Merge pull request BradLarson#1037 from iamcam/master

Prevent CGContextDrawImage error when empty images are passed to GPUImagePicture init
iquan · Jun 25, 2013 · 58c7375 · 58c7375
2 parents aad15fb + 6b3ddd9
commit 58c7375
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/framework/Source/iOS/GPUImagePicture.m b/framework/Source/iOS/GPUImagePicture.m
@@ -67,6 +67,17 @@ - (id)initWithCGImage:(CGImageRef)newImageSource smoothlyScaleOutput:(BOOL)smoot
     // TODO: Dispatch this whole thing asynchronously to move image loading off main thread
     CGFloat widthOfImage = CGImageGetWidth(newImageSource);
     CGFloat heightOfImage = CGImageGetHeight(newImageSource);
+
+    // If passed an empty image reference, create a small 2x2 image so we don't trigger a fatal error in the future on CGContextDrawImage below
+    if( !(widthOfImage >= 1) || !(heightOfImage >= 1) ){
+        widthOfImage = heightOfImage = 2.0;
+        UIGraphicsBeginImageContextWithOptions(CGSizeMake(widthOfImage, heightOfImage), NO, 0.0);
+        UIImage *blank = UIGraphicsGetImageFromCurrentImageContext();
+        UIGraphicsEndImageContext();
+        newImageSource = blank.CGImage;
+        blank = nil;
+    }
+
     pixelSizeOfImage = CGSizeMake(widthOfImage, heightOfImage);
     CGSize pixelSizeToUseForTexture = pixelSizeOfImage;