diff options
| author |  Brian Osman <brianosman@google.com> | 2018-06-04 09:21:17 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-04 14:07:48 +0000 |
| commit | e1adc3a9552c21e7b45b7a910f2a0854e00a92b9 (patch) | |
| tree | 5744750ccf142f18b84a16b9d28f1ba382d76155 /src/images/SkImageEncoderPriv.h | |
| parent | 7258e97e8e3af173cc5131f309ae487f663bfd39 (diff) | |
Remove color space restrictions from image infos
What makes an info valid (or invalid)? Nothing to do with
color space.
Bug: skia:
Change-Id: I6795efa9aa74ab0d65935c5ddccc1058f8e0b112
Reviewed-on: https://skia-review.googlesource.com/131780
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Diffstat (limited to 'src/images/SkImageEncoderPriv.h')
| -rw-r--r-- | src/images/SkImageEncoderPriv.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/images/SkImageEncoderPriv.h b/src/images/SkImageEncoderPriv.h index e6903bc5e8..a7707fec52 100644 --- a/src/images/SkImageEncoderPriv.h +++ b/src/images/SkImageEncoderPriv.h @@ -11,17 +11,9 @@ #include "SkImageEncoder.h" #include "SkImageInfoPriv.h" -static inline bool SkPixmapIsValid(const SkPixmap& src, - SkTransferFunctionBehavior unpremulBehavior) -{ - if (SkTransferFunctionBehavior::kRespect == unpremulBehavior) { - if (!SkImageInfoIsValidRenderingCS(src.info())) { - return false; - } - } else { - if (!SkImageInfoIsValidAllowNumericalCS(src.info())) { - return false; - } +static inline bool SkPixmapIsValid(const SkPixmap& src) { + if (!SkImageInfoIsValid(src.info())) { + return false; } if (!src.addr() || src.rowBytes() < src.info().minRowBytes()) { |