Ticket #58552: CGFloat@Leopard-2.patch

src/hb-coretext.

@@ -40 +40 @@
 HB_BEGIN_DECLS
 
 
+/* The macOS macro `ABS` should be equivalent, but I can't figure out
+   which header to include to get that macro. */
+#if CGFLOAT_IS_DOUBLE
+#define hb_CGFloat_abs(x) fabs(x)
+#else
+#define hb_CGFloat_abs(x) fabsf(x)
+#endif
+
 #define HB_CORETEXT_TAG_MORT HB_TAG('m','o','r','t')
 #define HB_CORETEXT_TAG_MORX HB_TAG('m','o','r','x')
 #define HB_CORETEXT_TAG_KERX HB_TAG('k','e','r','x')

src/hb-coretext.

@@ -54 +54 @@
    *
    * https://developer.apple.com/library/content/documentation/GraphicsAnimation/Conceptual/HighResolutionOSX/Explained/Explained.html
    */
-  ptem *= 96.f / 72.f;
+  ptem *= ((CGFloat) 96.f) / ((CGFloat) 72.f);
   return (CGFloat) (ptem <= 0.f ? HB_CORETEXT_DEFAULT_FONT_SIZE : ptem);
 }
 static float
 coretext_font_size_to_ptem (CGFloat size)
 {
-  size *= 72. / 96.;
+  size *= ((CGFloat) 72.) / ((CGFloat) 96.);
   return size <= 0 ? 0 : size;
 }
 
@@ -341 +341 @@
   const hb_coretext_font_data_t *data = font->data.coretext;
   if (unlikely (!data)) return nullptr;
 
-  if (fabs (CTFontGetSize((CTFontRef) data) - coretext_font_size_from_ptem (font->ptem)) > .5)
+  if (hb_CGFloat_abs (CTFontGetSize((CTFontRef) data) - coretext_font_size_from_ptem (font->ptem)) > (CGFloat) .5)
   {
     /* XXX-MT-bug
      * Note that evaluating condition above can be dangerous if another thread
@@ -1018 +1018 @@
         hb_glyph_info_t *info = run_info;
         if (HB_DIRECTION_IS_HORIZONTAL (buffer->props.direction))
         {
-          hb_position_t x_offset = (positions[0].x - advances_so_far) * x_mult;
+          hb_position_t x_offset = (positions[0].x - ((CGFloat) advances_so_far)) * x_mult;
           for (unsigned int j = 0; j < num_glyphs; j++)
           {
-            double advance;
+            CGFloat advance;
             if (likely (j + 1 < num_glyphs))
               advance = positions[j + 1].x - positions[j].x;
             else /* last glyph */
-              advance = run_advance - (positions[j].x - positions[0].x);
+              advance = ((CGFloat) run_advance) - (positions[j].x - positions[0].x);
             info->mask = advance * x_mult;
             info->var1.i32 = x_offset;
             info->var2.i32 = positions[j].y * y_mult;
@@ -1034 +1034 @@
         }
         else
         {
-          hb_position_t y_offset = (positions[0].y - advances_so_far) * y_mult;
+          hb_position_t y_offset = (positions[0].y - ((CGFloat) advances_so_far)) * y_mult;
           for (unsigned int j = 0; j < num_glyphs; j++)
           {
-            double advance;
+            CGFloat advance;
             if (likely (j + 1 < num_glyphs))
               advance = positions[j + 1].y - positions[j].y;
             else /* last glyph */
-              advance = run_advance - (positions[j].y - positions[0].y);
+              advance = ((CGFloat) run_advance) - (positions[j].y - positions[0].y);
             info->mask = advance * y_mult;
             info->var1.i32 = positions[j].x * x_mult;
             info->var2.i32 = y_offset;