Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am cf4c7bdd: Merge "Fix whitespace issues after casts."

Browse Source 
* commit 'cf4c7bdd1c108345596ebf77ab9c853da9235de5':
  Fix whitespace issues after casts.
This commit is contained in:
Elliott Hughes
2013-10-18 12:07:52 -07:00
committed by Android Git Automerger
parent 4a5b3f0ad0 cf4c7bdd1c
commit 2ec939bac6
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/jni/android/graphics/Graphics.cpp
View File

@@ -495,7 +495,7 @@ jbyteArray GraphicsJNI::allocateJavaPixelRef(JNIEnv* env, SkBitmap* bitmap,
gVMRuntime_newNonMovableArray, gVMRuntime_newNonMovableArray,
gByte_class, size); gByte_class, size);
if (arrayObj) { if (arrayObj) {
jbyte* addr = (jbyte*)env->CallLongMethod(gVMRuntime, gVMRuntime_addressOf, arrayObj); jbyte* addr = (jbyte*) env->CallLongMethod(gVMRuntime, gVMRuntime_addressOf, arrayObj);
if (addr) { if (addr) {
SkPixelRef* pr = new AndroidPixelRef(env, (void*) addr, size, arrayObj, ctable); SkPixelRef* pr = new AndroidPixelRef(env, (void*) addr, size, arrayObj, ctable);
bitmap->setPixelRef(pr)->unref(); bitmap->setPixelRef(pr)->unref();
@@ -552,7 +552,7 @@ static jclass make_globalref(JNIEnv* env, const char classname[])
{ {
jclass c = env->FindClass(classname); jclass c = env->FindClass(classname);
SkASSERT(c); SkASSERT(c);
return (jclass)env->NewGlobalRef(c); return (jclass) env->NewGlobalRef(c);
} }
static jfieldID getFieldIDCheck(JNIEnv* env, jclass clazz, static jfieldID getFieldIDCheck(JNIEnv* env, jclass clazz,
@@ -614,7 +614,7 @@ int register_android_graphics_Graphics(JNIEnv* env)
"(II)V"); "(II)V");
c = env->FindClass("java/lang/Byte"); c = env->FindClass("java/lang/Byte");
gByte_class = (jclass)env->NewGlobalRef( gByte_class = (jclass) env->NewGlobalRef(
env->GetStaticObjectField(c, env->GetStaticFieldID(c, "TYPE", "Ljava/lang/Class;"))); env->GetStaticObjectField(c, env->GetStaticFieldID(c, "TYPE", "Ljava/lang/Class;")));
gVMRuntime_class = make_globalref(env, "dalvik/system/VMRuntime"); gVMRuntime_class = make_globalref(env, "dalvik/system/VMRuntime");