switch Skia to explicit big-endian 16-bit skcms type

Change-Id: I1f3fd1d267631b2360da0054ba76b3aaffcec01b
Reviewed-on: https://skia-review.googlesource.com/154122
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
This commit is contained in:
Mike Klein 2018-09-12 16:05:38 -04:00 committed by Skia Commit-Bot
parent e650b85981
commit 34e5e1b387
2 changed files with 4 additions and 4 deletions

View File

@ -452,9 +452,9 @@ static skcms_PixelFormat png_select_xform_format(const SkEncodedInfo& info) {
// We use kRGB and kRGBA formats because color PNGs are always RGB or RGBA.
if (16 == info.bitsPerComponent()) {
if (SkEncodedInfo::kRGBA_Color == info.color()) {
return skcms_PixelFormat_RGBA_16161616;
return skcms_PixelFormat_RGBA_16161616BE;
} else if (SkEncodedInfo::kRGB_Color == info.color()) {
return skcms_PixelFormat_RGB_161616;
return skcms_PixelFormat_RGB_161616BE;
}
} else if (SkEncodedInfo::kGray_Color == info.color()) {
return skcms_PixelFormat_G_8;

View File

@ -49,9 +49,9 @@ static skcms_PixelFormat get_skcms_format(SkColorSpaceXform::ColorFormat fmt) {
case SkColorSpaceXform::kBGRA_8888_ColorFormat:
return skcms_PixelFormat_BGRA_8888;
case SkColorSpaceXform::kRGB_U16_BE_ColorFormat:
return skcms_PixelFormat_RGB_161616;
return skcms_PixelFormat_RGB_161616BE;
case SkColorSpaceXform::kRGBA_U16_BE_ColorFormat:
return skcms_PixelFormat_RGBA_16161616;
return skcms_PixelFormat_RGBA_16161616BE;
case SkColorSpaceXform::kRGBA_F16_ColorFormat:
return skcms_PixelFormat_RGBA_hhhh;
case SkColorSpaceXform::kRGBA_F32_ColorFormat: