aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Third2017-08-31 20:42:35 +0100
committerAlan Third2017-08-31 20:44:59 +0100
commite6a2b4c2df96ed8780ff407481a18e3f4299c8ad (patch)
treed2eacedb00a9a1f56e8fe3a25841e01b9d93da64
parent5fe41a23d811b17bcde0921b37b89175806c83ef (diff)
downloademacs-e6a2b4c2df96ed8780ff407481a18e3f4299c8ad.tar.gz
emacs-e6a2b4c2df96ed8780ff407481a18e3f4299c8ad.zip
Remove unneeded version checks (bug#28222)
* src/macfont.h (CGContextSetFontSmoothingStyle): Remove version check. * src/macfont.m (macfont_draw): Remove version check, and test for existence of CGContextSetFontSmoothingStyle.
-rw-r--r--src/macfont.h5
-rw-r--r--src/macfont.m5
2 files changed, 2 insertions, 8 deletions
diff --git a/src/macfont.h b/src/macfont.h
index 3a66d2d005a..909336cdbad 100644
--- a/src/macfont.h
+++ b/src/macfont.h
@@ -83,9 +83,6 @@ extern void mac_register_font_driver (struct frame *f);
83extern void *macfont_get_nsctfont (struct font *font); 83extern void *macfont_get_nsctfont (struct font *font);
84extern void macfont_update_antialias_threshold (void); 84extern void macfont_update_antialias_threshold (void);
85 85
86#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 86/* This is an undocumented function. */
87/* This is an undocumented function that is probably not available
88 pre-10.8. */
89extern void CGContextSetFontSmoothingStyle(CGContextRef, int) 87extern void CGContextSetFontSmoothingStyle(CGContextRef, int)
90 __attribute__((weak_import)); 88 __attribute__((weak_import));
91#endif
diff --git a/src/macfont.m b/src/macfont.m
index 33c28f7349a..59891353cd3 100644
--- a/src/macfont.m
+++ b/src/macfont.m
@@ -2888,14 +2888,11 @@ macfont_draw (struct glyph_string *s, int from, int to, int x, int y,
2888 if (no_antialias_p) 2888 if (no_antialias_p)
2889 CGContextSetShouldAntialias (context, false); 2889 CGContextSetShouldAntialias (context, false);
2890 2890
2891#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 2891 if (!NILP (ns_use_thin_smoothing))
2892 if (!NILP (ns_use_thin_smoothing)
2893 && CGContextSetFontSmoothingStyle != NULL)
2894 { 2892 {
2895 CGContextSetShouldSmoothFonts(context, YES); 2893 CGContextSetShouldSmoothFonts(context, YES);
2896 CGContextSetFontSmoothingStyle(context, 16); 2894 CGContextSetFontSmoothingStyle(context, 16);
2897 } 2895 }
2898#endif
2899 2896
2900 CGContextSetTextMatrix (context, atfm); 2897 CGContextSetTextMatrix (context, atfm);
2901 CGContextSetTextPosition (context, text_position.x, text_position.y); 2898 CGContextSetTextPosition (context, text_position.x, text_position.y);