| Index: src/images/SkJpegUtility_images.cpp
|
| diff --git a/src/images/SkJpegUtility_images.cpp b/src/images/SkJpegUtility_images.cpp
|
| index 985ad215a90d3a8e233ec189c8d63f62df082c5f..a368f9bf706f22d9e5af25a3de69e08db3fed540 100644
|
| --- a/src/images/SkJpegUtility_images.cpp
|
| +++ b/src/images/SkJpegUtility_images.cpp
|
| @@ -13,7 +13,7 @@ static void sk_init_source(j_decompress_ptr cinfo) {
|
| skjpeg_source_mgr* src = (skjpeg_source_mgr*)cinfo->src;
|
| src->next_input_byte = (const JOCTET*)src->fBuffer;
|
| src->bytes_in_buffer = 0;
|
| -#ifdef SK_BUILD_FOR_ANDROID
|
| +#if 0
|
| src->current_offset = 0;
|
| #endif
|
| if (!src->fStream->rewind()) {
|
| @@ -22,7 +22,7 @@ static void sk_init_source(j_decompress_ptr cinfo) {
|
| }
|
| }
|
|
|
| -#ifdef SK_BUILD_FOR_ANDROID
|
| +#if 0
|
| static boolean sk_seek_input_data(j_decompress_ptr cinfo, long byte_offset) {
|
| skjpeg_source_mgr* src = (skjpeg_source_mgr*)cinfo->src;
|
| size_t bo = (size_t) byte_offset;
|
| @@ -57,7 +57,7 @@ static boolean sk_fill_input_buffer(j_decompress_ptr cinfo) {
|
| return FALSE;
|
| }
|
|
|
| -#ifdef SK_BUILD_FOR_ANDROID
|
| +#if 0
|
| src->current_offset += bytes;
|
| #endif
|
| src->next_input_byte = (const JOCTET*)src->fBuffer;
|
| @@ -77,7 +77,7 @@ static void sk_skip_input_data(j_decompress_ptr cinfo, long num_bytes) {
|
| cinfo->err->error_exit((j_common_ptr)cinfo);
|
| return;
|
| }
|
| -#ifdef SK_BUILD_FOR_ANDROID
|
| +#if 0
|
| src->current_offset += bytes;
|
| #endif
|
| bytesToSkip -= bytes;
|
| @@ -104,7 +104,7 @@ skjpeg_source_mgr::skjpeg_source_mgr(SkStream* stream, SkImageDecoder* decoder)
|
| skip_input_data = sk_skip_input_data;
|
| resync_to_restart = jpeg_resync_to_restart;
|
| term_source = sk_term_source;
|
| -#ifdef SK_BUILD_FOR_ANDROID
|
| +#if 0
|
| seek_input_data = sk_seek_input_data;
|
| #endif
|
| // SkDebugf("**************** use memorybase %p %d\n", fMemoryBase, fMemoryBaseSize);
|
|
|