Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e1a7a50 authored by Mike Reed's avatar Mike Reed
Browse files

Do not merge 

roll 1-line fix from master here. Fixes crasher when apps use custom fonts

fixes http://code.google.com/p/android/issues/detail?id=6030
parent 88e653f6

core/jni/android/graphics/Typeface.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -46,7 +46,7 @@ static SkTypeface* Typeface_createFromTypeface(JNIEnv* env, jobject, SkTypeface* 
}

}

 

 

static void Typeface_unref(JNIEnv* env, jobject obj, SkTypeface* face) {

static void Typeface_unref(JNIEnv* env, jobject obj, SkTypeface* face) {

    face->unref();

    SkSafeUnref(face);

}

}





static int Typeface_getStyle(JNIEnv* env, jobject obj, SkTypeface* face) {

static int Typeface_getStyle(JNIEnv* env, jobject obj, SkTypeface* face) {