[cairo-commit] 2 commits - src/cairo-quartz-font.c

[GitLab Mirror]

 src/cairo-quartz-font.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 36193ec952e68dbcf81aca408f5e1c3179135180
Merge: f9de19ad7 85f021b1f
Author: Uli Schlachter <psychon at znc.in>
Date:   Thu Oct 26 16:34:41 2023 +0000

    Merge branch 'kCTFontTraitColorGlyphs' into 'master'
    
    quartz-font: Fix transposed constants
    
    Closes #810
    
    See merge request cairo/cairo!523

commit 85f021b1f10b170179c8c5f29178fd80839ec00c
Author: Ryan Schmidt <git at ryandesign.com>
Date:   Tue Oct 24 01:42:38 2023 -0500

    quartz-font: Fix transposed constants
    
    kCTFontColorGlyphsTrait is available in Mac OS X 10.7 and later.
    kCTFontTraitColorGlyphs is available in OS X 10.8 and later.
    
    Fixes build failure on Mac OS X 10.7.
    
    Closes #810

diff --git a/src/cairo-quartz-font.c b/src/cairo-quartz-font.c
index 0c868e026..621d3540c 100644
--- a/src/cairo-quartz-font.c
+++ b/src/cairo-quartz-font.c
@@ -77,10 +77,10 @@ static const CGFloat font_scale = 1.0;
 
 #if MAC_OS_X_VERSION_MIN_REQUIRED < 1080
 #define FONT_ORIENTATION_HORIZONTAL kCTFontHorizontalOrientation
-#define FONT_COLOR_GLYPHS kCTFontTraitColorGlyphs
+#define FONT_COLOR_GLYPHS kCTFontColorGlyphsTrait
 #else
 #define FONT_ORIENTATION_HORIZONTAL kCTFontOrientationHorizontal
-#define FONT_COLOR_GLYPHS kCTFontColorGlyphsTrait
+#define FONT_COLOR_GLYPHS kCTFontTraitColorGlyphs
 #endif
 
 static void