diff options
| author |  Leon Scroggins <scroggo@google.com> | 2017-05-02 17:08:28 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-02 17:08:35 +0000 |
| commit | c06f309cf52b885b1b1d98c6b045b120a09f5c54 (patch) | |
| tree | 97d4cb45ec60d694ca2dd5147724181d153ebd8d /gm/encode-srgb.cpp | |
| parent | 9b848d5749c5e34b56f927a3a3374c8ebafbd9db (diff) | |
Revert "Add support for row-by-row jpeg encoding"
This reverts commit 9b848d5749c5e34b56f927a3a3374c8ebafbd9db.
Reason for revert: ASAN reports leaked memory [1]. Google3 reports a "delete size mismatch" [2], which I suspect is the same issue.
[1] https://chromium-swarm.appspot.com/task?id=35e2c9fa9eac6310&refresh=10&show_raw=1
[2] https://test.corp.google.com/ui#cl=154838904&flags=CAMQBQ==&id=OCL:154838904:BASE:154839043:1493741642370:9c96115f&t=//chrome/skia/dm_wrapper:dm_wrapper
Original change's description:
> 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>
>
TBR=msarett@google.com,scroggo@google.com,reed@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: Ic5a8d67e0d4a7733662586055ceff086a2ab335d
Reviewed-on: https://skia-review.googlesource.com/15140
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Leon Scroggins <scroggo@google.com>
Diffstat (limited to 'gm/encode-srgb.cpp')
| -rw-r--r-- | gm/encode-srgb.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gm/encode-srgb.cpp b/gm/encode-srgb.cpp index fef133212c..3015baa4a0 100644 --- a/gm/encode-srgb.cpp +++ b/gm/encode-srgb.cpp @@ -13,7 +13,6 @@ #include "SkColorSpace_Base.h" #include "SkData.h" #include "SkImageEncoderPriv.h" -#include "SkJpegEncoder.h" #include "SkPM4f.h" #include "SkSRGB.h" @@ -129,7 +128,7 @@ static sk_sp<SkData> encode_data(const SkBitmap& bitmap, SkEncodedImageFormat fo SkAssertResult(SkEncodeImageAsWEBP(&buf, src, options)); break; case SkEncodedImageFormat::kJPEG: - SkAssertResult(SkJpegEncoder::Encode(&buf, src, SkJpegEncoder::Options())); + SkAssertResult(SkEncodeImageAsJPEG(&buf, src, options)); break; default: break; |