From c494a708be977a458a105318b2e2f439ab985ed8 Mon Sep 17 00:00:00 2001 From: Brian Osman Date: Wed, 23 May 2018 11:52:00 -0400 Subject: Use skcms for ICC parsing in HP codec test Change-Id: I6319b00ae35a15ffeaf8a785dde874b730f42c13 Reviewed-on: https://skia-review.googlesource.com/129649 Commit-Queue: Brian Osman Commit-Queue: Mike Klein Auto-Submit: Brian Osman Reviewed-by: Mike Klein --- dm/DMSrcSink.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'dm') diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp index 52826ac00b..6378fabd3a 100644 --- a/dm/DMSrcSink.cpp +++ b/dm/DMSrcSink.cpp @@ -71,6 +71,10 @@ #include "SkXMLWriter.h" #endif +#if defined(SK_USE_SKCMS) + #include "skcms.h" +#endif + #if SK_SUPPORT_GPU #include "GrBackendSurface.h" #include "GrContextPriv.h" @@ -1084,7 +1088,14 @@ Error ColorCodecSrc::draw(SkCanvas* canvas) const { if (kDst_sRGB_Mode == fMode) { dstSpace = SkColorSpace::MakeSRGB(); } else if (kDst_HPZR30w_Mode == fMode) { - dstSpace = SkColorSpace::MakeICC(dstData->data(), dstData->size()); +#if defined(SK_USE_SKCMS) + skcms_ICCProfile profile; + SkAssertResult(skcms_Parse(dstData->data(), dstData->size(), &profile)); + dstSpace = SkColorSpace::Make(profile); + SkASSERT(dstSpace); +#else + return "Cannot use ICC profile without skcms support."; +#endif } SkImageInfo decodeInfo = codec->getInfo().makeColorType(fColorType).makeColorSpace(dstSpace); -- cgit v1.2.3