if CG fails to decode an image, check to see if it was a problem in the colorspace
git-svn-id: http://skia.googlecode.com/svn/trunk@6830 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/ports/SkImageDecoder_CG.cpp b/src/ports/SkImageDecoder_CG.cpp
index d687003..afe4cf4 100644
--- a/src/ports/SkImageDecoder_CG.cpp
+++ b/src/ports/SkImageDecoder_CG.cpp
@@ -82,8 +82,13 @@
// use the same colorspace, so we don't change the pixels at all
CGColorSpaceRef cs = CGImageGetColorSpace(image);
- CGContextRef cg = CGBitmapContextCreate(bm->getPixels(), width, height,
- 8, bm->rowBytes(), cs, BITMAP_INFO);
+ CGContextRef cg = CGBitmapContextCreate(bm->getPixels(), width, height, 8, bm->rowBytes(), cs, BITMAP_INFO);
+ if (NULL == cg) {
+ // perhaps the image's colorspace does not work for a context, so try just rgb
+ cs = CGColorSpaceCreateDeviceRGB();
+ cg = CGBitmapContextCreate(bm->getPixels(), width, height, 8, bm->rowBytes(), cs, BITMAP_INFO);
+ CFRelease(cs);
+ }
CGContextDrawImage(cg, CGRectMake(0, 0, width, height), image);
CGContextRelease(cg);