PageRenderTime 85ms CodeModel.GetById 27ms RepoModel.GetById 0ms app.codeStats 2ms

/zbar_update_to_617889f8f73.patch

#
Patch | 12235 lines | 12142 code | 93 blank | 0 comment | 0 complexity | bec7532f513f4040726f95b8d12b2056 MD5 | raw file
Possible License(s): LGPL-2.1

Large files files are truncated, but you can click here to view the full file

    

  1. diff --git a/COPYING b/COPYING
    2. 

  2. --- a/COPYING
    3. 

  3. +++ b/COPYING
    4. 

  4. @@ -1,4 +1,4 @@
    5. 

  5. -The ZBar Bar Code Reader is Copyright (C) 2007-2009 Jeff Brown
    6. 

  6. +The ZBar Bar Code Reader is Copyright (C) 2007-2010 Jeff Brown
    7. 

  7.   <spadix@users.sourceforge.net>
    8. 

  8.  The QR Code reader is Copyright (C) 1999-2009 Timothy B. Terriberry
    9. 

  9.   <tterribe@xiph.org>
    10. 

  10. diff --git a/Makefile.am b/Makefile.am
    11. 

  11. --- a/Makefile.am
    12. 

  12. +++ b/Makefile.am
    13. 

  13. @@ -1,6 +1,3 @@
    14. 

  14. -AM_CPPFLAGS = -I$(srcdir)/include
    15. 

  15. -AM_CFLAGS = -Wall -Wno-parentheses
    16. 

  16. -AM_CXXFLAGS = $(AM_CFLAGS)
    17. 

  17.  ACLOCAL_AMFLAGS = -I config
    18. 

  18.  bin_PROGRAMS =
    19. 

  19.  check_PROGRAMS =
    20. 

  20. @@ -9,8 +6,10 @@ lib_LTLIBRARIES =
    21. 

  21.  pyexec_LTLIBRARIES =
    22. 

  22.  CLEANFILES =
    23. 

  23.  DISTCLEANFILES =
    24. 

  24. +MAINTAINERCLEANFILES =
    25. 

  25.  BUILT_SOURCES =
    26. 

  26.  EXTRA_DIST =
    27. 

  27. +SUBDIRS = .
    28. 

  28.  
    29. 

  29.  pkgconfigdir = $(libdir)/pkgconfig
    30. 

  30.  pkgconfig_DATA = zbar.pc
    31. 

  31. @@ -39,6 +38,9 @@ if HAVE_QT
    32. 

  32.  include $(srcdir)/qt/Makefile.am.inc
    33. 

  33.  pkgconfig_DATA += zbar-qt.pc
    34. 

  34.  endif
    35. 

  35. +if HAVE_JAVA
    36. 

  36. +SUBDIRS += java
    37. 

  37. +endif
    38. 

  38.  if HAVE_NPAPI
    39. 

  39.  include $(srcdir)/plugin/Makefile.am.inc
    40. 

  40.  endif
    41. 

  41. @@ -47,11 +49,8 @@ include $(srcdir)/doc/Makefile.am.inc
    42. 

  42.  
    43. 

  43.  EXTRA_DIST += zbar.ico zbar.nsi
    44. 

  44.  
    45. 

  45. -EXTRA_DIST += examples/upcrpc.pl examples/upcrpc.py examples/paginate.pl \
    46. 

  46. -    examples/barcode.png examples/processor.pl examples/processor.py \
    47. 

  47. -    examples/read_one.py examples/read_one.pl \
    48. 

  48. -    examples/scan_image.c examples/scan_image.cpp examples/scan_image.pl \
    49. 

  49. -    examples/scan_image.py examples/scan_image.vcproj
    50. 

  50. +EXTRA_DIST += examples/barcode.png examples/upcrpc.py examples/upcrpc.pl \
    51. 

  51. +    examples/scan_image.c examples/scan_image.cpp examples/scan_image.vcproj
    52. 

  52.  
    53. 

  53.  EXTRA_DIST += perl/MANIFEST perl/README perl/Changes perl/COPYING.LIB \
    54. 

  54.      perl/Makefile.PL perl/typemap perl/ZBar.xs perl/ppport.h \
    55. 

  55. diff --git a/configure.ac b/configure.ac
    56. 

  56. --- a/configure.ac
    57. 

  57. +++ b/configure.ac
    58. 

  58. @@ -46,6 +46,13 @@ AC_DEFINE_UNQUOTED([LIB_VERSION_REVISION
    59. 

  59.    [[`echo "$LIB_VERSION" | sed -e 's/^[^:]*:\([^:]*\):.*$/\1/'`]],
    60. 

  60.    [Library revision])
    61. 

  61.  
    62. 

  62. +AM_CPPFLAGS="-I$srcdir/include"
    63. 

  63. +AM_CFLAGS="-Wall -Wno-parentheses"
    64. 

  64. +AM_CXXFLAGS="$AM_CFLAGS"
    65. 

  65. +AC_SUBST([AM_CPPFLAGS])
    66. 

  66. +AC_SUBST([AM_CFLAGS])
    67. 

  67. +AC_SUBST([AM_CXXFLAGS])
    68. 

  68. +
    69. 

  69.  dnl windows build
    70. 

  70.  
    71. 

  71.  AC_CANONICAL_HOST
    72. 

  72. @@ -73,13 +80,36 @@ documentation generation])
    73. 

  73.  AC_ARG_VAR([XMLTOFLAGS], [additional arguments for xmlto])
    74. 

  74.  AC_CHECK_PROGS([XMLTO], [xmlto], [:])
    75. 

  75.  
    76. 

  76. +have_java="maybe"
    77. 

  77. +AC_ARG_VAR([JAVA_HOME], [root location of JDK])
    78. 

  78. +AS_IF([test "x$JAVA_HOME" = "x"],
    79. 

  79. +  [JAVA_PATH="$PATH"],
    80. 

  80. +  [JAVA_PATH="$JAVA_HOME/bin$PATH_SEPARATOR$PATH"])
    81. 

  81. +
    82. 

  82. +AC_ARG_VAR([JAVAC], [location of Java language compiler])
    83. 

  83. +AC_PATH_PROGS([JAVAC], [javac jikes ecj gcj], [:], [$JAVA_PATH])
    84. 

  84. +AS_IF([test "x$JAVAC" = "x:"], [have_java="no"])
    85. 

  85. +
    86. 

  86. +AC_ARG_VAR([JAVAH], [location of Java header generator])
    87. 

  87. +AC_PATH_PROGS([JAVAH], [javah], [/bin/false], [$JAVA_PATH])
    88. 

  88. +
    89. 

  89. +AC_ARG_VAR([JAR], [location of Java archive tool])
    90. 

  90. +AC_PATH_PROGS([JAR], [jar], [:], [$JAVA_PATH])
    91. 

  91. +AS_IF([test "x$JAR" = "x:"], [have_java="no"])
    92. 

  92. +
    93. 

  93. +AC_ARG_VAR([JAVA], [location of Java application launcher])
    94. 

  94. +AC_PATH_PROGS([JAVA], [java], [/bin/false], [$JAVA_PATH])
    95. 

  95. +
    96. 

  96. +AC_ARG_VAR([CLASSPATH], [Java class path (include JUnit to run java tests)])
    97. 

  97. +AS_IF([test "x$CLASSPATH" = "x"], [CLASSPATH="."])
    98. 

  98. +
    99. 

  99.  dnl symbologies
    100. 

  100.  
    101. 

  101.  AC_ARG_ENABLE([codes],
    102. 

  102.    [AS_HELP_STRING([--enable-codes=SYMS],
    103. 

  103. -    [select symbologies to compile [default=ean,i25,code39,code128,qrcode]])],
    104. 

  104. +    [select symbologies to compile [default=ean,databar,code128,code93,code39,i25,qrcode]])],
    105. 

  105.    [],
    106. 

  106. -  [enable_codes="ean,code39,code128,i25,qrcode"]) dnl pdf417
    107. 

  107. +  [enable_codes="ean,databar,code128,code93,code39,i25,qrcode"])
    108. 

  108.  
    109. 

  109.  AC_DEFUN([ZBAR_CHK_CODE], [
    110. 

  110.    AC_MSG_CHECKING([whether to build $2])
    111. 

  111. @@ -97,11 +127,13 @@ AC_DEFUN([ZBAR_CHK_CODE], [
    112. 

  112.  ])dnl
    113. 

  113.  
    114. 

  114.  ZBAR_CHK_CODE([ean], [EAN symbologies])
    115. 

  115. +ZBAR_CHK_CODE([databar], [DataBar symbology])
    116. 

  116.  ZBAR_CHK_CODE([code128], [Code 128 symbology])
    117. 

  117. +ZBAR_CHK_CODE([code93], [Code 93 symbology])
    118. 

  118.  ZBAR_CHK_CODE([code39], [Code 39 symbology])
    119. 

  119. -ZBAR_CHK_CODE([pdf417], [PDF417 symbology])
    120. 

  120.  ZBAR_CHK_CODE([i25], [Interleaved 2 of 5 symbology])
    121. 

  121.  ZBAR_CHK_CODE([qrcode], [QR Code])
    122. 

  122. +ZBAR_CHK_CODE([pdf417], [PDF417 symbology])
    123. 

  123.  
    124. 

  124.  dnl libraries
    125. 

  125.  
    126. 

  126. @@ -255,7 +287,7 @@ AM_CONDITIONAL([HAVE_JPEG], [test "x$wit
    127. 

  127.  dnl ImageMagick
    128. 

  128.  AC_ARG_WITH([imagemagick],
    129. 

  129.    [AS_HELP_STRING([--without-imagemagick],
    130. 

  130. -    [disable support for scanning images using ImageMagick])],
    131. 

  131. +    [disable support for scanning images with ImageMagick])],
    132. 

  132.    [],
    133. 

  133.    [with_imagemagick="yes"])
    134. 

  134.  
    135. 

  135. @@ -296,7 +328,7 @@ AM_CONDITIONAL([HAVE_MAGICK], [test "x$w
    136. 

  136.  dnl Mozilla NPAPI
    137. 

  137.  AC_ARG_WITH([npapi],
    138. 

  138.    [AS_HELP_STRING([--with-npapi],
    139. 

  139. -    [enable support for Firefox/Mozilla/OpenOffice NPAPI plugin])],
    140. 

  140. +    [enable support for Firefox/Mozilla/OpenOffice plugin])],
    141. 

  141.    [],
    142. 

  142.    [with_npapi="no"])
    143. 

  143.  
    144. 

  144. @@ -383,13 +415,38 @@ AS_IF([test "x$with_qt" != "xno"],
    145. 

  145.  
    146. 

  146.  AM_CONDITIONAL([HAVE_QT], [test "x$with_qt" = "xyes"])
    147. 

  147.  
    148. 

  148. +dnl Java
    149. 

  149. +AC_ARG_WITH([java],
    150. 

  150. +  [AS_HELP_STRING([--without-java],
    151. 

  151. +    [disable support for Java interface])],
    152. 

  152. +  [],
    153. 

  153. +  [with_java="check"])
    154. 

  154. +
    155. 

  155. +AC_ARG_VAR([JAVA_CFLAGS], [compiler flags for building JNI extensions])
    156. 

  156. +AS_IF([test "x$JAVA_CFLAGS" = "x" && test "x$JAVA_HOME" != "x"],
    157. 

  157. +  [JAVA_CFLAGS="-I$JAVA_HOME/include"])
    158. 

  158. +
    159. 

  159. +AS_IF([test "x$with_java" != "xno"],
    160. 

  160. +  [CPPFLAGS_save="$CPPFLAGS"
    161. 

  161. +   CPPFLAGS="$CPPFLAGS $JAVA_CFLAGS"
    162. 

  162. +   AC_CHECK_HEADER([jni.h], [], [have_java="no"])
    163. 

  163. +   CPPFLAGS="$CPPFLAGS_save"
    164. 

  164. +   AS_IF([test "x$have_java" != "xno"],
    165. 

  165. +     [with_java="yes"],
    166. 

  166. +     [test "x$with_java" = "xyes"],
    167. 

  167. +     [AC_MSG_FAILURE([unable to find Java JNI! ensure CFLAGS are set
    168. 

  168. +appropriately or configure --without-java])],
    169. 

  169. +     [with_java="no"])
    170. 

  170. +])
    171. 

  171. +AM_CONDITIONAL([HAVE_JAVA], [test "x$with_java" = "xyes"])
    172. 

  172. +
    173. 

  173.  
    174. 

  174.  dnl header files
    175. 

  175.  
    176. 

  176.  dnl FIXME switches for shm, mmap
    177. 

  177.  AC_HEADER_ASSERT
    178. 

  178. -AC_CHECK_HEADERS([fcntl.h features.h inttypes.h stdlib.h string.h unistd.h \
    179. 

  179. -  sys/ioctl.h sys/time.h sys/times.h sys/ipc.h sys/shm.h sys/mman.h])
    180. 

  180. +AC_CHECK_HEADERS([errno.h fcntl.h features.h inttypes.h stdlib.h string.h \
    181. 

  181. +  unistd.h sys/ioctl.h sys/time.h sys/times.h sys/ipc.h sys/shm.h sys/mman.h])
    182. 

  182.  
    183. 

  183.  dnl types
    184. 

  184.  
    185. 

  185. @@ -428,6 +485,7 @@ AC_CONFIG_COMMANDS([doc/reldate.xml],
    186. 

  186.  
    187. 

  187.  AC_CONFIG_FILES([
    188. 

  188.  Makefile
    189. 

  189. +java/Makefile
    190. 

  190.  zbar.pc
    191. 

  191.  zbar-gtk.pc
    192. 

  192.  zbar-qt.pc
    193. 

  193. @@ -460,6 +518,9 @@ AS_IF([test "x$with_gtk" != "xyes"],
    194. 

  194.  echo "Qt4               --with-qt=$with_qt"
    195. 

  195.  AS_IF([test "x$with_qt" != "xyes"],
    196. 

  196.    [echo "        => the Qt4 widget will *NOT* be built"])
    197. 

  197. +echo "Java              --with-java=$with_java"
    198. 

  198. +AS_IF([test "x$with_java" != "xyes"],
    199. 

  199. +  [echo "        => the Java interface will *NOT* be built"])
    200. 

  200.  #echo "NPAPI Plugin     --with-npapi=$with_npapi"
    201. 

  201.  #AS_IF([test "x$with_mozilla" != "xyes"],
    202. 

  202.  #  [echo "       => the Mozilla/Firefox/OpenOffice plugin will *NOT* be built"])
    203. 

  203. diff --git a/doc/Makefile.am.inc b/doc/Makefile.am.inc
    204. 

  204. --- a/doc/Makefile.am.inc
    205. 

  205. +++ b/doc/Makefile.am.inc
    206. 

  206. @@ -2,6 +2,7 @@
    207. 

  207.  DOCSOURCES = doc/manual.xml doc/version.xml doc/reldate.xml \
    208. 

  208.      doc/ref/zbarimg.xml doc/ref/zbarcam.xml doc/ref/commonoptions.xml
    209. 

  209.  
    210. 

  210. +MAINTAINERCLEANFILES += doc/man/man.stamp doc/version.xml doc/reldate.xml
    211. 

  211.  
    212. 

  212.  # man page targets to distribute and install
    213. 

  213.  dist_man_MANS =
    214. 

  214. diff --git a/doc/api/footer.html b/doc/api/footer.html
    215. 

  215. --- a/doc/api/footer.html
    216. 

  216. +++ b/doc/api/footer.html
    217. 

  217. @@ -9,9 +9,12 @@
    218. 

  218.  
    219. 

  219.  <address><a href="mailto:spadix@users.sourceforge.net">spadix@users.sourceforge.net</a></address>
    220. 

  220.  
    221. 

  221. -<p>Copyright 2008-2009 (c) Jeff Brown - All Rights Reserved.</p>
    222. 

  222. -<p>Verbatim copying and distribution of this entire article are
    223. 

  223. -  permitted worldwide, without royalty, in any medium, provided this
    224. 

  224. -  notice, and the copyright notice, are preserved.</p>
    225. 

  225. +<p>Copyright 2008-2010 (c) Jeff Brown</p>
    226. 

  226. +<p>This documentation is part of the ZBar Barcode Reader; you can
    227. 

  227. +redistribute it and/or modify it under the terms of the
    228. 

  228. +<a href="http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html">GNU
    229. 

  229. +Lesser General Public License</a> as published by the Free Software
    230. 

  230. +Foundation; either version 2.1 of the License, or (at your option) any
    231. 

  231. +later version.</p>
    232. 

  232.  
    233. 

  233.  </body></html>
    234. 

  234. diff --git a/doc/manual.xml b/doc/manual.xml
    235. 

  235. --- a/doc/manual.xml
    236. 

  236. +++ b/doc/manual.xml
    237. 

  237. @@ -29,10 +29,10 @@
    238. 

  238.        <year>2007</year>
    239. 

  239.        <year>2008</year>
    240. 

  240.        <year>2009</year>
    241. 

  241. +      <year>2010</year>
    242. 

  242.        <holder>Jeff Brown</holder>
    243. 

  243.      </copyright>
    244. 

  244.      <legalnotice><para>All Rights Reserved</para></legalnotice>
    245. 

  245. -    <!-- <legalnotice><para>insert GNU FDL header?</para></legalnotice> -->
    246. 

  246.    </bookinfo>
    247. 

  247.  
    248. 

  248.    <chapter id="intro">
    249. 

  249. @@ -47,7 +47,4 @@
    250. 

  250.      &refzbarimg;
    251. 

  251.  
    252. 

  252.    </reference>
    253. 

  253. -
    254. 

  254. -  <!-- insert GNU FDL? -->
    255. 

  255. -
    256. 

  256.  </book>
    257. 

  257. diff --git a/doc/ref/commonoptions.xml b/doc/ref/commonoptions.xml
    258. 

  258. --- a/doc/ref/commonoptions.xml
    259. 

  259. +++ b/doc/ref/commonoptions.xml
    260. 

  260. @@ -47,8 +47,9 @@
    261. 

  261.        <option>ean13</option>, <option>ean8</option>,
    262. 

  262.        <option>upca</option>, <option>upce</option>,
    263. 

  263.        <option>isbn13</option>, <option>isbn10</option>,
    264. 

  264. -      <option>i25</option>, <option>code39</option>,
    265. 

  265. -      <option>code128</option> or the special value <option>*</option>.
    266. 

  266. +      <option>i25</option>, <option>code39</option>, <option>code93</option>,
    267. 

  267. +      <option>code128</option>, <option>qrcode</option>
    268. 

  268. +      or the special value <option>*</option>.
    269. 

  269.        If <replaceable class="parameter">symbology</replaceable> is
    270. 

  270.        omitted or <option>*</option>, the <replaceable
    271. 

  271.        class="parameter">config</replaceable> will be set for all
    272. 

  272. diff --git a/doc/ref/zbarcam.xml b/doc/ref/zbarcam.xml
    273. 

  273. --- a/doc/ref/zbarcam.xml
    274. 

  274. +++ b/doc/ref/zbarcam.xml
    275. 

  275. @@ -60,9 +60,10 @@
    276. 

  276.      <filename>/dev/video0</filename></para>
    277. 

  277.  
    278. 

  278.      <para>The underlying library currently supports EAN-13 (including
    279. 

  279. -    UPC and ISBN subsets), EAN-8, Code 128, Code 39, and Interleaved
    280. 

  280. -    2 of 5 symbologies.  The specific type of each detected symbol is
    281. 

  281. -    printed with the decoded data.</para>
    282. 

  282. +    UPC and ISBN subsets), EAN-8, DataBar, DataBar Expanded, Code 128,
    283. 

  283. +    Code 93, Code 39, Interleaved 2 of 5 and QR Code symbologies.  The
    284. 

  284. +    specific type of each detected symbol is printed with the decoded
    285. 

  285. +    data.</para>
    286. 

  286.  
    287. 

  287.    </refsection>
    288. 

  288.  
    289. 

  289. @@ -160,6 +161,37 @@
    290. 

  290.    </refsection>
    291. 

  291.  
    292. 

  292.    <refsection>
    293. 

  293. +    <title>Exit Status</title>
    294. 

  294. +
    295. 

  295. +    <para><command>zbarcam</command> returns an exit code to indicate the
    296. 

  296. +    status of the program execution. Current exit codes are:</para>
    297. 

  297. +
    298. 

  298. +    <variablelist>
    299. 

  299. +      <varlistentry>
    300. 

  300. +        <term>0</term>
    301. 

  301. +        <listitem>
    302. 

  302. +          <para>Successful program completion.</para>
    303. 

  303. +        </listitem>
    304. 

  304. +      </varlistentry>
    305. 

  305. +
    306. 

  306. +      <varlistentry>
    307. 

  307. +        <term>1</term>
    308. 

  308. +        <listitem>
    309. 

  309. +          <para>An error occurred.  This includes bad arguments and I/O
    310. 

  310. +          errors.</para>
    311. 

  311. +        </listitem>
    312. 

  312. +      </varlistentry>
    313. 

  313. +
    314. 

  314. +      <varlistentry>
    315. 

  315. +        <term>2</term>
    316. 

  316. +        <listitem>
    317. 

  317. +          <para>A fatal error occurred.</para>
    318. 

  318. +        </listitem>
    319. 

  319. +      </varlistentry>
    320. 

  320. +    </variablelist>
    321. 

  321. +  </refsection>
    322. 

  322. +
    323. 

  323. +  <refsection>
    324. 

  324.      <title>See Also</title>
    325. 

  325.      <para><xref linkend="zbarimg"/></para>
    326. 

  326.      <para><link xlink:href="http://zbar.sf.net/"/></para>
    327. 

  327. diff --git a/doc/ref/zbarimg.xml b/doc/ref/zbarimg.xml
    328. 

  328. --- a/doc/ref/zbarimg.xml
    329. 

  329. +++ b/doc/ref/zbarimg.xml
    330. 

  330. @@ -59,9 +59,10 @@
    331. 

  331.      displayed to the screen.</para>
    332. 

  332.  
    333. 

  333.      <para>The underlying library currently supports EAN-13 (including
    334. 

  334. -    UPC and ISBN subsets), EAN-8, Code 128, Code 39, and Interleaved
    335. 

  335. -    2 of 5 symbologies.  The specific type of each detected symbol is
    336. 

  336. -    printed with the decoded data.</para>
    337. 

  337. +    UPC and ISBN subsets), EAN-8, DataBar, DataBar Expanded, Code 128,
    338. 

  338. +    Code 93, Code 39, Interleaved 2 of 5 and QR Code symbologies.  The
    339. 

  339. +    specific type of each detected symbol is printed with the decoded
    340. 

  340. +    data.</para>
    341. 

  341.  
    342. 

  342.      <para>Note that "<filename><replaceable>image</replaceable></filename>"
    343. 

  343.  
    344. 

  344. @@ -166,6 +167,56 @@
    345. 

  345.    </refsection>
    346. 

  346.  
    347. 

  347.    <refsection>
    348. 

  348. +    <title>Exit Status</title>
    349. 

  349. +
    350. 

  350. +    <para><command>zbarimg</command> returns an exit code to indicate the
    351. 

  351. +    status of the program execution. Current exit codes are:</para>
    352. 

  352. +
    353. 

  353. +    <variablelist>
    354. 

  354. +      <varlistentry>
    355. 

  355. +        <term>0</term>
    356. 

  356. +        <listitem>
    357. 

  357. +          <para>Barcodes successfully detected in all images. Warnings may
    358. 

  358. +          have been generated, but no errors.</para>
    359. 

  359. +        </listitem>
    360. 

  360. +      </varlistentry>
    361. 

  361. +
    362. 

  362. +      <varlistentry>
    363. 

  363. +        <term>1</term>
    364. 

  364. +        <listitem>
    365. 

  365. +          <para>An error occurred while processing some image(s).  This
    366. 

  366. +          includes bad arguments, I/O errors and image handling errors from
    367. 

  367. +          ImageMagick.</para>
    368. 

  368. +        </listitem>
    369. 

  369. +      </varlistentry>
    370. 

  370. +
    371. 

  371. +      <varlistentry>
    372. 

  372. +        <term>2</term>
    373. 

  373. +        <listitem>
    374. 

  374. +          <para>ImageMagick fatal error.</para>
    375. 

  375. +        </listitem>
    376. 

  376. +      </varlistentry>
    377. 

  377. +
    378. 

  378. +      <varlistentry>
    379. 

  379. +        <term>3</term>
    380. 

  380. +        <listitem>
    381. 

  381. +          <para>The user quit the program before all images were scanned.
    382. 

  382. +          Only applies when running in interactive mode
    383. 

  383. +          (with <option>--display</option>)</para>
    384. 

  384. +        </listitem>
    385. 

  385. +      </varlistentry>
    386. 

  386. +
    387. 

  387. +      <varlistentry>
    388. 

  388. +        <term>4</term>
    389. 

  389. +        <listitem>
    390. 

  390. +          <para>No barcode was detected in one or more of the images.  No
    391. 

  391. +          other errors occurred.</para>
    392. 

  392. +        </listitem>
    393. 

  393. +      </varlistentry>
    394. 

  394. +    </variablelist>
    395. 

  395. +  </refsection>
    396. 

  396. +
    397. 

  397. +  <refsection>
    398. 

  398.      <title>See Also</title>
    399. 

  399.      <para><xref linkend="zbarcam"/></para>
    400. 

  400.      <para><link xlink:href="http://zbar.sf.net/"/></para>
    401. 

  401. diff --git a/examples/paginate.pl b/examples/paginate.pl
    402. 

  402. deleted file mode 100755
    403. 

  403. --- a/examples/paginate.pl
    404. 

  404. +++ /dev/null
    405. 

  405. @@ -1,71 +0,0 @@
    406. 

  406. -#!/usr/bin/perl
    407. 

  407. -#------------------------------------------------------------------------
    408. 

  408. -#  Copyright 2009 (c) Jeff Brown <spadix@users.sourceforge.net>
    409. 

  409. -#
    410. 

  410. -#  This file is part of the ZBar Bar Code Reader.
    411. 

  411. -#
    412. 

  412. -#  The ZBar Bar Code Reader is free software; you can redistribute it
    413. 

  413. -#  and/or modify it under the terms of the GNU Lesser Public License as
    414. 

  414. -#  published by the Free Software Foundation; either version 2.1 of
    415. 

  415. -#  the License, or (at your option) any later version.
    416. 

  416. -#
    417. 

  417. -#  The ZBar Bar Code Reader is distributed in the hope that it will be
    418. 

  418. -#  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
    419. 

  419. -#  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    420. 

  420. -#  GNU Lesser Public License for more details.
    421. 

  421. -#
    422. 

  422. -#  You should have received a copy of the GNU Lesser Public License
    423. 

  423. -#  along with the ZBar Bar Code Reader; if not, write to the Free
    424. 

  424. -#  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
    425. 

  425. -#  Boston, MA  02110-1301  USA
    426. 

  426. -#
    427. 

  427. -#  http://sourceforge.net/projects/zbar
    428. 

  428. -#------------------------------------------------------------------------
    429. 

  429. -use warnings;
    430. 

  430. -use strict;
    431. 

  431. -
    432. 

  432. -use Barcode::ZBar;
    433. 

  433. -use Image::Magick;
    434. 

  434. -
    435. 

  435. -warn("no input files specified?\n") if(!@ARGV);
    436. 

  436. -
    437. 

  437. -# running output document
    438. 

  438. -my $out = undef;
    439. 

  439. -
    440. 

  440. -# barcode scanner
    441. 

  441. -my $scanner = Barcode::ZBar::ImageScanner->new();
    442. 

  442. -
    443. 

  443. -foreach my $file (@ARGV) {
    444. 

  444. -    print "scanning from \"$file\"\n";
    445. 

  445. -    my $imseq = Image::Magick->new();
    446. 

  446. -    my $err = $imseq->Read($file);
    447. 

  447. -    warn($err) if($err);
    448. 

  448. -
    449. 

  449. -    foreach my $page (@$imseq) {
    450. 

  450. -        # convert ImageMagick page to ZBar image
    451. 

  451. -        my $zimg = Barcode::ZBar::Image->new();
    452. 

  452. -        $zimg->set_format('Y800');
    453. 

  453. -        $zimg->set_size($page->Get(qw(columns rows)));
    454. 

  454. -        $zimg->set_data($page->Clone()->ImageToBlob(magick => 'GRAY', depth => 8));
    455. 

  455. -
    456. 

  456. -        # scan for barcodes
    457. 

  457. -        if($scanner->scan_image($zimg)) {
    458. 

  458. -            # write out previous document
    459. 

  459. -            $out->write() if($out);
    460. 

  460. -
    461. 

  461. -            # use first symbol found to name next image (FIXME sanitize)
    462. 

  462. -            my $data = ($zimg->get_symbols())[0]->get_data();
    463. 

  463. -            my $idx = $page->Get('scene') + 1;
    464. 

  464. -            print "splitting $data from page $idx\n";
    465. 

  465. -
    466. 

  466. -            # create new output document
    467. 

  467. -            $out = Image::Magick->new(filename => $data);
    468. 

  468. -        }
    469. 

  469. -
    470. 

  470. -        # append this page to current output
    471. 

  471. -        push(@$out, $page) if($out);
    472. 

  472. -    }
    473. 

  473. -
    474. 

  474. -    # write out final document
    475. 

  475. -    $out->write() if($out);
    476. 

  476. -}
    477. 

  477. diff --git a/examples/processor.c b/examples/processor.c
    478. 

  478. new file mode 100644
    479. 

  479. --- /dev/null
    480. 

  480. +++ b/examples/processor.c
    481. 

  481. @@ -0,0 +1,47 @@
    482. 

  482. +#include <stdio.h>
    483. 

  483. +#include <zbar.h>
    484. 

  484. +
    485. 

  485. +static void my_handler (zbar_image_t *image,
    486. 

  486. +                        const void *userdata)
    487. 

  487. +{
    488. 

  488. +    /* extract results */
    489. 

  489. +    const zbar_symbol_t *symbol = zbar_image_first_symbol(image);
    490. 

  490. +    for(; symbol; symbol = zbar_symbol_next(symbol)) {
    491. 

  491. +        /* do something useful with results */
    492. 

  492. +        zbar_symbol_type_t typ = zbar_symbol_get_type(symbol);
    493. 

  493. +        const char *data = zbar_symbol_get_data(symbol);
    494. 

  494. +        printf("decoded %s symbol \"%s\"\n",
    495. 

  495. +               zbar_get_symbol_name(typ), data);
    496. 

  496. +    }
    497. 

  497. +}
    498. 

  498. +
    499. 

  499. +int main (int argc, char **argv)
    500. 

  500. +{
    501. 

  501. +    const char *device = "/dev/video0";
    502. 

  502. +
    503. 

  503. +    /* create a Processor */
    504. 

  504. +    zbar_processor_t *proc = zbar_processor_create(1);
    505. 

  505. +
    506. 

  506. +    /* configure the Processor */
    507. 

  507. +    zbar_processor_set_config(proc, 0, ZBAR_CFG_ENABLE, 1);
    508. 

  508. +
    509. 

  509. +    /* initialize the Processor */
    510. 

  510. +    if(argc > 1)
    511. 

  511. +        device = argv[1];
    512. 

  512. +    zbar_processor_init(proc, device, 1);
    513. 

  513. +
    514. 

  514. +    /* setup a callback */
    515. 

  515. +    zbar_processor_set_data_handler(proc, my_handler, NULL);
    516. 

  516. +
    517. 

  517. +    /* enable the preview window */
    518. 

  518. +    zbar_processor_set_visible(proc, 1);
    519. 

  519. +    zbar_processor_set_active(proc, 1);
    520. 

  520. +
    521. 

  521. +    /* keep scanning until user provides key/mouse input */
    522. 

  522. +    zbar_processor_user_wait(proc, -1);
    523. 

  523. +
    524. 

  524. +    /* clean up */
    525. 

  525. +    zbar_processor_destroy(proc);
    526. 

  526. +
    527. 

  527. +    return(0);
    528. 

  528. +}
    529. 

  529. diff --git a/examples/processor.cpp b/examples/processor.cpp
    530. 

  530. new file mode 100644
    531. 

  531. --- /dev/null
    532. 

  532. +++ b/examples/processor.cpp
    533. 

  533. @@ -0,0 +1,45 @@
    534. 

  534. +#include <iostream>
    535. 

  535. +#include <zbar.h>
    536. 

  536. +
    537. 

  537. +using namespace std;
    538. 

  538. +using namespace zbar;
    539. 

  539. +
    540. 

  540. +class MyHandler : public Image::Handler
    541. 

  541. +{
    542. 

  542. +    void image_callback (Image &image)
    543. 

  543. +    {
    544. 

  544. +        for(SymbolIterator symbol = image.symbol_begin();
    545. 

  545. +            symbol != image.symbol_end();
    546. 

  546. +            ++symbol)
    547. 

  547. +            cout << "decoded " << symbol->get_type_name() << " symbol "
    548. 

  548. +                 << "\"" << symbol->get_data() << "\"" << endl;
    549. 

  549. +    }
    550. 

  550. +};
    551. 

  551. +
    552. 

  552. +int main (int argc, char **argv)
    553. 

  553. +{
    554. 

  554. +    // create and initialize a Processor
    555. 

  555. +    const char *device = "/dev/video0";
    556. 

  556. +    if(argc > 1)
    557. 

  557. +        device = argv[1];
    558. 

  558. +    Processor proc(true, device);
    559. 

  559. +
    560. 

  560. +    // configure the Processor
    561. 

  561. +    proc.set_config(ZBAR_NONE, ZBAR_CFG_ENABLE, 1);
    562. 

  562. +
    563. 

  563. +    // setup a callback
    564. 

  564. +    MyHandler my_handler;
    565. 

  565. +    proc.set_handler(my_handler);
    566. 

  566. +
    567. 

  567. +    // enable the preview window
    568. 

  568. +    proc.set_visible();
    569. 

  569. +    proc.set_active();
    570. 

  570. +
    571. 

  571. +    try {
    572. 

  572. +        // keep scanning until user provides key/mouse input
    573. 

  573. +        proc.user_wait();
    574. 

  574. +    }
    575. 

  575. +    catch(ClosedError &e) {
    576. 

  576. +    }
    577. 

  577. +    return(0);
    578. 

  578. +}
    579. 

  579. diff --git a/examples/processor.pl b/examples/processor.pl
    580. 

  580. deleted file mode 100755
    581. 

  581. --- a/examples/processor.pl
    582. 

  582. +++ /dev/null
    583. 

  583. @@ -1,35 +0,0 @@
    584. 

  584. -#!/usr/bin/env perl
    585. 

  585. -use warnings;
    586. 

  586. -use strict;
    587. 

  587. -require Barcode::ZBar;
    588. 

  588. -
    589. 

  589. -# create a Processor
    590. 

  590. -my $proc = Barcode::ZBar::Processor->new();
    591. 

  591. -
    592. 

  592. -# configure the Processor
    593. 

  593. -$proc->parse_config("enable");
    594. 

  594. -
    595. 

  595. -# initialize the Processor
    596. 

  596. -$proc->init($ARGV[0] || '/dev/video0');
    597. 

  597. -
    598. 

  598. -# setup a callback
    599. 

  599. -sub my_handler {
    600. 

  600. -    my ($proc, $image, $closure) = @_;
    601. 

  601. -
    602. 

  602. -    # extract results
    603. 

  603. -    foreach my $symbol ($proc->get_results()) {
    604. 

  604. -        # do something useful with results
    605. 

  605. -        print('decoded ' . $symbol->get_type() .
    606. 

  606. -              ' symbol "' . $symbol->get_data() . "\"\n");
    607. 

  607. -    }
    608. 

  608. -}
    609. 

  609. -$proc->set_data_handler(\&my_handler);
    610. 

  610. -
    611. 

  611. -# enable the preview window
    612. 

  612. -$proc->set_visible();
    613. 

  613. -
    614. 

  614. -# initiate scanning
    615. 

  615. -$proc->set_active();
    616. 

  616. -
    617. 

  617. -# keep scanning until user provides key/mouse input
    618. 

  618. -$proc->user_wait();
    619. 

  619. diff --git a/examples/read_one.pl b/examples/read_one.pl
    620. 

  620. deleted file mode 100755
    621. 

  621. --- a/examples/read_one.pl
    622. 

  622. +++ /dev/null
    623. 

  623. @@ -1,29 +0,0 @@
    624. 

  624. -#!/usr/bin/env perl
    625. 

  625. -use warnings;
    626. 

  626. -use strict;
    627. 

  627. -require Barcode::ZBar;
    628. 

  628. -
    629. 

  629. -# create a Processor
    630. 

  630. -my $proc = Barcode::ZBar::Processor->new();
    631. 

  631. -
    632. 

  632. -# configure the Processor
    633. 

  633. -$proc->parse_config("enable");
    634. 

  634. -
    635. 

  635. -# initialize the Processor
    636. 

  636. -$proc->init($ARGV[0] || '/dev/video0');
    637. 

  637. -
    638. 

  638. -# enable the preview window
    639. 

  639. -$proc->set_visible();
    640. 

  640. -
    641. 

  641. -# read at least one barcode (or until window closed)
    642. 

  642. -$proc->process_one();
    643. 

  643. -
    644. 

  644. -# hide the preview window
    645. 

  645. -$proc->set_visible(0);
    646. 

  646. -
    647. 

  647. -# extract results
    648. 

  648. -foreach my $symbol ($proc->get_results()) {
    649. 

  649. -  # do something useful with results
    650. 

  650. -  print('decoded ' . $symbol->get_type() .
    651. 

  651. -        ' symbol "' . $symbol->get_data() . "\"\n");
    652. 

  652. -}
    653. 

  653. diff --git a/examples/scan_image.c b/examples/scan_image.c
    654. 

  654. --- a/examples/scan_image.c
    655. 

  655. +++ b/examples/scan_image.c
    656. 

  656. @@ -65,7 +65,7 @@ int main (int argc, char **argv)
    657. 

  657.  
    658. 

  658.      /* wrap image data */
    659. 

  659.      zbar_image_t *image = zbar_image_create();
    660. 

  660. -    zbar_image_set_format(image, *(int*)"Y800");
    661. 

  661. +    zbar_image_set_format(image, zbar_fourcc('Y','8','0','0'));
    662. 

  662.      zbar_image_set_size(image, width, height);
    663. 

  663.      zbar_image_set_data(image, raw, width * height, zbar_image_free_data);
    664. 

  664.  
    665. 

  665. diff --git a/examples/scan_image.pl b/examples/scan_image.pl
    666. 

  666. deleted file mode 100755
    667. 

  667. --- a/examples/scan_image.pl
    668. 

  668. +++ /dev/null
    669. 

  669. @@ -1,37 +0,0 @@
    670. 

  670. -#!/usr/bin/perl
    671. 

  671. -use warnings;
    672. 

  672. -use strict;
    673. 

  673. -require Image::Magick;
    674. 

  674. -require Barcode::ZBar;
    675. 

  675. -
    676. 

  676. -$ARGV[0] || die;
    677. 

  677. -
    678. 

  678. -# create a reader
    679. 

  679. -my $scanner = Barcode::ZBar::ImageScanner->new();
    680. 

  680. -
    681. 

  681. -# configure the reader
    682. 

  682. -$scanner->parse_config("enable");
    683. 

  683. -
    684. 

  684. -# obtain image data
    685. 

  685. -my $magick = Image::Magick->new();
    686. 

  686. -$magick->Read($ARGV[0]) && die;
    687. 

  687. -my $raw = $magick->ImageToBlob(magick => 'GRAY', depth => 8);
    688. 

  688. -
    689. 

  689. -# wrap image data
    690. 

  690. -my $image = Barcode::ZBar::Image->new();
    691. 

  691. -$image->set_format('Y800');
    692. 

  692. -$image->set_size($magick->Get(qw(columns rows)));
    693. 

  693. -$image->set_data($raw);
    694. 

  694. -
    695. 

  695. -# scan the image for barcodes
    696. 

  696. -my $n = $scanner->scan_image($image);
    697. 

  697. -
    698. 

  698. -# extract results
    699. 

  699. -foreach my $symbol ($image->get_symbols()) {
    700. 

  700. -    # do something useful with results
    701. 

  701. -    print('decoded ' . $symbol->get_type() .
    702. 

  702. -          ' symbol "' . $symbol->get_data() . "\"\n");
    703. 

  703. -}
    704. 

  704. -
    705. 

  705. -# clean up
    706. 

  706. -undef($image);
    707. 

  707. diff --git a/examples/upcrpc.pl b/examples/upcrpc.pl
    708. 

  708. --- a/examples/upcrpc.pl
    709. 

  709. +++ b/examples/upcrpc.pl
    710. 

  710. @@ -3,7 +3,7 @@ use warnings;
    711. 

  711.  use strict;
    712. 

  712.  use Frontier::Client;
    713. 

  713.  use Data::Dumper;
    714. 

  714. -my $s = Frontier::Client->new('url' => 'http://dev.upcdatabase.com/rpc');
    715. 

  715. +my $s = Frontier::Client->new('url' => 'http://www.upcdatabase.com/rpc');
    716. 

  716.  
    717. 

  717.  $| = 1; # autoflush
    718. 

  718.  
    719. 

  719. diff --git a/examples/upcrpc.py b/examples/upcrpc.py
    720. 

  720. --- a/examples/upcrpc.py
    721. 

  721. +++ b/examples/upcrpc.py
    722. 

  722. @@ -2,7 +2,7 @@
    723. 

  723.  from xmlrpclib import ServerProxy
    724. 

  724.  import sys, re
    725. 

  725.  
    726. 

  726. -server = ServerProxy("http://dev.upcdatabase.com/rpc")
    727. 

  727. +server = ServerProxy("http://www.upcdatabase.com/rpc")
    728. 

  728.  ean_re = re.compile(r'^(UPC-A:|EAN-13:)?(\d{11,13})$', re.M)
    729. 

  729.  
    730. 

  730.  def lookup(decode):
    731. 

  731. diff --git a/gtk/zbargtk.c b/gtk/zbargtk.c
    732. 

  732. --- a/gtk/zbargtk.c
    733. 

  733. +++ b/gtk/zbargtk.c
    734. 

  734. @@ -1,5 +1,5 @@
    735. 

  735.  /*------------------------------------------------------------------------
    736. 

  736. - *  Copyright 2008-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
    737. 

  737. + *  Copyright 2008-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
    738. 

  738.   *
    739. 

  739.   *  This file is part of the ZBar Bar Code Reader.
    740. 

  740.   *
    741. 

  741. @@ -35,11 +35,6 @@
    742. 

  742.  #define DEFAULT_WIDTH 640
    743. 

  743.  #define DEFAULT_HEIGHT 480
    744. 

  744.  
    745. 

  745. -/* adapted from v4l2 spec */
    746. 

  746. -#define fourcc(a, b, c, d)                      \
    747. 

  747. -    ((long)(a) | ((long)(b) << 8) |             \
    748. 

  748. -     ((long)(c) << 16) | ((long)(d) << 24))
    749. 

  749. -
    750. 

  750.  enum {
    751. 

  751.      DECODED,
    752. 

  752.      DECODED_TEXT,
    753. 

  753. @@ -88,15 +83,15 @@ gboolean zbar_gtk_image_from_pixbuf (zba
    754. 

  754.  
    755. 

  755.      /* these are all guesses... */
    756. 

  756.      if(nchannels == 3 && bps == 8)
    757. 

  757. -        type = fourcc('R','G','B','3');
    758. 

  758. +        type = zbar_fourcc('R','G','B','3');
    759. 

  759.      else if(nchannels == 4 && bps == 8)
    760. 

  760. -        type = fourcc('B','G','R','4'); /* FIXME alpha flipped?! */
    761. 

  761. +        type = zbar_fourcc('B','G','R','4'); /* FIXME alpha flipped?! */
    762. 

  762.      else if(nchannels == 1 && bps == 8)
    763. 

  763. -        type = fourcc('Y','8','0','0');
    764. 

  764. +        type = zbar_fourcc('Y','8','0','0');
    765. 

  765.      else if(nchannels == 3 && bps == 5)
    766. 

  766. -        type = fourcc('R','G','B','R');
    767. 

  767. +        type = zbar_fourcc('R','G','B','R');
    768. 

  768.      else if(nchannels == 3 && bps == 4)
    769. 

  769. -        type = fourcc('R','4','4','4'); /* FIXME maybe? */
    770. 

  770. +        type = zbar_fourcc('R','4','4','4'); /* FIXME maybe? */
    771. 

  771.      else {
    772. 

  772.          g_warning("unsupported combination: nchannels=%d bps=%d\n",
    773. 

  773.                    nchannels, bps);
    774. 

  774. @@ -142,10 +137,6 @@ static inline gboolean zbar_gtk_video_op
    775. 

  775.  
    776. 

  776.      gdk_threads_enter();
    777. 

  777.  
    778. 

  778. -    zbar->req_width = DEFAULT_WIDTH;
    779. 

  779. -    zbar->req_height = DEFAULT_HEIGHT;
    780. 

  780. -    gtk_widget_queue_resize(GTK_WIDGET(self));
    781. 

  781. -
    782. 

  782.      zbar->video_opened = FALSE;
    783. 

  783.      if(zbar->thread)
    784. 

  784.          g_object_notify(G_OBJECT(self), "video-opened");
    785. 

  785. @@ -184,6 +175,10 @@ static inline gboolean zbar_gtk_video_op
    786. 

  786.           */
    787. 

  787.          gdk_threads_enter();
    788. 

  788.  
    789. 

  789. +        if(zbar->video_width && zbar->video_height)
    790. 

  790. +            zbar_video_request_size(zbar->video,
    791. 

  791. +                                    zbar->video_width, zbar->video_height);
    792. 

  792. +
    793. 

  793.          video_opened = !zbar_negotiate_format(zbar->video, zbar->window);
    794. 

  794.  
    795. 

  795.          if(video_opened) {
    796. 

  796. @@ -209,7 +204,7 @@ static inline int zbar_gtk_process_image
    797. 

  797.      if(!image)
    798. 

  798.          return(-1);
    799. 

  799.  
    800. 

  800. -    zbar_image_t *tmp = zbar_image_convert(image, fourcc('Y','8','0','0'));
    801. 

  801. +    zbar_image_t *tmp = zbar_image_convert(image, zbar_fourcc('Y','8','0','0'));
    802. 

  802.      if(!tmp)
    803. 

  803.          return(-1);
    804. 

  804.  
    805. 

  805. @@ -560,6 +555,19 @@ gboolean zbar_gtk_get_video_opened (ZBar
    806. 

  806.      return(zbar->video_opened);
    807. 

  807.  }
    808. 

  808.  
    809. 

  809. +void zbar_gtk_request_video_size (ZBarGtk *self,
    810. 

  810. +                                  int width,
    811. 

  811. +                                  int height)
    812. 

  812. +{
    813. 

  813. +    if(!self->_private || width < 0 || height < 0)
    814. 

  814. +        return;
    815. 

  815. +    ZBarGtkPrivate *zbar = ZBAR_GTK_PRIVATE(self->_private);
    816. 

  816. +
    817. 

  817. +    zbar->req_width = zbar->video_width = width;
    818. 

  818. +    zbar->req_height = zbar->video_height = height;
    819. 

  819. +    gtk_widget_queue_resize(GTK_WIDGET(self));
    820. 

  820. +}
    821. 

  821. +
    822. 

  822.  static void zbar_gtk_set_property (GObject *object,
    823. 

  823.                                     guint prop_id,
    824. 

  824.                                     const GValue *value,
    825. 

  825. @@ -613,8 +621,8 @@ static void zbar_gtk_init (ZBarGtk *self
    826. 

  826.      zbar->window = zbar_window_create();
    827. 

  827.      g_assert(zbar->window);
    828. 

  828.  
    829. 

  829. -    zbar->req_width = DEFAULT_WIDTH;
    830. 

  830. -    zbar->req_height = DEFAULT_HEIGHT;
    831. 

  831. +    zbar->req_width = zbar->video_width = DEFAULT_WIDTH;
    832. 

  832. +    zbar->req_height = zbar->video_width = DEFAULT_HEIGHT;
    833. 

  833.  
    834. 

  834.      /* spawn a thread to handle decoding and video */
    835. 

  835.      zbar->queue = g_async_queue_new();
    836. 

  836. diff --git a/gtk/zbargtkprivate.h b/gtk/zbargtkprivate.h
    837. 

  837. --- a/gtk/zbargtkprivate.h
    838. 

  838. +++ b/gtk/zbargtkprivate.h
    839. 

  839. @@ -71,6 +71,7 @@ typedef struct _ZBarGtkPrivate
    840. 

  840.       * protected by main gui lock
    841. 

  841.       */
    842. 

  842.      unsigned req_width, req_height;
    843. 

  843. +    unsigned video_width, video_height;
    844. 

  844.      gboolean video_opened;
    845. 

  845.  
    846. 

  846.      /* window is shared: owned by main gui thread.
    847. 

  847. diff --git a/include/zbar.h b/include/zbar.h
    848. 

  848. --- a/include/zbar.h
    849. 

  849. +++ b/include/zbar.h
    850. 

  850. @@ -1,5 +1,5 @@
    851. 

  851.  /*------------------------------------------------------------------------
    852. 

  852. - *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
    853. 

  853. + *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
    854. 

  854.   *
    855. 

  855.   *  This file is part of the ZBar Bar Code Reader.
    856. 

  856.   *
    857. 

  857. @@ -93,9 +93,12 @@ typedef enum zbar_symbol_type_e {
    858. 

  858.      ZBAR_EAN13       =     13,  /**< EAN-13 */
    859. 

  859.      ZBAR_ISBN13      =     14,  /**< ISBN-13 (from EAN-13). @since 0.4 */
    860. 

  860.      ZBAR_I25         =     25,  /**< Interleaved 2 of 5. @since 0.4 */
    861. 

  861. +    ZBAR_DATABAR     =     34,  /**< GS1 DataBar (RSS). @since 0.11 */
    862. 

  862. +    ZBAR_DATABAR_EXP =     35,  /**< GS1 DataBar Expanded. @since 0.11 */
    863. 

  863.      ZBAR_CODE39      =     39,  /**< Code 39. @since 0.4 */
    864. 

  864.      ZBAR_PDF417      =     57,  /**< PDF417. @since 0.6 */
    865. 

  865.      ZBAR_QRCODE      =     64,  /**< QR Code. @since 0.10 */
    866. 

  866. +    ZBAR_CODE93      =     93,  /**< Code 93. @since 0.11 */
    867. 

  867.      ZBAR_CODE128     =    128,  /**< Code 128 */
    868. 

  868.      ZBAR_SYMBOL      = 0x00ff,  /**< mask for base symbol type */
    869. 

  869.      ZBAR_ADDON2      = 0x0200,  /**< 2-digit add-on flag */
    870. 

  870. @@ -103,6 +106,17 @@ typedef enum zbar_symbol_type_e {
    871. 

  871.      ZBAR_ADDON       = 0x0700,  /**< add-on flag mask */
    872. 

  872.  } zbar_symbol_type_t;
    873. 

  873.  
    874. 

  874. +/** decoded symbol coarse orientation.
    875. 

  875. + * @since 0.11
    876. 

  876. + */
    877. 

  877. +typedef enum zbar_orientation_e {
    878. 

  878. +    ZBAR_ORIENT_UNKNOWN = -1,   /**< unable to determine orientation */
    879. 

  879. +    ZBAR_ORIENT_UP,             /**< upright, read left to right */
    880. 

  880. +    ZBAR_ORIENT_RIGHT,          /**< sideways, read top to bottom */
    881. 

  881. +    ZBAR_ORIENT_DOWN,           /**< upside-down, read right to left */
    882. 

  882. +    ZBAR_ORIENT_LEFT,           /**< sideways, read bottom to top */
    883. 

  883. +} zbar_orientation_t;
    884. 

  884. +
    885. 

  885.  /** error codes. */
    886. 

  886.  typedef enum zbar_error_e {
    887. 

  887.      ZBAR_OK = 0,                /**< no error */
    888. 

  888. @@ -133,12 +147,33 @@ typedef enum zbar_config_e {
    889. 

  889.      ZBAR_CFG_MIN_LEN = 0x20,    /**< minimum data length for valid decode */
    890. 

  890.      ZBAR_CFG_MAX_LEN,           /**< maximum data length for valid decode */
    891. 

  891.  
    892. 

  892. +    ZBAR_CFG_UNCERTAINTY = 0x40,/**< required video consistency frames */
    893. 

  893. +
    894. 

  894.      ZBAR_CFG_POSITION = 0x80,   /**< enable scanner to collect position data */
    895. 

  895.  
    896. 

  896.      ZBAR_CFG_X_DENSITY = 0x100, /**< image scanner vertical scan density */
    897. 

  897.      ZBAR_CFG_Y_DENSITY,         /**< image scanner horizontal scan density */
    898. 

  898.  } zbar_config_t;
    899. 

  899.  
    900. 

  900. +/** decoder symbology modifier flags.
    901. 

  901. + * @since 0.11
    902. 

  902. + */
    903. 

  903. +typedef enum zbar_modifier_e {
    904. 

  904. +    /** barcode tagged as GS1 (EAN.UCC) reserved
    905. 

  905. +     * (eg, FNC1 before first data character).
    906. 

  906. +     * data may be parsed as a sequence of GS1 AIs
    907. 

  907. +     */
    908. 

  908. +    ZBAR_MOD_GS1 = 0,
    909. 

  909. +
    910. 

  910. +    /** barcode tagged as AIM reserved
    911. 

  911. +     * (eg, FNC1 after first character or digit pair)
    912. 

  912. +     */
    913. 

  913. +    ZBAR_MOD_AIM,
    914. 

  914. +
    915. 

  915. +    /** number of modifiers */
    916. 

  916. +    ZBAR_MOD_NUM,
    917. 

  917. +} zbar_modifier_t;
    918. 

  918. +
    919. 

  919.  /** retrieve runtime library version information.
    920. 

  920.   * @param major set to the running major version (unless NULL)
    921. 

  921.   * @param minor set to the running minor version (unless NULL)
    922. 

  922. @@ -171,6 +206,28 @@ extern const char *zbar_get_symbol_name(
    923. 

  923.   */
    924. 

  924.  extern const char *zbar_get_addon_name(zbar_symbol_type_t sym);
    925. 

  925.  
    926. 

  926. +/** retrieve string name for configuration setting.
    927. 

  927. + * @param config setting to name
    928. 

  928. + * @returns static string name for config,
    929. 

  929. + * or the empty string if value is not a known config
    930. 

  930. + */
    931. 

  931. +extern const char *zbar_get_config_name(zbar_config_t config);
    932. 

  932. +
    933. 

  933. +/** retrieve string name for modifier.
    934. 

  934. + * @param modifier flag to name
    935. 

  935. + * @returns static string name for modifier,
    936. 

  936. + * or the empty string if the value is not a known flag
    937. 

  937. + */
    938. 

  938. +extern const char *zbar_get_modifier_name(zbar_modifier_t modifier);
    939. 

  939. +
    940. 

  940. +/** retrieve string name for orientation.
    941. 

  941. + * @param orientation orientation encoding
    942. 

  942. + * @returns the static string name for the specified orientation,
    943. 

  943. + * or "UNKNOWN" if the orientation is not recognized
    944. 

  944. + * @since 0.11
    945. 

  945. + */
    946. 

  946. +extern const char *zbar_get_orientation_name(zbar_orientation_t orientation);
    947. 

  947. +
    948. 

  948.  /** parse a configuration string of the form "[symbology.]config[=value]".
    949. 

  949.   * the config must match one of the recognized names.
    950. 

  950.   * the symbology, if present, must match one of the recognized names.
    951. 

  951. @@ -184,6 +241,30 @@ extern int zbar_parse_config(const char 
    952. 

  952.                               zbar_config_t *config,
    953. 

  953.                               int *value);
    954. 

  954.  
    955. 

  955. +/** consistently compute fourcc values across architectures
    956. 

  956. + * (adapted from v4l2 specification)
    957. 

  957. + * @since 0.11
    958. 

  958. + */
    959. 

  959. +#define zbar_fourcc(a, b, c, d)                 \
    960. 

  960. +        ((unsigned long)(a) |                   \
    961. 

  961. +         ((unsigned long)(b) << 8) |            \
    962. 

  962. +         ((unsigned long)(c) << 16) |           \
    963. 

  963. +         ((unsigned long)(d) << 24))
    964. 

  964. +
    965. 

  965. +/** parse a fourcc string into its encoded integer value.
    966. 

  966. + * @since 0.11
    967. 

  967. + */
    968. 

  968. +static inline unsigned long zbar_fourcc_parse (const char *format)
    969. 

  969. +{
    970. 

  970. +    unsigned long fourcc = 0;
    971. 

  971. +    if(format) {
    972. 

  972. +        int i;
    973. 

  973. +        for(i = 0; i < 4 && format[i]; i++)
    974. 

  974. +            fourcc |= ((unsigned long)format[i]) << (i * 8);
    975. 

  975. +    }
    976. 

  976. +    return(fourcc);
    977. 

  977. +}
    978. 

  978. +
    979. 

  979.  /** @internal type unsafe error API (don't use) */
    980. 

  980.  extern int _zbar_error_spew(const void *object,
    981. 

  981.                              int verbosity);
    982. 

  982. @@ -229,6 +310,20 @@ extern void zbar_symbol_ref(const zbar_s
    983. 

  983.   */
    984. 

  984.  extern zbar_symbol_type_t zbar_symbol_get_type(const zbar_symbol_t *symbol);
    985. 

  985.  
    986. 

  986. +/** retrieve symbology boolean config settings.
    987. 

  987. + * @returns a bitmask indicating which configs were set for the detected
    988. 

  988. + * symbology during decoding.
    989. 

  989. + * @since 0.11
    990. 

  990. + */
    991. 

  991. +extern unsigned int zbar_symbol_get_configs(const zbar_symbol_t *symbol);
    992. 

  992. +
    993. 

  993. +/** retrieve symbology modifier flag settings.
    994. 

  994. + * @returns a bitmask indicating which characteristics were detected
    995. 

  995. + * during decoding.
    996. 

  996. + * @since 0.11
    997. 

  997. + */
    998. 

  998. +extern unsigned int zbar_symbol_get_modifiers(const zbar_symbol_t *symbol);
    999. 

  999. +
    1000. 

  1000.  /** retrieve data decoded from symbol.
    1001. 

  1001.   * @returns the data string
    1002. 

  1002.   */
    1003. 

  1003. @@ -284,6 +379,14 @@ extern int zbar_symbol_get_loc_x(const z
    1004. 

  1004.  extern int zbar_symbol_get_loc_y(const zbar_symbol_t *symbol,
    1005. 

  1005.                                   unsigned index);
    1006. 

  1006.  
    1007. 

  1007. +/** retrieve general orientation of decoded symbol.
    1008. 

  1008. + * @returns a coarse, axis-aligned indication of symbol orientation or
    1009. 

  1009. + * ZBAR_ORIENT_UNKNOWN if unknown
    1010. 

  1010. + * @since 0.11
    1011. 

  1011. + */
    1012. 

  1012. +extern zbar_orientation_t
    1013. 

  1013. +zbar_symbol_get_orientation(const zbar_symbol_t *symbol);
    1014. 

  1014. +
    1015. 

  1015.  /** iterate the set to which this symbol belongs (there can be only one).
    1016. 

  1016.   * @returns the next symbol in the set, or
    1017. 

  1017.   * @returns NULL when no more results are available
    1018. 

  1018. @@ -357,6 +460,14 @@ extern int zbar_symbol_set_get_size(cons
    1019. 

  1019.  extern const zbar_symbol_t*
    1020. 

  1020.  zbar_symbol_set_first_symbol(const zbar_symbol_set_t *symbols);
    1021. 

  1021.  
    1022. 

  1022. +/** raw result iterator.
    1023. 

  1023. + * @returns the first decoded symbol result in a set, *before* filtering
    1024. 

  1024. + * @returns NULL if the set is empty
    1025. 

  1025. + * @since 0.11
    1026. 

  1026. + */
    1027. 

  1027. +extern const zbar_symbol_t*
    1028. 

  1028. +zbar_symbol_set_first_unfiltered(const zbar_symbol_set_t *symbols);
    1029. 

  1029. +
    1030. 

  1030.  /*@}*/
    1031. 

  1031.  
    1032. 

  1032.  /*------------------------------------------------------------*/
    1033. 

  1033. @@ -456,6 +567,25 @@ extern unsigned zbar_image_get_width(con
    1034. 

  1034.   */
    1035. 

  1035.  extern unsigned zbar_image_get_height(const zbar_image_t *image);
    1036. 

  1036.  
    1037. 

  1037. +/** retrieve both dimensions of the image.
    1038. 

  1038. + * fills in the width and height in samples
    1039. 

  1039. + */
    1040. 

  1040. +extern void zbar_image_get_size(const zbar_image_t *image,
    1041. 

  1041. +                                unsigned *width,
    1042. 

  1042. +                                unsigned *height);
    1043. 

  1043. +
    1044. 

  1044. +/** retrieve the crop rectangle.
    1045. 

  1045. + * fills in the image coordinates of the upper left corner and size
    1046. 

  1046. + * of an axis-aligned rectangular area of the image that will be scanned.
    1047. 

  1047. + * defaults to the full image
    1048. 

  1048. + * @since 0.11
    1049. 

  1049. + */
    1050. 

  1050. +extern void zbar_image_get_crop(const zbar_image_t *image,
    1051. 

  1051. +                                unsigned *x,
    1052. 

  1052. +                                unsigned *y,
    1053. 

  1053. +                                unsigned *width,
    1054. 

  1054. +                                unsigned *height);
    1055. 

  1055. +
    1056. 

  1056.  /** return the image sample data.  the returned data buffer is only
    1057. 

  1057.   * valid until zbar_image_destroy() is called
    1058. 

  1058.   */
    1059. 

  1059. @@ -505,12 +635,24 @@ extern void zbar_image_set_sequence(zbar
    1060. 

  1060.                                      unsigned sequence_num);
    1061. 

  1061.  
    1062. 

  1062.  /** specify the pixel size of the image.
    1063. 

  1063. + * @note this also resets the crop rectangle to the full image
    1064. 

  1064. + * (0, 0, width, height)
    1065. 

  1065.   * @note this does not affect the data!
    1066. 

  1066.   */
    1067. 

  1067.  extern void zbar_image_set_size(zbar_image_t *image,
    1068. 

  1068.                                  unsigned width,
    1069. 

  1069.                                  unsigned height);
    1070. 

  1070.  
    1071. 

  1071. +/** specify a rectangular region of the image to scan.
    1072. 

  1072. + * the rectangle will be clipped to the image boundaries.
    1073. 

  1073. + * defaults to the full image specified by zbar_image_set_size()
    1074. 

  1074. + */
    1075. 

  1075. +extern void zbar_image_set_crop(zbar_image_t *image,
    1076. 

  1076. +                                unsigned x,
    1077. 

  1077. +                                unsigned y,
    1078. 

  1078. +                                unsigned width,
    1079. 

  1079. +                                unsigned height);
    1080. 

  1080. +
    1081. 

  1081.  /** specify image sample data.  when image data is no longer needed by
    1082. 

  1082.   * the library the specific data cleanup handler will be called
    1083. 

  1083.   * (unless NULL)
    1084. 

  1084. @@ -1148,6 +1290,14 @@ static inline int zbar_decoder_parse_con
    1085. 

  1085.             zbar_decoder_set_config(decoder, sym, cfg, val));
    1086. 

  1086.  }
    1087. 

  1087.  
    1088. 

  1088. +/** retrieve symbology boolean config settings.
    1089. 

  1089. + * @returns a bitmask indicating which configs are currently set for the
    1090. 

  1090. + * specified symbology.
    1091. 

  1091. + * @since 0.11
    1092. 

  1092. + */
    1093. 

  1093. +extern unsigned int zbar_decoder_get_configs(const zbar_decoder_t *decoder,
    1094. 

  1094. +                                             zbar_symbol_type_t symbology);
    1095. 

  1095. +
    1096. 

  1096.  /** clear all decoder state.
    1097. 

  1097.   * any partial symbols are flushed
    1098. 

  1098.   */
    1099. 

  1099. @@ -1195,6 +1345,20 @@ zbar_decoder_get_data_length(const zbar_
    1100. 

  1100.  extern zbar_symbol_type_t
    1101. 

  1101.  zbar_decoder_get_type(const zbar_decoder_t *decoder);
    1102. 

  1102.  
    1103. 

  1103. +/** retrieve modifier flags for the last decoded symbol.
    1104. 

  1104. + * @returns a bitmask indicating which characteristics were detected
    1105. 

  1105. + * during decoding.
    1106. 

  1106. + * @since 0.11
    1107. 

  1107. + */
    1108. 

  1108. +extern unsigned int zbar_decoder_get_modifiers(const zbar_decoder_t *decoder);
    1109. 

  1109. +
    1110. 

  1110. +/** retrieve last decode direction.
    1111. 

  1111. + * @returns 1 for forward and -1 for reverse
    1112. 

  1112. + * @returns 0 if the decode direction is unknown or does not apply
    1113. 

  1113. + * @since 0.11
    1114. 

  1114. + */
    1115. 

  1115. +extern int zbar_decoder_get_direction(const zbar_decoder_t *decoder);
    1116. 

  1116. +
    1117. 

  1117.  /** setup data handler callback.
    1118. 

  1118.   * the registered function will be called by the decoder
    1119. 

  1119.   * just before zbar_decode_width() returns a non-zero value.
    1120. 

  1120. diff --git a/include/zbar/Decoder.h b/include/zbar/Decoder.h
    1121. 

  1121. --- a/include/zbar/Decoder.h
    1122. 

  1122. +++ b/include/zbar/Decoder.h
    1123. 

  1123. @@ -1,5 +1,5 @@
    1124. 

  1124.  //------------------------------------------------------------------------
    1125. 

  1125. -//  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
    1126. 

  1126. +//  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
    1127. 

  1127.  //
    1128. 

  1128.  //  This file is part of the ZBar Bar Code Reader.
    1129. 

  1129.  //
    1130. 

  1130. @@ -149,6 +149,14 @@ class Decoder {
    1131. 

  1131.          return(zbar_decoder_get_data_length(_decoder));
    1132. 

  1132.      }
    1133. 

  1133.  
    1134. 

  1134. +    /// retrieve last decode direction.
    1135. 

  1135. +    /// see zbar_decoder_get_direction()
    1136. 

  1136. +    /// @since 0.11
    1137. 

  1137. +    int get_direction() const
    1138. 

  1138. +    {
    1139. 

  1139. +        return(zbar_decoder_get_direction(_decoder));
    1140. 

  1140. +    }
    1141. 

  1141. +
    1142. 

  1142.      /// setup callback to handle result data.
    1143. 

  1143.      void set_handler (Handler &handler)
    1144. 

  1144.      {
    1145. 

  1145. diff --git a/include/zbar/Image.h b/include/zbar/Image.h
    1146. 

  1146. --- a/include/zbar/Image.h
    1147. 

  1147. +++ b/include/zbar/Image.h
    1148. 

  1148. @@ -1,5 +1,5 @@
    1149. 

  1149.  //------------------------------------------------------------------------
    1150. 

  1150. -//  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
    1151. 

  1151. +//  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
    1152. 

  1152.  //
    1153. 

  1153.  //  This file is part of the ZBar Bar Code Reader.
    1154. 

  1154.  //
    1155. 

  1155. @@ -67,7 +67,12 @@ public:
    1156. 

  1156.          {
    1157. 

  1157.              if(userdata) {
    1158. 

  1158.                  Image *image = (Image*)zbar_image_get_userdata(zimg);
    1159. 

  1159. -                ((Handler*)userdata)->image_callback(*image);
    1160. 

  1160. +                if(image)
    1161. 

  1161. +                    ((Handler*)userdata)->image_callback(*image);
    1162. 

  1162. +                else {
    1163. 

  1163. +                    Image tmp(zimg, 1);
    1164. 

  1164. +                    ((Handler*)userdata)->image_callback(tmp);
    1165. 

  1165. +                }
    1166. 

  1166.              }
    1167. 

  1167.          }
    1168. 

  1168.      };
    1169. 

  1169. @@ -110,6 +115,8 @@ public:
    1170. 

  1170.  
    1171. 

  1171.      ~Image ()
    1172. 

  1172.      {
    1173. 

  1173. +        set_data(NULL, 0);
    1174. 

  1174. +        zbar_image_set_userdata(_img, NULL);
    1175. 

  1175.          zbar_image_ref(_img, -1);
    1176. 

  1176.      }
    1177. 

  1177.  
    1178. 

  1178. @@ -143,12 +150,7 @@ public:
    1179. 

  1179.      /// see zbar_image_set_format()
    1180. 

  1180.      void set_format (const std::string& format)
    1181. 

  1181.      {
    1182. 

  1182. -        if(format.length() != 4)
    1183. 

  1183. -            throw FormatError();
    1184. 

  1184. -        unsigned long fourcc = ((format[0] & 0xff) |
    1185. 

  1185. -                                ((format[1] & 0xff) << 8) |
    1186. 

  1186. -                                ((format[2] & 0xff) << 16) |
    1187. 

  1187. -                                ((format[3] & 0xff) << 24));
    1188. 

  1188. +        unsigned long fourcc = zbar_fourcc_parse(format.c_str());
    1189. 

  1189.          zbar_image_set_format(_img, fourcc);
    1190. 

  1190.      }
    1191. 

  1191.  
    1192. 

  1192. @@ -183,6 +185,15 @@ public:
    1193. 

  1193.          return(zbar_image_get_height(_img));
    1194. 

  1194.      }
    1195. 

  1195.  
    1196. 

  1196. +    /// retrieve both dimensions of the image.
    1197. 

  1197. +    /// see zbar_image_get_size()
    1198. 

  1198. +    /// @since 0.11
    1199. 

  1199. +    void get_size (unsigned &width,
    1200. 

  1200. +                   unsigned &height) const
    1201. 

  1201. +    {
    1202. 

  1202. +        zbar_image_get_size(_img, &width, &height);
    1203. 

  1203. +    }
    1204. 

  1204. +
    1205. 

  1205.      /// specify the pixel size of the image.
    1206. 

  1206.      /// see zbar_image_set_size()
    1207. 

  1207.      void set_size (unsigned width,
    1208. 

  1208. @@ -191,6 +202,26 @@ public:
    1209. 

  1209.          zbar_image_set_size(_img, width, height);
    1210. 

  1210.      }
    1211. 

  1211.  
    1212. 

  1212. +    /// retrieve the scan crop rectangle.
    1213. 

  1213. +    /// see zbar_image_get_crop()
    1214. 

  1214. +    void get_crop (unsigned &x,
    1215. 

  1215. +                   unsigned &y,
    1216. 

  1216. +                   unsigned &width,
    1217. 

  1217. +                   unsigned &height) const
    1218. 

  1218. +    {
    1219. 

  1219. +        zbar_image_get_crop(_img, &x, &y, &width, &height);
    1220. 

  1220. +    }
    1221. 

  1221. +
    1222. 

  1222. +    /// set the scan crop rectangle.
    1223. 

  1223. +    /// see zbar_image_set_crop()
    1224. 

  1224. +    void set_crop (unsigned x,
    1225. 

  1225. +                   unsigned y,
    1226. 

  1226. +                   unsigned width,
    1227. 

  1227. +                   unsigned height)
    1228. 

  1228. +    {
    1229. 

  1229. +        zbar_image_set_crop(_img, x, y, width, height);
    1230. 

  1230. +    }
    1231. 

  1231. +
    1232. 

  1232.      /// return the image sample data.
    1233. 

  1233.      /// see zbar_image_get_data()
    1234. 

  1234.      const void *get_data () const
    1235. 

  1235. diff --git a/include/zbar/Processor.h b/include/zbar/Processor.h
    1236. 

  1236. --- a/include/zbar/Processor.h
    1237. 

  1237. +++ b/include/zbar/Processor.h
    1238. 

  1238. @@ -1,5 +1,5 @@
    1239. 

  1239.  //------------------------------------------------------------------------
    1240. 

  1240. -//  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
    1241. 

  1241. +//  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
    1242. 

  1242.  //
    1243. 

  1243.  //  This file is part of the ZBar Bar Code Reader.
    1244. 

  1244.  //
    1245. 

  1245. @@ -183,8 +183,8 @@ class Processor {
    1246. 

  1246.      void force_format (std::string& input_format,
    1247. 

  1247.                         std::string& output_format)
    1248. 

  1248.      {
    1249. 

  1249. -        unsigned long ifourcc = *(unsigned long*)input_format.c_str();
    1250. 

  1250. -        unsigned long ofourcc = *(unsigned long*)output_format.c_str();
    1251. 

  1251. +        unsigned long ifourcc = zbar_fourcc_parse(input_format.c_str());
    1252. 

  1252. +        unsigned long ofourcc = zbar_fourcc_parse(output_format.c_str());
    1253. 

  1253.          if(zbar_processor_force_format(_processor, ifourcc, ofourcc))
    1254. 

  1254.              throw_exception(_processor);
    1255. 

  1255.      }
    1256. 

  1256. diff --git a/include/zbar/QZBarImage.h b/include/zbar/QZBarImage.h
    1257. 

  1257. --- a/include/zbar/QZBarImage.h
    1258. 

  1258. +++ b/include/zbar/QZBarImage.h
    1259. 

  1259. @@ -1,5 +1,5 @@
    1260. 

  1260.  //------------------------------------------------------------------------
    1261. 

  1261. -//  Copyright 2008-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
    1262. 

  1262. +//  Copyright 2008-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
    1263. 

  1263.  //
    1264. 

  1264.  //  This file is part of the ZBar Bar Code Reader.
    1265. 

  1265.  //
    1266. 

  1266. @@ -53,7 +53,7 @@ public:
    1267. 

  1267.          unsigned width = bpl / 4;
    1268. 

  1268.          unsigned height = qimg.height();
    1269. 

  1269.          set_size(width, height);
    1270. 

  1270. -        set_format('B' | ('G' << 8) | ('R' << 16) | ('4' << 24));
    1271. 

  1271. +        set_format(zbar_fourcc('B','G','R','4'));
    1272. 

  1272.          unsigned long datalen = qimg.numBytes();
    1273. 

  1273.          set_data(qimg.bits(), datalen);
    1274. 

  1274.  
    1275. 

  1275. diff --git a/include/zbar/Symbol.h b/include/zbar/Symbol.h
    1276. 

  1276. --- a/include/zbar/Symbol.h
    1277. 

  1277. +++ b/include/zbar/Symbol.h
    1278. 

  1278. @@ -1,5 +1,5 @@
    1279. 

  1279.  //------------------------------------------------------------------------
    1280. 

  1280. -//  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
    1281. 

  1281. +//  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
    1282. 

  1282.  //
    1283. 

  1283.  //  This file is part of the ZBar Bar Code Reader.
    1284. 

  1284.  //
    1285. 

  1285. @@ -64,6 +64,21 @@ public:
    1286. 

  1286.          ref(-1);
    1287. 

  1287.      }
    1288. 

  1288.  
    1289. 

  1289. +    /// assignment.
    1290. 

  1290. +    SymbolSet& operator= (const SymbolSet& syms)
    1291. 

  1291. +    {
    1292. 

  1292. +        syms.ref();
    1293. 

  1293. +        ref(-1);
    1294. 

  1294. +        _syms = syms._syms;
    1295. 

  1295. +        return(*this);
    1296. 

  1296. +    }
    1297. 

  1297. +
    1298. 

  1298. +    /// truth testing.
    1299. 

  1299. +    bool operator! () const
    1300. 

  1300. +    {
    1301. 

  1301. +        return(!_syms || !get_size());
    1302. 

  1302. +    }
    1303. 

  1303. +
    1304. 

  1304.      /// manipulate reference count.
    1305. 

  1305.      void ref (int delta = 1) const
    1306. 

  1306.      {
    1307. 

  1307. @@ -77,7 +92,7 @@ public:
    1308. 

  1308.          return(_syms);
    1309. 

  1309.      }
    1310. 

  1310.  
    1311. 

  1311. -    int get_size ()
    1312. 

  1312. +    int get_size () const
    1313. 

  1313.      {
    1314. 

  1314.          return((_syms) ? zbar_symbol_set_get_size(_syms) : 0);
    1315. 

  1315.      }
    1316. 

  1316. @@ -112,9 +127,16 @@ public:
    1317. 

  1317.  
    1318. 

  1318.          /// copy constructor.
    1319. 

  1319.          Point (const Point& pt)
    1320. 

  1320. +            : x(pt.x),
    1321. 

  1321. +              y(pt.y)
    1322. 

  1322. +        { }
    1323. 

  1323. +
    1324. 

  1324. +        /// assignment.
    1325. 

  1325. +        Point& operator= (const Point& pt)
    1326. 

  1326.          {
    1327. 

  1327.              x = pt.x;
    1328. 

  1328.              y = pt.y;
    1329. 

  1329. +            return(*this);
    1330. 

  1330.          }
    1331. 

  1331.      };
    1332. 

  1332.  
    1333. 

  1333. @@ -135,7 +157,7 @@ public:
    1334. 

  1334.                  _index = -1;
    1335. 

  1335.          }
    1336. 

  1336.  
    1337. 

  1337. -        /// constructor.
    1338. 

  1338. +        /// copy constructor.
    1339. 

  1339.          PointIterator (const PointIterator& iter)
    1340. 

  1340.              : _sym(iter._sym),
    1341. 

  1341.                _index(iter._index)
    1342. 

  1342. @@ -149,6 +171,22 @@ public:
    1343. 

  1343.              _sym->ref(-1);
    1344. 

  1344.          }
    1345. 

  1345.  
    1346. 

  1346. +        /// assignment.
    1347. 

  1347. +        PointIterator& operator= (const PointIterator& iter)
    1348. 

  1348. +        {
    1349. 

  1349. +            iter._sym->ref();
    1350. 

  1350. +            _sym->ref(-1);
    1351. 

  1351. +            _sym = iter._sym;
    1352. 

  1352. +            _index = iter._index;
    1353. 

  1353. +            return(*this);
    1354. 

  1354. +        }
    1355. 

  1355. +
    1356. 

  1356. +        /// truth testing.
    1357. 

  1357. +        bool operator! () const
    1358. 

  1358. +        {
    1359. 

  1359. +            return(!_sym || _index < 0);
    1360. 

  1360. +        }
    1361. 

  1361. +
    1362. 

  1362.          /// advance iterator to next Point.
    1363. 

  1363.          PointIterator& operator++ ()
    1364. 

  1364.          {
    1365. 

  1365. @@ -161,7 +199,9 @@ public:
    1366. 

  1366.          /// retrieve currently referenced Point.
    1367. 

  1367.          const Point operator* () const
    1368. 

  1368.          {
    1369. 

  1369. -            assert(_index >= 0);
    1370. 

  1370. +            assert(!!*this);
    1371. 

  1371. +            if(!*this)
    1372. 

  1372. +                return(Point());
    1373. 

  1373.              return(Point(zbar_symbol_get_loc_x(*_sym, _index),
    1374. 

  1374.                           zbar_symbol_get_loc_y(*_sym, _index)));
    1375. 

  1375.          }
    1376. 

  1376. @@ -213,6 +253,32 @@ public:
    1377. 

  1377.          ref(-1);
    1378. 

  1378.      }
    1379. 

  1379.  
    1380. 

  1380. +    /// assignment.
    1381. 

  1381. +    Symbol& operator= (const Symbol& sym)
    1382. 

  1382. +    {
    1383. 

  1383. +        sym.ref(1);
    1384. 

  1384. +        ref(-1);
    1385. 

  1385. +        _sym = sym._sym;
    1386. 

  1386. +        _type = sym._type;
    1387. 

  1387. +        _data = sym._data;
    1388. 

  1388. +        return(*this);
    1389. 

  1389. +    }
    1390. 

  1390. +
    1391. 

  1391. +    Symbol& operator= (const zbar_symbol_t *sym)
    1392. 

  1392. +    {
    1393. 

  1393. +        if(sym)
    1394. 

  1394. +            zbar_symbol_ref(sym, 1);
    1395. 

  1395. +        ref(-1);
    1396. 

  1396. +        init(sym);
    1397. 

  1397. +        return(*this);
    1398. 

  1398. +    }
    1399. 

  1399. +
    1400. 

  1400. +    /// truth testing.
    1401. 

  1401. +    bool operator! () const
    1402. 

  1402. +    {
    1403. 

  1403. +        return(!_sym);
    1404. 

  1404. +    }
    1405. 

  1405. +
    1406. 

  1406.      void ref (int delta = 1) const
    1407. 

  1407.      {
    1408. 

  1408.          if(_sym)
    1409. 

  1409. @@ -311,6 +377,13 @@ public:
    1410. 

  1410.          return((_sym) ? zbar_symbol_get_loc_y(_sym, index) : -1);
    1411. 

  1411.      }
    1412. 

  1412.  
    1413. 

  1413. +    /// see zbar_symbol_get_orientation().
    1414. 

  1414. +    /// @since 0.11
    1415. 

  1415. +    int get_orientation () const
    1416. 

  1416. +    {
    1417. 

  1417. +        return(zbar_symbol_get_orientation(_sym));
    1418. 

  1418. +    }
    1419. 

  1419. +
    1420. 

  1420.      /// see zbar_symbol_xml().
    1421. 

  1421.      const std::string xml () const
    1422. 

  1422.      {
    1423. 

  1423. @@ -320,9 +393,6 @@ public:
    1424. 

  1424.      }
    1425. 

  1425.  
    1426. 

  1426.  protected:
    1427. 

  1427. -
    1428. 

  1428. -    friend class SymbolIterator;
    1429. 

  1429. -
    1430. 

  1430.      /// (re)initialize Symbol from C symbol object.
    1431. 

  1431.      void init (const zbar_symbol_t *sym = NULL)
    1432. 

  1432.      {
    1433. 

  1433. @@ -361,7 +431,7 @@ public:
    1434. 

  1434.      {
    1435. 

  1435.          const zbar_symbol_set_t *zsyms = _syms;
    1436. 

  1436.          if(zsyms)
    1437. 

  1437. -            _sym.init(zbar_symbol_set_first_symbol(zsyms));
    1438. 

  1438. +            _sym = zbar_symbol_set_first_symbol(zsyms);
    1439. 

  1439.      }
    1440. 

  1440.  
    1441. 

  1441.      /// copy constructor.
    1442. 

  1442. @@ -370,25 +440,33 @@ public:
    1443. 

  1443.      {
    1444. 

  1444.          const zbar_symbol_set_t *zsyms = _syms;
    1445. 

  1445.          if(zsyms)
    1446. 

  1446. -            _sym.init(zbar_symbol_set_first_symbol(zsyms));
    1447. 

  1447. +            _sym = zbar_symbol_set_first_symbol(zsyms);
    1448. 

  1448.      }
    1449. 

  1449.  
    1450. 

  1450.      ~SymbolIterator ()
    1451. 

  1451.      {
    1452. 

  1452. -        _sym.init();
    1453. 

  1453. +    }
    1454. 

  1454. +
    1455. 

  1455. +    /// assignment.
    1456. 

  1456. +    SymbolIterator& operator= (const SymbolIterator& iter)
    1457. 

  1457. +    {
    1458. 

  1458. +        _syms = iter._syms;
    1459. 

  1459. +        _sym = iter._sym;
    1460. 

  1460. +        return(*this);
    1461. 

  1461. +    }
    1462. 

  1462. +
    1463. 

  1463. +    bool operator! () const
    1464. 

  1464. +    {
    1465. 

  1465. +        return(!_syms || !_sym);
    1466. 

  1466.      }
    1467. 

  1467.  
    1468. 

  1468.      /// advance iterator to next Symbol.
    1469. 

  1469.      SymbolIterator& operator++ ()
    1470. 

  1470.      {
    1471. 

  1471. -        const zbar_symbol_t *zsym = _sym;
    1472. 

  1472. -        if(zsym)
    1473. 

  1473. -            _sym.init(zbar_symbol_next(zsym));
    1474. 

  1474. -        else {
    1475. 

  1475. -            const zbar_symbol_set_t *zsyms = _syms;
    1476. 

  1476. -            if(zsyms)
    1477. 

  1477. -                _sym.init(zbar_symbol_set_first_symbol(zsyms));
    1478. 

  1478. -        }
    1479. 

  1479. +        if(!!_sym)
    1480. 

  1480. +            _sym = zbar_symbol_next(_sym);
    1481. 

  1481. +        else if(!!_syms)
    1482. 

  1482. +            _sym = zbar_symbol_set_first_symbol(_syms);
    1483. 

  1483.          return(*this);
    1484. 

  1484.      }
    1485. 

  1485.  
    1486. 

  1486. diff --git a/include/zbar/Video.h b/include/zbar/Video.h
    1487. 

  1487. --- a/include/zbar/Video.h
    1488. 

  1488. +++ b/include/zbar/Video.h
    1489. 

  1489. @@ -1,5 +1,5 @@
    1490. 

  1490.  //------------------------------------------------------------------------
    1491. 

  1491. -//  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
    1492. 

  1492. +//  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
    1493. 

  1493.  //
    1494. 

  1494.  //  This file is part of the ZBar Bar Code Reader.
    1495. 

  1495.  //
    1496. 

  1496. @@ -92,7 +92,7 @@ public:
    1497. 

  1497.      /// see zbar_video_init()
    1498. 

  1498.      void init (std::string& format)
    1499. 

  1499.      {
    1500. 

  1500. -        unsigned int fourcc = *(unsigned int*)format.c_str();
    1501. 

  1501. +        unsigned int fourcc = zbar_fourcc_parse(format.c_str());
    1502. 

  1502.          if(zbar_video_init(_video, fourcc))
    1503. 

  1503.              throw_exception(_video);
    1504. 

  1504.      }
    1505. 

  1505. diff --git a/include/zbar/zbargtk.h b/include/zbar/zbargtk.h
    1506. 

  1506. --- a/include/zbar/zbargtk.h
    1507. 

  1507. +++ b/include/zbar/zbargtk.h
    1508. 

  1508. @@ -136,7 +136,7 @@ struct _ZBarGtkClass {
    1509. 

  1509.  
    1510. 

  1510.  GType zbar_gtk_get_type(void) G_GNUC_CONST;
    1511. 

  1511.  
    1512. 

  1512. -/** 
    1513. 

  1513. +/**
    1514. 

  1514.   * zbar_gtk_new:
    1515. 

  1515.   * create a new barcode reader widget instance.
    1516. 

  1516.   * initially has no associated video device or image.
    1517. 

  1517. @@ -189,7 +189,17 @@ void zbar_gtk_set_video_enabled(ZBarGtk 
    1518. 

  1518.   */
    1519. 

  1519.  gboolean zbar_gtk_get_video_opened(ZBarGtk *zbar);
    1520. 

  1520.  
    1521. 

  1521. -/** 
    1522. 

  1522. +/** set video camera resolution.
    1523. 

  1523. + * @width: width in pixels
    1524. 

  1524. + * @height: height in pixels
    1525. 

  1525. + *
    1526. 

  1526. + * @note this call must be made before video is initialized
    1527. 

  1527. + */
    1528. 

  1528. +void zbar_gtk_request_video_size(ZBarGtk *zbar,
    1529. 

  1529. +                                 int width,
    1530. 

  1530. +                                 int height);
    1531. 

  1531. +
    1532. 

  1532. +/**
    1533. 

  1533.   * utility function to populate a zbar_image_t from a GdkPixbuf.
    1534. 

  1534.   * @image: the zbar library image destination to populate
    1535. 

  1535.   * @pixbuf: the GdkPixbuf source
    1536. 

  1536. diff --git a/iphone/ChangeLog b/iphone/ChangeLog
    1537. 

  1537. new file mode 100644
    1538. 

  1538. --- /dev/null
    1539. 

  1539. +++ b/iphone/ChangeLog
    1540. 

  1540. @@ -0,0 +1,70 @@
    1541. 

  1541. +version 1.0.1:
    1542. 

  1542. +  * hotfix broken ZBarHelpController back button
    1543. 

  1543. +  * release updates
    1544. 

  1544. +    - update docs
    1545. 

  1545. +  * fix support for GS1 AIs
    1546. 

  1546. +  * fix simulated camera image orientation/scaling
    1547. 

  1547. +  * cleanup and expose ZBarHelpController
    1548. 

  1548. +  * expose enable for reader capture processing
    1549. 

  1549. +  * workaround iOS 4.2 hang
    1550. 

  1550. +    - upd…
    1551.

Large files files are truncated, but you can click here to view the full file