From a747f7c47f22ea35ba2951422d10cfda6b5ba2d3 Mon Sep 17 00:00:00 2001
From: ed <eddavies95@gmail.com>
Date: Tue, 27 Apr 2021 09:56:11 +0100
Subject: [PATCH] CoreGraphics:  Added convertToPointFloat() helper

---
 modules/juce_graphics/native/juce_mac_CoreGraphicsHelpers.h | 6 ++++++
 modules/juce_graphics/native/juce_mac_Fonts.mm              | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/modules/juce_graphics/native/juce_mac_CoreGraphicsHelpers.h b/modules/juce_graphics/native/juce_mac_CoreGraphicsHelpers.h
index d4fa0c3cb5..93ad32f82c 100644
--- a/modules/juce_graphics/native/juce_mac_CoreGraphicsHelpers.h
+++ b/modules/juce_graphics/native/juce_mac_CoreGraphicsHelpers.h
@@ -47,6 +47,12 @@ namespace
         return CGRectMake ((CGFloat) r.getX(), (CGFloat) r.getY(), (CGFloat) r.getWidth(), (CGFloat) r.getHeight());
     }
 
+    template <class PointType>
+    Point<float> convertToPointFloat (PointType p) noexcept
+    {
+        return { (float) p.x, (float) p.y };
+    }
+
     template <typename PointType>
     CGPoint convertToCGPoint (PointType p) noexcept
     {
diff --git a/modules/juce_graphics/native/juce_mac_Fonts.mm b/modules/juce_graphics/native/juce_mac_Fonts.mm
index c54e0144c8..583dd916f0 100644
--- a/modules/juce_graphics/native/juce_mac_Fonts.mm
+++ b/modules/juce_graphics/native/juce_mac_Fonts.mm
@@ -491,8 +491,8 @@ namespace CoreTextTypeLayout
                 const Positions positions (run, (size_t) numGlyphs);
 
                 for (CFIndex k = 0; k < numGlyphs; ++k)
-                    glyphRun->glyphs.add (TextLayout::Glyph (glyphs.glyphs[k], Point<float> ((float) positions.points[k].x,
-                                                                                             (float) positions.points[k].y),
+                    glyphRun->glyphs.add (TextLayout::Glyph (glyphs.glyphs[k],
+                                                             convertToPointFloat (positions.points[k]),
                                                              (float) advances.advances[k].width));
             }