diff options
author | 2016-12-01 16:38:16 +0000 | |
---|---|---|
committer | 2016-12-01 16:38:30 +0000 | |
commit | 62458a6778bc39eea5360301a67d192b3a263df1 (patch) | |
tree | 46e3969ee23b12b9a10cc69790e358b6db0c0cb0 /gm | |
parent | 51c3fcd376c5c9972d9476b5532f6164375a38d1 (diff) |
Revert "Added CMYK support for ICC profiles."
This reverts commit 51c3fcd376c5c9972d9476b5532f6164375a38d1.
Reason for revert: ASAN, MSAN both take issue with parse_and_load_gamma()
Original change's description:
> Added CMYK support for ICC profiles.
>
> Changed ICC parsing/SkGammas/SkColorLookUpTable to handle non-3-channel
> inputs. Parsed CMYK A2B ICC profiles. Integrated this with SkJpegCodec
> (the only file that supports CMYK) and SkColorSpaceXform_A2B to allow
> parsing and color xforming of ICC CMYK images.
>
> BUG=skia:
>
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=5197
> CQ_INCLUDE_TRYBOTS=skia.primary:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD
>
>
> Change-Id: Id6619f63f04071f79cd2d84321857dfa269ad3aa
> Reviewed-on: https://skia-review.googlesource.com/5197
> Commit-Queue: Mike Klein <mtklein@chromium.org>
> Reviewed-by: Matt Sarett <msarett@google.com>
> Reviewed-by: Mike Klein <mtklein@chromium.org>
> Reviewed-by: Leon Scroggins <scroggo@google.com>
>
TBR=mtklein@chromium.org,mtklein@google.com,msarett@google.com,scroggo@google.com,brianosman@google.com,raftias@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: Ib43fef00bc233c0b4fa47ed29040d69601def267
Reviewed-on: https://skia-review.googlesource.com/5423
Commit-Queue: Mike Klein <mtklein@chromium.org>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'gm')
-rw-r--r-- | gm/labpcsdemo.cpp | 192 |
1 files changed, 192 insertions, 0 deletions
diff --git a/gm/labpcsdemo.cpp b/gm/labpcsdemo.cpp new file mode 100644 index 0000000000..26e48a8890 --- /dev/null +++ b/gm/labpcsdemo.cpp @@ -0,0 +1,192 @@ +/* + * Copyright 2016 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + +#include <cmath> +#include "gm.h" +#include "Resources.h" +#include "SkCodec.h" +#include "SkColorSpace_Base.h" +#include "SkColorSpace_A2B.h" +#include "SkColorSpacePriv.h" +#include "SkData.h" +#include "SkFloatingPoint.h" +#include "SkImageInfo.h" +#include "SkScalar.h" +#include "SkSRGB.h" +#include "SkStream.h" +#include "SkSurface.h" +#include "SkTypes.h" + +/** + * This tests decoding from a Lab source image and displays on the left + * the image as raw RGB values, and on the right a Lab PCS. + * It currently does NOT apply a/b/m-curves, as in the .icc profile + * We are testing it on these are all identity transforms. + */ +class LabPCSDemoGM : public skiagm::GM { +public: + LabPCSDemoGM() + : fWidth(1080) + , fHeight(480) + {} + +protected: + + + SkString onShortName() override { + return SkString("labpcsdemo"); + } + + SkISize onISize() override { + return SkISize::Make(fWidth, fHeight); + } + + void onDraw(SkCanvas* canvas) override { + canvas->drawColor(SK_ColorGREEN); + const char* filename = "brickwork-texture.jpg"; + renderImage(canvas, filename, 0, false); + renderImage(canvas, filename, 1, true); + } + + void renderImage(SkCanvas* canvas, const char* filename, int col, bool convertLabToXYZ) { + SkBitmap bitmap; + SkStream* stream(GetResourceAsStream(filename)); + if (stream == nullptr) { + return; + } + std::unique_ptr<SkCodec> codec(SkCodec::NewFromStream(stream)); + + + // srgb_lab_pcs.icc is an elaborate way to specify sRGB but uses + // Lab as the PCS, so we can take any arbitrary image that should + // be sRGB and this should show a reasonable image + const SkString iccFilename(GetResourcePath("icc_profiles/srgb_lab_pcs.icc")); + sk_sp<SkData> iccData = SkData::MakeFromFileName(iccFilename.c_str()); + if (iccData == nullptr) { + return; + } + sk_sp<SkColorSpace> colorSpace = SkColorSpace::MakeICC(iccData->bytes(), iccData->size()); + + const int imageWidth = codec->getInfo().width(); + const int imageHeight = codec->getInfo().height(); + // Using nullptr as the color space instructs the codec to decode in legacy mode, + // meaning that we will get the raw encoded bytes without any color correction. + SkImageInfo imageInfo = SkImageInfo::Make(imageWidth, imageHeight, kN32_SkColorType, + kOpaque_SkAlphaType, nullptr); + bitmap.allocPixels(imageInfo); + codec->getPixels(imageInfo, bitmap.getPixels(), bitmap.rowBytes()); + if (convertLabToXYZ) { + SkASSERT(SkColorSpace_Base::Type::kA2B == as_CSB(colorSpace)->type()); + SkColorSpace_A2B& cs = *static_cast<SkColorSpace_A2B*>(colorSpace.get()); + const SkColorLookUpTable* colorLUT = nullptr; + bool printConversions = false; + // We're skipping evaluating the TRCs and the matrix here since they aren't + // in the ICC profile initially used here. + for (int e = 0; e < cs.count(); ++e) { + switch (cs.element(e).type()) { + case SkColorSpace_A2B::Element::Type::kGammaNamed: + SkASSERT(kLinear_SkGammaNamed == cs.element(e).gammaNamed()); + break; + case SkColorSpace_A2B::Element::Type::kGammas: + SkASSERT(false); + break; + case SkColorSpace_A2B::Element::Type::kCLUT: + colorLUT = &cs.element(e).colorLUT(); + break; + case SkColorSpace_A2B::Element::Type::kMatrix: + SkASSERT(cs.element(e).matrix().isIdentity()); + break; + } + } + SkASSERT(colorLUT); + for (int y = 0; y < imageHeight; ++y) { + for (int x = 0; x < imageWidth; ++x) { + uint32_t& p = *bitmap.getAddr32(x, y); + const int r = SkColorGetR(p); + const int g = SkColorGetG(p); + const int b = SkColorGetB(p); + if (printConversions) { + SkColorSpacePrintf("\nraw = (%d, %d, %d)\t", r, g, b); + } + + float lab[4] = { r * (1.f/255.f), g * (1.f/255.f), b * (1.f/255.f), 1.f }; + + colorLUT->interp3D(lab, lab); + + // Lab has ranges [0,100] for L and [-128,127] for a and b + // but the ICC profile loader stores as [0,1]. The ICC + // specifies an offset of -128 to convert. + // note: formula could be adjusted to remove this conversion, + // but for now let's keep it like this for clarity until + // an optimized version is added. + lab[0] *= 100.f; + lab[1] = 255.f * lab[1] - 128.f; + lab[2] = 255.f * lab[2] - 128.f; + if (printConversions) { + SkColorSpacePrintf("Lab = < %f, %f, %f >\n", lab[0], lab[1], lab[2]); + } + + // convert from Lab to XYZ + float Y = (lab[0] + 16.f) * (1.f/116.f); + float X = lab[1] * (1.f/500.f) + Y; + float Z = Y - (lab[2] * (1.f/200.f)); + float cubed; + cubed = X*X*X; + if (cubed > 0.008856f) + X = cubed; + else + X = (X - (16.f/116.f)) * (1.f/7.787f); + cubed = Y*Y*Y; + if (cubed > 0.008856f) + Y = cubed; + else + Y = (Y - (16.f/116.f)) * (1.f/7.787f); + cubed = Z*Z*Z; + if (cubed > 0.008856f) + Z = cubed; + else + Z = (Z - (16.f/116.f)) * (1.f/7.787f); + + // adjust to D50 illuminant + X *= 0.96422f; + Y *= 1.00000f; + Z *= 0.82521f; + + if (printConversions) { + SkColorSpacePrintf("XYZ = (%4f, %4f, %4f)\t", X, Y, Z); + } + + // convert XYZ -> linear sRGB + Sk4f lRGB( 3.1338561f*X - 1.6168667f*Y - 0.4906146f*Z, + -0.9787684f*X + 1.9161415f*Y + 0.0334540f*Z, + 0.0719453f*X - 0.2289914f*Y + 1.4052427f*Z, + 1.f); + // and apply sRGB gamma + Sk4i sRGB = sk_linear_to_srgb(lRGB); + if (printConversions) { + SkColorSpacePrintf("sRGB = (%d, %d, %d)\n", sRGB[0], sRGB[1], sRGB[2]); + } + p = SkColorSetRGB(sRGB[0], sRGB[1], sRGB[2]); + } + } + } + const int freeWidth = fWidth - 2*imageWidth; + const int freeHeight = fHeight - imageHeight; + canvas->drawBitmap(bitmap, + static_cast<SkScalar>((col+1) * (freeWidth / 3) + col*imageWidth), + static_cast<SkScalar>(freeHeight / 2)); + ++col; + } + +private: + const int fWidth; + const int fHeight; + + typedef skiagm::GM INHERITED; +}; + +DEF_GM( return new LabPCSDemoGM; ) |