diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-05-12 13:34:18 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-05-12 13:34:18 -0700 |
| commit | bae1ca315b27973fee8daacec482bb633a464294 (patch) | |
| tree | 1fdc53d38554da11ef39fce437a2b1345077aac6 /core/jni/android/graphics | |
| parent | 06f429edcd482a3c9bc51146d130e05e3741e2db (diff) | |
| parent | 3e3439d5ba0cf5eda060c4991219c32af917fc5b (diff) | |
| download | frameworks_base-bae1ca315b27973fee8daacec482bb633a464294.zip frameworks_base-bae1ca315b27973fee8daacec482bb633a464294.tar.gz frameworks_base-bae1ca315b27973fee8daacec482bb633a464294.tar.bz2 | |
am 3e3439d: Merge change 1478 into donut
Merge commit '3e3439d5ba0cf5eda060c4991219c32af917fc5b'
* commit '3e3439d5ba0cf5eda060c4991219c32af917fc5b':
Fixes #1847219. Add a new API to load fonts from arbitrary files: Typeface.createFromFile(String/File).
Diffstat (limited to 'core/jni/android/graphics')
| -rw-r--r-- | core/jni/android/graphics/Typeface.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/core/jni/android/graphics/Typeface.cpp b/core/jni/android/graphics/Typeface.cpp index e951431..4f23f65 100644 --- a/core/jni/android/graphics/Typeface.cpp +++ b/core/jni/android/graphics/Typeface.cpp @@ -133,6 +133,14 @@ static SkTypeface* Typeface_createFromAsset(JNIEnv* env, jobject, return SkTypeface::CreateFromStream(new AssetStream(asset, true)); } +static SkTypeface* Typeface_createFromFile(JNIEnv* env, jobject, jstring jpath) { + NPE_CHECK_RETURN_ZERO(env, jpath); + + AutoJavaStringToUTF8 str(env, jpath); + + return SkTypeface::CreateFromFile(str.c_str()); +} + /////////////////////////////////////////////////////////////////////////////// static JNINativeMethod gTypefaceMethods[] = { @@ -140,9 +148,10 @@ static JNINativeMethod gTypefaceMethods[] = { { "nativeCreateFromTypeface", "(II)I", (void*)Typeface_createFromTypeface }, { "nativeUnref", "(I)V", (void*)Typeface_unref }, { "nativeGetStyle", "(I)I", (void*)Typeface_getStyle }, - { "nativeCreateFromAsset", - "(Landroid/content/res/AssetManager;Ljava/lang/String;)I", - (void*)Typeface_createFromAsset } + { "nativeCreateFromAsset", "(Landroid/content/res/AssetManager;Ljava/lang/String;)I", + (void*)Typeface_createFromAsset }, + { "nativeCreateFromFile", "(Ljava/lang/String)I", + (void*)Typeface_createFromFile } }; int register_android_graphics_Typeface(JNIEnv* env); @@ -153,4 +162,3 @@ int register_android_graphics_Typeface(JNIEnv* env) gTypefaceMethods, SK_ARRAY_COUNT(gTypefaceMethods)); } - |