Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(534)

Unified Diff: src/images/SkImageDecoder_libwebp.cpp

Issue 14057013: remove unneeded reference to SkTScopedPtr (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/images/SkImageDecoder_libwebp.cpp
===================================================================
--- src/images/SkImageDecoder_libwebp.cpp (revision 8748)
+++ src/images/SkImageDecoder_libwebp.cpp (working copy)
@@ -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 @@
(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()) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698