| commit | 1c8a587120fd33854974457cf2a795ead98183a9 | [log] [tgz] |
|---|---|---|
| author | msarett <msarett@google.com> | Tue Jul 07 08:50:01 2015 -0700 |
| committer | Commit bot <commit-bot@chromium.org> | Tue Jul 07 08:50:01 2015 -0700 |
| tree | 2897642aa9e325f26a38bdd2cd15a01732abcf39 | |
| parent | 5617900063f69754de62b8b12d32f6e36df14104 [diff] [blame] |
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 Committed: https://skia.googlesource.com/skia/+/f8bf9181d7b0463c8e371755cfbb9ece90b34fc5 Committed: https://skia.googlesource.com/skia/+/e9e3ee33f30c14c31afd5fc3fe4dda7f15783c75 Committed: https://skia.googlesource.com/skia/+/40141b57f061fbfcc2fa38da942d9efe25aca4d0 Review URL: https://codereview.chromium.org/1180983002
diff --git a/src/codec/SkJpegCodec.h b/src/codec/SkJpegCodec.h index f39bc49..122c6e4 100644 --- a/src/codec/SkJpegCodec.h +++ b/src/codec/SkJpegCodec.h
@@ -106,6 +106,13 @@ 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 */ @@ -118,8 +125,6 @@ const Options& options); SkAutoTDelete<JpegDecoderMgr> fDecoderMgr; - SkAutoTDelete<SkSwizzler> fSwizzler; - size_t fSrcRowBytes; friend class SkJpegScanlineDecoder;