diff options
| author |  scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-07 19:53:53 +0000 |
|---|---|---|
| committer | scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-07 19:53:53 +0000 |
| commit | d79277f67824392876b82cf5635cc11f819e64df (patch) | |
| tree | 6edef887bf97ff87059e29669148b11b2a4fb122 /src/images/SkImageDecoder_libjpeg.cpp | |
| parent | 28621517f42682f1e028cbbf87c6afbf6e27a0f6 (diff) | |
Support decoding subsets from JPG on Android.
Previously we only supported it for the framework. Making this
change allows us to test subset decoding in skimage, to make sure
we don't break it.
Will require rebaselining android skimage results.
R=djsollen@google.com
Review URL: https://codereview.chromium.org/21612003
git-svn-id: http://skia.googlecode.com/svn/trunk@10625 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/images/SkImageDecoder_libjpeg.cpp')
| -rw-r--r-- | src/images/SkImageDecoder_libjpeg.cpp | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/src/images/SkImageDecoder_libjpeg.cpp b/src/images/SkImageDecoder_libjpeg.cpp index 81904ae530..d4047f1973 100644 --- a/src/images/SkImageDecoder_libjpeg.cpp +++ b/src/images/SkImageDecoder_libjpeg.cpp @@ -1,4 +1,3 @@ - /* * Copyright 2007 The Android Open Source Project * @@ -26,12 +25,6 @@ extern "C" { #include "jerror.h" } -// Uncomment to enable the code path used by the Android framework with their -// custom image decoders. -//#if defined(SK_BUILD_FOR_ANDROID) && defined(SK_DEBUG) -// #define SK_BUILD_FOR_ANDROID_FRAMEWORK -//#endif - // These enable timing code that report milliseconds for an encoding/decoding //#define TIME_ENCODE //#define TIME_DECODE @@ -68,7 +61,7 @@ public: : fSrcMgr(stream, decoder) {} ~SkJPEGImageIndex() { -#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK +#ifdef SK_BUILD_FOR_ANDROID jpeg_destroy_huffman_index(&fHuffmanIndex); #endif jpeg_finish_decompress(&fCInfo); @@ -87,14 +80,14 @@ public: jpeg_decompress_struct* cinfo() { return &fCInfo; } -#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK +#ifdef SK_BUILD_FOR_ANDROID huffman_index* huffmanIndex() { return &fHuffmanIndex; } #endif private: skjpeg_source_mgr fSrcMgr; jpeg_decompress_struct fCInfo; -#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK +#ifdef SK_BUILD_FOR_ANDROID huffman_index fHuffmanIndex; #endif }; @@ -116,7 +109,7 @@ public: } protected: -#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK +#ifdef SK_BUILD_FOR_ANDROID virtual bool onBuildTileIndex(SkStream *stream, int *width, int *height) SK_OVERRIDE; virtual bool onDecodeSubset(SkBitmap* bitmap, const SkIRect& rect) SK_OVERRIDE; #endif @@ -180,7 +173,7 @@ static bool skip_src_rows(jpeg_decompress_struct* cinfo, void* buffer, int count return true; } -#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK +#ifdef SK_BUILD_FOR_ANDROID static bool skip_src_rows_tile(jpeg_decompress_struct* cinfo, huffman_index *index, void* buffer, int count) { for (int i = 0; i < count; i++) { @@ -479,7 +472,7 @@ bool SkJPEGImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) { return true; } -#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK +#ifdef SK_BUILD_FOR_ANDROID bool SkJPEGImageDecoder::onBuildTileIndex(SkStream* stream, int *width, int *height) { SkJPEGImageIndex* imageIndex = SkNEW_ARGS(SkJPEGImageIndex, (stream, this)); |