diff options
| author |  msarett <msarett@google.com> | 2016-09-16 11:01:27 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-09-16 11:01:27 -0700 |
| commit | c71a9b7f53938b4f33f36f48e867b8b72cc1cc61 (patch) | |
| tree | 8fbb6b55eb00f5fb5b55e89d97076f199cc0e205 /src/codec/SkPngCodec.h | |
| parent | 046cb56c6c1bb40779c81b115271ed0e8196b48b (diff) | |
Revert of Support Float32 output from SkColorSpaceXform (patchset #7 id:140001 of https://codereview.chromium.org/2339233003/ )
Reason for revert:
Hitting an assert
Original issue's description:
> Support Float32 output from SkColorSpaceXform
>
> * Adds Float32 support to SkColorSpaceXform
> * Changes API to allows clients to ask for F32, updates clients to
> new API
> * Adds Sk4f_load4 and Sk4f_store4 to SkNx
> * Make use of new xform in SkGr.cpp
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2339233003
> CQ_INCLUDE_TRYBOTS=master.client.skia:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD-Trybot
>
> Committed: https://skia.googlesource.com/skia/+/43d6651111374b5d1e4ddd9030dcf079b448ec47
TBR=brianosman@google.com,mtklein@google.com,scroggo@google.com,mtklein@chromium.org,bsalomon@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review-Url: https://codereview.chromium.org/2347473007
Diffstat (limited to 'src/codec/SkPngCodec.h')
| -rw-r--r-- | src/codec/SkPngCodec.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/codec/SkPngCodec.h b/src/codec/SkPngCodec.h index 1fc451757e..e3059ba0d5 100644 --- a/src/codec/SkPngCodec.h +++ b/src/codec/SkPngCodec.h @@ -64,7 +64,7 @@ protected: SkSwizzler* swizzler() { return fSwizzler; } // Initialize variables used by applyXformRow. - void initializeXformParams(); + void initializeXformAlphaAndWidth(); /** * Pass available input to libpng to process it. @@ -128,10 +128,9 @@ private: virtual void setRange(int firstRow, int lastRow, void* dst, size_t rowBytes) = 0; virtual Result decode(int* rowsDecoded) = 0; - XformMode fXformMode; - SkColorSpaceXform::ColorFormat fXformColorFormat; - SkAlphaType fXformAlphaType; - int fXformWidth; + XformMode fXformMode; + SkAlphaType fXformAlphaType; + int fXformWidth; #ifdef SK_GOOGLE3_PNG_HACK bool fNeedsToRereadHeader; |