From 1c6088872ab84b139721b45d2b1f05474fc7bbe1 Mon Sep 17 00:00:00 2001 From: "Darryl H. Thomas" Date: Tue, 18 Jun 2013 15:53:18 -0700 Subject: [PATCH] Allow fallback to generic image loading when PNG/JPEG-specific loads fail. --- AFNetworking/AFImageRequestOperation.m | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/AFNetworking/AFImageRequestOperation.m b/AFNetworking/AFImageRequestOperation.m index 2154124..321c4b7 100644 --- a/AFNetworking/AFImageRequestOperation.m +++ b/AFNetworking/AFImageRequestOperation.m @@ -49,7 +49,7 @@ static UIImage * AFInflatedImageFromResponseWithDataAtScale(NSHTTPURLResponse *r return nil; } - CGImageRef imageRef; + CGImageRef imageRef = nil; CGDataProviderRef dataProvider = CGDataProviderCreateWithCFData((__bridge CFDataRef)data); @@ -58,7 +58,9 @@ static UIImage * AFInflatedImageFromResponseWithDataAtScale(NSHTTPURLResponse *r imageRef = CGImageCreateWithPNGDataProvider(dataProvider, NULL, true, kCGRenderingIntentDefault); } else if ([contentTypes containsObject:@"image/jpeg"]) { imageRef = CGImageCreateWithJPEGDataProvider(dataProvider, NULL, true, kCGRenderingIntentDefault); - } else { + } + + if (!imageRef) { UIImage *image = AFImageWithDataAtScale(data, scale); if (image.images) { CGDataProviderRelease(dataProvider);