Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am a2c6209f: Merge "Update SkTypeface::CreateFromName to handle NULL if familyName does not match" into klp-dev

Browse Source 
* commit 'a2c6209f6120d300cd28d97ec868b5cabb3ee1a9':
  Update SkTypeface::CreateFromName to handle NULL if familyName does not match
This commit is contained in:
Derek Sollenberger
2013-09-19 10:57:00 -07:00
committed by Android Git Automerger
parent be64336477 a2c6209f61
commit 23b7bc1b44
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/jni/android/graphics/Typeface.cpp
View File

@@ -29,15 +29,17 @@ private:
static SkTypeface* Typeface_create(JNIEnv* env, jobject, jstring name,
SkTypeface::Style style) {
SkTypeface* face;
SkTypeface* face = NULL;
if (NULL == name) {
face = SkTypeface::CreateFromName(NULL, (SkTypeface::Style)style);
}
else {
if (NULL != name) {
AutoJavaStringToUTF8 str(env, name);
face = SkTypeface::CreateFromName(str.c_str(), style);
}
// return the default font at the best style if no exact match exists
if (NULL == face) {
face = SkTypeface::CreateFromName(NULL, style);
}
return face;
}