From cfa722f1f7b832cf311d4a67f6df345baecd0f7d Mon Sep 17 00:00:00 2001
From: Pierre d'Herbemont <pdherbemont@videolan.org>
Date: Sun, 6 Jan 2008 23:03:04 +0000
Subject: [PATCH] MacOSX/VLC_app/VLC.xcodeproj: Fix copy phase.
MacOSX/Framework/Sources/VLCVideoCommon.m: Minor typo in previous commit.
---
extras/MacOSX/Framework/Sources/VLCVideoCommon.m | 2 +-
extras/MacOSX/VLC_app/VLC.xcodeproj/project.pbxproj | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/extras/MacOSX/Framework/Sources/VLCVideoCommon.m b/extras/MacOSX/Framework/Sources/VLCVideoCommon.m
index f233593dfffc..e3fb8d1fd204 100644
--- a/extras/MacOSX/Framework/Sources/VLCVideoCommon.m
+++ b/extras/MacOSX/Framework/Sources/VLCVideoCommon.m
@@ -50,7 +50,7 @@
CGFloat xRatio = CGRectGetWidth(bounds)/originalVideoSize.width;
CGFloat yRatio = CGRectGetHeight(bounds)/originalVideoSize.height;
- CGFloat ratio = fillScreenEntirely ? MAX(xRatio, yRatio) : MIX(xRatio, yRatio);
+ CGFloat ratio = fillScreenEntirely ? MAX(xRatio, yRatio) : MIN(xRatio, yRatio);
videoRect.size.width = ratio*originalVideoSize.width;
videoRect.size.height = ratio*originalVideoSize.height;
diff --git a/extras/MacOSX/VLC_app/VLC.xcodeproj/project.pbxproj b/extras/MacOSX/VLC_app/VLC.xcodeproj/project.pbxproj
index 45ac57ddc22c..4aaf51b3e73f 100644
--- a/extras/MacOSX/VLC_app/VLC.xcodeproj/project.pbxproj
+++ b/extras/MacOSX/VLC_app/VLC.xcodeproj/project.pbxproj
@@ -420,8 +420,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if test \"$SYMROOT\" == \"$PROJECT_DIR/build\"\nthen\n\tVLCFRAMEWORK=\"$SRCROOT/../Framework/build/$CONFIGURATION/VLCKit.framework\"\nelse\n\tVLCFRAMEWORK=\"$SYMROOT/VLCKit.framework\"\nfi\n/Developer/Library/PrivateFrameworks/DevToolsCore.framework/Resources/pbxcp -exclude .DS_Store -exclude CVS -exclude .svn -resolve-src-symlinks $VLCFRAMEWORK $BUILT_PRODUCTS_DIR/$FRAMEWORKS_FOLDER_PATH\n\n\n";
- showEnvVarsInLog = 0;
+ shellScript = "if test \"$SYMROOT\" == \"$PROJECT_DIR/build\"\nthen\n\tVLCFRAMEWORK=\"$SRCROOT/../Framework/build/$CONFIGURATION/VLCKit.framework\"\nelse\n\tVLCFRAMEWORK=\"$SYMROOT/$CONFIGURATION/VLCKit.framework\"\nfi\n/Developer/Library/PrivateFrameworks/DevToolsCore.framework/Resources/pbxcp -exclude .DS_Store -exclude CVS -exclude .svn -resolve-src-symlinks $VLCFRAMEWORK $BUILT_PRODUCTS_DIR/$FRAMEWORKS_FOLDER_PATH\n\n\n";
};
/* End PBXShellScriptBuildPhase section */
--
GitLab