diff options
| author | Mike Klein <mtklein@google.com> | 2013-08-29 11:15:06 -0400 |
|---|---|---|
| committer | Mike Klein <mtklein@google.com> | 2013-08-29 11:15:06 -0400 |
| commit | f5b43bdc6231df8b646d5bbb215e639230f37260 (patch) | |
| tree | d0c75efd0b2a5f74d28c00602462110837bf2d4c | |
| parent | c882eb73e6cf1520f9359f84a69efc8704bfd1a7 (diff) | |
| download | frameworks_base-f5b43bdc6231df8b646d5bbb215e639230f37260.zip frameworks_base-f5b43bdc6231df8b646d5bbb215e639230f37260.tar.gz frameworks_base-f5b43bdc6231df8b646d5bbb215e639230f37260.tar.bz2 | |
SkTScopedPtr -> SkAutoTDelete in Android
Change-Id: I8f0312f34e112d302b05852c31308a43967e7a3f
| -rw-r--r-- | core/jni/android/graphics/BitmapRegionDecoder.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/core/jni/android/graphics/BitmapRegionDecoder.cpp b/core/jni/android/graphics/BitmapRegionDecoder.cpp index 8867a11..cbb9b92 100644 --- a/core/jni/android/graphics/BitmapRegionDecoder.cpp +++ b/core/jni/android/graphics/BitmapRegionDecoder.cpp @@ -29,7 +29,6 @@ #include "CreateJavaOutputStreamAdaptor.h" #include "Utils.h" #include "JNIHelp.h" -#include "SkTScopedPtr.h" #include <android_runtime/AndroidRuntime.h> #include "android_util_Binder.h" @@ -238,7 +237,7 @@ static jobject nativeDecodeRegion(JNIEnv* env, jobject, SkBitmapRegionDecoder *b region.fRight = start_x + width; region.fBottom = start_y + height; SkBitmap* bitmap = NULL; - SkTScopedPtr<SkBitmap> adb; + SkAutoTDelete<SkBitmap> adb; if (tileBitmap != NULL) { // Re-use bitmap. @@ -269,7 +268,7 @@ static jobject nativeDecodeRegion(JNIEnv* env, jobject, SkBitmapRegionDecoder *b } // detach bitmap from its autodeleter, since we want to own it now - adb.release(); + adb.detach(); JavaPixelAllocator* allocator = (JavaPixelAllocator*) decoder->getAllocator(); jbyteArray buff = allocator->getStorageObjAndReset(); |