diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter_ios/CHANGELOG.md index 37034b5bb674..b4326e884c99 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/CHANGELOG.md +++ b/packages/google_maps_flutter/google_maps_flutter_ios/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.18.4 + +* Fixes a potential compilation issue in tile downscaling. + ## 2.18.3 * Updates README to include setup information. diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMTileOverlayController.m b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMTileOverlayController.m index 012276e27281..ba0c4ee33d64 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMTileOverlayController.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMTileOverlayController.m @@ -81,12 +81,12 @@ - (instancetype)initWithTileOverlayIdentifier:(NSString *)identifier - (UIImage *)handleResultTile:(nullable UIImage *)tile { CGImageRef imageRef = tile.CGImage; CGBitmapInfo bitmapInfo = CGImageGetBitmapInfo(imageRef); - BOOL isFloat = bitmapInfo && kCGBitmapFloatComponents; + BOOL isFloat = bitmapInfo & kCGBitmapFloatComponents; size_t bitsPerComponent = CGImageGetBitsPerComponent(imageRef); // Engine use f16 pixel format for wide gamut images // If it is wide gamut, we want to downsample it - if (isFloat & (bitsPerComponent == 16)) { + if (isFloat && (bitsPerComponent == 16)) { CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB(); CGContextRef context = CGBitmapContextCreate(nil, tile.size.width, tile.size.height, 8, 0, colorSpace, diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml index 46f21568a148..c5fe13b0ac51 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml @@ -2,7 +2,7 @@ name: google_maps_flutter_ios description: iOS implementation of the google_maps_flutter plugin. repository: https://github.com/flutter/packages/tree/main/packages/google_maps_flutter/google_maps_flutter_ios issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22 -version: 2.18.3 +version: 2.18.4 environment: sdk: ^3.10.0 diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/CHANGELOG.md index 4baa9e7a6eaa..59856f19dbec 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/CHANGELOG.md +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.18.5 + +* Fixes a potential compilation issue in tile downscaling. + ## 2.18.4 * Updates README to include setup information. diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/FGMTileOverlayController.m b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/FGMTileOverlayController.m index 012276e27281..ba0c4ee33d64 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/FGMTileOverlayController.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/FGMTileOverlayController.m @@ -81,12 +81,12 @@ - (instancetype)initWithTileOverlayIdentifier:(NSString *)identifier - (UIImage *)handleResultTile:(nullable UIImage *)tile { CGImageRef imageRef = tile.CGImage; CGBitmapInfo bitmapInfo = CGImageGetBitmapInfo(imageRef); - BOOL isFloat = bitmapInfo && kCGBitmapFloatComponents; + BOOL isFloat = bitmapInfo & kCGBitmapFloatComponents; size_t bitsPerComponent = CGImageGetBitsPerComponent(imageRef); // Engine use f16 pixel format for wide gamut images // If it is wide gamut, we want to downsample it - if (isFloat & (bitsPerComponent == 16)) { + if (isFloat && (bitsPerComponent == 16)) { CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB(); CGContextRef context = CGBitmapContextCreate(nil, tile.size.width, tile.size.height, 8, 0, colorSpace, diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/pubspec.yaml index 5ccd2b07d828..f50b68394747 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/pubspec.yaml @@ -2,7 +2,7 @@ name: google_maps_flutter_ios_sdk10 description: iOS implementation of the google_maps_flutter plugin using Google Maps SDK 10. repository: https://github.com/flutter/packages/tree/main/packages/google_maps_flutter/google_maps_flutter_ios_sdk10 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22 -version: 2.18.4 +version: 2.18.5 environment: sdk: ^3.10.0 diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/CHANGELOG.md index ec0a5c399519..b8e989f8c9b0 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/CHANGELOG.md +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.18.6 + +* Fixes a potential compilation issue in tile downscaling. + ## 2.18.5 * Corrects the README header. diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/FGMTileOverlayController.m b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/FGMTileOverlayController.m index 012276e27281..ba0c4ee33d64 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/FGMTileOverlayController.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/FGMTileOverlayController.m @@ -81,12 +81,12 @@ - (instancetype)initWithTileOverlayIdentifier:(NSString *)identifier - (UIImage *)handleResultTile:(nullable UIImage *)tile { CGImageRef imageRef = tile.CGImage; CGBitmapInfo bitmapInfo = CGImageGetBitmapInfo(imageRef); - BOOL isFloat = bitmapInfo && kCGBitmapFloatComponents; + BOOL isFloat = bitmapInfo & kCGBitmapFloatComponents; size_t bitsPerComponent = CGImageGetBitsPerComponent(imageRef); // Engine use f16 pixel format for wide gamut images // If it is wide gamut, we want to downsample it - if (isFloat & (bitsPerComponent == 16)) { + if (isFloat && (bitsPerComponent == 16)) { CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB(); CGContextRef context = CGBitmapContextCreate(nil, tile.size.width, tile.size.height, 8, 0, colorSpace, diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/pubspec.yaml index 36d9c5a64a66..cbfc993524f7 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/pubspec.yaml @@ -2,7 +2,7 @@ name: google_maps_flutter_ios_sdk9 description: iOS implementation of the google_maps_flutter plugin using Google Maps SDK 9. repository: https://github.com/flutter/packages/tree/main/packages/google_maps_flutter/google_maps_flutter_ios_sdk9 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22 -version: 2.18.5 +version: 2.18.6 environment: sdk: ^3.10.0 diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMTileOverlayController.m b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMTileOverlayController.m index 012276e27281..ba0c4ee33d64 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMTileOverlayController.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMTileOverlayController.m @@ -81,12 +81,12 @@ - (instancetype)initWithTileOverlayIdentifier:(NSString *)identifier - (UIImage *)handleResultTile:(nullable UIImage *)tile { CGImageRef imageRef = tile.CGImage; CGBitmapInfo bitmapInfo = CGImageGetBitmapInfo(imageRef); - BOOL isFloat = bitmapInfo && kCGBitmapFloatComponents; + BOOL isFloat = bitmapInfo & kCGBitmapFloatComponents; size_t bitsPerComponent = CGImageGetBitsPerComponent(imageRef); // Engine use f16 pixel format for wide gamut images // If it is wide gamut, we want to downsample it - if (isFloat & (bitsPerComponent == 16)) { + if (isFloat && (bitsPerComponent == 16)) { CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB(); CGContextRef context = CGBitmapContextCreate(nil, tile.size.width, tile.size.height, 8, 0, colorSpace,