| commit | 1e1a7a5017ae54af144e7c7bd6ff7a2cd87146cd | [log] [tgz] |
|---|---|---|
| author | Mike Reed <reed@google.com> | Tue Jan 19 16:38:53 2010 -0500 |
| committer | Mike Reed <reed@google.com> | Tue Jan 19 16:40:31 2010 -0500 |
| tree | 3f0f57d553b15b0b2bf613a70fb99154f213b9b9 | |
| parent | 88e653f6653aeb237631681f6700f0e572779617 [diff] |
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
diff --git a/core/jni/android/graphics/Typeface.cpp b/core/jni/android/graphics/Typeface.cpp index 238ece1..7c7bfeb 100644 --- a/core/jni/android/graphics/Typeface.cpp +++ b/core/jni/android/graphics/Typeface.cpp
@@ -46,7 +46,7 @@ } static void Typeface_unref(JNIEnv* env, jobject obj, SkTypeface* face) { - face->unref(); + SkSafeUnref(face); } static int Typeface_getStyle(JNIEnv* env, jobject obj, SkTypeface* face) {