From 9fefdd2e2c6e59f39b256c5ac2ae5d77f19fff01 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 6 Sep 2018 15:59:19 -0400 Subject: [PATCH] Respond to CR. --- SignalServiceKit/src/Util/NSData+Image.m | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/SignalServiceKit/src/Util/NSData+Image.m b/SignalServiceKit/src/Util/NSData+Image.m index 0a7773de9..ab1e0a568 100644 --- a/SignalServiceKit/src/Util/NSData+Image.m +++ b/SignalServiceKit/src/Util/NSData+Image.m @@ -42,7 +42,7 @@ typedef NS_ENUM(NSInteger, ImageFormat) { return NO; } - if (![self ows_hasValidImageDimensions:isAnimated]) { + if (![self ows_hasValidImageDimensionsWithIsAnimated:isAnimated]) { return NO; } @@ -65,9 +65,8 @@ typedef NS_ENUM(NSInteger, ImageFormat) { return NO; } - BOOL isAnimated = NO; - if ([MIMETypeUtil isSupportedAnimatedMIMEType:mimeType]) { - isAnimated = YES; + BOOL isAnimated = [MIMETypeUtil isSupportedAnimatedMIMEType:mimeType]; + if (isAnimated) { if (fileSize.unsignedIntegerValue > OWSMediaUtils.kMaxFileSizeAnimatedImage) { DDLogWarn(@"Oversize animated image."); return NO; @@ -101,7 +100,7 @@ typedef NS_ENUM(NSInteger, ImageFormat) { return YES; } -- (BOOL)ows_hasValidImageDimensions:(BOOL)isAnimated +- (BOOL)ows_hasValidImageDimensionsWithIsAnimated:(BOOL)isAnimated { CGImageSourceRef imageSource = CGImageSourceCreateWithData((__bridge CFDataRef)self, NULL); if (imageSource == NULL) {