signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

Respond to CR.

Browse Source
This commit is contained in:
Matthew Chen 2018-09-06 15:59:19 -04:00
parent a2fe4dbe39
commit 9fefdd2e2c
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
SignalServiceKit/src/Util/NSData+Image.m
View File

@ -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) {