diff options
| author |  msarett <msarett@google.com> | 2016-09-08 10:54:34 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-09-08 10:54:34 -0700 |
| commit | 85c922acec37726ac64e9be9a79de697c677f35d (patch) | |
| tree | ce407f846cdad8e4cf71c6d0479a1588b45d5cf6 /src/codec/SkBmpMaskCodec.cpp | |
| parent | 7a9900d6d34e437bb24beb5524a1f6488ae138c9 (diff) | |
Revert of Checking for valid colorType, alphaType, colorSpace in SkCodec (patchset #2 id:100001 of https://codereview.chromium.org/2319293003/ )
Reason for revert:
Broken perf bots
Original issue's description:
> Checking for valid colorType, alphaType, colorSpace in SkCodec
>
> * Refactor to share code between SkPngCodec and SkWebpCodec
> * Didn't end up sharing with SkJpegCodec but did refactor
> that code a bit
> * Disallow conversions to F16 with non-linear color spaces
> * Fail to decode if we fail to create a SkColorSpaceXform
> (should be an assert soon). We used to fallback on a
> legacy decode if we failed to create the transform.
> * A bunch of name changes
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2319293003
>
> Committed: https://skia.googlesource.com/skia/+/7a9900d6d34e437bb24beb5524a1f6488ae138c9
TBR=scroggo@google.com,brianosman@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/2328663002
Diffstat (limited to 'src/codec/SkBmpMaskCodec.cpp')
| -rw-r--r-- | src/codec/SkBmpMaskCodec.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/codec/SkBmpMaskCodec.cpp b/src/codec/SkBmpMaskCodec.cpp index 5b28252f7c..7d2d398bb4 100644 --- a/src/codec/SkBmpMaskCodec.cpp +++ b/src/codec/SkBmpMaskCodec.cpp @@ -39,7 +39,7 @@ SkCodec::Result SkBmpMaskCodec::onGetPixels(const SkImageInfo& dstInfo, return kInvalidScale; } - if (!conversion_possible_ignore_color_space(dstInfo, this->getInfo())) { + if (!conversion_possible(dstInfo, this->getInfo())) { SkCodecPrintf("Error: cannot convert input type to output type.\n"); return kInvalidConversion; } |