aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/images
diff options
context:
space:
mode:
authorGravatar Matt Sarett <msarett@google.com>2016-10-31 01:16:36 +0000
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2016-10-31 01:16:48 +0000
commit8981c35ed5dfc3b600c69ac02a9e1f0fb3d5c782 (patch)
tree2e09db0a66b3946bbb0c3e3db2ded6e34215858b /src/images
parent09b007f0ef8532e65933cdeb30334b745c1251bd (diff)
Revert "Speculative fix for flaky webp encode/decode on Nexus 5"
This reverts commit 18a11a6f374fe430c8736c53ff4f8bc3c72cd54b. Reason for revert: <INSERT REASONING HERE> Original change's description: > Speculative fix for flaky webp encode/decode on Nexus 5 > > I'm not really expecting this to work anymore... > > The docs don't say anything about the rgb pointer needing > to stay valid, and it looks like we are done with it > after the call to import. > > Still, worth a try I think. > > BUG=skia:5876 > > GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4024 > > Change-Id: I6e65ef96a2b661b01eb92bedab0acd73ed4f6218 > Reviewed-on: https://skia-review.googlesource.com/4024 > Reviewed-by: Mike Klein <mtklein@chromium.org> > Commit-Queue: Matt Sarett <msarett@google.com> > TBR=mtklein@chromium.org,msarett@google.com,reviews@skia.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Change-Id: Id764782ea58acc99e4719c0bff22619abaf9c6e5 Reviewed-on: https://skia-review.googlesource.com/4150 Commit-Queue: Matt Sarett <msarett@google.com> Reviewed-by: Matt Sarett <msarett@google.com>
Diffstat (limited to 'src/images')
-rw-r--r--src/images/SkWEBPImageEncoder.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/images/SkWEBPImageEncoder.cpp b/src/images/SkWEBPImageEncoder.cpp
index 6ae79efd0f..116608a253 100644
--- a/src/images/SkWEBPImageEncoder.cpp
+++ b/src/images/SkWEBPImageEncoder.cpp
@@ -227,10 +227,10 @@ bool SkWEBPImageEncoder::onEncode(SkWStream* stream, const SkBitmap& bm,
} else {
ok = SkToBool(WebPPictureImportRGBA(&pic, rgb, rgbStride));
}
+ delete[] rgb;
ok = ok && WebPEncode(&webp_config, &pic);
WebPPictureFree(&pic);
- delete[] rgb;
return ok;
}