From e80c86ffa6868f8bbcfd3a21b4b82a1436527100 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Wed, 4 Aug 2021 10:24:14 -0600 Subject: [PATCH] [coretext] Fix formatting --- src/hb-coretext.cc | 69 +++++++++++++++++++++++++--------------------- 1 file changed, 37 insertions(+), 32 deletions(-) diff --git a/src/hb-coretext.cc b/src/hb-coretext.cc index 1d9348dd5..4b6c67c1e 100644 --- a/src/hb-coretext.cc +++ b/src/hb-coretext.cc @@ -332,38 +332,43 @@ _hb_coretext_shaper_font_data_create (hb_font_t *font) return nullptr; } - if (font->coords) { - hb_ot_var_axis_info_t info; - unsigned int c = 1; - CFMutableDictionaryRef variations = CFDictionaryCreateMutable (kCFAllocatorDefault, - font->num_coords, - &kCFTypeDictionaryKeyCallBacks, - &kCFTypeDictionaryValueCallBacks); - - for (unsigned int i=0; i < font->num_coords; i++) - { - if (font->coords[i] == 0) continue; - hb_ot_var_get_axis_infos (font->face, i, &c, &info); - CFDictionarySetValue(variations, - CFNumberCreate (kCFAllocatorDefault, kCFNumberIntType, &info.tag), - CFNumberCreate (kCFAllocatorDefault, kCFNumberFloatType, &font->design_coords[i]) - ); - } - - CFDictionaryRef attributes = CFDictionaryCreate (kCFAllocatorDefault, - (const void **) &kCTFontVariationAttribute, - (const void **) &variations, - 1, - &kCFTypeDictionaryKeyCallBacks, - &kCFTypeDictionaryValueCallBacks); - - CTFontDescriptorRef varDesc = CTFontDescriptorCreateWithAttributes(attributes); - CTFontRef new_ct_font = CTFontCreateCopyWithAttributes(ct_font, 0, nullptr, varDesc); - CFRelease (ct_font); - CFRelease (attributes); - CFRelease (variations); - ct_font = new_ct_font; - } + if (font->coords) + { + CFMutableDictionaryRef variations = + CFDictionaryCreateMutable (kCFAllocatorDefault, + font->num_coords, + &kCFTypeDictionaryKeyCallBacks, + &kCFTypeDictionaryValueCallBacks); + + for (unsigned i = 0; i < font->num_coords; i++) + { + if (font->coords[i] == 0.) continue; + + hb_ot_var_axis_info_t info; + unsigned int c = 1; + hb_ot_var_get_axis_infos (font->face, i, &c, &info); + CFDictionarySetValue (variations, + CFNumberCreate (kCFAllocatorDefault, kCFNumberIntType, &info.tag), + CFNumberCreate (kCFAllocatorDefault, kCFNumberFloatType, &font->design_coords[i]) + ); + } + + CFDictionaryRef attributes = + CFDictionaryCreate (kCFAllocatorDefault, + (const void **) &kCTFontVariationAttribute, + (const void **) &variations, + 1, + &kCFTypeDictionaryKeyCallBacks, + &kCFTypeDictionaryValueCallBacks); + + CTFontDescriptorRef varDesc = CTFontDescriptorCreateWithAttributes (attributes); + CTFontRef new_ct_font = CTFontCreateCopyWithAttributes (ct_font, 0, nullptr, varDesc); + + CFRelease (ct_font); + CFRelease (attributes); + CFRelease (variations); + ct_font = new_ct_font; + } return (hb_coretext_font_data_t *) ct_font; }