mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-03-05 20:48:51 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

iOS 6 beta xcode tweaks and minor fixes detected by new clang

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2315 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
smparkes@smparkes.net 2012-06-21 20:34:52 +00:00
parent 8d86437747
commit 4eec01a5da
13 changed files with 165 additions and 416 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cpp/ios.xcodeproj/project.pbxproj
View file

@ -265,7 +265,7 @@
0867D690FE84028FC02AAC07 /* Project object */ = { 0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject; isa = PBXProject;
attributes = { attributes = {
LastUpgradeCheck = 0430; LastUpgradeCheck = 0450;
}; };
buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "ios" */; buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "ios" */;
compatibilityVersion = "Xcode 3.2"; compatibilityVersion = "Xcode 3.2";
@ -357,6 +357,8 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = ios_Prefix.pch; GCC_PREFIX_HEADER = ios_Prefix.pch;
GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_SYMBOLS_PRIVATE_EXTERN = YES;
"GCC_THUMB_SUPPORT[arch=armv6]" = NO;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
INSTALL_PATH = /usr/local/lib; INSTALL_PATH = /usr/local/lib;
PRODUCT_NAME = zxing; PRODUCT_NAME = zxing;
WARNING_CFLAGS = ( WARNING_CFLAGS = (
@ -377,6 +379,8 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = ios_Prefix.pch; GCC_PREFIX_HEADER = ios_Prefix.pch;
GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_SYMBOLS_PRIVATE_EXTERN = YES;
"GCC_THUMB_SUPPORT[arch=armv6]" = NO;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
INSTALL_PATH = /usr/local/lib; INSTALL_PATH = /usr/local/lib;
PRODUCT_NAME = zxing; PRODUCT_NAME = zxing;
WARNING_CFLAGS = ( WARNING_CFLAGS = (
@ -487,6 +491,8 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = ios_Prefix.pch; GCC_PREFIX_HEADER = ios_Prefix.pch;
GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_SYMBOLS_PRIVATE_EXTERN = YES;
"GCC_THUMB_SUPPORT[arch=armv6]" = NO;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
INSTALL_PATH = /usr/local/lib; INSTALL_PATH = /usr/local/lib;
PRODUCT_NAME = zxing; PRODUCT_NAME = zxing;
WARNING_CFLAGS = ( WARNING_CFLAGS = (
@ -536,6 +542,8 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = ios_Prefix.pch; GCC_PREFIX_HEADER = ios_Prefix.pch;
GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_SYMBOLS_PRIVATE_EXTERN = YES;
"GCC_THUMB_SUPPORT[arch=armv6]" = NO;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
INSTALL_PATH = /usr/local/lib; INSTALL_PATH = /usr/local/lib;
PRODUCT_NAME = zxing; PRODUCT_NAME = zxing;
WARNING_CFLAGS = ( WARNING_CFLAGS = (

40
iphone/Barcodes/Barcodes.xcodeproj/project.pbxproj
View file

@ -230,14 +230,6 @@
name = Products; name = Products;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
1FB43016128FFDBB002D63E8 /* dependencies */ = {
isa = PBXGroup;
children = (
1FB43017128FFDCD002D63E8 /* ZXingWidget.xcodeproj */,
);
name = dependencies;
sourceTree = "<group>";
};
1FB43018128FFDCD002D63E8 /* Products */ = { 1FB43018128FFDCD002D63E8 /* Products */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
@ -278,10 +270,10 @@
29B97314FDCFA39411CA2CEA /* CustomTemplate */ = { 29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
1FB43017128FFDCD002D63E8 /* ZXingWidget.xcodeproj */,
080E96DDFE201D6D7F000001 /* Classes */, 080E96DDFE201D6D7F000001 /* Classes */,
29B97315FDCFA39411CA2CEA /* Other Sources */, 29B97315FDCFA39411CA2CEA /* Other Sources */,
29B97317FDCFA39411CA2CEA /* Resources */, 29B97317FDCFA39411CA2CEA /* Resources */,
1FB43016128FFDBB002D63E8 /* dependencies */,
29B97323FDCFA39411CA2CEA /* Frameworks */, 29B97323FDCFA39411CA2CEA /* Frameworks */,
19C28FACFE9D520D11CA2CBB /* Products */, 19C28FACFE9D520D11CA2CBB /* Products */,
); );
@ -362,7 +354,7 @@
29B97313FDCFA39411CA2CEA /* Project object */ = { 29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject; isa = PBXProject;
attributes = { attributes = {
LastUpgradeCheck = 0430; LastUpgradeCheck = 0450;
}; };
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "Barcodes" */; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "Barcodes" */;
compatibilityVersion = "Xcode 3.2"; compatibilityVersion = "Xcode 3.2";
@ -617,10 +609,17 @@
../../cpp/core/src, ../../cpp/core/src,
"../ZXingWidget/Classes/**", "../ZXingWidget/Classes/**",
); );
IPHONEOS_DEPLOYMENT_TARGET = 4.1; IPHONEOS_DEPLOYMENT_TARGET = 4.0;
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
PROVISIONING_PROFILE = ""; PROVISIONING_PROFILE = "";
SDKROOT = iphoneos; SDKROOT = iphoneos;
VALID_ARCHS = "armv7 armv6";
WARNING_CFLAGS = (
"-Wall",
"-Wextra",
"-Werror",
"-Wno-unused-parameter",
);
}; };
name = Distribution; name = Distribution;
}; };
@ -661,9 +660,17 @@
../../cpp/core/src, ../../cpp/core/src,
"../ZXingWidget/Classes/**", "../ZXingWidget/Classes/**",
); );
IPHONEOS_DEPLOYMENT_TARGET = 4.1; IPHONEOS_DEPLOYMENT_TARGET = 4.0;
ONLY_ACTIVE_ARCH = YES;
PROVISIONING_PROFILE = ""; PROVISIONING_PROFILE = "";
SDKROOT = iphoneos; SDKROOT = iphoneos;
VALID_ARCHS = "armv7 armv6";
WARNING_CFLAGS = (
"-Wall",
"-Wextra",
"-Werror",
"-Wno-unused-parameter",
);
}; };
name = Debug; name = Debug;
}; };
@ -685,10 +692,17 @@
../../cpp/core/src, ../../cpp/core/src,
"../ZXingWidget/Classes/**", "../ZXingWidget/Classes/**",
); );
IPHONEOS_DEPLOYMENT_TARGET = 4.1; IPHONEOS_DEPLOYMENT_TARGET = 4.0;
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
PROVISIONING_PROFILE = ""; PROVISIONING_PROFILE = "";
SDKROOT = iphoneos; SDKROOT = iphoneos;
VALID_ARCHS = "armv7 armv6";
WARNING_CFLAGS = (
"-Wall",
"-Wextra",
"-Werror",
"-Wno-unused-parameter",
);
}; };
name = Release; name = Release;
}; };

408
iphone/Barcodes/ZXMainViewController.xib
View file

@ -1,31 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10"> <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
<data> <data>
<int key="IBDocument.SystemTarget">1056</int> <int key="IBDocument.SystemTarget">1536</int>
<string key="IBDocument.SystemVersion">10H542</string> <string key="IBDocument.SystemVersion">11E53</string>
<string key="IBDocument.InterfaceBuilderVersion">823</string> <string key="IBDocument.InterfaceBuilderVersion">2541</string>
<string key="IBDocument.AppKitVersion">1038.35</string> <string key="IBDocument.AppKitVersion">1138.47</string>
<string key="IBDocument.HIToolboxVersion">461.00</string> <string key="IBDocument.HIToolboxVersion">569.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="NS.object.0">132</string> <string key="NS.object.0">1875</string>
</object> </object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <object class="NSArray" key="IBDocument.IntegratedClassDependencies">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<integer value="1"/> <string>IBProxyObject</string>
<string>IBUIButton</string>
<string>IBUILabel</string>
<string>IBUIView</string>
</object> </object>
<object class="NSArray" key="IBDocument.PluginDependencies"> <object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
</object> </object>
<object class="NSMutableDictionary" key="IBDocument.Metadata"> <object class="NSMutableDictionary" key="IBDocument.Metadata">
<bool key="EncodedWithXMLCoder">YES</bool> <string key="NS.key.0">PluginDependencyRecalculationVersion</string>
<object class="NSArray" key="dict.sortedKeys" id="0"> <integer value="1" key="NS.object.0"/>
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
</object> </object>
<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000"> <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
@ -47,15 +45,11 @@
<int key="NSvFlags">292</int> <int key="NSvFlags">292</int>
<string key="NSFrame">{{96, 111}, {128, 128}}</string> <string key="NSFrame">{{96, 111}, {128, 128}}</string>
<reference key="NSSuperview" ref="191373211"/> <reference key="NSSuperview" ref="191373211"/>
<reference key="NSNextKeyView"/>
<bool key="IBUIOpaque">NO</bool> <bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int> <int key="IBUIContentHorizontalAlignment">0</int>
<int key="IBUIContentVerticalAlignment">0</int> <int key="IBUIContentVerticalAlignment">0</int>
<object class="NSFont" key="IBUIFont">
<string key="NSName">Helvetica-Bold</string>
<double key="NSSize">15</double>
<int key="NSfFlags">16</int>
</object>
<object class="NSColor" key="IBUIHighlightedTitleColor" id="367658244"> <object class="NSColor" key="IBUIHighlightedTitleColor" id="367658244">
<int key="NSColorSpace">3</int> <int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes> <bytes key="NSWhite">MQA</bytes>
@ -72,34 +66,54 @@
<string key="NSClassName">NSImage</string> <string key="NSClassName">NSImage</string>
<string key="NSResourceName">ZxingLarge.png</string> <string key="NSResourceName">ZxingLarge.png</string>
</object> </object>
<object class="IBUIFontDescription" key="IBUIFontDescription">
<string key="name">Helvetica-Bold</string>
<string key="family">Helvetica</string>
<int key="traits">2</int>
<double key="pointSize">15</double>
</object>
<object class="NSFont" key="IBUIFont">
<string key="NSName">Helvetica-Bold</string>
<double key="NSSize">15</double>
<int key="NSfFlags">16</int>
</object>
</object> </object>
<object class="IBUILabel" id="270868112"> <object class="IBUILabel" id="270868112">
<reference key="NSNextResponder" ref="191373211"/> <reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int> <int key="NSvFlags">292</int>
<string key="NSFrame">{{76, 20}, {167, 29}}</string> <string key="NSFrame">{{76, 20}, {167, 29}}</string>
<reference key="NSSuperview" ref="191373211"/> <reference key="NSSuperview" ref="191373211"/>
<reference key="NSNextKeyView" ref="1005126370"/>
<bool key="IBUIOpaque">NO</bool> <bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool> <bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">7</int> <int key="IBUIContentMode">7</int>
<bool key="IBUIUserInteractionEnabled">NO</bool> <bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<reference key="IBUIHighlightedColor" ref="367658244"/>
<int key="IBUIBaselineAdjustment">1</int>
<float key="IBUIMinimumFontSize">10</float>
<string key="IBUIText">Touch to Scan</string> <string key="IBUIText">Touch to Scan</string>
<object class="NSColor" key="IBUITextColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC4zNzU5MTI0MDg4AA</bytes>
</object>
<object class="IBUIFontDescription" key="IBUIFontDescription">
<string key="name">Helvetica-Bold</string>
<string key="family">Helvetica</string>
<int key="traits">2</int>
<double key="pointSize">24</double>
</object>
<object class="NSFont" key="IBUIFont"> <object class="NSFont" key="IBUIFont">
<string key="NSName">Helvetica-Bold</string> <string key="NSName">Helvetica-Bold</string>
<double key="NSSize">24</double> <double key="NSSize">24</double>
<int key="NSfFlags">16</int> <int key="NSfFlags">16</int>
</object> </object>
<object class="NSColor" key="IBUITextColor"> <int key="IBUIAutoshrinkMode">2</int>
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC4zNzU5MTI0MDg4AA</bytes>
</object>
<reference key="IBUIHighlightedColor" ref="367658244"/>
<int key="IBUIBaselineAdjustment">1</int>
<float key="IBUIMinimumFontSize">10</float>
</object> </object>
</object> </object>
<string key="NSFrameSize">{320, 367}</string> <string key="NSFrame">{{0, 64}, {320, 367}}</string>
<reference key="NSSuperview"/> <reference key="NSSuperview"/>
<reference key="NSNextKeyView" ref="270868112"/>
<object class="NSColor" key="IBUIBackgroundColor"> <object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">1</int> <int key="NSColorSpace">1</int>
<bytes key="NSRGB">MC45MTM3MjU0OTAyIDAuOTMzMzMzMzMzMyAwLjk1Mjk0MTE3NjUAA</bytes> <bytes key="NSRGB">MC45MTM3MjU0OTAyIDAuOTMzMzMzMzMzMyAwLjk1Mjk0MTE3NjUAA</bytes>
@ -138,7 +152,9 @@
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBObjectRecord"> <object class="IBObjectRecord">
<int key="objectID">0</int> <int key="objectID">0</int>
<reference key="object" ref="0"/> <object class="NSArray" key="object" id="0">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<reference key="children" ref="1000"/> <reference key="children" ref="1000"/>
<nil key="parent"/> <nil key="parent"/>
</object> </object>
@ -180,369 +196,55 @@
<object class="NSArray" key="dict.sortedKeys"> <object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<string>-1.CustomClassName</string> <string>-1.CustomClassName</string>
<string>-1.IBPluginDependency</string>
<string>-2.CustomClassName</string> <string>-2.CustomClassName</string>
<string>1.IBEditorWindowLastContentRect</string> <string>-2.IBPluginDependency</string>
<string>1.IBPluginDependency</string> <string>1.IBPluginDependency</string>
<string>24.IBPluginDependency</string> <string>24.IBPluginDependency</string>
<string>24.IBViewBoundsToFrameTransform</string>
<string>6.IBPluginDependency</string> <string>6.IBPluginDependency</string>
<string>6.IBViewBoundsToFrameTransform</string>
</object> </object>
<object class="NSMutableArray" key="dict.values"> <object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<string>ZXMainViewController</string> <string>ZXMainViewController</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>UIResponder</string> <string>UIResponder</string>
<string>{{340, 276}, {320, 480}}</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABCmgAAwoIAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<object class="NSAffineTransform"> <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<bytes key="NSTransformStruct">P4AAAL+AAABCzgAAw3YAAA</bytes>
</object>
</object> </object>
</object> </object>
<object class="NSMutableDictionary" key="unlocalizedProperties"> <object class="NSMutableDictionary" key="unlocalizedProperties">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<reference key="dict.sortedKeys" ref="0"/> <reference key="dict.sortedKeys" ref="0"/>
<object class="NSMutableArray" key="dict.values"> <reference key="dict.values" ref="0"/>
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
</object> </object>
<nil key="activeLocalization"/> <nil key="activeLocalization"/>
<object class="NSMutableDictionary" key="localizations"> <object class="NSMutableDictionary" key="localizations">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<reference key="dict.sortedKeys" ref="0"/> <reference key="dict.sortedKeys" ref="0"/>
<object class="NSMutableArray" key="dict.values"> <reference key="dict.values" ref="0"/>
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
</object> </object>
<nil key="sourceID"/> <nil key="sourceID"/>
<int key="maxID">24</int> <int key="maxID">24</int>
</object> </object>
<object class="IBClassDescriber" key="IBDocument.Classes"> <object class="IBClassDescriber" key="IBDocument.Classes"/>
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBPartialClassDescription">
<string key="className">ZXMainViewController</string>
<string key="superclassName">UIViewController</string>
<object class="NSMutableDictionary" key="actions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>info:</string>
<string>lastResultAction:</string>
<string>scan:</string>
<string>showArchive:</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>info:</string>
<string>lastResultAction:</string>
<string>scan:</string>
<string>showArchive:</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBActionInfo">
<string key="name">info:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">lastResultAction:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">scan:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">showArchive:</string>
<string key="candidateClassName">id</string>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="outlets">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>lastActionButton</string>
<string>resultView</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>UIButton</string>
<string>UITextView</string>
</object>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>lastActionButton</string>
<string>resultView</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBToOneOutletInfo">
<string key="name">lastActionButton</string>
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">resultView</string>
<string key="candidateClassName">UITextView</string>
</object>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">Classes/ZXMainViewController.h</string>
</object>
</object>
</object>
<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">Foundation.framework/Headers/NSError.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">Foundation.framework/Headers/NSObject.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">Foundation.framework/Headers/NSThread.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">Foundation.framework/Headers/NSURL.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">UIKit.framework/Headers/UIAccessibility.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">UIKit.framework/Headers/UINibLoading.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="890110704">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">UIKit.framework/Headers/UIResponder.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">UIButton</string>
<string key="superclassName">UIControl</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">UIKit.framework/Headers/UIButton.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">UIControl</string>
<string key="superclassName">UIView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">UIKit.framework/Headers/UIControl.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">UILabel</string>
<string key="superclassName">UIView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">UIKit.framework/Headers/UILabel.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">UIResponder</string>
<string key="superclassName">NSObject</string>
<reference key="sourceIdentifier" ref="890110704"/>
</object>
<object class="IBPartialClassDescription">
<string key="className">UIScrollView</string>
<string key="superclassName">UIView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">UIKit.framework/Headers/UIScrollView.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">UISearchBar</string>
<string key="superclassName">UIView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">UIKit.framework/Headers/UISearchBar.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">UISearchDisplayController</string>
<string key="superclassName">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">UIKit.framework/Headers/UISearchDisplayController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">UITextView</string>
<string key="superclassName">UIScrollView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">UIKit.framework/Headers/UITextView.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">UIView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">UIKit.framework/Headers/UIPrintFormatter.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">UIView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">UIKit.framework/Headers/UITextField.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">UIView</string>
<string key="superclassName">UIResponder</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">UIKit.framework/Headers/UIView.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">UIViewController</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">UIKit.framework/Headers/UINavigationController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">UIViewController</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">UIKit.framework/Headers/UIPopoverController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">UIViewController</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">UIKit.framework/Headers/UISplitViewController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">UIViewController</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">UIKit.framework/Headers/UITabBarController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">UIViewController</string>
<string key="superclassName">UIResponder</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">UIKit.framework/Headers/UIViewController.h</string>
</object>
</object>
</object>
</object>
<int key="IBDocument.localizationMode">0</int> <int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string> <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults"> <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
<integer value="1056" key="NS.object.0"/> <real value="1536" key="NS.object.0"/>
</object> </object>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies"> <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
<integer value="3000" key="NS.object.0"/> <integer value="3000" key="NS.object.0"/>
</object> </object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<string key="IBDocument.LastKnownRelativeProjectPath">Barcodes.xcodeproj</string>
<int key="IBDocument.defaultPropertyAccessControl">3</int> <int key="IBDocument.defaultPropertyAccessControl">3</int>
<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes"> <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
<string key="NS.key.0">ZxingLarge.png</string> <string key="NS.key.0">ZxingLarge.png</string>
<string key="NS.object.0">{128, 128}</string> <string key="NS.object.0">{128, 128}</string>
</object> </object>
<string key="IBCocoaTouchPluginVersion">132</string> <string key="IBCocoaTouchPluginVersion">1875</string>
</data> </data>
</archive> </archive>

25
iphone/ScanTest/ScanTest.xcodeproj/project.pbxproj
View file

@ -11,13 +11,13 @@
1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; }; 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; };
1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; }; 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; };
1F027F8511A7BB77006B06DE /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1F027F8411A7BB77006B06DE /* libiconv.dylib */; }; 1F027F8511A7BB77006B06DE /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1F027F8411A7BB77006B06DE /* libiconv.dylib */; };
1F5924BF128955A6006245C2 /* libZXingWidget.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1F027F7E11A7BAD4006B06DE /* libZXingWidget.a */; };
1FF586FD11BBD81D00E8E868 /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1FF586FC11BBD81D00E8E868 /* main.mm */; }; 1FF586FD11BBD81D00E8E868 /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1FF586FC11BBD81D00E8E868 /* main.mm */; };
2892E4100DC94CBA00A64D0F /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2892E40F0DC94CBA00A64D0F /* CoreGraphics.framework */; }; 2892E4100DC94CBA00A64D0F /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2892E40F0DC94CBA00A64D0F /* CoreGraphics.framework */; };
28AD73600D9D9599002E5188 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 28AD735F0D9D9599002E5188 /* MainWindow.xib */; }; 28AD73600D9D9599002E5188 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 28AD735F0D9D9599002E5188 /* MainWindow.xib */; };
28C286E10D94DF7D0034E888 /* RootViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 28C286E00D94DF7D0034E888 /* RootViewController.mm */; }; 28C286E10D94DF7D0034E888 /* RootViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 28C286E00D94DF7D0034E888 /* RootViewController.mm */; };
28F335F11007B36200424DE2 /* RootViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 28F335F01007B36200424DE2 /* RootViewController.xib */; }; 28F335F11007B36200424DE2 /* RootViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 28F335F01007B36200424DE2 /* RootViewController.xib */; };
3B0A5DB91444C492000EC568 /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 3B0A5DB81444C492000EC568 /* Icon.png */; }; 3B0A5DB91444C492000EC568 /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 3B0A5DB81444C492000EC568 /* Icon.png */; };
3B43FDCB15939575001CD5C9 /* libZXingWidget.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1F027F7E11A7BAD4006B06DE /* libZXingWidget.a */; };
3BCED5C8120F84C900131FA0 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BCED5C7120F84C900131FA0 /* AVFoundation.framework */; }; 3BCED5C8120F84C900131FA0 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BCED5C7120F84C900131FA0 /* AVFoundation.framework */; };
3BCED5CE120F84E000131FA0 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BCED5CD120F84E000131FA0 /* CoreVideo.framework */; }; 3BCED5CE120F84E000131FA0 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BCED5CD120F84E000131FA0 /* CoreVideo.framework */; };
3BCED5EB120F885C00131FA0 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BCED5EA120F885C00131FA0 /* CoreMedia.framework */; }; 3BCED5EB120F885C00131FA0 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BCED5EA120F885C00131FA0 /* CoreMedia.framework */; };
@ -33,7 +33,7 @@
remoteGlobalIDString = D2AAC07E0554694100DB518D; remoteGlobalIDString = D2AAC07E0554694100DB518D;
remoteInfo = ZXingWidget; remoteInfo = ZXingWidget;
}; };
1F027F8011A7BB06006B06DE /* PBXContainerItemProxy */ = { 3B43FDC915939570001CD5C9 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy; isa = PBXContainerItemProxy;
containerPortal = 1F027F7611A7BAD4006B06DE /* ZXingWidget.xcodeproj */; containerPortal = 1F027F7611A7BAD4006B06DE /* ZXingWidget.xcodeproj */;
proxyType = 1; proxyType = 1;
@ -79,6 +79,7 @@
isa = PBXFrameworksBuildPhase; isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
3B43FDCB15939575001CD5C9 /* libZXingWidget.a in Frameworks */,
1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */, 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */,
1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */, 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */,
2892E4100DC94CBA00A64D0F /* CoreGraphics.framework in Frameworks */, 2892E4100DC94CBA00A64D0F /* CoreGraphics.framework in Frameworks */,
@ -87,7 +88,6 @@
3BCED5C8120F84C900131FA0 /* AVFoundation.framework in Frameworks */, 3BCED5C8120F84C900131FA0 /* AVFoundation.framework in Frameworks */,
3BCED5CE120F84E000131FA0 /* CoreVideo.framework in Frameworks */, 3BCED5CE120F84E000131FA0 /* CoreVideo.framework in Frameworks */,
3BCED5EB120F885C00131FA0 /* CoreMedia.framework in Frameworks */, 3BCED5EB120F885C00131FA0 /* CoreMedia.framework in Frameworks */,
1F5924BF128955A6006245C2 /* libZXingWidget.a in Frameworks */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
@ -114,14 +114,6 @@
name = Products; name = Products;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
1F027F6D11A7BAB1006B06DE /* Dependencies */ = {
isa = PBXGroup;
children = (
1F027F7611A7BAD4006B06DE /* ZXingWidget.xcodeproj */,
);
name = Dependencies;
sourceTree = "<group>";
};
1F027F7711A7BAD4006B06DE /* Products */ = { 1F027F7711A7BAD4006B06DE /* Products */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
@ -134,10 +126,10 @@
29B97314FDCFA39411CA2CEA /* CustomTemplate */ = { 29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
1F027F7611A7BAD4006B06DE /* ZXingWidget.xcodeproj */,
080E96DDFE201D6D7F000001 /* Classes */, 080E96DDFE201D6D7F000001 /* Classes */,
29B97315FDCFA39411CA2CEA /* Other Sources */, 29B97315FDCFA39411CA2CEA /* Other Sources */,
29B97317FDCFA39411CA2CEA /* Resources */, 29B97317FDCFA39411CA2CEA /* Resources */,
1F027F6D11A7BAB1006B06DE /* Dependencies */,
29B97323FDCFA39411CA2CEA /* Frameworks */, 29B97323FDCFA39411CA2CEA /* Frameworks */,
19C28FACFE9D520D11CA2CBB /* Products */, 19C28FACFE9D520D11CA2CBB /* Products */,
); );
@ -194,7 +186,7 @@
buildRules = ( buildRules = (
); );
dependencies = ( dependencies = (
1F027F8111A7BB06006B06DE /* PBXTargetDependency */, 3B43FDCA15939570001CD5C9 /* PBXTargetDependency */,
); );
name = ScanTest; name = ScanTest;
productName = ScanTest; productName = ScanTest;
@ -207,7 +199,7 @@
29B97313FDCFA39411CA2CEA /* Project object */ = { 29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject; isa = PBXProject;
attributes = { attributes = {
LastUpgradeCheck = 0430; LastUpgradeCheck = 0450;
}; };
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "ScanTest" */; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "ScanTest" */;
compatibilityVersion = "Xcode 3.2"; compatibilityVersion = "Xcode 3.2";
@ -280,10 +272,10 @@
/* End PBXSourcesBuildPhase section */ /* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */ /* Begin PBXTargetDependency section */
1F027F8111A7BB06006B06DE /* PBXTargetDependency */ = { 3B43FDCA15939570001CD5C9 /* PBXTargetDependency */ = {
isa = PBXTargetDependency; isa = PBXTargetDependency;
name = ZXingWidget; name = ZXingWidget;
targetProxy = 1F027F8011A7BB06006B06DE /* PBXContainerItemProxy */; targetProxy = 3B43FDC915939570001CD5C9 /* PBXContainerItemProxy */;
}; };
/* End PBXTargetDependency section */ /* End PBXTargetDependency section */
@ -303,6 +295,7 @@
"GCC_THUMB_SUPPORT[arch=armv6]" = NO; "GCC_THUMB_SUPPORT[arch=armv6]" = NO;
INFOPLIST_FILE = "ScanTest-Info.plist"; INFOPLIST_FILE = "ScanTest-Info.plist";
LIBRARY_SEARCH_PATHS = "$(inherited)"; LIBRARY_SEARCH_PATHS = "$(inherited)";
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = ""; OTHER_LDFLAGS = "";
PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES; PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
PRODUCT_NAME = ScanTest; PRODUCT_NAME = ScanTest;

17
iphone/ZXingWidget/Classes/parsedResults/ParsedResult.m
View file

@ -35,10 +35,6 @@
static NSMutableDictionary *iconsByClass = nil; static NSMutableDictionary *iconsByClass = nil;
+ (NSString *)typeName {
return NSStringFromClass(self);
}
- (NSString *)stringForDisplay { - (NSString *)stringForDisplay {
return @"{none}"; return @"{none}";
} }
@ -46,11 +42,15 @@ static NSMutableDictionary *iconsByClass = nil;
#define ICON_SIZE 40 #define ICON_SIZE 40
#define ICON_INSIDE 36 #define ICON_INSIDE 36
+ (NSString *)typeName {
return NSStringFromClass(self);
}
+ (UIImage *)icon { + (UIImage *)icon {
if (iconsByClass == nil) { if (iconsByClass == nil) {
iconsByClass = [[NSMutableDictionary alloc] initWithCapacity:16]; iconsByClass = [[NSMutableDictionary alloc] initWithCapacity:16];
} }
UIImage *icon = [iconsByClass objectForKey:[self class]]; UIImage *icon = [iconsByClass objectForKey:NSStringFromClass([self class])];
if (icon == nil) { if (icon == nil) {
UIGraphicsBeginImageContext(CGSizeMake(ICON_SIZE, ICON_SIZE)); UIGraphicsBeginImageContext(CGSizeMake(ICON_SIZE, ICON_SIZE));
CGContextRef ctx = UIGraphicsGetCurrentContext(); CGContextRef ctx = UIGraphicsGetCurrentContext();
@ -59,7 +59,7 @@ static NSMutableDictionary *iconsByClass = nil;
UIRectFill(CGRectMake(0, 0, ICON_SIZE, ICON_SIZE)); UIRectFill(CGRectMake(0, 0, ICON_SIZE, ICON_SIZE));
[[UIColor blackColor] set]; [[UIColor blackColor] set];
NSString *s = [[self class] typeName]; NSString *s = NSStringFromClass([self class]);
UIFont *font = [UIFont systemFontOfSize:16]; UIFont *font = [UIFont systemFontOfSize:16];
CGSize stringSize = [s sizeWithFont:font]; CGSize stringSize = [s sizeWithFont:font];
float xScale = fminf(1.0, ICON_INSIDE / stringSize.width); float xScale = fminf(1.0, ICON_INSIDE / stringSize.width);
@ -74,8 +74,11 @@ static NSMutableDictionary *iconsByClass = nil;
[s drawAtPoint:CGPointMake(0, 0) withFont:font]; [s drawAtPoint:CGPointMake(0, 0) withFont:font];
// N.B.: I think this is overretained but it's static so doesn't matter and
// I don't want to test right now. (smp)
icon = [UIGraphicsGetImageFromCurrentImageContext() retain]; icon = [UIGraphicsGetImageFromCurrentImageContext() retain];
[iconsByClass setObject:icon forKey:[self class]]; [iconsByClass setObject:icon forKey:NSStringFromClass([self class])];
UIGraphicsEndImageContext(); UIGraphicsEndImageContext();
} }
return icon; return icon;

11
iphone/ZXingWidget/ZXingWidget.xcodeproj/project.pbxproj
View file

@ -624,9 +624,6 @@
0867D69AFE84028FC02AAC07 /* Frameworks */, 0867D69AFE84028FC02AAC07 /* Frameworks */,
E5345D2811999F53000CB77F /* Resources */, E5345D2811999F53000CB77F /* Resources */,
034768DFFF38A50411DB9C8B /* Products */, 034768DFFF38A50411DB9C8B /* Products */,
1D60391813DF7780006F4B51 /* AddressBook.framework */,
1D60391E13DF778C006F4B51 /* AddressBookUI.framework */,
1D6040C413E3393B006F4B51 /* AVFoundation.framework */,
); );
name = ZXingWidget; name = ZXingWidget;
sourceTree = "<group>"; sourceTree = "<group>";
@ -634,6 +631,9 @@
0867D69AFE84028FC02AAC07 /* Frameworks */ = { 0867D69AFE84028FC02AAC07 /* Frameworks */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
1D60391813DF7780006F4B51 /* AddressBook.framework */,
1D60391E13DF778C006F4B51 /* AddressBookUI.framework */,
1D6040C413E3393B006F4B51 /* AVFoundation.framework */,
AACBBE490F95108600F1A2B1 /* Foundation.framework */, AACBBE490F95108600F1A2B1 /* Foundation.framework */,
E53459CA119873F3000CB77F /* UIKit.framework */, E53459CA119873F3000CB77F /* UIKit.framework */,
E5345A651198792F000CB77F /* AudioToolbox.framework */, E5345A651198792F000CB77F /* AudioToolbox.framework */,
@ -1259,7 +1259,7 @@
0867D690FE84028FC02AAC07 /* Project object */ = { 0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject; isa = PBXProject;
attributes = { attributes = {
LastUpgradeCheck = 0430; LastUpgradeCheck = 0450;
}; };
buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "ZXingWidget" */; buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "ZXingWidget" */;
compatibilityVersion = "Xcode 3.2"; compatibilityVersion = "Xcode 3.2";
@ -1544,6 +1544,7 @@
LD_GENERATE_MAP_FILE = YES; LD_GENERATE_MAP_FILE = YES;
LD_OPENMP_FLAGS = "-fopenmp"; LD_OPENMP_FLAGS = "-fopenmp";
MACH_O_TYPE = staticlib; MACH_O_TYPE = staticlib;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"-ObjC", "-ObjC",
"-M", "-M",
@ -1590,6 +1591,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 4.0; IPHONEOS_DEPLOYMENT_TARGET = 4.0;
OTHER_LDFLAGS = "-ObjC"; OTHER_LDFLAGS = "-ObjC";
SDKROOT = iphoneos; SDKROOT = iphoneos;
VALID_ARCHS = "armv7 armv6";
WARNING_CFLAGS = ( WARNING_CFLAGS = (
"-Wall", "-Wall",
"-Wextra", "-Wextra",
@ -1616,6 +1618,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 4.0; IPHONEOS_DEPLOYMENT_TARGET = 4.0;
OTHER_LDFLAGS = "-ObjC"; OTHER_LDFLAGS = "-ObjC";
SDKROOT = iphoneos; SDKROOT = iphoneos;
VALID_ARCHS = "armv7 armv6";
WARNING_CFLAGS = ( WARNING_CFLAGS = (
"-Wall", "-Wall",
"-Wextra", "-Wextra",

8
objc/examples/ios/bare/bare.xcodeproj/project.pbxproj
View file

@ -185,7 +185,7 @@
3BA99649159122210056A230 /* Project object */ = { 3BA99649159122210056A230 /* Project object */ = {
isa = PBXProject; isa = PBXProject;
attributes = { attributes = {
LastUpgradeCheck = 0430; LastUpgradeCheck = 0450;
}; };
buildConfigurationList = 3BA9964C159122210056A230 /* Build configuration list for PBXProject "bare" */; buildConfigurationList = 3BA9964C159122210056A230 /* Build configuration list for PBXProject "bare" */;
compatibilityVersion = "Xcode 3.2"; compatibilityVersion = "Xcode 3.2";
@ -307,6 +307,7 @@
"$(inherited)", "$(inherited)",
); );
GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_SYMBOLS_PRIVATE_EXTERN = NO;
"GCC_THUMB_SUPPORT[arch=armv6]" = NO;
GCC_TREAT_WARNINGS_AS_ERRORS = YES; GCC_TREAT_WARNINGS_AS_ERRORS = YES;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES;
@ -330,6 +331,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = YES; COPY_PHASE_STRIP = YES;
GCC_C_LANGUAGE_STANDARD = gnu99; GCC_C_LANGUAGE_STANDARD = gnu99;
"GCC_THUMB_SUPPORT[arch=armv6]" = NO;
GCC_TREAT_WARNINGS_AS_ERRORS = YES; GCC_TREAT_WARNINGS_AS_ERRORS = YES;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES;
@ -350,6 +352,7 @@
ALWAYS_SEARCH_USER_PATHS = YES; ALWAYS_SEARCH_USER_PATHS = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "bare/bare-Prefix.pch"; GCC_PREFIX_HEADER = "bare/bare-Prefix.pch";
"GCC_THUMB_SUPPORT[arch=armv6]" = NO;
HEADER_SEARCH_PATHS = ( HEADER_SEARCH_PATHS = (
objc/cpp/core/src, objc/cpp/core/src,
objc/src, objc/src,
@ -360,6 +363,7 @@
"\"$(SRCROOT)/../../../../../../Library/Developer/Xcode/DerivedData/bare-ceenmvkaxbzcsubayrtaunypjmgx/Build/Products/Debug-iphoneos\"", "\"$(SRCROOT)/../../../../../../Library/Developer/Xcode/DerivedData/bare-ceenmvkaxbzcsubayrtaunypjmgx/Build/Products/Debug-iphoneos\"",
); );
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
VALID_ARCHS = "armv7 armv6";
WRAPPER_EXTENSION = app; WRAPPER_EXTENSION = app;
}; };
name = Debug; name = Debug;
@ -370,6 +374,7 @@
ALWAYS_SEARCH_USER_PATHS = YES; ALWAYS_SEARCH_USER_PATHS = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "bare/bare-Prefix.pch"; GCC_PREFIX_HEADER = "bare/bare-Prefix.pch";
"GCC_THUMB_SUPPORT[arch=armv6]" = NO;
HEADER_SEARCH_PATHS = ( HEADER_SEARCH_PATHS = (
objc/cpp/core/src, objc/cpp/core/src,
objc/src, objc/src,
@ -380,6 +385,7 @@
"\"$(SRCROOT)/../../../../../../Library/Developer/Xcode/DerivedData/bare-ceenmvkaxbzcsubayrtaunypjmgx/Build/Products/Debug-iphoneos\"", "\"$(SRCROOT)/../../../../../../Library/Developer/Xcode/DerivedData/bare-ceenmvkaxbzcsubayrtaunypjmgx/Build/Products/Debug-iphoneos\"",
); );
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
VALID_ARCHS = "armv7 armv6";
WRAPPER_EXTENSION = app; WRAPPER_EXTENSION = app;
}; };
name = Release; name = Release;

4
objc/examples/osx/demo/demo.xcodeproj/project.pbxproj
View file

@ -187,7 +187,7 @@
3B5D0F69159101EE00C33931 /* Project object */ = { 3B5D0F69159101EE00C33931 /* Project object */ = {
isa = PBXProject; isa = PBXProject;
attributes = { attributes = {
LastUpgradeCheck = 0430; LastUpgradeCheck = 0450;
}; };
buildConfigurationList = 3B5D0F6C159101EE00C33931 /* Build configuration list for PBXProject "demo" */; buildConfigurationList = 3B5D0F6C159101EE00C33931 /* Build configuration list for PBXProject "demo" */;
compatibilityVersion = "Xcode 3.2"; compatibilityVersion = "Xcode 3.2";
@ -323,6 +323,7 @@
buildSettings = { buildSettings = {
ALWAYS_SEARCH_USER_PATHS = YES; ALWAYS_SEARCH_USER_PATHS = YES;
ARCHS = "$(ARCHS_STANDARD_64_BIT)"; ARCHS = "$(ARCHS_STANDARD_64_BIT)";
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
GCC_C_LANGUAGE_STANDARD = gnu99; GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO; GCC_DYNAMIC_NO_PIC = NO;
@ -353,6 +354,7 @@
buildSettings = { buildSettings = {
ALWAYS_SEARCH_USER_PATHS = YES; ALWAYS_SEARCH_USER_PATHS = YES;
ARCHS = "$(ARCHS_STANDARD_64_BIT)"; ARCHS = "$(ARCHS_STANDARD_64_BIT)";
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES; COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_C_LANGUAGE_STANDARD = gnu99; GCC_C_LANGUAGE_STANDARD = gnu99;

10
objc/ios.xcodeproj/project.pbxproj
View file

@ -150,7 +150,7 @@
0867D690FE84028FC02AAC07 /* Project object */ = { 0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject; isa = PBXProject;
attributes = { attributes = {
LastUpgradeCheck = 0430; LastUpgradeCheck = 0450;
}; };
buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "ios" */; buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "ios" */;
compatibilityVersion = "Xcode 3.2"; compatibilityVersion = "Xcode 3.2";
@ -209,6 +209,8 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = ios_Prefix.pch; GCC_PREFIX_HEADER = ios_Prefix.pch;
GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_SYMBOLS_PRIVATE_EXTERN = YES;
"GCC_THUMB_SUPPORT[arch=armv6]" = NO;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
INSTALL_PATH = /usr/local/lib; INSTALL_PATH = /usr/local/lib;
PRODUCT_NAME = zxingmm; PRODUCT_NAME = zxingmm;
}; };
@ -223,6 +225,8 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = ios_Prefix.pch; GCC_PREFIX_HEADER = ios_Prefix.pch;
GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_SYMBOLS_PRIVATE_EXTERN = YES;
"GCC_THUMB_SUPPORT[arch=armv6]" = NO;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
INSTALL_PATH = /usr/local/lib; INSTALL_PATH = /usr/local/lib;
PRODUCT_NAME = zxingmm; PRODUCT_NAME = zxingmm;
}; };
@ -333,6 +337,8 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = ios_Prefix.pch; GCC_PREFIX_HEADER = ios_Prefix.pch;
GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_SYMBOLS_PRIVATE_EXTERN = YES;
"GCC_THUMB_SUPPORT[arch=armv6]" = NO;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
INSTALL_PATH = /usr/local/lib; INSTALL_PATH = /usr/local/lib;
PRODUCT_NAME = zxingmm; PRODUCT_NAME = zxingmm;
}; };
@ -378,6 +384,8 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = ios_Prefix.pch; GCC_PREFIX_HEADER = ios_Prefix.pch;
GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_SYMBOLS_PRIVATE_EXTERN = YES;
"GCC_THUMB_SUPPORT[arch=armv6]" = NO;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
INSTALL_PATH = /usr/local/lib; INSTALL_PATH = /usr/local/lib;
PRODUCT_NAME = zxingmm; PRODUCT_NAME = zxingmm;
}; };

17
objc/src/ZXing/CGImageLuminanceSource.mm
View file

@ -23,9 +23,9 @@ namespace zxing {
CGImageRef CGImageLuminanceSource::createImageFromBuffer CGImageRef CGImageLuminanceSource::createImageFromBuffer
(CVPixelBufferRef buffer, int left, int top, int width, int height) (CVPixelBufferRef buffer, int left, int top, int width, int height)
{ {
int bytesPerRow = CVPixelBufferGetBytesPerRow(buffer); int bytesPerRow = (int)CVPixelBufferGetBytesPerRow(buffer);
int dataWidth = CVPixelBufferGetWidth(buffer); int dataWidth = (int)CVPixelBufferGetWidth(buffer);
int dataHeight = CVPixelBufferGetHeight(buffer); int dataHeight = (int)CVPixelBufferGetHeight(buffer);
if (left + width > dataWidth || if (left + width > dataWidth ||
top + height > dataHeight || top + height > dataHeight ||
@ -82,8 +82,8 @@ CGImageRef CGImageLuminanceSource::createImageFromBuffer
(buffer, (buffer,
0, 0,
0, 0,
CVPixelBufferGetWidth(buffer), (int)CVPixelBufferGetWidth(buffer),
CVPixelBufferGetHeight(buffer)); (int)CVPixelBufferGetHeight(buffer));
} }
CGImageLuminanceSource::CGImageLuminanceSource(CVPixelBufferRef buffer) CGImageLuminanceSource::CGImageLuminanceSource(CVPixelBufferRef buffer)
@ -115,7 +115,8 @@ CGImageLuminanceSource::CGImageLuminanceSource
void void
CGImageLuminanceSource::init(CGImageRef cgimage) CGImageLuminanceSource::init(CGImageRef cgimage)
{ {
init(cgimage, 0, 0, CGImageGetWidth(cgimage), CGImageGetHeight(cgimage)); init(cgimage,
0, 0, (int)CGImageGetWidth(cgimage), (int)CGImageGetHeight(cgimage));
} }
void void
@ -127,8 +128,8 @@ CGImageLuminanceSource::init
top_ = top; top_ = top;
width_ = width; width_ = width;
height_ = height; height_ = height;
dataWidth_ = CGImageGetWidth(image_); dataWidth_ = (int)CGImageGetWidth(image_);
dataHeight_ = CGImageGetHeight(image_); dataHeight_ = (int)CGImageGetHeight(image_);
if (left_ + width_ > dataWidth_ || if (left_ + width_ > dataWidth_ ||
top_ + height_ > dataHeight_ || top_ + height_ > dataHeight_ ||

17
objc/src/ZXing/ZXCGImageLuminanceSource.mm
View file

@ -29,8 +29,9 @@
top:(size_t)top top:(size_t)top
width:(size_t)width width:(size_t)width
height:(size_t)height { height:(size_t)height {
return zxing::CGImageLuminanceSource::createImageFromBuffer return zxing::CGImageLuminanceSource::createImageFromBuffer(
(buffer, left, top, width, height); buffer, (int)left, (int)top, (int)width, (int)height
);
} }
- (id)initWithZXImage:(ZXImage*)image - (id)initWithZXImage:(ZXImage*)image
@ -38,7 +39,9 @@
top:(size_t)top top:(size_t)top
width:(size_t)width width:(size_t)width
height:(size_t)height { height:(size_t)height {
self = [super initWithNative:new zxing::CGImageLuminanceSource(image.cgimage, left, top, width, height)]; self = [super initWithNative:new zxing::CGImageLuminanceSource(
image.cgimage, (int)left, (int)top, (int)width, (int)height
)];
return self; return self;
} }
@ -52,7 +55,9 @@
top:(size_t)top top:(size_t)top
width:(size_t)width width:(size_t)width
height:(size_t)height { height:(size_t)height {
self = [super initWithNative:new zxing::CGImageLuminanceSource(image, left, top, width, height)]; self = [super initWithNative:new zxing::CGImageLuminanceSource(
image, (int)left, (int)top, (int)width, (int)height
)];
return self; return self;
} }
@ -66,7 +71,9 @@
top:(size_t)top top:(size_t)top
width:(size_t)width width:(size_t)width
height:(size_t)height { height:(size_t)height {
self = [super initWithNative:new zxing::CGImageLuminanceSource(buffer, left, top, width, height)]; self = [super initWithNative:new zxing::CGImageLuminanceSource(
buffer, (int)left, (int)top, (int)width, (int)height
)];
return self; return self;
} }

6
objc/src/ZXing/ZXCapture.mm
View file

@ -223,10 +223,10 @@ static bool isIPad();
NSMutableDictionary* attributes = NSMutableDictionary* attributes =
[NSMutableDictionary dictionaryWithObject:value forKey:key]; [NSMutableDictionary dictionaryWithObject:value forKey:key];
key = (NSString*)kCVPixelBufferWidthKey; key = (NSString*)kCVPixelBufferWidthKey;
value = [NSNumber numberWithUnsignedInt:width]; value = [NSNumber numberWithUnsignedLong:width];
[attributes setObject:value forKey:key]; [attributes setObject:value forKey:key];
key = (NSString*)kCVPixelBufferHeightKey; key = (NSString*)kCVPixelBufferHeightKey;
value = [NSNumber numberWithUnsignedInt:height]; value = [NSNumber numberWithUnsignedLong:height];
[attributes setObject:value forKey:key]; [attributes setObject:value forKey:key];
[output ZXQT(setPixelBufferAttributes:)ZXAV(setVideoSettings:)attributes]; [output ZXQT(setPixelBufferAttributes:)ZXAV(setVideoSettings:)attributes];
} }
@ -458,7 +458,7 @@ ZXAV(didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer)
[self performSelectorOnMainThread:@selector(setOutputAttributes) withObject:nil waitUntilDone:NO]; [self performSelectorOnMainThread:@selector(setOutputAttributes) withObject:nil waitUntilDone:NO];
reported_width = size.width; reported_width = size.width;
reported_height = size.height; reported_height = size.height;
if ([delegate respondsTo:@selector(captureSize:width:height:)]) { if ([delegate respondsToSelector:@selector(captureSize:width:height:)]) {
[delegate captureSize:self [delegate captureSize:self
width:[NSNumber numberWithFloat:size.width] width:[NSNumber numberWithFloat:size.width]
height:[NSNumber numberWithFloat:size.height]]; height:[NSNumber numberWithFloat:size.height]];

8
objc/zxing-objc.xcodeproj/project.pbxproj
View file

@ -366,7 +366,7 @@
3B83EB1C158E6C5100A3B31F /* Project object */ = { 3B83EB1C158E6C5100A3B31F /* Project object */ = {
isa = PBXProject; isa = PBXProject;
attributes = { attributes = {
LastUpgradeCheck = 0430; LastUpgradeCheck = 0450;
}; };
buildConfigurationList = 3B83EB1F158E6C5100A3B31F /* Build configuration list for PBXProject "zxing-objc" */; buildConfigurationList = 3B83EB1F158E6C5100A3B31F /* Build configuration list for PBXProject "zxing-objc" */;
compatibilityVersion = "Xcode 3.2"; compatibilityVersion = "Xcode 3.2";
@ -505,6 +505,7 @@
buildSettings = { buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO; ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_32_BIT)"; ARCHS = "$(ARCHS_STANDARD_32_BIT)";
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
GCC_C_LANGUAGE_STANDARD = gnu99; GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO; GCC_DYNAMIC_NO_PIC = NO;
@ -539,6 +540,7 @@
buildSettings = { buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO; ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_32_BIT)"; ARCHS = "$(ARCHS_STANDARD_32_BIT)";
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES; COPY_PHASE_STRIP = YES;
GCC_C_LANGUAGE_STANDARD = gnu99; GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_TREAT_WARNINGS_AS_ERRORS = YES; GCC_TREAT_WARNINGS_AS_ERRORS = YES;
@ -574,7 +576,7 @@
DSTROOT = /tmp/zxing_objc.dst; DSTROOT = /tmp/zxing_objc.dst;
GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = src/Prefix.pch; GCC_PREFIX_HEADER = src/Prefix.pch;
GCC_THUMB_SUPPORT = NO; "GCC_THUMB_SUPPORT[arch=armv6]" = NO;
OTHER_LDFLAGS = "-ObjC"; OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES; SKIP_INSTALL = YES;
@ -593,7 +595,7 @@
DSTROOT = /tmp/zxing_objc.dst; DSTROOT = /tmp/zxing_objc.dst;
GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = src/Prefix.pch; GCC_PREFIX_HEADER = src/Prefix.pch;
GCC_THUMB_SUPPORT = NO; "GCC_THUMB_SUPPORT[arch=armv6]" = NO;
OTHER_LDFLAGS = "-ObjC"; OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES; SKIP_INSTALL = YES;