aboutsummaryrefslogtreecommitdiffhomepage
path: root/dm
diff options
context:
space:
mode:
authorGravatar Matt Sarett <msarett@google.com>2016-11-01 12:19:50 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2016-11-01 16:45:40 +0000
commita9e9bfc6e40894c0447c044a380c74061cb9e15e (patch)
treee8753d1cb647661e5212b4208aa704499985029d /dm
parent10d665d000cfdce693b7ca088fb2c61ed54bcdfb (diff)
Delete qcms
This was always intended to be a temporary dependency to use for testing. It has served its purpose. Also, this has already been dropped (accidentally, I think) by the new GN build. TBR=reed@google.com BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4220 Change-Id: Ic72ee08bbfaf86ed86a4122fd38be2921eb1327e Reviewed-on: https://skia-review.googlesource.com/4220 Reviewed-by: Matt Sarett <msarett@google.com> Reviewed-by: Leon Scroggins <scroggo@google.com> Commit-Queue: Matt Sarett <msarett@google.com>
Diffstat (limited to 'dm')
-rw-r--r--dm/DM.cpp6
-rw-r--r--dm/DMSrcSink.cpp53
-rw-r--r--dm/DMSrcSink.h5
3 files changed, 0 insertions, 64 deletions
diff --git a/dm/DM.cpp b/dm/DM.cpp
index 42922c2c0b..71d31502d1 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -797,12 +797,6 @@ static bool gather_srcs() {
push_src("colorImage", "color_codec_sRGB_kN32", src);
src = new ColorCodecSrc(colorImage, ColorCodecSrc::kDst_sRGB_Mode, kRGBA_F16_SkColorType);
push_src("colorImage", "color_codec_sRGB_kF16", src);
-
-#if defined(SK_TEST_QCMS)
- src = new ColorCodecSrc(colorImage, ColorCodecSrc::kQCMS_HPZR30w_Mode,
- kRGBA_8888_SkColorType);
- push_src("colorImage", "color_codec_QCMS_HPZR30w", src);
-#endif
}
return true;
diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp
index 4c428a7b9c..d519860a17 100644
--- a/dm/DMSrcSink.cpp
+++ b/dm/DMSrcSink.cpp
@@ -45,10 +45,6 @@
#include "SkAutoCoInitialize.h"
#endif
-#if defined(SK_TEST_QCMS)
- #include "qcms.h"
-#endif
-
#if defined(SK_XML)
#include "SkSVGDOM.h"
#include "SkXMLWriter.h"
@@ -965,10 +961,6 @@ Error ColorCodecSrc::draw(SkCanvas* canvas) const {
}
bool runInLegacyMode = kBaseline_Mode == fMode;
-#if defined(SK_TEST_QCMS)
- runInLegacyMode = runInLegacyMode || kQCMS_HPZR30w_Mode == fMode;
-#endif
-
if (runInLegacyMode && canvas->imageInfo().colorSpace()) {
return Error::Nonfatal("Skipping tests that are only interesting in legacy mode.");
} else if (!runInLegacyMode && !canvas->imageInfo().colorSpace()) {
@@ -1038,51 +1030,6 @@ Error ColorCodecSrc::draw(SkCanvas* canvas) const {
case kDst_HPZR30w_Mode:
canvas->drawBitmap(bitmap, 0, 0);
break;
-#if defined(SK_TEST_QCMS)
- case kQCMS_HPZR30w_Mode: {
- sk_sp<SkData> srcData = codec->getICCData();
- if (!srcData) {
- return Error::Nonfatal("No ICC profile data. Cannot test with QCMS.\n");
- }
-
- SkAutoTCallVProc<qcms_profile, qcms_profile_release>
- srcSpace(qcms_profile_from_memory(srcData->data(), srcData->size()));
- if (!srcSpace) {
- return Error::Nonfatal(SkStringPrintf("QCMS cannot create profile for %s.\n",
- fPath.c_str()));
- }
-
- SkAutoTCallVProc<qcms_profile, qcms_profile_release>
- dstSpace(qcms_profile_from_memory(dstData->data(), dstData->size()));
- SkASSERT(dstSpace);
-
- // Optimizes conversion by precomputing the inverse transformation to dst. Also
- // causes QCMS to use a completely different codepath. This is how Chrome uses QCMS.
- qcms_profile_precache_output_transform(dstSpace);
- SkAutoTCallVProc<qcms_transform, qcms_transform_release>
- transform (qcms_transform_create(srcSpace, QCMS_DATA_RGBA_8, dstSpace,
- QCMS_DATA_RGBA_8, QCMS_INTENT_PERCEPTUAL));
- if (!transform) {
- return SkStringPrintf("QCMS cannot create transform for %s.\n", fPath.c_str());
- }
-
-#ifdef SK_PMCOLOR_IS_RGBA
- qcms_output_type outType = QCMS_OUTPUT_RGBX;
-#else
- qcms_output_type outType = QCMS_OUTPUT_BGRX;
-#endif
-
- // Perform color correction.
- uint32_t* row = (uint32_t*) bitmap.getPixels();
- for (int y = 0; y < decodeInfo.height(); y++) {
- qcms_transform_data_type(transform, row, row, decodeInfo.width(), outType);
- row = SkTAddOffset<uint32_t>(row, rowBytes);
- }
-
- canvas->drawBitmap(bitmap, 0, 0);
- break;
- }
-#endif
default:
SkASSERT(false);
return "Invalid fMode";
diff --git a/dm/DMSrcSink.h b/dm/DMSrcSink.h
index cad15c7e86..237f5d17ad 100644
--- a/dm/DMSrcSink.h
+++ b/dm/DMSrcSink.h
@@ -219,11 +219,6 @@ public:
kDst_HPZR30w_Mode,
kDst_sRGB_Mode,
-
-#if defined(SK_TEST_QCMS)
- // Use QCMS for color correction.
- kQCMS_HPZR30w_Mode,
-#endif
};
ColorCodecSrc(Path, Mode, SkColorType);