diff options
| author | Narayan Kamath <narayan@google.com> | 2014-01-16 15:57:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-16 15:57:47 +0000 |
| commit | 6606d16e097480e061546306cc95a729f5dccae8 (patch) | |
| tree | 8eec8ce5ec5dc334c1ca01d45a5f63ce944673cd /core/jni/android/graphics/Graphics.cpp | |
| parent | a3340da7d4ef3872bd1191fcd4bf8b25d1179a25 (diff) | |
| parent | 6706888e24aee04c2c914c44e5ef5b1510cf8013 (diff) | |
| download | frameworks_base-6606d16e097480e061546306cc95a729f5dccae8.zip frameworks_base-6606d16e097480e061546306cc95a729f5dccae8.tar.gz frameworks_base-6606d16e097480e061546306cc95a729f5dccae8.tar.bz2 | |
am 6706888e: am 775667c0: am 03e8be75: am 8796ab7f: am bb35356d: Merge changes Id54087dd,I946325e4,I2a2b2e68
* commit '6706888e24aee04c2c914c44e5ef5b1510cf8013':
AArch64: Use long for pointers in BitmapRegionDecoder
AArch64: Use long for pointers in Movie class
AArch64: Add AssetInputStream.getNativeAsset
Diffstat (limited to 'core/jni/android/graphics/Graphics.cpp')
| -rw-r--r-- | core/jni/android/graphics/Graphics.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/jni/android/graphics/Graphics.cpp b/core/jni/android/graphics/Graphics.cpp index c5c0eee..2a2db57 100644 --- a/core/jni/android/graphics/Graphics.cpp +++ b/core/jni/android/graphics/Graphics.cpp @@ -412,7 +412,7 @@ jobject GraphicsJNI::createBitmapRegionDecoder(JNIEnv* env, SkBitmapRegionDecode jobject obj = env->NewObject(gBitmapRegionDecoder_class, gBitmapRegionDecoder_constructorMethodID, - static_cast<jint>(reinterpret_cast<uintptr_t>(bitmap))); + reinterpret_cast<jlong>(bitmap)); hasException(env); // For the side effect of logging. return obj; } @@ -671,7 +671,7 @@ int register_android_graphics_Graphics(JNIEnv* env) gBitmap_reinitMethodID = env->GetMethodID(gBitmap_class, "reinit", "(IIZ)V"); gBitmap_getAllocationByteCountMethodID = env->GetMethodID(gBitmap_class, "getAllocationByteCount", "()I"); gBitmapRegionDecoder_class = make_globalref(env, "android/graphics/BitmapRegionDecoder"); - gBitmapRegionDecoder_constructorMethodID = env->GetMethodID(gBitmapRegionDecoder_class, "<init>", "(I)V"); + gBitmapRegionDecoder_constructorMethodID = env->GetMethodID(gBitmapRegionDecoder_class, "<init>", "(J)V"); gBitmapConfig_class = make_globalref(env, "android/graphics/Bitmap$Config"); gBitmapConfig_nativeInstanceID = getFieldIDCheck(env, gBitmapConfig_class, |