[Scummvm-git-logs] scummvm master -> 47d9d2f3a1d273d0be003de245b0f54a1b16d888

[bluegr]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
63dd85f0ce DISTS: Rename icon name which was automatically changed by Xcode
47d9d2f3a1 IOS7: Fix compilation warnings


Commit: 63dd85f0ce7870e334792cd4f6a75786817dc1f1
    https://github.com/scummvm/scummvm/commit/63dd85f0ce7870e334792cd4f6a75786817dc1f1
Author: Lars Sundström (l.sundstrom at gmail.com)
Date: 2024-11-07T13:04:09+02:00

Commit Message:
DISTS: Rename icon name which was automatically changed by Xcode

Xcode did a sneaky name change when applying a 120x120 icon, which was
targeted for 60x60x2. This caused the configure script to fail when
making the ios7bundle becuase it couldn't find the file with the
expected name.

Rename the icon to the proper name and update the json file
accordingly.

Changed paths:
  A dists/ios7/Images.xcassets/AppIcon.appiconset/icon4-60 at 2x.png
  R dists/ios7/Images.xcassets/AppIcon.appiconset/icon4-40 at 3x 1.png
    dists/ios7/Images.xcassets/AppIcon.appiconset/Contents.json


diff --git a/dists/ios7/Images.xcassets/AppIcon.appiconset/Contents.json b/dists/ios7/Images.xcassets/AppIcon.appiconset/Contents.json
index 7fbcd8989d1..ddd41821bc0 100644
--- a/dists/ios7/Images.xcassets/AppIcon.appiconset/Contents.json
+++ b/dists/ios7/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -57,7 +57,7 @@
       "size" : "40x40"
     },
     {
-      "filename" : "icon4-40 at 3x 1.png",
+      "filename" : "icon4-60 at 2x.png",
       "idiom" : "universal",
       "platform" : "ios",
       "scale" : "2x",
diff --git a/dists/ios7/Images.xcassets/AppIcon.appiconset/icon4-40 at 3x 1.png b/dists/ios7/Images.xcassets/AppIcon.appiconset/icon4-60 at 2x.png
similarity index 100%
rename from dists/ios7/Images.xcassets/AppIcon.appiconset/icon4-40 at 3x 1.png
rename to dists/ios7/Images.xcassets/AppIcon.appiconset/icon4-60 at 2x.png


Commit: 47d9d2f3a1d273d0be003de245b0f54a1b16d888
    https://github.com/scummvm/scummvm/commit/47d9d2f3a1d273d0be003de245b0f54a1b16d888
Author: Lars Sundström (l.sundstrom at gmail.com)
Date: 2024-11-07T13:04:09+02:00

Commit Message:
IOS7: Fix compilation warnings

Remove an accidental semicolon after a function definition which
was ignored by the compiler but generated a warning.

Rename a variable inside a code block that was generating a warning
about shadowing a local variable.

Changed paths:
    backends/platform/ios7/ios7_game_controller.mm
    backends/platform/ios7/ios7_scummvm_view_controller.mm


diff --git a/backends/platform/ios7/ios7_game_controller.mm b/backends/platform/ios7/ios7_game_controller.mm
index 1d8070c9aaa..de9b7aae5d2 100644
--- a/backends/platform/ios7/ios7_game_controller.mm
+++ b/backends/platform/ios7/ios7_game_controller.mm
@@ -44,7 +44,7 @@
 	return self;
 }
 
-- (CGPoint)getLocationInView:(UITouch *)touch; {
+- (CGPoint)getLocationInView:(UITouch *)touch {
 	CGPoint p = [touch locationInView:[self view]];
 	p.x *= [[self view] contentScaleFactor];
 	p.y *= [[self view] contentScaleFactor];
diff --git a/backends/platform/ios7/ios7_scummvm_view_controller.mm b/backends/platform/ios7/ios7_scummvm_view_controller.mm
index 3e90bbd8dab..7dd70477407 100644
--- a/backends/platform/ios7/ios7_scummvm_view_controller.mm
+++ b/backends/platform/ios7/ios7_scummvm_view_controller.mm
@@ -108,9 +108,9 @@
 	// updated to make sure the virtual controller is connected/disconnected
 	// properly based on the orientation.
 	[coordinator animateAlongsideTransition:nil completion:^(id<UIViewControllerTransitionCoordinatorContext> context) {
-		UIInterfaceOrientation orientationAfter = [self interfaceOrientation];
-		if (orientationAfter != UIInterfaceOrientationUnknown) {
-			[self setCurrentOrientation:orientationAfter];
+		UIInterfaceOrientation orientation = [self interfaceOrientation];
+		if (orientation != UIInterfaceOrientationUnknown) {
+			[self setCurrentOrientation:orientation];
 			if (@available(iOS 11.0, *)) {
 				[self setNeedsUpdateOfScreenEdgesDeferringSystemGestures];
 			}