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

* commit '2ec939bac6263fefee2605d2b50136955cfcba6d':
  Fix whitespace issues after casts.
This commit is contained in:
Elliott Hughes
2013-10-18 12:11:42 -07:00
committed by Android Git Automerger

View File

@@ -548,7 +548,7 @@ jbyteArray GraphicsJNI::allocateJavaPixelRef(JNIEnv* env, SkBitmap* bitmap,
gVMRuntime_newNonMovableArray,
gByte_class, size);
if (arrayObj) {
jbyte* addr = (jbyte*)env->CallLongMethod(gVMRuntime, gVMRuntime_addressOf, arrayObj);
jbyte* addr = (jbyte*) env->CallLongMethod(gVMRuntime, gVMRuntime_addressOf, arrayObj);
if (addr) {
SkPixelRef* pr = new AndroidPixelRef(env, (void*) addr, size, arrayObj, ctable);
bitmap->setPixelRef(pr)->unref();
@@ -605,7 +605,7 @@ static jclass make_globalref(JNIEnv* env, const char classname[])
{
jclass c = env->FindClass(classname);
SkASSERT(c);
return (jclass)env->NewGlobalRef(c);
return (jclass) env->NewGlobalRef(c);
}
static jfieldID getFieldIDCheck(JNIEnv* env, jclass clazz,
@@ -668,7 +668,7 @@ int register_android_graphics_Graphics(JNIEnv* env)
"(II)V");
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;")));
gVMRuntime_class = make_globalref(env, "dalvik/system/VMRuntime");