From a9e25e90a4ca05746fda4a598ad698db1d2c5c1a Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Fri, 14 Mar 2014 19:55:46 -0700 Subject: [PATCH] [coretext] Add hb_coretext_face_create() Not tested. --- src/hb-coretext.cc | 55 +++++++++++++++++++++++++++++++++++++++------- src/hb-coretext.h | 4 ++++ 2 files changed, 51 insertions(+), 8 deletions(-) diff --git a/src/hb-coretext.cc b/src/hb-coretext.cc index 9031231e8..570513667 100644 --- a/src/hb-coretext.cc +++ b/src/hb-coretext.cc @@ -37,6 +37,38 @@ #endif +static void +release_table_data (void *user_data) +{ + CFDataRef cf_data = reinterpret_cast (user_data); + CFRelease(cf_data); +} + +static hb_blob_t * +reference_table (hb_face_t *face HB_UNUSED, hb_tag_t tag, void *user_data) +{ + CGFontRef cg_font = reinterpret_cast (user_data); + CFDataRef cf_data = CGFontCopyTableForTag (cg_font, tag); + if (unlikely (!cf_data)) + return NULL; + + const char *data = reinterpret_cast (CFDataGetBytePtr (cf_data)); + const size_t length = CFDataGetLength (cf_data); + if (!data || !length) + return NULL; + + return hb_blob_create (data, length, HB_MEMORY_MODE_READONLY, + reinterpret_cast (const_cast<__CFData *> (cf_data)), + release_table_data); +} + +hb_face_t * +hb_coretext_face_create (CGFontRef cg_font) +{ + return hb_face_create_for_tables (reference_table, CGFontRetain (cg_font), (hb_destroy_func_t) CGFontRelease); +} + + HB_SHAPER_DATA_ENSURE_DECLARE(coretext, face) HB_SHAPER_DATA_ENSURE_DECLARE(coretext, font) @@ -65,15 +97,22 @@ _hb_coretext_shaper_face_data_create (hb_face_t *face) if (unlikely (!data)) return NULL; - hb_blob_t *blob = hb_face_reference_blob (face); - unsigned int blob_length; - const char *blob_data = hb_blob_get_data (blob, &blob_length); - if (unlikely (!blob_length)) - DEBUG_MSG (CORETEXT, face, "Face has empty blob"); + if (face->destroy == (hb_destroy_func_t) CGFontRelease) + { + data->cg_font = CGFontRetain ((CGFontRef) face->user_data); + } + else + { + hb_blob_t *blob = hb_face_reference_blob (face); + unsigned int blob_length; + const char *blob_data = hb_blob_get_data (blob, &blob_length); + if (unlikely (!blob_length)) + DEBUG_MSG (CORETEXT, face, "Face has empty blob"); - CGDataProviderRef provider = CGDataProviderCreateWithData (blob, blob_data, blob_length, &release_data); - data->cg_font = CGFontCreateWithDataProvider (provider); - CGDataProviderRelease (provider); + CGDataProviderRef provider = CGDataProviderCreateWithData (blob, blob_data, blob_length, &release_data); + data->cg_font = CGFontCreateWithDataProvider (provider); + CGDataProviderRelease (provider); + } if (unlikely (!data->cg_font)) { DEBUG_MSG (CORETEXT, face, "Face CGFontCreateWithDataProvider() failed"); diff --git a/src/hb-coretext.h b/src/hb-coretext.h index bcf1de714..607bbbc1e 100644 --- a/src/hb-coretext.h +++ b/src/hb-coretext.h @@ -38,6 +38,10 @@ HB_BEGIN_DECLS #define HB_CORETEXT_TAG_MORX HB_TAG('m','o','r','x') +hb_face_t * +hb_coretext_face_create (CGFontRef cg_font); + + CGFontRef hb_coretext_face_get_cg_font (hb_face_t *face);