aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/codec
diff options
context:
space:
mode:
authorGravatar raftias <raftias@google.com>2016-12-08 10:53:24 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2016-12-12 17:06:41 +0000
commitd737bee1470bbba8af5c9d74cbec2d731da33804 (patch)
tree12140efa7c572787ee98ad527f54c7586b7b7098 /include/codec
parentccd0eeecae63d2c43ad96fbfc2417b812f0588f9 (diff)
Updated the get_images_from_skps tool to check for ICC profile support
Tool will now check for and output all unsuccessfully parsed ICC profiles in input sksp images if --testColorCorrectionSupported is set as a flag. All ICC-aware codecs had to be slightly modified in order to expose this information, as the logic for accessing the ICC profiles is all within the codecs. If --writeFailedImages is set, it will also output all images whoses ICC profiles were not supported. TBR=reed@google.com BUG=skia: Change-Id: Ic310d82bdebf92f8d3bc0ad3dcc688136b6de377 Reviewed-on: https://skia-review.googlesource.com/5355 Reviewed-by: Leon Scroggins <scroggo@google.com> Reviewed-by: Matt Sarett <msarett@google.com> Commit-Queue: Robert Aftias <raftias@google.com>
Diffstat (limited to 'include/codec')
-rw-r--r--include/codec/SkCodec.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/include/codec/SkCodec.h b/include/codec/SkCodec.h
index 77f68fd761..314bec461c 100644
--- a/include/codec/SkCodec.h
+++ b/include/codec/SkCodec.h
@@ -785,6 +785,8 @@ protected:
return 0;
}
+ void setUnsupportedICC(bool SkDEBUGCODE(value)) { SkDEBUGCODE(fUnsupportedICC = value); }
+
private:
const SkEncodedInfo fEncodedInfo;
const SkImageInfo fSrcInfo;
@@ -800,6 +802,9 @@ private:
int fCurrScanline;
bool fStartedIncrementalDecode;
+#ifdef SK_DEBUG
+ bool fUnsupportedICC = false;
+#endif
/**
* Return whether these dimensions are supported as a scale.
@@ -864,5 +869,7 @@ private:
friend class DM::CodecSrc; // for fillIncompleteImage
friend class SkSampledCodec;
friend class SkIcoCodec;
+ friend struct Sniffer; // for fUnsupportedICC
+ friend class AutoCleanPng; // for setUnsupportedICC()
};
#endif // SkCodec_DEFINED