Skip to content

[google_maps_flutter] Fix iOS &/&& logic #11994

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
auto-submit merged 1 commit into from
Jun 25, 2026
Merged

[google_maps_flutter] Fix iOS &/&& logic #11994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions packages/google_maps_flutter/google_maps_flutter_ios/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 2.18.4

* Fixes a potential compilation issue in tile downscaling.

## 2.18.3

* Updates README to include setup information.
Expand Down
4 changes: 2 additions & 2 deletions ...os/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMTileOverlayController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Comment thread
stuartmorgan-g marked this conversation as resolved.
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,
Expand Down
2 changes: 1 addition & 1 deletion packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions packages/google_maps_flutter/google_maps_flutter_ios_sdk10/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 2.18.5

* Fixes a potential compilation issue in tile downscaling.

## 2.18.4

* Updates README to include setup information.
Expand Down
4 changes: 2 additions & 2 deletions ...e_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/FGMTileOverlayController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Comment thread
stuartmorgan-g marked this conversation as resolved.
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,
Expand Down
2 changes: 1 addition & 1 deletion packages/google_maps_flutter/google_maps_flutter_ios_sdk10/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions packages/google_maps_flutter/google_maps_flutter_ios_sdk9/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 2.18.6

* Fixes a potential compilation issue in tile downscaling.

## 2.18.5

* Corrects the README header.
Expand Down
4 changes: 2 additions & 2 deletions ...gle_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/FGMTileOverlayController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Comment thread
stuartmorgan-g marked this conversation as resolved.
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,
Expand Down
2 changes: 1 addition & 1 deletion packages/google_maps_flutter/google_maps_flutter_ios_sdk9/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ...de/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMTileOverlayController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Comment thread
stuartmorgan-g marked this conversation as resolved.
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,
Expand Down
Loading