From 8491949707e03c0b139dfd2f2064c728ec6601d1 Mon Sep 17 00:00:00 2001 From: "smparkes@smparkes.net" Date: Tue, 20 Sep 2011 18:04:15 +0000 Subject: [PATCH] remove llvm overrides git-svn-id: https://zxing.googlecode.com/svn/trunk@1922 59b500cc-1b3d-0410-9834-0bbf25fbcc57 --- cpp/ios.xcodeproj/project.pbxproj | 4 +--- iphone/ScanTest/ScanTest.xcodeproj/project.pbxproj | 7 +++---- iphone/ZXingWidget/ZXingWidget.xcodeproj/project.pbxproj | 5 +---- objc/ios.xcodeproj/project.pbxproj | 4 +--- objc/src/ZXing/ZXCapture.h | 5 ++--- 5 files changed, 8 insertions(+), 17 deletions(-) diff --git a/cpp/ios.xcodeproj/project.pbxproj b/cpp/ios.xcodeproj/project.pbxproj index b4f625fdf..3bf493e1e 100644 --- a/cpp/ios.xcodeproj/project.pbxproj +++ b/cpp/ios.xcodeproj/project.pbxproj @@ -228,7 +228,7 @@ 0867D690FE84028FC02AAC07 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0410; + LastUpgradeCheck = 0420; }; buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "ios" */; compatibilityVersion = "Xcode 3.2"; @@ -305,7 +305,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; COPY_PHASE_STRIP = NO; DSTROOT = /tmp/zxing.dst; GCC_DYNAMIC_NO_PIC = NO; @@ -328,7 +327,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; DSTROOT = /tmp/zxing.dst; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; diff --git a/iphone/ScanTest/ScanTest.xcodeproj/project.pbxproj b/iphone/ScanTest/ScanTest.xcodeproj/project.pbxproj index e881d48e6..79aee9940 100755 --- a/iphone/ScanTest/ScanTest.xcodeproj/project.pbxproj +++ b/iphone/ScanTest/ScanTest.xcodeproj/project.pbxproj @@ -204,7 +204,7 @@ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0410; + LastUpgradeCheck = 0420; }; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "ScanTest" */; compatibilityVersion = "Xcode 3.2"; @@ -297,7 +297,6 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ScanTest_Prefix.pch; GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_VERSION = ""; INFOPLIST_FILE = "ScanTest-Info.plist"; LIBRARY_SEARCH_PATHS = "$(inherited)"; OTHER_LDFLAGS = ""; @@ -331,7 +330,7 @@ ARCHS = "$(ARCHS_STANDARD_32_BIT)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; GCC_C_LANGUAGE_STANDARD = c99; - GCC_VERSION = 4.2; + GCC_VERSION = ""; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ( @@ -355,7 +354,7 @@ ARCHS = "$(ARCHS_STANDARD_32_BIT)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; GCC_C_LANGUAGE_STANDARD = c99; - GCC_VERSION = 4.2; + GCC_VERSION = ""; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ( diff --git a/iphone/ZXingWidget/ZXingWidget.xcodeproj/project.pbxproj b/iphone/ZXingWidget/ZXingWidget.xcodeproj/project.pbxproj index 744848898..31663094c 100644 --- a/iphone/ZXingWidget/ZXingWidget.xcodeproj/project.pbxproj +++ b/iphone/ZXingWidget/ZXingWidget.xcodeproj/project.pbxproj @@ -1170,7 +1170,7 @@ 0867D690FE84028FC02AAC07 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0410; + LastUpgradeCheck = 0420; }; buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "ZXingWidget" */; compatibilityVersion = "Xcode 3.2"; @@ -1442,7 +1442,6 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ZXingWidget_Prefix.pch; GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_VERSION = 4.2; HEADER_SEARCH_PATHS = ../../cpp/core/src; INSTALL_PATH = /usr/local/lib; LD_GENERATE_MAP_FILE = YES; @@ -1469,7 +1468,6 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ZXingWidget_Prefix.pch; GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_VERSION = 4.2; HEADER_SEARCH_PATHS = ../../cpp/core/src; INSTALL_PATH = /usr/local/lib; PRODUCT_NAME = ZXingWidget; @@ -1484,7 +1482,6 @@ ARCHS = "$(ARCHS_STANDARD_32_BIT)"; GCC_C_LANGUAGE_STANDARD = c99; GCC_OPTIMIZATION_LEVEL = 0; - GCC_VERSION = 4.2; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ../../cpp/core/src; diff --git a/objc/ios.xcodeproj/project.pbxproj b/objc/ios.xcodeproj/project.pbxproj index 18e230359..2c0dad412 100644 --- a/objc/ios.xcodeproj/project.pbxproj +++ b/objc/ios.xcodeproj/project.pbxproj @@ -150,7 +150,7 @@ 0867D690FE84028FC02AAC07 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0410; + LastUpgradeCheck = 0420; }; buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "ios" */; compatibilityVersion = "Xcode 3.2"; @@ -201,7 +201,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; COPY_PHASE_STRIP = NO; DSTROOT = /tmp/zxingmm.dst; GCC_DYNAMIC_NO_PIC = NO; @@ -218,7 +217,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; DSTROOT = /tmp/zxingmm.dst; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; diff --git a/objc/src/ZXing/ZXCapture.h b/objc/src/ZXing/ZXCapture.h index a9110644e..33c0f0227 100644 --- a/objc/src/ZXing/ZXCapture.h +++ b/objc/src/ZXing/ZXCapture.h @@ -75,12 +75,11 @@ ZX() { @property (nonatomic) CGAffineTransform transform; @property (nonatomic, readonly) ZXCaptureVideoOutput* output; @property (nonatomic, readonly) CALayer* layer; -@property (nonatomic, readonly) CALayer* luminance; -@property (nonatomic, readonly) CALayer* binary; - - (id)init; +- (CALayer*)luminance; - (void)setLuminance:(BOOL)on_off; +- (CALayer*)binary; - (void)setBinary:(BOOL)on_off; - (void)start; - (void)stop;