diff options
| author | Jason Wray <jason@mapbox.com> | 2018-11-27 15:44:00 -0500 |
|---|---|---|
| committer | Jason Wray <jason@mapbox.com> | 2018-11-27 15:46:05 -0500 |
| commit | 8b980bb0b9603a33586d5e969a6fe1d92eaa9640 (patch) | |
| tree | e3f0c07159ff185a1d04ae1514be72da2c5dc68e | |
| parent | 46edc91656a4468ff05f2a7b33c5fb036ab449d6 (diff) | |
| download | qtlocation-mapboxgl-8b980bb0b9603a33586d5e969a6fe1d92eaa9640.tar.gz | |
[darwin] Add platform-agnostic MGLStringFromSize() method
| -rw-r--r-- | platform/darwin/src/MGLLoggingConfiguration_Private.h | 7 | ||||
| -rw-r--r-- | platform/darwin/src/MGLMapSnapshotter.mm | 13 |
2 files changed, 11 insertions, 9 deletions
diff --git a/platform/darwin/src/MGLLoggingConfiguration_Private.h b/platform/darwin/src/MGLLoggingConfiguration_Private.h index 34e999ca72..5d2962f524 100644 --- a/platform/darwin/src/MGLLoggingConfiguration_Private.h +++ b/platform/darwin/src/MGLLoggingConfiguration_Private.h @@ -4,6 +4,13 @@ NS_INLINE NSString *MGLStringFromBOOL(BOOL value) { return value ? @"YES" : @"NO"; } +#if TARGET_OS_IPHONE +#import <UIKit/UIKit.h> +NS_INLINE NSString *MGLStringFromSize(CGSize size) { return NSStringFromCGSize(size); } +#else +NS_INLINE NSString *MGLStringFromSize(NSSize size) { return NSStringFromSize(size); } +#endif + #ifdef MGL_LOGGING_DISABLED #define MGLLogInfo(...) diff --git a/platform/darwin/src/MGLMapSnapshotter.mm b/platform/darwin/src/MGLMapSnapshotter.mm index 3d2a2525bc..65937fde66 100644 --- a/platform/darwin/src/MGLMapSnapshotter.mm +++ b/platform/darwin/src/MGLMapSnapshotter.mm @@ -31,16 +31,12 @@ const CGFloat MGLSnapshotterMinimumPixelSize = 64; @implementation MGLMapSnapshotOptions -- (instancetype _Nonnull)initWithStyleURL:(nullable NSURL *)styleURL camera:(MGLMapCamera *)camera size:(CGSize) size +- (instancetype _Nonnull)initWithStyleURL:(nullable NSURL *)styleURL camera:(MGLMapCamera *)camera size:(CGSize)size { -#if TARGET_OS_IPHONE - NSString *sizeString = NSStringFromCGSize(size); -#else - NSString *sizeString = NSStringFromSize(size); -#endif - MGLLogDebug(@"Initializing withStyleURL: %@ camera: %@ size: %@", styleURL, camera, sizeString); + MGLLogDebug(@"Initializing withStyleURL: %@ camera: %@ size: %@", styleURL, camera, MGLStringFromSize(size)); self = [super init]; - if (self) { + if (self) + { if ( !styleURL) { styleURL = [MGLStyle streetsStyleURLWithVersion:MGLStyleDefaultVersion]; @@ -53,7 +49,6 @@ const CGFloat MGLSnapshotterMinimumPixelSize = 64; #else _scale = [NSScreen mainScreen].backingScaleFactor; #endif - } return self; } |