8000 Changed the targets so a Framework can be easily built within Xcode 5 by jensolsson · Pull Request #3 · ZBar/ZBar · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Changed the targets so a Framework can be easily built within Xcode 5 #3

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Changed the targets so a Framework can be easily built within Xcode 5 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bfba322
Corrected ZBarSDK so that a universal Framework can be easily built u…
Nov 18, 2013
ce8e0b0
Changed black background to white to comply with iOS 7
Nov 18, 2013
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
iphone/build
32 changes: 16 additions & 16 deletions iphone/ZBarReaderView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,21 +54,21 @@ - (void) initSubviews
overlay.backgroundColor = [UIColor clearColor].CGColor;
[preview addSublayer: overlay];

#ifndef NDEBUG
overlay.borderWidth = 2;
overlay.borderColor = [UIColor colorWithRed: 1
green: 0
blue: 0
alpha: .5].CGColor;
cropLayer = [CALayer new];
cropLayer.backgroundColor = [UIColor clearColor].CGColor;
cropLayer.borderWidth = 2;
cropLayer.borderColor = [UIColor colorWithRed: 0
green: 0
blue: 1
alpha: .5].CGColor;
[overlay addSublayer: cropLayer];
#endif
//#ifndef NDEBUG
// overlay.borderWidth = 2;
// overlay.borderColor = [UIColor colorWithRed: 1
// green: 0
// blue: 0
// alpha: .5].CGColor;
// cropLayer = [CALayer new];
// cropLayer.backgroundColor = [UIColor clearColor].CGColor;
// cropLayer.borderWidth = 2;
// cropLayer.borderColor = [UIColor colorWithRed: 0
// green: 0
// blue: 1
// alpha: .5].CGColor;
// [overlay addSublayer: cropLayer];
//#endif

tracking = [CALayer new];
tracking.opacity = 0;
Expand Down Expand Up @@ -125,7 +125,7 @@ - (id) initWithImageScanner: (ZBarImageScanner*) scanner
if(!self)
return(nil);

self.backgroundColor = [UIColor blackColor];
self.backgroundColor = [UIColor whiteColor];
self.contentMode = UIViewContentModeScaleAspectFill;
self.clipsToBounds = YES;
self.autoresizingMask =
Expand Down
6 changes: 3 additions & 3 deletions iphone/ZBarReaderViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ - (void) initControls
UIViewAutoresizingFlexibleWidth |
UIViewAutoresizingFlexibleHeight |
UIViewAutoresizingFlexibleTopMargin;
controls.backgroundColor = [UIColor blackColor];
controls.backgroundColor = [UIColor whiteColor];

UIToolbar *toolbar =
[UIToolbar new];
Expand Down Expand Up @@ -328,7 +328,7 @@ - (void) viewDidLoad
{
[super viewDidLoad];
UIView *view = self.view;
view.backgroundColor = [UIColor blackColor];
view.backgroundColor = [UIColor whiteColor];
view.autoresizingMask =
UIViewAutoresizingFlexibleWidth |
UIViewAutoresizingFlexibleHeight;
Expand Down Expand Up @@ -364,7 +364,7 @@ - (void) viewDidLoad

shutter = [[UIView alloc]
initWithFrame: r];
shutter.backgroundColor = [UIColor blackColor];
shutter.backgroundColor = [UIColor whiteColor];
shutter.opaque = NO;
shutter.autoresizingMask =
UIViewAutoresizingFlexibleWidth |
Expand Down
22 changes: 22 additions & 0 deletions .../EmbedReader.xcodeproj/xcuserdata/deadlock.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>EmbedReader.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
<dict>
<key>DCFB448E136F7202004B3EE0</key>
<dict>
<key>primary</key>
<true/>
</dict>
</dict>
</dict>
</plist>
22 changes: 22 additions & 0 deletions ...ReaderSample.xcodeproj/xcuserdata/deadlock.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>ReaderSample.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>2</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
<dict>
<key>DC8F288E13579EFF005B8862</key>
<dict>
<key>primary</key>
<true/>
</dict>
</dict>
</dict>
</plist>
22 changes: 22 additions & 0 deletions ...er/TabReader.xcodeproj/xcuserdata/deadlock.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>TabReader.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>5</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
<dict>
<key>DC5D76D11370EE8F0069AEF5</key>
<dict>
<key>primary</key>
<true/>
</dict>
</dict>
</dict>
</plist>
22 changes: 22 additions & 0 deletions ...t/readertest.xcodeproj/xcuserdata/deadlock.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>readertest.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>4</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
<dict>
<key>1D6058900D05DD3D006BFB54</key>
<dict>
<key>primary</key>
<true/>
</dict>
</dict>
</dict>
</plist>
Loading
0