diff options
| author |  Matt Sarett <msarett@google.com> | 2017-05-02 11:32:42 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-02 16:07:15 +0000 |
| commit | 9b848d5749c5e34b56f927a3a3374c8ebafbd9db (patch) | |
| tree | a7498e9c1c35c467e95a8c50ed70d8bbcaacd976 /gm | |
| parent | a18d2db2fc2f708c4a71315ff21d822976bcabbf (diff) | |
Add support for row-by-row jpeg encoding
Bug: 713862
Change-Id: I787b7c49662a00b89ae0ef35845dfbd6be3e6fb1
Reviewed-on: https://skia-review.googlesource.com/14641
Commit-Queue: Matt Sarett <msarett@google.com>
Reviewed-by: Leon Scroggins <scroggo@google.com>
Diffstat (limited to 'gm')
| -rw-r--r-- | gm/encode-platform.cpp | 7 | ||||
| -rw-r--r-- | gm/encode-srgb.cpp | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/gm/encode-platform.cpp b/gm/encode-platform.cpp index f08da73ce8..f53ebc0d9a 100644 --- a/gm/encode-platform.cpp +++ b/gm/encode-platform.cpp @@ -11,6 +11,7 @@ #include "SkCanvas.h" #include "SkData.h" #include "SkImageEncoderPriv.h" +#include "SkJpegEncoder.h" #include "SkUnPreMultiply.h" namespace skiagm { @@ -70,8 +71,10 @@ static sk_sp<SkData> encode_data(SkEncodedImageFormat type, const SkBitmap& bitm case SkEncodedImageFormat::kPNG: return SkEncodeImageAsPNG(&buf, src, SkEncodeOptions()) ? buf.detachAsData() : nullptr; - case SkEncodedImageFormat::kJPEG: - return SkEncodeImageAsJPEG(&buf, src, 100) ? buf.detachAsData() : nullptr; + case SkEncodedImageFormat::kJPEG: { + bool success = SkJpegEncoder::Encode(&buf, src, SkJpegEncoder::Options()); + return success ? buf.detachAsData() : nullptr; + } case SkEncodedImageFormat::kWEBP: return SkEncodeImageAsWEBP(&buf, src, 100) ? buf.detachAsData() : nullptr; default: diff --git a/gm/encode-srgb.cpp b/gm/encode-srgb.cpp index 3015baa4a0..fef133212c 100644 --- a/gm/encode-srgb.cpp +++ b/gm/encode-srgb.cpp @@ -13,6 +13,7 @@ #include "SkColorSpace_Base.h" #include "SkData.h" #include "SkImageEncoderPriv.h" +#include "SkJpegEncoder.h" #include "SkPM4f.h" #include "SkSRGB.h" @@ -128,7 +129,7 @@ static sk_sp<SkData> encode_data(const SkBitmap& bitmap, SkEncodedImageFormat fo SkAssertResult(SkEncodeImageAsWEBP(&buf, src, options)); break; case SkEncodedImageFormat::kJPEG: - SkAssertResult(SkEncodeImageAsJPEG(&buf, src, options)); + SkAssertResult(SkJpegEncoder::Encode(&buf, src, SkJpegEncoder::Options())); break; default: break; |