summaryrefslogtreecommitdiffstats
path: root/core/jni/android/graphics/Camera.cpp
diff options
context:
space:
mode:
authorFlorin Malita <fmalita@google.com>2014-06-02 13:37:11 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-06-02 13:37:11 +0000
commit9ec2eabe5ae9b17064412833ae11b113da453b75 (patch)
treebe716b423b3796470c41233a6891e71f8ce5f053 /core/jni/android/graphics/Camera.cpp
parent052591143bf9345c30dec5758f211667144dcf2a (diff)
parent5c3d927e17e98e8fd4a9f3c86f7f4def0bcfa816 (diff)
downloadframeworks_base-9ec2eabe5ae9b17064412833ae11b113da453b75.zip
frameworks_base-9ec2eabe5ae9b17064412833ae11b113da453b75.tar.gz
frameworks_base-9ec2eabe5ae9b17064412833ae11b113da453b75.tar.bz2
Merge "Add a native Canvas wrapper."
Diffstat (limited to 'core/jni/android/graphics/Camera.cpp')
-rw-r--r--core/jni/android/graphics/Camera.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/jni/android/graphics/Camera.cpp b/core/jni/android/graphics/Camera.cpp
index ef57e3d..d17f46c 100644
--- a/core/jni/android/graphics/Camera.cpp
+++ b/core/jni/android/graphics/Camera.cpp
@@ -3,6 +3,8 @@
#include "SkCamera.h"
+#include "GraphicsJNI.h"
+
static jfieldID gNativeInstanceFieldID;
static void Camera_constructor(JNIEnv* env, jobject obj) {
@@ -93,7 +95,7 @@ static void Camera_getMatrix(JNIEnv* env, jobject obj, jlong matrixHandle) {
}
static void Camera_applyToCanvas(JNIEnv* env, jobject obj, jlong canvasHandle) {
- SkCanvas* native_canvas = reinterpret_cast<SkCanvas*>(canvasHandle);
+ SkCanvas* native_canvas = GraphicsJNI::getNativeCanvas(canvasHandle);
jlong viewHandle = env->GetLongField(obj, gNativeInstanceFieldID);
Sk3DView* v = reinterpret_cast<Sk3DView*>(viewHandle);
v->applyToCanvas((SkCanvas*)native_canvas);