summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Reed <reed@google.com>2010-01-20 13:17:49 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-01-20 13:17:49 -0800
commit9f954cf27e9e2bb94c836b1686c0e07500234b27 (patch)
treeb7b19d7912dc3387c7a8c86580d04b1b42149324
parent8c166512a7e6ffaf87e41cd3a85d55993648fe9b (diff)
parent1e1a7a5017ae54af144e7c7bd6ff7a2cd87146cd (diff)
downloadframeworks_base-9f954cf27e9e2bb94c836b1686c0e07500234b27.zip
frameworks_base-9f954cf27e9e2bb94c836b1686c0e07500234b27.tar.gz
frameworks_base-9f954cf27e9e2bb94c836b1686c0e07500234b27.tar.bz2
Merge "Do not merge" into eclair
-rw-r--r--core/jni/android/graphics/Typeface.cpp2
1 files changed, 1 insertions, 1 deletions
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 SkTypeface* Typeface_createFromTypeface(JNIEnv* env, jobject, SkTypeface*
}
static void Typeface_unref(JNIEnv* env, jobject obj, SkTypeface* face) {
- face->unref();
+ SkSafeUnref(face);
}
static int Typeface_getStyle(JNIEnv* env, jobject obj, SkTypeface* face) {