diff options
author | 2015-06-24 15:14:48 -0700 | |
---|---|---|
committer | 2015-06-24 15:14:48 -0700 | |
commit | c0bdecb920a957665f66adefd3f3fb865e32e5d0 (patch) | |
tree | 055fac27d0c76067ec1f2271dd9a5879450c0b18 /src/codec/SkJpegCodec.h | |
parent | b60c3f8291529303299262dba19b1a896060bd2d (diff) |
Revert of Switch SkJpegCode to libjpeg-turbo (patchset #11 id:540001 of https://codereview.chromium.org/1180983002/)
Reason for revert:
https://uberchromegw.corp.google.com/i/client.skia.compile/builders/Build-Ubuntu-GCC-MipsDSP2-Debug-Android/builds/1136/steps/build%20most/logs/stdio
Original issue's description:
> Add libjpeg-turbo library (depends on yasm)
> Mangle external function names to avoid conflict with libjpeg
> Take advantage of direct color conversion (RGBA, BGRA, 565)
> Prepare to use jpeg_skip_scanlines (when it is upstreamed)
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/b60c3f8291529303299262dba19b1a896060bd2d
TBR=scroggo@google.com,djsollen@google.com,emmaleer@google.com,msarett@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1199253006
Diffstat (limited to 'src/codec/SkJpegCodec.h')
-rw-r--r-- | src/codec/SkJpegCodec.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/codec/SkJpegCodec.h b/src/codec/SkJpegCodec.h index 1844269e6b..87c925d9d1 100644 --- a/src/codec/SkJpegCodec.h +++ b/src/codec/SkJpegCodec.h @@ -100,13 +100,6 @@ private: bool handleRewind(); /* - * Checks if the conversion between the input image and the requested output - * image has been implemented - * Sets the output color space - */ - bool setOutputColorSpace(const SkImageInfo& dst); - - /* * Checks if we can scale to the requested dimensions and scales the dimensions * if possible */ @@ -119,6 +112,8 @@ private: const Options& options); SkAutoTDelete<JpegDecoderMgr> fDecoderMgr; + SkAutoTDelete<SkSwizzler> fSwizzler; + size_t fSrcRowBytes; friend class SkJpegScanlineDecoder; |