Merge pull request #44 from IFTTT/orientation-fix

Orientation fix
IFTTT · Oct 6, 2015 · c2b35b4 · c2b35b4
2 parents 6a4b9e5 + 0c04ffa
commit c2b35b4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,9 +6,7 @@ podfile: FiltersExample/Podfile
 env:
 - LC_CTYPE=en_US.UTF-8 LANG=en_US.UTF-8
 script:
-- set -o pipefail && xcodebuild -workspace FiltersExample/FastttCameraDemo.xcworkspace -scheme
-  FastttCameraDemo -sdk iphonesimulator -destination "platform=iOS Simulator,OS=9.0,name=iPhone 5s" GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES clean
-  test | xcpretty -c
+- set -o pipefail && xcodebuild -workspace FiltersExample/FastttCameraDemo.xcworkspace -scheme FastttCameraDemo -sdk iphonesimulator -destination "platform=iOS Simulator,OS=9.0,name=iPhone 5s" GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES clean test | xcpretty -c
 - pod lib lint --quick
 - obcd --path FastttCamera find HeaderStyle
 after_success: slather
diff --git a/FastttCamera/Filters/FastttFilterCamera.m b/FastttCamera/Filters/FastttFilterCamera.m
@@ -635,6 +635,11 @@ - (void)_setPreviewVideoOrientation
         || orientation == UIDeviceOrientationFaceDown) {
         orientation = UIDeviceOrientationPortrait;
     }
+
+    if (!self.interfaceRotatesWithOrientation) {
+        orientation = self.fixedInterfaceOrientation;
+    }
+
     _stillCamera.outputImageOrientation = (UIInterfaceOrientation)orientation;
 }
 

diff --git a/FiltersExample/FastttCameraDemo.xcodeproj/project.pbxproj b/FiltersExample/FastttCameraDemo.xcodeproj/project.pbxproj
@@ -503,6 +503,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				INFOPLIST_FILE = FastttCameraDemo/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -514,6 +515,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				INFOPLIST_FILE = FastttCameraDemo/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};