Merge pull request #4617 from mdehoon/fixForIssue4609

tacaswell · tacaswell · commit 14d890490dd9 · 2015-07-11T00:50:39.000-04:00
Fix: text background color on OSX + py3k
diff --git a/src/_macosx.m b/src/_macosx.m
@@ -2648,7 +2648,6 @@ static CGFloat _get_device_scale(CGContextRef cr)
     const char* italic;
     float angle;
     CTFontRef font;
-    CGColorRef color;
     CGFloat descent;
 #if PY33
     const char* text;
@@ -2697,22 +2696,16 @@ static CGFloat _get_device_scale(CGContextRef cr)
         return NULL;
     }
 
-    color = CGColorCreateGenericRGB(self->color[0],
-                                    self->color[1],
-                                    self->color[2],
-                                    self->color[3]);
-
     keys[0] = kCTFontAttributeName;
-    keys[1] = kCTForegroundColorAttributeName;
+    keys[1] = kCTForegroundColorFromContextAttributeName;
     values[0] = font;
-    values[1] = color;
+    values[1] = kCFBooleanTrue;
     CFDictionaryRef attributes = CFDictionaryCreate(kCFAllocatorDefault,
                                         (const void**)&keys,
                                         (const void**)&values,
                                         2,
                                         &kCFTypeDictionaryKeyCallBacks,
                                         &kCFTypeDictionaryValueCallBacks);
-    CGColorRelease(color);
     CFRelease(font);
 
     CFAttributedStringRef string = CFAttributedStringCreate(kCFAllocatorDefault,
