diff options
| author | Narayan Kamath <narayan@google.com> | 2014-01-29 15:02:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-01-29 15:02:05 +0000 |
| commit | d228a03891f60520d517b2a3bc900b008b2da702 (patch) | |
| tree | 3dfd7ab4f6fe1fbe427bcf31561a7cc705824143 | |
| parent | d4ccffd3ba7f7c27ddfc56231cf7f2424842b1e3 (diff) | |
| parent | e3a6663bb2d006c3e8cea7c529378af862f050a6 (diff) | |
| download | frameworks_base-d228a03891f60520d517b2a3bc900b008b2da702.zip frameworks_base-d228a03891f60520d517b2a3bc900b008b2da702.tar.gz frameworks_base-d228a03891f60520d517b2a3bc900b008b2da702.tar.bz2 | |
Merge "mNativeCanvas is long, not int."
| -rw-r--r-- | core/jni/android_view_TextureView.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/android_view_TextureView.cpp b/core/jni/android_view_TextureView.cpp index b7eca8d..54f9278 100644 --- a/core/jni/android_view_TextureView.cpp +++ b/core/jni/android_view_TextureView.cpp @@ -127,7 +127,7 @@ static void android_view_TextureView_destroyNativeWindow(JNIEnv* env, jobject te static inline void swapCanvasPtr(JNIEnv* env, jobject canvasObj, SkCanvas* newCanvas) { jobject canvasFinalizerObj = env->GetObjectField(canvasObj, gCanvasClassInfo.mFinalizer); SkCanvas* previousCanvas = reinterpret_cast<SkCanvas*>( - env->GetIntField(canvasObj, gCanvasClassInfo.mNativeCanvas)); + env->GetLongField(canvasObj, gCanvasClassInfo.mNativeCanvas)); env->SetLongField(canvasObj, gCanvasClassInfo.mNativeCanvas, (jlong)newCanvas); env->SetLongField(canvasFinalizerObj, gCanvasFinalizerClassInfo.mNativeCanvas, (jlong)newCanvas); SkSafeUnref(previousCanvas); |