Skip to content

Ground overlay: address PR comments #16

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
jokerttu merged 4 commits into from
Feb 4, 2025
Merged

Ground overlay: address PR comments #16

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7d48344
Tweak imports
aednlaxer Jan 28, 2025
21053dc
Rename mockImage to placeholderImage
aednlaxer Jan 28, 2025
44d3c6d
Fix declaration comments and function names in FGMImageUtils
aednlaxer Jan 28, 2025
c502cb5
Tweak comment
aednlaxer Jan 28, 2025
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
Prev Previous commit
Next Next commit
Fix declaration comments and function names in FGMImageUtils
  • Loading branch information
@aednlaxer @jokerttu
aednlaxer authored and jokerttu committed Feb 4, 2025
commit 44d3c6dcdf19aa587618e0d4909ca977cf614bfb
73 changes: 38 additions & 35 deletions packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/FGMImageUtils.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,41 @@
#import "FGMImageUtils.h"
#import "Foundation/Foundation.h"

static UIImage *scaleImage(UIImage *image, double scale);
/// This method is deprecated within the context of `BitmapDescriptor.fromBytes` handling in the
/// flutter google_maps_flutter_platform_interface package which has been replaced by 'bytes'
/// message handling. It will be removed when the deprecated image bitmap description type
/// 'fromBytes' is removed from the platform interface.
static UIImage *scaledImage(UIImage *image, double scale);

/// Creates a scaled version of the provided UIImage based on a specified scale factor. If the
/// scale factor differs from the image's current scale by more than a small epsilon-delta (to
/// account for minor floating-point inaccuracies), a new UIImage object is created with the
/// specified scale. Otherwise, the original image is returned.
///
/// @param image The UIImage to scale.
/// @param scale The factor by which to scale the image.
/// @return UIImage Returns the scaled UIImage.
static UIImage *scaledImageWithScale(UIImage *image, CGFloat scale);

/// Scales an input UIImage to a specified size. If the aspect ratio of the input image
/// closely matches the target size, indicated by a small epsilon-delta, the image's scale
/// property is updated instead of resizing the image. If the aspect ratios differ beyond this
/// threshold, the method redraws the image at the target size.
///
/// @param image The UIImage to scale.
/// @param size The target CGSize to scale the image to.
/// @return UIImage Returns the scaled UIImage.
static UIImage *scaledImageWithSize(UIImage *image, CGSize size);
static UIImage *scaledImage(UIImage *image, NSNumber *width, NSNumber *height, CGFloat screenScale);

/// Scales an input UIImage to a specified width and height preserving aspect ratio if both
/// widht and height are not given..
///
/// @param image The UIImage to scale.
/// @param width The target width to scale the image to.
/// @param height The target height to scale the image to.
/// @param screenScale The current screen scale.
/// @return UIImage Returns the scaled UIImage.
static UIImage *scaledImageWithWidthHeight(UIImage *image, NSNumber *width, NSNumber *height, CGFloat screenScale);

UIImage *FGMIconFromBitmap(FGMPlatformBitmap *platformBitmap,
NSObject<FlutterPluginRegistrar> *registrar, CGFloat screenScale) {
Expand Down Expand Up @@ -39,7 +70,7 @@
// Refer to the flutter google_maps_flutter_platform_interface package for details.
FGMPlatformBitmapAssetImage *bitmapAssetImage = bitmap;
image = [UIImage imageNamed:[registrar lookupKeyForAsset:bitmapAssetImage.name]];
image = scaleImage(image, bitmapAssetImage.scale);
image = scaledImage(image, bitmapAssetImage.scale);
} else if ([bitmap isKindOfClass:[FGMPlatformBitmapBytes class]]) {
// Deprecated: This message handling for 'fromBytes' has been replaced by 'bytes'.
// Refer to the flutter google_maps_flutter_platform_interface package for details.
Expand All @@ -62,7 +93,7 @@
NSNumber *height = bitmapAssetMap.height;
if (width || height) {
image = scaledImageWithScale(image, screenScale);
image = scaledImage(image, width, height, screenScale);
image = scaledImageWithWidthHeight(image, width, height, screenScale);
} else {
image = scaledImageWithScale(image, bitmapAssetMap.imagePixelRatio);
}
Expand All @@ -80,7 +111,7 @@
if (width || height) {
// Before scaling the image, image must be in screenScale.
image = scaledImageWithScale(image, screenScale);
image = scaledImage(image, width, height, screenScale);
image = scaledImageWithWidthHeight(image, width, height, screenScale);
} else {
image = scaledImageWithScale(image, bitmapBytesMap.imagePixelRatio);
}
Expand All @@ -98,11 +129,7 @@
return image;
}

/// This method is deprecated within the context of `BitmapDescriptor.fromBytes` handling in the
/// flutter google_maps_flutter_platform_interface package which has been replaced by 'bytes'
/// message handling. It will be removed when the deprecated image bitmap description type
/// 'fromBytes' is removed from the platform interface.
UIImage *scaleImage(UIImage *image, double scale) {
UIImage *scaledImage(UIImage *image, double scale) {
if (fabs(scale - 1) > 1e-3) {
return [UIImage imageWithCGImage:[image CGImage]
scale:(image.scale * scale)
Expand All @@ -111,14 +138,6 @@
return image;
}

/// Creates a scaled version of the provided UIImage based on a specified scale factor. If the
/// scale factor differs from the image's current scale by more than a small epsilon-delta (to
/// account for minor floating-point inaccuracies), a new UIImage object is created with the
/// specified scale. Otherwise, the original image is returned.
///
/// @param image The UIImage to scale.
/// @param scale The factor by which to scale the image.
/// @return UIImage Returns the scaled UIImage.
UIImage *scaledImageWithScale(UIImage *image, CGFloat scale) {
if (fabs(scale - image.scale) > DBL_EPSILON) {
return [UIImage imageWithCGImage:[image CGImage]
Expand All @@ -128,14 +147,6 @@
return image;
}

/// Scales an input UIImage to a specified size. If the aspect ratio of the input image
/// closely matches the target size, indicated by a small epsilon-delta, the image's scale
/// property is updated instead of resizing the image. If the aspect ratios differ beyond this
/// threshold, the method redraws the image at the target size.
///
/// @param image The UIImage to scale.
/// @param size The target CGSize to scale the image to.
/// @return UIImage Returns the scaled UIImage.
UIImage *scaledImageWithSize(UIImage *image, CGSize size) {
CGFloat originalPixelWidth = image.size.width * image.scale;
CGFloat originalPixelHeight = image.size.height * image.scale;
Expand Down Expand Up @@ -177,15 +188,7 @@
}
}

/// Scales an input UIImage to a specified width and height preserving aspect ratio if both
/// widht and height are not given..
///
/// @param image The UIImage to scale.
/// @param width The target width to scale the image to.
/// @param height The target height to scale the image to.
/// @param screenScale The current screen scale.
/// @return UIImage Returns the scaled UIImage.
UIImage *scaledImage(UIImage *image, NSNumber *width, NSNumber *height, CGFloat screenScale) {
UIImage *scaledImageWithWidthHeight(UIImage *image, NSNumber *width, NSNumber *height, CGFloat screenScale) {
if (!width && !height) {
return image;
}
Expand Down