From 3fc93a0b024e34514dafcbb424db93593ff540be Mon Sep 17 00:00:00 2001
From: Alex Cristici <alex.cristici@gmail.com>
Date: Fri, 28 Mar 2025 20:31:29 +0200
Subject: [PATCH] Made iOS Benchmark app run on Xcode 16 (#3344)

---
 .../AppIcon.appiconset/Contents.json             |   1 -
 .../AppIcon.appiconset/Icon-76.png               | Bin 2841 -> 0 bytes
 platform/ios/benchmark/Info.plist                |   2 ++
 platform/ios/benchmark/MBXBenchViewController.mm |   2 +-
 4 files changed, 3 insertions(+), 2 deletions(-)
 delete mode 100644 platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-76.png

diff --git a/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Contents.json b/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Contents.json
index 41fff6130..6e4e5d20d 100644
--- a/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -81,7 +81,6 @@
       "size" : "40x40"
     },
     {
-      "filename" : "Icon-76.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "76x76"
diff --git a/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-76.png b/platform/ios/benchmark/Assets.xcassets/AppIcon.appiconset/Icon-76.png
deleted file mode 100644
index 0ed2a2673028c7ddd9c6f4a061be9094773bd018..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2841
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

diff --git a/platform/ios/benchmark/Info.plist b/platform/ios/benchmark/Info.plist
index 145b9e44a..c2e11adc6 100644
--- a/platform/ios/benchmark/Info.plist
+++ b/platform/ios/benchmark/Info.plist
@@ -20,6 +20,8 @@
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
 	<key>CFBundleSignature</key>
 	<string>MBGL</string>
 	<key>CFBundleVersion</key>
diff --git a/platform/ios/benchmark/MBXBenchViewController.mm b/platform/ios/benchmark/MBXBenchViewController.mm
index f7378ecaf..1b901616a 100644
--- a/platform/ios/benchmark/MBXBenchViewController.mm
+++ b/platform/ios/benchmark/MBXBenchViewController.mm
@@ -205,7 +205,7 @@ namespace  mbgl {
        8,
        4 * image.size.width,
        colorSpace,
-       kCGImageAlphaPremultipliedLast | kCGBitmapByteOrderDefault
+       kCGImageAlphaPremultipliedLast
     );
     CFRelease(colorSpace);
     CGImageRef cgImage = CGBitmapContextCreateImage(bitmapContext);