diff options
Diffstat (limited to 'skia/ext/skia_utils_mac.mm')
| -rw-r--r-- | skia/ext/skia_utils_mac.mm | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/skia/ext/skia_utils_mac.mm b/skia/ext/skia_utils_mac.mm index f181f0a..5622b5d 100644 --- a/skia/ext/skia_utils_mac.mm +++ b/skia/ext/skia_utils_mac.mm @@ -32,7 +32,7 @@ SkBitmap NSImageOrNSImageRepToSkBitmap( bitmap.setIsOpaque(is_opaque); - base::mac::ScopedCFTypeRef<CGColorSpaceRef> color_space( + base::ScopedCFTypeRef<CGColorSpaceRef> color_space( CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB)); void* data = bitmap.getPixels(); @@ -42,11 +42,14 @@ SkBitmap NSImageOrNSImageRepToSkBitmap( (SK_A32_SHIFT == (a) && SK_R32_SHIFT == (r) \ && SK_G32_SHIFT == (g) && SK_B32_SHIFT == (b)) #if defined(SK_CPU_LENDIAN) && HAS_ARGB_SHIFTS(24, 16, 8, 0) - base::mac::ScopedCFTypeRef<CGContextRef> context( - CGBitmapContextCreate(data, size.width, size.height, 8, size.width*4, - color_space, - kCGImageAlphaPremultipliedFirst | - kCGBitmapByteOrder32Host)); + base::ScopedCFTypeRef<CGContextRef> context(CGBitmapContextCreate( + data, + size.width, + size.height, + 8, + size.width * 4, + color_space, + kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host)); #else #error We require that Skia's and CoreGraphics's recommended \ image memory layout match. @@ -212,7 +215,7 @@ SkBitmap NSImageRepToSkBitmap( } NSBitmapImageRep* SkBitmapToNSBitmapImageRep(const SkBitmap& skiaBitmap) { - base::mac::ScopedCFTypeRef<CGColorSpaceRef> color_space( + base::ScopedCFTypeRef<CGColorSpaceRef> color_space( CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB)); return SkBitmapToNSBitmapImageRepWithColorSpace(skiaBitmap, color_space); } @@ -221,7 +224,7 @@ NSBitmapImageRep* SkBitmapToNSBitmapImageRepWithColorSpace( const SkBitmap& skiaBitmap, CGColorSpaceRef colorSpace) { // First convert SkBitmap to CGImageRef. - base::mac::ScopedCFTypeRef<CGImageRef> cgimage( + base::ScopedCFTypeRef<CGImageRef> cgimage( SkCreateCGImageRefWithColorspace(skiaBitmap, colorSpace)); // Now convert to NSBitmapImageRep. @@ -243,7 +246,7 @@ NSImage* SkBitmapToNSImageWithColorSpace(const SkBitmap& skiaBitmap, } NSImage* SkBitmapToNSImage(const SkBitmap& skiaBitmap) { - base::mac::ScopedCFTypeRef<CGColorSpaceRef> colorSpace( + base::ScopedCFTypeRef<CGColorSpaceRef> colorSpace( CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB)); return SkBitmapToNSImageWithColorSpace(skiaBitmap, colorSpace.get()); } @@ -363,7 +366,7 @@ CGContextRef SkiaBitLocker::cgContext() { bitmap_.allocPixels(); bitmap_.eraseColor(0); } - base::mac::ScopedCFTypeRef<CGColorSpaceRef> colorSpace( + base::ScopedCFTypeRef<CGColorSpaceRef> colorSpace( CGColorSpaceCreateDeviceRGB()); cgContext_ = CGBitmapContextCreate(bitmap_.getPixels(), bitmap_.width(), bitmap_.height(), 8, bitmap_.rowBytes(), colorSpace, |