diff options
| author | John Reck <jreck@google.com> | 2015-04-20 22:06:31 +0000 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2015-04-20 22:06:31 +0000 |
| commit | edc22fba5921f5c2d3502727e707f959b8c3a460 (patch) | |
| tree | 947113958a48609f55d003e2735739727b6cc70f /core/jni/android/graphics/GraphicsJNI.h | |
| parent | a771b9861d11671c780092d35c0062eeefcf37c0 (diff) | |
| download | frameworks_base-edc22fba5921f5c2d3502727e707f959b8c3a460.zip frameworks_base-edc22fba5921f5c2d3502727e707f959b8c3a460.tar.gz frameworks_base-edc22fba5921f5c2d3502727e707f959b8c3a460.tar.bz2 | |
Revert "Change how Java Bitmaps are accessed in a few places"
Bug: 20207616
This reverts commit a771b9861d11671c780092d35c0062eeefcf37c0.
Change-Id: Ifd891cc075274a7986e987229e0fed5a04ed9ff0
Diffstat (limited to 'core/jni/android/graphics/GraphicsJNI.h')
| -rw-r--r-- | core/jni/android/graphics/GraphicsJNI.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/core/jni/android/graphics/GraphicsJNI.h b/core/jni/android/graphics/GraphicsJNI.h index 49def13..422d3f1 100644 --- a/core/jni/android/graphics/GraphicsJNI.h +++ b/core/jni/android/graphics/GraphicsJNI.h @@ -48,9 +48,7 @@ public: static void point_to_jpointf(const SkPoint& point, JNIEnv*, jobject jpointf); static SkCanvas* getNativeCanvas(JNIEnv*, jobject canvas); - static SkBitmap* getSkBitmapDeprecated(JNIEnv*, jobject bitmap); - static void getSkBitmap(JNIEnv*, jobject bitmap, SkBitmap* outBitmap); - static SkPixelRef* getSkPixelRef(JNIEnv*, jobject bitmap); + static SkBitmap* getSkBitmap(JNIEnv*, jobject bitmap); static SkRegion* getNativeRegion(JNIEnv*, jobject region); // Given the 'native' long held by the Rasterizer.java object, return a |