Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ARCify, fix project settings for Xcode7, iOS 8/9 #2

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ARCify, fix project settings for Xcode7, iOS 8/9 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions AROverlayExample.xcodeproj/project.pbxproj
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand Down
Empty file modified AROverlayExample.xcodeproj/project.xcworkspace/contents.xcworkspacedata
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified ...xcodeproj/project.xcworkspace/xcuserdata/Jason.xcuserdatad/UserInterfaceState.xcuserstate
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified AROverlayExample.xcodeproj/xcuserdata/Jason.xcuserdatad/xcschemes/AROverlayExample.xcscheme
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified AROverlayExample.xcodeproj/xcuserdata/Jason.xcuserdatad/xcschemes/xcschememanagement.plist
100644 → 100755
View file
Open in desktop
Empty file.
91 changes: 91 additions & 0 deletions AROverlayExample.xcodeproj/xcuserdata/ido.xcuserdatad/xcschemes/AROverlayExample.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0700"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "96C334F31353F36900AD25CA"
BuildableName = "AROverlayExample.app"
BlueprintName = "AROverlayExample"
ReferencedContainer = "container:AROverlayExample.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "96C334F31353F36900AD25CA"
BuildableName = "AROverlayExample.app"
BlueprintName = "AROverlayExample"
ReferencedContainer = "container:AROverlayExample.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "96C334F31353F36900AD25CA"
BuildableName = "AROverlayExample.app"
BlueprintName = "AROverlayExample"
ReferencedContainer = "container:AROverlayExample.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "96C334F31353F36900AD25CA"
BuildableName = "AROverlayExample.app"
BlueprintName = "AROverlayExample"
ReferencedContainer = "container:AROverlayExample.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
22 changes: 22 additions & 0 deletions AROverlayExample.xcodeproj/xcuserdata/ido.xcuserdatad/xcschemes/xcschememanagement.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SchemeUserState</key>
<dict>
<key>AROverlayExample.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
<dict>
<key>96C334F31353F36900AD25CA</key>
<dict>
<key>primary</key>
<true/>
</dict>
</dict>
</dict>
</plist>
4 changes: 2 additions & 2 deletions AROverlayExample/Classes/AROverlayViewController.h
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

}

@property (retain) CaptureSessionManager *captureManager;
@property (nonatomic, retain) UILabel *scanningLabel;
@property (strong) CaptureSessionManager *captureManager;
@property (nonatomic, strong) UILabel *scanningLabel;

@end
9 changes: 3 additions & 6 deletions AROverlayExample/Classes/AROverlayViewController.m
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ @implementation AROverlayViewController

- (void)viewDidLoad {

[self setCaptureManager:[[[CaptureSessionManager alloc] init] autorelease]];
[self setCaptureManager:[[CaptureSessionManager alloc] init]];

[[self captureManager] addVideoInput];

Expand All @@ -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];
Expand All @@ -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]];
Expand All @@ -56,9 +54,8 @@ - (void)didReceiveMemoryWarning {
}

- (void)dealloc {
[captureManager release], captureManager = nil;
[scanningLabel release], scanningLabel = nil;
[super dealloc];
captureManager = nil;
scanningLabel = nil;
}

@end
Expand Down
4 changes: 2 additions & 2 deletions AROverlayExample/Classes/AppDelegate.h
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 2 additions & 3 deletions AROverlayExample/Classes/AppDelegate.m
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions AROverlayExample/Classes/CaptureSessionManager.h
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

}

@property (retain) AVCaptureVideoPreviewLayer *previewLayer;
@property (retain) AVCaptureSession *captureSession;
@property (strong) AVCaptureVideoPreviewLayer *previewLayer;
@property (strong) AVCaptureSession *captureSession;

- (void)addVideoPreviewLayer;
- (void)addVideoInput;
Expand Down
7 changes: 3 additions & 4 deletions AROverlayExample/Classes/CaptureSessionManager.m
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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];

}
Expand All @@ -43,10 +43,9 @@ - (void)dealloc {

[[self captureSession] stopRunning];

[previewLayer release], previewLayer = nil;
[captureSession release], captureSession = nil;
previewLayer = nil;
captureSession = nil;

[super dealloc];
}

@end
Empty file modified AROverlayExample/Info.plist
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified AROverlayExample/Prefix.pch
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified AROverlayExample/en.lproj/AROverlayViewController.xib
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified AROverlayExample/en.lproj/InfoPlist.strings
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified AROverlayExample/en.lproj/MainWindow.xib
100644 → 100755
View file
Open in desktop
Empty file.
8 changes: 4 additions & 4 deletions AROverlayExample/main.m
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Empty file modified AROverlayExample/overlaygraphic.png
100644 → 100755
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified AROverlayExample/scanbutton.png
100644 → 100755
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.