diff --git a/AROverlayExample.xcodeproj/project.pbxproj b/AROverlayExample.xcodeproj/project.pbxproj old mode 100644 new mode 100755 index da1b7b9..cb0d385 --- a/AROverlayExample.xcodeproj/project.pbxproj +++ b/AROverlayExample.xcodeproj/project.pbxproj @@ -165,6 +165,8 @@ /* Begin PBXProject section */ 96C334EB1353F36900AD25CA /* Project object */ = { isa = PBXProject; + attributes = { + }; buildConfigurationList = 96C334EE1353F36900AD25CA /* Build configuration list for PBXProject "AROverlayExample" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = English; @@ -275,11 +277,14 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ENABLE_OBJC_ARC = YES; COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = AROverlayExample/Prefix.pch; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; INFOPLIST_FILE = AROverlayExample/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; PRODUCT_NAME = "$(TARGET_NAME)"; TARGETED_DEVICE_FAMILY = 1; WRAPPER_EXTENSION = app; @@ -290,10 +295,13 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ENABLE_OBJC_ARC = YES; COPY_PHASE_STRIP = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = AROverlayExample/Prefix.pch; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; INFOPLIST_FILE = AROverlayExample/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; PRODUCT_NAME = "$(TARGET_NAME)"; TARGETED_DEVICE_FAMILY = 1; VALIDATE_PRODUCT = YES; diff --git a/AROverlayExample.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/AROverlayExample.xcodeproj/project.xcworkspace/contents.xcworkspacedata old mode 100644 new mode 100755 diff --git a/AROverlayExample.xcodeproj/project.xcworkspace/xcuserdata/Jason.xcuserdatad/UserInterfaceState.xcuserstate b/AROverlayExample.xcodeproj/project.xcworkspace/xcuserdata/Jason.xcuserdatad/UserInterfaceState.xcuserstate old mode 100644 new mode 100755 diff --git a/AROverlayExample.xcodeproj/xcuserdata/Jason.xcuserdatad/xcschemes/AROverlayExample.xcscheme b/AROverlayExample.xcodeproj/xcuserdata/Jason.xcuserdatad/xcschemes/AROverlayExample.xcscheme old mode 100644 new mode 100755 diff --git a/AROverlayExample.xcodeproj/xcuserdata/Jason.xcuserdatad/xcschemes/xcschememanagement.plist b/AROverlayExample.xcodeproj/xcuserdata/Jason.xcuserdatad/xcschemes/xcschememanagement.plist old mode 100644 new mode 100755 diff --git a/AROverlayExample.xcodeproj/xcuserdata/ido.xcuserdatad/xcschemes/AROverlayExample.xcscheme b/AROverlayExample.xcodeproj/xcuserdata/ido.xcuserdatad/xcschemes/AROverlayExample.xcscheme new file mode 100644 index 0000000..30cb7fb --- /dev/null +++ b/AROverlayExample.xcodeproj/xcuserdata/ido.xcuserdatad/xcschemes/AROverlayExample.xcscheme @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/AROverlayExample.xcodeproj/xcuserdata/ido.xcuserdatad/xcschemes/xcschememanagement.plist b/AROverlayExample.xcodeproj/xcuserdata/ido.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 0000000..c05a441 --- /dev/null +++ b/AROverlayExample.xcodeproj/xcuserdata/ido.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,22 @@ + + + + + SchemeUserState + + AROverlayExample.xcscheme + + orderHint + 0 + + + SuppressBuildableAutocreation + + 96C334F31353F36900AD25CA + + primary + + + + + diff --git a/AROverlayExample/Classes/AROverlayViewController.h b/AROverlayExample/Classes/AROverlayViewController.h old mode 100644 new mode 100755 index e46126c..f905bd9 --- a/AROverlayExample/Classes/AROverlayViewController.h +++ b/AROverlayExample/Classes/AROverlayViewController.h @@ -5,7 +5,7 @@ } -@property (retain) CaptureSessionManager *captureManager; -@property (nonatomic, retain) UILabel *scanningLabel; +@property (strong) CaptureSessionManager *captureManager; +@property (nonatomic, strong) UILabel *scanningLabel; @end diff --git a/AROverlayExample/Classes/AROverlayViewController.m b/AROverlayExample/Classes/AROverlayViewController.m old mode 100644 new mode 100755 index 3ed091f..e2d6e39 --- a/AROverlayExample/Classes/AROverlayViewController.m +++ b/AROverlayExample/Classes/AROverlayViewController.m @@ -7,7 +7,7 @@ @implementation AROverlayViewController - (void)viewDidLoad { - [self setCaptureManager:[[[CaptureSessionManager alloc] init] autorelease]]; + [self setCaptureManager:[[CaptureSessionManager alloc] init]]; [[self captureManager] addVideoInput]; @@ -21,7 +21,6 @@ - (void)viewDidLoad { UIImageView *overlayImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"overlaygraphic.png"]]; [overlayImageView setFrame:CGRectMake(30, 100, 260, 200)]; [[self view] addSubview:overlayImageView]; - [overlayImageView release]; UIButton *overlayButton = [UIButton buttonWithType:UIButtonTypeCustom]; [overlayButton setImage:[UIImage imageNamed:@"scanbutton.png"] forState:UIControlStateNormal]; @@ -31,7 +30,6 @@ - (void)viewDidLoad { UILabel *tempLabel = [[UILabel alloc] initWithFrame:CGRectMake(100, 50, 120, 30)]; [self setScanningLabel:tempLabel]; - [tempLabel release]; [scanningLabel setBackgroundColor:[UIColor clearColor]]; [scanningLabel setFont:[UIFont fontWithName:@"Courier" size: 18.0]]; [scanningLabel setTextColor:[UIColor redColor]]; @@ -56,9 +54,8 @@ - (void)didReceiveMemoryWarning { } - (void)dealloc { - [captureManager release], captureManager = nil; - [scanningLabel release], scanningLabel = nil; - [super dealloc]; + captureManager = nil; + scanningLabel = nil; } @end diff --git a/AROverlayExample/Classes/AppDelegate.h b/AROverlayExample/Classes/AppDelegate.h old mode 100644 new mode 100755 index ef1a5f9..3233f73 --- a/AROverlayExample/Classes/AppDelegate.h +++ b/AROverlayExample/Classes/AppDelegate.h @@ -6,7 +6,7 @@ } -@property (nonatomic, retain) IBOutlet UIWindow *window; -@property (nonatomic, retain) IBOutlet AROverlayViewController *viewController; +@property (nonatomic, strong) IBOutlet UIWindow *window; +@property (nonatomic, strong) IBOutlet AROverlayViewController *viewController; @end diff --git a/AROverlayExample/Classes/AppDelegate.m b/AROverlayExample/Classes/AppDelegate.m old mode 100644 new mode 100755 index f56450c..e512089 --- a/AROverlayExample/Classes/AppDelegate.m +++ b/AROverlayExample/Classes/AppDelegate.m @@ -25,9 +25,8 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:( - (void)dealloc { - [window release], window = nil; - [viewController release], viewController = nil; - [super dealloc]; + window = nil; + viewController = nil; } @end diff --git a/AROverlayExample/Classes/CaptureSessionManager.h b/AROverlayExample/Classes/CaptureSessionManager.h old mode 100644 new mode 100755 index f3480ec..f182d48 --- a/AROverlayExample/Classes/CaptureSessionManager.h +++ b/AROverlayExample/Classes/CaptureSessionManager.h @@ -6,8 +6,8 @@ } -@property (retain) AVCaptureVideoPreviewLayer *previewLayer; -@property (retain) AVCaptureSession *captureSession; +@property (strong) AVCaptureVideoPreviewLayer *previewLayer; +@property (strong) AVCaptureSession *captureSession; - (void)addVideoPreviewLayer; - (void)addVideoInput; diff --git a/AROverlayExample/Classes/CaptureSessionManager.m b/AROverlayExample/Classes/CaptureSessionManager.m old mode 100644 new mode 100755 index 01cfc67..da88e59 --- a/AROverlayExample/Classes/CaptureSessionManager.m +++ b/AROverlayExample/Classes/CaptureSessionManager.m @@ -16,7 +16,7 @@ - (id)init { } - (void)addVideoPreviewLayer { - [self setPreviewLayer:[[[AVCaptureVideoPreviewLayer alloc] initWithSession:[self captureSession]] autorelease]]; + [self setPreviewLayer:[[AVCaptureVideoPreviewLayer alloc] initWithSession:[self captureSession]]]; [[self previewLayer] setVideoGravity:AVLayerVideoGravityResizeAspectFill]; } @@ -43,10 +43,9 @@ - (void)dealloc { [[self captureSession] stopRunning]; - [previewLayer release], previewLayer = nil; - [captureSession release], captureSession = nil; + previewLayer = nil; + captureSession = nil; - [super dealloc]; } @end diff --git a/AROverlayExample/Info.plist b/AROverlayExample/Info.plist old mode 100644 new mode 100755 diff --git a/AROverlayExample/Prefix.pch b/AROverlayExample/Prefix.pch old mode 100644 new mode 100755 diff --git a/AROverlayExample/en.lproj/AROverlayViewController.xib b/AROverlayExample/en.lproj/AROverlayViewController.xib old mode 100644 new mode 100755 diff --git a/AROverlayExample/en.lproj/InfoPlist.strings b/AROverlayExample/en.lproj/InfoPlist.strings old mode 100644 new mode 100755 diff --git a/AROverlayExample/en.lproj/MainWindow.xib b/AROverlayExample/en.lproj/MainWindow.xib old mode 100644 new mode 100755 diff --git a/AROverlayExample/main.m b/AROverlayExample/main.m old mode 100644 new mode 100755 index 1ad7e5b..c4d122a --- a/AROverlayExample/main.m +++ b/AROverlayExample/main.m @@ -10,8 +10,8 @@ int main(int argc, char *argv[]) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - int retVal = UIApplicationMain(argc, argv, nil, nil); - [pool release]; - return retVal; + @autoreleasepool { + int retVal = UIApplicationMain(argc, argv, nil, nil); + return retVal; + } } diff --git a/AROverlayExample/overlaygraphic.png b/AROverlayExample/overlaygraphic.png old mode 100644 new mode 100755 diff --git a/AROverlayExample/scanbutton.png b/AROverlayExample/scanbutton.png old mode 100644 new mode 100755