[zbar-commits] push rev [272]: release updates
Status: Beta
Brought to you by:
spadix
Menu
▾
▴
[zbar-commits] push rev [272]: release updates
|
From: <sp...@us...> - 2010-11-29 20:34:39
|
changeset: 272:12de07e51dce user: sp...@us... date: Mon Nov 29 12:25:17 2010 -0800 details: http://zbar.hg.sourceforge.net:8000/hgroot/zbar/zbarzbar/rev/12de07e51dce description: release updates - update docs diffstat: iphone/ChangeLog | 5 ++++- iphone/README | 4 ++-- iphone/doc/ZBarSymbol.rst | 8 ++++++++ iphone/examples/ReaderSample/ReaderSample.xcodeproj/project.pbxproj | 4 ++-- iphone/examples/readertest/readertest.xcodeproj/project.pbxproj | 4 ++-- iphone/res/ZBarSDK-Info.plist | 2 +- iphone/res/zbar-help.html | 7 ++++++- iphone/zbar.xcodeproj/project.pbxproj | 6 ++++-- 8 files changed, 29 insertions(+), 11 deletions(-) diffs (163 lines): diff -r ee89b89ef55e -r 12de07e51dce iphone/ChangeLog --- a/iphone/ChangeLog Sun Nov 28 19:13:52 2010 -0800 +++ b/iphone/ChangeLog Mon Nov 29 12:25:17 2010 -0800 @@ -1,4 +1,7 @@ -current: +version 1.0.1: + * release updates + - update docs + * fix support for GS1 AIs * fix simulated camera image orientation/scaling * cleanup and expose ZBarHelpController * expose enable for reader capture processing diff -r ee89b89ef55e -r 12de07e51dce iphone/README --- a/iphone/README Sun Nov 28 19:13:52 2010 -0800 +++ b/iphone/README Mon Nov 29 12:25:17 2010 -0800 @@ -4,8 +4,8 @@ ZBar Bar Code Reader is an open source software suite for reading bar codes from various sources, such as video streams, image files and raw intensity sensors. It supports EAN-13/UPC-A, UPC-E, EAN-8, DataBar, -Code 128, Code 39, Interleaved 2 of 5 and QR Code. These are the -Objective C wrappers and integrated widget for developing with the +Code 128, Code 93, Code 39, Interleaved 2 of 5 and QR Code. These are +the Objective C wrappers and integrated widget for developing with the library on the iPhone platform. Check the ZBar project home page for the latest release, forums, etc. diff -r ee89b89ef55e -r 12de07e51dce iphone/doc/ZBarSymbol.rst --- a/iphone/doc/ZBarSymbol.rst Sun Nov 28 19:13:52 2010 -0800 +++ b/iphone/doc/ZBarSymbol.rst Mon Nov 29 12:25:17 2010 -0800 @@ -25,6 +25,14 @@ The canonical name used by the library to represent the symbology. (read-only) + .. member:: NSUInteger configMask + + Bitmask of symbology config settings used during decode. + + .. member:: NSUInteger modifierMask + + Bitmask of symbology characteristics detected during decode. + .. member:: NSString *data The raw decoded barcode data. (read-only) diff -r ee89b89ef55e -r 12de07e51dce iphone/examples/ReaderSample/ReaderSample.xcodeproj/project.pbxproj --- a/iphone/examples/ReaderSample/ReaderSample.xcodeproj/project.pbxproj Sun Nov 28 19:13:52 2010 -0800 +++ b/iphone/examples/ReaderSample/ReaderSample.xcodeproj/project.pbxproj Mon Nov 29 12:25:17 2010 -0800 @@ -340,7 +340,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 4.0; PREBINDING = NO; - SDKROOT = iphoneos4.1; + SDKROOT = iphoneos; }; name = Debug; }; @@ -355,7 +355,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 4.0; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; PREBINDING = NO; - SDKROOT = iphoneos4.1; + SDKROOT = iphoneos; }; name = Release; }; diff -r ee89b89ef55e -r 12de07e51dce iphone/examples/readertest/readertest.xcodeproj/project.pbxproj --- a/iphone/examples/readertest/readertest.xcodeproj/project.pbxproj Sun Nov 28 19:13:52 2010 -0800 +++ b/iphone/examples/readertest/readertest.xcodeproj/project.pbxproj Mon Nov 29 12:25:17 2010 -0800 @@ -298,7 +298,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 3.1; PREBINDING = NO; - SDKROOT = iphoneos4.1; + SDKROOT = iphoneos; SYMROOT = /tmp/readertest.build; }; name = Debug; @@ -313,7 +313,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 3.1; PREBINDING = NO; - SDKROOT = iphoneos4.1; + SDKROOT = iphoneos; SYMROOT = /tmp/readertest.build; }; name = Release; diff -r ee89b89ef55e -r 12de07e51dce iphone/res/ZBarSDK-Info.plist --- a/iphone/res/ZBarSDK-Info.plist Sun Nov 28 19:13:52 2010 -0800 +++ b/iphone/res/ZBarSDK-Info.plist Mon Nov 29 12:25:17 2010 -0800 @@ -7,7 +7,7 @@ <key>CFBundleName</key> <string>ZBarSDK</string> <key>CFBundleVersion</key> - <string>1.0</string> + <string>1.0.1</string> <key>CFBundleSignature</key> <string>????</string> <key>NSHumanReadableCopyright</key> diff -r ee89b89ef55e -r 12de07e51dce iphone/res/zbar-help.html --- a/iphone/res/zbar-help.html Sun Nov 28 19:13:52 2010 -0800 +++ b/iphone/res/zbar-help.html Mon Nov 29 12:25:17 2010 -0800 @@ -41,7 +41,12 @@ <a class="sample" style="width: 96px" href="http://wikipedia.org/wiki/QR_Code"></a> <p class="cen"><a href="http://wikipedia.org/wiki/QR_Code">QR Codes</a></p> </div> -<p class="clear cen smaller">Also recognized, but not shown: <a href="http://wikipedia.org/wiki/Code_128">Code 128</a>, <a href="http://en.wikipedia.org/wiki/Code_93">Code 93</a> and <a href="http://wikipedia.org/wiki/Code_39">Code 39</a></p> +<p class="clear cen smaller">Also recognized, but not shown: +<a href="http://wikipedia.org/wiki/Code_128">Code 128</a>, +<a href="http://wikipedia.org/wiki/DataBar">DataBar (RSS)</a>, +<a href="http://en.wikipedia.org/wiki/Code_93">Code 93</a>, +<a href="http://wikipedia.org/wiki/Code_39">Code 39</a> and +<a href="http://wikipedia.org/wiki/Interleaved_2_of_5">Interleaved 2 of 5</a></p> <hr/> <p class="clear title">Hints for successful scanning</p> <div class="iconlist"> diff -r ee89b89ef55e -r 12de07e51dce iphone/zbar.xcodeproj/project.pbxproj --- a/iphone/zbar.xcodeproj/project.pbxproj Sun Nov 28 19:13:52 2010 -0800 +++ b/iphone/zbar.xcodeproj/project.pbxproj Mon Nov 29 12:25:17 2010 -0800 @@ -114,6 +114,7 @@ DC67C1C210A07B6B0033B702 /* ZBarHelpController.m in Sources */ = {isa = PBXBuildFile; fileRef = DC67C1BE10A07B6B0033B702 /* ZBarHelpController.m */; }; DC67C1C310A07B6B0033B702 /* ZBarReaderController.m in Sources */ = {isa = PBXBuildFile; fileRef = DC67C1BF10A07B6B0033B702 /* ZBarReaderController.m */; }; DC67C1C410A07B6B0033B702 /* ZBarSymbol.m in Sources */ = {isa = PBXBuildFile; fileRef = DC67C1C010A07B6B0033B702 /* ZBarSymbol.m */; }; + DCB3789B12A43CAC0059B07B /* ZBarHelpController.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = DCB3789A12A43C7E0059B07B /* ZBarHelpController.h */; }; DCDC6E3011ADCA8E00021380 /* ZBarReaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = DCDC6E2F11ADCA8E00021380 /* ZBarReaderView.m */; }; DCE9900D129719F100D2655C /* code93.c in Sources */ = {isa = PBXBuildFile; fileRef = DCE9900B129719F100D2655C /* code93.c */; }; DCF5C9AD11EA3AD100E7DC21 /* databar.c in Sources */ = {isa = PBXBuildFile; fileRef = DCF5C9AB11EA3AD100E7DC21 /* databar.c */; }; @@ -151,6 +152,7 @@ dstSubfolderSpec = 1; files = ( DC3CEFB51216349700D7A786 /* ZBarCaptureReader.h in Copy Headers */, + DCB3789B12A43CAC0059B07B /* ZBarHelpController.h in Copy Headers */, DC3CEFB61216349700D7A786 /* ZBarImage.h in Copy Headers */, DC3CEFB71216349700D7A786 /* ZBarImageScanner.h in Copy Headers */, DC3CEFB81216349700D7A786 /* ZBarReaderController.h in Copy Headers */, @@ -317,11 +319,11 @@ DC67C15710A07AD30033B702 /* scanner.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = scanner.c; sourceTree = "<group>"; usesTabs = 0; }; DC67C15A10A07AD30033B702 /* symbol.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = symbol.c; sourceTree = "<group>"; usesTabs = 0; }; DC67C15B10A07AD30033B702 /* symbol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = symbol.h; sourceTree = "<group>"; usesTabs = 0; }; - DC67C1BD10A07B6B0033B702 /* ZBarHelpController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarHelpController.h; sourceTree = "<group>"; usesTabs = 0; }; DC67C1BE10A07B6B0033B702 /* ZBarHelpController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ZBarHelpController.m; sourceTree = "<group>"; usesTabs = 0; }; DC67C1BF10A07B6B0033B702 /* ZBarReaderController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ZBarReaderController.m; sourceTree = "<group>"; usesTabs = 0; }; DC67C1C010A07B6B0033B702 /* ZBarSymbol.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ZBarSymbol.m; sourceTree = "<group>"; usesTabs = 0; }; DC67C1CB10A07BEE0033B702 /* svg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = svg.h; sourceTree = "<group>"; usesTabs = 0; }; + DCB3789A12A43C7E0059B07B /* ZBarHelpController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ZBarHelpController.h; path = include/ZBarSDK/ZBarHelpController.h; sourceTree = "<group>"; }; DCDC6E2F11ADCA8E00021380 /* ZBarReaderView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ZBarReaderView.m; sourceTree = "<group>"; usesTabs = 0; }; DCE9900B129719F100D2655C /* code93.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = code93.c; sourceTree = "<group>"; }; DCE9900C129719F100D2655C /* code93.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = code93.h; sourceTree = "<group>"; }; @@ -409,6 +411,7 @@ isa = PBXGroup; children = ( DC3CEFA51216347100D7A786 /* ZBarCaptureReader.h */, + DCB3789A12A43C7E0059B07B /* ZBarHelpController.h */, DC3CEFA61216347100D7A786 /* ZBarImage.h */, DC3CEFA71216347100D7A786 /* ZBarImageScanner.h */, DC3CEFA81216347100D7A786 /* ZBarReaderController.h */, @@ -480,7 +483,6 @@ DC299BEC1208FE40006A023C /* prefix.pch */, DC299AF51208B7BD006A023C /* config.h */, DC3AAB4C11B71A040021C7B1 /* ZBarCVImage.h */, - DC67C1BD10A07B6B0033B702 /* ZBarHelpController.h */, DC299BE41208FE09006A023C /* ZBarSDK */, ); name = include; |
