diff options
author | Minh Nguyễn <mxn@1ec5.org> | 2017-01-11 03:08:05 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-11 03:08:05 -0800 |
commit | 581fb3849da8ce97e557bb3633b886fcc369f6cb (patch) | |
tree | 503b3a3657d59218c40712c853640032c51da169 | |
parent | b6cf87f5e763ec6849e4fe34f2dd20fc8a0d0d52 (diff) | |
download | qtlocation-mapboxgl-581fb3849da8ce97e557bb3633b886fcc369f6cb.tar.gz |
[ios, macos] Fix miscellaneous static analyzer warnings (#7670)
* [ios, macos] Fixed static analyzer warnings
Fixed static analyzer warnings in MGLNetworkConfiguration, MGLRasterSource, and MGLShape.
* [ios] Fixed static analyzer warnings
Fixed static analyzer warnings in MGLAnnotationImage.
* [macos] Fixed static analyzer warnings
Fixed static analyzer warnings in MGLAnnotationImage and NSImage(MGLAdditions).
* [ios, macos] Two pointer-equal images are object-equal by definition
-rw-r--r-- | platform/darwin/src/MGLNetworkConfiguration.m | 4 | ||||
-rw-r--r-- | platform/darwin/src/MGLRasterSource.mm | 2 | ||||
-rw-r--r-- | platform/darwin/src/MGLShape.mm | 4 | ||||
-rw-r--r-- | platform/ios/src/MGLAnnotationImage.m | 11 | ||||
-rw-r--r-- | platform/macos/src/MGLAnnotationImage.m | 8 | ||||
-rw-r--r-- | platform/macos/src/NSImage+MGLAdditions.mm | 2 |
6 files changed, 9 insertions, 22 deletions
diff --git a/platform/darwin/src/MGLNetworkConfiguration.m b/platform/darwin/src/MGLNetworkConfiguration.m index d661d9090e..82d333dc99 100644 --- a/platform/darwin/src/MGLNetworkConfiguration.m +++ b/platform/darwin/src/MGLNetworkConfiguration.m @@ -1,5 +1,4 @@ #import "MGLNetworkConfiguration.h" -#import "NSProcessInfo+MGLAdditions.h" @implementation MGLNetworkConfiguration @@ -12,9 +11,6 @@ } + (instancetype)sharedManager { - if (NSProcessInfo.processInfo.mgl_isInterfaceBuilderDesignablesAgent) { - return nil; - } static dispatch_once_t onceToken; static MGLNetworkConfiguration *_sharedManager; void (^setupBlock)() = ^{ diff --git a/platform/darwin/src/MGLRasterSource.mm b/platform/darwin/src/MGLRasterSource.mm index dbcba85d91..b52b4e3eed 100644 --- a/platform/darwin/src/MGLRasterSource.mm +++ b/platform/darwin/src/MGLRasterSource.mm @@ -51,7 +51,7 @@ static const CGFloat MGLRasterSourceRetinaTileSize = 512; if (self = [super initWithIdentifier:identifier tileURLTemplates:tileURLTemplates options:options]) { mbgl::Tileset tileSet = MGLTileSetFromTileURLTemplates(tileURLTemplates, options); - uint16_t tileSize; + uint16_t tileSize = MGLRasterSourceRetinaTileSize; if (NSNumber *tileSizeNumber = options[MGLTileSourceOptionTileSize]) { if (![tileSizeNumber isKindOfClass:[NSNumber class]]) { [NSException raise:NSInvalidArgumentException diff --git a/platform/darwin/src/MGLShape.mm b/platform/darwin/src/MGLShape.mm index 4ddf7c9df7..984235fd97 100644 --- a/platform/darwin/src/MGLShape.mm +++ b/platform/darwin/src/MGLShape.mm @@ -94,9 +94,7 @@ bool operator==(const CLLocationCoordinate2D lhs, const CLLocationCoordinate2D r - (NSUInteger)hash { - NSUInteger hash; - hash += _title.hash; - hash += _subtitle.hash; + NSUInteger hash = _title.hash + _subtitle.hash; #if !TARGET_OS_IPHONE hash += _toolTip.hash; #endif diff --git a/platform/ios/src/MGLAnnotationImage.m b/platform/ios/src/MGLAnnotationImage.m index c753e9e54e..9c9c175ab9 100644 --- a/platform/ios/src/MGLAnnotationImage.m +++ b/platform/ios/src/MGLAnnotationImage.m @@ -55,17 +55,14 @@ MGLAnnotationImage *otherAnnotationImage = other; - return ((!_reuseIdentifier && !otherAnnotationImage.reuseIdentifier) || [_reuseIdentifier isEqualToString:otherAnnotationImage.reuseIdentifier]) + return ((!_reuseIdentifier && !otherAnnotationImage.reuseIdentifier) + || [_reuseIdentifier isEqualToString:otherAnnotationImage.reuseIdentifier]) && _enabled == otherAnnotationImage.enabled - && ((!_image && !otherAnnotationImage.image) || [UIImagePNGRepresentation(_image) isEqualToData:UIImagePNGRepresentation(otherAnnotationImage.image)]); + && (_image == otherAnnotationImage.image || [UIImagePNGRepresentation(_image) isEqualToData:UIImagePNGRepresentation(otherAnnotationImage.image)]); } - (NSUInteger)hash { - NSUInteger hash; - hash += [_reuseIdentifier hash]; - hash += _enabled; - hash += [_image hash]; - return hash; + return _reuseIdentifier.hash + _enabled + _image.hash; } - (void)setImage:(UIImage *)image { diff --git a/platform/macos/src/MGLAnnotationImage.m b/platform/macos/src/MGLAnnotationImage.m index f9f900344a..d19dbe5dfc 100644 --- a/platform/macos/src/MGLAnnotationImage.m +++ b/platform/macos/src/MGLAnnotationImage.m @@ -53,15 +53,11 @@ return ((!_reuseIdentifier && !otherAnnotationImage.reuseIdentifier) || [_reuseIdentifier isEqualToString:otherAnnotationImage.reuseIdentifier]) && _selectable == otherAnnotationImage.selectable && ((!_cursor && !otherAnnotationImage.cursor) || [_cursor isEqual:otherAnnotationImage.cursor]) - && ((!_image && !otherAnnotationImage.image) || [[_image TIFFRepresentation] isEqualToData:[otherAnnotationImage.image TIFFRepresentation]]); + && (_image == otherAnnotationImage.image || [[_image TIFFRepresentation] isEqualToData:[otherAnnotationImage.image TIFFRepresentation]]); } - (NSUInteger)hash { - NSUInteger hash; - hash += [_reuseIdentifier hash]; - hash += _selectable; - hash += [_image hash]; - return hash; + return _reuseIdentifier.hash + @(_selectable).hash + _image.hash; } @end diff --git a/platform/macos/src/NSImage+MGLAdditions.mm b/platform/macos/src/NSImage+MGLAdditions.mm index 9036ab24ae..e8e84f0a03 100644 --- a/platform/macos/src/NSImage+MGLAdditions.mm +++ b/platform/macos/src/NSImage+MGLAdditions.mm @@ -6,7 +6,7 @@ std::string png = encodePNG(spriteImage->image); NSData *data = [[NSData alloc] initWithBytes:png.data() length:png.size()]; NSBitmapImageRep *rep = [NSBitmapImageRep imageRepWithData:data]; - if ([self initWithSize:NSMakeSize(spriteImage->getWidth(), spriteImage->getHeight())]) { + if (self = [self initWithSize:NSMakeSize(spriteImage->getWidth(), spriteImage->getHeight())]) { [self addRepresentation:rep]; [self setTemplate:spriteImage->sdf]; } |