diff options
| author |  Matt Sarett <msarett@google.com> | 2017-04-05 22:33:22 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-04-05 22:33:28 +0000 |
| commit | 3dbef9f184cfecadf14d4c424cf02ee2e8f68d44 (patch) | |
| tree | 6301d4b93faf3b288ad4ae408dd198f629bcbb6d /tests/CodecTest.cpp | |
| parent | 1a26ba9def4724c9d863532721471e928a6f9cf3 (diff) | |
Revert "Revert "Add support for writing ICC profiles to webp encoder""
This reverts commit e87d7781db75a7ec22a103eda0886c2ca8dc4d9d.
Reason for revert: Not the cause of the crashes.
Original change's description:
> Revert "Add support for writing ICC profiles to webp encoder"
>
> This reverts commit 0c9d0b4e03b6c10778329e995b5dfdcb97954b28.
>
> Reason for revert: Looks like it's breaking a number of bots.
>
> Original change's description:
> > Add support for writing ICC profiles to webp encoder
> >
> > Bug: skia:
> > Change-Id: If0a8f84ed88da96924370b841f2283c0ff8e32ab
> > Reviewed-on: https://skia-review.googlesource.com/10212
> > Commit-Queue: Matt Sarett <msarett@google.com>
> > Reviewed-by: Leon Scroggins <scroggo@google.com>
> >
>
> TBR=msarett@google.com,scroggo@google.com,reviews@skia.org,jzern@google.com
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
>
> Change-Id: Ic06ad9f19a4d743b34f8d3bd33f171b9d74badcb
> Reviewed-on: https://skia-review.googlesource.com/11408
> Reviewed-by: Jim Van Verth <jvanverth@google.com>
> Commit-Queue: Jim Van Verth <jvanverth@google.com>
>
TBR=jvanverth@google.com,msarett@google.com,scroggo@google.com,reviews@skia.org,jzern@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: I42f6ddefaf87c87b155640950b52a456952130ec
Reviewed-on: https://skia-review.googlesource.com/11410
Reviewed-by: Matt Sarett <msarett@google.com>
Commit-Queue: Matt Sarett <msarett@google.com>
Diffstat (limited to 'tests/CodecTest.cpp')
| -rw-r--r-- | tests/CodecTest.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/CodecTest.cpp b/tests/CodecTest.cpp index f3a393d7ac..3897878879 100644 --- a/tests/CodecTest.cpp +++ b/tests/CodecTest.cpp @@ -1538,6 +1538,9 @@ static void encode_format(SkDynamicMemoryWStream* stream, const SkPixmap& pixmap case SkEncodedImageFormat::kJPEG: SkEncodeImageAsJPEG(stream, pixmap, opts); break; + case SkEncodedImageFormat::kWEBP: + SkEncodeImageAsWEBP(stream, pixmap, opts); + break; default: SkASSERT(false); break; @@ -1586,4 +1589,5 @@ static void test_encode_icc(skiatest::Reporter* r, SkEncodedImageFormat format) DEF_TEST(Codec_EncodeICC, r) { test_encode_icc(r, SkEncodedImageFormat::kPNG); test_encode_icc(r, SkEncodedImageFormat::kJPEG); + test_encode_icc(r, SkEncodedImageFormat::kWEBP); } |