diff options
| author |  emmaleer <emmaleer@google.com> | 2015-08-13 11:44:05 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-08-13 11:44:05 -0700 |
| commit | e5aaa07c351815f023a0842820eb769c6d4b4ed3 (patch) | |
| tree | b0ec62be476f4201fa1306c30662df70466761df /src/codec/SkCodec_libpng.h | |
| parent | 0944100ac89f797714eeae0cf2875e2335ff52ee (diff) | |
Revert of SkScaledCodec class (patchset #32 id:620001 of https://codereview.chromium.org/1260673002/ )
Reason for revert:
Segfaulting:
http://build.chromium.org/p/client.skia/builders/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Release/builds/1605/steps/dm/logs/stdio
Original issue's description:
> SkScaledCodec class
>
> This class does scaling by using a scanlineDecoder.
> getScanlines and skipScanlines are used for y sampling,
> the swizzler is used for x sampling
>
> this class is currently only working for png and jpeg images
> I will update other Codec types to work soon
>
> For SkJpegCodec to implement width wise swizzling it now
> uses a swizzler. I ran performance tests on this change.
> Here are the performance test results:
> https://docs.google.com/a/google.com/spreadsheets/d/1D7-Q_GXD_dI68LZO005NNvb8Wq2Ee0wEBEPG72671yw/edit?usp=sharing
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/0944100ac89f797714eeae0cf2875e2335ff52ee
TBR=scroggo@google.com,msarett@google.com,djsollen@google.com,mtklein@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1294593002
Diffstat (limited to 'src/codec/SkCodec_libpng.h')
| -rw-r--r-- | src/codec/SkCodec_libpng.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/codec/SkCodec_libpng.h b/src/codec/SkCodec_libpng.h index e8807499ea..890402200c 100644 --- a/src/codec/SkCodec_libpng.h +++ b/src/codec/SkCodec_libpng.h @@ -37,7 +37,6 @@ protected: SkEncodedFormat onGetEncodedFormat() const override { return kPNG_SkEncodedFormat; } bool onRewind() override; bool onReallyHasAlpha() const override { return fReallyHasAlpha; } - private: png_structp fPng_ptr; png_infop fInfo_ptr; @@ -53,6 +52,7 @@ private: SkPngCodec(const SkImageInfo&, SkStream*, png_structp, png_infop, int); + // Helper to set up swizzler and color table. Also calls png_read_update_info. Result initializeSwizzler(const SkImageInfo& requestedInfo, const Options&, SkPMColor*, int* ctableCount); |