aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/images
diff options
context:
space:
mode:
authorGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-05-09 16:15:20 +0000
committerGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-05-09 16:15:20 +0000
commita9f142e9f0e96ba6766479545a66654d8b3ebdc4 (patch)
tree8cb9180f0766496c6dd951c3d2091c2ec63c6687 /src/images
parent8d47ddc19a40d1984bf1f384d711d36ab59fd1c0 (diff)
remove unneeded reference to SkTScopedPtr
R=djsollen@google.com, scroggo@google.com Author: reed@google.com Review URL: https://chromiumcodereview.appspot.com/14057013 git-svn-id: http://skia.googlecode.com/svn/trunk@9075 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/images')
-rw-r--r--src/images/SkImageDecoder_libwebp.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/images/SkImageDecoder_libwebp.cpp b/src/images/SkImageDecoder_libwebp.cpp
index e623f376d7..95b9a97878 100644
--- a/src/images/SkImageDecoder_libwebp.cpp
+++ b/src/images/SkImageDecoder_libwebp.cpp
@@ -21,7 +21,6 @@
#include "SkStream.h"
#include "SkTemplates.h"
#include "SkUtils.h"
-#include "SkTScopedPtr.h"
// A WebP decoder only, on top of (subset of) libwebp
// For more information on WebP image format, and libwebp library, see:
@@ -344,13 +343,12 @@ bool SkWEBPImageDecoder::onDecodeSubset(SkBitmap* decodedBitmap,
(is_config_compatible(*decodedBitmap) &&
(decodedBitmap->width() == width) &&
(decodedBitmap->height() == height)));
- SkTScopedPtr<SkBitmap> adb;
+
+ SkBitmap tmpBitmap;
SkBitmap *bitmap = decodedBitmap;
if (!directDecode) {
- // allocates a temp bitmap
- bitmap = new SkBitmap;
- adb.reset(bitmap);
+ bitmap = &tmpBitmap;
}
if (bitmap->isNull()) {