Merge pull request SDWebImage#1268 from izackp/patch-1

mythodeia · mythodeia · commit 5a5c65d7996c · 2015-08-21T18:53:35.000+03:00
Fix unsupported colorspace issue.
diff --git a/SDWebImage/SDWebImageDecoder.m b/SDWebImage/SDWebImageDecoder.m
@@ -29,25 +29,29 @@ + (UIImage *)decodedImageWithImage:(UIImage *)image {
     size_t width = CGImageGetWidth(imageRef);
     size_t height = CGImageGetHeight(imageRef);
 
-    // default RGB
-    CGColorSpaceRef RGBcolorSpace = CGColorSpaceCreateDeviceRGB();
-
     // current
     CGColorSpaceModel imageColorSpaceModel = CGColorSpaceGetModel(CGImageGetColorSpace(imageRef));
+    CGColorSpaceRef colorspaceRef = CGImageGetColorSpace(imageRef);
+    
+    bool unsupportedColorSpace = (imageColorSpaceModel == 0 || imageColorSpaceModel == -1 || imageColorSpaceModel == kCGColorSpaceModelIndexed);
+    if (unsupportedColorSpace)
+        colorspaceRef = CGColorSpaceCreateDeviceRGB();
 
     CGContextRef context = CGBitmapContextCreate(NULL, width,
                                                  height,
                                                  CGImageGetBitsPerComponent(imageRef),
                                                  0,
-                                                 (imageColorSpaceModel == 0 || imageColorSpaceModel == -1) ? RGBcolorSpace : CGImageGetColorSpace(imageRef),
+                                                 colorspaceRef,
                                                  kCGBitmapByteOrderDefault | kCGImageAlphaPremultipliedFirst);
 
     // Draw the image into the context and retrieve the new image, which will now have an alpha layer
     CGContextDrawImage(context, CGRectMake(0, 0, width, height), imageRef);
     CGImageRef imageRefWithAlpha = CGBitmapContextCreateImage(context);
     UIImage *imageWithAlpha = [UIImage imageWithCGImage:imageRefWithAlpha];
 
-    CGColorSpaceRelease(RGBcolorSpace);
+    if (unsupportedColorSpace)
+        CGColorSpaceRelease(colorspaceRef);
+    
     CGContextRelease(context);
     CGImageRelease(imageRefWithAlpha);
     
