diff options
author | Derek Sollenberger <djsollen@google.com> | 2017-03-22 16:19:49 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-22 16:19:59 +0000 |
commit | d68c41df1b55abe9c659cd4d236cf5ba5f435a65 (patch) | |
tree | da93d7c569212624b51eefd4a8e58b75662c1aab /tests/CodecTest.cpp | |
parent | d3b65972aad96453ff4510caa3e25a2b847c6d1e (diff) |
Revert "Add support for writing icc profiles to the jpeg encoder"
This reverts commit e3b95ce468c73af8247ba9582a7b84548b19f06a.
Reason for revert: This is breaking the Android auto roller.
Original change's description:
> Add support for writing icc profiles to the jpeg encoder
>
> Also, share the impl for skjpeg_error_mgr between the
> jpeg decoder and encoder. They are already identical
> anyway.
>
> BUG=skia:
>
> Change-Id: I029312406dee8734744cc3058acd1f153aefcd83
> Reviewed-on: https://skia-review.googlesource.com/9971
> Reviewed-by: Leon Scroggins <scroggo@google.com>
> Commit-Queue: Matt Sarett <msarett@google.com>
>
TBR=msarett@google.com,scroggo@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Change-Id: I05fb02610dbf4d9475f158d876d6495b0f7e9db4
Reviewed-on: https://skia-review.googlesource.com/10009
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Commit-Queue: Derek Sollenberger <djsollen@google.com>
Diffstat (limited to 'tests/CodecTest.cpp')
-rw-r--r-- | tests/CodecTest.cpp | 28 |
1 files changed, 4 insertions, 24 deletions
diff --git a/tests/CodecTest.cpp b/tests/CodecTest.cpp index da75ffb414..65e5475e54 100644 --- a/tests/CodecTest.cpp +++ b/tests/CodecTest.cpp @@ -1530,22 +1530,7 @@ DEF_TEST(Codec_InvalidAnimated, r) { } } -static void encode_format(SkDynamicMemoryWStream* stream, const SkPixmap& pixmap, - const SkEncodeOptions& opts, SkEncodedImageFormat format) { - switch (format) { - case SkEncodedImageFormat::kPNG: - SkEncodeImageAsPNG(stream, pixmap, opts); - break; - case SkEncodedImageFormat::kJPEG: - SkEncodeImageAsJPEG(stream, pixmap, opts); - break; - default: - SkASSERT(false); - break; - } -} - -static void test_encode_icc(skiatest::Reporter* r, SkEncodedImageFormat format) { +DEF_TEST(Codec_EncodeICC, r) { // Test with sRGB color space. SkBitmap srgbBitmap; SkImageInfo srgbInfo = SkImageInfo::MakeS32(1, 1, kOpaque_SkAlphaType); @@ -1556,7 +1541,7 @@ static void test_encode_icc(skiatest::Reporter* r, SkEncodedImageFormat format) SkDynamicMemoryWStream srgbBuf; SkEncodeOptions opts; opts.fColorBehavior = SkEncodeOptions::ColorBehavior::kCorrect; - encode_format(&srgbBuf, pixmap, opts, format); + SkEncodeImageAsPNG(&srgbBuf, pixmap, opts); sk_sp<SkData> srgbData = srgbBuf.detachAsData(); std::unique_ptr<SkCodec> srgbCodec(SkCodec::NewFromData(srgbData)); REPORTER_ASSERT(r, srgbCodec->getInfo().colorSpace() == SkColorSpace::MakeSRGB().get()); @@ -1566,7 +1551,7 @@ static void test_encode_icc(skiatest::Reporter* r, SkEncodedImageFormat format) sk_sp<SkColorSpace> p3 = SkColorSpace::MakeRGB(SkColorSpace::kSRGB_RenderTargetGamma, SkColorSpace::kDCIP3_D65_Gamut); pixmap.setColorSpace(p3); - encode_format(&p3Buf, pixmap, opts, format); + SkEncodeImageAsPNG(&p3Buf, pixmap, opts); sk_sp<SkData> p3Data = p3Buf.detachAsData(); std::unique_ptr<SkCodec> p3Codec(SkCodec::NewFromData(p3Data)); REPORTER_ASSERT(r, p3Codec->getInfo().colorSpace()->gammaCloseToSRGB()); @@ -1579,12 +1564,7 @@ static void test_encode_icc(skiatest::Reporter* r, SkEncodedImageFormat format) for (int i = 0; i < 4; i++) { for (int j = 0; j < 4; j++) { - REPORTER_ASSERT(r, color_space_almost_equal(mat0.get(i, j), mat1.get(i, j))); + REPORTER_ASSERT(r, color_space_almost_equal(mat0.get(0, 0), mat1.get(0, 0))); } } } - -DEF_TEST(Codec_EncodeICC, r) { - test_encode_icc(r, SkEncodedImageFormat::kPNG); - test_encode_icc(r, SkEncodedImageFormat::kJPEG); -} |