From 07188855daaf116d14f35ce6660397f0783163d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jason=20=E3=83=86=E3=82=A3=E3=83=93=E3=83=84?=
 <tibbs@fedoraproject.org>
Date: Wed, 29 Jul 2009 19:38:07 +0000
Subject: [PATCH 001/108] Setup of module zbar

---
 .cvsignore |  0
 Makefile   | 21 +++++++++++++++++++++
 sources    |  0
 3 files changed, 21 insertions(+)
 create mode 100644 .cvsignore
 create mode 100644 Makefile
 create mode 100644 sources

diff --git a/.cvsignore b/.cvsignore
new file mode 100644
index 0000000..e69de29
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..aa133b0
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,21 @@
+# Makefile for source rpm: zbar
+# $Id$
+NAME := zbar
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON := $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attept a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)
diff --git a/sources b/sources
new file mode 100644
index 0000000..e69de29

From f6d3222e8f41de3484c5dc550ee01fd88dab45c2 Mon Sep 17 00:00:00 2001
From: Douglas Schilling Landgraf <dougsland@fedoraproject.org>
Date: Wed, 29 Jul 2009 20:39:37 +0000
Subject: [PATCH 002/108] - Now fixed Source0 url - Removed ldconfig calls to
 devel subpackages - Fixed directory ownership issue -pygtk - Added %%{name}
 to URL - Added comment to rpath - Improved comment for removing .la and .a
 files Thu Jul 27 2009 Douglas Schilling Landgraf <dougsland@redhat.com> -
 0.8-4 - Fixed sourceforge url - Removed redundant libX11-devel package from
 BuildRequires - Removed redundant ImageMagick package from Requires - Removed
 Provides for not included static libs - Removed redundant requires to
 subpackages -qt and -gtk - Removed redundant {name} = %%{version}-%%{release}
 from -pygtk - Replaced macros from % to %% in changelog - Fixed ownership
 issue - Added ldconfig call to devel, qt-devel and gtk-devel Thu Jul 24 2009
 Douglas Schilling Landgraf <dougsland@redhat.com> - 0.8-3 - Fixed License
 from LGPLv2 to LGPLv2+ - Added to main BuildRequires libXv-devel and xmlto
 packages - Removed pkgconfig from main BuildRequires - Removed .la and .a
 files - Removed version validation from ImageMagick-c++ and
 ImageMagick-c++-devel     packages - Replaced 3 {%%version} to %%{version}
 (packages: devel, qt-devel,     gtk-devel) - Removed duplicated description
 for each package - Added %%{version}-%%{release} to packages: devel, gtk,
 gtk-devel, pygtk,     qt - Added pkgconfig to packages gtk-devel, qt-devel
 into Requires session - Removed redundant packages - Added dependency of gtk
 to pygtk - Added timestamp on installed files - Replaced %%{_datadir}/man to
 %%{_mandir} - Removed INSTALL file - Fixed %%doc session - Added to -devel
 own of %%{_includedir}/zbar directory - Replaced "%%{_libdir}/python*" to
 %%{python_sitearch} - Fixed %%defattr - Fixed Release Number and Changelog -
 Fixed rpath error Thu Jul 16 2009 Douglas Schilling Landgraf
 <dougsland@redhat.com> - 0.8-2 - Added pkgconfig to devel package - Fixed
 syntax to ldconfig - Fixed warnings from rpmlint - Fixed static path to docs
 Thu Jul 15 2009 Douglas Schilling Landgraf <dougsland@redhat.com> - 0.8-1 -
 First release, based on original zbar.spec provided by sources

---
 .cvsignore |   1 +
 import.log |   1 +
 sources    |   1 +
 zbar.spec  | 218 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 221 insertions(+)
 create mode 100644 import.log
 create mode 100644 zbar.spec

diff --git a/.cvsignore b/.cvsignore
index e69de29..f4e867b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -0,0 +1 @@
+zbar-0.8.tar.bz2
diff --git a/import.log b/import.log
new file mode 100644
index 0000000..d61b788
--- /dev/null
+++ b/import.log
@@ -0,0 +1 @@
+zbar-0_8-5_fc10:HEAD:zbar-0.8-5.fc10.src.rpm:1248899866
diff --git a/sources b/sources
index e69de29..0db5e47 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+b5b0efd92af16230ce9952e7a9a671fd  zbar-0.8.tar.bz2
diff --git a/zbar.spec b/zbar.spec
new file mode 100644
index 0000000..0a12c77
--- /dev/null
+++ b/zbar.spec
@@ -0,0 +1,218 @@
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+
+Name:           zbar
+Version:        0.8
+Release:        5%{?dist}
+Summary:        Bar code reader
+
+Group:          User Interface/X Hardware Support
+License:        LGPLv2+
+URL:            http://sourceforge.net/projects/%{name}
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  python-devel, gtk2-devel, pygtk2-devel, qt-devel >= 4, ImageMagick-c++-devel, libXv-devel, xmlto
+
+%description
+A layered barcode scanning and decoding library. Supports EAN, UPC, Code 128,
+Code 39 and Interleaved 2 of 5.
+Includes applications for decoding captured barcode images and using a video 
+device (eg, webcam) as a barcode scanner.
+
+%package devel
+Group: Development/Libraries
+Summary: Bar code library extra development files
+Requires: pkgconfig, %{name} = %{version}-%{release}
+
+%description devel
+This package contains header files and additional libraries used for
+developing applications that read bar codes with this library.
+
+%package gtk
+Group: Development/Libraries
+Summary: Bar code reader GTK widget
+Requires: %{name} = %{version}-%{release}
+
+%description gtk
+This package contains a bar code scanning widget for use with GUI
+applications based on GTK+-2.0.
+
+%package gtk-devel
+Group: Development/Libraries
+Summary: Bar code reader GTK widget extra development files
+Requires: pkgconfig, %{name}-gtk = %{version}-%{release}, %{name}-devel = %{version}-%{release}
+
+%description gtk-devel
+This package contains header files and additional libraries used for
+developing GUI applications based on GTK+-2.0 that include a bar code
+scanning widget.
+
+%package pygtk
+Group: Development/Libraries
+Summary: Bar code reader PyGTK widget
+Requires: pygtk2, %{name}-gtk = %{version}-%{release}
+
+%description pygtk
+This package contains a bar code scanning widget for use in GUI
+applications based on PyGTK.
+
+%package qt
+Group: Development/Libraries
+Summary: Bar code reader Qt widget
+Requires: %{name} = %{version}-%{release}
+
+%description qt
+This package contains a bar code scanning widget for use with GUI
+applications based on Qt4.
+
+%package qt-devel
+Group: Development/Libraries
+Summary: Bar code reader Qt widget extra development files
+Requires: pkgconfig, %{name}-qt = %{version}-%{release}, %{name}-devel = %{version}-%{release}
+
+%description qt-devel
+This package contains header files and additional libraries used for
+developing GUI applications based on Qt4 that include a bar code
+scanning widget.
+
+%prep
+%setup -q
+
+%build
+%configure --docdir=%{_docdir}/%{name}-%{version}
+
+# rpath
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
+make %{?_smp_mflags}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+
+#Remove .la and .a files
+find ${RPM_BUILD_ROOT} -name '*.la' -or -name '*.a' | xargs rm -f
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post -p /sbin/ldconfig
+
+%post devel -p /sbin/ldconfig
+
+%post gtk -p /sbin/ldconfig
+
+%post qt -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%postun devel -p /sbin/ldconfig
+
+%postun gtk -p /sbin/ldconfig
+
+%postun qt -p /sbin/ldconfig
+
+%files
+%defattr(-,root,root,-)
+%doc COPYING.LIB NEWS
+
+%{_bindir}/zbarimg
+%{_bindir}/zbarcam
+%{_libdir}/libzbar.so.*
+%{_mandir}/man1/*
+
+%files devel
+%defattr(-,root,root,-)
+%doc HACKING TODO
+
+%{_libdir}/libzbar.so
+%{_libdir}/pkgconfig/zbar.pc
+%dir %{_includedir}/zbar
+%{_includedir}/zbar.h
+%{_includedir}/zbar/Exception.h
+%{_includedir}/zbar/Symbol.h
+%{_includedir}/zbar/Image.h
+%{_includedir}/zbar/Scanner.h
+%{_includedir}/zbar/Decoder.h
+%{_includedir}/zbar/ImageScanner.h
+%{_includedir}/zbar/Video.h
+%{_includedir}/zbar/Window.h
+%{_includedir}/zbar/Processor.h
+
+%files gtk
+%defattr(-,root,root,-)
+%{_libdir}/libzbargtk.so.*
+
+%files gtk-devel
+%defattr(-,root,root,-)
+%{_libdir}/libzbargtk.so
+%{_libdir}/pkgconfig/zbar-gtk.pc
+%{_includedir}/zbar/zbargtk.h
+
+%files pygtk
+%defattr(-,root,root,-)
+%{python_sitearch}/zbarpygtk.so
+%{python_sitearch}/zbar.so
+
+%files qt
+%defattr(-,root,root,-)
+%{_libdir}/libzbarqt.so.*
+
+%files qt-devel
+%defattr(-,root,root,-)
+%{_libdir}/libzbarqt.so
+%{_libdir}/pkgconfig/zbar-qt.pc
+%{_includedir}/zbar/QZBar*.h
+
+%changelog
+* Thu Jul 28 2009 Douglas Schilling Landgraf <dougsland@redhat.com> - 0.8-5
+- Now fixed Source0 url
+- Removed ldconfig calls to devel subpackages
+- Fixed directory ownership issue -pygtk
+- Added %%{name} to URL
+- Added comment to rpath 
+- Improved comment for removing .la and .a files
+
+* Thu Jul 27 2009 Douglas Schilling Landgraf <dougsland@redhat.com> - 0.8-4
+- Fixed sourceforge url
+- Removed redundant libX11-devel package from BuildRequires
+- Removed redundant ImageMagick package from Requires
+- Removed Provides for not included static libs
+- Removed redundant requires to subpackages -qt and -gtk
+- Removed redundant {name} = %%{version}-%%{release} from -pygtk
+- Replaced macros from % to %% in changelog 
+- Fixed ownership issue
+- Added ldconfig call to devel, qt-devel and gtk-devel
+
+* Thu Jul 24 2009 Douglas Schilling Landgraf <dougsland@redhat.com> - 0.8-3
+- Fixed License from LGPLv2 to LGPLv2+
+- Added to main BuildRequires libXv-devel and xmlto packages
+- Removed pkgconfig from main BuildRequires
+- Removed .la and .a files
+- Removed version validation from ImageMagick-c++ and ImageMagick-c++-devel packages
+- Replaced 3 {%%version} to %%{version} (packages: devel, qt-devel, gtk-devel)
+- Removed duplicated description for each package
+- Added %%{version}-%%{release} to packages: devel, gtk, gtk-devel, pygtk, qt
+- Added pkgconfig to packages gtk-devel, qt-devel into Requires session
+- Removed redundant packages
+- Added dependency of gtk to pygtk
+- Added timestamp on installed files
+- Replaced %%{_datadir}/man to %%{_mandir}
+- Removed INSTALL file
+- Fixed %%doc session
+- Added to -devel own of %%{_includedir}/zbar directory
+- Replaced "%%{_libdir}/python*" to %%{python_sitearch}
+- Fixed %%defattr
+- Fixed Release Number and Changelog
+- Fixed rpath error
+
+* Thu Jul 16 2009 Douglas Schilling Landgraf <dougsland@redhat.com> - 0.8-2
+- Added pkgconfig to devel package 
+- Fixed syntax to ldconfig 
+- Fixed warnings from rpmlint
+- Fixed static path to docs
+
+* Thu Jul 15 2009 Douglas Schilling Landgraf <dougsland@redhat.com> - 0.8-1
+- First release, based on original zbar.spec provided by sources

From 092a56ed30c4fe19732b9ba0e07b7872c274c808 Mon Sep 17 00:00:00 2001
From: Douglas Schilling Landgraf <dougsland@fedoraproject.org>
Date: Thu, 30 Jul 2009 00:20:56 +0000
Subject: [PATCH 003/108] - fix epel build

---
 import.log |  1 +
 zbar.spec  | 13 +++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/import.log b/import.log
index d61b788..a789b48 100644
--- a/import.log
+++ b/import.log
@@ -1 +1,2 @@
 zbar-0_8-5_fc10:HEAD:zbar-0.8-5.fc10.src.rpm:1248899866
+zbar-0_8-6_fc10:HEAD:zbar-0.8-6.fc10.src.rpm:1248913251
diff --git a/zbar.spec b/zbar.spec
index 0a12c77..45eda1e 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -3,7 +3,7 @@
 
 Name:           zbar
 Version:        0.8
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Bar code reader
 
 Group:          User Interface/X Hardware Support
@@ -12,7 +12,13 @@ URL:            http://sourceforge.net/projects/%{name}
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  python-devel, gtk2-devel, pygtk2-devel, qt-devel >= 4, ImageMagick-c++-devel, libXv-devel, xmlto
+BuildRequires:  python-devel, gtk2-devel, pygtk2-devel, ImageMagick-c++-devel, libXv-devel, xmlto
+
+%if 0%{?rhel}
+BuildRequires: qt4-devel
+%else
+BuildRequires: qt-devel
+%endif
 
 %description
 A layered barcode scanning and decoding library. Supports EAN, UPC, Code 128,
@@ -167,6 +173,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/zbar/QZBar*.h
 
 %changelog
+* Wed Jul 29 2009 Itamar Reis Peixoto <itamar@ispbrasil.com.br> - 0.8-6
+- fix epel build
+
 * Thu Jul 28 2009 Douglas Schilling Landgraf <dougsland@redhat.com> - 0.8-5
 - Now fixed Source0 url
 - Removed ldconfig calls to devel subpackages

From d1ffdbdbb7fca0b9810e2327335ea97d089e06bf Mon Sep 17 00:00:00 2001
From: Douglas Schilling Landgraf <dougsland@fedoraproject.org>
Date: Thu, 30 Jul 2009 00:28:57 +0000
Subject: [PATCH 004/108] - Replace URL info

---
 import.log | 1 +
 zbar.spec  | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/import.log b/import.log
index a789b48..c533a2e 100644
--- a/import.log
+++ b/import.log
@@ -1,2 +1,3 @@
 zbar-0_8-5_fc10:HEAD:zbar-0.8-5.fc10.src.rpm:1248899866
 zbar-0_8-6_fc10:HEAD:zbar-0.8-6.fc10.src.rpm:1248913251
+zbar-0_8-7_fc10:HEAD:zbar-0.8-7.fc10.src.rpm:1248913736
diff --git a/zbar.spec b/zbar.spec
index 45eda1e..b2c1ab9 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -3,12 +3,12 @@
 
 Name:           zbar
 Version:        0.8
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Bar code reader
 
 Group:          User Interface/X Hardware Support
 License:        LGPLv2+
-URL:            http://sourceforge.net/projects/%{name}
+URL:            http://zbar.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -173,6 +173,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/zbar/QZBar*.h
 
 %changelog
+* Wed Jul 29 2009 Douglas Schilling Landgraf <dougsland@redhat.com> - 0.8-7
+- Replace URL info
+
 * Wed Jul 29 2009 Itamar Reis Peixoto <itamar@ispbrasil.com.br> - 0.8-6
 - fix epel build
 

From a43f5ef62bb907d1b22d1952cbbc148a9cf745b3 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@fedoraproject.org>
Date: Sat, 7 Nov 2009 16:06:44 +0000
Subject: [PATCH 005/108] - Update to 0.10

---
 .cvsignore | 2 +-
 sources    | 2 +-
 zbar.spec  | 9 ++++++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index f4e867b..d85da86 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-zbar-0.8.tar.bz2
+zbar-0.10.tar.bz2
diff --git a/sources b/sources
index 0db5e47..32db79b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b5b0efd92af16230ce9952e7a9a671fd  zbar-0.8.tar.bz2
+0fd61eb590ac1bab62a77913c8b086a5  zbar-0.10.tar.bz2
diff --git a/zbar.spec b/zbar.spec
index b2c1ab9..6e44e37 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -2,8 +2,8 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           zbar
-Version:        0.8
-Release:        7%{?dist}
+Version:        0.10
+Release:        1%{?dist}
 Summary:        Bar code reader
 
 Group:          User Interface/X Hardware Support
@@ -122,7 +122,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING.LIB NEWS
+%doc COPYING LICENSE NEWS
 
 %{_bindir}/zbarimg
 %{_bindir}/zbarcam
@@ -173,6 +173,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/zbar/QZBar*.h
 
 %changelog
+* Mon Nov 02 2009 Bastien Nocera <bnocera@redhat.com> 0.10-1
+- Update to 0.10
+
 * Wed Jul 29 2009 Douglas Schilling Landgraf <dougsland@redhat.com> - 0.8-7
 - Replace URL info
 

From e40042a887e31d5e87601ed826cd89eaedeffbfa Mon Sep 17 00:00:00 2001
From: Kevin Kofler <kkofler@fedoraproject.org>
Date: Wed, 25 Nov 2009 01:28:37 +0000
Subject: [PATCH 006/108] - Rebuild for Qt 4.6.0 RC1 in F13 (was built against
 Beta 1 with unstable     ABI) - Always BR qt4-devel rather than qt-devel,
 it's provided by qt-devel     anyway NOTE: Your package needs to be rebuilt
 IF AND ONLY IF it was built against     Qt 4.6.0 Beta 1. This was in the
 buildroot ONLY for dist-f13 after F12     branched. Packages built against Qt
 4.5.x or older do NOT need a     rebuild for 4.6.x (backwards binary
 compatibility). I have a list of     packages needing a rebuild and am going
 through it. This package is in     my list, so I am rebuilding it.

---
 zbar.spec | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/zbar.spec b/zbar.spec
index 6e44e37..bd78490 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -3,7 +3,7 @@
 
 Name:           zbar
 Version:        0.10
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Bar code reader
 
 Group:          User Interface/X Hardware Support
@@ -13,12 +13,7 @@ Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel, gtk2-devel, pygtk2-devel, ImageMagick-c++-devel, libXv-devel, xmlto
-
-%if 0%{?rhel}
-BuildRequires: qt4-devel
-%else
-BuildRequires: qt-devel
-%endif
+BuildRequires:  qt4-devel
 
 %description
 A layered barcode scanning and decoding library. Supports EAN, UPC, Code 128,
@@ -173,6 +168,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/zbar/QZBar*.h
 
 %changelog
+* Wed Nov 25 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> 0.10-2
+- Rebuild for Qt 4.6.0 RC1 in F13 (was built against Beta 1 with unstable ABI)
+- Always BR qt4-devel rather than qt-devel, it's provided by qt-devel anyway
+
 * Mon Nov 02 2009 Bastien Nocera <bnocera@redhat.com> 0.10-1
 - Update to 0.10
 

From 7f4c564f81392171e7785c112b67764cd0fae8c5 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Wed, 25 Nov 2009 22:39:18 +0000
Subject: [PATCH 007/108] Fix typo that causes a failure to update the common
 directory. (releng     #2781)

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index aa133b0..b48fd62 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 # Makefile for source rpm: zbar
-# $Id$
+# $Id: Makefile,v 1.1 2009/07/29 19:38:07 tibbs Exp $
 NAME := zbar
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
 endef
 
 MAKEFILE_COMMON := $(shell $(find-makefile-common))

From 16d17c4c10c1a27b82c7d46a22c784c95acbf492 Mon Sep 17 00:00:00 2001
From: dmalcolm <dmalcolm@fedoraproject.org>
Date: Thu, 22 Jul 2010 07:23:30 +0000
Subject: [PATCH 008/108] - Rebuilt for    
 https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild

---
 zbar.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zbar.spec b/zbar.spec
index bd78490..9c92a1e 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -3,7 +3,7 @@
 
 Name:           zbar
 Version:        0.10
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Bar code reader
 
 Group:          User Interface/X Hardware Support
@@ -168,6 +168,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/zbar/QZBar*.h
 
 %changelog
+* Thu Jul 22 2010 David Malcolm <dmalcolm@redhat.com> - 0.10-3
+- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
+
 * Wed Nov 25 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> 0.10-2
 - Rebuild for Qt 4.6.0 RC1 in F13 (was built against Beta 1 with unstable ABI)
 - Always BR qt4-devel rather than qt-devel, it's provided by qt-devel anyway

From d4efb30aca991061d43307bf2d23e4b349a7787d Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
Date: Thu, 29 Jul 2010 16:28:18 +0000
Subject: [PATCH 009/108] dist-git conversion

---
 .cvsignore => .gitignore |  0
 Makefile                 | 21 ---------------------
 import.log               |  3 ---
 3 files changed, 24 deletions(-)
 rename .cvsignore => .gitignore (100%)
 delete mode 100644 Makefile
 delete mode 100644 import.log

diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index b48fd62..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: zbar
-# $Id: Makefile,v 1.1 2009/07/29 19:38:07 tibbs Exp $
-NAME := zbar
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/import.log b/import.log
deleted file mode 100644
index c533a2e..0000000
--- a/import.log
+++ /dev/null
@@ -1,3 +0,0 @@
-zbar-0_8-5_fc10:HEAD:zbar-0.8-5.fc10.src.rpm:1248899866
-zbar-0_8-6_fc10:HEAD:zbar-0.8-6.fc10.src.rpm:1248913251
-zbar-0_8-7_fc10:HEAD:zbar-0.8-7.fc10.src.rpm:1248913736

From 225e5edff7a152c4612c9134ab8f640c58019bf5 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Wed, 15 Sep 2010 20:24:34 +0200
Subject: [PATCH 010/108] - Rebuild for new ImageMagick

---
 zbar.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zbar.spec b/zbar.spec
index 9c92a1e..1592d46 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -3,7 +3,7 @@
 
 Name:           zbar
 Version:        0.10
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Bar code reader
 
 Group:          User Interface/X Hardware Support
@@ -168,6 +168,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/zbar/QZBar*.h
 
 %changelog
+* Wed Sep 15 2010 Hans de Goede <hdegoede@redhat.com> 0.10-4
+- Rebuild for new ImageMagick
+
 * Thu Jul 22 2010 David Malcolm <dmalcolm@redhat.com> - 0.10-3
 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
 

From c066d62fe78c94de8caafe019d7f6d84446b990c Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating@redhat.com>
Date: Wed, 29 Sep 2010 13:34:53 -0700
Subject: [PATCH 011/108] - Rebuilt for gcc bug 634757

---
 zbar.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zbar.spec b/zbar.spec
index 1592d46..7d1f403 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -3,7 +3,7 @@
 
 Name:           zbar
 Version:        0.10
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Bar code reader
 
 Group:          User Interface/X Hardware Support
@@ -168,6 +168,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/zbar/QZBar*.h
 
 %changelog
+* Wed Sep 29 2010 jkeating - 0.10-5
+- Rebuilt for gcc bug 634757
+
 * Wed Sep 15 2010 Hans de Goede <hdegoede@redhat.com> 0.10-4
 - Rebuild for new ImageMagick
 

From 27a148a853350a30f1988a97eef01f310c976caf Mon Sep 17 00:00:00 2001
From: Rafael Azenha Aquini <aquini@fedoraproject.org>
Date: Sat, 18 Dec 2010 14:43:10 -0200
Subject: [PATCH 012/108] - Update it to the newest version available at zbar
 git directory - Use libv4l to communicate with video devices

---
 .gitignore                            |     1 +
 zbar.spec                             |    22 +-
 zbar_dont_user_reserved_dprintf.patch |  1729 ++
 zbar_update_to_617889f8f73.patch      | 28771 ++++++++++++++++++++++++
 zbar_use_libv4l.patch                 |   755 +
 5 files changed, 31274 insertions(+), 4 deletions(-)
 create mode 100644 zbar_dont_user_reserved_dprintf.patch
 create mode 100644 zbar_update_to_617889f8f73.patch
 create mode 100644 zbar_use_libv4l.patch

diff --git a/.gitignore b/.gitignore
index d85da86..f0c8280 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 zbar-0.10.tar.bz2
+/zbar-0.10.tar.bz2
diff --git a/zbar.spec b/zbar.spec
index 7d1f403..a99c126 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -3,17 +3,22 @@
 
 Name:           zbar
 Version:        0.10
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Bar code reader
 
 Group:          User Interface/X Hardware Support
 License:        LGPLv2+
 URL:            http://zbar.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Patch0:		zbar_update_to_617889f8f73.patch
+Patch1:		zbar_dont_user_reserved_dprintf.patch
+Patch2:		zbar_use_libv4l.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  python-devel, gtk2-devel, pygtk2-devel, ImageMagick-c++-devel, libXv-devel, xmlto
-BuildRequires:  qt4-devel
+Requires:	ImageMagick-c++ libv4l libXv
+ 
+BuildRequires:	autoconf automake libtool python-devel gettext-devel
+BuildRequires:	qt4-devel gtk2-devel pygtk2-devel ImageMagick-c++-devel
+BuildRequires:	libv4l-devel libXv-devel xmlto
 
 %description
 A layered barcode scanning and decoding library. Supports EAN, UPC, Code 128,
@@ -79,8 +84,13 @@ scanning widget.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
+autoreconf
+autoconf
 %configure --docdir=%{_docdir}/%{name}-%{version}
 
 # rpath
@@ -168,6 +178,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/zbar/QZBar*.h
 
 %changelog
+* Sun Dec 05 2010 mchehab - 0.10-6
+- Update it to the newest version available at zbar git directory
+- Use libv4l to communicate with video devices
+
 * Wed Sep 29 2010 jkeating - 0.10-5
 - Rebuilt for gcc bug 634757
 
diff --git a/zbar_dont_user_reserved_dprintf.patch b/zbar_dont_user_reserved_dprintf.patch
new file mode 100644
index 0000000..fa30ded
--- /dev/null
+++ b/zbar_dont_user_reserved_dprintf.patch
@@ -0,0 +1,1729 @@
+diff --git a/zbar/debug.h b/zbar/debug.h
+--- a/zbar/debug.h
++++ b/zbar/debug.h
+@@ -27,10 +27,10 @@
+ 
+ # ifdef __GNUC__
+     /* older versions of gcc (< 2.95) require a named varargs parameter */
+-#  define dprintf(args...) while(0)
++#  define debprintf(args...) while(0)
+ # else
+     /* unfortunately named vararg parameter is a gcc-specific extension */
+-#  define dprintf(...) while(0)
++#  define debprintf(...) while(0)
+ # endif
+ 
+ #else
+@@ -38,12 +38,12 @@
+ # include <stdio.h>
+ 
+ # ifdef __GNUC__
+-#  define dprintf(level, args...) do {  \
++#  define debprintf(level, args...) do {  \
+         if((level) <= DEBUG_LEVEL)      \
+             fprintf(stderr, args);      \
+     } while(0)
+ # else
+-#  define dprintf(level, ...) do {          \
++#  define debprintf(level, ...) do {          \
+         if((level) <= DEBUG_LEVEL)          \
+             fprintf(stderr, __VA_ARGS__);   \
+     } while(0)
+diff --git a/zbar/decoder.c b/zbar/decoder.c
+--- a/zbar/decoder.c
++++ b/zbar/decoder.c
+@@ -218,7 +218,7 @@ zbar_symbol_type_t zbar_decode_width (zb
+     zbar_symbol_type_t tmp, sym = ZBAR_NONE;
+ 
+     dcode->w[dcode->idx & (DECODE_WINDOW - 1)] = w;
+-    dprintf(1, "    decode[%x]: w=%d (%g)\n", dcode->idx, w, (w / 32.));
++    debprintf(1, "    decode[%x]: w=%d (%g)\n", dcode->idx, w, (w / 32.));
+ 
+     /* update shared character width */
+     dcode->s6 -= get_width(dcode, 7);
+diff --git a/zbar/decoder.h b/zbar/decoder.h
+--- a/zbar/decoder.h
++++ b/zbar/decoder.h
+@@ -188,7 +188,7 @@ static inline char acquire_lock (zbar_de
+                                  zbar_symbol_type_t req)
+ {
+     if(dcode->lock) {
+-        dprintf(2, " [locked %d]\n", dcode->lock);
++        debprintf(2, " [locked %d]\n", dcode->lock);
+         return(1);
+     }
+     dcode->lock = req;
+diff --git a/zbar/decoder/code128.c b/zbar/decoder/code128.c
+--- a/zbar/decoder/code128.c
++++ b/zbar/decoder/code128.c
+@@ -137,7 +137,7 @@ static inline signed char decode_lo (int
+     zassert(idx <= 0x50, -1, "sig=%x offset=%x base=%x idx=%x\n",
+             sig, offset, base, idx);
+     c = characters[idx];
+-    dprintf(2, " %02x(%x(%02x)/%x(%02x)) => %02x",
++    debprintf(2, " %02x(%x(%02x)/%x(%02x)) => %02x",
+             idx, base, lo_base[base], offset, lo_offset[offset],
+             (unsigned char)c);
+     return(c);
+@@ -152,7 +152,7 @@ static inline signed char decode_hi (int
+                ((sig >>  4) & 0x00f0) |
+                ((sig <<  4) & 0x0f00) |
+                ((sig << 12) & 0xf000));
+-    dprintf(2, " rev=%x", rev != 0);
++    debprintf(2, " rev=%x", rev != 0);
+ 
+     switch(sig) {
+     case 0x0014: idx = 0x0; break;
+@@ -174,7 +174,7 @@ static inline signed char decode_hi (int
+     if(rev)
+         idx += 0xe;
+     c = characters[0x51 + idx];
+-    dprintf(2, " %02x => %02x", idx, c);
++    debprintf(2, " %02x => %02x", idx, c);
+     return(c);
+ }
+ 
+@@ -199,7 +199,7 @@ static inline signed char decode6 (zbar_
+     /* build edge signature of character */
+     unsigned s = dcode->code128.s6;
+ 
+-    dprintf(2, " s=%d", s);
++    debprintf(2, " s=%d", s);
+     if(s < 5)
+         return(-1);
+     /* calculate similar edge measurements */
+@@ -214,7 +214,7 @@ static inline signed char decode6 (zbar_
+            (decode_e(get_width(dcode, 2) + get_width(dcode, 1), s, 11)));
+     if(sig < 0)
+         return(-1);
+-    dprintf(2, " sig=%04x", sig);
++    debprintf(2, " sig=%04x", sig);
+     /* lookup edge signature */
+     c = (sig & 0x4444) ? decode_hi(sig) : decode_lo(sig);
+     if(c == -1)
+@@ -226,7 +226,7 @@ static inline signed char decode6 (zbar_
+         : (get_width(dcode, 1) + get_width(dcode, 3) + get_width(dcode, 5));
+     bars = bars * 11 * 4 / s;
+     chk = calc_check(c);
+-    dprintf(2, " bars=%d chk=%d", bars, chk);
++    debprintf(2, " bars=%d chk=%d", bars, chk);
+     if(chk - 7 > bars || bars > chk + 7)
+         return(-1);
+ 
+@@ -268,10 +268,10 @@ static inline unsigned char validate_che
+     /* and compare to check character */
+     idx = (dcode128->direction) ? 1 : dcode128->character - 2;
+     check = dcode->buf[idx];
+-    dprintf(2, " chk=%02x(%02x)", sum, check);
++    debprintf(2, " chk=%02x(%02x)", sum, check);
+     err = (sum != check);
+     if(err)
+-        dprintf(1, " [checksum error]\n");
++        debprintf(1, " [checksum error]\n");
+     return(err);
+ }
+ 
+@@ -330,12 +330,12 @@ static inline unsigned char postprocess 
+     unsigned i, j, cexp;
+     unsigned char code = 0, charset;
+     code128_decoder_t *dcode128 = &dcode->code128;
+-    dprintf(2, "\n    postproc len=%d", dcode128->character);
++    debprintf(2, "\n    postproc len=%d", dcode128->character);
+     dcode->modifiers = 0;
+     dcode->direction = 1 - 2 * dcode128->direction;
+     if(dcode128->direction) {
+         /* reverse buffer */
+-        dprintf(2, " (rev)");
++        debprintf(2, " (rev)");
+         for(i = 0; i < dcode128->character / 2; i++) {
+             unsigned j = dcode128->character - 1 - i;
+             code = dcode->buf[i];
+@@ -357,7 +357,7 @@ static inline unsigned char postprocess 
+ 
+     charset = code - START_A;
+     cexp = (code == START_C) ? 1 : 0;
+-    dprintf(2, " start=%c", 'A' + charset);
++    debprintf(2, " start=%c", 'A' + charset);
+ 
+     for(i = 1, j = 0; i < dcode128->character - 2; i++) {
+         unsigned char code = dcode->buf[i];
+@@ -380,7 +380,7 @@ static inline unsigned char postprocess 
+                 charset &= 0x7f;
+         }
+         else {
+-            dprintf(2, " %02x", code);
++            debprintf(2, " %02x", code);
+             if(charset & 0x2) {
+                 unsigned delta;
+                 /* expand character set C to ASCII */
+@@ -414,7 +414,7 @@ static inline unsigned char postprocess 
+                 /*else drop trailing FNC1 */
+             }
+             else if(code >= START_A) {
+-                dprintf(1, " [truncated]\n");
++                debprintf(1, " [truncated]\n");
+                 return(1);
+             }
+             else {
+@@ -465,21 +465,21 @@ zbar_symbol_type_t _zbar_decode_code128 
+         return(0);
+     dcode128->element = 0;
+ 
+-    dprintf(2, "      code128[%c%02d+%x]:",
++    debprintf(2, "      code128[%c%02d+%x]:",
+             (dcode128->direction) ? '<' : '>',
+             dcode128->character, dcode128->element);
+ 
+     c = decode6(dcode);
+     if(dcode128->character < 0) {
+         unsigned qz;
+-        dprintf(2, " c=%02x", c);
++        debprintf(2, " c=%02x", c);
+         if(c < START_A || c > STOP_REV || c == STOP_FWD) {
+-            dprintf(2, " [invalid]\n");
++            debprintf(2, " [invalid]\n");
+             return(0);
+         }
+         qz = get_width(dcode, 6);
+         if(qz && qz < (dcode128->s6 * 3) / 4) {
+-            dprintf(2, " [invalid qz %d]\n", qz);
++            debprintf(2, " [invalid qz %d]\n", qz);
+             return(0);
+         }
+         /* decoded valid start/stop */
+@@ -493,13 +493,13 @@ zbar_symbol_type_t _zbar_decode_code128 
+             dcode128->direction = ZBAR_SPACE;
+         dcode128->start = c;
+         dcode128->width = dcode128->s6;
+-        dprintf(2, " dir=%x [valid start]\n", dcode128->direction);
++        debprintf(2, " dir=%x [valid start]\n", dcode128->direction);
+         return(0);
+     }
+     else if((c < 0) ||
+             ((dcode128->character >= BUFFER_MIN) &&
+              size_buf(dcode, dcode128->character + 1))) {
+-        dprintf(1, (c < 0) ? " [aborted]\n" : " [overflow]\n");
++        debprintf(1, (c < 0) ? " [aborted]\n" : " [overflow]\n");
+         if(dcode128->character > 1)
+             release_lock(dcode, ZBAR_CODE128);
+         dcode128->character = -1;
+@@ -513,7 +513,7 @@ zbar_symbol_type_t _zbar_decode_code128 
+             dw = dcode128->s6 - dcode128->width;
+         dw *= 4;
+         if(dw > dcode128->width) {
+-            dprintf(1, " [width var]\n");
++            debprintf(1, " [width var]\n");
+             if(dcode128->character > 1)
+                 release_lock(dcode, ZBAR_CODE128);
+             dcode128->character = -1;
+@@ -549,17 +549,17 @@ zbar_symbol_type_t _zbar_decode_code128 
+         else if(dcode128->character < CFG(*dcode128, ZBAR_CFG_MIN_LEN) ||
+                 (CFG(*dcode128, ZBAR_CFG_MAX_LEN) > 0 &&
+                  dcode128->character > CFG(*dcode128, ZBAR_CFG_MAX_LEN))) {
+-            dprintf(2, " [invalid len]\n");
++            debprintf(2, " [invalid len]\n");
+             sym = ZBAR_NONE;
+         }
+         else
+-            dprintf(2, " [valid end]\n");
++            debprintf(2, " [valid end]\n");
+         dcode128->character = -1;
+         if(!sym)
+             release_lock(dcode, ZBAR_CODE128);
+         return(sym);
+     }
+ 
+-    dprintf(2, "\n");
++    debprintf(2, "\n");
+     return(0);
+ }
+diff --git a/zbar/decoder/code39.c b/zbar/decoder/code39.c
+--- a/zbar/decoder/code39.c
++++ b/zbar/decoder/code39.c
+@@ -136,10 +136,10 @@ static inline unsigned char code39_decod
+     enc <<= 1;
+     if(E > 6) {
+         enc |= 1;
+-        dprintf(2, "1");
++        debprintf(2, "1");
+     }
+     else
+-        dprintf(2, "0");
++        debprintf(2, "0");
+     return(enc);
+ }
+ 
+@@ -180,7 +180,7 @@ static inline signed char code39_decode9
+     zassert(idx < 0x2c, -1, " idx=%x enc=%x s9=%x\n", idx, enc, dcode39->s9);
+ 
+     const char39_t *c = &code39_encodings[idx];
+-    dprintf(2, " i=%02x chk=%02x c=%02x/%02x", idx, c->chk, c->fwd, c->rev);
++    debprintf(2, " i=%02x chk=%02x c=%02x/%02x", idx, c->chk, c->fwd, c->rev);
+     if(enc != c->chk)
+         return(-1);
+ 
+@@ -191,11 +191,11 @@ static inline signed char code39_decode9
+ static inline signed char code39_decode_start (zbar_decoder_t *dcode)
+ {
+     code39_decoder_t *dcode39 = &dcode->code39;
+-    dprintf(2, " s=%d ", dcode39->s9);
++    debprintf(2, " s=%d ", dcode39->s9);
+ 
+     signed char c = code39_decode9(dcode);
+     if(c != 0x19 && c != 0x2b) {
+-        dprintf(2, "\n");
++        debprintf(2, "\n");
+         return(ZBAR_NONE);
+     }
+     dcode39->direction ^= (c == 0x19);
+@@ -203,13 +203,13 @@ static inline signed char code39_decode_
+     /* check leading quiet zone - spec is 10x */
+     unsigned quiet = get_width(dcode, 9);
+     if(quiet && quiet < dcode39->s9 / 2) {
+-        dprintf(2, " [invalid quiet]\n");
++        debprintf(2, " [invalid quiet]\n");
+         return(ZBAR_NONE);
+     }
+ 
+     dcode39->element = 9;
+     dcode39->character = 0;
+-    dprintf(1, " dir=%x [valid start]\n", dcode39->direction);
++    debprintf(1, " dir=%x [valid start]\n", dcode39->direction);
+     return(ZBAR_PARTIAL);
+ }
+ 
+@@ -220,7 +220,7 @@ static inline void code39_postprocess (z
+     int i;
+     if(dcode39->direction) {
+         /* reverse buffer */
+-        dprintf(2, " (rev)");
++        debprintf(2, " (rev)");
+         for(i = 0; i < dcode39->character / 2; i++) {
+             unsigned j = dcode39->character - 1 - i;
+             char code = dcode->buf[i];
+@@ -258,14 +258,14 @@ zbar_symbol_type_t _zbar_decode_code39 (
+     if(dcode39->character < 0) {
+         if(get_color(dcode) != ZBAR_BAR)
+             return(ZBAR_NONE);
+-        dprintf(2, "      code39:");
++        debprintf(2, "      code39:");
+         return(code39_decode_start(dcode));
+     }
+ 
+     if(++dcode39->element < 9)
+         return(ZBAR_NONE);
+ 
+-    dprintf(2, "      code39[%c%02d+%x]",
++    debprintf(2, "      code39[%c%02d+%x]",
+             (dcode39->direction) ? '<' : '>',
+             dcode39->character, dcode39->element);
+ 
+@@ -279,19 +279,19 @@ zbar_symbol_type_t _zbar_decode_code39 (
+ 
+             /* trailing quiet zone check */
+             if(space && space < dcode39->width / 2) {
+-                dprintf(2, " [invalid qz]\n");
++                debprintf(2, " [invalid qz]\n");
+                 sym = ZBAR_NONE;
+             }
+             else if(dcode39->character < CFG(*dcode39, ZBAR_CFG_MIN_LEN) ||
+                     (CFG(*dcode39, ZBAR_CFG_MAX_LEN) > 0 &&
+                      dcode39->character > CFG(*dcode39, ZBAR_CFG_MAX_LEN))) {
+-                dprintf(2, " [invalid len]\n");
++                debprintf(2, " [invalid len]\n");
+                 sym = ZBAR_NONE;
+             }
+             else {
+                 /* FIXME checksum (needs config enable) */
+                 code39_postprocess(dcode);
+-                dprintf(2, " [valid end]\n");
++                debprintf(2, " [valid end]\n");
+             }
+             dcode39->character = -1;
+             if(!sym)
+@@ -300,19 +300,19 @@ zbar_symbol_type_t _zbar_decode_code39 (
+         }
+         if(space > dcode39->width / 2) {
+             /* inter-character space check failure */
+-            dprintf(2, " ics>%d [invalid ics]", dcode39->width);
++            debprintf(2, " ics>%d [invalid ics]", dcode39->width);
+             if(dcode39->character)
+                 release_lock(dcode, ZBAR_CODE39);
+             dcode39->character = -1;
+         }
+         dcode39->element = 0;
+-        dprintf(2, "\n");
++        debprintf(2, "\n");
+         return(ZBAR_NONE);
+     }
+ 
+-    dprintf(2, " s=%d ", dcode39->s9);
++    debprintf(2, " s=%d ", dcode39->s9);
+     if(!check_width(dcode39->width, dcode39->s9)) {
+-        dprintf(2, " [width]\n");
++        debprintf(2, " [width]\n");
+         if(dcode39->character)
+             release_lock(dcode, ZBAR_CODE39);
+         dcode39->character = -1;
+@@ -320,7 +320,7 @@ zbar_symbol_type_t _zbar_decode_code39 (
+     }
+ 
+     signed char c = code39_decode9(dcode);
+-    dprintf(2, " c=%d", c);
++    debprintf(2, " c=%d", c);
+ 
+     /* lock shared resources */
+     if(!dcode39->character && acquire_lock(dcode, ZBAR_CODE39)) {
+@@ -331,14 +331,14 @@ zbar_symbol_type_t _zbar_decode_code39 (
+     if(c < 0 ||
+        ((dcode39->character >= BUFFER_MIN) &&
+         size_buf(dcode, dcode39->character + 1))) {
+-        dprintf(1, (c < 0) ? " [aborted]\n" : " [overflow]\n");
++        debprintf(1, (c < 0) ? " [aborted]\n" : " [overflow]\n");
+         release_lock(dcode, ZBAR_CODE39);
+         dcode39->character = -1;
+         return(ZBAR_NONE);
+     }
+     else {
+         zassert(c < 0x2c, ZBAR_NONE, "c=%02x s9=%x\n", c, dcode39->s9);
+-        dprintf(2, "\n");
++        debprintf(2, "\n");
+     }
+ 
+     dcode->buf[dcode39->character++] = c;
+diff --git a/zbar/decoder/ean.c b/zbar/decoder/ean.c
+--- a/zbar/decoder/ean.c
++++ b/zbar/decoder/ean.c
+@@ -132,22 +132,22 @@ static inline signed char aux_end (zbar_
+     /* check quiet zone */
+     unsigned qz = get_width(dcode, 0);
+     if(!fwd && qz && qz <= s * 3 / 4) {
+-        dprintf(2, " [invalid quiet]");
++        debprintf(2, " [invalid quiet]");
+         return(-1);
+     }
+ 
+-    dprintf(2, " (");
++    debprintf(2, " (");
+     code = 0;
+     for(i = 1 - fwd; i < 3 + fwd; i++) {
+         unsigned e = get_width(dcode, i) + get_width(dcode, i + 1);
+-        dprintf(2, " %d", e);
++        debprintf(2, " %d", e);
+         code = (code << 2) | decode_e(e, s, 7);
+         if(code < 0) {
+-            dprintf(2, " [invalid end guard]");
++            debprintf(2, " [invalid end guard]");
+             return(-1);
+         }
+     }
+-    dprintf(2, ") s=%d aux=%x", s, code);
++    debprintf(2, ") s=%d aux=%x", s, code);
+     return(code);
+ }
+ 
+@@ -162,7 +162,7 @@ static inline signed char aux_start (zba
+     if(dcode->ean.s4 < 6)
+         return(-1);
+     if(decode_e(e2, dcode->ean.s4, 7)) {
+-        dprintf(2, " [invalid any]");
++        debprintf(2, " [invalid any]");
+         return(/*FIXME (get_color(dcode) == ZBAR_SPACE) ? STATE_ADDON : */-1);
+     }
+ 
+@@ -174,17 +174,17 @@ static inline signed char aux_start (zba
+         unsigned qz = get_width(dcode, 7);
+         if(!qz || qz > dcode->ean.s4 * 3 / 4) {
+             if(!E1) {
+-                dprintf(2, " [valid normal]");
++                debprintf(2, " [valid normal]");
+                 return(0); /* normal symbol start */
+             }
+ #if 0
+             else if(E1 == 1) {
+-                dprintf(2, " [valid add-on]");
++                debprintf(2, " [valid add-on]");
+                 return(STATE_ADDON); /* add-on symbol start */
+             }
+ #endif
+         }
+-        dprintf(2, " [invalid start]");
++        debprintf(2, " [invalid start]");
+         return(-1);
+     }
+ 
+@@ -194,11 +194,11 @@ static inline signed char aux_start (zba
+         unsigned e4 = get_width(dcode, 7) + get_width(dcode, 8);
+         if(!decode_e(e3, dcode->ean.s4, 7) &&
+            !decode_e(e4, dcode->ean.s4, 7)) {
+-            dprintf(2, " [valid center]");
++            debprintf(2, " [valid center]");
+             return(0); /* start after center guard */
+         }
+     }
+-    dprintf(2, " [invalid center]");
++    debprintf(2, " [invalid center]");
+     return(/*STATE_ADDON*/-1);
+ }
+ 
+@@ -212,7 +212,7 @@ static inline signed char decode4 (zbar_
+                    ? get_width(dcode, 0) + get_width(dcode, 1)
+                    : get_width(dcode, 2) + get_width(dcode, 3));
+     unsigned e2 = get_width(dcode, 1) + get_width(dcode, 2);
+-    dprintf(2, "\n        e1=%d e2=%d", e1, e2);
++    debprintf(2, "\n        e1=%d e2=%d", e1, e2);
+ 
+     if(dcode->ean.s4 < 6)
+         return(-1);
+@@ -222,7 +222,7 @@ static inline signed char decode4 (zbar_
+              decode_e(e2, dcode->ean.s4, 7));
+     if(code < 0)
+         return(-1);
+-    dprintf(2, " code=%x", code);
++    debprintf(2, " code=%x", code);
+ 
+     /* 4 combinations require additional determinant (D2)
+        E1E2 == 34 (0110)
+@@ -243,9 +243,9 @@ static inline signed char decode4 (zbar_
+         alt = d2 > (mid * dcode->ean.s4);
+         if(alt)
+             code = ((code >> 1) & 3) | 0x10; /* compress code space */
+-        dprintf(2, " (d2=%d(%d) alt=%d)", d2, mid * dcode->ean.s4, alt);
++        debprintf(2, " (d2=%d(%d) alt=%d)", d2, mid * dcode->ean.s4, alt);
+     }
+-    dprintf(2, " char=%02x", digits[(unsigned char)code]);
++    debprintf(2, " char=%02x", digits[(unsigned char)code]);
+     zassert(code < 0x14, -1, "code=%02x e1=%x e2=%x s4=%x color=%x\n",
+             code, e1, e2, dcode->ean.s4, get_color(dcode));
+     return(code);
+@@ -260,7 +260,7 @@ static inline zbar_symbol_type_t ean_par
+                          (pass->raw[3] & 0x10) >> 3 |
+                          (pass->raw[4] & 0x10) >> 4);
+ 
+-    dprintf(2, " par=%x", par);
++    debprintf(2, " par=%x", par);
+     if(par && par != 0xf)
+         /* invalid parity combination */
+         return(ZBAR_NONE);
+@@ -276,8 +276,8 @@ static inline zbar_symbol_type_t ean_par
+         pass->raw[3] = tmp;
+     }
+ 
+-    dprintf(2, "\n");
+-    dprintf(1, "decode4=%x%x%x%x\n",
++    debprintf(2, "\n");
++    debprintf(1, "decode4=%x%x%x%x\n",
+             pass->raw[1] & 0xf, pass->raw[2] & 0xf,
+             pass->raw[3] & 0xf, pass->raw[4] & 0xf);
+     if(!par)
+@@ -309,7 +309,7 @@ static inline zbar_symbol_type_t ean_par
+     if(par & 1)
+         pass->raw[0] >>= 4;
+     pass->raw[0] &= 0xf;
+-    dprintf(2, " par=%02x(%x)", par, pass->raw[0]);
++    debprintf(2, " par=%02x(%x)", par, pass->raw[0]);
+ 
+     if(pass->raw[0] == 0xf)
+         /* invalid parity combination */
+@@ -326,8 +326,8 @@ static inline zbar_symbol_type_t ean_par
+         }
+     }
+ 
+-    dprintf(2, "\n");
+-    dprintf(1, "decode=%x%x%x%x%x%x%x(%02x)\n",
++    debprintf(2, "\n");
++    debprintf(1, "decode=%x%x%x%x%x%x%x(%02x)\n",
+             pass->raw[0] & 0xf, pass->raw[1] & 0xf,
+             pass->raw[2] & 0xf, pass->raw[3] & 0xf,
+             pass->raw[4] & 0xf, pass->raw[5] & 0xf,
+@@ -359,7 +359,7 @@ static inline zbar_symbol_type_t decode_
+        TEST_CFG(dcode->ean.ean8_config, ZBAR_CFG_ENABLE) &&
+        !aux_end(dcode, fwd)) {
+         zbar_symbol_type_t part;
+-        dprintf(2, " fwd=%x", fwd);
++        debprintf(2, " fwd=%x", fwd);
+         part = ean_part_end4(pass, fwd);
+         if(part)
+             dcode->ean.direction = (pass->state & STATE_REV) != 0;
+@@ -389,17 +389,17 @@ static inline zbar_symbol_type_t decode_
+         if(w)
+             code = decode4(dcode);
+         else
+-            dprintf(2, " [bad width]");
++            debprintf(2, " [bad width]");
+ 
+         if(code < 0 && idx != 0x10)
+             pass->state = -1;
+         else if(code < 0)
+             pass->raw[5] = 0xff;
+         else {
+-            dprintf(2, "\n        raw[%x]=%02x =>", idx >> 2,
++            debprintf(2, "\n        raw[%x]=%02x =>", idx >> 2,
+                     digits[(unsigned char)code]);
+             pass->raw[(idx >> 2) + 1] = digits[(unsigned char)code];
+-            dprintf(2, " raw=%d%d%d%d%d%d%d",
++            debprintf(2, " raw=%d%d%d%d%d%d%d",
+                     pass->raw[0] & 0xf, pass->raw[1] & 0xf,
+                     pass->raw[2] & 0xf, pass->raw[3] & 0xf,
+                     pass->raw[4] & 0xf, pass->raw[5] & 0xf,
+@@ -410,7 +410,7 @@ static inline zbar_symbol_type_t decode_
+     if(get_color(dcode) == ZBAR_SPACE &&
+        (idx == 0x18 || idx == 0x19)) {
+         zbar_symbol_type_t part = ZBAR_NONE;
+-        dprintf(2, " fwd=%x", fwd);
++        debprintf(2, " fwd=%x", fwd);
+         if(!aux_end(dcode, fwd) && pass->raw[5] != 0xff)
+             part = ean_part_end7(&dcode->ean, pass, fwd);
+         if(part)
+@@ -447,7 +447,7 @@ static inline signed char ean_verify_che
+     zassert(d < 10, -1, "n=%x d=%x chk=%x %s\n", n, d, chk,
+             _zbar_decoder_buf_dump((void*)ean->buf, 18));
+     if(chk != d) {
+-        dprintf(1, "\nchecksum mismatch %d != %d (%s)\n",
++        debprintf(1, "\nchecksum mismatch %d != %d (%s)\n",
+                 chk, d, dsprintbuf(ean));
+         return(-1);
+     }
+@@ -503,7 +503,7 @@ static inline zbar_symbol_type_t integra
+     signed char i, j, right = !!(part & EAN_RIGHT);
+     /* copy raw data into holding buffer */
+     /* if same partial is not consistent, reset others */
+-    dprintf(2, " integrate part=%x (%s) w=%d=>%d",
++    debprintf(2, " integrate part=%x (%s) w=%d=>%d",
+             part, dsprintbuf(ean), ean->width, pass->width);
+ 
+     if(part & ZBAR_ADDON) {
+@@ -522,13 +522,13 @@ static inline zbar_symbol_type_t integra
+         if((ean->left && ((part & ZBAR_SYMBOL) != ean->left)) ||
+            (ean->right && ((part & ZBAR_SYMBOL) != ean->right))) {
+             /* partial mismatch - reset collected parts */
+-            dprintf(2, " rst(type %x %x)", ean->left, ean->right);
++            debprintf(2, " rst(type %x %x)", ean->left, ean->right);
+             ean->left = ean->right = ean->addon = ZBAR_NONE;
+         }
+ 
+         if((ean->left || ean->right || ean->addon) &&
+            !check_width(ean->width, pass->width)) {
+-            dprintf(2, " rst(width %d)", pass->width);
++            debprintf(2, " rst(width %d)", pass->width);
+             ean->left = ean->right = ean->addon = ZBAR_NONE;
+         }
+ 
+@@ -539,7 +539,7 @@ static inline zbar_symbol_type_t integra
+                 unsigned char digit = pass->raw[i] & 0xf;
+                 if(ean->right && ean->buf[j] != digit) {
+                     /* partial mismatch - reset collected parts */
+-                    dprintf(2, " rst(right)");
++                    debprintf(2, " rst(right)");
+                     ean->left = ean->right = ean->addon = ZBAR_NONE;
+                 }
+                 ean->buf[j] = digit;
+@@ -552,7 +552,7 @@ static inline zbar_symbol_type_t integra
+                 unsigned char digit = pass->raw[i] & 0xf;
+                 if(ean->left && ean->buf[j] != digit) {
+                     /* partial mismatch - reset collected parts */
+-                    dprintf(2, " rst(left)");
++                    debprintf(2, " rst(left)");
+                     ean->left = ean->right = ean->addon = ZBAR_NONE;
+                 }
+                 ean->buf[j] = digit;
+@@ -617,7 +617,7 @@ static inline zbar_symbol_type_t integra
+     if(part > ZBAR_PARTIAL)
+         part |= ean->addon;
+ 
+-    dprintf(2, " dir=%d %x/%x=%x",
++    debprintf(2, " dir=%d %x/%x=%x",
+             ean->direction, ean->left, ean->right, part);
+     return(part);
+ }
+@@ -679,7 +679,7 @@ zbar_symbol_type_t _zbar_decode_ean (zba
+            i == pass_idx)
+         {
+             zbar_symbol_type_t part;
+-            dprintf(2, "      ean[%x/%x]: idx=%x st=%d s=%d",
++            debprintf(2, "      ean[%x/%x]: idx=%x st=%d s=%d",
+                     pass_idx, i, dcode->idx, pass->state, dcode->ean.s4);
+             part = decode_pass(dcode, pass);
+             if(part) {
+@@ -687,20 +687,20 @@ zbar_symbol_type_t _zbar_decode_ean (zba
+                 sym = integrate_partial(&dcode->ean, pass, part);
+                 if(sym) {
+                     /* this pass valid => _reset_ all passes */
+-                    dprintf(2, " sym=%x", sym);
++                    debprintf(2, " sym=%x", sym);
+                     dcode->ean.pass[0].state = dcode->ean.pass[1].state = -1;
+                     dcode->ean.pass[2].state = dcode->ean.pass[3].state = -1;
+                     if(sym > ZBAR_PARTIAL) {
+                         if(!acquire_lock(dcode, sym))
+                             postprocess(dcode, sym);
+                         else {
+-                            dprintf(1, " [locked %d]", dcode->lock);
++                            debprintf(1, " [locked %d]", dcode->lock);
+                             sym = ZBAR_PARTIAL;
+                         }
+                     }
+                 }
+             }
+-            dprintf(2, "\n");
++            debprintf(2, "\n");
+         }
+     }
+     return(sym);
+diff --git a/zbar/decoder/i25.c b/zbar/decoder/i25.c
+--- a/zbar/decoder/i25.c
++++ b/zbar/decoder/i25.c
+@@ -49,7 +49,7 @@ static inline unsigned char i25_decode10
+                                           unsigned char offset)
+ {
+     i25_decoder_t *dcode25 = &dcode->i25;
+-    dprintf(2, " s=%d", dcode25->s10);
++    debprintf(2, " s=%d", dcode25->s10);
+     if(dcode25->s10 < 10)
+         return(0xff);
+ 
+@@ -65,11 +65,11 @@ static inline unsigned char i25_decode10
+             par++;
+     }
+ 
+-    dprintf(2, " enc=%02x par=%x", enc, par);
++    debprintf(2, " enc=%02x par=%x", enc, par);
+ 
+     /* parity check */
+     if(par != 2) {
+-        dprintf(2, " [bad parity]");
++        debprintf(2, " [bad parity]");
+         return(0xff);
+     }
+ 
+@@ -79,12 +79,12 @@ static inline unsigned char i25_decode10
+         if(enc == 12)
+             enc = 0;
+         else if(--enc > 9) {
+-            dprintf(2, " [invalid encoding]");
++            debprintf(2, " [invalid encoding]");
+             return(0xff);
+         }
+     }
+ 
+-    dprintf(2, " => %x", enc);
++    debprintf(2, " => %x", enc);
+     return(enc);
+ }
+ 
+@@ -103,7 +103,7 @@ static inline signed char i25_decode_sta
+     if((get_color(dcode) == ZBAR_BAR)
+        ? enc != 4
+        : (enc = i25_decode1(enc, get_width(dcode, i++), dcode25->s10))) {
+-        dprintf(4, "      i25: s=%d enc=%x [invalid]\n", dcode25->s10, enc);
++        debprintf(4, "      i25: s=%d enc=%x [invalid]\n", dcode25->s10, enc);
+         return(ZBAR_NONE);
+     }
+ 
+@@ -113,7 +113,7 @@ static inline signed char i25_decode_sta
+      */
+     unsigned quiet = get_width(dcode, i);
+     if(quiet && quiet < dcode25->s10 * 3 / 8) {
+-        dprintf(3, "      i25: s=%d enc=%x q=%d [invalid qz]\n",
++        debprintf(3, "      i25: s=%d enc=%x q=%d [invalid qz]\n",
+                 dcode25->s10, enc, quiet);
+         return(ZBAR_NONE);
+     }
+@@ -148,7 +148,7 @@ static inline signed char i25_decode_end
+     if((quiet && quiet < dcode25->width * 3 / 8) ||
+        decode_e(get_width(dcode, 1), dcode25->width, 45) > 2 ||
+        decode_e(get_width(dcode, 2), dcode25->width, 45) > 2) {
+-        dprintf(3, "      i25: s=%d q=%d [invalid qz]\n",
++        debprintf(3, "      i25: s=%d q=%d [invalid qz]\n",
+                 dcode25->width, quiet);
+         return(ZBAR_NONE);
+     }
+@@ -168,7 +168,7 @@ static inline signed char i25_decode_end
+     dcode->direction = 1 - 2 * dcode25->direction;
+     if(dcode25->direction) {
+         /* reverse buffer */
+-        dprintf(2, " (rev)");
++        debprintf(2, " (rev)");
+         int i;
+         for(i = 0; i < dcode25->character / 2; i++) {
+             unsigned j = dcode25->character - 1 - i;
+@@ -181,7 +181,7 @@ static inline signed char i25_decode_end
+     if(dcode25->character < CFG(*dcode25, ZBAR_CFG_MIN_LEN) ||
+        (CFG(*dcode25, ZBAR_CFG_MAX_LEN) > 0 &&
+         dcode25->character > CFG(*dcode25, ZBAR_CFG_MAX_LEN))) {
+-        dprintf(2, " [invalid len]\n");
++        debprintf(2, " [invalid len]\n");
+         release_lock(dcode, ZBAR_I25);
+         dcode25->character = -1;
+         return(ZBAR_NONE);
+@@ -190,7 +190,7 @@ static inline signed char i25_decode_end
+     dcode->buflen = dcode25->character;
+     dcode->buf[dcode25->character] = '\0';
+     dcode->modifiers = 0;
+-    dprintf(2, " [valid end]\n");
++    debprintf(2, " [valid end]\n");
+     dcode25->character = -1;
+     return(ZBAR_I25);
+ }
+@@ -215,7 +215,7 @@ zbar_symbol_type_t _zbar_decode_i25 (zba
+     /* FIXME check current character width against previous */
+     dcode25->width = dcode25->s10;
+ 
+-    dprintf(2, "      i25[%c%02d+%x]",
++    debprintf(2, "      i25[%c%02d+%x]",
+             (dcode25->direction) ? '<' : '>',
+             dcode25->character, dcode25->element);
+ 
+@@ -223,15 +223,15 @@ zbar_symbol_type_t _zbar_decode_i25 (zba
+         return(ZBAR_PARTIAL);
+ 
+     unsigned char c = i25_decode10(dcode, 1);
+-    dprintf(2, " c=%x", c);
++    debprintf(2, " c=%x", c);
+     if(c > 9) {
+-        dprintf(2, " [aborted]\n");
++        debprintf(2, " [aborted]\n");
+         goto reset;
+     }
+ 
+     if((dcode25->character >= BUFFER_MIN) &&
+        size_buf(dcode, dcode25->character + 2)) {
+-        dprintf(2, " [overflow]\n");
++        debprintf(2, " [overflow]\n");
+         goto reset;
+     }
+ 
+@@ -243,13 +243,13 @@ zbar_symbol_type_t _zbar_decode_i25 (zba
+     buf[dcode25->character++] = c + '0';
+ 
+     c = i25_decode10(dcode, 0);
+-    dprintf(2, " c=%x", c);
++    debprintf(2, " c=%x", c);
+     if(c > 9) {
+-        dprintf(2, " [aborted]\n");
++        debprintf(2, " [aborted]\n");
+         goto reset;
+     }
+     else
+-        dprintf(2, "\n");
++        debprintf(2, "\n");
+ 
+     buf[dcode25->character++] = c + '0';
+     dcode25->element = 10;
+diff --git a/zbar/decoder/pdf417.c b/zbar/decoder/pdf417.c
+--- a/zbar/decoder/pdf417.c
++++ b/zbar/decoder/pdf417.c
+@@ -41,7 +41,7 @@ static inline signed short pdf417_decode
+      * from similar edge measurements
+      */
+     unsigned s = dcode->pdf417.s8;
+-    dprintf(2, " s=%d ", s);
++    debprintf(2, " s=%d ", s);
+     if(s < 8)
+         return(-1);
+ 
+@@ -55,19 +55,19 @@ static inline signed short pdf417_decode
+         else
+             e = decode_e(get_width(dcode, 7 - i) +
+                          get_width(dcode, 6 - i), s, 17);
+-        dprintf(4, "%x", e);
++        debprintf(4, "%x", e);
+         if(e < 0 || e > 8)
+             return(-1);
+         sig = (sig << 3) ^ e;
+     }
+-    dprintf(2, " sig=%06lx", sig);
++    debprintf(2, " sig=%06lx", sig);
+ 
+     /* determine cluster number */
+     int clst = ((sig & 7) - ((sig >> 3) & 7) +
+                 ((sig >> 12) & 7) - ((sig >> 15) & 7));
+     if(clst < 0)
+         clst += 9;
+-    dprintf(2, " k=%d", clst);
++    debprintf(2, " k=%d", clst);
+     zassert(clst >= 0 && clst < 9, -1, "dir=%x sig=%lx k=%x %s\n",
+             dcode->pdf417.direction, sig, clst,
+             _zbar_decoder_buf_dump(dcode->buf, dcode->pdf417.character));
+@@ -89,7 +89,7 @@ static inline signed short pdf417_decode
+             _zbar_decoder_buf_dump(dcode->buf, dcode->pdf417.character));
+ 
+     unsigned short c = (g[0] + g[1] + g[2]) & PDF417_HASH_MASK;
+-    dprintf(2, " g0=%x g1=%x g2=%x c=%03d(%d)",
++    debprintf(2, " g0=%x g1=%x g2=%x c=%03d(%d)",
+             g[0], g[1], g[2], c & 0x3ff, c >> 10);
+     return(c);
+ }
+@@ -142,18 +142,18 @@ static inline signed char pdf417_decode_
+         ei = decode_e(get_width(dcode, 8) + get_width(dcode, 9), s, 17);
+     }
+ 
+-    dprintf(2, "      pdf417[%c]: s=%d",
++    debprintf(2, "      pdf417[%c]: s=%d",
+             (get_color(dcode)) ? '<' : '>', s);
+ 
+     /* check quiet zone */
+     if(ei >= 0 && ei < ex) {
+-        dprintf(2, " [invalid quiet]\n");
++        debprintf(2, " [invalid quiet]\n");
+         return(0);
+     }
+ 
+     /* lock shared resources */
+     if(acquire_lock(dcode, ZBAR_PDF417)) {
+-        dprintf(2, " [locked %d]\n", dcode->lock);
++        debprintf(2, " [locked %d]\n", dcode->lock);
+         return(0);
+     }
+ 
+@@ -162,7 +162,7 @@ static inline signed char pdf417_decode_
+     dcode417->element = 0;
+     dcode417->character = 0;
+ 
+-    dprintf(2, " [valid start]\n");
++    debprintf(2, " [valid start]\n");
+     return(ZBAR_PARTIAL);
+ }
+ 
+@@ -176,7 +176,7 @@ zbar_symbol_type_t _zbar_decode_pdf417 (
+ 
+     if(dcode417->character < 0) {
+         pdf417_decode_start(dcode);
+-        dprintf(4, "\n");
++        debprintf(4, "\n");
+         return(0);
+     }
+ 
+@@ -185,7 +185,7 @@ zbar_symbol_type_t _zbar_decode_pdf417 (
+         return(0);
+     dcode417->element = 0;
+ 
+-    dprintf(2, "      pdf417[%c%02d]:",
++    debprintf(2, "      pdf417[%c%02d]:",
+             (dcode417->direction) ? '<' : '>', dcode417->character);
+ 
+     if(get_color(dcode) != dcode417->direction) {
+@@ -202,7 +202,7 @@ zbar_symbol_type_t _zbar_decode_pdf417 (
+     if((c < 0) ||
+        ((dcode417->character >= BUFFER_MIN) &&
+         size_buf(dcode, dcode417->character + 1))) {
+-        dprintf(1, (c < 0) ? " [aborted]\n" : " [overflow]\n");
++        debprintf(1, (c < 0) ? " [aborted]\n" : " [overflow]\n");
+         release_lock(dcode, ZBAR_PDF417);
+         dcode417->character = -1;
+         return(0);
+@@ -211,7 +211,7 @@ zbar_symbol_type_t _zbar_decode_pdf417 (
+     /* FIXME TBD infer dimensions, save codewords */
+ 
+     if(c == PDF417_STOP) {
+-        dprintf(1, " [valid stop]");
++        debprintf(1, " [valid stop]");
+         /* FIXME check trailing bar and qz */
+         dcode->direction = 1 - 2 * dcode417->direction;
+         dcode->modifiers = 0;
+@@ -219,6 +219,6 @@ zbar_symbol_type_t _zbar_decode_pdf417 (
+         dcode417->character = -1;
+     }
+ 
+-    dprintf(2, "\n");
++    debprintf(2, "\n");
+     return(0);
+ }
+diff --git a/zbar/decoder/qr_finder.c b/zbar/decoder/qr_finder.c
+--- a/zbar/decoder/qr_finder.c
++++ b/zbar/decoder/qr_finder.c
+@@ -54,25 +54,25 @@ zbar_symbol_type_t _zbar_find_qr (zbar_d
+     if(get_color(dcode) != ZBAR_SPACE || s < 7)
+         return(0);
+ 
+-    dprintf(2, "    qrf: s=%d", s);
++    debprintf(2, "    qrf: s=%d", s);
+ 
+     ei = decode_e(pair_width(dcode, 1), s, 7);
+-    dprintf(2, " %d", ei);
++    debprintf(2, " %d", ei);
+     if(ei)
+         goto invalid;
+ 
+     ei = decode_e(pair_width(dcode, 2), s, 7);
+-    dprintf(2, "%d", ei);
++    debprintf(2, "%d", ei);
+     if(ei != 2)
+         goto invalid;
+ 
+     ei = decode_e(pair_width(dcode, 3), s, 7);
+-    dprintf(2, "%d", ei);
++    debprintf(2, "%d", ei);
+     if(ei != 2)
+         goto invalid;
+ 
+     ei = decode_e(pair_width(dcode, 4), s, 7);
+-    dprintf(2, "%d", ei);
++    debprintf(2, "%d", ei);
+     if(ei)
+         goto invalid;
+ 
+@@ -88,7 +88,7 @@ zbar_symbol_type_t _zbar_find_qr (zbar_d
+     w = get_width(dcode, 5);
+     qrf->line.boffs = qrf->line.pos[0] + get_width(dcode, 4) + (w + 1) / 2;
+ 
+-    dprintf(2, " boff=%d pos=%d len=%d eoff=%d [valid]\n",
++    debprintf(2, " boff=%d pos=%d len=%d eoff=%d [valid]\n",
+             qrf->line.boffs, qrf->line.pos[0], qrf->line.len,
+             qrf->line.eoffs);
+ 
+@@ -97,6 +97,6 @@ zbar_symbol_type_t _zbar_find_qr (zbar_d
+     return(ZBAR_QRCODE);
+ 
+ invalid:
+-    dprintf(2, " [invalid]\n");
++    debprintf(2, " [invalid]\n");
+     return(0);
+ }
+diff --git a/zbar/scanner.c b/zbar/scanner.c
+--- a/zbar/scanner.c
++++ b/zbar/scanner.c
+@@ -129,7 +129,7 @@ static inline unsigned calc_thresh (zbar
+     unsigned dx, thresh = scn->y1_thresh;
+     unsigned long t;
+     if((thresh <= scn->y1_min_thresh) || !scn->width) {
+-        dprintf(1, " tmin=%d", scn->y1_min_thresh);
++        debprintf(1, " tmin=%d", scn->y1_min_thresh);
+         return(scn->y1_min_thresh);
+     }
+     /* slowly return threshold to min */
+@@ -137,7 +137,7 @@ static inline unsigned calc_thresh (zbar
+     t = thresh * dx;
+     t /= scn->width;
+     t /= ZBAR_SCANNER_THRESH_FADE;
+-    dprintf(1, " thr=%d t=%ld x=%d last=%d.%d (%d)",
++    debprintf(1, " thr=%d t=%ld x=%d last=%d.%d (%d)",
+             thresh, t, scn->x, scn->last_edge >> ZBAR_FIXED,
+             scn->last_edge & ((1 << ZBAR_FIXED) - 1), dx);
+     if(thresh > t) {
+@@ -158,7 +158,7 @@ static inline zbar_symbol_type_t process
+         scn->last_edge = scn->cur_edge;
+ 
+     scn->width = scn->cur_edge - scn->last_edge;
+-    dprintf(1, " sgn=%d cur=%d.%d w=%d (%s)\n",
++    debprintf(1, " sgn=%d cur=%d.%d w=%d (%s)\n",
+             scn->y1_sign, scn->cur_edge >> ZBAR_FIXED,
+             scn->cur_edge & ((1 << ZBAR_FIXED) - 1), scn->width,
+             ((y1 > 0) ? "SPACE" : "BAR"));
+@@ -184,7 +184,7 @@ inline zbar_symbol_type_t zbar_scanner_f
+ 
+     if(scn->cur_edge != x || scn->y1_sign > 0) {
+         zbar_symbol_type_t edge = process_edge(scn, -scn->y1_sign);
+-        dprintf(1, "flush0:");
++        debprintf(1, "flush0:");
+         scn->cur_edge = x;
+         scn->y1_sign = -scn->y1_sign;
+         return(edge);
+@@ -245,7 +245,7 @@ zbar_symbol_type_t zbar_scan_y (zbar_sca
+     y2_1 = y0_0 - (y0_1 * 2) + y0_2;
+     y2_2 = y0_1 - (y0_2 * 2) + y0_3;
+ 
+-    dprintf(1, "scan: x=%d y=%d y0=%d y1=%d y2=%d",
++    debprintf(1, "scan: x=%d y=%d y0=%d y1=%d y2=%d",
+             x, y, y0_1, y1_1, y2_1);
+ 
+     edge = ZBAR_NONE;
+@@ -267,7 +267,7 @@ zbar_symbol_type_t zbar_scan_y (zbar_sca
+             /* adaptive thresholding */
+             /* start at multiple of new min/max */
+             scn->y1_thresh = (abs(y1_1) * THRESH_INIT + ROUND) >> ZBAR_FIXED;
+-            dprintf(1, "\tthr=%d", scn->y1_thresh);
++            debprintf(1, "\tthr=%d", scn->y1_thresh);
+             if(scn->y1_thresh < scn->y1_min_thresh)
+                 scn->y1_thresh = scn->y1_min_thresh;
+ 
+@@ -280,11 +280,11 @@ zbar_symbol_type_t zbar_scan_y (zbar_sca
+                 /* interpolate zero crossing */
+                 scn->cur_edge -= ((y2_1 << ZBAR_FIXED) + 1) / d;
+             scn->cur_edge += x << ZBAR_FIXED;
+-            dprintf(1, "\n");
++            debprintf(1, "\n");
+         }
+     }
+     else
+-        dprintf(1, "\n");
++        debprintf(1, "\n");
+     /* FIXME add fall-thru pass to decoder after heuristic "idle" period
+        (eg, 6-8 * last width) */
+     scn->x = x + 1;
+@@ -313,5 +313,5 @@ void zbar_scanner_get_state (const zbar_
+     /* NB not quite accurate (uses updated x) */
+     mut_scn = (zbar_scanner_t*)scn;
+     if(y1_thresh) *y1_thresh = calc_thresh(mut_scn);
+-    dprintf(1, "\n");
++    debprintf(1, "\n");
+ }
+diff --git a/zbar/decoder/code93.c b/zbar/decoder/code93.c
+--- a/zbar/decoder/code93.c
++++ b/zbar/decoder/code93.c
+@@ -61,7 +61,7 @@ encode6 (zbar_decoder_t *dcode)
+     unsigned s = dcode->s6;
+     int sig = 0, i;
+ 
+-    dprintf(2, " s=%d ", s);
++    debprintf(2, " s=%d ", s);
+     if(s < 9)
+         return(-1);
+ 
+@@ -70,9 +70,9 @@ encode6 (zbar_decoder_t *dcode)
+         if(c > 3)
+             return(-1);
+         sig = (sig << 2) | c;
+-        dprintf(2, "%d", c);
++        debprintf(2, "%d", c);
+     }
+-    dprintf(2, " sig=%03x", sig);
++    debprintf(2, " sig=%03x", sig);
+ 
+     return(sig);
+ }
+@@ -81,14 +81,14 @@ static inline int
+ validate_sig (int sig)
+ {
+     int i, sum = 0, emin = 0, sig0 = 0, sig1 = 0;
+-    dprintf(3, " sum=0");
++    debprintf(3, " sum=0");
+     for(i = 3; --i >= 0; ) {
+         int e = sig & 3;
+         sig >>= 2;
+         sum = e - sum;
+         sig1 <<= 4;
+         sig1 += sum;
+-        dprintf(3, "%d", sum);
++        debprintf(3, "%d", sum);
+         if(!i)
+             break;
+ 
+@@ -99,16 +99,16 @@ validate_sig (int sig)
+         if(emin > sum)
+             emin = sum;
+         sig0 += sum;
+-        dprintf(3, "%d", sum);
++        debprintf(3, "%d", sum);
+     }
+ 
+-    dprintf(3, " emin=%d sig=%03x/%03x", emin, sig1 & 0xfff, sig0 & 0xfff);
++    debprintf(3, " emin=%d sig=%03x/%03x", emin, sig1 & 0xfff, sig0 & 0xfff);
+ 
+     emin = emin + (emin << 4) + (emin << 8);
+     sig0 -= emin;
+     sig1 += emin;
+ 
+-    dprintf(3, "=%03x/%03x", sig1 & 0xfff, sig0 & 0xfff);
++    debprintf(3, "=%03x/%03x", sig1 & 0xfff, sig0 & 0xfff);
+     return((sig0 | sig1) & 0x888);
+ }
+ 
+@@ -137,7 +137,7 @@ decode6 (zbar_decoder_t *dcode)
+             _zbar_decoder_buf_dump(dcode->buf, dcode->code93.character));
+ 
+     c = (g0 + g1) & 0x3f;
+-    dprintf(2, " g0=%x g1=%x c=%02x", g0, g1, c);
++    debprintf(2, " g0=%x g1=%x c=%02x", g0, g1, c);
+     return(c);
+ }
+ 
+@@ -148,7 +148,7 @@ decode_start (zbar_decoder_t *dcode)
+     unsigned dir, qz, s = dcode->s6;
+     int c;
+ 
+-    dprintf(2, "      code93:");
++    debprintf(2, "      code93:");
+     c = encode6(dcode);
+     if(c < 0 || (c != 0x00f && c != 0x0f0))
+         return(ZBAR_NONE);
+@@ -163,7 +163,7 @@ decode_start (zbar_decoder_t *dcode)
+ 
+     qz = get_width(dcode, 7);
+     if(qz && qz < (s * 3) / 4) {
+-        dprintf(2, " [invalid qz %d]", qz);
++        debprintf(2, " [invalid qz %d]", qz);
+         return(ZBAR_NONE);
+     }
+ 
+@@ -173,7 +173,7 @@ decode_start (zbar_decoder_t *dcode)
+     dcode93->character = 0;
+     dcode93->width = s;
+ 
+-    dprintf(2, " dir=%x [valid start]", dir);
++    debprintf(2, " dir=%x [valid start]", dir);
+     return(ZBAR_PARTIAL);
+ }
+ 
+@@ -186,7 +186,7 @@ decode_abort (zbar_decoder_t *dcode,
+         release_lock(dcode, ZBAR_CODE93);
+     dcode93->character = -1;
+     if(reason)
+-        dprintf(1, " [%s]\n", reason);
++        debprintf(1, " [%s]\n", reason);
+     return(ZBAR_NONE);
+ }
+ 
+@@ -252,14 +252,14 @@ validate_checksums (zbar_decoder_t *dcod
+     }
+ 
+     d = dcode->buf[(dcode93->direction) ? 1 : n - 2];
+-    dprintf(2, " C=%02x?=%02x", d, sum_c);
++    debprintf(2, " C=%02x?=%02x", d, sum_c);
+     if(d != sum_c)
+         return(1);
+ 
+     acc_k = plusmod47(acc_k, sum_c);
+     sum_k = plusmod47(sum_k, acc_k);
+     d = dcode->buf[(dcode93->direction) ? 0 : n - 1];
+-    dprintf(2, " K=%02x?=%02x", d, sum_k);
++    debprintf(2, " K=%02x?=%02x", d, sum_k);
+     if(d != sum_k)
+         return(1);
+ 
+@@ -276,11 +276,11 @@ postprocess (zbar_decoder_t *dcode)
+     static const unsigned char code93_s2[] =
+         "\x1b\x1c\x1d\x1e\x1f;<=>?[\\]^_{|}~\x7f\x00\x40`\x7f\x7f\x7f";
+ 
+-    dprintf(2, "\n    postproc len=%d", n);
++    debprintf(2, "\n    postproc len=%d", n);
+     dcode->direction = 1 - 2 * dcode93->direction;
+     if(dcode93->direction) {
+         /* reverse buffer */
+-        dprintf(2, " (rev)");
++        debprintf(2, " (rev)");
+         for(i = 0; i < n / 2; i++) {
+             unsigned j = n - 1 - i;
+             unsigned char d = dcode->buf[i];
+@@ -335,7 +335,7 @@ _zbar_decode_code93 (zbar_decoder_t *dco
+         if(get_color(dcode) != ZBAR_BAR)
+             return(ZBAR_NONE);
+         sym = decode_start(dcode);
+-        dprintf(2, "\n");
++        debprintf(2, "\n");
+         return(sym);
+     }
+ 
+@@ -347,7 +347,7 @@ _zbar_decode_code93 (zbar_decoder_t *dco
+ 
+     dcode93->element = 0;
+ 
+-    dprintf(2, "      code93[%c%02d+%x]:",
++    debprintf(2, "      code93[%c%02d+%x]:",
+             (dcode93->direction) ? '<' : '>',
+             dcode93->character, dcode93->element);
+ 
+@@ -366,8 +366,8 @@ _zbar_decode_code93 (zbar_decoder_t *dco
+         if(postprocess(dcode))
+             return(decode_abort(dcode, "invalid encoding"));
+ 
+-        dprintf(2, " [valid end]\n");
+-        dprintf(3, "    %s\n",
++        debprintf(2, " [valid end]\n");
++        debprintf(3, "    %s\n",
+                 _zbar_decoder_buf_dump(dcode->buf, dcode93->character));
+ 
+         dcode93->character = -1;
+@@ -393,6 +393,6 @@ _zbar_decode_code93 (zbar_decoder_t *dco
+         dcode->buf[dcode93->character] = c;
+     dcode93->character++;
+ 
+-    dprintf(2, "\n");
++    debprintf(2, "\n");
+     return(ZBAR_NONE);
+ }
+diff --git a/zbar/decoder/databar.c b/zbar/decoder/databar.c
+--- a/zbar/decoder/databar.c
++++ b/zbar/decoder/databar.c
+@@ -126,7 +126,7 @@ decode10 (unsigned char *buf,
+         d = (d << 12) | (*(data++) & 0xfff); \
+         i += 12;                             \
+         len--;                               \
+-        dprintf(2, " %03lx", d & 0xfff);     \
++        debprintf(2, " %03lx", d & 0xfff);     \
+     }
+ 
+ #define PUSH_CHAR(c) \
+@@ -151,7 +151,7 @@ databar_postprocess_exp (zbar_decoder_t 
+ 
+     /* grok encodation method */
+     d = *(data++);
+-    dprintf(2, "\n    len=%d %03lx", len, d & 0xfff);
++    debprintf(2, "\n    len=%d %03lx", len, d & 0xfff);
+     n = (d >> 4) & 0x7f;
+     if(n >= 0x40) {
+         i = 10;
+@@ -178,7 +178,7 @@ databar_postprocess_exp (zbar_decoder_t 
+         enc = 0;
+         buflen = VAR_MAX(len, 9 - 2) + 2;
+     }
+-    dprintf(2, " buflen=%d enc=%d", buflen, enc);
++    debprintf(2, " buflen=%d enc=%d", buflen, enc);
+     zassert(buflen > 2, -1, "buflen=%d\n", buflen);
+ 
+     if(enc < 4) {
+@@ -191,7 +191,7 @@ databar_postprocess_exp (zbar_decoder_t 
+             return(-1);
+     }
+     len -= 2;
+-    dprintf(2, " [%d+%d]", i, len);
++    debprintf(2, " [%d+%d]", i, len);
+ 
+     if(size_buf(dcode, buflen))
+         return(-1);
+@@ -263,7 +263,7 @@ databar_postprocess_exp (zbar_decoder_t 
+         FEED_BITS(15);
+         i -= 15;
+         n = (d >> i) & 0x7fff;
+-        dprintf(2, " v=%d", n);
++        debprintf(2, " v=%d", n);
+         PUSH_CHAR4('3', '2', '0', (n >= 10000) ? '3' : '2' );
+         if(n >= 10000)
+             n -= 10000;
+@@ -277,7 +277,7 @@ databar_postprocess_exp (zbar_decoder_t 
+         FEED_BITS(20);
+         i -= 20;
+         n = (d >> i) & 0xfffff;
+-        dprintf(2, " [%d+%d] %d", i, len, n);
++        debprintf(2, " [%d+%d] %d", i, len, n);
+         if(n >= 1000000)
+             return(-1);
+         decode10(buf, n, 6);
+@@ -313,7 +313,7 @@ databar_postprocess_exp (zbar_decoder_t 
+         int scheme = SCH_NUM;
+         while(i > 0 || len > 0) {
+             FEED_BITS(8);
+-            dprintf(2, " [%d+%d]", i, len);
++            debprintf(2, " [%d+%d]", i, len);
+ 
+             if(scheme == SCH_NUM) {
+                 int n1;
+@@ -322,7 +322,7 @@ databar_postprocess_exp (zbar_decoder_t 
+                     break;
+                 if(!((d >> i) & 0xf)) {
+                     scheme = SCH_ALNUM;
+-                    dprintf(2, ">A");
++                    debprintf(2, ">A");
+                     continue;
+                 }
+                 if(!len && i < 3) {
+@@ -338,7 +338,7 @@ databar_postprocess_exp (zbar_decoder_t 
+                 n = ((d >> i) & 0x7f) - 8;
+                 n1 = n % 11;
+                 n = n / 11;
+-                dprintf(2, "N%d%d", n, n1);
++                debprintf(2, "N%d%d", n, n1);
+                 *(buf++) = (n < 10) ? '0' + n : GS;
+                 *(buf++) = (n1 < 10) ? '0' + n1 : GS;
+             }
+@@ -357,7 +357,7 @@ databar_postprocess_exp (zbar_decoder_t 
+                 n = (d >> i) & 0x1f;
+                 if(n == 0x04) {
+                     scheme ^= 0x3;
+-                    dprintf(2, ">%d", scheme);
++                    debprintf(2, ">%d", scheme);
+                 }
+                 else if(n == 0x0f)
+                     c = GS;
+@@ -394,7 +394,7 @@ databar_postprocess_exp (zbar_decoder_t 
+                     if(i < 0)
+                         return(-1);
+                     n = ((d >> i) & 0x1f);
+-                    dprintf(2, "(%02x)", n);
++                    debprintf(2, "(%02x)", n);
+                     if(n < 0xa)
+                         c = '!' + n - 8;
+                     else if(n < 0x15)
+@@ -412,7 +412,7 @@ databar_postprocess_exp (zbar_decoder_t 
+                     return(-1);
+ 
+                 if(c) {
+-                    dprintf(2, "%d%c", scheme, c);
++                    debprintf(2, "%d%c", scheme, c);
+                     *(buf++) = c;
+                 }
+             }
+@@ -428,7 +428,7 @@ databar_postprocess_exp (zbar_decoder_t 
+         dcode->buflen--;
+     }
+ 
+-    dprintf(2, "\n    %s", _zbar_decoder_buf_dump(dcode->buf, dcode->buflen));
++    debprintf(2, "\n    %s", _zbar_decoder_buf_dump(dcode->buf, dcode->buflen));
+     return(0);
+ }
+ #undef FEED_BITS
+@@ -450,7 +450,7 @@ databar_postprocess (zbar_decoder_t *dco
+     *--buf = '\0';
+     *--buf = '\0';
+ 
+-    dprintf(2, "\n    d={%d,%d,%d,%d}", d[0], d[1], d[2], d[3]);
++    debprintf(2, "\n    d={%d,%d,%d,%d}", d[0], d[1], d[2], d[3]);
+     unsigned long r = d[0] * 1597 + d[1];
+     d[1] = r / 10000;
+     r %= 10000;
+@@ -459,7 +459,7 @@ databar_postprocess (zbar_decoder_t *dco
+     r %= 10000;
+     r = r * 1597 + d[3];
+     d[3] = r / 10000;
+-    dprintf(2, " r=%ld", r);
++    debprintf(2, " r=%ld", r);
+ 
+     for(i = 4; --i >= 0; ) {
+         c = r % 10;
+@@ -471,13 +471,13 @@ databar_postprocess (zbar_decoder_t *dco
+             r /= 10;
+     }
+ 
+-    dprintf(2, " d={%d,%d,%d}", d[1], d[2], d[3]);
++    debprintf(2, " d={%d,%d,%d}", d[1], d[2], d[3]);
+     r = d[1] * 2841 + d[2];
+     d[2] = r / 10000;
+     r %= 10000;
+     r = r * 1597 + d[3];
+     d[3] = r / 10000;
+-    dprintf(2, " r=%ld", r);
++    debprintf(2, " r=%ld", r);
+ 
+     for(i = 4; --i >= 0; ) {
+         c = r % 10;
+@@ -490,7 +490,7 @@ databar_postprocess (zbar_decoder_t *dco
+     }
+ 
+     r = d[2] * 1597 + d[3];
+-    dprintf(2, " d={%d,%d} r=%ld", d[2], d[3], r);
++    debprintf(2, " d={%d,%d} r=%ld", d[2], d[3], r);
+ 
+     for(i = 5; --i >= 0; ) {
+         c = r % 10;
+@@ -513,7 +513,7 @@ databar_postprocess (zbar_decoder_t *dco
+     else
+         dcode->buflen = buf - dcode->buf + 13;
+ 
+-    dprintf(2, "\n    %s", _zbar_decoder_buf_dump(dcode->buf, 16));
++    debprintf(2, "\n    %s", _zbar_decoder_buf_dump(dcode->buf, 16));
+ }
+ 
+ static inline int
+@@ -547,7 +547,7 @@ merge_segment (databar_decoder_t *db,
+             seg->partial &= s->partial;
+             seg->width = (3 * seg->width + s->width + 2) / 4;
+             s->finder = -1;
+-            dprintf(2, " dup@%d(%d,%d)",
++            debprintf(2, " dup@%d(%d,%d)",
+                     i, cnt, (db->epoch - seg->epoch) & 0xff);
+         }
+         else if(s->finder >= 0) {
+@@ -587,7 +587,7 @@ match_segment (zbar_decoder_t *dcode,
+                (s1->partial && s1->count < 4) ||
+                !check_width(seg->width, s1->width, 14))
+                 continue;
+-            dprintf(2, "\n\t[%d,%d] f=%d(0%xx)/%d(%x%x%x)",
++            debprintf(2, "\n\t[%d,%d] f=%d(0%xx)/%d(%x%x%x)",
+                     i0, i1, seg->finder, seg->color,
+                     s1->finder, s1->exp, s1->color, s1->side);
+ 
+@@ -607,7 +607,7 @@ match_segment (zbar_decoder_t *dcode,
+             else
+                 chk = 79 + chkf - chks;
+ 
+-            dprintf(2, " chk=(%d,%d) => %d", chkf, chks, chk);
++            debprintf(2, " chk=(%d,%d) => %d", chkf, chks, chk);
+             age1 = ((db->epoch - s0->epoch) & 0xff +
+                     (db->epoch - s1->epoch) & 0xff);
+ 
+@@ -623,7 +623,7 @@ match_segment (zbar_decoder_t *dcode,
+                 age2 = (db->epoch - s2->epoch) & 0xff;
+                 age = age1 + age2;
+                 cnt = s0->count + s1->count + s2->count;
+-                dprintf(2, " [%d] MATCH cnt=%d age=%d", i2, cnt, age);
++                debprintf(2, " [%d] MATCH cnt=%d age=%d", i2, cnt, age);
+                 if(maxcnt < cnt ||
+                    (maxcnt == cnt && maxage > age)) {
+                     maxcnt = cnt;
+@@ -670,7 +670,7 @@ lookup_sequence (databar_segment_t *seg,
+     i = (n + 1) / 2 + 1;
+     n += 4;
+     i = (i * i) / 4;
+-    dprintf(2, " {%d,%d:", i, n);
++    debprintf(2, " {%d,%d:", i, n);
+     p = exp_sequences + i;
+ 
+     fixed >>= 1;
+@@ -687,11 +687,11 @@ lookup_sequence (databar_segment_t *seg,
+         if(s == fixed)
+             fixed = -1;
+         s <<= 1;
+-        dprintf(2, "%x", s);
++        debprintf(2, "%x", s);
+         seq[i++] = s++;
+         seq[i++] = s;
+     }
+-    dprintf(2, "}");
++    debprintf(2, "}");
+     seq[n] = -1;
+     return(fixed < 1);
+ }
+@@ -713,27 +713,27 @@ match_segment_exp (zbar_decoder_t *dcode
+     bestsegs[0] = segs[0] = seq[1] = -1;
+     seq[0] = 0;
+ 
+-    dprintf(2, "\n    fixed=%d@%d: ", fixed, ifixed);
++    debprintf(2, "\n    fixed=%d@%d: ", fixed, ifixed);
+     for(i = csegs, seg = db->segs + csegs - 1; --i >= 0; seg--) {
+         if(seg->exp && seg->finder >= 0 &&
+            (!seg->partial || seg->count >= 4))
+             iseg[i] = IDX(seg);
+         else
+             iseg[i] = -1;
+-        dprintf(2, " %d", iseg[i]);
++        debprintf(2, " %d", iseg[i]);
+     }
+ 
+     for(i = 0; ; i--) {
+         if(!i)
+-            dprintf(2, "\n   ");
++            debprintf(2, "\n   ");
+         for(; i >= 0 && seq[i] >= 0; i--) {
+             int j;
+-            dprintf(2, " [%d]%d", i, seq[i]);
++            debprintf(2, " [%d]%d", i, seq[i]);
+ 
+             if(seq[i] == fixed) {
+                 seg = db->segs + ifixed;
+                 if(segs[i] < 0 && check_width(width, seg->width, 14)) {
+-                    dprintf(2, "*");
++                    debprintf(2, "*");
+                     j = ifixed;
+                 }
+                 else
+@@ -753,15 +753,15 @@ match_segment_exp (zbar_decoder_t *dcode
+ 
+             if(!i) {
+                 if(!lookup_sequence(seg, fixed, seq)) {
+-                    dprintf(2, "[nf]");
++                    debprintf(2, "[nf]");
+                     continue;
+                 }
+                 width = seg->width;
+-                dprintf(2, " A00@%d", j);
++                debprintf(2, " A00@%d", j);
+             }
+             else {
+                 width = (width + seg->width) / 2;
+-                dprintf(2, " %c%x%x@%d",
++                debprintf(2, " %c%x%x@%d",
+                         'A' + seg->finder, seg->color, seg->side, j);
+             }
+             segs[i++] = j;
+@@ -783,15 +783,15 @@ match_segment_exp (zbar_decoder_t *dcode
+         unsigned chk0 = data0 % 211;
+         chk %= 211;
+ 
+-        dprintf(2, " chk=%d ?= %d", chk, chk0);
++        debprintf(2, " chk=%d ?= %d", chk, chk0);
+         if(chk != chk0)
+             continue;
+ 
+-        dprintf(2, " cnt=%d age=%d", cnt, age);
++        debprintf(2, " cnt=%d age=%d", cnt, age);
+         if(maxcnt > cnt || (maxcnt == cnt && maxage <= age))
+             continue;
+ 
+-        dprintf(2, " !");
++        debprintf(2, " !");
+         maxcnt = cnt;
+         maxage = age;
+         for(i = 0; segs[i] >= 0; i++)
+@@ -844,7 +844,7 @@ calc_check (unsigned sig0,
+         if(!(i & 1))
+             chk %= mod;
+     }
+-    dprintf(2, " chk=%d", chk);
++    debprintf(2, " chk=%d", chk);
+ 
+     if(side)
+         chk = (chk * (6561 % mod)) % mod;
+@@ -958,7 +958,7 @@ decode_char (zbar_decoder_t *dcode,
+         n = 16;
+     emin[1] = -n;
+ 
+-    dprintf(2, "\n        char[%c%d]: n=%d s=%d w=%d sig=",
++    debprintf(2, "\n        char[%c%d]: n=%d s=%d w=%d sig=",
+             (dir < 0) ? '>' : '<', off, n, s, seg->width);
+     if(s < 13 || !check_width(seg->width, s, n))
+         return(ZBAR_NONE);
+@@ -967,7 +967,7 @@ decode_char (zbar_decoder_t *dcode,
+         int e = decode_e(pair_width(dcode, off), s, n);
+         if(e < 0)
+             return(ZBAR_NONE);
+-        dprintf(2, "%d", e);
++        debprintf(2, "%d", e);
+         sum = e - sum;
+         off += dir;
+         sig1 <<= 4;
+@@ -980,7 +980,7 @@ decode_char (zbar_decoder_t *dcode,
+         e = decode_e(pair_width(dcode, off), s, n);
+         if(e < 0)
+             return(ZBAR_NONE);
+-        dprintf(2, "%d", e);
++        debprintf(2, "%d", e);
+         sum = e - sum;
+         off += dir;
+         sig0 <<= 4;
+@@ -996,7 +996,7 @@ decode_char (zbar_decoder_t *dcode,
+     sig0 -= diff;
+     sig1 += diff;
+ 
+-    dprintf(2, " emin=%d,%d el=%04x/%04x", emin[0], emin[1], sig0, sig1);
++    debprintf(2, " emin=%d,%d el=%04x/%04x", emin[0], emin[1], sig0, sig1);
+ 
+     unsigned sum0 = sig0 + (sig0 >> 8);
+     unsigned sum1 = sig1 + (sig1 >> 8);
+@@ -1005,15 +1005,15 @@ decode_char (zbar_decoder_t *dcode,
+     sum0 &= 0xf;
+     sum1 &= 0xf;
+ 
+-    dprintf(2, " sum=%d/%d", sum0, sum1);
++    debprintf(2, " sum=%d/%d", sum0, sum1);
+ 
+     if(sum0 + sum1 + 8 != n) {
+-        dprintf(2, " [SUM]");
++        debprintf(2, " [SUM]");
+         return(ZBAR_NONE);
+     }
+ 
+     if(((sum0 ^ (n >> 1)) | (sum1 ^ (n >> 1) ^ n)) & 1) {
+-        dprintf(2, " [ODD]");
++        debprintf(2, " [ODD]");
+         return(ZBAR_NONE);
+     }
+ 
+@@ -1022,16 +1022,16 @@ decode_char (zbar_decoder_t *dcode,
+             "n=%d sum=%d/%d sig=%04x/%04x g=%d",
+             n, sum0, sum1, sig0, sig1, i);
+     struct group_s *g = groups + i;
+-    dprintf(2, "\n            g=%d(%d,%d,%d/%d)",
++    debprintf(2, "\n            g=%d(%d,%d,%d/%d)",
+             i, g->sum, g->wmax, g->todd, g->teven);
+ 
+     int vodd = calc_value4(sig0 + 0x1111, sum0 + 4, g->wmax, ~n & 1);
+-    dprintf(2, " v=%d", vodd);
++    debprintf(2, " v=%d", vodd);
+     if(vodd < 0 || vodd > g->todd)
+         return(ZBAR_NONE);
+ 
+     int veven = calc_value4(sig1 + 0x1111, sum1 + 4, 9 - g->wmax, n & 1);
+-    dprintf(2, "/%d", veven);
++    debprintf(2, "/%d", veven);
+     if(veven < 0 || veven > g->teven)
+         return(ZBAR_NONE);
+ 
+@@ -1041,7 +1041,7 @@ decode_char (zbar_decoder_t *dcode,
+     else
+         v += veven + vodd * g->teven;
+ 
+-    dprintf(2, " f=%d(%x%x%x)", seg->finder, seg->exp, seg->color, seg->side);
++    debprintf(2, " f=%d(%x%x%x)", seg->finder, seg->exp, seg->color, seg->side);
+ 
+     unsigned chk = 0;
+     if(seg->exp) {
+@@ -1067,7 +1067,7 @@ decode_char (zbar_decoder_t *dcode,
+         if(seg->color)
+             chk = (chk * 16) % 79;
+     }
+-    dprintf(2, " => %d val=%d", chk, v);
++    debprintf(2, " => %d val=%d", chk, v);
+ 
+     seg->check = chk;
+     seg->data = v;
+@@ -1090,13 +1090,13 @@ alloc_segment (databar_decoder_t *db)
+         databar_segment_t *seg = db->segs + i;
+         unsigned age;
+         if(seg->finder < 0) {
+-            dprintf(2, " free@%d", i);
++            debprintf(2, " free@%d", i);
+             return(i);
+         }
+         age = (db->epoch - seg->epoch) & 0xff;
+         if(age >= 128 && seg->count < 2) {
+             seg->finder = -1;
+-            dprintf(2, " stale@%d (%d - %d = %d)",
++            debprintf(2, " stale@%d (%d - %d = %d)",
+                     i, db->epoch, seg->epoch, age);
+             return(i);
+         }
+@@ -1110,12 +1110,12 @@ alloc_segment (databar_decoder_t *db)
+         if(maxage < age) {
+             maxage = age;
+             old = i;
+-            dprintf(2, " old@%d(%u)", i, age);
++            debprintf(2, " old@%d(%u)", i, age);
+         }
+     }
+ 
+     if(csegs < DATABAR_MAX_SEGMENTS) {
+-        dprintf(2, " new@%d", i);
++        debprintf(2, " new@%d", i);
+         i = csegs;
+         csegs *= 2;
+         if(csegs > DATABAR_MAX_SEGMENTS)
+@@ -1153,7 +1153,7 @@ decode_finder (zbar_decoder_t *dcode)
+     unsigned e2 = pair_width(dcode, 3);
+     unsigned e1, e3, s, finder, dir;
+     int sig, iseg;
+-    dprintf(2, "      databar: e0=%d e2=%d", e0, e2);
++    debprintf(2, "      databar: e0=%d e2=%d", e0, e2);
+     if(e0 < e2) {
+         unsigned e = e2 * 4;
+         if(e < 15 * e0 || e > 34 * e0)
+@@ -1172,13 +1172,13 @@ decode_finder (zbar_decoder_t *dcode)
+     e1 = pair_width(dcode, 2);
+ 
+     s = e1 + e3;
+-    dprintf(2, " e1=%d e3=%d dir=%d s=%d", e1, e3, dir, s);
++    debprintf(2, " e1=%d e3=%d dir=%d s=%d", e1, e3, dir, s);
+     if(s < 12)
+         return(ZBAR_NONE);
+ 
+     sig = ((decode_e(e3, s, 14) << 8) | (decode_e(e2, s, 14) << 4) |
+            decode_e(e1, s, 14));
+-    dprintf(2, " sig=%04x", sig & 0xfff);
++    debprintf(2, " sig=%04x", sig & 0xfff);
+     if(sig < 0 ||
+        ((sig >> 4) & 0xf) < 8 ||
+        ((sig >> 4) & 0xf) > 10 ||
+@@ -1189,7 +1189,7 @@ decode_finder (zbar_decoder_t *dcode)
+ 
+     finder = (finder_hash[(sig - (sig >> 5)) & 0x1f] +
+               finder_hash[(sig >> 1) & 0x1f]) & 0x1f;
+-    dprintf(2, " finder=%d", finder);
++    debprintf(2, " finder=%d", finder);
+     if(finder == 0x1f ||
+        !TEST_CFG((finder < 9) ? db->config : db->config_exp, ZBAR_CFG_ENABLE))
+         return(ZBAR_NONE);
+@@ -1232,7 +1232,7 @@ _zbar_decode_databar (zbar_decoder_t *dc
+     int iseg, i = dcode->idx & 0xf;
+ 
+     sym = decode_finder(dcode);
+-    dprintf(2, "\n");
++    debprintf(2, "\n");
+ 
+     iseg = db->chars[i];
+     if(iseg < 0)
+@@ -1240,7 +1240,7 @@ _zbar_decode_databar (zbar_decoder_t *dc
+ 
+     db->chars[i] = -1;
+     seg = db->segs + iseg;
+-    dprintf(2, "        databar: i=%d part=%d f=%d(%x%x%x)",
++    debprintf(2, "        databar: i=%d part=%d f=%d(%x%x%x)",
+             iseg, seg->partial, seg->finder, seg->exp, seg->color, seg->side);
+     zassert(seg->finder >= 0, ZBAR_NONE, "i=%d f=%d(%x%x%x) part=%x\n",
+             iseg, seg->finder, seg->exp, seg->color, seg->side, seg->partial);
+@@ -1271,7 +1271,7 @@ _zbar_decode_databar (zbar_decoder_t *dc
+     }
+     else
+         db->epoch++;
+-    dprintf(2, "\n");
++    debprintf(2, "\n");
+ 
+     return(sym);
+ }
diff --git a/zbar_update_to_617889f8f73.patch b/zbar_update_to_617889f8f73.patch
new file mode 100644
index 0000000..adf6455
--- /dev/null
+++ b/zbar_update_to_617889f8f73.patch
@@ -0,0 +1,28771 @@
+diff --git a/COPYING b/COPYING
+--- a/COPYING
++++ b/COPYING
+@@ -1,4 +1,4 @@
+-The ZBar Bar Code Reader is Copyright (C) 2007-2009 Jeff Brown
++The ZBar Bar Code Reader is Copyright (C) 2007-2010 Jeff Brown
+  <spadix@users.sourceforge.net>
+ The QR Code reader is Copyright (C) 1999-2009 Timothy B. Terriberry
+  <tterribe@xiph.org>
+diff --git a/Makefile.am b/Makefile.am
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,6 +1,3 @@
+-AM_CPPFLAGS = -I$(srcdir)/include
+-AM_CFLAGS = -Wall -Wno-parentheses
+-AM_CXXFLAGS = $(AM_CFLAGS)
+ ACLOCAL_AMFLAGS = -I config
+ bin_PROGRAMS =
+ check_PROGRAMS =
+@@ -9,8 +6,10 @@ lib_LTLIBRARIES =
+ pyexec_LTLIBRARIES =
+ CLEANFILES =
+ DISTCLEANFILES =
++MAINTAINERCLEANFILES =
+ BUILT_SOURCES =
+ EXTRA_DIST =
++SUBDIRS = .
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = zbar.pc
+@@ -39,6 +38,9 @@ if HAVE_QT
+ include $(srcdir)/qt/Makefile.am.inc
+ pkgconfig_DATA += zbar-qt.pc
+ endif
++if HAVE_JAVA
++SUBDIRS += java
++endif
+ if HAVE_NPAPI
+ include $(srcdir)/plugin/Makefile.am.inc
+ endif
+@@ -47,11 +49,8 @@ include $(srcdir)/doc/Makefile.am.inc
+ 
+ EXTRA_DIST += zbar.ico zbar.nsi
+ 
+-EXTRA_DIST += examples/upcrpc.pl examples/upcrpc.py examples/paginate.pl \
+-    examples/barcode.png examples/processor.pl examples/processor.py \
+-    examples/read_one.py examples/read_one.pl \
+-    examples/scan_image.c examples/scan_image.cpp examples/scan_image.pl \
+-    examples/scan_image.py examples/scan_image.vcproj
++EXTRA_DIST += examples/barcode.png examples/upcrpc.py examples/upcrpc.pl \
++    examples/scan_image.c examples/scan_image.cpp examples/scan_image.vcproj
+ 
+ EXTRA_DIST += perl/MANIFEST perl/README perl/Changes perl/COPYING.LIB \
+     perl/Makefile.PL perl/typemap perl/ZBar.xs perl/ppport.h \
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -46,6 +46,13 @@ AC_DEFINE_UNQUOTED([LIB_VERSION_REVISION
+   [[`echo "$LIB_VERSION" | sed -e 's/^[^:]*:\([^:]*\):.*$/\1/'`]],
+   [Library revision])
+ 
++AM_CPPFLAGS="-I$srcdir/include"
++AM_CFLAGS="-Wall -Wno-parentheses"
++AM_CXXFLAGS="$AM_CFLAGS"
++AC_SUBST([AM_CPPFLAGS])
++AC_SUBST([AM_CFLAGS])
++AC_SUBST([AM_CXXFLAGS])
++
+ dnl windows build
+ 
+ AC_CANONICAL_HOST
+@@ -73,13 +80,36 @@ documentation generation])
+ AC_ARG_VAR([XMLTOFLAGS], [additional arguments for xmlto])
+ AC_CHECK_PROGS([XMLTO], [xmlto], [:])
+ 
++have_java="maybe"
++AC_ARG_VAR([JAVA_HOME], [root location of JDK])
++AS_IF([test "x$JAVA_HOME" = "x"],
++  [JAVA_PATH="$PATH"],
++  [JAVA_PATH="$JAVA_HOME/bin$PATH_SEPARATOR$PATH"])
++
++AC_ARG_VAR([JAVAC], [location of Java language compiler])
++AC_PATH_PROGS([JAVAC], [javac jikes ecj gcj], [:], [$JAVA_PATH])
++AS_IF([test "x$JAVAC" = "x:"], [have_java="no"])
++
++AC_ARG_VAR([JAVAH], [location of Java header generator])
++AC_PATH_PROGS([JAVAH], [javah], [/bin/false], [$JAVA_PATH])
++
++AC_ARG_VAR([JAR], [location of Java archive tool])
++AC_PATH_PROGS([JAR], [jar], [:], [$JAVA_PATH])
++AS_IF([test "x$JAR" = "x:"], [have_java="no"])
++
++AC_ARG_VAR([JAVA], [location of Java application launcher])
++AC_PATH_PROGS([JAVA], [java], [/bin/false], [$JAVA_PATH])
++
++AC_ARG_VAR([CLASSPATH], [Java class path (include JUnit to run java tests)])
++AS_IF([test "x$CLASSPATH" = "x"], [CLASSPATH="."])
++
+ dnl symbologies
+ 
+ AC_ARG_ENABLE([codes],
+   [AS_HELP_STRING([--enable-codes=SYMS],
+-    [select symbologies to compile [default=ean,i25,code39,code128,qrcode]])],
++    [select symbologies to compile [default=ean,databar,code128,code93,code39,i25,qrcode]])],
+   [],
+-  [enable_codes="ean,code39,code128,i25,qrcode"]) dnl pdf417
++  [enable_codes="ean,databar,code128,code93,code39,i25,qrcode"])
+ 
+ AC_DEFUN([ZBAR_CHK_CODE], [
+   AC_MSG_CHECKING([whether to build $2])
+@@ -97,11 +127,13 @@ AC_DEFUN([ZBAR_CHK_CODE], [
+ ])dnl
+ 
+ ZBAR_CHK_CODE([ean], [EAN symbologies])
++ZBAR_CHK_CODE([databar], [DataBar symbology])
+ ZBAR_CHK_CODE([code128], [Code 128 symbology])
++ZBAR_CHK_CODE([code93], [Code 93 symbology])
+ ZBAR_CHK_CODE([code39], [Code 39 symbology])
+-ZBAR_CHK_CODE([pdf417], [PDF417 symbology])
+ ZBAR_CHK_CODE([i25], [Interleaved 2 of 5 symbology])
+ ZBAR_CHK_CODE([qrcode], [QR Code])
++ZBAR_CHK_CODE([pdf417], [PDF417 symbology])
+ 
+ dnl libraries
+ 
+@@ -255,7 +287,7 @@ AM_CONDITIONAL([HAVE_JPEG], [test "x$wit
+ dnl ImageMagick
+ AC_ARG_WITH([imagemagick],
+   [AS_HELP_STRING([--without-imagemagick],
+-    [disable support for scanning images using ImageMagick])],
++    [disable support for scanning images with ImageMagick])],
+   [],
+   [with_imagemagick="yes"])
+ 
+@@ -296,7 +328,7 @@ AM_CONDITIONAL([HAVE_MAGICK], [test "x$w
+ dnl Mozilla NPAPI
+ AC_ARG_WITH([npapi],
+   [AS_HELP_STRING([--with-npapi],
+-    [enable support for Firefox/Mozilla/OpenOffice NPAPI plugin])],
++    [enable support for Firefox/Mozilla/OpenOffice plugin])],
+   [],
+   [with_npapi="no"])
+ 
+@@ -383,13 +415,38 @@ AS_IF([test "x$with_qt" != "xno"],
+ 
+ AM_CONDITIONAL([HAVE_QT], [test "x$with_qt" = "xyes"])
+ 
++dnl Java
++AC_ARG_WITH([java],
++  [AS_HELP_STRING([--without-java],
++    [disable support for Java interface])],
++  [],
++  [with_java="check"])
++
++AC_ARG_VAR([JAVA_CFLAGS], [compiler flags for building JNI extensions])
++AS_IF([test "x$JAVA_CFLAGS" = "x" && test "x$JAVA_HOME" != "x"],
++  [JAVA_CFLAGS="-I$JAVA_HOME/include"])
++
++AS_IF([test "x$with_java" != "xno"],
++  [CPPFLAGS_save="$CPPFLAGS"
++   CPPFLAGS="$CPPFLAGS $JAVA_CFLAGS"
++   AC_CHECK_HEADER([jni.h], [], [have_java="no"])
++   CPPFLAGS="$CPPFLAGS_save"
++   AS_IF([test "x$have_java" != "xno"],
++     [with_java="yes"],
++     [test "x$with_java" = "xyes"],
++     [AC_MSG_FAILURE([unable to find Java JNI! ensure CFLAGS are set
++appropriately or configure --without-java])],
++     [with_java="no"])
++])
++AM_CONDITIONAL([HAVE_JAVA], [test "x$with_java" = "xyes"])
++
+ 
+ dnl header files
+ 
+ dnl FIXME switches for shm, mmap
+ AC_HEADER_ASSERT
+-AC_CHECK_HEADERS([fcntl.h features.h inttypes.h stdlib.h string.h unistd.h \
+-  sys/ioctl.h sys/time.h sys/times.h sys/ipc.h sys/shm.h sys/mman.h])
++AC_CHECK_HEADERS([errno.h fcntl.h features.h inttypes.h stdlib.h string.h \
++  unistd.h sys/ioctl.h sys/time.h sys/times.h sys/ipc.h sys/shm.h sys/mman.h])
+ 
+ dnl types
+ 
+@@ -428,6 +485,7 @@ AC_CONFIG_COMMANDS([doc/reldate.xml],
+ 
+ AC_CONFIG_FILES([
+ Makefile
++java/Makefile
+ zbar.pc
+ zbar-gtk.pc
+ zbar-qt.pc
+@@ -460,6 +518,9 @@ AS_IF([test "x$with_gtk" != "xyes"],
+ echo "Qt4               --with-qt=$with_qt"
+ AS_IF([test "x$with_qt" != "xyes"],
+   [echo "        => the Qt4 widget will *NOT* be built"])
++echo "Java              --with-java=$with_java"
++AS_IF([test "x$with_java" != "xyes"],
++  [echo "        => the Java interface will *NOT* be built"])
+ #echo "NPAPI Plugin     --with-npapi=$with_npapi"
+ #AS_IF([test "x$with_mozilla" != "xyes"],
+ #  [echo "       => the Mozilla/Firefox/OpenOffice plugin will *NOT* be built"])
+diff --git a/doc/Makefile.am.inc b/doc/Makefile.am.inc
+--- a/doc/Makefile.am.inc
++++ b/doc/Makefile.am.inc
+@@ -2,6 +2,7 @@
+ DOCSOURCES = doc/manual.xml doc/version.xml doc/reldate.xml \
+     doc/ref/zbarimg.xml doc/ref/zbarcam.xml doc/ref/commonoptions.xml
+ 
++MAINTAINERCLEANFILES += doc/man/man.stamp doc/version.xml doc/reldate.xml
+ 
+ # man page targets to distribute and install
+ dist_man_MANS =
+diff --git a/doc/api/footer.html b/doc/api/footer.html
+--- a/doc/api/footer.html
++++ b/doc/api/footer.html
+@@ -9,9 +9,12 @@
+ 
+ <address><a href="mailto:spadix@users.sourceforge.net">spadix@users.sourceforge.net</a></address>
+ 
+-<p>Copyright 2008-2009 (c) Jeff Brown - All Rights Reserved.</p>
+-<p>Verbatim copying and distribution of this entire article are
+-  permitted worldwide, without royalty, in any medium, provided this
+-  notice, and the copyright notice, are preserved.</p>
++<p>Copyright 2008-2010 (c) Jeff Brown</p>
++<p>This documentation is part of the ZBar Barcode Reader; you can
++redistribute it and/or modify it under the terms of the
++<a href="http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html">GNU
++Lesser General Public License</a> as published by the Free Software
++Foundation; either version 2.1 of the License, or (at your option) any
++later version.</p>
+ 
+ </body></html>
+diff --git a/doc/manual.xml b/doc/manual.xml
+--- a/doc/manual.xml
++++ b/doc/manual.xml
+@@ -29,10 +29,10 @@
+       <year>2007</year>
+       <year>2008</year>
+       <year>2009</year>
++      <year>2010</year>
+       <holder>Jeff Brown</holder>
+     </copyright>
+     <legalnotice><para>All Rights Reserved</para></legalnotice>
+-    <!-- <legalnotice><para>insert GNU FDL header?</para></legalnotice> -->
+   </bookinfo>
+ 
+   <chapter id="intro">
+@@ -47,7 +47,4 @@
+     &refzbarimg;
+ 
+   </reference>
+-
+-  <!-- insert GNU FDL? -->
+-
+ </book>
+diff --git a/doc/ref/commonoptions.xml b/doc/ref/commonoptions.xml
+--- a/doc/ref/commonoptions.xml
++++ b/doc/ref/commonoptions.xml
+@@ -47,8 +47,9 @@
+       <option>ean13</option>, <option>ean8</option>,
+       <option>upca</option>, <option>upce</option>,
+       <option>isbn13</option>, <option>isbn10</option>,
+-      <option>i25</option>, <option>code39</option>,
+-      <option>code128</option> or the special value <option>*</option>.
++      <option>i25</option>, <option>code39</option>, <option>code93</option>,
++      <option>code128</option>, <option>qrcode</option>
++      or the special value <option>*</option>.
+       If <replaceable class="parameter">symbology</replaceable> is
+       omitted or <option>*</option>, the <replaceable
+       class="parameter">config</replaceable> will be set for all
+diff --git a/doc/ref/zbarcam.xml b/doc/ref/zbarcam.xml
+--- a/doc/ref/zbarcam.xml
++++ b/doc/ref/zbarcam.xml
+@@ -60,9 +60,10 @@
+     <filename>/dev/video0</filename></para>
+ 
+     <para>The underlying library currently supports EAN-13 (including
+-    UPC and ISBN subsets), EAN-8, Code 128, Code 39, and Interleaved
+-    2 of 5 symbologies.  The specific type of each detected symbol is
+-    printed with the decoded data.</para>
++    UPC and ISBN subsets), EAN-8, DataBar, DataBar Expanded, Code 128,
++    Code 93, Code 39, Interleaved 2 of 5 and QR Code symbologies.  The
++    specific type of each detected symbol is printed with the decoded
++    data.</para>
+ 
+   </refsection>
+ 
+@@ -160,6 +161,37 @@
+   </refsection>
+ 
+   <refsection>
++    <title>Exit Status</title>
++
++    <para><command>zbarcam</command> returns an exit code to indicate the
++    status of the program execution. Current exit codes are:</para>
++
++    <variablelist>
++      <varlistentry>
++        <term>0</term>
++        <listitem>
++          <para>Successful program completion.</para>
++        </listitem>
++      </varlistentry>
++
++      <varlistentry>
++        <term>1</term>
++        <listitem>
++          <para>An error occurred.  This includes bad arguments and I/O
++          errors.</para>
++        </listitem>
++      </varlistentry>
++
++      <varlistentry>
++        <term>2</term>
++        <listitem>
++          <para>A fatal error occurred.</para>
++        </listitem>
++      </varlistentry>
++    </variablelist>
++  </refsection>
++
++  <refsection>
+     <title>See Also</title>
+     <para><xref linkend="zbarimg"/></para>
+     <para><link xlink:href="http://zbar.sf.net/"/></para>
+diff --git a/doc/ref/zbarimg.xml b/doc/ref/zbarimg.xml
+--- a/doc/ref/zbarimg.xml
++++ b/doc/ref/zbarimg.xml
+@@ -59,9 +59,10 @@
+     displayed to the screen.</para>
+ 
+     <para>The underlying library currently supports EAN-13 (including
+-    UPC and ISBN subsets), EAN-8, Code 128, Code 39, and Interleaved
+-    2 of 5 symbologies.  The specific type of each detected symbol is
+-    printed with the decoded data.</para>
++    UPC and ISBN subsets), EAN-8, DataBar, DataBar Expanded, Code 128,
++    Code 93, Code 39, Interleaved 2 of 5 and QR Code symbologies.  The
++    specific type of each detected symbol is printed with the decoded
++    data.</para>
+ 
+     <para>Note that "<filename><replaceable>image</replaceable></filename>"
+ 
+@@ -166,6 +167,56 @@
+   </refsection>
+ 
+   <refsection>
++    <title>Exit Status</title>
++
++    <para><command>zbarimg</command> returns an exit code to indicate the
++    status of the program execution. Current exit codes are:</para>
++
++    <variablelist>
++      <varlistentry>
++        <term>0</term>
++        <listitem>
++          <para>Barcodes successfully detected in all images. Warnings may
++          have been generated, but no errors.</para>
++        </listitem>
++      </varlistentry>
++
++      <varlistentry>
++        <term>1</term>
++        <listitem>
++          <para>An error occurred while processing some image(s).  This
++          includes bad arguments, I/O errors and image handling errors from
++          ImageMagick.</para>
++        </listitem>
++      </varlistentry>
++
++      <varlistentry>
++        <term>2</term>
++        <listitem>
++          <para>ImageMagick fatal error.</para>
++        </listitem>
++      </varlistentry>
++
++      <varlistentry>
++        <term>3</term>
++        <listitem>
++          <para>The user quit the program before all images were scanned.
++          Only applies when running in interactive mode
++          (with <option>--display</option>)</para>
++        </listitem>
++      </varlistentry>
++
++      <varlistentry>
++        <term>4</term>
++        <listitem>
++          <para>No barcode was detected in one or more of the images.  No
++          other errors occurred.</para>
++        </listitem>
++      </varlistentry>
++    </variablelist>
++  </refsection>
++
++  <refsection>
+     <title>See Also</title>
+     <para><xref linkend="zbarcam"/></para>
+     <para><link xlink:href="http://zbar.sf.net/"/></para>
+diff --git a/examples/paginate.pl b/examples/paginate.pl
+deleted file mode 100755
+--- a/examples/paginate.pl
++++ /dev/null
+@@ -1,71 +0,0 @@
+-#!/usr/bin/perl
+-#------------------------------------------------------------------------
+-#  Copyright 2009 (c) Jeff Brown <spadix@users.sourceforge.net>
+-#
+-#  This file is part of the ZBar Bar Code Reader.
+-#
+-#  The ZBar Bar Code Reader is free software; you can redistribute it
+-#  and/or modify it under the terms of the GNU Lesser Public License as
+-#  published by the Free Software Foundation; either version 2.1 of
+-#  the License, or (at your option) any later version.
+-#
+-#  The ZBar Bar Code Reader is distributed in the hope that it will be
+-#  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+-#  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-#  GNU Lesser Public License for more details.
+-#
+-#  You should have received a copy of the GNU Lesser Public License
+-#  along with the ZBar Bar Code Reader; if not, write to the Free
+-#  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+-#  Boston, MA  02110-1301  USA
+-#
+-#  http://sourceforge.net/projects/zbar
+-#------------------------------------------------------------------------
+-use warnings;
+-use strict;
+-
+-use Barcode::ZBar;
+-use Image::Magick;
+-
+-warn("no input files specified?\n") if(!@ARGV);
+-
+-# running output document
+-my $out = undef;
+-
+-# barcode scanner
+-my $scanner = Barcode::ZBar::ImageScanner->new();
+-
+-foreach my $file (@ARGV) {
+-    print "scanning from \"$file\"\n";
+-    my $imseq = Image::Magick->new();
+-    my $err = $imseq->Read($file);
+-    warn($err) if($err);
+-
+-    foreach my $page (@$imseq) {
+-        # convert ImageMagick page to ZBar image
+-        my $zimg = Barcode::ZBar::Image->new();
+-        $zimg->set_format('Y800');
+-        $zimg->set_size($page->Get(qw(columns rows)));
+-        $zimg->set_data($page->Clone()->ImageToBlob(magick => 'GRAY', depth => 8));
+-
+-        # scan for barcodes
+-        if($scanner->scan_image($zimg)) {
+-            # write out previous document
+-            $out->write() if($out);
+-
+-            # use first symbol found to name next image (FIXME sanitize)
+-            my $data = ($zimg->get_symbols())[0]->get_data();
+-            my $idx = $page->Get('scene') + 1;
+-            print "splitting $data from page $idx\n";
+-
+-            # create new output document
+-            $out = Image::Magick->new(filename => $data);
+-        }
+-
+-        # append this page to current output
+-        push(@$out, $page) if($out);
+-    }
+-
+-    # write out final document
+-    $out->write() if($out);
+-}
+diff --git a/examples/processor.c b/examples/processor.c
+new file mode 100644
+--- /dev/null
++++ b/examples/processor.c
+@@ -0,0 +1,47 @@
++#include <stdio.h>
++#include <zbar.h>
++
++static void my_handler (zbar_image_t *image,
++                        const void *userdata)
++{
++    /* extract results */
++    const zbar_symbol_t *symbol = zbar_image_first_symbol(image);
++    for(; symbol; symbol = zbar_symbol_next(symbol)) {
++        /* do something useful with results */
++        zbar_symbol_type_t typ = zbar_symbol_get_type(symbol);
++        const char *data = zbar_symbol_get_data(symbol);
++        printf("decoded %s symbol \"%s\"\n",
++               zbar_get_symbol_name(typ), data);
++    }
++}
++
++int main (int argc, char **argv)
++{
++    const char *device = "/dev/video0";
++
++    /* create a Processor */
++    zbar_processor_t *proc = zbar_processor_create(1);
++
++    /* configure the Processor */
++    zbar_processor_set_config(proc, 0, ZBAR_CFG_ENABLE, 1);
++
++    /* initialize the Processor */
++    if(argc > 1)
++        device = argv[1];
++    zbar_processor_init(proc, device, 1);
++
++    /* setup a callback */
++    zbar_processor_set_data_handler(proc, my_handler, NULL);
++
++    /* enable the preview window */
++    zbar_processor_set_visible(proc, 1);
++    zbar_processor_set_active(proc, 1);
++
++    /* keep scanning until user provides key/mouse input */
++    zbar_processor_user_wait(proc, -1);
++
++    /* clean up */
++    zbar_processor_destroy(proc);
++
++    return(0);
++}
+diff --git a/examples/processor.cpp b/examples/processor.cpp
+new file mode 100644
+--- /dev/null
++++ b/examples/processor.cpp
+@@ -0,0 +1,45 @@
++#include <iostream>
++#include <zbar.h>
++
++using namespace std;
++using namespace zbar;
++
++class MyHandler : public Image::Handler
++{
++    void image_callback (Image &image)
++    {
++        for(SymbolIterator symbol = image.symbol_begin();
++            symbol != image.symbol_end();
++            ++symbol)
++            cout << "decoded " << symbol->get_type_name() << " symbol "
++                 << "\"" << symbol->get_data() << "\"" << endl;
++    }
++};
++
++int main (int argc, char **argv)
++{
++    // create and initialize a Processor
++    const char *device = "/dev/video0";
++    if(argc > 1)
++        device = argv[1];
++    Processor proc(true, device);
++
++    // configure the Processor
++    proc.set_config(ZBAR_NONE, ZBAR_CFG_ENABLE, 1);
++
++    // setup a callback
++    MyHandler my_handler;
++    proc.set_handler(my_handler);
++
++    // enable the preview window
++    proc.set_visible();
++    proc.set_active();
++
++    try {
++        // keep scanning until user provides key/mouse input
++        proc.user_wait();
++    }
++    catch(ClosedError &e) {
++    }
++    return(0);
++}
+diff --git a/examples/processor.pl b/examples/processor.pl
+deleted file mode 100755
+--- a/examples/processor.pl
++++ /dev/null
+@@ -1,35 +0,0 @@
+-#!/usr/bin/env perl
+-use warnings;
+-use strict;
+-require Barcode::ZBar;
+-
+-# create a Processor
+-my $proc = Barcode::ZBar::Processor->new();
+-
+-# configure the Processor
+-$proc->parse_config("enable");
+-
+-# initialize the Processor
+-$proc->init($ARGV[0] || '/dev/video0');
+-
+-# setup a callback
+-sub my_handler {
+-    my ($proc, $image, $closure) = @_;
+-
+-    # extract results
+-    foreach my $symbol ($proc->get_results()) {
+-        # do something useful with results
+-        print('decoded ' . $symbol->get_type() .
+-              ' symbol "' . $symbol->get_data() . "\"\n");
+-    }
+-}
+-$proc->set_data_handler(\&my_handler);
+-
+-# enable the preview window
+-$proc->set_visible();
+-
+-# initiate scanning
+-$proc->set_active();
+-
+-# keep scanning until user provides key/mouse input
+-$proc->user_wait();
+diff --git a/examples/read_one.pl b/examples/read_one.pl
+deleted file mode 100755
+--- a/examples/read_one.pl
++++ /dev/null
+@@ -1,29 +0,0 @@
+-#!/usr/bin/env perl
+-use warnings;
+-use strict;
+-require Barcode::ZBar;
+-
+-# create a Processor
+-my $proc = Barcode::ZBar::Processor->new();
+-
+-# configure the Processor
+-$proc->parse_config("enable");
+-
+-# initialize the Processor
+-$proc->init($ARGV[0] || '/dev/video0');
+-
+-# enable the preview window
+-$proc->set_visible();
+-
+-# read at least one barcode (or until window closed)
+-$proc->process_one();
+-
+-# hide the preview window
+-$proc->set_visible(0);
+-
+-# extract results
+-foreach my $symbol ($proc->get_results()) {
+-  # do something useful with results
+-  print('decoded ' . $symbol->get_type() .
+-        ' symbol "' . $symbol->get_data() . "\"\n");
+-}
+diff --git a/examples/scan_image.c b/examples/scan_image.c
+--- a/examples/scan_image.c
++++ b/examples/scan_image.c
+@@ -65,7 +65,7 @@ int main (int argc, char **argv)
+ 
+     /* wrap image data */
+     zbar_image_t *image = zbar_image_create();
+-    zbar_image_set_format(image, *(int*)"Y800");
++    zbar_image_set_format(image, zbar_fourcc('Y','8','0','0'));
+     zbar_image_set_size(image, width, height);
+     zbar_image_set_data(image, raw, width * height, zbar_image_free_data);
+ 
+diff --git a/examples/scan_image.pl b/examples/scan_image.pl
+deleted file mode 100755
+--- a/examples/scan_image.pl
++++ /dev/null
+@@ -1,37 +0,0 @@
+-#!/usr/bin/perl
+-use warnings;
+-use strict;
+-require Image::Magick;
+-require Barcode::ZBar;
+-
+-$ARGV[0] || die;
+-
+-# create a reader
+-my $scanner = Barcode::ZBar::ImageScanner->new();
+-
+-# configure the reader
+-$scanner->parse_config("enable");
+-
+-# obtain image data
+-my $magick = Image::Magick->new();
+-$magick->Read($ARGV[0]) && die;
+-my $raw = $magick->ImageToBlob(magick => 'GRAY', depth => 8);
+-
+-# wrap image data
+-my $image = Barcode::ZBar::Image->new();
+-$image->set_format('Y800');
+-$image->set_size($magick->Get(qw(columns rows)));
+-$image->set_data($raw);
+-
+-# scan the image for barcodes
+-my $n = $scanner->scan_image($image);
+-
+-# extract results
+-foreach my $symbol ($image->get_symbols()) {
+-    # do something useful with results
+-    print('decoded ' . $symbol->get_type() .
+-          ' symbol "' . $symbol->get_data() . "\"\n");
+-}
+-
+-# clean up
+-undef($image);
+diff --git a/examples/upcrpc.pl b/examples/upcrpc.pl
+--- a/examples/upcrpc.pl
++++ b/examples/upcrpc.pl
+@@ -3,7 +3,7 @@ use warnings;
+ use strict;
+ use Frontier::Client;
+ use Data::Dumper;
+-my $s = Frontier::Client->new('url' => 'http://dev.upcdatabase.com/rpc');
++my $s = Frontier::Client->new('url' => 'http://www.upcdatabase.com/rpc');
+ 
+ $| = 1; # autoflush
+ 
+diff --git a/examples/upcrpc.py b/examples/upcrpc.py
+--- a/examples/upcrpc.py
++++ b/examples/upcrpc.py
+@@ -2,7 +2,7 @@
+ from xmlrpclib import ServerProxy
+ import sys, re
+ 
+-server = ServerProxy("http://dev.upcdatabase.com/rpc")
++server = ServerProxy("http://www.upcdatabase.com/rpc")
+ ean_re = re.compile(r'^(UPC-A:|EAN-13:)?(\d{11,13})$', re.M)
+ 
+ def lookup(decode):
+diff --git a/gtk/zbargtk.c b/gtk/zbargtk.c
+--- a/gtk/zbargtk.c
++++ b/gtk/zbargtk.c
+@@ -1,5 +1,5 @@
+ /*------------------------------------------------------------------------
+- *  Copyright 2008-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++ *  Copyright 2008-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
+  *
+  *  This file is part of the ZBar Bar Code Reader.
+  *
+@@ -35,11 +35,6 @@
+ #define DEFAULT_WIDTH 640
+ #define DEFAULT_HEIGHT 480
+ 
+-/* adapted from v4l2 spec */
+-#define fourcc(a, b, c, d)                      \
+-    ((long)(a) | ((long)(b) << 8) |             \
+-     ((long)(c) << 16) | ((long)(d) << 24))
+-
+ enum {
+     DECODED,
+     DECODED_TEXT,
+@@ -88,15 +83,15 @@ gboolean zbar_gtk_image_from_pixbuf (zba
+ 
+     /* these are all guesses... */
+     if(nchannels == 3 && bps == 8)
+-        type = fourcc('R','G','B','3');
++        type = zbar_fourcc('R','G','B','3');
+     else if(nchannels == 4 && bps == 8)
+-        type = fourcc('B','G','R','4'); /* FIXME alpha flipped?! */
++        type = zbar_fourcc('B','G','R','4'); /* FIXME alpha flipped?! */
+     else if(nchannels == 1 && bps == 8)
+-        type = fourcc('Y','8','0','0');
++        type = zbar_fourcc('Y','8','0','0');
+     else if(nchannels == 3 && bps == 5)
+-        type = fourcc('R','G','B','R');
++        type = zbar_fourcc('R','G','B','R');
+     else if(nchannels == 3 && bps == 4)
+-        type = fourcc('R','4','4','4'); /* FIXME maybe? */
++        type = zbar_fourcc('R','4','4','4'); /* FIXME maybe? */
+     else {
+         g_warning("unsupported combination: nchannels=%d bps=%d\n",
+                   nchannels, bps);
+@@ -142,10 +137,6 @@ static inline gboolean zbar_gtk_video_op
+ 
+     gdk_threads_enter();
+ 
+-    zbar->req_width = DEFAULT_WIDTH;
+-    zbar->req_height = DEFAULT_HEIGHT;
+-    gtk_widget_queue_resize(GTK_WIDGET(self));
+-
+     zbar->video_opened = FALSE;
+     if(zbar->thread)
+         g_object_notify(G_OBJECT(self), "video-opened");
+@@ -184,6 +175,10 @@ static inline gboolean zbar_gtk_video_op
+          */
+         gdk_threads_enter();
+ 
++        if(zbar->video_width && zbar->video_height)
++            zbar_video_request_size(zbar->video,
++                                    zbar->video_width, zbar->video_height);
++
+         video_opened = !zbar_negotiate_format(zbar->video, zbar->window);
+ 
+         if(video_opened) {
+@@ -209,7 +204,7 @@ static inline int zbar_gtk_process_image
+     if(!image)
+         return(-1);
+ 
+-    zbar_image_t *tmp = zbar_image_convert(image, fourcc('Y','8','0','0'));
++    zbar_image_t *tmp = zbar_image_convert(image, zbar_fourcc('Y','8','0','0'));
+     if(!tmp)
+         return(-1);
+ 
+@@ -560,6 +555,19 @@ gboolean zbar_gtk_get_video_opened (ZBar
+     return(zbar->video_opened);
+ }
+ 
++void zbar_gtk_request_video_size (ZBarGtk *self,
++                                  int width,
++                                  int height)
++{
++    if(!self->_private || width < 0 || height < 0)
++        return;
++    ZBarGtkPrivate *zbar = ZBAR_GTK_PRIVATE(self->_private);
++
++    zbar->req_width = zbar->video_width = width;
++    zbar->req_height = zbar->video_height = height;
++    gtk_widget_queue_resize(GTK_WIDGET(self));
++}
++
+ static void zbar_gtk_set_property (GObject *object,
+                                    guint prop_id,
+                                    const GValue *value,
+@@ -613,8 +621,8 @@ static void zbar_gtk_init (ZBarGtk *self
+     zbar->window = zbar_window_create();
+     g_assert(zbar->window);
+ 
+-    zbar->req_width = DEFAULT_WIDTH;
+-    zbar->req_height = DEFAULT_HEIGHT;
++    zbar->req_width = zbar->video_width = DEFAULT_WIDTH;
++    zbar->req_height = zbar->video_width = DEFAULT_HEIGHT;
+ 
+     /* spawn a thread to handle decoding and video */
+     zbar->queue = g_async_queue_new();
+diff --git a/gtk/zbargtkprivate.h b/gtk/zbargtkprivate.h
+--- a/gtk/zbargtkprivate.h
++++ b/gtk/zbargtkprivate.h
+@@ -71,6 +71,7 @@ typedef struct _ZBarGtkPrivate
+      * protected by main gui lock
+      */
+     unsigned req_width, req_height;
++    unsigned video_width, video_height;
+     gboolean video_opened;
+ 
+     /* window is shared: owned by main gui thread.
+diff --git a/include/zbar.h b/include/zbar.h
+--- a/include/zbar.h
++++ b/include/zbar.h
+@@ -1,5 +1,5 @@
+ /*------------------------------------------------------------------------
+- *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
+  *
+  *  This file is part of the ZBar Bar Code Reader.
+  *
+@@ -93,9 +93,12 @@ typedef enum zbar_symbol_type_e {
+     ZBAR_EAN13       =     13,  /**< EAN-13 */
+     ZBAR_ISBN13      =     14,  /**< ISBN-13 (from EAN-13). @since 0.4 */
+     ZBAR_I25         =     25,  /**< Interleaved 2 of 5. @since 0.4 */
++    ZBAR_DATABAR     =     34,  /**< GS1 DataBar (RSS). @since 0.11 */
++    ZBAR_DATABAR_EXP =     35,  /**< GS1 DataBar Expanded. @since 0.11 */
+     ZBAR_CODE39      =     39,  /**< Code 39. @since 0.4 */
+     ZBAR_PDF417      =     57,  /**< PDF417. @since 0.6 */
+     ZBAR_QRCODE      =     64,  /**< QR Code. @since 0.10 */
++    ZBAR_CODE93      =     93,  /**< Code 93. @since 0.11 */
+     ZBAR_CODE128     =    128,  /**< Code 128 */
+     ZBAR_SYMBOL      = 0x00ff,  /**< mask for base symbol type */
+     ZBAR_ADDON2      = 0x0200,  /**< 2-digit add-on flag */
+@@ -103,6 +106,17 @@ typedef enum zbar_symbol_type_e {
+     ZBAR_ADDON       = 0x0700,  /**< add-on flag mask */
+ } zbar_symbol_type_t;
+ 
++/** decoded symbol coarse orientation.
++ * @since 0.11
++ */
++typedef enum zbar_orientation_e {
++    ZBAR_ORIENT_UNKNOWN = -1,   /**< unable to determine orientation */
++    ZBAR_ORIENT_UP,             /**< upright, read left to right */
++    ZBAR_ORIENT_RIGHT,          /**< sideways, read top to bottom */
++    ZBAR_ORIENT_DOWN,           /**< upside-down, read right to left */
++    ZBAR_ORIENT_LEFT,           /**< sideways, read bottom to top */
++} zbar_orientation_t;
++
+ /** error codes. */
+ typedef enum zbar_error_e {
+     ZBAR_OK = 0,                /**< no error */
+@@ -133,12 +147,33 @@ typedef enum zbar_config_e {
+     ZBAR_CFG_MIN_LEN = 0x20,    /**< minimum data length for valid decode */
+     ZBAR_CFG_MAX_LEN,           /**< maximum data length for valid decode */
+ 
++    ZBAR_CFG_UNCERTAINTY = 0x40,/**< required video consistency frames */
++
+     ZBAR_CFG_POSITION = 0x80,   /**< enable scanner to collect position data */
+ 
+     ZBAR_CFG_X_DENSITY = 0x100, /**< image scanner vertical scan density */
+     ZBAR_CFG_Y_DENSITY,         /**< image scanner horizontal scan density */
+ } zbar_config_t;
+ 
++/** decoder symbology modifier flags.
++ * @since 0.11
++ */
++typedef enum zbar_modifier_e {
++    /** barcode tagged as GS1 (EAN.UCC) reserved
++     * (eg, FNC1 before first data character).
++     * data may be parsed as a sequence of GS1 AIs
++     */
++    ZBAR_MOD_GS1 = 0,
++
++    /** barcode tagged as AIM reserved
++     * (eg, FNC1 after first character or digit pair)
++     */
++    ZBAR_MOD_AIM,
++
++    /** number of modifiers */
++    ZBAR_MOD_NUM,
++} zbar_modifier_t;
++
+ /** retrieve runtime library version information.
+  * @param major set to the running major version (unless NULL)
+  * @param minor set to the running minor version (unless NULL)
+@@ -171,6 +206,28 @@ extern const char *zbar_get_symbol_name(
+  */
+ extern const char *zbar_get_addon_name(zbar_symbol_type_t sym);
+ 
++/** retrieve string name for configuration setting.
++ * @param config setting to name
++ * @returns static string name for config,
++ * or the empty string if value is not a known config
++ */
++extern const char *zbar_get_config_name(zbar_config_t config);
++
++/** retrieve string name for modifier.
++ * @param modifier flag to name
++ * @returns static string name for modifier,
++ * or the empty string if the value is not a known flag
++ */
++extern const char *zbar_get_modifier_name(zbar_modifier_t modifier);
++
++/** retrieve string name for orientation.
++ * @param orientation orientation encoding
++ * @returns the static string name for the specified orientation,
++ * or "UNKNOWN" if the orientation is not recognized
++ * @since 0.11
++ */
++extern const char *zbar_get_orientation_name(zbar_orientation_t orientation);
++
+ /** parse a configuration string of the form "[symbology.]config[=value]".
+  * the config must match one of the recognized names.
+  * the symbology, if present, must match one of the recognized names.
+@@ -184,6 +241,30 @@ extern int zbar_parse_config(const char 
+                              zbar_config_t *config,
+                              int *value);
+ 
++/** consistently compute fourcc values across architectures
++ * (adapted from v4l2 specification)
++ * @since 0.11
++ */
++#define zbar_fourcc(a, b, c, d)                 \
++        ((unsigned long)(a) |                   \
++         ((unsigned long)(b) << 8) |            \
++         ((unsigned long)(c) << 16) |           \
++         ((unsigned long)(d) << 24))
++
++/** parse a fourcc string into its encoded integer value.
++ * @since 0.11
++ */
++static inline unsigned long zbar_fourcc_parse (const char *format)
++{
++    unsigned long fourcc = 0;
++    if(format) {
++        int i;
++        for(i = 0; i < 4 && format[i]; i++)
++            fourcc |= ((unsigned long)format[i]) << (i * 8);
++    }
++    return(fourcc);
++}
++
+ /** @internal type unsafe error API (don't use) */
+ extern int _zbar_error_spew(const void *object,
+                             int verbosity);
+@@ -229,6 +310,20 @@ extern void zbar_symbol_ref(const zbar_s
+  */
+ extern zbar_symbol_type_t zbar_symbol_get_type(const zbar_symbol_t *symbol);
+ 
++/** retrieve symbology boolean config settings.
++ * @returns a bitmask indicating which configs were set for the detected
++ * symbology during decoding.
++ * @since 0.11
++ */
++extern unsigned int zbar_symbol_get_configs(const zbar_symbol_t *symbol);
++
++/** retrieve symbology modifier flag settings.
++ * @returns a bitmask indicating which characteristics were detected
++ * during decoding.
++ * @since 0.11
++ */
++extern unsigned int zbar_symbol_get_modifiers(const zbar_symbol_t *symbol);
++
+ /** retrieve data decoded from symbol.
+  * @returns the data string
+  */
+@@ -284,6 +379,14 @@ extern int zbar_symbol_get_loc_x(const z
+ extern int zbar_symbol_get_loc_y(const zbar_symbol_t *symbol,
+                                  unsigned index);
+ 
++/** retrieve general orientation of decoded symbol.
++ * @returns a coarse, axis-aligned indication of symbol orientation or
++ * ZBAR_ORIENT_UNKNOWN if unknown
++ * @since 0.11
++ */
++extern zbar_orientation_t
++zbar_symbol_get_orientation(const zbar_symbol_t *symbol);
++
+ /** iterate the set to which this symbol belongs (there can be only one).
+  * @returns the next symbol in the set, or
+  * @returns NULL when no more results are available
+@@ -357,6 +460,14 @@ extern int zbar_symbol_set_get_size(cons
+ extern const zbar_symbol_t*
+ zbar_symbol_set_first_symbol(const zbar_symbol_set_t *symbols);
+ 
++/** raw result iterator.
++ * @returns the first decoded symbol result in a set, *before* filtering
++ * @returns NULL if the set is empty
++ * @since 0.11
++ */
++extern const zbar_symbol_t*
++zbar_symbol_set_first_unfiltered(const zbar_symbol_set_t *symbols);
++
+ /*@}*/
+ 
+ /*------------------------------------------------------------*/
+@@ -456,6 +567,25 @@ extern unsigned zbar_image_get_width(con
+  */
+ extern unsigned zbar_image_get_height(const zbar_image_t *image);
+ 
++/** retrieve both dimensions of the image.
++ * fills in the width and height in samples
++ */
++extern void zbar_image_get_size(const zbar_image_t *image,
++                                unsigned *width,
++                                unsigned *height);
++
++/** retrieve the crop rectangle.
++ * fills in the image coordinates of the upper left corner and size
++ * of an axis-aligned rectangular area of the image that will be scanned.
++ * defaults to the full image
++ * @since 0.11
++ */
++extern void zbar_image_get_crop(const zbar_image_t *image,
++                                unsigned *x,
++                                unsigned *y,
++                                unsigned *width,
++                                unsigned *height);
++
+ /** return the image sample data.  the returned data buffer is only
+  * valid until zbar_image_destroy() is called
+  */
+@@ -505,12 +635,24 @@ extern void zbar_image_set_sequence(zbar
+                                     unsigned sequence_num);
+ 
+ /** specify the pixel size of the image.
++ * @note this also resets the crop rectangle to the full image
++ * (0, 0, width, height)
+  * @note this does not affect the data!
+  */
+ extern void zbar_image_set_size(zbar_image_t *image,
+                                 unsigned width,
+                                 unsigned height);
+ 
++/** specify a rectangular region of the image to scan.
++ * the rectangle will be clipped to the image boundaries.
++ * defaults to the full image specified by zbar_image_set_size()
++ */
++extern void zbar_image_set_crop(zbar_image_t *image,
++                                unsigned x,
++                                unsigned y,
++                                unsigned width,
++                                unsigned height);
++
+ /** specify image sample data.  when image data is no longer needed by
+  * the library the specific data cleanup handler will be called
+  * (unless NULL)
+@@ -1148,6 +1290,14 @@ static inline int zbar_decoder_parse_con
+            zbar_decoder_set_config(decoder, sym, cfg, val));
+ }
+ 
++/** retrieve symbology boolean config settings.
++ * @returns a bitmask indicating which configs are currently set for the
++ * specified symbology.
++ * @since 0.11
++ */
++extern unsigned int zbar_decoder_get_configs(const zbar_decoder_t *decoder,
++                                             zbar_symbol_type_t symbology);
++
+ /** clear all decoder state.
+  * any partial symbols are flushed
+  */
+@@ -1195,6 +1345,20 @@ zbar_decoder_get_data_length(const zbar_
+ extern zbar_symbol_type_t
+ zbar_decoder_get_type(const zbar_decoder_t *decoder);
+ 
++/** retrieve modifier flags for the last decoded symbol.
++ * @returns a bitmask indicating which characteristics were detected
++ * during decoding.
++ * @since 0.11
++ */
++extern unsigned int zbar_decoder_get_modifiers(const zbar_decoder_t *decoder);
++
++/** retrieve last decode direction.
++ * @returns 1 for forward and -1 for reverse
++ * @returns 0 if the decode direction is unknown or does not apply
++ * @since 0.11
++ */
++extern int zbar_decoder_get_direction(const zbar_decoder_t *decoder);
++
+ /** setup data handler callback.
+  * the registered function will be called by the decoder
+  * just before zbar_decode_width() returns a non-zero value.
+diff --git a/include/zbar/Decoder.h b/include/zbar/Decoder.h
+--- a/include/zbar/Decoder.h
++++ b/include/zbar/Decoder.h
+@@ -1,5 +1,5 @@
+ //------------------------------------------------------------------------
+-//  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++//  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
+ //
+ //  This file is part of the ZBar Bar Code Reader.
+ //
+@@ -149,6 +149,14 @@ class Decoder {
+         return(zbar_decoder_get_data_length(_decoder));
+     }
+ 
++    /// retrieve last decode direction.
++    /// see zbar_decoder_get_direction()
++    /// @since 0.11
++    int get_direction() const
++    {
++        return(zbar_decoder_get_direction(_decoder));
++    }
++
+     /// setup callback to handle result data.
+     void set_handler (Handler &handler)
+     {
+diff --git a/include/zbar/Image.h b/include/zbar/Image.h
+--- a/include/zbar/Image.h
++++ b/include/zbar/Image.h
+@@ -1,5 +1,5 @@
+ //------------------------------------------------------------------------
+-//  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++//  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
+ //
+ //  This file is part of the ZBar Bar Code Reader.
+ //
+@@ -67,7 +67,12 @@ public:
+         {
+             if(userdata) {
+                 Image *image = (Image*)zbar_image_get_userdata(zimg);
+-                ((Handler*)userdata)->image_callback(*image);
++                if(image)
++                    ((Handler*)userdata)->image_callback(*image);
++                else {
++                    Image tmp(zimg, 1);
++                    ((Handler*)userdata)->image_callback(tmp);
++                }
+             }
+         }
+     };
+@@ -110,6 +115,8 @@ public:
+ 
+     ~Image ()
+     {
++        set_data(NULL, 0);
++        zbar_image_set_userdata(_img, NULL);
+         zbar_image_ref(_img, -1);
+     }
+ 
+@@ -143,12 +150,7 @@ public:
+     /// see zbar_image_set_format()
+     void set_format (const std::string& format)
+     {
+-        if(format.length() != 4)
+-            throw FormatError();
+-        unsigned long fourcc = ((format[0] & 0xff) |
+-                                ((format[1] & 0xff) << 8) |
+-                                ((format[2] & 0xff) << 16) |
+-                                ((format[3] & 0xff) << 24));
++        unsigned long fourcc = zbar_fourcc_parse(format.c_str());
+         zbar_image_set_format(_img, fourcc);
+     }
+ 
+@@ -183,6 +185,15 @@ public:
+         return(zbar_image_get_height(_img));
+     }
+ 
++    /// retrieve both dimensions of the image.
++    /// see zbar_image_get_size()
++    /// @since 0.11
++    void get_size (unsigned &width,
++                   unsigned &height) const
++    {
++        zbar_image_get_size(_img, &width, &height);
++    }
++
+     /// specify the pixel size of the image.
+     /// see zbar_image_set_size()
+     void set_size (unsigned width,
+@@ -191,6 +202,26 @@ public:
+         zbar_image_set_size(_img, width, height);
+     }
+ 
++    /// retrieve the scan crop rectangle.
++    /// see zbar_image_get_crop()
++    void get_crop (unsigned &x,
++                   unsigned &y,
++                   unsigned &width,
++                   unsigned &height) const
++    {
++        zbar_image_get_crop(_img, &x, &y, &width, &height);
++    }
++
++    /// set the scan crop rectangle.
++    /// see zbar_image_set_crop()
++    void set_crop (unsigned x,
++                   unsigned y,
++                   unsigned width,
++                   unsigned height)
++    {
++        zbar_image_set_crop(_img, x, y, width, height);
++    }
++
+     /// return the image sample data.
+     /// see zbar_image_get_data()
+     const void *get_data () const
+diff --git a/include/zbar/Processor.h b/include/zbar/Processor.h
+--- a/include/zbar/Processor.h
++++ b/include/zbar/Processor.h
+@@ -1,5 +1,5 @@
+ //------------------------------------------------------------------------
+-//  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++//  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
+ //
+ //  This file is part of the ZBar Bar Code Reader.
+ //
+@@ -183,8 +183,8 @@ class Processor {
+     void force_format (std::string& input_format,
+                        std::string& output_format)
+     {
+-        unsigned long ifourcc = *(unsigned long*)input_format.c_str();
+-        unsigned long ofourcc = *(unsigned long*)output_format.c_str();
++        unsigned long ifourcc = zbar_fourcc_parse(input_format.c_str());
++        unsigned long ofourcc = zbar_fourcc_parse(output_format.c_str());
+         if(zbar_processor_force_format(_processor, ifourcc, ofourcc))
+             throw_exception(_processor);
+     }
+diff --git a/include/zbar/QZBarImage.h b/include/zbar/QZBarImage.h
+--- a/include/zbar/QZBarImage.h
++++ b/include/zbar/QZBarImage.h
+@@ -1,5 +1,5 @@
+ //------------------------------------------------------------------------
+-//  Copyright 2008-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++//  Copyright 2008-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
+ //
+ //  This file is part of the ZBar Bar Code Reader.
+ //
+@@ -53,7 +53,7 @@ public:
+         unsigned width = bpl / 4;
+         unsigned height = qimg.height();
+         set_size(width, height);
+-        set_format('B' | ('G' << 8) | ('R' << 16) | ('4' << 24));
++        set_format(zbar_fourcc('B','G','R','4'));
+         unsigned long datalen = qimg.numBytes();
+         set_data(qimg.bits(), datalen);
+ 
+diff --git a/include/zbar/Symbol.h b/include/zbar/Symbol.h
+--- a/include/zbar/Symbol.h
++++ b/include/zbar/Symbol.h
+@@ -1,5 +1,5 @@
+ //------------------------------------------------------------------------
+-//  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++//  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
+ //
+ //  This file is part of the ZBar Bar Code Reader.
+ //
+@@ -64,6 +64,21 @@ public:
+         ref(-1);
+     }
+ 
++    /// assignment.
++    SymbolSet& operator= (const SymbolSet& syms)
++    {
++        syms.ref();
++        ref(-1);
++        _syms = syms._syms;
++        return(*this);
++    }
++
++    /// truth testing.
++    bool operator! () const
++    {
++        return(!_syms || !get_size());
++    }
++
+     /// manipulate reference count.
+     void ref (int delta = 1) const
+     {
+@@ -77,7 +92,7 @@ public:
+         return(_syms);
+     }
+ 
+-    int get_size ()
++    int get_size () const
+     {
+         return((_syms) ? zbar_symbol_set_get_size(_syms) : 0);
+     }
+@@ -112,9 +127,16 @@ public:
+ 
+         /// copy constructor.
+         Point (const Point& pt)
++            : x(pt.x),
++              y(pt.y)
++        { }
++
++        /// assignment.
++        Point& operator= (const Point& pt)
+         {
+             x = pt.x;
+             y = pt.y;
++            return(*this);
+         }
+     };
+ 
+@@ -135,7 +157,7 @@ public:
+                 _index = -1;
+         }
+ 
+-        /// constructor.
++        /// copy constructor.
+         PointIterator (const PointIterator& iter)
+             : _sym(iter._sym),
+               _index(iter._index)
+@@ -149,6 +171,22 @@ public:
+             _sym->ref(-1);
+         }
+ 
++        /// assignment.
++        PointIterator& operator= (const PointIterator& iter)
++        {
++            iter._sym->ref();
++            _sym->ref(-1);
++            _sym = iter._sym;
++            _index = iter._index;
++            return(*this);
++        }
++
++        /// truth testing.
++        bool operator! () const
++        {
++            return(!_sym || _index < 0);
++        }
++
+         /// advance iterator to next Point.
+         PointIterator& operator++ ()
+         {
+@@ -161,7 +199,9 @@ public:
+         /// retrieve currently referenced Point.
+         const Point operator* () const
+         {
+-            assert(_index >= 0);
++            assert(!!*this);
++            if(!*this)
++                return(Point());
+             return(Point(zbar_symbol_get_loc_x(*_sym, _index),
+                          zbar_symbol_get_loc_y(*_sym, _index)));
+         }
+@@ -213,6 +253,32 @@ public:
+         ref(-1);
+     }
+ 
++    /// assignment.
++    Symbol& operator= (const Symbol& sym)
++    {
++        sym.ref(1);
++        ref(-1);
++        _sym = sym._sym;
++        _type = sym._type;
++        _data = sym._data;
++        return(*this);
++    }
++
++    Symbol& operator= (const zbar_symbol_t *sym)
++    {
++        if(sym)
++            zbar_symbol_ref(sym, 1);
++        ref(-1);
++        init(sym);
++        return(*this);
++    }
++
++    /// truth testing.
++    bool operator! () const
++    {
++        return(!_sym);
++    }
++
+     void ref (int delta = 1) const
+     {
+         if(_sym)
+@@ -311,6 +377,13 @@ public:
+         return((_sym) ? zbar_symbol_get_loc_y(_sym, index) : -1);
+     }
+ 
++    /// see zbar_symbol_get_orientation().
++    /// @since 0.11
++    int get_orientation () const
++    {
++        return(zbar_symbol_get_orientation(_sym));
++    }
++
+     /// see zbar_symbol_xml().
+     const std::string xml () const
+     {
+@@ -320,9 +393,6 @@ public:
+     }
+ 
+ protected:
+-
+-    friend class SymbolIterator;
+-
+     /// (re)initialize Symbol from C symbol object.
+     void init (const zbar_symbol_t *sym = NULL)
+     {
+@@ -361,7 +431,7 @@ public:
+     {
+         const zbar_symbol_set_t *zsyms = _syms;
+         if(zsyms)
+-            _sym.init(zbar_symbol_set_first_symbol(zsyms));
++            _sym = zbar_symbol_set_first_symbol(zsyms);
+     }
+ 
+     /// copy constructor.
+@@ -370,25 +440,33 @@ public:
+     {
+         const zbar_symbol_set_t *zsyms = _syms;
+         if(zsyms)
+-            _sym.init(zbar_symbol_set_first_symbol(zsyms));
++            _sym = zbar_symbol_set_first_symbol(zsyms);
+     }
+ 
+     ~SymbolIterator ()
+     {
+-        _sym.init();
++    }
++
++    /// assignment.
++    SymbolIterator& operator= (const SymbolIterator& iter)
++    {
++        _syms = iter._syms;
++        _sym = iter._sym;
++        return(*this);
++    }
++
++    bool operator! () const
++    {
++        return(!_syms || !_sym);
+     }
+ 
+     /// advance iterator to next Symbol.
+     SymbolIterator& operator++ ()
+     {
+-        const zbar_symbol_t *zsym = _sym;
+-        if(zsym)
+-            _sym.init(zbar_symbol_next(zsym));
+-        else {
+-            const zbar_symbol_set_t *zsyms = _syms;
+-            if(zsyms)
+-                _sym.init(zbar_symbol_set_first_symbol(zsyms));
+-        }
++        if(!!_sym)
++            _sym = zbar_symbol_next(_sym);
++        else if(!!_syms)
++            _sym = zbar_symbol_set_first_symbol(_syms);
+         return(*this);
+     }
+ 
+diff --git a/include/zbar/Video.h b/include/zbar/Video.h
+--- a/include/zbar/Video.h
++++ b/include/zbar/Video.h
+@@ -1,5 +1,5 @@
+ //------------------------------------------------------------------------
+-//  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++//  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
+ //
+ //  This file is part of the ZBar Bar Code Reader.
+ //
+@@ -92,7 +92,7 @@ public:
+     /// see zbar_video_init()
+     void init (std::string& format)
+     {
+-        unsigned int fourcc = *(unsigned int*)format.c_str();
++        unsigned int fourcc = zbar_fourcc_parse(format.c_str());
+         if(zbar_video_init(_video, fourcc))
+             throw_exception(_video);
+     }
+diff --git a/include/zbar/zbargtk.h b/include/zbar/zbargtk.h
+--- a/include/zbar/zbargtk.h
++++ b/include/zbar/zbargtk.h
+@@ -136,7 +136,7 @@ struct _ZBarGtkClass {
+ 
+ GType zbar_gtk_get_type(void) G_GNUC_CONST;
+ 
+-/** 
++/**
+  * zbar_gtk_new:
+  * create a new barcode reader widget instance.
+  * initially has no associated video device or image.
+@@ -189,7 +189,17 @@ void zbar_gtk_set_video_enabled(ZBarGtk 
+  */
+ gboolean zbar_gtk_get_video_opened(ZBarGtk *zbar);
+ 
+-/** 
++/** set video camera resolution.
++ * @width: width in pixels
++ * @height: height in pixels
++ *
++ * @note this call must be made before video is initialized
++ */
++void zbar_gtk_request_video_size(ZBarGtk *zbar,
++                                 int width,
++                                 int height);
++
++/**
+  * utility function to populate a zbar_image_t from a GdkPixbuf.
+  * @image: the zbar library image destination to populate
+  * @pixbuf: the GdkPixbuf source
+diff --git a/iphone/ChangeLog b/iphone/ChangeLog
+new file mode 100644
+--- /dev/null
++++ b/iphone/ChangeLog
+@@ -0,0 +1,70 @@
++version 1.0.1:
++  * hotfix broken ZBarHelpController back button
++  * 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
++  * workaround iOS 4.2 hang
++    - update to use latest SDK
++  * add support for Code 93 symbology
++
++version 1.0:
++  * update to SDK 4.1, clean out LLVM warnings
++  * fix camera simulation gesture
++
++version 0.1.2:
++  * fix missing header dependency
++  * doc enhancements
++  * force controls to front when showsZBarControls is enabled
++  * fix initial zoom crop (performance bug)
++  * workaround iPhone quartz access past image data
++
++version 0.1.1:
++  * migrate to binary iPhone SDK distribution (NB backward incompatibilities!)
++    - restructure headers
++
++version 0.1:
++  * workaround for iPhone simulator builds
++    - refactor ZBarReaderView for capture/simulator specific implementations
++    - fix tracking calculations
++    - fix captured video frame color conversion
++  * fix for poor iPhone 4 performance
++  * enable torch for iPhone 4
++  * fix iPhone circular ref bug
++  * add iPhone cache flush, change new libs to weak refs
++  * fix iPhone async ref bug
++  * enhance iPhone readertest w/more options
++  * add iPhone zoom support, integrate with crop
++  * add iPhone OS 4.0 video capture support
++    - replacement view controller for new camera reader
++    - separate view for use without controller
++    - separate capture delegate for use standalone
++    - add continuous autofocus
++  * cleanup and expose iphone help display API
++  * fixes to new iphone help display
++  * migrate iphone help display to integrated web page (NB resource updates!)
++    - allows easier customization
++    - local links open directly, external links confirm and jump out to Safari
++    - JavaScript hook for help context customization
++    - also enhanced default help (note this changes the required resources)
++    - fix to disable scanning during help overlay
++    - thanks to iafanasyev and others for detailed suggestions
++  * fix iphone custom overlay response (bug #2959617)
++    - thanks to an anonymous user for the patch!
++  * iphone widget performance tuning enhancements
++    - fix crop calculation bug in ZBarImage
++    - add properties to control pre-scan image cropping and scaling
++    - add property for scanner cache control
++    - enable some scanner density control (FIXME should be property)
++    - fix ifdef for quality control (FIXME should be property)
++    - add "sequence" mode test (not actually so useful)
++  * realtime scanning for iphone widget
++    - uses UIGetScreenImage() (NB private)
++    - ZBarImage from CGImage (instead of UIImage)
++    - add crop to scaling step
++    - expose symbol set unfiltered results
++  * iphone widget back compat updates, add basic test app
++  * add Obj-C wrapper
++  * first pass working iPhone "widget"
+diff --git a/iphone/README b/iphone/README
+new file mode 100644
+--- /dev/null
++++ b/iphone/README
+@@ -0,0 +1,59 @@
++ZBar iPhone SDK
++===============
++
++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 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.
++
++* http://zbar.sourceforge.net/iphone
++
++Installation
++------------
++
++If you are migrating from a pre-SDK source version of the library,
++first make sure you remove all of the old references to zbar.xcodeproj
++and libzbar.a and revert any related build settings.
++
++To add the SDK to an Xcode project:
++
++   1. Drag ZBarSDK into your Xcode project.
++   3. Add these system frameworks to your project:
++      * AVFoundation.framework (weak)
++      * CoreMedia.framework (weak)
++      * CoreVideo.framework (weak)
++      * QuartzCore.framework
++      * libiconv.dylib
++
++Documentation
++-------------
++
++See Documentation.html for complete SDK documentation.
++
++Examples
++--------
++
++A tutorial that walks through installing and using the SDK is
++available in the documentation.  The SDK disk image also contains the
++resulting Xcode project at Examples/ReaderSample.
++
++Examples/readertest demonstrates most of the configuration options
++available for the reader.
++
++You should be able to open and build the examples directly from the
++disk image.  If not, please copy them to your local drive and build
++from there.
++
++Copyright and License
++---------------------
++
++Licensed under the GNU Lesser General Public License, version 2.1.
++http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
++
++Copyright 2008-2010 � Jeff Brown <spadix@users.sourceforge.net> et al
++
++See the included files COPYING and LICENSE for details
+diff --git a/iphone/ZBarCVImage.h b/iphone/ZBarCVImage.h
+new file mode 100644
+--- /dev/null
++++ b/iphone/ZBarCVImage.h
+@@ -0,0 +1,43 @@
++//------------------------------------------------------------------------
++//  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
++//
++//  This file is part of the ZBar Bar Code Reader.
++//
++//  The ZBar Bar Code Reader is free software; you can redistribute it
++//  and/or modify it under the terms of the GNU Lesser Public License as
++//  published by the Free Software Foundation; either version 2.1 of
++//  the License, or (at your option) any later version.
++//
++//  The ZBar Bar Code Reader is distributed in the hope that it will be
++//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
++//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++//  GNU Lesser Public License for more details.
++//
++//  You should have received a copy of the GNU Lesser Public License
++//  along with the ZBar Bar Code Reader; if not, write to the Free
++//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++//  Boston, MA  02110-1301  USA
++//
++//  http://sourceforge.net/projects/zbar
++//------------------------------------------------------------------------
++
++#import <ZBarSDK/ZBarImage.h>
++#import <CoreVideo/CoreVideo.h>
++
++// ZBarImage referring to a CVPixelBuffer.  used internally to handle
++// asynchronous conversion to UIImage
++
++@interface ZBarCVImage
++    : ZBarImage
++{
++    CVPixelBufferRef pixelBuffer;
++    void *rgbBuffer;
++    NSInvocationOperation *conversion;
++}
++
++- (void) waitUntilConverted;
++
++@property (nonatomic) CVPixelBufferRef pixelBuffer;
++@property (nonatomic, readonly) void *rgbBuffer;
++
++@end
+diff --git a/iphone/ZBarCVImage.m b/iphone/ZBarCVImage.m
+new file mode 100644
+--- /dev/null
++++ b/iphone/ZBarCVImage.m
+@@ -0,0 +1,195 @@
++//------------------------------------------------------------------------
++//  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
++//
++//  This file is part of the ZBar Bar Code Reader.
++//
++//  The ZBar Bar Code Reader is free software; you can redistribute it
++//  and/or modify it under the terms of the GNU Lesser Public License as
++//  published by the Free Software Foundation; either version 2.1 of
++//  the License, or (at your option) any later version.
++//
++//  The ZBar Bar Code Reader is distributed in the hope that it will be
++//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
++//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++//  GNU Lesser Public License for more details.
++//
++//  You should have received a copy of the GNU Lesser Public License
++//  along with the ZBar Bar Code Reader; if not, write to the Free
++//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++//  Boston, MA  02110-1301  USA
++//
++//  http://sourceforge.net/projects/zbar
++//------------------------------------------------------------------------
++
++#import "ZBarCVImage.h"
++#define MODULE ZBarCVImage
++#import "debug.h"
++
++static NSOperationQueue *conversionQueue;
++
++static const void*
++asyncProvider_getBytePointer (void *info)
++{
++    // block until data is available
++    ZBarCVImage *image = info;
++    assert(image);
++    [image waitUntilConverted];
++    void *buf = image.rgbBuffer;
++    assert(buf);
++    return(buf);
++}
++
++static const CGDataProviderDirectCallbacks asyncProvider = {
++    .version = 0,
++    .getBytePointer = asyncProvider_getBytePointer,
++    .releaseBytePointer = NULL,
++    .getBytesAtPosition = NULL,
++    .releaseInfo = (void*)CFRelease,
++};
++
++@implementation ZBarCVImage
++
++@synthesize pixelBuffer, rgbBuffer;
++
++- (void) dealloc
++{
++    self.pixelBuffer = NULL;
++    if(rgbBuffer) {
++        free(rgbBuffer);
++        rgbBuffer = NULL;
++    }
++    [conversion release];
++    conversion = nil;
++    [super dealloc];
++}
++
++- (void) setPixelBuffer: (CVPixelBufferRef) newbuf
++{
++    CVPixelBufferRef oldbuf = pixelBuffer;
++    if(newbuf)
++        CVPixelBufferRetain(newbuf);
++    pixelBuffer = newbuf;
++    if(oldbuf)
++        CVPixelBufferRelease(oldbuf);
++}
++
++- (void) waitUntilConverted
++{
++    // operation will at least have been queued already
++    NSOperation *op = [conversion retain];
++    if(!op)
++        return;
++    [op waitUntilFinished];
++    [op release];
++}
++
++- (UIImage*) UIImageWithOrientation: (UIImageOrientation) orient
++{
++    if(!conversion && !rgbBuffer) {
++        // start format conversion in separate thread
++        NSOperationQueue *queue = conversionQueue;
++        if(!queue) {
++            queue = conversionQueue = [NSOperationQueue new];
++            queue.maxConcurrentOperationCount = 1;
++        }
++        else
++            [queue waitUntilAllOperationsAreFinished];
++
++        conversion = [[NSInvocationOperation alloc]
++                         initWithTarget: self
++                         selector: @selector(convertCVtoRGB)
++                         object: nil];
++        [queue addOperation: conversion];
++        [conversion release];
++    }
++
++    // create UIImage before converted data is available
++    CGSize size = self.size;
++    int w = size.width;
++    int h = size.height;
++
++    CGDataProviderRef datasrc =
++        CGDataProviderCreateDirect([self retain], 3 * w * h, &asyncProvider);
++    CGColorSpaceRef cs = CGColorSpaceCreateDeviceRGB();
++    CGImageRef cgimg =
++        CGImageCreate(w, h, 8, 24, 3 * w, cs,
++                      kCGBitmapByteOrderDefault, datasrc,
++                      NULL, YES, kCGRenderingIntentDefault);
++    CGColorSpaceRelease(cs);
++    CGDataProviderRelease(datasrc);
++
++    UIImage *uiimg =
++        [UIImage imageWithCGImage: cgimg
++                 scale: 1
++                 orientation: orient];
++    CGImageRelease(cgimg);
++
++    return(uiimg);
++}
++
++// convert video frame to a CGImage compatible RGB format
++// FIXME this is temporary until we can find the native way...
++- (void) convertCVtoRGB
++{
++    timer_start;
++    unsigned long format = self.format;
++    assert(format == zbar_fourcc('C','V','2','P'));
++    if(format != zbar_fourcc('C','V','2','P'))
++        return;
++
++    CVPixelBufferLockBaseAddress(pixelBuffer, kCVPixelBufferLock_ReadOnly);
++    int w = CVPixelBufferGetWidth(pixelBuffer);
++    int h = CVPixelBufferGetHeight(pixelBuffer);
++    int dy = CVPixelBufferGetBytesPerRowOfPlane(pixelBuffer, 0);
++    int duv = CVPixelBufferGetBytesPerRowOfPlane(pixelBuffer, 1);
++    uint8_t *py = CVPixelBufferGetBaseAddressOfPlane(pixelBuffer, 0);
++    uint8_t *puv = CVPixelBufferGetBaseAddressOfPlane(pixelBuffer, 1);
++    if(!py || !puv || dy < w || duv < w)
++        goto error;
++
++    int datalen = 3 * w * h;
++    // Quartz accesses some undocumented amount past allocated data?
++    // ...allocate extra to compensate
++    uint8_t *pdst = rgbBuffer = malloc(datalen + 3 * w);
++    if(!pdst)
++        goto error;
++    [self setData: rgbBuffer
++          withLength: datalen];
++
++    for(int y = 0; y < h; y++) {
++        const uint8_t *qy = py;
++        const uint8_t *quv = puv;
++        for(int x = 0; x < w; x++) {
++            int Y1 = *(qy++) - 16;
++            int Cb = *(quv) - 128;
++            int Cr = *(quv + 1) - 128;
++            Y1 *= 4769;
++            quv += (x & 1) << 1;
++            int r = (Y1 + 6537 * Cr + 2048) / 4096;
++            int g = (Y1 - 1604 * Cb - 3329 * Cr + 2048) / 4096;
++            int b = (Y1 + 8263 * Cb + 2048) / 4096;
++
++            r = (r | -!!(r >> 8)) & -((r >> 8) >= 0);
++            g = (g | -!!(g >> 8)) & -((g >> 8) >= 0);
++            b = (b | -!!(b >> 8)) & -((b >> 8) >= 0);
++
++            *(pdst++) = r;
++            *(pdst++) = g;
++            *(pdst++) = b;
++        }
++        py += dy;
++        if(y & 1)
++            puv += duv;
++    }
++
++error:
++    CVPixelBufferUnlockBaseAddress(pixelBuffer, kCVPixelBufferLock_ReadOnly);
++    zlog(@"convert time %gs", timer_elapsed(t_start, timer_now()));
++
++    // release buffer as soon as conversion is complete
++    self.pixelBuffer = NULL;
++
++    conversion = nil;
++}
++
++@end
+diff --git a/iphone/ZBarCaptureReader.m b/iphone/ZBarCaptureReader.m
+new file mode 100644
+--- /dev/null
++++ b/iphone/ZBarCaptureReader.m
+@@ -0,0 +1,355 @@
++//------------------------------------------------------------------------
++//  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
++//
++//  This file is part of the ZBar Bar Code Reader.
++//
++//  The ZBar Bar Code Reader is free software; you can redistribute it
++//  and/or modify it under the terms of the GNU Lesser Public License as
++//  published by the Free Software Foundation; either version 2.1 of
++//  the License, or (at your option) any later version.
++//
++//  The ZBar Bar Code Reader is distributed in the hope that it will be
++//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
++//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++//  GNU Lesser Public License for more details.
++//
++//  You should have received a copy of the GNU Lesser Public License
++//  along with the ZBar Bar Code Reader; if not, write to the Free
++//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++//  Boston, MA  02110-1301  USA
++//
++//  http://sourceforge.net/projects/zbar
++//------------------------------------------------------------------------
++
++#import <libkern/OSAtomic.h>
++#import <AVFoundation/AVFoundation.h>
++#import <CoreMedia/CoreMedia.h>
++#import <CoreVideo/CoreVideo.h>
++#import <ZBarSDK/ZBarCaptureReader.h>
++#import <ZBarSDK/ZBarImageScanner.h>
++#import "ZBarCVImage.h"
++
++#define MODULE ZBarCaptureReader
++#import "debug.h"
++
++@implementation ZBarCaptureReader
++
++@synthesize captureOutput, captureDelegate, scanner, scanCrop, size,
++    framesPerSecond, enableCache;
++@dynamic enableReader;
++
++- (void) initResult
++{
++    [result release];
++    result = [ZBarCVImage new];
++    result.format = [ZBarImage fourcc: @"CV2P"];
++}
++
++- (id) initWithImageScanner: (ZBarImageScanner*) _scanner
++{
++    self = [super init];
++    if(!self)
++        return(nil);
++
++    t_fps = t_frame = timer_now();
++    enableCache = YES;
++
++    scanner = [_scanner retain];
++    scanCrop = CGRectMake(0, 0, 1, 1);
++    image = [ZBarImage new];
++    image.format = [ZBarImage fourcc: @"Y800"];
++    [self initResult];
++
++    captureOutput = [AVCaptureVideoDataOutput new];
++    captureOutput.alwaysDiscardsLateVideoFrames = YES;
++
++#ifdef FIXED_8697526
++    /* iOS 4.2 introduced a bug that causes [session startRunning] to
++     * hang if the session has a preview layer and this property is
++     * specified at the output.  As this happens to be the default
++     * setting for the currently supported devices, it can be omitted
++     * without causing a functional problem (for now...).  Of course,
++     * we still have no idea what the real problem is, or how robust
++     * this is as a workaround...
++     */
++    captureOutput.videoSettings = 
++        [NSDictionary
++            dictionaryWithObject:
++                [NSNumber numberWithInt:
++                    kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange]
++            forKey: (NSString*)kCVPixelBufferPixelFormatTypeKey];
++#endif
++
++    queue = dispatch_queue_create("ZBarCaptureReader", NULL);
++    [captureOutput setSampleBufferDelegate:
++                       (id<AVCaptureVideoDataOutputSampleBufferDelegate>)self
++                   queue: queue];
++
++    return(self);
++}
++
++- (id) init
++{
++    self = [self initWithImageScanner:
++               [[ZBarImageScanner new]
++                   autorelease]];
++    if(!self)
++        return(nil);
++
++    [scanner setSymbology: 0
++             config: ZBAR_CFG_X_DENSITY
++             to: 3];
++    [scanner setSymbology: 0
++             config: ZBAR_CFG_Y_DENSITY
++             to: 3];
++    return(self);
++}
++
++- (void) dealloc
++{
++    captureDelegate = nil;
++
++    // queue continues to run after stopping (NB even after DidStopRunning!);
++    // ensure released delegate is not called. (also NB that the queue
++    // may not be null, even in this case...)
++    [captureOutput setSampleBufferDelegate: nil
++                   queue: queue];
++    [captureOutput release];
++    captureOutput = nil;
++    dispatch_release(queue);
++
++    [image release];
++    image = nil;
++    [result release];
++    result = nil;
++    [scanner release];
++    scanner = nil;
++    [super dealloc];
++}
++
++- (BOOL) enableReader
++{
++    return(!OSAtomicCompareAndSwap32Barrier(0, 0, &running));
++}
++
++- (void) setEnableReader: (BOOL) enable
++{
++    if(!enable)
++        OSAtomicAnd32OrigBarrier(0, (void*)&running);
++    else if(OSAtomicCompareAndSwap32Barrier(0, 1, &running))
++        @synchronized(scanner) {
++            scanner.enableCache = enableCache;
++        }
++}
++
++- (void) willStartRunning
++{
++    self.enableReader = YES;
++}
++
++- (void) willStopRunning
++{
++    self.enableReader = NO;
++}
++
++- (void) flushCache
++{
++    @synchronized(scanner) {
++        scanner.enableCache = enableCache;
++    }
++}
++
++- (void) setCaptureDelegate: (id<ZBarCaptureDelegate>) delegate
++{
++    @synchronized(scanner) {
++        captureDelegate = delegate;
++    }
++}
++
++- (void) cropUpdate
++{
++    @synchronized(scanner) {
++        image.crop = CGRectMake(scanCrop.origin.x * width,
++                                scanCrop.origin.y * height,
++                                scanCrop.size.width * width,
++                                scanCrop.size.height * height);
++    }
++}
++
++- (void) setScanCrop: (CGRect) crop
++{
++    if(CGRectEqualToRect(scanCrop, crop))
++        return;
++    scanCrop = crop;
++    [self cropUpdate];
++}
++
++- (void) didTrackSymbols: (ZBarSymbolSet*) syms
++{
++    [captureDelegate
++        captureReader: self
++        didTrackSymbols: syms];
++}
++
++- (void) didReadNewSymbolsFromImage: (ZBarImage*) img
++{
++    timer_start;
++    [captureDelegate
++        captureReader: self
++        didReadNewSymbolsFromImage: img];
++    OSAtomicCompareAndSwap32Barrier(2, 1, &running);
++    zlog(@"latency: delegate=%gs total=%gs",
++         timer_elapsed(t_start, timer_now()),
++         timer_elapsed(t_scan, timer_now()));
++}
++
++- (void) setFramesPerSecond: (CGFloat) fps
++{
++    framesPerSecond = fps;
++}
++
++- (void) updateFPS: (NSNumber*) val
++{
++    [self setFramesPerSecond: val.doubleValue];
++}
++
++- (void) setSize: (CGSize) _size
++{
++    size = _size;
++}
++
++- (void) updateSize: (CFDictionaryRef) val
++{
++    CGSize _size;
++    if(CGSizeMakeWithDictionaryRepresentation(val, &_size))
++        [self setSize: _size];
++}
++
++- (void)  captureOutput: (AVCaptureOutput*) output
++  didOutputSampleBuffer: (CMSampleBufferRef) samp
++         fromConnection: (AVCaptureConnection*) conn
++{
++    // queue is apparently not flushed when stopping;
++    // only process when running
++    if(!OSAtomicCompareAndSwap32Barrier(1, 1, &running))
++        return;
++
++    NSAutoreleasePool *pool = [NSAutoreleasePool new];
++    image.sequence = framecnt++;
++
++    uint64_t now = timer_now();
++    double dt = timer_elapsed(t_frame, now);
++    t_frame = now;
++    if(dt > 2) {
++        t_fps = now;
++        dt_frame = 0;
++    }
++    else if(!dt_frame)
++        dt_frame = dt;
++    dt_frame = (dt_frame + dt) / 2;
++    if(timer_elapsed(t_fps, now) >= 1) {
++        [self performSelectorOnMainThread: @selector(updateFPS:)
++              withObject: [NSNumber numberWithDouble: 1 / dt_frame]
++              waitUntilDone: NO];
++        t_fps = now;
++    }
++
++    CVImageBufferRef buf = CMSampleBufferGetImageBuffer(samp);
++    if(CMSampleBufferGetNumSamples(samp) != 1 ||
++       !CMSampleBufferIsValid(samp) ||
++       !CMSampleBufferDataIsReady(samp) ||
++       !buf) {
++        zlog(@"ERROR: invalid sample");
++        goto error;
++    }
++
++    OSType format = CVPixelBufferGetPixelFormatType(buf);
++    int planes = CVPixelBufferGetPlaneCount(buf);
++
++    if(format != kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange ||
++       !planes) {
++        zlog(@"ERROR: invalid buffer format");
++        goto error;
++    }
++
++    int w = CVPixelBufferGetBytesPerRowOfPlane(buf, 0);
++    int h = CVPixelBufferGetHeightOfPlane(buf, 0);
++    CVReturn rc =
++        CVPixelBufferLockBaseAddress(buf, kCVPixelBufferLock_ReadOnly);
++    if(!w || !h || rc) {
++        zlog(@"ERROR: invalid buffer data");
++        goto error;
++    }
++
++    void *data = CVPixelBufferGetBaseAddressOfPlane(buf, 0);
++    if(data) {
++        [image setData: data
++               withLength: w * h];
++
++        BOOL doTrack = NO;
++        int ngood = 0;
++        ZBarSymbolSet *syms = nil;
++        @synchronized(scanner) {
++            if(width != w || height != h) {
++                width = w;
++                height = h;
++                CGSize _size = CGSizeMake(w, h);
++                CFDictionaryRef sized =
++                    CGSizeCreateDictionaryRepresentation(_size);
++                if(sized) {
++                    [self performSelectorOnMainThread: @selector(updateSize:)
++                          withObject: (id)sized
++                          waitUntilDone: NO];
++                    CFRelease(sized);
++                }
++                image.size = _size;
++                [self cropUpdate];
++            }
++
++            ngood = [scanner scanImage: image];
++            syms = scanner.results;
++            doTrack = [captureDelegate respondsToSelector:
++                          @selector(captureReader:didTrackSymbols:)];
++        }
++        now = timer_now();
++
++        if(ngood >= 0) {
++            // return unfiltered results for tracking feedback
++            syms.filterSymbols = NO;
++            int nraw = syms.count;
++            if(nraw > 0)
++                zlog(@"scan image: %dx%d crop=%@ ngood=%d nraw=%d",
++                     w, h, NSStringFromCGRect(image.crop), ngood, nraw);
++
++            if(ngood) {
++                // copy image data so we can release the buffer
++                result.size = CGSizeMake(w, h);
++                result.pixelBuffer = buf;
++                result.symbols = syms;
++                t_scan = now;
++                OSAtomicCompareAndSwap32Barrier(1, 2, &running);
++                [self performSelectorOnMainThread:
++                          @selector(didReadNewSymbolsFromImage:)
++                      withObject: result
++                      waitUntilDone: NO];
++                [self initResult];
++            }
++
++            if(nraw && doTrack)
++                [self performSelectorOnMainThread:
++                          @selector(didTrackSymbols:)
++                      withObject: syms
++                      waitUntilDone: NO];
++        }
++        [image setData: NULL
++               withLength: 0];
++    }
++    else
++        zlog(@"ERROR: invalid data");
++    CVPixelBufferUnlockBaseAddress(buf, kCVPixelBufferLock_ReadOnly);
++
++ error:
++    [pool release];
++}
++
++@end
+diff --git a/iphone/ZBarHelpController.m b/iphone/ZBarHelpController.m
+new file mode 100644
+--- /dev/null
++++ b/iphone/ZBarHelpController.m
+@@ -0,0 +1,271 @@
++//------------------------------------------------------------------------
++//  Copyright 2009-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
++//
++//  This file is part of the ZBar Bar Code Reader.
++//
++//  The ZBar Bar Code Reader is free software; you can redistribute it
++//  and/or modify it under the terms of the GNU Lesser Public License as
++//  published by the Free Software Foundation; either version 2.1 of
++//  the License, or (at your option) any later version.
++//
++//  The ZBar Bar Code Reader is distributed in the hope that it will be
++//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
++//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++//  GNU Lesser Public License for more details.
++//
++//  You should have received a copy of the GNU Lesser Public License
++//  along with the ZBar Bar Code Reader; if not, write to the Free
++//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++//  Boston, MA  02110-1301  USA
++//
++//  http://sourceforge.net/projects/zbar
++//------------------------------------------------------------------------
++
++#import <ZBarSDK/ZBarHelpController.h>
++
++@implementation ZBarHelpController
++
++@synthesize delegate;
++
++- (id) initWithReason: (NSString*) _reason
++{
++    self = [super init];
++    if(!self)
++        return(nil);
++
++    if(!_reason)
++        _reason = @"INFO";
++    reason = [_reason retain];
++    orientations = ((1 << UIInterfaceOrientationPortrait) |
++                    (1 << UIInterfaceOrientationPortraitUpsideDown) |
++                    (1 << UIInterfaceOrientationLandscapeLeft) |
++                    (1 << UIInterfaceOrientationLandscapeRight));
++
++    return(self);
++}
++
++- (id) init
++{
++    return([self initWithReason: nil]);
++}
++
++- (void) cleanup
++{
++    [toolbar release];
++    toolbar = nil;
++    [webView release];
++    webView = nil;
++    [doneBtn release];
++    doneBtn = nil;
++    [backBtn release];
++    backBtn = nil;
++    [space release];
++    space = nil;
++}
++
++- (void) dealloc
++{
++    [self cleanup];
++    [reason release];
++    reason = nil;
++    [linkURL release];
++    linkURL = nil;
++    [super dealloc];
++}
++
++- (void) layoutSubviewsForOrientation: (UIInterfaceOrientation) orient
++{
++    CGFloat h;
++    if(orient == UIInterfaceOrientationPortrait ||
++       orient == UIInterfaceOrientationPortraitUpsideDown)
++        h = 44;
++    else
++        h = 32;
++    CGRect r = self.view.bounds;
++    r.origin.y += r.size.height - h;
++    r.size.height = h;
++    toolbar.frame = r;
++
++    r = self.view.bounds;
++    r.size.height -= h;
++    webView.frame = r;
++}
++
++- (void) viewDidLoad
++{
++    [super viewDidLoad];
++
++    UIView *view = self.view;
++    view.backgroundColor = [UIColor colorWithWhite: .125f
++                                    alpha: 1];
++    view.autoresizingMask = (UIViewAutoresizingFlexibleWidth |
++                             UIViewAutoresizingFlexibleHeight);
++
++    webView = [UIWebView new];
++    webView.delegate = self;
++    webView.backgroundColor = [UIColor colorWithWhite: .125f
++                                       alpha: 1 ];
++    webView.autoresizingMask = (UIViewAutoresizingFlexibleWidth |
++                                UIViewAutoresizingFlexibleHeight);
++
++    toolbar = [UIToolbar new];
++    toolbar.barStyle = UIBarStyleBlackOpaque;
++    toolbar.autoresizingMask = (UIViewAutoresizingFlexibleWidth |
++                                UIViewAutoresizingFlexibleTopMargin);
++
++    doneBtn = [[UIBarButtonItem alloc]
++                  initWithBarButtonSystemItem: UIBarButtonSystemItemDone
++                  target: self
++                  action: @selector(dismiss)];
++
++    backBtn = [[UIBarButtonItem alloc]
++                  initWithImage: [UIImage imageNamed: @"zbar-back.png"]
++                  style: UIBarButtonItemStylePlain
++                  target: webView
++                  action: @selector(goBack)];
++
++    space = [[UIBarButtonItem alloc]
++                initWithBarButtonSystemItem:
++                    UIBarButtonSystemItemFlexibleSpace
++                target: nil
++                action: nil];
++
++    toolbar.items = [NSArray arrayWithObjects: space, doneBtn, nil];
++
++    [view addSubview: toolbar];
++
++    UIInterfaceOrientation orient = self.interfaceOrientation;
++    if(!((orientations >> orient) & 1))
++        for(orient = UIInterfaceOrientationPortrait;
++            (orientations >> orient) && !((orientations >> orient) & 1);
++            orient++);
++    [self layoutSubviewsForOrientation: orient];
++
++    NSString *path = [[NSBundle mainBundle]
++                         pathForResource: @"zbar-help"
++                         ofType: @"html"];
++
++    NSURLRequest *req = nil;
++    if(path) {
++        NSURL *url = [NSURL fileURLWithPath: path
++                            isDirectory: NO];
++        if(url)
++            req = [NSURLRequest requestWithURL: url];
++    }
++    if(req)
++        [webView loadRequest: req];
++    else
++        NSLog(@"ERROR: unable to load zbar-help.html from bundle");
++}
++
++- (void) viewDidUnload
++{
++    [self cleanup];
++    [super viewDidUnload];
++}
++
++- (void) viewWillAppear: (BOOL) animated
++{
++    assert(webView);
++    if(webView.loading)
++        [webView removeFromSuperview];
++    [super viewWillAppear: animated];
++}
++
++- (void) viewWillDisappear: (BOOL) animated
++{
++    [webView stopLoading];
++    webView.delegate = nil;
++    [super viewWillDisappear: animated];
++}
++
++- (BOOL) shouldAutorotateToInterfaceOrientation: (UIInterfaceOrientation) orient
++{
++    return([self isInterfaceOrientationSupported: orient]);
++}
++
++- (void) willAnimateRotationToInterfaceOrientation: (UIInterfaceOrientation) orient
++                                          duration: (NSTimeInterval) duration
++{
++    [self layoutSubviewsForOrientation: orient];
++    [webView reload];
++}
++
++- (BOOL) isInterfaceOrientationSupported: (UIInterfaceOrientation) orient
++{
++    return((orientations >> orient) & 1);
++}
++
++- (void) setInterfaceOrientation: (UIInterfaceOrientation) orient
++                       supported: (BOOL) supported
++{
++    NSUInteger mask = 1 << orient;
++    if(supported)
++        orientations |= mask;
++    else
++        orientations &= ~mask;
++}
++
++- (void) dismiss
++{
++    if([delegate respondsToSelector: @selector(helpControllerDidFinish:)])
++        [delegate helpControllerDidFinish: self];
++    else
++        [self dismissModalViewControllerAnimated: YES];
++}
++
++- (void) webViewDidFinishLoad: (UIWebView*) view
++{
++    if(!view.superview) {
++        [view stringByEvaluatingJavaScriptFromString:
++            [NSString stringWithFormat:
++                @"onZBarHelp({reason:\"%@\"});", reason]];
++        [UIView beginAnimations: @"ZBarHelp"
++                context: nil];
++        [self.view addSubview: webView];
++        [UIView commitAnimations];
++    }
++
++    BOOL canGoBack = [view canGoBack];
++    NSArray *items = toolbar.items;
++    if(canGoBack != ([items objectAtIndex: 0] == backBtn)) {
++        if(canGoBack)
++            items = [NSArray arrayWithObjects: backBtn, space, doneBtn, nil];
++        else
++            items = [NSArray arrayWithObjects: space, doneBtn, nil];
++        [toolbar setItems: items
++                 animated: YES];
++    }
++}
++
++- (BOOL)             webView: (UIWebView*) view
++  shouldStartLoadWithRequest: (NSURLRequest*) req
++              navigationType: (UIWebViewNavigationType) nav
++{
++    NSURL *url = [req URL];
++    if([url isFileURL])
++        return(YES);
++
++    linkURL = [url retain];
++    UIAlertView *alert =
++        [[UIAlertView alloc]
++            initWithTitle: @"Open External Link"
++            message: @"Close this application and open link in Safari?"
++            delegate: nil
++            cancelButtonTitle: @"Cancel"
++            otherButtonTitles: @"OK", nil];
++    alert.delegate = self;
++    [alert show];
++    [alert release];
++    return(NO);
++}
++
++- (void)     alertView: (UIAlertView*) view
++  clickedButtonAtIndex: (NSInteger) idx
++{
++    if(idx)
++        [[UIApplication sharedApplication]
++            openURL: linkURL];
++}
++
++@end
+diff --git a/iphone/ZBarImage.m b/iphone/ZBarImage.m
+new file mode 100644
+--- /dev/null
++++ b/iphone/ZBarImage.m
+@@ -0,0 +1,306 @@
++//------------------------------------------------------------------------
++//  Copyright 2009-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
++//
++//  This file is part of the ZBar Bar Code Reader.
++//
++//  The ZBar Bar Code Reader is free software; you can redistribute it
++//  and/or modify it under the terms of the GNU Lesser Public License as
++//  published by the Free Software Foundation; either version 2.1 of
++//  the License, or (at your option) any later version.
++//
++//  The ZBar Bar Code Reader is distributed in the hope that it will be
++//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
++//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++//  GNU Lesser Public License for more details.
++//
++//  You should have received a copy of the GNU Lesser Public License
++//  along with the ZBar Bar Code Reader; if not, write to the Free
++//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++//  Boston, MA  02110-1301  USA
++//
++//  http://sourceforge.net/projects/zbar
++//------------------------------------------------------------------------
++
++#import <UIKit/UIKit.h>
++#import <ZBarSDK/ZBarImage.h>
++#import "debug.h"
++
++static void image_cleanup(zbar_image_t *zimg)
++{
++    ZBarImage *image = zbar_image_get_userdata(zimg);
++    [image cleanup];
++}
++
++@implementation ZBarImage
++
++@dynamic format, sequence, size, crop, data, dataLength, symbols, zbarImage,
++    UIImage;
++
+++ (unsigned long) fourcc: (NSString*) format
++{
++    return(zbar_fourcc_parse([format UTF8String]));
++}
++
++- (id) initWithImage: (zbar_image_t*) image
++{
++    if(!image) {
++        [self release];
++        return(nil);
++    }
++    if(self = [super init]) {
++        zimg = image;
++        zbar_image_ref(image, 1);
++        zbar_image_set_userdata(zimg, self);
++    }
++    return(self);
++}
++
++- (id) init
++{
++    zbar_image_t *image = zbar_image_create();
++    self = [self initWithImage: image];
++    zbar_image_ref(image, -1);
++    return(self);
++}
++
++- (void) dealloc
++{
++    if(zimg) {
++        zbar_image_ref(zimg, -1);
++        zimg = NULL;
++    }
++    [super dealloc];
++}
++
++- (id) initWithCGImage: (CGImageRef) image
++                  crop: (CGRect) crop
++                  size: (CGSize) size
++{
++    if(!(self = [self init]))
++        return(nil);
++    uint64_t t_start = timer_now();
++
++    unsigned int w = size.width + 0.5;
++    unsigned int h = size.height + 0.5;
++
++    unsigned long datalen = w * h;
++    uint8_t *raw = malloc(datalen);
++    if(!raw) {
++        [self release];
++        return(nil);
++    }
++
++    zbar_image_set_data(zimg, raw, datalen, zbar_image_free_data);
++    zbar_image_set_format(zimg, zbar_fourcc('Y','8','0','0'));
++    zbar_image_set_size(zimg, w, h);
++
++    // scale and crop simultaneously
++    CGFloat scale = size.width / crop.size.width;
++    crop.origin.x *= -scale;
++    crop.size.width = scale * (CGFloat)CGImageGetWidth(image);
++    scale = size.height / crop.size.height;
++    CGFloat height = CGImageGetHeight(image);
++    // compensate for wacky origin
++    crop.origin.y = height - crop.origin.y - crop.size.height;
++    crop.origin.y *= -scale;
++    crop.size.height = scale * height;
++
++    // generate grayscale image data
++    CGColorSpaceRef cs = CGColorSpaceCreateDeviceGray();
++    CGContextRef ctx =
++        CGBitmapContextCreate(raw, w, h, 8, w, cs, kCGImageAlphaNone);
++    CGColorSpaceRelease(cs);
++    CGContextSetAllowsAntialiasing(ctx, 0);
++
++    CGContextDrawImage(ctx, crop, image);
++
++#if 0
++    zlog(@"convert image %dx%d: crop %g,%g %gx%g size %gx%g (%dx%d)",
++         CGImageGetWidth(image), CGImageGetHeight(image),
++         crop.origin.x, crop.origin.y, crop.size.width, crop.size.height,
++         size.width, size.height, w, h);
++    CGImageRef cgdump = CGBitmapContextCreateImage(ctx);
++    UIImage *uidump = [[UIImage alloc]
++                          initWithCGImage: cgdump];
++    CGImageRelease(cgdump);
++    UIImageWriteToSavedPhotosAlbum(uidump, nil, nil, NULL);
++    [uidump release];
++#endif
++
++    CGContextRelease(ctx);
++
++    t_convert = timer_elapsed(t_start, timer_now());
++    return(self);
++}
++
++- (id) initWithCGImage: (CGImageRef) image
++                  size: (CGSize) size
++{
++    CGRect crop = CGRectMake(0, 0,
++                             CGImageGetWidth(image),
++                             CGImageGetHeight(image));
++    return([self initWithCGImage: image
++                 crop: crop
++                 size: size]);
++}
++
++- (id) initWithCGImage: (CGImageRef) image
++{
++    CGRect crop = CGRectMake(0, 0,
++                             CGImageGetWidth(image),
++                             CGImageGetHeight(image));
++    return([self initWithCGImage: image
++                 crop: crop
++                 size: crop.size]);
++}
++
++- (zbar_image_t*) image
++{
++    return(zimg);
++}
++
++- (unsigned long) format
++{
++    return(zbar_image_get_format(zimg));
++}
++
++- (void) setFormat: (unsigned long) format
++{
++    zbar_image_set_format(zimg, format);
++}
++
++- (unsigned) sequence
++{
++    return(zbar_image_get_sequence(zimg));
++}
++
++- (void) setSequence: (unsigned) seq
++{
++    zbar_image_set_sequence(zimg, seq);
++}
++
++- (CGSize) size
++{
++    unsigned w, h;
++    zbar_image_get_size(zimg, &w, &h);
++    return(CGSizeMake(w, h));
++}
++
++- (void) setSize: (CGSize) size
++{
++    zbar_image_set_size(zimg, size.width + .5, size.height + .5);
++}
++
++- (CGRect) crop
++{
++    unsigned x, y, w, h;
++    zbar_image_get_crop(zimg, &x, &y, &w, &h);
++    return(CGRectMake(x, y, w, h));
++}
++
++- (void) setCrop: (CGRect) crop
++{
++    zbar_image_set_crop(zimg, crop.origin.x + .5, crop.origin.y + .5,
++                        crop.size.width + .5, crop.size.height + .5);
++}
++
++- (ZBarSymbolSet*) symbols
++{
++    return([[[ZBarSymbolSet alloc]
++                initWithSymbolSet: zbar_image_get_symbols(zimg)]
++               autorelease]);
++}
++
++- (void) setSymbols: (ZBarSymbolSet*) symbols
++{
++    zbar_image_set_symbols(zimg, [symbols zbarSymbolSet]);
++}
++
++- (const void*) data
++{
++    return(zbar_image_get_data(zimg));
++}
++
++- (unsigned long) dataLength
++{
++    return(zbar_image_get_data_length(zimg));
++}
++
++- (void) setData: (const void*) data
++      withLength: (unsigned long) length
++{
++    zbar_image_set_data(zimg, data, length, image_cleanup);
++}
++
++- (zbar_image_t*) zbarImage
++{
++    return(zimg);
++}
++
++- (UIImage*) UIImageWithOrientation: (UIImageOrientation) orient
++{
++    unsigned long format = self.format;
++    size_t bpc, bpp;
++    switch(format)
++    {
++    case zbar_fourcc('R','G','B','3'):
++        bpc = 8;
++        bpp = 24;
++        break;
++    case zbar_fourcc('R','G','B','4'):
++        bpc = 8;
++        bpp = 32;
++        break;
++    case zbar_fourcc('R','G','B','Q'):
++        bpc = 5;
++        bpp = 16;
++        break;
++    default:
++        NSLog(@"ERROR: format %.4s(%08lx) is unsupported",
++              (char*)&format, format);
++        assert(0);
++        return(nil);
++    };
++
++    unsigned w = zbar_image_get_width(zimg);
++    unsigned h = zbar_image_get_height(zimg);
++    const void *data = zbar_image_get_data(zimg);
++    size_t datalen = zbar_image_get_data_length(zimg);
++    CGDataProviderRef datasrc =
++        CGDataProviderCreateWithData(self, data, datalen, (void*)CFRelease);
++    CGColorSpaceRef cs = CGColorSpaceCreateDeviceRGB();
++    CGImageRef cgimg =
++        CGImageCreate(w, h, bpc, bpp, ((bpp + 7) >> 3) * w, cs,
++                      kCGBitmapByteOrderDefault |
++                      kCGImageAlphaNoneSkipFirst,
++                      datasrc, NULL, YES, kCGRenderingIntentDefault);
++    CGColorSpaceRelease(cs);
++    CGDataProviderRelease(datasrc);
++
++    UIImage *uiimg =
++        [UIImage imageWithCGImage: cgimg
++                 scale: 1
++                 orientation: orient];
++    CGImageRelease(cgimg);
++    return(uiimg);
++}
++
++- (UIImage*) UIImage
++{
++    return([self UIImageWithOrientation: UIImageOrientationUp]);
++}
++
++- (void) cleanup
++{
++}
++
++#if 0
++- (ZBarImage*) convertToFormat: (unsigned long) format
++{
++    zbar_image_t *zdst = zbar_image_convert(zimg, format);
++    ZBarImage *image = ;
++    return([[[ZBarImage alloc] initWithImage: zdst] autorelease]);
++}
++#endif
++
++@end
+diff --git a/iphone/ZBarImageScanner.m b/iphone/ZBarImageScanner.m
+new file mode 100644
+--- /dev/null
++++ b/iphone/ZBarImageScanner.m
+@@ -0,0 +1,85 @@
++//------------------------------------------------------------------------
++//  Copyright 2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++//
++//  This file is part of the ZBar Bar Code Reader.
++//
++//  The ZBar Bar Code Reader is free software; you can redistribute it
++//  and/or modify it under the terms of the GNU Lesser Public License as
++//  published by the Free Software Foundation; either version 2.1 of
++//  the License, or (at your option) any later version.
++//
++//  The ZBar Bar Code Reader is distributed in the hope that it will be
++//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
++//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++//  GNU Lesser Public License for more details.
++//
++//  You should have received a copy of the GNU Lesser Public License
++//  along with the ZBar Bar Code Reader; if not, write to the Free
++//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++//  Boston, MA  02110-1301  USA
++//
++//  http://sourceforge.net/projects/zbar
++//------------------------------------------------------------------------
++
++#import <ZBarSDK/ZBarImageScanner.h>
++#import "debug.h"
++
++@implementation ZBarImageScanner
++
++@dynamic enableCache, results;
++
++- (id) init
++{
++    if(self = [super init]) {
++        scanner = zbar_image_scanner_create();
++    }
++    return(self);
++}
++
++- (void) dealloc
++{
++    if(scanner) {
++        zbar_image_scanner_destroy(scanner);
++        scanner = NULL;
++    }
++    [super dealloc];
++}
++
++- (BOOL) enableCache
++{
++    assert(0); // FIXME
++    return(NO);
++}
++
++- (void) setEnableCache: (BOOL) enable
++{
++    zbar_image_scanner_enable_cache(scanner, enable);
++}
++
++- (ZBarSymbolSet*) results
++{
++    const zbar_symbol_set_t *set = zbar_image_scanner_get_results(scanner);
++    return([[[ZBarSymbolSet alloc] initWithSymbolSet: set] autorelease]);
++}
++
++// image scanner config wrappers
++- (void) parseConfig: (NSString*) cfg
++{
++    zbar_image_scanner_parse_config(scanner, [cfg UTF8String]);
++    // FIXME throw errors
++}
++
++- (void) setSymbology: (zbar_symbol_type_t) sym
++               config: (zbar_config_t) cfg
++                   to: (int) val
++{
++    zbar_image_scanner_set_config(scanner, sym, cfg, val);
++    // FIXME throw errors
++}
++
++- (NSInteger) scanImage: (ZBarImage*) image
++{
++    return(zbar_scan_image(scanner, image.zbarImage));
++}
++
++@end
+diff --git a/iphone/ZBarReaderController.m b/iphone/ZBarReaderController.m
+new file mode 100644
+--- /dev/null
++++ b/iphone/ZBarReaderController.m
+@@ -0,0 +1,747 @@
++//------------------------------------------------------------------------
++//  Copyright 2009-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
++//
++//  This file is part of the ZBar Bar Code Reader.
++//
++//  The ZBar Bar Code Reader is free software; you can redistribute it
++//  and/or modify it under the terms of the GNU Lesser Public License as
++//  published by the Free Software Foundation; either version 2.1 of
++//  the License, or (at your option) any later version.
++//
++//  The ZBar Bar Code Reader is distributed in the hope that it will be
++//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
++//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++//  GNU Lesser Public License for more details.
++//
++//  You should have received a copy of the GNU Lesser Public License
++//  along with the ZBar Bar Code Reader; if not, write to the Free
++//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++//  Boston, MA  02110-1301  USA
++//
++//  http://sourceforge.net/projects/zbar
++//------------------------------------------------------------------------
++
++#import <ZBarSDK/ZBarReaderController.h>
++#import <ZBarSDK/ZBarHelpController.h>
++#import "debug.h"
++
++/* the use of UIGetScreenImage() may no longer be sanctioned, even
++ * though it was previously "allowed".  define this to 0 to rip it out
++ * and fall back to cameraMode=Default (manual capture)
++ */
++#ifndef USE_PRIVATE_APIS
++# define USE_PRIVATE_APIS 0
++#endif
++
++#ifndef MIN_QUALITY
++# define MIN_QUALITY 10
++#endif
++
++NSString* const ZBarReaderControllerResults = @"ZBarReaderControllerResults";
++
++#if USE_PRIVATE_APIS
++// expose undocumented API
++CF_RETURNS_RETAINED
++CGImageRef UIGetScreenImage(void);
++#endif
++
++@implementation ZBarReaderController
++
++@synthesize scanner, readerDelegate, cameraMode, scanCrop, maxScanDimension,
++    showsHelpOnFail, takesPicture, enableCache, tracksSymbols;
++@dynamic showsZBarControls;
++
++- (id) init
++{
++    if(self = [super init]) {
++        showsHelpOnFail = YES;
++        hasOverlay = showsZBarControls =
++            [self respondsToSelector: @selector(cameraOverlayView)];
++        enableCache = tracksSymbols = YES;
++        scanCrop = CGRectMake(0, 0, 1, 1);
++        maxScanDimension = 640;
++
++        scanner = [ZBarImageScanner new];
++        [scanner setSymbology: 0
++                 config: ZBAR_CFG_X_DENSITY
++                 to: 2];
++        [scanner setSymbology: 0
++                 config: ZBAR_CFG_Y_DENSITY
++                 to: 2];
++
++        if([UIImagePickerController
++               isSourceTypeAvailable: UIImagePickerControllerSourceTypeCamera])
++            self.sourceType = UIImagePickerControllerSourceTypeCamera;
++
++#if USE_PRIVATE_APIS
++        cameraMode = ZBarReaderControllerCameraModeSampling;
++#else
++        cameraMode = ZBarReaderControllerCameraModeDefault;
++#endif
++    }
++    return(self);
++}
++
++- (void) initOverlay
++{
++    CGRect bounds = self.view.bounds;
++    overlay = [[UIView alloc] initWithFrame: bounds];
++    overlay.backgroundColor = [UIColor clearColor];
++
++    CGRect r = bounds;
++    r.size.height -= 54;
++    boxView = [[UIView alloc] initWithFrame: r];
++
++    boxLayer = [CALayer new];
++    boxLayer.frame = r;
++    boxLayer.borderWidth = 1;
++    boxLayer.borderColor = [UIColor greenColor].CGColor;
++    [boxView.layer addSublayer: boxLayer];
++
++    toolbar = [UIToolbar new];
++    toolbar.barStyle = UIBarStyleBlackOpaque;
++    r.origin.y = r.size.height;
++    r.size.height = 54;
++    toolbar.frame = r;
++
++    cancelBtn = [[UIBarButtonItem alloc]
++                    initWithBarButtonSystemItem: UIBarButtonSystemItemCancel
++                    target: self
++                    action: @selector(cancel)];
++    cancelBtn.width = r.size.width / 4 - 16;
++
++    scanBtn = [[UIBarButtonItem alloc]
++                  initWithTitle: @"Scan!"
++                  style: UIBarButtonItemStyleDone
++                  target: self
++                  action: @selector(scan)];
++    scanBtn.width = r.size.width / 2 - 16;
++
++    for(int i = 0; i < 2; i++)
++        space[i] = [[UIBarButtonItem alloc]
++                       initWithBarButtonSystemItem:
++                           UIBarButtonSystemItemFlexibleSpace
++                       target: nil
++                       action: nil];
++
++    space[2] = [[UIBarButtonItem alloc]
++                    initWithBarButtonSystemItem:
++                        UIBarButtonSystemItemFixedSpace
++                    target: nil
++                    action: nil];
++    space[2].width = r.size.width / 4 - 16;
++
++    infoBtn = [[UIButton buttonWithType: UIButtonTypeInfoLight] retain];
++    r.origin.x = r.size.width - 54;
++    r.size.width = 54;
++    infoBtn.frame = r;
++    [infoBtn addTarget: self
++             action: @selector(info)
++             forControlEvents: UIControlEventTouchUpInside];
++}
++
++- (void) viewDidLoad
++{
++    [super viewDidLoad];
++    [super setDelegate: self];
++    if(hasOverlay)
++        [self initOverlay];
++}
++
++- (void) cleanup
++{
++    [overlay release];
++    overlay = nil;
++    [boxView release];
++    boxView = nil;
++    [boxLayer release];
++    boxLayer = nil;
++    [toolbar release];
++    toolbar = nil;
++    [cancelBtn release];
++    cancelBtn = nil;
++    [scanBtn release];
++    scanBtn = nil;
++    for(int i = 0; i < 3; i++) {
++        [space[i] release];
++        space[i] = nil;
++    }
++    [infoBtn release];
++    infoBtn = nil;
++    [help release];
++    help = nil;
++}
++
++- (void) viewDidUnload
++{
++    [self cleanup];
++    [super viewDidUnload];
++}
++
++- (void) dealloc
++{
++    [self cleanup];
++    [scanner release];
++    scanner = nil;
++    [super dealloc];
++}
++
++- (void) scan
++{
++    scanBtn.enabled = NO;
++    self.view.userInteractionEnabled = NO;
++    [self takePicture];
++}
++
++- (void) cancel
++{
++    [self performSelector: @selector(imagePickerControllerDidCancel:)
++          withObject: self
++          afterDelay: 0.1];
++}
++
++- (void) reenable
++{
++    scanBtn.enabled = YES;
++    self.view.userInteractionEnabled = YES;
++}
++
++- (void) initScanning
++{
++    if(hasOverlay &&
++       self.sourceType == UIImagePickerControllerSourceTypeCamera) {
++        if(showsZBarControls || ![self cameraOverlayView])
++            [self setCameraOverlayView: overlay];
++
++        UIView *activeOverlay = [self cameraOverlayView];
++
++        if(showsZBarControls) {
++            if(!toolbar.superview) {
++                [overlay addSubview: toolbar];
++                [overlay addSubview: infoBtn];
++            }
++            [self setShowsCameraControls: NO];
++        }
++        else {
++            [toolbar removeFromSuperview];
++            [infoBtn removeFromSuperview];
++            if(activeOverlay == overlay)
++                [self setShowsCameraControls: YES];
++        }
++
++        self.view.userInteractionEnabled = YES;
++
++        sampling = (cameraMode == ZBarReaderControllerCameraModeSampling ||
++                    cameraMode == ZBarReaderControllerCameraModeSequence);
++
++        if(sampling) {
++            toolbar.items = [NSArray arrayWithObjects:
++                                cancelBtn, space[0], nil];
++
++            t_frame = timer_now();
++            dt_frame = 0;
++            boxLayer.opacity = 0;
++            if(boxView.superview != activeOverlay)
++                [boxView removeFromSuperview];
++            if(!boxView.superview)
++                [activeOverlay insertSubview: boxView atIndex:0];
++            scanner.enableCache = enableCache;
++
++            SEL meth = nil;
++            if(cameraMode == ZBarReaderControllerCameraModeSampling) {
++                // ensure crop rect does not include controls
++                if(scanCrop.origin.x + scanCrop.size.width > .8875)
++                    scanCrop.size.width = .8875 - scanCrop.origin.x;
++
++                meth = @selector(scanScreen);
++            }
++            else
++                meth = @selector(takePicture);
++
++            [self performSelector: meth
++                  withObject: nil
++                  afterDelay: 2];
++#ifdef DEBUG_OBJC
++            [self performSelector: @selector(dumpFPS)
++                  withObject: nil
++                  afterDelay: 4];
++#endif
++        }
++        else {
++            scanBtn.enabled = NO;
++            toolbar.items = [NSArray arrayWithObjects:
++                        cancelBtn, space[0], scanBtn, space[1], space[2], nil];
++
++            [self performSelector: @selector(reenable)
++                  withObject: nil
++                  afterDelay: .5];
++
++            [boxView removeFromSuperview];
++        }
++    }
++}
++
++- (void) viewWillAppear: (BOOL) animated
++{
++    [self initScanning];
++    [super viewWillAppear: animated];
++}
++
++- (void) viewWillDisappear: (BOOL) animated
++{
++    sampling = NO;
++    scanner.enableCache = NO;
++    [super viewWillDisappear: animated];
++}
++
++- (BOOL) showsZBarControls
++{
++    return(showsZBarControls);
++}
++
++- (void) setCameraMode: (ZBarReaderControllerCameraMode) mode
++{
++#if !USE_PRIVATE_APIS
++    if(mode == ZBarReaderControllerCameraModeSampling)
++        [NSException raise: NSInvalidArgumentException
++            format: @"ZBarReaderController cannot set cameraMode=Sampling"
++                    @" when USE_PRIVATE_APIS=0"];
++#endif
++    cameraMode = mode;
++}
++
++- (void) setShowsZBarControls: (BOOL) show
++{
++    if(show && !hasOverlay)
++        [NSException raise: NSInvalidArgumentException
++            format: @"ZBarReaderController cannot set showsZBarControls=YES for OS<3.1"];
++
++    showsZBarControls = show;
++}
++
++// intercept delegate as readerDelegate
++
++- (void) setDelegate: (id <UINavigationControllerDelegate,
++                           UIImagePickerControllerDelegate>) delegate
++{
++    self.readerDelegate = (id <ZBarReaderDelegate>)delegate;
++}
++
++
++#ifdef DEBUG_OBJC
++- (void) dumpFPS
++{
++    if(!sampling)
++        return;
++    [self performSelector: @selector(dumpFPS)
++          withObject: nil
++          afterDelay: 2];
++    zlog(@"fps=%g", 1 / dt_frame);
++}
++#endif
++
++- (NSInteger) scanImage: (CGImageRef) image
++            withScaling: (CGFloat) scale
++{
++    uint64_t now = timer_now();
++    if(dt_frame)
++        dt_frame = (dt_frame + timer_elapsed(t_frame, now)) / 2;
++    else
++        dt_frame = timer_elapsed(t_frame, now);
++    t_frame = now;
++
++    int w = CGImageGetWidth(image);
++    int h = CGImageGetHeight(image);
++    CGRect crop;
++    if(w >= h)
++        crop = CGRectMake(scanCrop.origin.x * w, scanCrop.origin.y * h,
++                          scanCrop.size.width * w, scanCrop.size.height * h);
++    else
++        crop = CGRectMake(scanCrop.origin.y * w, scanCrop.origin.x * h,
++                          scanCrop.size.height * w, scanCrop.size.width * h);
++
++    CGSize size;
++    if(crop.size.width >= crop.size.height &&
++       crop.size.width > maxScanDimension)
++        size = CGSizeMake(maxScanDimension,
++                          crop.size.height * maxScanDimension / crop.size.width);
++    else if(crop.size.height > maxScanDimension)
++        size = CGSizeMake(crop.size.width * maxScanDimension / crop.size.height,
++                          maxScanDimension);
++    else
++        size = crop.size;
++
++    if(scale) {
++        size.width *= scale;
++        size.height *= scale;
++    }
++
++    if(self.sourceType != UIImagePickerControllerSourceTypeCamera ||
++       cameraMode == ZBarReaderControllerCameraModeDefault) {
++        // limit the maximum number of scan passes
++        int density;
++        if(size.width > 720)
++            density = (size.width / 240 + 1) / 2;
++        else
++            density = 1;
++        [scanner setSymbology: 0
++                 config: ZBAR_CFG_X_DENSITY
++                 to: density];
++
++        if(size.height > 720)
++            density = (size.height / 240 + 1) / 2;
++        else
++            density = 1;
++        [scanner setSymbology: 0
++                 config: ZBAR_CFG_Y_DENSITY
++                 to: density];
++    }
++
++    ZBarImage *zimg = [[ZBarImage alloc]
++                          initWithCGImage: image
++                          crop: crop
++                          size: size];
++    int nsyms = [scanner scanImage: zimg];
++    [zimg release];
++
++    return(nsyms);
++}
++
++- (ZBarSymbol*) extractBestResult: (BOOL) filter
++{
++    ZBarSymbol *sym = nil;
++    ZBarSymbolSet *results = scanner.results;
++    results.filterSymbols = filter;
++    for(ZBarSymbol *s in results)
++        if(!sym || sym.quality < s.quality)
++            sym = s;
++    return(sym);
++}
++
++- (void) updateBox: (ZBarSymbol*) sym
++         imageSize: (CGSize) size
++{
++    [CATransaction begin];
++    [CATransaction setAnimationDuration: .3];
++    [CATransaction setAnimationTimingFunction:
++        [CAMediaTimingFunction functionWithName:
++            kCAMediaTimingFunctionLinear]];
++
++    CGFloat alpha = boxLayer.opacity;
++    if(sym) {
++        CGRect r = sym.bounds;
++        if(r.size.width > 16 && r.size.height > 16) {
++            r.origin.x += scanCrop.origin.y * size.width;
++            r.origin.y += scanCrop.origin.x * size.height;
++            r = CGRectInset(r, -16, -16);
++            if(alpha > .25) {
++                CGRect frame = boxLayer.frame;
++                r.origin.x = (r.origin.x * 3 + frame.origin.x) / 4;
++                r.origin.y = (r.origin.y * 3 + frame.origin.y) / 4;
++                r.size.width = (r.size.width * 3 + frame.size.width) / 4;
++                r.size.height = (r.size.height * 3 + frame.size.height) / 4;
++            }
++            boxLayer.frame = r;
++            boxLayer.opacity = 1;
++        }
++    }
++    else {
++        if(alpha > .1)
++            boxLayer.opacity = alpha / 2;
++        else if(alpha)
++            boxLayer.opacity = 0;
++    }
++    [CATransaction commit];
++}
++
++#if USE_PRIVATE_APIS
++
++- (void) scanScreen
++{
++    if(!sampling)
++        return;
++
++    // FIXME ugly hack: use private API to sample screen
++    CGImageRef image = UIGetScreenImage();
++
++    [self scanImage: image
++          withScaling: 0];
++    CGSize size = CGSizeMake(CGImageGetWidth(image), CGImageGetHeight(image));
++    CGImageRelease(image);
++
++    ZBarSymbol *sym = [self extractBestResult: NO];
++
++    if(sym && !sym.count) {
++        SEL cb = @selector(imagePickerController:didFinishPickingMediaWithInfo:);
++        if(takesPicture) {
++            symbol = [sym retain];
++            [self takePicture];
++        }
++        else if([readerDelegate respondsToSelector: cb]) {
++            symbol = [sym retain];
++
++            [CATransaction begin];
++            [CATransaction setDisableActions: YES];
++            boxLayer.opacity = 0;
++            [CATransaction commit];
++
++            // capture preview image and send to delegate
++            // after box has been hidden
++            [self performSelector: @selector(captureScreen)
++                  withObject: nil
++                  afterDelay: 0.001];
++            return;
++        }
++    }
++
++    // reschedule
++    [self performSelector: @selector(scanScreen)
++          withObject: nil
++          afterDelay: 0.001];
++
++    if(tracksSymbols)
++        [self updateBox: sym
++              imageSize: size];
++}
++
++- (void) captureScreen
++{
++    CGImageRef screen = UIGetScreenImage();
++
++    CGRect r = CGRectMake(0, 0,
++                          CGImageGetWidth(screen), CGImageGetHeight(screen));
++    if(r.size.width > r.size.height)
++        r.size.width -= 54;
++    else
++        r.size.height -= 54;
++    CGImageRef preview = CGImageCreateWithImageInRect(screen, r);
++    CGImageRelease(screen);
++
++    UIImage *image = [UIImage imageWithCGImage: preview];
++    CGImageRelease(preview);
++
++    [readerDelegate
++        imagePickerController: self
++        didFinishPickingMediaWithInfo:
++            [NSDictionary dictionaryWithObjectsAndKeys:
++                image, UIImagePickerControllerOriginalImage,
++                [NSArray arrayWithObject: symbol],
++                    ZBarReaderControllerResults,
++                nil]];
++    [symbol release];
++    symbol = nil;
++
++    // continue scanning until dismissed
++    [self performSelector: @selector(scanScreen)
++          withObject: nil
++          afterDelay: 0.001];
++}
++
++#endif /* USE_PRIVATE_APIS */
++
++- (void) scanSequence: (UIImage*) image
++{
++    if(!sampling) {
++        [image release];
++        return;
++    }
++
++    int nsyms = [self scanImage: image.CGImage
++                      withScaling: 0];
++
++    ZBarSymbol *sym = nil;
++    if(nsyms)
++        [self extractBestResult: NO];
++
++    SEL cb = @selector(imagePickerController:didFinishPickingMediaWithInfo:);
++    if(sym && !sym.count &&
++       [readerDelegate respondsToSelector: cb])
++        [readerDelegate
++            imagePickerController: self
++            didFinishPickingMediaWithInfo:
++                [NSDictionary dictionaryWithObjectsAndKeys:
++                    image, UIImagePickerControllerOriginalImage,
++                    [NSArray arrayWithObject: sym],
++                        ZBarReaderControllerResults,
++                    nil]];
++    CGSize size = image.size;
++    [image release];
++
++    // reschedule
++    [self performSelector: @selector(takePicture)
++          withObject: nil
++          afterDelay: 0.001];
++
++    if(tracksSymbols)
++        [self updateBox: sym
++              imageSize: size];
++}
++
++- (void) showHelpWithReason: (NSString*) reason
++{
++    if(help) {
++        [help.view removeFromSuperview];
++        [help release];
++    }
++    help = [[ZBarHelpController alloc]
++               initWithReason: reason];
++    help.delegate = (id<ZBarHelpDelegate>)self;
++
++    if(self.sourceType != UIImagePickerControllerSourceTypeCamera) {
++        [self presentModalViewController: help
++              animated: YES];
++        return;
++    }
++
++    // show help as overlay view to workaround controller bugs
++    sampling = NO;
++    scanner.enableCache = NO;
++    help.wantsFullScreenLayout = YES;
++    help.view.alpha = 0;
++
++    UIView *activeOverlay = [self cameraOverlayView];
++    help.view.frame = [activeOverlay
++                          convertRect: CGRectMake(0, 0, 320, 480)
++                          fromView: nil];
++    [activeOverlay addSubview: help.view];
++    [UIView beginAnimations: @"ZBarHelp"
++            context: nil];
++    help.view.alpha = 1;
++    [UIView commitAnimations];
++}
++
++- (void) info
++{
++    [self showHelpWithReason: @"INFO"];
++}
++
++- (void)  imagePickerController: (UIImagePickerController*) picker
++  didFinishPickingMediaWithInfo: (NSDictionary*) info
++{
++    UIImage *img = [info objectForKey: UIImagePickerControllerOriginalImage];
++
++    id results = nil;
++    if(self.sourceType == UIImagePickerControllerSourceTypeCamera &&
++       cameraMode == ZBarReaderControllerCameraModeSequence) {
++        if(sampling)
++            [self performSelector: @selector(scanSequence:)
++                  withObject: [img retain]
++                  afterDelay: 0.001];
++        return;
++    }
++    else if(!sampling)
++        results = [self scanImage: img.CGImage];
++    else {
++        results = [NSArray arrayWithObject: symbol];
++        [symbol release];
++        symbol = nil;
++    }
++
++    [self performSelector: @selector(reenable)
++         withObject: nil
++         afterDelay: .25];
++
++    if(results) {
++        NSMutableDictionary *newinfo = [info mutableCopy];
++        [newinfo setObject: results
++                 forKey: ZBarReaderControllerResults];
++        SEL cb = @selector(imagePickerController:didFinishPickingMediaWithInfo:);
++        if([readerDelegate respondsToSelector: cb])
++            [readerDelegate imagePickerController: self
++                            didFinishPickingMediaWithInfo: newinfo];
++        else
++            [self dismissModalViewControllerAnimated: YES];
++        [newinfo release];
++        return;
++    }
++
++    BOOL camera = (self.sourceType == UIImagePickerControllerSourceTypeCamera);
++    BOOL retry = !camera || (hasOverlay && ![self showsCameraControls]);
++    if(showsHelpOnFail && retry)
++        [self showHelpWithReason: @"FAIL"];
++
++    SEL cb = @selector(readerControllerDidFailToRead:withRetry:);
++    if([readerDelegate respondsToSelector: cb])
++        // assume delegate dismisses controller if necessary
++        [readerDelegate readerControllerDidFailToRead: self
++                        withRetry: retry];
++    else if(!retry)
++        // must dismiss stock controller
++        [self dismissModalViewControllerAnimated: YES];
++}
++
++- (void) imagePickerControllerDidCancel: (UIImagePickerController*) picker
++{
++    SEL cb = @selector(imagePickerControllerDidCancel:);
++    if([readerDelegate respondsToSelector: cb])
++        [readerDelegate imagePickerControllerDidCancel: self];
++    else
++        [self dismissModalViewControllerAnimated: YES];
++}
++
++// ZBarHelpDelegate
++
++- (void) helpControllerDidFinish: (ZBarHelpController*) hlp
++{
++    if(self.sourceType == UIImagePickerControllerSourceTypeCamera) {
++        [UIView beginAnimations: @"ZBarHelp"
++                context: nil];
++        hlp.view.alpha = 0;
++        [UIView commitAnimations];
++        [self initScanning];
++    }
++    else
++        [hlp dismissModalViewControllerAnimated: YES];
++}
++
++- (id <NSFastEnumeration>) scanImage: (CGImageRef) image
++{
++    timer_start;
++
++    int nsyms = [self scanImage: image
++                      withScaling: 0];
++
++    if(!nsyms &&
++       CGImageGetWidth(image) >= 640 &&
++       CGImageGetHeight(image) >= 640)
++        // make one more attempt for close up, grainy images
++        nsyms = [self scanImage: image
++                      withScaling: .5];
++
++    NSMutableArray *syms = nil;
++    if(nsyms) {
++        // quality/type filtering
++        int max_quality = MIN_QUALITY;
++        for(ZBarSymbol *sym in scanner.results) {
++            zbar_symbol_type_t type = sym.type;
++            int quality;
++            if(type == ZBAR_QRCODE)
++                quality = INT_MAX;
++            else
++                quality = sym.quality;
++
++            if(quality < max_quality) {
++                zlog(@"    type=%d quality=%d < %d\n",
++                     type, quality, max_quality);
++                continue;
++            }
++
++            if(max_quality < quality) {
++                max_quality = quality;
++                if(syms)
++                    [syms removeAllObjects];
++            }
++            zlog(@"    type=%d quality=%d\n", type, quality);
++            if(!syms)
++                syms = [NSMutableArray arrayWithCapacity: 1];
++
++            [syms addObject: sym];
++        }
++    }
++
++    zlog(@"read %d filtered symbols in %gs total\n",
++          (!syms) ? 0 : [syms count], timer_elapsed(t_start, timer_now()));
++    return(syms);
++}
++
++@end
+diff --git a/iphone/ZBarReaderView.m b/iphone/ZBarReaderView.m
+new file mode 100644
+--- /dev/null
++++ b/iphone/ZBarReaderView.m
+@@ -0,0 +1,408 @@
++//------------------------------------------------------------------------
++//  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
++//
++//  This file is part of the ZBar Bar Code Reader.
++//
++//  The ZBar Bar Code Reader is free software; you can redistribute it
++//  and/or modify it under the terms of the GNU Lesser Public License as
++//  published by the Free Software Foundation; either version 2.1 of
++//  the License, or (at your option) any later version.
++//
++//  The ZBar Bar Code Reader is distributed in the hope that it will be
++//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
++//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++//  GNU Lesser Public License for more details.
++//
++//  You should have received a copy of the GNU Lesser Public License
++//  along with the ZBar Bar Code Reader; if not, write to the Free
++//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++//  Boston, MA  02110-1301  USA
++//
++//  http://sourceforge.net/projects/zbar
++//------------------------------------------------------------------------
++
++#import <ZBarSDK/ZBarReaderView.h>
++
++#define MODULE ZBarReaderView
++#import "debug.h"
++
++// silence warning
++@interface ZBarReaderViewImpl : NSObject
++@end
++
++@implementation ZBarReaderView
++
++@synthesize readerDelegate, tracksSymbols, torchMode, showsFPS, zoom, scanCrop,
++    previewTransform;
++@dynamic scanner, allowsPinchZoom, enableCache, device, session, captureReader;
++
+++ (id) alloc
++{
++    if(self == [ZBarReaderView class]) {
++        // this is an abstract wrapper for implementation selected
++        // at compile time.  replace with concrete subclass.
++        return([ZBarReaderViewImpl alloc]);
++    }
++    return([super alloc]);
++}
++
++- (void) initSubviews
++{
++    assert(preview);
++
++    CGRect r = preview.bounds;
++    overlay = [CALayer new];
++    overlay.frame = r;
++    overlay.backgroundColor = [UIColor clearColor].CGColor;
++    [preview addSublayer: overlay];
++
++    tracking = [CALayer new];
++    tracking.frame = r;
++    tracking.opacity = 0;
++    tracking.borderWidth = 1;
++    tracking.backgroundColor = [UIColor clearColor].CGColor;
++    tracking.borderColor = [UIColor greenColor].CGColor;
++    [overlay addSublayer: tracking];
++
++    r.origin.x = 3 * r.size.width / 4;
++    r.origin.y = r.size.height - 32;
++    r.size.width = r.size.width - r.origin.x + 12;
++    r.size.height = 32 + 12;
++    fpsView = [[UIView alloc]
++                   initWithFrame: r];
++    fpsView.backgroundColor = [UIColor colorWithWhite: 0
++                                       alpha: .333];
++    fpsView.layer.cornerRadius = 12;
++    fpsView.hidden = YES;
++    [self addSubview: fpsView];
++
++    fpsLabel = [[UILabel alloc]
++                   initWithFrame: CGRectMake(0, 0,
++                                             r.size.width - 12,
++                                             r.size.height - 12)];
++    fpsLabel.backgroundColor = [UIColor clearColor];
++    fpsLabel.textColor = [UIColor colorWithRed: .333
++                                  green: .666
++                                  blue: 1
++                                  alpha: 1];
++    fpsLabel.font = [UIFont systemFontOfSize: 18];
++    fpsLabel.textAlignment = UITextAlignmentRight;
++    [fpsView addSubview: fpsLabel];
++
++    self.zoom = 1.25;
++}
++
++- (id) initWithImageScanner: (ZBarImageScanner*) scanner
++{
++    self = [super initWithFrame: CGRectMake(0, 0, 320, 426)];
++    if(!self)
++        return(nil);
++
++    self.backgroundColor = [UIColor blackColor];
++    self.contentMode = UIViewContentModeScaleAspectFill;
++    self.autoresizingMask =
++        UIViewAutoresizingFlexibleWidth |
++        UIViewAutoresizingFlexibleHeight;
++
++    tracksSymbols = YES;
++    torchMode = 2; // AVCaptureTorchModeAuto
++    scanCrop = zoomCrop = CGRectMake(0, 0, 1, 1);
++    imageScale = 1;
++    previewTransform = CGAffineTransformIdentity;
++
++    pinch = [[UIPinchGestureRecognizer alloc]
++                initWithTarget: self
++                action: @selector(handlePinch)];
++    [self addGestureRecognizer: pinch];
++
++    return(self);
++}
++
++- (id) init
++{
++    ZBarImageScanner *scanner =
++        [[ZBarImageScanner new]
++            autorelease];
++    self = [self initWithImageScanner: scanner];
++    if(!self)
++        return(nil);
++
++    [scanner setSymbology: 0
++             config: ZBAR_CFG_X_DENSITY
++             to: 3];
++    [scanner setSymbology: 0
++             config: ZBAR_CFG_Y_DENSITY
++             to: 3];
++    return(self);
++}
++
++- (void) dealloc
++{
++    [preview removeFromSuperlayer];
++    [preview release];
++    preview = nil;
++    [overlay release];
++    overlay = nil;
++    [tracking release];
++    tracking = nil;
++    [fpsLabel release];
++    fpsLabel = nil;
++    [fpsView release];
++    fpsView = nil;
++    [pinch release];
++    pinch = nil;
++    [super dealloc];
++}
++
++- (void) resetTracking
++{
++    [tracking removeAllAnimations];
++    [CATransaction begin];
++    [CATransaction setDisableActions: YES];
++    CGSize size = overlay.bounds.size;
++    CGRect crop = zoomCrop;
++    tracking.frame = CGRectMake(crop.origin.x * size.width,
++                                crop.origin.y * size.height,
++                                crop.size.width * size.width,
++                                crop.size.height * size.height);
++    tracking.opacity = 0;
++    [CATransaction commit];
++}
++
++- (void) setImageSize: (CGSize) size
++{
++    CGSize psize = preview.bounds.size;
++    CGFloat scalex = size.width / psize.height;
++    CGFloat scaley = size.height / psize.width;
++    imageScale = (scalex > scaley) ? scalex : scaley;
++
++    // match overlay to preview image
++    overlay.bounds = CGRectMake(0, 0, size.width, size.height);
++    CGFloat scale = 1 / imageScale;
++    CATransform3D xform = CATransform3DMakeRotation(M_PI / 2, 0, 0, 1);
++    overlay.transform = CATransform3DScale(xform, scale, scale, 1);
++    tracking.borderWidth = imageScale / zoom;
++
++    zlog(@"scaling: layer=%@ image=%@ scale=%g %c %g = 1/%g",
++         NSStringFromCGSize(psize), NSStringFromCGSize(size),
++         scalex, (scalex > scaley) ? '>' : '<', scaley, scale);
++    [self resetTracking];
++}
++
++- (void) cropUpdate
++{
++    CGAffineTransform xfrm =
++        CGAffineTransformMakeTranslation(.5, .5);
++    CGFloat z = 1 / zoom;
++    xfrm = CGAffineTransformScale(xfrm, z, z);
++    xfrm = CGAffineTransformTranslate(xfrm, -.5, -.5);
++    zoomCrop = CGRectApplyAffineTransform(scanCrop, xfrm);
++    [self resetTracking];
++}
++
++- (void) setScanCrop: (CGRect) r
++{
++    if(CGRectEqualToRect(scanCrop, r))
++        return;
++    scanCrop = r;
++    [self cropUpdate];
++}
++
++- (void) setTracksSymbols: (BOOL) track
++{
++    if(track == tracksSymbols)
++        return;
++    tracksSymbols = track;
++    [self resetTracking];
++}
++
++- (BOOL) allowsPinchZoom
++{
++    return(pinch.enabled);
++}
++
++- (void) setAllowsPinchZoom: (BOOL) enabled
++{
++    pinch.enabled = enabled;
++}
++
++- (void) setShowsFPS: (BOOL) show
++{
++    if(show == showsFPS)
++        return;
++    fpsView.hidden = !show;
++}
++
++- (void) setZoom: (CGFloat) z
++{
++    if(z < 1.0)
++        z = 1.0;
++    if(z > 2.0)
++        z = 2.0;
++    if(z == zoom)
++        return;
++    zoom = z;
++
++    [CATransaction begin];
++    [CATransaction setAnimationDuration: .1];
++    [CATransaction setAnimationTimingFunction:
++        [CAMediaTimingFunction functionWithName:
++            kCAMediaTimingFunctionLinear]];
++    [preview setAffineTransform:
++        CGAffineTransformScale(previewTransform, z, z)];
++    tracking.borderWidth = imageScale / zoom;
++    [CATransaction commit];
++
++    [self cropUpdate];
++}
++
++- (void) setPreviewTransform: (CGAffineTransform) xfrm
++{
++    previewTransform = xfrm;
++    [preview setAffineTransform:
++        CGAffineTransformScale(previewTransform, zoom, zoom)];
++}
++
++- (void) start
++{
++    if(started)
++        return;
++    started = YES;
++
++    [self resetTracking];
++    fpsLabel.text = @"--- fps ";
++
++    [[UIDevice currentDevice]
++        beginGeneratingDeviceOrientationNotifications];
++}
++
++- (void) stop
++{
++    if(!started)
++        return;
++    started = NO;
++
++    [[UIDevice currentDevice]
++        endGeneratingDeviceOrientationNotifications];
++}
++
++- (void) flushCache
++{
++}
++
++// UIGestureRecognizer callback
++
++- (void) handlePinch
++{
++    if(pinch.state == UIGestureRecognizerStateBegan)
++        zoom0 = zoom;
++    CGFloat z = zoom0 * pinch.scale;
++    self.zoom = z;
++
++    if((zoom < 1.5) != (z < 1.5)) {
++        int d = (z < 1.5) ? 3 : 2;
++        ZBarImageScanner *scanner = self.scanner;
++        @synchronized(scanner) {
++            [scanner setSymbology: 0
++                     config: ZBAR_CFG_X_DENSITY
++                     to: d];
++            [scanner setSymbology: 0
++                     config: ZBAR_CFG_Y_DENSITY
++                     to: d];
++        }
++    }
++}
++
++- (void) updateTracking: (CALayer*) trk
++             withSymbol: (ZBarSymbol*) sym
++{
++    if(!sym)
++        return;
++
++    CGRect r = sym.bounds;
++    if(r.size.width <= 32 && r.size.height <= 32)
++        return;
++    r = CGRectInset(r, -24, -24);
++
++    CALayer *current = trk.presentationLayer;
++    CGPoint cp = current.position;
++    CGPoint p = CGPointMake(CGRectGetMidX(r), CGRectGetMidY(r));
++    p = CGPointMake((p.x * 3 + cp.x) / 4, (p.y * 3 + cp.y) / 4);
++
++    CGRect cr = current.bounds;
++    r.origin = cr.origin;
++    r.size.width = (r.size.width * 3 + cr.size.width) / 4;
++    r.size.height = (r.size.height * 3 + cr.size.height) / 4;
++
++    CAMediaTimingFunction *linear =
++        [CAMediaTimingFunction functionWithName: kCAMediaTimingFunctionLinear];
++
++    CABasicAnimation *resize =
++        [CABasicAnimation animationWithKeyPath: @"bounds"];
++    resize.fromValue = [NSValue valueWithCGRect: cr];
++    resize.toValue = [NSValue valueWithCGRect: r];
++    resize.duration = .2;
++    resize.timingFunction = linear;
++    resize.fillMode = kCAFillModeForwards;
++    resize.removedOnCompletion = NO;
++
++    CABasicAnimation *move =
++        [CABasicAnimation animationWithKeyPath: @"position"];
++    move.fromValue = [NSValue valueWithCGPoint: cp];
++    move.toValue = [NSValue valueWithCGPoint: p];
++    move.duration = .2;
++    move.timingFunction = linear;
++    move.fillMode = kCAFillModeForwards;
++    move.removedOnCompletion = NO;
++
++    CABasicAnimation *on =
++        [CABasicAnimation animationWithKeyPath: @"opacity"];
++    on.fromValue = [NSNumber numberWithDouble: current.opacity];
++    on.toValue = [NSNumber numberWithDouble: 1];
++    on.duration = .2;
++    on.timingFunction = linear;
++    on.fillMode = kCAFillModeForwards;
++    on.removedOnCompletion = NO;
++
++    CABasicAnimation *off = nil;
++    if(!TARGET_IPHONE_SIMULATOR) {
++        off = [CABasicAnimation animationWithKeyPath: @"opacity"];
++        off.fromValue = [NSNumber numberWithDouble: 1];
++        off.toValue = [NSNumber numberWithDouble: 0];
++        off.beginTime = .5;
++        off.duration = .5;
++        off.timingFunction = linear;
++    }
++
++    CAAnimationGroup *group = [CAAnimationGroup animation];
++    group.animations = [NSArray arrayWithObjects: resize, move, on, off, nil];
++    group.duration = 1;
++    group.fillMode = kCAFillModeForwards;
++    group.removedOnCompletion = !TARGET_IPHONE_SIMULATOR;
++    [trk addAnimation: group
++         forKey: @"tracking"];
++}
++
++- (void) didTrackSymbols: (ZBarSymbolSet*) syms
++{
++    if(!tracksSymbols)
++        return;
++
++    int n = syms.count;
++    assert(n);
++    if(!n)
++        return;
++
++    ZBarSymbol *sym = nil;
++    for(ZBarSymbol *s in syms)
++        if(!sym || s.type == ZBAR_QRCODE || s.quality > sym.quality)
++            sym = s;
++    assert(sym);
++    if(!sym)
++        return;
++
++    [self updateTracking: tracking
++          withSymbol: sym];
++}
++
++@end
+diff --git a/iphone/ZBarReaderViewController.m b/iphone/ZBarReaderViewController.m
+new file mode 100644
+--- /dev/null
++++ b/iphone/ZBarReaderViewController.m
+@@ -0,0 +1,383 @@
++//------------------------------------------------------------------------
++//  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
++//
++//  This file is part of the ZBar Bar Code Reader.
++//
++//  The ZBar Bar Code Reader is free software; you can redistribute it
++//  and/or modify it under the terms of the GNU Lesser Public License as
++//  published by the Free Software Foundation; either version 2.1 of
++//  the License, or (at your option) any later version.
++//
++//  The ZBar Bar Code Reader is distributed in the hope that it will be
++//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
++//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++//  GNU Lesser Public License for more details.
++//
++//  You should have received a copy of the GNU Lesser Public License
++//  along with the ZBar Bar Code Reader; if not, write to the Free
++//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++//  Boston, MA  02110-1301  USA
++//
++//  http://sourceforge.net/projects/zbar
++//------------------------------------------------------------------------
++
++#import <ZBarSDK/ZBarReaderViewController.h>
++#import <ZBarSDK/ZBarReaderView.h>
++#import <ZBarSDK/ZBarHelpController.h>
++
++#define MODULE ZBarReaderViewController
++#import "debug.h"
++
++@implementation ZBarReaderViewController
++
++@synthesize scanner, readerDelegate, showsZBarControls, tracksSymbols,
++    enableCache, cameraOverlayView, cameraViewTransform, readerView, scanCrop;
++@dynamic sourceType, allowsEditing, allowsImageEditing, showsCameraControls,
++    showsHelpOnFail, cameraMode, takesPicture, maxScanDimension;
++
+++ (BOOL) isSourceTypeAvailable: (UIImagePickerControllerSourceType) sourceType
++{
++    if(sourceType != UIImagePickerControllerSourceTypeCamera)
++        return(NO);
++    return(TARGET_IPHONE_SIMULATOR ||
++           [UIImagePickerController isSourceTypeAvailable: sourceType]);
++}
++
++- (id) init
++{
++    if(!TARGET_IPHONE_SIMULATOR &&
++       !NSClassFromString(@"AVCaptureSession")) {
++        // fallback to old interface
++        zlog(@"Falling back to ZBarReaderController");
++        [self release];
++        return([ZBarReaderController new]);
++    }
++
++    self = [super init];
++    if(!self)
++        return(nil);
++
++    self.wantsFullScreenLayout = YES;
++
++    showsZBarControls = tracksSymbols = enableCache = YES;
++    scanCrop = CGRectMake(0, 0, 1, 1);
++    cameraViewTransform = CGAffineTransformIdentity;
++
++    // create our own scanner to store configuration,
++    // independent of whether view is loaded
++    scanner = [ZBarImageScanner new];
++    [scanner setSymbology: 0
++             config: ZBAR_CFG_X_DENSITY
++             to: 3];
++    [scanner setSymbology: 0
++             config: ZBAR_CFG_Y_DENSITY
++             to: 3];
++
++    return(self);
++}
++
++- (void) cleanup
++{
++    readerView.readerDelegate = nil;
++    [readerView release];
++    readerView = nil;
++    [controls release];
++    controls = nil;
++}
++
++- (void) dealloc
++{
++    [self cleanup];
++    [cameraOverlayView release];
++    cameraOverlayView = nil;
++    [scanner release];
++    scanner = nil;
++    [super dealloc];
++}
++
++- (void) initControls
++{
++    if(!showsZBarControls && controls) {
++        [controls removeFromSuperview];
++        [controls release];
++        controls = nil;
++    }
++    if(!showsZBarControls)
++        return;
++
++    UIView *view = self.view;
++    if(controls) {
++        assert(controls.superview == view);
++        [view bringSubviewToFront: controls];
++        return;
++    }
++
++    CGRect r = view.bounds;
++    r.origin.y = r.size.height - 54;
++    r.size.height = 54;
++    controls = [[UIView alloc]
++                   initWithFrame: r];
++    controls.backgroundColor = [UIColor blackColor];
++
++    UIToolbar *toolbar =
++        [UIToolbar new];
++    r.origin.y = 0;
++    toolbar.frame = r;
++    toolbar.barStyle = UIBarStyleBlackOpaque;
++
++    toolbar.items =
++        [NSArray arrayWithObjects:
++            [[[UIBarButtonItem alloc]
++                 initWithBarButtonSystemItem: UIBarButtonSystemItemCancel
++                 target: self
++                 action: @selector(cancel)]
++                autorelease],
++            [[[UIBarButtonItem alloc]
++                 initWithBarButtonSystemItem: UIBarButtonSystemItemFlexibleSpace
++                 target: nil
++                 action: nil]
++                autorelease],
++            nil];
++    [controls addSubview: toolbar];
++    [toolbar release];
++
++    UIButton *info =
++        [UIButton buttonWithType: UIButtonTypeInfoLight];
++    r.origin.x = r.size.width - 54;
++    r.size.width = 54;
++    info.frame = r;
++    [info addTarget: self
++             action: @selector(info)
++             forControlEvents: UIControlEventTouchUpInside];
++    [controls addSubview: info];
++
++    [view addSubview: controls];
++}
++
++- (void) initSimulator
++{
++    // simulator specific hooks
++}
++
++- (void) loadView
++{
++    self.view = [[UIView alloc]
++                    initWithFrame: CGRectMake(0, 0, 320, 480)];
++}
++
++- (void) viewDidLoad
++{
++    [super viewDidLoad];
++    UIView *view = self.view;
++    view.backgroundColor = [UIColor blackColor];
++
++    readerView = [[ZBarReaderView alloc]
++                     initWithImageScanner: scanner];
++    readerView.readerDelegate = (id<ZBarReaderViewDelegate>)self;
++    readerView.scanCrop = scanCrop;
++    readerView.previewTransform = cameraViewTransform;
++    readerView.tracksSymbols = tracksSymbols;
++    readerView.enableCache = enableCache;
++    [view addSubview: readerView];
++
++    if(cameraOverlayView) {
++        assert(!cameraOverlayView.superview);
++        [cameraOverlayView removeFromSuperview];
++        [view addSubview: cameraOverlayView];
++    }
++
++    [self initControls];
++    [self initSimulator];
++}
++
++- (void) viewDidUnload
++{
++    [cameraOverlayView removeFromSuperview];
++    [self cleanup];
++    [super viewDidUnload];
++}
++
++- (void) viewWillAppear: (BOOL) animated
++{
++    [self initControls];
++    [super viewWillAppear: animated];
++
++    [readerView start];
++
++    UIApplication *app = [UIApplication sharedApplication];
++    BOOL willHideStatusBar =
++        !didHideStatusBar && self.wantsFullScreenLayout && !app.statusBarHidden;
++    if(willHideStatusBar)
++        [app setStatusBarHidden: YES
++             withAnimation: UIStatusBarAnimationFade];
++    didHideStatusBar = didHideStatusBar || willHideStatusBar;
++}
++
++- (void) dismissModalViewControllerAnimated: (BOOL) animated
++{
++    if(didHideStatusBar) {
++        [[UIApplication sharedApplication]
++            setStatusBarHidden: NO
++            withAnimation: UIStatusBarAnimationFade];
++        didHideStatusBar = NO;
++    }
++    [super dismissModalViewControllerAnimated: animated];
++}
++
++- (void) viewWillDisappear: (BOOL) animated
++{
++    [readerView stop];
++
++    if(didHideStatusBar) {
++        [[UIApplication sharedApplication]
++            setStatusBarHidden: NO
++            withAnimation: UIStatusBarAnimationFade];
++        didHideStatusBar = NO;
++    }
++
++    [super viewWillDisappear: animated];
++}
++
++- (ZBarReaderView*) readerView
++{
++    // force view to load
++    (void)self.view;
++    assert(readerView);
++    return(readerView);
++}
++
++- (void) setTracksSymbols: (BOOL) track
++{
++    tracksSymbols = track;
++    if(readerView)
++        readerView.tracksSymbols = track;
++}
++
++- (void) setEnableCache: (BOOL) enable
++{
++    enableCache = enable;
++    if(readerView)
++        readerView.enableCache = enable;
++}
++
++- (void) setScanCrop: (CGRect) r
++{
++    scanCrop = r;
++    if(readerView)
++        readerView.scanCrop = r;
++}
++
++- (void) setCameraOverlayView: (UIView*) newview
++{
++    UIView *oldview = cameraOverlayView;
++    [oldview removeFromSuperview];
++
++    cameraOverlayView = [newview retain];
++    if([self isViewLoaded] && newview)
++        [self.view addSubview: newview];
++
++    [oldview release];
++}
++
++- (void) setCameraViewTransform: (CGAffineTransform) xfrm
++{
++    cameraViewTransform = xfrm;
++    if(readerView)
++        readerView.previewTransform = xfrm;
++}
++
++- (void) cancel
++{
++    if(!readerDelegate)
++        return;
++    SEL cb = @selector(imagePickerControllerDidCancel:);
++    if([readerDelegate respondsToSelector: cb])
++        [readerDelegate
++            imagePickerControllerDidCancel: (UIImagePickerController*)self];
++    else
++        [self dismissModalViewControllerAnimated: YES];
++}
++
++- (void) info
++{
++    [self showHelpWithReason: @"INFO"];
++}
++
++- (void) showHelpWithReason: (NSString*) reason
++{
++    ZBarHelpController *help =
++        [[ZBarHelpController alloc]
++            initWithReason: reason];
++    help.delegate = (id<ZBarHelpDelegate>)self;
++    help.wantsFullScreenLayout = YES;
++    UIView *helpView = help.view;
++    helpView.alpha = 0;
++    [self.view addSubview: helpView];
++    [UIView beginAnimations: @"ZBarHelp"
++            context: nil];
++    help.view.alpha = 1;
++    [UIView commitAnimations];
++}
++
++// ZBarHelpDelegate
++
++- (void) helpControllerDidFinish: (ZBarHelpController*) help
++{
++    [UIView beginAnimations: @"ZBarHelp"
++            context: help];
++    [UIView setAnimationDelegate: self];
++    [UIView setAnimationDidStopSelector: @selector(removeHelp:done:context:)];
++    help.view.alpha = 0;
++    [UIView commitAnimations];
++}
++
++- (void) removeHelp: (NSString*) id
++               done: (NSNumber*) done
++            context: (void*) ctx
++{
++    if([id isEqualToString: @"ZBarHelp"]) {
++        ZBarHelpController *help = ctx;
++        [help.view removeFromSuperview];
++        [help release];
++    }
++}
++
++// ZBarReaderViewDelegate
++
++- (void) readerView: (ZBarReaderView*) view
++     didReadSymbols: (ZBarSymbolSet*) syms
++          fromImage: (UIImage*) image
++{
++    [readerDelegate
++        imagePickerController: (UIImagePickerController*)self
++        didFinishPickingMediaWithInfo:
++            [NSDictionary dictionaryWithObjectsAndKeys:
++                image, UIImagePickerControllerOriginalImage,
++                syms, ZBarReaderControllerResults,
++                nil]];
++}
++
++// "deprecated" properties
++
++#define DEPRECATED_PROPERTY(getter, setter, type, val, ignore) \
++    - (type) getter                                    \
++    {                                                  \
++        return(val);                                   \
++    }                                                  \
++    - (void) setter: (type) v                          \
++    {                                                  \
++        NSAssert2(ignore || v == val,                  \
++                  @"attempt to set unsupported value (%d)" \
++                  @" for %@ property", val, @#getter); \
++    }
++
++DEPRECATED_PROPERTY(sourceType, setSourceType, UIImagePickerControllerSourceType, UIImagePickerControllerSourceTypeCamera, NO)
++DEPRECATED_PROPERTY(allowsEditing, setAllowsEditing, BOOL, NO, NO)
++DEPRECATED_PROPERTY(allowsImageEditing, setAllowsImageEditing, BOOL, NO, NO)
++DEPRECATED_PROPERTY(showsCameraControls, setShowsCameraControls, BOOL, NO, NO)
++DEPRECATED_PROPERTY(showsHelpOnFail, setShowsHelpOnFail, BOOL, NO, YES)
++DEPRECATED_PROPERTY(cameraMode, setCameraMode, ZBarReaderControllerCameraMode, ZBarReaderControllerCameraModeSampling, NO)
++DEPRECATED_PROPERTY(takesPicture, setTakesPicture, BOOL, NO, NO)
++DEPRECATED_PROPERTY(maxScanDimension, setMaxScanDimension, NSInteger, 640, YES)
++
++@end
+diff --git a/iphone/ZBarReaderViewImpl_Capture.m b/iphone/ZBarReaderViewImpl_Capture.m
+new file mode 100644
+--- /dev/null
++++ b/iphone/ZBarReaderViewImpl_Capture.m
+@@ -0,0 +1,355 @@
++//------------------------------------------------------------------------
++//  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
++//
++//  This file is part of the ZBar Bar Code Reader.
++//
++//  The ZBar Bar Code Reader is free software; you can redistribute it
++//  and/or modify it under the terms of the GNU Lesser Public License as
++//  published by the Free Software Foundation; either version 2.1 of
++//  the License, or (at your option) any later version.
++//
++//  The ZBar Bar Code Reader is distributed in the hope that it will be
++//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
++//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++//  GNU Lesser Public License for more details.
++//
++//  You should have received a copy of the GNU Lesser Public License
++//  along with the ZBar Bar Code Reader; if not, write to the Free
++//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++//  Boston, MA  02110-1301  USA
++//
++//  http://sourceforge.net/projects/zbar
++//------------------------------------------------------------------------
++
++#import <AVFoundation/AVFoundation.h>
++#import <CoreMedia/CoreMedia.h>
++#import <CoreVideo/CoreVideo.h>
++#import <ZBarSDK/ZBarReaderView.h>
++#import <ZBarSDK/ZBarCaptureReader.h>
++
++#define MODULE ZBarReaderView
++#import "debug.h"
++
++// protected APIs
++@interface ZBarReaderView()
++- (void) initSubviews;
++- (void) cropUpdate;
++- (void) setImageSize: (CGSize) size;
++- (void) didTrackSymbols: (ZBarSymbolSet*) syms;
++@end
++
++@interface ZBarReaderViewImpl
++    : ZBarReaderView
++{
++    AVCaptureSession *session;
++    AVCaptureDevice *device;
++    AVCaptureInput *input;
++    ZBarCaptureReader *captureReader;
++}
++
++@end
++
++@implementation ZBarReaderViewImpl
++
++@synthesize device, session, captureReader;
++
++- (id) initWithImageScanner: (ZBarImageScanner*) scanner
++{
++    self = [super initWithImageScanner: scanner];
++    if(!self)
++        return(nil);
++
++    session = [AVCaptureSession new];
++    NSNotificationCenter *notify =
++        [NSNotificationCenter defaultCenter];
++    [notify addObserver: self
++            selector: @selector(onVideoError:)
++            name: AVCaptureSessionRuntimeErrorNotification
++            object: session];
++    [notify addObserver: self
++            selector: @selector(onVideoStart:)
++            name: AVCaptureSessionDidStartRunningNotification
++            object: session];
++    [notify addObserver: self
++            selector: @selector(onVideoStop:)
++            name: AVCaptureSessionDidStopRunningNotification
++            object: session];
++    [notify addObserver: self
++            selector: @selector(onVideoStop:)
++            name: AVCaptureSessionWasInterruptedNotification
++            object: session];
++    [notify addObserver: self
++            selector: @selector(onVideoStart:)
++            name: AVCaptureSessionInterruptionEndedNotification
++            object: session];
++
++    self.device = [AVCaptureDevice
++                      defaultDeviceWithMediaType: AVMediaTypeVideo];
++
++    captureReader = [[ZBarCaptureReader alloc]
++                        initWithImageScanner: scanner];
++    captureReader.captureDelegate = (id<ZBarCaptureDelegate>)self;
++    [session addOutput: captureReader.captureOutput];
++
++    if([session canSetSessionPreset: AVCaptureSessionPreset640x480])
++        session.sessionPreset = AVCaptureSessionPreset640x480;
++
++    [captureReader addObserver: self
++                   forKeyPath: @"size"
++                   options: 0
++                   context: NULL];
++
++    [self initSubviews];
++    [self cropUpdate];
++    return(self);
++}
++
++- (void) initSubviews
++{
++    AVCaptureVideoPreviewLayer *videoPreview =
++        [[AVCaptureVideoPreviewLayer
++             layerWithSession: session]
++            retain];
++    videoPreview.videoGravity = AVLayerVideoGravityResizeAspectFill;
++    preview = videoPreview;
++    preview.frame = self.bounds;
++    [self.layer addSublayer: preview];
++
++    [super initSubviews];
++
++    // camera image is rotated
++    overlay.transform = CATransform3DMakeRotation(M_PI / 2, 0, 0, 1);
++}
++
++- (void) dealloc
++{
++    [[NSNotificationCenter defaultCenter]
++        removeObserver: self];
++    if(showsFPS) {
++        @try {
++            [captureReader removeObserver: self
++                           forKeyPath: @"framesPerSecond"];
++        }
++        @catch(...) { }
++    }
++    @try {
++        [captureReader removeObserver: self
++                       forKeyPath: @"size"];
++    }
++    @catch(...) { }
++    captureReader.captureDelegate = nil;
++    [captureReader release];
++    captureReader = nil;
++    [device release];
++    device = nil;
++    [input release];
++    input = nil;
++    [session release];
++    session = nil;
++    [super dealloc];
++}
++
++- (void) cropUpdate
++{
++    [super cropUpdate];
++    captureReader.scanCrop = zoomCrop;
++}
++
++- (ZBarImageScanner*) scanner
++{
++    return(captureReader.scanner);
++}
++
++- (void) setDevice: (AVCaptureDevice*) newdev
++{
++    id olddev = device;
++    AVCaptureInput *oldinput = input;
++    assert(!olddev == !oldinput);
++
++    NSError *error = nil;
++    device = [newdev retain];
++    if(device) {
++        assert([device hasMediaType: AVMediaTypeVideo]);
++        input = [[AVCaptureDeviceInput alloc]
++                    initWithDevice: newdev
++                    error: &error];
++        assert(input);
++    }
++    else
++        input = nil;
++
++    [session beginConfiguration];
++    if(oldinput)
++        [session removeInput: input];
++    if(input)
++        [session addInput: input];
++    [session commitConfiguration];
++
++    [olddev release];
++    [oldinput release];
++}
++
++- (BOOL) enableCache
++{
++    return(captureReader.enableCache);
++}
++
++- (void) setEnableCache: (BOOL) enable
++{
++    captureReader.enableCache = enable;
++}
++
++- (void) setTorchMode: (NSInteger) mode
++{
++    [super setTorchMode: mode];
++    if(running && [device isTorchModeSupported: mode])
++        @try {
++            device.torchMode = mode;
++        }
++        @catch(...) { }
++}
++
++- (void) setShowsFPS: (BOOL) show
++{
++    [super setShowsFPS: show];
++    @try {
++        if(show)
++            [captureReader addObserver: self
++                           forKeyPath: @"framesPerSecond"
++                           options: 0
++                           context: NULL];
++        else
++            [captureReader removeObserver: self
++                           forKeyPath: @"framesPerSecond"];
++    }
++    @catch(...) { }
++}
++
++- (void) start
++{
++    if(started)
++        return;
++    [super start];
++
++    [session startRunning];
++    captureReader.enableReader = YES;
++}
++
++- (void) stop
++{
++    if(!started)
++        return;
++    [super stop];
++
++    captureReader.enableReader = NO;
++    [session stopRunning];
++}
++
++- (void) flushCache
++{
++    [captureReader flushCache];
++}
++
++// AVCaptureSession notifications
++
++- (void) onVideoStart: (NSNotification*) note
++{
++    zlog(@"onVideoStart: running=%d %@", running, note);
++    if(running)
++        return;
++    running = YES;
++
++    // lock device and set focus mode
++    NSError *error = nil;
++    if([device lockForConfiguration: &error]) {
++        if([device isFocusModeSupported: AVCaptureFocusModeContinuousAutoFocus])
++            device.focusMode = AVCaptureFocusModeContinuousAutoFocus;
++        if([device isTorchModeSupported: torchMode])
++            device.torchMode = torchMode;
++    }
++    else
++        zlog(@"failed to lock device: %@", error);
++}
++
++- (void) onVideoStop: (NSNotification*) note
++{
++    zlog(@"onVideoStop: %@", note);
++    if(!running)
++        return;
++
++    [device unlockForConfiguration];
++    running = NO;
++}
++
++- (void) onVideoError: (NSNotification*) note
++{
++    zlog(@"onVideoError: %@", note);
++    if(running) {
++        // FIXME does session always stop on error?
++        running = started = NO;
++        [device unlockForConfiguration];
++    }
++    NSError *err =
++        [note.userInfo objectForKey: AVCaptureSessionErrorKey];
++    NSLog(@"ZBarReaderView: ERROR during capture: %@: %@",
++          [err localizedDescription],
++          [err localizedFailureReason]);
++}
++
++// NSKeyValueObserving
++
++- (void) observeValueForKeyPath: (NSString*) path
++                       ofObject: (id) obj
++                         change: (NSDictionary*) info
++                        context: (void*) ctx
++{
++    if(obj == captureReader &&
++       [path isEqualToString: @"size"])
++        // adjust preview to match image size
++        [self setImageSize: captureReader.size];
++    else if(obj == captureReader &&
++       [path isEqualToString: @"framesPerSecond"])
++        fpsLabel.text = [NSString stringWithFormat: @"%.2ffps ",
++                                  captureReader.framesPerSecond];
++}
++
++// ZBarCaptureDelegate
++
++- (void) captureReader: (ZBarCaptureReader*) reader
++       didTrackSymbols: (ZBarSymbolSet*) syms
++{
++    [self didTrackSymbols: syms];
++}
++
++- (void)       captureReader: (ZBarCaptureReader*) reader
++  didReadNewSymbolsFromImage: (ZBarImage*) zimg
++{
++    zlog(@"scanned %d symbols: %@", zimg.symbols.count, zimg);
++    if(!readerDelegate)
++        return;
++
++    UIImageOrientation orient;
++    switch([UIDevice currentDevice].orientation)
++    {
++    case UIDeviceOrientationPortraitUpsideDown:
++        orient = UIImageOrientationLeft;
++        break;
++    case UIDeviceOrientationLandscapeLeft:
++        orient = UIImageOrientationUp;
++        break;
++    case UIDeviceOrientationLandscapeRight:
++        orient = UIImageOrientationDown;
++        break;
++    default:
++        orient = UIImageOrientationRight;
++        break;
++    }
++
++    UIImage *uiimg = [zimg UIImageWithOrientation: orient];
++    [readerDelegate
++        readerView: self
++        didReadSymbols: zimg.symbols
++        fromImage: uiimg];
++}
++
++@end
+diff --git a/iphone/ZBarReaderViewImpl_Simulator.m b/iphone/ZBarReaderViewImpl_Simulator.m
+new file mode 100644
+--- /dev/null
++++ b/iphone/ZBarReaderViewImpl_Simulator.m
+@@ -0,0 +1,223 @@
++//------------------------------------------------------------------------
++//  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
++//
++//  This file is part of the ZBar Bar Code Reader.
++//
++//  The ZBar Bar Code Reader is free software; you can redistribute it
++//  and/or modify it under the terms of the GNU Lesser Public License as
++//  published by the Free Software Foundation; either version 2.1 of
++//  the License, or (at your option) any later version.
++//
++//  The ZBar Bar Code Reader is distributed in the hope that it will be
++//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
++//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++//  GNU Lesser Public License for more details.
++//
++//  You should have received a copy of the GNU Lesser Public License
++//  along with the ZBar Bar Code Reader; if not, write to the Free
++//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++//  Boston, MA  02110-1301  USA
++//
++//  http://sourceforge.net/projects/zbar
++//------------------------------------------------------------------------
++
++#import <ZBarSDK/ZBarReaderView.h>
++#import <ZBarSDK/ZBarReaderViewController.h>
++
++#define MODULE ZBarReaderView
++#import "debug.h"
++
++// hack around missing simulator support for AVCapture interfaces
++
++@interface ZBarReaderViewController(Simulator)
++@end
++
++@implementation ZBarReaderViewController(Simulator)
++
++- (void) initSimulator
++{
++    UILongPressGestureRecognizer *press =
++        [[UILongPressGestureRecognizer alloc]
++            initWithTarget: self
++            action: @selector(didLongPress:)];
++    [self.view addGestureRecognizer: press];
++    press.numberOfTouchesRequired = 2;
++    [press release];
++}
++
++- (void) takePicture
++{
++    UIImagePickerController *picker =
++        [UIImagePickerController new];
++    picker.delegate = (id<UINavigationControllerDelegate,
++                          UIImagePickerControllerDelegate>)self;
++    [self presentModalViewController: picker
++          animated: YES];
++    [picker release];
++}
++
++- (void) didLongPress: (UIGestureRecognizer*) press
++{
++    if(press.state == UIGestureRecognizerStateBegan)
++        [self takePicture];
++}
++
++- (void)  imagePickerController: (UIImagePickerController*) picker
++  didFinishPickingMediaWithInfo: (NSDictionary*) info
++{
++    UIImage *image = [info objectForKey: UIImagePickerControllerOriginalImage];
++    [picker dismissModalViewControllerAnimated: YES];
++    [readerView performSelector: @selector(scanImage:)
++                withObject: image
++                afterDelay: .1];
++}
++
++- (void) imagePickerControllerDidCancel: (UIImagePickerController*) picker
++{
++    [picker dismissModalViewControllerAnimated: YES];
++}
++
++@end
++
++// protected APIs
++@interface ZBarReaderView()
++- (void) initSubviews;
++- (void) setImageSize: (CGSize) size;
++- (void) didTrackSymbols: (ZBarSymbolSet*) syms;
++@end
++
++@interface ZBarReaderViewImpl
++    : ZBarReaderView
++{
++    ZBarImageScanner *scanner;
++    UIImage *scanImage;
++    CALayer *previewImage;
++    BOOL enableCache;
++}
++@end
++
++@implementation ZBarReaderViewImpl
++
++@synthesize scanner, enableCache;
++
++- (id) initWithImageScanner: (ZBarImageScanner*) _scanner
++{
++    self = [super initWithImageScanner: _scanner];
++    if(!self)
++        return(nil);
++
++    scanner = [_scanner retain];
++
++    [self initSubviews];
++    return(self);
++}
++
++- (void) initSubviews
++{
++    UILabel *label =
++        [[UILabel alloc]
++            initWithFrame: CGRectMake(16, 165, 288, 96)];
++    label.backgroundColor = [UIColor clearColor];
++    label.textColor = [UIColor whiteColor];
++    label.font = [UIFont boldSystemFontOfSize: 20];
++    label.numberOfLines = 4;
++    label.textAlignment = UITextAlignmentCenter;
++    label.text = @"Camera Simulation\n\n"
++        @"Tap and hold with two \"fingers\" to select image";
++    [self addSubview: label];
++    [label release];
++
++    preview = [CALayer new];
++    preview.frame = self.bounds;
++    [self.layer addSublayer: preview];
++
++    previewImage = [CALayer new];
++    previewImage.frame = self.bounds;
++    [preview addSublayer: previewImage];
++
++    [super initSubviews];
++}
++
++- (void) dealloc
++{
++    [scanner release];
++    scanner = nil;
++    [previewImage release];
++    previewImage = nil;
++    [super dealloc];
++}
++
++- (void) start
++{
++    if(started)
++        return;
++    [super start];
++    running = YES;
++}
++
++- (void) stop
++{
++    if(!started)
++        return;
++    [super stop];
++    running = NO;
++}
++
++- (void) scanImage: (UIImage*) image
++{
++    // strip EXIF info
++    CGImageRef cgimage = image.CGImage;
++    image = [[UIImage alloc]
++                initWithCGImage: cgimage
++                scale: 1.0
++                orientation: UIImageOrientationUp];
++
++    [self setImageSize: image.size];
++
++    [CATransaction begin];
++    [CATransaction setDisableActions: YES];
++    previewImage.contentsScale = imageScale;
++    previewImage.contentsGravity = kCAGravityCenter;
++    previewImage.transform = CATransform3DMakeRotation(M_PI_2, 0, 0, 1);
++    previewImage.contents = (id)cgimage;
++    [CATransaction commit];
++
++    ZBarImage *zimg =
++        [[ZBarImage alloc]
++            initWithCGImage: cgimage];
++
++    CGSize size = zimg.size;
++    zimg.crop = CGRectMake(zoomCrop.origin.x * size.width,
++                           zoomCrop.origin.y * size.height,
++                           zoomCrop.size.width * size.width,
++                           zoomCrop.size.height * size.height);
++
++    int nsyms = [scanner scanImage: zimg];
++    zlog(@"scan image: %@ crop=%@ nsyms=%d",
++         NSStringFromCGSize(size), NSStringFromCGRect(zimg.crop), nsyms);
++    [zimg release];
++
++    if(nsyms > 0) {
++        scanImage = [image retain];
++        ZBarSymbolSet *syms = scanner.results;
++        [self performSelector: @selector(didReadSymbols:)
++              withObject: syms
++              afterDelay: .4];
++        [self performSelector: @selector(didTrackSymbols:)
++              withObject: syms
++              afterDelay: .001];
++    }
++    [image release];
++}
++
++- (void) didReadSymbols: (ZBarSymbolSet*) syms
++{
++    [readerDelegate
++        readerView: self
++        didReadSymbols: syms
++        fromImage: scanImage];
++    [scanImage release];
++    scanImage = nil;
++}
++
++@end
+diff --git a/iphone/ZBarSymbol.m b/iphone/ZBarSymbol.m
+new file mode 100644
+--- /dev/null
++++ b/iphone/ZBarSymbol.m
+@@ -0,0 +1,197 @@
++//------------------------------------------------------------------------
++//  Copyright 2009-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
++//
++//  This file is part of the ZBar Bar Code Reader.
++//
++//  The ZBar Bar Code Reader is free software; you can redistribute it
++//  and/or modify it under the terms of the GNU Lesser Public License as
++//  published by the Free Software Foundation; either version 2.1 of
++//  the License, or (at your option) any later version.
++//
++//  The ZBar Bar Code Reader is distributed in the hope that it will be
++//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
++//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++//  GNU Lesser Public License for more details.
++//
++//  You should have received a copy of the GNU Lesser Public License
++//  along with the ZBar Bar Code Reader; if not, write to the Free
++//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++//  Boston, MA  02110-1301  USA
++//
++//  http://sourceforge.net/projects/zbar
++//------------------------------------------------------------------------
++
++#import <ZBarSDK/ZBarSymbol.h>
++
++@implementation ZBarSymbol
++
++@dynamic type, typeName, configMask, modifierMask, data, quality, count,
++    zbarSymbol;
++
+++ (NSString*) nameForType: (zbar_symbol_type_t) type
++{
++    return([NSString stringWithUTF8String: zbar_get_symbol_name(type)]);
++}
++
++- (id) initWithSymbol: (const zbar_symbol_t*) sym
++{
++    if(self = [super init]) {
++        symbol = sym;
++        zbar_symbol_ref(sym, 1);
++    }
++    return(self);
++}
++
++- (void) dealloc
++{
++    if(symbol) {
++        zbar_symbol_ref(symbol, -1);
++        symbol = NULL;
++    }
++    [super dealloc];
++}
++
++- (zbar_symbol_type_t) type
++{
++    return(zbar_symbol_get_type(symbol));
++}
++
++- (NSString*) typeName
++{
++    return([[self class] nameForType: zbar_symbol_get_type(symbol)]);
++}
++
++- (NSUInteger) configMask
++{
++    return(zbar_symbol_get_configs(symbol));
++}
++
++- (NSUInteger) modifierMask
++{
++    return(zbar_symbol_get_modifiers(symbol));
++}
++
++- (NSString*) data
++{
++    return([NSString stringWithUTF8String: zbar_symbol_get_data(symbol)]);
++}
++
++- (int) quality
++{
++    return(zbar_symbol_get_quality(symbol));
++}
++
++- (int) count
++{
++    return(zbar_symbol_get_count(symbol));
++}
++
++- (zbar_orientation_t) orientation
++{
++    return(zbar_symbol_get_orientation(symbol));
++}
++
++- (const zbar_symbol_t*) zbarSymbol
++{
++    return(symbol);
++}
++
++- (ZBarSymbolSet*) components
++{
++    return([[[ZBarSymbolSet alloc]
++                initWithSymbolSet: zbar_symbol_get_components(symbol)]
++               autorelease]);
++}
++
++- (CGRect) bounds
++{
++    int n = zbar_symbol_get_loc_size(symbol);
++    if(!n)
++        return(CGRectNull);
++
++    int xmin = INT_MAX, xmax = INT_MIN;
++    int ymin = INT_MAX, ymax = INT_MIN;
++
++    for(int i = 0; i < n; i++) {
++        int t = zbar_symbol_get_loc_x(symbol, i);
++        if(xmin > t) xmin = t;
++        if(xmax < t) xmax = t;
++        t = zbar_symbol_get_loc_y(symbol, i);
++        if(ymin > t) ymin = t;
++        if(ymax < t) ymax = t;
++    }
++    return(CGRectMake(xmin, ymin, xmax - xmin, ymax - ymin));
++}
++
++@end
++
++
++@implementation ZBarSymbolSet
++
++@dynamic count, zbarSymbolSet;
++@synthesize filterSymbols;
++
++- (id) initWithSymbolSet: (const zbar_symbol_set_t*) s
++{
++    if(!s) {
++        [self release];
++        return(nil);
++    }
++    if(self = [super init]) {
++        set = s;
++        zbar_symbol_set_ref(s, 1);
++        filterSymbols = YES;
++    }
++    return(self);
++}
++
++- (void) dealloc
++{
++    if(set) {
++        zbar_symbol_set_ref(set, -1);
++        set = NULL;
++    }
++    [super dealloc];
++}
++
++- (int) count
++{
++    if(filterSymbols)
++        return(zbar_symbol_set_get_size(set));
++
++    int n = 0;
++    const zbar_symbol_t *sym = zbar_symbol_set_first_unfiltered(set);
++    for(; sym; sym = zbar_symbol_next(sym))
++        n++;
++    return(n);
++}
++
++- (const zbar_symbol_set_t*) zbarSymbolSet
++{
++    return(set);
++}
++
++- (NSUInteger) countByEnumeratingWithState: (NSFastEnumerationState*) state
++                                   objects: (id*) stackbuf
++                                     count: (NSUInteger) len
++{
++    const zbar_symbol_t *sym = (void*)state->state; // FIXME
++    if(sym)
++        sym = zbar_symbol_next(sym);
++    else if(set && filterSymbols)
++        sym = zbar_symbol_set_first_symbol(set);
++    else if(set)
++        sym = zbar_symbol_set_first_unfiltered(set);
++
++    if(sym)
++        *stackbuf = [[[ZBarSymbol alloc]
++                         initWithSymbol: sym]
++                        autorelease];
++
++    state->state = (unsigned long)sym; // FIXME
++    state->itemsPtr = stackbuf;
++    state->mutationsPtr = (void*)self;
++    return((sym) ? 1 : 0);
++}
++
++@end
+diff --git a/iphone/bin/BuildUniversal.sh b/iphone/bin/BuildUniversal.sh
+new file mode 100755
+--- /dev/null
++++ b/iphone/bin/BuildUniversal.sh
+@@ -0,0 +1,23 @@
++#!/bin/sh
++set -ux
++SUBTARGET=${1:?}
++OUTDIR=${2:-$TARGET_BUILD_DIR}
++
++# build library for device and simulator
++xcodebuild -target $SUBTARGET -configuration $CONFIGURATION -sdk iphoneos \
++    || exit 1
++xcodebuild -target $SUBTARGET -configuration $CONFIGURATION -sdk iphonesimulator \
++    || exit 1
++
++mkdir -p $OUTDIR
++
++# combine device and simulator libs into single fat lib.
++# others have indicated that this approach is "wrong", but for us
++# the ease of including the universal lib in a project without complicated
++# changes to build settings outweighs any lack of purity in the approach
++# ...we can always fix things later, if necessary
++lipo -create \
++    $BUILD_DIR/$CONFIGURATION-iphoneos/$SUBTARGET.a \
++    $BUILD_DIR/$CONFIGURATION-iphonesimulator/$SUBTARGET.a \
++    -output $OUTDIR/$SUBTARGET.a \
++    || exit 1
+diff --git a/iphone/bin/CreateDMG.sh b/iphone/bin/CreateDMG.sh
+new file mode 100755
+--- /dev/null
++++ b/iphone/bin/CreateDMG.sh
+@@ -0,0 +1,35 @@
++#!/bin/sh
++set -ux
++VOLNAME=${1:?}
++shift
++RES=$SOURCE_ROOT/res
++BUDDY=$(xcrun -find PlistBuddy) \
++    || exit 1
++VERSION=$($BUDDY -c 'Print :CFBundleVersion' $RES/$VOLNAME-Info.plist) \
++    || exit 1
++DMG=$VOLNAME-$VERSION
++
++mkdir -p $TARGET_BUILD_DIR/.background \
++    || exit 1
++cp -af $RES/$VOLNAME.DS_Store $TARGET_BUILD_DIR/.DS_Store
++cp -af $RES/$VOLNAME-bg.png $TARGET_BUILD_DIR/.background/
++
++# copy remaining arguments to image directly
++for content
++do
++    cp -af $content $TARGET_BUILD_DIR/ \
++        || exit 1
++done
++
++# prepare examples for distribution
++for example in $(find $TARGET_BUILD_DIR/Examples -depth 1)
++do
++    rm -rf $example/{*.xcodeproj/*.{mode1v3,pbxuser},ZBarSDK}
++    cp -af $BUILT_PRODUCTS_DIR/ZBarSDK $example/
++done
++
++hdiutil create -ov -fs HFS+ -format UDZO -imagekey zlib-level=9 \
++    -volname $VOLNAME \
++    -srcdir $TARGET_BUILD_DIR \
++    $BUILT_PRODUCTS_DIR/$DMG.dmg \
++    || exit 1
+diff --git a/iphone/bin/CreateDSStore.pl b/iphone/bin/CreateDSStore.pl
+new file mode 100755
+--- /dev/null
++++ b/iphone/bin/CreateDSStore.pl
+@@ -0,0 +1,72 @@
++#!/usr/bin/perl
++
++# Quick hack script to generate the .DS_Store for the DMG, which
++#   * allows us to precisely position the window and icons
++#   * is more usefully versioned
++#   * avoids references to my local HD(!?)
++
++use warnings;
++use strict;
++
++BEGIN {
++  use File::Spec::Functions qw(rel2abs splitpath);
++  use lib (splitpath(rel2abs($0)))[1];
++}
++
++use Data::Plist::BinaryWriter;
++use Mac::Finder::DSStore qw(writeDSDBEntries makeEntries);
++use Mac::Finder::AliasRecord;
++
++$Mac::Finder::DSStore::Entry::types{bwsp} = 'blob';
++$Mac::Finder::DSStore::Entry::types{icvp} = 'blob';
++
++writeDSDBEntries($ARGV[0] || "DS_Store",
++    makeEntries(".",
++        bwsp => Data::Plist::BinaryWriter->new(serialize => 0)->write([
++            dict => {
++                WindowBounds => [
++                    string => sprintf('{{%d, %d}, {%d, %d}}',
++                                      512, 128, 512, 608 + 22)
++                ],
++                SidebarWidth => [integer => 0],
++                ShowToolbar => [false => 0],
++                ShowSidebar => [false => 0],
++                ShowPathbar => [false => 0],
++                ShowStatusBar => [false => 0],
++            }
++        ]),
++        icvp => Data::Plist::BinaryWriter->new(serialize => 0)->write([
++            dict => {
++                viewOptionsVersion => [integer => 0],
++                arrangeBy => [string => "none"],
++                iconSize => [real => 64],
++                textSize => [real => 12],
++                labelOnBottom => [true => 1],
++                gridSpacing => [real => 100],
++                gridOffsetX => [real => 0],
++                gridOffsetY => [real => 0],
++                showItemInfo => [false => 0],
++                showIconPreview => [false => 0],
++                backgroundType => [integer => 2],
++                backgroundColorRed => [real => 0],
++                backgroundColorGreen => [real => 0],
++                backgroundColorBlue => [real => .5],
++                backgroundImageAlias => [
++                    data => Mac::Finder::AliasRecord->new(
++                        path => 'ZBarSDK:.background:ZBarSDK-bg.png',
++                        volumeFS => 'HFS+')->write()
++                ],
++            },
++        ]),
++        vstl => "icnv",
++    ),
++    makeEntries("README",       Iloc_xy => [ 4.5 * 32,  2.5  * 32 ]),
++    makeEntries("ZBarSDK",      Iloc_xy => [ 4.5 * 32,  7.5  * 32 ]),
++    makeEntries("ChangeLog",    Iloc_xy => [  4  * 32, 12.5  * 32 ]),
++    makeEntries("Documentation.html",
++                                Iloc_xy => [  8  * 32, 12.5  * 32 ]),
++    makeEntries("Examples",     Iloc_xy => [ 12  * 32, 12.5  * 32 ]),
++    makeEntries("COPYING",      Iloc_xy => [  4  * 32,  16   * 32 ]),
++    makeEntries("LICENSE",      Iloc_xy => [  8  * 32,  16   * 32 ]),
++    makeEntries("Documentation",Iloc_xy => [ 12  * 32,  16   * 32 ]),
++);
+diff --git a/iphone/bin/Mac/Finder/AliasRecord.pm b/iphone/bin/Mac/Finder/AliasRecord.pm
+new file mode 100644
+--- /dev/null
++++ b/iphone/bin/Mac/Finder/AliasRecord.pm
+@@ -0,0 +1,169 @@
++package Mac::Finder::AliasRecord;
++
++# Generate(/Parse) a Mac "alias record" binary string/file.
++#
++# Currently just enough is implemented to satisfy immediate requirements
++# (ie, write backgroundImageAlias to .DS_Store for DMG)
++#
++# based on these documents:
++# http://www.geocities.com/xhelmboyx/quicktime/formats/alias-layout.txt
++# http://sebastien.kirche.free.fr/python_stuff/MacOS-aliases.txt
++#
++# FIXME interface is very poor...
++
++use warnings;
++use strict;
++use DateTime;
++use File::Spec;
++use File::Spec::Mac;
++use Encode qw(encode);
++require Exporter;
++
++our $VERSION = '0.1';
++our @ISA = qw(Exporter);
++
++my %FSEncodings = (
++  MacFS   => ['RW', ''],
++  MFS     => ['RW', ''],
++  HFS     => ['BD', ''],
++  'HFS+'  => ['H+', ''],
++
++  AudioCD => ['', 'JH'],
++  ISO9660 => ['', 'AG'],
++  FAT     => ['', 'IS'],
++  Joliet  => ['', 'Jo'],
++  'ISO9660+Joliet' => ['', 'Jo'],
++);
++
++my %DiskEncodings = (
++  HD          => 0,
++  FixedHD     => 0,
++  Network     => 1,
++  NetworkDisk => 1,
++  Floppy      => 4,
++  Floppy1440  => 4,
++  Other       => 5,
++  OtherDisk   => 5,
++);
++
++my %RecordEncodings = (
++  parentDir     => 0x00,
++  absolutePath  => 0x02,
++  unicodeFile   => 0x0e,
++  unicodeVolume => 0x0f,
++  volumePath    => 0x12,
++);
++
++sub new {
++  my $class = shift || __PACKAGE__;
++  my $self = {
++    aliasCreator => '',
++    aliasVersion => 2,
++    aliasType => 'file',
++    volume => '',
++    volumeCreated => 0,
++    volumeFS => 'HFS',
++    volumeDisk => undef,
++    volumeAttrs => 0,
++    directoryID => 0,
++    file => '',
++    fileID => 0,
++    fileCreated => 0,
++    fileType => '',
++    fileCreator => '',
++    nlvlFrom => -1,
++    nlvlTo => -1,
++    records => { },
++    @_
++  };
++  if(exists($self->{path})) {
++    my $path = $self->{path};
++    my ($vol, $dir, $file) = File::Spec::Mac->splitpath($path);
++    $vol =~ s/:$//;
++    my @dir = File::Spec::Mac->splitdir($dir);
++    while(@dir && !$dir[0]) {
++      shift(@dir);
++    }
++    while(@dir && !$dir[-1]) {
++      pop(@dir);
++    }
++    $self->{volume} ||= $vol;
++    $self->{records}{unicodeVolume} ||=
++      pack('na*', length($vol), encode('utf-16be', $vol));
++
++    $self->{file} ||= $file;
++    $self->{records}{parentDir} ||= $dir[-1]
++      if(@dir);
++    $self->{records}{absolutePath} ||= $path;
++    $self->{records}{volumePath} ||= File::Spec->catfile('', @dir, $file);
++    $self->{records}{unicodeFile} ||=
++      pack('na*', length($file), encode('utf-16be', $file));
++  }
++  return(bless($self, ref($class) || $class));
++}
++
++sub toFSTime {
++  my $val = shift;
++  if(ref($val) && $val->isa("DateTime")) {
++    $val = $val->epoch - DateTime->new(year => 1904)->epoch();
++  }
++  return($val);
++}
++
++sub write {
++  my ($self, $out) = @_;
++
++  my $aliasType = $self->{aliasType};
++  $aliasType = (($aliasType =~ /^d(ir(ectory)?)?$/i && 1) ||
++                ($aliasType !~ /^f(ile)?$/ && $aliasType) || 0);
++
++  my $volumeCreated = toFSTime($self->{volumeCreated});
++  my $volumeFS = $self->{volumeFS};
++  if(ref($volumeFS) ne 'ARRAY') {
++    $volumeFS = $FSEncodings{$volumeFS} || ['', ''];
++  }
++
++  my $volumeDisk = $self->{volumeDisk};
++  if(!defined($volumeDisk)) {
++    if($volumeFS->[0] eq 'H+') {
++      $volumeDisk = 'Floppy';
++    }
++    elsif($volumeFS->[0]) {
++      $volumeDisk = 'HD';
++    }
++    else {
++      $volumeDisk = 'Other';
++    }
++  }
++  $volumeDisk = (exists($DiskEncodings{$volumeDisk})
++                 ? $DiskEncodings{$volumeDisk}
++                 : $volumeDisk);
++
++  my $fileCreated = toFSTime($self->{fileCreated});
++
++  my $buf =
++    pack('nn (C/a @28)Na2n N(C/a @64)NNa4a4 n!n!Na2 x10 (n!n/ax!2)*',
++         $self->{aliasVersion}, $aliasType,
++         $self->{volume}, $volumeCreated, $volumeFS->[0], $volumeDisk,
++         $self->{directoryID}, $self->{file}, $self->{fileID}, $fileCreated,
++         $self->{fileType}, $self->{fileCreator}, $self->{nlvlFrom},
++         $self->{nlvlTo}, $self->{volumeAttrs}, $volumeFS->[1],
++         map(((exists($RecordEncodings{$_}) ? $RecordEncodings{$_} : $_)
++              => $self->{records}{$_}),
++             keys(%{$self->{records}})),
++         (-1, ''));
++  $buf = pack('a4n', $self->{aliasCreator}, length($buf) + 6) . $buf;
++
++  if(!$out) {
++    return($buf);
++  }
++  elsif(ref($out) eq 'GLOB') {
++    print $out $buf;
++  }
++  else {
++    open(my $outfh, '>', $out) || die;
++    print $outfh $buf;
++  }
++}
++
++1;
+diff --git a/iphone/debug.h b/iphone/debug.h
+new file mode 100644
+--- /dev/null
++++ b/iphone/debug.h
+@@ -0,0 +1,53 @@
++//------------------------------------------------------------------------
++//  Copyright 2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++//
++//  This file is part of the ZBar Bar Code Reader.
++//
++//  The ZBar Bar Code Reader is free software; you can redistribute it
++//  and/or modify it under the terms of the GNU Lesser Public License as
++//  published by the Free Software Foundation; either version 2.1 of
++//  the License, or (at your option) any later version.
++//
++//  The ZBar Bar Code Reader is distributed in the hope that it will be
++//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
++//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++//  GNU Lesser Public License for more details.
++//
++//  You should have received a copy of the GNU Lesser Public License
++//  along with the ZBar Bar Code Reader; if not, write to the Free
++//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++//  Boston, MA  02110-1301  USA
++//
++//  http://sourceforge.net/projects/zbar
++//------------------------------------------------------------------------
++
++#include <mach/mach_time.h>
++#define xNSSTR(s) @#s
++#define NSSTR(s) xNSSTR(s)
++
++#ifdef DEBUG_OBJC
++# ifndef MODULE
++#  define MODULE ZBarReaderController
++# endif
++# define zlog(fmt, ...) \
++    NSLog(NSSTR(MODULE) @": " fmt , ##__VA_ARGS__)
++
++#define timer_start \
++    uint64_t t_start = timer_now();
++
++#else
++# define zlog(...) while(0)
++# define timer_start
++#endif
++
++static inline uint64_t timer_now ()
++{
++    return(mach_absolute_time());
++}
++
++static inline double timer_elapsed (uint64_t start, uint64_t end)
++{
++    mach_timebase_info_data_t info;
++    mach_timebase_info(&info);
++    return((double)(end - start) * info.numer / (info.denom * 1000000000.));
++}
+diff --git a/iphone/doc/Documentation.html b/iphone/doc/Documentation.html
+new file mode 100644
+--- /dev/null
++++ b/iphone/doc/Documentation.html
+@@ -0,0 +1,11 @@
++<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
++  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
++<html xmlns="http://www.w3.org/1999/xhtml">
++<head>
++<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
++<meta http-equiv="Refresh" content="0; url=Documentation/index.html"/>
++</head>
++<body>
++<p>redirecting to <a href="Documentation/index.html">Documentation/index.html</a></p>
++</body>
++</html>
+diff --git a/iphone/doc/ReaderSample.png b/iphone/doc/ReaderSample.png
+new file mode 100644
+index 0000000000000000000000000000000000000000..a71b5a4af2dbf6a6122b24e085b868d07b5ec8bb
+GIT binary patch
+literal 131381
+zc$@$_K*hg_P)<h;3K|Lk000e1NJLTq00Eu=00ROD1^@s6Sx2BA000*rX+uL$Nkc;*
+zP;zf(X>4Tx0C)k_S$Q~BZP&l|KBMCt^E@82%=0|Y^E^i!^E}ItF;b|MDMcwNqM|}l
+zNeD#<QBhF|rBV`Q`Zhg1&--2P_x|%;-#_1dUFY7vv(~!Tz0O{1?|ZFv0AOFBL`H_f
+zbO3~f$41*3>ycet-N?8X00$sI4`3ij@rjAlwXv}P|8e{nLu8RLBDt;WKZ^a&40>O`
+z7#{#28-(rc8{-p(;6?yoJ)g+vSO8F~2z@9%HWI<;UIa5mBL*UPavKNy#*5q7dk16C
+zJ2DP-`T$_q0KgL|l;{8eNP-BRyw@iH(L*u-0Lu{W8x#%zqYHwyd;%%H0I-)LG7@27
+z5!<*6!J^*(q9@>AFooj%w@wNr;BWl<w;(H#jSYfgB10*OJ74}Ur?AjC<bLf824p6N
+zhgxm>h6VY|`BDtbkt-MS*^CU`@fjimarlKh+9R}WED`Q)W&Ib{@{cyMLol)yvWbk<
+z+s4Q}gZv|7Z5;lhrzQpJTOpW;(2M+H4FBjk8%#0V_8ARAzaAZD=ZIiI1h>cRwKqgC
+z5>e2*q(BGfzhu7q`WgI1hhhI9Bh%k9FhfwR>Gobsh|l>$BFwjKK=y)_fH?>SejpA+
+zBXc;A1QtLa82mL$0)Ie3IC~LZ3<v@55gdlBh(OjvAej7@oc_O2jCR%qAnX3SMl$e0
+zWaIwc^Y?CKWY0f3gMcrB|IjJO9^1Ta>tZ~E_W!fzABk;!JJ!h5$;`{F|FH=zjFv+y
+zqV>?4Xf3oVAfs8(96%DSfL1~4qP5ZL2u~Flfp>`JfIl{F>kqr`zqd3ZQOzk3;cowS
+z?>}7Nv?Cq#_xFFZ00a#z++6r$0RXXn3CME*fPO?|VsubIU@Tb|d2;<E$fn^wQW9i2
+z8CjWa_Wzr){m%Mr?2_Hiy9i<#{D<bV0Dvk#0Jy$?Xko~MS*Hd7Z|^@ep=ba&FCg?&
+zK5@}|f9peUUoe0GXpsnI2RuLkh$8n{4k!V2paTqn8L$Qpz!mI4;wKP^!DtW<l0gQ@
+z26^BZC<doM1*ifw;0m}7Zh|}DKIjI0U<f<~6JQF=fRA7i`~YhZ1mPeO#0arNypRwi
+z4#`0(kQQVJSwMD>E93<QK;cjvlniA;c~Aj#3OWZ}g04Zgp!?86=n3>3nug|~Z_qCo
+z1ruQ=m>U*`rC}9V7dD3-U=KI|j)IfmEchr~3Rl9H;b!<g+y_5}r{It9G76xmQ7kAv
+zlq5<8rH`^kxuN_~(Wq2ZE~*4oiMonvMfIRYP*bP{)K4@P&4?zWC6PEaK|7*-&{61A
+z^kMWVbPc*0-Gv@OPoo#nn-~&?3nPwE!<b@RFael&Og5$ja}m>od4PF}nZf+PVzDe(
+z5v(%S1nY_o#_q!&#-7I3W81M$uy3);I2?{0Cyvv^S>q_USX?&lB<?cq9&Q*ngImQ@
+z<9YFNcq6<UJ{-RvUxKg2x8aBJv-mYCIw~P5H7aW=U#di^e5&(QtyF_lGgNB?dV&Z+
+zli)xICS(vw30DaZ2$O^*YHDhJYE^1m>LBWL>Qd?k>R#$;>Yqdgq8L%1=uV6y9wk;2
+z+lkMKOC%CWn508;BgK-Ak}i=tNv}w&G>kM-G^RAZG-)(tG|e=_G@ogyXoYBXY4^}3
+z(U#EOpdF-LprfJ_rqidR(52Fq(cPjOr(33Hq?e_)rVpb(OkYd?kbaH<#~{pL$l%M6
+z#Zbl2$?%pD#VEk2&*;OL$#|ae0pko4mPv%klqr}gkLe220MjBf1G56N6LSJ{8S`D{
+zDHarqFpDWmC`&%eb(S%fU##4$x~zVzIjmP%hgnzHIN5aA{Md5Y>e-&M{bDDx8?uM6
+zA7{VG{*nXDA;w|L5zldk;{nG4CljYSrw?Z?=XK5(TrigymmSwWt}3p6u4Qf>Ze#99
+z?vvb|+zUJ`JUTqVJViWhJoCJayjr|LyhXhCct4Pt$-3lFaw)lsyvWDJXTlf9caCp>
+zZ;fAs-;sYme?9+80fK;vfWJVIK!?DhAg`dMV6tGH;0qxtAr+xOp%X$qLMy@|!p_16
+zg>MSaiLi;7iX@5DiA;);M72euL@Px{cVTy_><Za+de@K`ET$+HC{`vmC=QD&i3f?F
+z7Jnjvkx-Qgm#CB&mn2H+O74}clbn`fk+P85FLhJuv$UYJoAhz%9_dXPMVU~U^D+~%
+z46<gj`(;~YzsZTo`N);YjmnecjpWnhTjakgh%5LhoKbkD$f#(kcu=uJaYIR2DO%~O
+z(!8>uvX^qX^0*3<ijB%)m0nehs-9|^>K)aeYD#LcYS-1is7tDcsMo5`X^3d}X`I)1
+ztI4lP(LAR)rA5~A(mJa(rOl^J(XP~fqa&c>t8-CjR(F?fu<m8u&w4U?(RxjKEBb2s
+zDf;aOC<9}IT!R5a217@~Q--gM_>BUL>WmhR6^-{9x0_&0%uSA)jGJ<s`j}oaT{KfR
+zOEK#*Cz{)vpE7@AA!ZS6(P{}>npqZFPFe|Bg<IXU2G*w5h1M@^L~NpLZrfsQZEVYI
+z-`mOBCENAbGunIF*V_MZ&~wOlm~a$zjC1U8qIGh2y5zLtY~WnrJmn(olH$_m%HbO1
+z+Tw<Db8@@rw!GVLck%8ScSZMX_c0F<j|7j0dpP!l?z!tp>q+sv;f3*X_Nw(-r&v=e
+zDa+ob-sRqlKKec<d_MZ>_!jxj`)T?W_|5uj`WN`m1!x8o2FwR)2bKgb1nCEz3i=vs
+z5?m3y5@H=v9kLbb99kcS5AzDU70wVI65bWT6Oj<{BvL#wJ8~*YEvh(bG1@%(Vhj}H
+z5z`XOgd~UkaiVbt;->d%?Je888t)W;BY{34JfS~PEHNi>HpwXI!anpqpM4$4e90Nf
+z(<!<s=Tf0m@6?VofwZi&nRMgynhZilNXFy+GW!emf6sKzY|Y}%O3!+G!1zF2HcfVP
+z_V_{dgB6F+hk_0b<jCio%-PKK&3%+7lUI_re%R;mqa(6MN{?(E^*=h0uatl081`8B
+zv9aUY$7>4c3z7=n7FrfI7m<r{i@q0o7C$UeD5*F>I1zVZs??&i<)q-rV<*>71)h3Z
+zrdL*9&Q+dMzH-|4^za#-Ggm9PEAlFSoeets?40qr=1Sqpk}7P~-m3TKozC}MP`PmF
+zBFDwNiyPJ9)l)TgHC>mKFI}qTs?D#1>*DI>FS}nJx?*sp<*MY>bM-9sc@3Z;uHnNq
+zuWMu1&98UdP`PonQK+%JiLoiS8EQ^!Uc4E2bE?I)<;g9xTOF<HtxdP3Zdc#oyHj?T
+z`EGt2p)IRz>t52m<@U(-h5G^b-*$L*Omw<*j&|904LmS^(A#a)-PxntbFWvk_s&DL
+zhqoT7Ji6JZ)Ysgv*x&S6@p03D(m?Z|@?gu5>QL(wjVEox+Qaup3`V*~O-K8lT0MO-
+z<~a6j+<koNneVf?=b_KPzS#R>Z6bXVGnxC6?q$g<u2+?>cfGEkQkuFuZ7|*c#{SL3
+zTc5Wd-^ILJpUHYpdS5cjJ9}wPZtl*!(frVd-5+K?Mt)pd$o@qCsr<9(=f*EOU-}na
+z7H7Ujf8F|ac!_<f`n$sSj%AzWS3kmjtgYm(vai<sRQcKS%lX&rTKqb0y>w&OM(d{e
+z=Hyn`)>b4XnzEA%ppY5%_XprxHBv*kBDKR10EG76HN}nuQm#OV%udF@4m3a%XhF_&
+zXQ&=#fsdg$QMb`i7&R;{jvCKJWlqSYo+a(3c}JJYpv<_yT+f=oZpew^>f}ivbMn;-
+zNDEdA6Gc2l%XU2xM@z^{?vXks-6iu&PD<Wep-}OG(hn60Rd=-<^=6GZEf#HEolxCk
+zy*B-MLq;PlV;_?vrcGwg%x5iTEN89et!HgM*e=>F+y8O|PB>>87baIWH@@A%?&2O&
+zd!#%iy(B4O-a<aSzU+SV{)7M!@FQ?B=wt9q$m`G-VdLRXBSs^KqsF2qW2R&0<Cf#$
+z1lmM$lKei?Wbc%u)WWoe^v;Y&`v)^evtAsS&YnH^<<LsbW*+7+?Ge_a<b3gCO2_pI
+zEDBwUe2ZgB(oY;MEk9Xz>Q>p~@~P85E11v9pL3{;t13U=ec@X*e~s;>{k4sC^H+GU
+zI@IShv|n4fA>QcGl-68)v%aPO*4x&NJFItQ+RX0xw`bn3=(yE6*0t2l&?DVz{V@Dd
+zZeMl(gU9a&@k2sSbcUTq!bbN$Ef}j9zx=G}`Rx}S6Frl?FZ*6SemyibGX4C`^xOG&
+zZ)RHG=gd0J@yxxSulo@CQT*flLd7S$&*;w$UtGRyEmnNh{yO<Beu;jm=DYUyvE`uU
+z^&j~wd@BvB+N%RUJ$^3yN?gOOomdxHZ`m;4nA(in!f$16Z6W?gBej+UutT!IUWf_u
+zgl@uI@NpCqsupdB<VJJYQQR>82SJYd5OI?xnU043He(1gndLQG8HWMqJa+~!AgAz6
+zAu-@DlqGyZq*AnYSEE>m_^8C36p&_=5tY@GbCi!#IHFjkbXWO>%90vUT~I?+(^@M)
+zJ58rh_kv!l{$qm)!(pRV<8vmtrjcgO<^~p0maJANt1s3QHodk@c2)L84q1+IPJYf#
+zE+($(Zc@AX+?hS7J+}7Dcs}sDK*{p<_R;d?^j-BE_iqX)3fvpy7OWW}5K0RD8TLMW
+zJfc6cGpa4RHRfh)OWd`+XXEn{5)y-wT=!WdYo^Gjil%X;Gi4C=!~54Vm$DWPyvcrc
+z@X4W`oVMH>c{PVCkJKH#lmF=0<nhHqbP;E<Y>CB*kkY)9*G|1C$DUR?6H;;E?3+q~
+zs-W|Y7dEO5Yoab4s;#PPzx?dVQaxRR#5MElp*M~-HaAV)#I(rX@@hSHyZg?1n+y^a
+zXYY@9Y<BTH(C+r?$?CoIaNyC`e(uLc1CfL0hK7fs5#`Z{r!`~mo(Vkndr>_xG5Pi7
+zuh-BNcAD^p<}K+Rafa|7{eEM1dG6!<s}I8;I~STiUHn}7C1)|=tNAzhTk}%LcfRk>
+zmXG|<`>~2df&WjgpToa$*L2rb*RO2^ZIU;~w<31@4<i)=D-r=FNNsuoJc6*06;y#_
+z=OOSsDiO_wevB!?#^A#6$yDWp38FaZIL!)OApHcRK2sI*GOIdU1bZ<@HD@JPK6ea{
+zJ+Bg(k^F^kkpHT{F~L|Ndtn6;W|1Y)@m(!q#p1CN&XTH9%u*}TBQiH+i{;|wT@_Rm
+zd6j_DOXUkHo~kUWkJM6-{N%O9QB8HtS*=2CZS5JI!@Bai&-K#u1@(Ik!VQ@WTa75j
+zRL0j$JWNTZ-DcV578WFn0m~y+7S?#{PMcI)CEKrdb@qM^JV>rk>g4Fm;{43zw5y++
+zq}$KkUGBLa1|I8snmwbuB)mRQE_ny~i2BU?*7=3`OZ$HdXbMaUQVUuSZVO2b)ehYV
+zyAz%ip%SqY*%GxcS|<h<GZ<SM=et)v9vwfHP?wmI<g!mLnUp-A(vx~2Ej!&O!(hKq
+zCN^^+Yy80d?D~Ue4;AF(<Ywh%9L_kBaWpIc;IaJU#|usso-L{>zF1Ow;zsG{$?s*%
+z<w~dB&ZJeGKihL|sfz2o(S`VnHPz#nNVSG_sh3-?{H#}RNV#_J2ENgusjB%$i_NY2
+z+w^ym?#|zHZy)Wj>l}ID*!{AX@^GOq_AwYZI7IuTbVPjg-q`N(wdXYxelKNTW2Qd6
+z`8Wg3iq9v0oc<i~RrEW&!uZQ$V{qI5zk5sDX989UfD=vtIBx=A{|<mWq`x725$P|T
+z1i*#_fP*T4Cq)75kOZI;gul-ZI;6_f296*Yq=O=)db|w=!5gp);UP{)3etrfka}<*
+zln+%wEzo1=4YUf=!XmIX>;gx_N8nnx7oJ5?p~O)(sCd*_)ML~JS_(};mmqP6#%N&T
+zF!h*^SW#>Mwi-K+lfXsbns6I<WBhUaB$XId5>+38hY&+}NKK|rq#hy4BDK&bk~OK3
+zMuet<mWei>j!1Wi9z%Zssb6v#X&FnH$V^w5RhS>L>}L7On#(4_*2V76LF8!U^yDIO
+z-9;i;l;<UH3E75^#Mj54CtxN>Bltw9K-gJ?TjY)C#a-cIN@5%04<wFAI!ckH7NnbH
+z4#@_{naj&5a45oxUz8@4`&4eLHmF@tKc!Kuc~mP`J6q>~ZjN4_{xO3h!*ZjGNZj5t
+z9W<LT|7fvlg|eo#;j|U9legD&Fm$wWa&h)@33ZKk%i5jqUhYx1=eFl#uh*1sKGeQK
+ze)|520k;Cb2TO%Sh29AJ5uqJ<Fls1<Bi1+WdOSM8F|j7;SF&BorPR&z-5Iwtxw29Y
+zygI0Hs5+M}@8IF}qw)DG$I}aGiz-S~PfVOlD&sF7K9hb{?%Zru`30M5R8325?&XVD
+z-(8cwk=69R#iMolZdSW`Cw({SA#1<k;KAW{V`k4sUV2Sazk4v3z2Leiu=IK5@><Bw
+z`-27PFjyk}pLFEyaTPoOFTfWF4Y5HIi0>VtU?>$TgleERXcYPYLogdGi`4mka0YxD
+zz6-yEH<4Q21QmrkjT%Iwkv>xbQk#Fr$YWwKjY#dSj?KXK;OKE~xbwJgcwPK4{4|v!
+zRW8*uL7h-S_(p9*-9Tg_CJ<kdj1iy9)7+$0r|qJ%rh85wK)=e6!^p$f$YjYh$DGN+
+z$8w+5myL?8p52)P=BVfN;39I}=RU+^%ge+2h1|tg&c9c{PEbyWUT9HxM5I}?WLJ`y
+zySSzVkHn_rE2$3YbBL$Y<dWt0Da0!#D8(x$t0b#ts^zI4*EpkDqt&9_tuv|nL!V?I
+zZfI&0Zd`2AYC2^0%6!QZYsGFYWutHFVi#?Hz@gOfiql=^0hd><pWJ@AV?1d0uz8Zb
+zgel_QQa(z)>VBp>US0~842cMB2wRL$j7*BU6TKCy8<)AaH-S3QGAV!GU<zZZO<I2X
+z$bQyLx2*C5Zw{&-s?0^_MI9bLs-0hRoS`7IaK6}~q@z^kWYMY3^3c;G6&h#HR}!mY
+z&Og7XRekOfRc-cV(JOE2E3XCJP;A_4e%8{|T6ia=Ev((EV|SNlw@+{Mqm=&QftsQ2
+z;kl<x&k80YURg{lzY~}xd_XO%fBF7xb@}`1<~qZU|91f!q?1$t8o*;P2f+{*q=cLx
+z0Z<xL3SEc#q4zKh^TJw4XD1y#k92aDQT!-J)KOGFnig%3E<?Y^$YC-tLs&s<5_T9T
+zh0DQxz+2(3Q?XMWp!!PiA&gR+P`43PiPuT8q$V0inswS*Ixl)Q`U!?g#z-a;W+4_l
+z@+?oYjj%uB=;CbWYT>TrImjDJ4&bBkQv?D8<AgGWOGU1U_U@Vy2NIl;3R2e6figL=
+zJ@P~aTg8(~Qz~Mr@oL=~teT-(4|I5RGxg>SoD6%6bxrP>>6>?3np!=wv9KMmw|3}v
+zGIQ>B)pxt^uHkXZQ`xK8Tfyg!pQe9Lpmorr5X;cMaN~%sD2?cbSb@0Wc<O|d#Bck&
+zlV7IVrS)Z4?jOo>I`HCu;j8Gnu`4Q9PuBmu=5oEMk*dkFxv2$z%el4k_NTk5ZRz(q
+z?-M#KI}5s=cC++&_MUtAwokM_`f=mH=8)NwlHs?bQcq*YZassZ>%BNI(ftyBrTp4|
+zs$lviQkQJbu)mj{)tfV)xBX!I(Q3i$lj>*TFQhNaiz8nfzGW>rBN@bp<%S<ID+(*0
+zRxkc^{)PS3xaPXHxn8wlxG}dSu<idCe|fp>(*r<6J*55kYHMpr80lXY0I+d<Yiq4?
+zYipwlDK?P*K-xop|6j2!j756x<-500yF*v{_Vr)Ke*vxLjr0nzX50V(010qNS#tmY
+z3ljhU3ljkVnw%H_0qMO-L_t(|+U&gtoZZ)5Cwj`gGn&!NNE%62msM=J*ErRwkV;5_
+z6w(MR1U8V*?!LDV2(Zgy2uWDVE)RH+EFU0bm)(5<ULYZr^y(yb++xQ?a+TG~NE*#(
+z=H7G8`_*&K|IVF}?8u3o%p_yY+_~jn&iQ?R<@@{oY)Z*2el312el312el31|x4zus
+zC0P7g{9624{96241fIpO#jnM$#jnM$@7u4|;w4!8TKro4I$K{Bz8>$#m=@~`-}`m4
+zcn=o87QYt1&LX(jC*Ucau@PJZtwrEj{9624{QBO3jQu_UoJR^qX%U1LfoJi{JTX!m
+zi(gON<@G25$38}Y^jI0I^a%cz7J+CHcz)20{37TqetkFBl>QA#Nn`NcKFw?9dpw@S
+z$RnNx9QwVs-}B=FpQHZ<`0n;RH!XtDBmY_?7d$d>v5#}Zu#nfexDgh=zLWJ<|BHZg
+z{<?MNzIveTE*M|A^2FHKayKwI7+Y;`y!Z6PZU_MoDs?-s^jt(QH+DKP;!^Z&OTUK%
+zMjRhWUD$ihv|8T8m}n=$pJ!9D(+=JwMtWK|cDpCRrsFZ#+1W1qo@SDbXy#$(#xyfC
+z({awrUXH2l+9?QTSnpE@{vHK6@ja)fXW@wO1A~PhQalBJhL?9baAfd_r%s(RCr?h}
+z&v-gJ;bjNmdlJ5n_3Wv}9;?mBA_y%4&zS(tnWPu$$L$$-Yw0X){(i>5E$~^35z*q;
+z*#sSpcG{~}t=e+&#XH{e@ZSAnD_5>F?e>6i-WltxA;WJYpc9}0{Mho=AXLDg%+N3z
+zVgMaL6Wn>u5y+6C_5eJ|CX?uO9<U0YX?^l7XTa#26akBDiVhC}-XoDkx3u2zb7Sbj
+zb3*j3mPw8*KD;L!g$;7xv|S^gP%;5t9wWXUJ}7qazwlU00G)IU2uvp@PnrV<A2yT6
+zPR5fbCucg{*$*B%bl|=47N_95Q$<i|J_oO#FZ+WIMn7=Ca~hzrr`dR}`Zrd;+tUD!
+zmFL@@zomIzYpd_n=NR#G(XAU0?{h%DTRmV@gJWE@qd#z8XKLI|=UCZZM{8hUU>L3E
+zEJOsI&MC0r0dax=z#!0o(YCQ#%!D!!vLtxCn-CKic&wxNCF0K*7{P-bSgJlEV0lFg
+zgP{@r3@>+vUh6n0qIf1M5J~P00mmb-Fo@wX#l#nbpsSov-dynEDd2kq0w6XM3C=B=
+zF2KudcNX5aYtK7x`^!3=nNJ@(c5HV~+AdbV_wMyMfYfV-e$asE2LgC{z-GRmU9~t|
+zkAe4ct(L$y_-tkn_g<^jTH^iSQi$MTk9ZFslfW|z-7ZGu;S~IfUeT<4V{Uk+`Z-jK
+zv|gaTItHhoRecXFS+ZoP-EM=Yxq9XL_3KxRjE$}vUAk=Z;F7@&!%K&Ty=xD`E^1?P
+zqvdQ1HmL)zv4bT&@<`!0yPYnsbU1KlWP2tf#sI!8Y;;eC!LzNwz1xM&8@j=?!K1bC
+zIN1Wro3z`-4bFxG-zNm#-PVY!8+n^!+5|V5gOo~w=cE+#sXN!wO_;YT|2^rAgyU(^
+z?+LwI_I2TNF+J0jXC?Yf^m@tIq{v1NJ~+lepOGZ_;v62ioN%I}%PT@x3>r`)7l!=n
+zY({K;JRheOgUA++44AXx16W7L*y~2%ySJRnr%3mL3}0EE;P%ta2ynr@<HyiY<7u$H
+z!t?T}e%A<}=lR6(Bp~etuf;$FqY*eKG|FVm$!I&g7Kv|@9H7Hn?D-ZtzK^h`6WwQT
+zA?h$oPEJpctlO~BEM2<PJ9u+USmAog_t5Zqz-xl%gHa1#F9rb!F7UqKg%wMk^4~k1
+z4uTu~9Ob%41rm&m;I**7ECHNEPgd?egAA{sDEGopvMkbC#C4#bA5%VKxE_Jhe0ZGQ
+zS%`pOQQ&KamJDJlFbxj0%(CUn2A7SGuLR(^1YR;Nk<Ur^o|1jtk-Z(Ny&Wt2k`_~Q
+z-^b*FGXR_3Xhp$AqljeyEaQMDBcr3EE62yjN7k%aH@;@gnr*{NN7jvwjI0?R8D2d&
+zIJ5?g!XR#-78pf<ozMZ?nVFqAGCMPK_~g{&!Kvw~Bd4ZL9Y1z_;=ttO<bh*Hk4`}@
+zI!sPZgZ1xr0__7bhF~vS?ZLr8G~sS|cz6&#dpSI|Y}txsYgevVwF0na!`QOr8{4h+
+zD$Jz=0I{h7BaWMhHY#pLGF0F>qR{{=6}=Us$s4=XVk585l@(7r0gzKtCS;J<z*9n^
+zfJE)ZqR|fUKKOh(4g3eJBEK$?VNJ5nk{Ady$oPJ^(Z#u>V~UB5fky+G)OcIov6zk#
+zBc;a85uosE>htr?Wy6lIk8nH|^FE1<yRA37yvEpaUSufIfWbGWkQ5-*6IKr!KR<D@
+zhMaTj%C*A3<2}li=`I7FC$MKwL!;^P$4jK(80-o3@K~HJ*vpqx%ora-stmS1kB&L=
+zwF_Wq5vbaf0^_x!;AV3@gbi<rP@JT|5SQp;&|0D6!S{r7L8qey>ks@aa7y5wfiqzv
+zUlUvp;EEBr>2>DoW$Au#Dl3^bULOT$_&=6_$m5BT909!B1YD+EQ~kX%)ETIq-gjEp
+zyi(Nx2;^Sz1;R~7YrFs;0kk#Zh{4YY^obo5Gc|P*z&q0Ygll@@#PJgkA31hx|Ea0T
+zJ(DLU??14A@7}``6VoRqCXT`0J`A;?33%xd0i;e3AoXTFdZW|y{SHFkSHSZKz(%9J
+zwnQ-qHfzApuUoNV#i}h^wyavcX5H4cYu8-5V%hkXB}0Q7hn5UE^y*q(^S`j!I)MyY
+zlF%Ow1sMWdzyb<XXeE!@l1HZo0XO7KXBKnPlz6agI52Q>E%5XrEpj$$Ex<%K;ApdV
+z02I354JJ7w*kJ7ZhF}>eJQ@0Kl;eUkhIgdnC9gFl*;;J;0~%B^8m(+_*sBynR)qlc
+z9@a7t$hr|5A>Mv=F6G$RAmBB?*JhBRBe8s)tjpHas=-3Ai&f-7203NG!1woRFe$gs
+zUaRC_GFas(DW3}8BLWt9O>m~1kCCV)v7xu}K2|;KQ~(l<nv;8zS6nK|8>g=oa3w%V
+zF@v5HP{sdwiq>KQm&D-g#9&%iA_RKhC^Zo|b~54$IC2m0qcBqC>&>s%<BVcx_2c;5
+z<eCsjMRFwQWtP{hI_oKx$dfP&BSr#&#Az+^?eW816VD}*)8BRdBw1e!79|q#92Rr*
+zl}ZgL>Ed$YAS7N9IYKt&^P;R3b#O8m8IFGGdGchvrsN2vK(BFf&!f@n9AIC0x+faV
+z=6#<ul7gDhNpLk!Og?zz$f3Iq9X$B$hxhDx2>y3$YU;!R0Hi(e;-fv8kFIG3z<ukr
+z-){i)eE~f408YOGd|OgilrkG09=l-8nw4v}Z{NOk-NucVu3ow7((x55w+}8^0%3le
+zJ;iR!##u82;Mvit1LI@Ca9CSK2JLo>4LllYc$PyZO}9&%7J!J7I{}l)06cB@4D|9l
+z2tc?Y!9Zhyb*4K@&xfDkwH@4;iS{ac!MNG2IInQ-EjoKlO(0OQ;U=#PSw*yT2L=b&
+zTSWsQ=_mEnF*Smb(I7m>iM!4opS-`b+2ByLl8W1%VW|e9>NX^Ky*}5ZlBIG2Jjvu>
+zqj<)&1ye~~$?@cfqvx}YL>p0#T_dvQaTa8>rW~(EIjN@{Vg>ASh#}x)Q>xCl`kXoz
+z)aTfgqeUm5tytdl*yXXrr=3gz&V0>H&kJ+aPyt-7c}{UjD4J}(CMlJ&A_b>i1}2I^
+zjDS%rE}Bi{-lPngPNEq0YWQQT`y&Qi@1+w*#t2B{YptMaY<{g!(<(5p7L1&;UUxbc
+zU1QbVBjN&qDo6jET8%l4Nsfgk<*XG@vN@HfSK3L0g;7sH;sM_n+AEONKt~TU#b6mC
+zMeSDZ6ghwB#Nnwy^1_^)nl=y~O&>XQ==MWL4}bfi2Y284&;t)1oR~Pg8=|6}0z#+c
+z-_S!=_`U_9Cp7S!25?;UJ*3~`<EyVe|NQgTZ`!o!stp@AUbS-N%1fbUV%aNC8nHkb
+zAX3U74Zz^w5(}v<+X7H&wK+0Cz@X=fA;$$cJ3CAH;ZrlG%nTG=agol>cHs9}GXsy|
+zb1=l8nV!byCbc#*Gqc%Xptr{x*JUeApr*NhIXx>zCF<W3XX}z@&yFH9%vXa4C+Pv&
+zL{2<2MGz<T1!qgyBK50JbIyUPyJ~WiMia40TVu^9Novda%BahB&t80G(6fC>5*?Hj
+zI2l#>U$iL$pMItlKq#rg#OV@!uIa;h)pVOgR-EeT1yH$8P9p|e6~rw8xT`^xuShmt
+z2>xvRN_s8{2-K_*{Rr_QC~ZY_V?X!WWfPl9no-X#S%%)oHTZl#HPvJcM>F_*D%z*W
+z?sYWzerWxqzGAkj*RXSB>6rD{Xg%fV!8Pt#%Be|Pz$QB?B|_%(9fMb@Qmb_BT$3Av
+z*N_i486_DcS#wsSIQhJOY%*fcNwkc0MvSg8MUFJ?0bu4~>JWir5S+pR_!+YgZTNj?
+zXo#FN-@@NLM@@2!lxhr^iRhA(iF=#xW5jcD6cyt0DMi@<rrgxzzP)>Id+4FvH$Cvc
+zuG{Xv|Ni?R8oEmWNb5$XPg?H#27sQBz*7NEzkh92uNgtGf#T=+mtK1L#TQ?A;j=ex
+zI`{IC(WTql;Nd6oUf2jjM?l2fG60K(sKpKp3{s?k9vd#s4lXPJmPw#j9zJ~79G^U4
+zjvYGz-VA&nKWShs0f5XvE_lYwc4h!vW-vQ#0<dB_n3fB(@EIN2AXH=(575}+#dDga
+zCJ`~1XtrA!J5}wy>|QUG)MSg%om0lNx!6p_dBPG7ostRS>G^^o4PP?m)B+W+g<@2S
+z=}it^f=JP}B)x@?;YOs7@^k7c1ZZ`gCf`vjX$=4|0@XmbmH@3rNqj4;VFiwq$cb&0
+z=p*SC_L1v6l_4V&NtQG4v1wWk&zG21PD?r^!cvfPN`MFq;)w|i^fT4aVoshUN+aRp
+zQnyI15$Q-Kkkgi2wBz$c!w$v_jU*)#G4hUFtF}H$P~(hsB?8K!c?b*)<S_8>2BYDY
+z&mTmNljGV3J0NAHX_|>%OV>!AXPbE~^3YP3NDBBItvMm>8Q;aipDa3R+=&A}mwS+6
+z^>+HGm3kVTgq&L@n^1oaT$7Z+gQF%)1GngJDU}X`V&CN6Cutm_XspF`9f|s^oCb1S
+zJVYx4@EC&3;1Fa$0C<+d_t@yD866!lBTJXUzoTY+#d0$OzmJWLnx(@_(Mcue6hXdA
+zAk=~H8R#$SAbHy+=8{t#3-`|Plarl82ln6o&_fU2aQ9tzedF%C@4gWZ?U2-lPR>&o
+zdcp(H6AF0xL^%Bb2UBUIm`;OUgQq<G>DOMnW5)&0S+;!nj**d(HX6&>4idZ^g)89A
+zP|^SyH00I5Lc_@A`0?ZLea!6JcfjmFaL^n&e9%lx95<6Erp?r;8A^}g7Hhe-aj?)Z
+zQW;z_0A3OU)>2H@wU?0RG&t0z!YiiImJAMN4~scfmi~rmGW1}{*gIRi^^~d<6Q>2D
+zrhK%<Q5C(jr>NP9sLUqW$y#^NR94R_whg1=Dua;7c#`3_B{enYmgIDfBQUe3)Nr&g
+zoKswCOz?c8$*DIzB5RAci!}tRDL=;>H%T49N;D=5TC#MBAB(YZj(Dx;wFO}+Z(rD3
+zQiRs$mULCh1^3!g1|=RCC+EpEJ||IANia#oYI}n8%!;$+KJrZ_#{l2oN$p9~W%N!d
+z7UmnJ#;l~~q-KG&C?N+}WdJrlTZtM8?`jpHluN_)6wAOFQ?3Q2o=7;-F{+y$33Mox
+zWl~;)9Mx3sp`csYAS;ehXwXYDWsRa<BhG?GHJTRHB!Nb!$rM5iz7IH;<QULe(kKwX
+z8239mjR+L@jZLHYJqwQFsmUobjlaXsGc){m%w8lRieU6OIM@be->?~7HeyzfuP|VD
+z%sJ<*GHcFRV<4kK0EPA54%TSlv!<q}Q)hO@=#s|0k7@B^6UUG3-+$ot`ybf#FW>mu
+z*RF?p(cKjQb*g&MoK)Ns4Sb#uz_UO~tp*&d+bqL>&pmhBwa<Irb6&ZA{f29XhnKD!
+z99Y7AV~!X-i9H-|5d@&ynpj*%CytnXd-oX#f6artcbmh94ny=Z%cc_+*8qUZ@W2p+
+zPvH5C44Y+R?D>r1f`f$x3}^Tr1Yp5X9KZ&CMlixK-2*TosNf={9I)r&B{Q11KBPv+
+zDxX=5VE(-)60rR*R4<J5q|ADLPdy1WE$FJZS*KYV{Lhl|E5@_}tjbt4fV23a*%)gY
+z#-{ols>k(E>q>QR{;cs(YFwSvr@36&c4`>wE1G)F-^_CbQ_s2Bszy;N#i?2Q(K?Q)
+z=+dd@=xm?Qw$(N2O&?VZ2d;ZGuRxSqNb}m3wP7p#U1+r|u!@>Nb<fJH?@2#P(|;Y8
+zdZ5Xv)Slz+NkTT)mT9iAoGO$wr7h`7B^^Yr;nFJ*1cFejDPqA42BgEMr%#z_sM#Ec
+ztOu~#4B&)0di0o?I0FApOqgSnlV)o6qzOR9Msho_Q_b>aqh{@zRc7PH_3*vXY}~NH
+z0D*~8^|Lb!LZ<-qAoD`WQgnJ|JF{`($kF@n*|qbtU;e`9KL*t8+YGBEOje|Xz7fz9
+z1%Mv+z%x%;t)@U@goC<KOV2&`+-qO_;+Ou^=5se)0UpLOr<Bkf0$94?gH&t}=HZ7Q
+zHuv1K)7<~yLuUWJgJwE(;O`K%fR{N8(a*AF%VCj>o8{wUw15z3mX0hXfEmKvFXn_>
+z9KBE-#d!i7Cjf)Yrxx|R2;ev?nI$j(QZ}AhRGQvmj%x#W8Y!M!;J1D8rO|P!H493Y
+zq`6$p%G=NBBTdt!>aj)@d|tah#{k&{ATU#PHSgaSMCO0*dB0M6M9*39J*!+;IrZEv
+z@|bB5HLshkIMjWB=QQtAQg62LQrpk$+n)12Q#3le`@I)W&)!#c-&0k;vK4ux;b3Vx
+zQfU2207}zn6#YO1b7~r8b*9Y3vE$~@(Ie)_A#h^%9X1CJAAp~anxlu0n3*_h1|ZY1
+zY;@Rc*s#`Y-@4U6Gpbp;b{(iW40G-0<P@ajW-StmuttOgr4z>|58b<K*C#&v*-w1{
+z()xG8;T$(C*HiZiJ>dZ8aSJ@BNvk<ws9{PCT5MKd`m$HN?5DSH+x|R=FqUwWB<ntL
+z^P?pO8G0~>4jnRg-g&3F<L<lR=Oa{&A6qsCATw&lmM=5Q#}H)j_ht0&(%~U$WW!LI
+z$ORD1VC2%0)EO2kIZY;DQ+-op<*m>&RVKt{N@r&MNP5KO6h!e`3n<zCHlnr#XS!2+
+z?s*M1sRAHVMLTl<sCJd-jl9m_xxH@pBe5e3onJ5eZ4Th3dA<3@YZiDfyTI$_drrUS
+zH`1Inz|3LZ&2#U2qRoEy!S-J3K7UJdjDH`epniRtOGB}}kI#2b^Q_tVoRx*HbKm2d
+zZ%xg23>vLgj$T7%L?R+05=pOIkjN+mPT>*BK-wKJIywP$;3G#T%)Wz%%$|Mw%%0u&
+z{jfQ5<S0fpkQHf}4Qtn!i!Zv+KmppUU$>qzCYairJb4n*eKQHtfOI%hQ_~Z--g4XD
+zeE##F{zv$XJyjiOUMAe*8GIg>z_UP<qiHo{sEq>~ZR_)2@S>MpdHGd84+X#_nCTs0
+z=9yz4uoQ_*O-&i_8q6)X-DV!zy@!g7%U7;8tHxIWzzmz^%a>C`vjTtz>OfTML9jtU
+z@dPph9MxcSqqP_T6Z%;}#%d3U%k*Ha+hn@1)OGaCoV877wkN{T^qXBE3aB@bUC1%5
+zSX&KHQP9!HDo-!<08Tn%PkrIzoiAl`Chu+LiNI`+C)*2v^S-{1;ZE~-%e7%mr%PsP
+zq}k6H_qhiP8dFmke0Cwg@A<qr%&vY8%mRSd_qgYCDi%ls&gUT1tVG)n#2!Ud(+^x5
+zYpA}a)!&IFsQWnA+nVWLB><J4J!Q2f0v_(~>r&4hG2H@3MhHa5frxbA;6cc=>@^QO
+zxEsFrn*9g&LoIp241;64ZQEvZ<rSBiOE12JYC{<LARQa(%@HFZ?^|}_=#f2N`N~&*
+z_oka}ydDl{AADn@>Wpdj06p#j=y3-;J)l$ntV}hm<E%aZ{0pD_BQO1tUs=0m-8RU<
+zMg$6oL>w+2?7_jWqeqXLyY9N%+<wQm%@N4QjxAeZ)}6B+WG_Y`<Q;)fX*sb{uttOF
+zw^myK20~)&sBTeh#uJcmRAY1GVuZHK>LQXZb2bwObOC4C7@;1Up43V2=HiHl4ORxK
+z+UvH>tajhc+0S_N7?IR#XlszEKqxb$=7|!{_LmygR2hZ_L2sTknf77SDaPKqOH66r
+zYte{s%v@2uIfm;r-v1*y--S|6{Zgo>0i68WI>lP88!LaSjeo!QOLa8RXKg7sEOcG0
+zuA$yz>`evtyBG5u|96_c?DwUhqYk7xg~YftJq}@?eN;PeQKX<S8tM=L1?sbd{vWC*
+zV@>A-fzV;|AOO&P_ufZ9v}f;L0Gg9PN?2*0bj9W7>Z`9d>o=^U_dPLrG98<kfM#*)
+z2Y@+u*PVBM{KFsp@cWJ(IdU`n`LHPp2~UXV=Wzo(r-^dV(j$3b913<jUh>i({qd`=
+zy!z+4*C7UI_yksE%W7}U!Gi}Vop$Hl_dqjdGHZcdvTD^hc8o&JW|>(HKVy^wY6Oxt
+z<Nh3Eo005C70qx&Q#_y?)kqpl57A}-N*Q#LP*LkB$Ie$@>DgSV+O&<oR|a7|BUBsQ
+zMg*|H#%UP+3W%~tT7zG0+~!GT*`8ERn$JV7J<|$|&tzSuUcl)AnmOm*&)`=eS6`QT
+zfoFl^>W#KeL+zMz&W{F^>_Xr)4<PlscMC;YrVkkRMog(sYOYq%T_{bq&~eOnJ?92G
+z>5<n1d)AuEiVL#eU6JM~5s=MI(V3xHktbB)f_t<|RHUi74n#x9Y{O^<nX#v!?cx|P
+zX!inp_P+b>H+Sv27l7yiAS@gO;?khG?6Ql^GoJo*vwhoEqJbZsIF^ncoruFA$q2-R
+zWB>A*PyP0d*I)l7__#e%|EU{M8xhds349(Gz_S48XagwKazGIC+E=~mwQt+7Y2(#+
+z^MI8`ZT#5ih3vG$M-CI<+<nhIK!uEE^=hUwBL9AT#i&^Y6vt(wV-yj2&lG2haDce)
+zynu}Yj^%WkQ9^*#sKsRfAvp0ivzlsVnzdEbW28@@HpaFFFEeN1b037MD7NMAweir6
+zQ>WzW*Yq;2)KIf>LFyZAXmrq|R-bwODD~6{9!X(3)eNM5?{k{h%?DbkC%WtRy!jqq
+z=)L+q|4f1NObhMx?+tCe1&nC#<Bh+4htb1AwK}`NHLD$=GXkETb6P0n+&9AMlX~vU
+zvh3X>J%20UQK!~o<8MhMg=&E6m8Vc`!U8}u6bWH_2hzED1j8YSejYM+0|?!7*FEN8
+zC=HAOi}vcPFEh`&_F8l9xtoCrcM5COz;TFBVs4vTZn^1yed1#u{ohbhxLu;3Y1358
+ze%yi2_Z)Z@NUb?Ztu2S|mCty_vtIIo7rfxthDVkz2Nh0Ct$|#PwL>uA0}FMx-~KIg
+z&(56&XHJcdtuV_WeKv;av=w7!)#_Dn^G2Wxxy_^l>Z56qh@t90ab1SV0F+u2+Ou`c
+zSj&+Sy{-@nxCX@RG*nK`Y_+P+(?<fm=i9JORb_PXn<<?!drUDF%_)7X{#);3_<A)~
+z`m?@2%{Qs;eH5ln{iTo9$B!GO_c^hu39(Xjw{fi6R5>q*RR*#5IC_C+J|Idd%{TWX
+z|BJ^y-}}|Y^kmKqAbVwM<~!yEYY__oU%z8bmD5l=9SZ^QBdwM6Td(u|y*>`!7py&3
+zJ2nd)XTNJU-?6tuPq1HfO@HeFUVN<A!Scc|?R}jNufyMoNF@IvB^uNC<-1J;BYhwJ
+zOk}zRVY)HNpp$Dps!`ZT$5rG6?jwTl*%?wbL5AF+BS*|`0G+#_HhtIKJBfk23;^ia
+z&v=@7_H&*M_2_Z4Z~xu|H6V+2=fQ^_xb>qS`p6$0Jh<;G0zQ)hKJoFGdi$ON&pe=`
+zeacv<S%vkSm%ZYZZ+`mIp8ks%mB5Wm1FZp)uNj1z4Bn7izjYh(;eqNr3Vk*sL=ad7
+zwVQJQa7KatthE}VHcR>pqn$R91z0Krl?;#`O$&<}LYbVPz@!G2B-4@Vi1}J69OA-3
+zzCU^~(4|bjlSk8;m4-9+Z1gdHKK~6RHgLgm4mjk0`E%HStFhOA6_9GcQ6Q<oO2I}S
+ztNlUR5OT3=psVFklBfaK#)4EAdOYyj(CFvY1}CQ<Qh%e<NWGD)NO%5Ry!Tmwd!aAw
+znxD_}?!!;W^lk-AU5wNqslPin2YB)CuKrzKV-`BbKEP8Ovfj^datytnzwogb9krQ_
+z?!x=s_GH)kgL!=n^|7fjo(~jzqqg}ZZTdL|jptW-dA)ycL`OYY0iM(28po)BqiJ;o
+zPjxb}bplmPhJf9QEf&xhNcIK4k@-3{#thgMkh+H^b$EP~R18SLpv8`8SN1p7cCh)h
+zGuxrZl8&dqdJtr2K+T??1FSY=wqd>JFfeZ)0w&z9o%fk<@4UwxK5)pKyJ@|7;R}A)
+zTmeJ`BrWXSzn`>=j)PkE7eDvecinpHt^Z<JjCA7h3O?U6;OPT8b$ShZb5_BP+xio)
+zfBnC??9$6$fyN#poCF|YQFa8qky~%M8N$*BVKIz?q{Xlq0`CNCIcp%Lh6|%D(Fw`l
+zfVYAj#w`y7f`OKd1xRG%kb!avfM6QfZ<CWKgEI;LPNLE*eIqMw8h{PEnepdY(O$#H
+zrsQ!7nF(+@^sPMq(;3Jggs+lf;SP2!+G^jtjZMfft`|f~%|L%3yS`xkN90}dd$7z;
+z{dY3P)-`fIc)NV{K4DI^qCOJVsS(w?{I`Y>XsXnTDudq4EH}aKJ1Lx3@@IXDE6wp2
+zePAc+yJZp0#q~SymnYSNL8=`WFdC!YKTPqTbIv(H4%lEetY2?noC-Zgc8NwwutLHV
+z*q3Pln^{s$2t_>sL5S=P$Z>%^It(?Rhrr3+x$^;YH`cB@)8^^dTxnkPq8CCl`*HxM
+z-4S#k9oVwz8@}<i|N7}qfBFN4Dc2K1I*5;_y3h9ncuoU4NFq3AaB%pdpM3M1e{Jiw
+ztxrR(DgcTEA+ALa1aHVUZ@Q7teq?kRUBTtxWvl~EJPc~0!A<CKpvtt$&SNBkAcBB0
+z0bRz(c*C9^V2TjUaq=W|9YcsqQW+xlsUdMka<KS#?-v3ZdOKt2^^A{`q5(4H&=Uf>
+zH$+?`<Ru{!rQK$a5S0xmdIL{qP#RG&KRhtNVuZa#+Efj>vI}eiR~ym!8b}tXytdk&
+zsOG6wHLzz|tX<&EQxk*+aqdplMc<z)-CO83{k7*z>d~U(7njqn^%mxS&_dOYT9vt1
+z@mgP<s{i&dDe_-TrACl!KQabt=Ov1M=ib26r^*&27|c^k(JRug<)-v1vwCxvB5m9M
+zgR7sDP>Or6QSU)%oe}q&=~?F{r9Nr|hW6h=AZV*~g4qWhM5xgdrp7U|(cANeufrNk
+zl&k<5eo22#f?Z&TbB62&suLg^4Q<9z`Nq0Tnx|iAP-M6en9v>|@N57eg0U;`y%p*;
+zn*fm30vIi&bR2%xarsQmiePj!Md`Om_}e59rw*CjpssTFz4w|2?|;awU%%S?*vnsT
+z&OiTr^T6)i2~-n+WaYXy+;HPxeB>h^{wu?jYn%(DY6tQ006yP!;F$+>G`)uXIp@I5
+zy5x;-`d9DRvUT$%5RpWrNu!s5B7CTsb_+y01B2LWvxJKC=d1<KV$Et0?i(SJ0n!=q
+zMxmJJ0nk}HeE1MFZ5;to&*Sj;32eq952GUyiPCJXq;l|@%+6v&!}?8ajHCcmww!ye
+z*|K$u*$NA1+m>_9+I4H8ezY2ZW(75xwg-nvT#yM1oYq6N0-8l{SssordY>I!TSdEo
+zF3dtU{|OTUq4Ft4Hmab>;*uuSz*+rGe?ODwoz1UDS_wbXzt4vp)_xZ*{=8j7XYu}?
+z!F5S}E>xBgN@w8=3*gm?;C)k+B9f{jA(VB`!xfoSfWX93I*=iObotEmNm42}GI0#j
+zVF#o)=RvazsL}TVGws2L9wG;~PEV>MjJFw`V^l_23r(Zjwr?}%ZQo9Sw07-U(tVqm
+z?Qq5gGAuKq9Y+8J+Hr?L3E>b(dOZjLbo=dhkSgL!Uh+cojAuN<96WT;96fddCJVRX
+z4L5w_uRit3kNqWl{KEo1;qgK`_^txa8Gz0j2t_aZ$v6M2cdlKxZU+bxMjVWWJvJl5
+zBM?qLXzuv-w}Cvcj26ZasK#yuFu(`{7X=Le1F4F=@VyTrnj_?;;E00GsSeFd#~KTc
+zAMVPqs|NKJRvmga=vl!`YqN3FCZIB2X0CbC)$s47(A>3!ypuKn9`^arIQYcs*2;1r
+zk1W%X`)tHCH^tKMX4BlcFpuEkJ|^~J@oVubJ)$S3M`8~i^+C*m&qj~u{DMw)p2eOT
+zf^`**yQd9;M;zE@y9L#rdF%)_jLuA-F#GrKH}?W9`nGR<%iQ?Qn+()lfGqGZrRp&|
+zf!PqQx$)SNHi!$40^@f5x^-qd0ue+on>KHT49XY*pQimW8bUBS0Tk>5AjfkEoa#I7
+zxYHa22m4vid<p>2OCT~jX$~Gfm~i;{tvBELzE6JgBYy#hzWeb6KHoLqISuG65zx8f
+zO>aWbS#v(fkq3ulK?skrsCN%gq<7uB3lw0Nll?wt^-8lIyaTMY?Af!|?1knl6#7K(
+z0K<K*xy(q>e>RW%4LU%I3gwa5C-__piD6EUdFC^pX`c7oXPYNoeT7-MY7HD6O7OD`
+z22!|#Mn_dKbD@Iocil*Q|Bq{5{CWa@WzpC<sn;hkAlJQaRns-qm2s{QrqF2=Loi1n
+z61n-d+szlg@I~{5FMi3~1}Z8*1|Sey0yXHCOe@BW3xXS#6fkuU`jh5@9XrhCO`Cx@
+zHB9wr1R#{-p%E=m`@x#@x9_|QT1oCQPlmeBtA6~)N#_kn2Q-fB)|<ci*Pr^-zr6SH
+z6#0Btfaf%zgJY-HVom2QZ~57GuUWhHVmPP(`Q8jVJ9nXw=lzgMTShl|)yfs5G_YsS
+z9!jN6!;L`c_}JwkZ0HrBcptH&bSAwia_N{mMKS?O-fxD;=DE*%u6gN?{0KB^J;jWS
+zjgu^UXO>9>%D_>^QEl9<Mku+<UTY3#Df(D|_4C-@Go8cuC^qCmx;UpvLoG&KkNjHO
+z^w=BNvz4}-13dG^_^GE(XV36BQe$B0qdbRLE#gPF59`(jEA^iCl3{XWBiNQ3Zob9*
+z^FM#oeDdR;px(nth+>eafRPZE6)=jTTCim$7F4vxH2?N(=RtqsYI;vhy`7lkk^+Ly
+z&RzGJJ8r+zTzJ7Y^AoRq6-{5=yZ->t=ThtDn{Il~XFl_(zc$=xT7%E`q~`OO1J4<N
+z4zkzIf6H5b?sqnA-27x54TY1P2S`nzZSMT`oe<6Jqeuq<V{icF#HRu2kK|%MMl>i_
+zj(N}-k{AzFH-3pu@bAcxUkb&(E3dl3y!>S^H?MfvOU<S&+xdM?;V`#pnsP|02r9J_
+zQ%;LnnplY8c8hK-J?7mb+<|Aj<LA}^PG`N(aC0tr95N^E(WL!SD)a99YUQWC59SSC
+z<msz})gfo}Zx6Wlj)hLWf9v@eS3MYQ&vmV81HJF<Dt16W9)(N&|K=)7Sl>FE3Tk9a
+znVM+Q`}dv;&5g~@^uO56lmHw+<G*hG`OZ|-<2>-MH-FWnXUus!+vol3d{^JYv2{+l
+zJZAf>g}xrkLg#p<d#)c9BQ@7$YW9ES(cQU6E>Vh18%lL?ma*M-K_DWA?eHi)ZyI#k
+zKK#*-nZN&se=uMC;+LsLg8&4>D~Y<<CRXl%Og?s0UI6DD>dafsI!Mc*jYLNq?IDsi
+zcHVoxx%sAB%mwFfF|T>`tEuLE@bDp=YUsXp{a1ePOJDlp2LybM%?CbDc;Gn==pdgN
+z!V9zQjc<JOFJE-wg)fCVO@bk67K`(3sH4C%KC^r89y7djj0ggWm}Y^1h8h*&U(A^z
+zS%3j2=BXc91_M9=Q)v?uM}clVWS;q~XPVc){`KZ%Kl&20baVxc9GsdwCS##pZh+&d
+zl7Nh@LE}&`l<3!9EHX0WKyL{OeF$Vz;C0NLng;GYdLSn$98NTF3I|1%Sv6=w0#SCm
+zMmtT&RwYZRJX-oX)sh%Cp)s-mpD=T3HjiYs+QgX3JQl1|MVjmg;3-owvsWww%|cI8
+zTXV27Z$N5(3!(B-F|RF5t(;!a8OS=7l8do3r#b@EoYstaOmX4n#Z)3I9?HfOAZOwD
+zyV@&cE8~<>!=>e+VtGb{*k_e8X|m4Ba2l15k=M)Hx;c1kO`g=#PhLi5@>$!YYFW9y
+zIJ7O&eUw3MR^CsIo2rke`hBa>1xXJ#W!*3x%|N4`lR83>k^#0PHa+tQZ<%6R%|vP_
+zzBzsjhZUNvM^-c2R8vhQp4juJ25D)CE);T^cq?<$>lNfl_slg$kJFw;4aKM<@%Rge
+zCt}SsPjba`rkck<o`9?8i)tgRsU~2VxG$%6{7@tqjV)df>c_*TZg?$44>a;R(Ozb<
+z4^MbSHYc=|OU*_`ocNY7P<f0>dqBrw50FhU)>j#UK(;AjdY=eO9lF<=De3nW0{7$%
+z4UHH-FhuY1nNNMjy#M|0Hy``NCn<_qj&pn99B@)Hk8|OkBJ3~3>w_%0O`Dk+hu8P`
+zac%|K3ALr0A)?y8eY1JpYhHs!FdaI4#G>8#+^0YDtDto7QTV|9hMP>grca;GV+}sv
+z4dCfVnZ~<@VxOB{`qG#G^fgbu<`;C14ZdU;7-Bo`xtkiNTChp(zxP3d^K)??j+2Hg
+z>Y+I~MaDiiK4x`g-k`Y7CV(~#J*VdB&v>eN^P7Llyz-SV1Hf4hX*uT58)KxW$53hx
+z-vMuMd&$!5`eQB@yNLJh-EDRQh4BF(IqU@j!vRp11>GcbVgjhxr;sTJOceOH3yaDH
+z5jbqwJX0R6Q5VMt!|~Vv$JatbZE32a1%;)Azr*ugWciJN5kSJBQrbMoeI_`zx=W-m
+zOY0x!N4gFhfKHla|4YX}dp79k+~Z?iLVQF(_Tm#cJ-iV;9-q_ckNB=p24cf~2{;&<
+zt#lVRg1Ad~KO){vY`jCpkKw704m9#oOBO;42h&?J%)}tVP1&W16l_q@jKJUVd1O3c
+zgUlj%qbr47$0MJuvfA)S@MJ;(u9i!DlJurQ%mMyd508WA1x8|geHZ>lW0~>XandLC
+zu>f_y>uHK+62s!!=t#i%(fh--Z%HuI70ic^#MjV7OV8uVlNaEE&uim*c?P<O*If>g
+z2Ex)+?dE6@_dtj#2X8I<0ghGY7dd`^MgdRi8&*?8_)kkdC(>Qbr0xjkYm<x&mjQVA
+zSuMDiv#7$6)XDG^q<OgZfff;@dc5T;8u;?Y#DHbH!Uk(8T1Glw95Eizc$Z#dHo)HM
+zJVtmc1~6>kCT9!pBTnYVb%vkO@&c}C8a=%yo)2ASctKktU?fI%J@26wTt@8C!;O#r
+zUduB8;(3uo7VejpxO{Mu2v|7keW2}&gcgB~r}5kfKp=V#j_)v}{Gl}hS~tdk05G<E
+z3?_}PWJc@Carj;ZATUnq_P({G1k_+-$dSU4_d-ONlhl(@<^!M`IRG{XU-QwAf6~17
+zJ?}A}1R%nQW(Blru!4vY04l8_2u$PSOw)$>Fhp)Rd2$+rk?%A&Lu37A7o2Zi{i;`)
+zle4pF^4Kv8j_Kq-eei?7ym#-zUx1I_3*V>asrfvnDYwTAcq-5_rm4GzO9!p`+H0?U
+z*2{kAc`v*U^gY|q!-D5&mq1PD!3Q6JMk$uRxo_vaG^1kG%H`zAAq^TEJ(1agsW#>I
+zXAeB_&A|xhD1@Kq?>OK5?9cv;dChBo0z%XEaAWcHC!`42Ccwg*ii>O*x{hgOg7Mx3
+z`O<IQb_cLhZli{+dx0jo|G-{z;@AlStQm|5s3nmNVP=A&rv!9i@}|@<;oNwgMehw8
+zS@L{68OsEpM~c@tOCA*y0&jRUDjnP=)RW)|IlKT!$ni1J>%i#qk7(FkYKsv7SP?Ba
+z4;wQ`WaMSj^7vpma9^@i82uq&A#T8=c+<8BEf@)UHhgFy@a^F_KJsyO;QiXs8MgnC
+zZL7X#R6kk5FB2r?!wVzS*)m_)hIpPyK(l@yG%UgLMev44B_qfoFyV6;a3Zm`osOqQ
+z+eLpzu=iv*13nXv9{}Iv_ZD!Do<Nsy%j57bGV}ZzLIf|LkH^R#8m(^@8Z6&OT$gCz
+zJpA63OW^6)9JRUPLWzvv6fFd{Nc4FGu#xW_IWL~COGKlJbYGloONSpzRAc#C;E51x
+z9UTY+*}(T2uN~btx%GIyWTT@t^;Q!@Q)&#OOV-MY7ZfseZ<35g4;*Qu<K!u7!w!8f
+z(n*d!i}wYNV8_wk3VJ+3gimdjfFT72*aR00_Y*pkQA{NNTt(sVTm)W>)V;VyL6s<S
+zhPFh{<cy`cX*@iNu0v%KC+`BFXFX*vkSs8O=`S$;IKU0(c%kqxMjac@-C(wFf>w)j
+zx0rL!JI|a8(a6Z?a#<1`szsx%as5Du?r|4D1==!}i~wEwp!x3*{ru7Y{l}o!_As?>
+zMCov5<&`#pB7zVp@`JNHzG@}VvDbh$<x<K5-T2L$$!=Y8$qp(jOirInP;RgX_8;E;
+zkN@xwzjpHE@vj^1^O-es6%HO#@OeytXMq%(m%7e6;H*FIb+3Kne}-J<DBgVt6)i>@
+zs4RUGgo&6ky7#^Zz{6My#k6rs{UBqFDAMq6Q{JVJ2M~0QK$wcV@6B&|gZcTl{%g4K
+zmry7?4cvQ7fjQTfbP_eDnxPS191q>U3s@&#GS`3gYvwlK$M4?#kU4zx2(jbv^#N)+
+zE!1%nL(OtCIAIhvMMRIXZMuR$&anp=1rV&*p;#wwXoqnzGr0l?YC{4U5j1dc%wQA(
+zSQw8z1&!W%G2OVBW8@?V0Tx{7!2SD)?G@QrjQ$*0VLQNm{1$%3IEDRgsbxglXtS~8
+z2e-%rrq6egA^?*!FYLpjM~VPMsg)=v;uxCQuw$d7BTzuYiFVX=A{`fX{*&=#VO>hm
+zsSyp10ErAFQP=DG4@Sv>qbUNuNM12sFIQ<B1VK4GUybH+H(io*z$it+O5d9r(Q7E5
+z>k?bQ=&Nf$Z=n$*0|OdIylz&WND2yGF7ra707zy*V6iFJw!GdO^*6d=Jmr{^XV5~!
+zJ0SO6cVcK%9vr6yZ78=e$(ssV;~Gb&$D{K^o{lA~#d{FI8n?;uYB$y(uK5mmKLW@M
+ztJ&%BkzF<VC|O(-#NwJnDC58;m-7(tyQzL1N80%8=mqQ@gSG2Mx<|>X@`Okxk%W+?
+z*xkt+(`(>;0|Auo!zis_yeCsT@_GuK4p*fNj7Gie*$$pbN9Yj_o5{Ud+8#0^07h%p
+zt%BO|7IX0>7n!RsyV_j+q$|z3^_%Egb!JYICR@KKh{;UJEP)i919183SFbnke8)S?
+z$3OW=A{8L<fK%YC0D|=&1VHfI>Ai-B&|acy!dg;4`0DjHn0*KK!<dCj%u9ek1x@n_
+zMm5;`@7wj|5B<|W{SMf`JA`b|DPd~?pC=6PEC4zx`neha=CYsr*KhsZHRqgj5v~<5
+z<{0u&)8=PC`#CcODXWKf@22o}6<kCd3p*p-!_>i?Qlmhr0)=?f4#J?NOE10H{Oa4^
+zZeIN2m%w`rfb=-0<Mbxef`gxju*L(P)%DkZ-F)buKV+`|%Gb?(_umKUxk+jg3+TC%
+zQnkvh^meMdoR0Ex%Cm-n$)-S?o;HkQLq=&b*#`7%pUBQytsTi0jpBV8*|@Yx=va)@
+zXe|Am{^lYXjgD;Ej4}!(Xt3xQtazMqa{}hE6B`GO3Jj-m5>dz_foTMgc8VNcJw*7e
+z!yA@UeUgU3D?!IzBB3Zd77bRL>;QV-Ug}tZQ#DQuR5Tf=jb>O9rvUlw*sphvO?X!s
+zNP$n8rRZC1k;RS*3Q+onfy<MZi~!{<-#z_IPoL>1WfN@7Ktb2b={RJQ&xtn>8gK?O
+zQ!@SnY@R>|Vqm&w^nQ8ikSUaFVCeqP^Q@esM0l7UOIDM9vF2ULYVnjdLeRH?BkB-)
+zWP1!>$0S~UlJ&)BFB)zgL+Ln<v<<OD)%(EoB)*oe3Ec<2Z|ttXLlQB@z>#P>AE|2`
+zZ5u(^vVYM<hXkYZ$QPIEe1W2HihI=aVKy>cN5{@xka<{~gQIt*(elA^G)mWw0W><<
+z3gQF=-M!9LGEJ7&JifQqBdJDL)w7%&3p$w?d2wme5iqt$AhZShuS>_-!gMyRXBHA3
+z9%_TC%DCCIX`{IcS~Q;XoF6vNefCo!-M`9oXMqqkJqgFyGRE0C07PjuAR!=g_xFGA
+z-R3=i{@)<&x0IM~u^Lr@={S50ze&Ux01KPx&xIy;RCoFESHDga>}Os3RC6sTT<_kq
+zmoo4-ee*_Ox_#z-@D>li_lZ9Bp2rM)9xLGKM<&p^&UvqV<*R@G>L)$vO`(ee+}aMC
+zr|>5I^G7}cy*S5Nh5|O*npLYPXL;%r7Vu9};jS^HOg9xQJdA>{?(>rn<^0kw{j%A-
+zc>@7X3?WmKIV=xw^OlhT|LkWzWB&GU|EKx-4c~+)324~>ZeccNqeX(0A!IeK%3)+f
+zD^ZN|a<{acU^x$usj?*H6x$<Pi5@U-^duJtp9@3?@j^LuR*6}XH=QUY<2sUR!FNTr
+zjP0Wxre3gYCyma~%SC`_B`1><T?PyG_=1+Xjo2Z0e*r;ph@)g#tdsh=3JMhGoD1ik
+zffkFSPSSlCjp4Nk4Ux=p+?2*aPt!$m!Mr>VH-EyE4c-^a=}5Zf6z#AJpvneO8EABk
+zBO7q}3??B|VWr%(M8}l~m`G023K}K3g5vd(=%b_n#oo#|2}U_*D{tE*xvz3f*rO1K
+zgwchz3nV&h+cYD&vbu}^?x<8o#tof`4n>~2!Sufxk@Eea-(&46nH-CF>DG^qlV=De
+z_!^8_DNWofE<uL9E%mlQ5tgOs*vU2K#gJ@=0iGhXUY1u*x>DM)9gV5tt_G1qAHht5
+zY0Z*@g$@nZw8R;c{pBSRVxVWTg@QA#8QbCY!{iNK$moa$&4_Y5L*xQFI&rp`%fK>H
+zobu)LAVz^!)_SW;VH>5jIb!3`D`+YYGci;z0<lr35nXuxHuL=FKi|COm9I1#x1PtX
+z8xjG{8OZ?uBA|5O7~lUle`Bt@?zbrWgLUvI-i0dSW4a9{F`Fe|Pc03^95Cmdw+)(1
+zC(Ji)yqO}_m%Q-#X6yFzfo8oA^xitNpZ>(h-+u4Tou91gJ+V*P?X0KV&MNRMP}fln
+zwvAU@cEt-`{$sEHJxE<af0a*A9J5%k`}oH{X70Rer&$6QbPD8d&H<rMZ2FuAkv!z9
+zBU7y2kY#w2B_;<J)_&tRe%-wGwXdgKI#I0~(<dWK?0`t<jo<jH`LjQJuldqfzCx_D
+z4)p%acGWfJ!?qlrWFi};YFrRzkK@Dz0zr^1pBzRPEv~HwUWid*nIJAF5(#XNN{k|M
+zRz+4f)v2&B7H`1>ciIFn&J;E=8Fj;+nr>>|7>+lFSJM|WK%nKdvyxsAubfNiHKr!5
+zTIEN{DB^KMjq{osW<jEYVvK>AWCBMecrMI_U_t^J_aNi~@v|(ytCh5t5#2dQ7F1G(
+zT;5?rAqFQ(T1WyPjubo_Y>g(cmVzul@>Y$2w>Sq@(u-Jl4y8=dh)jjJ#hy1<eX5~(
+zjx?Rt8^{m_83@RpGs-1}(8p)7T<F&|fN6kkmD}u1k>LrWAx9(F$!RQ!yq(nrCTJh&
+z+>j$lqdRg+FXToV{CliwTN&z{yk`_HoaeepX52~ijn_4zQza`;Q)-GBc+M@U%NWhX
+z#zf~CMG{BXY{-o9;viW~jdm~{5(L!Q8KLwVA!0`&QbYGM=yf5i!&<0sfLK}6C8Wm3
+z1|;H%Cg)MrucT`cjI>KwN!7*b8ah57d>kFQ5V_vRH7{lRahkP5w-??6>dG{30Z?EQ
+z5CUMRrFrvDzR7IfvdwfM1y_$RDYlNw14wxK;0OP~y#4LJPT3!9GOb-=WxFi_q5_sJ
+zkSu|Kv~Alq$mD>&+s<8P9HuY7;$=Sysl1_h@W^3z^w_ccKlJy1|I6UCe-qx~fSmec
+zPB!q@U3cAgqppK%ZWU^<z5Wev_${DJFNb_EXnzKWpmY1}x0^3te?184Eh7=WmE$XD
+zaU*MOYI=$QXs)^=Q&Nw?4Y=~M%guj#?|aOPAhk9Np(_>eR2Ch<2Z;lq^Y-wbedhPy
+z{Vwxczx_Mr4rtoK^c~iHD6cA%PTF_00W25fX=z!mpIA1!+W$ag1}voFW|Z7Dlaqux
+zD+`c3|G;cDIwmimgH{xobV57B*E#E|@zZ?#6rJEE@KWryQiCDpoVce{SCR~5TNrhT
+z8Dz?OZb?eV3+2{}J{Wmcf`D|`(dNw)$sDMs=*aC4D(0AYb`ho~JW;fml}1LAz&c5!
+zWhjDWJV|WOlCZj*L<_iKDHL)X4YlOCGI)#AF>=fl$#D4_0fYDsL>S-#Jb@1q4uo<Z
+z@Ps|n*d3%bd?>!Z4h$nwU@}TIlUhQ_7SSuLm_=g4G0TlubzTU<-sUD{X5PWE;ISgu
+zOI?Vs0&fdiUsCIibWKXCE6NT+55J|%w8%z~u6q>c!AV_C)6bsMe^yBsq0pky_#<ml
+z`Stp;(8e^F^!3m&GMsol7mPA&%F#J`_OY0KF?`5sOq9mLT2H|DuiBF=QNC@a$0ubo
+zQmvved6QE56Gxb|t}(*EJ=N9FUs7Z(Bjg<M1xda}sOvHl%cqi22<#zp+7ah+3BpHe
+zb5MP8&->l+9=7bA(=pI`rm`Y41KB4M#}>zVVCqm9l2nUS!bI1}K4sz!jX#0!<B<OP
+z#@BB!AOG;jpyo4ac3gN7h#ZemJ3({g13Q#m=rO$FswbI?FTT)x{_|fT<$`v*)o5s~
+zN1%Aeo*fDzZ`iQjoCI5X=<rceJ=k&Hc@*mn4GfHfi0SOTyLR0z^y<!hHvVj3#aWGb
+z=1H+B@QlIt*4Mn|C*F4D<yXC7rZWSrB*~AA4iiJ{fB)SFh@U<MeKAXy4iOh00S9MN
+zP``<pJ2VO}Fh)WzdeIBaAN;`|n03G^nLKtRQ?m8EFibrK>9dc1<iqCo|KJaSrhPwn
+z8_rD5Oi|wtHfT}IkhG913yQo~$3<0}D(00X4@6a*H6s%!Rl$C_=KYI@S^6@9FvPOw
+zC21Qk-a9dKk{0f}lC)uuFJ&jh=M7KHC|ml!oY1qIgV%g<U}||}Lt{K-Zi|-)fHUDq
+zUlN$1M^$Es=s23{VL>D|G95`uaE?LSi^NyX&5InCMDZNySX&GpXc^{C(W!<GI2~Jn
+zbn_NPADY@Ae>sPjPCH;T^NH_?$)0l*t<l76Wj;2~DbCo){9x4P@?thZdLW0}H`7NH
+z8Me5-BF;V;K!O^ruQ_IUkkk@6Jc+=8!Ar>1&Psi!M3m919;)Xwmz)bfBao5q3M0#g
+z(sNqMT&_`hiAC6~Dlgbvk-_MlqIg^rp6fA@3hS0B)yjPHL5LPy`(iRe%+Z=Nh4GfW
+z=g%(eaqjsMQjAk@FiJOfJe8{o8$;HN<+@f$5{k1SBoQZ37O@30E3zc<=(&<Q$jLuR
+zZ!3w0fX52}#xgQPGHbc7EmFO-OBsz^FcmU>y_S)3A3aBl8dtP{kkA6wF503iFTc$E
+z(!c*d%=3Quhk?@Vh)mV1l7Mz^WZAg++~+=P{>|I|E$Fo!BK2#m-`2jr&Jx1t$2e9$
+zSPFHYyYAja*`TLA1qcsUU7hwFIA~{~hW@!v{mZ}GwQJX>4a@4xJk}{Ucb20a(-ZYL
+z!%JrcXbxSyef#-uI5Bw~_97?~4Dzg;&wugrgz%?;P~Zl56gA2~U{Nf^G^c-=3?(tt
+zrp+5(|2p#*?|rXX3v(|{96KzHVFh%CA)4B~=YYBHH~*vg#ee(nKuY{R@+>E2PUPB9
+zkcu(AcVMs3sTUqg8Y!8o5!6z49K0G!-d`Yt5!q-bTjjNbwpYkQmZAaXMR?88l)new
+zNW>y)iLneWlTElKp_NlWiHhM-TOHYhjqDL?QQaubJQUEWJH=w;)C5@r(`5z^Zp<K2
+ziT9FvYH@+tEBS?sw|ciJ|4y&th`{8CscxE+Rovm@bCQ-KBi`i*je2CV(zMG>uTjYv
+zlp#ao-=%0E3ZFMBfKa-zF$h8a9>jx=Oy3pbMfGc`5wK`>Vv~_i&WjK1^O9!JNqMq8
+z-7i^3m{RoJ!hOM%Ef&?CY>A}#yjB$IxPVR&l7|%5qw`g&g=;8uWN1t^DyG~{%mWJ@
+z^}(d7Fz$pf!s#$t0_dnzUA2i;lO<|A$DB-;x2_`&h$BzlNYNk9m03cZMxwqboSw^#
+zW77Lmk`gwX8KGGR*+$rRW29M|XxvK2U`N5pJ`CD~n@Zo9k9^&toFlCci7*iHqtjdw
+zJPySXye4%0yp<Golp3usO9UgFHs2cps3f%$d}`MSalz3wv{C!l)JY1oCTleZBJ+r+
+z#hDB2(UX&xQv#AKq*$SbjaePI9yi^3i+SrWzKvLH`+-m}41J5-tQ;Hl?8%9P=DE-P
+zA@e7H`p1+VLM49fMbs~>jZce`3vL|jC&E^g4eQquv-Q?nZ!`P$?y+Mdqu{sN^pvMv
+z`wQ?MNV^-A<cRCjgL&4z&ZfHMe2t=bBCCJs`7iiclCpt@7Wmhq^!FWie9PPiv&FHK
+zx*KNAFd+X4xQI9cHsvaUsy%Z@G%nOhh?0Kl%|B`W%YXTO>L#8%b`+Q$18hizy*3Pt
+zwQqd=8|D|@`d0Ivzx+$0riN)AE$cLefZ;5GTgZ83swrSDmPiRqThx$S`xZDI$JW+U
+zZNf;Lz%`&GRO_y;#S9)PUmYvCY11G_t9*MZpyeorVq+N@T$EpDrN+=ow(5h4Ic+BG
+z;GBnWQG<XvE66EeSk2f+iB4n_Cu!DH8nG%3ga!|XCzg8Gkf3q4fMn?vN%TupB16or
+z|2!F07-h5uY^eN4K8;j?332JvqYVPkhI@D@=@K~rLn|MGYV3K5V6B+uz@RP62piaJ
+z+1%u*g>y;!c>zo(^_Q5XAs7hwu%%v=Sgj(Zsy4?suVlfb)eWM`bFITib^?TRo*7xx
+zzohF`QgU>T(o~AqPUDtP={L~5qxa*UB&{7}I(gu=roCb8&Ty}j-X8)EWCGIEOze?y
+zC5FN%j)1T9GSR*Ag*wfSl_aH;#MYE<4Sdh=o(3Ugcuw*9auS?ErRM9zEJi2F@RBOd
+zswGiaYg8BWl7~<<63fz(i*E&palgloT-(ezV220oL`PBpBFE5iMq(}Tk6cX)NmM>d
+z67opmlG1sx%H9NV0Pv0@yNzb=K)v}-{_M}p+W>&RdE+;sw{Qhzaaip{z^4Uva^etZ
+zO#Tq``TP-0K*bUTsx8!1Mzn?4*iQBoJ_}11O9rqfa@-sRm4lmZxdkcu4tpqvMu#ta
+z@{^zX40zc}2^Q-5e75WMEQv+BvlQ+0OR*_^dc~DjUj5WH=d8UFaRUloB>stc#~Xl6
+z)`AopX|O?h4Ur#FSt^8Cg+NIHSi8ZQIzRI>KW*Oq?st;MH;rfy7n8;z!-XblA+Xl|
+z`NRKc-uer_2vowaLIJT&B7C@7i8_io>&QkwNs}WLqCGbhV&4d*NQxK&c}+p8+G^){
+z(>Awvo+hb<*i^^}y}DT~1U;c0H+8E@#8RZJ*q{e+r$g$|aIxCBZX06;LzbZOWO$Pn
+zk4<V0FT=&}l{;l}2YayGeeQ{REA@m_;w4)t0+5P#Hg`5hRjrN_g@H`x<8-FB-`bc-
+z21%&XJ{96cS!l%r=S$>sJ;2fW2pN@<fWMX$+NvFwBSkhC$#PE=rZy?q?U-CAF;bh0
+zGAvCJGdY3_ro4aD`jDhrBB>NO)4WLXp03o}Ob|w)e59tNoKc#4IbJWoZ*9qb_@)F~
+zZhw?`D3cHreHBDeiGguINFq{|=Rn)a=G8dQ=ZtM5|6ny0YjZ^6b9b^jBDg0VYnsUc
+zQM{g1ZYN|?2u4hro=$S@`P?*T8S*ehjSBM`u~t%=9AS7Y#!DSG%DuGJ>+_CH(pzRz
+zA#*qdB3IVAi@9%)*KXwinI>(W*9&K52&gr+ZB22o@|xlci~kM+c>w=1HF=822cP}?
+z7tJsJ+}p^Gp*?E@F)CJL=P|;WI&sLn@P#ijfB1*LPpU3BJ=r>zJ5qg09HNP3i`fnj
+zx5VcAu@$3c>Btx~>ECbed*FT?L}x>%o6bA`yte`qZX3M)a#NP%oM`84fX~_1^REw7
+zqn)+aJo%|VhnIN(beXVzgAvIsx7=!u9Gd`%iWYe-0cVn*n#~(YHJYfXiJ$|U2T}b^
+zZ+fHo?cctRHWx-Oq@hM54gxh%4Gxc)_rLFb=KuQlzf41!@UG5+7l8~P-UzZmqy`bS
+zNz*gMIb@%Q3!mh1OCb~sm0fBI<<ts#WkFPPIlIIjZ%Uem5$&y<-m;?CC7sH~N-f3J
+zq<Km^(L8q5siGQ?=(-8G5UVKhw#1^Rt@By5PeUo6r^1A@L3T{4ASxJchBKNH3b``C
+zJtUE8Q$bigHWiOB8&t8oP6<}>*<H_hd)4i7wxr=~(esvIkPFFl$S#O3rxQwT=?UTP
+zk#2rZR)r|?D7`zSn|WD28zDC2F>ATa8cyw$_*YV;UhZMnie4RGTatal#gmvkAVryC
+zh{fPJaa7cUa6!oy+7zU_CDLal>EoeerIfBjmdM0Iqtf*hvAODc^GNX^aPMX4H?KvF
+zU{Y0Zz;*7Z;nz_8GWYJQD6<uvxK#R<DDC9sF}^_pG|EVCrp0X-5ay?(urrO@<WyAF
+zq%#t}<=Hn<r;@a`=IuzPN7#1cuo#n5dsJVIOwtK?0i>*9S2PDp4`AIuoM=_Cx8iMc
+zGOd$hAeTHvFw|Czy&Sp9agg)DbuU{fbWlH@Rz0oOer@gnBtU@&Po6wQ^}oCC-D&>M
+zUwXUwAOHP*U^`)C_Fxly5XMiPoG>qc`76!4-}O#l0<Q*!ZkJPYRZ~5_2Az7;xWs9z
+z2+HH2wt(K|Ew_9NAGb@FEJ^Kw!PVD3>sdc6Z7+jj!yl8Bn>)+VP7OL3t}TD^lb`mK
+z<;#~Ng(88#o<m6p6zsg~?mI~;9CghQ4LY4pao<u+n?`vo4yoVxhS!<j`mO6AI%-pI
+zk8AlHQeqS}Ff?lZ;xFH8uKQ2FX%6f=NEB>jkI+=nAXHwFAR$_@_C6%0O7rJ(=Qa@x
+zg1U9K48lw<%aUka#aLlvB{hIHhy3b&lAxz4o|TcDdPM%ebfZUUI>ll;7W6ZrHwqIf
+zaqgRrJ&L6W+)$cQ-EWboMqs7zOg#pc1y;LGj@L@Riqt4nbTLp0g}q(%kVC9GN~DfN
+zJrniFiHcsGVo5o~Y+w1fyGine+Eat|izF#c67Gz7b8@h2MSN4vC-8fyN#zWeV=p?H
+zEJ&KN`@)PuVNZ)58-q1UqA<Ho8ZhyAlPXg1`>1D|<eDb|d1Rz@Wi46tqLXN;l_U*m
+zvlWPEPoHFoRCU{NWJ(cNmbT#IjnYm+(EySTV#?ZcQG`~t*|aX>Ybsdlb$Q%`D~?9g
+z)S?2LEm5l0Ba`$=aX)ULmV`3$!c%>-2vyr`e3PjLs#3I|^tpU+5~W*Vr&{R)<5zNf
+zn+W8FN`fe`c(1bIG<r-q>{J;gTh*~R6&r*h$~~~fJE3cCZQYQ->(+BLr_Ngzl(n3a
+zcBFe}vPWf;)CiNDk1`AcX93XIhgRb*H5#|0){<c{V9yV-EYaCM2sP^8_>KQ${^C7<
+zPFij_4Y|mKaXoAn2G70rHLo(i`YXQ#GsU)oj@uwByO<&ti@%?O2K`QVRx(U&(41Qa
+zb)Ex2xVi^=8;8i6uUWJHHNZYTzpC{-CQ;90QRC4R8w{T?Yp%HBsy7h2W8vSha32nJ
+zn>>CJeg@!~ovGw+>aw>b!-k>bGC=1ad&SGmum9SwnsJb$z;F>q5@gi^>F|C3-@MPf
+z`yKD1akK$aGq|Xb`Zz1yHr}!?7^L?B!N`!TOknD5<lYBgX?8_LoS4KLlEynRShkvn
+z5@NLzyl7;lQng_V9&)Hp?nKw;G=sC{c2MmpNG(A&QM4-eQ3NLG|0$U)b!?3E`y`35
+zG;!kCd$ct_%ZY#Q@+QEVl{2X^E!A??ozsdf_Ri63_PJoe>5-O>8BRt>*jm4mx{>zh
+zPy?wK!>BxNA#N)jI<Kf81c+GJcE(FbzW_c)1`<IyDUqAXFnckuo>*Bar>vYe;<;MV
+z*CVmf801=T`cUr`k^Zm`2%~f7Wm*GQpSda5aj`l_or&dMD)}}o^pkHx5-nUra)y~<
+zj?zc`f^JM=e8r!yyl}3$u|j}H_L;1&uJ+W#s^?AKBUmMx$g!Yf6*(QGZ9b_w*4nGb
+zdlQn&`W%dgF-IW!8tU6g+EhKuWEGvO6N|NBy+2cGVu78#XgMR0B$cWRNV-<kPQcCw
+zM~#u&6B4HjsfMd*?Yt%fr7K&BqZmB@;3WmkE(j1o98>Nke@$yDL{XD)lGaYyDYT}V
+zA%qKM*5(Q?Z%3u2Gds0IpXVeks|1oH*$S6SgWSB#!oalVHL?bhz~PA#=6BxxZfF@n
+z@EIn1SIdN<(~cRVSN+&4&FfzGT2OAe1O{cUCUTaxeh|n)+6`rNPR-8Hbq6Xn_Vbu;
+z-SKU6d~(wIHms(B)@sO5JzapO{a8gk?kq<;bunt}qDwEoa@qK@ZPbwq?hWoGl>5H(
+zt~((*0h%+-zKMP3z96dOXoM{wwD&_W5%jG;_ZG7r7#R#YE`tsp#u6Bt@Zk@A(7fZF
+z?*Qe4qbxZdM4luuEt<@WNPl31DQP_kIIvJ+;ILgSO=RsUl7tGpOv@}6%gmR^j4>iT
+z<3@4f<;rSGu9niblt0Gf@-hikx*|x|tS#!zTJ%k#2pmPKq^q(gQ6mshmKIWg4yB{w
+zeOD;YRs=~iCIw>Rm8jB6t;C9QGM*~~aFWJFGIFUTvRSB5njOi5<jrh_S;ogJ>7~Ff
+zpLeR=Cg&J?=jDjCN?cPSFH}C4VBSe#Sqv4WGL#%-wGNP|X2DxuhzQchm14*@f`L2=
+zAX}~WaMVP#1*a`9k~#?zt+JQvMUg1w9Ev07!6hsFFpQ3UPN$%oL0}iyK_ImV#}s8L
+zKybYxrCg&>*`vq}V6w5IdKFSw=YFbSyUhM1xt1iP6?Tkb;JA^bk|Z5X0MKG~6d_F}
+z>q+%P3iX*IAb<1H*GBK-1Z2c<<M6ByK(z5cNS(-53`^>Zi`>(uvI|7lS7u?gJd>_F
+z@3I;Or4ohIL2Dr}9ELVKAC&#Hk_x4L$p@o=i}&7B1Fy@}cot`6<#5(sbfRMzB`VUI
+zqRDCMDC|m&aAT~}cwz%^9pgRmnl`Lbew<y6bbNtGgOZAMdL08XN~z8`8^BRNVczx5
+zcR||i{nTVnitV|H-VvbS6y+cNk(ZcjuDKfYDK7?@o(=T36br`_<;S`+GZgjUIWGZ{
+z*90`+-+Rwae7(cxuV26Z6;kV2+5<f9Y(+ipEJr(<X2Ss!%dfcX@)rXWZLp2h3F?oD
+z=Gy=|$6(9=%8z%6r(O(Ws?uvX1LL9#F95FjRpzBHeTli~q8-%m*$YuaBO~U9Z+y-C
+z$KSjT=8hlcSu^66MWWk!-XJ6eBIWN?WmZvqGZasgwKihzDkm8Xs_$s?SK|HVY(wrw
+zYb!AnO))F<)DQ|&fYMtr=3;SDDyJ*71O&0Jgz6$T0A5?*9T2#=El3B07bz1>*C8N~
+z0zH5a8Xjiv2>T#t<QAnDD&@jId4Fxg;-=DAm!z~z9)04}6ncYQ5ccXOR<P#F7;^fL
+zsj8Nm<_KVumvfZsRdt6WfKbslvR4?YoH}E8Vbet`p1aWtMNllpO*Gzu$#pMId!(!}
+zrvY3La+8hB(&~`32^YM*P|vyO9GJaDYSDb{Y^=77q-`=C+65&e=lOEP=o1T0DKZHy
+zqL2shoVtO5oBbag)ez`!9GR85M5wJt@9u-7b2-v-R--#M>RoZhq7p`kyuy@l?_Cyc
+zqw6H~9qPSNfgh>~uwOxua3}-`N*lVOabcD6P5NX-9FFUrEY3;kQ{q627MtO5B}uAv
+z<iO>~N|K{K<>-Rw;{^KLpT^Erl8D!ddU>D}l}Z=UXS77oJ8>N-O0AYP5M55gk(1>`
+zX<f7dm7X73j^&|3CGQ~V4FWGMf}z9Yg+OGP_&{2K%Dc48kko>b6*(OOmB9NI6F4E1
+z0eV~llhidTQOtHhU3${|=5PMC`S?dZK_JsG<On`sPd9AbXrA}n=YSIb8kj_SAt+>T
+z7AM2x<}OUP;ruX)8sW2tpx0;Du6v<gbduJ{z>*~!F1zB2%cTFZ7j(`_)Z-q5Xa`s0
+z$eJ~4u3o!l&83`P0|5)sQ@iV~yGYIf`Q_HzIp~EO0vn$Yu`jyl0uuau@-<Ip-?NgF
+zph<pEY}@_N9`m2zX50s345-<!n{q>$rpUaIZQ7<%zE#aJ6!7#iz{;>NB`e<eJeNjg
+z{I#)@f~6>aHqtRI7pC!F1_J4&A+0n96{38KiZpfq*Mg6d^TvEFVw5LFOcaWz`ty}C
+zO7t1zBpuGB(a5yXD7s#Fph1i_dA*K{%uLt`MK~mJ9|`KQSkW!xlo?Z3i4-Tp=e&_r
+zByOt6DGHvH5Lr!tq5|O}wXBewxbRMC443janLx(UXWDFwv6MHxmw>>BLiv``xe-H@
+z#E6@~eN-+}!+8D;sTv54mP~*X;Zvcy2JN{I3<@1}L?TNS=?DssL;b|)Yf+mUeWeeo
+z$`T{H&ZSbh_R?#mh-+n?AwAbg8jzYYUGaN@m5$=X4iVP0u%5(BYL|=q6x~vE0{5xK
+zYp@mVoEe_v<V3BPSYdHR0c^fER>bx~ViJMP&Y;#+l4i!ZF;ZTaJUc-|X~4mS7}1AH
+zu|OI(RRIC(ML{BZ+yy!Hl}arq3Dpf90#szzw3ZJwwLRqCohZdHs)@=u1f@O;C0$xq
+zr7mT~A(VAS=asl-DQU`}Cu^jER9Y{RtXY#-=T7TY6lGf(yhyDJ{2WTP;(qsh54qGO
+zjo!Ei;aa!zm<NuoIlA*XHSNU(neG6q7np0m`fLAz2E7eI<Wu)^VwMP5!A}Bb{nAS=
+zrN+|j+qW6$p``xEOsYUp;SNSVvoP`m6t1a_WeVn=-EW4M41vIe9oTg4mKPfy)H&QI
+z-S)WX<LTGCGxDS-U2`GGb)Q3_9{dHR9Ug`;14yIB34Yz~tn`Cd#p%RD*e--fXUBQx
+zn^iDh;;B!0D$KiB&OlW~b~LvH7Q&zY$)B1ped#Ok{vMj7I$-N;?wqblrMw`bbh=wE
+zMCQS2lFq0}&s{GOhh-JvC|<C~ji%EKqzIg~5S6_npWjvLtgzOoe+-)mMX8u3rn;h!
+zW?Yek)L)`1|H=kHPzp+?aa`n%;ztKk1Yi+OHB#QjJUu!@VXj%;G(i-SgQTtSc)7`w
+z;VY5sKQ}!Jry?&w(ijV-0Bv3gi8dLf9lIO}klvg$NG9FLnxfH?ffrB;k^5rE(-f4n
+zCB>nIWV)_+eqAYEOVcY2p))1AQRPh^>n3Ewo!+VJ0#8Nl#3@*9?@dOeX*jYB67_Tw
+zrxPi{(^N}vB2y#xLehaWM@IUAl2Fm8s_5i3!o?;)BN-QoGDO)xyG0rre;ScQjVxsR
+zhEXqCKwQWUsnyJC8mXiB5LK6k>QTaf%QceNm>6v(Gv_i>%V^W9H$o2Ko*c>2=D9+6
+zuu%vVyodQ5G0nult~ETNqbH@PGugs&QHDiQF{*P~Ph}^F&ecf-A6eeYRc&)F&ld8c
+z;2uPOmmMB5T9WEQ@m*b&DLaxfqsMb!Sh881gHy9PRm18Ikvpyl%!5c=IhAKsQmc%@
+z!)JFj;tfudGgXAm-U|YlgJxK)iSOCB$Nb8#{|8VlI70o4z4e|J^fo^G+0Udp4=T58
+zhH}M5h=iz>q#7kN+nu5Pg2#=F;Ct@77loKD*5OA-M|W)AvgL{@-DdmMdLC`M%{|I!
+z$1D)>EQS2w*3Fx@Jj+U+9W{dxjd7GUiuW;yh)X1SQS>$toObNkZq7e%I~2VDfG)Ve
+zT!<+)?Cq(^yKr{~LH^;RANi>HtM~miG)1+6f;bD2RhzR(mF9`lzA>5U!G&Q<3pa}F
+zJVnwN`Jk5@oTNS2V8<W=BU11S++`}BcOVJ+sPkK7E=!O`$P(5w;IJKal18&R86GqL
+zOQvg*_s;Lh^%|G!PKFE(#|d8hsU_v%<T$9juIc+!B>XdSBw@2f?#=PSieko3BtS``
+zeHE?C6kL*o3!K8FA!S~TsO0Kt1aN7H?RtqEsHn;zOeDH%${W>*C|9h8kP(2=`$qz?
+zAnDIMr^vJDX=bRg#GA>JigcQ%WSU6BOPU<<_mD+c6JJvs1z5$<dpV!TDhxqN(JYqg
+zME)j9#HCU|a(vN|qv4X^VW|3PtR6R;9529_<i18C97MLnmZLUy^KI7MilP<ARN`1_
+zKVJHxq~_7(SeNB!h|S26Nsx0^^>CL7B&<?RgWe)X1YT-!6j5NI+j5Oc$#+2o9%Q~c
+zF)0hpj;<3oxr*cv0+0(i4Xq6^shUX>MQPkxd0x<zcp2jDq~;ZcWI*?wh(wWQ7LhW0
+z<<<sqT7ot;*i<wJT!{_6r2TnJxsyS4jCfZ38?E_q3f!_@VvvX~ux=rpH>Ia}q)JjC
+zRc$w2%a%J&DV}sm+77Jf3<{MWH)2<mEdV%XXS?+B8^7^Q^Skf<T}aUlWFS%SnTF_P
+zGekMpJn1T64iD16xDD$!(2zK1OKk|(TL)@Bcw7T8N@4QElsSB09}M1XV|sMu#h7+t
+z;BkFG=X(<I*m>A&_&v0B>-KHS$H%uPF3Kj1dJY~uWFFe{Fw_wojhJ?tQ;|X_QV6%e
+z{D^H^x6vH=70Z{yg}a&>rFiUXNwKvcD#EeY@BYufM;8yp@4V;qRc`mtq*`ot*VAf^
+z<?p1)W}NiM#7w_oPb#X4Q+A<!gR^gPC>{hi$Z(|6PR6RoG3!0)Rd+!pMx1znE;rLz
+z9lH>;D<d)>3eg}+nWHOQ=P06Nv8s`kPDiPDsU}wB`7^O41#_dKg0YY`d?oXfbCyiL
+zP?7@HBB*;^<YlzZ9G%HRn4F$dun<`lCuu~(qMKIgUCvAQzBHHC)ZfIlU8&88`nM>e
+zdc&j+p9c|WYEAn!yhL*x5gM79;+2lBh4?5x<9m0Vc%p$ul{*<Y<RzN*^>mzAb=PZ7
+zKdWO(>d=d+3`y!50!q3>MHQ6Pq`NYR%m|AN8!$1-#gs9Lj&djwbZVeFN7^T4VwSa`
+zuB^oOM*<DTG#*te5nL37bBU}|$U_V@8L1;Mm_VUpNgR)_5O+PwzM|S^j3VX4&A>Rq
+z+=f&Pg=L3=L08ha*2sIvcmi=0&`HU4IT{4V=|?M$0@ra}uIopk<CB6z)aZ}*mx~PS
+zA$Vbo%BT^FQj(1I;A3i`Mq`vLfMgS>;n*8VOP0=IK39_^ktp4)#~h5PaWIjAN3-}G
+z_1Rb$=5!rB*O0Y2Jt&hC)8y!fz-aHO$>XLCzyGff{GIv7|L^ZfrA6ydSu7MHpQk+K
+z8XyX+foKM%m4YL`9wsnj7AZ?gQ9ZBAZWTsla8Vz;{{b_ALa*?ol`B_29fF800zR$z
+z0O-*~J?<<3S6z6*GRnxs7hQ589PqF#P>UY<u3bA#w==_%HhP@MR*@C6e%(5=6@X_c
+zs7Pby?gcw`KzO*xoSHh-NU@=G1oGM612f6*x#w;o6QI_cRfbFt(3E1dsWzv{bqY-@
+zwZv-<>iI^O#UdMeV?x=j;3z-O*U=WK^m3|0Gd|Q^9mNZ+Uhk^{A$k0f4Mr3_4j;XE
+z=~cMyv?j|F8Z|FM`S!?$IQSye>C~|5Bu*@*8?JZw<Qjv<a^FrYqLLv$qZ~Io=dlcu
+zi84BkA{)JU%*b<^E)<c^Km+XLn5;DA#+av<>i7p5S8XKHWa2TuR-lpkajYJn7bSBe
+zAj?rAPq1XoD^im%TH`Sd@kfF_$A#Y*OQT_6i_DRo(fV8w4h=HtQbksXrd-)38mebi
+zpvz<jBGl_sXuv@{nJDx{x}Qmhs|%YdiPo501ulh&V<G9|qN5i}N=Y0pbRdGJczLQ`
+z);%*y>ZtzaRp&yBinfT4ve7bGm0AXhmwgy{Tm;uv9Ix%Jrl+LdnKSM#kNWJ=y-20W
+z)(EMB8mmLzBg8z#&+B?goAaIIW=+0k1Rm0u8>7!cv@y$gMh2z8`@u@CFu5{2D9LqX
+zCb$#8=Esz=iK4YMdPADRZHyXPbK21G;6^99S6P&YoEOn2v8)b=Ai%Y&BAZL<<j~-Q
+zY~SN2j!_i)2fz16RKgelyQw55w3k><U$JtPx$?>@X)X_nFe4#h4MaVoBcmK$Csl3X
+zbB7T%W*_uFP8>Ud<7!aAbla9~+qMeun0e|vkA14G52>Jzcn}eR7Cy9X^Tu<p#uI@P
+zO6bXU0ev3;X$J3FG{lGutTdnDMPIRE9138YK*nK&@{?m@W9G8UFB2mi8j{~bOP8Bl
+zZobic;Q#$Qh=vA8p?Uy-Drrh7)u&c#+Lt5NdWQZn)>lvfN9(w$F_tElDaoeN`i=D*
+z8!i?rxM;H%36EA{f2=cQB+3y<!&n4igLLBuBL>u&(l{2%P-mYN%VHMSR6QuK6FUtL
+z>tdr=KqDxY>88{G$Hm-A*UWLMa)9LM)nK`D&10qZWh4dHs$or28`0zlFAAVKS7xz9
+z+0djpn#Wk%+{`CrqAd7W+VYi1CN+zs=`q(-dx@3XAVz>m1y$Q!;5rhql$;f&ozx7a
+z)>jvHoi4c~_f6{;l9%EU)v2mMnu@H#lS7Sys(>#uuDE%a21Mtb=XeB!)asJnSm}Uu
+znYH3_$GmP2Zi<akCgk<yvXORqj#SpL?k1_x=)RDYApCtcD;MzkEzCcc(~(J)q80d1
+zp*?y@5AwODJc3rPtK&g$D(q@imrl+{!JC0dMGRdgQ&4FnmB<@az&WiO^5G?yCw=5H
+zqLV_JvgLFXH??BO`#KqJ6;%L)fQv~bPI~Y{PLfDEIhH*a1+<)J$Af!SrJj{yu92y1
+zI6JPvs2C}Ye1Ir<3WSvJfAC)O$AA3CB&p-8lqE@wLBr^kS6psZ!$3`R=CKYwJTweV
+zqN^zd7o=dtMAt5@fey5yJoNBG(u`!6Zr{Fr$2<{_`%Y4B-$}&NZ_4QKs#R;&FIzc!
+zVOId74Qz^o2M++L;D`W7qKJn!AvQ4q3UA)Lk-!F(3^3)kb?X+hal<-7?Rq9T71ts4
+z_W%6(d(5$k2{ScylAa%B!+KNbj%wMoZ`_qSYLO3#uI8;ZLYpKiwY4&g7mBH-ZfdFd
+zSWjA%7o}Jhs73&`ZV<JcS9i^(7Cuj7a;l0_RIz6!Q7oEaNoyE3X8Da!Wy$iKdjZIL
+z&Ww?o172sBqZBsuO7o4?=r<K*?lqjI7V*@9Z;?SGb0K0$Q<jF0m<?piDbE5*P7%s6
+zd0H>8m$@oYr;BP{(A76nqCQE*S*Z_k*M2i{<1NJ}+)|gq+uY9*V~Gm9GPa`DkW8+H
+zAVDCs%8d-Qwp-+Axg`y~d9-#Fi91!yPPu=UjjLtDP9$=vn^AqC)@>n&P7{IU1_v8+
+zWUZdQ6(*RCWj%TsOHoES=<NwianJJs3UIeFMV}*fuc)V^5uD9Ma<5m=nLOJ@Z?Dpg
+zqoRN<j|pBIwcf#&#T;vgNa^Y+3BjX8>@+f4;WY2XNcT+J9+c@5lquIEf=kh^FPV=_
+zjLG-kSC5t~Kol~OjGdzEWTP(Em>ocu`=8hq_0&tq$C&S*<8woTRzO-bq{==5lbgSG
+z{g<J&WEqt)6nJJp@gE0dUJ9iew3CBS!oWH@Mm*!=%UMROF<g^bw}%fL;?^v<P%Fn*
+zUI7u)M#F<V=ZknAG0DK4CD76A)!;=JU9=t|ktJ{euy+TwUr2~<2D@uXVVV=h<Q>6D
+zqQ20I<tqT7S~N2PDS#JWd=Yt=HB}JnJQ(eK6{d!M_A{RY=5LoIaf&GqS;4oYu<CSJ
+z%C?)u1ykM}wlWSTXKPs@H@P~^Cakb1I$i4BSB?HbI!t<FP-V*a)F6-Zps-4lS~o^1
+z8`P19ZJ<sbJ}0TQmPToF?rNlZmCx)?mlty|wP7`-307teWx0Dg(H2pCRdFkYVqm;V
+z#2D2uGlgv@#>!DXyg3!dRX=OJggezuk+>Ip>iQyu!-m*YpDp#BSWEFs@!sd&a+dS4
+z&FE88fEq1iu&DBJ<e-cEeyD0_jd~iTY-7n)#=@>7)}BU{;-xD<cjfx3t3>O)6-}74
+zewynxHrATUH<7_Y(}I;|ov$S`V&neP@mO8kbt;PK^-Ru*eT@c_Omy9fx_fUP+LWj(
+zN_{QgKUWATS&%zP8-f738fxwMEH%?4vNKN7%&uDht|zTl-K(6B1TeR(gQw9S->YcU
+z)p1okk7KTL&!46%t<R&?lT0gCFSq`$mC;z5xrkzyoX}!pY_26GN;z?Eg4D;HWJ5j7
+zOP>XO%Y6qAn!oz1zaiilKw?0pI)Zi+l?+D5Mk(q+8;k#fj2X=5Sz03pIT+{^O-vl8
+z(KKyT`Cq#9!j&smo-4hX_G~E_oH6k9u-W>757H~nS-WoC4i8GJtSF65P19!Y!@C(E
+zG=VBYnq#A*Q0!Vo7Xx#UNF-RdcCFdGX(I`SHV6eRPYr8-`#=6CDO6)KsUPq~<ge2E
+z(1n+KWn3kH+z^RQ)jST96`C_RgrfaegGF!pDbyNlhP%*<{CPADU0++75z7CUZlUJ8
+z7n%K5^^rFD2B7G%aqi#bF81mpjP~~D8EI<bGNU<Gk(+CrTrHMpgw2%;&bCA*`7G2D
+zTi;_g6L0X4$}z}hN;<ep(-)TeNHWhmmO#>)(BoWGqlX&Rxbm}={*|t&#{?Vg7Bo6%
+zh1qk}wT|T)w?b}%A*q<ucuv_$+0gscxQeD*Cg9{20-=Rl+cQ5%8}s!sS9^GT9zpfQ
+zGGj~Y359}9eM?=_cu!{9MI}(?skQYL^VK!1Y-q!Y%U0Kw5fJ(8lg+eXTim`TAt#jW
+zm)8&V%7ko$ZF3@D<GvQZfm2T|PsXXOcdWASvC%tcvM8<+0LrWK`J~vWYZgZ;<P<xP
+z;|OzuqZliGNz7^P5KNB^VHRPm6vgu@(P%rwhAetcS;~VmFz)5c;E;dui(dvsn6W%U
+z0l@$fK<>X36$+rAl89UQJJx&9mLko1Ib@m8;crywvC$r0GjaH^r9p(=Ejw?=jukx-
+z&v(pld!!N1eBeU^-ymAqykY&i%h;QVq*j1}phqChM)SwD0~$^U=jg12xeyrPv>^Am
+zWDtR;O$|@j%M&UUR`d`s+PV4WZ<;TC^~>f|XSz%kGnFc`6l84dxw%oMfY=&!s(OJ$
+zK}ig2x0s8%;kR6{RBbZVz{=rjl&OZcG9|VGsX8TBeZD%PsVAtE@yL0**i@Udyi!x)
+zm^7Ay?eUpYwc(R(0->wffXU8zbt>)Uz2em6n6niPIV8yX4qe@7A}$(BIw{6Fbg&I2
+zi$+?{RdPG2>S;<f%=US4(ouF*FcNabhYs7zp?6caSde7$Fu#7Wr>P>gJdjVNjH-yF
+zH78lXW35f~_tbN}RpHxI%%@!GN<8?@Hf~dFc+3<n_n=0ov<2xfwP0D9f>2*4jbIyV
+zPnd_5jdv9-*_tvnp}?g+R*jdiz1Ojy4U0_zPCuiR)1axbD0`=em`a${)RE$X)=tvQ
+zPQctYkIS~yfsAu!U8Opc;*=LDM3Hh`n}ulUm6AHDPWmoxP0DP>;tzI#6tK^H=))f(
+zupEGTPu;JB{X0n3;yTX&Ir!MT577+S-=w`=R_N)l7mpk{iuN)E=#yKsX6<%qCLJ*S
+z$0a;scH5&#we_p*;MWoe$(F(QmT90j1Jlf+Fz7)D1E(SCaXKSH)P^zi!(3wv(l?-5
+zO&0}!M~R18p&&16`2FJ_{g~OmcRvht>#__)9Vv+WPBhp&l%=_V8-j*;EOU}zC~*Ng
+zv6PEWzRVrmsiHmF`J*4*)s57M8sKUgwdqs1@1`;uVUCGQ^`xKbon!CKadYt?-!6{K
+zY9LjG;@a$YO{GGdML%7^sM>hR+t;APeDJdE)$6sY$0eF=-t=WJh#Q&unxRlR8(Eao
+zg?vwl6_*;9O`c!&2}|On|DU}#f41$a>PP38YwvSzf0LW$0ttbHK(GO6M4s{lr34hU
+zY|-*-sn4#;(pOq#`GaNiAE>4Npq5stRaW^d`(6P>It2uYAOw&;0g@2X+}zymoW16F
+zb98f#wRUrwyU$H7nIpAx&)IvQy;nQN9AkXO=QB7EzSJ{;iPvgyxvTuL?K$4`mDvFK
+z*bP3HRTZ2g46gB<x-iU?JexGS;|#+K2Y0x|ds}Hw>f~%U`dgFD<^YAs=VF61QZmZE
+zayUa6Rt{2Mi9d(imIiYK-5`g?;27TK;*P%ydYAbH*A+#}OdMcChW=sh%3?nH<U^sz
+zoOpNG4P0U@C9f`pQN|Q%DN`j5Ak^#L=E?eU>{Hnz3m@n~JUB$omTW9(MFow(s;XYu
+zv7_(4l<9Qd_0D&O58g#Qn8%80sZe9}j2OQ5+H1M5L-1;9d5F(F${7$-Md@e(Q2{-Y
+zC2O*XTt;cn!gbeQ|NLB*yGc>Y3xm#HGoSrtJmYMK;{M@G&2a7E!$)8%Q!(Tn1lr;I
+z@4sI-!=UoIPO~o0i7ZP^)Hnp&qYQ@{xzz7Dl@E@e+o81a@R4KTp)cGY-ukw;W|Giz
+zLG=oY4v4W48%gs7!CkJZ>w|6;RA|tlP<4RPod*~?{c_(IhYbY>k6OM<PF)n-s?Y9n
+zpDh^iF<Mrj^&f;P32Zd`g_10o!lDbDI>;tc&s4_h=SoZqqGGKzYb3R)a9GewFm~di
+z9b*R~%*S=F(-JTZGB)NEa}E*IgY@G|%ZBDBV8rrakt@Qv93KW)&%UsHFV0Ye1aufZ
+z`*HA7$axJ)MHfTMdueceOq0OgJKIV(Id8{}_Z{mow^@#|PsvDZLkZvralzfUT=pJE
+z!Kd~?D$;7WD3a_2j0bJ-Ax=OKee#$_-{)j?OSXy&HZ_&izjq;nD;8n#?y7iJUp_Y0
+zcnm&!4NToL*bkm15+`M7@ibpZ)}EW?X*gg&>2dxj^Kt7Xl*~F`lrweJdM)*%(s*4*
+zq_U3foN8=v>aavbwLO8s{n8mnpMC=MBR}@Pp9uf)_P5C$rVDcmJOti)dTwDbJ4|kC
+zP>GEyQin5H^O3{SzKN!^oCDB>^A|EP>7(rI^80T+cI?;<K{R?`LAmW<N^K5Cy(sH3
+zDD`!>+;Yq9bP;5|?>rNiMT&AC<_iygVbHgrPdb)UJVLW&HBxPOZ3cS(%{Se|$hPER
+z$8@81o8cYrdRLy?`B<j(-clk<M^7HQLjR2_6DBn9(NWy{rFl(5OJ+qnFXh&Qx<+!O
+z)ZlJd(2^l)S*<7^V;DDBoDNSdzkzYTO<YFg`beE^<0K4Lz;<tfl@2kf$duq(OJfm-
+zx5>-`W?7X&?LI-hNle~AN<6Uy&f@l2sBZB#DaXuQ4O^(|twe_dH(#gOupIW%qpIq7
+z!H@xi+iyfJn^YgDt_N%Q!tpBF0t+s2+-|cBR5H#6XxI-*Ur`1(W!j|HPf?E-*f|9O
+ztw<Y4MVXUk5K&N=z3V|Z>9o1UCE_?}4i^x0h<3^95y1sV7-SxErB0|>6DWaYvg^9A
+zE~Drx1q<2|@H#JvYds&F&uZq%rM_Nliys~I23Nr-!KdtMR~8B2?xWt()(n{AU8FXq
+zgH#0g7Om%D5V&izvhx24<2yKQs6~EtxSZmvr>qKUMMnTP<33=0ov*L_VUOl4<?V0(
+z_sl@>aMt7*mfNVjcH1*=WmFseOjJAMb16U(+ciB`7U0>aH+1&QS>W-PX?N_FXWe?#
+z1)dldkJKC}sx2-kx8=%Lciriy-SlkARu~<TcZ5oAXEU8Q7(G25fT<wYq}DhU2=zp=
+zo~J$Ssodc8pn@q;LgeS(@s9t<LF^%A^9R*H2}MaW>CZ_eb(wKjdnzUw5HL81v~vtP
+zOx(F9NGZ*rIx?qR7z#|&1su?(xLro5%mOefb>X~&vpO}f!f7Ze5cm}{*2v~_Dl9bX
+zabA+G^0<ql6G$1+f<!DqN760s`)g`tpM_AJKiKb+1-`HZcy!$MLyCJ;1k|9mU@#_=
+zG`3YX)J)L48?zCY3OSZ?X}u-wxY@Dp2Mz3Ud^8x8Ql$&l;Et=E+<|ZxS|G>5z!2uL
+zGZ&R<)jSz4I%?TaG=S1*t_PiDW?5XhIxV`i54CJK*Mq})bI$-&n`zkd3SOzxFIdo@
+z4R`)r)&yao5>h4NQ|~IK!oS9gK-77jQ6}iGQIpA?mHui!s=)f}9K&2~!nglQK2tR=
+zV3z7`C%-<dtk>2CvNvMyv#@%UdF>U!Ev~BMy4|DTgxKav$)o-0%2fDp(KA%&9UW}D
+z+b8md?fm?m|MR}^p%49UrqbCQpn~aV@~<S3P5yNw`&?>Q5VZSHUifcpOv*xAuCbIs
+zT#t}sHqvO!Gj6{5#!v}Emm%AB4XeH!aDo5Q%wn^7%?;OGf5&#_Riow<1r?gL@v}Iz
+zO_b?SkRe?824_1PjDEZ3<jIUJzjgpBpgQGd9(a1-f&0UqcfOy8MZ1aM?k$sH(E?hD
+zDOR4E&%Hu%$G!jqmZ33a@>i6K4%GF@H9}F#QHsI0Ra%lkKGRGu7cJI{50n{~1*VD&
+zw!DW+>b;a(K)J6(V;)%ApetoHpF+8Qj?*h)ti4GXV5)jKnljHoE+81K_CW(pl@CFc
+zfDu{{&IJ1!48b{n(B2o80NWS2o}ha3*!NmOs;I3Jl>Cm^_ROF}CSiTXDzq2O(JGsA
+zq4#qNspeFzS_-wq8I)UWGPq!c@RIw2UEP!t$lUkV-jJ0YV=z5bJzJ$$h`6Bqt>rV}
+zM0HZ%AOw>ThJjCMrV6uiDF=bic6D0c%Dd>|w}vW&`GqL>+EovO9+fX<qU}3|dj2dB
+zS>Urph{0v_`%+hNDSU70wLb%;nz2$g42ym>B^Avmxh$j0#2pyNjx`2X)^no~R`S+s
+z$}&trV%B3l1E={T^{e6HY=lI`P#dHZ*X!?#A_Nu$rGudk`kleI1ppMVVWl}cr&zN%
+z>s>=tXmv2i!L>??%=diyp71|8_;A&vtA3ZNNY`Y=(HpM6K}y5f_fl_%XRm0+CkGz@
+zsJCXe$1<dP`{E_8Gv0W^>1XHn-4N=nwD11TUIWiEL>tfV<Qn4f>#w`+=*1iy48KMJ
+zqwf{kN6q9MWeLVdJ3QT(aL}OxK*xusYbhwDgacqf&hx@uANsJ!9%yaZoQ#yZj4%-k
+z@02X61z=fpEkGTq-T-t>&%k)M#EEq}3t=jVGe~-)LuoXcR(vVEq~Ll(;N+YuvW=y*
+zgX-E?X-(<bYZF=U{04DGCq;~!0%Mol#U_rkbES?7xRL#x^rICnN`T_t4NBlEy|kkK
+zp|E$Yk3e6u)tOQ1qn=@v4+kxA&4Lhs3fvltQ$<#A)bDpU5g%vPS?P<4DRyDlYtx&N
+z5kRwAzL|mb?<!~l{PLX7v&eG?)fhs3P1uEPiE6MlOO2p}lEMg0!L_8$Ndvp}4ndtD
+zC@97J9SjP$G1N@cNG0WOQG%`S|3OV>O2?!uwv#~uoKmO|<rU`yt`tXA2CUl^?6`NK
+z>_1<x;GAJh73QtSt%vIT1DH&Lm2aJM)$_sElTx>%s`fG?07C6?A`E(;sHHSHmso-u
+zmhv{1@)qbl0mAvh`#=jGK4vrBZVgoC%=wx^kJ_lpy?#L@3j_!_aH&wM6<C2pg<t?j
+zS*=|I7KLZvQ^``7fTGL`?!19R)j|ofVCdN%9Z<ngnTaJ1&S!#9l1#Wr{FRfb423E(
+zn0)V3Gc_6YcDh`0n@*-&Z6bOe@yk=!OU`7YIf*!*69*ERJ9_Nst%s)5YaGDfvQ$ZT
+z3_J_^JByHQhfbe<>T$|sNLCdHSdi1RhaY~#-R#KJ+Z1dl!qU$ZhWAOG@rF#{%`iWx
+zsi8H<?)tz7!sj#lfyiMixgbrhC+TrWfblH1I%HM=3d)P648}5<CcIrqC6Ngs#cZ%j
+zMIw~%(clTSF{*6F!8CbdEq{nQCpbuwsa4j@ii=`V%W}QQ+cK0JRCiuiKM8%$whq(w
+zTIv%<<K%*u>e3`B0bm(4jH7mFC&ZCfe`ZBVp^^ukuL5SJ7ItI{6mo;~CE(f0yf|qT
+zijvM)0aERT$;7^6B*tzy-4R_!1}sSFDj@~c@e#qbPH)t*4`31oeQls8D9FGrSr7+V
+za0Hiq0+zte&K9r`Cfa2rnQ1I!q9rHL3=DN1rzjZP5pkM4!AYd!01Jw>wXRYNWhJkY
+z0A-O|&`nV?S<B`MG||e!RYm|(#b76=LJ6fLj3qna#er)1M6`2UzhmN><t(<Q0mRBf
+zbuq3gu`aNrfigP|`a7l4Y1-HrOTRO!l4w~sDZf}PMcMXil|mU8u)|t@8wA~wxbu<k
+zR1yG;eL;Ws6$QX5oL9;u7F030^1I&4q1UWRkbcQh^v;e)S1J!8vuzazteJf12mRr?
+zs8p0~tU-!r$~d5_=zCu1e<({?-*^85+P87eJ|Cacr*Bjr969(<pPi9z?31UOg~>oI
+zQJrOW7&w=M+0i4%ZaZ}R_%&g%6!sOF<MCf+sQ6<~eah)m6i_lvLr?H%(uFv4_EA}t
+z=;P2-gAO6tDClUNkpkAKJkx`&InMo^e1NvL&Sy>VyLgfox=y)Qbdp&G$7Bdhr%=jF
+zhY*m8!e3>TrVD!}nucZG2V?MByRM9ur1q+Wlbw-%ps6S(A>K$v+b&YLsWd5j=Qtu$
+zyhD#e7^?B(Ai61<B+8QI=CvEi(V@gRfF9R!K)o46v&0-?Qsm6A&0bd6OxD>|iRfA6
+zAkSzW6eZ0G#Imwe-7t+WSa|n>1Gmle28>EYgD^x>@w9?wCY%AP7K@2e+j=-Lv1hM=
+zPDvo42D0A4kRyPqeWo%8kxIFy-Y+rWXzIjZ%&~$fOrWi=nJpw6(TSzJf)PsPDry74
+z2s}kuR!gD0paAWWqxOnKvxg4d#Pz<QOyH~ZgObgns3Itva_wYThT0W~JQf$h*QrUN
+zE5s@lOie1QY0)y%h9_3&75dUn-xtT*n-U%-x7s)L8ebwrWy02H-7HKjtP?nZ?ika!
+zFazku#5kDl?@J@lm*Iw)LsB9M07V?3pU@LcAJsc3zhfCL3swI~la_uk=^b@U#QJ%$
+zECTG9$7p?6EaHlmE%9#Az0p;$0-Ep;)Y1;ia->qnFQqjZK8K3B<!a$1d@?gk-<OB>
+zNx~aoIB=e;Qn|-|l(QUSCZLuFE%50aQ|kjFs5)>yb{SYet&-g5q2n?=b>hU~5wdL=
+zwE94MJRa|HJWH<L%H^2MA4E~~?Af!KS^8Y5Gj<wL1wX#YWj89h5wYFT3^pKm^#El?
+ztE`;*-FNQ;;o~3s7(=XiRURGmu`~WDP{Kx`AxUX8r@~GsGBpQXt`nn+iK1a+M1#q_
+z-^8~d)r+$JEHc2MAcu@vUKwb+PzJ$*HdmRt-@36XIf~K9J(I&ONhmc<cmq!K4hfXp
+zO0?I%2USyr=mex<D18&#79-fSMtYA>C}((ek5<r-=UBWh|1C>0W6c=E^J5vP<zp3x
+zvk2XwgW!kWQbi5Az64-}qgolQ=;V~3sHHXsqU#(l7H4IB-ImIbQfuf?niAkU+@n%z
+zm4_IVE6beFkPvBNwEw+9retP?sppLc%mPDK!5AFOgIt^FhCB<4cuf^b9|ueYG-!Fx
+z^|)|^TI*|wA2h&impiBn7`lFEm77KxIKUw;6EBoz%#sa4hTFx#i7$e5u53l`6G2t1
+zP;=+_!B6-UY3Wc(f1SNwiCB%9q_ZBR-W$CJchDf0)UWg3U{cm-EmRsAXK6d8K_{Q2
+zCi*z^lAX$Vb5FALl=?by3%1A*ZXB>{)&jGs*Xs5{A8S_T+cvR|YoIcdcUr}mIRH_w
+zW$yZUfqm+O4?Gw?@u^SN1x4wZhj22_Po6w^oU=pnuY_#tH24_UAQ}8WpUmxx7xP%m
+z42kCHw%cz%rhzA}==1CfV6fjFkAD!N?O2|{xota3v(9D-D8)OUGnB1NQfGBm-bqdC
+zHo3PWus+(+j1kYl=g<I!AzL>IpUWCPpSkBAU6FNRBx@u8Pa=9HOvdVN6s+GV@gR|U
+zns^v%)5oe)lQe^hoY_dZjo+{T3W=tJwx(2Z_Q~X|LvXU{p-@_==oWnj(~rkGXx1yS
+zVKULGSlMu8Ns2{=frF(oD?|+vy!wYuX={>-snr{^OtUb|S7#1Tf-@L5ncifBTS$91
+zm5!!vXL5ay)Q=#%4*A<z22o_f)1cvAf@2D<hhPJHb|lLYm42Sqt9z`>+w2-KdPWh}
+zN3r=A%c^4ZVq!fXi{8^FmA)VrMsJp}4yjatg3Dk)^py+9QD#0owiwFs?LuuKsfxPv
+zWw3WtNwHj7og31X#7iBw&H_oPrLt%UBFj!da_xqya@p&OrPqxH@N_>=IMwL9&B}cx
+zW$3ZH5czYxPI^@;E!U<yXLd7mBEw+E--3%F%lc#}P+iHZOm~-jnNjaE?q~E4*=ENM
+z>+ok3VYPbDl^7L_POEcpWTSwJ0sP!ggtCxCR|SDos}H@E2m4s%&u!lnSkz;xtO_dG
+zP?(u)LR2+0Ai3Elv`nurf#1+?Hdhx5s?`mR=j}ds>3o)<`FIw2n`!S3%RO``FY-@j
+zAQvt8CsRoTCakdAaS)<`eh%E~x2b18ySSAo!@cpw8&4{-4Z>yew#9t}oiHl3O>*!!
+zly~Na?X0&$gQMiSY4Vk(UaiSafrfEFIrz}fXw=Esn0J&3>^3$Afya<=q&4wChEa1Q
+zPJMM?jv<#Xnq;!W(KX%rIhH5MT4E59$y6xmja8R!%~?#!L~U9d;?z@Ag3LH<I(Eqo
+zMpE`vN^`L=Cqt1o5N2!RqB5PBpur{?f-d%sIXIRcmG!JF4}yYYjhgNG&^)Ad<eQ8{
+zw2T5Jy8c4w^}enpDi-WjRn_F886=yGS1IUHLK6)XP_8PUd8(+U%5Mj!6sx3(n3S_h
+z&LyNeXi-_J<p54ByGlvV2`D&0GSx}nmEq4|{W1zjMaV7|M{IHwe*QLsQqE%3q0Uqt
+zr5@9n2BV~zD=$_;U--48?~_WO$F8To)3Q?^wQTDU`le)?RCh<8n_$JI$H9<MUwFa#
+zVR}~vQ>#{#EP6T>CPRlqNm_0$v!;D4L8B0EYGt6a@1x@#!Blbzt8;Ihd&(+3v%XrY
+z@MuF!^7R^mil!wkAsXYlG7w}R!tCOyx*QJ1$%#IWW^865Ip&~LyNLs8EYw*blT%4<
+zP&$<W)7#?R=}uu+d8cN2Uv}j>wj?JNx%H@v-QJ>;`VpaL3WWt%IBA6yzpMD3T8vCW
+z%ajn6=r@I;N?Vpp$kH>P`qZa#f98^uv7J#l?b?&qD4LBPz)aUHLdaQA$8<Wj-BfCO
+zELW~*CNukZf>a+}GRL#_QXA}0Zkyz0)v0T)z4n?*TLPt~XnF43xjaa!s4$g5pqeA~
+ze>lQ+kux6p_e92)8wF0;uuh0ZK7IG6Gpz4iL3BvNG?kS&OHB9GA%d28O8q`Ym4sI6
+z|Jc=&nX2<OmBUUQy+1OY1~XKmzoZV?r^a2V(#aMGAi4T_RNDNQibLnmjWr-yFfht`
+zbLObEVo22?Kv6AKWzAH%pHixiSZ){vLg?*}!Ge_V*i4G>T`WY1+zaa+bFoHy+Gf_u
+zQRZj?6ezWbHtNmcnG-P)IxZ>2S`J4OyYrJ0QDwr5BzN5}lN!Ks4#Y`xZr(-$jDrd%
+zE6K$YK;)RpvGz16Tsd+SL5f3>02@sJPCyP^ZDrB7+O<l3MLgOHy#iarq4?}MnIu5b
+zh>>7wnL7t_R_d&JH_3GaZI;BYD;o#s%lv&()@Usq2W7)W?O`hLqj%dwIx*z*>jDXw
+zpx2Il<-Nvo&9ihyU$4RFO58~+2G&>QVO#aeoyO)#sb5sp+N3>@6l!0WnX|S3WrG5#
+zmt&I@M8Wz=$w^y7oTFz-%1(`1{V;Aczo3;21B*sbVc&2IO}>{w7mrbb0sYM9En54g
+z*9t<aWTa4;;(aA$qUUnvDS(`Sl*xXho;O;>M6D5shLL1jq|kis++*Cc@v}UWd^{=R
+zvHm&_k<#_1(CVn=Hq;S|t(-OGtPKbymjPh6Qg!RV!3CpQ-LmL5$pfLASzxHUkcEjT
+zxR8!FVZgZ+%)Y<lAVbP|l=;{W^8{^v5IwgK%#3KuWwxyh<NM4#pXI0v+C7VLFg{tQ
+zlvA%X7jsvbE(+^OHw_do_!dmWs`Tw+=~Y1TLubRnuW6Jd4GOF{8l&qQ$@87As=9(Q
+zau<B65^8p1+65UyMI~_$v=dP>-tN*%Qlwl=1H^|h2!mG8gJw?FyXe$41(gKm8oELl
+zAZaG2H0+aDr4%giTVV>Sq>g3;s?Mn^z)I8aG>lw2MCAh!TSHY(mCptZhS3FPF3G97
+z8fQj)gM;3zex}=klJ>T$xQwiz6%AG738EtRR0Y+S8Do_1=t3<0Hi;6clt`1Rv1-*-
+z0z$IykDBp-lx{(?=jfXLs1CJeymcW`1m?8#8+CDH;F#n<1*sI+lE`HwHzwfA#bp#U
+zmYycsvF3~{>1W!)MsvlO+@JMj(G*i%P+6v4`mVOfDOqAHi;7@@(XwO<mLZgk!B+LM
+zP>HovtWqbP(@Cnqt5f-UIZqZ4XI)j|?G=n<!EY8*xk9-d53vM?E)@FuIyG<iZJ+df
+zny8$X>Oljqiuze*WEtsz3Ejl+Y;g(ocyytPB?hNznqnO2D<#b)sg8Qz{htr#GPsKt
+z`F<duq9oDhOgE<-WY`DC2?r$d%M%Se3<x7XLxE?DBxo`m`|y#c=J#y6A=0qltY@!1
+z9#{aSp5z^w5W95Fa4@6QfM~TZ<l3MOXIayVcg&D&)ZZZ(A2Au^AyF{en-cU0pl~7F
+zpIKM=29Hvst+$K02U9~7U7J$An%l_=C}wu#E|f;3*G=iQ4xUmP5eB+tkRfF>Q23G(
+zX|-31`sjvN6ECOxSe?nFABw19tOz~3`Kqe5A*Yge8AUzH0%R3k^<<&RiMd7YkNCi9
+zH!c=uQbmEqQAnC^ILf{XOqQ}+2-YJDPTEu@58QXy@v^dEKd6QFu8itM$5J7IG59N3
+zFG5Q=Ni&z^vf;X##3E?NQrTtrPX!6h**hA3E0vgvY_uZ0I@qfAUCT=5g?&$g0+3}m
+zcEwg^Z`G;sI&LsLcc8&&z+9}0mfixmqP>#kvtAJv>jEh`*7jZjIX=_rT%eWD#6nS1
+zyKc6yvTP6wxphA(ZbNdJf0Sd|7r{0+qM!g0(0=ViGnU@<NvS-RH0!fq8dX?t7Hc^z
+zYIaE+kADC9(m#u(XNjt$TI3)|gf9+fKka%4C3))uxU4xi{=2%+?6o2w<xVMK+kVeR
+z9qOWO6-0%U7BNM!BWj6urX{sl(=J}9*_DzMK?g#-OMRM0@+b>2OjD_C+&e#dJX4l!
+zX38><*-9#{QIMH*QW2tlkHFa@OVV#&x(GDSlY`WW{5UjXFF5c4(q&O?Bd2bMHVHz#
+zwT-l++ZlehMe{sb9+T@>u;LbkqBgWB03F`k9D;;Y=!r^f_h)wNWCz!MZ6Bee`Jk(s
+zt~9mdfNCZcq*PKEFu3T1ZZ4oJP~lEh3|Yn)lcT9f#Q_R+hOSQaJ$-OoV=8DC%Y33b
+zP1V%sA(TEqGN(+)8A!F9XAoVzQBz-6f|AzD%Ez*osC^Gx$wP_*iDv!`RE1G>?7hoC
+zqLmUHawv>~5Ey7fGn-Bk4F&S6pGW-+@Il7uve<c}wJag#X6D!;YFWdyU`#q(pz4#}
+zdNjgFY_FRXGhYJ(jUWYj=<1s?ze#VxfPE=Rg63~CPYkJILl|qe8x;vz+tcd!%ZfRc
+zQl#|?q~%`Ar-kO;_rdg>@ik*TLY2@qCv5$wS*(3Y%ivM_23;xd>H?=rMg3GfJd~c3
+z2%%xgDs5vp(2}z!XVh09h-9HqN>82jFR;Wv-fz_HwCmBv8BAh<?x!w*E`}@{)axTc
+zStxl2Z)HTzK07QZRF+ony8`f$g_s2VPSrjO{znzmOii|wU#)6E+tk-<y)2~4@wf4S
+zSb`!rWn=3X$K=3EI&RT9Qd2|XSdUaPmskK5Ryq%(MOmli^wd|uJ-goIQl0U=6u8xK
+zHaz&ygN3=k+u=McN&};OUZVPAS|IQv`@e||h)Y40Do&&@kca+{A3JvBnlL1D-xsoN
+zui%1l_QS)YnQr?yp&n+r#6~CPQZA8Q$_&+pa}S!jacW16EUqca;3x|dZEns*WpXs<
+z&p#F(e&mcgg^G{0W^5|+VM!TaM-04<Zo>d49Xk3$fDp&U#E2@k)p2v#AdtbRZ4l>=
+zbnp1<-HbvJpt6_T#IX${_NDWh3O<-_EX&M-)o-!Pzn7}IvD=~sq!g-?FO=%&vK};;
+zZYnoDpa)*WL4t=mXJjj@!pIy2x=I6hg1$*kc3bKO6x_PL;K~$L=k#Ryy1EuAX)W_5
+z7|6<)OmT1f1LkPexu;rovR+0)S-sNsNrpMp;px3Dq$0thD>F*T3shED^9W4Z7qC83
+z1(2AtuTsXTyv|G-eJwp1xCHuCdL?L}nZAMn7>U>o=AqT;RZvRNc}cO9Z&K_^A2K<4
+zZ7lObD00dw{p^7}sbocR48ay9>X?#WtW#ycz%Y;;NTfEyxdNf*J~^GBu1Ig!W7TWs
+zIniJkjgTs0349o;dZ!JF_P(U9*)h1qXzFVw$_ot~y1#Nx(?AQYWNYY#uzA=VdqtYo
+zl48<pAO+W>3$bL=Q3G)rNkG(|p@-^r1qyB%Tb)yL?9~Q)#+o;Q${$l@h`<03J@{Z4
+z5<Y6+$^Q0mCI&T7L03?18iX`Uvg5s-hf=pLT_C^RW#!UEnmkv8By<d`-njPKjCLTX
+z=d4ExDx?ldQ?DF7SpZIVjvH8l8J|Q6K+H}(osN1-vVuAP*x5`n`lwDD_e}j=DgDbl
+zRpm8Px{orapu8V|m9Ve3f!2cRsY6*sCD7=~K_~egtp;cS3g9l%vN1zijH1cr$u7YQ
+zwdouNR8lN<l06j4kU|CHC`*bG4Cs7Ds>64J+DVmC1sqrbDs+iU18B1gwRSd?2Y}im
+z(@e)M7@GfJ`2o`(ii*lZom1f8))hd4htYO!*u;8o2p)k|LpS$*O6jnxGaSA@SFnt+
+zXroBYN*ozW73<157Cc4gw3S>gYyB?E@<4iM29h%rdg){6Z9nOaXd$}(ONH-4NQ1!M
+z57>>M^bzezaz0j~Wa;O^6QzabqW$ccn!#ZCQPweis^!ZlGe%K`_(G_3QAIFQvm(>K
+z@`yIeU^*==f-51zK;StAPg~2RzsdBEs^{p(1#t~75`=Vslzc~m(pQBtZw3sZ2V?4h
+zN+!y)LQzX@ps;n&?1=ACtqo|IEjsk4T@QV<zM@LDyVQgHhs^<&(S;%#KP)-(-)m2+
+z(uG!OZYx3B$OI_MN6>!JL|2gvUWn3jidx^6KA`z5lkcegoLL@idF0_U#;#L(JT{n5
+zatPE%r?On9*-jiiY(P8vle|vKOG!c?A3r%+(&ITWRNFG_c6a2+@l!UPO%Fo1WoZPa
+zbKn6m00k6u1vN3zo=@kRU*oSOWE}O1svAto%?3lQ6XSeBEVWo1iAa~E0dXk21eM0a
+zX1~F)-gMxUN+Hbg#V2F3_Ueq$e>A$0NOPJv*Z@R_SxBDjF_eK0nKA3-Z(}Udyi%%z
+z0jXh8J}TT)NgbEXgAa)(HCnmRG?|B=;1Wff-iG!1@)uH4GS-5s<I>Md<0$;v@hQ7=
+z=_QC!Wq}#m+-rX)Ib~t&E9_MjNqN2q1+tvS-uMw5jF+{cxG3SS5yU}N1JYnurP;pV
+znki*G=k#mO(PhRE${?&|EYURVz`5;CoxT-jT!z8)PcfE~VOSta7PQd~+Gqm^s$CTZ
+z@M>c`vz0sc75L%HWRQmRB&iH(hBD+i3DE^=>z&FDCpQq9+`^;Be!y*JSa2(87RhTb
+z`salAFjNFXfnS$%XMNt`jat91%1}dEtX>5pWLxiMxcK^|%)==|dW2$c_W||==zt}Q
+z72!EZHcYF?IJY2)4iMEt8hON2A@7PdWXO4}S-2!a9SL!U&*zM1HuHURg-I(ZsQ1ZT
+zCsirSeqw=<YXvL!?P;HLg(`-{T0DE|_e}QD)A2!wF0*MawQVGA{?QJcKYyN?2Feg$
+zsUr$g0SB8-c1}=ki{szf3<sq8V&^gxmeB6~;2)F;X;emN&|$mc&;Uo0jS?(OE&&F@
+z_x&Jq>0L(SlBnu1p-!O>9aohbz>ywe@<i#z)?l1oy1h|nBry3CAkQ%!zXo+gbVR0=
+z$|Km29aIOG^!SxtJ)nlcUUz>ejMWbh8NWY;P_w?0Ep{Wv(UsCjl_8h3FBS&vP`L3z
+z?`AyQ_&s20NtA#VR41j5=>X3jh<Bd%BzBIfXkbN7mHt5juh~^eS<Bx*rPIMac#aZV
+zqztrF=Co5RSl4O9UI{vT=T5D>+4~G0Wmb#dH&e+Fnu<?p#PpE{K~axvsF$L0;i1!!
+z0U;vt<zXn)mGyd0cAfftB08EbRtao-uD6>ajY47=(<->@XSfT-VlfFSKLM#ML_~F?
+zAKv>;%A!^Wly@;0PzLKg3`0E+$*ii6h)y{apiqTy`8KK3>>YV&`M+kbe9ab~NGT(8
+zP)~h5s=YEDDre+ij<-U4<Xk9`te;P|Kqw2Zt}Lu9yCXO>iDr6jGxImpS0`y2p52*9
+zpNFba9?cfqb;W(f+`pe~Z$U1#ZH6J)`@SI6lU+iomm%92f}d~vlY;(}!_7fQq0drg
+zi*=Sq%WqV6Guj5y<{2W|<g3qT6+DWx#<l|BJH|#Sj>9XizFPB)K{_zh#ql+}N>5^X
+zHsG|Vl>Jv_o6)@=U|5|pG+)Vhco0t6ZIuWTyylNz^+V;D8ff<vhf>$l;J?RBaszn%
+zcXZry;FYt>iYz$?V3a0R*sZdG2RD5_;M~GGlVK#LfCFV9^>a8Zup}e*gfj4nP+570
+zn~QP`^?)-lB|}0Flc?Zylk3$um&wWYu#iRJyh}RJhf2<>01nSwPwrF&{`@f*I9@#w
+z395bzmIX@XBS`v(5uH#Se;*d-1iBO%3a|N<yENSUt!<tpr+Y$(J3%4j##{i77Dii-
+zUhl{;>O(C7Na~V?*Hx8>&}{)Not0yZoGF1-AcBBm`rw$A5nQ(8haez0KJIdD3{>Ul
+zy8zsR$}fxT%0f3NZ2M|tLN$_=TpqlpjVpKeZUs?LY<7QEKVbLJY{hV+<3e!4?<gF1
+zWx-ZuB$#Gw(id5AbR|VEwOg3b_2hW(jCRzGP*^X3$8xKJNJF~-gGCTa(9<CQM6w%U
+zsD=Trrd#PV1H#4JI+<<vSw8!kLk?W9Z=3A$eT$-7>BZ#?=1|`!1rS7)LP$dNsB=6P
+zc(}9x`Y#2bE>?|<VQl6AHux&6caGiUriNH9M;NU_T#E0r0t^HC=fc@k231WL$5x8~
+z^>TvB;Rj)OvmnBN^GSxkyjIWfn!*yiAXF*tSV6CYg$@iz6U)lnUd8#<B%%wDqt}?r
+zs{~L_HVDHYZ4RLi18owp0(U8)KslFKG~q_FT^4k0MOm1)p^{h*bhA9Au+RieGV12o
+z@spXV{fN}2K^i+zRawDpBh}mOxsnwd<qJx$D(Pp(;6&IuD6Hc#f%0bJ5NoSb^wF|T
+z5v(uoW7SB?FhSX=6FQKJKh_isCz`!h?lsFBZHA4R5Ar?nSgr(|$#B_OufwZO?Nf$X
+zhum%Ej?l?@5A;lXbPFs9!HcL3(4jEkj;nW(f?&{HHtsx*?-Kwo$`@R=ZP%5Z^JuFR
+zcYNzA0K7tJxn2ehC{IW277&)9;2;o|dn!S>fKA51$Wn_=j`uKV+D=f}SAEa{A1<M&
+zwOUxk9$ax*r82+;fAdR-!-ZxF?(E9`7;^@_^`VCzVHShQG*(7%6w=<qn}^Eqs3imJ
+zk6n+as4M5|mU>3pd69VZ=&?gCZY<MhgRn}UeV2g;R(uH|9Hz&PpE%Tu@+c6R>0(B-
+zNyZa3g{uGq*}+&+yBOo*ObtbT75l!j%?=0)U8Z27W=_Mx<fak*1zr<#1iv!V2CtoT
+z|6OH?h;`+UFzO*yX9}a5GB{aaBj7ZWN<>`Tp2NOq@`U1`wN_4L7EGm_P_nmjp_-0J
+zrOponM%|%oLkUps*bR<LIkr%wgt62W(!BB}R`3O?UJ5#t1%%=GC>!q2jlBk4p{cik
+zMAy%e9CQvHJ6f157&|c|=&s2Jn<O|C0m?yEk+6_~#$aXH3{c45myGeZ^v0kx+Cj^+
+zDb+zkBe`TW6?0~a%r|FuP9QAU>OEm0bYc04UP@-9oifXVdJtuJngkJPzJeRSA*#bb
+zUf2<#?li+;AH45=9@Ykkg>@MQg5T9yBUZ&Y2;O-Ir}u)+N8@lIHh29v%^au06Gman
+zJM~&dgW)34YxD%aK<ib`0_wsLhi(a-C?qQ9j_;9{GP#pHMPu%s`9;pK>}Q{g?p^^`
+z)<#!;wxkmKTK)iEo&@tNb{$|v-GU2TZe?1I+n_vHmkj8fOj)dGkdOu<a-V&S7UpY>
+z<gO2G7Mh$0)hDxGHsV&4dyB5c$dV_R!3Fu^TLW{!WRLH+FCiG(>HK(lPSc)#^zh-M
+zeV=qb26^bH(9dhoakqlh5Tj&1)v?W6o(tlJ77T(Y)Rj9pwMrNu2!;Rxtd4ka(!;!Z
+zvp=;p&cIMcwm9_4w(Bz(aI31hLk9~K*wL$Vh5@l(@GDmw6b?%73O%;L>E)WfP4HQq
+z-C%=@++qE(9uWX1wXM!;P*Wc-Z@~3ToPsO3meL>>wQUch(qt)F^`j`B^*4@)f-Pmk
+zbn#xy*V^pDwxH2ERDGqyPJnZmu2OnO*P=BRUJ6!;Z#LCViCTZRk{c=@Jcd$6GBG$g
+z(E`;aiYKOP@yEsjud+Et?R^+iHiJZp_Kajk(T-hIE{jx;VeF*DxRIU4k)ub#b*E2<
+z`!b1cz$!xM7Zqh&uqu_7Y|Yh&!GUf7u%5BHv>)ClqeWa@!#J@t{TwKnLaim&rK4o9
+z*0TYCVL2cS5i@|UUyC)Eqaz(P)!0Q>s8bp!U<=Py?!%)`ZL0L#P-?pdGq;Gr;6(jg
+zb*3!b{O=0&ffQV=d#*n?$RJDb3j-BwK)?0kBS@NtdxS8VCtxPTXD12)qJt)_k5UBU
+z>#?4WT;9ctd0~`ifUeyyl5M}>0{<Yso;yyQxaR-ld+wIAkDk5uDOuUh)DL^r?BJlI
+z4XXe(&<N5ky4My}+K_3vQ%XL@hu~ZFmXi9_xm(^B#Xf)0xeK65=gvFr;8uIJ$uiW^
+zC>P`iEr(&SG;=`?M*8h;6*j&uOlBBd2m|K`a9C#ZHwO&h2(|HPtF5v+HV0zmM1}5+
+zZoxr70szOBJ8a4eo)}Be8)k8XTy%h*D~<0#hBi9JEajVTlw2Y(Xzn>0Y|BK5^z*cn
+z8%Ht?kQ)h1`7=L9WQb*j8eQp4=aeF9ZwyodS&qNOEgnd;>`g^h5@jG3K=_(=r6APi
+zPpU9`S=CbJkMgwj=$wOxSWAw)T^%!g=}b^=7;jzV8993XNT#<x{@97|$RiJDZIunj
+zcI|@@jPe72Re0CDV1WR^RT6x!#RF?_)PDr`$Ab^4JrnTPO&Vo6{%0I!EdDwIul8A0
+z_5g-uT}wyGwF>n!-KFMAd9FwX!-cDjW_W^NSNAW#8yEo}s(4};4Rm7F)EO-pYDN`R
+z%c=J2U~a`+R~1|uO!6I<^8F!6z`WV~jtq@<OcvTj*9M_~QKa5!JYzd=!*(v)ZEhTz
+zF3EJpWww>&wzvXVu!@Ukdg8>XJ6`z0|LdFYxcy6>clYN$H@$S}BCW_+d6Y_Ie3Eol
+z$50Z{vK+3)$C}<P**L?U!w41T9kHqQh2XQ2Dkf(R6J16CRhV#)iFhq@48uksc>K1O
+z%tDbV9#qWhg^e{<mm>=3w%?q$uT{fvv577y;b6my3aH6gqbqWt&#X)$++>f-@=<SA
+zD>GVoGSp16I3<THv;c~uB}viHajjz$!2&?nGa4)u>(Z^L=G9~D7bZ+Dn^$MX7))G#
+z)Ss9b8mE_XKvepB)Zty`%1Sa6nb41#s9I)}%mR~0mRnL&#BbD@7y%<Fsa|I<+X_5k
+zm8<6FdksW&s8NuLG1bO((Z)$u3RLg|U}cyF&E`n7D?0)L8Ei~8vZTlf?ezA#NP*!1
+zbx|7~LhXaQMr$U4gC@0Qy&l6;)m&>y)#Se!9ac(Dbx_)8LmmW*Md`FUQ(GL?>#tS=
+zs)V(>msS29N(K??HC+^DM|~l5y;Uux*3vc%q`a+qVZF)0K)Ua^0F;1=BP3|u>>-*J
+zy?`BJk;xu-YfL)+SA7xstjLusQ3u?tEPOt5XZE=i8%I2t%(~yn0Dmc~S+7Th8KL-X
+z(K4DuoA1KQDzWXg$20f1<(8XIe#<w#COvxQ(f;!f-#@wU{`-J-hSIw-J?v6g#vH|p
+z9>ejZKa9{RAr#qI+$o`(gG<k6PYXtH=F4G&w8J6XaFnix(KPT}U2nL$3?4E&*B=^A
+z%HW{!J`jQ&rul>X4_rXTL57CIA*R9K57xXcm@PWKI2wv_Jzm$(8sOOK5x~(_ml7OQ
+z2Q{eK;qYi;L9y^~q|KCsq&i7lW`i>LNRB&dZ@Sl>LP9LMm`o+daI{|a<xnY7VnJZR
+zAeEDu^N4k^lY+69tD~jTM677Eve-~5@yd7+tNx1hj|^U?%BFOGOiMmsD`F5Xqa>6q
+zjJl(;TSkOZcIV}!!{C%#AFy`u%C!KlYJlK8zgu*fLmzn5P=aRdfq=ruVW3H4NYH_^
+z9|Rw8B`_BdVg8mxH@4uf(-bfaV-&c4tYy{pegFu=5}nJKaO4UQ+~OU_h*%t6w*UpG
+zgM$Sx4ocaG-~uJO``ja5hoeqmaDFT}ySuEE>N^>?pfdD@OIba%_keb-IOQHs7Ui5w
+zqH<`0q5+k=5a;I+ViAcSBr7X}5G62(iyJ9%7eQxX$?fE|*I*_G#SE{@{$K+4-unfX
+zT}7n@w;icyt5{YNWd#jT29;p$YmrNKI0{Ph<)5+RUlMy30v~bC@h&f28aTiey$2o>
+z7JQdm9~D*|xAw$wd|b4ju*05(0hP~OK$#z-U4FQhTtYq(8P8ApwgI~00*;1z(PcU{
+zusb(7NX%`;IvUo^KOfE|C1TR00XUl5xiq`Pf>w-ZOBDz~i<YFrgywvNbwCx+Snomk
+zDw386ZSd2yS!{8qsS*#S@+wLN&<uwFGC0l1FPeE!HVV;zL8X#0scOv%_4huR!Wfq9
+zIWZkgE^Q<kRE$OBO-LQLvdV8z;>doM7GC9x?~Bpm$Vt5~e&6ug^2ku@WjMIh;94ID
+zjiP_T^#gH$cN}apqR%g2xXr^=*kDmKSYmoe|DaOf0;yfM7#1!~%l6}7`8fB^8dOHh
+zCcr`U1|7yzAkrf@=H|w%4+>bp1vvIAr3C60Cw3iSn)4pk4v9QJIVtm%R$j9~rqY`S
+z8Qi6Q`&KUTf(%`DyZ0V@&v;-(<`c6X_vGF0eIE&Pheyw!38$_-rG1B3v`iS~1C?8*
+z1ezEfY#x_J3Z@$;diJhcyfwJP)+4NNz{}>Bf*Z0M-;TKCGjRFF!Q$99%zIXC+b-TU
+zXiDz9lE5X$X2-<Qm)d-)k7HK_OPttl&&1;3m<QMbv7m2Zo=t#hc-Ae?4tIUz{kg~S
+zU^sU41PcrT!IDKFrD(?&1u)0*EVV5Sl0;^Tl4(TF&|^t57@gS}C5dw)UDT{54J4Z<
+zT5<}iONB7(gAq~<6KJl4d;=z(eL_XX<>(?MGNN?pwM?bG(}(lE9?ht}+wb_Y%<6HT
+z2dt41aNQ1z6L6)OFc0W~ieMRcAz?utzb{A<F1vRZ-7h#y_eTqpVO7HaA?|U*a97LK
+zl{<vH*ykl*JHizWDg`AJt=!Dv^0dZDSXjZRaBWi!7|!olN!<bts2VEko{4-%+yPXu
+z7UqIQr8bUuXU?8E^3Hd>4Z7(RZ@lqTxc<6RDm8CNDs7ZjecpP(V;#;~wVesmLXx{(
+z#E-!WWmhq3Q4+PA%XHzBxZ`%>UatS$-Y~H9vB4D?A}+bgce?Iz?oC)B>o`0XFqeJe
+z5T3K-o9Tw2p3b=o=fbVGeo1)b?Ah>wFMm;Z)vLcLyz4!04|m^vPuR|-1xBn9{}hFZ
+zNsxX|5*;JvlIvxzCuv~d0MJQBqX4xWk2(nix`L&wLWOIC@lHs;MWNKa-jv+GF#tj>
+z7a5S78Mb+FG|9bzqDwQOcMuhQZv~fFh+iu@F4Nf`-3-rv!B>R;`)gknzVL;I!uvk>
+z-rPVw&sovbkdRAH7S8+XW!cgEY1`jry6Y7O?)<m7hXop}jtK*JUfAyr!RlKQSKL3N
+z;dLAq<M;0C#-&Kainv__pbd4#j%O@mto?WGb4AN;l_{G<J%vdGFB{ReF!1aGSit$q
+zM#kWsJAVnb&Yi_;PoB_y?HM~xkJ3%Y+Hgx)(O5=mxH9mhespc@@6yM8zP|f!gVkBj
+zPEZfr(?=~Ssq7_M?q*rKs!WMX52Bw*ACRyuXe<wg_ICJYnRV&HXFhvRc>2?C4KI4Z
+z3&Y0Y&G4Kr{qpeDU-Pwrz%A#q6Q;;9%`-7Ju*|yi^k4p43OEy#1r3$PqB`qd$w;{z
+zJQLa{*5m0!*R<Dph+YFA0cM!rOzB0?1s+CYQ>ly@8M-pd!9Am>_dt^2XwKv(Dg<b=
+zL_u_LP$e^HTAX`6-A0B{9}35h9S`?C@C8P;QFisnBM&hgcD|Rl_=v)iTzhe53M(_#
+z-CS&YS@g~IkirgC@MRy2z8|~b%l7C(7T?LZa@$weLwsJd-{80SJLa>~#peT+Ojj5S
+zVyN(Lcl{_DnOQLMqUch-&Np$o3emPUaKSQSP?&BU>fqcquMSxiGnfbh6tq<(WRALn
+z!O=$G4#k$BtH-bi+`E2*<^Fu-wKZBPF1r$Or|WaYO#yfrdye~fBP{z)+|irhIIUT*
+zavs;TcYk7X;K&>HpYM8WIC1jYyz+l#c=WMH!^MoEBo*6@%_FjMGdbuST&4sYrR#4p
+zQMP2$theD&RH=X{(A6X-VFHnP!sxXlhmHuvKF{O`=T--mi`n?CXjMpot?NQ%Lk^)R
+zO46K8XXqu$x+u_4kW;`(r<{E@Kf%L*otENyf>LjX&*q>*@*@vF`e1nf``%r$!7-w9
+zL3+8gz`Oj&@3pXot1stW++(|X4d+YaJN-Qb2)NG-2Nz^J^T%d!d3`Wb=ejtnVkoRA
+zugwKPz=by#7)2E>Ybk)v?I?^of@*&$IuEc&#wa0&ES?ZAJKNc9k7v;=PnU`2qMb-C
+zIncDMp*jYXE8+mW{3?tgE8~XYsGbbr3d9>+L#(=-xVS7eUvXnWIG|9xQ=r=^MZ~>t
+z9q#58MGDdN_Rp{X>u~SApAN75`qzY;Z+TW8aN7>saVD^6<%-+L3;@Y88W1v3MqGBF
+zOarm#st8C<7Ds88crIv`Bs1F185H+aspOEE*W*+I$808pqoDE-%<4=Za7pKMSeFQ^
+z>P3|6e>?x(2Hh`&x=UJSW99_l-f$O<@td60j00Niru;AFOzDH~e^2<EKl}eOd;6oA
+zukMhrd+h3<;_faU9CjM^bD`lu+@s6NOS@SA?=^(NZhDZb%IkA&Alzj(wAvr}UR_v#
+zG%SPd4iX1TFM&8v1}KBX1qoO;ipt6Tvg>TkfoECfBll|Rg}c4C+O@K&3QR~*61sW=
+zL%cf*7>I)*u!RVbbbuModSk_Yui%|O7q86Cy%vXnd&`dYcg)4XAIeC!JOArH!~5=h
+zPk72rH;1P^<*7O2*_1LBfl_!rhf35cLdOfFP8_|JdZ}90>AXUzc}q~@+P6)|YYM{+
+zeiFb_d1@M{>!zK~v7kV+X|>qP=m2Fi9N-joESVUHyf~VE4;0E0&VqV@ct`E^7*8Jc
+zuFgMtF5LaePlV6j`x#O6C34;UI)lBeEO1R13GVN<z{lb4#>>5z@p8X+*_YwU&qrJh
+zMk+jlU~@b6h+&{57OF6$Bnw0+IvD|nmL@Cv4m>;dcrIMHG>xhZDK|SRgjHB&CGvKr
+zuUDeA@mk?1NDqiYZSV_6EYeq_;g$6K2bu@%eb)|XQ<%{=ulzR;ALg>x=kB?iA5Rt|
+z)m{pQxW*OemA*)D-Ix8<elPFg%jN)nO9MJCAI2#CoiO6!tBDjSNhtM3yJ=KLkNpRm
+zy=FX%N^N;|C*xUpD3nTtxsJXeSa3{&$tlyXu39``(I{hIihUmxHKUGC;7WM!lit?R
+zIlYQ+RCBz<-NqS;quEDS@_;c>F)Y5o2b_O?jfgO0><<fZO@m?HK`jVi?(>3UogRSu
+z{5Fk7zCibx`czj%(D`EU|4;P&A19~aFQQn~VHdh}6NZC<?uYWFr!ruRr2-|{{yNqM
+zlYL}68hqkZZhkjlMyXo|Me;!UuS(0IlC$MrL`N6nG9IJ3F;q{BJI!{J0f`jHLEYx?
+z1pd5c&Aju*`Ss|M_t_%f23wP+I?VEcm8%k!eM1JDaaF9?wGG1I67jc1fvF>!0_IsV
+zx_cWuQvS7|b?YLCX{34jnnA1Ur1R*jRgD?fEM0Rzq;D6k$!<4qHn!Tl+1NbUwr#t%
+znrypvvukr3Hruvse%0^$f95{-dG9&ry_#AsusrNAjye>X^dE^kFV$%hnY&98@g}A=
+zs~M9@7{V1AFJ#&d7@#K=hbrGc`^%Fa0`AR)#a1YR(s?eQTHQLf4N00<3L&nmuPNFe
+zf~jY>Pg8HI%Cfpts#a4Uu{bY>QXr1i27-mqYlIgrQ<M?!gO9h9P-Dfsah)M>P5jhh
+z7DZ{F0va$?6lX~ZD6SI%LUENe>{~$MPM?6X%C+DVq^R?qQCKWyO6TdB33jD7nI3BY
+zW~ZY*wU8s`>-%3I3flOY_R{1x7HZml!x>#$U8+e*<_-*1_PfwjqBe;UX4r?IYF-ED
+zVI@M`D(Qo%!k|cHwYV{C&|<a)95J~}{!5NAPN~!${L6g1!-elG^SMt~x;3hC)gW5V
+z3aujNQ+T2XP*=`T&`6aZ!mPaMrv&vEEU{B%f_IPNc;etl|85Q-f;*pES8xQ%6cS@R
+zN&f8ZAU2@OxM=3l_7ih1I#f-MaayO$z16)sm7{DDLHc$u!VkwN5-(-swM#Uq>v%o4
+zAyZ>KoO(<WGCu7-hi^aOB%dvzmAq9)9F_O5nV%w~sjxO*c6F_}$I=9m>k3236{+p6
+zOxYJk$Bxd*MR|{`m+i>G>x);J9hCWIhjq~csQ$&>mYvR=|JzHH>VjG4X|ic3RA7RS
+zgHEyRVG7}*#T@_(ivo^C`s>6DfM^Yc!V7I-Z;u?cGMnN6xUZiNX~OOGwT|`ujxUz;
+zs8K)B)N{e0OUm)QR9R+&+Ng((A0|8f5uAr6nH<$iiYoUw=U~3HqpLIjbaJ|KGoS-z
+zgOku3d5K!e6{)>l?I!7Y&3a`knM?CJ4EV1KR>IDnL9(W@e5X%a&WhD|hXq=G8%1w|
+z<9D9fLN5-A2^$b-g&7jd^t$nrdOZG1a`T4~0>`fMYBV4<@}{vuXjLnf{kdGIeNmi@
+zBJ7NA-17_ZcnxEPAZo$5>ECRDe6OIO2G|&?<c`zypZX~;-BdSZlfP_c-e76$!K5m(
+z7)o(r>=sii6(Jt{Tn^|VyP%pB_^!2hbIi8c2^GUssLg~;QzKoZFf0!=5micqaiWZ+
+z6bXbnn!HpzDx3Px4lMgkJ4OIs5I>g14CxCyl;STyj46t|b+|vgK~pruoA$XsX_|*i
+z#l!`D`mt-68iwee2!<IAZX121dP?ThUwP>7iI!WRv2UxsX7+AUYf&aQu|8SWv{@0@
+z$VLb2M-ok$e}`L(E+$|SsZ`vU^}Jz7M+)&!E6voxGJ&?yn?H1J8=FV|ec&f-W)foc
+z?%n)ndSrUcVqCosMByvClQGAm+6p*{@3<)<fV|^m22$lSGkBqso`&c$jwQXkhpJbe
+z*KM!*bMOoURfq-jdEAol|AEYEYne1ua~cBZ);}Bz_{k}<k@{SAvuS0UmGs)m^G%6n
+z!uRL;029^_RQA#a_!o+Wh33HTnY{RH$oM;0x&L5s|2R4hIAweC_exc6WCsSxHNFQi
+zRV%Zg2lXHp790kTmVh&9$sUD}VtJunceS8?X?1?3*^v>Cvl^~p)j7?+j=FSV4k3P8
+zk>yWLD58?g2@qBU%L|Q7QR9Ox%tdN9rO^S-tgCVoc(iTUDGx(kiiE~$rd5N*^<O)u
+z>k*^HMz0B9&O%<dhURP9J)Z8)`P>E+WI~S1=%CTbMx1jCt^8ww;>3dq1K?l@?b<&d
+zEShKE_+wFzf(!lmwFT+SAct-f9&=O!6Q3ohFRU1;B)%85TsNu@hUnGx?&a~+M`6|G
+z^_k~($-zXdpVfaunk+%!NA*AP?ue0d$b_DgfIXKY@@TU|aB@o=*$=P3t*XuNhjfi&
+zR*Hh#N=!VplXbsBUXXyzJGbN8))QoL&l9f&lB<oTJk5<nNpd`MY8ty>Pt7>&1aRX0
+zES;48mx>%0EFoy(DG;te02^6c_CbxT%cEquVv<_LF+4r0;E7E=*>nwxIN0z-lBBeA
+zqKyH!S&=9zCl>m2k!{Po9MU+69*|HGWL~~J959b@Ly(+699ARhgR016qyPhYe$u(|
+zzeGP1zX+6wG>c+D%X8cATWDffUd2d^O)X>(otp**W`0k-lQIYduu~yUi%wVmh!Sg8
+zbN*mzY8mq$WW}r0GrpCZYKaxqbc%g_o;k$+Kx`mAf-p5U%|iC%7q`#>x+-=&Ojdch
+z%HI+NU46llpAgIXCf}KLSfA5Jx5xU|Pn|!ZYh-9@Yc-6DNM@!Q$_`7Tf$0%Em!Tir
+zglW0oPlR_Q1mWO>0h`2z1-d)pYkaPb(!9k7J1vHt@HEvu$hPnI)QQsh*u_BX280A%
+z2{}VJFsZ1R35zTa#I`KguBNUmr0pV@X^fjy=BK79WyR&e<Z}p?5c%&waAug7L1N&Z
+ziQ?T0{kFS`6NV?$UbjN_Rz-&^B!8>P5gyO4hRNrp`4NU_^3{(5YTM2Lda4aFhefy8
+z`ojyD<V$pylkNO~!%hd?>;olqLTz^D%hB^}=pSPJ^+vCSb`-+6Q`>v&Y1fDuGTLjy
+zbMUkYlT>M?N0_^gJMlfu*RF4F%vf68gCIVsemC*8W}g2df#^;f@ESKvjgnG6NPb%1
+zS3`?!wnKWhpO0$pci^NhKN$i=6edrPUAEwx2>+qt3l|vzQDXiw)%h^LZa|+xb1!?y
+zJkZY8V1Bq@gbJr4bBz6sxCEhXQL8|sZT*|&)i2OHBPKViFcBdvs{3%^2#kpkD^%h&
+z<Ke0m@nJC;LH3*>1G#`_;*?`AqR&Q0HSt-vM|LvUW>boUQgr@mU)b5-otII$lUU(v
+z7tq-nH6egpnC{}^O)h}rU;#+9*KoSb&dt0am{B1GYP8r3+J>WAZJStd`^}yOXWq{x
+zgR|O{fgzJ&=Ll0|>~<FL!&w&Bf4tusI*}{pi;KY)@`o^41+sVDaq1C+AgqFkHT8Hh
+zjle@;ZN?x2iGFHBB#jrZPAU`zv<MY=!^%_CCIi4R1%J^Un*Ar>-!<<`X`c*=!TgH@
+zUgWJ0Qhb>AEfl`s9hcNi5NfV<W+)(GxymCEOH@eDBcfVzCauICtHNLaQE8aLCwEx5
+zojw%J&oqAxP`qZ=iI9Eo9l{IkoppcP9m3`&bD7PYDY9Kx;HIId&p|s>$n+<mNv+4P
+z|H{?VNqWC2$;&No=))6M^#p<hoyOC0au!&40^isliXrJ;&Lhsqff?>eDU1I0X=k-?
+zTO-x!<?{3l+7(G)!r&6)mQMOq!A;cie|rl*NCSiEr<hsj+e)Sts=JjV?&Z2wt$}4Q
+zPTLymXJYg~LCP_a{@DvgcK|O!wV;A7mS2UcF=^zWbd1sb<6&?$8fk86X+;&8BJk_c
+zcYKm7jx=Yg_l^D8rw1}|J0go$A2G#7jp2(`Ee`racPdY)^#u0(jarrp**{6v4jVXr
+zYD}qNJoRRZQmwi=T!~{?VF18Kcas)WMTB9D^GoTPoVdC=tyYfh?sCQ;&IupkXG{(E
+zd^2N){ftmC8=#h$H4oM{8-+GIEOT1o7MFSNl-wj-Pb;G2orpJoWsP91DPBf*NU@B#
+zG`)US(zuK3{hLFKjbF?rG!msYo2L17HM~janr+BLOYv76=M{@9rd5VTaRG{h9T@e=
+z+;JI&4jC$=vFZ~WTU2l|gcd~4JF5T1ormu29CaD2PZUT(&DHHHf>%Xbo7cuNX<)%S
+z2>g67H_l0+{&%^F?`kPae85nA?P4e-f(}}9m4gu@rgBPS!sZW^ROmH=$VYc%i^@P0
+zt7s*b`p$O0#{ctJ-|{_4BwH8P+!AlvwSO6h>AnwX=g)YpY$$ZywiL?w2Fz)AsyNFw
+ziUv303yT3;CL8#>lM1wo<FO=<0LXYD1=)8ppx}v<QqNSGHWYfLo=|P68=Pb!W9&fi
+zaM-h?H=dLXKo!{|<k+Yfyn!(jukfUNP$)x8Hp4h2#leJNfF~nknd5UZm|)JU;)#Fk
+zGufDms=@G5TQ(>r1qs<3WTKW`waa$7>AJEe$%eIHb1P9+rX~~HkXnp7z9SqOL=S^c
+zIhL)hjEboZkkw{)zi7szXLijw{VgN>4t}10QmT*)cq6=3hlL0<!i^Jua0w~Qp=eUs
+zzWgJ+QpNtQmf1^Vy$>d7Rmq(Nz^W`CjjHe*P{_QvO83$Q1)>&djSK~n^yN})t#Y9n
+zrb%_`^HA)e$lw{%Pkoa>-cCfZPqz%---7j_P?~MKPWWb_qVs;u_!}3Shufj~lrA#s
+z!2R{^^^JKk2XRYv&tH}C0(xJIK@BvK>bbfBuU9XonY`u$+05K&ar+BQna}YHN4E+(
+zw*xkJIW0z`#|<WkIfa}=dBdSaND6v{Kj1lhKXIlred#a~pZ32hML105{-DQizC*@U
+z*h_FfNt;j5ZYWd92GR8be67HpABEXA5qeyY*OE2I5$f6~sP5mh0O0^&Zz!SL4zu;2
+z{k!$N5ax(4W{Dy0^f3>ds7ifY;?F<@)+rt=(>h-S)Wo8|IVy)#t%8}`=f<B5l(^~W
+zh0S|TueXmvbgUL^r|RUt)rffF@T=MhNMVhT7g$S1i@bTBuQC9m1F?%WS<kedBgYLP
+zY9p@oCb|5a>yAUk^+tVaQDR}ct|m?}DaF<(IHLlKMSRcu7njVL=Mmoy4(&WV(sGio
+z<`x!cK%n3eHYP<c2ZuPq$^9utSxxfa9iCo1XB`mhOHB?(wNdz7nB}cE>MIRK0viZA
+zcU^1Gl(LyyUX*#8LRl{78$A~fPP1AK@;)z@S+7so1iWd(1FPB&!>pd%gl=0gw(DI`
+z-p~Cpq%D#4Jhv+zHXJ)evRNay)A=0ZzlToRU%lIm>1UDgIseXf2>d0b^0ZP<97Hju
+zT%)WdL;=tw@2n;*3&F&k2SVYX@X>2FqVqm=Mg^Mi?55oJqLx?~rz^(-!6x=cj2hFS
+zK6ORrxDzWq;3W=d6S$OLxsKR8_1eT|`5e!BTNO-#EV$vql{;bT2FPJtU!Lx5*=GZF
+zE@G1c7caZ~@Q9yfL_yJb8-2VtRc9}^?R?x1dwEB+6@?u_0$XYA_i5cKo;@mOk*}Gz
+zEtD;f%csbcGU=*!FCm29$*ZqVyL?#?jIFnPua|s-kNZu84>^SJqn<m=_q(qzr?1Gb
+z4;8OptXs}|3l`79+wa0XH4i1wy8HNE&d+pSuXWaaUUq%DN)(E^T)cN(g0WinM4lcr
+zRxU8ThmTZzu2lvZU&~e>%IerFja6p6uf%*<xOX{5n~p~BS6`o3&u)EQZ())#aHM67
+z7<B=@@=gOJSxNO!&aD&`ElC~B{7pth2w4wPlwEy%4`F8p4NrVHrfln0BqmaIB6^y8
+zP`ar4ermJPxiRPw&h(KWsB$EMs&d2-yr}>b-u|x&_ABVV{rAxZ+DREa9&G6x4#Dl4
+zcjucH%R2U{TSMA+U0A^t55Follpfi$fr&!MaiBf~?K6OL2jRn5$erhyg{))V(N>7h
+zT}U^+%hD&_yG|7QLVkhmoiv*rUA?|!z}a}7*!}hCW7{dhsK?4>ml*HGrxCWcZH+c^
+z&-d8fwXQz$c(0DW9F1OZylheO{hMF=t$qE=c95<iu>Iw*onCF6DUV2~Gac|)*0A!W
+z?bf3`3E~UBLOXVLwkUWMCf@fYTZk+y_ckL=l?u7B9H`P;W)Ie8l>G;;VqXJp%b;eY
+zuXjWuF-<wE-yLj<(xhgTGg6P3#%Mh)ZFFF>{+v3*R#LM<+<fNA%LQvW0s=eyh^d{?
+zHQCqVO&V~J=Y>#s(A%B{+qpd-8+^Em+6>VHU$$gl0$;UM&fI#wYJbwcA5aNyfBe&q
+zK=`~THrw1@J5cC*X{2*wbToC+_IP4D%5!V07D`}<{$v0As)&z=``AntVf9LS^{-4K
+z05u^ub5C?P*dLkWiSK2TZ--y-@o*Gnc?jL{<j*Ou_LAqnBu}_gzA_r>AHbC3!Zhm*
+zFn+&aOt4e0Q;+Vn)hFYZmaMz5thLkZ+i`$lf?T}_0%o-d&!O7-V%zcJosHMp`#+EF
+z>r3NJ1E4^ObIx4N*CGv<TVHw`R~UPTohZ@tY5P21d(g|#xl|OQ0w2$EYDEMS)P)Ep
+z5F2~X6Ph|8z`}z?u;2m#!&_sKlBfr8k|b9xcJY~vj-1q1$cp;VXKR2&RV{DRiB!^2
+zZx8mZe4VEatdP??(CHd&hy-2yJkR6&C^FxD93Rfh8Om#PM))-#qSs%!DPC#pS3)`h
+zl%~Bt`rpilsiNw*Jb6qg$N~Gk=l9=?cHyp^L6@H|x+v_2rlaD2v(I)sA0G|pbx=~i
+zs7`8)P|<V5<3003IfKuVV86<?qI^6u;Ts%DBN+8MahNxo3{bwQ)p|pygZ`s{K)OG~
+zF{Kfj@|V0_>c_h`rXuiSzHz_(->3pnuE7t1kZKZjAkg`u!RN8T6S==sN_>_xBP}Ch
+z<Qo*L`!}de)UKr#D66kfE}RvLJNXuIn2?UgEEdM#p%PU#9*c|4&)=t#!X%p(q^Q9f
+zkpM=SO#O%`e*r{0E3)d}a4x;wxyjF9k&tQJrCD%e{h{tKHdKMGb!6-eSa#tT%bJ*>
+z7PD<DlEIsi{zDDkhYc5_=!X5&G0SfPyk1w~W#zgrsq^LKKI=6l1K}Fb9|i>GL<A}S
+zL#J(feQeL-+toUC$C~xtf8H`JJ`&+m0Osimfqwc!aQyBg@Q8r;d<`&FvVIPFyPD5t
+z!ddQUt(Ar$I{O~8DTYjz?C+O~mxGF(<AOC4H9QWU=KhjCA*6|lr-6zsg1^(cwKQZN
+z*S~eNQeSJMY}_Z)T-(h)=|=h>)Eo0%kn(l)r9}86wT6tq@a&nuOF80?nE>03pKimC
+zEZTM~?oLY_CAPVl)YDz_F5iyAp=cHL+da1N@j&1n{`veSo$hxfSq~*V(3#{&j!7Em
+zSc95r6Fyk$GXER{Z4?#=l4o|KZkhTv2d&Yu1JiNI(t(aaf~llYAP9-w8tN6-7uk~5
+z&Z_(opXKf2y=I_!VqLVt87M>f*AxuHqaWcNIDH(DP2kk$eo$vbAjBV~Ecf3%@P=Ov
+ztySi?-LGQ>S$}WJBH4Ka9<c)a0b#1_v4iw45%I&(LItBw@7f!b)f6WOmh&b+k?ABk
+zMxI$Ac;An^ts0gw-^ltB0I@gy+40VQ#(;k$b08ai>0Jl7JfCNMyj)iwSNagXa5|I!
+zE{tf!G7@Rlrkc##eAZgM)>>LCIts>oV>tELq@W+KM?+sA7@l!Fo!pIx(V(5E^z7#h
+zmjTz3mhZ?i!<kE>1@)}}Pt3z}#o2+j<Q-bHUn8L5Co=k0@-Q*P_LYMMW^vPYHn0op
+zwW&(7yE8i?UcyDy+@Y1wI3jeb)*0x6TG1u*U}Mr9aQ;EJ0a!(b9RLK$nvr1dZQ435
+zJh$^jA7vsQ?=e<FE)}lZ^P$e@ND!(#Ix6=?*oqMH;Rx5MVTeg*G;fmfmf~zt`}wLQ
+zxNqu~&l!wQ$Lg(Q`;}z6Uh8GXspehEA4ZzN))S|S&1@m$sQNS}-0C6WPE!VWUi9QQ
+zd4D<j)huAP+D~ObDkj^PNDx0g-jw~!ve&rWAFm|8^8<&LXKxNT8syG+)e!IYawYr9
+z!Y4KlcfGpTw47{|6K|$YXcaT=mc1!cz{@%6%$v%}{Cd5P;^XQ?xYw(N*kpVwq+{$+
+z`I*7Qw$qR~FMcy2M4|g>l*pc)A}2KfDJEdTC*#J4%Dy^SXaZl(lRcOQp@Ey~lx~xw
+zm;*1ZE_;*=M&AqFo)_Jf3L>W(;aO%4!rr!)M%!>}s}J0tDPJVg!-7nn;UPiiKB3cs
+z?Xv2K*@X$7DsUt>nDaQ!i!ULr_*}Zb{CnGZq{=dq`AEh<Xgn)0no$=#<Lg(-iBU(y
+zl9p=+zFP-R1%(@l-I>&9$0xH-=K*|o0Z)%yE9aoI-M3U>TXoWH1#Vx=Z=eH;%j&z4
+ziXvuy`@HmP@qFCxsruEq>LU@{9I`AaHI#4t$s46;<v72L)gA+>2K!fa{32kS7qIfw
+zv#0f;eu?vp`GRM6=bMhAi$fyN-%M_kQp_Z*M?~UbWT4v%Z=v?bV1M~3p*Pi7_yV4w
+z-*5JOWAn=PJ<sPp$;a)C;|k~5|KF-nE5IXDLb%qx&_H@sS`B2RH^}SoUDPkgpE}`*
+zN{BSC4cQ1x#bAs$@5tYu_qxE84;GKVK*ati5$Sm@>KS|V+w*?bi`m_f32!$7G(aBc
+z17bo+Ez2>GM!@0Rz0w}!_j&5`@dVauVoi)P;SC7(6*L;FRE)D;G4owAM-94Q^`<2h
+zu!(;e!z?F)co`4mDuGXc7+c@Z8G^&AdHusQ1T_dKN?agQIjk}6b_8$>OW;aH@pB@p
+zA%YtIR0un62gG|X0zQMp1%--XHtpC3T#FrrfLl6uK{{(pSl5E4BR$Z_R$y^>gi!eY
+z#2U6MHoDoP#6>@(&ER3t*We~)k*}j(_M&F0ZQ|EaJr|j%1W!L9-kaCI|GDiAf?*5o
+z%T#%Zybdd4Ti3^1o0lCM>>a7jB!YOPPpAQyc#hmdz1_ZwE1H<DmW{~|tb;>sS>^cf
+zzKUP+4}Z4J4itOF)vIOxo+#FF;Q*Syay<Sn1UI2Y&{6nFp%83L1Y#WC(iWG`AOMhw
+z#itA&<2iz42(#oDiNJCW&ZLTc@}gV3XH+IQjEd;Ftprd%v*qWTuRL^`>HS@?z<11O
+z_s9!ofkHi~K&4HIz=PtT3LsPP@vSC0=pGwo3lSIzOz&&tFomT>P=7ITkHjOoMxzS-
+zWa}5PR=*>R<+bA-0f<B@(K;6BW13ohUS8dn3MpshG$!bhN*Q5a%)V7{7WVV6me8Ob
+z^Y3PcKbqm*GfWwGy8=Id&vT(G-g9H`%N3QX=WU&r?aha0t^MCo-E!Bf1@=86l>1F4
+z2hs}4UzL8b96}+wbWF@vhJ!(Jv(TXZkV+e_v-#|sw+pAoPyRh^fBcHxHMzDrPa8>;
+zGQ|7|QmZf)frG*xxRMit=60yDI#3};u@$L1XFxiI&C??H4@6+BcuEN)Yzes1s&&`7
+zPI;_zN~Fl5GA^iFUZ`%<tT9%}>x_l-a;$LB5Qh2DRM8#utK3j%2B7y)&x)CS17DOW
+zIqQ!czyz%+02$j17wVg9iX(CXZbG@{J42LZY77}aXjvqF^Zcc3A?>}-z?3If!bC2D
+zd8mnq(qY>Hmx{+;(JrE!1Zy#fwlR{{wBeFy9UX}g?N^zi99m0ZNi;NViUWe)$UwCU
+zouiL`Z+mft!sg#2y3YU(=65+T6_9mDq;mNelMVU!)HH%<w0o5U&K^UP7bCzSi6C?S
+zCgzc|=ZwW<2}oM~ELL_*qef$GjrlOMXG;p_%OrOxRS-YNenSNou}C3<Oiq(?*=*`S
+zk3tU-yF52!A?v_hTnvLg4<TtIb=%3}hHWjk2LCuI(ug-R`)<Xf+K??g6Q*(^Wk{Rp
+zB3W0P(cS|x8*7L$X_rB$q@lZ(OVzfM9!U+^Z?9S*6;7h8<C1f}NtcI+cF7XhE1QH8
+zEpL0^LRI(tH2UiKr~JLelVAIKx%qlJFuN(Jh^t0}@Hl`^N?tedB<G8L6^nnx-40<f
+zx!qiPW~6#%{n_oJ&L4)#OA?XcOxP(qlC~G5!7`I%$4C9qW@lYgC}%z^!&V{~?kw%p
+zonhsV0SKi3r4(I@$q46oPL-HPGD@Bb<!@3`n#6@7HJvgHgyhT?`1mT9Z8tnEn3YrX
+z=t)4wFF$p%t8drG1yQlPi-jEE{&nOKNf@r!Ec|6(63n1wjs+9=iC6-^Ci$7WJLKjG
+z3t$S^q5ld;wD>Tkp|fOn5434vjOm=h``mv>;hvIgnoA`)`jB#Wz>1MW|Mkq$#PWN1
+z=Q)u)D3#etcza<juoI$54r<SK9T*~-!`6UlY(sMS(cc?Jrh@dFh}F|eia`&-F>%M`
+z7qQAJJx%*oGeyCZN!7{dh;ulMR#`G~E?iEmtPkv|O9?C?*|eSS`~J}p5BT9BRXeF4
+z&Th1BEc7XubWdO?J#8}mKA%!>ZJkN?+fV^F%fNw?ymL*q9vC2$bqk#~ZPYyxDwB<W
+z;r;waNd(;{2LB#>V0=~W4>CO>LQn>xhCE7EEK!N|rwJ<_vYe!tb29pp^Wf?()*nRn
+zRRC33WDG{RoT+Rhc2zi<4jzjkmJe5efY8WlM4jSeq(FF<%APhVX!Pj1k&EbxQ$fwi
+z`ePpu<>}PA)FFLf0j4THd1ZlT?^>NVm7!I75fdD4c>QgcVNt@uM_=5hzBVA|$&$t^
+z`sW4}l?bSE95!4aNnD6B-LP_OH`U(n8K$xYN+ZQDMSQ!s1yczc9FiDZq6$fFz|54v
+zeDZL-|BoVrevjXOGlL|oxG|(N2fh$M%!6T^M0C2Zc3M@lV`!8^Ng43<Hzth<C#qr}
+zq*HmH-AmxFaZ-Ukf#2Qwsv4wlR{u@OxJM{!TI#6a90ilRhoImdbM3i@A@Y|o^oz93
+zmR#lkekrmf2NR+GjUi_fDI%9yO82ca-)Z=xy$-KR%ONZ0TNn|dWGOF>DF3Z_?CLUq
+z5mq6&)Cu8+&^6vG8<C7$diF|ZAQ+xQ#!)@b7ef%KEce54l^JwVd_1odCWSQr+TlCk
+z4)fr1#_<#%BVhF0pzngsi99=+43IG6j$RE6-Yt0o?^8DT+5!Jt8$_g9nmPLcFX#0o
+z15KGHl$lxapbnfmn5?POUKu7l#TkGq>B3<(Kz1}{e0X~cKqRhPL&9d|tw#wahWIOG
+zg6M{xodH|@zwyyc+GOcZv;+zT0yxQ4lZhUZ&(b|?66kC-fKD{>GhILKn&L4jr$0)N
+zGLtOCxt9wlIh8rks%hC;|FKq@A0AL*Oe`xa<|_ypZ5#__^urH*qtRVNI0rY%V{N@G
+z!&-`^8c-vTR_V(`aB^-dj-<v9E0}Q!*Q?;G>WY~9G3-cSgsOx)NCre+m@+{iP5(-c
+z6z$cfdWsHTSy(~F`lj8Y?+2su<jr`!@6V7Xnxokt&1Eey|Ccr#Ud@<vfg6}yqT*!h
+zm|Fh{>tkBs7eqvWt;B$h6k6>_35CZ%KP+=CPU=vvWyX^!0=_riH^O^!AGr^GZ8OG{
+zWXRP;NKg39k9sCU37nvkcf?dj3RLHZ@PXFWUQW|4I#Oo(QpjlbxvQW;&c`D~rCct8
+zr>s)CGbv@rRHaq^rhZxr7S9(`(R%43g&jt627y_T!fr-T7Coo2IqC$5pB{pHSLlJV
+zNR#o$tg->GQ`I1`ZBln~!SZ`O;9{v{)wsz5Clc<U1iy6zW5Bi7Lp17GjKFQ{gfs-j
+zAPGlO;oF+O=@dJ2f^1}BbqSd)rGQDoMR8y3e>&l1$ab`%C#FK5o91^_R<Kp5N8z*)
+zg2s$hI*WBmeimV&qk&?~<^9C|IRn7oN6wn+e2lT&3&A7Ry#}-r|DrC~iS!#q>aB8n
+zpP$XokIo%CREpDBN%L9wWGdyMjqf;WY6pN!?R{T^xM!LDuFn+u2InB)xt~iEX5~@C
+z;>1;;6LUWeLLu=71!%m$s6Mh+k~G#<erVw1s2k>^l9jEkY!Mc(v|z2@FOV_Q7(wk~
+zEZWZwZ~Ug$xN_esR{FD7-oyD3zuh*W5EMRmMV&znay+YMJ4NOQ41NXz0udxZv(Ye>
+z{~+hX?oSft`%qz8;KWoTq(l=!Md5laDnrXwWM{SCp)G0kvMaf`xM*Tr<9NE$n}g?K
+z?4LP;%QI;1G$%QLiLMH?MPD<+)71kecEr!j^#3<Z8Sx{HC*U%F<pDklX%Kk@*V^6F
+z-Jbk2hNo3c5?dL@Ln(JX5j<J;TwAb^368K80;7dxwU7tb4XcLI%Q>2E!A0;#D3?M{
+z`+)O`ebD&EN;9Eq(xYZdwJ7)JU1NPUNRq)6<1A@1@OAjS1=}lzKWF1n-d7G1Qp5Ae
+zNprQ{R0qyEBWLJ$+EkkSMq*+(vXvcEA2h!?SyBnDw-fodRpx<SiFLmZJFp0iNTa*4
+z`^3Vifaabe!Z)iMcaM~-Jq%J1EFRz3fZ@CA6#J&Nkh}J|1d}~Xlp#q`6CHXEfYC!?
+zHKE($_y{`(qpx%8q~oHS<#ls3e-`z67qy=CvY*v8nR!!thO~Nyv|hhxjqrN$?X@dv
+zm-n{mX=#75s2g|nPSktJ=k<AgJ%kYX`?8~g>++#CR@<&e8)eJ=u+7fxs?)62lX`G%
+z(y8lsxc1*uw_^*P!4`=t*He$x!PUnc6fdfl1Eq?M)5e#F!~42_`I+7in(l;Ng{`M&
+z>)lVh&1=0kekh*4tFI$2ZE>rTK0=F<i_bApp84Fj=TScCSsu54R)@2sqg2`-rd#;F
+zdF@M@K}WQA(>FzV9T_||Rrov~-ZLMuk3SZ}NmM*{^F0amBM`jMa+Vucxb}R#b9k$4
+z+vB4?d7WNn-g3W0C=|&g>=L-Hfxj#wV9^g9&t7J|dh!OZ-bJpej&#3WrY}n%OQd~r
+zcgcQ`?rDiR>wd@{dEevsZo$DB*{1E@_(gM}?R)FKbby2F%afaTBtgTfHy0sFE@jo>
+zHd@x5u<KsVdq;J3GN2sIo$wf;HHzSN*@duuv>eO5Wt+}se)8IWH^b%P{CXAv-(unP
+zwq=)R8?SALwPL;9>z|~y{K)!yyKDt?+y45zy)@^HdXd1pS!Uy9aUX%ze%G_jeB`?9
+zb-UbxLMf9@HOrmB_3-3z+S-u*n$&t^)MDkbWGB{?c+5U_dbKd9^J4#!Qa@V0&TKLg
+zf6KFpGrD#=-gGsKaQyw5tBvj3>>hy!$+n;o2*wbanew}5lw3#ZUvc`1ZGIsuv~6oN
+z+Z%AG%r%3*+#O(IIAc9;619g{pv!T>4~l1B%oJeq2d;!E8Yzz72{0c0l{)L`myzx>
+zu&@aC&=pk>_@3_rG9tflX!7YDT?}|Me(?5)MAub=QjW|##lSS{1HBZq7t9_pV-EkA
+z-v#j*%yU$Z793aJPPYHftg$LQt$fzGZhB##x7ak;yj}IFST*4)zgfyP*p140j%-~8
+zh4F~_oJPg@jQAw2_8RSuY2QAYKU&O&Kl9{>_U(@Ow6~txmt(cB)=P);cE6UjxAmRk
+z626{0G4KX&di?->A3PnsTR2;l_0#vH#nL+5e6*e4^=3?1Fl>-tA3&rD0!ybNg24<{
+zM`LL!a!3?5p)=vGd9rCJwA8K6;@>CGaAclS{A%}fCSD|pKB*|V5Dd%@mI!0;cdXrr
+zeZJEtMJ+%`v8GTrn(U^xbq6W8)OHo@O36PhH94$T^$~0;kv>bE=8a~j1-xWx*US#@
+zIqY3m<rR+R&F(Qzd<Jm46Iwxd)xSm<?eHbN)PV_Qt+x+mUOpN;w(oHrC67JsJM_u;
+z)<^PYX%~%NJo53DUlDMXU#0VvUuBQt;I>*n+Vm~(c4y*ded7vQ8DF?vbfM!6xoNg4
+z>hB%Z`Bq=yJoL<QH5=V(^KCY~)n@v-dJpfxK)?RTiz1_C?@ptV;1uE><MG9gsNSL*
+zl=NoLT)=R?%h(h7xo-XTFx<^|xpuq}OV+5t5aLxZraP$7Q}c%-`a>9lTEJc@zT?`t
+z+9*vlcnF38ZL$odChk$dS|>v2uv5(e92Am-op|ZX2Isl6!9&7*eRbPI+E8X*TBtRu
+zL-ERbnow@v+&KsW((8sqjB$nSLDOT^y5>7!@e#)ZqQ{6$1qbFSi}S;hU3Tqp{%G|m
+zGcF9QkERvtQG<cp+WDi+?qI#k_%3Ml@D6Xm<=$ZvqBf&jBpmR{yEs!NRA<?FV=;Zr
+z#H$@%j^%@V%u0y;#IZEoRCRlQX<nfQtoAy4lrW-Sm=zHS;5C>(&poX<v{owQ<*nFs
+zxa-mTt%eYLy{NQRwkzs2a>Q|m`ez8UJ*ro~*}9oIW<mQwHYujP$)_Mnh`nCYbHjZi
+z5ch;z!Ukp;-soC}jJWjwi!ao5_et<##)8K!yHX|;>gHn>1vJEQK@$E9D3E_X`<dWW
+zBc;%UpjzIKGu~4s%$2qjnsZA{70!cLJwLMzIesjT3Afb%(7|J=(aFIX{7sYyMSdw8
+z3FA^CpogMrG1;B@!MMa-|A5Xjt%rS3NSTtOvq>g}O6V-W^!&(kp8ZVZvNS#Gz}vun
+z3D({jZpZ$+W<6+E@XZd?=M0lNYoSj}X|=Cg_s^2E1&9~v$d%L<5cNwHB@gJ_{V<*%
+zyLkHb|NOoT9Bx_%Mv1`aS`Iu6T$Gprn6>=1ll2q!U-njgoYCr16J*N{cALo+y-YTd
+zGALZk9zhu_!EJMmmjY?bocH(LjFr0P?|_G`G!KD#yB)NkEV^~6DJWCa1g0GC`g$u>
+zY**W=KAliYh|Rw_d&%GJJuG^;P~(bYa`Tvjbl2F5e2~UytUhuX5u^|n<9SZe>H>+q
+zi2i{5jhsz&1fboj#<8R|_5dQvEVzI|?OME;*x&3>u7CoKw*PjS>X?+w!o5+~uvneQ
+zcE=<zqy|(Gh$B2O9=P{90=_b3ta~(y7Wcz$U-;=RIM0-i#{e@(mhCRbuY>=~W>)|a
+ze$ANdR%xpOGVo+(YlcM4mi`emmJyzVkeoQWmGnKn|9D@ZcMXIyt#|zB451Y)G#Mi}
+z1uLIndi<0AP2%Mzii{;5f26Y8yKIurzjJ4bLr9~jP%Vs^V96ihq!J(`A?5{O2s9Hv
+zjY9_nh$<{n-XPS=O=Jj$Kr{-1fooj-w*)vC>aVl}e^05fVXD|Q^ko1CRiI?ku*{Mv
+z31NU<Lx7x3t_FddJCy~^pX_30FP1y)tP_f{NPnQ}42Jaso2-;VI~L)962usP|MozL
+zYy%^C@UYH><mOo>B(kXmd@NY%(knr<0WbWs@#&j}C#`7e2_DLy{}o6V)zBjNzZEEE
+z{PXEz=^roQq{2{q(L#7l_)sSoLeplMgCzoTOR!46v;IOyp*MuW{&l7C&%qVOwTP$=
+z>?0H^-231shr-jqZW8iOfw9Ad+QlKVFZi<sy)}g$5RgRu!_<0ICmbT-y`wvUYw*#s
+zn_~kJFjdsiY#&QYhFrb$-34stJ&-r4#k$&rfmWF-V!8olH>X++Io(CF@f`sq;rukd
+zQ-^xFKvb&`f2;;~62Xp`Mpk+dSHSw@|I_t!<NdF1@?UJ>Q+!&eHiRu~<y%lL=f<uk
+zsL!LprZ)Q`?if!@YCsi=ZkRi$>q<GU4=Qx8+_<YH(frsT9Hgs&1Sp~=B`h^|6*jAv
+ziU$HdlM=RiiBIY0cnDs*R>t?5lHyoq+aBymSQR)LSGUfbnuSS!tSVLE!IrINW-$A~
+z=hjOK>%|v{HkqK9^>&8poX#}hAHs3Niqy&GE6TCB#h0kp1^|<BemzBt$CbmHL^frA
+zu*t~Deqw=;;!`9!c<4{_yjjIt3QL*q_EAL|Nytm7Yf~%?3j!&d>&pjEAc}2c<`!4S
+z$%61nd<5P9f@t40#IQ;2o$M2f30F*F*7eg80=>|DX9e<}r}yjcz8awi3U0o@&^7fO
+zB#{4=Ew}C$DY6k&LGZ*4GWC#;3Udbc=Nt@ayrrmjWKdTGqpn<^uDoG~s($R)wN+oU
+z?)(==3b)OAa#P<4({6t=6}-SwOx+JD8CF&lvGZosDg4@5JZP=~Nr9g<-Hhz280_gv
+z;y>2NE8B{xm^O6!17aXHr8+5`#$1ApQs1WYUw0&5gVul549>cV*@+PEV()z`noJGv
+z)uKkq9S78o_sDA(E#FKrW@Taor8!Ykty36jL0GFF6dqoYJ3T#J-bruae?62#7ChRQ
+zX@ozYuml_bMIkcw6G3e0$qxY7C{&am+_7*_N^)-sOwjNw{LD^m+xtj9(aHq=rvey1
+z`4ye2Q!=_JNQLt7d>d&naP+0MxdmMHV*)3jYY3u@sR2c7H)hz|oE=m@4b%ChUp@j>
+z9vZfWi`mK&pr|3kpKj^9Q*Rc^qL95Uw(g)2R{=U)NEse3frrEKF_V8j$puiJnU><9
+zK;zx`{dX+5F{i{D9@!r_Ie_d0qG@c%59$j?QG(R%ic6HHB{qZNYc!FlkOm$0Ir$!6
+z7>bhe7z}C798)6|jHUt{*|@fkEy#c{zK*D3ZM=lo)Y>U{Cy=qQ+%g04(gs@ol(VUW
+z!zF5X2bA77C<ayB#{SRoUlr?Gg=oI@7{Q?gL(`kS8yG}kM#zG&2r)H_^tis~OB;-!
+z3E^+IF|^8LIh<9tSd?7zgYx-fH%QljmuXlFah0qO?TuT3GWvIiC=jZo$P`Y|JeUL#
+z=Kp)!7Hq0yi#v+!aU&-{BRByyxMFfZiDD&tH}PjM^E6u)_a`QT*J0cuS-x$>q;1p-
+z->)|{Rs#I6NOh=zxsZgT=L)&B$F7!GKRzfGv(z`NDq$zF<W^)<M<08!N2ZVor$;3`
+zrS0V{wYgxcYlj7HtoE2yzdnZV!o92Pzj9rZ;(MBF?o1i5Vm1{?uxuQK;r?mPaP5O2
+zMD{tlkl8^+>d+DepGe|4<DXGgn?~DQ7o^GD*ncSE9wE-u>pJeuRT+#n*}iz5oc<L&
+zNKu>z<xz*h5@T0NH~Kn*8y!lcwETY&_Y^LH2K}F&!&ph8Vw~6$tC0ZrK{wAsz^H2?
+z6mCuAki6~FM1kaN2A>aocggq88gT?uFp<fe&`$CEI+Sqm1;mejDi6Ur%<pJcOz4z!
+zOfubA6K~!x&8qwccG5`q%eHl$vAYzrnhwL#8X6juk2s7;68ojHX1?Z|r6Px+1uex>
+z3yr<vbN|U7i4wL6J{Wy;Kaj5^;<Gq1Riq4=76E1$X~O>3D07Xe)08FKZlvWDW)suy
+z3CGlefZU-=+muMNx=U*(#?U9w4>Hy4FtEHRtCA1L$`}h$9DZX=6?!?N=6`w3L$tyJ
+z*>{B9;Lt|${PW8E+BXgTHFK5S?P6=)VV8hZn=l{$6SNgAI7KkA<HDL{LLFG0aU+<i
+zZw_4N2j0Ih6IAf0I)<VvX7>K&lnZ$+%Mpq`EGrw*<ezKk)AL0ajoL3!m`&$>o#Pl8
+zFy=9KKEOG2c7T*t*Q*(Vrrnx5Wq2^f!_V%OS^n6`j7JvF&Gt^T$5(*dvz*JK^l~ql
+zhfC;rfQQMfdMgKAx+h06-O!mjh!8qI<(W~+IZ%YMjJP+e8kF8R^2b;Wl70G*hemyg
+z+xUoj{o^T;@tL5Ddd4p}=&sRZZn_u~yrX8?egr5-XEvF*8R>H)W^*@|X&ji%G62cZ
+z0|5Z-o(ElP&_dELA*n7CT}Pz<ba<`Qkq7K2VtusV&Ke-b%V|Qn^~ZuRG?p!Gs-uM@
+z`V9hozXmE>Lw$V(F$d(rnOf?$04XsXMw6l<i8-yi(0K3<@WYT^s5IS}Vv)R$K8i`a
+zUja`h@JCt<jIcBplE+~y1VU#@2a+EWnD~o3Pnt6ap#%H%v)nwD?+^wJIs%j-QD+~^
+zAFnH>w%}a;W}*S|>FfX2avz6m60;Y`?w($cyo{m^2ko4cmNVxmc^H{%dN3EO4K?bG
+zf*ESM&$?0dLb`{BhV+mPu#G~<HINyZ-#+oQvY4^2aXtNSNTH#y!Nhs(#Ijx1EmNI~
+zdD-jUcx8y&jVaB_I77_JX`l)UfuA6}_Ma}gGxqL$b<e%b1$XA9_iJyBiA(O3eepjE
+z{7PcgLaQ&{mGXmO8**{8E_lcxo1cC2*07<)<BC~-4nX>;sz1Z<|2+JnvFJoI%AL7O
+zR$A|xaj0E{vN8ou9&X=w$9+sgifzZ~k!(dU&yI)OSJET+qW~$x-Dy58Sm94b*$srA
+zFJ~CbY32ds#PfsBCP~U?)+fpF$T<4hayPN`=*q9P;w6z9$LR^9BDU;!AO$BL1)Tzx
+zr^O#f#L2~l&ldFh9$$ye3!^6a7d(TDKLfid&By}aoG)x>tco1T>N%;Lgi}=_*1@tA
+zx>o$`kwd!Ilc(>qPd~G{gNvpCOE~D%F%VIuvQ67dKaDjRH5wx2dw7F3Q56rE#aU{w
+z9VzYWNfaY8ScGns)-i?i4uk3<#bW~^GW{LioSB!iH;I~`(uqLF1i%!K8?+stoCF@@
+zm=xi&P1j>`-49ekd=G{Cry58L$X+_xakPv#Ux#dzmx^DUu<ptG^5zSBtFDRp9+n#u
+znu{?9*<65+p@rl%zZqjzhBls&LidWhtfr-vS^G#bd23=2Ad|c<k)0(}(L8^Nq`*#M
+zk>kyRt!6~=jxR%(yt$hDH?hMSye^g^F)^)hZviC45k=9oC$A>%x=@o<D%0I1ndLLa
+z^fJBV+CMu>Y~1o;?ue06sFU$R=;Xonu(z9?(eLI0iz(GeOQ4~K1eIRYvGa;+#ZkdG
+zz@dBSehE5h(i*EdagH0$MlNW9J{Qu}I|Wqw6^k)0Q1=#{h<g3b^>dr7maT&45#aQj
+z$|HGy*nA{3an{Dkp%AoXlxZ?F=dv@R6HT_*W%XX0AiDeo2{wOz>rK=RprU$CTOalh
+z=K;vw2R20%(+{jc@pM^Ql)Wg~)Fg@@_ymA3qt(4ikxe*es$ferW5;KAIkN3IBpQ3&
+zgqn&kKXnPuNQ`7+2rCF;bRIJ}jc~r%FgS_c0h1)aO_4Ufn41DKtgugKl2h#hTJSAu
+z1V|C_3`0+N;g12QC4Osbu&Y>b8<4wWrMWME4>iVR_zR)en%}!JnEB&9*x|nM^bF1v
+zGSc~Uus=9E6f9lF!}4u~ZP6h%g3qtW9Y(_4^Ec~a5!O60yK{rh5aI@@C-?{E1s+bP
+z5Pya_4-^;U0%wXAmxwvuXaE<%b!4|RT5p~zAq*d=*)h*8APhFeLH5Y;Gg2&rQvYU{
+zJi;{<A~%;B+alJyCK`#hVM0Hh;dv;dhJmVKVrHOIfF(XWNbDWY?4Kp(Z{f7n9h6CO
+zso<F<oYA=2LZw}5)Ni6G*M}t!Tmw5P%y}8rf6|GADuFQ_Y_+q03UO(IO6!)=<K809
+zPEWzvRLz!LQ+tBHP8@(94D<R4<yBM;Bv2S_9lD7_x2$aFo)Ks`Jm|bqFU4Yx!5e8s
+zV-ZW6E5`bEyd6z>ACn9nKf_{~!x-%^oI0}D5=A6^0Rof7U^I?QLjs1MiLwbp<+R_G
+zvg%DKQ+26eqC~4p4AOkDa!n@RqkN^GIVXW{9;ZYU|N1LFMH(NUA&pXlwwCx)R5VGo
+za`8m2^+L8ihjLYH=#OikjZ8;_T6Wn~;al+<Gnx^Tp7+OTr!~Y0q5dUOJ&%BO-mp=`
+zA_%U_SYepW31b1z;o)G)g2$xtVMN~|N1ZPpZ>ke{u7ok3LKLgd%w$meTW#<8ozdo-
+zxb#6SXw68(%2g4miArGi=0SqnvPs<jlFqkf+nh3_ahNeq#kM8sgV<%j_HvI`LlU~g
+zPUVxT_TRDO4AwBHZwjz`*MyiG1euLYySxMAh)Bfn3>YW=UnMC-5(Y6742xubanx-h
+z)29Lhh;2%242*bRrEMawfAQqG>D#iUy|a%j9-&1eLJO}nGjIA~q8~;us~&b&YS=g-
+zy<0P;E9|$3qi?h-wult{cXQU%A4Y{j2i#?h@YqoJw1;b;e{aDA9l8#*otkmd_2e`W
+zN5Yi4O_^T@G{LpBWAA)zEQ&i#9bQl~HBA!R_Brgb>IbGB<6FXNvP~a6i)q}Jd<Y62
+z66299RA_DAKY(8;AWh%FVHcnOv!t4+p^b{%9<eo86aRxVje}K@d`XX5HW*Yzay03X
+zhw0QCF@g*CXI2~zQs1nkmur~!+*p>@n{E^01CkQ4FG>VDRF9wRmr%C>W&{cMTn2Ls
+zD>Gvhvg_(4T{#>Iv_*RhTeI98@2X)tguMSxt!P>~mMvIxa;(--qc)pJKBwaaIi{W^
+z)KQ>6O@0%+mlK(Fc1JEnIb`3-NeBjK3mET@)vudI5l@p-7PwKf@=kwe-TDzuC2Y2f
+z-^<cnQXoq_d@AR{uAF)Ei+*zqT#uShAQN=t#+%xmwtI?w)5DoEVUwBzvm0??i4n#>
+zV)pL=9fxC;<k33d*+Gsdh<GI@SA;ni0~Ur|7GtHSPb=g9wU(~yStuoIo~H=O17uhI
+zW40XwqQTO|IcuDT?EQhCbSU54c|(_2!|-FRc;ZQp4x|9{KW%|9sLxM(b6@0&K&BMa
+zwTn`lt}<J$d-UD8Oay_)4AAporU9<WG6;IxV6~jG*M$Xvjail;9j<rE(H7J12!KlV
+z?r_4*1I1CV^>p%b)Y))|(VNkC(GEQcO~*Ci`xKg0Frc*tptZfrEQ0MCUd+Cl`Tg4C
+zCSX{MW=3xck_sBD{eBTPu4eUSk<p{S<`uWVBWs`e>bgU@fx{I4-l8-IIWT*Z+O$rK
+zVQsFAv?9qVfd0=>b!A{&6+YEgXjC(VTwG8j;fhDaWnRX<i_5zh*#QpQR$Wc17lcEs
+zU@^Zs79j6mRY6ZKm^K&h*B=LkWoKyrtr>yqiSoS4gYx3mt<fVG<+m}T4~mJLDr55b
+z=@E=thVsd&JW6KpCh(mQc=L^Eh$G&Z_*>uRP7Fa{!hq`N@o=0RKjldqsys^@t64q~
+z)~%vF*OAMlyLFyZ_f^|r3vB{x+h^Qh2bByolbjwJ2OetmJ7txcAIi7XXmMrn0l5Mn
+zILA6)yRD|ikeUR<8W+bR@nb`0@B)u-K>71KNWGvVTSP*yMXr^XtpN<5%b6LVqiuAF
+zyh#Ql4c_;(Yt%B30((lW>ud2lYnj^7Su-#<v`GN&Oah+=f%(+^yyR$rN;t@(E!UYI
+zf-`DDk5iA;>tvU<%M2f_JiM?2_(gRXB(qpkFsD^m>4pV7AV+3{^LvH_MeD+`R;Dk+
+zIcR8Mz{lC)AN24&9*CL19(>PRgmE6v%6GYnGBx|>m&uY+5=Xzr26aw)fV*tU9ArVo
+zbnP7V$!P4E8_#<z<c2)p(Djjb3?stEXo&ABVv%Fb8^qy^L=8NbLW?+Z$R6fd(KQZa
+z3>R}cH6<pKLA^TR_|v(!^<TlKS=c()-z5>&4cU89g6P-?&!Ftl)W8hy`qUtjB9ZG)
+z(Shp&_I8U(`7mc_KM_d?wX@K*P_8X}FnBLHBIob411N#%hBO$b-HkUhmqN7*`kIG6
+z@r<RLr9mQZMVPlaX;oec=AJFP>iIePRLLMOeNCyI@IzGCKcqzbK?(}WSKyK2%cv;D
+z8goi4yG7v9Q}esL8juoD?Ujt=2hOE9S#13?A2sMtbXO2#K@6X-r^`5nljH~_H3x;@
+zuv}fzCjIgA;w*IfC77e;BGC?9aGhpBI^Zym-g{3ZH^01KYarp*|53FQ+l5J9DV#bM
+z3;#;fq<iSt5A`Vg{V-h?T~ERFZ>Dhcpdx4@dbFkF_=jbcw5FZ+I7^@=+0@(PF^&xU
+zvGkMELo5`kRi5=H5iF{(i-Lz6QA&VHOCZ`06+GF*le}b@c`A&A!QqUpY-Tr-6qrbc
+z6UNAQ(6GSNWPwLbD*FC#u7X7AWjyH}kLO+>YRvZ&;dmCXJ?w{y){K@Gs0`LmjD|L(
+z6-51c4g8}sm^zI)O!S`GY?9~>Yl1yWX1<KjD%PBd()M@K@GC`eD(}{)29}kDt8UIy
+zHgixNFxD@~i{e?T5I3nx<ZU5M7IVQl%S%?7UCPrw&bo3_yo=oZMrNV1@vBiyEnSeY
+z!6z2x0<-!uz26c$M}fb~8};i20Ak0RYGv0`EV{}oLXnov4ra`Mf)v4QQo<*Y^!GCk
+z2*m!Zu3sF0-g$*0^ku{a-L85iE}MCO`bK%?3yR2hy^U|HEAS>GmLW~eI-uV&t(4Og
+zQ{4SDisDcu=lrd@W37Kj$Va>wdKb~Rk5-Y={t$m8>+EW^HGRIfDTUMLaC8qT$u_&9
+zl}i(ro%{<Xc{h2A6~~949vl_bS3tmD;ajllzQMmFG8E?Wa21CZ2P~G?&ABuwQmjAN
+z4h}OnBA;pxzR19eP>=)W4{@cTtn7z<$AZi><UnuXxg=ogA#Y7CbHJ++PPYvAWHK;?
+zw;pXpD~QNxT{ky(sKlqPKEeo%#rBS#dlCXRUGs0UrWb}`lR0rnXZc>xi&nl0UrZLO
+zyJuXH$#8UU6D7CZC>^jjL~5ML#=(O+a8_GQ!gr&@Y)#&i4J_h~u(JMgCgaKfk#H3Z
+zQMFB!2C1cUmu~4;mhO}Wm6mRBDOtK3mXz)W=@Jl>UXT!^JC+WCmsCJM@%sUL_qp?&
+zIcH|>%xsjOM$+U`5X4Tk@UL=}`{8l#&YU4R@Bf(Wk|nr(1ZL_bkVF<nyw1B@IIk(s
+zMOf>f&;L5qBlK8)GEhfyA1}5dDL6qt=O^u9kso#SzJoIEXpJt7diguOKR#Wh4Sbsk
+zRgQ7#n^Oi_@A1~@L#wuudg#@&UplQkxwzfx47BKb2nUrzOwkt=)^OWE1z;LJ>Bv!e
+ztAUJmmn+3B<}b7QGPGES4i(FzUA4LwV6gi~@Qp=zOsRayOVmD_&NaTLAZ(g=Cb9&J
+z*?s9tzbc_PR<2)8;}S#6X$VXwdW}2E_iCA<<<wG->)Im^XG;*Zcm@SGU;q2E7XJM^
+zmiOzVVo!*6AnwCl=PuXOEUm*#kv(+%3Qen>)noO{V2DnnCA*LfqAd%nGY-(}5%cC2
+zux2pLA(YLjSoc0H3krRrPDj52E5!!GoB%dM*P#*fA;^5*N=pdeve_gB&Um`hhnYhg
+z)nwiC1cK15vL^6*yXNKQ`TBHt(NU#V=DVj5KQx?1^)wO{Y9>=I&HzG-24^}*WsU9X
+z9WDsDE^)(E4Dg(O09dIZMNNLg9P2G^ds!<EFH@G=L8F}=f}u}Nof^Zg@lNb&;xSq5
+z!=!^_HTa(U<lc&yuim52{T;u642Qq4mp_6AaPQCN-X-YN;bYox`UI#z?tRpRcDr!a
+zerlJm944mcYe3_GwAw;@{Fax>d({^>COo4!7+3#UaOB|=3)U3OdRsYuEu7i;#O+<=
+z9Tb%+{^Q+~0jY*TQLu@VmI`&VI83}gRr4V<bXSIQF^a=HuIQ+}X<^b2t`%+!r#?Jf
+znmj-I^2U9=Qt`bYOvU<FJ;1fLe;In{DG#HtR<3Y-T-{`e9#I{_Bf&T;Guv5@Dce47
+zS)&^K-UO#&C~9M<vrG*yX54YQOl!}yXZRneC%)9S&Ab06T{CTWO&1?k7CXzPqQ6vB
+z7Fp$_PSz#{$EKz6MxVYj@?POj!{!xkZ!cKv=KhlQUmrQp=f#s|twJs6KP}r`l-*#9
+zhZ&~MB8S|P)Urk#VyQP_!{Nuul|NvcP+3P>C63uB9BOUjD&Kq`+c-_8LKuI`L>lxd
+zmhl-OtuO~oDyq(4e5YbRjyDFlbj`xrzq{mS?5zz{;m4L-)6M$zGkJf9?AfX3T&;Zd
+z^GRdf&wAYcCoo34;bijH(W^)2KoKJJI=80fz^bw^0p=>hs7@NbeMg4V9Oa>{EHCh7
+z<U_*bMz(>+AS0+M3n`HF#4=+Y)-fxXIjRcAAZePmi!YzC(zSHXss+V#%H^_HroUA{
+z3Rt!l1y4?X9856~x{rZ(CU!oegEaMaoqV{T43GlUmi)5SqA62_NlWfcmw;i1+V7B7
+zEJ4wXLX)Q>L<NpD4WTQDnVjc&HX7l<p1Q22=laNNGA<P985H<*e<vKr->p(62P+bB
+z=O88#=?2;}9_~{$@L!cjp6W08ri_2@K?;h5fDwktO7jLj<E<+$+f!s4eJi+441VMP
+zZV}a)+M#?*R*f>aDfF!p4hB>{W#T^Ly*!El9L#2!##BI3ag-k6xTos5MjSJyB*>;A
+zs6vMKU6{`D)FDEo#Si%OA{d{#*|w*nbmPJ)#tfBq0|c~^$?~*9(=1AUb93)BtBKJ4
+z)OMV4ET#n}3iN3$^j!A5{Nzd#-LqG;E4iZeSKturMf*#L9m@8X?M*mxD+;V#DL5Q(
+zHlK<OY6?8+_~gr|re&hq;w((@Hkfw2n@xew0aF2$2@X}A^*rK@#NP*WXSFW-9o*44
+zl9Z<>jO-XXP0G`8rr7XA4K5!R%9Rs}b6HvglkSK$7zn81`PE}9uNktZDktB?@POmq
+z;m?-(l_Q>1UTO93DJqtmM|Tttb9a&_vkW4Ysos)+SVm3N*6d4JJc-&=<($gs1`0$*
+zw3IwWtA&SV!9T_Q2LBmz?F^%(XPB45-kLBb)$U*=v~<*)BdKc2MuWjDLTJT)cKB@^
+zl6cvC%`j#18IadTLNDu8?swP!#3oHnao+wbSYhv?na8$)Vy&!le)Gcn(9oynt67?8
+zG*0>%%L&xmira-;T&v08S{-%_gYsGgUa8ZU>iZ!jV6i&Ow%CkZ36>`zwHs{tk~USJ
+zDR_OMdS-hPA-iHB%ozW^jC;3pcG-?Lo}u+qqd|?Au9JCV_FBJBxWdtav+?0!y3T@<
+zE*<U@!9PqBRp7)78tHzSkvjh<2UVA-PnmS<7|vGec*x0g&9KoDs8Afon*fAuVVTk2
+zY&ithT=te-l6x8+gA&rJK~L2fRaKCBYpdQfFa_iAUO-u)m(D=`HdEe;QPkSn8WA{h
+z4va5OVcA(rSf(r-KO~HlV>yZ=plWW^viGATEsa0MtN}gwczCqY>tX)3Fsq5*K+`m_
+zaebLcU&lz~RuRHz&zhcZZ&{8wX+Zh4z2M-YeEX{}u@6Q*OhaS=Sk+G)&5a-h{HJ;p
+z&@9eC@|ooii#lep^(Q&Px=CcU?(i^v7_G_&nNSv;;K?!IvQD^hIteQ}?3+!U$}pb&
+zrCxUy?fw&CUoylAri)omD;!<c$n)q<5pfel|7lJj%c@Sa$66ue<0$aNk3X$3)}dAF
+zOGpMX{YjIw6ntaCTw+xl+Yvlos>GKR{gj}(Rh3Ss(^e|lbCFMpk?9Lo1uxaa3433K
+z#6(Vprd2Kv>msV=|E#<>r}MO*uMD5kly5Ej!d|*J1ZH6TaRysG`{(mol?xWU6xV|e
+zN0_DXwv_bT^A8`)zB#^XU%=l%o48MGPMHJn_^_^3P>bZ-sVLHFM3lUAl9Kvi_OAdV
+znN*`ec@JnkGG)$AAv?AZp^IlqhH<^$0=v8&L+MO}O1jF8mQX`78I8BT&O&R|3=qtQ
+z#Lsg=9In)#BEIn?n0cAdqv?&!`&LXg&63Hb^bcuj$02pyvU^U8Km;?17;D@|7a?Cg
+zmnKt}X{}lE3bpz^@8zdI-|onN95JaG0@vVu%>(o{E!;f1^kmH$^7#xye|+^6DHYKk
+z6vE3lwmS`Jqi7LMwnFMZb6wYpNwdp^=|14^DUM2?Ogt5_&{~s;7osGg;H9t3WO%kh
+zU&^*zxJ;Y*)RjLdOL~g*j+f14*nD@W#^jg{SR{`F>G;7?uT}~a7!TXgxg=TdS}~qn
+zjc1#4|B>Z7zm~+#6}lfsbdV(?^3jm2<&1V4#v<c@{w@RjE9d)46D@>{2Z0p?k#3H;
+z-@*Uu(*D9be__E6mD=r1R%KV%uizc1E}O9zUhexc<|#4()~;|ZFfh^2rZ|HvbH5#J
+z;QWvnR;XJ_|I@wkGu<uE6JruLYA?sswhJcqPJ$ctov(DAu8eRj)%M}WWWtoCesmt8
+zN^A~vyLqBox@N~vF|IzTC&|fk8e~pGYbL=L{;HPfonT(@d0Hh;fBq(GC`9io)&w$z
+zC1>aNY%$ri3m#LV{sEh2PsntN;#<v@C#wN3f8}=s=dUiC*6It(W}$!sLdLUqKE!Fn
+zM;+2l3@5pNF1dGss~{LTgycssjPm3Crl}z7#gy63Y3lzRk&kz_@NEhK=bOf1sI>gA
+zu>8p;ffbgmS4OU5?%@Zsf*C7+gHHL72~%V73FSA@5Y0~o6&4>?w|<WFvH$l3-6mvc
+z8*x%cR;o!&qGOxwBj^Zo+V1KqFst8gr4DzFmYIacWxH)+K85YOFnL>qU2?zqKIvgZ
+zoXGp(OH+6Ek53$Xi7n66>oUo1%$KB7a~v#|O(eTcDtKBDNx09@kmxS?HG;}D&q+5)
+z*Q-JlnA%a?P4YP8;339pquueuYpc9_AwC9e4111>^6g@h{Wc192q#%V=ep&a{QUf-
+zc9((}#F6Mg5eC}GKE^>?Isf!^!jE|sspK`fo4Lw=Nqa1TC*@&lba1g=ZYa2EDmK2i
+zD}V$$#Tol>K3mDQ&6TQC_Lq+=Z<RT5EzV1c2~B7{e<qbC7rSMYcB<}@k|9(&{wbl{
+zQ#^5!T;`z3?a8n}`Oj`dlwc{wym55dC)RviApKSHM(E&V0&%}2F(4<Y>)}ltI7Qe5
+zy&8nte!^kD`k>?4_nf%op79CCqtAvow;iR#<?PS6>sCX%CJj|9GGf$z!)HyVr6)T1
+z3stK$Kcq<(YXm&!iDj#e5m_hP;Jo*n-abKl`uUi$O5j~4oo+6gD*^vko9ApkY&&Qb
+zhY%h&{7({}a>*|^LK$e48e-n%j_lc_`#BX5ogqHQgK;l-hMJ?MhtYS<pOjO}B72}r
+zQj-VliaTLY*?ukyOjA@YpZlxRUM})=mo7XtQX34rXs~Y){rZ}1#h**7g<lF%Q8+r$
+zv`sH;S3$^r^oBo`&fuLTbag(B(;I_wb#K{MS{<s#Oga^Zllt{4BRRhRjU}v!Z8*6;
+zg(x!%Gfl_K3k$a{!`n0T>QF(FtaN3En@^7*?V$A(&v#0w)?=0sp?ROv^WHi;M_uR(
+zmBFY5w|hIxB7-K0e@WJtDiOkvb}YPBp`h$vjW#BrY<t<M_pda|J-8PVH}}qfrFBGj
+zdf3i-qZ~hkbOH!kj=ep$xBW_^=O*-0)~@NkbO-NwzMm<sQW7(f&Wf75<)h@ZAiU}N
+z@_-+rUHt^Op*UDYr=6|#;J|n6=9kv~4G!u&Sj;|-+S=Z_mUyoGLfOZ@PLkJc<R1qb
+zd&-3mDOMQ0XicaVoUx5wXj46W{r4d(E+`J(Bp@hP>QBDgL4N!;RwV1d+qO(t@A!^Z
+zB$SL+N`25eP=eFQh4i??02G;67)_EJw&KOGEsa1pOFsFo{S|W>hT@#j7=yeJM?Mel
+z&21Hugh(x+U!@9OmC)ikD#=Pg%aD%9=l=l@Os=%@@)C7y(DRNJsHIPk#od%9z4{mE
+zY5WPFH6omm#c1m*<s9ERw59>swhfq=tf(t5QX$g3t@S5R;gJte@xsG>gDMS><{^Wj
+z!#@p;-*bK?yrPaUCmn4O)aps&K@Or6HK#k9;OEVm?)eoM(5j-X68}^nR??4kiCV;v
+zqh7947QM%e{8t$$o)HjQ@ld@%pK)2*tHyM`RIAz6K=P{3AqC^RCrtw-Tc)Z-`lmZ3
+zYNo-b2NtD(h;q?hR8A%B8rePH1#uzmrl-3YUDL{@az6Q%Lf@i}RGnhb!a>%xeX)07
+zEvyBDydQSIE3>+&4x*31&}aU{R{V|yG8ufJz9{4UJpBv)iSj7{=ZJau(sBD%z$aA<
+zS=Od@)TUc=?>DJ)e0k^1%h-~gj@P;rv(}^@#*c-$L>l`YAN)n4YS_f|1MDk0QJ%>Y
+zIN4)iwZ5|jcf0N~l%9}NnOp?3QB{h9f5q%FTC;<R-Gb=gg$0sm3F9&~F@?=bavnB2
+zU8br`YeagS^zvPb&OhP$#kr;+Rg$Ue;iiUI_R_v<N_I8%A_AJf+_j*JQ<SDf!Zr=t
+zqnu|)>_3QS)zS%<$M#W#O>7kNJ4nvPNo_vmKBO2DV6)cBwrNz$Wi2>qnkHu6P|?^Y
+zwRGHBJ-*|8ehSOgvKVY+y{F-PmA$A=5`npaGAt89%#sxspZ3mVJ^Bm9Es*73wMFEs
+zE;CJKa&(VadBpdZOO}}e2X*ZaA4=nB4ii#+)kPW?!2%(^{3bO#Sqbe4&Gj!P+-H{v
+z9gQ&!U0F4M*x+#GdiJLNKO-YmmO6cD__?VAds?pbigwX;c3F78?1q{|T<z$B^;@Yq
+zzy4q;W^VDMONgF`FhyhWws-<Hqc`0zV)3fI#9PmWb+e-<BYTQJ53aBx1Zvt)@W!3;
+zf=GGYfdDF3HUGeEHpjNU&J*sGKPF&Zv9*WAINfQcf+-Pp$7df-=$ZU_|B4LU%K3#O
+zA7ULz;)2HM%BPBP=dVr%X#1+2J$}Yu&h?@!{27LADOTT0zK*|%^{NAm1j9(*@xUNd
+zPpw%Ggp;{I>FxqnJPZHlGI_m~C(l9#AIavNoYOGk67*-9z>zi>Jh-g)BU-GK+&=HX
+z+}qXLMJDk=@^9iZgd$Wx&daVGU`H~OhHj_#RY;eJOD4K(1B}VYH~&7uF`=8?C`W*g
+z#HULQ1N5uDu`!0?I>H-=L>g6fnM;NBYg{Qtf!UU?Kib<@%X<QE*m@v~)5T{6ZFc2F
+zS3Nu7n@^#bRip&PVfvn-Vp5&MjhYpJHX}p*@XJ*5>$`-;bX{?y@ohmZx{F?4oqP6u
+zvpL5Wb5M#)d{Z?Ty7!TvV;eIm^XX$EoR+B8w`w64#W?nxaxURKZ=Au3g?LVC4B8OQ
+zo2vYZCK7~frTMF#_P<eO|L_N9!bVaHrIBRD4{HoL)HJuBs46XL*2>UJIS|z{Kwrz7
+zKgXVaH2ZT6g%hZ37*omZ5jkpEj9qF0?1Cg*@(sM-2TI=n*?YnpdlJnH2>$xfgsN1z
+zSC{gKty%X)h4R;c_+G~{ibYM}f306Ms@`-x87s9igyA~hinB#e-FZ(X!<FT5tZEL2
+zPB~3%zyOs$)wZh_Wi)T?{Nnky$$c{WXNSq?8009|`CY|Q-h4}v1(#T$tn|sB%=M)b
+zbV)hVjPSI9((-tC$2WnDJsncV3Vp%<dZ(-yUrNMKNQD~r2vmcsFAQ)C@NrA*6T3*o
+zD4A&&Q90J2jM;9KuYajnXBiMkF8x(GxZ_)EQxoJ}M1o(fN;LS@cx#+}4p-Z6jo}rN
+zM{x`C%yOP0@k(PsHICfzD^q@jey!5Hx+Bh}EhZ-W@J+8@4!9a^YPZghu48_xZOP;d
+zT?ZGW>FQF6SV>=hwNSn-`Q3x6%?|1zmT6dbdHj#Ci}?N;bQ5KE`!gu_b>^7s=P7Z*
+zWq9~a@HM2|yz1R<R(;Sd|5%4k#DYvygPV1*+q^5H>(Oj&Asnt2oN)iGuHOFIPmL1<
+zBe)4R`N((NUixRX3)#8x`zrX$l=ysp+MM%ZK48XS$PlwnnK3J$+@3TixyAT0mM987
+zCIGieM6B87+H^6(*&SCjA7v608De>IJ4}Vk!<h5`kl5wkL%jz?8hj_9x1Tno@+5qC
+z1MUXs3F-gbAqEKE!Umv8{;SM+VxDZPKi+-B0|eg<47j>^=0b<aUysCh%;f)I;Uh!!
+zMXnzxi{chOj1~gj0+6)PpVm&@ww4z@x0B(#CYa=LbB{kyj+RuM_d!Uk>&~}rOaN9l
+zu|#ohJHG|)cotr%6_VBauN|w)P|ka&<*q8ud)GOeJzxDV<0C%6Zz_Bz(B*kX@SppQ
+zH@`o(wRx|<+w^>zI2l-Ku^;F;3w*nD``h#5m&elqX1a?Q=)S~;QHIal%hzpZ>&ND|
+zxF35?T?f4DJwamThFI_g&9{E~OK-V-e0)R$c9`i?P8W@4@S}IFmom-XWdp}lr2k9#
+zZ_Q-m*StUcSgzyYzp)juoi6CZg(x@raj)25yA^#S2%^0Bx`6gXXmX%3_*doFZ6iML
+z_<sHNb93+mu$~fl{Io)d@M$d(JfOz{^cZ9*aeo}Sf8GZOYRvQGrf<NO+(g~aA23-v
+zdbMQ<@Hg!EIq`OVlHhZ+t)&a@q=fW0+f4}4&;sPsb8NONapu2qzw-vDkQe+AA2`&$
+z<q4rk3c4!Y%^7G*ygkrpN-F$SUC4FZ`|a+QfB*Q;8N1Q(1Sgm;5ng3@8I;$oky?xk
+z))cQX*J{Rb{PeraY{vC<#NS}Ot1reYN}Pj3mlzvf`u$v|sKgc3S^jYT6#`YC&m6+{
+zGj<OK9T<QOF!bq|BWV_rbAiL>ggzbNs|ozSU=80o&CmQ6(!TX=o;xN*?eO|^#&cgX
+zATFn(r42G-zge15dPwqzb@W*-Hn|00V?8_WTAFZU!y-BE`(?4ySO?p>T-2iKp4&xA
+zKp7UXx({F-GW-UHfCSPER?i}Qenmsx8{#O+jY#GJk49eJOoYh(WvNpwJr>zMY83GX
+z!skNj1Uqrla+2{TZQtP<*dG&gVojfR+XOIVZ!f%8M}&W~d~+d|2MDP5k?f#o<OK#p
+zy3)+~0(1@=C~HX(D3hpTz0PZ5gZqtUUgwa{clh;kR1y$6Q@(D(j-cA``;chN?&#hB
+zr07UbuqU6_OXZmqympfSirr8nFjp47+{VVtj+nUO<~70J&#@7gBua5S!d#9Vl=I05
+zOzP2!SqD4h;3_cyH5II;cWJB!&-M98IFaEZdHtCg9St^<Y$#Z$e5;BbjOQ2#JZe!Y
+zH)uC+I$R7Fnzprvm>9ZfHKa_S#s|1bua4Y-Rw5|%Nnrp{bHHi<e}N&^&F<4mgLyah
+z1d4Tp2NZevjCLba+<c9&`<wT+;iiuZc19u|<?-+g??=GK?#(vD%y;+we^LQA;q(th
+zwc(phgTE{dEKHjue<zA!Cy=(|4O2zYt|WT*%39~cE~vK8hHy&^`F;=iTo?sJUFkfm
+z(g*(_okR^9{%vj2Snpk3{nDay(f$N`=54omBj3W8-`BhLE~FW;l)rz60s>^2SSqR;
+zdHDB!K{HJv25`#1m>(3Kmnig$|CE(gnflUUYD%i{5|#g^!>$p(7H=QzxKG-a_A18K
+z$^^v}0Npd>YcMlUlVnG!CvXAW&@P~bIHPPJ+9Hr)uEXN)1sx5Nd!}?5Nv=a8SJO#B
+z2JMM_kPp8NgP9cICZh8+f;OZ0&64$VRqRGy%t$9Jp1?t%X1fN67{{t{W9+L7?RP9r
+z%HE;P{ywE@^vy6Z$n~vSqRMYV*CIvv>mAE&tjh%l2g}X%%YxgH7lg(=jqat$YC68C
+zdrt@*cj=cUgF!x#-;(XIoOw^fZ622w%8|vTO_dj6O_2g&x&uL*%BQ6m=3ZXSchU*i
+z=KL72t+)K#uq~?Y+n%%cwp%_f^o3qc=Bp2j6w>8KtpnUE3Bq4LZ9M+4i}7cMBV(%Y
+zqGHF4DYGv)DX{SFBPa{JntJ%b395}jwb+O1K<0;d*WuenLg4d<__N-r8`0+=U3y2$
+z&c$eCp2F|Mv7u&*4)^Xu*-qCxV50ap^o+T;D^918$Nil{pRGC#u}YQbM8)L_UIfrB
+z5WxwYnIRPXCy+B!Ks_^e5+eORgtDHmp0cnM*}MM}M2D^X>P~W!_9l~%_?FZh!VbCZ
+z&iEC$d(jWRWQ<zD-;X)#xBO2Wig7$z45<QN+w<&X3AR<tQ>Ym^=T%bFrI2yf8urYQ
+zco(=!zgpq8uWZHPIsBqVzHh|~7AzjoV#A#r>ae4c&->jOk>dV_A!;TxG`cU~GIs;G
+z{+IfN(Zh1n9LY@&x<`MpBaqVNQ?OfgfbeF=Qimo?FOqRzlh8WMwU1!jA#{>-csKtn
+zptAedGFGVwFa7<1FhyaW<AEjr`UTu4;z<FT2_Ep*5jX!iW@~o@ltj6Q7KhCEA!#={
+z+S|h(`vn^(_)Q-LUnKz&aPt}3G566n`g}UI&{h%ygBCum&pBy8J%ooLukO~ntb_|o
+z057l(M^QfPL)WBHAiR)FuLDVJ{xS%=aM`^p-a_>5mZY^9WW8JZkiqzD^{aOT^7iKA
+zmmaAqhQP>g(ENms*YveiKP~d1OomwP)GK4E)QI*!l3$WMLrw>Sgw{r8x#kD1*gzEY
+zPE8Y4)>}Ezr32p<u^@&gd~~wV$H4vt?^nmW${ZulTToaeY-g0q3Evn<qzTRFfQ^{G
+zPmVbB&ChW>eocA{M^e|6rYJLaRvjw|rZN(jM=4Dzf&su!Fne{HoR2+&s6_fg9n|Yr
+z6{3-^ySK@=>fQ!^c$oA;b5oRd|8n%QA$3*MW4i;DS6M4t7th>q<N2GP>b^&%)Aq}F
+zqRa`D?YWBKc+?s{gz|9n^y#Gp2r$qiks;nfGT*EtuKQu#KfD{#e&ONv8}empM~7SE
+zFk>TzVw$w^==M7L?s^R^>EApay^f~r-o$K{+_}_!eJ~RxTm_@&JE2V!rDK355NQ_u
+z7-09KS&1hA@&WZ-=;54jP$^~wBWfNgmC>xydC9;@s58j|TK&+|+~}4PpI-`4Me?zf
+zuKCAu)aBEnE#9%=pP`pU=-~p0&i-3>UiX0W^ClYKZ7O6}xI*wn{2T6LB~9Em8lZwS
+z2GQyp>5k1v+s&56w|M{{b}|IYw`CkA)Q7iExDNyn-2u%L<U3EE=+47+bCD5E#h7US
+zmXx+hlXOl`<@H%;kJf0xrCdH8tI2!8<MSLRQV%&2Q5NEFSku*v<pdsmT7ii)apg=*
+zUaK;{(uy@uHHC+jxOM}S<vP87V~esoi+A)E{+C`ElQJ+v#cNj)>}MbHZ98zUU>|FK
+zhyxo7S*;yd^FU}Fkp~X4!zB<EEX=rA?~?TS<2A|tng(m$u+e4jN7MSg%%7iI7fHe0
+zR5BE97j)9-){&IBix4ahhZ)X#PssqTAEh}1KvD66h3-8OtAm2Sp;YWvxci{kaU#=v
+z^lg(g6_3mFNqX};!ga(u3kml;3x_7{%3WBa8C3jfncWa{rgPKOg8tBJljTAv;ZG18
+z`yP8B-uk};dr1X2&*GavAvR`^cmccAq1t~^rq2Uwh!=zsM5!&IY!L0CxamiMD1}~;
+z%YMqwI`stn%TNuY(&Ny;P2YhaMq|Xgk{{vGMBLbXKy-+(d8Q#<eVu6c7Qxfrxw;ef
+zpeX%5pC-+OhYPV<><vWV5xi1Z+*{a=HvUwQs)(-|QH}5jwbM<0R?8dlF~j>;Z)bi>
+zt`aX%Xs7Ya()x17<ifiilNfey`eWqb;|uN&{g~qd%5(T#7-r-A>*I1rH4^18C09Ld
+z_a@{Szj?=|W$T46Md|GeQV=D7%_7^Xg%>|eKDuQ9Jblq?Ay9`g5Pr6`7d35FOuLeF
+zCe#y^OE!tVvH!V`XtQGI8wAUgFM%RM$&MT(Txf1t)#yT{KygYf(8qzo&%$4%8gG${
+zLq*Kp!k2fuk1-ZOTG}@}BXC1LoD@~#qjSfN&v8RMiG{%Xvz=w>`<HnrSE6=NKIkqE
+zc}aG-K_^f;+#3HBNe>WjQ*Cu1vj#>|mAiSJ!Y)IY<+!L2SXy*&jD6edElfm&HwZ}k
+zK(LQ;%nIecV+j3bL2D#BC}!)5xj+TP%zHK|Q@zSkT`P!n0dk=Qa;l+JF>f(qjoEP#
+z+<%(|{}9ugbSK!3w7rCFNhw<;e7>Omz5z(nlEH-%G}Ealv))8rb5@7|6lBHnVeB`&
+zBS7LMXCrmSz7lFOIjl>WPO=Y=i?`}i2^l)X;E{`wu<sd!lw6(u;@^X@!7Sv`j?sIe
+zi1!Zc?+SkD5#wgLZKkpH2kAslr}fJ7xe=Or-QgDwy7wWKb5<@IL-4FIi*S;>*Uo}&
+z)4Xup47)9oEn_Um48ubi%M~Jo7(XP4K2N|iA1@R_>y;ij*i?=Z2onkkl~>1WHROJ=
+z$3K@#tcCLB)<t5zyOEHJg$m#zBpqF8T!!4lz!998Cy(mHcVVBzyCI$CxVexINed_L
+z|H6M@<1Ek<6Kn}-GSB-og967);7@=|vI2cK^w9^f_Rq)drS%KW-5>6M)1n~I5Fjj?
+z1x(P=q;z-}6yJ!x&(Gb>;*PjHOj?tn3(<yx9csIE89>#mfIlDas&W<jt^aUqnZ49Q
+zhK>5Z@;uPA1$JQ>-p2X>zis+sC{r&g&H@Ak&@TwW$?F-#>GDML-iW_&0T_9DqOG9r
+z!(EZ+wDpcIc$189RHNivl#$iJdar_PXC_;5Cn;&;4I6F6k&1UkfmzplB|1`X!1iE7
+zxYvq@N}+hF_h9|y=V_d6rVpg06QR#}ZWrx>-jr-J%oukssbMRFu%il;yi7wnsG-QM
+zy<W_uc%os_!a`C*=_T)uD)&oE5PwyN*ivTLX;jK)8ap#kujX}VE@>37@buoy0)H#O
+zp~}L+0tjmv;A|2_Kel}>Q7Q#gs8BzbE+ld1-hwsKJ;YbKHdlA#+mv5xmn}+Dy##vZ
+zQC7S>_mRe_r8rZ|9To_49|C)VxZMV-n=8Vs-KmBrfll9S*!u5~hR8@{9A!K0J`I2f
+z+PJ8F;=jT1Vm}faA3}EmSl?(6jnzJmA#D0~$DN0P4?f~N=sD6aFl4KD<p!*TB30F;
+z=ZF08>On5(?U`lCc+_Uy0OrIfBk=A`Ef^xC?B8LRMYr>Niw@b;f4%sDY17l|An?eW
+zcav&6U{ieXW^1Sw3@4b$@ako;H5F`Dz~?C+%$7VY?9Wk2H*#{<71DcAcYLM!$CjI^
+zfmt6*2YZ<Xp<nj8H7ftQf;f)#-YaavBe__?{p*M9u<M`i^Wdh?XG3U9pU{(Ox_*&O
+zZnHTym2sVo3)8e?-^-tuMbF~l^Zm^P-cj+dI=~pOQ3oQcFtn476FdM^_>w)vlOeh2
+zlUN%AGt4)DvjL8QV$05sCJQp1v(V`iT1a*YQlGxMQKPMo0qV<dXow{pO-s%P!IHcf
+zVAKUi4ueD`aLAuFQVgLKJA*btQ~CwoU`pH=*&u#fWZ!YaX^%A__BIMB)IK!50?M;7
+z)(UJ?B><pMGf`9i;_YwPP4C85<H41CHxXkW=ZTLdk|y-B&tvJs05<2}xZZz}j++z_
+zLr{BS-+#NfgZ~$PwC30%3)|gH*0L}0ZcZ$+HOf;pN3n@2g4`3J(%Cdvv1kj7^_+h(
+zFEvxH(O2g`CC<568FgymkJ*krEn3f>$DT)dLR)=a1}juPh0g6Of<L4;v#+tGBs?bU
+z1>2PkYURTBm@1U}hV3)w=LKHN^2a0lLW(*f&6CU3*J9G9^Eo%SE*Lo+IYe92b9C=s
+z5iVNBPf*62$|AxGN2iQ>psLwJLot<t(x{;J1!NT*Ta<e~Iv%8*&(F}Iw&XRk3}AI3
+zJce0B6kg`-#|ZSs>#;1#RBSZ5)R6YNZ^lw7qus{^Mh}GOpMU_Pc>ElT(s~w6fn|2c
+zJF8BZ+<c^R79tbVU7U_=QunwQyxqdx-{2_;wPAVPh#jpIcp{WQo{?xB!EO&Jm=Pp|
+zMi|ojx84~foZ8?<S2KOTeoY?$t#yYVwx0L@4n15D-MdMVoTLT;J|p(N&p9WKneM|H
+zdG6?P!<JUC20m$_InG@$*lPZgVMe|2ZEA?t5EZ9$0RRE(3UL5F65Mm?Ji?&p?-=Hk
+zGZ*}}FL0&lR-rPRe*O0yH_$c4)WP<1)BJYip#yqdY@xJji)M~_9Jtl9YPPK}9bXT@
+zANdQ_Ng66CQq0<RI}r;j`w8W|26=tFVdY4flDkUVE;HA`?eyariKQ(`Q@}(i3thAh
+z4K`}s#~fV7Ht!&IFQrRA>h-vYh@(xaW;5+p72Q0f)Zpi~mf0F!4>^zRcq<)&Iy@vF
+zn-bpD{xeV#g!Er@TiwyvYEm8w69!^uOmHNt<KATsV$aeV>NBZ@w4q9~BF|s~bA!mC
+zJ-yZ5lVrq2=s;f@&u_S^MGi3{PV_415J)5X?$8sYnkZ-$kpfZg!oSBW4ZFldAN0gQ
+zM2bHHo?A{b&abG@JPr`vQ0nrSLzfp{L#AJ5P<>9a?i;~8OG9bgKqsFB=r`Vz_utd8
+zRAj;m8sB(Hx_AuvmzmICHFneko^7y75Z)5sPzRR+2}?KTjowZ)Ky?g7Y2B(HmG@y&
+z7wk=_`$V_Q^O3d}z<$dUAHvQ*hFJIcRjDD?-y6^uXy}-rNhy6kzjzTWp5kIar}oHK
+zZ~3g^TFQ673W}1T-3w9Tm76KVdzJ#fad<4}NGqfgtYpYyB@GzlSuG9Aiz$nXgBcru
+z{N&V$nIjjQ%ELpWY@$@J=Ghi|2-q>K<0%Uop%<X^+sYe?4DBr?Dm=+PeXI!GuSb|k
+zw%b^&-n63h_;XxC?<aD`qt8C_K-sz(8%<pR`DhZuhcE}KkwL2<(29n*NC^&E-xkMt
+z;0fOKAar00X0?&L!p=-sIN)RHa&C4)8^nerM9>~Hr=YC#p$TL1H6;wpBB0#ozTAN0
+z{?Ev_>8X7eMYscUz3y^0(VjTr8-)tewSUb4&^H;B-p*0rI%MVZjpYW6DF+e{L+37Z
+zvb^*6)`C(b=Vw%mkI4%B$(^~3&m{sji^{&K;T{@j_xkpsqv};d51{R;ltM~hqj^jh
+z?g)>gyMI$t&-gYt-PK7%*N$E-2Xz3T<4x<{`;FSp+rI{zdPSD-=B*?wX&Yr!Wp1j$
+zir1BN7aFEvQ$F<!N7;0DFPQzvmmTzLdH0eTh`Lm#_*8R|FvX^#d5>Yg{%FQ*<4|P?
+zRJA;9jSzguI~=RzZeBA1oA>lxC>5tOP1dkZ7EjDY$4XYF9>!Bf8>XP7muR^aLg|?D
+zSEJfHwN&)4&h=&#Yn$1`aJNLZ1bp9}q5d3wJAx7}U~ACy>q^;=t3dEVI-{?0zaT}$
+zTB%gSmjX!ZA~YikA%sX9V!Mf-kb<}~qG>yW{ZyO?bP3!HTttDif73`xID0#2C1&^~
+zH)(H^^+kqq(%NNAjA6?`5+eawB1!f7qP@5_ccJo*JTc&#Wnow(^YCvS_pL_9_v;p^
+z9`JPX@1hV<$Rt!8W?`fW0x7@TV(=IYT5yyx4uR(qW|t-YK78b`7XIa2Q`wxBjm;i`
+zO=`-wXs<5Q1Xi7Ajpc*@G@f0GBLvSoUyA>98XU-3J`yYQ8xG<k_8RGKZvv_lZHcqB
+z5Z+>{;RN7FxFSeRH1`5B_+8$WQB|eOlr+z$F7ZF))@_t8pGRI@&qjv`y1|htn2e%X
+zUcccs)3s{thQg$@x_(ZK?>jdV>DP%rFbX<Z2Wrs<)Sz2%5U0)vY{mj9+3@LkT>=O@
+z?M)jyhyZ@y%V!A>Gq?wv30pP-s49k`;oGr9gqTsF<8WfcH~#Mlk~(;O_FH8-fBG~d
+zyl*-KzK(2O8nS1E=LWW|<gJWW$gZBl1P4i(-Td^-mM$Z#!#A2-YLhTu>DU{o^u<34
+zdI=iRdEP9#amSx9?p$6-Fl#*|1lmMk?qefDaZnMVX2&1yd$odU<Xg0&cBQtSX(#XY
+zPBkb~L`y|~Na?p!<4&MyDugyeune&Z?ow|0L?Dz(g)6Igk@d>HJ=PXBo{ak*i`m+y
+z(#`>}WCaD`5_I5e;UcR-_qr<#a?>{qsl9Sr4<(ja3nWAG7bVT8_2`hyaHfUF9|J+-
+z{c;C05dk>6Ulu9M<6*j-4|<D&x^xaD{PSbX`+>qn?cceM@4T8vrv(K~dNR`$p~0Ii
+zRr_xfkZOtC1qn=2<P})X9Oddn_ptPxS2hOyKLZjxM!BTDB>DUKM><e12E*`ZL~*=Z
+zVHf=uQ(5L!?caTdFR^TSb{OO_K>$7ej^rk-Zj1EAhiL0qLfC3v_p?QlLGiH~q+CSk
+z8Pf5s3?lqA64}?qVf%dnsOnvD!0Zp&<ba+)azaGHf^;ZBfLw*9(>v<1{)zZqhWF2y
+zhtMQ2nJ$*rFM2tJz8ZT=!ul>YrB2Y>Nhh%#yAe`9+_z%214>T*pwr*=DiBM(`esQV
+z2;4m^Y-4x91Aa>@e6SI-Q(d!=kh|Gzl6HKH17co^x!3LYALRg}(%X>@THey$Yp8=K
+zd182AMGC?pO~8&xC@-|WL*uV&w?M^{{ANpca+qQxuO|_bdjeaI+WtAF5-^L^w-Wo1
+zXqzodnPk0z&pLsqW0rrY^vd&`70J(M2>d6XKO87%&y(dSO4t5TwC+*6nsK5d5!=dd
+zRc)EuwlC3N2ujQ<=haudwf6uDB68d63@aQ|)@etyAZM~>HA}~Vym`J>R8mw9RQgoV
+zGL$N8W!pFNYB$fBZXU5zdMu49ivlDaR}<{~<_Qj~AEj&QUO=#wDLST&Y|Pf);Yu~{
+zM;s~&!aH0)=*#+A_xCnB5`EEktNio8<((e|2R%Srp^_SJo7U$RI#pj;{2{tYQbyUw
+zI4=MCF1Q=|;D9qaC6VARH7RDQnQxVAsk0?}p@WV-?8OcOFz1V<XBbgc*7OBk1y?w!
+z6(ib$7~A#-6eYTYENd@NuvOx*v81yYXl!pR+McDQFy=Gfgs!x8CEWoVB0Ik^>UX&S
+zdc{hu(D$+3f!H_b`+x<$-$OmV%W!sM9i1?^GKXc3a!$W+O6yr}dLP(0fikMureWB{
+zY0e$|Npgk(@_r<_+kaY|Fb0!}2KOhvb;Glb-j2Ykd(}3T61x0dPfpMz9lH~z-zp2N
+zYZ!Av%m0Q-hYPzJ&D6Am8uEP4%9WA;X{k?h4|=gTZh6=ER#l+ypw3MKZ?P=q%)ZEo
+zDs#`$8LK=(%1w)kno7Je3Sygvg}HHT8v@D19_uBDuT+Bg0N=R13FiLQg^`3e2@*NA
+z7$+K?(iIGBsfW88FVH1X)-yUyZY^6KkzEszK=x8^?ahc6IB134AM3yWF*-*GL|@qG
+zU#T7Ty0BEt)A=Ew(pwhpZ@1`5+*Z20uiL7noy_M-KV^X<22p1>HzhB6Lyj|eP&HI$
+z1a2B$2+(rutHH9T@$JgruR6CYO#%r{*4Rr4u2Y4VuN)NnC9I$4yF?+Iawa=~N*a@2
+zh39U|qzE*c5`WvR3w%u|AXyL+d{udyxBhI*e{ZpO^S}NQ#@;kSkv^zyieAqzGBD*9
+z>X>clUjpKWHp^<_+HY9TQf}Q_x@p9_528CRN;SGr(QD-oYDPZ}?yEt1o2zig)9K*o
+z&Jc)JhZ?79>~2aB9=gf|A2;@y_0pm?__){}yYP6%6Q-+>P_4Uqo<4(Ux60i-ulgF|
+zip-<V6QYu<kwu<i>!$2uy`LaHwV>5)2_v>c=OG}U>odZT8C4))#^k1tO7nDuf>OFs
+zd#UwGldrt#7LX*=h6{2>WD96Vo{L!GG!W3km_Iy00{*&)jwX7aaaY-nC1c_sk<54A
+zgfGg>!YN%)XBBKia6T1sMRQjELW&ee^Re7Expq&BpuL2&_(f4z!cj}2pmB)zT`hQ7
+zoyndxb(I0ZTozU`Oi+t`V&K%GKM_lIUDRp9`5SC1@0%BnFIE2X+#sAb>S!u&_}M_8
+zo8u~x&9W&zLV^4ZS)L_XmUfgtbTLCBX)tqfk?8ixYev@h`Y$Y3?}KvZIB=C|sv!ZC
+z+SUA2chYW>+=argskDS`n>z_NEW?>z*1DgZiv<+ypg~Zm%ufK{$zWeqBILsrNif}R
+zf>!Q!;=5(s+ydx2gC)hRd!Y4(qWCoJ#7h2o&k28o3k^06G!1qtz9pCT7nocV-^^oV
+zQb>#qzo_~z(KE&Y9nnJnhA{jc36EGFcAj=E-m&dkav44vA?kvJtv9qAYDWJNvMxhb
+zjP+~?clCuv<u-7$YukII2?*s%V1a586KtC@nO!d;q}v_Q(SYwmgD-qd6$0N(<lQo6
+zCm90h;;O<X(iux<HM6j1k4{S-92H5JsTFTtYyHAXjilL@C&#ZTo^13k7kr;4UgB)p
+z0uBzoTHS*bl#pO<2Ph6%Oyz%lVXHOr<68ezl`fgTp|&t6FjmivyZ;7`9fc=~Q;1&;
+z!bBe*L7}AEzZfT2y@HkWr%86*TGnO{_me)qoGjBtUgohp!|r=l8em+CWE9Cb9C(>r
+zlW1GQOoti3<uky~|Mr_7F6TNwiOrvDVx0FR9BJs$gVJ=|fL~^+Jy)D`@E~){cJzA{
+z1o|FOdhA(dEub%X`@z!eL@w;2|6MP~whx4k>So4@&hnAJADRahto@YoYLX+AlNDl+
+zhe#7IFqZ=Dqb&%}&n(bwK0r0yNx0xVv|>reFxc;{onD5rnWA658=mO<-wHTrytybh
+zmxrWcoQVNkF#f)aViHUdEcZt<{9QD0x|`i(jlru8%bCqeYXsXwTTjhwvB=HHJ3tz5
+zu5fIWt~8Tbx-Z%1rW%myki+NMGj3u43l#-x-cn6?Em4haq8o!GCC}GG!T<iUC*Ib)
+zzzU0q%?7R3(nYdeY&_L)vIm!jlI4maX&(W>9<Kc-Q+$h_GCm|H9vpy$7L~0pZ$xU@
+zijMwSyf^+n%64ln!g^~K;Vp_cA8*@xC(A&7T-m}T5ksnN3DhNv7AR^5%}4HrTPn(9
+znY(Zg`RESx`7rD}L-u>^M#5PWiSa4%wHgu<PQ#c(Tei?q^N91P+drLcF}wg27Mi?#
+zU|{c6HgQ33Pt*F$9-cfd_kA$3cN)Y$^*9pyd)4|2af<XdagqaJh0HwJ){cl*vFG$L
+zPP0tKnJtq5%Gf3jR!xMp8L)7|bw@R_;AleGIM15Mk1BL4@@(_L+Lw%Q=w~-o3(W9K
+zS>R$BG0whBN3N4x-f!0$%<q-@X6nr&(G%qdi1DGE7cF*G%8GI{k|!r8ZWNueehJO%
+zz_FCb4@@>~R>+2H4D#cIm#AI+mEo5O>w`RB464B{e7rV)HKv-#Oedu2%oKqqx?WQ@
+zx(bg@ccsyC!7E4>>k1XT?Rd7u;dhw(TP<M&A<dXtj9hx#10ghIn~TVv-<(ws$kc9B
+z9ovLm<zGRg?s)MD^&l`S+d!Pc@Rt717lx@l?-(~>10mavG%E}HR~JGhAn{i&^eXb!
+zYj?Z}q}c0C$-&0eV2IfXyFI#YpsWettFPnG00})5xHaNyz98@sCS@JGB!RiVCc$Sa
+z1KaAj>GHo9qpQW!!bRlizC43feTh0oUs-sbVqLf(^5*tSntSXuzu8wB)_tC>Re_iB
+zmpz4f-+@cX1tZPXML1Q$|CzY9PSEdKKy1owx;dEXY`-W4$vEo>7?0Zf`#%qOI3fR=
+zN+ruG=zs6rtsmKywU?j?W%!Y8x0clT<Ilt~h2N;2Yj=?YhU57K%P5=tszt}N1te)j
+zDTqu(wVhI;l~WIgdEn}qo5m`Pzv8$(R{P@}FUV+vugR^)z=I(aZET0&8yY`8nF@IW
+z#bLFu>`xe%;{d9KgvI8$nR+}Byrxtq7*N=w9>@q98~8xKhN6;4=^w~}3_q38<X_(2
+z(I%03WfZSsyOLrP8XfjhtoV0dxCb9g#Z`+l)q5SRBl%_s(0VeRDq{(7iTr#m^-6>B
+zzn=A_`cgYjlg^$yNoVo9Y^Nz0fB#=#IkvA~m`V|SN-${1Rq&8|U(r7jUS}~qbv3oY
+z#Jp%byY<0Sog@*7YMDl(%9^Fd#DoptT*tPqi(bU)7r3aZ7P0Li$ivg!W=--yN$6Y$
+zbU5nZ8P*9|oSc<=B-a{U9Wb}xmD{55e=4}HwFf!&z^u$MnX(H&ZS)-HoyM0Ctt9lq
+zanz|)z`YULB!K&Qw-#*-(YZJ`$3QTn4l(uQ{-Jj8FHD(l1~vdiQid=fW;bCqQzM~E
+zfHZewp1sWd(*9%q^u$qH@Kl$KK=D#pUzvN!beRxn%tA;h-qA5kbHtscPWAPdPa{ld
+zJlQpZfDf)2808T&?^PMJ(PQQ4sK^J(oMcCVlDo1fvlulZ-;ddl*FPnmS{d_Dlva%6
+zz~L0{Qyi@w%Nh`QqiA4>q4^DFUD4SO<t~M;dHs?ib;94|oqia;bDK5YDx&Q=dVv<6
+z`=e+_?}jku(`+aBsZVqnTS6&c^&q`Mg0orP-&sK{J6nFHIzT$xzxN=zPW-tOp61r4
+z7Liwz%~TqSi!{P-a}nGTVGf@$oaR1geT~3}Jm<wY&i8(5H+NZAIXRk|I}lWoE#FBg
+z-%GP0%CjxYIc@JI&x-oQb<x_hSdeHb8IKGNxar)5pH7wOFbs8+xkYh`5@Rcg^U^eR
+zWqGXB1cYKgH3GYP+yli*Dq8pNZQf-E{+`o0wh5)cYP2a~Dn|X4H0BQexn~3fI0=uX
+zY8vp;_V`(SxS|%GL<8_#J%0?DzX4E7v;K_yw?N~aWNdXyY}2c8Mx)H6?hToHO8)i#
+zcI=`o83Sc}SIc}Qb?wDeQJrT~=EtdVXL!7<8`wp;gOiiejuw=}hXx~~HVdBm#^DqM
+zS9@ab!fN#K;$w*&gkBK((`07DpO;fQ)b&W3Tsmw{kY0F=<7`DFb$!YvJ1j%rD$8xx
+zkf6GEf96l++V^j#fjiol88*c5_g`G-o*F|;1^rz9j;VIjM=}Yi=U;T$Q~)gm`+1`m
+zvKU^LH8aNDsegvQ+eu8#oH(+%5>z-wP7mXZ;Qbq;H*jd_xK<%th7`o7ba-SjG3W|3
+z5|fs`SJ69im;q;zo++IAr76F`yQY2dbw-Dg+7Yz$QNPu4zT0_w_7l02_oe!pocq(Q
+zx#uN4%e3PFl!5Q+sx1`*x9S|ce>S~bmGGt(hJW3UyEb);LH6NeJK|~@SE=V1&ZJa7
+zCoD@=F>?`jJPZ7l?@{>A$e!Xomm%u-tZ`oz(|B#%vQy!9^Ih{9s}FE)=Z}J!NVeFB
+zxULJqZ2Olo=-E+qmW<{fo91gXO1oyj48_T!pSc_kDF4kW(wa>%T{-5m7;{Tb#f$(`
+zU+(DAExouBJT?<@v2ULo2`CWb*GA{ea<0i>&Tm*6+%=%EZy2$B?xD06c+tHdt55kp
+z+GqdiOza7PR;0Fb`03BSH;-=o;=!ZU9Q{a<4J06>aAa)g)c8-*)Yfl2bQOB@(a!SI
+z>1eyRK2byn!&*y^aht%pUS-+Q>whPDe!@8&g*y!9?o0R3q2qk@lix94Zod*U^)ris
+z&c)R8Z>J8Q#w#FnF6TdfEXElP9Z8k?&Qlq$Xr+zmddLYn9#8hfw8YLw9A!RD*aO$r
+z&QS}AwH-u!ng&j&-mi~wcM3<~H6341XG_vhF?hE1o|HAp9nF#q53Le-HIKe)gOM+c
+zHzYqMF0YWT5I1Lz`&-29Oq4#MV8^02BKKZQrTDqOa8H&-vm9%zQeqIvH9of<6?48)
+zdZ#lj5;i&4$=26pM*I_l`YM8e-UL*68bG=Oub6%%^GRi{=ylCa@;`iU`Le}x)u4;d
+zroh=S<`=Q&90qVOAm!5zi#*2an!A3r7|oUf-+ITgog}HMKb4<=U6^)iT2gSj4#S!~
+zGwjpZ*r;X80^;TamJReSf2vG9P4ZBJM;V3hpKl8|n59e~70)<7&sQ{RH0}waCRBeT
+z=RI+LD7?{e_SccGX5VF)@g;HSP|o1wyprq8o3-&eFkF&z4uuQwNlrfvTp*so*y6l|
+zZeZshx%F(U9okx$S;xn1-AxlohSc@t7ANdQozXb$3>DOix!aI9x|$9yJ+YHmfSj9%
+z;5^B%?<!qDZPT>APff)vy4pYb3oUvijo4GRw}N7v!dsf+Sq)TQ;R#-6nFgzz2I=|>
+z@_jkc$fao{hDWz_2^{69V`}0EYi&`7)8l^MA{F0atk<cSW8B@0ed1Aw`D}~T2`PC^
+zUAJz9`Bxjxs#Gy{&C_?yd-_)|f1K<rS-tnAQGE`2`yx(1%K-5i=*{tX^$9$-BFRgu
+z*wUHp5D=&HUqOZbzc%%WQ~Z9XT)U$3GJNaV>9oXdidda=)v|;7EnTBgNFP_B$&Y!D
+zuaoAnEu<FUx^~Y`pX!1uUuUpon*JA6PFXlZEnWRg7f^8^oAYK}|H0$Q%NcdUGz0B+
+z?exlCrAf8|QlS>9g332XS0Z)q$*RT5R>92MYEw=t_4iHX1nT)@3c~Fn3B7Kg=(&Tb
+zXpv!_z8(UuvpXVmPj4#MJM&_Y>Jy|j7S+E(9%0k)o-LU614E#s;HzTQ*%oRzdugP7
+zt=Cc6cF}pvXhn4MjlO)^4BU1*Io>W=w?;vwe0ZZWJ@1Xe6M$`IG?-9CWNxee=zpxU
+z?w}r(1?fz?807fzf8%a{U-Z}b2-Bm<N%*O@qj|gGqP||H$Jm}usyK7vyVQwu&a`wb
+zdZB-7Cpg%A8`2tC^v27Ka=Q{HzRd5;Sm0vkKl0M3Y(C~2e|f_zs+2FzNsFdgI{nUz
+zq;!k}h0`|Vx3xB@9&v?|OLgZ^E7IRe`Jer1SUe&*m-}A$y^CX=o!a43SZ^Ii6-2|q
+zQLihA8a`AE{q@_5I0G3qRjr>PR#U^8$^PE)ppCK1GD%B<E*3rt*-@Q)9}6+-7anSj
+z=&`~0_fRk!Rqe@iSkXKX*QROu<$S_no8Z!h>X1`1K`rCKIFYD5k*St3vYIhz+&SdP
+zv3{;f(9lJ+su8$D!GFd`lPFI9L(#3vr7oDFkQz~O)c!w~t~svm@BdfJE!#F0Z(g?R
+z*5a0N!_tjw*|u#h*RpMME!$lFeQw|1-#zZD_c`a~^E%I`)vtZj?`{%qBN|y)ujg;C
+zpVn@FxuQZQfO}5uTw8^+-Je$flD!^xzB0ER8=NCAwyxjyNRVB{Trg%|F`mA7zbtyA
+zLME5*4F-G3?yBEMfq$-7Ms!0!=Qjx_-K78hSC8VIxeW>ieR{k4gr02RqVx3p&L6PH
+z+xgJ8yS7bskBI(b<HO>wZTCsfum2!KXcxUA&%K*LylqBLPnus0aI-D~=mQ{F{#d$y
+z_W(^u5DG5>$N=-%!{@uxQWY=IJHx<420!+hV{+@zeq-apG5^c$w>R+bQ`_&vWDi3!
+zS@&d7{Z3ie85eo@?F?&Mcuk1tKQH`OU&+Bb!OOo;GRcFtkC2lD@p!~TlRinj2syGb
+z;+E0sY3e!`+>)6!><WLZd0Yk!mdhoTSWuIwi~tNvUYmG6db;TE;3<as*dX2V;Eng?
+zl{Ojf_!*8XaN-*uJm2gUtQu}WSYW^2U1r_4S^OLAd>*}k3^8x=dSCPQwx5ANJ&Zy4
+zcQ2?#uBaW2FL{3;NS}>%oQ(F||CqcVvUuJ7_Db8fFMPgy-_yK2ZnyC9T;*j>Wtfxv
+z!UrJ$vV^T0NbVW<-<FB2Z4YfQG&VKevm7gQ>?kY<WI<*oH}SnM@p~bI*7kQN%fib0
+z!9Ndzdm#K}_D!vSl#mnb#oumJ-f&+3MZalhz+|4IKX;)IJ-K#1{n@>a_I}>pz4h$8
+z_uRJ~TwT9wynuZ8CWPQ|!U^w-zJt`i#_vx6hcf$w_gn3n=ab1-8@B@qa*y>!^7@Ki
+zn?<9E=w1h&$$B01-LI>RkJdzJr9TK^0<pk87BrD9&S(k*CXQ7s%=xxDPws%8ONLKS
+z&E1vNde=Vr0k+Endg(9?F9lxwHA>{We@!U2Z3UFgr0gxQq4J+sJ6~2eArsOBr^IU;
+z@K;UbZ<plw`%ors54*|15Dwks`;CNO4w2Tfa~BX+xy`??r+@o?|A7p;zg?ieRlAV>
+zTMPbtlY2p!eMxxr^!7aYCTn{2pTZw+cHFmDJ)e5N-Fx?bdYSnYxY%*mfaL&v{+}+t
+z)A@$wHybACMqYh-?)g-a*y$7h&ItS8AAT0|t4mTs{`;qieaOb`e)qnj_ojLp@al(q
+zgb+(^Lgv+bI^Ui;gCPvNag#6qX}yKpF7r3StcNiR`TJ`DLqfhN?Y&AnFtZL`)S=3M
+z=M(P#-v?BA9hi}tx1u@yB#9~q&tZGmzLh4+%p-yR2wzjW0%fp^NirHP)8Rge%VMZ&
+zN5Wk>`b&S?9x%|-O5cGQ<>MzJXw2p2Z%m=aUB2T>z$zxh>=&BSP982QR)VHN<_nY&
+zd7L)>4Mp&4@?~u@v9t5_whCY3{>-&gF9NV`G87I(^C^COx%fRO%+|I;`w0m`?7BQ7
+zZf_2GsE|GjO?F!%6G;9tO>V0O7XhH6Ea*e~z=Cbn^Zj4YcfRxX<j&{axSqUO=rixP
+zr{MJUo1$7YDCsxNDi2M!K5DY*s1Fmf5M>?hFeZfke7}kA{hNPCGegi-IWKndv0@Ud
+zxYx{U8s96Hoi>(J@T3;4&VZg@1Z{AhacjApQ#HkMHh8k+SLu{+s;=0YhV>u|S!6`g
+z?K)8-o1PKLx1JD$4zu$0-&V|_&dS_L=_e>@QCGkzrc#HB+g369RmxlQ?5QtVB|hmm
+zmt6<Y<+mhr`cQM)8x)^UXFn^=@InYsX#_mZJ^wP7W)S~5kbWXkl4OyE^ICNE`ofjQ
+z-o_pWp#))wf?;GR=#Po=%cWa?m~cJPkQ6p|D=WtKgZ`@I-hN{C3B~)~)f@lkHt$b~
+zh32sDZ+G8CqRY{PAOBN1mBtTUfFHBGUbF6uLURfi7=CF;zK@tb3F|GEA6I=)o_^l9
+z{>|$A`?%0#S6bK0cFevCC*z!Py=|{g+OBf$vC{#VN&0vk0GH(HH6ofQ{Lv<Uw$!GH
+z>$bt^u1uQy_fC|IOj%lqzWnTt0AG^8px7+GL-w|DnwY)pa)89{{StwrgMS7(br^)t
+z#ghty4|d~yNHyF8E^P7dW945W$a@n7VK^x}f~Oa%-``&5za`SYPCm6wT6_D~bze%z
+zqw>)3VG^hkXiMspm>Ie|Q~V<xz(zxv*oQF9($Ef`z8=VkFx{3`y{uII_fv2b!m7ga
+z+4<|Q3gRdP<r9dV?w-ri|J?oZb2sa}n=ofDApGfC<n0>WOVJ_2=lI*(qvvZB5q{oh
+zX`SG1qo!lN{lU%Ox<SGk`y(_9BsNQWJa5(0HfvuzE5Nyy0(LcM*OCHk^IFMLYe^?v
+z0|hGsAQD&C$x!^jY(gF`KJeJyjEYQ(K2pCpO6hF3`K1kA;G?o@OMHPT*>%cbNWLf$
+zA`kf-vLVgzqc|#z%8@;dTMIlA^aRvxFt`D!U@-<>JhCVna6kZIg_TgZE)f&DtBFn&
+z=!f_Y1yIx>lcYiC6>}$51NEHoh9L&)f2Q@KuSd2XEcPwgSP$U@{Uay*bNdF|C&bC0
+zcXf+D&*W4*)c+-Yf50<}g-~gx;M}645P0QS99$lLY{-n~t~hNnkP(LHJ!+r^^ok^3
+zT?0RFAgExu{&N*=j6=n4<WUHQEY9&mtX=96oy)Ps<XJ{#qj?t5<nW&_e`<Hnq9hp!
+z!YRB21XO^tc7StAK&|tOJ^)=17WI}7pUT4FYkHFLvF{_w$GO?;S7*knzpr;q$>Mx7
+zqO#qTw1GWB2U83i*bEVG3*TR~++MG<{~jUrL0s#I>z7%jiff-=ks<#7TB@D|7+ZP?
+zHyB@?KJPp2NOh_C5Pg*A%z#su)Bf~ziLPi5Lf~9Kgsjb4Mr|uKcsKu_HpL<Lxm*k*
+zjXwMr_skgoQ4>8zo&Spx#+)_EB=)hDTq#F5V)a@%tLC$8je7Tj7S-7I(!#zK023no
+z`2Kneucf~%QF0;{p)Be0X}vsbt7!Yb+KeSgRKO%Csl7_`Fyn;sWNJh3&F&k9=RS%Q
+ziU19T{`JH>WQ6{(FJ?u)5>6lBtk_#GdS*EygpgPGjO@h?eW1NYK8h;sp}%gR_rzyE
+z?+6E>s%+=n|NPI6@7<5Z#mEm(UZAL;31(1md(=?;wxJ)OZa?09c-i>x7w*{-VQ8cN
+z9|F{*BMXWdsgJ}!=+ijrK-oXOMIVcZ8!?~22@J&u>i*7n!m290cX1tF+WP;k&I7W#
+z;?+a)zw^*aGs$!YbhgaHbO@4%l{N}fYExM3IW=Z#-Xg6|Y%JH!sPYZ0{^LJW90LWA
+zDH~G-r|F^`hg1m@z_BobV4ElvY__E~eZdGe<P*ysQ&VW4#6WsioW3fj%;TZIh6kQG
+zU6IZcAZ)ss&$7(ErHx_ff1meig?^ZW1!JU50(^A)1qK7pyVa-)Z^r*Vk8klk;&=Kx
+zQ%10XWDn3`#EfuDZVd$q`6=?c8Z-M2p=6zm_?;19!``}DK4<yc=bj22Jvi|F3JL{q
+zoT?8pX10cE%*9XjO04Tm8;X9-+}`>fkf%P61!M`TL=AN_6|9r}R8XdvsgNaL9~X<@
+z7i8lsNks(W@{mr4_7yQt3Y1?P60<Lfrtp9wB|M?8o>Y|)ZQrH;xkcZHNh#1h3y9#Q
+zf}6wGV3<<y>meyw5{_Y$IJL~|_NV>_A)RK7qDF-c<49A+OwFN#xrKoe7CF#(fRKXA
+zwHpbSylotkD<iE2GK9Xcms_z(k~%YdyMX&fu^I;MBFy89W`K%<RzoKtoYACE-|#9R
+zUgTFSKtTUcfDIvy0uo7gH%jb4bACv3jHRPCxnSoTb0NKb<|Fy?bWpt5$+9v<g<7Dd
+zX`C0iF;*lmJij~*)cspY1-<W*tXXJo>5)Oa>4uSK#$B&<Cs7Y1w45nbeC4W%t=GOW
+zA=B(XE=kgjp#N%~?#xSXNV93E`WwL$xwF?T_tp0+@rLeVOVS+L&(p=9tk2WrFR^V<
+zb4(Y1I-;Oc3HT8B5?*|Qq<^4AL4gsWlwnlvc$<fnc3i9HHYi>%$=}p6^2|l!B`prl
+zM36TQRG%LHbGT0K4m$RhIUXN!Og~rx`mJ$GK9Me5LY2_wq9aFPqv0G&oMWi_$Ut0h
+zHN*u!QZ?x+dj?s=mtaPQm-gq37utJ>hNl4A1vq>Nrr5ad3`&#NFDd5Xn;R?SbEVls
+zFpBUP;Q_RTJUX&3g+B$%lKgilSgtv3()7{n|BJGE5rXPG3@y}}_3|8j8Uj0JkXI_Q
+zn`A(v7zC|UJ$rSPA6wYy`s8`I>~$Sm%pFv1myzESfS4c_iFh3KeN<@@Sp>H&8K7VN
+z-=jw@-yuVuegv5?0StygZM-|w(WCI^5J}m}&ny@Ql#aSjids!?PaWq^1;L2ZXc2E>
+zj8!j5;H6W66Nu_A)F?;9_c9iaFA-Y#<Xipb;j*sHQ9GPtLd<FWJz^g;`biM`vq%3R
+zFXOycp<_=i4}EvPY3jDY%7lf6pe+lELMx>%5ps!V&Fx9w*txB_3S7js(Gd~5dHHzJ
+zAY8_r*O^l`3Xv<{0KX466|s&A%F>{w`QQG&jQ{p^i6)qf$1h3QoWE52TKi6DHd-vy
+z5G7Y@Rg{m3WX`*>i|=dHramoxMEZ;<Q)^w|-n4O)X7d&&UasP_@_~hfHV49g<=&qb
+zuF<`Sz6V2@!7=@eZ*uPqz?cfDP{r^c0URuEy6)6g0`lhhs5Q4Ql1|3UFhQn~g?0ZT
+z`0@PCzD!;AZNgUWmxOhL{vH(Ql5X|UFFF($saz}HK-<3qw|+Egz>ibpSuv<yhi_=t
+zDUOcw%aAznc&>Xk8<PJw;vO$4Zas~Z=hUpI?BbaE5@L;Vy2X7?$#DuGB?f=h^Ot$Y
+ze|?Uz*xhG&i90zqLQ%-e-&7=fTCp4;;XcX)Z71KhZY$bsyHjP2b&F5KirDr_XyHy9
+znygbj>}Yjy%FvoN^7Tto{e>z`*qW6g{jZ*PJ4i&~u1l!oEe7k;l_SBW>Fw=BOydDt
+z442litm>PW2I}~-M#~cX7%&s2t^$`*fpJo-vr(zAnP)<p<%x>Ir_NK|lJAfV%G?+W
+zM^SQVksVTbsbV&_Q{xJ&y+QHlhkZU+6Jw3;{|TzIm@NH>#^}b+TSaL5vnj}VDS8gR
+z6RH1GkyV0ts^n>c0i>A~m7goTdEIpP2@x(YGqoa>e8o1xS(L`IJztG39@K~$RSbwZ
+z%c?Z3hB$PP%5W;zYMcnr51LdC5J@rrgjssp(#x-8Qq9AaOuR`EFph@={!i$*^c=rs
+zA%0g41w~(yS)2m^k4P*RiixX~=gI;XBk=_I@<bIl+GuimyqW`CJ!}3`t&z?cKFkt=
+zBLS3yFWpR`iSoc9Zbe>5zrDmM+6kkjkt)jNtAYUOL}6YgaP!0{7hcV9bMe#wy``x=
+zSd?(;@hy^0G)J~#3?nC_t^+^Ny9m{0f>#lCkdBo@S{d@KUSW?@cpgq=#{t4n_R9Q8
+z%H#~%UL|bbtufcGA>E{D>a3JQhYE8OWm#g;aG{IqbEzXCF%Np;{!#63&XS0DTYP`}
+zd<dzsScuyL{C#CAKB=FX9$;u#V9o2~;E%4je?N+;*K={V8<hKBQygI~1=bc%A8#v3
+zXnV0jgHuVVv?2UH)$%K-9--z?!t1Tp+76=`ig=QguoA^32S7Zh*s8oJH_$!wL)tq2
+z+|?#bR=FAS(BItWRtarIS64SquAx+es|`Dih^8oZfnsa>OBSk=+3Mc32!Yy<6=amu
+z6dh`^vBNzIN^1Ow?h$Rec8Z#~(5XU#)(iTUSqQ>IJdq2EK})O<z?U1j#xTuY+O~17
+zw4T;UKFyK1%$6L3a+k2_eCKCzfEj6CqS6P3R4nC25+j!QLCxsiMCSNB)$Q>e5^fR_
+zy=w@*7atn>EPYDW_Hx@~&`7D7`ic(ngWbPoNn-cPmn2m-zSg?(hDW3L`W2TXO<V5a
+zv%IqWS<Eo*7~|pq-u3zerupxP8b;*;1OmlNR;LN6eFu=H7dFS%VY(C{ROI~n(T-0$
+z`rAw|wLF*nUD%9ksvfYu1kIx2`a4B*BS#cMLfan!Jfjl*^SEJBUXLs*Xft>LTJ^!4
+zc*mi*h*8-g+&?U??`9kqQe2m}=g-Ndp!F>q=;%z4adT%`EFyDrz!0cz>a0WrD2gs-
+zN@fFk<g$bptR^KYlRjFN*AT<vFH;bu$Ag5zdRkPIGQsDN7QBqiVFF58J1+Q8EkBJj
+z4O>3R-PpSj9$p|z+TxZ1lXu~9c!7Nkz(X-!gE+R>9dy26B(~HHm!X={C#q1qfl--C
+z@3@9>9qB-6)m&r=)o;CM4MDv(@gP_B3}2urvjG@k;*(k_p<{R|e*q91h`{8+6zm5r
+z1T>4q@wb9|U6KWBy-~P-7O_RuXe&!enxsE;eSj&2x9`J_ccMxLp(?(62+kODlUDiJ
+zu?la!5|V~xebPuD1_qb*WD|TGpM$_jGz^ZAYt+4r{!1SUd!5X|c7seb7j$t)0ZJag
+z7pAB5rBMkrJ62=4P8R3&3#UUOWe5nBgL68G;~;g`&yj&D^N0M8ME|%sj`>Q*N>Y{O
+z{mRv5YMrlZdAl!J8XG^T2Z!sPFrJJe#goNIIu8)50MK&X%}uIsF-!dCB<x^6ERMY^
+zWOL4I@mDOF5sHD<3A!bc@uvhk&f*_MD=vsI^<PusA0y(~piKR0=j?46P1G8aE!gQ`
+z#T)3fEVx6l7)i<w8)OHh7WG?Jq>drJtd}}&bN+TufhE8>O|^^%gMpu^U%*9?uk>&S
+zPl$!dgujq8-LX5A6rIMYY}Cqu$ZfqhN0}aR-*e?y^BWZxr45^8t!Y8^@)-4#B&08#
+z(vK2qZ^;OtX9dk#vPS}jrRU!$ZWN97YqU*)nG@PcV3_U+n}8}Esw_-2I%#4iAU8p8
+zRL*FFbBhh$g%lb-a*Jy!$<@~}yR>BpGD;Nxb2MLC6b;3l*0pVq8#XGJ=BJpI=;sQx
+zSPZNn)I5#vg<MQtCY!5<oU8F?Dwb$NE*vMR;q*?y@<U2u4Gftp)bH);7XM)lL4|_~
+zR&{HWB1f^<P^ceWDwz@?oFq|qE#|dJCMg<SHc9X^4r`k2<l7-AtfIKiJze}ljOp=_
+zw(G7OxF8ae+^Aj$!Uqc4=yy2Ne??xkxgZaY1I2XFy2~Z)Z=W*4&HIjRP+wNQBe69s
+zxU*Z^N{~bYJkL(D;yos-2~79>7;}_akcAN~C7DW~YntcycIOT!ihu@f(eF1ea5Y_-
+zN1crtAUPB6y=tu11SqWm<35<vyT#4SX>LHQi{8QgR<&4Eu|QmZHSJc8c$nR^9?}B(
+z3W-V$RZ_{9Z4@0O#89bUQ{^R(a1g||LFtSk-K`L&4>~&z1?^^*FM_7H;k~hp&~lzk
+zwkJF%*ApqdibT2Bd}NXW_Uw5daB8toOzT0lpEKtiL$T{vLyP}Zh7~uL!{ZW%RvIY&
+z`~&g&m(?@kOkbr=?Z#%cZ88`054qg}Sh{_c>39-(Z@;-8l;06!T>2oYezTa!z})9@
+z>GK_W+Zyp{BCrYY+atV%!U5|ezN{TWM9KAJYV~ZK_vR=uneb98aVe=S4UbmL!luD}
+zDzijYiM@NQRXBDtwR833Y$%-AV2#Y8%dcXsln#?zpB?9plnr66Ag<rw@yLQiIc2g-
+zMOM~|TiGCFNocjCQZy?CVFjAfQTV=4jWX}m$~!)>YSyuM>-55C3)g1me2gS8#TrdR
+z4EHTwWk>#e86aH-5w8bjQD_^>UB*e0mI>({Wt<+xLwC3*FM9^Qw=|EqSY%OcW+9w#
+zC4!7eKi?bSvQHaO;ERK19-?PdKCv@^7PZY6X|PLn?||D@eo|eAlLOD45(ct!(v1ht
+zyx&j^)hHwHk55c@kj)No&--<s)W0U|bQ;fMA*U-~;>>+ZYHj7IYv6D`8bPdb2Si9|
+z!X3@|35}B~qwxmKB&bqLbhIR!Oz%wtvgw!B5IcXqtKzisy+Y_hq6un24`_SoSbZge
+z8(v2KQC?hDd!Zsp`)Suvg9IH|s`(vNFyMez&El7nxVFY|R)ax8b~$~|eL*fGQzg+3
+z%(S<Y?mMtOHQ5mJU0upp{rF0a8$-=0Eq+~ZnpK#ZwMcgnijC2PE^D~Wx9zKO2O;-T
+zq3?hGvV7#F1*Ra3>+Ty_*qleD%Y#&@U@RABj^pvzu-*ZVYESk>+7t+>j|gm3%Qe*F
+z2nfDQ@Hz$8O&jJX^OV!h%5q#dX^>3To<WgFaS!HaR%vLI0G(&%if7@s6DiK5#oJYN
+zd*gt<Bl^!s|Jn0D$#Ay`C*JWLi;qVv0PlK9OxS*H*v6WWAE`I`pj^|K;ll9c5V$&i
+zvibapo)F8{RPIc=NO`N<>uI_TsaV5}CCx-PABnOoKF_ju<uPBg(kp%tV%pOOwo_Os
+zkuDeZWQ|}Ae_9yuhK0sJ!cA|ZL@hwHPioB%uvIE&J)hUjmy9aHUOqMfQ)1?Xub>z7
+zc7rATEMeT=<wZqwo9osQ&T(3T^uQh9QuKcWOiZavI082E-1H~`Vwt#ZBO!hmm-^s&
+z&Gb#TIQC_DLeEJ1N*tyPUC$DZ0u2%YWp}lfZ;Y%fR<}8M9(K)gu7dCC6JnqdF2zQL
+zm}a{|NFODQjc%(6rZ!$BnG}<RiBl~z(I2a|;woH;yE#V;A73l~hpn+!gkQKXX3Ay%
+zSw)N0-*iSG;YiD3XAuI9nbF0U&U%W_iA!h_X$S@WH%;)p#%rx3p*|O(Yz|ze#8(HV
+z8=GGg3Ey5`CrU8v`Z?VqL2G_^Oc*5P)PdC_SBIV^Q~7PsJaP|!Ear+A22b{mo5<mp
+zIfc5GfQgtdCE6bX%Ra%h(PlZH!^uytNWrSr+4M>di*HqQHljl^scBJFLY!F0taUJ#
+za{!JMJW0`9aX#ETopV4|Uqu3t+f_9}n1A?`aZV00xFm%rY<227w6{r4Yrc`+#j2<8
+zC7K%%4Q51q)$cJ|)k{Qa6e|Vr&73l&Qcnz~V6Pyph5{5<oHDQK1t_faI0J$62*{jV
+zJ<V|MrAkThn^LnifYs1P9h@MoW~R>EjS_PRP&#7?lYsfG8w%H&o~KXo3Jq66)M#We
+z12YDQv@4(=tgkmoCW#oRhOdEA4DH)=$fUnUDu4)7UyNssH?4`p=o+xvBU~qRuD0Yr
+z;z~K<P>z=^PyBV)jx_|T+JldjVo#hsLh80r81Gh0vo1`)d%B<q$@ws2V~Y_hK#vJ#
+zFjG-^Uo{%S=X!d=N3E6vi`puVIHe3Qi?~`TXWDt+w51&3_f|~`91q*k)C3fB!f^I8
+z&}JD62T?;vpZK{A5l737@-SU;(p-uyE2m!_sebwjL@!BCWCKi0*;f7lHpdG_ViK8(
+zh$K*z(t|Jr-MQFTX;igsR3j~PP*fFG+1*ruRq6#R+z1%c`_fTv>;?b<Ca@N#7w)xN
+zBc3wHJ8+>u4%SH4I*u8M#z&k|0O{QV3C=pY&IvmrqBu-Bnnh~|&7Vf3D498A^#fz#
+z(^=?nC0YWTV5i)LMl@fPX?0Mum&Q-tpU~!YNxui(-xZu8Ciua!l&3rspZX&Ws3x^?
+z_o7L;-3Q>&#EHfpM!ydU`L@L?`t=69s)FD0$8Xu_GPxKDBy*$jX_Ktaqqw<fr#~{0
+zj_W3%2<W~S18B$gEE%C0HStBAqrIJxEz&+vF3<&&WiVhQ=Im%48y@Mu5%UixEBaXq
+zXKou%uC4>s{)f(qtdv>v;<!xeGSWhOro_GDXfSBX^`-eo1xNL*yECNkYyyHyjCtCs
+zJq5C=5lfmm{04Dw@ZC5cr4PIN&TTnGqejG&N~}KWSuK4Wj6dL!U?-~Q#{xtr)$*Ei
+zAbn6Tlj=4Eq9-WMLkWJi`F?u%@;->OnFl?Uz3h$sMLd_`!=^N@8T=oQAu7DEvG}RB
+zS}e3aD=D5U0?#@<Ia3Q)Ub?LstK186_q3dN*1#l?$svsq`*5&%xZQ?aFGlGMhHS60
+z)za!JBnOX@(7CmGWe7~KQ~KGsEXc3B5d+jLQk+KRRIbs8lfxos?EzOgd1Yop&Z`d}
+zqev5>zDqX1t~U<@U6HMrhg#{7w?ubTOuN<-z>5^D|F9MLu%8?U*#%Cb9ILYo$!VkX
+zGWpCtz;VhkDBlTWV~iB!Y@Al2hL8%>1r^j`{}OW5jEn#TDjS$NPJDGQ9CP$BRd!;r
+zgs<#Wh>o(dxBgs{ViUFCc+pP6Gfr0uh&^4m-O7E>%+vnLc}jeEu|64~B5+bNznFVV
+zT4*CTX>`ec6trBRJ*1h*)!o4y&%YiE{M@`<Du#xlToXE0SUr-5)=tfl2&^DEn*UG~
+zGhn9(!{F1KGz-Cd-d-9IE@O={m5(-7YLF8_F{#v!iQ&W0<({YoB$#jio}Z-bcOkU7
+z`b~)~8%w>`Vzc^hlTOS+JbQYlo|t@1`l|xDiqYrk0#e0a=`7)XRR1q^$TIDNmO?au
+zRrJJq29YjZ$<CG)km}5`Vo|z17nb0U%=M*rV9w1iN=$YRvDOb*Pe89*f~QWuJp~?)
+z%IB|?<HH&MysYtF5VOeA<V$N);hEJeuaRPZ2+Wt8hYk!x3yim<+h3T8v(<8`om<s$
+zju}AB)u85axjWH0?%h;8H;q+HDR45b?ur(yD&=RR)<v}h#!{d>yu<tLgviWTSd9RX
+z6m+@d3k5K4E+p&vr?+708zbm&()cBmwGqJl(m?I8ZC7(5FVqfK?8k~+Jtidwfg#o3
+zhO=!vu_Ze&`Fix_2s#7|?ZQ;6215PsV>x%9#Vn?r#~%csMGxmI=QMyhqEr;ji8N(o
+z5$4Ik6xgz^uDqsX(H`Bopa&Kn`R==@!a!%*bJRCorYIN$X>I~rfv?=k(q|riLc8w*
+z?S=f-mJRtZ!Ax@WxpGz#vR}&ss`Dmf73)#=#<*-(gfP+DEWn>PJmbrX>)g0Ii-^fJ
+zn^!Eoy4%VX+pV3bF_4Scd4%7&8)&kE)pK$_%3_tl!%OHhs8NWCXcQy&am%$ee0MVT
+znJUACwnfe)vNPrmk~AqPy;F&ZH}*|vif9-}i<ag~vy-TxU+3NvzKnfG5!`mk<0q-S
+zr2)h&v@IhB$Mdv>;@CERmY-UJZ)}3C#2*f@DjEJrEY3D1%<aW<W@C*;O0$A_$5%QX
+zrvluy8s~^giVN?lXBco9UB<S79EyH*f8h%meR^8|*^xe3reEgVR|%z}*CrcBegP>_
+zLi^smo68}z`AmYb%^_=5X}BfO==7Yj(k(DdPwHV)u}+So+@9_?+RmYdE!h*qi(p3Z
+zhw9moq27oIDB%#~NJCY{-`437T;XB2{_NX~NJ?8RorQ5RJGq4)-wsXsN?eDA8rP_n
+z4#JNNS|pKEJK~lS*A(MviV3Mdnsc{^_JV9;bu842M7>yg^RlWHVPv-@oPVjRo}dB-
+zwOtrT&G1o#A!BcBs_i<-AT}^wDKACLbYBuIkV?d}Y*UkNH&|01$|*<-DE6OZ4Px!|
+zfe2iBEl%Nds%I2J=6>E6&?{bIAc~BrJ!l-}JH$vM#dGwnPP}#ELZ!$YygbRvZ`gaI
+zx$^zcV}nqzO5?179<La~rW(>Mt?#sMz{VLQ>nbo%H2aRoYXS?)kusY?7bZ`|T8>8i
+z5sX9!Hdovk;y{`<O#_1>C8g{&dy8cEd<+l<<E0*@soQKe^%a$98S3}c<T}+9=j#0&
+zGt4iwy)0b!%Y<X|--F1u1I@3)fgDPNer2_~ZpBJCTZY64T!gMr^chQ}Ft|}OQg@Ba
+zx#}+V->8JJ2sYnsM?WJO2sp#!rqV!<;{PJc-ZNnA6t<K_RB2yI3pjgLhfv#4=O)a2
+zO--eXHDMkwt^1rUb~rOLf~EPXt_pb=su{GJ%+r-JikH1~>9f#Ipl(u1c@+v+*S#;(
+zPPVB>D#+w5v}o8$0=1X=udICDK75}*i!xFvogaIUr%glCOG=AOv8Wk0;j7~Trngp;
+zDKsq4Ex@YTgv!khfp$@;@K4S%xX{xhg)oY(^5YG8G*?z8d+f^91xGn~9wbdnB3czD
+z-+^d3a?!7ozQ%LPHf~AR4@|4gmyY9^z!Rz4%@CQSwrKN3a)*PuC(hs*@grJ8wBfOn
+z{m&*TK1K8t2{3uO`IX{X&Xz_>#N=2sak9?M266m0eNR3SX=C{Q3>Xr7{^l>P=}1=^
+zXx6qD^#YV=%FM3@u*y`K={}3xt;3GhmJ6U8cxHQ+m(hc*vk+)7urTYoC~PpytD)%u
+z@DbzJI9SF{aK?%!ecRVgSo=oUgG+t0*BJB;WG;#XaD4<l6!5+@F;gtuE=?X;t>rCc
+zXTqMHw^a>y&BbNqdIp-stteJ6Ka$ISU9QixKZ#gZdcV9OW8r_yy@mH&xr$xeCrC?~
+z|2jpsD&!4H2g4=a7iyU{PT5}VLk2lnns-8zJd=p`34o%U+Z=`9+6AH_0nJcKRu1Id
+z!5gY{QF^=nNIAR7uu?Zs_LS?7I#{Sz6&{JZhh6=mP98lO-$1MlaUuB9(%|8?)eWSb
+z_kM-;R&zv28c-aAdsFAmQ8rRUA<ZXaxb4v|!B@Lt?1D$mPkuZxXm~JTl-bX1j!W5~
+zl%q`?iDu=p1p5254N?6_-OhBy-*}q?+7~IchTK^#z2*H%h<<3p-&#8Qur?!3OOkra
+zniEA%eEU;4*DS*s4#L4~z?_X?byCH=^<Xa85-YF#ON_0q_B~s&?pD>nUcPF|BWyQ0
+zFiBZJThhg$l5RES76j>ABn6ow*aT{P**ouUW3S`Kv(!W7O7{r~!0OV-F!RI1!u=bA
+z{6}Vwi2RO=i;LOc&1d;gC$f@m{P>rj7R!tviyzO-zd1t`MUEqKDznJ$S+m)Zv6EW)
+z`{xHp-lD*_1XlZ|DB|Q$gtjFwym17_pN>1BH}*rEh)`%-NV$5BlF2_u+rmK*<I_aq
+z49LF%>a=l23wzLN=8846ymaI|=3FaP3Z%nSsPEz`-OFOt8jCeqV(9$d%aBkRkMpI&
+z<8x;iWXnJV!IB$>XdK%ZXc@)1RK&m=;0~thPgvA%xZM_h<(Pm=bo&=#KY8UEM%}RX
+z-60VrX|r<o8?^&9C(85^OL&pEdSw^o_g09(80SpP)vz3|3KhrMX`qrekiF?BIZb^(
+zx_uJZ=Ww+)E!bp9@=?h;tvHHwbs@SJa1Xh-jMdg`So*cBON`7bbYbdJRP*3XOBt#b
+zQ^ipXzYINdONWSi!3BxoHFHkOx;Ck4T4@!P?75Q5zBOFD{)oRV3Bt>4Bs`=3Am?27
+zEbHr>pz1o`$~&-$8s$aJ`AWgtG#mDoP$ft8=NbZ!r!3Pg3hK}zRls;u*YJ>{pM|uU
+z-{h8E3;GL2jW1$%bt!qG^Hkvx<;N)QS6!~@xVSG1RM6Yevdn$WqS72G^Iej^7Wn2%
+z$m7;?PA+3W-O*Qz99N-@+GR$<UI4Q9rvNjS#m#OixtD_xfSw^hmspD>E>r5bN}W>b
+zW4%<}5+x%|pJ3gVaQ3U4O#N(ZS!5WkvPP?F9f_{<7LIN!f498IZ#Xecv4+xRzqFan
+zr=yi@NN>6ZwnTPR-)Lw|*!{<}j4C}-8ijR%Jal*1ho9xGLXQtAGI$m|p7o?znFexn
+zxeez0Lm#G3wUNB6Gt`vQc$58alV!ZBV=f{yO8Q$xSHO@2Q=93jL`pgJd_(aUzlsbD
+zZ{62_)(p;g`FqgB0O|wV1Wu6JbR6N}z92J95UEs*OCE@r_?$ycwy)#{net;7Yx-<`
+z3qFmLd_&nJ{5Q~Xjtxtk$b%bJU?3!PB<Z~X9RUg@#5z4uID*=HzCTtHY|Yrn6-V$+
+zP9{KDEBIx)9DN!Ji5jT^E%?mso&;YTmej;I<vFd?^kUo_hK)5iS2G#T=1|}U-?N$D
+zgfiQemDd5nq{7(^T)4IFTkP98alYZc9_G4nqFT*gOq_x)<^CwqmtpgRKYGzc=B|~}
+zxrKZ&vDQ<ZX-%6??Fz7|RZ^h6W#j!UkQz7c`Rx8~Y0_GQ(Eq+2ofKiHn+=SQ&<!Vv
+z2P2)+pGt<NM~u7vv)-5w@&;~iGZ$`69{?Q+_b75*wlalW(r*!)6H?Li3H`K0+}M%)
+zE<^YN<j=5zj3~|Ufe@;jnbhFPncR$0K35Z`{_NA9&iWOmKa*DOrsgxG3K)`;6Bjyk
+z3}Yc$A1}wo6q%_3XCHL-g_C|1lcS95B{)rAQOHYL=ZB)Sd;nT}X@FQ)9EzWzg*AV8
+z{zy?_CbuLn(}+6>a|2s1VHOH>>OYE<6Cw^Cc4PywBz_tv!rwVPKFW3NkvwL08oX%p
+zHJJM4ZMqR+l*PY>vE=*_$5wIQiDr|eg=h>4B#VeQj-=iU!o$)~d<xzM<~v$;O?hm8
+zIn$}H-Uk*;FB-63Ig1N@07S=+NKvmdtY)H_<p!@r!Bu{<v*mTqX}teX3><5_*@qmI
+z3FDBd+=QIPDbE+~UQXBKysi`H+F$?B`x{yo>UbFiC6`adc(^wTUtdYk$2F9NH0%4O
+z<!5CjYNqjwd>=4jH4aGChDyp{5@RtiD4Fy;<K9)(aa;n_Re{X&xyXIoj3F_Sk6`Fg
+z-m(vN+5C)3P!xeFmNf~~ismk45Gg9a|L1s_a{MFDGwQu($}QQKMEP>F+=Tl1q;W=E
+z%M8`s?1nNHN4XvpHa1A!R5+uoRhpF1fyri*nBoJ-Zkopvww~XmI2M^dr7$<(-X)*j
+z7dM2#Rnb?&MJFD+G-pPnM`blm{N5tFg63T3n<y->e9Ga~06z?;Bbmssu<^f$!$h+a
+z39P1dA}fVr3gyGdlS^yP4}aC!yV(+<hWQjrX5ATvgedbkH)eF_q$h?{aO9{f&rK?M
+z2ye5%-KxG>kKCpDnS6$!f+2Yz!{P$sS87A(%iqj&C{QIbPv=VU!Z3aH%s?h57ls30
+zl@C=}z=rO4J9I{wy>@4My#6?&KSb^P`@VjmBkFqkhYDtMSQlqlUNEd{#zvf^D_qy7
+z*Apdu<a&=}U3?gbhI4AA9txj>yySS$BdLT${aM4pD2DfseJ6IzUgP!P(}#9SZ`a7q
+zUAOqBBAvt<b;hAarTBS_Vg7_E4P<Cdrx+O+<=G^mfy{%0g$?f-q=4S<3`JWL+v?~s
+zNTp^s&|acb93f*rZdj7qGh@=6p)2~j<Yj2)x&^eK@k|oF%3NojF_Cd4jh0FhALy+e
+z3+OPFhCLOu<Jtb4#U7lqJX=Uy<NhT6;@9>UlJ6=6lI5r+i8(MG;~?0<w<v@rs6~qS
+z)Dwj@S;{vW+QDrd;@Rv6`+qJ6!AX7F&T`BYpVyuwDY50?*4yJnN<2CV_Dix$WD7$J
+z`oLwbAg+a!W)q`|h9X<_et)$l<5a^gVU7B|@Sj=(ha{}=TE<wbQpIH0TYVAS5Q%Jl
+zfz{E)+z7H?xi+mYYrdu39HVtq(@3En$D-+`z4>SQZ^7prxWvz^@VBZ@vE6!*!nTIQ
+zFzS~ENs><>kj91v&u)M!7lbRTwHrcHQPR!+W(0PeuX4_)r3yjl0QIIluD!*_P_P&2
+z?8{D8n_eUYl429(G!gXuMr#_``&{ck!cuPZ&c~>2n#h$$`qG4m%;e<H0oJt<9I?M<
+zO@ch;DJ78Z_d9vJAVj^?uF8KRX#IzTD>IAASxa`~dkDp>2eW?got^1iTCwbH7H2j=
+z!bBb6jd!2ye?lepf_3sL<q~@_Q0Ev^%a#%b)qa!|KG0p0%l?v^|6T&4t_nvovA@Z(
+zsALq#5|c-iUb%??RM2mriQZFls<dtTv!~rAqF9PVz%)kkXmVvSG=2wpQpAU+cPSfl
+zKq4)F)PU#5xZK5ZVH{4^8P$X6i-Lp{8sEqLap%EHN1#Ep8Lj$cM9!e@n15c5n-Lr$
+z&)dUV6sPJ0zr8aMNaW!}`Ax?Zi&p;zRvq%iXio>VKNo1dcg_;bW~QjikuZj-(}e?n
+z?5v@ssS?GNMFj>p7X2dO7JT4mL7I{=yv{Hc1~`;YI2~uKEy(c-%Iko4)m*(yR}%lc
+zQ;8<^exBh6B@763`a0{{<*`q>3;c$Ifr*f#z|;5(_|uJ}0d;0Md}XOCHod6HL+4K~
+zSMk9l3}=$X*%Elmow`6VB~PdY#Bb&!rl}jheCLv8X`(>{?1xGVQQ#u|EI%>9Jt%Gz
+z%37OB^Z?2KRU$3Tp9pSQp*$_x8ZJ}ymu#t>6SPW{`zQ`diXEYflU)>d5K^tlX87b-
+z{SXs0%>Mv!3XT(dD`{$}BMqH9cIIOq9*!90iKz{9HXn*OV0^%Yh~X9zvn++b1O*ZV
+zDalxf=1Vam8YXNo=3ztWP(9<>NURi41%*n2AKNgAO;kEi5;f{g)w3@ll8uiug1|dI
+z2sJsN?$mU*TUzv4OO_s3jlz+MLtR}P76a_N;k{!zH107z1}6AkJ0b4mDiF3<deN%c
+zF^bmRfrcQ=YTL4L4M?>g`qtxxu1Ti0+jBnFTlD=!$T!L<9M~1}QM`36{9JqzGvipG
+zLVDTqlGWtSbhx;qs9E#!znQNm=J6KGef|@Kafd--+hxo(Q*7b6g*NGWN4S(QOxg0i
+z?ieqI=u7I?wR-O%Qk^+V{SZp?0BQK(S0SxbxQHc2GR$G^{2UIV$G@Zdpszq*7;pOu
+zUCKV{foyTUK%<5-xypVugLy0FWyfVlEI8s562F8%CT7HL=65r&JH<|?ol#pzCF`92
+z!K2v<Uz1F-bur39%7k*Ln8fMR)VrosZu@YP$i0}09;j=e;Hfkw79STL0z1;7OlEtD
+zc#KP}R_&ltTbt?&{z{{u@NTglr`R*HL;Y`Ow{sXc%@&M$RL-+r$V7+;p<snIToxmb
+z`J>B;n}M2ea*hq(#6JDxT;-5G`!e(FT%n6v99`>Xt^hj{?~g9bh&6E@#lK11@*%e`
+zNfLq{x!*!HQ&-k~?DH5R8<1zH1(}d8A0npZ*vXYr-$eD;feouChN7j!+kSTDLc(WH
+zyJeg_#5_P9JUJfk;(1T%c*FEKr2r)0ab_%nAm`G1Z+1%!hCe=|II*Hul!e{KODqXf
+z21qqxPQ`>Ehzy6)qpZu9`@2NoND@q4jCZxuJ*)i<PZniWnmUu=wMbKfPs-kB(%L9_
+zK41a|jtG7q7vck0!rdd}=W<t4O4#M*ytNehv`wIwO>1+M!|O2bGs+?qum-8devxb)
+z`U8L4E~LEe0I$}azaVrL@|GEMV~M>5zL2ul&?GH1a##oKya(~CC{$L};hk8|h^1ZA
+z$dYceH;OU!jeAX~FMe2aZ1i*TnDzob#w<aJc_0(x)JlunUuf3Yn6ioHqYCm=xjTY5
+zAEs^iF^AlIN^(w~O<(j+*#APfShJk_Of;2ezw{_a$p!VVE1HWGY<{0^130*SDMT+6
+zk#ONrnqJTpo099Nwwn>!M|#Qnjn>5`(^J94gCe(_l-$+9WX~lGCi{cLGs%cP{=YZ?
+zG?jDI5>afv2!^&)jc(Mo!o*niB60^!!x|k(?-C`MVGVEzq*5vx#)@?|iC?*yE^~FM
+z8_AmS7pr5#P*Tq0!@7Ty3pHf`F1W>L379%S%kzies6rzt73PXKK{BvIp6D<X=Mp1&
+zJEX0OG?X_<DNcjX7Hu5`3kjuejGJpKTK5K8y3C>8GRufmbv;<S@3l2{3kanhc5<1e
+zg&#@emy7)ZT%6xWcal`ExpOmi|H}0l<j+CjVwRUFJpxMu`llJ>l*{N){nH62Dn4$-
+zj?f+WOAJlL&;yms{8_&LGLMte4^I)V@CBY0(dIC*&8P+&B!E`|F`r@}M3OToSrqus
+z(^om+D(T3mW1qNs%;-Y1iSL+bA1SP9X(|QEUF^*jjGc8UQ3^PdhfmcfQUHh1Rl#6v
+z|33_f;s6BDi-&{q?mdE)7M&1SW8;5`Cqk?Kl-_*4KX|B!`A`|tDp+oxPiz*hqD8Ko
+zW(gy(zu;T2H!6bh(HfjU%~)w!$I1GTAycF*B5`$OsxRSWWQGRqr5??X*tq~S;zpiE
+zlfj@yo%eYWT3jL15gz%*(fESi1e@4eNw7RU^5v3!TqzF*+n|1wYmG>}raE2ax;zJx
+zR23>0>9S0j&F6e_t?1?)u1uS;biG<Dw^q51CLNxHbLzT@ce|P?mD%Snqhd=>Sn)j?
+z*7T+sKat}b6#HCY+msNFyd079uz;><p}VcjM8+_!z8sf`5To1XTrlrkCl8{{WVc<Y
+zO8kh(!d1AE%?r^g$$D-pank1I>d6&Qk6jd;i`JfGr9m?%J`pbZKmL?O@+=*(3Ahb8
+zIk2n;v!n(I67sYukwZ-VuJ$l|cxKo&8T)TPJ~1l1vJsSb*QeaB(V}vy@UxF>XWBiY
+zf0{^(U#wLtvcXb8Gh!vTwj}-Q_rm&>0`by7Q;bLoTb^*~p#?o_E94W~n7I!xEmM{Q
+zX3g9OpH)KGAcSmDh4`>E$ULa7*!Tcq*Nr@KEKs;C#@{jdeKD}zNPziR7K(478iIA|
+zflo)?+NTmK$HHd8Zs)DsfEKuNcR#7Bl`J%}-$2>Y7!5%2k&v#bE_6z2YVPo`Tv}$P
+zS$vysLdLQJXK-&hGK-cY?$r7HGL3u0LWPdR_V#x1Ym^iiYCM;FH7^Xs7;weD>p&`{
+zOe)o0B;|jmopzgAx@PYF#fhCj{R?pcDMmD?)!(v%c-QBkLxIYQld~4yxQ-Y(+;;hm
+z5Y&%j+YRJ3Q)w?lm8|oA`$;*-{Oh+LTk8p@Zo5ar+J9R3Atfy>Zk0M(NF4q1znly(
+zF~A0cN}zC!y0W1K6SS)znP7uuo$34-@BEriiKv4!!joarrw^Pwu~aBDaBl$5R3CH5
+zMO<qg|62-}uuxQ@MDG}`K{JN}jmiOM&WE@cMk=;`s$waqT*h17pZ&SX*cS@^)x4L+
+zFRb$4sWC9%=UZfg@r2(VCW{5n+v4roZ?y!@+paB*jkj>t>uOhw=TmJj5Hv^>5SWf_
+zitU*Ao;vlnY~!AtB3d=J+W@okU%h#g`1LP8#@Zlk4fRJ-B<pDPCN%FNGU?TXeA~rh
+zlRcky-WD?eru$AYcHP`?+pac7etj7EGQ*Yqph!;&>Famt_;PJGRC%%5F4s!28LC{8
+z&Wr??5PHjov)(J#0_Lvy%j|R)zuqvLO=FR^>XM>YAE3+KB2#8Dxc*RG6#tCHV5%;3
+zNK>?Sg<LD*vkdS7#V>t8C9V~h3qD=Z=od`c^l|Puf9i;y5PAFIP0LRbCAFR5G?5Fz
+zDWBmH8+`@N3p#SB2p}UZgvQl1ras@$C_(MpvzF%PKCH(`NPO+3^hU+TumNi!Ueb);
+z?#aTkZ{_^bTN8Mz!Uz-1<A9DN8Z$u-m){pEX2&x6+u^0owjKK3EP!LvpDr6rb!3_j
+znRTq(%TaT69jS@n`W>vC$Qa|~q-BxXAmJz+Ge09~vdt{3Tsb}eBUpz<HCzLX{aauw
+zMXQx5r402jzlJCtD0p&S;t8(5TN|b)uV12|=~8?z#!xb7Ee*s7J=M!eS6}Ba;a%+O
+zKZc}aqt9k2c%JBn5ti5-Tbd}BQT^~1AB;TCD`_<Ejk<djOuL+OO!jP-AIfk1YJ@9&
+zh)#P*k<wEM1h7|(a_|~SnSy?6Oj}8a;2rT~AO2^KY(90c7RU=6%65s^1yCWhxpaC6
+z@;x(5sf7~iIj?D;WPc{aeK6}Z62M}z%;i|Dbgb<6ro2Nj+pg}$@>unRQlft_l;bcX
+z&mA8Tvc;og%_7p>W<~9_&|_$^@qqtV7Mj`roYFL|eNjdkzX}N0D;)rg5UT_7YR=8$
+zV-ojT&nCS|L0OcU#4KT8@(M{Gf~q=+w~QRc7)uis8UJ##8BvTTSplVXg8b%<gNKog
+zVQgmTuJOVi=71y^c>kiJdN&WS_%!SrGyELG6?s_C!+FK<-e8!`FLZz+JXL)cp6)b~
+zIVA&m2Mxo`V~O21dpkZxyu(wO7%I^g+=;Qu?DMejT84V{n~o;k2HfyksAfui)LFLy
+zSh1vY_Bbeo^yxo0WH%s$!7X%IMluL@TTC#C(u*#y=Buli>Y;LTed0{H3kxL3K0yRj
+z%VHId)}}?2H%|XWR@6<qm2#rEVRxL$Fc5tjim$W*y=JAErbd@xf|awfr1cp0H*D9q
+zSHWh~|5o9am%+NnNh+=IkWxsWHD4g4YYPqHavjiNW#;HV?ZT4V%tjJv`W3aiG~TPA
+zE+2L+3asNlp}nO+TOE>qUb`A9V6!^1gp*L^D#x}a1&ZbVYkv=hp$K*T^Gm4;H2al`
+zwvH+jAlv>!o$wy$4C>r046p9h$oLOAd}sOCJQ^BD102P~TZb~X4Z~RKwQ@>8dJ47Q
+zsRdR4UQ@nK8e`|lKZK2^KeQ&|KxUBaS(2Qj6`s2*hHiXpT@&IeD-Xmw`84RuBe1Xv
+zZd+A_=00e#-K#!SP;A9Iq8^24(@cZPBN3*mFp^ikzd|+l(ZY@&$stKJt(+-x!BJg#
+zylcG&Qxn_9e2pj{b?JEVuNRry@c=>wNB1Q!qGn68N-3Ioxnb*)Z}JBHPA=j?ANW%9
+z3<l84YRS`CRT=0<U2>+}8qA2iY<}3_Cc6lG#Y7UMx6MPE1fwPHBkpMtKl(K24tD6T
+zGGvf5m<|VjTbAgU`f$iJ7W^jDRO*X#t_o_d^O;blK{lM#HRpP6RE`7#n1}-UXt`ec
+zHslczvwvNcFenlse&Ou6^{i`JA;~mJsyZU`vf;H|Z&bm{`o#a{+;Y>y^@6_bCaxv4
+zC2M}PIl@GaSWqL%WKbedW*qrA^R+xR(!=Dr#wZoN^zrvdTJgeh$>IXi<y-^P;sAy3
+z9&G_rG!=S)+n6?+-fx2`eb}tGY6?npvr=wz*4LYEwvF38dlu~Me`};SPj9z%^-hzy
+z{N&zun)uVL>yPp+dm|{%(K~KElssaKD_doKK`Ss@OgzYeWl*HdgsvC(nn^UMhClz7
+z+oaa#XVgc{;BwDG_xNbfSphSUo%;$Eaw{`PKeol3Q#7N~{XyBwE4$6<ohE#}SGu3B
+zYQHx@J<Moy@%yIuc+>f^K7KR#c78wGo9^;JK5_}`o7r^t)16t|pP&Khi_M5529F+=
+zl|ya9^i=(ZWRnf3@$j&h+22k64TDT{BL*61tHzvcX-1SvD`5f~mPBkfofL1g%ncZ6
+zT=+Y&c>v{o^-8>ZN_f0D^|#~P_GY=$1K;bi%G>w#&*TerbBiE1kA(N5NXLOU!ytCB
+z>liavK<tRpR^=v|L<8N2IV~K?hLKn=vZpjd3&9ESf5kx7?)@Wk!93lVnJ~9iYQtmL
+zKW&2@_x|>-gzvfIT?JkPYf+K}n!#v;S8P%L`2SrLWnR6ywr`X=KlEFSK6(AbY~M3m
+zoLcO7K>YJ|;gXh>YHjUzbny0a{Ao%U-7en?0ev=b-zI0V{h7$)^mfvwjCO<TTSxNe
+zyXEg!Czj}y2Exjd9*=>}r(B;3lRFO%#~0h~KZ!`_HJ%rryWN@HB!o}qMgMqoX}Nx7
+zy#iPLK4bFOtYf==Q;j-vD=sx3JDyFFWe!tf*N-J<|0BDkXMirvFEm|-Jd-&xg~B8+
+z`v>?TbIgs3DI+%#JhW%0YXQPa8;cbvq!OqW5eIr^7J+J;Rkfj~7o+IWE}n(%D`qW6
+zqh4-?C;!S#Ha{ABFk(*y&CZb>F8;mrlKC;&M7As@@?!mFfLLtE?ES{-`dQvpq&o5E
+zWpT%s&v#$QADCXwykEyM&inV@9=DsO1b?3F-o$@*tNC$Kv`Utg-E21a*~5NY8IS*9
+z?HUtL;KzoySLXT)N>%Zf_8rh$^zK394x^BomUiCRZq5kiJq*kJm$Y^+lDR8gOlwkt
+z&)W>-aUodZwL3G3@uFo&r39k4&0wwJg>ts|vSKknVLC2{9OLh2!8G$WGFl8C*d2T4
+zz(t2dn2oNt$ooH{RnMXKGwI%UlLt+2HySsQt-Pd{w-nehXlzkG@8~<ye{Ng6Q3~(o
+z)$KTWKMhySnym7yp%g$1-4o)^W<RgK`M=)qdMB_6eE0uxvdv<if(}$E33#2YdSmzc
+zJDR=x<2mT<Md>Yi=YZ_=_`V{%KvND$w3qdWNTI*1k?5ym5-cmshjfJD&<H8-*H@!6
+z^Z4TUFqu68MTWXtmJC3+_L?@UHMck$O2Kl1?X&b&E$!55AEJ@u=Lw-Gv`Y<<|0C%t
+z*y3oKEfOF=kU;Ro-GjTk>*5yNZGqqk?u)wycXxM(#R=~2?r`&d_YX|>%u`c!PSxqt
+z*ZS;ZkcqCAE$p-`phGtT(Hdz}*VggwkrGd`?~{cA`DkMW-@~k?!!NDQi;1eXB;VIN
+z=D3HdP3$Fy_i5@qAL&|%R#%$u<vb+uSJ!Ef5~eoivg^rW1x5=eUHKC?s1N^{>*7^v
+zrqt^S#9ZV>yv+2lRde?8CKQ*q;xE-qwIp98ZXi{n*UuFn7uMNtF8OUZ$W&C8+{`Jp
+z?}Tb<l#~cvp`r&x0ZK1_s(#9N%!*gSTF2oLcCMDzhI8!)g}5U(uMgq%&9UL@<ImZZ
+z^;dnDF~aDX3I4^WXMKVK80hmIJP4%g1@^W_=+SDq-qqp82jYJGH1VQ&^YZJC&mr>$
+zBqGnXe$DtihUP0_&PmX8x)o89N1&tcG_nNR7dyyk(FiRnWAF+wQIs1i&1el1{VsyL
+zY^Qf7-cV{zHEb-0UaOO&9a*2T@^?CcEkjq=r0khK#67ouiGn1NSd6lilg#>TdpFoG
+zy*yJHDUT$g(CnuLxVigZ>Osf(!ch0KeIxIp^}fUzR+!bY<IfsAOHT({P0VJu`b|f%
+z0a)h<v~sTh@$O*e3!CBkjNkgsSDF77QW*3XyEhGJ@=o0Ev^`A|*Z>tH<2i4WxrAkl
+zOhE{hhap2^mpOagQA`qypNs-K9Vjuog=Ez*5+I7z_tSEi)(gXG4Fld(ts%(#+@y{u
+zLgcf&`ZpJBbz_|XzCd2y{(U>Iqq~m-;;|P8pB>j*$gkVyeGpC^2)Z<h^}w(ExxH?&
+zsq?4d%{zDv;YjS)uk`kh(quh}m7j#R(g$ZkZUS$+Xq{SF2VIX@XivmzPT}<4wRO#A
+z&3XuGs6#3&MiKd!vw+^`@kwiM;z+1tKw1X7lb0?nV*WMyvHSoH0%L%Yzd+f7`ow~C
+z@xcsh{Z>w<^clA9efZEco-otNg8c9c32Ob{aBJt6N>~Q$=7y)`vMTQEy#<Tu{^rJS
+zg5!oleQc!a3LhIoorBlM1V_w*mz2Dj4}Lk)^uLXun5R1Q7=7-`9+qbRX7_{DB={wA
+z63@J&taZ&RSyOjVRT*Spw8ejf7X69K)X3`Od`I`kH;vb-3Jj;V`uLuT+l~F>4lI`#
+zzbj$0BLB=0^%E6a#_PVJ(Ah?<QBwd6HVEu`W!sSJx+NBr_j*v8Uh&<lvNSHI9&-$#
+zvPi2E<8Zmhv)OxVdhNsc-s7!pE>vX<w^|y;vfS_x1LT9`%xZ_D)QCWrW|T1rC3m`?
+z1mtd0w0xFRXt;39u#IFGp8Hv0;V{4fpV`DKOBqjq<zy*c^n};=7+nW=`rDVfgr#~V
+zUSaF`3gsDfTgi|ROog-+${Q0Y5%pVq)gqd^0f{&y54ruBFI(i|X@G0kk@$CQMa(38
+z*3RqLuWQ-oBVrG$o4b$Gkgf>dSA<Tn^=y9rm6%B(&w;wb#f^7fkB=aTZ+QKpQC9$A
+zX7sOf#aQ4+?~1`1IwY!zfAg33(8$m$dDGrJJW$ggvtfZx0f6GomL8?%QC9Q0K(U)=
+zoj{j#8)n396Gsauai^UZ`wvde)ijDNWi@mK4wn17V3=#k(38*+G)?k??XT8WQN4K3
+zKAN1o?2s?E<RM><{6UMe5(imKOz{6IcF=>xuWPK^1+I=jqUC0}enh2%@WT32r1h&E
+z=AvxhF}Wim1N<Ozk*C*mL$9-ps+W_8_gT1$*_Zb!;`@*9U`)fe-M<vKIm*9bMHuL|
+zF(NW&hCL*oWD-ZeLvQL*jy7UZ6rq+UNw<@;oX+c<{bQBs8X5Q>+3ILACYp8prCKF(
+zyxQ><vFg#Kf+2Zoo4Nbm*k~CW80Y|Gk~j-PpJ|pZc#6C7GNx;xN|U{B{5s3HVe0!G
+z*aXC!c_dCOF^C;u-TA22;ek0=Xde!d$PsA=S03L_ci&yfn4rAwOJ)D6Vw?_>h1S*{
+ze0hMY`>JviBGVUaBuiy*Bo%zR`#+*6lx#QtW0a#HIv=?}g}FPfy!$W|c0dF_=_a)c
+z4J7N$NJsb?HD%<Qq?}<aBaIN*JXM-5X*cR&C{S|Fo|OHJqvALF4m7fiD;;XFOp_Jp
+zHuXR8kc-Azy68k8EUPwTS=(P51ayYfW(~xlqtnSw{Fbf&3CnWV4WL%!NgOB|e+^`F
+z?<wBb(8=Vu=G~*3Us1O+H8Y5V<QaxuS0=pzt%hZc+}Ku}ep>%S^@pKBr`(Bk_*ph$
+zGNg&AUh26=51x{W`+CC5*74$g1_@@fTU$qoYF9B51jV-M2OK;cFSQdeYT9NPRFkrD
+z&}xO~1oQ}Y^q$fG>qG~z_D=muxkTQH4*im4JqMOc!u}l&PbsWSeZ0JXH=QsN8%7&s
+zU+Sl5&Tqm{v*Ps#Maa)z0*pyCr`Vylo*}N4DX)X;hf`^|Q`pil4iQz`{vW3)>Bm%`
+zFjxFnhF9h|sO0AS01eHTT)F_#v~p~yq)IA_`>i7@oi*Yj{x;EjcXM;|-u28jtBK=z
+z7sqQ71rTlUlcK~x2xHA=j>bzcx)d5l!t(RkUNmbFC;!rXG4nGI08HJxWZYs7-NwDA
+zNzPTFnrxNX60afdR)L0qKO)U$9-3sp+ZVp)TDCBSZ@}}n)=G~0XBF&$|F`?oRSC6d
+zqTId!XuFNh%)!B-0pT`v-jYTHYWq($vG*m(mMkmNaFh+U+#Fu~0!)-eg@u-P$Mf&9
+zPTYV@C<~;?r1){ZGfXWpo+s%Ft;}G~blEZ)Tae3jtVFEdt%GA;&mr}7DU@LIQBR2F
+z*<bGLC>ss<t4&|~jhgtvBGlQzsOXv2yAw-WV?EhAbXoS^&@0%)Q$p4n5w#au!mv-|
+ziD;SXw=X`_ME__x&()?a&k`24InS~+@<hGB5%nEFGMV<SnQx%?JHGNnkeF@e$YH<2
+z?cn#*KZL9Eybl>~^{zK2nX6rUWy>kw(N5FzY3*xzY?(9?@mON+KUZYa$hZ|-{$m%#
+zi21{ac{G8`!J4XXnWp=A1O$0fL>~Qyw5TC@Y@6~uOU|`l(~Qz`<not#E&MB*Vp@`c
+zvN8iecxw|G0LrmeOa+Fg?TrR6H%9|&D1tX@4;BpjW_$=LNVg)%PHWm9;q2>VscmjO
+zh7?+LD55H^#J#DmZ@4+03x=QUK@S2kVCnh4?kekl4UW+?4jaWD=HwY+a{<-Q(wkIn
+zG<VO2Uoz@=8Yu~XO3N#;qba6OlZPP8PxT*%O@6Kq2oLEo?K9|dw%CIftxZ-JhI%3-
+z1FEHNXyIFhR`gQ;jT{n3{9Bp$V^OBkor;PopSA5~lJ5=c-#?#(l0nI>Ht2EgW1T{+
+zvuR$T!Z8qrUq>hxMa7dh(!QLlA>-|<If4WmtFC$NdrX5v>UMJ(mm1VK+O9k<2&7&|
+zuLknwEh(lcP0O~hUhzKB)u9k@PT4iBN$NJ)-)TnmZE3N(o&FVRTK6o=pe@Q@&TV{4
+zNevWb>7JbHS(d5Yhm0iz{D`|xH!8*xpurCGJOu>Xh{)3SxBOnpxCt2SZy?c0;^(z6
+zj!+}=mEB*HjIz$<&K)cdzk0$$FR~8#Cf3ac;g1)58c`a>{EwAmBkMJ<JNBWtta}_}
+zy8P%_wR!yhP-?go{QYlij$*8e&7Yhfjyhj^)<{BB1eJ0}d4JNI`mv|t<3F%0q07>9
+zM=1`x^r>F6Cn{;Q0aD?j`ak7$Dcj9Ym83QpEr5F9aHgmQuMk^zz<l2O|J~<)(SA?|
+zV=-7H^kzj$Sbw2}=#PkSt@pq}v-aFU^6x7q#h)oHcoLDbkg!L*=6zS}C(X}wKY=0~
+zE~z2m{l_{BemzN!P(?F|v!tq-@UG2=T_?&cu`S*VbK??cE%y;Ar64o6$DDUO7_`2e
+zw;hGkSLTc{waH75>@EC@O(<up)f|I>7$~+(HI1W4_YklxfdmhzMiXx+ZlrYH26Nrc
+zlV}A=zA*usJY9=on4a=kr;I2@uCZWxYPh7XU||c@!i$7*RnZHKjk21X+AQ4SUizDQ
+za>*iFVYWTK-f2hDbJGvOvilfJ>TvCewd=?|mDcM_Gl@jgxlm>J>$o%{2s}CE8{Z$U
+zO~uvnXmZ?%7Whe<9d6mGSC9G#nrW>pp|#^zCVI5EVIEin$?A*L<+-C4*R<G=cjAJY
+zIBAr#z;<-q?B!z%O8(UU(xpnj79GwHav+M79O9IlUJ^e?q>R7oLVsCBI7YPo<Ti~J
+z4EIKxlhL90yarx!Zt3(M`NUSNHd+_#mY=%7ajjh&-+s7BkLc35?DawTf8|I0p<e|N
+zodL0x8)vf}uI`pZbQr^s9EH{?V?^P(xHyTl0nELjDGgH+BcVJaGZH5i(1JZB{grUk
+zh^{~BM;08`gpKar_ad$T$q=_s2sw}@mepq`we2GEjzhFrKg9_0%9o5wnXZ$MnxLx|
+zfO59gJB&l6ObF-{n&@q51M{yCKKo#nxH7fyZxYw##urd>)T$M!GhVQ73}y5FHwCdA
+zrKLMoR$Tpy%O)3%H~@q4q>xlOryM82*hppi@+`_;00f3ztb~&iF_4s~PS7Qq^5f?P
+z>sqiCqMA>jrxEJBpw1eZ%0S`tmd10f{jcaqwTVx&1EZLphr$KSACoBIa;zr}BBjHV
+zv<`T+0jBxJ#?DCCyO<iX=z63Cx1T{vi-^{<Br{f>^R7Ga%eb`-Z8l3VB;i2t;kNS`
+zgz&%F3R0Ycg=izHx;2LM-Hpn!-La~I!gq`MKq!{zSQpj1iE`_xx)J&?_bFLq?9A{X
+ztyDPlq<A_fw(kQvg@wIV+tp(B_u{Vb`MYo$RMFl4jaLSeVJK%9l7Y%+R9pU?`>yC%
+zIEUp@;)W%hu)i55*;sL8=kosnG^#|6mUNwh_-xe`!b;HEF3)Elk}IZv5L&n0wZ;^^
+z2$p}?jlut!u%2R(>HGgCUo%Q40(R+J@~F+lL%yh@>(wx7EO?Y_3g29H>y1fDP5d$-
+zs!!^3^6E)pisDPas#;&N_7%FeyyNLX*Yrk6?N|96^TvRt>3zW->|}I3@%siI&w>9J
+z-i-xnt3g%An+V#XW2ZP!q3XMoD^Dk^Wtux1TfqVgS_J6}w^arLrt%sWMC-w1Beq3J
+ztd-3R4S5nk*Y8MOOlG-BKS@3Q|6z>oM!n^wTd@G%_>$S($oT;kQnLCve@bLrzRgw1
+zlPJ$tmo&|AzJ~9{?0BxFj9ZGWVKZXiu+2pMC*(<qt%#2$<Iz=g2@KAa$#+2ii_S??
+zkj(;RqPn|uVxJ`)uyx81gvGx56|uZ~_h!VLk0tur3u6Qi49Y6SV&Cb>D>t^R-`Qhq
+zR)Gn8gf&h#QEgO?EE<>~fw25h95`WY5&-^BSkx}<<dR!jOcI@>8OJ*+?P_wA+1I0d
+zR6+~m--7#%)VX2<r#1DLi`v!PQoC<%f@7^exp@A^LLi^XnrZMK+&2nF7}7j!5r5m!
+z1y=0vitwSM|7B{Y>J|46o^6F&EV|6HMKJ}0L(obE1mwYuBW}}xwUuVul%m^^#(OY1
+z9-FMhKc4b7Z$cHTSc^vxL0N3s7xhz3V7bt)lZSpOr2{PeF;jx#|DV+WHO#ScuGJip
+z)INuHyhO-r7eys2I`XZ!aa7PRJfFW!(zY<Xs`JG$he(;l%PxZ^?}F7mh&3v;f71L`
+zc~iy7kl5hxmxA^OC8-CDvGHl*o0k7Krj3z+@Yfp5_Dmj@8n`{vD+FQZ)~IoF^*D(P
+z5;<04Cl!YWDN122)&7FnI6CSRE89o<k<gfG#y@wL;mo|e80YOfr#2@fTN`p__CGNJ
+zLZV0g(UtBrt_4CA$X>aB(yU^@zjbT8ZOXx1l&%OY!M>m}U6(-|KeiJNecYhMmYQPC
+zUp!)=YLg)nH}xrXWw_9m(^v#oWy)1;It4*ZHQ^gimHU5Nou)ZAbzRU3*v1F|t8b^I
+zb!&Y3qZ$Fo7!nJsq&;Bb@S$#ipQ1Vat1EIoXWTz^QNrhHCJ{ab89rk#b?&C2)phB$
+z3{(GdX6nRVEb%a`Jd`c+Uy^b^u9<bEm>S(5q58^+>u1XG0YH6x6IoM^tl!qzuB=7K
+zzvrX3^kcs<Dy_5u)|t8TqA<=#^Q3Y^O8;2C3$<`-7x6SGSjvOixBv4-7!Zv%c1^)P
+zAz0B4!%$HxspTfc{j)ESl{%QfBV$o|<(!lY4F`AXtS;Q>k1ZX`!}R(&K-pwT6i<|?
+z*pz{ebayJhFU&Z1BuaW9dSzeS;D7QTC;eBote<-O9t`=};(ou)-bam5KNB|cj@)%U
+z+D^)#DF3vX`V^T%|25K8?TSHnULy%yYLM-iO+t4VJ9<e|tS?pz1>~@<>*hMc4-fEL
+z=BlR?&sFJ%St1T4b{7C#65A(<IyAh7HnpFfy+{6wHYFV+acF{cPdCr=AWwU>=vLLf
+z1}LoPjQKizASPvRA@xC{hWM&^nU(t8@XwP-8kL_7-L+v-t2mDalZDW+l&c(Lc@tW4
+zBeW@_3a`R>lOD#ke>91%z{lTv0SklW#rx2Iw*p=)-yW^g;V7@&GWxdMuY2mPS2@$O
+zR{KC{c=llv6_TQ$!d}wCT=RW{J1b755$__&6NX6H0QEWBM`xFLipZik|B~Z?`c}kU
+zZQp_T?-`|u!g1>+6ONxp(|F`OxMJW`D|J-u^F5bj#TAGYq6Ea~2x@PPHRu~}vX;8C
+zsmfS%I^N}vfd5G#;!(AMeX}9=vwu4HO5_!mCt;RgxavZi5_G;_<2oM{$JM1LOMboN
+z95&u%*w2}kF8bnLyPP#(aC&?GvsM`2L`lEIOyye=SK=FCv#g&#nKlw_l)UH_2|XJQ
+zqeR4MPLg<gUZi`sO8iUXY>eDk4bVnG1?Mg7(2+X}kOBJuEvOVS8*=y^6KxyCC`gPw
+zEiyR;Pe3f5;SPuGz_#vQ@8l6SNaSl^kg0@--BDitIlLCd07G$^(cvCuw0!_l%_oxq
+zE!MU=)=C=6Q@;Uj)v^&{Xn71t6d9)$!5Li(bwT*Gk5u0JXmeEJIX?9Ewf%n!GmPiG
+zk)a0zx`qy4#mBg$-I(&E51oc+rs^{aV6_fHj~T&q`S~Vak9tMmsAIW$M0Yeon}vzp
+z=eV<MJ<vGA{83_7H-aM=SNPJd851dpFqIEtS$9(O{H?=Q?3b=7{?m!e^z+X=m4GE+
+z@M}#fIFWb6=P~C>@a^qr5A_i0K(qkI&<GBZwc;4s(oed1_8KXgD_Tm(?LY8U@r<ne
+zERI8S7@PD=7yd|>=z@#L-(2M)eQX22mi?zLi-(V9W}<h722ocJWKbMI>5b;gmXDLs
+zuTn$~&cKnS61dhk+b965HP(@?tudov%*RG^t0=ucgED6n*^>Qvo4#3IyJ}Es?-h?J
+zKEJ7=1Z^_1|Az)-73TEDZ8T}q4oNu3W0v>1wEJPzRiz4afwrP!DunqGQenk;>VaSe
+zP;-&SN|s`EW`-q8S-~@6%eaLOhLtWCW4d4sw@%*iNUFEr|D=oZLeA@wBXiTS;%IE?
+zEE+g<Uw9;TuZ5>MZ3{$CXv9nN^O4_KcY0FC$rHmhLNy79CLO<*)$$J)MBs2?@nz)5
+z$p%SO<bDmVkR>~^e4kYp{GV(M;Gb2|GVIUz&YR9tm%_r<7rGcZ_gThVf;*4$vq-X6
+zedOmeyx4P<g?d&0&FUdGaq|ad2Apj`QE)i}zNnmGB@*J3&KFCHyUO~-;u7%x4t0!&
+zhm1A{j92sM-~yVKtna1)y`?#nM9R}5_GI=nD@0b2nH+zTHmrBDr%v)_L|8O&VD0JB
+z8@4TU&K)&0Vy`Rc8hP_%i>gsS(`Zv<{7<knDv%e+u7WP5-(MA?gC&yAkzz*AI__<3
+zIh}YepM+~mT8Ya`;OmlW9l*e=?oA-Nt`{*NYFXMz;@qyY&o!;5JYN(QZl_o{c*9PC
+zMVrHXG`^$twQ6lArPwV|ZQIdB?=o_|$rY=-CI5T<p^8n9jJl}(umr<cctv572u9`_
+z7H`cso-iFs@+{qwaWoyZYAwogvBno;%NXOl=Fi7u6h1@3({#i$rL^u0{yTFRDEUP-
+z%{G7_y?w2OadH}J@}UybOmlOC>k1i*GsGmGTK-WEQT($!@rZgEr`uN)Neu}<fC(4m
+z2$hb=eDsHPC=0cj912!AYga6eX{N1|RH8jyOQrn40^L^r)HG54mr!q|A*Z<ELIw8F
+zXUllSmz$wdck2ibVjW4~lP5LlkWA3|p4wO3?kEyuFL6u)3a5BzSX0#o9mWucr8O&w
+zxo-!@))I^{lG@^>+Dl2Bc;6V9u+SP2z2(S+yVr>DF;Bi(ii>+Tq_AI*>LyR<+JWQM
+z*M5@>4h^LrkV%`nxw)aH0xI@2q~VT9u1I#9OfqZ?OAF)tW~f+0cKZ3VUC*<OXSHqa
+z=>sHY)N7dOIQ5><Fk$$CgGuG3CCevCjTrIqyu|s57!f2wpO}laY#T~Q<F&pVZz^Z1
+zv2CkrH@qj}SLiNyGHKIs`l5P<+Y6s@s{{rdSaxmT<aT!<1o)wg%M49KtR~Ta0veQ)
+zsqHPo`yzxEtBdUY<O5J|rmnRbL-MW>#-XKbY)E@dzfI?=xOoKYz?iyH6`R=i@{iTA
+z@3N*Eic~a0Yw|VUoFPOT<TOq{hC66Q^DoE!LnthRD(S)apsZETZs6&u2ruA9rU)H1
+z)X3U;v|QZTLa0k!0g8^g{``_p1?cztlBMc5fI8`Sq>GDy;g{6u*iugwjBK`KZVZ|D
+zvBk(vxC3Tpi(`lkZ#IPIr@8)=%m6GNhqIe7YusMcU4HqlKMpqkD*UT)`~+cyTujB^
+z4BcP3bB~Bv!FL+zc{aV!(3|kRsTmoz!&~AX2I^|fezsIpRR8sw6ySCpU7}(lbals`
+zSP#3zDvo~$gf!I6UCJD3$+)4JUzG|bDQT`v(D9KH>2;Xl*H9Vgl?Wtke{4xm@m{Sm
+zEb46hL%pQ7)3hyV6HYL{VTmamYd>4`M6kbi6jv+T`FUS9j>iGOn5wtq^q9ALmEyuA
+zOy&)f90U6drFoGVgPas`PvFnp++TCf3-LqO_&Z5fszmlM5|BYUwtk_@!3~1a-+V|@
+z5RO;xB~gQl)$jJ5t%scHqg40GbsA(*AH_mYGg)V>U=t^M0uc5XmmSO|=YVaHttlM8
+zCAqP<@Vlf_z#xf$u5`vXajL}Nh3?+`Cy!J!Uqfkn7k1D^{&wsi28XU(w9rkGX@9Xw
+zoUg~hd(#YpLdJrNyJYIeunAIMk^HWQllV@+F%ifBIZDEMxbW65A>KNEO9~-q#7U^o
+zrNmZp>CHVBLSQo-z9blB>&SeLC~q=t>7xBqloHe2#MJ;+J2dQ|7`d`i@_w+v-g8Xw
+zA@ahuDM{sg?N=KZ*tR%K<J=j0Ol^_a-qbpg__VWan4wx}gv3w7<^}3JQn2R)%fEzm
+zXU-fM4&;dlvq#Li8WYe$VAPpaaNbYmh~kS)zLWyW8!4O^NI)e9Kl(AFzHaG<XJ#3-
+z@ybLB&w~_noCX_5bMV>Kb88~<l#%{iS^am?g~88dR1sCjCZ))`ZPj5_Q=LD^ThDz{
+z>-wg|-DotZYw1_G9`E(DT$QOYGTdB=cjf|buRszNVR~`8J##QG-!eg)ZG<N9OxSXi
+z4PDj#-fK=+ox-Q0lnSRe)(g8q;K-37&SlB~_Go;3+<Qd;zJA?tV{CP3WT-}Kd}Qid
+zcDm`!4aEUypg%sQPYmA-bJp@fKKe>)l^r+|d`ul{cU2z4PZVcu{=LaHr^JCgIB--U
+z7sygKtrbZ22h~wxzP5-GI)8yEp=kv$B*kl12;2MQMv)1#`XDMuqUzAbgZ<`7Qb#tH
+z7x6rulutNTJJxp&*J96Is=$<I48z2}rUAW%4ne2-Q{vH0`9i9N8{4cF;2s!Fck(An
+zG}u`=A`{y}ZpVI?Yu6Ew?(+NIdB2J85?A?57-ro!5_RY*S+GSNW>8$F4F7cR6V|W2
+z@;1}u47wX)3`~_8H=D^TRe=hUZIz#m%lq1N?6_8?t|C^$;9_Of{z4R~33;gp_hTwF
+zy@_SdJ@qT<m>nk_WNV)QoT=N}Tg+hjX*YT%WYi(DY~eI-!gw>NZ<IAaf$vsHdsCL%
+zFai;B4e^nd&L!@beg;2(RuMQsV<7`Dv9wBy|5nB7*z^g1Lqo4<H2Nbts*uJ>F`z&b
+zCr}2ayN(;WYDQo;CvE=0{UKiZWwh4j%KN5t$SEV)IPa%g*ljncD5(iwBrjjJ&JIiw
+zgFT>IhJ}#mR9*Z@U5LfCNqb49%+3<yc&hb9`=%{|!%}u)F~L-I>8NCEUDWGGku^#y
+z0BoYkr-jbwyh}}1W4y0+9}58QP!i80?rI$64*4`jawUE{S<0lWu8VU`E~GTuAd{*C
+z3b0g>I6*I4P+@5rkL;UUI}2)40M&9NsfiSfl$-u)n|VpGR`og6i?z`F)ws@@bXM6H
+zNcrJ0zr#JL83J}!wGj+ZjN?{)xbyh-UB)8*VClz=K(F-lf<fGwMVfN?h6S9S1Dy7L
+zzlO$7Yxb!;4~6<;%CJ5E1-@-*C{dUl>^S^XUge^Ah9S&2m+-cmraJ#KcRvp$at~K-
+z@Bzn+Z|QEVPK5^%oW8-N+qA~AL(jdBc%TuTZ42;E-G~%5wO8$gX2jo`{OMTICR6@=
+zo!-s-1hFpsaROQ8)#@uN*s)$7jz`;}D{kS28}YB00JLd;BbB>H`{*6_GNSryNhZ5#
+z^?otA-&6|0imgJl0kM|p`9COVnfx5%w%AVhv+i0w-1CM>+G$)cH3BwWxTuGRNZP0(
+zU?jaz{mM)`?RgLIrd{GuzYe$AgUM01a*YF&Hp6<IOCvC+F>IKVcmdHvJUUq4&>BsL
+ztZ3%_!4lySeiFu9zUF)1lFWgO_|>GLA+0TkVVNDmdD`sCbj0;I*-19dZESjX>OH5&
+zIpoQIfb0vvJ6-T|huQF+YqSaJ=B2<_Moy=N>WDlyj3Z+Q>QcsFB#4Coc<2`yr0wx5
+z@%Yqrw|bBt_vj~-qfdB$N@F2~#d&DozRK7X>QNt;E}R!`vmE#ZTd547OG|=0F5SsD
+zj@UCAIRE_PXorZjC_nU>*X?7|2z4z0Ln>J|l*1J^A|mV|QP=)KCbz0nNv=Qb9>b8(
+z<O=o<p2vr-9s#C^7JqkS6iy4J%VGg2F97-oe1zZAco`ftl?&!TO-SQ<Es+ukcl<4<
+zpLo;29G@}pn%W$}b>}rzf>r+nSsI}1F+?rpb-IKK<qYFI4xNQVLZr@@nTCyjRIcBa
+zWbn|sI1S2v(c`@tXT$NS-Vr=oX^K8?-a&o-&j9}7r-Gn_!J8>MkUQz8Fv5|@5nKni
+z>a4UhNgA_x0<SKO0@2wI$(NranqpVVXfga#6PPXO`s(NkSokJW>{3`2eqtPTCkz(%
+zfwi`y9_v_#)Yhh)xXsCoAAa@o`}sR5zlxK)*-yc)3cSgNzC3R;%x@U_uJb@uV0~Hk
+zj&F@_*?H?pWu9i|b>crN*p+_X`EtJh)5WhbprOxcZV@?AkMK=1i3i^BQqvkb95Uey
+zr@v@EANi$$ze%E8kxzs04_2}!`qizmtrZkIJxBdA)IhFo$FJ@}G2h>qte2x?OJ#{3
+zGH?j!6zYO&P7Jqtb)34ISb=&pSIE|H&v&=<UDx!YynJq_IS`+7kjtX}&(!GoD*>DW
+zYYXG{{WP1y=aVWNvX}pC(4SkfUwD>VKo%B>N=ZfoI=;!`qkPajVDGrdNVYv&a1@>*
+zb1917ZhpaZXR)|b3cO;rng?n`$>(wdp8kMided}>IEq)@QPTZ(-RK?sK>Jr;I}&R1
+zb)s+Zl(y3K+s~8@Xi9|0IiX0cM3r4f3J$sSRqb({4(sw=Z!292P3xW~alaNU1aI)3
+zw{g0pFFY694r!G<klv=y-q7EAh+jpD`eA#a5%~a873~CmB6Q9$f)O>FhALh7Hnu6X
+zwCmr;zEW9BR3}HIB{*NrFz5=5ov^yxk&JlHi!QmKNK6-w6L?f};9?)y6abY)%POj#
+z1bCu#2wvY31vU@)^1=5vk;QcaNur-Db@jc@8m=$?+ZWah?YpI1$Cicnp%^g+3zRQs
+zAQC>xjDo8w9Z`tM7WKm+JclkOmzYkECOW>+d%&Wq-Nx^P-*hQ~t+Xz4R#eNS^5;~P
+z6%i%^ToHMu8a$E!mcXwimtx%PJZ7|uVu?p^cknPW^V^CF_YHYnddAv@m%`i^fWO{F
+zW1PA@X36@J2N@vLvyHB7`<A_={RcmqBxm~Or~PyZJ;y;ji>Uz|!_}vayy9g&oipxh
+zMA63KsxtbP(|RoiQ6y2a)gb)PNF58|3f#bjpsxBnyZ707t5xj*waU)gk?Y+*fvf#h
+z+c;<G{K6qMRz!61MvK>pK#ptYGPw-V**tmmc(!O0^*=5g`ONb}!6*dyiMZufqdlDf
+zRVdjs8Xe=JOt<BXjU~A7UdUF;%PV<JQ!HD{>BX>2S#Vk_U5VR7%)4Af#e60m6DuW=
+zuJg9)RBDWU>?CcdB_jQMraJ#<q&Y)Kr7pYLoII#f`QbvSo2gfA#&Aw3c(k10$W>Oo
+zw@WNJ*J%h727|^O=G54@ESrGu@GN-WnuRkWzh)=P$x2S@LV^$M{%%&HQ>(qPYuw5}
+z9wR$3Vd{}!mr`iH3rY;L?N_SfFHj}o85wRjpnDD&5@C;)6PNQ?*e55ZIV-N;jTOYJ
+zw~A}R<baTB>l#@*r`?~fNdeL1`EB=keQsyBEMn?tw?}VBbw8sXx2tmNtdyQ40qbyT
+zK55@y<-}ZKE~T#2)Q3yiWK6ka3JalQtLKX{WmE^GYFCaH+5KeIwqc5aE8z$dXA<Pq
+zLL9c*Xb<p^Q99i-VA@J1GOA1g)Ft#|z(`?3B`XBu%poPZoh=PK2#xH-K#{$BL*QE^
+zm{ho&1(`hnpcMn^Z72r_sP+Bn=9m4V(1*CX8rb0@qW-!axnu@3$1uVUXGG(d@q%`E
+zNN&u<RN~B-?pYC|%z`ig=^f8XR+x@3xW`yi&8{&M_?E0UTYi=WHf|5*%t0x&6-+Gm
+zrhV({ShbH2qT~-%=aS84C6`r5@b5|iP$#b{itl|lbaW)6Bih(;0$i<<$oVHx|Fkrn
+zcg!AC|72IE?{z;TuU{tT$FDTfyDk~RKly_vyylm7m{-rHllvdgcIt;%JPUCWsPLtu
+z)D=!c+o`aQK#Mg220p?C0ZrjrIU#wY*4$4HQ7iwCcIKDb|5i<PZ!MMF*R-Tob=?o=
+z91?|uIbml?<H!ydX-L*I;<+&vS-_JqK*1Kz%Fjsnx;m-lne*M>(d^G=K#sN?@2jx@
+zW1icLP37GWi*;;$Z<v@nq7frRIr~@n`=w}Z$SE(UOKr(S>&;=$9V~w;e=L-7;`L*P
+z*r2PhGm|oV18(R-F@a|;Z*@wh$dD~=sz<0OpgNgVl8D!K#L|uoWZlQhQV6o*r9qK1
+z!3jt~FSpZ)`5~`c_F<0J&&E%QoPWbsQn02GvSnLI7Y2lj7A~Yty8r-7lkd8P7wv`}
+zh<#o1aD)B5tqrQj%zbpUt9XT}bhb7U|APJz-5olo0!`I_SQg5z-gmx8u<G-!I=1wD
+zLC#RfCHvSbv4>^6xPjPTEbA*H%*6C@*YF{8cF>e(%9AZ>?M47$3VB!&h{x48Bbr_t
+z^;p0JsC4htT@Ac?`l`(#{z=S3S@p}+L8I-OET7wXt`ny*fc1((tyYHSYYDw8V*BXQ
+zEH+^U^(i85el`toWrTz%`+|F4fOPj%BHgZBXu<K5ApTR#+0_s!-QP|SUsqLU$ej_5
+zHlHftkD^)}{0q*8c@;I4jB&lIge6}=Bq6|J{F}Sszz|uEl|kG}0N>w>XgGd!9>5e=
+zfGAlCAIGxYYYUO4gqM5zOXbUXqHWd}Kj_{N^e;GfOh2gD1qFL*Pu3CnYysdF&9FN}
+zES!wb*H-O~?YYj8l`gv|8XBG^0{Y|0czl(oOHTnGKXDC0BzQ6;t>rTMR8A*EF^3UH
+zMa`8?<&q%Zgp$#wdrKQ71Q3(Ga(5C(+u6875m-3k;pblhQvz)%bsM*^hNb$w$E(o<
+zA4v$g-Gya)uRTN98iq?%Fq~7hJ|TmtUnKM_*RzW0UoktzKxD%`WrRci5JcV4MH=ub
+zO~`;!@CV8deAC%!Q9il%REFr>QRpXAec!>1&%1CATtpXu&8qa=mYQtj4o1k^D%Mr~
+zFOfzhdpGWKiz_}21^G`ga;Ck-_&hGytTSbT20F&~{RfQ~t0E5qkLbT{%46cCpZvAm
+zZn|Fd&Tj3vhPP-`ps3?q6io+qD7Lsgn6Zg~kynuj+b}#o16*=qhA`bTSl9#-60t`l
+z$SXYKT=S8DM)jz)4KxWY7~iw|*YfH1#mB10cnr2jqHkJ0RfnM64N>==3d5_|4ryQw
+zDVOXk56bWbY~(g^3kc+_bb4@|nVG>2{E>doUCPNlYqUS3Lr-n`3II(Nkb^wzdqi66
+z`&zv_6SKpb^x+p1>2)9LTWtJxh7UNL;?8+>1ZrfXAHSz9ec}0sRB!Xo?{i)f;PEe$
+z7`AoxZ*>r5yrbIFZyrDKss%_rW}k&0SW3uH_k-%Ki(b<WRjj&W5jaB0!eVl;FB)g8
+z<>X~qcSfF}u70SqMcXaOrZ?GI040vt(sKQE?aMSOwpQp=EFb4{^L#el1a4O9EYJvf
+zU8Hl7(S15rIW?XP0>?;4zM21dB&6QH*u*ghlV=fd8@6nR0hQ{e{4)nw_kSx)CYYae
+z=i>#&>rNgIuu#LN_8{m&AKyK*v!$$?_s2&ESUPL=*KJA=lJe3N_?(`$IozeqkBW;W
+z$|n1os12gT4-$80M};8>iVzU5jH6kSh?M7AB3oAl;G9|&Rggc}fWGBebAJ_$XVh(+
+zGKm(Tl9i<hNwT&q(dI8e@>m)(pfYW=Tj6{nr1lTQiH|vUch*bU8rO$dSVY4?kIX@g
+z0kZhRJRX*^j7}84)!g(=zZhFtZ=2?rL$J0B3e53Mwo|jxf<+D~qIB%!1T&INFm!xb
+zJU`FQvW5IqBtgh3jif8sc1wfrmayTQ>n(o-JcHeTSC22X+VK&l@!BF6HR!nAaQVA)
+z+H$W|9Rfh5p^Y6g&S<M~76E-PWrlC1>Qp3Ii(T(`px4TzxS<<Zp-b4?ndDCO;p@V5
+z``p}nz4M!v&kQc}oBb0VfDJHX<Mg!mzP82KfR6`QE%l;0*Y2Y8O_YiCy_zPC)LigY
+z9luV1XbL6E#M|CNaE$z$^Xv2PT)QOj>Yg4uBB4Wyl))xWLX-Qx5>ZBm=V5PYtF>)=
+zvW2;YrSW{TxbBHEGTM~$b_>32p`O@n&!m3a5y?x_w8ufOZiw|eE>7sGx$XopZ^(Fs
+z$j9&ZRnM8OYEwk81p)WeO30%#?6lz9k<u(%*43BRf1v#^%E6nw<1&ajKZM9rdS7Tr
+z*DUcRxcNkmsYRTQ=F`~Q+r~$SzBi*C(X6j+0Y={+vcafM>rI+7YL~djC$7!->syo)
+zvt$b$x^3A^gywXY-)z%v7b`Y68oV$)mg4&tEG3%hXE1PO>tco$0<*Jf?l2HQ-h|sK
+zC~KX?K%Bvo`<Qa?)$ltHpFjs<E{wWB9osBJh@cpoXN;bdDQXeb3hb<8)cM*NHm}#u
+zi+${s#M<sa>!L}z3BiMmI{cSRjIc9zXIS7!qLNn{_i?TOCl60cIbnvgMCipwozM&0
+zlLxcsbj0EH7;{lsWvjIeh2JIDD?nZ4<E-nA>*>Kcv?c~c+Kv#C!_<B$D)_1J2--mA
+zl7w4owsWRg*+Y>;g=<ve*AlIQs4xPW{B^3AaySe+IE5Dh3p<cERLpYeqNI6(lZ|cM
+zq=UuV2)RoVRV(DgQbO7SODR^KSfMJjVuOn(B~##c*%XJ(f(FgO<tFI>L18OyQ>u?x
+z5`wPhYzP(FY~$IA>2Of}XOAoAiNzD8DUSm~60r)~B)%+`i!)As2lGdgU+XtnQc4}$
+zNK3uz1A}#KkK21tUC~Hpz8o&?yRd#e+3!c$Gf`aY(u;Z^luX~}qlikHOa6hk=9@{r
+zqw}^41807YP6Xft?u;A{>D_7FWNzJKFojw>YUk}9b6f62%~X8qpmu`mInM#opTisG
+z@ULvUb7}}^*X8DML9mT_;mAJj=Cw4o!-jlRf;`@W0o_^|jwwI~8Y=kNI<(6ZYoVwl
+zsc1>Tp*wNI)4dtd4uRDdE8iaCtgW)@e{cRh*7o3B2bJsrkS3Wy-0i3wHVt@Pe3k+7
+z*m?=0IV_LA2*B2i`vnmurF*`1GjC-)&n{FHbReL5$n{L?&HtHcIh~P{;Bez59<|8y
+zC`89tb$dA5U<Td_x(x}t21byePwx=UC@^O@U35H*Rv_o{8_dvRp)7;kQAoiA{Y`$v
+z<a3#nK3GByLtsMZ8v(8%QH0y$`LaXXO82?!3Jo9u*vh`)Y_%<bD%E|VQb2cdH=&#$
+z=pc!q;qW9M$Hi4d&s0OnQSRhY^8K>Y0}B#Ynz=)n6;zsa&z#gr%&CLs^ve$|fFocC
+z{&Od?kGXt3-evdJ<?KSl&YLWox8-c%(BEdTOvK9PWmPqkY2-;ELj!MVMwE3`$4$hQ
+zS?D7-L3bzaou?o=1O(Pkv^ZCwLo#~_Kik3-cd93(3n)$2Vsl~nM+0xP^-1bH%q^X2
+z^h<vt3kxtyXHOOSXp`&7LRbPp1v|Pz>eg@D%g0ej-$T#I6dx2g&-K%!zzqX$_Q8(#
+zyi%zdvT^&Dr&|+UqMZX@h4y{1za8p+;rb~93s;jCpalJK^lGX)n;}l=l84#Y@W!D1
+zk4#N|mjuJl*t@8GJul5okNo{**T!hf3C>%bd~3~FvQ`$YP6<C_iND*na0xUj44a`e
+zeXUkOHc_EjS7yr1eyczry0u6&QFN_#+L3HcKzQVCUx`Rd@kx+1;UM0$Y4PMvW;a3)
+zt}m{(NQn`aEuIn)mj01|O(-2{*i2GrDyF#-BY1vXNHghplKLVEsZ|k<#PrUdYK3aq
+z+%S0+gzvp3<4VN0KMR^wJ=?Lk8pxEc^J(0%goWU>W0RcnUigEK#@Qg~1v=F{Au$-#
+zF#Ok3CUlRiD;a6oAXu5t(i3sC_q60>--OXmA6G9l`(P37$wLmlGoI?i;4~kO>Z3zM
+zkApb-M3x$VT3cU3`^NG+L?R*}bT7{?%!u5ZL?kUU9wSmE$iCq|qQ&pR)%zUSFSmQp
+z>$@#cjvLY3(_LZmp55NP))Xl}_C`t7ivg6*OAkmiSuI-xqJrQ_qRD_vtR}0wm-b<*
+zmmD^a-G)P^>RC!2>p!AbgaKX%&sXXIE^7rBTRh)j+;oXa%Nim9@~`cgAXq$^eRV)b
+zPTcbJnEYsI<CCeHVA7eB(CcB|^|JG}6NAfDzyY3m;>i=4FLt7{JZq;g9O$xJ&@+(S
+z>T<OtLYDO?JmRtKC_>bL6&<_!nDMTRr4qK+WR<b|T`^Xb*e=@QskCvY*v-;lpf0(J
+zj0?iL<Gez$Z3J}^tls&#k#v<=zI6zeEl029)kWxGkJ$YZI;pl(SP;j{nzPk>UdQu!
+zw#v5BI@1Mk<~ARICM1vJC=rR2J1(@0Lp|}wj=2_2KbO%;W!R5CoNNPaFGxEJw6`H1
+zRo?aH`=rgT<WmxRAsJXJE|78KHTGr;`F_9;Ib+%4_`NhwRe9S!u&-5&4AnjVF<K-T
+zrQ5utIxnSB`$Nj5o%pb(B6@moBE4WVsY6yRfNH7YOO(GB>KR?=*X~jvCOe-12*(g$
+zSJcACp9=0U2c5pONzZ5>YG51{HYc(Syfu2`Ka`;n@uqm$t|%u;+v?&5$rJ~oZVhNP
+zRzCTydq6T*1B6za^LoR*A`Oi+4Lm3_CqL~+ID?=1*+xL=2t@9}RqqF}3M(V6Yw$LF
+zUlJh6+Ol?7Xgbby#oniHe`xm{<41?>Cl;IRLH|-RW@nK;W#Y?JtB_O&#5{!{D*yar
+zp((%h2KoC?duLMP%;VWnk;5j(Z+gU*T=(;%YfFrvtB!|t2+mW8IIXrW95ckr1t~2{
+zALGIwC~x$4*YB^{M^*>gjfLBkUceM3BbW&1YW!q&Z>YqxT8n+8Fgv<jyDb==jSa8g
+zU(k(4Glqu)iQEU8`p0_M6%Y_#EtA08Q7rrARlMI==nTnVu<bB+KYVt}vT2oQZvit9
+z9=8=jo%-})a0r?<XGPZD2z0jjRR!ePq7iCK`v8>>U>|&BU>^bQ-j{d!BZ%1;$KBeO
+zofy==8c899JQXDCjh`J9T{B>Ar}`bv`8R+Z+TJ*I4<W1@J+V4yao?auKIyx%$4@Dn
+zWz6z(;+?K`z*;x<4XNw_9!NXB{XEV~)G_KC(h_h%aM|Jij1qzd300M<eDrUHLNUUn
+zv-;`g8jdh@&l_E%dhq^o9v>ha(t=gL<1!70<J@*us^YMUI6Q4FvjwwX*>;|5wL)m4
+zV|Rmkn+FuR5n7B9O*aLL8c3~TKQF`izJEQdzkjpxQQ(|eg4mtBoOf;bECGfr8;(GS
+z$7NN8$PghV@9!#mMqC&;^j>afxoz%M<wBfHIIo^b&hjYq8_GMODZHi%w0oQcle-3J
+z8`+%$dFTva#imx>BV39(yemN2vP^{=L8t{6eJR&Jg5+_?<Xi1dk6NOlYi;~3jr~F7
+zdENc*t7bs$_Wp`}tOS*l)LvC)YU-Xqu<L&|3%b7Gu1f%N!|L~!=8zEtNZ#O3)S;7%
+zIjN{t=of4d-!dfSqbBdG;tM?s&0ylOetTqifjZ7NZm=6PeECl1(1Fm$6B%Tvyo1~M
+zw%N`N@`hH8YY{RzrXZ+~22`Kb1IQreYg<l%oO9VR|BiRO0=!KP20#po?s^g{#-RsV
+ziHcs6Y!hgqgpO`X*{*|lKOpD&9#|h=mzi--FUKdp6bw*d2p)Bt{n*yMXijgeoor{;
+ztQ7eK?+EmH2W5*L+$csb@`CeX(dG<N9)z6%<Gg|Un0+v3l_m|HNnT#7*^BS(StJua
+z=c%mc2Inxs9S4k@L;fMoVXgaga4$B@o?FN%F2UQXzi*X8TOFs-UJ8$v{9H062XjUw
+zaoqwzMM%Vk4W20Gi9hE5YIT^bEQCD9I~EMm6cmyJ?Vg-?O~<H+bbi}fu4f8sz}`%r
+zdwK1c<faLaH2Eb9$Bw{;s3(B>@B<bpG*I1FtLO0!sy1q^5PWVb+a%Ou;!p<*3k#3Z
+zEc7HGn;5Ej)tSBkWW%eTT=Shm1@<0I*P3yxm3fJ$<-Gbfu*M$X!iRg|VdCi#W?sR|
+zmx2jiKIhW7EjsK#T+){>3m4*}&I;L^oC0bJWF{A&4NIUf9XchQue4=%I?rl)pz@O9
+z-1Kr>js*t(O1b4pZnz7UH8P$*&Oo4nALO)O>%@}Fi?6u(<y&UgQ+gnd4tdqk_0ZMj
+zX+#8Nm5k8dr|1wj+OCNnWO)&l1zL}sVY{x7gh`;jn;!?__YXidrFY(=EPdCUS2CB`
+zB;~!yU^}Ed#cv0niS0)3I5H^T<uJOwoHdQLql2MTo&JgtfklO-VkBM~Lz8q*BBGx_
+z(Hsw?n7ldGUXQU-hhPWax+Mi?ZtO~T7blmq<=MmeDqoJMiWy2(CO7wJ3yo!at~#-2
+zvDL5L?T#s`@%(f*_tMx%MM4hV8L+$0-l{hsFiuI=NE3o(LQg!nXnq0lN~`PK@(KB@
+z7TEzoBgt;P(`RT7FQcf=>?Wywi@o7ck%vpjDk-D~uuc9euyi^ndN%Xtnp`yhb&TE>
+z3J7C?=(_wMv8p|b$?Ssjv8AQEy9RwK&0mNh_cJGGPi?s9GwQN+U9HrtMx~0J7W#qD
+z8z6C|eI=uczBkZ~Z{qX!`e7?l30)^X_dv8T2k#vMvZebL@Xi(Z5|Kzv&uL)qcCE^t
+zXDs}|3SMUl3;X-jkkD1vu1T@m@V(n6LjdsYTe&_0%=WPbiq}yNu*q}caeRM*;Nrm0
+zv3TBG4msmVE>4}<Y>+Mc_YBNgV+G&O^S^p`bI^BFyCRL9JcipCqq(y&#N798mk2cY
+zS>Yejd~WBPo8{>Py2bfNgqxeWzZ@rks(0l&b)(rf;5^ZIyHs!c&QzjpxLIRuwhv=U
+zCiFjqCF+}F$36fRmWGkSnA!FSzLsbbqSNEm=esJoyZ!tf_l#WO1>iG)^k#X{mpP;>
+zlN?Os4n}d$f|a;hdstO6d|PIGbuANb21ZbRJN*+E-mHu~C*r?xd81LG9nZ5JJm~c%
+z#pPg*slZ4vqcXhzS=&``vebx&E$cpmx@p<YXt+Wz*T-Yy9rmbvRtYVd|Mt5;lvi|J
+zA0CFGvPSvVnIktn8%fO<(wqKmoIRY*Ti|k|3Bg@nFxJRHYWc566o;Ifzg;MMIm`*X
+zU<tucwXVAbT?tX79KxC@n_T_1ZzJ#1;-9Z*n)1$`>gjXbznP`u{u-t7h~p%+Z-@u)
+zaQ{9S$G0!gcie)z-RJ6vMZGxq-9*QUN~8?4aaj``(Un~&82?v<RO1slvi2NvC6OLn
+zRF%Jj5pfBO)rOy#;Z}B6qL6D2@QlLKyDejqJ}YQAMCWII<I2>q#myuk-+f=J@5}vJ
+zZ>L3;D-{9Tq%3|`$E)cF%mQjFRu%>9wl7s_mG|CQ+*tf$aMeba1zN}D0CWBc&k)fm
+zVctUr;gEe>B4Kuw(_Mg3W9_&e>U&-|awxA#1K|}&w`t}*K$|8PU~fD>{r0f2vHCM)
+zM@yK%jj(Cp@?OEg8&-dug%sg$L`ALm?}oC)nE*6_-lL}MIOLi?e|Jnv0{eSu53dNn
+zDq%{S3)(DZOUCPcF4u3c{_uHNQ!C93l0Mk2Uj~~@szJ&;@2}4~JG>q?xCi9&ciw!L
+zZ-*s4dyoxC?6_hi74gkb%IuqAA@XGk0{g-tPjAsa*J|~NA^n&FiqH@hb$gCqui0<2
+zP0p?BEg9Oip5TD0z8dtW9G`};0|CR=Z5%Tr!&DO&me2a-o_0?9P2|7ao;r%V9XC1$
+zDjJxteEL8g%{qL5Xas&a4JXA(tYkykk4I`>|NFD$%6UcqG&bpmn;taZ7*4@PVCfk&
+z#18eQ9Pq<|JLihSIdAo|)*!V;0nG?>A3;$e>YB~LV+>euL))dGZdHR|x_8@Ol>e`@
+zfbwG9gY8D6Ph4LsjDG`D%c(PO)I3gxM(KVCNp?=Bts3?+r5(H=?s@Bh$n!W(*BmZG
+z?pw`Ax3A|UTegVM>ppRu7@TG`6T2h-`WCbO!s&?{ThqFI>k*YU_dt(OSM8y5$bsej
+zH)*t{%#5_>0cM}D&Pg&D{s$*RJ=QbsO6w5FFp5P+k6j&U#}1)G5!<8|Ge|*i3a#0h
+z$F9%Hh1hUv_3}!|`WxT2a5Gf5ryLf;0Ul&pRutxOe9t;0EIj!Uw&|Se;)hm*ou|Qo
+z+U&I1+>pSAwsqN=W&SJ`arG`y=URss<eV8~$a2X~ZMRd_isL<m+}zNuf(TTy!~ecz
+zTx9*FeafpmeqU7B<zMW72ne)4sR&XSo46w=JS%nFQ6FhTe6cYhe`Ce;LQMY9i>qV4
+z>Mf0*w`ae+9vop){n>`kVL7|{EakVS!Mo@4dfNGQ%-$aF*PV@F9<yWnJ?G@YHQi7R
+zZjR5FF!oy4%3n`%M|VP(Z}rK9#+$6ab>Lwb&%aN<d_2Fk&j#CTqr*ATD6uqujH$87
+z@YYk@UtS;eAJ3Qg8_LTX?jy6IL(V<s6)o%<3pDtV8<w3<P?LDj>NgM&0#Y4pR~miH
+zIUWEPoiC`Z&%}D<r{P=7rdY;9j6y8o?ViJ*5<;{qk-F|GLJk9n|F5)f4DQ5-+O2Kd
+zcDL5AcDJ^<wY#;swcD+2+qTVLZQH#2zccsiop<KVw>&dB$vJtFoaaN5F9`b$q7-Z<
+z3LJ-Ty$Rc9gU=$rsk+s3%8Q8*sF<O~Z3iQ$)S&OrwHY{Ak~wsrTQYOIj8LZKvfO{n
+z#IaWzvp4P^AUM94^Ne+vs8KaW8Zl<hC6VAc-e5af@q1ip^%|t76=o~7N)gTJOP)<_
+zP58<o?iR+nN451QnRar5R;szZXFGSsm*J8sbqsZ~*qh99+qy-ZUz<Jv8(fgiuvHpd
+zpewlBR|On?2Gku1FjRfLOg`+o8-9N^`i!`?KY6UoFLno2YA=YA3=Bl0v=7}A`o{OS
+zAi5&w9>s3nxVh|O+oO$<1VhEMc~g}j&HZL>PuY5%&as7Rln2BNsZxj^LZS7-W7^j6
+zt)e4RK#+>uLfVx40c=&FV0B{)f-fyyc0xp)9no*>4OGJ7uu<EFnba{hH=$tE;=O42
+zU1FcgxL)M|_$g<2CPy?HmJkEEzF%g(*-CgD5<Ozg)BdzbnA2K%MY{}1MhOp<rp;)|
+zN64FW`I?5@j;x_H>RmSK*ubX+F_leGVf#<mG-1|<-(OK&u}AQg0u9T2R+=w?20mMD
+z*p<7s7a#f9df0Z~Z??K)nhE&_hWGyT8oUtj3m=juB1Vy60v*ruey<fhc_jjmaGv8u
+zsnW7YekWt#(5E>c`^094!=ex7eqY#5nEv##_Bz~HvO>K?b^&!uiTo`re+8n^2^@p)
+z(6Ko+{janj(Iv1=?gAw-0oJJN7we>q{K5Ev-ZK8AqZ7NDo{_dRGZUg=Nb|t$Ta|~<
+zm7aK{D?Sou!a-tHIg*k(>64uAA%l6uoEMC$bWK|}mnkm#^NF?ot@2!Tvx=4K@sCU-
+zYmFMfLsLeNC$^tej~ai`dRgq8v5wOaI+m!a(c(+YlT<#coEb$Z@bBjE<)vr0K(ama
+ze{ZDuS$W&=3m$vSz`uLYK1>*V!P)L$x7aL-Y+;*5hi_L|7*BE2uc%AI+kN+aK9CDO
+zNW6JeJE-64num66-Q0z>8m3>m`5qBo7smP?kc$}q<G^88?>Ucj5t^m#+|p$^6waZ{
+zY4w^Ri-l7`K95<4Veg!H5jZCEdLOg7TVT(}z2JUsGhm7+TS<#u5Lp3OE8GdUeP?2C
+z_IUJ*_q=k!OrWS9V&1|yFd~gw{Lw5Cp83hlBrMIr@Vi^E?Yi5`e$N0pk^lyNN1esm
+z9@^D9aW1nNXiT3iKIMMY1dO3%Db;a9>*~*P7xEVOpq3<r-~?1Mx9)iJ#y)!@DJVEC
+zK9<IbEFjuJFQ{0R1@*0@b6B5{SI)i+mH;T_D+J)#()Z{me^-p0x_#wro62TsjQiy}
+zMhd%frv&aLhsu;nW#>WlLn4;rs{SaAaTs`iSw#>;zUBBUnsV)&oL*1?PpWGeB$oX;
+zX?^16`@ZR2*Bzr{6Gn=xXbBk6-S>FG|GsKjo%-;Vx7i|TAWY&K^LA1(JGL$?RxBHS
+zd(`yH#Dv_Pw)Z*zg1*Siw#wSPbOnkG=X%f<HdyTO$V^0Ikz~075nJ@UfxI}AUz>en
+zq79h~=xb*Jg3;vKhZ*O2$p*q7A#tH2=)~!~?BZc->XJVw{zmzJBY*t`c<rY$?9j;M
+z(^4#BXZvw>U3c{i=!@6HeJdJ=YP`q97G${Uq7q`zx{#*cT`R-#%yG9<WzEBNKP14P
+zJo`Qi&Ms*Hl9}C~WZXt4p+f%pehYq*`WzH+-6VXi@wQ8Oq8bpCpoTEo(y=Hdz*p)H
+z>FYLG89#N~Z+^NRDc5=hlpksG@yib9hnF<Twa)?+x`c+<8l4c4FTMs;!nS56@^`nq
+zuFQ({#gCms2MyKrcaIYA76qm9YnsZ_j(~Vy+Ak=d@7r&&50AheQej7nmffaquWO?A
+zgFxp~g{^0=hxC<h38KYxHEZv_#a#z)okXNPW2W{K{<p4eFXpZnK7ATzDXg9IFGN4Y
+zOrx(6=r8Keu<w`mMxz1G@R%~|MCn8*tCV>XYXX0m7LgtJvMtTk9=GfFHm9EL>Ekqy
+z<0p}W1_mYJRLq$<ZQIKTXfA|GSC)n?E&-nx+0NOK180SQv6AKfHWK;LoV$wom}~rF
+z;_=9k8lSlL%Rjhlv%_t!=k@tIuj9IBW&S?cm*Vo_f=!`7@O9vMF1GVflAFGB=9`pr
+zbmqU0qwTSG0&xRV)GE{)+U`6asQn(o9wJixS~4Ar;70gwU0lC=POS}$LV!KV1q8{+
+z{hRe4H5inj%YT2sqs92Qg3KFcYdL6~$RZ1V?D%k}o=OS#)s<(N5tmPpX75*djw24x
+zKA>>j+09JxAh!XVc`nx5*bIDM50&vk|2{xtrEtn7_R0N(Ze3q%vCm;p5NP&*{~WgO
+z3?urb(6W0G1wi4(zcD`JuGszB_uBgTy+`<+`7IjNQ0)Ug6Hb@&{+|c%^8x8j#x|G&
+zpJx*%JzuGUCD-0#zZ*?fILChp@=Z9MvAyKKH3RJma$eKi>d{94PrpRNsH6ME@cA--
+z{819XiKYE96X~G$y=sy{)RhJw5ber@e3Z2^QtoQecF;hvm!_dlSaD{#ePdW$RoD^4
+zNCZ#}*}C|r)gZYRz30TSWhq>v)`KRC*`VD-#e%(Wg81)+%i262={(){3mz(ZzB14d
+z`Pukr{WO)D>c%z~7lq$e1izghww^z*^hU`-9~ndkpG~QW!v^ZWl=wg7j~kEb>Ht0~
+zkK4l6-`C$+*^Wy~jT!V=`WF*&_=7IIItLq1Q@~SO!B5xqPDgmJ=BlIfr#x?fjyObi
+z*(G;#HV#_OS|M*(pN&9=*T^*T4X$@s*2uzrc~*K1xgRz2Kn(-KqgO0hRW@_Y6|jo2
+zZaA9S(1lflcBZDhuI0&-wfn+sWg!TeUk=#p>`8G!d?SgFj*Ch<1k)}U5G#IVlI?t?
+zm7wZ5-F7@%^EKf%&z3VZx4OUDf|F{5r)~2R`+{=)+WGG0n+kYtW3ENn_4ig_4P&tX
+z?}IbdxSu>>4s!^PSM9$mPDgz27$4vT-<?%w>H~gU^WHIpy4i6nhd$1lS8faCy!RiU
+z5?+63$naWg$Z|<C%?1$-;6Y=Wk`jBpI8>@1r~cXefn~VtS7*PSt@9emrPahHO8)v#
+z89#dgR@GuAUCKwAjrBSiPLfCd?0J-kY$xU1;ct(9NBr@Y)PK%ZTetap#fN(H_j^{O
+z`L*2{sWbJ8Hc`T`;eZDwP?5Hx6vUQ2#eBh2p4(>yxGll#F$VwlbLG}=(D7BY;6Zo9
+z%=+M2@MSl4-r(!dFWDPwbryNBr!@T@;=c>OiNf5jzIRpmtbi~Shw$17zsJby{A-V)
+z=lN_xJ}uoLLJ}-c(=8oSW)4^T(*;TU7n;xhnQz|9^#+}M<odzkIE!VcGO$+h;PF3d
+z){S<byx}7LxjQ7xo6bY`c|Py1ela}=5_UQ-uC3zS4eV~_=6PLNX5nz{6h!Hg{B`2|
+zOG<yBTVT8O`ddmIUS=yiV6V-Nv)t@_|EVI3?lB`x8z!p>&o~W}cXiRdK#z{47p`r2
+zL6abh4WrMS*zLPtZ(l22>C28q3+8vY$Cr9*8<*nxrMzLTHb7zGx0|rj0WNRd3nka9
+zjiT=WZDmbr(y#%?d>Cli5%FxngX&3codAKu`p8p6`#0gYG`}Ymm*q6`Syw=bsUL!o
+zt#@BnfH;KW!&iym3%PntS1LWO>xyQBYvDR#du7lIPG-=bzq?FmdXLE2@?l8w#!yMf
+zgn!`(gzsN{pr3ssdiIUFZ5y$G7fOH3yX&hOIDz%y$K2)Ft`oN16`+9TQ2W%|OQ)?c
+zcgAnhny#0<$aCwOuI9intPL;ZJ7T0FGF^>1U+`;HT1BPb1+n2mg%RJgDv4pIX4@Ww
+zpR2K*0o6x?DykBzr)fJ?1|R?A!k|^Pf3w}XT+ZtU_Q^Hi(Xu^FwBK+CW~^CL`mdu2
+zr&?BG+<#B!&%&WsPyz}(b$1Qh(2v)OQg!9F-_x)2h~MX0X797Vy_-RSlF*tYltk9L
+zhn2sa0+cV$2|~Vfu3z=uZY1sE=%6n-7#LD7tX`_s_9ReRlU@JVI;b!F-u7Vh(w?6E
+zbn~moPR}e~z5K>{a(su_&I)^Zf;lz*HVnW5dWQv0S7b4To9C5NH<xF>GPd|e`Y+#I
+zDt8MA{CF+gy-7<oaMk+U!|rNL=lA||)pl&RKG-!`=eP-#dY9-&F>E2A>}JjKJy_1#
+zUA2olO`+%A2l)`R{q6H0P~(Z~Wm|<BzN<YA+K+-{+w%DFg%d_|xz-eG*RwDGwx`ie
+zCK2zp>Bwcf-KO_b#w2r}Xyc2I2bYH+W~9Pq{6Ye22R#@R{L3xJhnl%Wqw5Uw;ZyMC
+z^CADZN3or^!|f8~oYG>hHYrLCr81`T+a4g)^Dh_64<qvZD+zC2_gf`tE!s}tjGy}c
+zd4=Ce=;Vk}fhR}*t^E9CHe2)|8Q;F_nUG&~sUe8ZJ>(Ew(`>innWil4NUowkZQGcy
+z*t#!*B-=z)AWxkCG6m>;*Jqm*KcmL_)Du>;Jkxp8A36WH(!*Y@*OUG)b0^%u>yY)u
+zhM}QEWPwu*EVKw}3_#dk&T5v|vHxhA@qFTVNa6Yb5xC}A`IFe^U&Fq9=QsQN+s|wJ
+zi(<tw%dP!-5>VS4NTClQd;=N>CjFN(5EVCBEs0zw|0053%{6%<`NO2_BaZm8enPN_
+zuB?z?Nd6!}PPU#V98Fr00u*oqg%vy0ee8P7-|>!gRF@0m1nQa?l$Dj$=1lA}<2LQq
+z?Tl9xCV)X2cPupZP<nepd7xUhIoR`cp3$m4F|%{IaNX;XWUEskdD^wKFAeqzw*e}n
+zGOf}@e_px|8f|6qcR(f{afqx@6Mqd_yLzW6RX=#8=b6|07`Yp9M&OwMOb)!IEbU^Q
+zE@M<{(waH{6VFimbNhRTct`L%^?N+)6}I+i4~@lCZLOK-^kFQ}Qo9aUD{t!x*ZnnF
+z<>stKzK`-k?(_R=MKH`-mWzMAtHr?#<V^0SI&k_9rAj?;8p}m(^j2StF9-j|Cdla?
+za+4Fu8%x*;Kz+04gPdq+u-)Tl@c#B}U{B<CMAP|t#JsEVeMhBViWy~d<WaGKB*ItY
+zdFirKyMKm&Rfv`gqGC?uON^cK9y^)`aQ=|ilqlo)-MbZyozTC`<GsxwQ*~U+1{Ts2
+z#As>h_tj77e%!UdAi*8&?{YL5CiSVer=9=!xTN}*j!_N5T-J~lKUtn{r0>nE#Gv`P
+zjn)_2J0%u=)Ya8w@0tSWB8tdfsn*7^(1~3T=uT)LLBVE)bVN`$>1}KX<4)vhikkho
+z-f#n5(*;%I^UmS^H3+-<JPK$&uh4v|t84Ff!DVIbz{WQ8F~LlobqD`?tNDWZx()k=
+z&|uaxId+G-UkXT>q6kP%kS;XV8FDp-updz%2utmG{6XNcr^I~^Y`EF~eouVb8>*Nx
+zG&xVr$f)?n7Zi#|I&`u72|`$~*56gQdWCrtRj?tGtg|-Mj?A;orZR6=%JWVB;Q<#Z
+zG~oAgFL+OF;7jCtf8MflnbQSnKI1*kZ^5=-#H^H5o5;5le-_QHrW~;Yxfw|`i06UP
+z>b2b$`F-s7=5wT87V<efj1{yB<|?MyOY<j*oUIiDy!vMzX>uY8Zh#f6Kq7r<$@fWt
+zf`eXi>`s43q{G#RM>SP<xM5?bH$Kl2ran({`>3%2@0c`XbW|po*^eoZYH;)?8SOgh
+z_VIMd5a-;04a~IchPm$zgxbCkkVqeAn!Z_C`*4(gfwuU_HHd*n%a5!r1qOcLwC|e6
+zx@CoI$%^C1Vq!)UI7<=w5+>Q$d$_z8PI6lqGI3}kbxxQ@&n;c1_btVGI`teBW38SD
+zi6Q0{7H`XETIk_|^WUIu`HFet>R0=(tDZh&zZdetcjkh5+t7|0f2_dy!ICwF_$4YZ
+zjC?}=-xt!{9%mE;K4+|rVThSN$D%K%_&xm`Gu3a=k4s#0P@lw*gas=I7MyT9xV<O+
+zb6z5KK3BbLAx`umP>3!=Py-QM`I|9&``pbBUs%na?uY^rH=EZ!E1z3jelvPKZ4lUi
+zP8j>oi&O_fL|?yOSfyqbFv|Pj!dN_DfJjCxeGZ3{UQjz`$6K@rO!X8c{~N{^1;1N!
+z98kgm3jLiXRTvCUsePpba_KHegb=UEv2~dwRl&h6#83IiWztau2eK-YX9zID1WT0?
+zW4WU~#tW>D5D+oQDh!#0bVl~m_1U|^VtzEn<DXlojL$#mVU=+<jg{klwI@D%ZQsa`
+zQOo|Myy(60-}W`K=r8sx+zVa)xS<yR6!!S_PuTiGGb)oe$sydKi+t(%Hzz+^*n)i5
+z<iuaX%l)Y9&4~v47-EO(Y=lg$r}dUPra9_DRF6P*h>VT%a4cXoxdrHV(hct24>cpS
+z>3!*fVM4y&b?JFWkoVH|X5suoHEm_n?yBHcot9xB<qRc-?#+yTim`CQ__NHq_S^Bu
+z@+9*>oT@}@%BB@>ricJh*|<w0eNeeRr@e&XN-sDF`gtG#99k*)iQOBKJi|mm05;ZW
+zW>imeel9n9wLdwL>$JPri)|i{Ti`;<|8wOgU@Bqv(rr70`1`)6H+Jg<cbUaE@T`II
+zmrD9@(Hqgay*?lG<<J{d(|np}`oE3uYw_M;=f?NKSjg3kaJti(s{8TYZGVY=<zx8h
+zO|U7big=gQ8$`K6W!^eNG?%T?(E6Hk$W_7L9PC9-r5#blz5~;nNHXi4wy^#S1JU??
+zUe+LX`|HciA&tARU8?T3;(2$o#V_()xw7DydEUAtbe<M*Fj^b<6Dp}BRv>z!<0>>(
+z@Czr!o@oG{Iwxr5`)0e3o;fGb2l?7e$Vf<NAIPE+iC!%@Fy0D~5K+|;JJ(VCL<Ys<
+z+9=pSRzULZ+IBd;80M!)=VwxJun|)Y*%OP)m(Yfw>#cWWKeM822w3Kl<j}HG6lFhO
+zxMR0m!kg29<wU3*Egi}AAu;wv8J(55aCS*VR4uk6>3zp3x<?OS^h3IH!{^3vNTxR*
+zG}gn1sz7niAsFpfcj+dda*I+O1I-O7lR-h-NZjA~JXo^A9LITpvw&B&L0}EC!G&an
+zo)M@<If2%Jm9hXreASJv;93Of5km?<In`=A+=>BF&|8a#nk@|G0&<@dmEuBU8|oKX
+zd|MXGNHD4E?uXTtE%74ek=JWLeaxfWG*vt$E950tcE$<vaxgsZIhJ34WwcD$IH?lx
+z)db;(CyCCO!HdZ*-1-BNAX@ule#>GHcJo%RmhhJ=p40<YP6!oWhM(g~6p-@uyx-}w
+z?AyZ<_xA|5Q}b0H*J;?SwwBo@goQ+#el)CB50^FYL;|Te7%&U2MTF<|8FmVpXiOzt
+z3$&Y8utCvyLR6U>I97Lfgb#`1v0E^Tb0uF13U9W*FL7UP@dbxqj*lJQx{zn3^+tRy
+zcaNLn_Ii@5!zPncYFI(%OeBedj_an6R~r=ivn8Kye!#TM^%WiRPG<w~w|&li+z!{3
+zBQHn4ya*61Ue6RTUF>3Wmy2mvuV_y;WOo8+U$cLSO_xM@pYUL&0b*i(xLM`*#NK2(
+z!?Cm7@1&DRe39S0-n<u3{WCqT5xk=wfQ$@rPMv!u<j0e+j}m;f($?jbCUvycG#+57
+zCfpAvMp6DueQUAPy$oPu@XY+sHJvVS*?hMQ{Gq#dVDdlYk)bdsOHqwYcKH>WB?L&0
+zoiW6$_!3MOC={ybacqMr_5)e<pM*nD<+1aY%q+)B(~V=J5({HG?FOhD5~3pQX3(Mu
+zXQq3R^6gff1(HAzN<lTwqJYI-e7!bInMJdv=K#96Q=-w5TY@s3tB`k-ohK+MIE+_!
+z;n=+0p0*P>YJ*<pE@nChuD@<@@>ftCQk{~3UnUtxb&8=E6=<XPtndzAY%aR@C~R4p
+zs}iYEx-`>T6%r^9t*31I8m<VQ^4{xEZa($ZkA$_e_e7@KgPQ9j2Y4Mnh@4RG)`&QJ
+z0N+Dv*o9go?_#KRUD*VwU|_9N5$V?L3i<jl0Fc!DKzGRxLy}8V;kv)~KEJBn?TSUC
+zvTR2m!Mc5wBKuC=jId;OV}h8d3Gdz3mWp}A;5{*S<P`9kpXsg*pzAB`8#pPB$bQ#M
+z8^ygd!u>>9y0u?B6+VW5p9g~0A!abBlR@<gML%U_%IlMXzl(Fa|A4`;+vtXEaVVP2
+zA({R7ME*kE@;qlhO4G=TeKLU}TqnBvejCP9d4vF52q}NcZ-Zkl33~0}Wb!_e5db_f
+zVg-7e@K<)AnCzovI81dpcY@pm{hzl!P|Q}jG&rH~{UWE4%4(}=Zz?f`*cixY3bN`v
+zvSu=jJIs68FdlpVddG&@nFmQbol6R9UwGU4x?U-8HaEvy_8;Z=J&e?hjKmW6dCsQ<
+z816sec|UAvy}VrT=oX$sd8OAaNf+mFh>K;M+|J_(cCcDL_ruQ&te{vlJ76v#1Kf!-
+zVzW(1c-~%&xMTDha=g!AxnqRfZf1R_F{kRWDY?8@W+-HsHSeFgKqCn~`*8WLoqdI)
+zjk+Uso8OfRh|?#37ECGoq;fjEdi+S4#zZQsuF=PF1djYYOI!s0URRx!#)ub(*icn$
+zKEJ@Z0D2Pihxbb;XXj=Y;_y<p<x7C1**o0vK9cA~Kn(HJTH?Ti&)>w*-VArzL($zq
+z;w6_U-TpFi8QYFqDVrXKgK*DJ&0*9OvRqM|#!vLX7(+Y6gv1-1HRr?bBNI)9&wOnl
+zJsiL}fqQ_p95KFo61FsEeSkucH*Kh6Z?dW+<-<nUIl`wzP&OZ^?gGo;X1$6z3D{b2
+zV$hE(F!k1>Qk)<e#a@{?-xf(%`C%~R2m|YKuq`1Z(0-6)s(9<YCG^gL2WK`KX~`s>
+zp28~0p0@fs&O`#ZR+`H{4nj5AO}^2v%+`5BF@<T&l{9DATyPATYizilc{i+4&5*}(
+z3I<^6ukpJ_`T$#M)nGOVs#vMM=RE!u&(r6VBb*^_e()B3UhDLZwXpA_tC!Y$M01pD
+z;Eh_=QIaEsx=6-gU&(?f>1vIRPgT=wUE5wqB>1}1$@jUi;IO~^h|HREFX(vR*a_Oy
+z+Xj<(IB#Yi$U;>E{!F*t_K!w^PC=+UYz*8d3ZtJF8aF%vO2g8bAlpTqlPd;qp6-Vk
+z+Ya}U_jU_;3Be-gQy>#7_9lDZV7f0S1m&}K`K^XOOR=;|M7*$3mqdMlqoN*1xCe4M
+zegTxR8GplGA3jP}+aJloh6OSWy`C6)^Masvd%r$!P?~ey58}g&1VguwceQaE#kd@s
+z2REm0jEw}2f)GttBiYIadWEBN>8bee`I{)`$jFL(B+SS&=N04lC%m13_ziiJ0RQU^
+zQ&yf<7n7nM$gbZ@Uf81P<Oy*I9EG~_cY%l`mPMN5v8c(rg)DARueSi@)K$!s8tA$7
+zJ&u<2caZ@$l(*r0HeToyXg0W|VJy2KJNN0Z5Rw%Q+V16PVjrw^0#a^JB13XAcFPM8
+zBaGT6>tlWuLXj27q8UyPV#YABY2ljqp&hAR?#RZAt06s`%z{9c8k-1UpLWv)Ay+!z
+zgTQq9V;w4m9&{y(0*9%Y7iMt+<_Qm&+RjfB;FylPUgQvMTz;QjplS<WxcrCW%!VOq
+zIGE6d_9w#DTqZ$H&bS2N(!P-g{Q%D^`eF?~;g9}w8;I%RG1l)RZ^JbDV2r7b`8?+|
+zeV6K}{JUws=x)79)V#xQv=BtxP7hqr2$#SEdCTtRbT>WGqu{&N2@B$s+JW)cd+b-o
+z-95;cN8t6|4E<>LhN*UoB@1)#y%F+sSeu8{A>|Z+mf9QLR)yHIc_559ggQ=y?`;s(
+z{bEki2vrL=9eDyqiYsnNOH`+&xoLX(Vg1ZgS8}$^>9*bPn7YK0a)Wq>@D3jn73D-X
+zD{caJDZmrQWk+Ax#sK36LB-Ave`f(d!ux^)qke$Yn_zIHZte9|uy61a^~YDu2T)^R
+zVTRbb!}WO+PaY=1{}(H0Yg0F*>`Kbc`XObK(e_cf{#kHsVD<n=7rJ_GUY?Gg*6vs>
+zOACHB?-vA0mL!STurXxcDU>>T&CYR3-Pj49zBd};?7@|_d>8`EVZhNXYlZSvb|4CF
+z6;YM;T8>e{0Xr`ZErWhK7BvqjwU@}*DdbcW27q)ye4{I`P#8{;Ucf6-`R~lK)ByD>
+z7e)34TItx!e6-|{jebkm`_MaUl3U&knt#Jo$;VFwTDL(S{HX(HyWq|Ri71%ES{N5~
+zjTN)h+fN9x&aR)H-9tcgQH5{Yrp$&2I&YSs$zj7;E3#~K9X!TA3&Zc?9w?8seVCpi
+zk$6jN3Pjb+Cv=e7D=$gJ@a~E_rcpP-Nm2t!*+(y$I`okKs;wI($xfJmr2mq^TIE@I
+z$Um@COXXu$ednHw9>=FV7?PXCQ@6z4fvM}NEZ=z7txVyUY~wRmsd#>L?tYR(`v)}F
+zJ-x(yOSD1%_+XdB+r$#gRKP&<kyqEYeGov*q4&&!<bs&)qMBiS%S`k^t9>}-&|lX_
+zZ2O}PwV^Txfu(djOES6<&#xZWCRAgMl;ZrmO0m6@NrU{I(W5Tq7{N9N2ae7MhF6f5
+z+3Yyc@_}(|3WW|0-<U^aye1A@v<*W$A*66(anqEL??lD!5NjPQ|H+>8QoK2&H$V&`
+zi9TJ}UrUIu7XGr=&PDrJv8%b3Wdw<C2_Nb#D|F?pHxK+~QAM)$a%Et4phtYNjj<+z
+z*Ojo(HtX5GH|BnP7_Zn4%JJ|h;`^XWVfVtze7efEQYlF^3&uhqOZKIe2jWMDNq%Nu
+zVdnII8lLAyZtS@gc85*I-LOZ;+}g9#pX<yh)9D+4w7!L|KoI?XgkQ2ZXA<iX;d^2n
+zf8aU81PVH)ftC}oK|}Sh?Cz7JlewYOHzw|VaaRR&AQUyevpA(Hkgr>$wnPS4WI3l3
+zxHQZS9^(sRIwlPg)=r{Q!#_!r6^#jXncVG+Nx>$Ha4q)2xM!Ez(sO0OlcgQu)1Jvx
+zn#zY<8m-4c+KPqEMpyeMX0>OsN$ER~OM96QOPHsl*URM7R(adW(DmzJ2{WZx5ALfj
+zz>%6MQ=HnrBC}qQWwV?yR)p#P*y{BFMKxy!P*;x8G!OTk-%6#+gU0)_9F)c(7N<V5
+z<QOOi$E}c##YYiHk{mdbdR@z`-FPY<HDR~i<aQ*MO>Ka#w&E4D=%DI1>M9hgW{;l+
+zm4Unl%Q6M{%CH~7v3AhC2sI1aCmx?YzKiVPi}#&YrpVZH*<%m{gdXX?JcySp7VzRj
+zkfrxhqeMi@jvPj#QP!G_h>`O`aeNT48vBeqhaYlII*!E~4+sn}SQTEwoUu4y0A)A?
+z1Eg7mQ36C4i<Cs9^gu@INJ)}{-~9=Zu*wzX<NYOjfLpRWIO?Q)ZCgq>fGsK-nELzt
+z=O28`qzCIlU3F3$b4U;eWI;K+X!4%b@i+mhcJT13kqt2Kada7y9l}b?bN3xj7YWY6
+z_rZABGneTB9`)oe>rjE?ymZ?Z@v>leSZ(e+TO9n<I`|Yw!W_WiUz%-AN7V+cSJT~o
+zt`3Le$={&$nSDUKL(Q;Lqgh-??gBi&P-Zljf1L7`xWT37r|Gj$I^`PwCOCaQmd}ki
+zL4KcNuv#aMrPk+0MJD7q8H-cgixD{@3T=cSU>mJVILhYjm#GGc-V_1}?7aDH!zYYx
+zNEmR=35RWGl++js$E$)hHwE66DP?!_*cRd;@9;F|FnyVz20}Xr2-2rV`CYihe;K6d
+zsSg=9aEkjt!J{CwBbH5ZiM~~6gi;?LUGM5Co8(_sB~rXsneC6TjYZ!GMlE`1ABP<b
+zS0z)wgp*+YchP`s?$`JPnqaZN3MHO7$X_s}R}NwF0D9WRq!?$Y)?6Vinn{_fO?_AC
+zc&cG4%|!Ljtx^vPS)oXG`CcX~r(w%(p<b<&g<N0+sLDMv>f~}qCJZzrhb%8XC59|!
+z-U9NOz*-VygS^0RR9>lrLLNLQ!ijKLm{&uLSXrg8WRThrIfAl<jd&Zz6IR}2es(yd
+zAQX=4yb)r^4P^-l(6MDRN89P2^V=3oEp%lir8G8UuSk$pn6KJcJb5(n)YN@G3>FMs
+zDVG+XZi_m@=k=56XJa~4kT{ZFam~q0Xj$~KCfd=s;#VOQlor0R)jU(upjrYZN^gbI
+zMwth=YvLqoy5y)?JUmL*j!@1D<;_}Z)1-#EKU}d2(mXmxu<Ha5z`!Q<vOTW+d!WfT
+zUPH8)G)ug=S#Z{Uiu+MJB{E>xxmabiDUTp75jUN4;k3|%@>bw<l&+!01`l=UujWfq
+zH`~}W+1y{p1$WH<DD#zg5ach}MdvO^z{0p9oOqM=I;ZZiF}=|WmuQFyLJ7qdq&5)?
+z#MuuocZop}LxRQ&oy_ivR&xoSulMoVC@U*dCaC6eL`vk)K>R!J6rKz{$xaK$O=hz3
+z^k8Zvd=dwo^Pxt2?ekp{MBMT>{&*HVFW{Z>uVrB*r`6dc1v*+8cAhtINnvE+-e+Ss
+z5zuNU@RN>5n|b{Gv9hoHC616dX>S`x1f)QS2$5SsTgQ!~c*RdXwtI!bvWg)Gf0O?q
+z_45FNrmH7BA8Y^G1>8~-XK??ZG+HPMVOL1Y_s&L*1cm1eUhWVU2kuzGVpPBCUR#tR
+zG{cgwXp|exh9mz*B%}7$@J&8{NX-T3gytRLL>qjmoL}p3L|P3~bXt)nPBun%8eB5c
+zGX@vp(HmFqMDABLnloFWFeJDHz8R&4RE5;~wzpE0#iDgWXGbXsv1((2F=-tT?gD`y
+z?@+5zHYW1W22aI}C-pu|rl^ffMy^7QuIpTnN%I%o1V_3C93Cr8bg?lK)BsIV-9j5i
+z6HGe5oJX{HkiFhEX^XupL}_Nj9^Sq?Ae<QIZ|9M`Ssq(Vw=uxa=D{QnXvEWSWlsJ+
+zj*<6uFoTLYJ+vxNENi)qKfS=)jeL6khm72+@!Gt12Biz8QpS4GgWwN!>FXHi!tkQ7
+zS?(bmMv)SJ=1+)pM3?zx=>CM8PgWGi3D1qa=ee!D*Kq3ze54S#tNt`+hux15gPr$n
+z#oX6Mkj!W>MXE!mVUEuaWuaqu@a!2F042<nP|LOstekWDHz`OzhwleDjz{N3`d0;8
+zLuucLarI}|a|<-F-y$=h@nqBxQr-$${tV8?zk_7~<~k<PIwf(>XZL`|=ptC>TAIjI
+zqAd7?A~;5RjgkVZ=T}nLGTK39KsDoFlc2tUVqzr}DB?9AQL(oM5~`fUPW0P+`H{^*
+zR59A(K0);I?oA!lm{s@K0+Hv>Zb@mlj5(JGmz2QdUSW&BNt&Fnb*U#M;Y^gCLCoXi
+zRjo+{!Bj=DUGoa8;u2JAu5X(Ulp-%p-I_!K5iTTjKE}t(%UQ?QEoT`Z;(G9)`4=W8
+zokeW8ZctXW!TdCkcwL@1@ik3Kmc_vZA@Jf<TjM+~5-#Z<+Ir^}?<H9)iEoNE6523x
+zlqB^8aV`A0U^#~s3HK;b^+}P&{&YF;bP{t?^AOB$&!uRN8oGY3dKR1|lwcCE0nW4r
+zfBj~D-29DM$UotvB^`oQmiC-n8LB8^*`}Vzb+$_&?~{0DJL8*w7Z<=$qks<QPk9xF
+zT*1;V8r@h-I4ec0?Ed-O6O!p>%s~OzHq~m1FlcSI=|zBB_=E9TaMrv@aPw^2l#oH@
+zur3r4Pva32HP|P7ah_*sm2ppO;O}hCWLT0^lw*i`Hgl_!DzrS^R_>AcNUBKtUTKRI
+zFckxy#f;&81?K$$b8{Ly`n`Hz3_=p&|5OIDO9D3Lc#z$*sd!3_<#*-dZck$QAPP<7
+z+Th$^Lp4foIp817<`zn+<X^o?9j+Y}Gdh$fy_LARulDKgp*6*NV;$2)S<R{xJAN*r
+zpf$ekYPB##QZB?DaXgb-WR1)klH0oz*$x$d#tVrr5)rp3SgmNm!_qF(b%=sS36<V(
+zieb-p0-|qdCk0#-yJdNWa?ygjXv-d=7)Ih1@hl2E;Kt8>u2x+1NX*lTPEb>&qRf6O
+zHXc|lZZEQElBAlUJ3P=A_+4}$LT8r@S>M}Etl9U+Exg<%&iXf;rNa2FI}Q1CrzeHi
+zy|iu?Ek7uV2Fw74P&AXOn3Q;5dI?(k)R{@<SJL_Dt;FJn!k<@O{J$9s=q3@>cl>O)
+zYzMrwhnr%zMZLS?Tehc2B}iyIXtwia7DKo>#PVXhA1qp7bA~ZB=nF-l^K|`v`Rsr&
+zsv_(gWbvvv5kqxPsG>n*xy1vaXL_8(Tz(Vwl_AT~5G2`}n>exNgmRCAHXdnK7YuI#
+z#)XfC(X@Lh2$pq52zEa?_D6sJkN~L&KiU#tf`48zkzKENi>At`%rwe-b+|zJtJd~S
+zk^$g(>@Zq3wfe)s+WHe56H#}$JyT~^FW=J|#vO`0LIhg$H!mNUOSi+$E5Z&N-5V~Y
+z2u@6lD?NyS2oFgT`;{=q+;xGM3j{SA+}_c~o~W16c6S)r?*_Z0cU?Ye#$O_L=|6YL
+z$BQK3M3)lKNa~y<sX4bfkud(GPfGKR4g(}UJC+jMpWfE?5oEMVTWGV{a6OcQJtDz$
+z>EP8A*ky(F_WG+Z^u%DiZIsXu_KMo`siY9p70zQ54q9mrWJ4QHlBqbDqw!V@o9VE#
+zsN((6%M-*=v-+Pm?&$)G10*>6^=H&n6|v$tr7M?LU#M_tpw&h5Z^bcko5`;{QsIcv
+ze_FnRbq*_aP_WqI0L9eSDs3@G^<)lYeXwNXni_<iur7R<j@e%L^oo~)sceSmsdpoe
+z@cwo$;!&crYD&w{6rRhIukFa)YA%jAC<t~{D^;WGm7<92?iEprMyv`K*wgzy$~f{?
+zl~`rTB>cAfbteBL5R70Wf|j1{l)HVnu<=tlPJ+xSQii)nd?opw)fUX4TR}+Vc$oeW
+zCqLz+)FLo4c#72eaqC`Wjt&PaSr#`lpIc>G$N+TRsjwLdNBYvDg|i<Eo<K<Fr)`;G
+zpjxWfaXC((1=m@G;OsOh&gP$1^h7IFL3b}p4*d=%v;FbIiDSEM{a4oP0kf%H2HKqs
+zBJ`oC`~?Yd9zG<OZj7C^;zdv0hlQv=E}o+O!FN1OrM^;S+-IO}g<NbMHQSS&!Ctk*
+zWs3r<sCjGAKSkV3t|?Oh(^5a;t<xz*99faLsu1uj#gwK>`$wsGaY)i`Z<!Wo?&|VS
+z8s;+C{h5P8cAIC)dUGvkWXJ;ZSEqFZIX7kQX0r~M@Gfx;Ie30nAMBolCfl-Z$5r8~
+zPaTV~87iUg&w;u`fJ6ElKcr(Yn{Lt$!k_6?B&`+BR#q<DW3v^l?A3IU<gT=9I=nE^
+zPOXAKi34a<T^o`0#Z8-=eK6=)hV66$N<*@2a`Wjx^y;JWG|Qj?1ZG<FWL>6m_a4BJ
+zTo3rvYtNq+?$O>1U~tXebwmah2c4X7+ClQ9HLggtI1{g?lO|4w1@5m95tduh7*p)#
+zaj&D>xT>AAqpoceL9uk*aX!S{kk5+2V?VKSRK!T&_}1NERrn`f@xx&(GNPBTLHYO?
+zF>*_;R24xSSt~vZWyKeP={@T3p@%qu`ta9Ic`ge_C(G1U8rRS|bH$kcd7qC7<w?&8
+zh3OXcG(&9^XlRIJMf^Hv<`n!Sfpb)U4|JT8>yoX^v+}(Ok_5@1gYE{bxioa5>{3#z
+zw>mw&9*>w&a;s@q8R(N;gXWXT#Xt*$ezjgsmC_u`#>-uE@1%hN>=0g}lzWotT8;ei
+zVp5(?Oj^L^P;Fkqymjs|0D=)qWAENQS`@ekV6GgiA$Ox~oA>P?SrlpoQf<ny%tz&O
+z;)v>;M8RM`)RY!19gQm>MM_@7d3)ga>h8mJ%d*SxjBXyq#B=!N>p1cZrxp=zi9?em
+z^kF+bGR~9eJ0KK{8;y?>O@{&%D2%}NlO~sCEx7b7jOP-ljx{T1H1{j}H>pX3>CY0!
+zm#O2{p_A`!cgMBIL<`A8mJ6^kU#5@qU1{E&_zH#sDT-t%vn2?ZAxVVRs<?~o5TmnK
+zN{JfJRS!kiyYbH&Y~M);p&vd07F+%NUbbweka=>X&1FoqEy1)l9_?k7F=e?8x(tPT
+z@_meSeYogCPraC%&}6|*zOF*-3%MK7WTh89xgb;0mS|b$xhGwHF`@odM`S(>Oj!>)
+z&i$EYn8HabL1nO)3?wiQs$cTkGxFL|gu}f@B%<2*Q(Q7iWQ}{=hI^rwT>*;;N{rQF
+zsmo1Z0(HZs`W8tEk)1>{AVu@^G-d;Deb%zFD}sGU5avqk4S9ynDh26gK2Z}>NkR)T
+zAO)^+No;Tq-Kw*%$^qsGFTI?lElRyVkm5f6JkMIg!-?FN$9N%Fqhcvqu!NP@5By<$
+zpL-$dEe=6889CeR^yb72o1T*LqtreryYBOr`+<VDHA2I$b?2`#EU1}NZL=pz$}1%h
+zslwJ0*HN#v7G@?Qn<rxA*HNX0HbBlLkFW`t6upiXSL61|%mb<x86JkJYA!H2*@doY
+zJ@#o2SU4*gsE-_Tz{Bw}E%<I>Mw3MXY>`ORs#AZePcRL-5iFogruJZXHhxV1<s<m5
+zZ1OANC+FsG!d!lpYUeIp-a5Nd6<3Bkag1>HNQo)dS$?%LDcP)}PF>Nl3JhyDOQPYT
+zjd%$|)^C0Jatb<F#YXe9X7S5rHTw3cB4b@Osykt+t=YE=ai!q{6IZlXnRUfXR4>^^
+zPBC!<(Hycfn8SMYI0)3X)HZ@&JDNGpp;(^*Px}o_L?BGh+Ixi5;yDu%Do!2iP@-h~
+zOi6ZaRF=+!`0iD<x+DD$^s7Z*bSW0Py-vvEGnJ)M{zB$I1Ad9yFYK05%7Okhs!fxq
+z>XQe}VkZ1AL6T?!;zEk}!uXGe5ray|JBxIvX0p`Gq0c*f<?j0uQIuaW?o{3VxgHXL
+zk@vc-BaT#gHfCR>Uc%Q1;Zh#D>{9dBnJZA(6`WZbc8f}u-SDKl9pk}Sv3(^rX%Wp2
+z0-LNX1{+TyVOdlz+{nf{eeK_Ix710zRCtQ$qO@10G-IvOQ;Pio2h6;LE|f@4Lvh)p
+zGAY`wX3wWD5GyD)c8tn8%5HuXfm1A9)V2JK1Q_U{fcjS>-Nv{TkuBJLXuH&0xqdm(
+zb)VRbn3?w#m6AON$wK37qWo~pX_J4SurmcETy+t5!Q}Ich9q&ltpS2oq4z0RSZ`X6
+zYPl?qibQPi(qVRMqnH%;#%gZm!svpA0%NsV&Yccx!uXDyuOQ79hAh9-$y%m6VamfO
+z4xKGjs39l!4W)m2p;OLl)J^VDagyk7t*>hKUqR6`Hc_Q!wN}bBGD4>RE}G^1eLp~g
+zE&(FFreaI5ilAb}hv(u7aT5iSBi#=!NC|f*3c~)e&H}Qw9h!Qc9dd;y>=T`U^~gH%
+zg-`7O<NW6A&T)*Q8aHisbi2fpw0IR0?T5j7ipqY}z~F8zb_Bm{E}M8-$D&R}sy+k2
+zi)9|W+To24a}qCWW~Hp>5U!jHTJq$E$pTm_N|m4D>s0V-AkSiyfXNfsO2bJkY5x+s
+z@L5|7mKTscx=s{`p2l#<N><jpDp3;?oYTrH8BL>H$@&?iBpw<q7gR`9#v`)NpGtqQ
+zeNb*CKUVf*-04S^bfu46uEBEphUG(JS+Rx{)p`-i+tm6u{ylChlXx#pYjsjb!$*M3
+zr}AbDI40@~1s~EhCJ35x$wj?FPGs85y{<iEx$(j}C8j9_YKT&{IJi~@GwwPg*-gmS
+zkK!0?+(yJucT@y^U!@C3jU)uI<Z2F9@kY}4;Sh|BW~NOI4`9%T&-~;Vt`g2X6Le%k
+z6^)h&t+`U8{)$AlN!d@$e!aFo<BdQ~<ffSIrclE`1?clXoagz4c9&7r6?+#c63k{?
+zCsX;$#SnqQpeO@M;|`5%AL|q{ww3;d)B)2mpxN7`Z~v_iFq~+x?A<W>d{P6&8#6*B
+zTq8vK^IsfJ>qUl3K}r?Tpc}E)Tq{K*u2-ej0e*n{wX!^exf9bWkXU6Utk65ALo{$j
+zoNp(iCZ$;E-i7`XGx&8@;QE}>bPQy+t(f3IMS9Ex<SQ!%kp0GyJUdk|j2NUK)z2cd
+z*&te!@b`uw35EpDyHOAl3$G=y#0P>&uQ^7X99a79#!o(~{<ZjjcA&ChcfiSo3^6R&
+zRr2$dYC2#^Akh6wHi%b;XD&TUIqFLbV!Vi9hhb}ezVXP@Vo8ee@8>7D;*($ugG|?I
+z+Y-=RNzJa+^*UqE#b%(C*&NTwfn;@ryGwimVBM__R3r)c67BG@mwNyHG1eYrL-JmS
+zeE@RT!m0S%kAP46fbxs(fTJUPamQIuiAmVW4L0b_ra_4<kY#r~PM`hjdj{FCxXT{z
+zW{_5ChWiFrGBFygSQ;2<^5i%Y^j~w8eBxCoNY1O0CAT+L61ES5D=>FM1e8ltf5+#t
+zyi$^{*UTC?se%Bg|BFL%!WkMOyvTv4*S%w3W1IL2g3ern2o>aG34-eK%gyXZfoHwr
+zy8r7KY{qmaz!pT<|I{N#dIzl;)b5#aXQQRJ;U`EStkO7p9*7ON4G5KrP2y7pm?Git
+zi%A$qK7Vi)ffY6c5s(E)*!_HJ_c)N_Zs=@S5C|Yhn6y%4Pvi`^jlr0DKuHYm74pu1
+zeu9`|fPmV>mg8e@@}v0Q_kzs8fTTk~0YQ_07zffCvYmQS3)B?E@VZi=4E>uZmh7hp
+z2XlehMi|TaC*Ey*Vhoc{63`h8kaR3mTkK4UfT`BYMT`H;f0sfJgFr-i*mmTiwZOU~
+zW9+P+2sp5nwMywB;PKsVaDp7z-E(n_mlec7Gry(b#7BYVN!R!l^&SPpxHsd%{sa%Z
+z6ys(A{R5D7Q2{NF;q88bG4HqzSMj&Ndy#`|dQoE?HlW;TlO@4}hRC6;FY{NHBt(W1
+zvc*<xe$0MR<LEXp+gXD`@lj`aWe`&7EBohz{Gu~gPB_p<K;1+q;MfhMpaU`rj_&v3
+z?M}eL;InF6S?|3Wm`b$kS?PY?A5Xek)t!H%<Na6jCG5@)<o%BhymU8<N|J=X7nS}C
+s;{OzZ<Ny7?K>pt_{(s2D&h0no;CX(KtH}H!$iE^jE-zLsVi@>;0N;%18~^|S
+
+diff --git a/iphone/doc/ZBarImage.rst b/iphone/doc/ZBarImage.rst
+new file mode 100644
+--- /dev/null
++++ b/iphone/doc/ZBarImage.rst
+@@ -0,0 +1,150 @@
++ZBarImage Class Reference
++=========================
++
++.. class:: ZBarImage
++
++   :Inherits from: :class:`NSObject`
++
++   A :class:`ZBarImage` is a wrapper for images passed to the barcode reader.
++   It encapsulates raw image data with the format and size metadata necessary
++   to interpret it.
++
++   An image must be wrapped in a :class:`ZBarImage` in order to be scanned by
++   the library.  At least the format, size and data must be set.  There are
++   also initialization methods for automatically extracting the data and
++   format from a `CGImage`.
++
++   This class is a wrapper around a :type:`zbar_image_t` C object (q.v.)
++
++
++Properties
++----------
++
++   .. member:: unsigned long format
++
++      The image format four-charcter code (fourcc) as a 4-byte integer.  Use
++      :ref:`fourcc:` to create a fourcc value from a string.
++
++   .. member:: unsigned sequence
++
++      A "sequence number" associated with the image.  This reference value is
++      unused by the library.
++
++   .. member:: CGSize size
++
++      The size of the image in pixels.
++
++      .. note::
++
++         There is no separate "bytesPerLine" property, the width must match
++         the image data (which is not always the logical image width).
++
++   .. member:: CGRect crop
++
++      Optionally limit the scan region to this rectangle without having to
++      generate a cropped image.
++
++   .. member:: const void *data
++
++      Obtain a pointer to the raw image data.  This property is read-only, use
++      :ref:`setData:withLength:` to set the image data.
++
++   .. member:: unsigned long dataLength
++
++      Byte length of the raw image data.  This property is read-only, use 
++      :ref:`setData:withLength:` to set the image data.
++
++   .. member:: ZBarSymbolSet *symbols
++
++      Barcode results from the last scan.
++
++   .. member:: zbar_image_t *zbarImage
++
++      Retrieve the underlying C object instance. (read-only)
++
++   .. member:: UIImage *UIImage
++
++      Convert the image to a UIImage.  Only certain image formats are
++      supported for conversion (read-only)
++
++      :See also: :ref:`UIImageWithOrientation:`
++
++
++Class Methods
++-------------
++
++   .. _`fourcc:`:
++   .. describe:: + (unsigned long) fourcc:(NSString*)format
++
++      Parse the integer four-character code from a string.  Alternatively use
++      the :func:`zbar_fourcc` macro to create a constant expression.
++
++      :format: A four character string representing an image format.
++      :Returns: The corresponding 4-byte integer format code.
++
++
++Instance Methods
++----------------
++
++   .. _`initWithImage:`:
++   .. describe:: - (id) initWithImage:(zbar_image_t*)image
++
++      Initialize an image wrapper, given the C object to wrap.
++
++      :image: The C object to wrap.
++      :Returns: The initialized :class:`ZBarImage`.
++
++   .. _`initWithCGImage:`:
++   .. describe:: - (id) initWithCGImage:(CGImageRef)image
++
++      Initialize a :class:`ZBarImage` from the data and metadata extracted
++      from a `CGImage`.  The image is converted to `Y800` (grayscale) format.
++
++      :image: A `CGImage` to source the data and metadata.
++      :Returns: The initialized :class:`ZBarImage`.
++      :See also: :ref:`initWithCGImage:size:`
++
++   .. _`initWithCGImage:size:`:
++   .. describe:: - (id) initWithCGImage:(CGImageRef)image size:(CGSize)size
++
++      Initialize a :class:`ZBarImage` from the data and metadata extracted
++      from a `CGImage`.  The image is converted to `Y800` (grayscale) format
++      and scaled to the specified size.
++
++      :image: A `CGImage` to source the data and metadata.
++      :size: The pixel size of the resulting ZBarImage.
++      :Returns: The initialized :class:`ZBarImage`.
++      :See also: :ref:`initWithCGImage:crop:size:`
++
++   .. _`initWithCGImage:crop:size:`:
++   .. describe:: - (id) initWithCGImage:(CGImageRef)image crop:(CGRect)crop size:(CGSize)size
++
++      Initialize a :class:`ZBarImage` from the data and metadata extracted
++      from a `CGImage`.  The image is simultaneously converted to `Y800`
++      (grayscale) format, cropped and scaled to the specified size.
++
++      :image: A `CGImage` to source the data and metadata.
++      :crop: The region to convert, in image coordinates.
++      :size: The pixel size of the resulting ZBarImage.
++      :Returns: The initialized :class:`ZBarImage`.
++
++   .. _`setData:withLength:`:
++   .. describe:: - (void) setData:(const void*)data withLength:(unsigned long)length
++
++      Specify a pointer to the raw image data, for the image format and size.
++      The length of the data must also be provided.  Note that the data must
++      remain valid as long as the image has a reference to it.  Set data to
++      ``NULL`` to clear a previous reference.
++
++      :data: A pointer to a raw image data buffer.
++      :length: The size of the image data buffer.
++
++   .. _`UIImageWithOrientation:`:
++   .. describe:: - (UIImage*) UIImageWithOrientation:(UIImageOrientation)orient
++
++      Convert the image to a UIImage with the specified orientation.  Only
++      certain image formats are supported for conversion.  (currently
++      ``RGB3``, ``RGB4``, ``RGBQ``)
++
++      :orient: Desired orientation of the image.
++      :Returns: A new :class:`UIImage`, or ``nil`` in case of error.
+diff --git a/iphone/doc/ZBarImageScanner.rst b/iphone/doc/ZBarImageScanner.rst
+new file mode 100644
+--- /dev/null
++++ b/iphone/doc/ZBarImageScanner.rst
+@@ -0,0 +1,99 @@
++ZBarImageScanner Class Reference
++================================
++
++.. class:: ZBarImageScanner
++
++   :Inherits from: :class:`NSObject`
++
++   This is a low-level interface for programmatically scanning images without
++   a user interface.  If you want to scan images manually selected by the user
++   (from the photo library or using the camera), you may prefer to use a
++   :class:`ZBarReaderController` instead.
++
++   This class is a wrapper around a :type:`zbar_image_scanner_t` C object
++   (q.v.)
++
++
++Properties
++----------
++
++   .. member:: BOOL enableCache
++
++      Enable the inter-frame consistency cache.  Set to ``YES`` for scanning
++      video or ``NO`` for scanning images.
++
++   .. member:: ZBarSymbolSet results
++
++      Decoded symbols resulting from the last scan.
++
++
++Instance Methods
++----------------
++
++   .. _`parseConfig:`:
++   .. describe:: - (void) parseConfig:(NSString*)config
++
++      Apply scanner/decoder configuration parsed from a string.
++
++      :config: A configuration setting of the form: `symbology.config[=value]`.
++
++   .. _`setSymbology:config:to:`:
++   .. describe:: - (void) setSymbology:(zbar_symbol_type_t)symbology config:(zbar_config_t)config to:(int)value
++
++      Apply generic scanner/decoder configuration.
++
++      :symbology: The symbology to effect, or 0 for all.
++      :config: The configuration setting to adjust.
++      :value: The value to set for the specific configuration/symbology.
++
++   .. _`scanImage:`:
++   .. describe:: - (NSInteger) scanImage:(ZBarImage*)image
++
++      Scan an image for barcodes using the current configuration.  The image
++      must be in ``Y800`` format (8-bpp graysale).
++
++      :image: The :class:`ZBarImage` to scan.
++      :Returns: The number of barcode symbols decoded in the image.
++
++
++Constants
++---------
++
++.. type:: zbar_config_t
++
++   ZBAR_CFG_ENABLE
++      Control whether specific symbologies will be recognized.  Disabling
++      unused symbologies improves performance and prevents bad scans.
++
++   ZBAR_CFG_EMIT_CHECK
++      Whether to include the check digit in the result data string.  This
++      value may be set individually for symbologies where it makes sense.
++
++   ZBAR_CFG_MIN_LEN
++      The minimum data length for a symbol to be valid, set to 0 to disable.
++      Use with eg, I2/5 to avoid short scans.  This value may be set
++      individually for variable-length symbologies.
++
++   ZBAR_CFG_MAX_LEN
++      The maximum data length for which a symbol is valid, set to 0 to
++      disable.  Use with eg, I2/5 to enforce a specific range of data lengths.
++      This value may be set individually for variable-length symbologies.
++
++   ZBAR_CFG_UNCERTAINTY
++      Number of "nearby" frames that must contain a symbol before it will be
++      considered valid.  This value may be set for individual symbologies.
++
++   ZBAR_CFG_POSITION
++      Whether to track position information.  
++
++   ZBAR_CFG_X_DENSITY
++      The stride to use for scanning vertical columns of the image.  This many
++      pixel columns will be skipped between vertical scan passes.  Useful for
++      trading off between resolution and performance.  This is a scanner
++      setting (use 0 for the symbology).
++
++   ZBAR_CFG_Y_DENSITY
++      The stride to use for scanning horizontal columns of the image.  This
++      many pixel rows will be skipped between horizontal scan passes.  Useful
++      for trading off between resolution and performance.  This is a scanner
++      setting (use 0 for the symbology).
+diff --git a/iphone/doc/ZBarReaderController.rst b/iphone/doc/ZBarReaderController.rst
+new file mode 100644
+--- /dev/null
++++ b/iphone/doc/ZBarReaderController.rst
+@@ -0,0 +1,156 @@
++ZBarReaderController Class Reference
++====================================
++
++.. class:: ZBarReaderController
++
++   :Inherits from: :class:`UIImagePickerController`
++
++   This is the controller to use for scanning images selected by a
++   :class:`UIImagePickerController` either captured manually using the camera,
++   or selected from the Photo Library.  For more information, see
++   :doc:`picker`.
++
++   It can support automatic capture from the camera only if the library is
++   re-built to use private APIs (see :doc:`compat`).
++
++
++Properties
++----------
++
++   .. member:: ZBarImageScanner *scanner
++
++      Access to the image scanner for configuration. (read-only)
++
++   .. member:: id<ZBarReaderDelegate> readerDelegate
++
++      The delegate that will be notified when new barcode results are
++      available.
++
++   .. member:: BOOL showsZBarControls
++
++      Whether to display a default control set consisting of cancel, scan and
++      info buttons.  Disable these if you provide your own controls using the
++      :member:`cameraOverlayView`.  Enabling this automatically disables the
++      system controls :member:`showsCameraControls`.  (Default ``YES``).
++
++   .. member:: BOOL showsHelpOnFail
++
++      Whether to automatically display the integrated help viewer when an
++      image fails to decode.  Even if this is disabled, the integrated help
++      may still be presented manually using ``showHelpWithReason:``.
++      (Default ``YES``)
++
++   .. member:: ZBarReaderControllerCameraMode cameraMode
++
++      Scanning mode to use with the camera.  It is generally appropriate to
++      leave this at the default.
++
++   .. member:: BOOL tracksSymbols
++
++      Whether to display the tracking rectangle around detected barcodes.
++
++   .. member:: BOOL takesPicture
++
++      Whether to take a full picture (with ``takePicture``) when a barcode
++      is detected with ``ZBarReaderControllerCameraModeSampling``.  The
++      resulting image will be delayed from the actual decode.
++
++   .. member:: BOOL enableCache
++
++      This property is deprecated and should not be modified.
++
++   .. member:: CGRect scanCrop
++
++      Crop images before scanning.  The original image will be cropped to this
++      rectangle, which should be in normalized image coordinates, x-axis
++      major.  Defaults to the full image ``{{0, 0}, {1, 1}}``.
++
++   .. member:: NSInteger maxScanDimension
++
++      Scale image to scan.  After cropping, the image will be scaled if
++      necessary, such that neither of its dimensions exceed this value.
++      Defaults to 640.
++
++   .. note::
++
++      The remaining properties are inherited from
++      :class:`UIImagePickerController`.
++
++   .. member:: UIImagePickerControllerSourceType sourceType
++
++      Image source.  Use to select between the camera and photo library.
++
++   .. member:: BOOL showsCameraControls
++
++      Whether to display the system camera controls.  Overridden to ``NO``
++      when :member:`showsZBarControls` is ``YES``.
++
++   .. member:: UIView *cameraOverlayView
++
++      A custom view to display over the camera preview.  The tracking layer
++      and default controls will be added to this view if they are enabled.
++
++   .. member:: CGAffineTransform cameraViewTransform
++
++      A transform to apply to the camera preview.  Ignored by the reader.
++      Possibly useful for eg, a digital zoom effect.
++
++   .. member:: BOOL allowsEditing
++
++      Whether to enable the system image editing dialog after a picture is
++      taken.  Possibly useful to improve reader results in some cases using
++      manual intervention.
++
++
++Instance Methods
++----------------
++
++   .. _`showHelpWithReason:`:
++   .. describe:: - (void) showHelpWithReason:(NSString*)reason
++
++      Display the integrated help browser.  Use this with custom overlays if
++      you don't also want to create your own help view.  Should only be called
++      when the reader is displayed.  The ``reason`` argument will be passed to
++      the :func:`onZBarHelp` javascript function.
++
++      :reason: A string parameter passed to javascript.
++
++   .. _`scanImage:`:
++   .. describe:: - (id <NSFastEnumeration>) scanImage:(CGImageRef)image
++
++      Scan an image for barcodes.  This is a wrapper around
++      ``scanner.scanImage`` that applies scanCrop and maxScanDimension.  Some
++      additional result filtering is also performed.
++
++      :image: A :class:`CGImage` to scan.
++      :Returns: The result set containing :class:`ZBarSymbol` objects.
++
++
++Constants
++---------
++
++.. type:: ZBarReaderControllerCameraMode
++
++   The scanning mode to use with the camera.
++
++   ZBarReaderControllerCameraModeDefault
++      The standard mode provided by UIImagePickerController - the user
++      manually captures an image by tapping a control.  This is the default
++      unless private APIs are enabled.
++
++   ZBarReaderControllerCameraModeSampling
++      Automatically capture by taking screenshots with
++      :func:`UIGetScreenImage`.  Resolution is limited to the screen
++      resolution, so this mode is inappropriate for longer codes.  Only
++      available when private APIs are enabled, and becomes the default mode in
++      that case.
++
++   ZBarReaderControllerCameraModeSequence
++      Experimental mode that automatically scans by "rapidly" scanning
++      pictures captured with ``takePicture``.  Not recommended for serious
++      use.
++
++.. c:var:: NSString *ZBarReaderControllerResults
++
++   The info dictionary key used to return decode results to
++   ``imagePickerController:didFinishPickingMediaWithInfo:``
+diff --git a/iphone/doc/ZBarReaderDelegate.rst b/iphone/doc/ZBarReaderDelegate.rst
+new file mode 100644
+--- /dev/null
++++ b/iphone/doc/ZBarReaderDelegate.rst
+@@ -0,0 +1,70 @@
++ZBarReaderDelegate Protocol Reference
++=====================================
++
++.. class:: ZBarReaderDelegate
++
++   :Inherits from: :class:`UIImagePickerControllerDelegate`
++
++   This protocol must be implemented by the
++   :member:`~ZBarReaderViewController::readerDelegate` provided to a
++   :class:`ZBarReaderViewController` or :class:`ZBarReaderController`.  It is
++   used to notify the delegate of new decode results, when an image fails to
++   decode, or when the user dismisses the reader with the built-in controls.
++
++
++Instance Methods
++----------------
++
++   .. describe:: - (void) imagePickerController:(UIImagePickerController*)picker didFinishPickingMediaWithInfo:(NSDictionary*)info
++
++      This inherited delegate method is called when a barcode is successfully
++      decoded.  The decoded symbols are available from the dictionary as a
++      :class:`ZBarSymbolSet` using the :c:data:`ZBarReaderControllerResults`
++      key.  The image from which the barcodes were scanned is available using
++      the :c:data:`UIImagePickerControllerOriginalImage` key.  No other keys
++      are guaranteed to be valid.
++
++      .. note::
++
++         The ``picker`` parameter will be the reader controller instance that
++         read the barcodes - not necessarily a
++         :class:`UIImagePickerController` instance.  You should cast it to the
++         correct type for anything other than basic view controller access.
++
++      :picker: The reader controller that scanned the barcode(s).
++      :info: A dictionary containing the image and decode results.
++
++   .. describe:: - (void) imagePickerControllerDidCancel:(UIImagePickerController*)picker
++
++      Called when the user taps the "Cancel" button provided by the built-in
++      controls (when :member:`showsZBarControls`\ ``=YES``).  The default
++      implementation dismisses the reader.  If this method is implemented, it
++      should do the same.
++
++      .. note::
++
++         The ``picker`` parameter will be the reader controller instance that
++         read the barcodes - not necessarily a
++         :class:`UIImagePickerController` instance.  You should cast it to the
++         correct type for anything other than basic view controller access.
++
++      :picker: The reader controller that scanned the barcode(s).
++
++   .. describe:: - (void) readerControllerDidFailToRead:(ZBarReaderController*)reader withRetry:(BOOL)retry
++
++      Called when an image, manually captured or selected from the photo
++      library, is scanned and no barcodes were detected.
++
++      If the ``retry`` parameter is ``NO``, the controller must be dismissed
++      before this method returns.  Otherwise, another scan may be attempted
++      without re-presenting the controller.
++
++      If the :member:`~ZBarReaderController::showsHelpOnFail` is ``YES`` *and*
++      ``retry`` is ``YES``, the integrated help viewer will already be
++      presenting.
++
++      If this method is not implemented, the controller will be dismissed iff
++      ``retry`` is ``NO``.
++
++      :reader: The :class:`ZBarReaderController` that scanned the barcode(s).
++      :retry: Whether another scan may be attempted.
+diff --git a/iphone/doc/ZBarReaderView.rst b/iphone/doc/ZBarReaderView.rst
+new file mode 100644
+--- /dev/null
++++ b/iphone/doc/ZBarReaderView.rst
+@@ -0,0 +1,104 @@
++ZBarReaderView Class Reference
++==============================
++
++.. class:: ZBarReaderView
++
++   :Inherits from: :class:`UIView`
++
++   This is a barcode reader encapsulted in a UIView.  It manages an
++   :class:`AVCaptureSession` with a camera device and a
++   :class:`ZBarCaptureReader`, presents the video preview and optionally
++   tracks detected barcode symbols.  A delegate will usually be assigned for
++   notification of new decode results.
++
++
++Properties
++----------
++
++   .. member:: id<ZBarReaderViewDelegate> readerDelegate
++
++      The delegate that will be notified of new decode results.
++
++   .. member:: ZBarImageScanner *scanner
++
++      Access to the image scanner is provided for configuration. (read-only)
++
++   .. member:: BOOL tracksSymbols
++
++      Whether to display the tracking annotation (default ``YES``).
++
++   .. member:: BOOL allowsPinchZoom
++
++      Enable pinch gesture recognition for manually zooming the preview/decode
++      (default ``YES``).
++
++   .. member:: NSInteger torchMode
++
++      An :type:`AVCaptureTorchMode` value that will be applied if/when
++      appropriate.  (default Auto)
++
++   .. member:: BOOL showsFPS
++
++      Overlay the decode frame rate on the preview to help with performance
++      optimization.  This is for *debug only* and should not be set for
++      production.  (default ``NO``)
++
++   .. member:: CGFloat zoom
++
++      Zoom scale factor applied to the video preview *and* scanCrop.  This
++      value is also updated by the pinch-zoom gesture.  Valid values are in
++      the range [1,2].  (default 1.25)
++
++   .. member:: CGRect scanCrop
++
++      The region of the video image that will be scanned, in normalized image
++      coordinates.  Note that the video image is in landscape mode (default
++      {{0, 0}, {1, 1}})
++
++   .. member:: CGAffineTransform previewTransform
++
++      Additional transform that will be applied to the video preview.  Note
++      that this transform is *not* applied to scanCrop.
++
++   .. member:: AVCaptureDevice *device
++
++      The capture device may be manipulated or replaced.
++
++   .. member:: AVCaptureSession *session
++
++      Direct access to the capture session.  Warranty void if opened.
++      (read-only)
++
++   .. member:: ZBarCaptureReader *captureReader
++
++      Direct access to the capture reader.  Warranty void if opened.
++      (read-only)
++
++   .. member:: BOOL enableCache
++
++      :Deprecated:
++
++      Whether to use the inter-frame consistency cache.  This should always be
++      set to ``YES``.
++
++
++Instance Methods
++----------------
++
++   .. describe:: - (id) initWithImageScanner:(ZBarImageScanner*)imageScanner
++
++      :imageScanner: A pre-configured :class:`ZBarImageScanner` to use for scanning
++      :Returns: The initialized :class:`ZBarReaderView`
++
++   .. describe:: - (void) start
++
++      Begin/resume scanning after a call to ``stop``.
++
++   .. describe:: - (void) stop
++
++      Stop scanning and pause the video feed.
++
++   .. describe:: - (void) flushCache
++
++      Flush the inter-frame consistency cache.  Any barcodes in the frame will
++      be re-recognized in subsequent frames.
+diff --git a/iphone/doc/ZBarReaderViewController.rst b/iphone/doc/ZBarReaderViewController.rst
+new file mode 100644
+--- /dev/null
++++ b/iphone/doc/ZBarReaderViewController.rst
+@@ -0,0 +1,128 @@
++ZBarReaderViewController Class Reference
++========================================
++
++.. class:: ZBarReaderViewController
++
++   :Inherits from: :class:`UIViewController`
++
++   This is the controller to use for live scanning from the camera feed with
++   automatic capture.  For scanning from image files or with manual capture,
++   see :class:`ZBarReaderController`.
++
++
++Properties
++----------
++
++   .. member:: ZBarImageScanner *scanner
++
++      Access to the image scanner for configuration. (read-only)
++
++   .. member:: id <ZBarReaderDelegate> readerDelegate
++
++      The delegate that will be notified when new barcode results are
++      available.
++
++   .. member:: BOOL showsZBarControls
++
++      Whether to display a default control set consisting of cancel, scan and
++      info buttons.  Disable these if you provide your own controls using the
++      :member:`cameraOverlayView`.  (Default ``YES``).
++
++   .. member:: BOOL tracksSymbols
++
++      Whether to display the tracking rectangle around detected barcodes.
++
++   .. member:: CGRect scanCrop
++
++      Crop images before scanning.  The original image will be cropped to this
++      rectangle, which should be in normalized image coordinates (NB the
++      camera image x-axis is *vertical* on the screen).  Defaults to the full
++      image ``{{0, 0}, {1, 1}}``.
++
++   .. member:: UIView *cameraOverlayView
++
++      A custom view to display over the camera preview.
++
++   .. member:: CGAffineTransform cameraViewTransform
++
++      A transform to apply to the camera preview.  Ignored by the reader.
++
++   .. member:: ZBarReaderView *readerView
++
++      View that presents the camera preview and performs the scanning.  This
++      view has other properties you may use to control the appearance and
++      behavior of the reader.
++
++      Note that this view may be released when it is not displayed (eg, under
++      low memory conditions).  You should apply any configuration just before
++      you present the reader.
++
++   .. member:: BOOL enableCache
++
++      This property is deprecated and should not be modified.
++
++   .. warning::
++
++      The remaining properties are deprecated, they are only present for
++      backward compatibility with :class:`ZBarReaderController` and will raise
++      an exception if inappropriate/unsupported values are set.
++
++   .. member:: UIImagePickerControllerSourceType sourceType
++
++      Raises an exception if anything other than
++      ``UIImagePickerControllerSourceTypeCamera`` is set.  If you want to scan
++      images, use a :class:`ZBarReaderController` instead of this class.
++
++   .. member:: BOOL allowsEditing
++
++      Raises an exception if anything other than ``NO`` is set.
++
++   .. member:: BOOL showsCameraControls
++
++      Raises an exception if anything other than ``NO`` is set.  Use
++      :member:`showsZBarControls` to disable the buit-in overlay.
++
++   .. member:: BOOL showsHelpOnFail
++
++      Any value set to this property is ignored.  It is only useful for
++      scanning images, for which you should use :class:`ZBarReaderController`.
++
++   .. member:: ZBarReaderControllerCameraMode cameraMode
++
++      This reader only supports scanning from the camera feed.  If you want to
++      scan manually captured images, use a :class:`ZBarReaderController`
++      instead of this class.
++
++   .. member:: BOOL takesPicture
++
++      Raises an exception if anything other than ``NO`` is set.  This
++      controller automatically returns the scanned camera frame and does not
++      support capturing a separate image.
++
++   .. member:: NSInteger maxScanDimension
++
++      Any value set to this property is ignored.  It is only useful for
++      scanning images, for which you should use :class:`ZBarReaderController`.
++
++
++Class Methods
++-------------
++
++   .. describe:: + (BOOL) isSourceTypeAvailable:(UIImagePickerControllerSourceType)source
++
++      Returns ``YES`` only if ``source`` is ``Camera`` and the
++      :class:`UImagePickerController` method of the same name also returns
++      ``YES``.
++
++Instance Methods
++----------------
++
++   .. _`showHelpWithReason:`:
++   .. describe:: - (void) showHelpWithReason:(NSString*)reason
++
++      Display the integrated help browser.  Use this with custom overlays if
++      you don't also want to create your own help view.  Should only be called
++      when the reader is displayed.  The ``reason`` argument will be passed to
++      the :func:`onZBarHelp` javascript function.
++
++      :reason: A string parameter passed to javascript.
+diff --git a/iphone/doc/ZBarReaderViewDelegate.rst b/iphone/doc/ZBarReaderViewDelegate.rst
+new file mode 100644
+--- /dev/null
++++ b/iphone/doc/ZBarReaderViewDelegate.rst
+@@ -0,0 +1,26 @@
++ZBarReaderViewDelegate Protocol Reference
++=========================================
++
++.. class:: ZBarReaderViewDelegate
++
++   :Inherits from: :class:`NSObject`
++
++   This protocol, which must be implemented by the `readerDelegate` provided
++   to a :class:`ZBarReaderView`, is used to notify the delegate of new decode
++   results.
++
++
++Instance Methods
++----------------
++
++   .. describe:: - (void) readerView:(ZBarReaderView*)readerView didReadSymbols:(ZBarSymbolSet*)symbols fromImage:(UIImage*)image
++
++      Called to notify the delegate of new decode results.
++
++      Note that the referenced image is a proxy for a video buffer that is
++      asynchronously being converted to a :class:`UIImage`, attempting to
++      access the data will block until the conversion is complete.
++
++      :readerView: :class:`ZBarReaderView` that scanned the barcode(s).
++      :symbols: :class:`ZBarSymbolSet` containing the decode results.
++      :image: :class:`UIImage` from which the barcode(s) were scanned.
+diff --git a/iphone/doc/ZBarSymbol.rst b/iphone/doc/ZBarSymbol.rst
+new file mode 100644
+--- /dev/null
++++ b/iphone/doc/ZBarSymbol.rst
+@@ -0,0 +1,166 @@
++ZBarSymbol Class Reference
++==========================
++
++.. class:: ZBarSymbol
++
++   :Inherits from: :class:`NSObject`
++
++   A symbol wraps all of the information the library has about a decoded
++   barcode.  Use the available properties to retrieve the barcode data, the
++   symbology (type of barcode), location and more.
++
++   This class is a simple wrapper around a :type:`zbar_symbol_t` C object
++   (q.v.)
++
++
++Properties
++----------
++
++   .. member:: zbar_symbol_type_t type
++
++      The type of symbology that was decoded. (read-only)
++
++   .. member:: NSString *typeName
++
++      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)
++
++   .. member:: int quality
++
++      A relative metric indicating rough confidence in the decoded value.
++      Larger values are better than smaller values. (read-only)
++
++   .. member:: zbar_orientation_t orientation
++
++      The general, axis-aligned orientation of the symbol, or
++      ZBAR_ORIENT_UNKNOWN if unknown. (read-only)
++
++   .. member:: ZBarSymbolSet *components
++
++      The components of a composite symbol. (read-only)
++
++   .. member:: const zbar_symbol_t *zbarSymbol
++
++      Retrieve the underlying C object instance. (read-only)
++
++   .. member:: CGRect bounds
++
++      Calculate a rough bounding box for the symbol. (read-only)
++
++      .. note::
++
++         Coordinates are relative to the image *data*, which may not match a
++         displayed UIImage.  Make sure to account for the UIImage orientation
++         when using these values.
++
++
++Class Methods
++-------------
++
++   .. _`nameForType:`:
++   .. describe:: + (NSString*) nameForType:(zbar_symbol_type_t)type
++
++      Retrieve the canonical name for a symbology used by the library, given
++      its enumerated value.
++
++      :type: The :type:`zbar_symbol_type_t` enumerated symbology value.
++      :Returns: A short string name for the symbology.
++
++
++Instance Methods
++----------------
++
++   .. _`initWithSymbol:`:
++   .. describe:: - (id) initWithSymbol:(const zbar_symbol_t*)symbol
++
++      Initialize a symbol wrapper, given the C object to wrap.
++
++      :symbol: The C object to wrap.
++      :Returns: The initialized symbol, or nil if an error occurred.
++
++
++Constants
++---------
++
++.. type:: zbar_symbol_type_t
++
++   Symbology identifiers.
++
++   ZBAR_NONE
++      No symbol was decoded.
++
++   ZBAR_PARTIAL
++      Intermediate status.
++
++   ZBAR_EAN8
++      EAN-8
++
++   ZBAR_UPCE
++      UPC-E
++
++   ZBAR_ISBN10
++      ISBN-10, converted from EAN-13
++
++   ZBAR_UPCA
++      UPC-A
++
++   ZBAR_EAN13
++      EAN-13
++
++   ZBAR_ISBN13
++      ISBN-13, converted from EAN-13
++
++   ZBAR_I25
++      Interleaved 2 of 5
++
++   ZBAR_DATABAR
++      GS1 DataBar (RSS)
++
++   ZBAR_DATABAR_EXP
++      GS1 DataBar Expanded
++
++   ZBAR_CODE39
++      Code 39 (3 of 9)
++
++   ZBAR_QRCODE
++      QR Code
++
++   ZBAR_CODE128
++      Code 128
++
++.. type:: zbar_orientation_t
++
++   The coarse orientation of a symbol.
++
++   .. note::
++
++      Orientation is relative to the image *data*, which may not match a
++      displayed UIImage.  Make sure to account for the UIImage orientation
++      when using these values.
++
++   ZBAR_ORIENT_UNKNOWN
++      Unable to determine orientation.
++
++   ZBAR_ORIENT_UP
++      Upright, read left to right
++
++   ZBAR_ORIENT_RIGHT
++      Sideways, read top to bottom
++
++   ZBAR_ORIENT_DOWN
++      Upside-down, read right to left
++
++   ZBAR_ORIENT_LEFT
++      Sideways, read bottom to top
+diff --git a/iphone/doc/ZBarSymbolSet.rst b/iphone/doc/ZBarSymbolSet.rst
+new file mode 100644
+--- /dev/null
++++ b/iphone/doc/ZBarSymbolSet.rst
+@@ -0,0 +1,43 @@
++ZBarSymbolSet Class Reference
++=============================
++
++.. class:: ZBarSymbolSet
++
++   :Inherits from: :class:`NSObject`
++   :Conforms to: :class:`NSFastEnumeration`
++
++   A symbol set is a simple container for the symbols scanned from an image.
++   It supports :class:`NSFastEnumeration`, and not much else...  Use it to
++   iterate through the :class:`ZBarSymbol` objects in a decode result set::
++
++      ZBarSymbolSet *symbols = image.symbols;
++      for(ZBarSymbol *symbol in symbols) {
++          // process result
++      }
++
++   This class is a simple wrapper around a :type:`zbar_symbol_set_t` C object
++   (q.v.)
++
++
++Properties
++----------
++
++   .. member:: int count
++
++      The number of symbols in the set. (read-only)
++
++   .. member:: const zbar_symbol_set_t *zbarSymbolSet
++
++      Retrieve the underlying C object instance. (read-only)
++
++
++Instance Methods
++----------------
++
++   .. _`initWithSymbolSet:`:
++   .. describe:: - (id) initWithSymbolSet:(const zbar_symbol_set_t*)set
++
++      Initialize a symbol set wrapper, given the C object to wrap.
++
++      :set: The C object to wrap.
++      :Returns: The initialized symbol set, or nil if an error occurred.
+diff --git a/iphone/doc/apiref.rst b/iphone/doc/apiref.rst
+new file mode 100644
+--- /dev/null
++++ b/iphone/doc/apiref.rst
+@@ -0,0 +1,16 @@
++*******************
++   API Reference
++*******************
++
++.. toctree::
++   :maxdepth: 1
++
++   ZBarImage
++   ZBarImageScanner
++   ZBarReaderController
++   ZBarReaderDelegate
++   ZBarReaderView
++   ZBarReaderViewController
++   ZBarReaderViewDelegate
++   ZBarSymbol
++   ZBarSymbolSet
+diff --git a/iphone/doc/camera.rst b/iphone/doc/camera.rst
+new file mode 100644
+--- /dev/null
++++ b/iphone/doc/camera.rst
+@@ -0,0 +1,129 @@
++Scanning From the Camera Feed
++=============================
++
++Many iPhone developers want their application to support automatic recognition
++of barcodes from the camera feed in real-time.  ZBar makes this easy!
++
++There are three levels that you may choose to integrate at, from least complex
++(recommended) to most complex these are:
++
++* Use the fully integrated view controller - this is very easy to implement
++  and is the recommended approach.
++* Use the reader view with your own controller - this is not recommended, it
++  does not give you much more flexibility than using the full controller.
++* Use the capture component with your own AVCapture session - this is not
++  supported and only provided for advanced developers with special needs who
++  are already familiar with AVCapture.
++
++
++Using a ZBarReaderViewController
++--------------------------------
++
++This is the fastest, easiest and recommend way to get the barcode reader into
++your application.  It is also the only way to support :doc:`automatic fallback
++for iOS 3.1 <compat>`.  The procedure is the same as using a
++UIImagePickerController to take a picture with the camera, so it will help if
++you are familiar with that.  Basically you:
++
++1. Create the reader.
++
++   This is as simple as creating a new :class:`ZBarReaderViewController`::
++
++      ZBarReaderViewController *reader = [ZBarReaderViewController new];
++
++2. Setup a delegate to receive the results.
++
++   The delegate should implement the :class:`ZBarReaderDelegate` protocol,
++   which inherits from :class:`UIImagePickerControllerDelegate`::
++
++      reader.readerDelegate = self;
++
++3. Configure the reader.
++
++   Aside from the properties of the reader itself, you can configure the
++   decoder via the :member:`~ZBarReaderViewController::scanner` property and
++   further customize the view via the
++   :member:`~ZBarReaderViewController::readerView` property::
++
++      [reader.scanner setSymbology: ZBAR_QRCODE
++                      config: ZBAR_CFG_ENABLE
++                      to: 0];
++      reader.readerView.zoom = 1.0;
++
++   See :doc:`custom` and :doc:`optimizing` for more details.
++
++4. Present the reader to the user.
++
++   Typically the controller is presented modally, although the new controller
++   does not require it (note that modal presentation is the only option if you
++   want to support :doc:`iOS 3.1 fallback <compat>`)::
++
++      [self presentModalViewController: reader
++            animated: YES];
++
++5. Process the results.
++
++   The controller will call the
++   :member:`imagePickerController:didFinishPickingMediaWithInfo:` method of
++   your delegate every time new results become available.  The barcode data
++   can be obtained using the :c:data:`ZBarReaderControllerResults` key of the
++   info dictionary.  This key will return "something enumerable"; keep in mind
++   that there may be multiple results.  You may also retrieve the
++   corresponding image with :c:data:`UIImagePickerControllerOriginalImage` as
++   usual::
++
++      - (void) imagePickerController: (UIImagePickerController*) reader
++       didFinishPickingMediaWithInfo: (NSDictionary*) info
++      {
++          id<NSFastEnumeration> results =
++              [info objectForKey: ZBarReaderControllerResults];
++          UIImage *image =
++              [info objectForKey: UIImagePickerControllerOriginalImage];
++          ...
++
++   The ``reader`` parameter will be the actual type of the reader (not
++   necessarily a :class:`UIImagePickerController`).
++
++   .. note::
++
++      The delegate method should queue the interface response and return as
++      soon as possible; any processing of the results should be deferred until
++      later, otherwise the user will experience unacceptable latency between
++      the actual scan completion and the visual interface feedback.
++
++6. Dismiss the reader (or not).
++
++   Once you have the results you may dismiss the reader::
++
++      [reader dismissModalViewControllerAnimated: YES];
++
++   .. warning::
++
++      It is very important to dismiss from the *reader* (not the presenting
++      controller) to avoid corrupting the interface.
++
++   Alternatively, you may choose to continue scanning and provide visual
++   feedback another way (eg, maybe by updating your custom overlay with the
++   results).  The "continuous" mode of the readertest example does this.
++
++
++Using a ZBarReaderView
++----------------------
++
++:class:`ZBarReaderViewController` is a relatively thin wrapper around a
++:class:`ZBarReaderView`; it is possible to use the view directly.  You will
++lose the automatic fallback for iOS 3.1 and some of the simulator hooks, so
++this approach is not currently recommended (or well tested).
++
++
++Using the ZBarCaptureReader
++---------------------------
++
++If you have special requirements for the capture session or just want to use
++your own preview, you can add your own :class:`ZBarCaptureReader` to your
++session.  You must have a solid understanding of the AVCapture infrastructure
++if you plan to use this approach.
++
++.. admonition:: TBD
++
++   sorry, you're on your own here - UTSL  :)
+diff --git a/iphone/doc/compat.rst b/iphone/doc/compat.rst
+new file mode 100644
+--- /dev/null
++++ b/iphone/doc/compat.rst
+@@ -0,0 +1,183 @@
++Backward Compatibility
++======================
++
++Generally speaking, we take great care to ensure that each release of the
++library is backward compatible with previous versions - upgrading the library
++should not require any changes to your code and will continue to provide
++equivalent functionality.  The notable exception to this is the iOS 4 upgrade
++and associated "deprecation" of the former automatic capture method by our
++vendor.
++
++
++The Private API
++---------------
++
++The API that we use for automatic capture with iOS 3.x (namely
++:func:`UIGetScreenImage`) has an interesting history.  It has changed status
++several times, starting with "Private, unless we like you" moving to
++"reluctantly Public but undocumeted" by popular demand and reverting to
++"strictly Private" as of iOS 4.  The current story: if you want to distribute
++on the App Store, you had better not be using it - IOW, no automatic capture
++for you with iOS 3.x.
++
++Since App Store distribution is the most common use for the library, the
++default configuration, and thus the binary SDK, does *not* use any private
++APIs.
++
++Users targeting ad-hoc or enterprise distribution may not care about the
++status of the API and may prefer to continue supporting automatic capture for
++iOS 3.x.  To do this you will need to rebuild the library with the following
++define set for all configurations:
++
++.. sourcecode:: sh
++
++   USE_PRIVATE_APIS=1
++
++For reference, you can check whether your app refers to the offensive function
++with this command:
++
++.. sourcecode:: sh
++
++   $ otool -vI MyApp.app/MyApp | grep UIGetScreenImage
++
++If there is any output, then the executable includes the private API and is
++bound to be rejected if submitted for review.  Otherwise it is "clean" as far
++as this library is concerned.
++
++
++Upgrading to iOS 4
++------------------
++
++If you were using the reader before iOS 4 was introduced, you will want to
++upgrade to the new reader controller.  The performance has improved quite a
++bit, and you can continue to support automatic capture on the App Store.
++
++.. note::
++
++   This discussion only applies to automatic capture from the camera.  If you
++   are only scanning image files, or prefer/need to use manual capture, you
++   should not change anything.
++
++Basically just replace your old :class:`ZBarReaderController` with a new
++:class:`ZBarReaderViewController` and you're done!  See the reference and the
++next section for compatibility between the two classes.
++
++Also see the :doc:`install` instructions for details about upgrading the
++header references to use the SDK.
++
++
++Supporting iOS 3.x
++------------------
++
++The new :class:`ZBarReaderViewController` is intentionally designed to be
++compatible with the old :class:`ZBarReaderController` in most aspects that
++relate to reading barcodes.  When a :class:`ZBarReaderViewController` is
++initialized under iOS 3.x, it will *replace* itself with a
++:class:`ZBarReaderController`.  You can leverage the compatibility of these
++controllers to continue supporting iOS 3.x.
++
++The following properties and methods should be equivalent across
++implementations.  You may use them without regard for the actual instance
++type.
++
++========================================================  ====
++Equivalent Members
++========================================================  ====
++:member:`~ZBarReaderViewController::cameraOverlayView`
++:member:`~ZBarReaderViewController::cameraViewTransform`
++:member:`~ZBarReaderViewController::enableCache`
++:member:`~ZBarReaderViewController::scanner`
++:member:`~ZBarReaderViewController::readerDelegate`
++:member:`~ZBarReaderViewController::scanCrop`
++``showHelpWithReason:``
++:member:`~ZBarReaderViewController::showsZBarControls`
++:member:`~ZBarReaderViewController::tracksSymbols`
++========================================================  ====
++
++Some properties are available with :class:`ZBarReaderViewController` only for
++backward compatibility.  If these are configured, they must be set as
++indicated; attempts to set another value will raise an exception.
++
++====================================================  =======================================
++:class:`ZBarReaderController` Property                :class:`ZBarReaderViewController` Value
++====================================================  =======================================
++:member:`~ZBarReaderController::allowsEditing`        ``NO``
++:member:`~ZBarReaderController::cameraMode`           ``Sampling``
++:member:`~ZBarReaderController::maxScanDimension`     (ignored)
++:member:`~ZBarReaderController::showsCameraControls`  ``NO``
++:member:`~ZBarReaderController::showsHelpOnFail`      (ignored)
++:member:`~ZBarReaderController::sourceType`           ``Camera``
++:member:`~ZBarReaderController::takesPicture`         ``NO``
++====================================================  =======================================
++
++Also, the ``isSourceTypeAvailable:`` class method of
++:class:`ZBarReaderViewController` will return ``YES`` only for the ``Camera``
++source.
++
++All other members of :class:`ZBarReaderController`, including those inherited
++from :class:`UIImagePickerController` are not supported by
++:class:`ZBarReaderViewController`.  This includes ``takePicture`` and
++``scanImage:``, among others.
++
++Remaining members of :class:`ZBarReaderViewController`: are only available
++with the new implementation.  At the moment this is only
++:member:`~ZBarReaderViewController::readerView`, but any new properties or
++methods not listed here will also fall in this category.
++
++To access settings that may not be available in a potential fallback
++environment, you must verify that they exist and may be set as desired - eg,
++by testing the specific reader subtype.
++
++Weak Linking
++^^^^^^^^^^^^
++
++When leveraging fallbacks to iOS 3.x, it is important that features introduced
++in iOS 4 are referenced using *weak* links.  You must configure your project
++correctly to support this:
++
++* Make sure the iOS 4 frameworks are set to *Weak*.  Specifically, these are
++  AVCapture, CoreMedia and CoreVideo.
++
++* Build with the latest SDK - do *not* use the "Base SDK" setting to target
++  earlier devices.
++
++* Set the correct iOS 3.x version for the "iPhone OS Deployment Target"
++  build setting.
++
++
++Example: Fallback to Manual Capture
++-----------------------------------
++
++This code example will configure the reader for automatic capture from the
++camera for iOS 4 and fall back to manual or automatic capture for iOS 3.x,
++depending on whether the library was compiled to use private APIs::
++
++   if(![ZBarReaderController isSourceTypeAvailable:
++                                 UIImagePickerControllerSoureTypeCamera]) {
++       // camera unavailable: display warning and abort
++       // or resort to keypad entry, etc...
++       return;
++   }
++   
++   ZBarReaderViewController *reader = [ZBarReaderViewController new];
++   // reader will be a ZBarReaderController for iOS 3.x
++   // or a ZBarReaderViewController for iOS 4
++   
++   reader.readerDelegate = self;
++   reader.sourceType = UIImagePickerControllerSoureTypeCamera;
++   reader.showsZBarControls = YES;
++   
++   if(reader.cameraMode == ZBarReaderControllerCameraModeSampling) {
++       // additional automatic capture configuration here
++   }
++   else {
++       // additional manual capture configuration here
++   }
++   
++   [self presentModalViewController: reader
++         animated: YES];
++
++If you are using a custom control set
++(:member:`~ZBarReaderViewController::showsZBarControls`\ ``=NO``), you will
++want to provide a button attached to ``takePicture`` for the manual capture
++case.  The built-in controls do this automatically.
+diff --git a/iphone/doc/conf.py b/iphone/doc/conf.py
+new file mode 100644
+--- /dev/null
++++ b/iphone/doc/conf.py
+@@ -0,0 +1,77 @@
++import sys, os
++from plistlib import readPlist
++
++# General configuration
++
++extensions = []
++templates_path = ['ext']
++source_suffix = '.rst'
++master_doc = 'index'
++exclude_patterns = ['.#*']
++
++project = u'ZBar iPhone SDK'
++copyright = u'2010, Jeff Brown et al'
++
++today_fmt = '%Y-%m-%d'
++info = readPlist('../res/ZBarSDK-Info.plist')
++version = 'X.Y'
++if info:
++    version = info['CFBundleVersion']
++release = version
++
++#add_module_names = False
++
++pygments_style = 'sphinx'
++highlight_language = 'objc'
++primary_domain = 'cpp'
++
++# Options for HTML output
++
++html_theme = 'default'
++html_theme_options = {
++    'bgcolor': 'white',
++    'textcolor': 'black',
++    'linkcolor': '#247',
++    'headbgcolor': '#edeff0',
++    'headtextcolor': '#247',
++    'headlinkcolor': '#c11',
++    'sidebarbgcolor': '#247',
++    'sidebartextcolor': 'white',
++    'sidebarlinkcolor': '#cde',
++    'relbarbgcolor': '#247',
++    'relbartextcolor': '#ccc',
++    'relbarlinkcolor': 'white',
++    'footerbgcolor': 'white',
++    'footertextcolor': 'black',
++    'codebgcolor': '#dfe',
++    'codetextcolor': 'black',
++}
++
++html_short_title = 'ZBarSDK ' + version
++html_title = 'ZBar iPhone SDK Documentation'
++html_static_path = ['static']
++html_favicon = '../../zbar.ico'
++html_style = 'style.css'
++html_use_modindex = False
++html_use_index = False
++html_copy_source = False
++html_show_sourcelink = False
++htmlhelp_basename = 'doc'
++
++# Options for LaTeX output
++
++latex_paper_size = 'letter'
++latex_font_size = '10pt'
++
++# Grouping the document tree into LaTeX files. List of tuples
++# (source start file, target name, title, author, documentclass [howto/manual])
++latex_documents = [
++  ('index', 'ZBarSDK.tex', u'ZBar iPhone SDK Documentation',
++   u'Jeff Brown', 'manual'),
++]
++
++#latex_logo = ''
++#latex_use_parts = False
++#latex_preamble = ''
++#latex_appendices = []
++#latex_use_modindex = False
+diff --git a/iphone/doc/custom.rst b/iphone/doc/custom.rst
+new file mode 100644
+--- /dev/null
++++ b/iphone/doc/custom.rst
+@@ -0,0 +1,72 @@
++Customizing the Interface
++=========================
++
++The reader supports customization of the camera overlay and the integrated
++help that is displayed.
++
++
++Customizing the Overlay
++-----------------------
++
++If you are scanning with the camera, whether using a
++:class:`ZBarReaderViewController` for automatic capture or manually with
++:class:`ZBarReaderController`, you may want to customize the appearance of the
++reader.  You do this mainly by setting a
++:member:`~ZBarReaderViewController::cameraOverlayView`.
++
++Note that if you are scanning images from the photo library, there is no
++customization - you are limited to the system picker interface provided by the
++:class:`UIImagePickerController`.
++
++If you are using a :class:`ZBarReaderViewController`, are *only* planning to
++support iOS 4 and just want to add to the existing controls, you can simply
++set your overlay to include the additional view hierarchy::
++
++   reader.cameraOverlayView = myLogoImageView;
++
++Otherwise, if you are using a :class:`ZBarReaderController`, still need the
++iOS 3.1 fallback or prefer to completely replace the default controls, you
++should disable those first.  Note that you will need to provide your own
++controls, which should at least include a way to dismiss the reader::
++
++   reader.showsCameraControls = NO;  // for UIImagePickerController
++   reader.showsZBarControls = NO;
++   reader.cameraOverlayView = myControlView;
++
++For manual capture with :class:`ZBarReaderController`, you should also include
++a control connected to :member:`~ZBarReaderController::takePicture`.
++
++See :doc:`compat` for more information about iOS 3.1 fallbacks.
++
++In either case, the overlay view may be loaded from a NIB, or simply created
++programmatically.
++
++You can also disable the tracking rectangle that highlights barcodes with
++:member:`~ZBarReaderViewController::tracksSymbols`.
++
++
++Presenting Help
++---------------
++
++If you have set ``showsZBarControls = NO`` and replaced the default controls,
++you may still present the built-in help viewer.  Just hook your custom control
++to the ``showsHelpWithReason:`` method of the controller.  You should only
++call this method when the reader is actually presented.
++
++The default reader controls invoke ``showsHelpWithReason:`` with a reason
++parameter of ``"INFO"`` when the info button is tapped.
++
++
++Customizing the Help Content
++----------------------------
++
++Whether you use the default controls or provide your own, you can still
++customize the content of the help that is displayed.  The integrated viewer
++uses a UIWebView to display the contents of :file:`zbar-help.html` that we
++copied into your Resources.  You should hack this up as you see fit to give
++your users the best help experience.
++
++To allow for runtime customization based on the reason for presenting help,
++the javascript function ``onZBarHelp`` will be called just before the page is
++displayed, with the ``reason`` argument set as provided to
++``showsHelpWithReason:``.
+diff --git a/iphone/doc/devguide.rst b/iphone/doc/devguide.rst
+new file mode 100644
+--- /dev/null
++++ b/iphone/doc/devguide.rst
+@@ -0,0 +1,13 @@
++***********************
++   Developer's Guide
++***********************
++
++.. toctree::
++   :maxdepth: 2
++
++   camera
++   picker
++   custom
++   optimizing
++   compat
++   licensing
+diff --git a/iphone/doc/faq.rst b/iphone/doc/faq.rst
+new file mode 100644
+--- /dev/null
++++ b/iphone/doc/faq.rst
+@@ -0,0 +1,113 @@
++Frequently Asked Questions (FAQ)
++================================
++
++This is the ever-growing list of answers to commonly asked questions.  Please
++feel free to post you question in our `iPhone Developers forum`_ if you do not
++find the information you need in this documentation.
++
++.. _`iPhone Developers Forum`:
++   http://sourceforge.net/projects/zbar/forums/forum/1072195
++
++
++General
++-------
++
++This looks great...  Where can I get it?
++   You can download the latest version of the SDK from
++   http://zbar.sf.net/iphone
++
++
++Compatibility
++-------------
++
++Which iPhone devices does this library support?
++   The library works *only* with the iPhone 3GS and iPhone 4.
++
++Will you make it work with the iPhone 3G?
++   *No* - the 3G it is not supported and is unlikely to ever be supported.
++
++   To be fair, you *can* use the 3G to scan image files, as long as they're in
++   focus (ie, *not* images taken by the built-in fixed-focus camera).  There
++   is at least one application that found a use for this...
++
++What target iOS versions does this library work with?
++   iOS 4 is fully supported, including the latest video streaming interfaces.
++   Since Apple has dropped support for earlier versions of iOS on the App
++   Store, we recommend that you target only iOS 4 for reading barcodes.
++
++   iOS 3.1 is also supported, but you will have to resort to manual capture if
++   you intend to distribute on the App Store.
++
++   The library should work all the way back to iOS 3.0, although we no longer
++   test with it.  For most cases we recommend you use at least iOS 3.1, which
++   introduced several must-have enhancements for the UIImagePickerController
++   (ie, :member:`~ZBarReaderController::cameraOverlayView` and ``takePicture``)
++
++   In all cases you will need at least a 4.0 SDK to build.
++
++   See :doc:`compat` for details about iOS version fallbacks.
++
++Are any private APIs in use?
++   No - the binary release of the SDK does not use any private APIs.
++
++   OTOH, if you do not care about private APIs (for instance, you are
++   targeting AdHoc or enterprise distribution) and you want to enable
++   automatic capture with iOS 3.1, you can build a version that uses
++   UIGetScreenImage (which is again a private API).
++
++   See :doc:`compat` for details.
++
++Does this support "automatic" barcode capture?
++   Yes - if you use iOS 4, the default configuration will capture barcodes
++   automatically from the video stream.
++
++   Again, automatic capture is no longer supported with iOS 3.1 for apps
++   distributed on the App Store.
++
++
++Building
++--------
++
++I get "Undefined symbols" errors when I try to build?
++   Most likely you did not add all of the necessary framework dependencies.
++   See :doc:`tutorial` or :doc:`install` for the list of frameworks you need
++   to link against.
++
++
++Licensing
++---------
++
++Please refer to :doc:`licensing` for questions about licensing.
++
++
++Barcodes
++--------
++
++Why do my UPC barcodes have an extra 0 at the front?
++   The UPC-A_ symbology is the subset of EAN-13_ that starts with a leading 0.
++   The ZBar decoder enables only EAN-13_ by default, so GTIN-13_ product codes
++   are consistently reported.  You can choose to receive the 12-digit results
++   instead by explicitly enabling UPC-A_.
++
++   The :member:`~ZBarSymbol::type` property of the symbol can be used to see
++   which type of barcode is reported.
++
++   See EAN-13_ and UPC-A_ for more information.
++
++Why does my UPC-E (short version) barcode data look completely wrong?
++   UPC-E_ is a "zero compressed" version of UPC-A_; certain of the zeros are
++   removed from the UPC-A_ data to generate the UPC-E_ barcode.  The ZBar
++   decoder *expands* this compression by default, again to consistently report
++   GTIN-13_ product codes.  You can choose to receive the compressed 8-digit
++   results instead by explicitly enabling UPC-E_.
++
++   The :member:`~ZBarSymbol::type` property of the symbol can be used to see
++   which type of barcode is reported.
++
++   See UPC-E_ for more information.
++
++.. _GTIN-13:
++.. _GTIN: http://wikipedia.org/wiki/GTIN
++.. _EAN-13: http://wikipedia.org/wiki/EAN-13
++.. _UPC-A: http://wikipedia.org/wiki/UPC-A
++.. _UPC-E: http://wikipedia.org/wiki/UPC-E#Zero-compressed_UPC-E
+diff --git a/iphone/doc/getstarted.rst b/iphone/doc/getstarted.rst
+new file mode 100644
+--- /dev/null
++++ b/iphone/doc/getstarted.rst
+@@ -0,0 +1,12 @@
++*********************
++   Getting Started
++*********************
++
++.. toctree::
++   :maxdepth: 2
++   :numbered:
++
++   install
++   tutorial
++   faq
++   support
+diff --git a/iphone/doc/index.rst b/iphone/doc/index.rst
+new file mode 100644
+--- /dev/null
++++ b/iphone/doc/index.rst
+@@ -0,0 +1,20 @@
++###################
++  ZBar iPhone SDK
++###################
++
++Welcome to the ZBar SDK for iPhone!
++
++This documentation covers all aspects of developing with the SDK: from adding
++the SDK to your project, to writing code that uses it, even licensing the
++library with your app.
++
++Please let us know if you find anything inaccurate or lacking (even better,
++send doc patches!)
++
++.. toctree::
++   :maxdepth: 2
++   :numbered:
++
++   getstarted
++   devguide
++   apiref
+diff --git a/iphone/doc/install.rst b/iphone/doc/install.rst
+new file mode 100644
+--- /dev/null
++++ b/iphone/doc/install.rst
+@@ -0,0 +1,135 @@
++Installing the SDK
++==================
++
++These are the basic instructions for obtaining the SDK and adding it to an
++Xcode project.
++
++You may want to try things out with the :doc:`tutorial` before hacking at your
++own project.
++
++
++Requirements
++------------
++
++You will need *all* of the following to develop iPhone applications
++using this SDK:
++
++* Mac OS X >= 10.6.x (Snow Leopard)
++* Xcode >= 3.2.3
++* iPhone SDK >= 4.0
++* An iPhone 3GS or iPhone 4
++* iOS >= 3.1 running on the device (>= 4.0 is preferred)
++
++.. warning::
++
++   *Only* the iPhone 3GS and iPhone 4 are supported, as they have a camera
++   with auto-focus.  The ZBar library does not support the iPhone 3G and is
++   unlikely to ever support it.
++
++
++Downloading
++-----------
++
++Download the latest binary release of the ZBar SDK from
++
++http://zbar.sourceforge.net/iphone
++
++
++Integration
++-----------
++
++The recommended installation method is to simply copy the SDK into your
++Xcode project:
++
++1. Open ZBarSDK-|version|.dmg in the Finder.
++
++2. Drag the :file:`ZBarSDK` folder into your Xcode project.  In the dialog
++   that appears, you should choose to **copy** the SDK into your project by
++   checking the box.  The target that you want to link with the library should
++   also be selected in the target list.
++
++4. Link the following additional frameworks to any targets that link with the
++   ZBarSDK.  You should set the first three to use weak references and
++   configure an appropriate deployment target if you still need to support
++   iOS 3.1:
++
++   * :file:`AVFoundation.framework` (weak)
++   * :file:`CoreMedia.framework` (weak)
++   * :file:`CoreVideo.framework` (weak)
++   * :file:`QuartzCore.framework`
++   * :file:`libiconv.dylib`
++
++   If you check "Link Binary With Libraries" for the target(s), you should see
++   all of these frameworks along with :file:`libzbar.a`.
++
++5. Import the SDK header from your prefix header to make the barcode reader
++   APIs available::
++
++      #import "ZBarSDK.h"
++
++Proceed to :doc:`camera` or :doc:`picker` to learn about using the reader APIs
++to scan barcodes.  Use the :doc:`apiref` for specific interface details.
++
++
++Upgrading from an Older Version
++-------------------------------
++
++If you are using an older version of the *SDK* (NB, skip to the next section
++if you are currently using Mercurial), upgrading is straightforward:
++
++1. Delete the current ZBarSDK group from your project.  You should choose
++   to delete the files if you copied them into your project.
++2. Drag the new ZBarSDK from the DMG into your project.
++
++Clean out and rebuild your project with the new version.
++
++
++Upgrading a Pre-SDK Integration
++-------------------------------
++
++If your project was using the library directly from the Mercurial repository,
++before the SDK was introduced, there are a few incompatibilities that
++you must resolve in order to upgrade.  Don't worry - all of you source stays
++the same, you just need to update how the library is included in the project
++and how the headers are imported.
++
++Switching to the Binary Distribution
++^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
++
++This approach is recommended - the binary releases provide you with a stable
++development platform, isolating you from temporary instability and transient
++problems that may occur at the bleeding edge.
++
++The first task is to reverse the previous ZBar integration:
++
++1. Remove the reference to zbar.xcodeproj from your project.
++2. Remove any :file:`zbar-*` files from your Resources.
++3. In the target build settings, remove any "Header Search Paths" that
++   reference zbar.
++4. Remove any references to zbar headers in your :file:`prefix.pch` or source
++   files.
++
++Now just continue with the `integration`_ instructions above and you should be
++back up and running!
++
++Continuing with Mercurial
++^^^^^^^^^^^^^^^^^^^^^^^^^
++
++Alternatively, you may still prefer to select Mercurial revisions.  You have a
++few choices for this:
++
++* You may build your own ZBarSDK and copy/link it into your project.  This is
++  the same as `Switching to the Binary Distribution`_, except that you use
++  your own version of the SDK.  In this case you need to manually rebuild the
++  SDK when you update it.
++* You may leave zbar.xcodeproj as a project dependency and pull the SDK into
++  your project.  This is not well tested, so ymmv.
++* You may leave zbar.xcodeproj as a project dependency and just link libzbar.a
++  into your project, as before.  You will need to update the target dependency
++  (the library target changed names to libzbar) and add the
++  :file:`iphone/include/ZBarSDK` directory to "Header Search Paths"
++
++In any case, you should remove the references to the zbar headers from
++:file:`prefix.pch` (or your source files) and replace them with::
++
++   #import "ZBarSDK.h"
+diff --git a/iphone/doc/licensing.rst b/iphone/doc/licensing.rst
+new file mode 100644
+--- /dev/null
++++ b/iphone/doc/licensing.rst
+@@ -0,0 +1,187 @@
++Licensing the Library
++=====================
++
++First of all, the big disclaimer:
++
++.. warning::
++
++   We are *not* lawyers; we cannot help you decide if you should use the
++   library or how to apply the license, only your lawyer can advise you
++   concerning legal matters.
++
++That said, it should also be noted that we have neither the resources (time,
++cash, etc) nor the patience to enforce the license (at all); the reality is
++that all of this is left to your discretion.
++
++If you prefer to leave the lawyers out of it, the rest of this section will
++help you apply the license to your application.
++
++
++Licensing FAQ
++-------------
++
++Can I use this library with my proprietary (closed source) application?
++   Yes, that is our intent and we do not believe there is any problem
++   regarding the license.
++
++Will I need to open source my entire app?
++    No, it is not required by the license.
++
++Will I need to distribute all of my "object files" on the App Store?
++    No, this is also not required by the license, although you should offer to
++    provide them upon request.  See below for more detail.
++
++But I read somewhere that "iPhone apps may not use LGPL code"?
++   That statement is an over-generalization that does not apply in this case.
++   Most likely your source is either:
++
++   * referring to the GPL, which is significantly different from the
++     *L*\ GPL
++   * referring to a different version of the LGPL; we intentionally use
++     version 2.1, which has specific static linking exceptions.
++   * not a lawyer either and too lazy to read the whole license
++
++   Basically, if you leverage the appropriate sections of the license, it
++   should be fully compatible with the App Store restrictions and
++   requirements.
++
++This is too complicated, can I just pay for an easier license?
++   No, it is not possible.  There are multiple problems with this approach,
++   some brief highlights:
++
++   * Most open source projects (including this one) do not have a single
++     author.  Tracking down every contributor and getting their approval could
++     be quite a challenge.
++   * The license is meant to protect users' rights to the software.  Giving
++     you special treatment bypasses the protection we offered them,
++     effectively revoking their rights.  This would be a violation of their
++     trust and completely defeats the purpose of the license.
++
++   You may think of this as the "price" you pay for using our open source
++   library.  If you want to make your life easier, you should be petitioning
++   Apple for shared library support...
++
++What if you add a clause that lets me do whatever I want?
++   No, also not possible.  In addition to the problems mentioned above, there
++   are even more problems with this:
++
++   * Sourceforge requires an OSI approved license for hosting our project;
++     an altered license would no longer be approved.
++   * Again we are not lawyers and therefore not qualified to change the
++     license, we would have to pay one of those slimy buggers to do it.
++
++Do I need to add an "about" dialog to display your copyright/license?
++   No, not as such.  We won't discourage you from plugging the library if you
++   like, but it is not a requirement.  You should think of our license as a
++   supplement to your own software license, therefore it is appropriate to
++   display it where (and only where) you display your own:
++
++   * If you follow Apple's recommendation, the App Store is the only place
++     that the user accesses your license, so it should also be the only place
++     where the library supplement is available.
++   * If your app already has some kind of "about" view that displays your
++     copyright/license information, it is also appropriate to display the same
++     information for the library.
++
++Do I need to include the entire library in my application bundle?
++   No, it is not necessary:
++
++   * If you have not modified the library, it is sufficient to provide a link
++     to the project and the version information.
++   * If you are using a modified version, you may provide a link to download
++     that instead of including it in the bundle.
++
++
++Modifications
++-------------
++
++What is a "modification"?  Again, we leave it to your discretion with this
++guidance:
++
++* If you use the distributed binary SDK you have certainly not modified the
++  library.
++* If you are working from Mercurial, *any* change you have made to the
++  "source code" of the library is a modification, it does not matter how
++  trivial.  You can see what changes have been made by running
++  ``hg status -mard``; if this command outputs anything, you have modified
++  the library.
++
++If you find that you have made changes to the library, you should carefully
++consider how far you want to proceed down that path.  Once you publish your
++changes you have created a "fork" of the project which you now need to
++maintain.  Are you prepared to merge every time the library is updated?
++
++If your change adds a useful feature to the library, we absolutely encourage
++you to submit patches.  Assuming you can get your patch into the project, then
++you will no longer need to use a modified version!  When submitting patches,
++ensure that your changes are appropriate for all of our users.  Specifically,
++we are not interested in patches that simply hack up the library to work the
++way you want.  Compare a patch that changes the default behavior to your
++preference (probably not acceptable), to a patch that adds a new configuration
++to support the feature you have added (probably fine).
++
++
++Object File Distribution
++------------------------
++
++Section 6 of the LGPL v2.1 specifically permits static linking with the
++library.  If your project is not open source, this section does require that
++you make your object files available to your users.  The intent, as indicated
++in the license, is that a user who has obtained your software may exercise
++their right to modify the library and then re-link their modified version into
++your application.
++
++We recommend that you apply Subsection 6c, which only requires that you make a
++written offer to provide the object files.  Now...if you consider the actual
++utility of this mechanism - that it is only applicable to developers, and only
++those with in depth knowledge of the tools, the time required for development
++- all to have a new barcode reader in a specific version of your application
++that only they can use, the reality is that no one is going to request this.
++You probably should not even waste time preparing for it until a request is
++made.
++
++Additionally, to avoid "casual requests" from nefarious types that just want
++to inconvenience you, also consider charging a fee for the distribution of
++this material (as permitted by the license); just add up the cost of burning
++and shipping a disk.  If this cost is "large" compared to the price of your
++app, the likelyhood of a request is reduced even further.
++
++
++Using the Unmodified Library
++----------------------------
++
++Applying the license in this case is somewhat simpler.  These are the basic
++steps you can follow:
++
++1. Verify that the rest of your software license is compatible with the LGPL.
++   You cannot use the library if they are incompatible.
++
++   For those using the default App Store license, we have reviewed this and
++   believe it is compatible with the LGPL.
++
++2. At the end of your license text, in an annex or supplement, start by
++   declaring your use of the library and offering a link to the project.
++   Something like this:
++
++      This software uses the open source ZBar Barcode Reader library, version
++      |version|, which is available from http://zbar.sourceforge.net/iphone
++
++   If you built your own version of the library, replace the version callout
++   with eg, "cloned from Mercurial revision xxxxxxxx"
++
++3. Then append the contents of the text file COPYING, included with the
++   library.  This is all of the copyright information for the library.
++
++4. Then append the contents of the text file LICENSE, also included with the
++   library.  This is just the LGPL version 2.1 which you may also obtain from
++   http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html
++
++5. You may choose to make the written offer for the object files explicit.
++   Provide some text and whatever link or email address is appropriate.
++
++
++Using a Modified Library
++------------------------
++
++We intentionally leave this option vague and force you to refer to the license
++as an underhanded way of encouraging you to contribute back to the project ;)
+diff --git a/iphone/doc/optimizing.rst b/iphone/doc/optimizing.rst
+new file mode 100644
+--- /dev/null
++++ b/iphone/doc/optimizing.rst
+@@ -0,0 +1,437 @@
++Optimizing the Reader
++=====================
++
++As good as the iPhone performance is for a mobile device, the reality from an
++image processing perspective is that it represents a lower performance target.
++While the default configuration of the iPhone reader has been carefully tuned
++for the general case, you can often obtain much better results if you optimize
++for your specific application.
++
++.. note::
++
++   Performance is a complex topic.  The only way to tune performance is by
++   changing settings and comparing measured results.  If you are not
++   comfortable with the concepts presented here, it is recommended that you
++   leave the settings at the defaults and avoid compromising reliability.
++
++Performance of the barcode reader is generally evaluated by two factors:
++
++* The **latency** - how quickly it "recognizes" a barcode.  Specifically this
++  is the time from when the user puts a barcode in the frame or selects an
++  image until a response is indicated back to the them.
++
++* The **reliability** - it does not matter how quickly an image is scanned if
++  an incorrect result is returned.  That may seem obvious, but bad decodes
++  *are* possible and you need to keep this in mind when changing settings that
++  affect the reliability of the reader.
++
++Basically our goal is to optimize the latency without sacrificing reliability.
++There are several factors that contribue to latency:
++
++* The **quality** of the barcode image.  Quality includes the available
++  resolution, focus, lighting, noise, etc.  We have more control over some of
++  these than others.
++
++* The **camera**.  When scanning from the camera, the time for the
++  autoexposure and autofocus to converge on an image that can be decoded is a
++  significant contribution to the overall latency.
++
++* The **frame rate** of the reader - this translates to the time it takes the
++  scanner to process an image.
++
++* The **effort level** of the reader - some of the available settings control
++  "how hard" the reader tries to find barcodes in each frame.
++
++* The **delegate latency** - the time spent in your application after a
++  barcode has been detected until the user is notified.
++
++Most of these factors are interrelated.  We will discuss those we can control
++in detail, as well the settings you use to affect them.  Then we will provide
++a few specific case examples.
++
++
++Measuring Performance
++---------------------
++
++Subjective response times are a good place to start (does it "feel" responsive
++to you?), and possibly the only way to evaluate the overall experience, but to
++compare incremental changes to interrelated settings and have meaningful
++performance discussions with others, we need a more quantitative approach.
++
++The :func:`mach_absolute_time` function is a good tool for accurately
++measuring small delays.  Research this function and learn how to apply it.  As
++when measuring any real-world value, keep in mind that some variance is to be
++expected - even if you perform exactly the same operation multiple times, you
++will not see exactly the same measurement.  You should collect several
++samples, discard any obvious outliers, and average the remaining measurements.
++
++One way that the overall reader latency may be evaluated is by manually
++marking the time when the barcode is presented to the reader.  Add a control
++to your overlay that captures the start time when tapped and compare this to
++the end time, just before your delegate returns.
++
++The reader continually monitors the frame rate at which it is running.  The
++measured value may be displayed for debugging purposes by enabling the
++:member:`~ZBarReaderView::showsFPS` property.  The readertest example does
++this and also provides control over many of the available settings, so you can
++quickly test how each setting affects the frame rate.  You should target your
++optimization efforts to achieve a frame rate of at least 8-10fps, although
++12-15fps is preferable.
++
++You can measure the latency of your delegate using :func:`mach_absolute_time`.
++The measured value should be less than about 100ms, the smaller the better, to
++avoid noticeable lag.
++
++The readertest is a good tool for testing the performance of the reader.  You
++can tune the settings appropriately for your application and evaluate the
++effect each change has on the performance.
++
++
++Delegate Latency
++----------------
++
++This latency contributor is the easiest for you to effect (and sometimes the
++easiest to overlook).  You delegate method should update the interface -
++dismiss the controller or update your overlay to indicate success - and
++*nothing* else.  All other processing should be deferred until after the
++animations have started.
++
++
++Image Quality
++-------------
++
++Resolution
++^^^^^^^^^^
++
++One might think that "more is better" in terms of resolution, but this is not
++necessarily the case.  Given average image quality, the ideal resolution for
++scanning is right around three pixels per barcode "module" (the width of the
++smallest bar or space).  Note that this measure is not an absolute image size
++or even a measure of the physical dimensions represented by a pixel sample, it
++*only* describes the sampled size of the barcode in the image.
++
++As the resolution decreases below about two pixels per module, edge fidelity
++is lost and the bars and spaces start to merge together, making it impossible
++(for this library) to scan.  This affects the density (feature size) and
++maximum size (data capacity) of the barcodes that can be detected.
++Conversely, as the resolution increases above about 4 pixels per module, noise
++can interfere with the edge detection and images will take longer to process.
++
++Other quality factors, such as poor focus, bad lighting or even excessive
++noise, can increase (or decrease) the resolution requirement.
++
++When scanning from the camera, the reader defaults to 640x480, which is good
++for most applications.  On the iPhone 4, you can increase this using a capture
++:member:`~ZBarReaderView::session` preset.  The iPhone 3GS does not have a
++higher resolution option available.
++
++For scanning images, you can use
++:member:`~ZBarReaderController::maxScanDimension` to control the scaled size
++of the converted image, or resort to converting them yourself.
++
++If you want to read long linear barcodes or dense 2-D symbols, you will
++probably want to increase the resolution by adjusting these settings.
++
++Keep in mind that more pixels will take longer to scan, refer to the `frame
++rate`_ discussion for ways to compensate.
++
++Focus
++^^^^^
++
++Ideally we would fix the focus at a calculated optimum distance and optimize
++the aperture selection to maximize the depth of field.  Unfortunately the APIs
++do not currently give us control over any of these settings, the best we can
++do (as of iOS 4) is continuous auto-focus mode - this mode is configured by
++the reader automatically.  It can still take the device as long as 1-2 seconds
++to find the appropriate macro focus setting, but there just isn't much we can
++do about that.
++
++Lighting and Exposure
++^^^^^^^^^^^^^^^^^^^^^
++
++An image that is too bright or overexposed can completely wash out any
++barcodes.  An image that is too dark or underexposed will not provide
++sufficient contrast for the scanner.  Low light levels also tend to produce
++noisier images, possibly because the driver uses a faster "ISO" setting to
++compensate for the lighting.
++
++The camera defaults to continuous automatic exposure and white balance.  Since
++there are no other useful values, the reader leaves these unchanged from their
++default setting.
++
++For the iPhone 4 device, the "torch" can be enabled to provide additional
++illumination for the camera in low-light conditions.  The reader sets the
++torch to automatic by default, so it should turn on only when needeed...
++There have been some reports that the torch turns on inappropriately, washing
++out the image.  If you find that this occurs, you should instead set the
++:member:`~ZBarReaderView::torchMode` property of the :class:`ZBarReaderView`
++to ``Off``.
++
++For scanning images from another source, you are again stuck with the
++available image quality.  If you have any control over the image source, you
++should do what you can to fix quality problems there.
++
++Noise
++^^^^^
++
++Some level of noise is filtered by the reader, but excessive noise levels
++create additional edges in the image which corrupt barcodes and increase
++scanning time (decreasing the frame rate).
++
++As mentioned with `lighting and exposure`_, noise mostly becomes a problem
++when the light-level is too low, but high-resolution images may also increase
++exposure to sensor noise.
++
++We compensate for noise by *reducing* the `resolution`_ from the sensor
++maximum.  Scaling the image down has the effect of averaging several pixels
++into one value, filtering out the high-frequency noise component.
++
++
++Frame Rate
++----------
++
++The time it takes to scan and decode an image/frame is roughly proportional to
++the number of pixels that are processed.  The number and type of enabled
++symbologies and image noise can also affect the processing time.
++
++We have several knobs available that affect the frame rate.  Most of these are
++geared toward reducing the number of image pixels that are scanned.
++
++Decrease the Resolution
++^^^^^^^^^^^^^^^^^^^^^^^
++
++Adjusting the resolution of the image is an easy way to quickly reduce the
++number of pixels.  Smaller images also mean there is less data to carry
++around, which helps performance in other ways.  For example, reducing each
++image dimension by 30% (eg, from 640x480 to 448x336) will about double the
++speed of the reader (to a point).  [FIXME verify!]
++
++Adjusting the resolution is `described above <resolution>`_.  As mentioned
++there, reducing the resolution will negatively impact the minimum feature size
++and maximum barcode size that can be scanned, but it will help filter noise.
++
++Crop the Scan Region
++^^^^^^^^^^^^^^^^^^^^
++
++It may not always be necessary for an application to scan all the way to the
++edges of the image.  By cropping the scan area, you can get most of the
++benefits of reduced resolution without sacrificing the minimum feature size.
++Cropping will also not affect image noise, but similar to decreasing the
++resolution, it does affect the maximum size barcode that can be scanned.
++
++For all cases you set the crop rectangle
++:class:`~ZBarReaderViewController::scanCrop` property.  Note that the
++rectangle provided to the controller is *normalized* across image size and
++rotation.  This means that the coordinates range from 0 to 1 and the axes will
++be arranged such that the x-axis of the crop rectangle corresponds to the
++major (longer) image axis.
++
++Your interface will typically need to indicate the cropped scan area to the
++user with visual queues.  Use the
++:class:`~ZBarReaderViewController::cameraOverlayView` to provide this.
++
++By default, the :class:`ZBarReaderView` recognizes a pinch gesture to
++digitally zoom the preview around the center of the image.  This zoom does not
++affect the resolution of the image, but it does crop the scan region to the
++visible area.  You can also disable the pinch gesture and set the
++:class:`~ZBarReaderView::zoom` programmatically.
++
++Limit the Scan Density
++^^^^^^^^^^^^^^^^^^^^^^
++
++The scanner works by making scan passes across the pixel rows and colums of
++the image.  The density of the passes is configured at the scanner as a pixel
++stride for each axis.  ``ZBAR_CFG_Y_DENSITY`` (``ZBAR_CFG_X_DENSITY``)
++controls the number of pixel rows (columns) that are skipped between
++successive horizontal (vertical) scan passes.  (Note that "density" is really
++not a good name for the configuation settings... "stride" might be more
++appropriate.)
++
++Decreasing the scan density (by increasing the stride setting) is a great way
++to limit the processing (increasing the frame rate) without sacrificing scan
++resolution - each scan pass is still made at full image resolution, there are
++just fewer passes (less redundancy).
++
++Setting the stride value to 0 completely disables scanning in that direction.
++This is very useful when reading linear codes with a visual alignment guide -
++scanning parallel to the bars is a waste of cycles which may be better applied
++to support higher resolution or increased density of scans across the symbol.
++Note that some 2-D symbologies (QR Code) require scans in both directions.
++
++Setting the stride to a very large value will generate a single scan pass
++through the center of the image.  Note that some symbologies will not be
++detected without multiple successful passes; it is usually better to combine
++this setting with cropping to generate a number of closely clustered scan
++passes in the target area.
++
++Note that the density also affects the aspect ratio and rotation that can be
++tolerated.  If you set it too large, some barcodes will become more difficult
++to read.
++
++In general, 2 to 4 is a good target for the stride setting, unless you have
++very high or low resolution images.
++
++Disable unused symbologies
++^^^^^^^^^^^^^^^^^^^^^^^^^^
++
++Limiting the symbologies to the set of interest should provide a small
++performance boost.  It also improves decode reliability - it is impossible to
++receive an incorrect or unexpected decode result from a symbology that is
++disabled.
++
++The reader does support full auto-discrimination among the supported
++symbologies, but with all of them enabled you may need to compensate elsewhere
++to get a good frame rate.
++
++For example, if you are only interested in QR codes, disable the others.  The
++robust way to do this is by disabling *all* symbologies and then reenabling
++only those you want.  This helps isolate you from encountering new symbologies
++that may be added in future versions of the library until you are ready to
++handle them::
++
++   [scanner setSymbology: 0
++            config: ZBAR_CFG_ENABLE
++            to: 0];
++   [scanner setSymbology: ZBAR_QRCODE
++            config: ZBAR_CFG_ENABLE
++            to: 1];
++
++Even if you would like your application to support multiple symbologies, you
++may consider if there is a way to limit the enabled subset based on the
++scanning context, etc...
++
++
++Examples
++--------
++
++These examples demonstrate several scenarios for scanning from the camera with
++automatic capture using iOS 4.  You can try them yourself using the
++readertest.  For each example, start with the default settings (by tapping the
++``ZBarReaderViewController`` class), then enable continuous mode and the
++custom overlay (by disabling
++:member:`~ZBarReaderViewController::showsZBarControls`).  You should also use
++a release build and avoid running in the debugger.
++
++Frame rates are approximate, measured on an iPhone 3GS running iOS 4.0.1 in a
++well lit room.  Two measurements are taken for each sample: the rate with the
++camera pointed at a blank white page such that it fills the frame, and the
++rate while continuously decoding the provided example.  For best results, it
++is recommended that you print the examples rather than scanning them from the
++screen.
++
++For reference, the base frame rates with default settings are 12fps for a
++blank white page, 7.5fps for this `basic EAN symbol`_ and 2.2fps for this
++`basic QR symbol`_.
++
++.. _`basic EAN symbol`:
++   http://zbar.sf.net/test/ean13/9876543210128.png
++.. _`basic QR symbol`:
++   http://chart.apis.google.com/chart?cht=qr&chs=512x512&chl=http://zbar.sf.net/iphone
++
++Long Linear Symbols
++^^^^^^^^^^^^^^^^^^^
++
++For this example, we will use a relatively `long Code 128 barcode`_.
++
++.. _`long Code 128 barcode`:
++   http://zbar.sf.net/test/code128/ALPHA.png
++
++While it should be possible to read this symbol with the default settings, you
++may notice that it is not very reliable.  You will have to stretch the symbol
++across the entire screen, and even then the default settings will only give
++you about 1.6 pixels per module, well below the ideal target of 3.  To improve
++these results, we want to maximize scanning resolution for the long image
++axis.
++
++1. Disable the default zoom/crop - zoom all the way out by hitting "Scan" and
++   pinching the preview; the frame rate immediately drops to 8fps / 4.8fps.
++
++We should compensate for this reduction in the frame rate:
++
++2. Crop the image to a long, skinny rectangle - set the
++   :member:`~ZBarReaderViewController::scanCrop` setting to
++   ``{{0, 0.3}, {1, 0.4}}``;  The frame rate jumps up to 18fps / 8.7fps.
++
++3. Disable scans across the short image axis - set the ``CFG_X_DENSITY``
++   setting to 0.  The frame rate goes all the way to 30fps / 13fps.
++
++Since we have plenty of margin with the frame rate, we can minimize the total
++decode latency by performing more scan passes through the symbol:
++
++4. Increase the scan density - set the ``CFG_Y_DENSITY`` setting to 1 (13.5fps
++   / 5fps) or 2 (24fps / 9fps).
++
++You should now be able to quickly and reliably decode long linear symbols.
++
++If have an iPhone 4, you may also try increasing the resolution to support
++even longer symbols (NB there is no readertest setting for resolution).  You
++may have to compensate elsewhere to bring the frame rate back to a reasonable
++level.
++
++High Density QR Symbols
++^^^^^^^^^^^^^^^^^^^^^^^
++
++For this example we will use a `version 29 QR Code symbol`_.
++
++.. _`version 29 QR Code symbol`:
++   http://www.qrcomic.com/images/5.png
++
++In this case we still want to maximize the resolution, but we also need to
++increase the scan density to reliably pick up the small finder patterns:
++
++1. Maximize scan density in both directions - set the ``CFG_X_DENSITY`` and
++   ``CFG_Y_DENSITY`` settings both to 1.  You should be able to scan the symbol
++   now, although the frame rate drops to 4.5fps / 1fps
++
++2. Disable the default zoom/crop - zoom all the way out by hitting "Scan" and
++   pinching the preview; the frame rate drops further to 3fps / 0.7fps
++
++We can compensate somewhat for the reduced frame rate:
++
++3. Crop the image to a square - set ``scanCrop`` to ``{{0.125, 0}, {.75, 1}}``.
++   This boosts the frame rate slightly to 3.7fps / 0.75fps.
++
++4. Disable linear symbologies - set the symbologies such that only QR Code is
++   enabled (4fps / 1fps)
++
++Even though the frame rate is still pretty bad, the QR recognition latency
++should be acceptable.
++
++If have an iPhone 4, you may also try increasing the resolution to support
++even denser QR symbols (NB there is no readertest setting for resolution).
++You may have to compensate elsewhere to bring the frame rate back to a
++reasonable level.
++
++Small DataBar Symbols
++^^^^^^^^^^^^^^^^^^^^^
++
++For this example we will use a `DataBar symbol`_ printed with a small feature
++size, typical of the stickers used to tag produce.  Scale it when printing
++such that the printed dimensions are about 1cm square.  This symbol should
++scan with the default settings, but we will attempt to optimize the scan
++latency for this case.
++
++.. _`DataBar symbol`:
++   http://zbar.sf.net/test/databar/0109876543210128-so.png
++
++As well as high barcode resolution, we also want high density passes in both
++directions to minimize sensitivity to rotation:
++
++1. Maximize scan density in both directions - set the ``CFG_X_DENSITY`` and
++   ``CFG_Y_DENSITY`` settings both to 1.  The frame rate drops to 4.5fps /
++   3fps.
++
++Compensate for the reduction in frame rate by zooming in on the small symbol,
++which crops the scanned image.  Zooming also helps the user see the small
++barcode:
++
++2. Zoom all the way in - hit "Scan" and un-pinch the preview.  The frame rate
++   recovers to 11fps / 6.2fps.
++
++3. Crop the image to a square - set ``scanCrop`` to ``{{0.125, 0}, {0.75, 1}}``
++   (14fps / 7.5fps)
++
++4. Disable all symbologies except DataBar and DataBar Expanded (14.5fps / 9fps)
++
++The reader should now be very sensitive to DataBar, even when scanned at an
++angle.
+diff --git a/iphone/doc/picker.rst b/iphone/doc/picker.rst
+new file mode 100644
+--- /dev/null
++++ b/iphone/doc/picker.rst
+@@ -0,0 +1,104 @@
++Scanning a User-Selected Image
++==============================
++
++Some applications may need the full resolution offered by camera snapshots, or
++need to scan an image from the user's photo library.  In these cases you use a
++:class:`ZBarReaderController`.  This reader is a *subclass* of
++:class:`UIImagePickerController`, and you use it the same way.  See the
++documentation for :class:`UIImagePickerController` for more detais.
++
++1. Create the reader.
++
++   This is as simple as creating a new :class:`ZBarReaderController`::
++
++      ZBarReaderController *reader = [ZBarReaderController new];
++
++2. Setup a delegate to receive the results.
++
++   The delegate should implement the :class:`ZBarReaderDelegate` protocol,
++   which inherits from :class:`UIImagePickerControllerDelegate`::
++
++      reader.readerDelegate = self;
++
++3. Configure the reader.
++
++   You will need to set the :member:`~ZBarReaderController::sourceType`
++   appropriately.  Aside from the properties of the reader itself, you can
++   configure the decoder via the :member:`~ZBarReaderController::scanner`
++   property::
++
++      if([ZBarReaderController isSourceTypeAvailable:
++                                   UIImagePickerControllerSoureTypeCamera])
++          reader.sourceType = UIImagePickerControllerSoureTypeCamera;
++      [reader.scanner setSymbology: ZBAR_I25
++                      config: ZBAR_CFG_ENABLE
++                      to: 0];
++
++   See :doc:`custom` and :doc:`optimizing` for more details.
++
++4. Present the reader to the user.
++
++   As the reader is a UIImagePickerController, it must be presented modally::
++
++      [self presentModalViewController: reader
++            animated: YES];
++
++5. Process the results.
++
++   The controller will call the
++   :member:`imagePickerController:didFinishPickingMediaWithInfo:` method of
++   your delegate for a successful decode (NB *not* every time the user takes a
++   picture or selects an image).  The barcode data can be obtained using the
++   :c:data:`ZBarReaderControllerResults` key of the info dictionary.  This key
++   will return "something enumerable"; keep in mind that there may be multiple
++   results.  You may also retrieve the corresponding image with
++   :c:data:`UIImagePickerControllerOriginalImage` as usual::
++
++      - (void) imagePickerController: (UIImagePickerController*) reader
++       didFinishPickingMediaWithInfo: (NSDictionary*) info
++      {
++          id<NSFastEnumeration> results =
++              [info objectForKey: ZBarReaderControllerResults];
++          UIImage *image =
++              [info objectForKey: UIImagePickerControllerOriginalImage];
++          ...
++
++   The ``reader`` parameter will be the actual :class:`ZBarReaderController`
++   (again, a subclass :class:`UIImagePickerController`).
++
++   .. note::
++
++      The delegate method should dismiss the reader and return as soon as
++      possible; any processing of the results should be deferred until later,
++      otherwise the user will experience unacceptable latency between the
++      actual scan completion and the visual interface feedback.
++
++6. Dismiss the reader.
++
++   Once you have the results you should dismiss the reader::
++
++      [reader dismissModalViewControllerAnimated: YES];
++
++   .. warning::
++
++      It is very important to dismiss from the *reader* (not the presenting
++      controller) to avoid corrupting the interface.
++
++
++Handling Failure
++----------------
++
++It is always possible the user selects/takes an image that does not contain
++barcodes, or that the image quality is not sufficient for the ZBar library to
++scan successfully.
++
++In this case, and if :member:`~ZBarReaderController::showsHelpOnFail` is
++``YES``, the integrated help controller will automatically be displayed with
++reason set to ``"FAIL"``.
++
++Your delegate may also choose to implement the optional
++``readerControllerDidFailToRead:withRetry:`` method to explicitly handle
++failures.  If the ``retry`` parameter is ``NO``, you *must* dismiss the reader
++before returning, otherwise you may continue and allow the user to retry the
++operation.  Note that, if it is enabled, the integrated help will be displayed
++when this delegate method is invoked.
+diff --git a/iphone/doc/static/style.css b/iphone/doc/static/style.css
+new file mode 100644
+--- /dev/null
++++ b/iphone/doc/static/style.css
+@@ -0,0 +1,36 @@
++@import url("default.css");
++
++h1, h2, h3, h4, h5, h6 {
++    clear: both;
++}
++
++img.logo {
++    vertical-align: middle;
++}
++
++img.floatright {
++    float: right;
++    clear: both;
++    margin-left: 2em;
++    margin-right: 2em;
++}
++
++dl.docutils dt {
++    font-weight: bold;
++}
++dl.docutils dd {
++    margin-top: 1em;
++    margin-bottom: 1em;
++}
++
++table.docutils {
++    margin-left: auto;
++    margin-right: auto;
++}
++table.docutils th, table.docutils td {
++    padding: .25em .5em;
++}
++
++table.docutils.field-list {
++    margin-left: 0;
++}
+diff --git a/iphone/doc/support.rst b/iphone/doc/support.rst
+new file mode 100644
+--- /dev/null
++++ b/iphone/doc/support.rst
+@@ -0,0 +1,19 @@
++Obtaining Support
++=================
++
++If this documentation does not address your question/problem and you need
++support, please feel free to post in our `iPhone Developers Forum`_.
++
++.. _`iPhone Developers Forum`:
++   http://sourceforge.net/projects/zbar/forums/forum/1072195
++
++When posting, please:
++
++* Check the :doc:`faq` and the rest of this documentation first.
++* Start a new thread for a new question - do not "hijack" an unrelated thread.
++* Post complete details of your problem - complete error messages as well as
++  relevant source code and images.
++* Log-in to receive email, or check back within a day or so - you will almost
++  always get a response.
++
++For the latest support information, please see http://zbar.sf.net/iphone
+diff --git a/iphone/doc/tutorial.rst b/iphone/doc/tutorial.rst
+new file mode 100644
+--- /dev/null
++++ b/iphone/doc/tutorial.rst
+@@ -0,0 +1,216 @@
++ZBar SDK Integration Tutorial
++=============================
++
++.. image:: ReaderSample.png
++   :alt: Screenshot of the ReaderSample app
++   :width: 414
++   :height: 770
++   :scale: 40
++   :class: floatright
++
++This tutorial will quickly get you up and running with the ZBar iPhone SDK.
++
++We will develop a very simple app that presents a button the user can tap to
++invoke the barcode reader and then displays the results.  Interface Builder
++will be used to create the interface.
++
++The completed project is also available with the distributed SDK under
++:file:`Examples/ReaderSample`.
++
++
++Create the App
++--------------
++
++1. Open Xcode; you must have version 3.2.3 or later.
++
++2. Create a new project using the "View-based Application" template.  Name the
++   project "ReaderSample".  Save it wherever you like.
++
++3. Open :file:`ReaderSampleViewController.xib`
++
++4. Drag a Round Rect Button onto the view and title it "Scan".  Customize the
++   placement and appearance as you like.
++
++5. Drag an Image View onto the view.  Size it to fill about half of the
++   remaining space.  Change the view mode to Aspect Fit.
++
++6. Drag a Text View onto the view and size it to fill the remaining space.
++   Change the default text to "No barcode scanned" or something.  De-select
++   "Editable"
++
++7. Add connections to the interface elements in the code; open
++   :file:`ReaderSampleViewController.h` and change the interface to::
++
++      @interface ReaderSampleViewController : UIViewController
++      {
++          UIImageView *resultImage;
++          UITextView *resultText;
++      }
++      @property (nonatomic, retain) IBOutlet UIImageView *resultImage;
++      @property (nonatomic, retain) IBOutlet UITextView *resultText;
++      - (IBAction) scanButtonTapped;
++      @end
++
++8. Now we can finish the interface connections - open
++   :file:`ReaderSampleViewController.xib` and make these connections:
++
++   * Connect ReaderSampleViewController ``resultImage`` outlet to the
++     ImageView.
++   * Connect ReaderSampleViewController ``resultText`` outlet to the TextView.
++   * Connect ReaderSampleViewController ``scanButtonTapped`` action to the
++     RoundedRectButton(Scan) event ``TouchUpInside``.
++
++   Consult the Xcode documentation if you need help making these connections.
++   Make sure you save the XIB once they are finished.
++
++9. Finish the implementation in :file:`ReaderSampleViewController.m`::
++
++      @synthesize resultImage, resultText;
++      
++      - (IBAction) scanButtonTapped
++      {
++          NSLog(@"TBD: scan barcode here...");
++      }
++      
++      - (void) dealloc {
++          self.resultImage = nil;
++          self.resultText = nil;
++          [super dealloc];
++      }
++
++   This stub for scanButtonTapped is temporary, we'll fix it in a minute...
++
++Although it doesn't do much yet, you should now have a working skeleton app
++that you can build and run.
++
++
++Integrate the Reader
++--------------------
++
++Now for the exciting part - let's add a barcode reader!
++
++1. If you have not done so already, download the latest SDK from
++   http://zbar.sourceforge.net/iphone
++
++2. Double-click the disk image, ZBarSDK-|version|.dmg in the Finder to open it.
++
++3. Drag the :file:`ZBarSDK` folder into your Xcode project.  Make sure that
++   the "Copy Items into destination group's folder" checkbox is checked.
++
++4. Right-click the ``Frameworks`` group in your project.  Select
++   ``Add -> Existing Frameworks...``  Make sure "All" are listed and add each
++   of these from the ``Device`` list (NB hold down command for multiple
++   selection):
++
++   * AVFoundation.framework
++   * CoreMedia.framework
++   * CoreVideo.framework
++   * QuartzCore.framework
++   * libiconv.dylib
++
++5. Import the SDK header.  You will usually want to prefix it, so add it to
++   :file:`ReaderSample_prefix.pch`::
++
++      // ADD: import barcode reader APIs
++      #import "ZBarSDK.h"
++
++6. Declare support for the delegate protocol in
++   :file:`ReaderSampleViewController.h`::
++
++      @interface ReaderSampleViewController : UIViewController
++          // ADD: delegate protocol
++          < ZBarReaderDelegate >
++      {
++      ...
++
++7. Re-implement scanButtonTapped to present a barcode reader when the user
++   taps the Scan button.  In :file:`ReaderSampleViewController.m`::
++
++      - (IBAction) scanButtonTapped
++      {
++          // ADD: present a barcode reader that scans from the camera feed
++          ZBarReaderViewController *reader = [ZBarReaderViewController new];
++          reader.readerDelegate = self;
++      
++          ZBarImageScanner *scanner = reader.scanner;
++          // TODO: (optional) additional reader configuration here
++      
++          // EXAMPLE: disable rarely used I2/5 to improve performance
++          [scanner setSymbology: ZBAR_I25
++                   config: ZBAR_CFG_ENABLE
++                   to: 0];
++      
++          // present and release the controller
++          [self presentModalViewController: reader
++                animated: YES];
++          [reader release];
++      }
++
++8. Finally, implement the delegate method to do something useful with the
++   results.  Still in :file:`ReaderSampleViewController.m`::
++
++      - (void) imagePickerController: (UIImagePickerController*) reader
++       didFinishPickingMediaWithInfo: (NSDictionary*) info
++      {
++          // ADD: get the decode results
++          id<NSFastEnumeration> results =
++              [info objectForKey: ZBarReaderControllerResults];
++          ZBarSymbol *symbol = nil;
++          for(symbol in results)
++              // EXAMPLE: just grab the first barcode
++              break;
++      
++          // EXAMPLE: do something useful with the barcode data
++          resultText.text = symbol.data;
++      
++          // EXAMPLE: do something useful with the barcode image
++          resultImage.image =
++              [info objectForKey: UIImagePickerControllerOriginalImage];
++      
++          // ADD: dismiss the controller (NB dismiss from the *reader*!)
++          [reader dismissModalViewControllerAnimated: YES];
++      }
++
++And that's it!
++
++
++Testing
++-------
++
++1. Save everything (don't forget to save MyAppViewController.xib).
++
++2. Select "Build and Run".
++
++3. Tap the Scan button.
++
++4. Aim at barcode.
++
++5. Enjoy the sweet fruits of your minimal labor
++
++
++Where to go from here
++---------------------
++
++You can learn more about using the reader APIs to scan barcodes from
++:doc:`camera` or :doc:`picker`.  Use the :doc:`apiref` to find details about a
++particular interface.
++
++
++Troubleshooting
++---------------
++
++We take great care to ensure this tutorial is working as described.  However,
++if you do have a problem
++
++1. Make sure you followed the instructions exactly - every detail is
++   important.
++2. Start from scratch with a new project and follow the instructions
++   *exactly*.
++3. Try the ReaderSample distributed with the SDK and compare your work with
++   that.
++4. If you are unable to get things working, you may post your frustrations in
++   the project `iPhone Developers Forum`_.  Please be very specific about your
++   problem, post the complete text of any errors, etc.
++
++.. _`iPhone Developers Forum`:
++   http://sourceforge.net/projects/zbar/forums/forum/1072195
+diff --git a/iphone/examples/ReaderSample/Classes/ReaderSampleAppDelegate.h b/iphone/examples/ReaderSample/Classes/ReaderSampleAppDelegate.h
+new file mode 100644
+--- /dev/null
++++ b/iphone/examples/ReaderSample/Classes/ReaderSampleAppDelegate.h
+@@ -0,0 +1,21 @@
++//
++//  ReaderSampleAppDelegate.h
++//  ReaderSample
++//
++//  Created by spadix on 8/4/10.
++//
++
++#import <UIKit/UIKit.h>
++
++@class ReaderSampleViewController;
++
++@interface ReaderSampleAppDelegate : NSObject <UIApplicationDelegate> {
++    UIWindow *window;
++    ReaderSampleViewController *viewController;
++}
++
++@property (nonatomic, retain) IBOutlet UIWindow *window;
++@property (nonatomic, retain) IBOutlet ReaderSampleViewController *viewController;
++
++@end
++
+diff --git a/iphone/examples/ReaderSample/Classes/ReaderSampleAppDelegate.m b/iphone/examples/ReaderSample/Classes/ReaderSampleAppDelegate.m
+new file mode 100644
+--- /dev/null
++++ b/iphone/examples/ReaderSample/Classes/ReaderSampleAppDelegate.m
+@@ -0,0 +1,86 @@
++//
++//  ReaderSampleAppDelegate.m
++//  ReaderSample
++//
++//  Created by spadix on 8/4/10.
++//
++
++#import "ReaderSampleAppDelegate.h"
++#import "ReaderSampleViewController.h"
++
++@implementation ReaderSampleAppDelegate
++
++@synthesize window;
++@synthesize viewController;
++
++
++#pragma mark -
++#pragma mark Application lifecycle
++
++- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
++    // Override point for customization after application launch.
++
++    // Add the view controller's view to the window and display.
++    [window addSubview:viewController.view];
++    [window makeKeyAndVisible];
++
++    return YES;
++}
++
++
++- (void)applicationWillResignActive:(UIApplication *)application {
++    /*
++     Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
++     Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
++     */
++}
++
++
++- (void)applicationDidEnterBackground:(UIApplication *)application {
++    /*
++     Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. 
++     If your application supports background execution, called instead of applicationWillTerminate: when the user quits.
++     */
++}
++
++
++- (void)applicationWillEnterForeground:(UIApplication *)application {
++    /*
++     Called as part of  transition from the background to the inactive state: here you can undo many of the changes made on entering the background.
++     */
++}
++
++
++- (void)applicationDidBecomeActive:(UIApplication *)application {
++    /*
++     Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
++     */
++}
++
++
++- (void)applicationWillTerminate:(UIApplication *)application {
++    /*
++     Called when the application is about to terminate.
++     See also applicationDidEnterBackground:.
++     */
++}
++
++
++#pragma mark -
++#pragma mark Memory management
++
++- (void)applicationDidReceiveMemoryWarning:(UIApplication *)application {
++    /*
++     Free up as much memory as possible by purging cached data objects that can be recreated (or reloaded from disk) later.
++     */
++}
++
++
++- (void)dealloc {
++    [viewController release];
++    [window release];
++    [super dealloc];
++}
++
++
++@end
+diff --git a/iphone/examples/ReaderSample/Classes/ReaderSampleViewController.h b/iphone/examples/ReaderSample/Classes/ReaderSampleViewController.h
+new file mode 100644
+--- /dev/null
++++ b/iphone/examples/ReaderSample/Classes/ReaderSampleViewController.h
+@@ -0,0 +1,21 @@
++//
++//  ReaderSampleViewController.h
++//  ReaderSample
++//
++//  Created by spadix on 8/4/10.
++//
++
++#import <UIKit/UIKit.h>
++
++@interface ReaderSampleViewController
++    : UIViewController
++    // ADD: delegate protocol
++    < ZBarReaderDelegate >
++{
++    UIImageView *resultImage;
++    UITextView *resultText;
++}
++@property (nonatomic, retain) IBOutlet UIImageView *resultImage;
++@property (nonatomic, retain) IBOutlet UITextView *resultText;
++- (IBAction) scanButtonTapped;
++@end
+diff --git a/iphone/examples/ReaderSample/Classes/ReaderSampleViewController.m b/iphone/examples/ReaderSample/Classes/ReaderSampleViewController.m
+new file mode 100644
+--- /dev/null
++++ b/iphone/examples/ReaderSample/Classes/ReaderSampleViewController.m
+@@ -0,0 +1,68 @@
++//
++//  ReaderSampleViewController.m
++//  ReaderSample
++//
++//  Created by spadix on 8/4/10.
++//
++
++#import "ReaderSampleViewController.h"
++
++@implementation ReaderSampleViewController
++
++@synthesize resultImage, resultText;
++
++- (IBAction) scanButtonTapped
++{
++    // ADD: present a barcode reader that scans from the camera feed
++    ZBarReaderViewController *reader = [ZBarReaderViewController new];
++    reader.readerDelegate = self;
++
++    ZBarImageScanner *scanner = reader.scanner;
++    // TODO: (optional) additional reader configuration here
++
++    // EXAMPLE: disable rarely used I2/5 to improve performance
++    [scanner setSymbology: ZBAR_I25
++             config: ZBAR_CFG_ENABLE
++             to: 0];
++
++    // present and release the controller
++    [self presentModalViewController: reader
++          animated: YES];
++    [reader release];
++}
++
++- (void) imagePickerController: (UIImagePickerController*) reader
++ didFinishPickingMediaWithInfo: (NSDictionary*) info
++{
++    // ADD: get the decode results
++    id<NSFastEnumeration> results =
++        [info objectForKey: ZBarReaderControllerResults];
++    ZBarSymbol *symbol = nil;
++    for(symbol in results)
++        // EXAMPLE: just grab the first barcode
++        break;
++
++    // EXAMPLE: do something useful with the barcode data
++    resultText.text = symbol.data;
++
++    // EXAMPLE: do something useful with the barcode image
++    resultImage.image =
++        [info objectForKey: UIImagePickerControllerOriginalImage];
++
++    // ADD: dismiss the controller (NB dismiss from the *reader*!)
++    [reader dismissModalViewControllerAnimated: YES];
++}
++
++- (void)didReceiveMemoryWarning {
++    // Releases the view if it doesn't have a superview.
++    [super didReceiveMemoryWarning];
++    // Release any cached data, images, etc that aren't in use.
++}
++
++- (void)dealloc {
++    self.resultImage = nil;
++    self.resultText = nil;
++    [super dealloc];
++}
++
++@end
+diff --git a/iphone/examples/ReaderSample/MainWindow.xib b/iphone/examples/ReaderSample/MainWindow.xib
+new file mode 100644
+--- /dev/null
++++ b/iphone/examples/ReaderSample/MainWindow.xib
+@@ -0,0 +1,444 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
++	<data>
++		<int key="IBDocument.SystemTarget">1024</int>
++		<string key="IBDocument.SystemVersion">10D571</string>
++		<string key="IBDocument.InterfaceBuilderVersion">786</string>
++		<string key="IBDocument.AppKitVersion">1038.29</string>
++		<string key="IBDocument.HIToolboxVersion">460.00</string>
++		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
++			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
++			<string key="NS.object.0">112</string>
++		</object>
++		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
++			<bool key="EncodedWithXMLCoder">YES</bool>
++			<integer value="10"/>
++		</object>
++		<object class="NSArray" key="IBDocument.PluginDependencies">
++			<bool key="EncodedWithXMLCoder">YES</bool>
++			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
++		</object>
++		<object class="NSMutableDictionary" key="IBDocument.Metadata">
++			<bool key="EncodedWithXMLCoder">YES</bool>
++			<object class="NSArray" key="dict.sortedKeys" id="0">
++				<bool key="EncodedWithXMLCoder">YES</bool>
++			</object>
++			<object class="NSMutableArray" key="dict.values">
++				<bool key="EncodedWithXMLCoder">YES</bool>
++			</object>
++		</object>
++		<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
++			<bool key="EncodedWithXMLCoder">YES</bool>
++			<object class="IBProxyObject" id="841351856">
++				<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
++				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
++			</object>
++			<object class="IBProxyObject" id="427554174">
++				<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
++				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
++			</object>
++			<object class="IBUICustomObject" id="664661524">
++				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
++			</object>
++			<object class="IBUIViewController" id="943309135">
++				<string key="IBUINibName">ReaderSampleViewController</string>
++				<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
++				<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
++					<int key="interfaceOrientation">1</int>
++				</object>
++				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
++				<bool key="IBUIHorizontal">NO</bool>
++			</object>
++			<object class="IBUIWindow" id="117978783">
++				<nil key="NSNextResponder"/>
++				<int key="NSvFlags">292</int>
++				<string key="NSFrameSize">{320, 480}</string>
++				<object class="NSColor" key="IBUIBackgroundColor">
++					<int key="NSColorSpace">1</int>
++					<bytes key="NSRGB">MSAxIDEAA</bytes>
++				</object>
++				<bool key="IBUIOpaque">NO</bool>
++				<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
++				<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
++				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
++				<bool key="IBUIResizesToFullScreen">YES</bool>
++			</object>
++		</object>
++		<object class="IBObjectContainer" key="IBDocument.Objects">
++			<object class="NSMutableArray" key="connectionRecords">
++				<bool key="EncodedWithXMLCoder">YES</bool>
++				<object class="IBConnectionRecord">
++					<object class="IBCocoaTouchOutletConnection" key="connection">
++						<string key="label">delegate</string>
++						<reference key="source" ref="841351856"/>
++						<reference key="destination" ref="664661524"/>
++					</object>
++					<int key="connectionID">4</int>
++				</object>
++				<object class="IBConnectionRecord">
++					<object class="IBCocoaTouchOutletConnection" key="connection">
++						<string key="label">viewController</string>
++						<reference key="source" ref="664661524"/>
++						<reference key="destination" ref="943309135"/>
++					</object>
++					<int key="connectionID">11</int>
++				</object>
++				<object class="IBConnectionRecord">
++					<object class="IBCocoaTouchOutletConnection" key="connection">
++						<string key="label">window</string>
++						<reference key="source" ref="664661524"/>
++						<reference key="destination" ref="117978783"/>
++					</object>
++					<int key="connectionID">14</int>
++				</object>
++			</object>
++			<object class="IBMutableOrderedSet" key="objectRecords">
++				<object class="NSArray" key="orderedObjects">
++					<bool key="EncodedWithXMLCoder">YES</bool>
++					<object class="IBObjectRecord">
++						<int key="objectID">0</int>
++						<reference key="object" ref="0"/>
++						<reference key="children" ref="1000"/>
++						<nil key="parent"/>
++					</object>
++					<object class="IBObjectRecord">
++						<int key="objectID">-1</int>
++						<reference key="object" ref="841351856"/>
++						<reference key="parent" ref="0"/>
++						<string key="objectName">File's Owner</string>
++					</object>
++					<object class="IBObjectRecord">
++						<int key="objectID">3</int>
++						<reference key="object" ref="664661524"/>
++						<reference key="parent" ref="0"/>
++						<string key="objectName">ReaderSample App Delegate</string>
++					</object>
++					<object class="IBObjectRecord">
++						<int key="objectID">-2</int>
++						<reference key="object" ref="427554174"/>
++						<reference key="parent" ref="0"/>
++					</object>
++					<object class="IBObjectRecord">
++						<int key="objectID">10</int>
++						<reference key="object" ref="943309135"/>
++						<reference key="parent" ref="0"/>
++					</object>
++					<object class="IBObjectRecord">
++						<int key="objectID">12</int>
++						<reference key="object" ref="117978783"/>
++						<reference key="parent" ref="0"/>
++					</object>
++				</object>
++			</object>
++			<object class="NSMutableDictionary" key="flattenedProperties">
++				<bool key="EncodedWithXMLCoder">YES</bool>
++				<object class="NSArray" key="dict.sortedKeys">
++					<bool key="EncodedWithXMLCoder">YES</bool>
++					<string>-1.CustomClassName</string>
++					<string>-2.CustomClassName</string>
++					<string>10.CustomClassName</string>
++					<string>10.IBEditorWindowLastContentRect</string>
++					<string>10.IBPluginDependency</string>
++					<string>12.IBEditorWindowLastContentRect</string>
++					<string>12.IBPluginDependency</string>
++					<string>3.CustomClassName</string>
++					<string>3.IBPluginDependency</string>
++				</object>
++				<object class="NSMutableArray" key="dict.values">
++					<bool key="EncodedWithXMLCoder">YES</bool>
++					<string>UIApplication</string>
++					<string>UIResponder</string>
++					<string>ReaderSampleViewController</string>
++					<string>{{234, 376}, {320, 480}}</string>
++					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
++					<string>{{525, 346}, {320, 480}}</string>
++					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
++					<string>ReaderSampleAppDelegate</string>
++					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
++				</object>
++			</object>
++			<object class="NSMutableDictionary" key="unlocalizedProperties">
++				<bool key="EncodedWithXMLCoder">YES</bool>
++				<reference key="dict.sortedKeys" ref="0"/>
++				<object class="NSMutableArray" key="dict.values">
++					<bool key="EncodedWithXMLCoder">YES</bool>
++				</object>
++			</object>
++			<nil key="activeLocalization"/>
++			<object class="NSMutableDictionary" key="localizations">
++				<bool key="EncodedWithXMLCoder">YES</bool>
++				<reference key="dict.sortedKeys" ref="0"/>
++				<object class="NSMutableArray" key="dict.values">
++					<bool key="EncodedWithXMLCoder">YES</bool>
++				</object>
++			</object>
++			<nil key="sourceID"/>
++			<int key="maxID">15</int>
++		</object>
++		<object class="IBClassDescriber" key="IBDocument.Classes">
++			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
++				<bool key="EncodedWithXMLCoder">YES</bool>
++				<object class="IBPartialClassDescription">
++					<string key="className">UIWindow</string>
++					<string key="superclassName">UIView</string>
++					<object class="IBClassDescriptionSource" key="sourceIdentifier">
++						<string key="majorKey">IBUserSource</string>
++						<string key="minorKey"/>
++					</object>
++				</object>
++				<object class="IBPartialClassDescription">
++					<string key="className">ReaderSampleAppDelegate</string>
++					<string key="superclassName">NSObject</string>
++					<object class="NSMutableDictionary" key="outlets">
++						<bool key="EncodedWithXMLCoder">YES</bool>
++						<object class="NSArray" key="dict.sortedKeys">
++							<bool key="EncodedWithXMLCoder">YES</bool>
++							<string>viewController</string>
++							<string>window</string>
++						</object>
++						<object class="NSMutableArray" key="dict.values">
++							<bool key="EncodedWithXMLCoder">YES</bool>
++							<string>ReaderSampleViewController</string>
++							<string>UIWindow</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>viewController</string>
++							<string>window</string>
++						</object>
++						<object class="NSMutableArray" key="dict.values">
++							<bool key="EncodedWithXMLCoder">YES</bool>
++							<object class="IBToOneOutletInfo">
++								<string key="name">viewController</string>
++								<string key="candidateClassName">ReaderSampleViewController</string>
++							</object>
++							<object class="IBToOneOutletInfo">
++								<string key="name">window</string>
++								<string key="candidateClassName">UIWindow</string>
++							</object>
++						</object>
++					</object>
++					<object class="IBClassDescriptionSource" key="sourceIdentifier">
++						<string key="majorKey">IBProjectSource</string>
++						<string key="minorKey">Classes/ReaderSampleAppDelegate.h</string>
++					</object>
++				</object>
++				<object class="IBPartialClassDescription">
++					<string key="className">ReaderSampleAppDelegate</string>
++					<string key="superclassName">NSObject</string>
++					<object class="IBClassDescriptionSource" key="sourceIdentifier">
++						<string key="majorKey">IBUserSource</string>
++						<string key="minorKey"/>
++					</object>
++				</object>
++				<object class="IBPartialClassDescription">
++					<string key="className">ReaderSampleViewController</string>
++					<string key="superclassName">UIViewController</string>
++					<object class="IBClassDescriptionSource" key="sourceIdentifier">
++						<string key="majorKey">IBProjectSource</string>
++						<string key="minorKey">Classes/ReaderSampleViewController.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="356479594">
++						<string key="majorKey">IBFrameworkSource</string>
++						<string key="minorKey">UIKit.framework/Headers/UIResponder.h</string>
++					</object>
++				</object>
++				<object class="IBPartialClassDescription">
++					<string key="className">UIApplication</string>
++					<string key="superclassName">UIResponder</string>
++					<object class="IBClassDescriptionSource" key="sourceIdentifier">
++						<string key="majorKey">IBFrameworkSource</string>
++						<string key="minorKey">UIKit.framework/Headers/UIApplication.h</string>
++					</object>
++				</object>
++				<object class="IBPartialClassDescription">
++					<string key="className">UIResponder</string>
++					<string key="superclassName">NSObject</string>
++					<reference key="sourceIdentifier" ref="356479594"/>
++				</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">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 class="IBPartialClassDescription">
++					<string key="className">UIWindow</string>
++					<string key="superclassName">UIView</string>
++					<object class="IBClassDescriptionSource" key="sourceIdentifier">
++						<string key="majorKey">IBFrameworkSource</string>
++						<string key="minorKey">UIKit.framework/Headers/UIWindow.h</string>
++					</object>
++				</object>
++			</object>
++		</object>
++		<int key="IBDocument.localizationMode">0</int>
++		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
++		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
++			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
++			<integer value="1024" key="NS.object.0"/>
++		</object>
++		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
++			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
++			<integer value="3100" key="NS.object.0"/>
++		</object>
++		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
++		<string key="IBDocument.LastKnownRelativeProjectPath">ReaderSample.xcodeproj</string>
++		<int key="IBDocument.defaultPropertyAccessControl">3</int>
++		<string key="IBCocoaTouchPluginVersion">112</string>
++	</data>
++</archive>
+diff --git a/iphone/examples/ReaderSample/ReaderSample-Info.plist b/iphone/examples/ReaderSample/ReaderSample-Info.plist
+new file mode 100644
+--- /dev/null
++++ b/iphone/examples/ReaderSample/ReaderSample-Info.plist
+@@ -0,0 +1,30 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
++<plist version="1.0">
++<dict>
++	<key>CFBundleDevelopmentRegion</key>
++	<string>English</string>
++	<key>CFBundleDisplayName</key>
++	<string>${PRODUCT_NAME}</string>
++	<key>CFBundleExecutable</key>
++	<string>${EXECUTABLE_NAME}</string>
++	<key>CFBundleIconFile</key>
++	<string></string>
++	<key>CFBundleIdentifier</key>
++	<string>com.yourcompany.${PRODUCT_NAME:rfc1034identifier}</string>
++	<key>CFBundleInfoDictionaryVersion</key>
++	<string>6.0</string>
++	<key>CFBundleName</key>
++	<string>${PRODUCT_NAME}</string>
++	<key>CFBundlePackageType</key>
++	<string>APPL</string>
++	<key>CFBundleSignature</key>
++	<string>????</string>
++	<key>CFBundleVersion</key>
++	<string>1.0</string>
++	<key>LSRequiresIPhoneOS</key>
++	<true/>
++	<key>NSMainNibFile</key>
++	<string>MainWindow</string>
++</dict>
++</plist>
+diff --git a/iphone/examples/ReaderSample/ReaderSample.xcodeproj/project.pbxproj b/iphone/examples/ReaderSample/ReaderSample.xcodeproj/project.pbxproj
+new file mode 100755
+--- /dev/null
++++ b/iphone/examples/ReaderSample/ReaderSample.xcodeproj/project.pbxproj
+@@ -0,0 +1,386 @@
++// !$*UTF8*$!
++{
++	archiveVersion = 1;
++	classes = {
++	};
++	objectVersion = 45;
++	objects = {
++
++/* Begin PBXBuildFile section */
++		1D3623260D0F684500981E51 /* ReaderSampleAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D3623250D0F684500981E51 /* ReaderSampleAppDelegate.m */; };
++		1D60589B0D05DD56006BFB54 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; };
++		1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; };
++		1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; };
++		288765A50DF7441C002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765A40DF7441C002DB57D /* CoreGraphics.framework */; };
++		2899E5220DE3E06400AC0155 /* ReaderSampleViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2899E5210DE3E06400AC0155 /* ReaderSampleViewController.xib */; };
++		28AD733F0D9D9553002E5188 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 28AD733E0D9D9553002E5188 /* MainWindow.xib */; };
++		28D7ACF80DDB3853001CB0EB /* ReaderSampleViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 28D7ACF70DDB3853001CB0EB /* ReaderSampleViewController.m */; };
++		DC3CEC791209F83E00D7A786 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC3CEC781209F83E00D7A786 /* AVFoundation.framework */; };
++		DC3CEC7B1209F83E00D7A786 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC3CEC7A1209F83E00D7A786 /* CoreMedia.framework */; };
++		DC3CEC7D1209F83E00D7A786 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC3CEC7C1209F83E00D7A786 /* CoreVideo.framework */; };
++		DC3CEC7F1209F83E00D7A786 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC3CEC7E1209F83E00D7A786 /* QuartzCore.framework */; };
++		DC3CEC811209F83E00D7A786 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DC3CEC801209F83E00D7A786 /* libiconv.dylib */; };
++		DC48C40C1219E1A20047193B /* libzbar.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC48C4061219E1A20047193B /* libzbar.a */; };
++		DC48C40D1219E1A20047193B /* zbar-back.png in Resources */ = {isa = PBXBuildFile; fileRef = DC48C4081219E1A20047193B /* zbar-back.png */; };
++		DC48C40E1219E1A20047193B /* zbar-help.html in Resources */ = {isa = PBXBuildFile; fileRef = DC48C4091219E1A20047193B /* zbar-help.html */; };
++		DC48C40F1219E1A20047193B /* zbar-helpicons.png in Resources */ = {isa = PBXBuildFile; fileRef = DC48C40A1219E1A20047193B /* zbar-helpicons.png */; };
++		DC48C4101219E1A20047193B /* zbar-samples.png in Resources */ = {isa = PBXBuildFile; fileRef = DC48C40B1219E1A20047193B /* zbar-samples.png */; };
++/* End PBXBuildFile section */
++
++/* Begin PBXFileReference section */
++		1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
++		1D3623240D0F684500981E51 /* ReaderSampleAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReaderSampleAppDelegate.h; sourceTree = "<group>"; };
++		1D3623250D0F684500981E51 /* ReaderSampleAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ReaderSampleAppDelegate.m; sourceTree = "<group>"; };
++		1D6058910D05DD3D006BFB54 /* ReaderSample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ReaderSample.app; sourceTree = BUILT_PRODUCTS_DIR; };
++		1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
++		288765A40DF7441C002DB57D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
++		2899E5210DE3E06400AC0155 /* ReaderSampleViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ReaderSampleViewController.xib; sourceTree = "<group>"; };
++		28AD733E0D9D9553002E5188 /* MainWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MainWindow.xib; sourceTree = "<group>"; };
++		28D7ACF60DDB3853001CB0EB /* ReaderSampleViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReaderSampleViewController.h; sourceTree = "<group>"; };
++		28D7ACF70DDB3853001CB0EB /* ReaderSampleViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ReaderSampleViewController.m; sourceTree = "<group>"; };
++		29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
++		32CA4F630368D1EE00C91783 /* ReaderSample_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReaderSample_Prefix.pch; sourceTree = "<group>"; };
++		8D1107310486CEB800E47090 /* ReaderSample-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "ReaderSample-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = "<group>"; };
++		DC3CEC781209F83E00D7A786 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
++		DC3CEC7A1209F83E00D7A786 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; };
++		DC3CEC7C1209F83E00D7A786 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; };
++		DC3CEC7E1209F83E00D7A786 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
++		DC3CEC801209F83E00D7A786 /* libiconv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libiconv.dylib; path = usr/lib/libiconv.dylib; sourceTree = SDKROOT; };
++		DC48C3F41219E1A20047193B /* Decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Decoder.h; sourceTree = "<group>"; };
++		DC48C3F51219E1A20047193B /* Exception.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Exception.h; sourceTree = "<group>"; };
++		DC48C3F61219E1A20047193B /* Image.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Image.h; sourceTree = "<group>"; };
++		DC48C3F71219E1A20047193B /* ImageScanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImageScanner.h; sourceTree = "<group>"; };
++		DC48C3F81219E1A20047193B /* Processor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Processor.h; sourceTree = "<group>"; };
++		DC48C3F91219E1A20047193B /* Scanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Scanner.h; sourceTree = "<group>"; };
++		DC48C3FA1219E1A20047193B /* Symbol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Symbol.h; sourceTree = "<group>"; };
++		DC48C3FB1219E1A20047193B /* Video.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Video.h; sourceTree = "<group>"; };
++		DC48C3FC1219E1A20047193B /* Window.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Window.h; sourceTree = "<group>"; };
++		DC48C3FD1219E1A20047193B /* zbar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zbar.h; sourceTree = "<group>"; };
++		DC48C3FE1219E1A20047193B /* ZBarCaptureReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarCaptureReader.h; sourceTree = "<group>"; };
++		DC48C3FF1219E1A20047193B /* ZBarImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarImage.h; sourceTree = "<group>"; };
++		DC48C4001219E1A20047193B /* ZBarImageScanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarImageScanner.h; sourceTree = "<group>"; };
++		DC48C4011219E1A20047193B /* ZBarReaderController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarReaderController.h; sourceTree = "<group>"; };
++		DC48C4021219E1A20047193B /* ZBarReaderView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarReaderView.h; sourceTree = "<group>"; };
++		DC48C4031219E1A20047193B /* ZBarReaderViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarReaderViewController.h; sourceTree = "<group>"; };
++		DC48C4041219E1A20047193B /* ZBarSDK.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarSDK.h; sourceTree = "<group>"; };
++		DC48C4051219E1A20047193B /* ZBarSymbol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarSymbol.h; sourceTree = "<group>"; };
++		DC48C4061219E1A20047193B /* libzbar.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libzbar.a; sourceTree = "<group>"; };
++		DC48C4081219E1A20047193B /* zbar-back.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "zbar-back.png"; sourceTree = "<group>"; };
++		DC48C4091219E1A20047193B /* zbar-help.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "zbar-help.html"; sourceTree = "<group>"; };
++		DC48C40A1219E1A20047193B /* zbar-helpicons.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "zbar-helpicons.png"; sourceTree = "<group>"; };
++		DC48C40B1219E1A20047193B /* zbar-samples.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "zbar-samples.png"; sourceTree = "<group>"; };
++/* End PBXFileReference section */
++
++/* Begin PBXFrameworksBuildPhase section */
++		1D60588F0D05DD3D006BFB54 /* Frameworks */ = {
++			isa = PBXFrameworksBuildPhase;
++			buildActionMask = 2147483647;
++			files = (
++				1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */,
++				288765A50DF7441C002DB57D /* CoreGraphics.framework in Frameworks */,
++				1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */,
++				DC3CEC791209F83E00D7A786 /* AVFoundation.framework in Frameworks */,
++				DC3CEC7B1209F83E00D7A786 /* CoreMedia.framework in Frameworks */,
++				DC3CEC7D1209F83E00D7A786 /* CoreVideo.framework in Frameworks */,
++				DC3CEC7F1209F83E00D7A786 /* QuartzCore.framework in Frameworks */,
++				DC3CEC811209F83E00D7A786 /* libiconv.dylib in Frameworks */,
++				DC48C40C1219E1A20047193B /* libzbar.a in Frameworks */,
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++/* End PBXFrameworksBuildPhase section */
++
++/* Begin PBXGroup section */
++		080E96DDFE201D6D7F000001 /* Classes */ = {
++			isa = PBXGroup;
++			children = (
++				1D3623240D0F684500981E51 /* ReaderSampleAppDelegate.h */,
++				1D3623250D0F684500981E51 /* ReaderSampleAppDelegate.m */,
++				28D7ACF60DDB3853001CB0EB /* ReaderSampleViewController.h */,
++				28D7ACF70DDB3853001CB0EB /* ReaderSampleViewController.m */,
++			);
++			path = Classes;
++			sourceTree = "<group>";
++		};
++		19C28FACFE9D520D11CA2CBB /* Products */ = {
++			isa = PBXGroup;
++			children = (
++				1D6058910D05DD3D006BFB54 /* ReaderSample.app */,
++			);
++			name = Products;
++			sourceTree = "<group>";
++		};
++		29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
++			isa = PBXGroup;
++			children = (
++				080E96DDFE201D6D7F000001 /* Classes */,
++				29B97315FDCFA39411CA2CEA /* Other Sources */,
++				29B97317FDCFA39411CA2CEA /* Resources */,
++				DC48C3F01219E1A20047193B /* ZBarSDK */,
++				29B97323FDCFA39411CA2CEA /* Frameworks */,
++				19C28FACFE9D520D11CA2CBB /* Products */,
++			);
++			name = CustomTemplate;
++			sourceTree = "<group>";
++		};
++		29B97315FDCFA39411CA2CEA /* Other Sources */ = {
++			isa = PBXGroup;
++			children = (
++				32CA4F630368D1EE00C91783 /* ReaderSample_Prefix.pch */,
++				29B97316FDCFA39411CA2CEA /* main.m */,
++			);
++			name = "Other Sources";
++			sourceTree = "<group>";
++		};
++		29B97317FDCFA39411CA2CEA /* Resources */ = {
++			isa = PBXGroup;
++			children = (
++				2899E5210DE3E06400AC0155 /* ReaderSampleViewController.xib */,
++				28AD733E0D9D9553002E5188 /* MainWindow.xib */,
++				8D1107310486CEB800E47090 /* ReaderSample-Info.plist */,
++			);
++			name = Resources;
++			sourceTree = "<group>";
++		};
++		29B97323FDCFA39411CA2CEA /* Frameworks */ = {
++			isa = PBXGroup;
++			children = (
++				1D30AB110D05D00D00671497 /* Foundation.framework */,
++				288765A40DF7441C002DB57D /* CoreGraphics.framework */,
++				1DF5F4DF0D08C38300B7A737 /* UIKit.framework */,
++				DC3CEC7E1209F83E00D7A786 /* QuartzCore.framework */,
++				DC3CEC781209F83E00D7A786 /* AVFoundation.framework */,
++				DC3CEC7A1209F83E00D7A786 /* CoreMedia.framework */,
++				DC3CEC7C1209F83E00D7A786 /* CoreVideo.framework */,
++				DC3CEC801209F83E00D7A786 /* libiconv.dylib */,
++			);
++			name = Frameworks;
++			sourceTree = "<group>";
++		};
++		DC48C3F01219E1A20047193B /* ZBarSDK */ = {
++			isa = PBXGroup;
++			children = (
++				DC48C3F11219E1A20047193B /* Headers */,
++				DC48C4061219E1A20047193B /* libzbar.a */,
++				DC48C4071219E1A20047193B /* Resources */,
++			);
++			path = ZBarSDK;
++			sourceTree = "<group>";
++		};
++		DC48C3F11219E1A20047193B /* Headers */ = {
++			isa = PBXGroup;
++			children = (
++				DC48C3F21219E1A20047193B /* ZBarSDK */,
++			);
++			path = Headers;
++			sourceTree = "<group>";
++		};
++		DC48C3F21219E1A20047193B /* ZBarSDK */ = {
++			isa = PBXGroup;
++			children = (
++				DC48C3F31219E1A20047193B /* zbar */,
++				DC48C3FD1219E1A20047193B /* zbar.h */,
++				DC48C3FE1219E1A20047193B /* ZBarCaptureReader.h */,
++				DC48C3FF1219E1A20047193B /* ZBarImage.h */,
++				DC48C4001219E1A20047193B /* ZBarImageScanner.h */,
++				DC48C4011219E1A20047193B /* ZBarReaderController.h */,
++				DC48C4021219E1A20047193B /* ZBarReaderView.h */,
++				DC48C4031219E1A20047193B /* ZBarReaderViewController.h */,
++				DC48C4041219E1A20047193B /* ZBarSDK.h */,
++				DC48C4051219E1A20047193B /* ZBarSymbol.h */,
++			);
++			path = ZBarSDK;
++			sourceTree = "<group>";
++		};
++		DC48C3F31219E1A20047193B /* zbar */ = {
++			isa = PBXGroup;
++			children = (
++				DC48C3F41219E1A20047193B /* Decoder.h */,
++				DC48C3F51219E1A20047193B /* Exception.h */,
++				DC48C3F61219E1A20047193B /* Image.h */,
++				DC48C3F71219E1A20047193B /* ImageScanner.h */,
++				DC48C3F81219E1A20047193B /* Processor.h */,
++				DC48C3F91219E1A20047193B /* Scanner.h */,
++				DC48C3FA1219E1A20047193B /* Symbol.h */,
++				DC48C3FB1219E1A20047193B /* Video.h */,
++				DC48C3FC1219E1A20047193B /* Window.h */,
++			);
++			path = zbar;
++			sourceTree = "<group>";
++		};
++		DC48C4071219E1A20047193B /* Resources */ = {
++			isa = PBXGroup;
++			children = (
++				DC48C4081219E1A20047193B /* zbar-back.png */,
++				DC48C4091219E1A20047193B /* zbar-help.html */,
++				DC48C40A1219E1A20047193B /* zbar-helpicons.png */,
++				DC48C40B1219E1A20047193B /* zbar-samples.png */,
++			);
++			path = Resources;
++			sourceTree = "<group>";
++		};
++/* End PBXGroup section */
++
++/* Begin PBXNativeTarget section */
++		1D6058900D05DD3D006BFB54 /* ReaderSample */ = {
++			isa = PBXNativeTarget;
++			buildConfigurationList = 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "ReaderSample" */;
++			buildPhases = (
++				1D60588D0D05DD3D006BFB54 /* Resources */,
++				1D60588E0D05DD3D006BFB54 /* Sources */,
++				1D60588F0D05DD3D006BFB54 /* Frameworks */,
++			);
++			buildRules = (
++			);
++			dependencies = (
++			);
++			name = ReaderSample;
++			productName = ReaderSample;
++			productReference = 1D6058910D05DD3D006BFB54 /* ReaderSample.app */;
++			productType = "com.apple.product-type.application";
++		};
++/* End PBXNativeTarget section */
++
++/* Begin PBXProject section */
++		29B97313FDCFA39411CA2CEA /* Project object */ = {
++			isa = PBXProject;
++			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "ReaderSample" */;
++			compatibilityVersion = "Xcode 3.1";
++			developmentRegion = English;
++			hasScannedForEncodings = 1;
++			knownRegions = (
++				English,
++				Japanese,
++				French,
++				German,
++			);
++			mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */;
++			projectDirPath = "";
++			projectRoot = "";
++			targets = (
++				1D6058900D05DD3D006BFB54 /* ReaderSample */,
++			);
++		};
++/* End PBXProject section */
++
++/* Begin PBXResourcesBuildPhase section */
++		1D60588D0D05DD3D006BFB54 /* Resources */ = {
++			isa = PBXResourcesBuildPhase;
++			buildActionMask = 2147483647;
++			files = (
++				28AD733F0D9D9553002E5188 /* MainWindow.xib in Resources */,
++				2899E5220DE3E06400AC0155 /* ReaderSampleViewController.xib in Resources */,
++				DC48C40D1219E1A20047193B /* zbar-back.png in Resources */,
++				DC48C40E1219E1A20047193B /* zbar-help.html in Resources */,
++				DC48C40F1219E1A20047193B /* zbar-helpicons.png in Resources */,
++				DC48C4101219E1A20047193B /* zbar-samples.png in Resources */,
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++/* End PBXResourcesBuildPhase section */
++
++/* Begin PBXSourcesBuildPhase section */
++		1D60588E0D05DD3D006BFB54 /* Sources */ = {
++			isa = PBXSourcesBuildPhase;
++			buildActionMask = 2147483647;
++			files = (
++				1D60589B0D05DD56006BFB54 /* main.m in Sources */,
++				1D3623260D0F684500981E51 /* ReaderSampleAppDelegate.m in Sources */,
++				28D7ACF80DDB3853001CB0EB /* ReaderSampleViewController.m in Sources */,
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++/* End PBXSourcesBuildPhase section */
++
++/* Begin XCBuildConfiguration section */
++		1D6058940D05DD3E006BFB54 /* Debug */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				ALWAYS_SEARCH_USER_PATHS = NO;
++				COPY_PHASE_STRIP = NO;
++				GCC_DYNAMIC_NO_PIC = NO;
++				GCC_OPTIMIZATION_LEVEL = 0;
++				GCC_PRECOMPILE_PREFIX_HEADER = YES;
++				GCC_PREFIX_HEADER = ReaderSample_Prefix.pch;
++				INFOPLIST_FILE = "ReaderSample-Info.plist";
++				LIBRARY_SEARCH_PATHS = (
++					"$(inherited)",
++					"\"$(SRCROOT)/ZBarSDK\"",
++				);
++				PRODUCT_NAME = ReaderSample;
++				SYMROOT = /tmp/ReaderSample.build;
++			};
++			name = Debug;
++		};
++		1D6058950D05DD3E006BFB54 /* Release */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				ALWAYS_SEARCH_USER_PATHS = NO;
++				COPY_PHASE_STRIP = YES;
++				GCC_PRECOMPILE_PREFIX_HEADER = YES;
++				GCC_PREFIX_HEADER = ReaderSample_Prefix.pch;
++				INFOPLIST_FILE = "ReaderSample-Info.plist";
++				LIBRARY_SEARCH_PATHS = (
++					"$(inherited)",
++					"\"$(SRCROOT)/ZBarSDK\"",
++				);
++				PRODUCT_NAME = ReaderSample;
++				SYMROOT = /tmp/ReaderSample.build;
++				VALIDATE_PRODUCT = YES;
++			};
++			name = Release;
++		};
++		C01FCF4F08A954540054247B /* Debug */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
++				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
++				GCC_C_LANGUAGE_STANDARD = c99;
++				GCC_WARN_ABOUT_RETURN_TYPE = YES;
++				GCC_WARN_UNUSED_VARIABLE = YES;
++				IPHONEOS_DEPLOYMENT_TARGET = 4.0;
++				PREBINDING = NO;
++				SDKROOT = iphoneos;
++			};
++			name = Debug;
++		};
++		C01FCF5008A954540054247B /* Release */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
++				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
++				GCC_C_LANGUAGE_STANDARD = c99;
++				GCC_WARN_ABOUT_RETURN_TYPE = YES;
++				GCC_WARN_UNUSED_VARIABLE = YES;
++				IPHONEOS_DEPLOYMENT_TARGET = 4.0;
++				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
++				PREBINDING = NO;
++				SDKROOT = iphoneos;
++			};
++			name = Release;
++		};
++/* End XCBuildConfiguration section */
++
++/* Begin XCConfigurationList section */
++		1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "ReaderSample" */ = {
++			isa = XCConfigurationList;
++			buildConfigurations = (
++				1D6058940D05DD3E006BFB54 /* Debug */,
++				1D6058950D05DD3E006BFB54 /* Release */,
++			);
++			defaultConfigurationIsVisible = 0;
++			defaultConfigurationName = Release;
++		};
++		C01FCF4E08A954540054247B /* Build configuration list for PBXProject "ReaderSample" */ = {
++			isa = XCConfigurationList;
++			buildConfigurations = (
++				C01FCF4F08A954540054247B /* Debug */,
++				C01FCF5008A954540054247B /* Release */,
++			);
++			defaultConfigurationIsVisible = 0;
++			defaultConfigurationName = Release;
++		};
++/* End XCConfigurationList section */
++	};
++	rootObject = 29B97313FDCFA39411CA2CEA /* Project object */;
++}
+diff --git a/iphone/examples/ReaderSample/ReaderSampleViewController.xib b/iphone/examples/ReaderSample/ReaderSampleViewController.xib
+new file mode 100644
+--- /dev/null
++++ b/iphone/examples/ReaderSample/ReaderSampleViewController.xib
+@@ -0,0 +1,521 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
++	<data>
++		<int key="IBDocument.SystemTarget">1024</int>
++		<string key="IBDocument.SystemVersion">10F569</string>
++		<string key="IBDocument.InterfaceBuilderVersion">788</string>
++		<string key="IBDocument.AppKitVersion">1038.29</string>
++		<string key="IBDocument.HIToolboxVersion">461.00</string>
++		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
++			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
++			<string key="NS.object.0">117</string>
++		</object>
++		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
++			<bool key="EncodedWithXMLCoder">YES</bool>
++			<integer value="6"/>
++		</object>
++		<object class="NSArray" key="IBDocument.PluginDependencies">
++			<bool key="EncodedWithXMLCoder">YES</bool>
++			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
++		</object>
++		<object class="NSMutableDictionary" key="IBDocument.Metadata">
++			<bool key="EncodedWithXMLCoder">YES</bool>
++			<object class="NSArray" key="dict.sortedKeys" id="0">
++				<bool key="EncodedWithXMLCoder">YES</bool>
++			</object>
++			<object class="NSMutableArray" key="dict.values">
++				<bool key="EncodedWithXMLCoder">YES</bool>
++			</object>
++		</object>
++		<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
++			<bool key="EncodedWithXMLCoder">YES</bool>
++			<object class="IBProxyObject" id="372490531">
++				<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
++				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
++			</object>
++			<object class="IBProxyObject" id="843779117">
++				<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
++				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
++			</object>
++			<object class="IBUIView" id="774585933">
++				<reference key="NSNextResponder"/>
++				<int key="NSvFlags">274</int>
++				<object class="NSMutableArray" key="NSSubviews">
++					<bool key="EncodedWithXMLCoder">YES</bool>
++					<object class="IBUIButton" id="651640269">
++						<reference key="NSNextResponder" ref="774585933"/>
++						<int key="NSvFlags">292</int>
++						<string key="NSFrame">{{20, 392}, {280, 48}}</string>
++						<reference key="NSSuperview" ref="774585933"/>
++						<bool key="IBUIOpaque">NO</bool>
++						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
++						<int key="IBUIContentHorizontalAlignment">0</int>
++						<int key="IBUIContentVerticalAlignment">0</int>
++						<object class="NSFont" key="IBUIFont">
++							<string key="NSName">Helvetica-Bold</string>
++							<double key="NSSize">18</double>
++							<int key="NSfFlags">16</int>
++						</object>
++						<int key="IBUIButtonType">1</int>
++						<string key="IBUINormalTitle">Scan</string>
++						<object class="NSColor" key="IBUIHighlightedTitleColor">
++							<int key="NSColorSpace">3</int>
++							<bytes key="NSWhite">MQA</bytes>
++						</object>
++						<object class="NSColor" key="IBUINormalTitleColor">
++							<int key="NSColorSpace">1</int>
++							<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
++						</object>
++						<object class="NSColor" key="IBUINormalTitleShadowColor">
++							<int key="NSColorSpace">3</int>
++							<bytes key="NSWhite">MC41AA</bytes>
++						</object>
++					</object>
++					<object class="IBUIImageView" id="122884923">
++						<reference key="NSNextResponder" ref="774585933"/>
++						<int key="NSvFlags">292</int>
++						<string key="NSFrame">{{20, 20}, {280, 210}}</string>
++						<reference key="NSSuperview" ref="774585933"/>
++						<int key="IBUIContentMode">1</int>
++						<bool key="IBUIUserInteractionEnabled">NO</bool>
++						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
++					</object>
++					<object class="IBUITextView" id="854633925">
++						<reference key="NSNextResponder" ref="774585933"/>
++						<int key="NSvFlags">292</int>
++						<string key="NSFrame">{{20, 238}, {280, 146}}</string>
++						<reference key="NSSuperview" ref="774585933"/>
++						<object class="NSColor" key="IBUIBackgroundColor">
++							<int key="NSColorSpace">3</int>
++							<bytes key="NSWhite">MCAwAA</bytes>
++						</object>
++						<bool key="IBUIOpaque">NO</bool>
++						<bool key="IBUIClipsSubviews">YES</bool>
++						<bool key="IBUIMultipleTouchEnabled">YES</bool>
++						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
++						<bool key="IBUIEditable">NO</bool>
++						<string key="IBUIText">No barcode scanned</string>
++						<object class="IBUITextInputTraits" key="IBUITextInputTraits">
++							<int key="IBUIAutocapitalizationType">2</int>
++							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
++						</object>
++					</object>
++				</object>
++				<string key="NSFrameSize">{320, 460}</string>
++				<reference key="NSSuperview"/>
++				<object class="NSColor" key="IBUIBackgroundColor">
++					<int key="NSColorSpace">3</int>
++					<bytes key="NSWhite">MC43NQA</bytes>
++					<object class="NSColorSpace" key="NSCustomColorSpace">
++						<int key="NSID">2</int>
++					</object>
++				</object>
++				<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
++				<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
++				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
++			</object>
++		</object>
++		<object class="IBObjectContainer" key="IBDocument.Objects">
++			<object class="NSMutableArray" key="connectionRecords">
++				<bool key="EncodedWithXMLCoder">YES</bool>
++				<object class="IBConnectionRecord">
++					<object class="IBCocoaTouchOutletConnection" key="connection">
++						<string key="label">view</string>
++						<reference key="source" ref="372490531"/>
++						<reference key="destination" ref="774585933"/>
++					</object>
++					<int key="connectionID">7</int>
++				</object>
++				<object class="IBConnectionRecord">
++					<object class="IBCocoaTouchOutletConnection" key="connection">
++						<string key="label">resultImage</string>
++						<reference key="source" ref="372490531"/>
++						<reference key="destination" ref="122884923"/>
++					</object>
++					<int key="connectionID">11</int>
++				</object>
++				<object class="IBConnectionRecord">
++					<object class="IBCocoaTouchOutletConnection" key="connection">
++						<string key="label">resultText</string>
++						<reference key="source" ref="372490531"/>
++						<reference key="destination" ref="854633925"/>
++					</object>
++					<int key="connectionID">12</int>
++				</object>
++				<object class="IBConnectionRecord">
++					<object class="IBCocoaTouchEventConnection" key="connection">
++						<string key="label">scanButtonTapped</string>
++						<reference key="source" ref="651640269"/>
++						<reference key="destination" ref="372490531"/>
++						<int key="IBEventType">7</int>
++					</object>
++					<int key="connectionID">13</int>
++				</object>
++			</object>
++			<object class="IBMutableOrderedSet" key="objectRecords">
++				<object class="NSArray" key="orderedObjects">
++					<bool key="EncodedWithXMLCoder">YES</bool>
++					<object class="IBObjectRecord">
++						<int key="objectID">0</int>
++						<reference key="object" ref="0"/>
++						<reference key="children" ref="1000"/>
++						<nil key="parent"/>
++					</object>
++					<object class="IBObjectRecord">
++						<int key="objectID">-1</int>
++						<reference key="object" ref="372490531"/>
++						<reference key="parent" ref="0"/>
++						<string key="objectName">File's Owner</string>
++					</object>
++					<object class="IBObjectRecord">
++						<int key="objectID">-2</int>
++						<reference key="object" ref="843779117"/>
++						<reference key="parent" ref="0"/>
++					</object>
++					<object class="IBObjectRecord">
++						<int key="objectID">6</int>
++						<reference key="object" ref="774585933"/>
++						<object class="NSMutableArray" key="children">
++							<bool key="EncodedWithXMLCoder">YES</bool>
++							<reference ref="651640269"/>
++							<reference ref="122884923"/>
++							<reference ref="854633925"/>
++						</object>
++						<reference key="parent" ref="0"/>
++					</object>
++					<object class="IBObjectRecord">
++						<int key="objectID">8</int>
++						<reference key="object" ref="651640269"/>
++						<reference key="parent" ref="774585933"/>
++					</object>
++					<object class="IBObjectRecord">
++						<int key="objectID">9</int>
++						<reference key="object" ref="122884923"/>
++						<reference key="parent" ref="774585933"/>
++					</object>
++					<object class="IBObjectRecord">
++						<int key="objectID">10</int>
++						<reference key="object" ref="854633925"/>
++						<reference key="parent" ref="774585933"/>
++					</object>
++				</object>
++			</object>
++			<object class="NSMutableDictionary" key="flattenedProperties">
++				<bool key="EncodedWithXMLCoder">YES</bool>
++				<object class="NSArray" key="dict.sortedKeys">
++					<bool key="EncodedWithXMLCoder">YES</bool>
++					<string>-1.CustomClassName</string>
++					<string>-2.CustomClassName</string>
++					<string>10.IBPluginDependency</string>
++					<string>6.IBEditorWindowLastContentRect</string>
++					<string>6.IBPluginDependency</string>
++					<string>8.IBPluginDependency</string>
++					<string>9.IBPluginDependency</string>
++				</object>
++				<object class="NSMutableArray" key="dict.values">
++					<bool key="EncodedWithXMLCoder">YES</bool>
++					<string>ReaderSampleViewController</string>
++					<string>UIResponder</string>
++					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
++					<string>{{239, 276}, {320, 480}}</string>
++					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
++					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
++					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
++				</object>
++			</object>
++			<object class="NSMutableDictionary" key="unlocalizedProperties">
++				<bool key="EncodedWithXMLCoder">YES</bool>
++				<reference key="dict.sortedKeys" ref="0"/>
++				<object class="NSMutableArray" key="dict.values">
++					<bool key="EncodedWithXMLCoder">YES</bool>
++				</object>
++			</object>
++			<nil key="activeLocalization"/>
++			<object class="NSMutableDictionary" key="localizations">
++				<bool key="EncodedWithXMLCoder">YES</bool>
++				<reference key="dict.sortedKeys" ref="0"/>
++				<object class="NSMutableArray" key="dict.values">
++					<bool key="EncodedWithXMLCoder">YES</bool>
++				</object>
++			</object>
++			<nil key="sourceID"/>
++			<int key="maxID">13</int>
++		</object>
++		<object class="IBClassDescriber" key="IBDocument.Classes">
++			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
++				<bool key="EncodedWithXMLCoder">YES</bool>
++				<object class="IBPartialClassDescription">
++					<string key="className">ReaderSampleViewController</string>
++					<string key="superclassName">UIViewController</string>
++					<object class="NSMutableDictionary" key="actions">
++						<string key="NS.key.0">scanButtonTapped</string>
++						<string key="NS.object.0">id</string>
++					</object>
++					<object class="NSMutableDictionary" key="actionInfosByName">
++						<string key="NS.key.0">scanButtonTapped</string>
++						<object class="IBActionInfo" key="NS.object.0">
++							<string key="name">scanButtonTapped</string>
++							<string key="candidateClassName">id</string>
++						</object>
++					</object>
++					<object class="NSMutableDictionary" key="outlets">
++						<bool key="EncodedWithXMLCoder">YES</bool>
++						<object class="NSArray" key="dict.sortedKeys">
++							<bool key="EncodedWithXMLCoder">YES</bool>
++							<string>resultImage</string>
++							<string>resultText</string>
++						</object>
++						<object class="NSMutableArray" key="dict.values">
++							<bool key="EncodedWithXMLCoder">YES</bool>
++							<string>UIImageView</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>resultImage</string>
++							<string>resultText</string>
++						</object>
++						<object class="NSMutableArray" key="dict.values">
++							<bool key="EncodedWithXMLCoder">YES</bool>
++							<object class="IBToOneOutletInfo">
++								<string key="name">resultImage</string>
++								<string key="candidateClassName">UIImageView</string>
++							</object>
++							<object class="IBToOneOutletInfo">
++								<string key="name">resultText</string>
++								<string key="candidateClassName">UITextView</string>
++							</object>
++						</object>
++					</object>
++					<object class="IBClassDescriptionSource" key="sourceIdentifier">
++						<string key="majorKey">IBProjectSource</string>
++						<string key="minorKey">Classes/ReaderSampleViewController.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="1005214018">
++						<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">UIImageView</string>
++					<string key="superclassName">UIView</string>
++					<object class="IBClassDescriptionSource" key="sourceIdentifier">
++						<string key="majorKey">IBFrameworkSource</string>
++						<string key="minorKey">UIKit.framework/Headers/UIImageView.h</string>
++					</object>
++				</object>
++				<object class="IBPartialClassDescription">
++					<string key="className">UIResponder</string>
++					<string key="superclassName">NSObject</string>
++					<reference key="sourceIdentifier" ref="1005214018"/>
++				</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/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>
++		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
++		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
++			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
++			<integer value="1024" key="NS.object.0"/>
++		</object>
++		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
++			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
++			<integer value="3100" key="NS.object.0"/>
++		</object>
++		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
++		<string key="IBDocument.LastKnownRelativeProjectPath">ReaderSample.xcodeproj</string>
++		<int key="IBDocument.defaultPropertyAccessControl">3</int>
++		<string key="IBCocoaTouchPluginVersion">117</string>
++	</data>
++</archive>
+diff --git a/iphone/examples/ReaderSample/ReaderSample_Prefix.pch b/iphone/examples/ReaderSample/ReaderSample_Prefix.pch
+new file mode 100644
+--- /dev/null
++++ b/iphone/examples/ReaderSample/ReaderSample_Prefix.pch
+@@ -0,0 +1,11 @@
++//
++// Prefix header for all source files of the 'ReaderSample' target in the 'ReaderSample' project
++//
++
++#ifdef __OBJC__
++# import <Foundation/Foundation.h>
++# import <UIKit/UIKit.h>
++
++// ADD: barcode reader APIs
++# import "ZBarSDK.h"
++#endif
+diff --git a/iphone/examples/ReaderSample/ZBarSDK b/iphone/examples/ReaderSample/ZBarSDK
+new file mode 120000
+--- /dev/null
++++ b/iphone/examples/ReaderSample/ZBarSDK
+@@ -0,0 +1,1 @@
++../../build/Release-iphoneos/ZBarSDK
+\ No newline at end of file
+diff --git a/iphone/examples/ReaderSample/build b/iphone/examples/ReaderSample/build
+new file mode 120000
+--- /dev/null
++++ b/iphone/examples/ReaderSample/build
+@@ -0,0 +1,1 @@
++/tmp/ReaderSample.build
+\ No newline at end of file
+diff --git a/iphone/examples/ReaderSample/main.m b/iphone/examples/ReaderSample/main.m
+new file mode 100644
+--- /dev/null
++++ b/iphone/examples/ReaderSample/main.m
+@@ -0,0 +1,15 @@
++//
++//  main.m
++//  ReaderSample
++//
++//  Created by spadix on 8/4/10.
++//
++
++#import <UIKit/UIKit.h>
++
++int main(int argc, char *argv[]) {
++    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
++    int retVal = UIApplicationMain(argc, argv, nil, nil);
++    [pool release];
++    return retVal;
++}
+diff --git a/iphone/examples/readertest/ZBarSDK b/iphone/examples/readertest/ZBarSDK
+new file mode 120000
+--- /dev/null
++++ b/iphone/examples/readertest/ZBarSDK
+@@ -0,0 +1,1 @@
++../../build/Release-iphoneos/ZBarSDK
+\ No newline at end of file
+diff --git a/iphone/examples/readertest/build b/iphone/examples/readertest/build
+new file mode 120000
+--- /dev/null
++++ b/iphone/examples/readertest/build
+@@ -0,0 +1,1 @@
++/tmp/readertest.build
+\ No newline at end of file
+diff --git a/iphone/examples/readertest/entitlements.plist b/iphone/examples/readertest/entitlements.plist
+new file mode 100644
+--- /dev/null
++++ b/iphone/examples/readertest/entitlements.plist
+@@ -0,0 +1,8 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
++<plist version="1.0">
++<dict>
++	<key>get-task-allow</key>
++	<false/>
++</dict>
++</plist>
+diff --git a/iphone/examples/readertest/prefix.pch b/iphone/examples/readertest/prefix.pch
+new file mode 100644
+--- /dev/null
++++ b/iphone/examples/readertest/prefix.pch
+@@ -0,0 +1,11 @@
++#ifdef __OBJC__
++# import <Foundation/Foundation.h>
++# import <CoreFoundation/CoreFoundation.h>
++# import <CoreGraphics/CoreGraphics.h>
++# import <UIKit/UIKit.h>
++# import <QuartzCore/QuartzCore.h>
++# import <AVFoundation/AVFoundation.h>
++# import <CoreMedia/CoreMedia.h>
++# import <CoreVideo/CoreVideo.h>
++# import "ZBarSDK.h"
++#endif
+diff --git a/iphone/examples/readertest/readertest.m b/iphone/examples/readertest/readertest.m
+new file mode 100644
+--- /dev/null
++++ b/iphone/examples/readertest/readertest.m
+@@ -0,0 +1,829 @@
++#if 0
++# define VALGRIND "/usr/local/bin/valgrind"
++#endif
++
++enum {
++    CLASS_SECTION = 0,
++    SOURCE_SECTION,
++    CAMODE_SECTION,
++    CONFIG_SECTION,
++    CUSTOM_SECTION,
++    SYMBOL_SECTION,
++    RESULT_SECTION,
++    NUM_SECTIONS
++};
++
++static NSString* const section_titles[] = {
++    @"Classes",
++    @"SourceType",
++    @"CameraMode",
++    @"Reader Configuration",
++    nil,
++    @"Enabled Symbologies",
++    @"Decode Results",
++};
++
++static const CGRect const crop_choices[] = {
++    { { 0, 0 }, { 1, 1 } },
++    { { .125, 0 }, { .75, 1 } },
++    { { 0, .3 }, { 1, .4 } },
++    { { 0, 0 }, { 0, 0 } }
++};
++
++static const NSInteger const density_choices[] = {
++    3, 2, 1, 0, 4, -1
++};
++
++@interface AppDelegate
++    : UITableViewController
++    < UIApplicationDelegate,
++      UINavigationControllerDelegate,
++      UITableViewDelegate,
++      UITableViewDataSource,
++      UIActionSheetDelegate,
++      ZBarReaderDelegate >
++{
++    UIWindow *window;
++    UINavigationController *nav;
++
++    NSMutableArray *sections, *symbolEnables;
++
++    BOOL found, paused, continuous;
++    NSInteger dataHeight;
++    UILabel *typeLabel, *dataLabel;
++    UIImageView *imageView;
++
++    ZBarReaderViewController *reader;
++    UIView *overlay;
++    UIBarButtonItem *manualBtn;
++    UILabel *typeOvl, *dataOvl;
++    NSArray *masks;
++}
++
++@end
++
++
++@implementation AppDelegate
++
++- (id) init
++{
++    // force these classes to load
++    [ZBarReaderViewController class];
++    [ZBarReaderController class];
++
++    return([super initWithStyle: UITableViewStyleGrouped]);
++}
++
++- (void) initReader: (NSString*) clsName
++{
++    [reader release];
++    reader = [NSClassFromString(clsName) new];
++    reader.readerDelegate = self;
++}
++
++- (void) initOverlay
++{
++    overlay = [[UIView alloc]
++                  initWithFrame: CGRectMake(0, 426, 320, 54)];
++    overlay.backgroundColor = [UIColor clearColor];
++
++    masks = [[NSArray alloc]
++                initWithObjects:
++                    [[[UIView alloc]
++                         initWithFrame: CGRectMake(0, -426, 320, 0)]
++                        autorelease],
++                    [[[UIView alloc]
++                         initWithFrame: CGRectMake(0, -426, 0, 426)]
++                        autorelease],
++                    [[[UIView alloc]
++                         initWithFrame: CGRectMake(0, 0, 320, 0)]
++                        autorelease],
++                    [[[UIView alloc]
++                         initWithFrame: CGRectMake(320, -426, 0, 426)]
++                        autorelease],
++                nil];
++    for(UIView *mask in masks) {
++        mask.backgroundColor = [UIColor colorWithWhite: 0
++                                        alpha: .5];
++        [overlay addSubview: mask];
++    }
++
++    UILabel *label =
++        [[UILabel alloc]
++            initWithFrame: CGRectMake(0, -426, 320, 48)];
++    label.backgroundColor = [UIColor clearColor];
++    label.textColor = [UIColor whiteColor];
++    label.font = [UIFont boldSystemFontOfSize: 24];
++    label.text = @"Custom Overlay";
++    [overlay addSubview: label];
++    [label release];
++
++    typeOvl = [[UILabel alloc]
++                  initWithFrame: CGRectMake(0, -378, 80, 24)];
++    typeOvl.backgroundColor = [UIColor clearColor];
++    typeOvl.textColor = [UIColor whiteColor];
++    typeOvl.font = [UIFont systemFontOfSize: 16];
++    typeOvl.textAlignment = UITextAlignmentCenter;
++    [overlay addSubview: typeOvl];
++
++    dataOvl = [[UILabel alloc]
++                  initWithFrame: CGRectMake(96, -378, 224, 24)];
++    dataOvl.backgroundColor = [UIColor clearColor];
++    dataOvl.textColor = [UIColor whiteColor];
++    dataOvl.font = [UIFont systemFontOfSize: 16];
++    [overlay addSubview: dataOvl];
++
++    UIToolbar *toolbar =
++        [[UIToolbar alloc]
++            initWithFrame: CGRectMake(0, 0, 320, 54)];
++    toolbar.tintColor = [UIColor colorWithRed: .5
++                                     green: 0
++                                     blue: 0
++                                     alpha: 1];
++    [manualBtn release];
++    manualBtn = [[UIBarButtonItem alloc]
++                    initWithBarButtonSystemItem: UIBarButtonSystemItemCamera
++                    target: self
++                    action: @selector(manualCapture)];
++
++    toolbar.items =
++        [NSArray arrayWithObjects:
++            [[[UIBarButtonItem alloc]
++                 initWithTitle: @"X"
++                 style: UIBarButtonItemStylePlain
++                 target: self
++                 action: @selector(imagePickerControllerDidCancel:)]
++                autorelease],
++            [[[UIBarButtonItem alloc]
++                 initWithBarButtonSystemItem: UIBarButtonSystemItemFlexibleSpace
++                 target: nil
++                 action: nil]
++                autorelease],
++            manualBtn,
++            [[[UIBarButtonItem alloc]
++                 initWithBarButtonSystemItem: UIBarButtonSystemItemFlexibleSpace
++                 target: nil
++                 action: nil]
++                autorelease],
++            [[[UIBarButtonItem alloc]
++                 initWithBarButtonSystemItem: UIBarButtonSystemItemPause
++                 target: self
++                 action: @selector(pause)]
++                autorelease],
++            [[[UIBarButtonItem alloc]
++                 initWithBarButtonSystemItem: UIBarButtonSystemItemFlexibleSpace
++                 target: nil
++                 action: nil]
++                autorelease],
++            nil];
++    [overlay addSubview: toolbar];
++    [toolbar release];
++
++
++    UIButton *info =
++        [UIButton buttonWithType: UIButtonTypeInfoLight];
++    info.frame = CGRectMake(266, 0, 54, 54);
++    [info addTarget: self
++             action: @selector(info)
++             forControlEvents: UIControlEventTouchUpInside];
++    [overlay addSubview: info];
++}
++
++- (void) setCheck: (BOOL) state
++          forCell: (UITableViewCell*) cell
++{
++    cell.accessoryType =
++        ((state)
++         ? UITableViewCellAccessoryCheckmark
++         : UITableViewCellAccessoryNone);
++}
++
++- (void) setCheckForTag: (int) tag
++              inSection: (int) section
++{
++    for(UITableViewCell *cell in [sections objectAtIndex: section])
++        [self setCheck: (cell.tag == tag)
++              forCell: cell];
++}
++
++- (void) setCheckForName: (NSString*) name
++               inSection: (int) section
++{
++    for(UITableViewCell *cell in [sections objectAtIndex: section])
++        [self setCheck: [name isEqualToString: cell.textLabel.text]
++              forCell: cell];
++}
++
++- (void) applicationDidFinishLaunching: (UIApplication*) application
++{
++    self.title = @"ZBar Reader Test";
++
++    nav = [[UINavigationController alloc]
++              initWithRootViewController: self];
++    nav.delegate = self;
++
++    window = [[UIWindow alloc] initWithFrame: [[UIScreen mainScreen] bounds]];
++    [window addSubview: nav.view];
++    [window makeKeyAndVisible];
++
++    [self initReader: @"ZBarReaderViewController"];
++}
++
++- (UITableViewCell*) cellWithTitle: (NSString*) title
++                               tag: (NSInteger) tag
++                           checked: (BOOL) checked
++{
++    UITableViewCell *cell = [UITableViewCell new];
++    cell.textLabel.text = title;
++    cell.tag = tag;
++    [self setCheck: checked
++          forCell: cell];
++    return([cell autorelease]);
++}
++
++- (void) initControlCells
++{
++    // NB don't need SourceTypeSavedPhotosAlbum
++    static NSString* const sourceNames[] = {
++        @"Library", @"Camera", @"Album", nil
++    };
++    NSMutableArray *sources = [NSMutableArray array];
++    for(int i = 0; sourceNames[i]; i++)
++        if([[reader class] isSourceTypeAvailable: i])
++            [sources addObject:
++                [self cellWithTitle: sourceNames[i]
++                      tag: i
++                      checked: (reader.sourceType == i)]];
++    [sections replaceObjectAtIndex: SOURCE_SECTION
++              withObject: sources];
++
++    static NSString* const modeNames[] = {
++        @"Default", @"Sampling", @"Sequence", nil
++    };
++    NSMutableArray *modes = [NSMutableArray array];
++    for(int i = 0; modeNames[i]; i++)
++        [modes addObject:
++            [self cellWithTitle: modeNames[i]
++                  tag: i
++                  checked: (reader.cameraMode == i)]];
++    [sections replaceObjectAtIndex: CAMODE_SECTION
++              withObject: modes];
++
++    static NSString* const configNames[] = {
++        @"showsCameraControls", @"showsZBarControls", @"tracksSymbols",
++        @"enableCache", @"showsHelpOnFail", @"takesPicture",
++        nil
++    };
++    NSMutableArray *configs = [NSMutableArray array];
++    for(int i = 0; configNames[i]; i++)
++        @try {
++            BOOL checked = [[reader valueForKey: configNames[i]] boolValue];
++            [configs addObject:
++                [self cellWithTitle: configNames[i]
++                      tag: i
++                      checked: checked]];
++        }
++        @catch(...) { }
++    [sections replaceObjectAtIndex: CONFIG_SECTION
++              withObject: configs];
++
++    UITableViewCell *cropCell =
++        [[[UITableViewCell alloc]
++             initWithStyle: UITableViewCellStyleValue1
++             reuseIdentifier: nil]
++            autorelease];
++    cropCell.textLabel.text = @"scanCrop";
++    cropCell.detailTextLabel.text = NSStringFromCGRect(crop_choices[0]);
++
++    UITableViewCell *xDensityCell =
++        [[[UITableViewCell alloc]
++             initWithStyle: UITableViewCellStyleValue1
++             reuseIdentifier: nil]
++            autorelease];
++    xDensityCell.textLabel.text = @"CFG_X_DENSITY";
++    xDensityCell.detailTextLabel.tag = ZBAR_CFG_X_DENSITY;
++    xDensityCell.detailTextLabel.text =
++        [NSString stringWithFormat: @"%d", density_choices[0]];
++
++    UITableViewCell *yDensityCell =
++        [[[UITableViewCell alloc]
++             initWithStyle: UITableViewCellStyleValue1
++             reuseIdentifier: nil]
++            autorelease];
++    yDensityCell.textLabel.text = @"CFG_Y_DENSITY";
++    yDensityCell.detailTextLabel.tag = ZBAR_CFG_Y_DENSITY;
++    yDensityCell.detailTextLabel.text =
++        [NSString stringWithFormat: @"%d", density_choices[0]];
++
++    [sections replaceObjectAtIndex: CUSTOM_SECTION
++              withObject: [NSArray arrayWithObjects:
++                              xDensityCell,
++                              yDensityCell,
++                              cropCell,
++                              [self cellWithTitle: @"continuous"
++                                    tag: 1
++                                    checked: continuous],
++                              nil]];
++
++    static const int symbolValues[] = {
++        ZBAR_QRCODE, ZBAR_CODE128, ZBAR_CODE93, ZBAR_CODE39, ZBAR_I25,
++        ZBAR_DATABAR, ZBAR_DATABAR_EXP,
++        ZBAR_EAN13, ZBAR_EAN8, ZBAR_UPCA, ZBAR_UPCE, ZBAR_ISBN13, ZBAR_ISBN10,
++        0
++    };
++    NSMutableArray *symbols = [NSMutableArray array];
++    [symbolEnables release];
++    symbolEnables = [[NSMutableArray alloc] init];
++    BOOL en = YES;
++    for(int i = 0; symbolValues[i]; i++) {
++        en = en && (symbolValues[i] != ZBAR_UPCA);
++        [symbols addObject:
++            [self cellWithTitle: [ZBarSymbol nameForType: symbolValues[i]]
++                  tag: symbolValues[i]
++                  checked: en]];
++        [symbolEnables addObject: [NSNumber numberWithBool: en]];
++    }
++    [sections replaceObjectAtIndex: SYMBOL_SECTION
++              withObject: symbols];
++
++    [self.tableView reloadData];
++}
++
++- (void) viewDidLoad
++{
++    [super viewDidLoad];
++
++    UITableView *view = self.tableView;
++    view.delegate = self;
++    view.dataSource = self;
++
++    [self initOverlay];
++
++    sections = [[NSMutableArray alloc]
++                   initWithCapacity: NUM_SECTIONS];
++    for(int i = 0; i < NUM_SECTIONS; i++)
++        [sections addObject: [NSNull null]];
++
++    NSArray *classes =
++        [NSArray arrayWithObjects:
++            [self cellWithTitle: @"ZBarReaderViewController"
++                  tag: 0
++                  checked: YES],
++            [self cellWithTitle: @"ZBarReaderController"
++                  tag: 1
++                  checked: NO],
++            nil];
++    [sections replaceObjectAtIndex: CLASS_SECTION
++              withObject: classes];
++
++    UITableViewCell *typeCell = [UITableViewCell new];
++    typeLabel = [typeCell.textLabel retain];
++    UITableViewCell *dataCell = [UITableViewCell new];
++    dataLabel = [dataCell.textLabel retain];
++    dataLabel.numberOfLines = 0;
++    dataLabel.lineBreakMode = UILineBreakModeCharacterWrap;
++    UITableViewCell *imageCell = [UITableViewCell new];
++    imageView = [UIImageView new];
++    imageView.contentMode = UIViewContentModeScaleAspectFit;
++    imageView.autoresizingMask = (UIViewAutoresizingFlexibleWidth |
++                                  UIViewAutoresizingFlexibleHeight);
++    UIView *content = imageCell.contentView;
++    imageView.frame = content.bounds;
++    [content addSubview: imageView];
++    [imageView release];
++    NSArray *results =
++        [NSArray arrayWithObjects: typeCell, dataCell, imageCell, nil];
++    [sections replaceObjectAtIndex: RESULT_SECTION
++              withObject: results];
++
++    [self initControlCells];
++}
++
++- (void) viewDidUnload
++{
++    [sections release];
++    sections = nil;
++    [symbolEnables release];
++    symbolEnables = nil;
++    [manualBtn release];
++    manualBtn = nil;
++    [typeLabel release];
++    typeLabel = nil;
++    [dataLabel release];
++    dataLabel = nil;
++    [imageView release];
++    imageView = nil;
++    [typeOvl release];
++    typeOvl = nil;
++    [dataOvl release];
++    dataOvl = nil;
++    [overlay release];
++    overlay = nil;
++    [masks release];
++    masks = nil;
++    [super viewDidUnload];
++}
++
++- (void) dealloc
++{
++    [reader release];
++    reader = nil;
++    [nav release];
++    nav = nil;
++    [window release];
++    window = nil;
++    [super dealloc];
++}
++
++- (void) scan
++{
++    found = paused = NO;
++    imageView.image = nil;
++    typeLabel.text = nil;
++    dataLabel.text = nil;
++    typeOvl.text = nil;
++    dataOvl.text = nil;
++    [self.tableView reloadData];
++    if([reader respondsToSelector: @selector(readerView)])
++        reader.readerView.showsFPS = YES;
++    if(reader.sourceType == UIImagePickerControllerSourceTypeCamera)
++        reader.cameraOverlayView = (reader.showsZBarControls) ? nil : overlay;
++    manualBtn.enabled = TARGET_IPHONE_SIMULATOR ||
++        (reader.cameraMode == ZBarReaderControllerCameraModeDefault);
++    [self presentModalViewController: reader
++          animated: YES];
++}
++
++- (void) help
++{
++    ZBarHelpController *help =
++        [[ZBarHelpController alloc]
++            initWithReason: @"TEST"];
++    [self presentModalViewController: help
++          animated: YES];
++    [help release];
++}
++
++- (void) info
++{
++    [reader showHelpWithReason: @"INFO"];
++}
++
++- (void) pause
++{
++    if(![reader respondsToSelector: @selector(readerView)])
++        return;
++    paused = !paused;
++    if(paused)
++        [reader.readerView stop];
++    else
++        [reader.readerView start];
++}
++
++- (void) manualCapture
++{
++    [(UIImagePickerController*)reader takePicture];
++}
++
++// UINavigationControllerDelegate
++
++- (void) navigationController: (UINavigationController*) _nav
++       willShowViewController: (UIViewController*) vc
++                     animated: (BOOL) animated
++{
++    self.navigationItem.leftBarButtonItem =
++        [[[UIBarButtonItem alloc]
++             initWithTitle: @"Help"
++             style: UIBarButtonItemStyleDone
++             target: self
++             action: @selector(help)]
++            autorelease];
++    self.navigationItem.rightBarButtonItem =
++        [[[UIBarButtonItem alloc]
++             initWithTitle: @"Scan!"
++             style: UIBarButtonItemStyleDone
++             target: self
++             action: @selector(scan)]
++            autorelease];
++}
++
++// UITableViewDataSource
++
++- (NSInteger) numberOfSectionsInTableView: (UITableView*) view
++{
++    return(sections.count - !found);
++}
++
++- (NSInteger) tableView: (UITableView*) view
++  numberOfRowsInSection: (NSInteger) idx
++{
++    NSArray *section = [sections objectAtIndex: idx];
++    return(section.count);
++}
++
++- (UITableViewCell*) tableView: (UITableView*) view
++         cellForRowAtIndexPath: (NSIndexPath*) path
++{
++    return([[sections objectAtIndex: path.section]
++               objectAtIndex: path.row]);
++}
++
++- (NSString*)  tableView: (UITableView*) view
++ titleForHeaderInSection: (NSInteger) idx
++{
++    assert(idx < NUM_SECTIONS);
++    return(section_titles[idx]);
++}
++
++// UITableViewDelegate
++
++- (NSIndexPath*) tableView: (UITableView*) view
++  willSelectRowAtIndexPath: (NSIndexPath*) path
++{
++    if(path.section == RESULT_SECTION && path.row != 2)
++        return(nil);
++    return(path);
++}
++
++- (void) alertUnsupported
++{
++    UIAlertView *alert =
++        [[UIAlertView alloc]
++            initWithTitle: @"Unsupported"
++            message: @"Setting not available for this reader"
++            @" (or with this OS on this device)"
++            delegate: nil
++            cancelButtonTitle: @"Cancel"
++            otherButtonTitles: nil];
++    [alert show];
++    [alert release];
++}
++
++- (void) advanceCrop: (UILabel*) label
++{
++    CGRect r = CGRectFromString(label.text);
++    int i;
++    for(i = 0; crop_choices[i].size.width;)
++        if(CGRectEqualToRect(r, crop_choices[i++]))
++            break;
++    if(!crop_choices[i].size.width)
++        i = 0;
++    r = crop_choices[i];
++    reader.scanCrop = r;
++    label.text = NSStringFromCGRect(r);
++
++    r.origin.x *= 426;
++    r.origin.y *= 320;
++    r.size.width *= 426;
++    r.size.height *= 320;
++    UIView *mask = [masks objectAtIndex: 0];
++    mask.frame = CGRectMake(0, -426, 320, r.origin.x);
++    mask = [masks objectAtIndex: 1];
++    mask.frame = CGRectMake(0, r.origin.x - 426, r.origin.y, r.size.width);
++
++    r.origin.y += r.size.height;
++    mask = [masks objectAtIndex: 2];
++    mask.frame = CGRectMake(r.origin.y, r.origin.x - 426,
++                            320 - r.origin.y, r.size.width);
++
++    r.origin.x += r.size.width;
++    mask = [masks objectAtIndex: 3];
++    mask.frame = CGRectMake(0, r.origin.x - 426, 320, 426 - r.origin.x);
++}
++
++- (void) advanceDensity: (UILabel*) label
++{
++    NSInteger d = [label.text integerValue];
++    int i;
++    for(i = 0; density_choices[i] >= 0;)
++        if(d == density_choices[i++])
++            break;
++    if(density_choices[i] < 0)
++        i = 0;
++    d = density_choices[i];
++    assert(d >= 0);
++    [reader.scanner setSymbology: 0
++           config: label.tag
++           to: d];
++    label.text = [NSString stringWithFormat: @"%d", d];
++}
++
++- (void)       tableView: (UITableView*) view
++ didSelectRowAtIndexPath: (NSIndexPath*) path
++{
++    [view deselectRowAtIndexPath: path
++          animated: YES];
++
++    UITableViewCell *cell = [view cellForRowAtIndexPath: path];
++
++    switch(path.section)
++    {
++    case CLASS_SECTION: {
++        NSString *name = cell.textLabel.text;
++        [self initReader: name];
++        [self initControlCells];
++        [self setCheckForName: name
++              inSection: CLASS_SECTION];
++        break;
++    }
++
++    case SOURCE_SECTION:
++        [self setCheckForTag: reader.sourceType = cell.tag
++              inSection: SOURCE_SECTION];
++        break;
++
++    case CAMODE_SECTION:
++        @try {
++            reader.cameraMode = cell.tag;
++        }
++        @catch (...) {
++            [self alertUnsupported];
++        }
++        [self setCheckForTag: reader.cameraMode
++              inSection: CAMODE_SECTION];
++        break;
++
++    case CONFIG_SECTION: {
++        BOOL state;
++        NSString *key = cell.textLabel.text;
++        state = ![[reader valueForKey: key] boolValue];
++        @try {
++            [reader setValue: [NSNumber numberWithBool: state]
++                    forKey: key];
++        }
++        @catch (...) {
++            [self alertUnsupported];
++        }
++
++        // read back and update current state
++        state = [[reader valueForKey: key] boolValue];
++        [self setCheck: state
++              forCell: cell];
++        break;
++    }
++
++    case CUSTOM_SECTION:
++        switch(path.row)
++        {
++        case 0:
++        case 1:
++            [self advanceDensity: cell.detailTextLabel];
++            break;
++        case 2:
++            [self advanceCrop: cell.detailTextLabel];
++            break;
++        case 3:
++            [self setCheck: continuous = !continuous
++                  forCell: cell];
++            break;
++        default:
++            assert(0);
++        }
++        break;
++
++    case SYMBOL_SECTION: {
++        BOOL state = ![[symbolEnables objectAtIndex: path.row] boolValue];
++        [symbolEnables replaceObjectAtIndex: path.row
++                       withObject: [NSNumber numberWithBool: state]];
++        [reader.scanner setSymbology: cell.tag
++               config: ZBAR_CFG_ENABLE
++               to: state];
++        [self setCheck: state
++              forCell: cell];
++        break;
++    }
++    case RESULT_SECTION:
++        if(path.row == 2)
++            [[[[UIActionSheet alloc]
++                  initWithTitle: nil
++                  delegate: self
++                  cancelButtonTitle: @"Cancel"
++                  destructiveButtonTitle: nil
++                  otherButtonTitles: @"Save Image", nil]
++                 autorelease]
++                showInView: self.view];
++        break;
++    default:
++        assert(0);
++    }
++}
++
++- (CGFloat)    tableView: (UITableView*) view
++ heightForRowAtIndexPath: (NSIndexPath*) path
++{
++    if(path.section < RESULT_SECTION)
++        return(44);
++
++    switch(path.row) {
++    case 0: return(44);
++    case 1: return(dataHeight);
++    case 2: return(300);
++    default: assert(0);
++    }
++    return(44);
++}
++
++// UIActionSheetDelegate
++
++- (void)  actionSheet: (UIActionSheet*) sheet
++ clickedButtonAtIndex: (NSInteger) idx
++{
++    if(idx == sheet.cancelButtonIndex)
++        return;
++    idx -= sheet.firstOtherButtonIndex;
++    if(!idx)
++        UIImageWriteToSavedPhotosAlbum(imageView.image, nil, NULL, NULL);
++}
++
++// ZBarReaderDelegate
++
++- (void)  imagePickerController: (UIImagePickerController*) picker
++  didFinishPickingMediaWithInfo: (NSDictionary*) info
++{
++    id <NSFastEnumeration> results =
++        [info objectForKey: ZBarReaderControllerResults];
++    assert(results);
++
++    UIImage *image = [info objectForKey: UIImagePickerControllerOriginalImage];
++    assert(image);
++    if(image)
++        imageView.image = image;
++
++    int quality = 0;
++    ZBarSymbol *bestResult = nil;
++    for(ZBarSymbol *sym in results)
++        if(sym.quality > quality)
++            bestResult = sym;
++    assert(!!bestResult);
++
++    [self performSelector: @selector(presentResult:)
++          withObject: bestResult
++          afterDelay: .001];
++    if(!continuous)
++        [picker dismissModalViewControllerAnimated: YES];
++}
++
++- (void) presentResult: (ZBarSymbol*) sym
++{
++    found = !!sym;
++    NSString *typeName = sym.typeName;
++    typeLabel.text = typeName;
++    NSString *data = sym.data;
++    dataLabel.text = data;
++
++    if(continuous) {
++        typeOvl.text = typeName;
++        dataOvl.text = data;
++    }
++
++    NSLog(@"imagePickerController:didFinishPickingMediaWithInfo:\n");
++    NSLog(@"    type=%@ data=%@\n", sym.typeName, data);
++
++    CGSize size = [data sizeWithFont: [UIFont systemFontOfSize: 17]
++                        constrainedToSize: CGSizeMake(288, 2000)
++                        lineBreakMode: UILineBreakModeCharacterWrap];
++    dataHeight = size.height + 26;
++    if(dataHeight > 2000)
++        dataHeight = 2000;
++
++    [self.tableView reloadData];
++    [self.tableView scrollToRowAtIndexPath:
++             [NSIndexPath indexPathForRow: 0
++                          inSection: RESULT_SECTION]
++         atScrollPosition:UITableViewScrollPositionTop
++         animated: NO];
++}
++
++- (void) imagePickerControllerDidCancel: (UIImagePickerController*) picker
++{
++    NSLog(@"imagePickerControllerDidCancel:\n");
++    [reader dismissModalViewControllerAnimated: YES];
++}
++
++- (void) readerControllerDidFailToRead: (ZBarReaderController*) _reader
++                             withRetry: (BOOL) retry
++{
++    NSLog(@"readerControllerDidFailToRead: retry=%s\n",
++          (retry) ? "YES" : "NO");
++    if(!retry)
++        [_reader dismissModalViewControllerAnimated: YES];
++}
++
++@end
++
++
++int main (int argc, char *argv[])
++{
++#ifdef VALGRIND
++    if(argc < 2 || (argc >= 2 && strcmp(argv[1], "-valgrind")))
++        execl(VALGRIND, VALGRIND,
++              "--log-file=/tmp/memcheck.log", "--leak-check=full",
++              argv[0], "-valgrind",
++              NULL);
++#endif
++
++    NSAutoreleasePool *pool = [NSAutoreleasePool new];
++    int rc = UIApplicationMain(argc, argv, nil, @"AppDelegate");
++    [pool release];
++    return(rc);
++}
+diff --git a/iphone/examples/readertest/readertest.plist b/iphone/examples/readertest/readertest.plist
+new file mode 100644
+--- /dev/null
++++ b/iphone/examples/readertest/readertest.plist
+@@ -0,0 +1,28 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
++<plist version="1.0">
++<dict>
++	<key>CFBundleDevelopmentRegion</key>
++	<string>English</string>
++	<key>CFBundleDisplayName</key>
++	<string>${PRODUCT_NAME}</string>
++	<key>CFBundleExecutable</key>
++	<string>${EXECUTABLE_NAME}</string>
++	<key>CFBundleIconFile</key>
++	<string></string>
++	<key>CFBundleIdentifier</key>
++	<string>net.sourceforge.zbar.test.readertest</string>
++	<key>CFBundleInfoDictionaryVersion</key>
++	<string>6.0</string>
++	<key>CFBundleName</key>
++	<string>${PRODUCT_NAME}</string>
++	<key>CFBundlePackageType</key>
++	<string>APPL</string>
++	<key>CFBundleSignature</key>
++	<string>????</string>
++	<key>CFBundleVersion</key>
++	<string>1.0</string>
++	<key>LSRequiresIPhoneOS</key>
++	<true/>
++</dict>
++</plist>
+diff --git a/iphone/examples/readertest/readertest.xcodeproj/project.pbxproj b/iphone/examples/readertest/readertest.xcodeproj/project.pbxproj
+new file mode 100755
+--- /dev/null
++++ b/iphone/examples/readertest/readertest.xcodeproj/project.pbxproj
+@@ -0,0 +1,345 @@
++// !$*UTF8*$!
++{
++	archiveVersion = 1;
++	classes = {
++	};
++	objectVersion = 45;
++	objects = {
++
++/* Begin PBXBuildFile section */
++		1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; };
++		1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; };
++		288765FD0DF74451002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765FC0DF74451002DB57D /* CoreGraphics.framework */; };
++		DC48C4D61219E5F70047193B /* libzbar.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC48C4D01219E5F70047193B /* libzbar.a */; };
++		DC48C4D71219E5F70047193B /* zbar-back.png in Resources */ = {isa = PBXBuildFile; fileRef = DC48C4D21219E5F70047193B /* zbar-back.png */; };
++		DC48C4D81219E5F70047193B /* zbar-help.html in Resources */ = {isa = PBXBuildFile; fileRef = DC48C4D31219E5F70047193B /* zbar-help.html */; };
++		DC48C4D91219E5F70047193B /* zbar-helpicons.png in Resources */ = {isa = PBXBuildFile; fileRef = DC48C4D41219E5F70047193B /* zbar-helpicons.png */; };
++		DC48C4DA1219E5F70047193B /* zbar-samples.png in Resources */ = {isa = PBXBuildFile; fileRef = DC48C4D51219E5F70047193B /* zbar-samples.png */; };
++		DCB9118510BC5DA200B907F0 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCB9118410BC5DA200B907F0 /* QuartzCore.framework */; };
++		DCB9118810BC5DB500B907F0 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DCD6E13B10B0AFD4002005CD /* libiconv.dylib */; };
++		DCD6E0D010B0AD41002005CD /* readertest.m in Sources */ = {isa = PBXBuildFile; fileRef = DCD6E0CF10B0AD41002005CD /* readertest.m */; };
++		DCDC6D9B11ACA23000021380 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCDC6D9A11ACA23000021380 /* CoreVideo.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
++		DCDC6D9F11ACA23900021380 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCDC6D9E11ACA23900021380 /* CoreMedia.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
++		DCDC6DEC11ACA5B400021380 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCDC6DEB11ACA5B400021380 /* AVFoundation.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
++/* End PBXBuildFile section */
++
++/* Begin PBXFileReference section */
++		1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
++		1D6058910D05DD3D006BFB54 /* readertest.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = readertest.app; sourceTree = BUILT_PRODUCTS_DIR; };
++		1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
++		288765FC0DF74451002DB57D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
++		DC48C4BE1219E5F70047193B /* Decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Decoder.h; sourceTree = "<group>"; };
++		DC48C4BF1219E5F70047193B /* Exception.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Exception.h; sourceTree = "<group>"; };
++		DC48C4C01219E5F70047193B /* Image.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Image.h; sourceTree = "<group>"; };
++		DC48C4C11219E5F70047193B /* ImageScanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImageScanner.h; sourceTree = "<group>"; };
++		DC48C4C21219E5F70047193B /* Processor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Processor.h; sourceTree = "<group>"; };
++		DC48C4C31219E5F70047193B /* Scanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Scanner.h; sourceTree = "<group>"; };
++		DC48C4C41219E5F70047193B /* Symbol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Symbol.h; sourceTree = "<group>"; };
++		DC48C4C51219E5F70047193B /* Video.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Video.h; sourceTree = "<group>"; };
++		DC48C4C61219E5F70047193B /* Window.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Window.h; sourceTree = "<group>"; };
++		DC48C4C71219E5F70047193B /* zbar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zbar.h; sourceTree = "<group>"; };
++		DC48C4C81219E5F70047193B /* ZBarCaptureReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarCaptureReader.h; sourceTree = "<group>"; };
++		DC48C4C91219E5F70047193B /* ZBarImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarImage.h; sourceTree = "<group>"; };
++		DC48C4CA1219E5F70047193B /* ZBarImageScanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarImageScanner.h; sourceTree = "<group>"; };
++		DC48C4CB1219E5F70047193B /* ZBarReaderController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarReaderController.h; sourceTree = "<group>"; };
++		DC48C4CC1219E5F70047193B /* ZBarReaderView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarReaderView.h; sourceTree = "<group>"; };
++		DC48C4CD1219E5F70047193B /* ZBarReaderViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarReaderViewController.h; sourceTree = "<group>"; };
++		DC48C4CE1219E5F70047193B /* ZBarSDK.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarSDK.h; sourceTree = "<group>"; };
++		DC48C4CF1219E5F70047193B /* ZBarSymbol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarSymbol.h; sourceTree = "<group>"; };
++		DC48C4D01219E5F70047193B /* libzbar.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libzbar.a; sourceTree = "<group>"; };
++		DC48C4D21219E5F70047193B /* zbar-back.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "zbar-back.png"; sourceTree = "<group>"; };
++		DC48C4D31219E5F70047193B /* zbar-help.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "zbar-help.html"; sourceTree = "<group>"; };
++		DC48C4D41219E5F70047193B /* zbar-helpicons.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "zbar-helpicons.png"; sourceTree = "<group>"; };
++		DC48C4D51219E5F70047193B /* zbar-samples.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "zbar-samples.png"; sourceTree = "<group>"; };
++		DCB9118410BC5DA200B907F0 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
++		DCD6E0CE10B0AD41002005CD /* prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = prefix.pch; sourceTree = "<group>"; };
++		DCD6E0CF10B0AD41002005CD /* readertest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = readertest.m; sourceTree = "<group>"; };
++		DCD6E0D810B0AD55002005CD /* readertest.plist */ = {isa = PBXFileReference; explicitFileType = text.plist.info; fileEncoding = 4; path = readertest.plist; sourceTree = "<group>"; };
++		DCD6E13B10B0AFD4002005CD /* libiconv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libiconv.dylib; path = usr/lib/libiconv.dylib; sourceTree = SDKROOT; };
++		DCDC6D9A11ACA23000021380 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; };
++		DCDC6D9E11ACA23900021380 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; };
++		DCDC6DEB11ACA5B400021380 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
++/* End PBXFileReference section */
++
++/* Begin PBXFrameworksBuildPhase section */
++		1D60588F0D05DD3D006BFB54 /* Frameworks */ = {
++			isa = PBXFrameworksBuildPhase;
++			buildActionMask = 2147483647;
++			files = (
++				1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */,
++				288765FD0DF74451002DB57D /* CoreGraphics.framework in Frameworks */,
++				1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */,
++				DCB9118510BC5DA200B907F0 /* QuartzCore.framework in Frameworks */,
++				DCDC6DEC11ACA5B400021380 /* AVFoundation.framework in Frameworks */,
++				DCDC6D9F11ACA23900021380 /* CoreMedia.framework in Frameworks */,
++				DCDC6D9B11ACA23000021380 /* CoreVideo.framework in Frameworks */,
++				DCB9118810BC5DB500B907F0 /* libiconv.dylib in Frameworks */,
++				DC48C4D61219E5F70047193B /* libzbar.a in Frameworks */,
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++/* End PBXFrameworksBuildPhase section */
++
++/* Begin PBXGroup section */
++		19C28FACFE9D520D11CA2CBB /* Products */ = {
++			isa = PBXGroup;
++			children = (
++				1D6058910D05DD3D006BFB54 /* readertest.app */,
++			);
++			name = Products;
++			sourceTree = "<group>";
++		};
++		29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
++			isa = PBXGroup;
++			children = (
++				DCD6E0CE10B0AD41002005CD /* prefix.pch */,
++				DCD6E0CF10B0AD41002005CD /* readertest.m */,
++				DC48C4BA1219E5F70047193B /* ZBarSDK */,
++				DC3CEAC61209C07400D7A786 /* Resources */,
++				29B97323FDCFA39411CA2CEA /* Frameworks */,
++				19C28FACFE9D520D11CA2CBB /* Products */,
++			);
++			name = CustomTemplate;
++			sourceTree = "<group>";
++		};
++		29B97323FDCFA39411CA2CEA /* Frameworks */ = {
++			isa = PBXGroup;
++			children = (
++				1D30AB110D05D00D00671497 /* Foundation.framework */,
++				288765FC0DF74451002DB57D /* CoreGraphics.framework */,
++				1DF5F4DF0D08C38300B7A737 /* UIKit.framework */,
++				DCB9118410BC5DA200B907F0 /* QuartzCore.framework */,
++				DCDC6DEB11ACA5B400021380 /* AVFoundation.framework */,
++				DCDC6D9A11ACA23000021380 /* CoreVideo.framework */,
++				DCDC6D9E11ACA23900021380 /* CoreMedia.framework */,
++				DCD6E13B10B0AFD4002005CD /* libiconv.dylib */,
++			);
++			name = Frameworks;
++			sourceTree = "<group>";
++		};
++		DC3CEAC61209C07400D7A786 /* Resources */ = {
++			isa = PBXGroup;
++			children = (
++				DCD6E0D810B0AD55002005CD /* readertest.plist */,
++			);
++			name = Resources;
++			sourceTree = "<group>";
++		};
++		DC48C4BA1219E5F70047193B /* ZBarSDK */ = {
++			isa = PBXGroup;
++			children = (
++				DC48C4BB1219E5F70047193B /* Headers */,
++				DC48C4D01219E5F70047193B /* libzbar.a */,
++				DC48C4D11219E5F70047193B /* Resources */,
++			);
++			path = ZBarSDK;
++			sourceTree = "<group>";
++		};
++		DC48C4BB1219E5F70047193B /* Headers */ = {
++			isa = PBXGroup;
++			children = (
++				DC48C4BC1219E5F70047193B /* ZBarSDK */,
++			);
++			path = Headers;
++			sourceTree = "<group>";
++		};
++		DC48C4BC1219E5F70047193B /* ZBarSDK */ = {
++			isa = PBXGroup;
++			children = (
++				DC48C4BD1219E5F70047193B /* zbar */,
++				DC48C4C71219E5F70047193B /* zbar.h */,
++				DC48C4C81219E5F70047193B /* ZBarCaptureReader.h */,
++				DC48C4C91219E5F70047193B /* ZBarImage.h */,
++				DC48C4CA1219E5F70047193B /* ZBarImageScanner.h */,
++				DC48C4CB1219E5F70047193B /* ZBarReaderController.h */,
++				DC48C4CC1219E5F70047193B /* ZBarReaderView.h */,
++				DC48C4CD1219E5F70047193B /* ZBarReaderViewController.h */,
++				DC48C4CE1219E5F70047193B /* ZBarSDK.h */,
++				DC48C4CF1219E5F70047193B /* ZBarSymbol.h */,
++			);
++			path = ZBarSDK;
++			sourceTree = "<group>";
++		};
++		DC48C4BD1219E5F70047193B /* zbar */ = {
++			isa = PBXGroup;
++			children = (
++				DC48C4BE1219E5F70047193B /* Decoder.h */,
++				DC48C4BF1219E5F70047193B /* Exception.h */,
++				DC48C4C01219E5F70047193B /* Image.h */,
++				DC48C4C11219E5F70047193B /* ImageScanner.h */,
++				DC48C4C21219E5F70047193B /* Processor.h */,
++				DC48C4C31219E5F70047193B /* Scanner.h */,
++				DC48C4C41219E5F70047193B /* Symbol.h */,
++				DC48C4C51219E5F70047193B /* Video.h */,
++				DC48C4C61219E5F70047193B /* Window.h */,
++			);
++			path = zbar;
++			sourceTree = "<group>";
++		};
++		DC48C4D11219E5F70047193B /* Resources */ = {
++			isa = PBXGroup;
++			children = (
++				DC48C4D21219E5F70047193B /* zbar-back.png */,
++				DC48C4D31219E5F70047193B /* zbar-help.html */,
++				DC48C4D41219E5F70047193B /* zbar-helpicons.png */,
++				DC48C4D51219E5F70047193B /* zbar-samples.png */,
++			);
++			path = Resources;
++			sourceTree = "<group>";
++		};
++/* End PBXGroup section */
++
++/* Begin PBXNativeTarget section */
++		1D6058900D05DD3D006BFB54 /* readertest */ = {
++			isa = PBXNativeTarget;
++			buildConfigurationList = 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "readertest" */;
++			buildPhases = (
++				1D60588D0D05DD3D006BFB54 /* Resources */,
++				1D60588E0D05DD3D006BFB54 /* Sources */,
++				1D60588F0D05DD3D006BFB54 /* Frameworks */,
++			);
++			buildRules = (
++			);
++			dependencies = (
++			);
++			name = readertest;
++			productName = readertest;
++			productReference = 1D6058910D05DD3D006BFB54 /* readertest.app */;
++			productType = "com.apple.product-type.application";
++		};
++/* End PBXNativeTarget section */
++
++/* Begin PBXProject section */
++		29B97313FDCFA39411CA2CEA /* Project object */ = {
++			isa = PBXProject;
++			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "readertest" */;
++			compatibilityVersion = "Xcode 3.1";
++			developmentRegion = English;
++			hasScannedForEncodings = 1;
++			knownRegions = (
++				English,
++				Japanese,
++				French,
++				German,
++			);
++			mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */;
++			projectDirPath = "";
++			projectRoot = "";
++			targets = (
++				1D6058900D05DD3D006BFB54 /* readertest */,
++			);
++		};
++/* End PBXProject section */
++
++/* Begin PBXResourcesBuildPhase section */
++		1D60588D0D05DD3D006BFB54 /* Resources */ = {
++			isa = PBXResourcesBuildPhase;
++			buildActionMask = 2147483647;
++			files = (
++				DC48C4D71219E5F70047193B /* zbar-back.png in Resources */,
++				DC48C4D81219E5F70047193B /* zbar-help.html in Resources */,
++				DC48C4D91219E5F70047193B /* zbar-helpicons.png in Resources */,
++				DC48C4DA1219E5F70047193B /* zbar-samples.png in Resources */,
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++/* End PBXResourcesBuildPhase section */
++
++/* Begin PBXSourcesBuildPhase section */
++		1D60588E0D05DD3D006BFB54 /* Sources */ = {
++			isa = PBXSourcesBuildPhase;
++			buildActionMask = 2147483647;
++			files = (
++				DCD6E0D010B0AD41002005CD /* readertest.m in Sources */,
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++/* End PBXSourcesBuildPhase section */
++
++/* Begin XCBuildConfiguration section */
++		1D6058940D05DD3E006BFB54 /* Debug */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				COPY_PHASE_STRIP = NO;
++				GCC_OPTIMIZATION_LEVEL = 0;
++				GCC_PRECOMPILE_PREFIX_HEADER = YES;
++				GCC_PREFIX_HEADER = prefix.pch;
++				INFOPLIST_FILE = readertest.plist;
++				LIBRARY_SEARCH_PATHS = (
++					"$(inherited)",
++					"\"$(SRCROOT)/ZBarSDK\"",
++				);
++				PRODUCT_NAME = readertest;
++			};
++			name = Debug;
++		};
++		1D6058950D05DD3E006BFB54 /* Release */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				COPY_PHASE_STRIP = YES;
++				GCC_PRECOMPILE_PREFIX_HEADER = YES;
++				GCC_PREFIX_HEADER = prefix.pch;
++				INFOPLIST_FILE = readertest.plist;
++				LIBRARY_SEARCH_PATHS = (
++					"$(inherited)",
++					"\"$(SRCROOT)/ZBarSDK\"",
++				);
++				PRODUCT_NAME = readertest;
++			};
++			name = Release;
++		};
++		C01FCF4F08A954540054247B /* Debug */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
++				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
++				GCC_C_LANGUAGE_STANDARD = c99;
++				GCC_WARN_ABOUT_RETURN_TYPE = YES;
++				GCC_WARN_UNUSED_VARIABLE = YES;
++				IPHONEOS_DEPLOYMENT_TARGET = 3.1;
++				PREBINDING = NO;
++				SDKROOT = iphoneos;
++				SYMROOT = /tmp/readertest.build;
++			};
++			name = Debug;
++		};
++		C01FCF5008A954540054247B /* Release */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
++				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
++				GCC_C_LANGUAGE_STANDARD = c99;
++				GCC_WARN_ABOUT_RETURN_TYPE = YES;
++				GCC_WARN_UNUSED_VARIABLE = YES;
++				IPHONEOS_DEPLOYMENT_TARGET = 3.1;
++				PREBINDING = NO;
++				SDKROOT = iphoneos;
++				SYMROOT = /tmp/readertest.build;
++			};
++			name = Release;
++		};
++/* End XCBuildConfiguration section */
++
++/* Begin XCConfigurationList section */
++		1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "readertest" */ = {
++			isa = XCConfigurationList;
++			buildConfigurations = (
++				1D6058940D05DD3E006BFB54 /* Debug */,
++				1D6058950D05DD3E006BFB54 /* Release */,
++			);
++			defaultConfigurationIsVisible = 0;
++			defaultConfigurationName = Release;
++		};
++		C01FCF4E08A954540054247B /* Build configuration list for PBXProject "readertest" */ = {
++			isa = XCConfigurationList;
++			buildConfigurations = (
++				C01FCF4F08A954540054247B /* Debug */,
++				C01FCF5008A954540054247B /* Release */,
++			);
++			defaultConfigurationIsVisible = 0;
++			defaultConfigurationName = Release;
++		};
++/* End XCConfigurationList section */
++	};
++	rootObject = 29B97313FDCFA39411CA2CEA /* Project object */;
++}
+diff --git a/iphone/include/ZBarSDK/ZBarCaptureReader.h b/iphone/include/ZBarSDK/ZBarCaptureReader.h
+new file mode 100644
+--- /dev/null
++++ b/iphone/include/ZBarSDK/ZBarCaptureReader.h
+@@ -0,0 +1,105 @@
++//------------------------------------------------------------------------
++//  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
++//
++//  This file is part of the ZBar Bar Code Reader.
++//
++//  The ZBar Bar Code Reader is free software; you can redistribute it
++//  and/or modify it under the terms of the GNU Lesser Public License as
++//  published by the Free Software Foundation; either version 2.1 of
++//  the License, or (at your option) any later version.
++//
++//  The ZBar Bar Code Reader is distributed in the hope that it will be
++//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
++//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++//  GNU Lesser Public License for more details.
++//
++//  You should have received a copy of the GNU Lesser Public License
++//  along with the ZBar Bar Code Reader; if not, write to the Free
++//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++//  Boston, MA  02110-1301  USA
++//
++//  http://sourceforge.net/projects/zbar
++//------------------------------------------------------------------------
++
++#import <CoreGraphics/CoreGraphics.h>
++#import "ZBarImageScanner.h"
++
++@class AVCaptureVideoDataOutput, AVCaptureOutput;
++@class ZBarCaptureReader, ZBarCVImage;
++
++@protocol ZBarCaptureDelegate <NSObject>
++
++// called when a new barcode is detected.  the image refers to the
++// video buffer and must not be retained for long
++- (void)       captureReader: (ZBarCaptureReader*) captureReader
++  didReadNewSymbolsFromImage: (ZBarImage*) image;
++
++@optional
++// called when a potential/uncertain barcode is detected.  will also
++// be called *after* captureReader:didReadNewSymbolsFromImage:
++// when good barcodes are detected
++- (void) captureReader: (ZBarCaptureReader*) captureReader
++       didTrackSymbols: (ZBarSymbolSet*) symbols;
++
++@end
++
++@interface ZBarCaptureReader
++    : NSObject
++{
++    AVCaptureVideoDataOutput *captureOutput;
++    id<ZBarCaptureDelegate> captureDelegate;
++    ZBarImageScanner *scanner;
++    CGRect scanCrop;
++    CGSize size;
++    CGFloat framesPerSecond;
++    BOOL enableCache;
++
++    dispatch_queue_t queue;
++    ZBarImage *image;
++    ZBarCVImage *result;
++    int32_t running;
++    int framecnt;
++    unsigned width, height;
++    uint64_t t_frame, t_fps, t_scan;
++    CGFloat dt_frame;
++}
++
++// supply a pre-configured image scanner
++- (id) initWithImageScanner: (ZBarImageScanner*) imageScanner;
++
++// this must be called before the session is started
++- (void) willStartRunning;
++
++// this must be called *before* the session is stopped
++- (void) willStopRunning;
++
++// clear the internal result cache
++- (void) flushCache;
++
++// the capture output.  add this to an instance of AVCaptureSession
++@property (nonatomic, readonly) AVCaptureOutput *captureOutput;
++
++// delegate is notified of decode results and symbol tracking.
++@property (nonatomic, assign) id<ZBarCaptureDelegate> captureDelegate;
++
++// access to image scanner for configuration.
++@property (nonatomic, readonly) ZBarImageScanner *scanner;
++
++// region of image to scan in normalized coordinates.
++// NB horizontal crop currently ignored...
++@property (nonatomic, assign) CGRect scanCrop;
++
++// size of video frames.
++@property (nonatomic, readonly) CGSize size;
++
++// (quickly) gate the reader function without interrupting the video
++// stream.  also flushes the cache when enabled.  defaults to *NO*
++@property (nonatomic) BOOL enableReader;
++
++// current frame rate (for debug/optimization).
++// only valid when running
++@property (nonatomic, readonly) CGFloat framesPerSecond;
++
++@property (nonatomic) BOOL enableCache;
++
++@end
+diff --git a/iphone/include/ZBarSDK/ZBarHelpController.h b/iphone/include/ZBarSDK/ZBarHelpController.h
+new file mode 100644
+--- /dev/null
++++ b/iphone/include/ZBarSDK/ZBarHelpController.h
+@@ -0,0 +1,60 @@
++//------------------------------------------------------------------------
++//  Copyright 2009-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
++//
++//  This file is part of the ZBar Bar Code Reader.
++//
++//  The ZBar Bar Code Reader is free software; you can redistribute it
++//  and/or modify it under the terms of the GNU Lesser Public License as
++//  published by the Free Software Foundation; either version 2.1 of
++//  the License, or (at your option) any later version.
++//
++//  The ZBar Bar Code Reader is distributed in the hope that it will be
++//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
++//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++//  GNU Lesser Public License for more details.
++//
++//  You should have received a copy of the GNU Lesser Public License
++//  along with the ZBar Bar Code Reader; if not, write to the Free
++//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++//  Boston, MA  02110-1301  USA
++//
++//  http://sourceforge.net/projects/zbar
++//------------------------------------------------------------------------
++
++#import <UIKit/UIKit.h>
++
++@class ZBarHelpController;
++
++@protocol ZBarHelpDelegate
++@optional
++
++- (void) helpControllerDidFinish: (ZBarHelpController*) help;
++
++@end
++
++
++// failure dialog w/a few useful tips
++
++@interface ZBarHelpController : UIViewController
++                              < UIWebViewDelegate,
++                                UIAlertViewDelegate >
++{
++    NSString *reason;
++    id delegate;
++    UIWebView *webView;
++    UIToolbar *toolbar;
++    UIBarButtonItem *doneBtn, *backBtn, *space;
++    NSURL *linkURL;
++    NSUInteger orientations;
++}
++
++@property (nonatomic, assign) id<ZBarHelpDelegate> delegate;
++
++// designated initializer
++- (id) initWithReason: (NSString*) reason;
++
++- (BOOL) isInterfaceOrientationSupported: (UIInterfaceOrientation) orientation;
++- (void) setInterfaceOrientation: (UIInterfaceOrientation) orientation
++                       supported: (BOOL) supported;
++
++@end
+diff --git a/iphone/include/ZBarSDK/ZBarImage.h b/iphone/include/ZBarSDK/ZBarImage.h
+new file mode 100644
+--- /dev/null
++++ b/iphone/include/ZBarSDK/ZBarImage.h
+@@ -0,0 +1,69 @@
++//------------------------------------------------------------------------
++//  Copyright 2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++//
++//  This file is part of the ZBar Bar Code Reader.
++//
++//  The ZBar Bar Code Reader is free software; you can redistribute it
++//  and/or modify it under the terms of the GNU Lesser Public License as
++//  published by the Free Software Foundation; either version 2.1 of
++//  the License, or (at your option) any later version.
++//
++//  The ZBar Bar Code Reader is distributed in the hope that it will be
++//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
++//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++//  GNU Lesser Public License for more details.
++//
++//  You should have received a copy of the GNU Lesser Public License
++//  along with the ZBar Bar Code Reader; if not, write to the Free
++//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++//  Boston, MA  02110-1301  USA
++//
++//  http://sourceforge.net/projects/zbar
++//------------------------------------------------------------------------
++
++#import <UIKit/UIKit.h>
++#import "zbar.h"
++#import "ZBarSymbol.h"
++
++#ifdef __cplusplus
++using namespace zbar;
++#endif
++
++// Obj-C wrapper for ZBar image
++
++@interface ZBarImage : NSObject
++{
++    zbar_image_t *zimg;
++    double t_convert;
++}
++
++@property (nonatomic) unsigned long format;
++@property (nonatomic) unsigned sequence;
++@property (nonatomic) CGSize size;
++@property (nonatomic) CGRect crop;
++@property (readonly, nonatomic) const void *data;
++@property (readonly, nonatomic) unsigned long dataLength;
++@property (copy, nonatomic) ZBarSymbolSet *symbols;
++@property (readonly, nonatomic) zbar_image_t *zbarImage;
++@property (readonly, nonatomic) UIImage *UIImage;
++
++- (id) initWithImage: (zbar_image_t*) image;
++- (id) initWithCGImage: (CGImageRef) image;
++- (id) initWithCGImage: (CGImageRef) image
++                  size: (CGSize) size;
++- (id) initWithCGImage: (CGImageRef) image
++                  crop: (CGRect) crop
++                  size: (CGSize) size;
++
++- (void) setData: (const void*) data
++      withLength: (unsigned long) length;
++- (UIImage*) UIImageWithOrientation: (UIImageOrientation) imageOrientation;
++- (void) cleanup;
++
+++ (unsigned long) fourcc: (NSString*) format;
++
++#if 0
++- convertToFormat: (unsigned long) format;
++#endif
++
++@end
+diff --git a/iphone/include/ZBarSDK/ZBarImageScanner.h b/iphone/include/ZBarSDK/ZBarImageScanner.h
+new file mode 100644
+--- /dev/null
++++ b/iphone/include/ZBarSDK/ZBarImageScanner.h
+@@ -0,0 +1,51 @@
++//------------------------------------------------------------------------
++//  Copyright 2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++//
++//  This file is part of the ZBar Bar Code Reader.
++//
++//  The ZBar Bar Code Reader is free software; you can redistribute it
++//  and/or modify it under the terms of the GNU Lesser Public License as
++//  published by the Free Software Foundation; either version 2.1 of
++//  the License, or (at your option) any later version.
++//
++//  The ZBar Bar Code Reader is distributed in the hope that it will be
++//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
++//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++//  GNU Lesser Public License for more details.
++//
++//  You should have received a copy of the GNU Lesser Public License
++//  along with the ZBar Bar Code Reader; if not, write to the Free
++//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++//  Boston, MA  02110-1301  USA
++//
++//  http://sourceforge.net/projects/zbar
++//------------------------------------------------------------------------
++
++#import <Foundation/Foundation.h>
++#import "zbar.h"
++#import "ZBarImage.h"
++
++#ifdef __cplusplus
++using namespace zbar;
++#endif
++
++// Obj-C wrapper for ZBar image scanner
++
++@interface ZBarImageScanner : NSObject
++{
++    zbar_image_scanner_t *scanner;
++}
++
++@property (nonatomic) BOOL enableCache;
++@property (readonly, nonatomic) ZBarSymbolSet *results;
++
++// decoder configuration
++- (void) parseConfig: (NSString*) configStr;
++- (void) setSymbology: (zbar_symbol_type_t) symbology
++               config: (zbar_config_t) config
++                   to: (int) value;
++
++// image scanning interface
++- (NSInteger) scanImage: (ZBarImage*) image;
++
++@end
+diff --git a/iphone/include/ZBarSDK/ZBarReaderController.h b/iphone/include/ZBarSDK/ZBarReaderController.h
+new file mode 100644
+--- /dev/null
++++ b/iphone/include/ZBarSDK/ZBarReaderController.h
+@@ -0,0 +1,142 @@
++//------------------------------------------------------------------------
++//  Copyright 2009-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
++//
++//  This file is part of the ZBar Bar Code Reader.
++//
++//  The ZBar Bar Code Reader is free software; you can redistribute it
++//  and/or modify it under the terms of the GNU Lesser Public License as
++//  published by the Free Software Foundation; either version 2.1 of
++//  the License, or (at your option) any later version.
++//
++//  The ZBar Bar Code Reader is distributed in the hope that it will be
++//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
++//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++//  GNU Lesser Public License for more details.
++//
++//  You should have received a copy of the GNU Lesser Public License
++//  along with the ZBar Bar Code Reader; if not, write to the Free
++//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++//  Boston, MA  02110-1301  USA
++//
++//  http://sourceforge.net/projects/zbar
++//------------------------------------------------------------------------
++
++#import <UIKit/UIKit.h>
++#import "ZBarImageScanner.h"
++
++#ifdef __cplusplus
++using namespace zbar;
++#endif
++
++typedef enum {
++    // default interface provided by UIImagePickerController - user manually
++    // captures an image by pressing a button
++    ZBarReaderControllerCameraModeDefault = 0,
++
++    // automatically scan by taking screenshots with UIGetScreenImage().
++    // resolution is limited by the screen, so this is inappropriate for
++    // longer codes
++    ZBarReaderControllerCameraModeSampling,
++
++    // automatically scan by rapidly taking pictures with takePicture.
++    // tradeoff resolution with frame rate by adjusting the crop, and size
++    // properties of the reader along with the density configs of the image
++    // scanner
++    ZBarReaderControllerCameraModeSequence,
++
++} ZBarReaderControllerCameraMode;
++
++
++@class ZBarReaderController, ZBarHelpController;
++
++@protocol ZBarReaderDelegate <UIImagePickerControllerDelegate>
++@optional
++
++// called when no barcode is found in an image selected by the user.
++// if retry is NO, the delegate *must* dismiss the controller
++- (void) readerControllerDidFailToRead: (ZBarReaderController*) reader
++                             withRetry: (BOOL) retry;
++
++@end
++
++
++@interface ZBarReaderController
++    : UIImagePickerController
++    < UINavigationControllerDelegate,
++      UIImagePickerControllerDelegate >
++{
++    ZBarImageScanner *scanner;
++    ZBarHelpController *help;
++    UIView *overlay, *boxView;
++    CALayer *boxLayer;
++
++    UIToolbar *toolbar;
++    UIBarButtonItem *cancelBtn, *scanBtn, *space[3];
++    UIButton *infoBtn;
++
++    id <ZBarReaderDelegate> readerDelegate;
++    BOOL showsZBarControls, showsHelpOnFail, takesPicture, enableCache;
++    ZBarReaderControllerCameraMode cameraMode;
++    CGRect scanCrop;
++    NSInteger maxScanDimension;
++
++    BOOL hasOverlay, sampling;
++    uint64_t t_frame;
++    double dt_frame;
++
++    ZBarSymbol *symbol;
++}
++
++// access to configure image scanner
++@property (readonly, nonatomic) ZBarImageScanner *scanner;
++
++// barcode result recipient (NB don't use delegate)
++@property (nonatomic, assign) id <ZBarReaderDelegate> readerDelegate;
++
++// whether to use alternate control set
++@property (nonatomic) BOOL showsZBarControls;
++
++// whether to display helpful information when decoding fails
++@property (nonatomic) BOOL showsHelpOnFail;
++
++// how to use the camera (when sourceType == Camera)
++@property (nonatomic) ZBarReaderControllerCameraMode cameraMode;
++
++// whether to outline symbols with the green tracking box.
++@property (nonatomic) BOOL tracksSymbols;
++
++// whether to automatically take a full picture when a barcode is detected
++// (when cameraMode == Sampling)
++@property (nonatomic) BOOL takesPicture;
++
++// whether to use the "cache" for realtime modes (default YES).  this can be
++// used to safely disable the inter-frame consistency and duplicate checks,
++// speeding up recognition, iff:
++//     1. the controller is dismissed when a barcode is read and
++//     2. unreliable symbologies are disabled (all EAN/UPC variants and I2/5)
++@property (nonatomic) BOOL enableCache;
++
++// crop images for scanning.  the original image will be cropped to this
++// rectangle before scanning.  the rectangle is normalized to the image size
++// and aspect ratio; useful values will place the rectangle between 0 and 1
++// on each axis, where the x-axis corresponds to the image major axis.
++// defaults to the full image (0, 0, 1, 1).
++@property (nonatomic) CGRect scanCrop;
++
++// scale image to scan.  after cropping, the image will be scaled if
++// necessary, such that neither of its dimensions exceed this value.
++// defaults to 640.
++@property (nonatomic) NSInteger maxScanDimension;
++
++// display the built-in help browser.  for use with custom overlays if
++// you don't also want to create your own help view.  only send this
++// message when the reader is displayed.  the argument will be passed
++// to the onZBarHelp() javascript function.
++- (void) showHelpWithReason: (NSString*) reason;
++
++// direct scanner interface - scan UIImage and return something enumerable
++- (id <NSFastEnumeration>) scanImage: (CGImageRef) image;
++
++@end
++
++extern NSString* const ZBarReaderControllerResults;
+diff --git a/iphone/include/ZBarSDK/ZBarReaderView.h b/iphone/include/ZBarSDK/ZBarReaderView.h
+new file mode 100644
+--- /dev/null
++++ b/iphone/include/ZBarSDK/ZBarReaderView.h
+@@ -0,0 +1,118 @@
++//------------------------------------------------------------------------
++//  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
++//
++//  This file is part of the ZBar Bar Code Reader.
++//
++//  The ZBar Bar Code Reader is free software; you can redistribute it
++//  and/or modify it under the terms of the GNU Lesser Public License as
++//  published by the Free Software Foundation; either version 2.1 of
++//  the License, or (at your option) any later version.
++//
++//  The ZBar Bar Code Reader is distributed in the hope that it will be
++//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
++//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++//  GNU Lesser Public License for more details.
++//
++//  You should have received a copy of the GNU Lesser Public License
++//  along with the ZBar Bar Code Reader; if not, write to the Free
++//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++//  Boston, MA  02110-1301  USA
++//
++//  http://sourceforge.net/projects/zbar
++//------------------------------------------------------------------------
++
++#import <UIKit/UIKit.h>
++#import "ZBarImageScanner.h"
++
++@class AVCaptureSession, AVCaptureDevice;
++@class CALayer;
++@class ZBarImageScanner, ZBarCaptureReader, ZBarReaderView;
++
++// delegate is notified of decode results.
++
++@protocol ZBarReaderViewDelegate < NSObject >
++
++- (void) readerView: (ZBarReaderView*) readerView
++     didReadSymbols: (ZBarSymbolSet*) symbols
++          fromImage: (UIImage*) image;
++
++@end
++
++// read barcodes from the displayed video preview.  the view maintains
++// a complete video capture session feeding a ZBarCaptureReader and
++// presents the associated preview with symbol tracking annotations.
++
++@interface ZBarReaderView
++    : UIView
++{
++    id<ZBarReaderViewDelegate> readerDelegate;
++    CGRect scanCrop, zoomCrop;
++    CGAffineTransform previewTransform;
++    CGFloat zoom, zoom0;
++    BOOL tracksSymbols, showsFPS;
++    NSInteger torchMode;
++
++    CALayer *preview, *overlay, *tracking;
++    UIView *fpsView;
++    UILabel *fpsLabel;
++    UIPinchGestureRecognizer *pinch;
++    CGFloat imageScale;
++    BOOL started, running;
++}
++
++// supply a pre-configured image scanner.
++- (id) initWithImageScanner: (ZBarImageScanner*) imageScanner;
++
++// start the video stream and barcode reader.
++- (void) start;
++
++// stop the video stream and barcode reader.
++- (void) stop;
++
++// clear the internal result cache
++- (void) flushCache;
++
++// delegate is notified of decode results.
++@property (nonatomic, assign) id<ZBarReaderViewDelegate> readerDelegate;
++
++// access to image scanner for configuration.
++@property (nonatomic, readonly) ZBarImageScanner *scanner;
++
++// whether to display the tracking annotation for uncertain barcodes
++// (default YES).
++@property (nonatomic) BOOL tracksSymbols;
++
++// enable pinch gesture recognition for zooming the preview/decode
++// (default YES).
++@property (nonatomic) BOOL allowsPinchZoom;
++
++// torch mode to set automatically (default Auto).
++@property (nonatomic) NSInteger torchMode;
++
++// whether to display the frame rate for debug/configuration
++// (default NO).
++@property (nonatomic) BOOL showsFPS;
++
++// zoom scale factor applied to video preview *and* scanCrop.
++// also updated by pinch-zoom gesture.  clipped to range [1,2],
++// defaults to 1.25
++@property (nonatomic) CGFloat zoom;
++
++// the region of the image that will be scanned.  normalized coordinates.
++@property (nonatomic) CGRect scanCrop;
++
++// additional transform applied to video preview.
++// (NB *not* applied to scan crop)
++@property (nonatomic) CGAffineTransform previewTransform;
++
++// specify an alternate capture device.
++@property (nonatomic, retain) AVCaptureDevice *device;
++
++// direct access to the capture session.  warranty void if opened...
++@property (nonatomic, readonly) AVCaptureSession *session;
++@property (nonatomic, readonly) ZBarCaptureReader *captureReader;
++
++// this flag still works, but its use is deprecated
++@property (nonatomic) BOOL enableCache;
++
++@end
+diff --git a/iphone/include/ZBarSDK/ZBarReaderViewController.h b/iphone/include/ZBarSDK/ZBarReaderViewController.h
+new file mode 100644
+--- /dev/null
++++ b/iphone/include/ZBarSDK/ZBarReaderViewController.h
+@@ -0,0 +1,100 @@
++//------------------------------------------------------------------------
++//  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
++//
++//  This file is part of the ZBar Bar Code Reader.
++//
++//  The ZBar Bar Code Reader is free software; you can redistribute it
++//  and/or modify it under the terms of the GNU Lesser Public License as
++//  published by the Free Software Foundation; either version 2.1 of
++//  the License, or (at your option) any later version.
++//
++//  The ZBar Bar Code Reader is distributed in the hope that it will be
++//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
++//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++//  GNU Lesser Public License for more details.
++//
++//  You should have received a copy of the GNU Lesser Public License
++//  along with the ZBar Bar Code Reader; if not, write to the Free
++//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++//  Boston, MA  02110-1301  USA
++//
++//  http://sourceforge.net/projects/zbar
++//------------------------------------------------------------------------
++
++#import <UIKit/UIKit.h>
++#import "ZBarReaderController.h"
++
++@class ZBarReaderView;
++
++// drop in video scanning replacement for ZBarReaderController.
++// this is a thin controller around a ZBarReaderView that adds the UI
++// controls and select functionality offered by ZBarReaderController.
++// Automatically falls back to a ZBarReaderController if video APIs
++// are unavailable (eg for OS < 4.0)
++
++@interface ZBarReaderViewController
++    : UIViewController
++{
++    ZBarImageScanner *scanner;
++    id <ZBarReaderDelegate> readerDelegate;
++    ZBarReaderView *readerView;
++    UIView *cameraOverlayView;
++    CGAffineTransform cameraViewTransform;
++    CGRect scanCrop;
++    BOOL showsZBarControls, tracksSymbols, enableCache;
++
++    UIView *controls;
++    BOOL didHideStatusBar;
++}
++
++// access to configure image scanner
++@property (nonatomic, readonly) ZBarImageScanner *scanner;
++
++// barcode result recipient
++@property (nonatomic, assign) id <ZBarReaderDelegate> readerDelegate;
++
++// whether to use alternate control set
++@property (nonatomic) BOOL showsZBarControls;
++
++// whether to show the green tracking box.  note that, even when
++// enabled, the box will only be visible when scanning EAN and I2/5.
++@property (nonatomic) BOOL tracksSymbols;
++
++// crop images for scanning.  the image will be cropped to this
++// rectangle before scanning.  the rectangle is normalized to the
++// image size and aspect ratio; useful values will place the rectangle
++// between 0 and 1 on each axis, where the x-axis corresponds to the
++// image major axis.  defaults to the full image (0, 0, 1, 1).
++@property (nonatomic) CGRect scanCrop;
++
++// provide a custom overlay.  note that this can be used with
++// showsZBarControls enabled (but not if you want backward compatibility)
++@property (nonatomic, retain) UIView *cameraOverlayView;
++
++// transform applied to the preview image.
++@property (nonatomic) CGAffineTransform cameraViewTransform;
++
++// display the built-in help browser.  the argument will be passed to
++// the onZBarHelp() javascript function.
++- (void) showHelpWithReason: (NSString*) reason;
++
++// direct access to the ZBarReaderView
++@property (nonatomic, readonly) ZBarReaderView *readerView;
++
++// this flag still works, but its use is deprecated
++@property (nonatomic) BOOL enableCache;
++
++// these are present only for backward compatibility.
++// they will error if inappropriate/unsupported values are set
++@property (nonatomic) UIImagePickerControllerSourceType sourceType; // Camera
++@property (nonatomic) BOOL allowsEditing; // NO
++@property (nonatomic) BOOL allowsImageEditing; // NO
++@property (nonatomic) BOOL showsCameraControls; // NO
++@property (nonatomic) BOOL showsHelpOnFail; // ignored
++@property (nonatomic) ZBarReaderControllerCameraMode cameraMode; // Sampling
++@property (nonatomic) BOOL takesPicture; // NO
++@property (nonatomic) NSInteger maxScanDimension; // ignored
++
+++ (BOOL) isSourceTypeAvailable: (UIImagePickerControllerSourceType) sourceType;
++
++@end
+diff --git a/iphone/include/ZBarSDK/ZBarSDK.h b/iphone/include/ZBarSDK/ZBarSDK.h
+new file mode 100644
+--- /dev/null
++++ b/iphone/include/ZBarSDK/ZBarSDK.h
+@@ -0,0 +1,33 @@
++/*------------------------------------------------------------------------
++ *  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
++ *
++ *  This file is part of the ZBar Bar Code Reader.
++ *
++ *  The ZBar Bar Code Reader is free software; you can redistribute it
++ *  and/or modify it under the terms of the GNU Lesser Public License as
++ *  published by the Free Software Foundation; either version 2.1 of
++ *  the License, or (at your option) any later version.
++ *
++ *  The ZBar Bar Code Reader is distributed in the hope that it will be
++ *  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
++ *  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU Lesser Public License for more details.
++ *
++ *  You should have received a copy of the GNU Lesser Public License
++ *  along with the ZBar Bar Code Reader; if not, write to the Free
++ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++ *  Boston, MA  02110-1301  USA
++ *
++ *  http://sourceforge.net/projects/zbar
++ *------------------------------------------------------------------------*/
++
++#import "zbar.h"
++
++#import "ZBarSymbol.h"
++#import "ZBarImage.h"
++#import "ZBarImageScanner.h"
++#import "ZBarReaderView.h"
++#import "ZBarReaderViewController.h"
++#import "ZBarReaderController.h"
++#import "ZBarCaptureReader.h"
++#import "ZBarHelpController.h"
+diff --git a/iphone/include/ZBarSDK/ZBarSymbol.h b/iphone/include/ZBarSDK/ZBarSymbol.h
+new file mode 100644
+--- /dev/null
++++ b/iphone/include/ZBarSDK/ZBarSymbol.h
+@@ -0,0 +1,71 @@
++//------------------------------------------------------------------------
++//  Copyright 2009-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
++//
++//  This file is part of the ZBar Bar Code Reader.
++//
++//  The ZBar Bar Code Reader is free software; you can redistribute it
++//  and/or modify it under the terms of the GNU Lesser Public License as
++//  published by the Free Software Foundation; either version 2.1 of
++//  the License, or (at your option) any later version.
++//
++//  The ZBar Bar Code Reader is distributed in the hope that it will be
++//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
++//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++//  GNU Lesser Public License for more details.
++//
++//  You should have received a copy of the GNU Lesser Public License
++//  along with the ZBar Bar Code Reader; if not, write to the Free
++//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++//  Boston, MA  02110-1301  USA
++//
++//  http://sourceforge.net/projects/zbar
++//------------------------------------------------------------------------
++
++#import <Foundation/Foundation.h>
++#import <CoreGraphics/CoreGraphics.h>
++#import "zbar.h"
++
++#ifdef __cplusplus
++using namespace zbar;
++#endif
++
++// Obj-C wrapper for ZBar result types
++
++@interface ZBarSymbolSet
++    : NSObject <NSFastEnumeration>
++{
++    const zbar_symbol_set_t *set;
++    BOOL filterSymbols;
++}
++
++@property (readonly, nonatomic) int count;
++@property (readonly, nonatomic) const zbar_symbol_set_t *zbarSymbolSet;
++@property (nonatomic) BOOL filterSymbols;
++
++- (id) initWithSymbolSet: (const zbar_symbol_set_t*) set;
++
++@end
++
++
++@interface ZBarSymbol : NSObject
++{
++    const zbar_symbol_t *symbol;
++}
++
++@property (readonly, nonatomic) zbar_symbol_type_t type;
++@property (readonly, nonatomic) NSString *typeName;
++@property (readonly, nonatomic) NSUInteger configMask;
++@property (readonly, nonatomic) NSUInteger modifierMask;
++@property (readonly, nonatomic) NSString *data;
++@property (readonly, nonatomic) int quality;
++@property (readonly, nonatomic) int count;
++@property (readonly, nonatomic) zbar_orientation_t orientation;
++@property (readonly, nonatomic) ZBarSymbolSet *components;
++@property (readonly, nonatomic) const zbar_symbol_t *zbarSymbol;
++@property (readonly, nonatomic) CGRect bounds;
++
++- (id) initWithSymbol: (const zbar_symbol_t*) symbol;
++
+++ (NSString*) nameForType: (zbar_symbol_type_t) type;
++
++@end
+diff --git a/iphone/include/config.h b/iphone/include/config.h
+new file mode 100644
+--- /dev/null
++++ b/iphone/include/config.h
+@@ -0,0 +1,231 @@
++/* manually customized for iPhone platform */
++
++/* whether to build support for Code 128 symbology */
++#define ENABLE_CODE128 1
++
++/* whether to build support for Code 93 symbology */
++#define ENABLE_CODE93 1
++
++/* whether to build support for Code 39 symbology */
++#define ENABLE_CODE39 1
++
++/* whether to build support for DataBar symbology */
++#define ENABLE_DATABAR 1
++
++/* whether to build support for EAN symbologies */
++#define ENABLE_EAN 1
++
++/* whether to build support for Interleaved 2 of 5 symbology */
++#define ENABLE_I25 1
++
++/* whether to build support for PDF417 symbology */
++#undef ENABLE_PDF417
++
++/* whether to build support for QR Code */
++#define ENABLE_QRCODE 1
++
++/* Define to 1 if you have the `atexit' function. */
++#undef HAVE_ATEXIT
++
++/* Define to 1 if you have the <dlfcn.h> header file. */
++#undef HAVE_DLFCN_H
++
++/* Define to 1 if you have the <fcntl.h> header file. */
++#undef HAVE_FCNTL_H
++
++/* Define to 1 if you have the <features.h> header file. */
++#undef HAVE_FEATURES_H
++
++/* Define to 1 if you have the `getpagesize' function. */
++#undef HAVE_GETPAGESIZE
++
++/* Define if you have the iconv() function and it works. */
++#undef HAVE_ICONV
++
++/* Define to 1 if you have the <inttypes.h> header file. */
++#define HAVE_INTTYPES_H 1
++
++/* Define to 1 if you have the <jpeglib.h> header file. */
++#undef HAVE_JPEGLIB_H
++
++/* Define to 1 if you have the `jpeg' library (-ljpeg). */
++#undef HAVE_LIBJPEG
++
++/* Define to 1 if you have the `pthread' library (-lpthread). */
++#undef HAVE_LIBPTHREAD
++
++/* Define to 1 if you have the <linux/videodev2.h> header file. */
++#undef HAVE_LINUX_VIDEODEV2_H
++
++/* Define to 1 if you have the <linux/videodev.h> header file. */
++#undef HAVE_LINUX_VIDEODEV_H
++
++/* Define to 1 if you have the <memory.h> header file. */
++#undef HAVE_MEMORY_H
++
++/* Define to 1 if you have the `memset' function. */
++#define HAVE_MEMSET 1
++
++/* Define to 1 if you have a working `mmap' system call. */
++#undef HAVE_MMAP
++
++/* Define to 1 if you have the <poll.h> header file. */
++#undef HAVE_POLL_H
++
++/* Define to 1 if you have the <pthread.h> header file. */
++#undef HAVE_PTHREAD_H
++
++/* Define to 1 if you have the `setenv' function. */
++#undef HAVE_SETENV
++
++/* Define to 1 if you have the <stdint.h> header file. */
++#define HAVE_STDINT_H 1
++
++/* Define to 1 if you have the <stdlib.h> header file. */
++#define HAVE_STDLIB_H 1
++
++/* Define to 1 if you have the <strings.h> header file. */
++#define HAVE_STRINGS_H 1
++
++/* Define to 1 if you have the <string.h> header file. */
++#define HAVE_STRING_H 1
++
++/* Define to 1 if you have the <sys/ioctl.h> header file. */
++#undef HAVE_SYS_IOCTL_H
++
++/* Define to 1 if you have the <sys/ipc.h> header file. */
++#undef HAVE_SYS_IPC_H
++
++/* Define to 1 if you have the <sys/mman.h> header file. */
++#undef HAVE_SYS_MMAN_H
++
++/* Define to 1 if you have the <sys/shm.h> header file. */
++#undef HAVE_SYS_SHM_H
++
++/* Define to 1 if you have the <sys/stat.h> header file. */
++#define HAVE_SYS_STAT_H 1
++
++/* Define to 1 if you have the <sys/times.h> header file. */
++#define HAVE_SYS_TIMES_H 1
++
++/* Define to 1 if you have the <sys/time.h> header file. */
++#define HAVE_SYS_TIME_H 1
++
++/* Define to 1 if you have the <sys/types.h> header file. */
++#define HAVE_SYS_TYPES_H 1
++
++/* Define to 1 if the system has the type `uintptr_t'. */
++#define HAVE_UINTPTR_T 1
++
++/* Define to 1 if you have the <unistd.h> header file. */
++#define HAVE_UNISTD_H 1
++
++/* Define to 1 if you have the <vfw.h> header file. */
++#undef HAVE_VFW_H
++
++/* Define to 1 if you have the <X11/extensions/XShm.h> header file. */
++#undef HAVE_X11_EXTENSIONS_XSHM_H
++
++/* Define to 1 if you have the <X11/extensions/Xvlib.h> header file. */
++#undef HAVE_X11_EXTENSIONS_XVLIB_H
++
++/* Define as const if the declaration of iconv() needs const. */
++#undef ICONV_CONST
++
++/* Library major version */
++#define LIB_VERSION_MAJOR 0
++
++/* Library minor version */
++#define LIB_VERSION_MINOR 2
++
++/* Library revision */
++#define LIB_VERSION_REVISION 0
++
++/* Define to the sub-directory in which libtool stores uninstalled libraries.
++   */
++#undef LT_OBJDIR
++
++/* Define to 1 if assertions should be disabled. */
++//#undef NDEBUG
++
++/* Define to 1 if your C compiler doesn't accept -c and -o together. */
++#undef NO_MINUS_C_MINUS_O
++
++/* Name of package */
++#define PACKAGE "zbar"
++
++/* Define to the address where bug reports for this package should be sent. */
++#define PACKAGE_BUGREPORT "spadix@users.sourceforge.net"
++
++/* Define to the full name of this package. */
++#define PACKAGE_NAME "zbar"
++
++/* Define to the full name and version of this package. */
++#define PACKAGE_STRING "zbar 0.10"
++
++/* Define to the one symbol short name of this package. */
++#define PACKAGE_TARNAME "zbar"
++
++/* Define to the version of this package. */
++#define PACKAGE_VERSION "0.10"
++
++/* Define to 1 if you have the ANSI C header files. */
++#define STDC_HEADERS 1
++
++/* Version number of package */
++#define VERSION "0.10"
++
++/* Define to 1 if the X Window System is missing or not being used. */
++#define X_DISPLAY_MISSING 1
++
++/* Program major version (before the '.') as a number */
++#define ZBAR_VERSION_MAJOR 0
++
++/* Program minor version (after '.') as a number */
++#define ZBAR_VERSION_MINOR 10
++
++/* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
++   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
++   #define below would cause a syntax error. */
++#undef _UINT32_T
++
++/* Define for Solaris 2.5.1 so the uint8_t typedef from <sys/synch.h>,
++   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
++   #define below would cause a syntax error. */
++#undef _UINT8_T
++
++/* Minimum Windows API version */
++#undef _WIN32_WINNT
++
++/* used only for pthread debug attributes */
++#undef __USE_UNIX98
++
++/* Define to empty if `const' does not conform to ANSI C. */
++#undef const
++
++/* Define to `__inline__' or `__inline' if that's what the C compiler
++   calls it, or to nothing if 'inline' is not supported under any name.  */
++#ifndef __cplusplus
++#undef inline
++#endif
++
++/* Define to the type of a signed integer type of width exactly 32 bits if
++   such a type exists and the standard includes do not define it. */
++#undef int32_t
++
++/* Define to the type of an unsigned integer type of width exactly 32 bits if
++   such a type exists and the standard includes do not define it. */
++#undef uint32_t
++
++/* Define to the type of an unsigned integer type of width exactly 8 bits if
++   such a type exists and the standard includes do not define it. */
++#undef uint8_t
++
++/* Define to the type of an unsigned integer type wide enough to hold a
++   pointer, if such a type exists, and if the system does not define it. */
++#undef uintptr_t
++
++#ifndef X_DISPLAY_MISSING
++# define HAVE_X
++#endif
++
+diff --git a/iphone/include/prefix.pch b/iphone/include/prefix.pch
+new file mode 100644
+--- /dev/null
++++ b/iphone/include/prefix.pch
+@@ -0,0 +1,10 @@
++#ifdef __OBJC__
++# import <Foundation/Foundation.h>
++# import <CoreFoundation/CoreFoundation.h>
++# import <CoreGraphics/CoreGraphics.h>
++# import <UIKit/UIKit.h>
++# import <QuartzCore/QuartzCore.h>
++# import <AVFoundation/AVFoundation.h>
++# import <CoreMedia/CoreMedia.h>
++# import <CoreVideo/CoreVideo.h>
++#endif
+diff --git a/iphone/res/ZBarSDK-Info.plist b/iphone/res/ZBarSDK-Info.plist
+new file mode 100644
+--- /dev/null
++++ b/iphone/res/ZBarSDK-Info.plist
+@@ -0,0 +1,16 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
++<plist version="1.0">
++<dict>
++	<key>CFBundleDevelopmentRegion</key>
++	<string>English</string>
++	<key>CFBundleName</key>
++	<string>ZBarSDK</string>
++	<key>CFBundleVersion</key>
++	<string>1.0.1</string>
++	<key>CFBundleSignature</key>
++	<string>????</string>
++	<key>NSHumanReadableCopyright</key>
++	<string>Copyright 2010 © Jeff Brown et al</string>
++</dict>
++</plist>
+diff --git a/iphone/res/ZBarSDK-bg.png b/iphone/res/ZBarSDK-bg.png
+new file mode 100644
+index 0000000000000000000000000000000000000000..5c633ace7cfc63684aed03aa53c71c7b752eb317
+GIT binary patch
+literal 23569
+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%0D~81_Z(L+
+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
+VH=rocyi2gz*3&|1Rv_)e{|ElIn@s=!
+
+diff --git a/iphone/res/ZBarSDK-bg.svg b/iphone/res/ZBarSDK-bg.svg
+new file mode 100644
+--- /dev/null
++++ b/iphone/res/ZBarSDK-bg.svg
+@@ -0,0 +1,78 @@
++<?xml version="1.0"?>
++<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
++  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
++
++<!--
++   Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
++     All Rights Reserved
++
++   icon size = 64
++   grid spacing = 32
++
++   $ java -Xmx2000m -jar batik-rasterizer.jar -w 4096 -h 4864 -d res/ZBarSDK-bg.8x.png res/ZBarSDK-bg.svg
++   $ convert -resize 12.5% res/ZBarSDK-bg.8x.png res/ZBarSDK-bg.png
++-->
++
++<svg version="1.1" id="top"
++  width="512px" height="608px"
++  viewBox="-1,-1 16,19" preserveAspectRatio="xMidYMid" overflow="visible"
++  xmlns="http://www.w3.org/2000/svg"
++  xmlns:xlink="http://www.w3.org/1999/xlink">
++
++  <title>ZBar iPhone SDK DMG Folder Background Image</title>
++
++  <defs>
++    <style type="text/css"><![CDATA[
++      path, line { fill: none; stroke-linejoin: round; stroke-linecap: round }
++      #bg { fill: url(#bg-grad) }
++      #grid { fill: none; stroke: white; stroke-opacity: .25 ; stroke-width: .05 }
++      #icons { marker: url(#icon) }
++      #icon *, .text { fill: none; stroke: red; stroke-width: .05 }
++      .section { fill: white; stroke: black; stroke-width: .1 }
++      #drag { stroke: none; fill: url(#drag-grad) }
++      text { text-anchor: middle; font-family: sans-serif; font-size: .78125 }
++      .small { font-size: 66% }
++    ]]></style>
++    <marker id="icon" overflow="visible"><rect x="-1" y="-1" width="2" height="2"/></marker>
++    <linearGradient id="bg-grad" x2="0%" y1="5%" y2="100%">
++      <stop offset="0%" stop-color="#36a"/>
++      <stop offset="100%" stop-color="#112"/>
++    </linearGradient>
++    <linearGradient id="drag-grad" x1="100%" x2="0%">
++      <stop offset="0%" stop-color="#4f8" stop-opacity="0.05"/>
++      <stop offset="72%" stop-color="#4f8" stop-opacity=".9"/>
++      <stop offset="100%" stop-color="#4f8" stop-opacity="1"/>
++    </linearGradient>
++  </defs>
++
++  <rect id="bg" x="-1" y="-1" width="16" height="19"/>
++
++  <rect class="section" x="1.5" y="-.25" width="11" height="4" rx=".5" ry=".5"/>
++  <rect class="section" x="1.5" y="4.75" width="11" height="4" rx=".5" ry=".5"/>
++  <rect class="section" x=".5" y="9.75" width="13" height="7.5" rx=".5" ry=".5"/>
++
++  <text y="1.75">
++    <tspan x="8.75" dy=".2344">Read this first</tspan>
++  </text>
++  <text y="6.75">
++    <tspan x="8.75" dy="-.75">Then drag this</tspan>
++    <tspan x="8.75" dy="1">into your</tspan>
++    <tspan x="8.75" dy="1">Xcode project</tspan>
++  </text>
++
++  <path id="drag"
++    d="M3.5,6.125 v1 h-2.75 v.3 l-1.1,-.8 l1.1,-.8 v.3z"/>
++
++<!--
++  <g id="debug">
++    <path id="grid"
++      d="M0,0h14 M0,2h14 M0,4h14 M0,6h14 M0,8h14 M0,10h14 M0,12h14 M0,14h14 M0,16h14 M0,18h14
++         M0,0v17 M2,0v17 M4,0v17 M6,0v17 M8,0v17 M10,0v17 M12,0v17 M14,0v17"/>
++    <path id="icons" d="M3.5,1.5 M3.5,6.5
++                        M3,11.5 M7,11.5 M11,11.5
++                        M3,15 M7,15 M11,15"/>
++    <rect class="text" x="5.5" y=".25" width="6.5" height="3"/>
++    <rect class="text" x="5.5" y="5.25" width="6.5" height="3"/>
++  </g>
++-->
++</svg>
+diff --git a/iphone/res/ZBarSDK.DS_Store b/iphone/res/ZBarSDK.DS_Store
+new file mode 100644
+index 0000000000000000000000000000000000000000..6e71b2f4e8aa91b36e4a25535611f49c4e466a9a
+GIT binary patch
+literal 8196
+zc%1E5TTc@~6h1Spbh$_u6fcmNMwFPS2pElGjHT2_1JcG4X%Qv6?Xcaj-D!5W;3Y)j
+zi?93*6JLGx5BO?)Gx`&Z@g2{0r_yf47hg2YmrTE%IhQ#z=j==u07$A{o&-=}zo~ur
+z^BN%03jwHLzfVvO5)u*;5)u;sJt6@q{{4Pl-2W015{C;Un$D+F(D;*ouoAYU;GKYp
+z7^i}xA^n8lq~M)^iI7vlQNfB}Rd7OZQt(c|B1l4;!3$Odi_a925S;wOq9h~^H-c~b
+zaed3J=@!?q_eQT-rt3{itS*~&nQx_d-7dRp>Zunmu1!u|N=#1O*uInqp08h>*xp{v
+zn`NeJ&azqdDk?n6SNN6~QW~8l&MoXbZU{WhtGg-9X-IOKS3$`qpwX_FLLx^H%Fx8^
+zJM#;Lbtj0h`NBhw;BLV$gV4>=rU;#WXokL~#$9xuDRDdJuuYR~DQoI+T`O%Ej=!8)
+zZgJ<H!<aqV+=$hNfyb&Dd!0YoS6zBmV=66p?5USGpR>{Ag+RZ}U#6-VY{oJ*H#<Pa
+z8c~n==UZ$ASDH`HAGG^(7lYHUU+7)djq#do{B>6M5FLXQ&WdTK$M-{@4ow}$^EU=7
+zkOB=H$U_?Dp&!m*YahD|Iv6kxHL#HfVdP4S(<`0p>1`2%A6>!3>;zkyYi{YWP>NDk
+zosHi4+7u7^natKaliTh?=D5gMZ-!%*v+L_F^NNoxO=nitPI1rU)$WEUU(-saZHy+1
+zzubgodBDm=&2co_V5w(IHn&-e&%zfqj^%kI*4=wFJ}`Lv#L3enLb{ZmzJ4`wY$$Rn
+zf*02?jKCD!f;m`*B5uqEydrPOJMx}<B%jH5@`D2Hr*S$$&(WK7md?>7k&|X|j|d(X
+z<8^2h_onMv9#)`PvNypm{aL7B68tS^umBv4jKxdh&Gm1-9W>kB+xt}jF|^1+4x`Gz
+zBHZiLrqH5&6jRHg1a+vQe;YiU%L5a~>~>2Mwj4az5{smQ&sDHOJ|GmU0(apl+EuZr
+zEcD`b&KX+U0<LNntroE;?{<1`i?9nGpymw5c|WWRyV!DVp4*E3H`?D?v?U}YBqSsx
+KBqSvMdHe+GEK9fm
+
+diff --git a/iphone/res/buttondown.svg b/iphone/res/buttondown.svg
+new file mode 100644
+--- /dev/null
++++ b/iphone/res/buttondown.svg
+@@ -0,0 +1,57 @@
++<?xml version="1.0"?>
++<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
++  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
++
++<!--
++   Copyright 2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++     All Rights Reserved
++-->
++
++<svg version="1.1" id="top"
++  width="384px" height="384px"
++  viewBox="0,0 1,1" preserveAspectRatio="xMidYMid" overflow="visible"
++  xmlns="http://www.w3.org/2000/svg"
++  xmlns:xlink="http://www.w3.org/1999/xlink">
++
++  <title>rounded button overlay</title>
++
++  <defs>
++    <style type="text/css"><![CDATA[
++      #bg { fill: #202020 }
++      #test { fill: #d22 }
++      #button { fill: black; stroke: none; filter: url(#emboss) }
++    ]]></style>
++
++    <filter id="emboss" filterUnits="userSpaceOnUse"
++      x="-1" y="-1" width="3" height="3">
++      <feFlood flood-color="black"
++        x=".05" y=".05" width=".9" height=".9"/>
++      <feGaussianBlur result="grad" stdDeviation=".1"
++        x="-1" y="-1" width="3" height="3"/>
++
++      <feComponentTransfer>
++        <feFuncA type="linear" slope="-1" intercept="1"/>
++      </feComponentTransfer>
++
++      <feSpecularLighting surfaceScale=".25" specularConstant=".75"
++        specularExponent="16" lighting-color="#ccc">
++        <fePointLight x="6" y="-10" z="2"/>
++      </feSpecularLighting>
++      <feGaussianBlur result="spec" stdDeviation="0.015"/>
++
++      <feColorMatrix in="grad" type="matrix" values="
++0 0 0 0 0
++0 0 0 0 0
++0 0 0 0 0
++0 0 0 .8 -.3
++"/>
++      <feComposite in2="spec" operator="over"/>
++      <feComposite in2="SourceAlpha" operator="in"/>
++    </filter>
++  </defs>
++<!--
++  <rect id="bg" x="-.5" y="-.5" width="2" height="2"/>
++  <rect id="test" width="1" height="1" rx=".2" ry=".2"/>
++-->
++  <rect id="button" width="1" height="1" rx=".25" ry=".25"/>
++</svg>
+diff --git a/iphone/res/buttonmask.svg b/iphone/res/buttonmask.svg
+new file mode 100644
+--- /dev/null
++++ b/iphone/res/buttonmask.svg
+@@ -0,0 +1,26 @@
++<?xml version="1.0"?>
++<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
++  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
++
++<!--
++   Copyright 2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++     All Rights Reserved
++-->
++
++<svg version="1.1" id="top"
++  width="384px" height="384px"
++  viewBox="0,0 1,1" preserveAspectRatio="xMidYMid" overflow="visible"
++  xmlns="http://www.w3.org/2000/svg"
++  xmlns:xlink="http://www.w3.org/1999/xlink">
++
++  <title>mask for button overlays</title>
++
++  <defs>
++    <style type="text/css"><![CDATA[
++      #bg { fill: white; stroke: none }
++      #mask { fill: black; stroke: none }
++    ]]></style>
++  </defs>
++  <!--<rect id="bg" x="-1" y="-1" width="3" height="3"/>-->
++  <rect id="mask" width="1" height="1" rx=".25" ry=".25"/>
++</svg>
+diff --git a/iphone/res/buttonup.svg b/iphone/res/buttonup.svg
+new file mode 100644
+--- /dev/null
++++ b/iphone/res/buttonup.svg
+@@ -0,0 +1,57 @@
++<?xml version="1.0"?>
++<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
++  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
++
++<!--
++   Copyright 2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++     All Rights Reserved
++-->
++
++<svg version="1.1" id="top"
++  width="384px" height="384px"
++  viewBox="0,0 1,1" preserveAspectRatio="xMidYMid" overflow="visible"
++  xmlns="http://www.w3.org/2000/svg"
++  xmlns:xlink="http://www.w3.org/1999/xlink">
++
++  <title>rounded button overlay</title>
++
++  <defs>
++    <style type="text/css"><![CDATA[
++      #bg { fill: #202020 }
++      #test { fill: #d22 }
++      #button { fill: black; stroke: none; filter: url(#emboss) }
++    ]]></style>
++
++    <filter id="emboss" filterUnits="userSpaceOnUse"
++      x="-1" y="-1" width="3" height="3">
++      <feFlood flood-color="black"
++        x=".05" y=".05" width=".9" height=".9"/>
++      <feGaussianBlur result="grad" stdDeviation=".1"
++        x="-1" y="-1" width="3" height="3"/>
++
++      <feSpecularLighting surfaceScale=".25" specularConstant="1"
++        specularExponent="16" lighting-color="#ccc">
++        <fePointLight x="6" y="-10" z="5"/>
++      </feSpecularLighting>
++      <feGaussianBlur result="spec" stdDeviation="0.015"/>
++
++      <feColorMatrix in="grad" type="matrix" values="
++0 0 0 0 0
++0 0 0 0 0
++0 0 0 0 0
++0 0 0 -1.05 1
++"/>
++      <feComposite in2="spec" operator="over"/>
++      <feComposite in2="SourceAlpha" operator="in" result="result"/>
++      <feFlood flood-color="black"/>
++      <feComposite in2="SourceAlpha" operator="out"/>
++      <feComposite in2="result" operator="over"/>
++    </filter>
++  </defs>
++<!--
++  <rect id="bg" x="-.5" y="-.5" width="2" height="2"/>
++
++  <rect id="test" width="1" height="1" rx=".2" ry=".2"/>
++-->
++  <rect id="button" width="1" height="1" rx=".25" ry=".25"/>
++</svg>
+diff --git a/iphone/res/lightbulb.svg b/iphone/res/lightbulb.svg
+new file mode 100644
+--- /dev/null
++++ b/iphone/res/lightbulb.svg
+@@ -0,0 +1,108 @@
++<?xml version="1.0"?>
++<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
++  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
++
++<!--
++   Copyright 2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++     All Rights Reserved
++-->
++
++<svg version="1.1" id="top"
++  width="512px" height="512px"
++  viewBox="0,0 1,1" preserveAspectRatio="xMidYMid" overflow="visible"
++  xmlns="http://www.w3.org/2000/svg"
++  xmlns:xlink="http://www.w3.org/1999/xlink">
++
++  <title>lit light bulb icon</title>
++
++  <defs>
++    <style type="text/css"><![CDATA[
++      path, line { fill: none; stroke-linejoin: round; stroke-linecap: round }
++      #bg { fill: #202020 }
++      #bulb { fill: url(#bulb-on); stroke: #778; stroke-width: .06 }
++      #support { stroke: #888; stroke-width: .03; stroke-opacity: .4 }
++      #filament { stroke: #f80; stroke-width: .06; stroke-opacity: .5 }
++      #rays line { stroke: #fff; stroke-width: .1 }
++      #base { fill: #ccc; stroke: #777; stroke-width: .14 }
++      #screw { stroke: #777; stroke-width: .25 }
++      #nub { fill: #444; stroke: #444; stroke-width: .25 }
++    ]]></style>
++
++    <radialGradient id="bulb-off" gradientUnits="userSpaceOnUse" cx="0" cy="0" r="1.2">
++      <stop offset="0%" stop-color="#ccc"/>
++      <stop offset="33%" stop-color="#ccc"/>
++      <stop offset="100%" stop-color="#999"/>
++    </radialGradient>
++
++    <radialGradient id="bulb-on" gradientUnits="userSpaceOnUse" cx="0" cy="0" r="1.2">
++      <stop offset="0%" stop-color="#ffc"/>
++      <stop offset="33%" stop-color="#ffb"/>
++      <stop offset="100%" stop-color="#dda"/>
++    </radialGradient>
++  </defs>
++
++  <!--<rect id="bg" width="1" height="1"/>-->
++
++  <g transform="translate(.5,.28) scale(.27)">
++    <path id="bulb" d="
++M-.42,1.85
++C-.42,1.4 -.42,1.22 -.866,.5
++A1,1 0 1 1 .866,.5
++C.42,1.22 .42,1.4 .42,1.85
++z
++"/>
++    <path id="support" d="
++M-.42,.1
++C-.15,.9 -.15,1 -.15,1.86
++M.42,.1
++C.15,.9 .15,1 .15,1.86
++"/>
++    <path id="filament" d="
++M-.42,.1
++a.18,.15 0 1 1 .28,0
++a.18,.15 0 1 1 .28,0
++a.18,.15 0 1 1 .28,0
++"/>
++
++    <g id="rays">
++      <line x1="1.2" x2="1.8" transform="rotate(-30)"/>
++      <line x1="1.2" x2="1.8"/>
++      <line x1="1.2" x2="1.8" transform="rotate(30)"/>
++      <line x1="-1.2" x2="-1.8" transform="rotate(-30)"/>
++      <line x1="-1.2" x2="-1.8"/>
++      <line x1="-1.2" x2="-1.8" transform="rotate(30)"/>
++    </g>
++  </g>
++
++  <g transform="translate(.5,.778) scale(.11)">
++    <path id="base" d="
++M-1,-.05
++A2,.75 0 0 0 1,-.05
++V1.2
++L.55,1.6
++H-.55
++L-1,1.2
++z
++"/>
++    <clipPath id="base-clip"><use xlink:href="#base"/></clipPath>
++    <path id="screw" clip-path="url(#base-clip)" d="
++M-1,.1
++a2.2,1 0 0 0 2,-.14
++M-1,.6
++a2.2,1 0 0 0 2,-.14
++M-1,1.1
++a2.2,1 0 0 0 2,-.14
++M-1,1.6
++a2.2,1 0 0 0 2,-.14
++"/>
++  </g>
++
++  <path id="nub" transform="translate(.5,.954) scale(.06)" d="
++M-1,-.05
++A2,.333 0 0 0 1,-.05
++L.5,.5
++H-.5
++z
++"/>
++
++</svg>
+diff --git a/iphone/res/shakyhand.svg b/iphone/res/shakyhand.svg
+new file mode 100644
+--- /dev/null
++++ b/iphone/res/shakyhand.svg
+@@ -0,0 +1,108 @@
++<?xml version="1.0"?>
++<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
++  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
++
++<!--
++   Copyright 2009-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
++     All Rights Reserved
++-->
++
++<svg version="1.1" id="top"
++  width="512px" height="512px"
++  viewBox="0,0 1,1" preserveAspectRatio="xMidYMid" overflow="visible"
++  xmlns="http://www.w3.org/2000/svg"
++  xmlns:xlink="http://www.w3.org/1999/xlink">
++
++  <title>unstable hand icon</title>
++
++  <defs>
++    <style type="text/css"><![CDATA[
++      path, line, circle { fill: none; stroke-linejoin: round; stroke-linecap: round }
++      #bg { fill: #202020 }
++      #hand-outline { stroke: #a76; stroke-width: .75; stroke-opacity: 1 }
++      #skin-base { fill: #db9 }
++      #skin circle { fill: url(#skin-grad);/* stroke: red; stroke-width: .01*/ }
++      #shakes { stroke: #d5f; stroke-width: .03125 } /* #f43 */
++    ]]></style>
++
++    <clipPath id="hand-clip"><use xlink:href="#hand-outline"/></clipPath>
++    <clipPath id="wrist-clip"><rect x="-20" y="3" width="40" height="42"/></clipPath>
++
++    <radialGradient id="skin-grad" r=".5" cx=".5" cy=".5">
++      <stop offset="0%" stop-color="#edc"/>
++      <stop offset="100%" stop-color="#edc" stop-opacity="0"/>
++    </radialGradient>
++  </defs>
++
++  <!--<rect id="bg" width="1" height="1"/>-->
++
++  <g id="hand" transform="translate(.5,-.025) scale(.0225)"
++    clip-path="url(#wrist-clip)">
++    <g id="skin" clip-path="url(#hand-clip)">
++      <rect id="skin-base" x="-20" y="0" width="40" height="50"/>
++
++      <circle r="10" transform="translate(4,33) rotate(-50) scale(1,.75)"/>
++      <circle r="4" transform="translate(-7,32) rotate(-8) scale(1,2)"/>
++      <circle r="4" transform="translate(-1.5,23) rotate(-8) scale(2.4,.9)"/>
++
++      <g transform="rotate(-27.44 0,40)">
++        <circle r="1.5" transform="translate(0,11.5) scale(.85,1.5)"/>
++        <circle r="1.5" transform="translate(0,15.25) scale(.85,1.5)"/>
++        <circle r="1.5" transform="translate(-.2,19) scale(.85,1.5)"/>
++      </g>
++      <g transform="rotate(-13.83 0,40) translate(0,.5)">
++        <circle r="2" transform="translate(0,6.25) scale(.85,1.75)"/>
++        <circle r="2" transform="translate(0,11.5) scale(.85,1.75)"/>
++        <circle r="2" transform="translate(0,16.75) scale(.85,1.75)"/>
++      </g>
++      <g>
++        <circle r="2" transform="translate(0,6.25) scale(.85,1.75)"/>
++        <circle r="2" transform="translate(0,11.5) scale(.85,1.75)"/>
++        <circle r="2" transform="translate(0,16.75) scale(.85,1.75)"/>
++      </g>
++      <g transform="rotate(13.83 0,40) translate(0,.5)">
++        <circle r="2" transform="translate(0,6.25) scale(.85,1.75)"/>
++        <circle r="2" transform="translate(0,11.5) scale(.85,1.75)"/>
++        <circle r="2" transform="translate(0,16.75) scale(.85,1.75)"/>
++      </g>
++      <g transform="rotate(23.025 0,49.75)">
++        <circle r="2.25" transform="translate(0,18) scale(.85,1.5)"/>
++        <circle r="2.25" transform="translate(0,24) scale(.85,1.5)"/>
++      </g>
++    </g>
++
++    <path id="hand-outline" d="
++M-8,45 V39
++C-11,36 -11,32 -11,29
++C-11,22 -11,22 -14.7,14.7
++A1.4,1.4 0 0 1 -12.2,13.2
++L-7.75,21.8
++A.6,.6 0 0 0 -6.66,21.3
++L-10,8
++A2,2 0 0 1 -6,7
++L-3,19.2
++A.5,.5 0 0 0 -2,19
++L-2,5.5
++A2,2 0 0 1 2,5.5
++L2,19
++A.5,.5 0 0 0 3,19.2
++L6,7
++A2,2 0 0 1 10,8
++C7,20 7,19 7,25.5
++A.42,.42 0 0 0 7.75,25.75
++L10.6,18.8
++A2.25,2.25 0 0 1 14.8,20.6
++C11.7,28 11.7,27.7 11,30
++C10,34 7,39 3,40
++L3,45
++"/>
++  </g>
++
++  <path id="shakes" transform="translate(.5,.5) rotate(22.5)" d="
++M.484,0 A.484,.484 0 0 0 .342,-.342
++M.39,0 A.39,.39 0 0 0 .276,-.276
++M-.484,0 A.484,.484 0 0 0 -.342,.342
++M-.39,0 A.39,.39 0 0 0 -.276,.276
++"/>
++
++</svg>
+diff --git a/iphone/res/shakyphone.svg b/iphone/res/shakyphone.svg
+new file mode 100644
+--- /dev/null
++++ b/iphone/res/shakyphone.svg
+@@ -0,0 +1,51 @@
++<?xml version="1.0"?>
++<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
++  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
++
++<!--
++   Copyright 2009-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
++     All Rights Reserved
++-->
++
++<svg version="1.1" id="top"
++  width="512px" height="512px"
++  viewBox="0,0 1,1" preserveAspectRatio="xMidYMid" overflow="visible"
++  xmlns="http://www.w3.org/2000/svg"
++  xmlns:xlink="http://www.w3.org/1999/xlink">
++
++  <title>iPhone shake gesture icon</title>
++
++  <defs>
++    <style type="text/css"><![CDATA[
++      path, line, circle, rect { fill: none; stroke-linejoin: round; stroke-linecap: round }
++      #bg { fill: black }
++      #outline { fill: black; stroke: #4ef; stroke-width: .1 }
++      #screen { fill: #045; stroke: none }
++      #home { fill: #045; stroke: #4ef; stroke-width: .05 }
++      #speaker { stroke: #4ef; stroke-width: .0625 }
++    ]]></style>
++  </defs>
++
++  <!--<rect id="bg" width="1" height="1"/>-->
++
++  <use transform="translate(.5,.5) scale(.2) rotate(-15)"
++    style="opacity: .25"
++    xlink:href="#phone"/>
++
++  <use transform="translate(.5,.5) scale(.2) rotate(-5)"
++    style="opacity: .5"
++    xlink:href="#phone"/>
++
++  <use transform="translate(.5,.5) scale(.2) rotate(5)"
++    style="opacity: .75"
++    xlink:href="#phone"/>
++
++  <g transform="translate(.5,.5) scale(.2) rotate(15)">
++    <g id="phone">
++      <rect id="outline" x="-1.1875" y="-2.21875" width="2.375" height="4.4375" rx=".25" ry=".25"/>
++      <rect id="screen" x="-1" y="-1.5" width="2" height="3"/>
++      <circle id="home" cy="1.84375" r=".21875"/>
++      <line id="speaker" x1="-.25" x2=".25" y1="-1.84375" y2="-1.84375"/>
++    </g>
++  </g>
++</svg>
+diff --git a/iphone/res/stopwatch.svg b/iphone/res/stopwatch.svg
+new file mode 100644
+--- /dev/null
++++ b/iphone/res/stopwatch.svg
+@@ -0,0 +1,88 @@
++<?xml version="1.0"?>
++<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
++  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
++
++<!--
++   Copyright 2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++     All Rights Reserved
++-->
++
++<svg version="1.1" id="top"
++  width="512px" height="512px"
++  viewBox="0,0 1,1" preserveAspectRatio="xMidYMid" overflow="visible"
++  xmlns="http://www.w3.org/2000/svg"
++  xmlns:xlink="http://www.w3.org/1999/xlink">
++
++  <title>stopwatch icon</title>
++
++  <defs>
++    <style type="text/css"><![CDATA[
++      path, line, circle, rect { fill: none; stroke-linejoin: round; stroke-linecap: round }
++      #bg { fill: #202020 }
++      #face { fill: url(#face-grad); stroke: none }
++      #button * { stroke: #fd0 }
++      #btn-top { stroke: url(#btn-grad); stroke-width: .45 }
++      #btn-stem { stroke-width: .5 }
++      #btn-base { fill: #fd0; stroke-width: .18 }
++      #ticks { stroke: #444; stroke-width: .06 }
++      #swoosh { fill: url(#swoosh-grad); stroke: none }
++      #hand { stroke: black; stroke-width: .1 }
++    ]]></style>
++
++    <radialGradient id="face-grad" gradientUnits="userSpaceOnUse" cx="0" cy="0" r="1">
++      <stop offset="0%" stop-color="#fff"/>
++      <stop offset="50%" stop-color="#eef"/>
++      <stop offset="85%" stop-color="#ccd"/>
++      <stop offset="85%" stop-color="#c93"/>
++      <stop offset="91.25%" stop-color="#fd0"/>
++      <stop offset="93.75%" stop-color="#fd0"/>
++      <stop offset="100%" stop-color="#c93"/>
++    </radialGradient>
++
++    <radialGradient id="btn-grad" gradientUnits="userSpaceOnUse"
++      cx="0" cy="0" r="2" gradientTransform="scale(1,.2)">
++      <stop offset="0%" stop-color="#fd0"/>
++      <stop offset="10%" stop-color="#fd0"/>
++      <stop offset="100%" stop-color="#c93"/>
++    </radialGradient>
++
++    <linearGradient id="swoosh-grad" gradientUnits="userSpaceOnUse"
++      x1="1" x2="0" gradientTransform="translate(.22) rotate(-18)"
++      spreadMethod="pad">
++      <stop offset="0%" stop-color="#45f"/>
++      <stop offset="100%" stop-color="#45f" stop-opacity="0"/>
++    </linearGradient>
++  </defs>
++
++  <!--<rect id="bg" width="1" height="1"/>-->
++
++  <g transform="translate(.5,.56) scale(.4375)">
++    <g id="button" transform="translate(0,-1.28) scale(.24) translate(0,.225)">
++      <path id="btn-stem" d="M0,.1v1"/>
++      <path id="btn-top" d="M-1,0h2"/>
++      <rect id="btn-base" x="-1" y=".8" width="2" height=".5"/>
++    </g>
++
++    <circle id="face" r="1"/>
++
++    <g id="ticks">
++      <line y2="-.15" transform="translate(0,-.6)"/>
++      <line y2="-.15" transform="rotate(36) translate(0,-.6)"/>
++      <line y2="-.15" transform="rotate(72) translate(0,-.6)"/>
++      <line y2="-.15" transform="rotate(108) translate(0,-.6)"/>
++      <line y2="-.15" transform="rotate(144) translate(0,-.6)"/>
++      <line y2="-.15" transform="rotate(180) translate(0,-.6)"/>
++      <line y2="-.15" transform="rotate(216) translate(0,-.6)"/>
++      <line y2="-.15" transform="rotate(252) translate(0,-.6)"/>
++      <line y2="-.15" transform="rotate(288) translate(0,-.6)"/>
++      <line y2="-.15" transform="rotate(324) translate(0,-.6)"/>
++    </g>
++
++    <g transform="scale(.8)">
++      <path id="swoosh"
++        d="M0,0 v-1 a1,1 0 0 1 .951,.691z"/>
++      <line id="hand" transform="scale(.975)" x2=".951" y2="-.309"/>
++    </g>
++  </g>
++
++</svg>
+diff --git a/iphone/res/zbar-back.png b/iphone/res/zbar-back.png
+new file mode 100644
+index 0000000000000000000000000000000000000000..6a0681d0deeaa2cfbeffa620ea31a3cc279fd0da
+GIT binary patch
+literal 319
+zc%17D@N?(olHy`uVBq!ia0vp^vOp}s!VDz86uj;SQVPi)LB0$ORcZ_j4J`}|zkosw
+zFBlj~4Hy_+B``2p&0t^<FPO6{&;}^MlJ4m1$iT3%ujY5)WFVihILO_JVcj{Imp~3@
+zfk$L90|Va?5N4dJ%_j{MR1fe8aRt)<i2&<ty)1!Bc}jx(f*F|OG7cU-b?w&OH-7?y
+zl5IhjC3(BM@HB1?Oa^iSJY5_^B*M3z+9=pyz~daaydgA!b%jv{7u$(|n52^%**bQ8
+z_fOj$HczYO_wqAxKJ#MA+8k#s@t<H<b@_iUgZl!>Lma2&CZ(T{bIf_VD(OCd&<l@Q
+U9$QY%0-DX>>FVdQ&MBb@08P+*g8%>k
+
+diff --git a/iphone/res/zbar-back.svg b/iphone/res/zbar-back.svg
+new file mode 100644
+--- /dev/null
++++ b/iphone/res/zbar-back.svg
+@@ -0,0 +1,31 @@
++<?xml version="1.0"?>
++<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
++  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
++
++<!--
++   Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
++     All Rights Reserved
++-->
++
++<svg version="1.1" id="top"
++  width="29px" height="24px"
++  viewBox="-.175,-.175 1.45,1.2" preserveAspectRatio="xMidYMid" overflow="visible"
++  xmlns="http://www.w3.org/2000/svg"
++  xmlns:xlink="http://www.w3.org/1999/xlink">
++
++  <title>left pointing arrow toolbar icon</title>
++
++  <defs>
++    <style type="text/css"><![CDATA[
++      path, line { fill: none; stroke-linejoin: round; stroke-linecap: round }
++      #bg { fill: #78a }
++      #arrow { fill: white;; stroke: white; stroke-width: .1 }
++    ]]></style>
++  </defs>
++
++  <!--<rect id="bg" x="-.5" y="-.5" width="2" height="2"/>-->
++
++  <g>
++    <path id="arrow" d="M.1,.5 L.9,.1 .9,.9 z"/>
++  </g>
++</svg>
+diff --git a/iphone/res/zbar-help.html b/iphone/res/zbar-help.html
+new file mode 100644
+--- /dev/null
++++ b/iphone/res/zbar-help.html
+@@ -0,0 +1,88 @@
++<?xml version="1.0"?>
++<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
++"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
++<!--
++Copyright 2009-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
++All Rights Reserved
++-->
++<html>
++<head>
++<title>Barcode Reader Help</title>
++<style type="text/css">
++html, body { margin: 0; padding: 0; background: black; color: white; font-family: sans-serif; font-size: 16px }
++h1 { margin: .5em 0; text-align: center; font-size: 28px }
++h2 { font-size: 24px }
++hr { margin: 1em 0; height: 0; border: none; border-top: solid 1px #666 }
++.smaller { font-size: 85% }
++p { margin: .5em }
++a { color: #8af }
++p.cen { text-align: center }
++p.title { margin: 1em; clear: both; text-align: center }
++div.col { width: 50% }
++.clear { clear: both }
++.iconlist { position: relative; clear: both; margin: 4px 0; padding: 1px 0 }
++.icon { width: 64px; height: 64px; overflow: hidden; margin: 12px 16px; padding: 0; background: url("zbar-helpicons.png") no-repeat; font: bold 56px "Marker Felt"; text-align: center }
++.sample { display: block; height: 96px; overflow: hidden; margin: 12px auto; padding: 0; background: url("zbar-samples.png") no-repeat; text-align: center}
++.left { float: left }
++.right { float: right }
++.iconlist > p { margin: 10px }
++.iconlist > h2 { margin: 10px }
++</style>
++</head>
++<body>
++<h1 id="title" style="color: #f88">Barcode Reader Help</h1>
++<hr/>
++<p class="title">Recognized barcodes should look like</p>
++<div class="col left">
++<a class="sample" style="width: 118px; background-position: -96px" href="http://wikipedia.org/wiki/EAN-13"></a>
++<p class="cen"><a href="http://wikipedia.org/wiki/EAN-13">EAN/UPC<br/>Product Codes</a></p>
++</div>
++<div class="col right">
++<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://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">
++<div class="icon left"></div>
++<p>Ensure there is plenty of</p>
++<h2 style="color: #ff4">Light</h2>
++</div>
++<div class="iconlist">
++<div class="icon left" style="background: none; color: #2d4">4"</div>
++<h2 style="color: #4f6">Distance</h2>
++<p>should be about 3 to 5 inches</p>
++</div>
++<div class="iconlist">
++<div class="icon left" style="background-position: 0 -64px"></div>
++<h2 style="color: #3ee">Shake</h2>
++<p>to force the camera to focus</p>
++</div>
++<div class="iconlist">
++<div class="icon left" style="background-position: 0 -128px"></div>
++<h2 style="color: #59f">Wait</h2>
++<p>for the autofocus to finish</p>
++</div>
++<div class="iconlist">
++<div class="icon left" style="background-position: 0 -192px"></div>
++<h2 style="color: #d5f">Hold Still</h2>
++<p>while the barcode is scanned</p>
++</div>
++<script type="text/javascript">
++function onZBarHelp(argv) {
++var title;
++switch(argv.reason) {
++case "INFO": break;
++case "FAIL": title = "No Barcode Detected"; break;
++}
++if(title) document.getElementById('title').textContent = title;
++}
++</script>
++</body>
++</html>
+diff --git a/iphone/res/zbar-helpicons.png b/iphone/res/zbar-helpicons.png
+new file mode 100644
+index 0000000000000000000000000000000000000000..2a07e7c44478cd30a1e297395de2f25c8a7bb52a
+GIT binary patch
+literal 18350
+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
+JPDHLkV1mE0dd2_%
+
+diff --git a/iphone/res/zbar-samples.png b/iphone/res/zbar-samples.png
+new file mode 100644
+index 0000000000000000000000000000000000000000..7c805e2ca96ad96e391803e6ffb0bdb35f9696ed
+GIT binary patch
+literal 1181
+zc$@*91Y-M%P)<h;3K|Lk000e1NJLTq007ni003YJ00000L>tqZ00009a7bBm0000;
+z0000;07l7cJ^%m&Pf0{URCwC$oIhylTok}Fbu14$35AS>4!PR{LFm#Y&_(F>aH)e^
+z=_DDl+`*-|38jm;b$GZ44&8L<^gwWUn?n#XxP{>6@_R#K%%>);{qM&)keHi$PjY`=
+z@9~`DjRyZqF$7Dn1WT|4OR(N7c4&vT8QP{9VuxUdtCL`d*rplUp>0Ml%hn<B7Aq#D
+z=xBK@JNzOn6{tWNfijE$6@Us>CqV@$!w6KMjOb<AIw0O+#iSG+Ew815tyso3NvhHZ
+zYx^uM!4j-jV6EGe)R{HPq?oTISc3Hmtj#W`i)&;#T7o55AAz-L=><!$z62}F;}9&t
+z`ZzCR?R=IOyl>8vV0}}pt&!8S`~3_f1?xLvWy!N1$BRX<1Zy`hBg?s9TQcCeStVG4
+zwZq)n+PkeC-#W>1$plNVcJMOR5I19~twDd*yCPVEwQIcfY~ZyS=x;U_EWvu6f!`X?
+z=i_GOp9D*=-k5oMNv@sjOn_hs*4yK)O{Zh)@8SF7WeC>3Vr_C{Wu9J^krFJy+Reb{
+zpyX%kzxVf+V0~+>EXm15W%<a0C0OsiRyPZU+|0dT3D!HV%gD++<<CFC60CPzp_b!@
+z?BZ((mSDXJ%g9|s`R&u6`-o-9Xz{XTlKF-|AIsVi%UWSs?=)H;h-KwsSvjL+#aQ8&
+zWBDGw=YdbO;WK6GMWw0d;p2OrhmQ)Zz@OrKEVo$E_h9PbM|ysAo!30Sm6ZU<NzA9k
+zZ{E*Y-Fnn$&l$R|)&pj(<_sp<bv=MvSUfbwq*^o7odrM}m^E87fPn`*=mF5veZB;1
+zR;bpBi{#c%1?S>|fveq<ZeU(l%mvMo)*jF_p!TzVG){H2TX2e3z`X&BlS;*0!02!Q
+zHRT+4xK*yz{1U8I1**N|)(waG0l@H*+iSS<x#|EgJ~p5>quxki)w%=+P%j(MKZo-^
+zU3EGDE1-9d-KTE@R-giCUQb>cZ$0~KPkxjJjXF_JqmFvTdf5R`6E5#6b{|yn;5=ku
+z^$dWX8k2MsV0;2247jaBy~*E2X&Aj>ReB}2)J?7(c1johPr@1%em@j+Y#rdqa>`dg
+zuMB6Z_fQy99WJVMZmJkScv*amY>6L#h^<~c0@?+wfzklr&+(MIqFZdITThDR&%vT=
+z-_%-3sr(yG$8gz&i(WjC49@-@+-SoE@Q(gta8!Hw!D>dM1!n_bXpZ2=jM<M>W6x2}
+z^mCr+_wV5BDJfob;dBH?Avi6#x}W@l_SMwYuA#9e%ns8ACmJhQ&8-OQ&*=m>4ARY8
+zR(rlSw?0hfX039zDn1_9%O#kc08{g(Y6cW9>&N4`JC1TyBc)wd+SPI0!mLzI77<oh
+zC~MuuQLb{5#=)i~{J`Ogzqgiit<j#tv>jEoe3;+gMi$Hkx{b%QvevG4mvysda|Y1y
+vn7Z249q8-c<{jm4Km<#$1WT|4YoFvFczj9D2djhT00000NkvXXu0mjf>ajvZ
+
+diff --git a/iphone/zbar.xcodeproj/project.pbxproj b/iphone/zbar.xcodeproj/project.pbxproj
+new file mode 100644
+--- /dev/null
++++ b/iphone/zbar.xcodeproj/project.pbxproj
+@@ -0,0 +1,993 @@
++// !$*UTF8*$!
++{
++	archiveVersion = 1;
++	classes = {
++	};
++	objectVersion = 45;
++	objects = {
++
++/* Begin PBXAggregateTarget section */
++		DC1A4A4E11FF5D0500BCDA30 /* ZBarSDK.dmg */ = {
++			isa = PBXAggregateTarget;
++			buildConfigurationList = DC1A4A5311FF5D3D00BCDA30 /* Build configuration list for PBXAggregateTarget "ZBarSDK.dmg" */;
++			buildPhases = (
++				DC3CF2061218355900D7A786 /* Copy SDK */,
++				DC48C585121AC7C20047193B /* Build Documentation */,
++				DC3CF025121720B600D7A786 /* Copy Examples */,
++				DC1A4A4D11FF5D0500BCDA30 /* Make Disk Image */,
++			);
++			dependencies = (
++				DC3CF01F1216366200D7A786 /* PBXTargetDependency */,
++			);
++			name = ZBarSDK.dmg;
++			productName = Package;
++		};
++		DC3CEE821215C7EF00D7A786 /* ZBarSDK */ = {
++			isa = PBXAggregateTarget;
++			buildConfigurationList = DC3CEE851215C83500D7A786 /* Build configuration list for PBXAggregateTarget "ZBarSDK" */;
++			buildPhases = (
++				DC3CEE891215C88000D7A786 /* Build Universal Library */,
++				DC3CEE811215C7EF00D7A786 /* Copy Headers */,
++				DC3CEE9E1215C9B800D7A786 /* Copy Headers */,
++				DC3CEE9F1215C9B800D7A786 /* Copy Resources */,
++			);
++			dependencies = (
++				DC3CEE871215C85400D7A786 /* PBXTargetDependency */,
++			);
++			name = ZBarSDK;
++			productName = ZBarSDK;
++		};
++/* End PBXAggregateTarget section */
++
++/* Begin PBXBuildFile section */
++		DC26004C118631C200FA987B /* ZBarCaptureReader.m in Sources */ = {isa = PBXBuildFile; fileRef = DC26004B118631C200FA987B /* ZBarCaptureReader.m */; };
++		DC299A9D1208B5E8006A023C /* libzbar.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D2AAC07E0554694100DB518D /* libzbar.a */; };
++		DC299AA01208B61C006A023C /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC50453D1203396B009FF359 /* AVFoundation.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
++		DC299AA11208B61C006A023C /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC50453F1203396B009FF359 /* CoreMedia.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
++		DC299AA21208B61C006A023C /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC5045411203396B009FF359 /* CoreVideo.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
++		DC299AA31208B61C006A023C /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1A49C111FF537000BCDA30 /* QuartzCore.framework */; };
++		DC299AA41208B61C006A023C /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DC5045431203396B009FF359 /* libiconv.dylib */; };
++		DC299AA51208B63C006A023C /* zbar-help.html in Resources */ = {isa = PBXBuildFile; fileRef = DC1A49A211FF33B300BCDA30 /* zbar-help.html */; };
++		DC299AA61208B63C006A023C /* zbar-helpicons.png in Resources */ = {isa = PBXBuildFile; fileRef = DC1A49A311FF33B300BCDA30 /* zbar-helpicons.png */; };
++		DC299AA71208B63C006A023C /* zbar-samples.png in Resources */ = {isa = PBXBuildFile; fileRef = DC1A49A411FF33B300BCDA30 /* zbar-samples.png */; };
++		DC299B061208FC11006A023C /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC299B051208FC11006A023C /* CoreGraphics.framework */; };
++		DC299B311208FCA3006A023C /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC67C08210A079BE0033B702 /* UIKit.framework */; };
++		DC299B841208FCAB006A023C /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AACBBE490F95108600F1A2B1 /* Foundation.framework */; };
++		DC3AAB4F11B71A040021C7B1 /* ZBarCVImage.m in Sources */ = {isa = PBXBuildFile; fileRef = DC3AAB4D11B71A040021C7B1 /* ZBarCVImage.m */; };
++		DC3CE47811FA1622008FAF88 /* ZBarReaderViewImpl_Capture.m in Sources */ = {isa = PBXBuildFile; fileRef = DC3CE47611FA1622008FAF88 /* ZBarReaderViewImpl_Capture.m */; };
++		DC3CE47911FA1622008FAF88 /* ZBarReaderViewImpl_Simulator.m in Sources */ = {isa = PBXBuildFile; fileRef = DC3CE47711FA1622008FAF88 /* ZBarReaderViewImpl_Simulator.m */; };
++		DC3CEE921215C93200D7A786 /* zbar.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = DC67C11710A07A810033B702 /* zbar.h */; };
++		DC3CEE941215C97F00D7A786 /* Decoder.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = DC50463512034A4C009FF359 /* Decoder.h */; };
++		DC3CEE951215C97F00D7A786 /* Exception.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = DC50463612034A4C009FF359 /* Exception.h */; };
++		DC3CEE961215C97F00D7A786 /* Image.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = DC50463712034A4C009FF359 /* Image.h */; };
++		DC3CEE971215C97F00D7A786 /* ImageScanner.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = DC50463812034A4C009FF359 /* ImageScanner.h */; };
++		DC3CEE981215C97F00D7A786 /* Processor.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = DC50463912034A4C009FF359 /* Processor.h */; };
++		DC3CEE991215C97F00D7A786 /* Scanner.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = DC50463A12034A4C009FF359 /* Scanner.h */; };
++		DC3CEE9A1215C97F00D7A786 /* Symbol.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = DC50463B12034A4C009FF359 /* Symbol.h */; };
++		DC3CEE9B1215C97F00D7A786 /* Video.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = DC50463C12034A4C009FF359 /* Video.h */; };
++		DC3CEE9C1215C97F00D7A786 /* Window.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = DC50463D12034A4C009FF359 /* Window.h */; };
++		DC3CEEA01215C9C000D7A786 /* zbar-help.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = DC1A49A211FF33B300BCDA30 /* zbar-help.html */; };
++		DC3CEEA11215C9C000D7A786 /* zbar-helpicons.png in Copy Resources */ = {isa = PBXBuildFile; fileRef = DC1A49A311FF33B300BCDA30 /* zbar-helpicons.png */; };
++		DC3CEEA21215C9C000D7A786 /* zbar-samples.png in Copy Resources */ = {isa = PBXBuildFile; fileRef = DC1A49A411FF33B300BCDA30 /* zbar-samples.png */; };
++		DC3CEFB51216349700D7A786 /* ZBarCaptureReader.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = DC3CEFA51216347100D7A786 /* ZBarCaptureReader.h */; };
++		DC3CEFB61216349700D7A786 /* ZBarImage.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = DC3CEFA61216347100D7A786 /* ZBarImage.h */; };
++		DC3CEFB71216349700D7A786 /* ZBarImageScanner.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = DC3CEFA71216347100D7A786 /* ZBarImageScanner.h */; };
++		DC3CEFB81216349700D7A786 /* ZBarReaderController.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = DC3CEFA81216347100D7A786 /* ZBarReaderController.h */; };
++		DC3CEFB91216349700D7A786 /* ZBarReaderView.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = DC3CEFA91216347100D7A786 /* ZBarReaderView.h */; };
++		DC3CEFBA1216349700D7A786 /* ZBarReaderViewController.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = DC3CEFAA1216347100D7A786 /* ZBarReaderViewController.h */; };
++		DC3CEFBB1216349700D7A786 /* ZBarSDK.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = DC3CEFAB1216347100D7A786 /* ZBarSDK.h */; };
++		DC3CEFBC1216349700D7A786 /* ZBarSymbol.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = DC3CEFAC1216347100D7A786 /* ZBarSymbol.h */; };
++		DC3CF2021218353B00D7A786 /* README in Copy SDK */ = {isa = PBXBuildFile; fileRef = DC50467B12034D60009FF359 /* README */; };
++		DC3CF2031218353B00D7A786 /* ChangeLog in Copy SDK */ = {isa = PBXBuildFile; fileRef = DC3CF141121721A100D7A786 /* ChangeLog */; };
++		DC3CF2041218353B00D7A786 /* COPYING in Copy SDK */ = {isa = PBXBuildFile; fileRef = DC50467C12034D71009FF359 /* COPYING */; };
++		DC3CF2051218353B00D7A786 /* LICENSE in Copy SDK */ = {isa = PBXBuildFile; fileRef = DC50467D12034D71009FF359 /* LICENSE */; };
++		DC3CF29A1218359400D7A786 /* ReaderSample in Copy Examples */ = {isa = PBXBuildFile; fileRef = DC3CF2081218358C00D7A786 /* ReaderSample */; };
++		DC3CF29B1218359400D7A786 /* readertest in Copy Examples */ = {isa = PBXBuildFile; fileRef = DC3CF2651218358C00D7A786 /* readertest */; };
++		DC3CF2A312197A8C00D7A786 /* zbar-back.png in Copy Resources */ = {isa = PBXBuildFile; fileRef = DC3CF2A212197A7200D7A786 /* zbar-back.png */; };
++		DC3EBB2D119DDB2100107EE9 /* ZBarReaderViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DC3EBB2C119DDB2100107EE9 /* ZBarReaderViewController.m */; };
++		DC48C5341219FDDE0047193B /* zbar-back.png in Resources */ = {isa = PBXBuildFile; fileRef = DC3CF2A212197A7200D7A786 /* zbar-back.png */; };
++		DC48C5411219FE550047193B /* readertest.m in Sources */ = {isa = PBXBuildFile; fileRef = DC48C5401219FE550047193B /* readertest.m */; };
++		DC48C57D121A1F410047193B /* ZBarSDK in Copy SDK */ = {isa = PBXBuildFile; fileRef = DC48C55F121A1E7F0047193B /* ZBarSDK */; };
++		DC48C5A8121B1F910047193B /* Documentation.html in Copy SDK */ = {isa = PBXBuildFile; fileRef = DC48C5A7121B1F840047193B /* Documentation.html */; };
++		DC4920EE10A70475000E4D43 /* ZBarImage.m in Sources */ = {isa = PBXBuildFile; fileRef = DC4920EC10A70475000E4D43 /* ZBarImage.m */; };
++		DC4920EF10A70475000E4D43 /* ZBarImageScanner.m in Sources */ = {isa = PBXBuildFile; fileRef = DC4920ED10A70475000E4D43 /* ZBarImageScanner.m */; };
++		DC67C17110A07AD30033B702 /* config.c in Sources */ = {isa = PBXBuildFile; fileRef = DC67C11F10A07AD30033B702 /* config.c */; };
++		DC67C17410A07AD30033B702 /* code128.c in Sources */ = {isa = PBXBuildFile; fileRef = DC67C12310A07AD30033B702 /* code128.c */; };
++		DC67C17610A07AD30033B702 /* code39.c in Sources */ = {isa = PBXBuildFile; fileRef = DC67C12510A07AD30033B702 /* code39.c */; };
++		DC67C17810A07AD30033B702 /* ean.c in Sources */ = {isa = PBXBuildFile; fileRef = DC67C12710A07AD30033B702 /* ean.c */; };
++		DC67C17A10A07AD30033B702 /* i25.c in Sources */ = {isa = PBXBuildFile; fileRef = DC67C12910A07AD30033B702 /* i25.c */; };
++		DC67C17F10A07AD30033B702 /* qr_finder.c in Sources */ = {isa = PBXBuildFile; fileRef = DC67C12E10A07AD30033B702 /* qr_finder.c */; };
++		DC67C18110A07AD30033B702 /* decoder.c in Sources */ = {isa = PBXBuildFile; fileRef = DC67C13010A07AD30033B702 /* decoder.c */; };
++		DC67C18310A07AD30033B702 /* error.c in Sources */ = {isa = PBXBuildFile; fileRef = DC67C13210A07AD30033B702 /* error.c */; };
++		DC67C18610A07AD30033B702 /* image.c in Sources */ = {isa = PBXBuildFile; fileRef = DC67C13510A07AD30033B702 /* image.c */; };
++		DC67C18810A07AD30033B702 /* img_scanner.c in Sources */ = {isa = PBXBuildFile; fileRef = DC67C13710A07AD30033B702 /* img_scanner.c */; };
++		DC67C19510A07AD30033B702 /* bch15_5.c in Sources */ = {isa = PBXBuildFile; fileRef = DC67C14710A07AD30033B702 /* bch15_5.c */; };
++		DC67C19710A07AD30033B702 /* binarize.c in Sources */ = {isa = PBXBuildFile; fileRef = DC67C14910A07AD30033B702 /* binarize.c */; };
++		DC67C19910A07AD30033B702 /* isaac.c in Sources */ = {isa = PBXBuildFile; fileRef = DC67C14B10A07AD30033B702 /* isaac.c */; };
++		DC67C19B10A07AD30033B702 /* qrdec.c in Sources */ = {isa = PBXBuildFile; fileRef = DC67C14D10A07AD30033B702 /* qrdec.c */; };
++		DC67C19D10A07AD30033B702 /* qrdectxt.c in Sources */ = {isa = PBXBuildFile; fileRef = DC67C14F10A07AD30033B702 /* qrdectxt.c */; };
++		DC67C19E10A07AD30033B702 /* rs.c in Sources */ = {isa = PBXBuildFile; fileRef = DC67C15010A07AD30033B702 /* rs.c */; };
++		DC67C1A010A07AD30033B702 /* util.c in Sources */ = {isa = PBXBuildFile; fileRef = DC67C15210A07AD30033B702 /* util.c */; };
++		DC67C1A310A07AD30033B702 /* refcnt.c in Sources */ = {isa = PBXBuildFile; fileRef = DC67C15510A07AD30033B702 /* refcnt.c */; };
++		DC67C1A510A07AD30033B702 /* scanner.c in Sources */ = {isa = PBXBuildFile; fileRef = DC67C15710A07AD30033B702 /* scanner.c */; };
++		DC67C1A810A07AD30033B702 /* symbol.c in Sources */ = {isa = PBXBuildFile; fileRef = DC67C15A10A07AD30033B702 /* symbol.c */; };
++		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 */; };
++/* End PBXBuildFile section */
++
++/* Begin PBXContainerItemProxy section */
++		DC299A9E1208B5F1006A023C /* PBXContainerItemProxy */ = {
++			isa = PBXContainerItemProxy;
++			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
++			proxyType = 1;
++			remoteGlobalIDString = D2AAC07D0554694100DB518D;
++			remoteInfo = libzbar;
++		};
++		DC3CEE861215C85400D7A786 /* PBXContainerItemProxy */ = {
++			isa = PBXContainerItemProxy;
++			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
++			proxyType = 1;
++			remoteGlobalIDString = D2AAC07D0554694100DB518D;
++			remoteInfo = libzbar;
++		};
++		DC3CF01E1216366200D7A786 /* PBXContainerItemProxy */ = {
++			isa = PBXContainerItemProxy;
++			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
++			proxyType = 1;
++			remoteGlobalIDString = DC3CEE821215C7EF00D7A786;
++			remoteInfo = ZBarSDK;
++		};
++/* End PBXContainerItemProxy section */
++
++/* Begin PBXCopyFilesBuildPhase section */
++		DC3CEE811215C7EF00D7A786 /* Copy Headers */ = {
++			isa = PBXCopyFilesBuildPhase;
++			buildActionMask = 2147483647;
++			dstPath = Headers/ZBarSDK;
++			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 */,
++				DC3CEFB91216349700D7A786 /* ZBarReaderView.h in Copy Headers */,
++				DC3CEFBA1216349700D7A786 /* ZBarReaderViewController.h in Copy Headers */,
++				DC3CEFBB1216349700D7A786 /* ZBarSDK.h in Copy Headers */,
++				DC3CEFBC1216349700D7A786 /* ZBarSymbol.h in Copy Headers */,
++				DC3CEE921215C93200D7A786 /* zbar.h in Copy Headers */,
++			);
++			name = "Copy Headers";
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++		DC3CEE9E1215C9B800D7A786 /* Copy Headers */ = {
++			isa = PBXCopyFilesBuildPhase;
++			buildActionMask = 2147483647;
++			dstPath = Headers/ZBarSDK/zbar;
++			dstSubfolderSpec = 1;
++			files = (
++				DC3CEE941215C97F00D7A786 /* Decoder.h in Copy Headers */,
++				DC3CEE951215C97F00D7A786 /* Exception.h in Copy Headers */,
++				DC3CEE961215C97F00D7A786 /* Image.h in Copy Headers */,
++				DC3CEE971215C97F00D7A786 /* ImageScanner.h in Copy Headers */,
++				DC3CEE981215C97F00D7A786 /* Processor.h in Copy Headers */,
++				DC3CEE991215C97F00D7A786 /* Scanner.h in Copy Headers */,
++				DC3CEE9A1215C97F00D7A786 /* Symbol.h in Copy Headers */,
++				DC3CEE9B1215C97F00D7A786 /* Video.h in Copy Headers */,
++				DC3CEE9C1215C97F00D7A786 /* Window.h in Copy Headers */,
++			);
++			name = "Copy Headers";
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++		DC3CEE9F1215C9B800D7A786 /* Copy Resources */ = {
++			isa = PBXCopyFilesBuildPhase;
++			buildActionMask = 2147483647;
++			dstPath = Resources;
++			dstSubfolderSpec = 1;
++			files = (
++				DC3CF2A312197A8C00D7A786 /* zbar-back.png in Copy Resources */,
++				DC3CEEA01215C9C000D7A786 /* zbar-help.html in Copy Resources */,
++				DC3CEEA11215C9C000D7A786 /* zbar-helpicons.png in Copy Resources */,
++				DC3CEEA21215C9C000D7A786 /* zbar-samples.png in Copy Resources */,
++			);
++			name = "Copy Resources";
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++		DC3CF025121720B600D7A786 /* Copy Examples */ = {
++			isa = PBXCopyFilesBuildPhase;
++			buildActionMask = 2147483647;
++			dstPath = Examples;
++			dstSubfolderSpec = 1;
++			files = (
++				DC3CF29A1218359400D7A786 /* ReaderSample in Copy Examples */,
++				DC3CF29B1218359400D7A786 /* readertest in Copy Examples */,
++			);
++			name = "Copy Examples";
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++		DC3CF2061218355900D7A786 /* Copy SDK */ = {
++			isa = PBXCopyFilesBuildPhase;
++			buildActionMask = 2147483647;
++			dstPath = "";
++			dstSubfolderSpec = 1;
++			files = (
++				DC48C57D121A1F410047193B /* ZBarSDK in Copy SDK */,
++				DC3CF2021218353B00D7A786 /* README in Copy SDK */,
++				DC3CF2031218353B00D7A786 /* ChangeLog in Copy SDK */,
++				DC3CF2041218353B00D7A786 /* COPYING in Copy SDK */,
++				DC3CF2051218353B00D7A786 /* LICENSE in Copy SDK */,
++				DC48C5A8121B1F910047193B /* Documentation.html in Copy SDK */,
++			);
++			name = "Copy SDK";
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++/* End PBXCopyFilesBuildPhase section */
++
++/* Begin PBXFileReference section */
++		AACBBE490F95108600F1A2B1 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
++		D2AAC07E0554694100DB518D /* libzbar.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libzbar.a; sourceTree = BUILT_PRODUCTS_DIR; };
++		DC1A49A211FF33B300BCDA30 /* zbar-help.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = "zbar-help.html"; path = "res/zbar-help.html"; sourceTree = "<group>"; };
++		DC1A49A311FF33B300BCDA30 /* zbar-helpicons.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "zbar-helpicons.png"; path = "res/zbar-helpicons.png"; sourceTree = "<group>"; };
++		DC1A49A411FF33B300BCDA30 /* zbar-samples.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "zbar-samples.png"; path = "res/zbar-samples.png"; sourceTree = "<group>"; };
++		DC1A49C111FF537000BCDA30 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
++		DC26004B118631C200FA987B /* ZBarCaptureReader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ZBarCaptureReader.m; sourceTree = "<group>"; usesTabs = 0; };
++		DC299AF51208B7BD006A023C /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = config.h; path = include/config.h; sourceTree = "<group>"; };
++		DC299B051208FC11006A023C /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
++		DC299BEC1208FE40006A023C /* prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = prefix.pch; path = include/prefix.pch; sourceTree = "<group>"; };
++		DC3AAB4C11B71A040021C7B1 /* ZBarCVImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarCVImage.h; sourceTree = "<group>"; usesTabs = 0; };
++		DC3AAB4D11B71A040021C7B1 /* ZBarCVImage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ZBarCVImage.m; sourceTree = "<group>"; usesTabs = 0; };
++		DC3CE47611FA1622008FAF88 /* ZBarReaderViewImpl_Capture.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ZBarReaderViewImpl_Capture.m; sourceTree = "<group>"; usesTabs = 0; };
++		DC3CE47711FA1622008FAF88 /* ZBarReaderViewImpl_Simulator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ZBarReaderViewImpl_Simulator.m; sourceTree = "<group>"; usesTabs = 0; };
++		DC3CEF9D121633C500D7A786 /* readertest.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = readertest.app; sourceTree = BUILT_PRODUCTS_DIR; };
++		DC3CEFA51216347100D7A786 /* ZBarCaptureReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ZBarCaptureReader.h; path = include/ZBarSDK/ZBarCaptureReader.h; sourceTree = "<group>"; };
++		DC3CEFA61216347100D7A786 /* ZBarImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ZBarImage.h; path = include/ZBarSDK/ZBarImage.h; sourceTree = "<group>"; };
++		DC3CEFA71216347100D7A786 /* ZBarImageScanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ZBarImageScanner.h; path = include/ZBarSDK/ZBarImageScanner.h; sourceTree = "<group>"; };
++		DC3CEFA81216347100D7A786 /* ZBarReaderController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ZBarReaderController.h; path = include/ZBarSDK/ZBarReaderController.h; sourceTree = "<group>"; };
++		DC3CEFA91216347100D7A786 /* ZBarReaderView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ZBarReaderView.h; path = include/ZBarSDK/ZBarReaderView.h; sourceTree = "<group>"; };
++		DC3CEFAA1216347100D7A786 /* ZBarReaderViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ZBarReaderViewController.h; path = include/ZBarSDK/ZBarReaderViewController.h; sourceTree = "<group>"; };
++		DC3CEFAB1216347100D7A786 /* ZBarSDK.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ZBarSDK.h; path = include/ZBarSDK/ZBarSDK.h; sourceTree = "<group>"; };
++		DC3CEFAC1216347100D7A786 /* ZBarSymbol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ZBarSymbol.h; path = include/ZBarSDK/ZBarSymbol.h; sourceTree = "<group>"; };
++		DC3CF141121721A100D7A786 /* ChangeLog */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ChangeLog; sourceTree = "<group>"; };
++		DC3CF2081218358C00D7A786 /* ReaderSample */ = {isa = PBXFileReference; lastKnownFileType = folder; name = ReaderSample; path = examples/ReaderSample; sourceTree = "<group>"; };
++		DC3CF2651218358C00D7A786 /* readertest */ = {isa = PBXFileReference; lastKnownFileType = folder; name = readertest; path = examples/readertest; sourceTree = "<group>"; };
++		DC3CF2A212197A7200D7A786 /* zbar-back.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "zbar-back.png"; path = "res/zbar-back.png"; sourceTree = "<group>"; };
++		DC3EBB2C119DDB2100107EE9 /* ZBarReaderViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ZBarReaderViewController.m; sourceTree = "<group>"; usesTabs = 0; };
++		DC48C5401219FE550047193B /* readertest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = readertest.m; path = examples/readertest/readertest.m; sourceTree = "<group>"; };
++		DC48C55F121A1E7F0047193B /* ZBarSDK */ = {isa = PBXFileReference; lastKnownFileType = folder; path = ZBarSDK; sourceTree = BUILT_PRODUCTS_DIR; };
++		DC48C5A7121B1F840047193B /* Documentation.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = Documentation.html; path = doc/Documentation.html; sourceTree = "<group>"; };
++		DC4920EC10A70475000E4D43 /* ZBarImage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ZBarImage.m; sourceTree = "<group>"; usesTabs = 0; };
++		DC4920ED10A70475000E4D43 /* ZBarImageScanner.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ZBarImageScanner.m; sourceTree = "<group>"; usesTabs = 0; };
++		DC50453D1203396B009FF359 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
++		DC50453F1203396B009FF359 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; };
++		DC5045411203396B009FF359 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; };
++		DC5045431203396B009FF359 /* libiconv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libiconv.dylib; path = usr/lib/libiconv.dylib; sourceTree = SDKROOT; };
++		DC50463512034A4C009FF359 /* Decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Decoder.h; path = ../include/zbar/Decoder.h; sourceTree = SOURCE_ROOT; };
++		DC50463612034A4C009FF359 /* Exception.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Exception.h; path = ../include/zbar/Exception.h; sourceTree = SOURCE_ROOT; };
++		DC50463712034A4C009FF359 /* Image.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Image.h; path = ../include/zbar/Image.h; sourceTree = SOURCE_ROOT; };
++		DC50463812034A4C009FF359 /* ImageScanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ImageScanner.h; path = ../include/zbar/ImageScanner.h; sourceTree = SOURCE_ROOT; };
++		DC50463912034A4C009FF359 /* Processor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Processor.h; path = ../include/zbar/Processor.h; sourceTree = SOURCE_ROOT; };
++		DC50463A12034A4C009FF359 /* Scanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Scanner.h; path = ../include/zbar/Scanner.h; sourceTree = SOURCE_ROOT; };
++		DC50463B12034A4C009FF359 /* Symbol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Symbol.h; path = ../include/zbar/Symbol.h; sourceTree = SOURCE_ROOT; };
++		DC50463C12034A4C009FF359 /* Video.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Video.h; path = ../include/zbar/Video.h; sourceTree = SOURCE_ROOT; };
++		DC50463D12034A4C009FF359 /* Window.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Window.h; path = ../include/zbar/Window.h; sourceTree = SOURCE_ROOT; };
++		DC50467B12034D60009FF359 /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README; sourceTree = "<group>"; };
++		DC50467C12034D71009FF359 /* COPYING */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = COPYING; path = ../COPYING; sourceTree = SOURCE_ROOT; };
++		DC50467D12034D71009FF359 /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = SOURCE_ROOT; };
++		DC67C08210A079BE0033B702 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
++		DC67C11710A07A810033B702 /* zbar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = zbar.h; path = ../include/zbar.h; sourceTree = SOURCE_ROOT; usesTabs = 0; };
++		DC67C11F10A07AD30033B702 /* config.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = config.c; sourceTree = "<group>"; usesTabs = 0; };
++		DC67C12110A07AD30033B702 /* debug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = debug.h; sourceTree = "<group>"; usesTabs = 0; };
++		DC67C12310A07AD30033B702 /* code128.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = code128.c; sourceTree = "<group>"; };
++		DC67C12410A07AD30033B702 /* code128.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = code128.h; sourceTree = "<group>"; };
++		DC67C12510A07AD30033B702 /* code39.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = code39.c; sourceTree = "<group>"; };
++		DC67C12610A07AD30033B702 /* code39.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = code39.h; sourceTree = "<group>"; };
++		DC67C12710A07AD30033B702 /* ean.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ean.c; sourceTree = "<group>"; };
++		DC67C12810A07AD30033B702 /* ean.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ean.h; sourceTree = "<group>"; };
++		DC67C12910A07AD30033B702 /* i25.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = i25.c; sourceTree = "<group>"; };
++		DC67C12A10A07AD30033B702 /* i25.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = i25.h; sourceTree = "<group>"; };
++		DC67C12E10A07AD30033B702 /* qr_finder.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = qr_finder.c; sourceTree = "<group>"; };
++		DC67C12F10A07AD30033B702 /* qr_finder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = qr_finder.h; sourceTree = "<group>"; };
++		DC67C13010A07AD30033B702 /* decoder.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = decoder.c; sourceTree = "<group>"; usesTabs = 0; };
++		DC67C13110A07AD30033B702 /* decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = decoder.h; sourceTree = "<group>"; usesTabs = 0; };
++		DC67C13210A07AD30033B702 /* error.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = error.c; sourceTree = "<group>"; usesTabs = 0; };
++		DC67C13310A07AD30033B702 /* error.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = error.h; sourceTree = "<group>"; usesTabs = 0; };
++		DC67C13510A07AD30033B702 /* image.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = image.c; sourceTree = "<group>"; usesTabs = 0; };
++		DC67C13610A07AD30033B702 /* image.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = image.h; sourceTree = "<group>"; usesTabs = 0; };
++		DC67C13710A07AD30033B702 /* img_scanner.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = img_scanner.c; sourceTree = "<group>"; usesTabs = 0; };
++		DC67C13810A07AD30033B702 /* img_scanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = img_scanner.h; sourceTree = "<group>"; usesTabs = 0; };
++		DC67C14710A07AD30033B702 /* bch15_5.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bch15_5.c; sourceTree = "<group>"; };
++		DC67C14810A07AD30033B702 /* bch15_5.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bch15_5.h; sourceTree = "<group>"; };
++		DC67C14910A07AD30033B702 /* binarize.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = binarize.c; sourceTree = "<group>"; };
++		DC67C14A10A07AD30033B702 /* binarize.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = binarize.h; sourceTree = "<group>"; };
++		DC67C14B10A07AD30033B702 /* isaac.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = isaac.c; sourceTree = "<group>"; };
++		DC67C14C10A07AD30033B702 /* isaac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = isaac.h; sourceTree = "<group>"; };
++		DC67C14D10A07AD30033B702 /* qrdec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = qrdec.c; sourceTree = "<group>"; };
++		DC67C14E10A07AD30033B702 /* qrdec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = qrdec.h; sourceTree = "<group>"; };
++		DC67C14F10A07AD30033B702 /* qrdectxt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = qrdectxt.c; sourceTree = "<group>"; };
++		DC67C15010A07AD30033B702 /* rs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rs.c; sourceTree = "<group>"; };
++		DC67C15110A07AD30033B702 /* rs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rs.h; sourceTree = "<group>"; };
++		DC67C15210A07AD30033B702 /* util.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = util.c; sourceTree = "<group>"; };
++		DC67C15310A07AD30033B702 /* util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = util.h; sourceTree = "<group>"; };
++		DC67C15410A07AD30033B702 /* qrcode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = qrcode.h; sourceTree = "<group>"; usesTabs = 0; };
++		DC67C15510A07AD30033B702 /* refcnt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = refcnt.c; sourceTree = "<group>"; usesTabs = 0; };
++		DC67C15610A07AD30033B702 /* refcnt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = refcnt.h; sourceTree = "<group>"; usesTabs = 0; };
++		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; };
++		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>"; };
++		DCF5C9AB11EA3AD100E7DC21 /* databar.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = databar.c; sourceTree = "<group>"; };
++		DCF5C9AC11EA3AD100E7DC21 /* databar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = databar.h; sourceTree = "<group>"; };
++/* End PBXFileReference section */
++
++/* Begin PBXFrameworksBuildPhase section */
++		DC299A931208B5D4006A023C /* Frameworks */ = {
++			isa = PBXFrameworksBuildPhase;
++			buildActionMask = 2147483647;
++			files = (
++				DC299B841208FCAB006A023C /* Foundation.framework in Frameworks */,
++				DC299B061208FC11006A023C /* CoreGraphics.framework in Frameworks */,
++				DC299B311208FCA3006A023C /* UIKit.framework in Frameworks */,
++				DC299AA31208B61C006A023C /* QuartzCore.framework in Frameworks */,
++				DC299AA01208B61C006A023C /* AVFoundation.framework in Frameworks */,
++				DC299AA11208B61C006A023C /* CoreMedia.framework in Frameworks */,
++				DC299AA21208B61C006A023C /* CoreVideo.framework in Frameworks */,
++				DC299AA41208B61C006A023C /* libiconv.dylib in Frameworks */,
++				DC299A9D1208B5E8006A023C /* libzbar.a in Frameworks */,
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++/* End PBXFrameworksBuildPhase section */
++
++/* Begin PBXGroup section */
++		034768DFFF38A50411DB9C8B /* Products */ = {
++			isa = PBXGroup;
++			children = (
++				D2AAC07E0554694100DB518D /* libzbar.a */,
++				DC3CEF9D121633C500D7A786 /* readertest.app */,
++				DC48C55F121A1E7F0047193B /* ZBarSDK */,
++			);
++			name = Products;
++			sourceTree = "<group>";
++		};
++		0867D691FE84028FC02AAC07 /* zbar */ = {
++			isa = PBXGroup;
++			children = (
++				DC50467B12034D60009FF359 /* README */,
++				DC3CF141121721A100D7A786 /* ChangeLog */,
++				DC50467C12034D71009FF359 /* COPYING */,
++				DC50467D12034D71009FF359 /* LICENSE */,
++				DC48C5A7121B1F840047193B /* Documentation.html */,
++				DC299BED1208FE49006A023C /* src */,
++				DC1A49A111FF338B00BCDA30 /* Resources */,
++				DC67C11610A07A670033B702 /* include */,
++				DC3CF2071218356F00D7A786 /* Examples */,
++				DC48C5361219FE2F0047193B /* readertest */,
++				0867D69AFE84028FC02AAC07 /* Frameworks */,
++				034768DFFF38A50411DB9C8B /* Products */,
++			);
++			name = zbar;
++			sourceTree = "<group>";
++		};
++		0867D69AFE84028FC02AAC07 /* Frameworks */ = {
++			isa = PBXGroup;
++			children = (
++				AACBBE490F95108600F1A2B1 /* Foundation.framework */,
++				DC299B051208FC11006A023C /* CoreGraphics.framework */,
++				DC67C08210A079BE0033B702 /* UIKit.framework */,
++				DC1A49C111FF537000BCDA30 /* QuartzCore.framework */,
++				DC50453D1203396B009FF359 /* AVFoundation.framework */,
++				DC50453F1203396B009FF359 /* CoreMedia.framework */,
++				DC5045411203396B009FF359 /* CoreVideo.framework */,
++				DC5045431203396B009FF359 /* libiconv.dylib */,
++			);
++			name = Frameworks;
++			sourceTree = "<group>";
++		};
++		DC1A49A111FF338B00BCDA30 /* Resources */ = {
++			isa = PBXGroup;
++			children = (
++				DC3CF2A212197A7200D7A786 /* zbar-back.png */,
++				DC1A49A211FF33B300BCDA30 /* zbar-help.html */,
++				DC1A49A311FF33B300BCDA30 /* zbar-helpicons.png */,
++				DC1A49A411FF33B300BCDA30 /* zbar-samples.png */,
++			);
++			name = Resources;
++			sourceTree = "<group>";
++			usesTabs = 0;
++		};
++		DC299BE41208FE09006A023C /* ZBarSDK */ = {
++			isa = PBXGroup;
++			children = (
++				DC3CEFA51216347100D7A786 /* ZBarCaptureReader.h */,
++				DCB3789A12A43C7E0059B07B /* ZBarHelpController.h */,
++				DC3CEFA61216347100D7A786 /* ZBarImage.h */,
++				DC3CEFA71216347100D7A786 /* ZBarImageScanner.h */,
++				DC3CEFA81216347100D7A786 /* ZBarReaderController.h */,
++				DC3CEFA91216347100D7A786 /* ZBarReaderView.h */,
++				DC3CEFAA1216347100D7A786 /* ZBarReaderViewController.h */,
++				DC3CEFAB1216347100D7A786 /* ZBarSDK.h */,
++				DC3CEFAC1216347100D7A786 /* ZBarSymbol.h */,
++				DC67C11710A07A810033B702 /* zbar.h */,
++				DC50463412034A1E009FF359 /* zbar */,
++			);
++			name = ZBarSDK;
++			sourceTree = "<group>";
++		};
++		DC299BED1208FE49006A023C /* src */ = {
++			isa = PBXGroup;
++			children = (
++				DC67C1C010A07B6B0033B702 /* ZBarSymbol.m */,
++				DC4920EC10A70475000E4D43 /* ZBarImage.m */,
++				DC4920ED10A70475000E4D43 /* ZBarImageScanner.m */,
++				DC3AAB4D11B71A040021C7B1 /* ZBarCVImage.m */,
++				DC26004B118631C200FA987B /* ZBarCaptureReader.m */,
++				DCDC6E2F11ADCA8E00021380 /* ZBarReaderView.m */,
++				DC3CE47611FA1622008FAF88 /* ZBarReaderViewImpl_Capture.m */,
++				DC3CE47711FA1622008FAF88 /* ZBarReaderViewImpl_Simulator.m */,
++				DC67C1BE10A07B6B0033B702 /* ZBarHelpController.m */,
++				DC3EBB2C119DDB2100107EE9 /* ZBarReaderViewController.m */,
++				DC67C1BF10A07B6B0033B702 /* ZBarReaderController.m */,
++				DC67C11E10A07AD30033B702 /* zbar */,
++			);
++			name = src;
++			sourceTree = "<group>";
++		};
++		DC3CF2071218356F00D7A786 /* Examples */ = {
++			isa = PBXGroup;
++			children = (
++				DC3CF2081218358C00D7A786 /* ReaderSample */,
++				DC3CF2651218358C00D7A786 /* readertest */,
++			);
++			name = Examples;
++			sourceTree = "<group>";
++		};
++		DC48C5361219FE2F0047193B /* readertest */ = {
++			isa = PBXGroup;
++			children = (
++				DC48C5401219FE550047193B /* readertest.m */,
++			);
++			name = readertest;
++			sourceTree = "<group>";
++		};
++		DC50463412034A1E009FF359 /* zbar */ = {
++			isa = PBXGroup;
++			children = (
++				DC50463512034A4C009FF359 /* Decoder.h */,
++				DC50463612034A4C009FF359 /* Exception.h */,
++				DC50463712034A4C009FF359 /* Image.h */,
++				DC50463812034A4C009FF359 /* ImageScanner.h */,
++				DC50463912034A4C009FF359 /* Processor.h */,
++				DC50463A12034A4C009FF359 /* Scanner.h */,
++				DC50463B12034A4C009FF359 /* Symbol.h */,
++				DC50463C12034A4C009FF359 /* Video.h */,
++				DC50463D12034A4C009FF359 /* Window.h */,
++			);
++			name = zbar;
++			sourceTree = "<group>";
++		};
++		DC67C11610A07A670033B702 /* include */ = {
++			isa = PBXGroup;
++			children = (
++				DC299BEC1208FE40006A023C /* prefix.pch */,
++				DC299AF51208B7BD006A023C /* config.h */,
++				DC3AAB4C11B71A040021C7B1 /* ZBarCVImage.h */,
++				DC299BE41208FE09006A023C /* ZBarSDK */,
++			);
++			name = include;
++			sourceTree = "<group>";
++			usesTabs = 0;
++		};
++		DC67C11E10A07AD30033B702 /* zbar */ = {
++			isa = PBXGroup;
++			children = (
++				DC67C11F10A07AD30033B702 /* config.c */,
++				DC67C12110A07AD30033B702 /* debug.h */,
++				DC67C12210A07AD30033B702 /* decoder */,
++				DC67C13010A07AD30033B702 /* decoder.c */,
++				DC67C13110A07AD30033B702 /* decoder.h */,
++				DC67C13210A07AD30033B702 /* error.c */,
++				DC67C13310A07AD30033B702 /* error.h */,
++				DC67C13510A07AD30033B702 /* image.c */,
++				DC67C13610A07AD30033B702 /* image.h */,
++				DC67C13710A07AD30033B702 /* img_scanner.c */,
++				DC67C13810A07AD30033B702 /* img_scanner.h */,
++				DC67C14610A07AD30033B702 /* qrcode */,
++				DC67C15410A07AD30033B702 /* qrcode.h */,
++				DC67C15510A07AD30033B702 /* refcnt.c */,
++				DC67C15610A07AD30033B702 /* refcnt.h */,
++				DC67C15710A07AD30033B702 /* scanner.c */,
++				DC67C1CB10A07BEE0033B702 /* svg.h */,
++				DC67C15A10A07AD30033B702 /* symbol.c */,
++				DC67C15B10A07AD30033B702 /* symbol.h */,
++			);
++			name = zbar;
++			path = ../zbar;
++			sourceTree = SOURCE_ROOT;
++			usesTabs = 0;
++		};
++		DC67C12210A07AD30033B702 /* decoder */ = {
++			isa = PBXGroup;
++			children = (
++				DCF5C9AB11EA3AD100E7DC21 /* databar.c */,
++				DCF5C9AC11EA3AD100E7DC21 /* databar.h */,
++				DC67C12310A07AD30033B702 /* code128.c */,
++				DC67C12410A07AD30033B702 /* code128.h */,
++				DCE9900B129719F100D2655C /* code93.c */,
++				DCE9900C129719F100D2655C /* code93.h */,
++				DC67C12510A07AD30033B702 /* code39.c */,
++				DC67C12610A07AD30033B702 /* code39.h */,
++				DC67C12710A07AD30033B702 /* ean.c */,
++				DC67C12810A07AD30033B702 /* ean.h */,
++				DC67C12910A07AD30033B702 /* i25.c */,
++				DC67C12A10A07AD30033B702 /* i25.h */,
++				DC67C12E10A07AD30033B702 /* qr_finder.c */,
++				DC67C12F10A07AD30033B702 /* qr_finder.h */,
++			);
++			path = decoder;
++			sourceTree = "<group>";
++			usesTabs = 0;
++		};
++		DC67C14610A07AD30033B702 /* qrcode */ = {
++			isa = PBXGroup;
++			children = (
++				DC67C14710A07AD30033B702 /* bch15_5.c */,
++				DC67C14810A07AD30033B702 /* bch15_5.h */,
++				DC67C14910A07AD30033B702 /* binarize.c */,
++				DC67C14A10A07AD30033B702 /* binarize.h */,
++				DC67C14B10A07AD30033B702 /* isaac.c */,
++				DC67C14C10A07AD30033B702 /* isaac.h */,
++				DC67C14D10A07AD30033B702 /* qrdec.c */,
++				DC67C14E10A07AD30033B702 /* qrdec.h */,
++				DC67C14F10A07AD30033B702 /* qrdectxt.c */,
++				DC67C15010A07AD30033B702 /* rs.c */,
++				DC67C15110A07AD30033B702 /* rs.h */,
++				DC67C15210A07AD30033B702 /* util.c */,
++				DC67C15310A07AD30033B702 /* util.h */,
++			);
++			path = qrcode;
++			sourceTree = "<group>";
++			usesTabs = 0;
++		};
++/* End PBXGroup section */
++
++/* Begin PBXNativeTarget section */
++		D2AAC07D0554694100DB518D /* libzbar */ = {
++			isa = PBXNativeTarget;
++			buildConfigurationList = 1DEB921E08733DC00010E9CD /* Build configuration list for PBXNativeTarget "libzbar" */;
++			buildPhases = (
++				D2AAC07B0554694100DB518D /* Sources */,
++			);
++			buildRules = (
++			);
++			dependencies = (
++			);
++			name = libzbar;
++			productName = zbar;
++			productReference = D2AAC07E0554694100DB518D /* libzbar.a */;
++			productType = "com.apple.product-type.library.static";
++		};
++		DC299A941208B5D4006A023C /* readertest */ = {
++			isa = PBXNativeTarget;
++			buildConfigurationList = DC299A9A1208B5D5006A023C /* Build configuration list for PBXNativeTarget "readertest" */;
++			buildPhases = (
++				DC299A911208B5D4006A023C /* Resources */,
++				DC299A921208B5D4006A023C /* Sources */,
++				DC299A931208B5D4006A023C /* Frameworks */,
++			);
++			buildRules = (
++			);
++			dependencies = (
++				DC299A9F1208B5F1006A023C /* PBXTargetDependency */,
++			);
++			name = readertest;
++			productName = readertest;
++			productReference = DC3CEF9D121633C500D7A786 /* readertest.app */;
++			productType = "com.apple.product-type.application";
++		};
++/* End PBXNativeTarget section */
++
++/* Begin PBXProject section */
++		0867D690FE84028FC02AAC07 /* Project object */ = {
++			isa = PBXProject;
++			buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "zbar" */;
++			compatibilityVersion = "Xcode 3.1";
++			developmentRegion = English;
++			hasScannedForEncodings = 1;
++			knownRegions = (
++				English,
++				Japanese,
++				French,
++				German,
++			);
++			mainGroup = 0867D691FE84028FC02AAC07 /* zbar */;
++			productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
++			projectDirPath = "";
++			projectRoot = "";
++			targets = (
++				D2AAC07D0554694100DB518D /* libzbar */,
++				DC3CEE821215C7EF00D7A786 /* ZBarSDK */,
++				DC1A4A4E11FF5D0500BCDA30 /* ZBarSDK.dmg */,
++				DC299A941208B5D4006A023C /* readertest */,
++			);
++		};
++/* End PBXProject section */
++
++/* Begin PBXResourcesBuildPhase section */
++		DC299A911208B5D4006A023C /* Resources */ = {
++			isa = PBXResourcesBuildPhase;
++			buildActionMask = 2147483647;
++			files = (
++				DC299AA51208B63C006A023C /* zbar-help.html in Resources */,
++				DC299AA61208B63C006A023C /* zbar-helpicons.png in Resources */,
++				DC299AA71208B63C006A023C /* zbar-samples.png in Resources */,
++				DC48C5341219FDDE0047193B /* zbar-back.png in Resources */,
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++/* End PBXResourcesBuildPhase section */
++
++/* Begin PBXShellScriptBuildPhase section */
++		DC1A4A4D11FF5D0500BCDA30 /* Make Disk Image */ = {
++			isa = PBXShellScriptBuildPhase;
++			buildActionMask = 2147483647;
++			files = (
++			);
++			inputPaths = (
++			);
++			name = "Make Disk Image";
++			outputPaths = (
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++			shellPath = /bin/sh;
++			shellScript = "exec $SOURCE_ROOT/bin/CreateDMG.sh ZBarSDK";
++		};
++		DC3CEE891215C88000D7A786 /* Build Universal Library */ = {
++			isa = PBXShellScriptBuildPhase;
++			buildActionMask = 2147483647;
++			files = (
++			);
++			inputPaths = (
++				"$(BUILD_DIR)/$(CONFIGURATION)-iphoneos/libzbar.a",
++				"$(BUILD_DIR)/$(CONFIGURATION)-iphonesimulator/libzbar.a",
++			);
++			name = "Build Universal Library";
++			outputPaths = (
++				"$(TARGET_BUILD_DIR)/libzbar.a",
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++			shellPath = /bin/sh;
++			shellScript = "exec $SOURCE_ROOT/bin/BuildUniversal.sh libzbar";
++		};
++		DC48C585121AC7C20047193B /* Build Documentation */ = {
++			isa = PBXShellScriptBuildPhase;
++			buildActionMask = 2147483647;
++			files = (
++			);
++			inputPaths = (
++			);
++			name = "Build Documentation";
++			outputPaths = (
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++			shellPath = /bin/sh;
++			shellScript = "PATH=${PATH}:/usr/local/bin:/sw/bin\nsphinx-build -W -d $TEMP_DIR $SOURCE_ROOT/doc $TARGET_BUILD_DIR/Documentation";
++		};
++/* End PBXShellScriptBuildPhase section */
++
++/* Begin PBXSourcesBuildPhase section */
++		D2AAC07B0554694100DB518D /* Sources */ = {
++			isa = PBXSourcesBuildPhase;
++			buildActionMask = 2147483647;
++			files = (
++				DC67C17110A07AD30033B702 /* config.c in Sources */,
++				DC67C17410A07AD30033B702 /* code128.c in Sources */,
++				DC67C17610A07AD30033B702 /* code39.c in Sources */,
++				DC67C17810A07AD30033B702 /* ean.c in Sources */,
++				DC67C17A10A07AD30033B702 /* i25.c in Sources */,
++				DC67C17F10A07AD30033B702 /* qr_finder.c in Sources */,
++				DC67C18110A07AD30033B702 /* decoder.c in Sources */,
++				DC67C18310A07AD30033B702 /* error.c in Sources */,
++				DC67C18610A07AD30033B702 /* image.c in Sources */,
++				DC67C18810A07AD30033B702 /* img_scanner.c in Sources */,
++				DC67C19510A07AD30033B702 /* bch15_5.c in Sources */,
++				DC67C19710A07AD30033B702 /* binarize.c in Sources */,
++				DC67C19910A07AD30033B702 /* isaac.c in Sources */,
++				DC67C19B10A07AD30033B702 /* qrdec.c in Sources */,
++				DC67C19D10A07AD30033B702 /* qrdectxt.c in Sources */,
++				DC67C19E10A07AD30033B702 /* rs.c in Sources */,
++				DC67C1A010A07AD30033B702 /* util.c in Sources */,
++				DC67C1A310A07AD30033B702 /* refcnt.c in Sources */,
++				DC67C1A510A07AD30033B702 /* scanner.c in Sources */,
++				DC67C1A810A07AD30033B702 /* symbol.c in Sources */,
++				DC67C1C210A07B6B0033B702 /* ZBarHelpController.m in Sources */,
++				DC67C1C310A07B6B0033B702 /* ZBarReaderController.m in Sources */,
++				DC67C1C410A07B6B0033B702 /* ZBarSymbol.m in Sources */,
++				DC4920EE10A70475000E4D43 /* ZBarImage.m in Sources */,
++				DC4920EF10A70475000E4D43 /* ZBarImageScanner.m in Sources */,
++				DC26004C118631C200FA987B /* ZBarCaptureReader.m in Sources */,
++				DC3EBB2D119DDB2100107EE9 /* ZBarReaderViewController.m in Sources */,
++				DCDC6E3011ADCA8E00021380 /* ZBarReaderView.m in Sources */,
++				DC3AAB4F11B71A040021C7B1 /* ZBarCVImage.m in Sources */,
++				DCF5C9AD11EA3AD100E7DC21 /* databar.c in Sources */,
++				DC3CE47811FA1622008FAF88 /* ZBarReaderViewImpl_Capture.m in Sources */,
++				DC3CE47911FA1622008FAF88 /* ZBarReaderViewImpl_Simulator.m in Sources */,
++				DCE9900D129719F100D2655C /* code93.c in Sources */,
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++		DC299A921208B5D4006A023C /* Sources */ = {
++			isa = PBXSourcesBuildPhase;
++			buildActionMask = 2147483647;
++			files = (
++				DC48C5411219FE550047193B /* readertest.m in Sources */,
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++/* End PBXSourcesBuildPhase section */
++
++/* Begin PBXTargetDependency section */
++		DC299A9F1208B5F1006A023C /* PBXTargetDependency */ = {
++			isa = PBXTargetDependency;
++			target = D2AAC07D0554694100DB518D /* libzbar */;
++			targetProxy = DC299A9E1208B5F1006A023C /* PBXContainerItemProxy */;
++		};
++		DC3CEE871215C85400D7A786 /* PBXTargetDependency */ = {
++			isa = PBXTargetDependency;
++			target = D2AAC07D0554694100DB518D /* libzbar */;
++			targetProxy = DC3CEE861215C85400D7A786 /* PBXContainerItemProxy */;
++		};
++		DC3CF01F1216366200D7A786 /* PBXTargetDependency */ = {
++			isa = PBXTargetDependency;
++			target = DC3CEE821215C7EF00D7A786 /* ZBarSDK */;
++			targetProxy = DC3CF01E1216366200D7A786 /* PBXContainerItemProxy */;
++		};
++/* End PBXTargetDependency section */
++
++/* Begin XCBuildConfiguration section */
++		1DEB921F08733DC00010E9CD /* Debug */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				ALWAYS_SEARCH_USER_PATHS = NO;
++				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
++				COPY_PHASE_STRIP = NO;
++				GCC_DYNAMIC_NO_PIC = NO;
++				GCC_ENABLE_FIX_AND_CONTINUE = YES;
++				GCC_MODEL_TUNING = G5;
++				GCC_OPTIMIZATION_LEVEL = 0;
++				GCC_PRECOMPILE_PREFIX_HEADER = YES;
++				GCC_PREFIX_HEADER = include/prefix.pch;
++				HEADER_SEARCH_PATHS = (
++					include,
++					../include,
++					../zbar,
++				);
++				OTHER_LDFLAGS = "";
++				PRODUCT_NAME = zbar;
++			};
++			name = Debug;
++		};
++		1DEB922008733DC00010E9CD /* Release */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				ALWAYS_SEARCH_USER_PATHS = NO;
++				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
++				GCC_MODEL_TUNING = G5;
++				GCC_PRECOMPILE_PREFIX_HEADER = YES;
++				GCC_PREFIX_HEADER = include/prefix.pch;
++				HEADER_SEARCH_PATHS = (
++					include,
++					../include,
++					../zbar,
++				);
++				OTHER_LDFLAGS = "";
++				PRODUCT_NAME = zbar;
++			};
++			name = Release;
++		};
++		1DEB922308733DC00010E9CD /* Debug */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
++				EXCLUDED_SOURCE_FILE_NAMES = "";
++				"EXCLUDED_SOURCE_FILE_NAMES[sdk=iphoneos*][arch=*]" = ZBarReaderViewImpl_Simulator.m;
++				"EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*][arch=*]" = (
++					ZBarReaderViewImpl_Capture.m,
++					ZBarCaptureReader.m,
++				);
++				GCC_C_LANGUAGE_STANDARD = c99;
++				GCC_OPTIMIZATION_LEVEL = 0;
++				GCC_PREPROCESSOR_DEFINITIONS = "DEBUG_OBJC=1";
++				GCC_WARN_ABOUT_RETURN_TYPE = YES;
++				GCC_WARN_UNUSED_VARIABLE = YES;
++				IPHONEOS_DEPLOYMENT_TARGET = 3.0;
++				OTHER_LDFLAGS = "-ObjC";
++				PREBINDING = NO;
++				RUN_CLANG_STATIC_ANALYZER = NO;
++				SDKROOT = iphoneos;
++				USE_HEADERMAP = NO;
++			};
++			name = Debug;
++		};
++		1DEB922408733DC00010E9CD /* Release */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
++				EXCLUDED_SOURCE_FILE_NAMES = "";
++				"EXCLUDED_SOURCE_FILE_NAMES[sdk=iphoneos*][arch=*]" = ZBarReaderViewImpl_Simulator.m;
++				"EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*][arch=*]" = (
++					ZBarReaderViewImpl_Capture.m,
++					ZBarCaptureReader.m,
++				);
++				GCC_C_LANGUAGE_STANDARD = c99;
++				GCC_PREPROCESSOR_DEFINITIONS = "NDEBUG=1";
++				GCC_WARN_ABOUT_RETURN_TYPE = YES;
++				GCC_WARN_UNUSED_VARIABLE = YES;
++				IPHONEOS_DEPLOYMENT_TARGET = 3.0;
++				OTHER_LDFLAGS = "-ObjC";
++				PREBINDING = NO;
++				RUN_CLANG_STATIC_ANALYZER = NO;
++				SDKROOT = iphoneos;
++				USE_HEADERMAP = NO;
++			};
++			name = Release;
++		};
++		DC1A4A4F11FF5D0500BCDA30 /* Debug */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				COPY_PHASE_STRIP = NO;
++				PRODUCT_NAME = ZBarSDK.dmg;
++				TARGET_BUILD_DIR = "$(TARGET_BUILD_DIR)/$(PRODUCT_NAME)";
++			};
++			name = Debug;
++		};
++		DC1A4A5011FF5D0500BCDA30 /* Release */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				COPY_PHASE_STRIP = NO;
++				PRODUCT_NAME = ZBarSDK.dmg;
++				TARGET_BUILD_DIR = "$(TARGET_BUILD_DIR)/$(PRODUCT_NAME)";
++			};
++			name = Release;
++		};
++		DC299A981208B5D5006A023C /* Debug */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				ALWAYS_SEARCH_USER_PATHS = NO;
++				CODE_SIGN_IDENTITY = "iPhone Developer";
++				COPY_PHASE_STRIP = NO;
++				GCC_DYNAMIC_NO_PIC = NO;
++				GCC_OPTIMIZATION_LEVEL = 0;
++				GCC_PRECOMPILE_PREFIX_HEADER = YES;
++				GCC_PREFIX_HEADER = examples/readertest/prefix.pch;
++				HEADER_SEARCH_PATHS = (
++					include/ZBarSDK,
++					../include,
++				);
++				INFOPLIST_FILE = examples/readertest/readertest.plist;
++				INSTALL_PATH = "$(HOME)/Applications";
++				OTHER_LDFLAGS = (
++					"-framework",
++					Foundation,
++					"-framework",
++					UIKit,
++				);
++				PREBINDING = NO;
++				PRODUCT_NAME = readertest;
++			};
++			name = Debug;
++		};
++		DC299A991208B5D5006A023C /* Release */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				ALWAYS_SEARCH_USER_PATHS = NO;
++				CODE_SIGN_IDENTITY = "iPhone Developer";
++				COPY_PHASE_STRIP = YES;
++				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
++				GCC_ENABLE_FIX_AND_CONTINUE = NO;
++				GCC_PRECOMPILE_PREFIX_HEADER = YES;
++				GCC_PREFIX_HEADER = examples/readertest/prefix.pch;
++				HEADER_SEARCH_PATHS = (
++					include/ZBarSDK,
++					../include,
++				);
++				INFOPLIST_FILE = examples/readertest/readertest.plist;
++				INSTALL_PATH = "$(HOME)/Applications";
++				OTHER_LDFLAGS = (
++					"-framework",
++					Foundation,
++					"-framework",
++					UIKit,
++				);
++				PREBINDING = NO;
++				PRODUCT_NAME = readertest;
++				ZERO_LINK = NO;
++			};
++			name = Release;
++		};
++		DC3CEE831215C7EF00D7A786 /* Debug */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				COPY_PHASE_STRIP = NO;
++				GCC_DYNAMIC_NO_PIC = NO;
++				GCC_OPTIMIZATION_LEVEL = 0;
++				PRODUCT_NAME = ZBarSDK;
++				TARGET_BUILD_DIR = "$(TARGET_BUILD_DIR)/$(PRODUCT_NAME)";
++			};
++			name = Debug;
++		};
++		DC3CEE841215C7EF00D7A786 /* Release */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				COPY_PHASE_STRIP = YES;
++				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
++				GCC_ENABLE_FIX_AND_CONTINUE = NO;
++				PRODUCT_NAME = ZBarSDK;
++				TARGET_BUILD_DIR = "$(TARGET_BUILD_DIR)/$(PRODUCT_NAME)";
++				ZERO_LINK = NO;
++			};
++			name = Release;
++		};
++/* End XCBuildConfiguration section */
++
++/* Begin XCConfigurationList section */
++		1DEB921E08733DC00010E9CD /* Build configuration list for PBXNativeTarget "libzbar" */ = {
++			isa = XCConfigurationList;
++			buildConfigurations = (
++				1DEB921F08733DC00010E9CD /* Debug */,
++				1DEB922008733DC00010E9CD /* Release */,
++			);
++			defaultConfigurationIsVisible = 0;
++			defaultConfigurationName = Release;
++		};
++		1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "zbar" */ = {
++			isa = XCConfigurationList;
++			buildConfigurations = (
++				1DEB922308733DC00010E9CD /* Debug */,
++				1DEB922408733DC00010E9CD /* Release */,
++			);
++			defaultConfigurationIsVisible = 0;
++			defaultConfigurationName = Release;
++		};
++		DC1A4A5311FF5D3D00BCDA30 /* Build configuration list for PBXAggregateTarget "ZBarSDK.dmg" */ = {
++			isa = XCConfigurationList;
++			buildConfigurations = (
++				DC1A4A4F11FF5D0500BCDA30 /* Debug */,
++				DC1A4A5011FF5D0500BCDA30 /* Release */,
++			);
++			defaultConfigurationIsVisible = 0;
++			defaultConfigurationName = Release;
++		};
++		DC299A9A1208B5D5006A023C /* Build configuration list for PBXNativeTarget "readertest" */ = {
++			isa = XCConfigurationList;
++			buildConfigurations = (
++				DC299A981208B5D5006A023C /* Debug */,
++				DC299A991208B5D5006A023C /* Release */,
++			);
++			defaultConfigurationIsVisible = 0;
++			defaultConfigurationName = Release;
++		};
++		DC3CEE851215C83500D7A786 /* Build configuration list for PBXAggregateTarget "ZBarSDK" */ = {
++			isa = XCConfigurationList;
++			buildConfigurations = (
++				DC3CEE831215C7EF00D7A786 /* Debug */,
++				DC3CEE841215C7EF00D7A786 /* Release */,
++			);
++			defaultConfigurationIsVisible = 0;
++			defaultConfigurationName = Release;
++		};
++/* End XCConfigurationList section */
++	};
++	rootObject = 0867D690FE84028FC02AAC07 /* Project object */;
++}
+diff --git a/java/Makefile.am b/java/Makefile.am
+new file mode 100644
+--- /dev/null
++++ b/java/Makefile.am
+@@ -0,0 +1,39 @@
++javadir = $(pkgdatadir)/lib
++
++PKG = net/sourceforge/zbar
++java_DATA = zbar.jar
++
++java_LTLIBRARIES = libzbarjni.la
++libzbarjni_la_CPPFLAGS = $(JAVA_CFLAGS) $(AM_CPPFLAGS)
++libzbarjni_la_LIBADD = $(abs_top_builddir)/zbar/libzbar.la
++
++libzbarjni_la_SOURCES = zbarjni.c zbarjni.h
++BUILT_SOURCES = zbarjni.h
++MAINTAINERCLEANFILES = zbarjni.h
++
++zbar_jar_SRCS = \
++    $(PKG)/Config.java $(PKG)/Modifier.java $(PKG)/Orientation.java \
++    $(PKG)/Symbol.java $(PKG)/SymbolIterator.java $(PKG)/SymbolSet.java \
++    $(PKG)/Image.java $(PKG)/ImageScanner.java
++
++zbar_jar_CLASSES = $(zbar_jar_SRCS:.java=.class)
++
++test_SRCS = test/TestImage.java test/TestImageScanner.java \
++    test/TestScanImage.java
++test_CLASSES = TestImage TestImageScanner TestScanImage
++
++CLEANFILES = zbar.jar $(zbar_jar_CLASSES) $(test_CLASSES:=.class)
++
++zbarjni.h: $(zbar_jar_SRCS)
++	$(MAKE) $(AM_MAKEFLAGS) zbar.jar
++	classes=`echo $(zbar_jar_CLASSES:.class=) | tr / .` ; \
++	    $(JAVAH) -o $@ $$classes
++
++zbar.jar: $(zbar_jar_SRCS)
++	cd $(abs_srcdir); $(JAVAC) -d $(abs_builddir) $(zbar_jar_SRCS)
++	$(JAR) cf $@ $(zbar_jar_CLASSES) || $(RM) $@
++
++check-local:
++	echo "making check in java"
++	cd $(abs_srcdir); $(JAVAC) -classpath $(abs_builddir)/zbar.jar:.:$(CLASSPATH) -d $(abs_builddir) $(test_SRCS)
++	$(top_builddir)/libtool -dlopen $(top_builddir)/zbar/libzbar.la -dlopen libzbarjni.la --mode=execute $(JAVA) -Xcheck:jni -classpath zbar.jar:.:$(CLASSPATH) org.junit.runner.JUnitCore $(test_CLASSES)
+diff --git a/java/net/sourceforge/zbar/Config.java b/java/net/sourceforge/zbar/Config.java
+new file mode 100644
+--- /dev/null
++++ b/java/net/sourceforge/zbar/Config.java
+@@ -0,0 +1,56 @@
++/*------------------------------------------------------------------------
++ *  Config
++ *
++ *  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
++ *
++ *  This file is part of the ZBar Bar Code Reader.
++ *
++ *  The ZBar Bar Code Reader is free software; you can redistribute it
++ *  and/or modify it under the terms of the GNU Lesser Public License as
++ *  published by the Free Software Foundation; either version 2.1 of
++ *  the License, or (at your option) any later version.
++ *
++ *  The ZBar Bar Code Reader is distributed in the hope that it will be
++ *  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
++ *  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU Lesser Public License for more details.
++ *
++ *  You should have received a copy of the GNU Lesser Public License
++ *  along with the ZBar Bar Code Reader; if not, write to the Free
++ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++ *  Boston, MA  02110-1301  USA
++ *
++ *  http://sourceforge.net/projects/zbar
++ *------------------------------------------------------------------------*/
++
++package net.sourceforge.zbar;
++
++/** Decoder configuration options.
++ */
++public class Config
++{
++    /** Enable symbology/feature. */
++    public static final int ENABLE = 0;
++    /** Enable check digit when optional. */
++    public static final int ADD_CHECK = 1;
++    /** Return check digit when present. */
++    public static final int EMIT_CHECK = 2;
++    /** Enable full ASCII character set. */
++    public static final int ASCII = 3;
++
++    /** Minimum data length for valid decode. */
++    public static final int MIN_LEN = 0x20;
++    /** Maximum data length for valid decode. */
++    public static final int MAX_LEN = 0x21;
++
++    /** Required video consistency frames. */
++    public static final int UNCERTAINTY = 0x40;
++
++    /** Enable scanner to collect position data. */
++    public static final int POSITION = 0x80;
++
++    /** Image scanner vertical scan density. */
++    public static final int X_DENSITY = 0x100;
++    /** Image scanner horizontal scan density. */
++    public static final int Y_DENSITY = 0x101;
++}
+diff --git a/java/net/sourceforge/zbar/Image.java b/java/net/sourceforge/zbar/Image.java
+new file mode 100644
+--- /dev/null
++++ b/java/net/sourceforge/zbar/Image.java
+@@ -0,0 +1,163 @@
++/*------------------------------------------------------------------------
++ *  Image
++ *
++ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
++ *
++ *  This file is part of the ZBar Bar Code Reader.
++ *
++ *  The ZBar Bar Code Reader is free software; you can redistribute it
++ *  and/or modify it under the terms of the GNU Lesser Public License as
++ *  published by the Free Software Foundation; either version 2.1 of
++ *  the License, or (at your option) any later version.
++ *
++ *  The ZBar Bar Code Reader is distributed in the hope that it will be
++ *  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
++ *  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU Lesser Public License for more details.
++ *
++ *  You should have received a copy of the GNU Lesser Public License
++ *  along with the ZBar Bar Code Reader; if not, write to the Free
++ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++ *  Boston, MA  02110-1301  USA
++ *
++ *  http://sourceforge.net/projects/zbar
++ *------------------------------------------------------------------------*/
++
++package net.sourceforge.zbar;
++
++/** stores image data samples along with associated format and size
++ * metadata.
++ */
++public class Image
++{
++    /** C pointer to a zbar_symbol_t. */
++    private long peer;
++    private Object data;
++
++    static
++    {
++        System.loadLibrary("zbarjni");
++        init();
++    }
++    private static native void init();
++
++    public Image ()
++    {
++        peer = create();
++    }
++
++    public Image (int width, int height)
++    {
++        this();
++        setSize(width, height);
++    }
++
++    public Image (int width, int height, String format)
++    {
++        this();
++        setSize(width, height);
++        setFormat(format);
++    }
++
++    public Image (String format)
++    {
++        this();
++        setFormat(format);
++    }
++
++    Image (long peer)
++    {
++        this.peer = peer;
++    }
++
++    /** Create an associated peer instance. */
++    private native long create();
++
++    protected void finalize ()
++    {
++        destroy();
++    }
++
++    /** Clean up native data associated with an instance. */
++    public synchronized void destroy ()
++    {
++        if(peer != 0) {
++            destroy(peer);
++            peer = 0;
++        }
++    }
++
++    /** Destroy the associated peer instance.  */
++    private native void destroy(long peer);
++
++    /** Image format conversion.
++     * @returns a @em new image with the sample data from the original
++     * image converted to the requested format fourcc.  the original
++     * image is unaffected.
++     */
++    public Image convert (String format)
++    {
++        long newpeer = convert(peer, format);
++        if(newpeer == 0)
++            return(null);
++        return(new Image(newpeer));
++    }
++
++    private native long convert(long peer, String format);
++
++    /** Retrieve the image format fourcc. */
++    public native String getFormat();
++
++    /** Specify the fourcc image format code for image sample data. */
++    public native void setFormat(String format);
++
++    /** Retrieve a "sequence" (page/frame) number associated with this
++     * image.
++     */
++    public native int getSequence();
++
++    /** Associate a "sequence" (page/frame) number with this image. */
++    public native void setSequence(int seq);
++
++    /** Retrieve the width of the image. */
++    public native int getWidth();
++
++    /** Retrieve the height of the image. */
++    public native int getHeight();
++
++    /** Retrieve the size of the image. */
++    public native int[] getSize();
++
++    /** Specify the pixel size of the image. */
++    public native void setSize(int width, int height);
++
++    /** Specify the pixel size of the image. */
++    public native void setSize(int[] size);
++
++    /** Retrieve the crop region of the image. */
++    public native int[] getCrop();
++
++    /** Specify the crop region of the image. */
++    public native void setCrop(int x, int y, int width, int height);
++
++    /** Specify the crop region of the image. */
++    public native void setCrop(int[] crop);
++
++    /** Retrieve the image sample data. */
++    public native byte[] getData();
++
++    /** Specify image sample data. */
++    public native void setData(byte[] data);
++
++    /** Specify image sample data. */
++    public native void setData(int[] data);
++
++    /** Retrieve the decoded results associated with this image. */
++    public SymbolSet getSymbols ()
++    {
++        return(new SymbolSet(getSymbols(peer)));
++    }
++
++    private native long getSymbols(long peer);
++
++}
+diff --git a/java/net/sourceforge/zbar/ImageScanner.java b/java/net/sourceforge/zbar/ImageScanner.java
+new file mode 100644
+--- /dev/null
++++ b/java/net/sourceforge/zbar/ImageScanner.java
+@@ -0,0 +1,98 @@
++/*------------------------------------------------------------------------
++ *  ImageScanner
++ *
++ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
++ *
++ *  This file is part of the ZBar Bar Code Reader.
++ *
++ *  The ZBar Bar Code Reader is free software; you can redistribute it
++ *  and/or modify it under the terms of the GNU Lesser Public License as
++ *  published by the Free Software Foundation; either version 2.1 of
++ *  the License, or (at your option) any later version.
++ *
++ *  The ZBar Bar Code Reader is distributed in the hope that it will be
++ *  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
++ *  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU Lesser Public License for more details.
++ *
++ *  You should have received a copy of the GNU Lesser Public License
++ *  along with the ZBar Bar Code Reader; if not, write to the Free
++ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++ *  Boston, MA  02110-1301  USA
++ *
++ *  http://sourceforge.net/projects/zbar
++ *------------------------------------------------------------------------*/
++
++package net.sourceforge.zbar;
++
++/** Read barcodes from 2-D images.
++ */
++public class ImageScanner
++{
++    /** C pointer to a zbar_image_scanner_t. */
++    private long peer;
++
++    static
++    {
++        System.loadLibrary("zbarjni");
++        init();
++    }
++    private static native void init();
++
++    public ImageScanner ()
++    {
++        peer = create();
++    }
++
++    /** Create an associated peer instance. */
++    private native long create();
++
++    protected void finalize ()
++    {
++        destroy();
++    }
++
++    /** Clean up native data associated with an instance. */
++    public synchronized void destroy ()
++    {
++        if(peer != 0) {
++            destroy(peer);
++            peer = 0;
++        }
++    }
++
++    /** Destroy the associated peer instance.  */
++    private native void destroy(long peer);
++
++    /** Set config for indicated symbology (0 for all) to specified value.
++     */
++    public native void setConfig(int symbology, int config, int value)
++        throws IllegalArgumentException;
++
++    /** Parse configuration string and apply to image scanner. */
++    public native void parseConfig(String config);
++
++    /** Enable or disable the inter-image result cache (default disabled).
++     * Mostly useful for scanning video frames, the cache filters duplicate
++     * results from consecutive images, while adding some consistency
++     * checking and hysteresis to the results.  Invoking this method also
++     * clears the cache.
++     */
++    public native void enableCache(boolean enable);
++
++    /** Retrieve decode results for last scanned image.
++     * @returns the SymbolSet result container
++     */
++    public SymbolSet getResults ()
++    {
++        return(new SymbolSet(getResults(peer)));
++    }
++
++    private native long getResults(long peer);
++
++    /** Scan for symbols in provided Image.
++     * The image format must currently be "Y800" or "GRAY".
++     * @returns the number of symbols successfully decoded from the image.
++     */
++    public native int scanImage(Image image);
++}
+diff --git a/java/net/sourceforge/zbar/Modifier.java b/java/net/sourceforge/zbar/Modifier.java
+new file mode 100644
+--- /dev/null
++++ b/java/net/sourceforge/zbar/Modifier.java
+@@ -0,0 +1,42 @@
++/*------------------------------------------------------------------------
++ *  Modifier
++ *
++ *  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
++ *
++ *  This file is part of the ZBar Bar Code Reader.
++ *
++ *  The ZBar Bar Code Reader is free software; you can redistribute it
++ *  and/or modify it under the terms of the GNU Lesser Public License as
++ *  published by the Free Software Foundation; either version 2.1 of
++ *  the License, or (at your option) any later version.
++ *
++ *  The ZBar Bar Code Reader is distributed in the hope that it will be
++ *  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
++ *  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU Lesser Public License for more details.
++ *
++ *  You should have received a copy of the GNU Lesser Public License
++ *  along with the ZBar Bar Code Reader; if not, write to the Free
++ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++ *  Boston, MA  02110-1301  USA
++ *
++ *  http://sourceforge.net/projects/zbar
++ *------------------------------------------------------------------------*/
++
++package net.sourceforge.zbar;
++
++/** Decoder symbology modifiers.
++ */
++public class Modifier
++{
++    /** barcode tagged as GS1 (EAN.UCC) reserved
++     * (eg, FNC1 before first data character).
++     * data may be parsed as a sequence of GS1 AIs
++     */
++    public static final int GS1 = 0;
++
++    /** barcode tagged as AIM reserved
++     * (eg, FNC1 after first character or digit pair)
++     */
++    public static final int AIM = 1;
++}
+diff --git a/java/net/sourceforge/zbar/Orientation.java b/java/net/sourceforge/zbar/Orientation.java
+new file mode 100644
+--- /dev/null
++++ b/java/net/sourceforge/zbar/Orientation.java
+@@ -0,0 +1,42 @@
++/*------------------------------------------------------------------------
++ *  Orientation
++ *
++ *  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
++ *
++ *  This file is part of the ZBar Bar Code Reader.
++ *
++ *  The ZBar Bar Code Reader is free software; you can redistribute it
++ *  and/or modify it under the terms of the GNU Lesser Public License as
++ *  published by the Free Software Foundation; either version 2.1 of
++ *  the License, or (at your option) any later version.
++ *
++ *  The ZBar Bar Code Reader is distributed in the hope that it will be
++ *  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
++ *  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU Lesser Public License for more details.
++ *
++ *  You should have received a copy of the GNU Lesser Public License
++ *  along with the ZBar Bar Code Reader; if not, write to the Free
++ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++ *  Boston, MA  02110-1301  USA
++ *
++ *  http://sourceforge.net/projects/zbar
++ *------------------------------------------------------------------------*/
++
++package net.sourceforge.zbar;
++
++/** Decoded symbol coarse orientation.
++ */
++public class Orientation
++{
++    /** Unable to determine orientation. */
++    public static final int UNKNOWN = -1;
++    /** Upright, read left to right. */
++    public static final int UP = 0;
++    /** sideways, read top to bottom */
++    public static final int RIGHT = 1;
++    /** upside-down, read right to left */
++    public static final int DOWN = 2;
++    /** sideways, read bottom to top */
++    public static final int LEFT = 3;
++}
+diff --git a/java/net/sourceforge/zbar/Symbol.java b/java/net/sourceforge/zbar/Symbol.java
+new file mode 100644
+--- /dev/null
++++ b/java/net/sourceforge/zbar/Symbol.java
+@@ -0,0 +1,197 @@
++/*------------------------------------------------------------------------
++ *  Symbol
++ *
++ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
++ *
++ *  This file is part of the ZBar Bar Code Reader.
++ *
++ *  The ZBar Bar Code Reader is free software; you can redistribute it
++ *  and/or modify it under the terms of the GNU Lesser Public License as
++ *  published by the Free Software Foundation; either version 2.1 of
++ *  the License, or (at your option) any later version.
++ *
++ *  The ZBar Bar Code Reader is distributed in the hope that it will be
++ *  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
++ *  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU Lesser Public License for more details.
++ *
++ *  You should have received a copy of the GNU Lesser Public License
++ *  along with the ZBar Bar Code Reader; if not, write to the Free
++ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++ *  Boston, MA  02110-1301  USA
++ *
++ *  http://sourceforge.net/projects/zbar
++ *------------------------------------------------------------------------*/
++
++package net.sourceforge.zbar;
++
++/** Immutable container for decoded result symbols associated with an image
++ * or a composite symbol.
++ */
++public class Symbol
++{
++    /** No symbol decoded. */
++    public static final int NONE = 0;
++    /** Symbol detected but not decoded. */
++    public static final int PARTIAL = 1;
++
++    /** EAN-8. */
++    public static final int EAN8 = 8;
++    /** UPC-E. */
++    public static final int UPCE = 9;
++    /** ISBN-10 (from EAN-13). */
++    public static final int ISBN10 = 10;
++    /** UPC-A. */
++    public static final int UPCA = 12;
++    /** EAN-13. */
++    public static final int EAN13 = 13;
++    /** ISBN-13 (from EAN-13). */
++    public static final int ISBN13 = 14;
++    /** Interleaved 2 of 5. */
++    public static final int I25 = 25;
++    /** DataBar (RSS-14). */
++    public static final int DATABAR = 34;
++    /** DataBar Expanded. */
++    public static final int DATABAR_EXP = 35;
++    /** Code 93. */
++    public static final int CODE93 = 93;
++    /** Code 39. */
++    public static final int CODE39 = 39;
++    /** PDF417. */
++    public static final int PDF417 = 57;
++    /** QR Code. */
++    public static final int QRCODE = 64;
++    /** Code 128. */
++    public static final int CODE128 = 128;
++
++    /** C pointer to a zbar_symbol_t. */
++    private long peer;
++
++    /** Cached attributes. */
++    private int type;
++
++    static
++    {
++        System.loadLibrary("zbarjni");
++        init();
++    }
++    private static native void init();
++
++    /** Symbols are only created by other package methods. */
++    Symbol (long peer)
++    {
++        this.peer = peer;
++    }
++
++    protected void finalize ()
++    {
++        destroy();
++    }
++
++    /** Clean up native data associated with an instance. */
++    public synchronized void destroy ()
++    {
++        if(peer != 0) {
++            destroy(peer);
++            peer = 0;
++        }
++    }
++
++    /** Release the associated peer instance.  */
++    private native void destroy(long peer);
++
++    /** Retrieve type of decoded symbol. */
++    public int getType ()
++    {
++        if(type == 0)
++            type = getType(peer);
++        return(type);
++    }
++
++    private native int getType(long peer);
++
++    /** Retrieve symbology boolean configs settings used during decode. */
++    public native int getConfigMask();
++
++    /** Retrieve symbology characteristics detected during decode. */
++    public native int getModifierMask();
++
++    /** Retrieve data decoded from symbol as a String. */
++    public native String getData();
++
++    /** Retrieve raw data bytes decoded from symbol. */
++    public native byte[] getDataBytes();
++
++    /** Retrieve a symbol confidence metric.  Quality is an unscaled,
++     * relative quantity: larger values are better than smaller
++     * values, where "large" and "small" are application dependent.
++     */
++    public native int getQuality();
++
++    /** Retrieve current cache count.  When the cache is enabled for
++     * the image_scanner this provides inter-frame reliability and
++     * redundancy information for video streams.
++     * @returns < 0 if symbol is still uncertain
++     * @returns 0 if symbol is newly verified
++     * @returns > 0 for duplicate symbols
++     */
++    public native int getCount();
++
++    /** Retrieve an approximate, axis-aligned bounding box for the
++     * symbol.
++     */
++    public int[] getBounds ()
++    {
++        int n = getLocationSize(peer);
++        if(n <= 0)
++            return(null);
++
++        int[] bounds = new int[4];
++        int xmin = Integer.MAX_VALUE;
++        int xmax = Integer.MIN_VALUE;
++        int ymin = Integer.MAX_VALUE;
++        int ymax = Integer.MIN_VALUE;
++
++        for(int i = 0; i < n; i++) {
++            int x = getLocationX(peer, i);
++            if(xmin > x) xmin = x;
++            if(xmax < x) xmax = x;
++
++            int y = getLocationY(peer, i);
++            if(ymin > y) ymin = y;
++            if(ymax < y) ymax = y;
++        }
++        bounds[0] = xmin;
++        bounds[1] = ymin;
++        bounds[2] = xmax - xmin;
++        bounds[3] = ymax - ymin;
++        return(bounds);
++    }
++
++    private native int getLocationSize(long peer);
++    private native int getLocationX(long peer, int idx);
++    private native int getLocationY(long peer, int idx);
++
++    public int[] getLocationPoint (int idx)
++    {
++        int[] p = new int[2];
++        p[0] = getLocationX(peer, idx);
++        p[1] = getLocationY(peer, idx);
++        return(p);
++    }
++
++    /** Retrieve general axis-aligned, orientation of decoded
++     * symbol.
++     */
++    public native int getOrientation();
++
++    /** Retrieve components of a composite result. */
++    public SymbolSet getComponents ()
++    {
++        return(new SymbolSet(getComponents(peer)));
++    }
++
++    private native long getComponents(long peer);
++
++    native long next();
++}
+diff --git a/java/net/sourceforge/zbar/SymbolIterator.java b/java/net/sourceforge/zbar/SymbolIterator.java
+new file mode 100644
+--- /dev/null
++++ b/java/net/sourceforge/zbar/SymbolIterator.java
+@@ -0,0 +1,70 @@
++/*------------------------------------------------------------------------
++ *  SymbolIterator
++ *
++ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
++ *
++ *  This file is part of the ZBar Bar Code Reader.
++ *
++ *  The ZBar Bar Code Reader is free software; you can redistribute it
++ *  and/or modify it under the terms of the GNU Lesser Public License as
++ *  published by the Free Software Foundation; either version 2.1 of
++ *  the License, or (at your option) any later version.
++ *
++ *  The ZBar Bar Code Reader is distributed in the hope that it will be
++ *  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
++ *  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU Lesser Public License for more details.
++ *
++ *  You should have received a copy of the GNU Lesser Public License
++ *  along with the ZBar Bar Code Reader; if not, write to the Free
++ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++ *  Boston, MA  02110-1301  USA
++ *
++ *  http://sourceforge.net/projects/zbar
++ *------------------------------------------------------------------------*/
++
++package net.sourceforge.zbar;
++
++/** Iterator over a SymbolSet.
++ */
++public class SymbolIterator
++    implements java.util.Iterator<Symbol>
++{
++    /** Next symbol to be returned by the iterator. */
++    private Symbol current;
++
++    /** SymbolIterators are only created by internal interface methods. */
++    SymbolIterator (Symbol first)
++    {
++        current = first;
++    }
++
++    /** Returns true if the iteration has more elements. */
++    public boolean hasNext ()
++    {
++        return(current != null);
++    }
++
++    /** Retrieves the next element in the iteration. */
++    public Symbol next ()
++    {
++        if(current == null)
++            throw(new java.util.NoSuchElementException
++                  ("access past end of SymbolIterator"));
++
++        Symbol result = current;
++        long sym = current.next();
++        if(sym != 0)
++            current = new Symbol(sym);
++        else
++            current = null;
++        return(result);
++    }
++
++    /** Raises UnsupportedOperationException. */
++    public void remove ()
++    {
++        throw(new UnsupportedOperationException
++              ("SymbolIterator is immutable"));
++    }
++}
+diff --git a/java/net/sourceforge/zbar/SymbolSet.java b/java/net/sourceforge/zbar/SymbolSet.java
+new file mode 100644
+--- /dev/null
++++ b/java/net/sourceforge/zbar/SymbolSet.java
+@@ -0,0 +1,82 @@
++/*------------------------------------------------------------------------
++ *  SymbolSet
++ *
++ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
++ *
++ *  This file is part of the ZBar Bar Code Reader.
++ *
++ *  The ZBar Bar Code Reader is free software; you can redistribute it
++ *  and/or modify it under the terms of the GNU Lesser Public License as
++ *  published by the Free Software Foundation; either version 2.1 of
++ *  the License, or (at your option) any later version.
++ *
++ *  The ZBar Bar Code Reader is distributed in the hope that it will be
++ *  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
++ *  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU Lesser Public License for more details.
++ *
++ *  You should have received a copy of the GNU Lesser Public License
++ *  along with the ZBar Bar Code Reader; if not, write to the Free
++ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++ *  Boston, MA  02110-1301  USA
++ *
++ *  http://sourceforge.net/projects/zbar
++ *------------------------------------------------------------------------*/
++
++package net.sourceforge.zbar;
++
++/** Immutable container for decoded result symbols associated with an image
++ * or a composite symbol.
++ */
++public class SymbolSet
++    extends java.util.AbstractCollection<Symbol>
++{
++    /** C pointer to a zbar_symbol_set_t. */
++    private long peer;
++
++    static
++    {
++        System.loadLibrary("zbarjni");
++        init();
++    }
++    private static native void init();
++
++    /** SymbolSets are only created by other package methods. */
++    SymbolSet (long peer)
++    {
++        this.peer = peer;
++    }
++
++    protected void finalize ()
++    {
++        destroy();
++    }
++
++    /** Clean up native data associated with an instance. */
++    public synchronized void destroy ()
++    {
++        if(peer != 0) {
++            destroy(peer);
++            peer = 0;
++        }
++    }
++
++    /** Release the associated peer instance.  */
++    private native void destroy(long peer);
++
++    /** Retrieve an iterator over the Symbol elements in this collection. */
++    public java.util.Iterator<Symbol> iterator ()
++    {
++        long sym = firstSymbol(peer);
++        if(sym == 0)
++            return(new SymbolIterator(null));
++
++        return(new SymbolIterator(new Symbol(sym)));
++    }
++
++    /** Retrieve the number of elements in the collection. */
++    public native int size();
++
++    /** Retrieve C pointer to first symbol in the set. */
++    private native long firstSymbol(long peer);
++}
+diff --git a/java/test/TestImage.java b/java/test/TestImage.java
+new file mode 100644
+--- /dev/null
++++ b/java/test/TestImage.java
+@@ -0,0 +1,175 @@
++
++import org.junit.Test;
++import org.junit.Before;
++import org.junit.After;
++import static org.junit.Assert.*;
++
++import net.sourceforge.zbar.Image;
++
++public class TestImage
++{
++    protected Image image;
++
++    @Before public void setUp ()
++    {
++        image = new Image();
++    }
++
++    @After public void tearDown ()
++    {
++        image.destroy();
++        image = null;
++    }
++
++
++    @Test public void creation ()
++    {
++        Image img0 = new Image(123, 456);
++        Image img1 = new Image("BGR3");
++        Image img2 = new Image(987, 654, "UYVY");
++
++        assertEquals(123, img0.getWidth());
++        assertEquals(456, img0.getHeight());
++        assertEquals(null, img0.getFormat());
++
++        assertEquals(0, img1.getWidth());
++        assertEquals(0, img1.getHeight());
++        assertEquals("BGR3", img1.getFormat());
++
++        assertEquals(987, img2.getWidth());
++        assertEquals(654, img2.getHeight());
++        assertEquals("UYVY", img2.getFormat());
++    }
++
++    @Test public void sequence ()
++    {
++        assertEquals(0, image.getSequence());
++        image.setSequence(42);
++        assertEquals(42, image.getSequence());
++    }
++
++    @Test public void size ()
++    {
++        assertEquals(0, image.getWidth());
++        assertEquals(0, image.getHeight());
++
++        image.setSize(640, 480);
++        int[] size0 = { 640, 480 };
++        assertArrayEquals(size0, image.getSize());
++
++        int[] size1 = { 320, 240 };
++        image.setSize(size1);
++        assertEquals(320, image.getWidth());
++        assertEquals(240, image.getHeight());
++    }
++
++    @Test public void crop ()
++    {
++        int[] zeros = { 0, 0, 0, 0 };
++        assertArrayEquals(zeros, image.getCrop());
++
++        image.setSize(123, 456);
++        int[] crop0 = { 0, 0, 123, 456 };
++        assertArrayEquals(crop0, image.getCrop());
++
++        image.setCrop(1, 2, 34, 56);
++        int[] crop1 = { 1, 2, 34, 56 };
++        assertArrayEquals(crop1, image.getCrop());
++
++        image.setCrop(-20, -20, 200, 500);
++        assertArrayEquals(crop0, image.getCrop());
++
++        int[] crop2 = { 7, 8, 90, 12};
++        image.setCrop(crop2);
++        assertArrayEquals(crop2, image.getCrop());
++
++        image.setSize(654, 321);
++        int[] crop3 = { 0, 0, 654, 321 };
++        assertArrayEquals(crop3, image.getCrop());
++
++        int[] crop4 = { -10, -10, 700, 400 };
++        image.setCrop(crop4);
++        assertArrayEquals(crop3, image.getCrop());
++    }
++
++    @Test public void format ()
++    {
++        assertNull(image.getFormat());
++        image.setFormat("Y800");
++        assertEquals("Y800", image.getFormat());
++        boolean gotException = false;
++        try {
++            image.setFormat("[]");
++        }
++        catch(IllegalArgumentException e) {
++            // expected
++            gotException = true;
++        }
++        assertTrue("Expected exception", gotException);
++        assertEquals("Y800", image.getFormat());
++    }
++
++    @Test(expected=IllegalArgumentException.class)
++        public void setFormatInvalid0 ()
++    {
++        image.setFormat(null);
++    }
++
++    @Test(expected=IllegalArgumentException.class)
++        public void setFormatInvalid1 ()
++    {
++        image.setFormat("");
++    }
++
++    @Test(expected=IllegalArgumentException.class)
++        public void setFormatInvalid2 ()
++    {
++        image.setFormat("YOMAMA");
++    }
++
++    @Test(expected=IllegalArgumentException.class)
++        public void setFormatInvalid3 ()
++    {
++        image.setFormat("foo");
++    }
++
++    @Test public void data ()
++    {
++        assertNull(image.getData());
++
++        int[] ints = new int[24];
++        image.setData(ints);
++        assertSame(ints, image.getData());
++
++        byte[] bytes = new byte[280];
++        image.setData(bytes);
++        assertSame(bytes, image.getData());
++
++        image.setData((byte[])null);
++        assertNull(image.getData());
++    }
++
++    @Test public void convert ()
++    {
++        image.setSize(4, 4);
++        image.setFormat("RGB4");
++        int[] rgb4 = new int[16];
++        byte[] exp = new byte[16];
++        for(int i = 0; i < 16; i++) {
++            int c = i * 15;
++            rgb4[i] = c | (c << 8) | (c << 16) | (c << 24);
++            exp[i] = (byte)c;
++        }
++        image.setData(rgb4);
++
++        Image gray = image.convert("Y800");
++        assertEquals(4, gray.getWidth());
++        assertEquals(4, gray.getHeight());
++        assertEquals("Y800", gray.getFormat());
++
++        byte[] y800 = gray.getData();
++        assertEquals(16, y800.length);
++
++        assertArrayEquals(exp, y800);
++    }
++}
+diff --git a/java/test/TestImageScanner.java b/java/test/TestImageScanner.java
+new file mode 100644
+--- /dev/null
++++ b/java/test/TestImageScanner.java
+@@ -0,0 +1,53 @@
++
++import org.junit.Test;
++import org.junit.Before;
++import org.junit.After;
++import org.junit.Assert.*;
++
++import net.sourceforge.zbar.ImageScanner;
++import net.sourceforge.zbar.Config;
++
++public class TestImageScanner
++{
++    protected ImageScanner scanner;
++
++    @Before public void setUp ()
++    {
++        scanner = new ImageScanner();
++    }
++
++    @After public void tearDown ()
++    {
++        scanner.destroy();
++        scanner = null;
++    }
++
++
++    @Test public void creation ()
++    {
++        // create/destroy
++    }
++
++    @Test public void callSetConfig ()
++    {
++        scanner.setConfig(0, Config.X_DENSITY, 2);
++        scanner.setConfig(0, Config.Y_DENSITY, 4);
++    }
++
++    @Test public void callParseConfig ()
++    {
++        scanner.parseConfig("disable");
++    }
++
++    @Test(expected=IllegalArgumentException.class)
++        public void callParseConfigInvalid ()
++    {
++        scanner.parseConfig("yomama");
++    }
++
++    @Test public void callEnableCache ()
++    {
++        scanner.enableCache(true);
++        scanner.enableCache(false);
++    }
++}
+diff --git a/java/test/TestScanImage.java b/java/test/TestScanImage.java
+new file mode 100644
+--- /dev/null
++++ b/java/test/TestScanImage.java
+@@ -0,0 +1,183 @@
++
++import org.junit.Test;
++import org.junit.Before;
++import org.junit.After;
++import static org.junit.Assert.*;
++
++import net.sourceforge.zbar.*;
++
++import java.text.CharacterIterator;
++import java.text.StringCharacterIterator;
++import java.util.Iterator;
++
++public class TestScanImage
++{
++    protected ImageScanner scanner;
++    protected Image image;
++
++    @Before public void setUp ()
++    {
++        scanner = new ImageScanner();
++        image = new Image();
++    }
++
++    @After public void tearDown ()
++    {
++        image = null;
++        scanner = null;
++        System.gc();
++    }
++
++    public static final String encoded_widths =
++        "9 111 212241113121211311141132 11111 311213121312121332111132 111 9";
++
++    protected void generateY800 ()
++    {
++        int width = 114, height = 85;
++        image.setSize(width, height);
++        image.setFormat("Y800");
++        int datalen = width * height;
++        byte[] data = new byte[datalen];
++
++        int y = 0;
++        int p = 0;
++        for(; y < 10 && y < height; y++)
++            for(int x = 0; x < width; x++)
++                data[p++] = -1;
++
++        for(; y < height - 10; y++) {
++            int x = 0;
++            byte color = -1;
++            CharacterIterator it = new StringCharacterIterator(encoded_widths);
++            for(char c = it.first();
++                c != CharacterIterator.DONE;
++                c = it.next())
++            {
++                if(c == ' ')
++                    continue;
++                for(int dx = (int)c - 0x30; dx > 0; dx--) {
++                    data[p++] = color;
++                    x++;
++                }
++                color = (byte)~color;
++            }
++            for(; x < width; x++)
++                data[p++] = (byte)~color;
++        }
++
++        for(; y < height; y++)
++            for(int x = 0; x < width; x++)
++                data[p++] = -1;
++        assert(p == datalen);
++
++        image.setData(data);
++    }
++
++    protected void checkResults (SymbolSet syms)
++    {
++        assertNotNull(syms);
++        assert(syms.size() == 1);
++        Iterator<Symbol> it = syms.iterator();
++        assertTrue(it.hasNext());
++        Symbol sym = it.next();
++        assertNotNull(sym);
++        assertFalse(it.hasNext());
++
++        assertEquals(Symbol.EAN13, sym.getType());
++        assertEquals(sym.EAN13, sym.getType()); // cached
++
++        assertTrue(sym.getQuality() > 1);
++        assertEquals(0, sym.getCount());
++
++        SymbolSet comps = sym.getComponents();
++        assertNotNull(comps);
++        assertEquals(0, comps.size());
++        it = comps.iterator();
++        assertNotNull(it);
++        assertFalse(it.hasNext());
++
++        String data = sym.getData();
++        assertEquals("6268964977804", data);
++
++        byte[] bytes = sym.getDataBytes();
++        byte[] exp = { '6','2','6','8','9','6','4','9','7','7','8','0','4' };
++        assertArrayEquals(exp, bytes);
++
++        int[] r = sym.getBounds();
++        assertTrue(r[0] > 6);
++        assertTrue(r[1] > 6);
++        assertTrue(r[2] < 102);
++        assertTrue(r[3] < 73);
++
++        assertEquals(Orientation.UP, sym.getOrientation());
++    }
++
++    @Test public void generated ()
++    {
++        generateY800();
++        int n = scanner.scanImage(image);
++        assertEquals(1, n);
++
++        checkResults(image.getSymbols());
++        checkResults(scanner.getResults());
++    }
++
++    @Test public void config ()
++    {
++        generateY800();
++        scanner.setConfig(Symbol.EAN13, Config.ENABLE, 0);
++        int n = scanner.scanImage(image);
++        assertEquals(0, n);
++    }
++
++    @Test public void cache ()
++    {
++        generateY800();
++        scanner.enableCache(true);
++
++        int n = 0;
++        for(int i = 0; i < 10; i++) {
++            n = scanner.scanImage(image);
++            if(n > 0) {
++                assertTrue(i > 1);
++                break;
++            }
++        }
++
++        assertEquals(1, n);
++        checkResults(scanner.getResults());
++    }
++
++    @Test public void orientation()
++    {
++        generateY800();
++
++        // flip the image
++        int width = image.getWidth();
++        int height = image.getHeight();
++        byte[] data = image.getData();
++        int p = 0;
++        for(int y = 0; y < height; y++) {
++            for(int x0 = 0; x0 < width / 2; x0++) {
++                int x1 = width - x0 - 1;
++                assert(x0 < x1);
++                byte b = data[p + x0];
++                data[p + x0] = data[p + x1];
++                data[p + x1] = b;
++            }
++            p += width;
++        }
++        image.setData(data);
++
++        int n = scanner.scanImage(image);
++        assertEquals(1, n);
++
++        SymbolSet syms = scanner.getResults();
++        assert(syms.size() == 1);
++        for(Symbol sym : syms) {
++            assertEquals(Symbol.EAN13, sym.getType());
++            assertEquals("6268964977804", sym.getData());
++            assertEquals(Orientation.DOWN, sym.getOrientation());
++        }
++    }
++}
+diff --git a/java/zbarjni.c b/java/zbarjni.c
+new file mode 100644
+--- /dev/null
++++ b/java/zbarjni.c
+@@ -0,0 +1,701 @@
++/*------------------------------------------------------------------------
++ *  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
++ *
++ *  This file is part of the ZBar Bar Code Reader.
++ *
++ *  The ZBar Bar Code Reader is free software; you can redistribute it
++ *  and/or modify it under the terms of the GNU Lesser Public License as
++ *  published by the Free Software Foundation; either version 2.1 of
++ *  the License, or (at your option) any later version.
++ *
++ *  The ZBar Bar Code Reader is distributed in the hope that it will be
++ *  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
++ *  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU Lesser Public License for more details.
++ *
++ *  You should have received a copy of the GNU Lesser Public License
++ *  along with the ZBar Bar Code Reader; if not, write to the Free
++ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++ *  Boston, MA  02110-1301  USA
++ *
++ *  http://sourceforge.net/projects/zbar
++ *------------------------------------------------------------------------*/
++#include <inttypes.h>
++#include <assert.h>
++#include <zbar.h>
++#include <jni.h>
++
++static jfieldID SymbolSet_peer;
++static jfieldID Symbol_peer;
++static jfieldID Image_peer, Image_data;
++static jfieldID ImageScanner_peer;
++
++static struct {
++    int SymbolSet_create, SymbolSet_destroy;
++    int Symbol_create, Symbol_destroy;
++    int Image_create, Image_destroy;
++    int ImageScanner_create, ImageScanner_destroy;
++} stats;
++
++
++#define PEER_CAST(l) \
++    ((void*)(uintptr_t)(l))
++
++#define GET_PEER(c, o) \
++    PEER_CAST((*env)->GetLongField(env, (o), c ## _peer))
++
++
++static inline void
++throw_exc(JNIEnv *env,
++          const char *name,
++          const char *msg)
++{
++    jclass cls = (*env)->FindClass(env, name);
++    if(cls)
++        (*env)->ThrowNew(env, cls, msg);
++    (*env)->DeleteLocalRef(env, cls);
++}
++
++static inline uint32_t
++format_to_fourcc(JNIEnv *env,
++                 jstring format)
++{
++    if(!format)
++        goto invalid;
++
++    int n = (*env)->GetStringLength(env, format);
++    if(0 >= n || n > 4)
++        goto invalid;
++
++    char fmtstr[8];
++    (*env)->GetStringUTFRegion(env, format, 0, n, fmtstr);
++
++    uint32_t fourcc = 0;
++    int i;
++    for(i = 0; i < n; i++) {
++        if(fmtstr[i] < ' ' || 'Z' < fmtstr[i] ||
++           ('9' < fmtstr[i] && fmtstr[i] < 'A') ||
++           (' ' < fmtstr[i] && fmtstr[i] < '0'))
++            goto invalid;
++        fourcc |= ((uint32_t)fmtstr[i]) << (8 * i);
++    }
++    return(fourcc);
++
++invalid:
++    throw_exc(env, "java/lang/IllegalArgumentException",
++              "invalid format fourcc");
++    return(0);
++}
++
++static JavaVM *jvm = NULL;
++
++JNIEXPORT jint JNICALL
++JNI_OnLoad (JavaVM *_jvm,
++            void *reserved)
++{
++    jvm = _jvm;
++    return(JNI_VERSION_1_2);
++}
++
++JNIEXPORT void JNICALL
++JNI_OnUnload (JavaVM *_jvm,
++              void *reserved)
++{
++    assert(stats.SymbolSet_create == stats.SymbolSet_destroy);
++    assert(stats.Symbol_create == stats.Symbol_destroy);
++    assert(stats.Image_create == stats.Image_destroy);
++    assert(stats.ImageScanner_create == stats.ImageScanner_destroy);
++}
++
++
++JNIEXPORT void JNICALL
++Java_net_sourceforge_zbar_SymbolSet_init (JNIEnv *env,
++                                          jclass cls)
++{
++    SymbolSet_peer = (*env)->GetFieldID(env, cls, "peer", "J");
++}
++
++JNIEXPORT void JNICALL
++Java_net_sourceforge_zbar_SymbolSet_destroy (JNIEnv *env,
++                                             jobject obj,
++                                             jlong peer)
++{
++    zbar_symbol_set_ref(PEER_CAST(peer), -1);
++    stats.SymbolSet_destroy++;
++}
++
++JNIEXPORT jint JNICALL
++Java_net_sourceforge_zbar_SymbolSet_size (JNIEnv *env,
++                                          jobject obj)
++{
++    zbar_symbol_set_t *zsyms = GET_PEER(SymbolSet, obj);
++    if(!zsyms)
++        return(0);
++    return(zbar_symbol_set_get_size(zsyms));
++}
++
++JNIEXPORT jlong JNICALL
++Java_net_sourceforge_zbar_SymbolSet_firstSymbol (JNIEnv *env,
++                                                 jobject obj,
++                                                 jlong peer)
++{
++    if(!peer)
++        return(0);
++    const zbar_symbol_t *zsym = zbar_symbol_set_first_symbol(PEER_CAST(peer));
++    if(zsym) {
++        zbar_symbol_ref(zsym, 1);
++        stats.Symbol_create++;
++    }
++    return((intptr_t)zsym);
++}
++
++
++
++JNIEXPORT void JNICALL
++Java_net_sourceforge_zbar_Symbol_init (JNIEnv *env,
++                                       jclass cls)
++{
++    Symbol_peer = (*env)->GetFieldID(env, cls, "peer", "J");
++}
++
++JNIEXPORT void JNICALL
++Java_net_sourceforge_zbar_Symbol_destroy (JNIEnv *env,
++                                          jobject obj,
++                                          jlong peer)
++{
++    zbar_symbol_ref(PEER_CAST(peer), -1);
++    stats.Symbol_destroy++;
++}
++
++JNIEXPORT jint JNICALL
++Java_net_sourceforge_zbar_Symbol_getType (JNIEnv *env,
++                                          jobject obj,
++                                          jlong peer)
++{
++    return(zbar_symbol_get_type(PEER_CAST(peer)));
++}
++
++JNIEXPORT jint JNICALL
++Java_net_sourceforge_zbar_Symbol_getConfigMask (JNIEnv *env,
++                                                jobject obj)
++{
++    return(zbar_symbol_get_configs(GET_PEER(Symbol, obj)));
++}
++
++JNIEXPORT jint JNICALL
++Java_net_sourceforge_zbar_Symbol_getModifierMask (JNIEnv *env,
++                                                  jobject obj)
++{
++    return(zbar_symbol_get_modifiers(GET_PEER(Symbol, obj)));
++}
++
++JNIEXPORT jstring JNICALL
++Java_net_sourceforge_zbar_Symbol_getData (JNIEnv *env,
++                                          jobject obj)
++{
++    const char *data = zbar_symbol_get_data(GET_PEER(Symbol, obj));
++    return((*env)->NewStringUTF(env, data));
++}
++
++JNIEXPORT jstring JNICALL
++Java_net_sourceforge_zbar_Symbol_getDataBytes (JNIEnv *env,
++                                               jobject obj)
++{
++    const zbar_symbol_t *zsym = GET_PEER(Symbol, obj);
++    const void *data = zbar_symbol_get_data(zsym);
++    unsigned long datalen = zbar_symbol_get_data_length(zsym);
++    if(!data || !datalen)
++        return(NULL);
++
++    jbyteArray bytes = (*env)->NewByteArray(env, datalen);
++    if(!bytes)
++        return(NULL);
++
++    (*env)->SetByteArrayRegion(env, bytes, 0, datalen, data);
++    return(bytes);
++}
++
++JNIEXPORT jint JNICALL
++Java_net_sourceforge_zbar_Symbol_getQuality (JNIEnv *env,
++                                             jobject obj)
++{
++    return(zbar_symbol_get_quality(GET_PEER(Symbol, obj)));
++}
++
++JNIEXPORT jint JNICALL
++Java_net_sourceforge_zbar_Symbol_getCount (JNIEnv *env,
++                                           jobject obj)
++{
++    return(zbar_symbol_get_count(GET_PEER(Symbol, obj)));
++}
++
++JNIEXPORT jint JNICALL
++Java_net_sourceforge_zbar_Symbol_getLocationSize (JNIEnv *env,
++                                                  jobject obj,
++                                                  jlong peer)
++{
++    return(zbar_symbol_get_loc_size(PEER_CAST(peer)));
++}
++
++JNIEXPORT jint JNICALL
++Java_net_sourceforge_zbar_Symbol_getLocationX (JNIEnv *env,
++                                               jobject obj,
++                                               jlong peer,
++                                               jint idx)
++{
++    return(zbar_symbol_get_loc_x(PEER_CAST(peer), idx));
++}
++
++JNIEXPORT jint JNICALL
++Java_net_sourceforge_zbar_Symbol_getLocationY (JNIEnv *env,
++                                               jobject obj,
++                                               jlong peer,
++                                               jint idx)
++{
++    return(zbar_symbol_get_loc_y(PEER_CAST(peer), idx));
++}
++
++JNIEXPORT jint JNICALL
++Java_net_sourceforge_zbar_Symbol_getOrientation (JNIEnv *env,
++                                                 jobject obj)
++{
++    return(zbar_symbol_get_orientation(GET_PEER(Symbol, obj)));
++}
++
++JNIEXPORT jlong JNICALL
++Java_net_sourceforge_zbar_Symbol_getComponents (JNIEnv *env,
++                                                jobject obj,
++                                                jlong peer)
++{
++    const zbar_symbol_set_t *zsyms =
++        zbar_symbol_get_components(PEER_CAST(peer));
++    if(zsyms) {
++        zbar_symbol_set_ref(zsyms, 1);
++        stats.SymbolSet_create++;
++    }
++    return((intptr_t)zsyms);
++}
++
++JNIEXPORT jlong JNICALL
++Java_net_sourceforge_zbar_Symbol_next (JNIEnv *env,
++                                       jobject obj)
++{
++    const zbar_symbol_t *zsym = zbar_symbol_next(GET_PEER(Symbol, obj));
++    if(zsym) {
++        zbar_symbol_ref(zsym, 1);
++        stats.Symbol_create++;
++    }
++    return((intptr_t)zsym);
++}
++
++
++
++static void
++Image_cleanupByteArray (zbar_image_t *zimg)
++{
++    jobject data = zbar_image_get_userdata(zimg);
++    assert(data);
++
++    JNIEnv *env = NULL;
++    if((*jvm)->AttachCurrentThread(jvm, (void**)&env, NULL))
++        return;
++    assert(env);
++    if(env && data) {
++        void *raw = (void*)zbar_image_get_data(zimg);
++        assert(raw);
++        /* const image data is unchanged - abort copy back */
++        (*env)->ReleaseByteArrayElements(env, data, raw, JNI_ABORT);
++        (*env)->DeleteGlobalRef(env, data);
++        zbar_image_set_userdata(zimg, NULL);
++    }
++}
++
++static void
++Image_cleanupIntArray (zbar_image_t *zimg)
++{
++    jobject data = zbar_image_get_userdata(zimg);
++    assert(data);
++
++    JNIEnv *env = NULL;
++    if((*jvm)->AttachCurrentThread(jvm, (void**)&env, NULL))
++        return;
++    assert(env);
++    if(env && data) {
++        void *raw = (void*)zbar_image_get_data(zimg);
++        assert(raw);
++        /* const image data is unchanged - abort copy back */
++        (*env)->ReleaseIntArrayElements(env, data, raw, JNI_ABORT);
++        (*env)->DeleteGlobalRef(env, data);
++        zbar_image_set_userdata(zimg, NULL);
++    }
++}
++
++
++JNIEXPORT void JNICALL
++Java_net_sourceforge_zbar_Image_init (JNIEnv *env,
++                                      jclass cls)
++{
++    Image_peer = (*env)->GetFieldID(env, cls, "peer", "J");
++    Image_data = (*env)->GetFieldID(env, cls, "data", "Ljava/lang/Object;");
++}
++
++JNIEXPORT jlong JNICALL
++Java_net_sourceforge_zbar_Image_create (JNIEnv *env,
++                                        jobject obj)
++{
++    zbar_image_t *zimg = zbar_image_create();
++    if(!zimg) {
++        throw_exc(env, "java/lang/OutOfMemoryError", NULL);
++        return(0);
++    }
++    stats.Image_create++;
++    return((intptr_t)zimg);
++}
++
++JNIEXPORT void JNICALL
++Java_net_sourceforge_zbar_Image_destroy (JNIEnv *env,
++                                         jobject obj,
++                                         jlong peer)
++{
++    zbar_image_ref(PEER_CAST(peer), -1);
++    stats.Image_destroy++;
++}
++
++JNIEXPORT jlong JNICALL
++Java_net_sourceforge_zbar_Image_convert (JNIEnv *env,
++                                         jobject obj,
++                                         jlong peer,
++                                         jstring format)
++{
++    uint32_t fourcc = format_to_fourcc(env, format);
++    if(!fourcc)
++        return(0);
++    zbar_image_t *zimg = zbar_image_convert(PEER_CAST(peer), fourcc);
++    if(!zimg)
++        throw_exc(env, "java/lang/UnsupportedOperationException",
++                  "unsupported image format");
++    else
++        stats.Image_create++;
++    return((intptr_t)zimg);
++}
++
++JNIEXPORT jstring JNICALL
++Java_net_sourceforge_zbar_Image_getFormat (JNIEnv *env,
++                                           jobject obj)
++{
++    uint32_t fourcc = zbar_image_get_format(GET_PEER(Image, obj));
++    if(!fourcc)
++        return(NULL);
++    char fmtstr[5] = { fourcc, fourcc >> 8, fourcc >> 16, fourcc >> 24, 0 };
++    return((*env)->NewStringUTF(env, fmtstr));
++}
++
++JNIEXPORT void JNICALL
++Java_net_sourceforge_zbar_Image_setFormat (JNIEnv *env,
++                                           jobject obj,
++                                           jstring format)
++{
++    uint32_t fourcc = format_to_fourcc(env, format);
++    if(!fourcc)
++        return;
++    zbar_image_set_format(GET_PEER(Image, obj), fourcc);
++}
++
++JNIEXPORT jint JNICALL
++Java_net_sourceforge_zbar_Image_getSequence (JNIEnv *env,
++                                             jobject obj)
++{
++    return(zbar_image_get_sequence(GET_PEER(Image, obj)));
++}
++
++JNIEXPORT void JNICALL
++Java_net_sourceforge_zbar_Image_setSequence (JNIEnv *env,
++                                             jobject obj,
++                                             jint seq)
++{
++    zbar_image_set_sequence(GET_PEER(Image, obj), seq);
++}
++
++JNIEXPORT jint JNICALL
++Java_net_sourceforge_zbar_Image_getWidth (JNIEnv *env,
++                                          jobject obj)
++{
++    return(zbar_image_get_width(GET_PEER(Image, obj)));
++}
++
++JNIEXPORT jint JNICALL
++Java_net_sourceforge_zbar_Image_getHeight (JNIEnv *env,
++                                           jobject obj)
++{
++    return(zbar_image_get_height(GET_PEER(Image, obj)));
++}
++
++JNIEXPORT jobject JNICALL
++Java_net_sourceforge_zbar_Image_getSize (JNIEnv *env,
++                                         jobject obj)
++{
++    jintArray size = (*env)->NewIntArray(env, 2);
++    if(!size)
++        return(NULL);
++
++    unsigned dims[2];
++    zbar_image_get_size(GET_PEER(Image, obj), dims, dims + 1);
++    jint jdims[2] = { dims[0], dims[1] };
++    (*env)->SetIntArrayRegion(env, size, 0, 2, jdims);
++    return(size);
++}
++
++JNIEXPORT void JNICALL
++Java_net_sourceforge_zbar_Image_setSize__II (JNIEnv *env,
++                                             jobject obj,
++                                             jint width,
++                                             jint height)
++{
++    if(width < 0) width = 0;
++    if(height < 0) height = 0;
++    zbar_image_set_size(GET_PEER(Image, obj), width, height);
++}
++
++JNIEXPORT void JNICALL
++Java_net_sourceforge_zbar_Image_setSize___3I (JNIEnv *env,
++                                              jobject obj,
++                                              jintArray size)
++{
++    if((*env)->GetArrayLength(env, size) != 2)
++        throw_exc(env, "java/lang/IllegalArgumentException",
++                  "size must be an array of two ints");
++    jint dims[2];
++    (*env)->GetIntArrayRegion(env, size, 0, 2, dims);
++    if(dims[0] < 0) dims[0] = 0;
++    if(dims[1] < 0) dims[1] = 0;
++    zbar_image_set_size(GET_PEER(Image, obj), dims[0], dims[1]);
++}
++
++JNIEXPORT jobject JNICALL
++Java_net_sourceforge_zbar_Image_getCrop (JNIEnv *env,
++                                         jobject obj)
++{
++    jintArray crop = (*env)->NewIntArray(env, 4);
++    if(!crop)
++        return(NULL);
++
++    unsigned dims[4];
++    zbar_image_get_crop(GET_PEER(Image, obj), dims, dims + 1,
++                        dims + 2, dims + 3);
++    jint jdims[4] = { dims[0], dims[1], dims[2], dims[3] };
++    (*env)->SetIntArrayRegion(env, crop, 0, 4, jdims);
++    return(crop);
++}
++
++#define VALIDATE_CROP(u, m) \
++    if((u) < 0) {           \
++        (m) += (u);         \
++        (u) = 0;            \
++    }
++
++JNIEXPORT void JNICALL
++Java_net_sourceforge_zbar_Image_setCrop__IIII (JNIEnv *env,
++                                               jobject obj,
++                                               jint x, jint y,
++                                               jint w, jint h)
++{
++    VALIDATE_CROP(x, w);
++    VALIDATE_CROP(y, h);
++    zbar_image_set_crop(GET_PEER(Image, obj), x, y, w, h);
++}
++
++JNIEXPORT void JNICALL
++Java_net_sourceforge_zbar_Image_setCrop___3I (JNIEnv *env,
++                                              jobject obj,
++                                              jintArray crop)
++{
++    if((*env)->GetArrayLength(env, crop) != 4)
++        throw_exc(env, "java/lang/IllegalArgumentException",
++                  "crop must be an array of four ints");
++    jint dims[4];
++    (*env)->GetIntArrayRegion(env, crop, 0, 4, dims);
++    VALIDATE_CROP(dims[0], dims[2]);
++    VALIDATE_CROP(dims[1], dims[3]);
++    zbar_image_set_crop(GET_PEER(Image, obj),
++                        dims[0], dims[1], dims[2], dims[3]);
++}
++#undef VALIDATE_CROP
++
++JNIEXPORT jobject JNICALL
++Java_net_sourceforge_zbar_Image_getData (JNIEnv *env,
++                                         jobject obj)
++{
++    jobject data = (*env)->GetObjectField(env, obj, Image_data);
++    if(data)
++        return(data);
++
++    zbar_image_t *zimg = GET_PEER(Image, obj);
++    data = zbar_image_get_userdata(zimg);
++    if(data)
++        return(data);
++
++    unsigned long rawlen = zbar_image_get_data_length(zimg);
++    const void *raw = zbar_image_get_data(zimg);
++    if(!rawlen || !raw)
++        return(NULL);
++
++    data = (*env)->NewByteArray(env, rawlen);
++    if(!data)
++        return(NULL);
++
++    (*env)->SetByteArrayRegion(env, data, 0, rawlen, raw);
++    (*env)->SetObjectField(env, obj, Image_data, data);
++    return(data);
++}
++
++static inline void
++Image_setData (JNIEnv *env,
++               jobject obj,
++               jbyteArray data,
++               void *raw,
++               unsigned long rawlen,
++               zbar_image_cleanup_handler_t *cleanup)
++{
++    if(!data)
++        cleanup = NULL;
++    (*env)->SetObjectField(env, obj, Image_data, data);
++    zbar_image_t *zimg = GET_PEER(Image, obj);
++    zbar_image_set_data(zimg, raw, rawlen, cleanup);
++    zbar_image_set_userdata(zimg, (*env)->NewGlobalRef(env, data));
++}
++
++JNIEXPORT void JNICALL
++Java_net_sourceforge_zbar_Image_setData___3B (JNIEnv *env,
++                                              jobject obj,
++                                              jbyteArray data)
++{
++    jbyte *raw = NULL;
++    unsigned long rawlen = 0;
++    if(data) {
++        raw = (*env)->GetByteArrayElements(env, data, NULL);
++        if(!raw)
++            return;
++        rawlen = (*env)->GetArrayLength(env, data);
++    }
++    Image_setData(env, obj, data, raw, rawlen, Image_cleanupByteArray);
++}
++
++JNIEXPORT void JNICALL
++Java_net_sourceforge_zbar_Image_setData___3I (JNIEnv *env,
++                                              jobject obj,
++                                              jintArray data)
++{
++    jint *raw = NULL;
++    unsigned long rawlen = 0;
++    if(data) {
++        raw = (*env)->GetIntArrayElements(env, data, NULL);
++        if(!raw)
++            return;
++        rawlen = (*env)->GetArrayLength(env, data) * sizeof(*raw);
++    }
++    Image_setData(env, obj, data, raw, rawlen, Image_cleanupIntArray);
++}
++
++JNIEXPORT jlong JNICALL
++Java_net_sourceforge_zbar_Image_getSymbols (JNIEnv *env,
++                                            jobject obj,
++                                            jlong peer)
++{
++    const zbar_symbol_set_t *zsyms = zbar_image_get_symbols(PEER_CAST(peer));
++    if(zsyms) {
++        zbar_symbol_set_ref(zsyms, 1);
++        stats.SymbolSet_create++;
++    }
++    return((intptr_t)zsyms);
++}
++
++
++JNIEXPORT void JNICALL
++Java_net_sourceforge_zbar_ImageScanner_init (JNIEnv *env,
++                                             jclass cls)
++{
++    ImageScanner_peer = (*env)->GetFieldID(env, cls, "peer", "J");
++}
++
++JNIEXPORT jlong JNICALL
++Java_net_sourceforge_zbar_ImageScanner_create (JNIEnv *env,
++                                               jobject obj)
++{
++    zbar_image_scanner_t *zscn = zbar_image_scanner_create();
++    if(!zscn) {
++        throw_exc(env, "java/lang/OutOfMemoryError", NULL);
++        return(0);
++    }
++    stats.ImageScanner_create++;
++    return((intptr_t)zscn);
++}
++
++JNIEXPORT void JNICALL
++Java_net_sourceforge_zbar_ImageScanner_destroy (JNIEnv *env,
++                                                jobject obj,
++                                                jlong peer)
++{
++    zbar_image_scanner_destroy(PEER_CAST(peer));
++    stats.ImageScanner_destroy++;
++}
++
++JNIEXPORT void JNICALL
++Java_net_sourceforge_zbar_ImageScanner_setConfig (JNIEnv *env,
++                                                  jobject obj,
++                                                  jint symbology,
++                                                  jint config,
++                                                  jint value)
++{
++    zbar_image_scanner_set_config(GET_PEER(ImageScanner, obj),
++                                  symbology, config, value);
++}
++
++JNIEXPORT void JNICALL
++Java_net_sourceforge_zbar_ImageScanner_parseConfig (JNIEnv *env,
++                                                    jobject obj,
++                                                    jstring cfg)
++{
++    const char *cfgstr = (*env)->GetStringUTFChars(env, cfg, NULL);
++    if(!cfgstr)
++        return;
++    if(zbar_image_scanner_parse_config(GET_PEER(ImageScanner, obj), cfgstr))
++        throw_exc(env, "java/lang/IllegalArgumentException",
++                  "unknown configuration");
++}
++
++JNIEXPORT void JNICALL
++Java_net_sourceforge_zbar_ImageScanner_enableCache (JNIEnv *env,
++                                                    jobject obj,
++                                                    jboolean enable)
++{
++    zbar_image_scanner_enable_cache(GET_PEER(ImageScanner, obj), enable);
++}
++
++JNIEXPORT jlong JNICALL
++Java_net_sourceforge_zbar_ImageScanner_getResults (JNIEnv *env,
++                                                   jobject obj,
++                                                   jlong peer)
++{
++    const zbar_symbol_set_t *zsyms =
++        zbar_image_scanner_get_results(PEER_CAST(peer));
++    if(zsyms) {
++        zbar_symbol_set_ref(zsyms, 1);
++        stats.SymbolSet_create++;
++    }
++    return((intptr_t)zsyms);
++}
++
++JNIEXPORT jint JNICALL
++Java_net_sourceforge_zbar_ImageScanner_scanImage (JNIEnv *env,
++                                                  jobject obj,
++                                                  jobject image)
++{
++    zbar_image_scanner_t *zscn = GET_PEER(ImageScanner, obj);
++    zbar_image_t *zimg = GET_PEER(Image, image);
++
++    int n = zbar_scan_image(zscn, zimg);
++    if(n < 0)
++        throw_exc(env, "java/lang/UnsupportedOperationException",
++                  "unsupported image format");
++    return(n);
++}
+diff --git a/perl/Changes b/perl/Changes
+--- a/perl/Changes
++++ b/perl/Changes
+@@ -1,5 +1,17 @@
+ Revision history for Perl extension Barcode::ZBar.
+ 
++current spadix
++	* add Symbol orientation and Decoder direction interfaces
++
++0.04  2009-10-23 spadix
++	* add result query interfaces to ImageScanner and Processor
++
++0.03  2009-09-24 spadix
++	* add support for binary symbol data
++	* fix symbol leaks
++	* add symbol quality metric
++	* add support for QR Code
++
+ 0.02  2009-04-16 spadix
+ 	* project name change: package becomes Barcode::ZBar
+ 
+diff --git a/perl/README b/perl/README
+--- a/perl/README
++++ b/perl/README
+@@ -1,10 +1,11 @@
+ Barcode::ZBar Perl module
+ =========================
+ 
+-The ZBar Bar Code Reader is a library for scanning and decoding bar
+-codes from various sources such as video streams, image files or raw
+-intensity sensors.  It supports EAN, UPC, Code 128, Code 39 and
+-Interleaved 2 of 5.  These are the Perl bindings for the library.
++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, Code 128,
++Code 93, Code 39, Interleaved 2 of 5 and QR Code.  These are the Perl
++bindings for the library.
+ 
+ Check the ZBar project home page for the latest release, mailing
+ lists, etc.
+@@ -34,4 +35,4 @@ COPYRIGHT AND LICENCE
+ Licensed under the GNU Lesser General Public License, version 2.1.
+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+ 
+-Copyright 2008-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++Copyright 2008-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
+diff --git a/perl/ZBar.pm b/perl/ZBar.pm
+--- a/perl/ZBar.pm
++++ b/perl/ZBar.pm
+@@ -1,5 +1,5 @@
+ #------------------------------------------------------------------------
+-#  Copyright 2008-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++#  Copyright 2008-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
+ #
+ #  This file is part of the ZBar Bar Code Reader.
+ #
+@@ -137,6 +137,56 @@ Dark area or colored bar segment.
+ 
+ =back
+ 
++Decoder configuration constants:
++
++=over 4
++
++=item Config::ENABLE
++
++=item Config::ADD_CHECK
++
++=item Config::EMIT_CHECK
++
++=item Config::ASCII
++
++=item Config::MIN_LEN
++
++=item Config::MAX_LEN
++
++=item Config::POSITION
++
++=item Config::X_DENSITY
++
++=item Config::Y_DENSITY
++
++=back
++
++Symbology modifier constants:
++
++=over 4
++
++=item Modifier::GS1
++
++=item Modifier::AIM
++
++=back
++
++Symbol orientation constants:
++
++=over 4
++
++=item Orient::UNKNOWN
++
++=item Orient::UP
++
++=item Orient::RIGHT
++
++=item Orient::DOWN
++
++=item Orient::LEFT
++
++=back
++
+ 
+ =head1 SEE ALSO
+ 
+@@ -156,7 +206,7 @@ Jeff Brown, E<lt>spadix@users.sourceforg
+ 
+ =head1 COPYRIGHT AND LICENSE
+ 
+-Copyright 2008-2009 (c) Jeff Brown E<lt>spadix@users.sourceforge.netE<gt>
++Copyright 2008-2010 (c) Jeff Brown E<lt>spadix@users.sourceforge.netE<gt>
+ 
+ The ZBar Bar Code Reader is free software; you can redistribute it
+ and/or modify it under the terms of the GNU Lesser Public License as
+diff --git a/perl/ZBar.xs b/perl/ZBar.xs
+--- a/perl/ZBar.xs
++++ b/perl/ZBar.xs
+@@ -1,5 +1,5 @@
+ //------------------------------------------------------------------------
+-//  Copyright 2008-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++//  Copyright 2008-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
+ //
+ //  This file is part of the ZBar Bar Code Reader.
+ //
+@@ -53,6 +53,8 @@ static AV *LOOKUP_zbar_color_t = NULL;
+ static AV *LOOKUP_zbar_symbol_type_t = NULL;
+ static AV *LOOKUP_zbar_error_t = NULL;
+ static AV *LOOKUP_zbar_config_t = NULL;
++static AV *LOOKUP_zbar_modifier_t = NULL;
++static AV *LOOKUP_zbar_orientation_t = NULL;
+ 
+ #define CONSTANT(typ, prefix, sym, name)                \
+     do {                                                \
+@@ -93,6 +95,15 @@ static inline void check_error (int rc, 
+         }                                                               \
+     } while(0);
+ 
++#define PUSH_ENUM_MASK(typ, TYP, val)                         \
++    do {                                                      \
++        unsigned mask = (val);                                \
++        int i;                                                \
++        for(i = 0; i < ZBAR_ ## TYP ## _NUM; i++, mask >>= 1) \
++            if(mask & 1)                                      \
++                XPUSHs(LOOKUP_ENUM(typ, i));                  \
++    } while(0);
++
+ static void image_cleanup_handler (zbar_image_t *image)
+ {
+     SV *data = zbar_image_get_userdata(image);
+@@ -151,7 +162,7 @@ static inline void activate_handler (han
+     SAVETMPS;
+ 
+     PUSHMARK(SP);
+-    EXTEND(SP, 2);
++    EXTEND(SP, 3);
+     PUSHs(sv_mortalcopy(wrap->instance));
+     if(param)
+         PUSHs(param);
+@@ -277,11 +288,37 @@ BOOT:
+         CONSTANT(config, CFG_, ASCII, "ascii");
+         CONSTANT(config, CFG_, MIN_LEN, "min-length");
+         CONSTANT(config, CFG_, MAX_LEN, "max-length");
++        CONSTANT(config, CFG_, UNCERTAINTY, "uncertainty");
+         CONSTANT(config, CFG_, POSITION, "position");
+         CONSTANT(config, CFG_, X_DENSITY, "x-density");
+         CONSTANT(config, CFG_, Y_DENSITY, "y-density");
+     }
+ 
++MODULE = Barcode::ZBar  PACKAGE = Barcode::ZBar::Modifier  PREFIX = zbar_mod_
++
++BOOT:
++    {
++        HV *stash = gv_stashpv("Barcode::ZBar::Modifier", TRUE);
++
++        LOOKUP_zbar_modifier_t = newAV();
++        CONSTANT(modifier, MOD_, GS1, "GS1");
++        CONSTANT(modifier, MOD_, AIM, "AIM");
++    }
++
++MODULE = Barcode::ZBar	PACKAGE = Barcode::ZBar::Orient	PREFIX = zbar_orientation_
++
++BOOT:
++    {
++        HV *stash = gv_stashpv("Barcode::ZBar::Orient", TRUE);
++
++        LOOKUP_zbar_orientation_t = newAV();
++        CONSTANT(orientation, ORIENT_, UNKNOWN, "UNKNOWN");
++        CONSTANT(orientation, ORIENT_, UP, "UP");
++        CONSTANT(orientation, ORIENT_, RIGHT, "RIGHT");
++        CONSTANT(orientation, ORIENT_, DOWN, "DOWN");
++        CONSTANT(orientation, ORIENT_, LEFT, "LEFT");
++    }
++
+ 
+ MODULE = Barcode::ZBar	PACKAGE = Barcode::ZBar::Symbol	PREFIX = zbar_symbol_
+ 
+@@ -298,10 +335,14 @@ BOOT:
+         CONSTANT(symbol_type, , UPCA, zbar_get_symbol_name(ZBAR_UPCA));
+         CONSTANT(symbol_type, , EAN13, zbar_get_symbol_name(ZBAR_EAN13));
+         CONSTANT(symbol_type, , ISBN13, zbar_get_symbol_name(ZBAR_ISBN13));
++        CONSTANT(symbol_type, , DATABAR, zbar_get_symbol_name(ZBAR_DATABAR));
++        CONSTANT(symbol_type, , DATABAR_EXP,
++                 zbar_get_symbol_name(ZBAR_DATABAR_EXP));
+         CONSTANT(symbol_type, , I25, zbar_get_symbol_name(ZBAR_I25));
+         CONSTANT(symbol_type, , CODE39, zbar_get_symbol_name(ZBAR_CODE39));
+         CONSTANT(symbol_type, , PDF417, zbar_get_symbol_name(ZBAR_PDF417));
+         CONSTANT(symbol_type, , QRCODE, zbar_get_symbol_name(ZBAR_QRCODE));
++        CONSTANT(symbol_type, , CODE93, zbar_get_symbol_name(ZBAR_CODE93));
+         CONSTANT(symbol_type, , CODE128, zbar_get_symbol_name(ZBAR_CODE128));
+     }
+ 
+@@ -316,6 +357,18 @@ zbar_symbol_get_type(symbol)
+ 	Barcode::ZBar::Symbol symbol
+ 
+ SV *
++zbar_symbol_get_configs(symbol)
++	Barcode::ZBar::Symbol	symbol
++    PPCODE:
++        PUSH_ENUM_MASK(config, CFG, zbar_symbol_get_configs(symbol));
++
++SV *
++zbar_symbol_get_modifiers(symbol)
++	Barcode::ZBar::Symbol	symbol
++    PPCODE:
++        PUSH_ENUM_MASK(modifier, MOD, zbar_symbol_get_modifiers(symbol));
++
++SV *
+ zbar_symbol_get_data(symbol)
+ 	Barcode::ZBar::Symbol symbol
+     CODE:
+@@ -347,6 +400,10 @@ zbar_symbol_get_loc(symbol)
+             av_push(pt, newSVuv(zbar_symbol_get_loc_y(symbol, i)));
+         }
+ 
++zbar_orientation_t
++zbar_symbol_get_orientation(symbol)
++	Barcode::ZBar::Symbol symbol
++
+ SV *
+ get_components(symbol)
+         Barcode::ZBar::Symbol	symbol
+@@ -398,6 +455,19 @@ get_size(image)
+         mPUSHu(zbar_image_get_width(image));
+         mPUSHu(zbar_image_get_height(image));
+ 
++void
++get_crop(image)
++        Barcode::ZBar::Image	image
++    PREINIT:
++        unsigned x, y, w, h;
++    PPCODE:
++        zbar_image_get_crop(image, &x, &y, &w, &h);
++        EXTEND(SP, 4);
++        mPUSHu(x);
++        mPUSHu(y);
++        mPUSHu(w);
++        mPUSHu(h);
++
+ SV *
+ zbar_image_get_data(image)
+         Barcode::ZBar::Image	image
+@@ -426,8 +496,16 @@ zbar_image_set_sequence(image, seq_num)
+ void
+ zbar_image_set_size(image, width, height)
+         Barcode::ZBar::Image	image
+-	unsigned	width
+-	unsigned	height
++        int	width + if(width < 0) width = 0;
++        int	height + if(height < 0) height = 0;
++
++void
++zbar_image_set_crop(image, x, y, width, height)
++        Barcode::ZBar::Image	image
++        int	x + if(x < 0) { width += x; x = 0; }
++        int	y + if(y < 0) { height += y; y = 0; }
++        int	width
++        int	height
+ 
+ void
+ zbar_image_set_data(image, data)
+@@ -712,6 +790,25 @@ zbar_symbol_type_t
+ zbar_decoder_get_type(decoder)
+ 	Barcode::ZBar::Decoder	decoder
+ 
++SV *
++zbar_decoder_get_configs(decoder, symbology)
++	Barcode::ZBar::Decoder	decoder
++        zbar_symbol_type_t	symbology
++    PPCODE:
++        if(symbology == ZBAR_NONE)
++            symbology = zbar_decoder_get_type(decoder)
++        PUSH_ENUM_MASK(config, CFG, zbar_decoder_get_configs(decoder, symbology));
++
++SV *
++zbar_decoder_get_modifiers(decoder)
++	Barcode::ZBar::Decoder	decoder
++    PPCODE:
++        PUSH_ENUM_MASK(modifier, MOD, zbar_decoder_get_modifiers(decoder));
++
++int
++zbar_decoder_get_direction(decoder)
++	Barcode::ZBar::Decoder	decoder
++
+ void
+ zbar_decoder_set_handler(decoder, handler = 0, closure = 0)
+ 	Barcode::ZBar::Decoder	decoder
+diff --git a/perl/ZBar/Image.pod b/perl/ZBar/Image.pod
+--- a/perl/ZBar/Image.pod
++++ b/perl/ZBar/Image.pod
+@@ -132,7 +132,7 @@ Jeff Brown, E<lt>spadix@users.sourceforg
+ 
+ =head1 COPYRIGHT AND LICENSE
+ 
+-Copyright 2008-2009 (c) Jeff Brown E<lt>spadix@users.sourceforge.netE<gt>
++Copyright 2008-2010 (c) Jeff Brown E<lt>spadix@users.sourceforge.netE<gt>
+ 
+ The ZBar Bar Code Reader is free software; you can redistribute it
+ and/or modify it under the terms of the GNU Lesser Public License as
+diff --git a/perl/ZBar/ImageScanner.pod b/perl/ZBar/ImageScanner.pod
+--- a/perl/ZBar/ImageScanner.pod
++++ b/perl/ZBar/ImageScanner.pod
+@@ -89,7 +89,7 @@ Jeff Brown, E<lt>spadix@users.sourceforg
+ 
+ =head1 COPYRIGHT AND LICENSE
+ 
+-Copyright 2008-2009 (c) Jeff Brown E<lt>spadix@users.sourceforge.netE<gt>
++Copyright 2008-2010 (c) Jeff Brown E<lt>spadix@users.sourceforge.netE<gt>
+ 
+ The ZBar Bar Code Reader is free software; you can redistribute it
+ and/or modify it under the terms of the GNU Lesser Public License as
+diff --git a/perl/ZBar/Processor.pod b/perl/ZBar/Processor.pod
+--- a/perl/ZBar/Processor.pod
++++ b/perl/ZBar/Processor.pod
+@@ -137,7 +137,7 @@ Jeff Brown, E<lt>spadix@users.sourceforg
+ 
+ =head1 COPYRIGHT AND LICENSE
+ 
+-Copyright 2008-2009 (c) Jeff Brown E<lt>spadix@users.sourceforge.netE<gt>
++Copyright 2008-2010 (c) Jeff Brown E<lt>spadix@users.sourceforge.netE<gt>
+ 
+ The ZBar Bar Code Reader is free software; you can redistribute it
+ and/or modify it under the terms of the GNU Lesser Public License as
+diff --git a/perl/ZBar/Symbol.pod b/perl/ZBar/Symbol.pod
+--- a/perl/ZBar/Symbol.pod
++++ b/perl/ZBar/Symbol.pod
+@@ -1,5 +1,5 @@
+ #------------------------------------------------------------------------
+-#  Copyright 2008-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++#  Copyright 2008-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
+ #
+ #  This file is part of the ZBar Bar Code Reader.
+ #
+@@ -72,6 +72,12 @@ Current cache count of the symbol.  This
+ inter-scan reliability and redundancy information if enabled at the
+ Barcode::ZBar::ImageScanner.
+ 
++=item get_orientation()
++
++General orientation of decoded symbol.  This returns one of the
++Barcode::ZBar::Orient constants, which provide a coarse, axis-aligned
++indication of symbol orientation.
++
+ =item get_components()
+ 
+ Components of a composite result.  This yields an array of physical
+@@ -122,6 +128,8 @@ Bar code type "symbology" constants:
+ 
+ =item CODE39
+ 
++=item CODE93
++
+ =item CODE128
+ 
+ =item QRCODE
+@@ -144,7 +152,7 @@ Jeff Brown, E<lt>spadix@users.sourceforg
+ 
+ =head1 COPYRIGHT AND LICENSE
+ 
+-Copyright 2008-2009 (c) Jeff Brown E<lt>spadix@users.sourceforge.netE<gt>
++Copyright 2008-2010 (c) Jeff Brown E<lt>spadix@users.sourceforge.netE<gt>
+ 
+ The ZBar Bar Code Reader is free software; you can redistribute it
+ and/or modify it under the terms of the GNU Lesser Public License as
+diff --git a/perl/t/Decoder.t b/perl/t/Decoder.t
+--- a/perl/t/Decoder.t
++++ b/perl/t/Decoder.t
+@@ -3,7 +3,7 @@
+ 
+ use warnings;
+ use strict;
+-use Test::More tests => 13;
++use Test::More tests => 17;
+ 
+ #########################
+ 
+@@ -19,7 +19,8 @@ isa_ok($decoder, 'Barcode::ZBar::Decoder
+ #########################
+ 
+ can_ok($decoder, qw(set_config parse_config reset new_scan decode_width
+-                    get_color get_data get_type set_handler));
++                    get_color get_configs get_direction get_data get_modifiers
++                    get_type set_handler));
+ 
+ #########################
+ 
+@@ -58,6 +59,10 @@ is($decoder->get_color(), Barcode::ZBar:
+ 
+ #########################
+ 
++is($decoder->get_direction(), 0, 'reset direction');
++
++#########################
++
+ $decoder->set_config(Barcode::ZBar::Symbol::QRCODE,
+                      Barcode::ZBar::Config::ENABLE, 0);
+ 
+@@ -74,6 +79,17 @@ is($sym, Barcode::ZBar::Symbol::EAN13, '
+ 
+ #########################
+ 
++is_deeply([$decoder->get_configs($sym)],
++          [Barcode::ZBar::Config::ENABLE,
++           Barcode::ZBar::Config::EMIT_CHECK],
++          'read configs');
++
++#########################
++
++is_deeply([$decoder->get_modifiers()], [], 'read modifiers');
++
++#########################
++
+ is($decoder->get_data(), '6268964977804', 'EAN-13 data');
+ 
+ #########################
+@@ -82,6 +98,10 @@ is($decoder->get_color(), Barcode::ZBar:
+ 
+ #########################
+ 
++is($decoder->get_direction(), 1, 'decode direction');
++
++#########################
++
+ is($handler_type, Barcode::ZBar::Symbol::EAN13, 'handler type');
+ 
+ #########################
+diff --git a/perl/t/Image.t b/perl/t/Image.t
+--- a/perl/t/Image.t
++++ b/perl/t/Image.t
+@@ -3,7 +3,7 @@
+ 
+ use warnings;
+ use strict;
+-use Test::More tests => 22;
++use Test::More tests => 29;
+ 
+ #########################
+ 
+@@ -48,6 +48,26 @@ is_deeply([$image->get_size()], [114, 80
+ 
+ #########################
+ 
++$image->set_crop(20, 20, 74, 40);
++is_deeply([$image->get_crop()], [20, 20, 74, 40], 'crop accessors');
++
++#########################
++
++$image->set_crop(-57, -40, 228, 160);
++is_deeply([$image->get_crop()], [0, 0, 114, 80], 'crop clipping');
++
++#########################
++
++$image->set_crop(10, 10, 94, 60);
++is_deeply([$image->get_crop()], [10, 10, 94, 60], 'crop accessors');
++
++#########################
++
++$image->set_size(114, 80);
++is_deeply([$image->get_crop()], [0, 0, 114, 80], 'crop reset');
++
++#########################
++
+ # FIXME avoid skipping these (eg embed image vs ImageMagick)
+ SKIP: {
+     eval { require Image::Magick };
+@@ -94,7 +114,8 @@ SKIP: {
+ 
+     #########################
+ 
+-    can_ok($sym, qw(get_type get_data get_quality get_count get_loc));
++    can_ok($sym, qw(get_type get_configs get_modifiers get_data get_quality
++                    get_count get_loc get_orientation));
+ 
+     #########################
+ 
+@@ -102,6 +123,17 @@ SKIP: {
+ 
+     #########################
+ 
++    is_deeply([$sym->get_configs()],
++              [Barcode::ZBar::Config::ENABLE,
++               Barcode::ZBar::Config::EMIT_CHECK],
++              'result configs');
++
++    #########################
++
++    is_deeply([$sym->get_modifiers()], [], 'result modifiers');
++
++    #########################
++
+     is($sym->get_data(), '9876543210128', 'result data');
+ 
+     #########################
+@@ -133,6 +165,10 @@ SKIP: {
+ 
+     #########################
+ 
++    is($sym->get_orientation(), Barcode::ZBar::Orient::UP, 'orientation');
++
++    #########################
++
+     my @comps = $sym->get_components();
+     is(scalar(@comps), 0, 'components size');
+ 
+diff --git a/perl/t/ZBar.t b/perl/t/ZBar.t
+--- a/perl/t/ZBar.t
++++ b/perl/t/ZBar.t
+@@ -3,7 +3,7 @@
+ 
+ use warnings;
+ use strict;
+-use Test::More tests => 3;
++use Test::More tests => 37;
+ 
+ #########################
+ 
+@@ -20,3 +20,49 @@ Barcode::ZBar::increase_verbosity();
+ pass('verbosity');
+ 
+ #########################
++
++# performs (2 * n) tests
++sub test_enum {
++    my $name = shift;
++    foreach my $test (@_) {
++        my $enum = $test->[0];
++
++        is($enum, $test->[1], "$name enum/string compare");
++
++        #########################
++
++        ok($enum == $test->[2], "$name enum/numeric compare");
++    }
++}
++
++test_enum('config',
++    [Barcode::ZBar::Config::ENABLE,      'enable',        0],
++    [Barcode::ZBar::Config::ADD_CHECK,   'add-check',     1],
++    [Barcode::ZBar::Config::EMIT_CHECK,  'emit-check',    2],
++    [Barcode::ZBar::Config::ASCII,       'ascii',         3],
++    [Barcode::ZBar::Config::MIN_LEN,     'min-length',   32],
++    [Barcode::ZBar::Config::MAX_LEN,     'max-length',   33],
++    [Barcode::ZBar::Config::UNCERTAINTY, 'uncertainty',  64],
++    [Barcode::ZBar::Config::POSITION,    'position',    128],
++    [Barcode::ZBar::Config::X_DENSITY,   'x-density',   256],
++    [Barcode::ZBar::Config::Y_DENSITY,   'y-density',   257],
++);
++
++#########################
++
++test_enum('modifier',
++    [Barcode::ZBar::Modifier::GS1, 'GS1', 0],
++    [Barcode::ZBar::Modifier::AIM, 'AIM', 1],
++);
++
++#########################
++
++test_enum('orientation',
++    [Barcode::ZBar::Orient::UNKNOWN, 'UNKNOWN', -1],
++    [Barcode::ZBar::Orient::UP,      'UP',       0],
++    [Barcode::ZBar::Orient::RIGHT,   'RIGHT',    1],
++    [Barcode::ZBar::Orient::DOWN,    'DOWN',     2],
++    [Barcode::ZBar::Orient::LEFT,    'LEFT',     3],
++);
++
++#########################
+diff --git a/perl/typemap b/perl/typemap
+--- a/perl/typemap
++++ b/perl/typemap
+@@ -14,6 +14,8 @@ zbar_color_t					T_ENUM
+ zbar_error_t					T_ENUM
+ zbar_symbol_type_t				T_ENUM
+ zbar_config_t					T_ENUM
++zbar_modifier_t                                 T_ENUM
++zbar_orientation_t				T_ENUM
+ 
+ # special scalars
+ fourcc_t					T_FOURCC
+@@ -30,14 +32,8 @@ T_ENUM
+ T_FOURCC
+ 	{
+             if(SvPOK($arg)) {
+-                STRLEN len;
+-                char *str = SvPV($arg, len);
+-                if(len != 4)
+-                    croak(\"invalid fourcc: \%s\", str);
+-                $var = ((unsigned long)str[0] |
+-                        ((unsigned long)str[1] << 8) |
+-                        ((unsigned long)str[2] << 16) |
+-                        ((unsigned long)str[3] << 24));
++                char *str = SvPV_nolen($arg);
++                $var = zbar_fourcc_parse(str);
+             }
+             else
+                 $var = SvUV($arg);
+diff --git a/python/MANIFEST.in b/python/MANIFEST.in
+new file mode 100644
+--- /dev/null
++++ b/python/MANIFEST.in
+@@ -0,0 +1,2 @@
++include MANIFEST MANIFEST.in zbarmodule.h test/barcode.png
++recursive-include examples *.py
+diff --git a/python/Makefile.am.inc b/python/Makefile.am.inc
+--- a/python/Makefile.am.inc
++++ b/python/Makefile.am.inc
+@@ -9,4 +9,5 @@ python_zbar_la_SOURCES = python/zbarmodu
+     python/symboliter.c python/image.c \
+     python/processor.c python/imagescanner.c python/decoder.c python/scanner.c
+ 
+-EXTRA_DIST += python/test/barcode.png python/test/test_zbar.py
++EXTRA_DIST += python/test/barcode.png python/test/test_zbar.py \
++    python/examples/processor.py python/examples/read_one.py
+diff --git a/python/README b/python/README
+new file mode 100644
+--- /dev/null
++++ b/python/README
+@@ -0,0 +1,59 @@
++==========================================
++zbar -- read barcodes from images or video
++==========================================
++
++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, Code 128,
++Code 93, Code 39, Interleaved 2 of 5 and QR Code.  These are the
++Python bindings for the library.
++
++Check the ZBar project home page for the latest release, mailing
++lists, etc.
++
++* http://zbar.sourceforge.net/
++
++Installation
++------------
++
++To install this module type the following::
++
++   python setup.py install
++
++Dependencies
++------------
++
++This module requires the ZBar Bar Code Reader, which may be obtained
++from:
++
++* http://zbar.sourceforge.net/
++
++Windows users please note: the module *will NOT load* unless the ZBar
++library DLL (currently libzbar-0.dll) is available in your PATH!
++
++Examples
++--------
++
++To scan an image, wrap the raw image data in a ``zbar.Image`` and feed
++it to a ``zbar.ImageScanner``::
++
++    import zbar
++    scanner = zbar.ImageScanner()
++    image = zbar.Image(width, height, 'Y800', raw_data)
++    scanner.scan(image)
++    for symbol in image:
++        print 'decoded', symbol.type, 'symbol', '"%s"' % symbol.data
++
++Complete, runnable examples may be found in the source distribution,
++under the ``examples/`` directory.  A couple of HOWTOs_ that cover
++programming with the library may be found on the project wiki.
++
++.. _HOWTOs: http://sourceforge.net/apps/mediawiki/zbar/index.php?title=Category:HOWTOs
++
++Copyright and License
++---------------------
++
++Licensed under the GNU Lesser General Public License, version 2.1.
++http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
++
++Copyright 2008-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
+diff --git a/python/decoder.c b/python/decoder.c
+--- a/python/decoder.c
++++ b/python/decoder.c
+@@ -1,5 +1,5 @@
+ /*------------------------------------------------------------------------
+- *  Copyright 2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++ *  Copyright 2009-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
+  *
+  *  This file is part of the ZBar Bar Code Reader.
+  *
+@@ -104,6 +104,23 @@ decoder_get_type (zbarDecoder *self,
+ }
+ 
+ static PyObject*
++decoder_get_configs (zbarDecoder *self,
++                     void *closure)
++{
++    unsigned int sym = zbar_decoder_get_type(self->zdcode);
++    unsigned int mask = zbar_decoder_get_configs(self->zdcode, sym);
++    return(zbarEnum_SetFromMask(config_enum, mask));
++}
++
++static PyObject*
++decoder_get_modifiers (zbarDecoder *self,
++                       void *closure)
++{
++    unsigned int mask = zbar_decoder_get_modifiers(self->zdcode);
++    return(zbarEnum_SetFromMask(modifier_enum, mask));
++}
++
++static PyObject*
+ decoder_get_data (zbarDecoder *self,
+                   void *closure)
+ {
+@@ -111,10 +128,20 @@ decoder_get_data (zbarDecoder *self,
+                                       zbar_decoder_get_data_length(self->zdcode)));
+ }
+ 
++static PyObject*
++decoder_get_direction (zbarDecoder *self,
++                       void *closure)
++{
++    return(PyInt_FromLong(zbar_decoder_get_direction(self->zdcode)));
++}
++
+ static PyGetSetDef decoder_getset[] = {
+-    { "color",    (getter)decoder_get_color, },
+-    { "type",     (getter)decoder_get_type, },
+-    { "data",     (getter)decoder_get_data, },
++    { "color",     (getter)decoder_get_color, },
++    { "type",      (getter)decoder_get_type, },
++    { "configs",   (getter)decoder_get_configs, },
++    { "modifiers", (getter)decoder_get_modifiers, },
++    { "data",      (getter)decoder_get_data, },
++    { "direction", (getter)decoder_get_direction },
+     { NULL, },
+ };
+ 
+@@ -139,6 +166,23 @@ decoder_set_config (zbarDecoder *self,
+ }
+ 
+ static PyObject*
++decoder_get_configs_meth (zbarDecoder *self,
++                          PyObject *args,
++                          PyObject *kwds)
++{
++    zbar_symbol_type_t sym = ZBAR_NONE;
++    static char *kwlist[] = { "symbology", NULL };
++    if(!PyArg_ParseTupleAndKeywords(args, kwds, "|i", kwlist, &sym))
++        return(NULL);
++
++    if(sym == ZBAR_NONE)
++        sym = zbar_decoder_get_type(self->zdcode);
++
++    unsigned int mask = zbar_decoder_get_configs(self->zdcode, sym);
++    return(zbarEnum_SetFromMask(config_enum, mask));
++}
++
++static PyObject*
+ decoder_parse_config (zbarDecoder *self,
+                       PyObject *args,
+                       PyObject *kwds)
+@@ -262,6 +306,8 @@ decoder_decode_width (zbarDecoder *self,
+ static PyMethodDef decoder_methods[] = {
+     { "set_config",   (PyCFunction)decoder_set_config,
+       METH_VARARGS | METH_KEYWORDS, },
++    { "get_configs",  (PyCFunction)decoder_get_configs_meth,
++      METH_VARARGS | METH_KEYWORDS, },
+     { "parse_config", (PyCFunction)decoder_parse_config,
+       METH_VARARGS | METH_KEYWORDS, },
+     { "reset",        (PyCFunction)decoder_reset,
+diff --git a/python/enum.c b/python/enum.c
+--- a/python/enum.c
++++ b/python/enum.c
+@@ -1,5 +1,5 @@
+ /*------------------------------------------------------------------------
+- *  Copyright 2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++ *  Copyright 2009-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
+  *
+  *  This file is part of the ZBar Bar Code Reader.
+  *
+@@ -192,3 +192,31 @@ zbarEnum_Add (zbarEnum *self,
+         return(-1);
+     return(0);
+ }
++
++zbarEnumItem*
++zbarEnum_LookupValue (zbarEnum *self,
++                      int val)
++{
++    PyObject *key = PyInt_FromLong(val);
++    zbarEnumItem *e = (zbarEnumItem*)PyDict_GetItem(self->byvalue, key);
++    if(!e)
++        return((zbarEnumItem*)key);
++    Py_INCREF((PyObject*)e);
++    Py_DECREF(key);
++    return(e);
++}
++
++PyObject*
++zbarEnum_SetFromMask (zbarEnum *self,
++                      unsigned int mask)
++{
++    PyObject *result = PySet_New(NULL);
++    PyObject *key, *item;
++    Py_ssize_t i = 0;
++    while(PyDict_Next(self->byvalue, &i, &key, &item)) {
++        int val = PyInt_AsLong(item);
++        if(val < sizeof(mask) * 8 && ((mask >> val) & 1))
++            PySet_Add(result, item);
++    }
++    return(result);
++}
+diff --git a/examples/processor.py b/python/examples/processor.py
+rename from examples/processor.py
+rename to python/examples/processor.py
+diff --git a/examples/read_one.py b/python/examples/read_one.py
+rename from examples/read_one.py
+rename to python/examples/read_one.py
+diff --git a/examples/scan_image.py b/python/examples/scan_image.py
+rename from examples/scan_image.py
+rename to python/examples/scan_image.py
+diff --git a/python/image.c b/python/image.c
+--- a/python/image.c
++++ b/python/image.c
+@@ -1,5 +1,5 @@
+ /*------------------------------------------------------------------------
+- *  Copyright 2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++ *  Copyright 2009-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
+  *
+  *  This file is part of the ZBar Bar Code Reader.
+  *
+@@ -139,16 +139,18 @@ image_set_format (zbarImage *self,
+         PyErr_SetString(PyExc_TypeError, "cannot delete format attribute");
+         return(-1);
+     }
+-    char *format;
++    char *format = NULL;
+     Py_ssize_t len;
+     if(PyString_AsStringAndSize(value, &format, &len) ||
+        !format || len != 4) {
++        if(!format)
++            format = "(nil)";
+         PyErr_Format(PyExc_ValueError,
+                      "format '%.50s' is not a valid four character code",
+                      format);
+         return(-1);
+     }
+-    zbar_image_set_format(self->zimg,*((unsigned long*)format));
++    zbar_image_set_format(self->zimg, zbar_fourcc_parse(format));
+     return(0);
+ }
+ 
+@@ -156,9 +158,9 @@ static PyObject*
+ image_get_size (zbarImage *self,
+                 void *closure)
+ {
+-    unsigned int width = zbar_image_get_width(self->zimg);
+-    unsigned int height = zbar_image_get_height(self->zimg);
+-    return(PyTuple_Pack(2, PyInt_FromLong(width), PyInt_FromLong(height)));
++    unsigned int w, h;
++    zbar_image_get_size(self->zimg, &w, &h);
++    return(PyTuple_Pack(2, PyInt_FromLong(w), PyInt_FromLong(h)));
+ }
+ 
+ static int
+@@ -170,33 +172,82 @@ image_set_size (zbarImage *self,
+         PyErr_SetString(PyExc_TypeError, "cannot delete size attribute");
+         return(-1);
+     }
+-    int rc = -1;
+-    PyObject *wobj = NULL, *hobj = NULL;
++    int rc = -1, i, dims[2];
+     if(!PySequence_Check(value) ||
+        PySequence_Size(value) != 2)
+         goto error;
+-    wobj = PySequence_GetItem(value, 0);
+-    hobj = PySequence_GetItem(value, 1);
+-    if(!wobj || !hobj)
+-        goto error;
++    for(i = 0; i < 2; i++) {
++        PyObject *dim = PySequence_GetItem(value, i);
++        if(!dim)
++            goto error;
++        dims[i] = PyInt_AsSsize_t(dim);
++        Py_DECREF(dim);
++        if(dims[i] < 0)
++            goto error;
++    }
+ 
+-    int width = PyInt_AsSsize_t(wobj);
+-    if(width == -1 && PyErr_Occurred())
+-        goto error;
+-
+-    int height = PyInt_AsSsize_t(hobj);
+-    if(height == -1 && PyErr_Occurred())
+-        goto error;
+-
+-    zbar_image_set_size(self->zimg, width, height);
++    zbar_image_set_size(self->zimg, dims[0], dims[1]);
+     rc = 0;
+ 
+ error:
+-    Py_XDECREF(wobj);
+-    Py_XDECREF(hobj);
+     if(rc)
+         PyErr_SetString(PyExc_ValueError,
+-                        "size must be a sequence of two ints");
++                        "size must be a sequence of two positive ints");
++    return(rc);
++}
++
++static PyObject*
++image_get_crop (zbarImage *self,
++                void *closure)
++{
++    unsigned int x, y, w, h;
++    zbar_image_get_crop(self->zimg, &x, &y, &w, &h);
++    return(PyTuple_Pack(4, PyInt_FromLong(x), PyInt_FromLong(y),
++                        PyInt_FromLong(w), PyInt_FromLong(h)));
++}
++
++static int
++image_set_crop (zbarImage *self,
++                PyObject *value,
++                void *closure)
++{
++    unsigned w, h;
++    zbar_image_get_size(self->zimg, &w, &h);
++    if(!value) {
++        zbar_image_set_crop(self->zimg, 0, 0, w, h);
++        return(0);
++    }
++    int rc = -1, i, dims[4];
++    if(!PySequence_Check(value) ||
++       PySequence_Size(value) != 4)
++        goto error;
++    for(i = 0; i < 4; i++) {
++        PyObject *dim = PySequence_GetItem(value, i);
++        if(!dim)
++            goto error;
++        dims[i] = PyInt_AsSsize_t(dim);
++        Py_DECREF(dim);
++        if(dims[i] == -1 && PyErr_Occurred())
++            goto error;
++    }
++    if(dims[2] < 0 || dims[3] < 0)
++        goto error;
++    if(dims[0] < 0) {
++        dims[2] += dims[0];
++        dims[0] = 0;
++    }
++    if(dims[1] < 0) {
++        dims[3] += dims[1];
++        dims[1] = 0;
++    }
++
++    zbar_image_set_crop(self->zimg, dims[0], dims[1], dims[2], dims[3]);
++    rc = 0;
++
++error:
++    if(rc)
++        PyErr_SetString(PyExc_ValueError,
++                        "crop must be a sequence of four positive ints");
+     return(rc);
+ }
+ 
+@@ -308,6 +359,7 @@ image_set_data (zbarImage *self,
+ static PyGetSetDef image_getset[] = {
+     { "format",   (getter)image_get_format, (setter)image_set_format, },
+     { "size",     (getter)image_get_size,   (setter)image_set_size, },
++    { "crop",     (getter)image_get_crop,   (setter)image_set_crop, },
+     { "width",    (getter)image_get_int,    (setter)image_set_int,
+       NULL, (void*)0 },
+     { "height",   (getter)image_get_int,    (setter)image_set_int,
+@@ -359,6 +411,7 @@ image_convert (zbarImage *self,
+                      format);
+         return(NULL);
+     }
++    unsigned long fourcc = zbar_fourcc_parse(format);
+ 
+     zbarImage *img = PyObject_GC_New(zbarImage, &zbarImage_Type);
+     if(!img)
+@@ -366,11 +419,9 @@ image_convert (zbarImage *self,
+     img->data = NULL;
+     if(width > 0 && height > 0)
+         img->zimg =
+-            zbar_image_convert_resize(self->zimg,
+-                                       *((unsigned long*)format),
+-                                       width, height);
++            zbar_image_convert_resize(self->zimg, fourcc, width, height);
+     else
+-        img->zimg = zbar_image_convert(self->zimg, *((unsigned long*)format));
++        img->zimg = zbar_image_convert(self->zimg, fourcc);
+ 
+     if(!img->zimg) {
+         /* FIXME propagate exception */
+diff --git a/python/setup.py b/python/setup.py
+new file mode 100755
+--- /dev/null
++++ b/python/setup.py
+@@ -0,0 +1,44 @@
++#!/usr/bin/env python
++from distutils.core import setup, Extension
++
++setup(
++    name = 'zbar',
++    version = '0.10',
++    author = 'Jeff Brown',
++    author_email = 'spadix@users.sourceforge.net',
++    url = 'http://zbar.sourceforge.net',
++    description = 'read barcodes from images or video',
++    license = 'LGPL',
++    long_description = open('README').read(),
++    classifiers = [
++        'License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)',
++        'Development Status :: 4 - Beta',
++        'Intended Audience :: Developers',
++        'Environment :: Console',
++        'Environment :: X11 Applications',
++        'Environment :: Win32 (MS Windows)',
++        'Operating System :: POSIX',
++        'Operating System :: Unix',
++        'Operating System :: Microsoft :: Windows',
++        'Topic :: Communications',
++        'Topic :: Multimedia :: Graphics',
++        'Topic :: Software Development :: Libraries',
++    ],
++    ext_modules = [
++        Extension('zbar', [
++                'zbarmodule.c',
++                'enum.c',
++                'exception.c',
++                'symbol.c',
++                'symbolset.c',
++                'symboliter.c',
++                'image.c',
++                'processor.c',
++                'imagescanner.c',
++                'decoder.c',
++                'scanner.c',
++                ],
++            libraries = [ 'zbar' ],
++        ),
++    ],
++)
+diff --git a/python/symbol.c b/python/symbol.c
+--- a/python/symbol.c
++++ b/python/symbol.c
+@@ -1,5 +1,5 @@
+ /*------------------------------------------------------------------------
+- *  Copyright 2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++ *  Copyright 2009-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
+  *
+  *  This file is part of the ZBar Bar Code Reader.
+  *
+@@ -81,6 +81,22 @@ symbol_get_type (zbarSymbol *self,
+ }
+ 
+ static PyObject*
++symbol_get_configs (zbarSymbol *self,
++                    void *closure)
++{
++    unsigned int mask = zbar_symbol_get_configs(self->zsym);
++    return(zbarEnum_SetFromMask(config_enum, mask));
++}
++
++static PyObject*
++symbol_get_modifiers (zbarSymbol *self,
++                      void *closure)
++{
++    unsigned int mask = zbar_symbol_get_modifiers(self->zsym);
++    return(zbarEnum_SetFromMask(modifier_enum, mask));
++}
++
++static PyObject*
+ symbol_get_long (zbarSymbol *self,
+                  void *closure)
+ {
+@@ -128,12 +144,23 @@ symbol_get_location (zbarSymbol *self,
+     return(self->loc);
+ }
+ 
++static zbarEnumItem*
++symbol_get_orientation (zbarSymbol *self,
++                        void *closure)
++{
++    return(zbarEnum_LookupValue(orient_enum,
++                                zbar_symbol_get_orientation(self->zsym)));
++}
++
+ static PyGetSetDef symbol_getset[] = {
+     { "type",       (getter)symbol_get_type, },
++    { "configs",    (getter)symbol_get_configs, },
++    { "modifiers",  (getter)symbol_get_modifiers, },
+     { "quality",    (getter)symbol_get_long, NULL, NULL, (void*)0 },
+     { "count",      (getter)symbol_get_long, NULL, NULL, (void*)1 },
+     { "data",       (getter)symbol_get_data, },
+     { "location",   (getter)symbol_get_location, },
++    { "orientation",(getter)symbol_get_orientation, },
+     { "components", (getter)symbol_get_components,  },
+     { NULL, },
+ };
+diff --git a/python/test/test_zbar.py b/python/test/test_zbar.py
+--- a/python/test/test_zbar.py
++++ b/python/test/test_zbar.py
+@@ -20,6 +20,9 @@ def load_image():
+ encoded_widths = \
+     '9 111 212241113121211311141132 11111 311213121312121332111132 111 9'
+ 
++databar_widths = \
++    '11 31111333 13911 31131231 11214222 11553 21231313 1'
++
+ VIDEO_DEVICE = None
+ if 'VIDEO_DEVICE' in os.environ:
+     VIDEO_DEVICE = os.environ['VIDEO_DEVICE']
+@@ -59,6 +62,7 @@ class TestZBarFunctions(ut.TestCase):
+                     zbar.Config.ASCII,
+                     zbar.Config.MIN_LEN,
+                     zbar.Config.MAX_LEN,
++                    zbar.Config.UNCERTAINTY,
+                     zbar.Config.POSITION,
+                     zbar.Config.X_DENSITY,
+                     zbar.Config.Y_DENSITY):
+@@ -66,6 +70,13 @@ class TestZBarFunctions(ut.TestCase):
+             self.assert_(int(cfg) >= 0)
+             self.assert_(is_identifier.match(str(cfg)))
+ 
++    def test_modifiers(self):
++        for mod in (zbar.Modifier.GS1,
++                    zbar.Modifier.AIM):
++            self.assert_(isinstance(mod, zbar.EnumItem))
++            self.assert_(int(mod) >= 0)
++            self.assert_(is_identifier.match(str(mod)))
++
+     def test_symbologies(self):
+         for sym in (zbar.Symbol.NONE,
+                     zbar.Symbol.PARTIAL,
+@@ -75,15 +86,28 @@ class TestZBarFunctions(ut.TestCase):
+                     zbar.Symbol.UPCA,
+                     zbar.Symbol.EAN13,
+                     zbar.Symbol.ISBN13,
++                    zbar.Symbol.DATABAR,
++                    zbar.Symbol.DATABAR_EXP,
+                     zbar.Symbol.I25,
+                     zbar.Symbol.CODE39,
+                     zbar.Symbol.PDF417,
+                     zbar.Symbol.QRCODE,
++                    zbar.Symbol.CODE93,
+                     zbar.Symbol.CODE128):
+             self.assert_(isinstance(sym, zbar.EnumItem))
+             self.assert_(int(sym) >= 0)
+             self.assert_(is_identifier.match(str(sym)))
+ 
++    def test_orientations(self):
++        for orient in (zbar.Orient.UNKNOWN,
++                       zbar.Orient.UP,
++                       zbar.Orient.RIGHT,
++                       zbar.Orient.DOWN,
++                       zbar.Orient.LEFT):
++            self.assert_(isinstance(orient, zbar.EnumItem))
++            self.assert_(-1 <= int(orient) <= 3)
++            self.assert_(is_identifier.match(str(orient)))
++
+ class TestScanner(ut.TestCase):
+     def setUp(self):
+         self.scn = zbar.Scanner()
+@@ -135,6 +159,9 @@ class TestDecoder(ut.TestCase):
+             self.dcode.data = data
+         self.assertRaises(AttributeError, set_data, 'yomama')
+ 
++        self.assertRaises(AttributeError,
++                          self.dcode.__setattr__, 'direction', -1)
++
+     def test_width(self):
+         sym = self.dcode.decode_width(5)
+         self.assert_(sym is zbar.Symbol.NONE)
+@@ -150,6 +177,7 @@ class TestDecoder(ut.TestCase):
+         self.assert_(self.dcode.color is zbar.BAR)
+         self.dcode.reset()
+         self.assert_(self.dcode.color is zbar.SPACE)
++        self.assertEqual(self.dcode.direction, 0)
+ 
+     def test_decode(self):
+         inline_sym = [ -1 ]
+@@ -172,12 +200,33 @@ class TestDecoder(ut.TestCase):
+             else:
+                 self.assert_(sym is zbar.Symbol.EAN13)
+ 
++        self.assertEqual(self.dcode.configs,
++                         set((zbar.Config.ENABLE, zbar.Config.EMIT_CHECK)))
++        self.assertEqual(self.dcode.modifiers, set())
+         self.assertEqual(self.dcode.data, '6268964977804')
+         self.assert_(self.dcode.color is zbar.BAR)
++        self.assertEqual(self.dcode.direction, 1)
+         self.assert_(sym is zbar.Symbol.EAN13)
+         self.assert_(inline_sym[0] is zbar.Symbol.EAN13)
+         self.assertEqual(explicit_closure, [ 2 ])
+ 
++    def test_databar(self):
++        self.dcode.set_config(zbar.Symbol.QRCODE, zbar.Config.ENABLE, 0)
++        for (i, width) in enumerate(databar_widths):
++            if width == ' ': continue
++            sym = self.dcode.decode_width(int(width))
++            if i < len(databar_widths) - 1:
++                self.assert_(sym is zbar.Symbol.NONE or
++                             sym is zbar.Symbol.PARTIAL)
++
++        self.assert_(sym is zbar.Symbol.DATABAR)
++        self.assertEqual(self.dcode.get_configs(zbar.Symbol.EAN13),
++                         set((zbar.Config.ENABLE, zbar.Config.EMIT_CHECK)))
++        self.assertEqual(self.dcode.modifiers, set((zbar.Modifier.GS1,)))
++        self.assertEqual(self.dcode.data, '0124012345678905')
++        self.assert_(self.dcode.color is zbar.BAR)
++        self.assertEqual(self.dcode.direction, 1)
++
+     # FIXME test exception during callback
+ 
+ class TestImage(ut.TestCase):
+@@ -194,11 +243,13 @@ class TestImage(ut.TestCase):
+     def test_new(self):
+         self.assertEqual(self.image.format, 'Y800')
+         self.assertEqual(self.image.size, (123, 456))
++        self.assertEqual(self.image.crop, (0, 0, 123, 456))
+ 
+         image = zbar.Image()
+         self.assert_(isinstance(image, zbar.Image))
+         self.assertEqual(image.format, '\0\0\0\0')
+         self.assertEqual(image.size, (0, 0))
++        self.assertEqual(image.crop, (0, 0, 0, 0))
+ 
+     def test_format(self):
+         def set_format(fmt):
+@@ -231,6 +282,23 @@ class TestImage(ut.TestCase):
+         self.assertEqual(self.image.width, 81)
+         self.assertEqual(self.image.height, 64)
+ 
++    def test_crop(self):
++        def set_crop(crp):
++            self.image.crop = crp
++        self.assertRaises(ValueError, set_crop, (1,))
++        self.assertRaises(ValueError, set_crop, 1)
++        self.image.crop = (1, 2, 100, 200)
++        self.assertRaises(ValueError, set_crop, (1, 2, 3, 4, 5))
++        self.assertEqual(self.image.crop, (1, 2, 100, 200))
++        self.assertRaises(ValueError, set_crop, "foo")
++        self.assertEqual(self.image.crop, (1, 2, 100, 200))
++        self.image.crop = (-100, -100, 400, 700)
++        self.assertEqual(self.image.crop, (0, 0, 123, 456))
++        self.image.crop = (40, 50, 60, 70)
++        self.assertEqual(self.image.crop, (40, 50, 60, 70))
++        self.image.size = (82, 65)
++        self.assertEqual(self.image.crop, (0, 0, 82, 65))
++
+ class TestImageScanner(ut.TestCase):
+     def setUp(self):
+         self.scn = zbar.ImageScanner()
+@@ -289,6 +357,20 @@ class TestImageScan(ut.TestCase):
+             self.assert_(sym.type is zbar.Symbol.EAN13)
+             self.assert_(sym.type is sym.EAN13)
+             self.assertEqual(str(sym.type), 'EAN13')
++
++            cfgs = sym.configs
++            self.assert_(isinstance(cfgs, set))
++            for cfg in cfgs:
++                self.assert_(isinstance(cfg, zbar.EnumItem))
++            self.assertEqual(cfgs,
++                             set((zbar.Config.ENABLE, zbar.Config.EMIT_CHECK)))
++
++            mods = sym.modifiers
++            self.assert_(isinstance(mods, set))
++            for mod in mods:
++                self.assert_(isinstance(mod, zbar.EnumItem))
++            self.assertEqual(mods, set())
++
+             self.assert_(sym.quality > 0)
+             self.assertEqual(sym.count, 0)
+ 
+@@ -310,6 +392,7 @@ class TestImageScan(ut.TestCase):
+                 self.assertEqual(len(pt), 2)
+                 # FIXME test values (API currently in flux)
+ 
++            self.assert_(sym.orientation is zbar.Orient.UP)
+             self.assert_(data is sym.data)
+             self.assert_(loc is sym.location)
+ 
+@@ -320,6 +403,21 @@ class TestImageScan(ut.TestCase):
+         self.scn.recycle(self.image)
+         self.assertEqual(len(self.image.symbols), 0)
+ 
++    def test_scan_crop(self):
++        self.image.crop = (0, 71, 114, 9)
++        self.assertEqual(self.image.crop, (0, 71, 114, 9))
++        n = self.scn.scan(self.image)
++        self.assertEqual(n, 0)
++
++        self.image.crop = (12, 24, 90, 12)
++        self.assertEqual(self.image.crop, (12, 24, 90, 12))
++        n = self.scn.scan(self.image)
++        self.assertEqual(n, 0)
++
++        self.image.crop = (9, 24, 96, 12)
++        self.assertEqual(self.image.crop, (9, 24, 96, 12))
++        self.test_scan()
++
+     def test_scan_again(self):
+         self.test_scan()
+ 
+@@ -370,13 +468,14 @@ class TestProcessor(ut.TestCase):
+             symiter = iter(image)
+             self.assert_(isinstance(symiter, zbar.SymbolIter))
+ 
+-            symbols = tuple(image)
+-            self.assertEqual(len(symbols), 1)
+-            for symbol in symbols:
+-                self.assert_(isinstance(symbol, zbar.Symbol))
+-                self.assert_(symbol.type is zbar.Symbol.EAN13)
+-                self.assertEqual(symbol.data, '9876543210128')
+-                self.assert_(symbol.quality > 0)
++            syms = tuple(image)
++            self.assertEqual(len(syms), 1)
++            for sym in syms:
++                self.assert_(isinstance(sym, zbar.Symbol))
++                self.assert_(sym.type is zbar.Symbol.EAN13)
++                self.assertEqual(sym.data, '9876543210128')
++                self.assert_(sym.quality > 0)
++                self.assert_(sym.orientation is zbar.Orient.UP)
+             closure[0] += 1
+ 
+         explicit_closure = [ 0 ]
+diff --git a/python/zbarmodule.c b/python/zbarmodule.c
+--- a/python/zbarmodule.c
++++ b/python/zbarmodule.c
+@@ -1,5 +1,5 @@
+ /*------------------------------------------------------------------------
+- *  Copyright 2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++ *  Copyright 2009-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
+  *
+  *  This file is part of the ZBar Bar Code Reader.
+  *
+@@ -23,6 +23,11 @@
+ 
+ #include "zbarmodule.h"
+ 
++typedef struct enumdef {
++    const char *strval;
++    int intval;
++} enumdef;
++
+ static char *exc_names[] = {
+     "zbar.Exception",
+     NULL,
+@@ -38,6 +43,55 @@ static char *exc_names[] = {
+     "zbar.WinAPIError",
+ };
+ 
++static const enumdef symbol_defs[] = {
++    { "NONE",           ZBAR_NONE },
++    { "PARTIAL",        ZBAR_PARTIAL },
++    { "EAN8",           ZBAR_EAN8 },
++    { "UPCE",           ZBAR_UPCE },
++    { "ISBN10",         ZBAR_ISBN10 },
++    { "UPCA",           ZBAR_UPCA },
++    { "EAN13",          ZBAR_EAN13 },
++    { "ISBN13",         ZBAR_ISBN13 },
++    { "DATABAR",        ZBAR_DATABAR },
++    { "DATABAR_EXP",    ZBAR_DATABAR_EXP },
++    { "I25",            ZBAR_I25 },
++    { "CODE39",         ZBAR_CODE39 },
++    { "PDF417",         ZBAR_PDF417 },
++    { "QRCODE",         ZBAR_QRCODE },
++    { "CODE93",         ZBAR_CODE93 },
++    { "CODE128",        ZBAR_CODE128 },
++    { NULL, }
++};
++
++static const enumdef config_defs[] = {
++    { "ENABLE",         ZBAR_CFG_ENABLE },
++    { "ADD_CHECK",      ZBAR_CFG_ADD_CHECK },
++    { "EMIT_CHECK",     ZBAR_CFG_EMIT_CHECK },
++    { "ASCII",          ZBAR_CFG_ASCII },
++    { "MIN_LEN",        ZBAR_CFG_MIN_LEN },
++    { "MAX_LEN",        ZBAR_CFG_MAX_LEN },
++    { "UNCERTAINTY",    ZBAR_CFG_UNCERTAINTY },
++    { "POSITION",       ZBAR_CFG_POSITION },
++    { "X_DENSITY",      ZBAR_CFG_X_DENSITY },
++    { "Y_DENSITY",      ZBAR_CFG_Y_DENSITY },
++    { NULL, }
++};
++
++static const enumdef modifier_defs[] = {
++    { "GS1",            ZBAR_MOD_GS1 },
++    { "AIM",            ZBAR_MOD_AIM },
++    { NULL, }
++};
++
++static const enumdef orient_defs[] = {
++    { "UNKNOWN",        ZBAR_ORIENT_UNKNOWN },
++    { "UP",             ZBAR_ORIENT_UP },
++    { "RIGHT",          ZBAR_ORIENT_RIGHT },
++    { "DOWN",           ZBAR_ORIENT_DOWN },
++    { "LEFT",           ZBAR_ORIENT_LEFT },
++    { NULL, }
++};
++
+ int
+ object_to_bool (PyObject *obj,
+                 int *val)
+@@ -52,8 +106,10 @@ object_to_bool (PyObject *obj,
+ PyObject *zbar_exc[ZBAR_ERR_NUM];
+ zbarEnumItem *color_enum[2];
+ zbarEnum *config_enum;
++zbarEnum *modifier_enum;
+ PyObject *symbol_enum;
+ zbarEnumItem *symbol_NONE;
++zbarEnum *orient_enum;
+ 
+ static PyObject*
+ version (PyObject *self,
+@@ -105,12 +161,6 @@ static PyMethodDef zbar_functions[] = {
+ PyMODINIT_FUNC
+ initzbar (void)
+ {
+-    /* initialize constant containers */
+-    config_enum = zbarEnum_New();
+-    symbol_enum = PyDict_New();
+-    if(!config_enum || !symbol_enum)
+-        return;
+-
+     /* initialize types */
+     zbarEnumItem_Type.tp_base = &PyInt_Type;
+     zbarException_Type.tp_base = (PyTypeObject*)PyExc_Exception;
+@@ -128,6 +178,14 @@ initzbar (void)
+        PyType_Ready(&zbarScanner_Type) < 0)
+         return;
+ 
++    /* initialize constant containers */
++    config_enum = zbarEnum_New();
++    modifier_enum = zbarEnum_New();
++    symbol_enum = PyDict_New();
++    orient_enum = zbarEnum_New();
++    if(!config_enum || !modifier_enum || !symbol_enum || !orient_enum)
++        return;
++
+     zbar_exc[0] = (PyObject*)&zbarException_Type;
+     zbar_exc[ZBAR_ERR_NOMEM] = NULL;
+     zbar_error_t ei;
+@@ -151,6 +209,8 @@ initzbar (void)
+     PyModule_AddObject(mod, "EnumItem", (PyObject*)&zbarEnumItem_Type);
+     PyModule_AddObject(mod, "Image", (PyObject*)&zbarImage_Type);
+     PyModule_AddObject(mod, "Config", (PyObject*)config_enum);
++    PyModule_AddObject(mod, "Modifier", (PyObject*)modifier_enum);
++    PyModule_AddObject(mod, "Orient", (PyObject*)orient_enum);
+     PyModule_AddObject(mod, "Symbol", (PyObject*)&zbarSymbol_Type);
+     PyModule_AddObject(mod, "SymbolSet", (PyObject*)&zbarSymbolSet_Type);
+     PyModule_AddObject(mod, "SymbolIter", (PyObject*)&zbarSymbolIter_Type);
+@@ -170,29 +230,16 @@ initzbar (void)
+     color_enum[ZBAR_BAR] =
+         zbarEnumItem_New(dict, NULL, ZBAR_BAR, "BAR");
+ 
+-    zbarEnum_Add(config_enum, ZBAR_CFG_ENABLE,     "ENABLE");
+-    zbarEnum_Add(config_enum, ZBAR_CFG_ADD_CHECK,  "ADD_CHECK");
+-    zbarEnum_Add(config_enum, ZBAR_CFG_EMIT_CHECK, "EMIT_CHECK");
+-    zbarEnum_Add(config_enum, ZBAR_CFG_ASCII,      "ASCII");
+-    zbarEnum_Add(config_enum, ZBAR_CFG_MIN_LEN,    "MIN_LEN");
+-    zbarEnum_Add(config_enum, ZBAR_CFG_MAX_LEN,    "MAX_LEN");
+-    zbarEnum_Add(config_enum, ZBAR_CFG_X_DENSITY,  "POSITION");
+-    zbarEnum_Add(config_enum, ZBAR_CFG_X_DENSITY,  "X_DENSITY");
+-    zbarEnum_Add(config_enum, ZBAR_CFG_Y_DENSITY,  "Y_DENSITY");
++    const enumdef *item;
++    for(item = config_defs; item->strval; item++)
++        zbarEnum_Add(config_enum, item->intval, item->strval);
++    for(item = modifier_defs; item->strval; item++)
++        zbarEnum_Add(modifier_enum, item->intval, item->strval);
++    for(item = orient_defs; item->strval; item++)
++        zbarEnum_Add(orient_enum, item->intval, item->strval);
+ 
+     PyObject *tp_dict = zbarSymbol_Type.tp_dict;
+-    symbol_NONE =
+-        zbarEnumItem_New(tp_dict, symbol_enum, ZBAR_NONE, "NONE");
+-    zbarEnumItem_New(tp_dict, symbol_enum, ZBAR_PARTIAL, "PARTIAL");
+-    zbarEnumItem_New(tp_dict, symbol_enum, ZBAR_EAN8,    "EAN8");
+-    zbarEnumItem_New(tp_dict, symbol_enum, ZBAR_UPCE,    "UPCE");
+-    zbarEnumItem_New(tp_dict, symbol_enum, ZBAR_ISBN10,  "ISBN10");
+-    zbarEnumItem_New(tp_dict, symbol_enum, ZBAR_UPCA,    "UPCA");
+-    zbarEnumItem_New(tp_dict, symbol_enum, ZBAR_EAN13,   "EAN13");
+-    zbarEnumItem_New(tp_dict, symbol_enum, ZBAR_ISBN13,  "ISBN13");
+-    zbarEnumItem_New(tp_dict, symbol_enum, ZBAR_I25,     "I25");
+-    zbarEnumItem_New(tp_dict, symbol_enum, ZBAR_CODE39,  "CODE39");
+-    zbarEnumItem_New(tp_dict, symbol_enum, ZBAR_PDF417,  "PDF417");
+-    zbarEnumItem_New(tp_dict, symbol_enum, ZBAR_QRCODE,  "QRCODE");
+-    zbarEnumItem_New(tp_dict, symbol_enum, ZBAR_CODE128, "CODE128");
++    for(item = symbol_defs; item->strval; item++)
++        zbarEnumItem_New(tp_dict, symbol_enum, item->intval, item->strval);
++    symbol_NONE = zbarSymbol_LookupEnum(ZBAR_NONE);
+ }
+diff --git a/python/zbarmodule.h b/python/zbarmodule.h
+--- a/python/zbarmodule.h
++++ b/python/zbarmodule.h
+@@ -1,5 +1,5 @@
+ /*------------------------------------------------------------------------
+- *  Copyright 2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++ *  Copyright 2009-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
+  *
+  *  This file is part of the ZBar Bar Code Reader.
+  *
+@@ -61,6 +61,10 @@ extern zbarEnum *zbarEnum_New(void);
+ extern int zbarEnum_Add(zbarEnum *self,
+                          int val,
+                          const char *name);
++extern zbarEnumItem *zbarEnum_LookupValue(zbarEnum *self,
++                                          int val);
++extern PyObject *zbarEnum_SetFromMask(zbarEnum *self,
++                                      unsigned int mask);
+ 
+ typedef struct {
+     PyObject_HEAD
+@@ -144,8 +148,10 @@ extern PyTypeObject zbarScanner_Type;
+ 
+ extern zbarEnumItem *color_enum[2];
+ extern zbarEnum *config_enum;
++extern zbarEnum *modifier_enum;
+ extern PyObject *symbol_enum;
+ extern zbarEnumItem *symbol_NONE;
++extern zbarEnum *orient_enum;
+ 
+ int object_to_bool(PyObject *obj,
+                    int *val);
+diff --git a/test/Makefile.am.inc b/test/Makefile.am.inc
+--- a/test/Makefile.am.inc
++++ b/test/Makefile.am.inc
+@@ -67,3 +67,14 @@ EXTRA_DIST += test/test_pygtk.py test/te
+ CLEANFILES += test/.libs/test_decode test/.libs/test_proc \
+     test/.libs/test_convert test/.libs/test_window \
+     test/.libs/test_video test/.libs/dbg_scan test/.libs/test_gtk
++
++check-decoder: test/test_decode
++	test/test_decode -q
++
++regress-decoder: test/test_decode
++	test/test_decode -n 100000
++
++check-local: check-decoder check-images
++regress: regress-decoder regress-images
++
++.PHONY: check-decoder check-images regress-decoder regress-images regress
+diff --git a/test/barcodetest.py b/test/barcodetest.py
+--- a/test/barcodetest.py
++++ b/test/barcodetest.py
+@@ -124,6 +124,8 @@ def run_zbarimg(images):
+     assert rc in (0, 4), \
+            'zbarimg returned error status (%d)\n' % rc + err
+ 
++    assert not err, err
++
+     result = ET.XML(xml)
+     assert result.tag == ET.QName(BC, 'barcodes')
+     return result
+@@ -167,7 +169,8 @@ class BuiltinTestCase(TestCase):
+             href = 'http://zbar.sf.net/test/barcode.png'
+ 
+         self.source = src = ET.Element(ET.QName(BC, 'source'), href=href)
+-        sym = ET.SubElement(src, ET.QName(BC, 'symbol'), type='EAN-13')
++        sym = ET.SubElement(src, ET.QName(BC, 'symbol'), type='EAN-13',
++                            orientation='UP')
+         data = ET.SubElement(sym, ET.QName(BC, 'data'))
+         data.text = '9876543210128'
+ 
+@@ -258,8 +261,9 @@ def compare_indices(expect, actual):
+ 
+ 
+ def compare_symbols(expect, actual):
+-    pass
+-
++    orient = expect.get('orientation')
++    if orient:
++        assert actual.get('orientation') == orient
+ 
+ # override unittest.TestLoader to populate tests from xml description
+ class TestLoader:
+diff --git a/test/test_decode.c b/test/test_decode.c
+--- a/test/test_decode.c
++++ b/test/test_decode.c
+@@ -22,33 +22,86 @@
+  *------------------------------------------------------------------------*/
+ 
+ #include <inttypes.h>
++#include <limits.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
++#include <ctype.h>
++#include <time.h>
+ #include <assert.h>
+ 
+ #include <zbar.h>
+ 
+ zbar_decoder_t *decoder;
+ 
++zbar_symbol_type_t expect_sym;
++char *expect_data = NULL;
++
++unsigned seed = 0;
++int verbosity = 1;
++int rnd_size = 9;  /* NB should be odd */
++int iter = 0;      /* test iteration */
++
++#define zprintf(level, format, ...) do {                                \
++        if(verbosity >= (level)) {                                      \
++            fprintf(stderr, format , ##__VA_ARGS__); \
++        }                                                               \
++    } while(0)
++
++static inline void print_sep (int level)
++{
++    zprintf(level,
++            "----------------------------------------------------------\n");
++}
++
+ static void symbol_handler (zbar_decoder_t *decoder)
+ {
+     zbar_symbol_type_t sym = zbar_decoder_get_type(decoder);
+-    if(sym <= ZBAR_PARTIAL)
++    if(sym <= ZBAR_PARTIAL || sym == ZBAR_QRCODE)
+         return;
+-    printf("%s%s:%s\n",
+-           zbar_get_symbol_name(sym),
+-           zbar_get_addon_name(sym),
+-           zbar_decoder_get_data(decoder));
+-    /* FIXME add check! */
++    const char *data = zbar_decoder_get_data(decoder);
++
++    int pass = (sym == expect_sym) && !strcmp(data, expect_data) &&
++        zbar_decoder_get_data_length(decoder) == strlen(data);
++    pass *= 3;
++
++    zprintf(pass, "decode %s:%s\n", zbar_get_symbol_name(sym), data);
++
++    if(!expect_sym)
++        zprintf(0, "UNEXPECTED!\n");
++    else
++        zprintf(pass, "expect %s:%s\n", zbar_get_symbol_name(expect_sym),
++                expect_data);
++    if(!pass) {
++        zprintf(0, "SEED=%d\n", seed);
++        abort();
++    }
++
++    expect_sym = ZBAR_NONE;
++    free(expect_data);
++    expect_data = NULL;
++}
++
++static void expect (zbar_symbol_type_t sym,
++                    const char *data)
++{
++    if(expect_sym) {
++        zprintf(0, "MISSING %s:%s\n"
++                "SEED=%d\n",
++                zbar_get_symbol_name(expect_sym), expect_data, seed);
++        abort();
++    }
++    expect_sym = sym;
++    expect_data = (data) ? strdup(data) : NULL;
+ }
+ 
+ static void encode_junk (int n)
+ {
+-    printf("encode random junk...\n");
++    if(n > 1)
++        zprintf(3, "encode random junk...\n");
+     int i;
+     for(i = 0; i < n; i++)
+-        zbar_decode_width(decoder, 10. * (rand() / (RAND_MAX + 1.)));
++        zbar_decode_width(decoder, 20. * (rand() / (RAND_MAX + 1.)) + 1);
+ }
+ 
+ #define FWD 1
+@@ -57,8 +110,8 @@ static void encode_junk (int n)
+ static void encode (uint64_t units,
+                     int fwd)
+ {
+-    printf(" raw=%x%x%c\n", (unsigned)(units >> 32),
+-           (unsigned)(units & 0xffffffff), (fwd) ? '<' : '>');
++    zprintf(3, " raw=%x%x%c\n", (unsigned)(units >> 32),
++            (unsigned)(units & 0xffffffff), (fwd) ? '<' : '>');
+     if(!fwd)
+         while(units && !(units >> 0x3c))
+             units <<= 4;
+@@ -122,47 +175,188 @@ static const unsigned int code128[107] =
+     0x2331112a,                             /* STOP (6a) */
+ };
+ 
+-static void encode_code128b (unsigned char *data)
++static void encode_code128b (char *data)
+ {
+-    printf("------------------------------------------------------------\n"
+-           "encode CODE-128(B): %s\n"
+-           "    encode START_B: %02x", data, START_B);
++    assert(zbar_decoder_get_color(decoder) == ZBAR_SPACE);
++    print_sep(3);
++    zprintf(2, "CODE-128(B): %s\n", data);
++    zprintf(3, "    encode START_B: %02x", START_B);
+     encode(code128[START_B], 0);
+     int i, chk = START_B;
+     for(i = 0; data[i]; i++) {
+-        printf("    encode '%c': %02x", data[i], data[i] - 0x20);
++        zprintf(3, "    encode '%c': %02x", data[i], data[i] - 0x20);
+         encode(code128[data[i] - 0x20], 0);
+         chk += (i + 1) * (data[i] - 0x20);
+     }
+     chk %= 103;
+-    printf("    encode checksum: %02x", chk);
++    zprintf(3, "    encode checksum: %02x", chk);
+     encode(code128[chk], 0);
+-    printf("    encode STOP: %02x", STOP);
++    zprintf(3, "    encode STOP: %02x", STOP);
+     encode(code128[STOP], 0);
+-    printf("------------------------------------------------------------\n");
++    print_sep(3);
+ }
+ 
+-static void encode_code128c (unsigned char *data)
++static void encode_code128c (char *data)
+ {
+-    printf("------------------------------------------------------------\n"
+-           "encode CODE-128(C): %s\n"
+-           "    encode START_C: %02x", data, START_C);
++    assert(zbar_decoder_get_color(decoder) == ZBAR_SPACE);
++    print_sep(3);
++    zprintf(2, "CODE-128(C): %s\n", data);
++    zprintf(3, "    encode START_C: %02x", START_C);
+     encode(code128[START_C], 0);
+     int i, chk = START_C;
+     for(i = 0; data[i]; i += 2) {
+         assert(data[i] >= '0');
+         assert(data[i + 1] >= '0');
+         unsigned char c = (data[i] - '0') * 10 + (data[i + 1] - '0');
+-        printf("    encode '%c%c': %02d", data[i], data[i + 1], c);
++        zprintf(3, "    encode '%c%c': %02d", data[i], data[i + 1], c);
+         encode(code128[c], 0);
+         chk += (i / 2 + 1) * c;
+     }
+     chk %= 103;
+-    printf("    encode checksum: %02x", chk);
++    zprintf(3, "    encode checksum: %02x", chk);
+     encode(code128[chk], 0);
+-    printf("    encode STOP: %02x", STOP);
++    zprintf(3, "    encode STOP: %02x", STOP);
+     encode(code128[STOP], 0);
+-    printf("------------------------------------------------------------\n");
++    print_sep(3);
++}
++
++/*------------------------------------------------------------*/
++/* Code 93 encoding */
++
++#define CODE93_START_STOP 0x2f
++
++static const unsigned int code93[47 + 1] = {
++    0x131112, 0x111213, 0x111312, 0x111411, /* 00 */
++    0x121113, 0x121212, 0x121311, 0x111114,
++    0x131211, 0x141111, 0x211113, 0x211212, /* 08 */
++    0x211311, 0x221112, 0x221211, 0x231111,
++    0x112113, 0x112212, 0x112311, 0x122112, /* 10 */
++    0x132111, 0x111123, 0x111222, 0x111321,
++    0x121122, 0x131121, 0x212112, 0x212211, /* 18 */
++    0x211122, 0x211221, 0x221121, 0x222111,
++    0x112122, 0x112221, 0x122121, 0x123111, /* 20 */
++    0x121131, 0x311112, 0x311211, 0x321111,
++    0x112131, 0x113121, 0x211131, 0x121221, /* 28 */
++    0x312111, 0x311121, 0x122211,
++    0x111141,                               /* START/STOP (2f) */
++};
++
++#define S1 0x2b00|
++#define S2 0x2c00|
++#define S3 0x2d00|
++#define S4 0x2e00|
++
++static const unsigned short code93_ext[0x80] = {
++    S2'U', S1'A', S1'B', S1'C', S1'D', S1'E', S1'F', S1'G',
++    S1'H', S1'I', S1'J', S1'K', S1'L', S1'M', S1'N', S1'O',
++    S1'P', S1'Q', S1'R', S1'S', S1'T', S1'U', S1'V', S1'W',
++    S1'X', S1'Y', S1'Z', S2'A', S2'B', S2'C', S2'D', S2'E',
++    0x26,  S3'A', S3'B', S3'C', 0x27,  0x2a,  S3'F', S3'G',
++    S3'H', S3'I', S3'J', 0x29,  S3'L', 0x24,  0x25,  0x28,
++    0x00,  0x01,  0x02,  0x03,  0x04,  0x05,  0x06,  0x07,
++    0x08,  0x09,  S3'Z', S2'F', S2'G', S2'H', S2'I', S2'J',
++    S2'V', 0x0a,  0x0b,  0x0c,  0x0d,  0x0e,  0x0f,  0x10,
++    0x11,  0x12,  0x13,  0x14,  0x15,  0x16,  0x17,  0x18,
++    0x19,  0x1a,  0x1b,  0x1c,  0x1d,  0x1e,  0x1f,  0x20,
++    0x21,  0x22,  0x23,  S2'K', S2'L', S2'M', S2'N', S2'O',
++    S2'W', S4'A', S4'B', S4'C', S4'D', S4'E', S4'F', S4'G',
++    S4'H', S4'I', S4'J', S4'K', S4'L', S4'M', S4'N', S4'O',
++    S4'P', S4'Q', S4'R', S4'S', S4'T', S4'U', S4'V', S4'W',
++    S4'X', S4'Y', S4'Z', S2'P', S2'Q', S2'R', S2'S', S2'T',
++};
++
++#undef S1
++#undef S2
++#undef S3
++#undef S4
++
++static void encode_char93 (unsigned char c,
++                           int dir)
++{
++    unsigned ext = code93_ext[c];
++    unsigned shift = ext >> 8;
++    assert(shift < 0x30);
++    c = ext & 0xff;
++    if(shift) {
++        assert(c < 0x80);
++        c = code93_ext[c];
++    }
++    assert(c < 0x30);
++
++    if(shift) {
++        encode(code93[(dir) ? shift : c], dir ^ 1);
++        encode(code93[(dir) ? c : shift], dir ^ 1);
++    }
++    else
++        encode(code93[c], dir ^ 1);
++}
++
++static void encode_code93 (char *data,
++                           int dir)
++{
++    assert(zbar_decoder_get_color(decoder) == ZBAR_SPACE);
++    print_sep(3);
++
++    /* calculate checksums */
++    int i, j, chk_c = 0, chk_k = 0, n = 0;
++    for(i = 0; data[i]; i++, n++) {
++        unsigned c = data[i], ext;
++        assert(c < 0x80);
++        ext = code93_ext[c];
++        n += ext >> 13;
++    }
++
++    for(i = 0, j = 0; data[i]; i++, j++) {
++        unsigned ext = code93_ext[(unsigned)data[i]];
++        unsigned shift = ext >> 8;
++        unsigned c = ext & 0xff;
++        if(shift) {
++            chk_c += shift * (((n - 1 - j) % 20) + 1);
++            chk_k += shift * (((n - j) % 15) + 1);
++            j++;
++            c = code93_ext[c];
++        }
++        chk_c += c * (((n - 1 - j) % 20) + 1);
++        chk_k += c * (((n - j) % 15) + 1);
++    }
++    chk_c %= 47;
++    chk_k += chk_c;
++    chk_k %= 47;
++
++    zprintf(2, "CODE-93: %s (n=%x C=%02x K=%02x)\n", data, n, chk_c, chk_k);
++    encode(0xa, 0);  /* leading quiet */
++
++    zprintf(3, "    encode %s:", (dir) ? "START" : "STOP");
++    if(!dir)
++        encode(0x1, REV);
++    encode(code93[CODE93_START_STOP], dir ^ 1);
++    if(!dir) {
++        zprintf(3, "    encode checksum (K): %02x", chk_k);
++        encode(code93[chk_k], REV ^ 1);
++        zprintf(3, "    encode checksum (C): %02x", chk_c);
++        encode(code93[chk_c], REV ^ 1);
++    }
++
++    n = strlen(data);
++    for(i = 0; i < n; i++) {
++        unsigned char c = data[(dir) ? i : (n - i - 1)];
++        zprintf(3, "    encode '%c':", c);
++        encode_char93(c, dir);
++    }
++
++    if(dir) {
++        zprintf(3, "    encode checksum (C): %02x", chk_c);
++        encode(code93[chk_c], FWD ^ 1);
++        zprintf(3, "    encode checksum (K): %02x", chk_k);
++        encode(code93[chk_k], FWD ^ 1);
++    }
++    zprintf(3, "    encode %s:", (dir) ? "STOP" : "START");
++    encode(code93[CODE93_START_STOP], dir ^ 1);
++    if(dir)
++        encode(0x1, FWD);
++
++    encode(0xa, 0);  /* trailing quiet */
++    print_sep(3);
+ }
+ 
+ /*------------------------------------------------------------*/
+@@ -182,14 +376,29 @@ static const unsigned int code39[91-32] 
+ /* FIXME configurable/randomized ratio, ics */
+ /* FIXME check digit option, ASCII escapes */
+ 
++static void convert_code39 (char *data)
++{
++    char *src, *dst;
++    for(src = data, dst = data; *src; src++) {
++        char c = *src;
++        if(c >= 'a' && c <= 'z')
++            *(dst++) = c - ('a' - 'A');
++        else if(c == ' ' ||
++                c == '$' || c == '%' ||
++                c == '+' || c == '-' ||
++                (c >= '.' && c <= '9') ||
++                (c >= 'A' && c <= 'Z'))
++            *(dst++) = c;
++        else
++            /* skip (FIXME) */;
++    }
++    *dst = 0;
++}
++
+ static void encode_char39 (unsigned char c,
+                            unsigned ics)
+ {
+-    if(c >= 'a' && c <= 'z')
+-        c -= 'a' - 'A';
+-    else if(c < 0x20 || c > 0x5a)
+-        return; /* skip (FIXME) */
+-
++    assert(0x20 <= c && c <= 0x5a);
+     unsigned int raw = code39[c - 0x20];
+     if(!raw)
+         return; /* skip (FIXME) */
+@@ -201,15 +410,16 @@ static void encode_char39 (unsigned char
+         raw <<= 1;
+     }
+     enc = (enc << 4) | ics;
+-    printf("    encode '%c': %02x%08x: ", c,
+-           (unsigned)(enc >> 32), (unsigned)(enc & 0xffffffff));
++    zprintf(3, "    encode '%c': %02x%08x: ", c,
++            (unsigned)(enc >> 32), (unsigned)(enc & 0xffffffff));
+     encode(enc, REV);
+ }
+ 
+-static void encode_code39 (unsigned char *data)
++static void encode_code39 (char *data)
+ {
+-    printf("------------------------------------------------------------\n"
+-           "encode CODE-39: %s\n", data);
++    assert(zbar_decoder_get_color(decoder) == ZBAR_SPACE);
++    print_sep(3);
++    zprintf(2, "CODE-39: %s\n", data);
+     encode(0xa, 0);  /* leading quiet */
+     encode_char39('*', 1);
+     int i;
+@@ -217,10 +427,10 @@ static void encode_code39 (unsigned char
+         if(data[i] != '*') /* skip (FIXME) */
+             encode_char39(data[i], 1);
+     encode_char39('*', 0xa);  /* w/trailing quiet */
+-    printf("------------------------------------------------------------\n");
++    print_sep(3);
+ }
+ 
+-
++#if 0
+ /*------------------------------------------------------------*/
+ /* PDF417 encoding */
+ 
+@@ -258,32 +468,33 @@ static void encode_row417 (int r,
+ {
+     int k = r % 3;
+ 
+-    printf("    [%d] encode %s:", r, (dir) ? "stop" : "start");
++    zprintf(3, "    [%d] encode %s:", r, (dir) ? "stop" : "start");
+     encode((dir) ? PDF417_STOP : PDF417_START, dir);
+ 
+     int cw = calc_ind417(k + !dir, r, cols);
+-    printf("    [%d,%c] encode %03d(%d): ", r, (dir) ? 'R' : 'L', cw, k);
++    zprintf(3, "    [%d,%c] encode %03d(%d): ", r, (dir) ? 'R' : 'L', cw, k);
+     encode(pdf417_encode[cw][k], dir);
+ 
+     int c;
+     for(c = 0; c < cols; c++) {
+         cw = cws[c];
+-        printf("    [%d,%d] encode %03d(%d): ", r, c, cw, k);
++        zprintf(3, "    [%d,%d] encode %03d(%d): ", r, c, cw, k);
+         encode(pdf417_encode[cw][k], dir);
+     }
+ 
+     cw = calc_ind417(k + dir, r, cols);
+-    printf("    [%d,%c] encode %03d(%d): ", r, (dir) ? 'L' : 'R', cw, k);
++    zprintf(3, "    [%d,%c] encode %03d(%d): ", r, (dir) ? 'L' : 'R', cw, k);
+     encode(pdf417_encode[cw][k], dir);
+ 
+-    printf("    [%d] encode %s:", r, (dir) ? "start" : "stop");
++    zprintf(3, "    [%d] encode %s:", r, (dir) ? "start" : "stop");
+     encode((dir) ? PDF417_START : PDF417_STOP, dir);
+ }
+ 
+-static void encode_pdf417 (unsigned char *data)
++static void encode_pdf417 (char *data)
+ {
+-    printf("------------------------------------------------------------\n"
+-           "encode PDF417: hello world\n");
++    assert(zbar_decoder_get_color(decoder) == ZBAR_SPACE);
++    print_sep(3);
++    zprintf(2, "PDF417: hello world\n");
+     encode(0xa, 0);
+ 
+     int r;
+@@ -292,9 +503,9 @@ static void encode_pdf417 (unsigned char
+         encode(0xa, 0);
+     }
+ 
+-    printf("------------------------------------------------------------\n");
++    print_sep(3);
+ }
+-
++#endif
+ 
+ /*------------------------------------------------------------*/
+ /* Interleaved 2 of 5 encoding */
+@@ -303,21 +514,22 @@ static const unsigned char i25[10] = {
+     0x06, 0x11, 0x09, 0x18, 0x05, 0x14, 0x0c, 0x03, 0x12, 0x0a,
+ };
+ 
+-static void encode_i25 (unsigned char *data,
++static void encode_i25 (char *data,
+                         int dir)
+ {
+-    printf("------------------------------------------------------------\n"
+-           "encode Interleaved 2 of 5: %s\n"
+-           "    encode start:", data);
++    assert(zbar_decoder_get_color(decoder) == ZBAR_SPACE);
++    print_sep(3);
++    zprintf(2, "Interleaved 2 of 5: %s\n", data);
++    zprintf(3, "    encode start:");
+     encode((dir) ? 0xa1111 : 0xa112, 0);
+ 
+     /* FIXME rev case data reversal */
+     int i;
+-    for(i = (strlen((char*)data) & 1) ? -1 : 0; i < 0 || data[i]; i += 2) {
++    for(i = (strlen(data) & 1) ? -1 : 0; i < 0 || data[i]; i += 2) {
+         /* encode 2 digits */
+         unsigned char c0 = (i < 0) ? 0 : data[i] - '0';
+         unsigned char c1 = data[i + 1] - '0';
+-        printf("    encode '%d%d':", c0, c1);
++        zprintf(3, "    encode '%d%d':", c0, c1);
+         assert(c0 < 10);
+         assert(c1 < 10);
+ 
+@@ -337,12 +549,252 @@ static void encode_i25 (unsigned char *d
+         encode(enc, dir);
+     }
+ 
+-    printf("    encode end:");
++    zprintf(3, "    encode end:");
+     encode((dir) ? 0x211a : 0x1111a, 0);
+-    printf("------------------------------------------------------------\n");
++    print_sep(3);
+ }
+ 
+ /*------------------------------------------------------------*/
++/* DataBar encoding */
++
++
++/* character encoder reference algorithm from ISO/IEC 24724:2009 */
++
++struct rss_group {
++    int T_odd, T_even, n_odd, w_max;
++};
++
++static const struct rss_group databar_groups_outside[] = {
++    { 161,   1, 12, 8 },
++    {  80,  10, 10, 6 },
++    {  31,  34,  8, 4 },
++    {  10,  70,  6, 3 },
++    {   1, 126,  4, 1 },
++    {   0, }
++};
++
++static const struct rss_group databar_groups_inside[] = {
++    {  4, 84,  5, 2 },
++    { 20, 35,  7, 4 },
++    { 48, 10,  9, 6 },
++    { 81,  1, 11, 8 },
++    {  0, }
++};
++
++static const uint32_t databar_finders[9] = {
++    0x38211, 0x35511, 0x33711, 0x31911, 0x27411,
++    0x25611, 0x23811, 0x15711, 0x13911,
++};
++
++int combins (int n,
++             int r)
++{
++    int i, j;
++    int maxDenom, minDenom;
++    int val;
++    if(n-r > r) {
++        minDenom = r;
++        maxDenom = n-r;
++    }
++    else {
++        minDenom = n-r;
++        maxDenom = r;
++    }
++    val = 1;
++    j = 1;
++    for(i = n; i > maxDenom; i--) {
++        val *= i;
++        if(j <= minDenom) {
++            val /= j;
++            j++;
++        }
++    }
++    for(; j <= minDenom; j++)
++        val /= j;
++    return(val);
++}
++
++void getRSSWidths (int val,
++                   int n,
++                   int elements,
++                   int maxWidth,
++                   int noNarrow,
++                   int *widths)
++{
++    int narrowMask = 0;
++    int bar;
++    for(bar = 0; bar < elements - 1; bar++) {
++        int elmWidth, subVal;
++        for(elmWidth = 1, narrowMask |= (1<<bar);
++            ;
++            elmWidth++, narrowMask &= ~(1<<bar))
++        {
++            subVal = combins(n-elmWidth-1, elements-bar-2);
++            if((!noNarrow) && !narrowMask &&
++                (n-elmWidth-(elements-bar-1) >= elements-bar-1))
++                subVal -= combins(n-elmWidth-(elements-bar), elements-bar-2);
++            if(elements-bar-1 > 1) {
++                int mxwElement, lessVal = 0;
++                for (mxwElement = n-elmWidth-(elements-bar-2);
++                     mxwElement > maxWidth;
++                     mxwElement--)
++                    lessVal += combins(n-elmWidth-mxwElement-1, elements-bar-3);
++                subVal -= lessVal * (elements-1-bar);
++            }
++            else if (n-elmWidth > maxWidth)
++                subVal--;
++            val -= subVal;
++            if(val < 0)
++                break;
++        }
++        val += subVal;
++        n -= elmWidth;
++        widths[bar] = elmWidth;
++    }
++    widths[bar] = n;
++}
++
++static uint64_t encode_databar_char (unsigned val,
++                                     const struct rss_group *grp,
++                                     int nmodules,
++                                     int nelems,
++                                     int dir)
++{
++    int G_sum = 0;
++    while(1) {
++        assert(grp->T_odd);
++        int sum = G_sum + grp->T_odd * grp->T_even;
++        if(val >= sum)
++            G_sum = sum;
++        else
++            break;
++        grp++;
++    }
++
++    zprintf(3, "char=%d", val);
++
++    int V_grp = val - G_sum;
++    int V_odd, V_even;
++    if(!dir) {
++        V_odd = V_grp / grp->T_even;
++        V_even = V_grp % grp->T_even;
++    }
++    else {
++        V_even = V_grp / grp->T_odd;
++        V_odd = V_grp % grp->T_odd;
++    }
++
++    zprintf(3, " G_sum=%d T_odd=%d T_even=%d n_odd=%d w_max=%d V_grp=%d\n",
++            G_sum, grp->T_odd, grp->T_even, grp->n_odd, grp->w_max, V_grp);
++
++    int odd[16];
++    getRSSWidths(V_odd, grp->n_odd, nelems, grp->w_max, !dir, odd);
++    zprintf(3, "    V_odd=%d odd=%d%d%d%d",
++            V_odd, odd[0], odd[1], odd[2], odd[3]);
++
++    int even[16];
++    getRSSWidths(V_even, nmodules - grp->n_odd, nelems, 9 - grp->w_max,
++                 dir, even);
++    zprintf(3, " V_even=%d even=%d%d%d%d",
++            V_even, even[0], even[1], even[2], even[3]);
++
++    uint64_t units = 0;
++    int i;
++    for(i = 0; i < nelems; i++)
++        units = (units << 8) | (odd[i] << 4) | even[i];
++
++    zprintf(3, " raw=%"PRIx64"\n", units);
++    return(units);
++}
++
++#define SWAP(a, b) do { \
++        uint32_t tmp = (a); \
++        (a) = (b); \
++        (b) = tmp; \
++    } while(0);
++
++static void encode_databar (char *data,
++                            int dir)
++{
++    assert(zbar_decoder_get_color(decoder) == ZBAR_SPACE);
++
++    print_sep(3);
++    zprintf(2, "DataBar: %s\n", data);
++
++    uint32_t v[4] = { 0, };
++    int i, j;
++    for(i = 0; i < 14; i++) {
++        for(j = 0; j < 4; j++)
++            v[j] *= 10;
++        assert(data[i]);
++        v[0] += data[i] - '0';
++        v[1] += v[0] / 1597;
++        v[0] %= 1597;
++        v[2] += v[1] / 2841;
++        v[1] %= 2841;
++        v[3] += v[2] / 1597;
++        v[2] %= 1597;
++        /*printf("    [%d] %c (%d,%d,%d,%d)\n",
++               i, data[i], v[0], v[1], v[2], v[3]);*/
++    }
++    zprintf(3, "chars=(%d,%d,%d,%d)\n", v[3], v[2], v[1], v[0]);
++
++    uint32_t c[4] = {
++        encode_databar_char(v[3], databar_groups_outside, 16, 4, 0),
++        encode_databar_char(v[2], databar_groups_inside, 15, 4, 1),
++        encode_databar_char(v[1], databar_groups_outside, 16, 4, 0),
++        encode_databar_char(v[0], databar_groups_inside, 15, 4, 1),
++    };
++
++    int chk = 0, w = 1;
++    for(i = 0; i < 4; i++, chk %= 79, w %= 79)
++        for(j = 0; j < 8; j++, w *= 3)
++            chk += ((c[i] >> (28 - j * 4)) & 0xf) * w;
++    zprintf(3, "chk=%d\n", chk);
++
++    if(chk >= 8) chk++;
++    if(chk >= 72) chk++;
++    int C_left = chk / 9;
++    int C_right = chk % 9;
++
++    if(dir == REV) {
++        SWAP(C_left, C_right);
++        SWAP(c[0], c[2]);
++        SWAP(c[1], c[3]);
++        SWAP(v[0], v[2]);
++        SWAP(v[1], v[3]);
++    }
++
++    zprintf(3, "    encode start guard:");
++    encode_junk(dir);
++    encode(0x1, FWD);
++
++    zprintf(3, "encode char[0]=%d", v[3]);
++    encode(c[0], REV);
++
++    zprintf(3, "encode left finder=%d", C_left);
++    encode(databar_finders[C_left], REV);
++
++    zprintf(3, "encode char[1]=%d", v[2]);
++    encode(c[1], FWD);
++
++    zprintf(3, "encode char[3]=%d", v[0]);
++    encode(c[3], REV);
++
++    zprintf(3, "encode right finder=%d", C_right);
++    encode(databar_finders[C_right], FWD);
++
++    zprintf(3, "encode char[2]=%d", v[1]);
++    encode(c[2], FWD);
++
++    zprintf(3, "    encode end guard:");
++    encode(0x1, FWD);
++    encode_junk(!dir);
++    print_sep(3);
++}
++
++
++/*------------------------------------------------------------*/
+ /* EAN/UPC encoding */
+ 
+ static const unsigned int ean_digits[10] = {
+@@ -372,7 +824,7 @@ static const unsigned char ean_parity_en
+     0x25,       /* ABBABA = 9 */
+ };
+ 
+-static void calc_ean_parity (unsigned char *data,
++static void calc_ean_parity (char *data,
+                              int n)
+ {
+     int i, chk = 0;
+@@ -387,119 +839,293 @@ static void calc_ean_parity (unsigned ch
+     data[i] = 0;
+ }
+ 
+-static void encode_ean13 (unsigned char *data)
++static void encode_ean13 (char *data)
+ {
+     int i;
+     unsigned char par = ean_parity_encode[data[0] - '0'];
++    assert(zbar_decoder_get_color(decoder) == ZBAR_SPACE);
+ 
+-    printf("------------------------------------------------------------\n"
+-           "encode EAN-13: %s (%02x)\n"
+-           "    encode start guard:",
+-           data, par);
++    print_sep(3);
++    zprintf(2, "EAN-13: %s (%02x)\n", data, par);
++    zprintf(3, "    encode start guard:");
+     encode(ean_guard[3], FWD);
+     for(i = 1; i < 7; i++, par <<= 1) {
+-        printf("    encode %x%c:", (par >> 5) & 1, data[i]);
+-        encode(ean_digits[data[i] - '0'], REV ^ ((par >> 5) & 1));
++        zprintf(3, "    encode %x%c:", (par >> 5) & 1, data[i]);
++        encode(ean_digits[data[i] - '0'], (par >> 5) & 1);
+     }
+-    printf("    encode center guard:");
++    zprintf(3, "    encode center guard:");
+     encode(ean_guard[5], FWD);
+     for(; i < 13; i++) {
+-        printf("    encode %x%c:", 0, data[i]);
++        zprintf(3, "    encode %x%c:", 0, data[i]);
+         encode(ean_digits[data[i] - '0'], FWD);
+     }
+-    printf("    encode end guard:");
++    zprintf(3, "    encode end guard:");
+     encode(ean_guard[3], REV);
+-    printf("------------------------------------------------------------\n");
++    print_sep(3);
+ }
+ 
+-static void encode_ean8 (unsigned char *data)
++static void encode_ean8 (char *data)
+ {
+     int i;
+-    printf("------------------------------------------------------------\n"
+-           "encode EAN-8: %s\n"
+-           "    encode start guard:",
+-           data);
++    assert(zbar_decoder_get_color(decoder) == ZBAR_SPACE);
++    print_sep(3);
++    zprintf(2, "EAN-8: %s\n", data);
++    zprintf(3, "    encode start guard:");
+     encode(ean_guard[3], FWD);
+     for(i = 0; i < 4; i++) {
+-        printf("    encode %c:", data[i]);
++        zprintf(3, "    encode %c:", data[i]);
+         encode(ean_digits[data[i] - '0'], FWD);
+     }
+-    printf("    encode center guard:");
++    zprintf(3, "    encode center guard:");
+     encode(ean_guard[5], FWD);
+     for(; i < 8; i++) {
+-        printf("    encode %c:", data[i]);
++        zprintf(3, "    encode %c:", data[i]);
+         encode(ean_digits[data[i] - '0'], FWD);
+     }
+-    printf("    encode end guard:");
++    zprintf(3, "    encode end guard:");
+     encode(ean_guard[3], REV);
+-    printf("------------------------------------------------------------\n");
++    print_sep(3);
+ }
+ 
+ 
+ /*------------------------------------------------------------*/
+ /* main test flow */
+ 
+-int main (int argc, char **argv)
++int test_databar_F_1 ()
+ {
+-    int i;
+-    int rnd_size = 9;           /* should be odd */
+-    srand(0xbabeface);
++    expect(ZBAR_DATABAR, "0124012345678905");
++    assert(zbar_decoder_get_color(decoder) == ZBAR_SPACE);
++    encode(0x11, 0);
++    encode(0x31111333, 0);
++    encode(0x13911, 0);
++    encode(0x31131231, 0);
++    encode(0x11214222, 0);
++    encode(0x11553, 0);
++    encode(0x21231313, 0);
++    encode(0x1, 0);
++    encode_junk(rnd_size);
++    return(0);
++}
+ 
+-    /* FIXME TBD:
+-     *   - random module width (!= 1.0)
+-     *   - simulate scan speed variance
+-     *   - simulate dark "swelling" and light "blooming"
+-     *   - inject parity errors
+-     */
+-    decoder = zbar_decoder_create();
+-    zbar_decoder_set_handler(decoder, symbol_handler);
+-    zbar_decoder_set_config(decoder, 0, ZBAR_CFG_MIN_LEN, 0);
++int test_databar_F_3 ()
++{
++    expect(ZBAR_DATABAR_EXP, "1012A");
++    assert(zbar_decoder_get_color(decoder) == ZBAR_SPACE);
++    encode(0x11, 0);
++    encode(0x11521151, 0);
++    encode(0x18411, 0);
++    encode(0x13171121, 0);
++    encode(0x11521232, 0);
++    encode(0x11481, 0);
++    encode(0x23171111, 0);
++    encode(0x1, 0);
++    encode_junk(rnd_size);
++    return(0);
++}
+ 
+-    encode_junk(rnd_size + 1);
++int test_orange ()
++{
++    char data[32] = "0100845963000052";
++    expect(ZBAR_DATABAR, data);
++    assert(zbar_decoder_get_color(decoder) == ZBAR_SPACE);
++    encode(0x1, 0);
++    encode(0x23212321, 0);   // data[0]
++    encode(0x31911, 0);      // finder[?] = 3
++    encode(0x21121215, 1);   // data[1]
++    encode(0x41111133, 0);   // data[3]
++    encode(0x23811, 1);      // finder[?] = 6
++    encode(0x11215141, 1);   // data[2]
++    encode(0x11, 0);
++    encode_junk(rnd_size);
+ 
+-    unsigned char data[32] = { 0 };
+-    for(i = 0; i < 12; i++)
+-        data[i] = (rand() % 10) + '0';
++    expect(ZBAR_DATABAR, data);
++    data[1] = '0';
++    encode_databar(data + 1, FWD);
++    encode_junk(rnd_size);
++    return(0);
++}
+ 
+-    calc_ean_parity(data, 12);
+-    encode_ean13(data);
++int test_numeric (char *data)
++{
++    char tmp[32] = "01";
++    strncpy(tmp + 2, data + 1, 13);
++    calc_ean_parity(tmp + 2, 13);
++    expect(ZBAR_DATABAR, tmp);
++
++    tmp[1] = data[0] & '1';
++    encode_databar(tmp + 1, (rand() >> 8) & 1);
+ 
+     encode_junk(rnd_size);
+ 
+-    data[i] = 0;
++    data[strlen(data) & ~1] = 0;
++    expect(ZBAR_CODE128, data);
+     encode_code128c(data);
+ 
+     encode_junk(rnd_size);
+ 
++    expect(ZBAR_I25, data);
+     encode_i25(data, FWD);
+ 
+     encode_junk(rnd_size);
+ 
++#if 0 /* FIXME encoding broken */
+     encode_i25(data, REV);
+ 
+     encode_junk(rnd_size);
++#endif
+ 
+-    calc_ean_parity(data, 7);
+-    encode_ean8(data);
++    calc_ean_parity(data + 2, 12);
++    expect(ZBAR_EAN13, data + 2);
++    encode_ean13(data + 2);
+ 
+     encode_junk(rnd_size);
+ 
++    calc_ean_parity(data + 7, 7);
++    expect(ZBAR_EAN8, data + 7);
++    encode_ean8(data + 7);
++
++    encode_junk(rnd_size);
++
++    expect(ZBAR_NONE, NULL);
++    return(0);
++}
++
++int test_alpha (char *data)
++{
++    expect(ZBAR_CODE128, data);
++    encode_code128b(data);
++
++    encode_junk(rnd_size);
++
++    expect(ZBAR_CODE93, data);
++    encode_code93(data, FWD);
++
++    encode_junk(rnd_size);
++
++    expect(ZBAR_CODE93, data);
++    encode_code93(data, REV);
++
++    encode_junk(rnd_size);
++
++    /*encode_code39("0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ-. $/+%");*/
++    convert_code39(data);
++    expect(ZBAR_CODE39, data);
++    encode_code39(data);
++
++    encode_junk(rnd_size);
++
++#if 0 /* FIXME decoder unfinished */
++    encode_pdf417(data);
++
++    encode_junk(rnd_size);
++#endif
++
++    expect(ZBAR_NONE, NULL);
++    return(0);
++}
++
++int test1 ()
++{
++    print_sep(2);
++    if(!seed)
++        seed = 0xbabeface;
++    zprintf(1, "[%d] SEED=%d\n", iter++, seed);
++    srand(seed);
++
++    int i;
++    char data[32] = { 0, };
++    for(i = 0; i < 14; i++)
++        data[i] = (rand() % 10) + '0';
++
++    test_numeric(data);
++
+     for(i = 0; i < 10; i++)
+         data[i] = (rand() % 0x5f) + 0x20;
+     data[i] = 0;
+ 
+-    encode_code128b(data);
++    test_alpha(data);
++    return(0);
++}
+ 
+-    encode_junk(rnd_size);
++/* FIXME TBD:
++ *   - random module width (!= 1.0)
++ *   - simulate scan speed variance
++ *   - simulate dark "swelling" and light "blooming"
++ *   - inject parity errors
++ */
+ 
+-    /*encode_code39("0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ-. $/+%");*/
+-    encode_code39(data);
++int main (int argc, char **argv)
++{
++    int n, i, j;
++    char *end;
+ 
+-    encode_junk(rnd_size);
++    decoder = zbar_decoder_create();
++    zbar_decoder_set_handler(decoder, symbol_handler);
+ 
+-    encode_pdf417(data);
++    encode_junk(rnd_size + 1);
+ 
+-    encode_junk(rnd_size);
++    for(i = 1; i < argc; i++) {
++        if(argv[i][0] != '-') {
++            fprintf(stderr, "ERROR: unknown argument: %s\n", argv[i]);
++            return(2);
++        }
++        for(j = 1; argv[i][j]; j++) {
++            switch(argv[i][j])
++            {
++            case 'q': verbosity = 0; break;
++            case 'v': verbosity++; break;
++            case 'r':
++                seed = time(NULL);
++                srand(seed);
++                seed = (rand() << 8) ^ rand();
++                zprintf(0, "-r SEED=%d\n", seed);
++                break;
++
++            case 's':
++                if(!argv[i][++j] && !(j = 0) && ++i >= argc) {
++                    fprintf(stderr, "ERROR: -s needs <seed> argument\n");
++                    return(2);
++                }
++                seed = strtol(argv[i] + j, &end, 0);
++                if((!isdigit(argv[i][j]) && argv[i][j] != '-') ||
++                   !seed || seed == LONG_MAX || seed == LONG_MIN) {
++                    fprintf(stderr, "ERROR: invalid <seed>: \"%s\"\n",
++                            argv[i] + j);
++                    return(2);
++                }
++                j = end - argv[i] - 1;
++                break;
++
++            case 'n':
++                if(!argv[i][++j] && !(j = 0) && ++i >= argc) {
++                    fprintf(stderr, "ERROR: -n needs <num> argument\n");
++                    return(2);
++                }
++                n = strtol(argv[i] + j, &end, 0);
++                if(!isdigit(argv[i][j]) || !n) {
++                    fprintf(stderr, "ERROR: invalid <num>: \"%s\"\n",
++                            argv[i] + j);
++                    return(2);
++                }
++                j = end - argv[i] - 1;
++
++                while(n--) {
++                    test1();
++                    seed = (rand() << 8) ^ rand();
++                }
++                break;
++            }
++        }
++    }
++
++    if(!iter) {
++        test_databar_F_1();
++        test_databar_F_3();
++        test_orange();
++        test1();
++    }
++
++    /* FIXME "Ran %d iterations in %gs\n\nOK\n" */
+ 
+     zbar_decoder_destroy(decoder);
+     return(0);
+diff --git a/test/test_images.h b/test/test_images.h
+--- a/test/test_images.h
++++ b/test/test_images.h
+@@ -1,5 +1,5 @@
+ /*------------------------------------------------------------------------
+- *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
+  *
+  *  This file is part of the ZBar Bar Code Reader.
+  *
+@@ -23,10 +23,7 @@
+ #ifndef _TEST_IMAGES_H_
+ #define _TEST_IMAGES_H_
+ 
+-/* adapted from v4l2 spec */
+-#define fourcc(a, b, c, d)                      \
+-    ((uint32_t)(a) | ((uint32_t)(b) << 8) |     \
+-     ((uint32_t)(c) << 16) | ((uint32_t)(d) << 24))
++#define fourcc zbar_fourcc
+ 
+ int test_image_check_cleanup(void);
+ int test_image_bars(zbar_image_t*);
+diff --git a/zbar/Makefile.am.inc b/zbar/Makefile.am.inc
+--- a/zbar/Makefile.am.inc
++++ b/zbar/Makefile.am.inc
+@@ -19,9 +19,15 @@ EXTRA_zbar_libzbar_la_SOURCES = zbar/svg
+ if ENABLE_EAN
+ zbar_libzbar_la_SOURCES += zbar/decoder/ean.h zbar/decoder/ean.c
+ endif
++if ENABLE_DATABAR
++zbar_libzbar_la_SOURCES += zbar/decoder/databar.h zbar/decoder/databar.c
++endif
+ if ENABLE_CODE128
+ zbar_libzbar_la_SOURCES += zbar/decoder/code128.h zbar/decoder/code128.c
+ endif
++if ENABLE_CODE93
++zbar_libzbar_la_SOURCES += zbar/decoder/code93.h zbar/decoder/code93.c
++endif
+ if ENABLE_CODE39
+ zbar_libzbar_la_SOURCES += zbar/decoder/code39.h zbar/decoder/code39.c
+ endif
+diff --git a/zbar/config.c b/zbar/config.c
+--- a/zbar/config.c
++++ b/zbar/config.c
+@@ -1,5 +1,5 @@
+ /*------------------------------------------------------------------------
+- *  Copyright 2008-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++ *  Copyright 2008-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
+  *
+  *  This file is part of the ZBar Bar Code Reader.
+  *
+@@ -24,20 +24,24 @@
+ #include <config.h>
+ #include <stdlib.h>     /* strtol */
+ #include <string.h>     /* strchr, strncmp, strlen */
+-#include <errno.h>
+-#include <assert.h>
++#ifdef HAVE_ERRNO_H
++# include <errno.h>
++#endif
+ 
+ #include <zbar.h>
+ 
+ int zbar_parse_config (const char *cfgstr,
+-                        zbar_symbol_type_t *sym,
+-                        zbar_config_t *cfg,
+-                        int *val)
++                       zbar_symbol_type_t *sym,
++                       zbar_config_t *cfg,
++                       int *val)
+ {
++    const char *dot, *eq;
++    int len;
++    char negate;
+     if(!cfgstr)
+         return(1);
+ 
+-    const char *dot = strchr(cfgstr, '.');
++    dot = strchr(cfgstr, '.');
+     if(dot) {
+         int len = dot - cfgstr;
+         if(!len || (len == 1 && !strncmp(cfgstr, "*", len)))
+@@ -46,6 +50,8 @@ int zbar_parse_config (const char *cfgst
+             return(1);
+         else if(!strncmp(cfgstr, "qrcode", len))
+             *sym = ZBAR_QRCODE;
++        else if(!strncmp(cfgstr, "db", len))
++            *sym = ZBAR_DATABAR;
+         else if(len < 3)
+             return(1);
+         else if(!strncmp(cfgstr, "upca", len))
+@@ -66,6 +72,8 @@ int zbar_parse_config (const char *cfgst
+             *sym = ZBAR_ISBN13;
+         else if(!strncmp(cfgstr, "isbn10", len))
+             *sym = ZBAR_ISBN10;
++        else if(!strncmp(cfgstr, "db-exp", len))
++            *sym = ZBAR_DATABAR_EXP;
+ #if 0
+         /* FIXME addons are configured per-main symbol type */
+         else if(!strncmp(cfgstr, "addon2", len))
+@@ -75,6 +83,8 @@ int zbar_parse_config (const char *cfgst
+ #endif
+         else if(len < 6)
+             return(1);
++        else if(!strncmp(cfgstr, "code93", len))
++            *sym = ZBAR_CODE93;
+         else if(!strncmp(cfgstr, "code39", len))
+             *sym = ZBAR_CODE39;
+         else if(!strncmp(cfgstr, "pdf417", len))
+@@ -83,6 +93,10 @@ int zbar_parse_config (const char *cfgst
+             return(1);
+         else if(!strncmp(cfgstr, "code128", len))
+             *sym = ZBAR_CODE128;
++        else if(!strncmp(cfgstr, "databar", len))
++            *sym = ZBAR_DATABAR;
++        else if(!strncmp(cfgstr, "databar-exp", len))
++            *sym = ZBAR_DATABAR_EXP;
+         else
+             return(1);
+         cfgstr = dot + 1;
+@@ -90,13 +104,13 @@ int zbar_parse_config (const char *cfgst
+     else
+         *sym = 0;
+ 
+-    int len = strlen(cfgstr);
+-    const char *eq = strchr(cfgstr, '=');
++    len = strlen(cfgstr);
++    eq = strchr(cfgstr, '=');
+     if(eq)
+         len = eq - cfgstr;
+     else
+         *val = 1;  /* handle this here so we can override later */
+-    char negate = 0;
++    negate = 0;
+ 
+     if(len > 3 && !strncmp(cfgstr, "no-", 3)) {
+         negate = 1;
+@@ -130,16 +144,22 @@ int zbar_parse_config (const char *cfgst
+         *cfg = ZBAR_CFG_ADD_CHECK;
+     else if(!strncmp(cfgstr, "emit-check", len))
+         *cfg = ZBAR_CFG_EMIT_CHECK;
++    else if(!strncmp(cfgstr, "uncertainty", len))
++        *cfg = ZBAR_CFG_UNCERTAINTY;
+     else if(!strncmp(cfgstr, "position", len))
+         *cfg = ZBAR_CFG_POSITION;
+     else 
+         return(1);
+ 
+     if(eq) {
++#ifdef HAVE_ERRNO_H
+         errno = 0;
++#endif
+         *val = strtol(eq + 1, NULL, 0);
++#ifdef HAVE_ERRNO_H
+         if(errno)
+             return(1);
++#endif
+     }
+     if(negate)
+         *val = !*val;
+diff --git a/zbar/convert.c b/zbar/convert.c
+--- a/zbar/convert.c
++++ b/zbar/convert.c
+@@ -1,5 +1,5 @@
+ /*------------------------------------------------------------------------
+- *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
+  *
+  *  This file is part of the ZBar Bar Code Reader.
+  *
+@@ -236,12 +236,13 @@ static inline void uv_round (zbar_image_
+ static inline void uv_roundup (zbar_image_t *img,
+                                const zbar_format_def_t *fmt)
+ {
++    unsigned xmask, ymask;
+     if(fmt->group == ZBAR_FMT_GRAY)
+         return;
+-    unsigned xmask = (1 << fmt->p.yuv.xsub2) - 1;
++    xmask = (1 << fmt->p.yuv.xsub2) - 1;
+     if(img->width & xmask)
+         img->width = (img->width + xmask) & ~xmask;
+-    unsigned ymask = (1 << fmt->p.yuv.ysub2) - 1;
++    ymask = (1 << fmt->p.yuv.ysub2) - 1;
+     if(img->height & ymask)
+         img->height = (img->height + ymask) & ~ymask;
+ }
+@@ -306,16 +307,18 @@ static inline void convert_y_resize (zba
+                                      const zbar_format_def_t *srcfmt,
+                                      size_t n)
+ {
++    uint8_t *psrc, *pdst;
++    unsigned width, height, xpad, y;
++
+     if(dst->width == src->width && dst->height == src->height) {
+         memcpy((void*)dst->data, src->data, n);
+         return;
+     }
+-    uint8_t *psrc = (void*)src->data;
+-    uint8_t *pdst = (void*)dst->data;
+-    unsigned width = (dst->width > src->width) ? src->width : dst->width;
+-    unsigned xpad = (dst->width > src->width) ? dst->width - src->width : 0;
+-    unsigned height = (dst->height > src->height) ? src->height : dst->height;
+-    unsigned y;
++    psrc = (void*)src->data;
++    pdst = (void*)dst->data;
++    width = (dst->width > src->width) ? src->width : dst->width;
++    xpad = (dst->width > src->width) ? dst->width - src->width : 0;
++    height = (dst->height > src->height) ? src->height : dst->height;
+     for(y = 0; y < height; y++) {
+         memcpy(pdst, psrc, width);
+         pdst += width;
+@@ -344,10 +347,10 @@ static void convert_copy (zbar_image_t *
+ {
+     if(src->width == dst->width &&
+        src->height == dst->height) {
++        zbar_image_t *s = (zbar_image_t*)src;
+         dst->data = src->data;
+         dst->datalen = src->datalen;
+         dst->cleanup = cleanup_ref;
+-        zbar_image_t *s = (zbar_image_t*)src;
+         dst->next = s;
+         _zbar_image_refcnt(s, 1);
+     }
+@@ -362,9 +365,10 @@ static void convert_uvp_append (zbar_ima
+                                 const zbar_image_t *src,
+                                 const zbar_format_def_t *srcfmt)
+ {
++    unsigned long n;
+     uv_roundup(dst, dstfmt);
+     dst->datalen = uvp_size(dst, dstfmt) * 2;
+-    unsigned long n = dst->width * dst->height;
++    n = dst->width * dst->height;
+     dst->datalen += n;
+     assert(src->datalen >= src->width * src->height);
+     zprintf(24, "dst=%dx%d (%lx) %lx src=%dx%d %lx\n",
+@@ -373,7 +377,7 @@ static void convert_uvp_append (zbar_ima
+     dst->data = malloc(dst->datalen);
+     if(!dst->data) return;
+     convert_y_resize(dst, dstfmt, src, srcfmt, n);
+-    memset((void*)dst->data + n, 0x80, dst->datalen - n);
++    memset((uint8_t*)dst->data + n, 0x80, dst->datalen - n);
+ }
+ 
+ /* interleave YUV planes into packed YUV */
+@@ -382,32 +386,35 @@ static void convert_yuv_pack (zbar_image
+                               const zbar_image_t *src,
+                               const zbar_format_def_t *srcfmt)
+ {
++    unsigned long srcm, srcn;
++    uint8_t flags, *srcy, *dstp;
++    const uint8_t *srcu, *srcv;
++    unsigned srcl, xmask, ymask, x, y;
++    uint8_t y0 = 0, y1 = 0, u = 0x80, v = 0x80;
++
+     uv_roundup(dst, dstfmt);
+     dst->datalen = dst->width * dst->height + uvp_size(dst, dstfmt) * 2;
+     dst->data = malloc(dst->datalen);
+     if(!dst->data) return;
+-    uint8_t *dstp = (void*)dst->data;
++    dstp = (void*)dst->data;
+ 
+-    unsigned long srcm = uvp_size(src, srcfmt);
+-    unsigned long srcn = src->width * src->height;
++    srcm = uvp_size(src, srcfmt);
++    srcn = src->width * src->height;
+     assert(src->datalen >= srcn + 2 * srcn);
+-    uint8_t flags = dstfmt->p.yuv.packorder ^ srcfmt->p.yuv.packorder;
+-    uint8_t *srcy = (void*)src->data;
+-    const uint8_t *srcu, *srcv;
++    flags = dstfmt->p.yuv.packorder ^ srcfmt->p.yuv.packorder;
++    srcy = (void*)src->data;
+     if(flags & 1) {
+-        srcv = src->data + srcn;
++        srcv = (uint8_t*)src->data + srcn;
+         srcu = srcv + srcm;
+     } else {
+-        srcu = src->data + srcn;
++        srcu = (uint8_t*)src->data + srcn;
+         srcv = srcu + srcm;
+     }
+     flags = dstfmt->p.yuv.packorder & 2;
+ 
+-    unsigned srcl = src->width >> srcfmt->p.yuv.xsub2;
+-    unsigned xmask = (1 << srcfmt->p.yuv.xsub2) - 1;
+-    unsigned ymask = (1 << srcfmt->p.yuv.ysub2) - 1;
+-    unsigned x, y;
+-    uint8_t y0 = 0, y1 = 0, u = 0x80, v = 0x80;
++    srcl = src->width >> srcfmt->p.yuv.xsub2;
++    xmask = (1 << srcfmt->p.yuv.xsub2) - 1;
++    ymask = (1 << srcfmt->p.yuv.ysub2) - 1;
+     for(y = 0; y < dst->height; y++) {
+         if(y >= src->height) {
+             srcy -= src->width;
+@@ -448,25 +455,29 @@ static void convert_yuv_unpack (zbar_ima
+                                 const zbar_image_t *src,
+                                 const zbar_format_def_t *srcfmt)
+ {
++    unsigned long dstn, dstm2;
++    uint8_t *dsty, flags;
++    const uint8_t *srcp;
++    unsigned srcl, x, y;
++    uint8_t y0 = 0, y1 = 0;
++
+     uv_roundup(dst, dstfmt);
+-    unsigned long dstn = dst->width * dst->height;
+-    unsigned long dstm2 = uvp_size(dst, dstfmt) * 2;
++    dstn = dst->width * dst->height;
++    dstm2 = uvp_size(dst, dstfmt) * 2;
+     dst->datalen = dstn + dstm2;
+     dst->data = malloc(dst->datalen);
+     if(!dst->data) return;
+     if(dstm2)
+-        memset((void*)dst->data + dstn, 0x80, dstm2);
+-    uint8_t *dsty = (void*)dst->data;
++        memset((uint8_t*)dst->data + dstn, 0x80, dstm2);
++    dsty = (uint8_t*)dst->data;
+ 
+-    uint8_t flags = srcfmt->p.yuv.packorder ^ dstfmt->p.yuv.packorder;
++    flags = srcfmt->p.yuv.packorder ^ dstfmt->p.yuv.packorder;
+     flags &= 2;
+-    const uint8_t *srcp = src->data;
++    srcp = src->data;
+     if(flags)
+         srcp++;
+ 
+-    unsigned srcl = src->width + (src->width >> srcfmt->p.yuv.xsub2);
+-    unsigned x, y;
+-    uint8_t y0 = 0, y1 = 0;
++    srcl = src->width + (src->width >> srcfmt->p.yuv.xsub2);
+     for(y = 0; y < dst->height; y++) {
+         if(y >= src->height)
+             srcp -= srcl;
+@@ -491,15 +502,16 @@ static void convert_uvp_resample (zbar_i
+                                   const zbar_image_t *src,
+                                   const zbar_format_def_t *srcfmt)
+ {
++    unsigned long dstn, dstm2;
+     uv_roundup(dst, dstfmt);
+-    unsigned long dstn = dst->width * dst->height;
+-    unsigned long dstm2 = uvp_size(dst, dstfmt) * 2;
++    dstn = dst->width * dst->height;
++    dstm2 = uvp_size(dst, dstfmt) * 2;
+     dst->datalen = dstn + dstm2;
+     dst->data = malloc(dst->datalen);
+     if(!dst->data) return;
+     convert_y_resize(dst, dstfmt, src, srcfmt, dstn);
+     if(dstm2)
+-        memset((void*)dst->data + dstn, 0x80, dstm2);
++        memset((uint8_t*)dst->data + dstn, 0x80, dstm2);
+ }
+ 
+ /* rearrange interleaved UV componets */
+@@ -508,19 +520,23 @@ static void convert_uv_resample (zbar_im
+                                  const zbar_image_t *src,
+                                  const zbar_format_def_t *srcfmt)
+ {
++    unsigned long dstn;
++    uint8_t *dstp, flags;
++    const uint8_t *srcp;
++    unsigned srcl, x, y;
++    uint8_t y0 = 0, y1 = 0, u = 0x80, v = 0x80;
++
+     uv_roundup(dst, dstfmt);
+-    unsigned long dstn = dst->width * dst->height;
++    dstn = dst->width * dst->height;
+     dst->datalen = dstn + uvp_size(dst, dstfmt) * 2;
+     dst->data = malloc(dst->datalen);
+     if(!dst->data) return;
+-    uint8_t *dstp = (void*)dst->data;
++    dstp = (void*)dst->data;
+ 
+-    uint8_t flags = (srcfmt->p.yuv.packorder ^ dstfmt->p.yuv.packorder) & 1;
+-    const uint8_t *srcp = src->data;
++    flags = (srcfmt->p.yuv.packorder ^ dstfmt->p.yuv.packorder) & 1;
++    srcp = src->data;
+ 
+-    unsigned srcl = src->width + (src->width >> srcfmt->p.yuv.xsub2);
+-    unsigned x, y;
+-    uint8_t y0 = 0, y1 = 0, u = 0x80, v = 0x80;
++    srcl = src->width + (src->width >> srcfmt->p.yuv.xsub2);
+     for(y = 0; y < dst->height; y++) {
+         if(y >= src->height)
+             srcp -= srcl;
+@@ -560,25 +576,29 @@ static void convert_yuvp_to_rgb (zbar_im
+                                  const zbar_image_t *src,
+                                  const zbar_format_def_t *srcfmt)
+ {
++    uint8_t *dstp, *srcy;
++    int drbits, drbit0, dgbits, dgbit0, dbbits, dbbit0;
++    unsigned long srcm, srcn;
++    unsigned x, y;
++    uint32_t p = 0;
++
+     dst->datalen = dst->width * dst->height * dstfmt->p.rgb.bpp;
+     dst->data = malloc(dst->datalen);
+     if(!dst->data) return;
+-    uint8_t *dstp = (void*)dst->data;
++    dstp = (void*)dst->data;
+ 
+-    int drbits = RGB_SIZE(dstfmt->p.rgb.red);
+-    int drbit0 = RGB_OFFSET(dstfmt->p.rgb.red);
+-    int dgbits = RGB_SIZE(dstfmt->p.rgb.green);
+-    int dgbit0 = RGB_OFFSET(dstfmt->p.rgb.green);
+-    int dbbits = RGB_SIZE(dstfmt->p.rgb.blue);
+-    int dbbit0 = RGB_OFFSET(dstfmt->p.rgb.blue);
++    drbits = RGB_SIZE(dstfmt->p.rgb.red);
++    drbit0 = RGB_OFFSET(dstfmt->p.rgb.red);
++    dgbits = RGB_SIZE(dstfmt->p.rgb.green);
++    dgbit0 = RGB_OFFSET(dstfmt->p.rgb.green);
++    dbbits = RGB_SIZE(dstfmt->p.rgb.blue);
++    dbbit0 = RGB_OFFSET(dstfmt->p.rgb.blue);
+ 
+-    unsigned long srcm = uvp_size(src, srcfmt);
+-    unsigned long srcn = src->width * src->height;
++    srcm = uvp_size(src, srcfmt);
++    srcn = src->width * src->height;
+     assert(src->datalen >= srcn + 2 * srcm);
+-    uint8_t *srcy = (void*)src->data;
++    srcy = (void*)src->data;
+ 
+-    unsigned x, y;
+-    uint32_t p = 0;
+     for(y = 0; y < dst->height; y++) {
+         if(y >= src->height)
+             srcy -= src->width;
+@@ -606,29 +626,34 @@ static void convert_rgb_to_yuvp (zbar_im
+                                  const zbar_image_t *src,
+                                  const zbar_format_def_t *srcfmt)
+ {
++    unsigned long dstn, dstm2;
++    uint8_t *dsty;
++    const uint8_t *srcp;
++    int rbits, rbit0, gbits, gbit0, bbits, bbit0;
++    unsigned srcl, x, y;
++    uint16_t y0 = 0;
++
+     uv_roundup(dst, dstfmt);
+-    unsigned long dstn = dst->width * dst->height;
+-    unsigned long dstm2 = uvp_size(dst, dstfmt) * 2;
++    dstn = dst->width * dst->height;
++    dstm2 = uvp_size(dst, dstfmt) * 2;
+     dst->datalen = dstn + dstm2;
+     dst->data = malloc(dst->datalen);
+     if(!dst->data) return;
+     if(dstm2)
+-        memset((void*)dst->data + dstn, 0x80, dstm2);
+-    uint8_t *dsty = (void*)dst->data;
++        memset((uint8_t*)dst->data + dstn, 0x80, dstm2);
++    dsty = (void*)dst->data;
+ 
+     assert(src->datalen >= (src->width * src->height * srcfmt->p.rgb.bpp));
+-    const uint8_t *srcp = src->data;
++    srcp = src->data;
+ 
+-    int rbits = RGB_SIZE(srcfmt->p.rgb.red);
+-    int rbit0 = RGB_OFFSET(srcfmt->p.rgb.red);
+-    int gbits = RGB_SIZE(srcfmt->p.rgb.green);
+-    int gbit0 = RGB_OFFSET(srcfmt->p.rgb.green);
+-    int bbits = RGB_SIZE(srcfmt->p.rgb.blue);
+-    int bbit0 = RGB_OFFSET(srcfmt->p.rgb.blue);
++    rbits = RGB_SIZE(srcfmt->p.rgb.red);
++    rbit0 = RGB_OFFSET(srcfmt->p.rgb.red);
++    gbits = RGB_SIZE(srcfmt->p.rgb.green);
++    gbit0 = RGB_OFFSET(srcfmt->p.rgb.green);
++    bbits = RGB_SIZE(srcfmt->p.rgb.blue);
++    bbit0 = RGB_OFFSET(srcfmt->p.rgb.blue);
+ 
+-    unsigned srcl = src->width * srcfmt->p.rgb.bpp;
+-    unsigned x, y;
+-    uint16_t y0 = 0;
++    srcl = src->width * srcfmt->p.rgb.bpp;
+     for(y = 0; y < dst->height; y++) {
+         if(y >= src->height)
+             srcp -= srcl;
+@@ -659,29 +684,33 @@ static void convert_yuv_to_rgb (zbar_ima
+                                 const zbar_image_t *src,
+                                 const zbar_format_def_t *srcfmt)
+ {
++    uint8_t *dstp;
+     unsigned long dstn = dst->width * dst->height;
++    int drbits, drbit0, dgbits, dgbit0, dbbits, dbbit0;
++    const uint8_t *srcp;
++    unsigned srcl, x, y;
++    uint32_t p = 0;
++
+     dst->datalen = dstn * dstfmt->p.rgb.bpp;
+     dst->data = malloc(dst->datalen);
+     if(!dst->data) return;
+-    uint8_t *dstp = (void*)dst->data;
++    dstp = (void*)dst->data;
+ 
+-    int drbits = RGB_SIZE(dstfmt->p.rgb.red);
+-    int drbit0 = RGB_OFFSET(dstfmt->p.rgb.red);
+-    int dgbits = RGB_SIZE(dstfmt->p.rgb.green);
+-    int dgbit0 = RGB_OFFSET(dstfmt->p.rgb.green);
+-    int dbbits = RGB_SIZE(dstfmt->p.rgb.blue);
+-    int dbbit0 = RGB_OFFSET(dstfmt->p.rgb.blue);
++    drbits = RGB_SIZE(dstfmt->p.rgb.red);
++    drbit0 = RGB_OFFSET(dstfmt->p.rgb.red);
++    dgbits = RGB_SIZE(dstfmt->p.rgb.green);
++    dgbit0 = RGB_OFFSET(dstfmt->p.rgb.green);
++    dbbits = RGB_SIZE(dstfmt->p.rgb.blue);
++    dbbit0 = RGB_OFFSET(dstfmt->p.rgb.blue);
+ 
+     assert(src->datalen >= (src->width * src->height +
+                             uvp_size(src, srcfmt) * 2));
+-    const uint8_t *srcp = src->data;
++    srcp = src->data;
+     if(srcfmt->p.yuv.packorder & 2)
+         srcp++;
+ 
+     assert(srcfmt->p.yuv.xsub2 == 1);
+-    unsigned srcl = src->width + (src->width >> 1);
+-    unsigned x, y;
+-    uint32_t p = 0;
++    srcl = src->width + (src->width >> 1);
+     for(y = 0; y < dst->height; y++) {
+         if(y >= src->height)
+             srcp -= srcl;
+@@ -717,26 +746,30 @@ static void convert_rgb_to_yuv (zbar_ima
+                                 const zbar_image_t *src,
+                                 const zbar_format_def_t *srcfmt)
+ {
++    uint8_t *dstp, flags;
++    const uint8_t *srcp;
++    int rbits, rbit0, gbits, gbit0, bbits, bbit0;
++    unsigned srcl, x, y;
++    uint16_t y0 = 0;
++
+     uv_roundup(dst, dstfmt);
+     dst->datalen = dst->width * dst->height + uvp_size(dst, dstfmt) * 2;
+     dst->data = malloc(dst->datalen);
+     if(!dst->data) return;
+-    uint8_t *dstp = (void*)dst->data;
+-    uint8_t flags = dstfmt->p.yuv.packorder & 2;
++    dstp = (void*)dst->data;
++    flags = dstfmt->p.yuv.packorder & 2;
+ 
+     assert(src->datalen >= (src->width * src->height * srcfmt->p.rgb.bpp));
+-    const uint8_t *srcp = src->data;
++    srcp = src->data;
+ 
+-    int rbits = RGB_SIZE(srcfmt->p.rgb.red);
+-    int rbit0 = RGB_OFFSET(srcfmt->p.rgb.red);
+-    int gbits = RGB_SIZE(srcfmt->p.rgb.green);
+-    int gbit0 = RGB_OFFSET(srcfmt->p.rgb.green);
+-    int bbits = RGB_SIZE(srcfmt->p.rgb.blue);
+-    int bbit0 = RGB_OFFSET(srcfmt->p.rgb.blue);
++    rbits = RGB_SIZE(srcfmt->p.rgb.red);
++    rbit0 = RGB_OFFSET(srcfmt->p.rgb.red);
++    gbits = RGB_SIZE(srcfmt->p.rgb.green);
++    gbit0 = RGB_OFFSET(srcfmt->p.rgb.green);
++    bbits = RGB_SIZE(srcfmt->p.rgb.blue);
++    bbit0 = RGB_OFFSET(srcfmt->p.rgb.blue);
+ 
+-    unsigned srcl = src->width * srcfmt->p.rgb.bpp;
+-    unsigned x, y;
+-    uint16_t y0 = 0;
++    srcl = src->width * srcfmt->p.rgb.bpp;
+     for(y = 0; y < dst->height; y++) {
+         if(y >= src->height)
+             srcp -= srcl;
+@@ -773,31 +806,36 @@ static void convert_rgb_resample (zbar_i
+                                   const zbar_format_def_t *srcfmt)
+ {
+     unsigned long dstn = dst->width * dst->height;
++    uint8_t *dstp;
++    int drbits, drbit0, dgbits, dgbit0, dbbits, dbbit0;
++    int srbits, srbit0, sgbits, sgbit0, sbbits, sbbit0;
++    const uint8_t *srcp;
++    unsigned srcl, x, y;
++    uint32_t p = 0;
++
+     dst->datalen = dstn * dstfmt->p.rgb.bpp;
+     dst->data = malloc(dst->datalen);
+     if(!dst->data) return;
+-    uint8_t *dstp = (void*)dst->data;
++    dstp = (void*)dst->data;
+ 
+-    int drbits = RGB_SIZE(dstfmt->p.rgb.red);
+-    int drbit0 = RGB_OFFSET(dstfmt->p.rgb.red);
+-    int dgbits = RGB_SIZE(dstfmt->p.rgb.green);
+-    int dgbit0 = RGB_OFFSET(dstfmt->p.rgb.green);
+-    int dbbits = RGB_SIZE(dstfmt->p.rgb.blue);
+-    int dbbit0 = RGB_OFFSET(dstfmt->p.rgb.blue);
++    drbits = RGB_SIZE(dstfmt->p.rgb.red);
++    drbit0 = RGB_OFFSET(dstfmt->p.rgb.red);
++    dgbits = RGB_SIZE(dstfmt->p.rgb.green);
++    dgbit0 = RGB_OFFSET(dstfmt->p.rgb.green);
++    dbbits = RGB_SIZE(dstfmt->p.rgb.blue);
++    dbbit0 = RGB_OFFSET(dstfmt->p.rgb.blue);
+ 
+     assert(src->datalen >= (src->width * src->height * srcfmt->p.rgb.bpp));
+-    const uint8_t *srcp = src->data;
++    srcp = src->data;
+ 
+-    int srbits = RGB_SIZE(srcfmt->p.rgb.red);
+-    int srbit0 = RGB_OFFSET(srcfmt->p.rgb.red);
+-    int sgbits = RGB_SIZE(srcfmt->p.rgb.green);
+-    int sgbit0 = RGB_OFFSET(srcfmt->p.rgb.green);
+-    int sbbits = RGB_SIZE(srcfmt->p.rgb.blue);
+-    int sbbit0 = RGB_OFFSET(srcfmt->p.rgb.blue);
++    srbits = RGB_SIZE(srcfmt->p.rgb.red);
++    srbit0 = RGB_OFFSET(srcfmt->p.rgb.red);
++    sgbits = RGB_SIZE(srcfmt->p.rgb.green);
++    sgbit0 = RGB_OFFSET(srcfmt->p.rgb.green);
++    sbbits = RGB_SIZE(srcfmt->p.rgb.blue);
++    sbbit0 = RGB_OFFSET(srcfmt->p.rgb.blue);
+ 
+-    unsigned srcl = src->width * srcfmt->p.rgb.bpp;
+-    unsigned x, y;
+-    uint32_t p = 0;
++    srcl = src->width * srcfmt->p.rgb.bpp;
+     for(y = 0; y < dst->height; y++) {
+         if(y >= src->height)
+             y -= srcl;
+@@ -928,14 +966,12 @@ static void convert_jpeg (zbar_image_t *
+     if(!src->src) {
+         tmp = zbar_image_create();
+         tmp->format = fourcc('Y','8','0','0');
+-        tmp->width = dst->width;
+-        tmp->height = dst->height;
++        _zbar_image_copy_size(tmp, dst);
+     }
+     else {
+         tmp = src->src->jpeg_img;
+         assert(tmp);
+-        dst->width = tmp->width;
+-        dst->height = tmp->height;
++        _zbar_image_copy_size(dst, tmp);
+     }
+ 
+     const zbar_format_def_t *tmpfmt = _zbar_format_lookup(tmp->format);
+@@ -945,8 +981,7 @@ static void convert_jpeg (zbar_image_t *
+     _zbar_convert_jpeg_to_y(tmp, tmpfmt, src, srcfmt);
+ 
+     /* now convert to dst */
+-    dst->width = tmp->width;
+-    dst->height = tmp->height;
++    _zbar_image_copy_size(dst, tmp);
+ 
+     conversion_handler_t *func =
+         conversions[tmpfmt->group][dstfmt->group].func;
+@@ -963,10 +998,14 @@ zbar_image_t *zbar_image_convert_resize 
+                                          unsigned width,
+                                          unsigned height)
+ {
++    const zbar_format_def_t *srcfmt, *dstfmt;
++    conversion_handler_t *func;
+     zbar_image_t *dst = zbar_image_create();
+     dst->format = fmt;
+     dst->width = width;
+     dst->height = height;
++    zbar_image_set_crop(dst, src->crop_x, src->crop_y,
++                        src->crop_w, src->crop_h);
+     if(src->format == fmt &&
+        src->width == width &&
+        src->height == height) {
+@@ -974,8 +1013,8 @@ zbar_image_t *zbar_image_convert_resize 
+         return(dst);
+     }
+ 
+-    const zbar_format_def_t *srcfmt = _zbar_format_lookup(src->format);
+-    const zbar_format_def_t *dstfmt = _zbar_format_lookup(dst->format);
++    srcfmt = _zbar_format_lookup(src->format);
++    dstfmt = _zbar_format_lookup(dst->format);
+     if(!srcfmt || !dstfmt)
+         /* FIXME free dst */
+         return(NULL);
+@@ -988,8 +1027,7 @@ zbar_image_t *zbar_image_convert_resize 
+         return(dst);
+     }
+ 
+-    conversion_handler_t *func =
+-        conversions[srcfmt->group][dstfmt->group].func;
++    func = conversions[srcfmt->group][dstfmt->group].func;
+ 
+     dst->cleanup = zbar_image_free_data;
+     func(dst, dstfmt, src, srcfmt);
+@@ -1021,6 +1059,9 @@ int _zbar_best_format (uint32_t src,
+                        uint32_t *dst,
+                        const uint32_t *dsts)
+ {
++    const zbar_format_def_t *srcfmt;
++    unsigned min_cost = -1;
++
+     if(dst)
+         *dst = 0;
+     if(!dsts)
+@@ -1031,17 +1072,16 @@ int _zbar_best_format (uint32_t src,
+             *dst = src;
+         return(0);
+     }
+-    const zbar_format_def_t *srcfmt = _zbar_format_lookup(src);
++    srcfmt = _zbar_format_lookup(src);
+     if(!srcfmt)
+         return(-1);
+ 
+     zprintf(8, "from %.4s(%08" PRIx32 ") to", (char*)&src, src);
+-    unsigned min_cost = -1;
+     for(; *dsts; dsts++) {
+         const zbar_format_def_t *dstfmt = _zbar_format_lookup(*dsts);
++        int cost;
+         if(!dstfmt)
+             continue;
+-        int cost;
+         if(srcfmt->group == dstfmt->group &&
+            srcfmt->p.cmp == dstfmt->p.cmp)
+             cost = 0;
+@@ -1065,13 +1105,20 @@ int _zbar_best_format (uint32_t src,
+ int zbar_negotiate_format (zbar_video_t *vdo,
+                            zbar_window_t *win)
+ {
++    static const uint32_t y800[2] = { fourcc('Y','8','0','0'), 0 };
++    errinfo_t *errdst;
++    const uint32_t *srcs, *dsts;
++    unsigned min_cost = -1;
++    uint32_t min_fmt = 0;
++    const uint32_t *fmt;
++
+     if(!vdo && !win)
+         return(0);
+ 
+     if(win)
+         (void)window_lock(win);
+ 
+-    errinfo_t *errdst = (vdo) ? &vdo->err : &win->err;
++    errdst = (vdo) ? &vdo->err : &win->err;
+     if(verify_format_sort()) {
+         if(win)
+             (void)window_unlock(win);
+@@ -1086,19 +1133,16 @@ int zbar_negotiate_format (zbar_video_t 
+                            "no input or output formats available"));
+     }
+ 
+-    static const uint32_t y800[2] = { fourcc('Y','8','0','0'), 0 };
+-    const uint32_t *srcs = (vdo) ? vdo->formats : y800;
+-    const uint32_t *dsts = (win) ? win->formats : y800;
++    srcs = (vdo) ? vdo->formats : y800;
++    dsts = (win) ? win->formats : y800;
+ 
+-    unsigned min_cost = -1;
+-    uint32_t min_fmt = 0;
+-    const uint32_t *fmt;
+     for(fmt = _zbar_formats; *fmt; fmt++) {
+         /* only consider formats supported by video device */
++        uint32_t win_fmt = 0;
++        int cost;
+         if(!has_format(*fmt, srcs))
+             continue;
+-        uint32_t win_fmt = 0;
+-        int cost = _zbar_best_format(*fmt, &win_fmt, dsts);
++        cost = _zbar_best_format(*fmt, &win_fmt, dsts);
+         if(cost < 0) {
+             zprintf(4, "%.4s(%08" PRIx32 ") -> ? (unsupported)\n",
+                     (char*)fmt, *fmt);
+diff --git a/zbar/debug.h b/zbar/debug.h
+--- a/zbar/debug.h
++++ b/zbar/debug.h
+@@ -27,10 +27,10 @@
+ 
+ # ifdef __GNUC__
+     /* older versions of gcc (< 2.95) require a named varargs parameter */
+-#  define dprintf(args...)
++#  define dprintf(args...) while(0)
+ # else
+     /* unfortunately named vararg parameter is a gcc-specific extension */
+-#  define dprintf(...)
++#  define dprintf(...) while(0)
+ # endif
+ 
+ #else
+@@ -38,13 +38,15 @@
+ # include <stdio.h>
+ 
+ # ifdef __GNUC__
+-#  define dprintf(level, args...) \
+-    if((level) <= DEBUG_LEVEL)    \
+-        fprintf(stderr, args)
++#  define dprintf(level, args...) do {  \
++        if((level) <= DEBUG_LEVEL)      \
++            fprintf(stderr, args);      \
++    } while(0)
+ # else
+-#  define dprintf(level, ...)     \
+-    if((level) <= DEBUG_LEVEL)    \
+-        fprintf(stderr, __VA_ARGS__)
++#  define dprintf(level, ...) do {          \
++        if((level) <= DEBUG_LEVEL)          \
++            fprintf(stderr, __VA_ARGS__);   \
++    } while(0)
+ # endif
+ 
+ #endif /* DEBUG_LEVEL */
+diff --git a/zbar/decoder.c b/zbar/decoder.c
+--- a/zbar/decoder.c
++++ b/zbar/decoder.c
+@@ -1,5 +1,5 @@
+ /*------------------------------------------------------------------------
+- *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
+  *
+  *  This file is part of the ZBar Bar Code Reader.
+  *
+@@ -27,15 +27,15 @@
+ #include <string.h>     /* memset, strlen */
+ 
+ #include <zbar.h>
+-#include "decoder.h"
+ 
+-#if defined(DEBUG_DECODER) || defined(DEBUG_EAN) ||             \
+-    defined(DEBUG_CODE39) || defined(DEBUG_I25) ||              \
++#if defined(DEBUG_DECODER) || defined(DEBUG_EAN) || defined(DEBUG_CODE93) || \
++    defined(DEBUG_CODE39) || defined(DEBUG_I25) || defined(DEBUG_DATABAR) || \
+     defined(DEBUG_CODE128) || defined(DEBUG_QR_FINDER) ||       \
+     (defined(DEBUG_PDF417) && (DEBUG_PDF417 >= 4))
+ # define DEBUG_LEVEL 1
+ #endif
+ #include "debug.h"
++#include "decoder.h"
+ 
+ zbar_decoder_t *zbar_decoder_create ()
+ {
+@@ -59,10 +59,21 @@ zbar_decoder_t *zbar_decoder_create ()
+     dcode->i25.config = 1 << ZBAR_CFG_ENABLE;
+     CFG(dcode->i25, ZBAR_CFG_MIN_LEN) = 6;
+ #endif
++#ifdef ENABLE_DATABAR
++    dcode->databar.config = ((1 << ZBAR_CFG_ENABLE) |
++                             (1 << ZBAR_CFG_EMIT_CHECK));
++    dcode->databar.config_exp = ((1 << ZBAR_CFG_ENABLE) |
++                                 (1 << ZBAR_CFG_EMIT_CHECK));
++    dcode->databar.csegs = 4;
++    dcode->databar.segs = calloc(4, sizeof(*dcode->databar.segs));
++#endif
+ #ifdef ENABLE_CODE39
+     dcode->code39.config = 1 << ZBAR_CFG_ENABLE;
+     CFG(dcode->code39, ZBAR_CFG_MIN_LEN) = 1;
+ #endif
++#ifdef ENABLE_CODE93
++    dcode->code93.config = 1 << ZBAR_CFG_ENABLE;
++#endif
+ #ifdef ENABLE_CODE128
+     dcode->code128.config = 1 << ZBAR_CFG_ENABLE;
+ #endif
+@@ -79,6 +90,10 @@ zbar_decoder_t *zbar_decoder_create ()
+ 
+ void zbar_decoder_destroy (zbar_decoder_t *dcode)
+ {
++#ifdef ENABLE_DATABAR
++    if(dcode->databar.segs)
++        free(dcode->databar.segs);
++#endif
+     if(dcode->buf)
+         free(dcode->buf);
+     free(dcode);
+@@ -93,9 +108,15 @@ void zbar_decoder_reset (zbar_decoder_t 
+ #ifdef ENABLE_I25
+     i25_reset(&dcode->i25);
+ #endif
++#ifdef ENABLE_DATABAR
++    databar_reset(&dcode->databar);
++#endif
+ #ifdef ENABLE_CODE39
+     code39_reset(&dcode->code39);
+ #endif
++#ifdef ENABLE_CODE93
++    code93_reset(&dcode->code93);
++#endif
+ #ifdef ENABLE_CODE128
+     code128_reset(&dcode->code128);
+ #endif
+@@ -113,15 +134,22 @@ void zbar_decoder_new_scan (zbar_decoder
+     memset(dcode->w, 0, sizeof(dcode->w));
+     dcode->lock = 0;
+     dcode->idx = 0;
++    dcode->s6 = 0;
+ #ifdef ENABLE_EAN
+     ean_new_scan(&dcode->ean);
+ #endif
+ #ifdef ENABLE_I25
+     i25_reset(&dcode->i25);
+ #endif
++#ifdef ENABLE_DATABAR
++    databar_new_scan(&dcode->databar);
++#endif
+ #ifdef ENABLE_CODE39
+     code39_reset(&dcode->code39);
+ #endif
++#ifdef ENABLE_CODE93
++    code93_reset(&dcode->code93);
++#endif
+ #ifdef ENABLE_CODE128
+     code128_reset(&dcode->code128);
+ #endif
+@@ -149,9 +177,14 @@ unsigned int zbar_decoder_get_data_lengt
+     return(dcode->buflen);
+ }
+ 
++int zbar_decoder_get_direction (const zbar_decoder_t *dcode)
++{
++    return(dcode->direction);
++}
++
+ zbar_decoder_handler_t *
+ zbar_decoder_set_handler (zbar_decoder_t *dcode,
+-                          zbar_decoder_handler_t handler)
++                          zbar_decoder_handler_t *handler)
+ {
+     zbar_decoder_handler_t *result = dcode->handler;
+     dcode->handler = handler;
+@@ -174,62 +207,82 @@ zbar_symbol_type_t zbar_decoder_get_type
+     return(dcode->type);
+ }
+ 
++unsigned int zbar_decoder_get_modifiers (const zbar_decoder_t *dcode)
++{
++    return(dcode->modifiers);
++}
++
+ zbar_symbol_type_t zbar_decode_width (zbar_decoder_t *dcode,
+                                       unsigned w)
+ {
++    zbar_symbol_type_t tmp, sym = ZBAR_NONE;
++
+     dcode->w[dcode->idx & (DECODE_WINDOW - 1)] = w;
+     dprintf(1, "    decode[%x]: w=%d (%g)\n", dcode->idx, w, (w / 32.));
+ 
++    /* update shared character width */
++    dcode->s6 -= get_width(dcode, 7);
++    dcode->s6 += get_width(dcode, 1);
++
+     /* each decoder processes width stream in parallel */
+-    zbar_symbol_type_t sym = dcode->type = ZBAR_NONE;
+-
+ #ifdef ENABLE_EAN
+     if((dcode->ean.enable) &&
+-       (sym = _zbar_decode_ean(dcode)))
+-        dcode->type = sym;
++       (tmp = _zbar_decode_ean(dcode)))
++        sym = tmp;
++#endif
++#ifdef ENABLE_QRCODE
++    if(TEST_CFG(dcode->qrf.config, ZBAR_CFG_ENABLE) &&
++       (tmp = _zbar_find_qr(dcode)) > ZBAR_PARTIAL)
++        sym = tmp;
+ #endif
+ #ifdef ENABLE_CODE39
+     if(TEST_CFG(dcode->code39.config, ZBAR_CFG_ENABLE) &&
+-       (sym = _zbar_decode_code39(dcode)) > ZBAR_PARTIAL)
+-        dcode->type = sym;
++       (tmp = _zbar_decode_code39(dcode)) > ZBAR_PARTIAL)
++        sym = tmp;
++#endif
++#ifdef ENABLE_CODE93
++    if(TEST_CFG(dcode->code93.config, ZBAR_CFG_ENABLE) &&
++       (tmp = _zbar_decode_code93(dcode)) > ZBAR_PARTIAL)
++        sym = tmp;
+ #endif
+ #ifdef ENABLE_CODE128
+     if(TEST_CFG(dcode->code128.config, ZBAR_CFG_ENABLE) &&
+-       (sym = _zbar_decode_code128(dcode)) > ZBAR_PARTIAL)
+-        dcode->type = sym;
++       (tmp = _zbar_decode_code128(dcode)) > ZBAR_PARTIAL)
++        sym = tmp;
++#endif
++#ifdef ENABLE_DATABAR
++    if(TEST_CFG(dcode->databar.config | dcode->databar.config_exp,
++                ZBAR_CFG_ENABLE) &&
++       (tmp = _zbar_decode_databar(dcode)) > ZBAR_PARTIAL)
++        sym = tmp;
+ #endif
+ #ifdef ENABLE_I25
+     if(TEST_CFG(dcode->i25.config, ZBAR_CFG_ENABLE) &&
+-       (sym = _zbar_decode_i25(dcode)) > ZBAR_PARTIAL)
+-        dcode->type = sym;
++       (tmp = _zbar_decode_i25(dcode)) > ZBAR_PARTIAL)
++        sym = tmp;
+ #endif
+ #ifdef ENABLE_PDF417
+     if(TEST_CFG(dcode->pdf417.config, ZBAR_CFG_ENABLE) &&
+-       (sym = _zbar_decode_pdf417(dcode)) > ZBAR_PARTIAL)
+-        dcode->type = sym;
+-#endif
+-#ifdef ENABLE_QRCODE
+-    if(TEST_CFG(dcode->qrf.config, ZBAR_CFG_ENABLE) &&
+-       (sym = _zbar_find_qr(dcode)) > ZBAR_PARTIAL)
+-        dcode->type = sym;
++       (tmp = _zbar_decode_pdf417(dcode)) > ZBAR_PARTIAL)
++        sym = tmp;
+ #endif
+ 
+     dcode->idx++;
+-    if(dcode->type) {
++    dcode->type = sym;
++    if(sym) {
++        if(dcode->lock && sym > ZBAR_PARTIAL && sym != ZBAR_QRCODE)
++            release_lock(dcode, sym);
+         if(dcode->handler)
+             dcode->handler(dcode);
+-        if(dcode->lock && dcode->type > ZBAR_PARTIAL)
+-            dcode->lock = 0;
+     }
+-    return(dcode->type);
++    return(sym);
+ }
+ 
+-static inline int decoder_set_config_bool (zbar_decoder_t *dcode,
+-                                           zbar_symbol_type_t sym,
+-                                           zbar_config_t cfg,
+-                                           int val)
++static inline const unsigned int*
++decoder_get_configp (const zbar_decoder_t *dcode,
++                     zbar_symbol_type_t sym)
+ {
+-    unsigned *config = NULL;
++    const unsigned int *config;
+     switch(sym) {
+ #ifdef ENABLE_EAN
+     case ZBAR_EAN13:
+@@ -263,12 +316,27 @@ static inline int decoder_set_config_boo
+         break;
+ #endif
+ 
++#ifdef ENABLE_DATABAR
++    case ZBAR_DATABAR:
++        config = &dcode->databar.config;
++        break;
++    case ZBAR_DATABAR_EXP:
++        config = &dcode->databar.config_exp;
++        break;
++#endif
++
+ #ifdef ENABLE_CODE39
+     case ZBAR_CODE39:
+         config = &dcode->code39.config;
+         break;
+ #endif
+ 
++#ifdef ENABLE_CODE93
++    case ZBAR_CODE93:
++        config = &dcode->code93.config;
++        break;
++#endif
++
+ #ifdef ENABLE_CODE128
+     case ZBAR_CODE128:
+         config = &dcode->code128.config;
+@@ -290,8 +358,26 @@ static inline int decoder_set_config_boo
+     /* FIXME handle addons */
+ 
+     default:
+-        return(1);
++        config = NULL;
+     }
++    return(config);
++}
++
++unsigned int zbar_decoder_get_configs (const zbar_decoder_t *dcode,
++                                       zbar_symbol_type_t sym)
++{
++    const unsigned *config = decoder_get_configp(dcode, sym);
++    if(!config)
++        return(0);
++    return(*config);
++}
++
++static inline int decoder_set_config_bool (zbar_decoder_t *dcode,
++                                           zbar_symbol_type_t sym,
++                                           zbar_config_t cfg,
++                                           int val)
++{
++    unsigned *config = (void*)decoder_get_configp(dcode, sym);
+     if(!config || cfg >= ZBAR_CFG_NUM)
+         return(1);
+ 
+@@ -332,6 +418,11 @@ static inline int decoder_set_config_int
+         CFG(dcode->code39, cfg) = val;
+         break;
+ #endif
++#ifdef ENABLE_CODE93
++    case ZBAR_CODE93:
++        CFG(dcode->code93, cfg) = val;
++        break;
++#endif
+ #ifdef ENABLE_CODE128
+     case ZBAR_CODE128:
+         CFG(dcode->code128, cfg) = val;
+@@ -362,7 +453,10 @@ int zbar_decoder_set_config (zbar_decode
+         zbar_decoder_set_config(dcode, ZBAR_ISBN10, cfg, val);
+         zbar_decoder_set_config(dcode, ZBAR_ISBN13, cfg, val);
+         zbar_decoder_set_config(dcode, ZBAR_I25, cfg, val);
++        zbar_decoder_set_config(dcode, ZBAR_DATABAR, cfg, val);
++        zbar_decoder_set_config(dcode, ZBAR_DATABAR_EXP, cfg, val);
+         zbar_decoder_set_config(dcode, ZBAR_CODE39, cfg, val);
++        zbar_decoder_set_config(dcode, ZBAR_CODE93, cfg, val);
+         zbar_decoder_set_config(dcode, ZBAR_CODE128, cfg, val);
+         zbar_decoder_set_config(dcode, ZBAR_PDF417, cfg, val);
+         zbar_decoder_set_config(dcode, ZBAR_QRCODE, cfg, val);
+@@ -385,16 +479,18 @@ const char *_zbar_decoder_buf_dump (unsi
+                                     unsigned int buflen)
+ {
+     int dumplen = (buflen * 3) + 12;
++    char *p;
++    int i;
++
+     if(!decoder_dump || dumplen > decoder_dumplen) {
+         if(decoder_dump)
+             free(decoder_dump);
+         decoder_dump = malloc(dumplen);
+         decoder_dumplen = dumplen;
+     }
+-    char *p = decoder_dump +
++    p = decoder_dump +
+         snprintf(decoder_dump, 12, "buf[%04x]=",
+                  (buflen > 0xffff) ? 0xffff : buflen);
+-    int i;
+     for(i = 0; i < buflen; i++)
+         p += snprintf(p, 4, "%s%02x", (i) ? " " : "",  buf[i]);
+     return(decoder_dump);
+diff --git a/zbar/decoder.h b/zbar/decoder.h
+--- a/zbar/decoder.h
++++ b/zbar/decoder.h
+@@ -1,5 +1,5 @@
+ /*------------------------------------------------------------------------
+- *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
+  *
+  *  This file is part of the ZBar Bar Code Reader.
+  *
+@@ -36,9 +36,15 @@
+ #ifdef ENABLE_I25
+ # include "decoder/i25.h"
+ #endif
++#ifdef ENABLE_DATABAR
++# include "decoder/databar.h"
++#endif
+ #ifdef ENABLE_CODE39
+ # include "decoder/code39.h"
+ #endif
++#ifdef ENABLE_CODE93
++# include "decoder/code93.h"
++#endif
+ #ifdef ENABLE_CODE128
+ # include "decoder/code128.h"
+ #endif
+@@ -73,6 +79,7 @@
+ 
+ #define CFG(dcode, cfg) ((dcode).configs[(cfg) - ZBAR_CFG_MIN_LEN])
+ #define TEST_CFG(config, cfg) (((config) >> (cfg)) & 1)
++#define MOD(mod) (1 << (mod))
+ 
+ /* symbology independent decoder state */
+ struct zbar_decoder_s {
+@@ -80,6 +87,9 @@ struct zbar_decoder_s {
+     unsigned w[DECODE_WINDOW];          /* window of last N bar widths */
+     zbar_symbol_type_t type;            /* type of last decoded data */
+     zbar_symbol_type_t lock;            /* buffer lock */
++    unsigned modifiers;                 /* symbology modifier */
++    int direction;                      /* direction of last decoded data */
++    unsigned s6;                        /* 6-element character width */
+ 
+     /* everything above here is automatically reset */
+     unsigned buf_alloc;                 /* dynamic buffer allocation */
+@@ -95,9 +105,15 @@ struct zbar_decoder_s {
+ #ifdef ENABLE_I25
+     i25_decoder_t i25;                  /* Interleaved 2 of 5 decode state */
+ #endif
++#ifdef ENABLE_DATABAR
++    databar_decoder_t databar;          /* DataBar decode state */
++#endif
+ #ifdef ENABLE_CODE39
+     code39_decoder_t code39;            /* Code 39 decode state */
+ #endif
++#ifdef ENABLE_CODE93
++    code93_decoder_t code93;            /* Code 93 decode state */
++#endif
+ #ifdef ENABLE_CODE128
+     code128_decoder_t code128;          /* Code 128 decode state */
+ #endif
+@@ -168,19 +184,32 @@ static inline int decode_e (unsigned e,
+ }
+ 
+ /* acquire shared state lock */
+-static inline char get_lock (zbar_decoder_t *dcode,
+-                             zbar_symbol_type_t req)
++static inline char acquire_lock (zbar_decoder_t *dcode,
++                                 zbar_symbol_type_t req)
+ {
+-    if(dcode->lock)
++    if(dcode->lock) {
++        dprintf(2, " [locked %d]\n", dcode->lock);
+         return(1);
++    }
+     dcode->lock = req;
+     return(0);
+ }
+ 
++/* check and release shared state lock */
++static inline char release_lock (zbar_decoder_t *dcode,
++                                 zbar_symbol_type_t req)
++{
++    zassert(dcode->lock == req, 1, "lock=%d req=%d\n",
++            dcode->lock, req);
++    dcode->lock = 0;
++    return(0);
++}
++
+ /* ensure output buffer has sufficient allocation for request */
+ static inline char size_buf (zbar_decoder_t *dcode,
+                              unsigned len)
+ {
++    unsigned char *buf;
+     if(len < dcode->buf_alloc)
+         /* FIXME size reduction heuristic? */
+         return(0);
+@@ -191,7 +220,7 @@ static inline char size_buf (zbar_decode
+         if(len > BUFFER_MAX)
+             len = BUFFER_MAX;
+     }
+-    unsigned char *buf = realloc(dcode->buf, len);
++    buf = realloc(dcode->buf, len);
+     if(!buf)
+         return(1);
+     dcode->buf = buf;
+@@ -200,6 +229,6 @@ static inline char size_buf (zbar_decode
+ }
+ 
+ extern const char *_zbar_decoder_buf_dump (unsigned char *buf,
+-                                            unsigned int buflen);
++                                           unsigned int buflen);
+ 
+ #endif
+diff --git a/zbar/decoder/code128.c b/zbar/decoder/code128.c
+--- a/zbar/decoder/code128.c
++++ b/zbar/decoder/code128.c
+@@ -1,5 +1,5 @@
+ /*------------------------------------------------------------------------
+- *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
+  *
+  *  This file is part of the ZBar Bar Code Reader.
+  *
+@@ -25,12 +25,12 @@
+ #include <string.h>     /* memmove */
+ 
+ #include <zbar.h>
+-#include "decoder.h"
+ 
+ #ifdef DEBUG_CODE128
+ # define DEBUG_LEVEL (DEBUG_CODE128)
+ #endif
+ #include "debug.h"
++#include "decoder.h"
+ 
+ #define NUM_CHARS 108           /* total number of character codes */
+ 
+@@ -120,6 +120,8 @@ static inline signed char decode_lo (int
+                             ((sig >> 5) & 0x18) |
+                             ((sig >> 7) & 0x60));
+     unsigned char idx = lo_offset[offset];
++    unsigned char base, c;
++
+     if(sig & 1)
+         idx &= 0xf;
+     else
+@@ -127,14 +129,14 @@ static inline signed char decode_lo (int
+     if(idx == 0xf)
+         return(-1);
+ 
+-    unsigned char base = (sig >> 11) | ((sig >> 9) & 1);
++    base = (sig >> 11) | ((sig >> 9) & 1);
+     zassert(base < 8, -1, "sig=%x offset=%x idx=%x base=%x\n",
+             sig, offset, idx, base);
+     idx += lo_base[base];
+ 
+     zassert(idx <= 0x50, -1, "sig=%x offset=%x base=%x idx=%x\n",
+             sig, offset, base, idx);
+-    unsigned char c = characters[idx];
++    c = characters[idx];
+     dprintf(2, " %02x(%x(%02x)/%x(%02x)) => %02x",
+             idx, base, lo_base[base], offset, lo_offset[offset],
+             (unsigned char)c);
+@@ -144,6 +146,7 @@ static inline signed char decode_lo (int
+ static inline signed char decode_hi (int sig)
+ {
+     unsigned char rev = (sig & 0x4400) != 0;
++    unsigned char idx, c;
+     if(rev)
+         sig = (((sig >> 12) & 0x000f) |
+                ((sig >>  4) & 0x00f0) |
+@@ -151,7 +154,6 @@ static inline signed char decode_hi (int
+                ((sig << 12) & 0xf000));
+     dprintf(2, " rev=%x", rev != 0);
+ 
+-    unsigned char idx;
+     switch(sig) {
+     case 0x0014: idx = 0x0; break;
+     case 0x0025: idx = 0x1; break;
+@@ -171,7 +173,7 @@ static inline signed char decode_hi (int
+     }
+     if(rev)
+         idx += 0xe;
+-    unsigned char c = characters[0x51 + idx];
++    c = characters[0x51 + idx];
+     dprintf(2, " %02x => %02x", idx, c);
+     return(c);
+ }
+@@ -190,13 +192,18 @@ static inline unsigned char calc_check (
+ 
+ static inline signed char decode6 (zbar_decoder_t *dcode)
+ {
++    int sig;
++    signed char c, chk;
++    unsigned bars;
++
+     /* build edge signature of character */
+     unsigned s = dcode->code128.s6;
++
+     dprintf(2, " s=%d", s);
+     if(s < 5)
+         return(-1);
+     /* calculate similar edge measurements */
+-    int sig = (get_color(dcode) == ZBAR_BAR)
++    sig = (get_color(dcode) == ZBAR_BAR)
+         ? ((decode_e(get_width(dcode, 0) + get_width(dcode, 1), s, 11) << 12) |
+            (decode_e(get_width(dcode, 1) + get_width(dcode, 2), s, 11) << 8) |
+            (decode_e(get_width(dcode, 2) + get_width(dcode, 3), s, 11) << 4) |
+@@ -209,16 +216,16 @@ static inline signed char decode6 (zbar_
+         return(-1);
+     dprintf(2, " sig=%04x", sig);
+     /* lookup edge signature */
+-    signed char c = (sig & 0x4444) ? decode_hi(sig) : decode_lo(sig);
++    c = (sig & 0x4444) ? decode_hi(sig) : decode_lo(sig);
+     if(c == -1)
+         return(-1);
+ 
+     /* character validation */
+-    unsigned bars = (get_color(dcode) == ZBAR_BAR)
++    bars = (get_color(dcode) == ZBAR_BAR)
+         ? (get_width(dcode, 0) + get_width(dcode, 2) + get_width(dcode, 4))
+         : (get_width(dcode, 1) + get_width(dcode, 3) + get_width(dcode, 5));
+     bars = bars * 11 * 4 / s;
+-    unsigned char chk = calc_check(c);
++    chk = calc_check(c);
+     dprintf(2, " bars=%d chk=%d", bars, chk);
+     if(chk - 7 > bars || bars > chk + 7)
+         return(-1);
+@@ -228,18 +235,20 @@ static inline signed char decode6 (zbar_
+ 
+ static inline unsigned char validate_checksum (zbar_decoder_t *dcode)
+ {
++    unsigned idx, sum, i, acc = 0;
++    unsigned char check, err;
++
+     code128_decoder_t *dcode128 = &dcode->code128;
+     if(dcode128->character < 3)
+         return(1);
+ 
+     /* add in irregularly weighted start character */
+-    unsigned idx = (dcode128->direction) ? dcode128->character - 1 : 0;
+-    unsigned sum = dcode->buf[idx];
++    idx = (dcode128->direction) ? dcode128->character - 1 : 0;
++    sum = dcode->buf[idx];
+     if(sum >= 103)
+         sum -= 103;
+ 
+     /* calculate sum in reverse to avoid multiply operations */
+-    unsigned i, acc = 0;
+     for(i = dcode128->character - 3; i; i--) {
+         zassert(sum < 103, -1, "dir=%x i=%x sum=%x acc=%x %s\n",
+                 dcode128->direction, i, sum, acc,
+@@ -258,9 +267,9 @@ static inline unsigned char validate_che
+ 
+     /* and compare to check character */
+     idx = (dcode128->direction) ? 1 : dcode128->character - 2;
+-    unsigned char check = dcode->buf[idx];
++    check = dcode->buf[idx];
+     dprintf(2, " chk=%02x(%02x)", sum, check);
+-    unsigned char err = (sum != check);
++    err = (sum != check);
+     if(err)
+         dprintf(1, " [checksum error]\n");
+     return(err);
+@@ -272,6 +281,8 @@ static inline unsigned postprocess_c (zb
+                                       unsigned end,
+                                       unsigned dst)
+ {
++    unsigned i, j;
++
+     /* expand buffer to accomodate 2x set C characters (2 digits per-char) */
+     unsigned delta = end - start;
+     unsigned newlen = dcode->code128.character + delta;
+@@ -282,7 +293,6 @@ static inline unsigned postprocess_c (zb
+             dcode->code128.character - start);
+     dcode->code128.character = newlen;
+ 
+-    unsigned i, j;
+     for(i = 0, j = dst; i < delta; i++, j += 2) {
+         /* convert each set C character into two ASCII digits */
+         unsigned char code = dcode->buf[start + delta + i];
+@@ -317,10 +327,12 @@ static inline unsigned postprocess_c (zb
+ /* resolve scan direction and convert to ASCII */
+ static inline unsigned char postprocess (zbar_decoder_t *dcode)
+ {
++    unsigned i, j, cexp;
++    unsigned char code = 0, charset;
+     code128_decoder_t *dcode128 = &dcode->code128;
+     dprintf(2, "\n    postproc len=%d", dcode128->character);
+-    unsigned i, j;
+-    unsigned char code = 0;
++    dcode->modifiers = 0;
++    dcode->direction = 1 - 2 * dcode128->direction;
+     if(dcode128->direction) {
+         /* reverse buffer */
+         dprintf(2, " (rev)");
+@@ -343,8 +355,8 @@ static inline unsigned char postprocess 
+     zassert(code >= START_A && code <= START_C, 1, "%s\n",
+             _zbar_decoder_buf_dump(dcode->buf, dcode->code128.character));
+ 
+-    unsigned char charset = code - START_A;
+-    unsigned cexp = (code == START_C) ? 1 : 0;
++    charset = code - START_A;
++    cexp = (code == START_C) ? 1 : 0;
+     dprintf(2, " start=%c", 'A' + charset);
+ 
+     for(i = 1, j = 0; i < dcode128->character - 2; i++) {
+@@ -370,12 +382,13 @@ static inline unsigned char postprocess 
+         else {
+             dprintf(2, " %02x", code);
+             if(charset & 0x2) {
++                unsigned delta;
+                 /* expand character set C to ASCII */
+                 zassert(cexp, 1, "i=%x j=%x code=%02x charset=%x cexp=%x %s\n",
+                         i, j, code, charset, cexp,
+                         _zbar_decoder_buf_dump(dcode->buf,
+                                                 dcode->code128.character));
+-                unsigned delta = postprocess_c(dcode, cexp, i, j);
++                delta = postprocess_c(dcode, cexp, i, j);
+                 i += delta;
+                 j += delta * 2;
+                 cexp = 0;
+@@ -383,28 +396,39 @@ static inline unsigned char postprocess 
+             if(code < CODE_C) {
+                 if(code == SHIFT)
+                     charset |= 0x80;
+-                else if(code == FNC2)
+-                    /* FIXME FNC2 - message append */;
+-                else if(code == FNC3)
+-                    /* FIXME FNC3 - initialize */;
++                else if(code == FNC2) {
++                    /* FIXME FNC2 - message append */
++                }
++                else if(code == FNC3) {
++                    /* FIXME FNC3 - initialize */
++                }
+             }
+-            else if(code == FNC1)
+-                /* FIXME FNC1 - Code 128 subsets or ASCII 0x1d */;
++            else if(code == FNC1) {
++                /* FNC1 - Code 128 subsets or ASCII 0x1d */
++                if(i == 1)
++                    dcode->modifiers |= MOD(ZBAR_MOD_GS1);
++                else if(i == 2)
++                    dcode->modifiers |= MOD(ZBAR_MOD_AIM);
++                else if(i < dcode->code128.character - 3)
++                    dcode->buf[j++] = 0x1d;
++                /*else drop trailing FNC1 */
++            }
+             else if(code >= START_A) {
+                 dprintf(1, " [truncated]\n");
+                 return(1);
+             }
+             else {
++                unsigned char newset = CODE_A - code;
+                 zassert(code >= CODE_C && code <= CODE_A, 1,
+                         "i=%x j=%x code=%02x charset=%x cexp=%x %s\n",
+                         i, j, code, charset, cexp,
+                         _zbar_decoder_buf_dump(dcode->buf,
+                                                 dcode->code128.character));
+-                unsigned char newset = CODE_A - code;
+                 if(newset != charset)
+                     charset = newset;
+-                else
+-                    /* FIXME FNC4 - extended ASCII */;
++                else {
++                    /* FIXME FNC4 - extended ASCII */
++                }
+             }
+             if(charset & 0x2)
+                 cexp = i + 1;
+@@ -426,16 +450,18 @@ static inline unsigned char postprocess 
+ zbar_symbol_type_t _zbar_decode_code128 (zbar_decoder_t *dcode)
+ {
+     code128_decoder_t *dcode128 = &dcode->code128;
++    signed char c;
+ 
+     /* update latest character width */
+     dcode128->s6 -= get_width(dcode, 6);
+     dcode128->s6 += get_width(dcode, 0);
+ 
+-    if(/* process every 6th element of active symbol */
+-       (dcode128->character >= 0 &&
+-        (++dcode128->element) != 6) ||
+-       /* decode color based on direction */
+-       (get_color(dcode) != dcode128->direction))
++    if((dcode128->character < 0)
++       ? get_color(dcode) != ZBAR_SPACE
++       : (/* process every 6th element of active symbol */
++          ++dcode128->element != 6 ||
++          /* decode color based on direction */
++          get_color(dcode) != dcode128->direction))
+         return(0);
+     dcode128->element = 0;
+ 
+@@ -443,49 +469,73 @@ zbar_symbol_type_t _zbar_decode_code128 
+             (dcode128->direction) ? '<' : '>',
+             dcode128->character, dcode128->element);
+ 
+-    signed char c = decode6(dcode);
++    c = decode6(dcode);
+     if(dcode128->character < 0) {
++        unsigned qz;
+         dprintf(2, " c=%02x", c);
+         if(c < START_A || c > STOP_REV || c == STOP_FWD) {
+             dprintf(2, " [invalid]\n");
+             return(0);
+         }
+-        unsigned qz = get_width(dcode, 6);
+-        if(qz && qz < (dcode->code128.s6 * 3) / 4) {
++        qz = get_width(dcode, 6);
++        if(qz && qz < (dcode128->s6 * 3) / 4) {
+             dprintf(2, " [invalid qz %d]\n", qz);
+             return(0);
+         }
+-        /* lock shared resources */
+-        if(get_lock(dcode, ZBAR_CODE128)) {
+-            dprintf(2, " [locked %d]\n", dcode->lock);
+-            dcode128->character = -1;
+-            return(0);
+-        }
+         /* decoded valid start/stop */
+         /* initialize state */
+-        dcode128->character = 0;
++        dcode128->character = 1;
+         if(c == STOP_REV) {
+             dcode128->direction = ZBAR_BAR;
+             dcode128->element = 7;
+         }
+         else
+             dcode128->direction = ZBAR_SPACE;
+-        dprintf(2, " dir=%x [valid start]", dcode128->direction);
++        dcode128->start = c;
++        dcode128->width = dcode128->s6;
++        dprintf(2, " dir=%x [valid start]\n", dcode128->direction);
++        return(0);
+     }
+     else if((c < 0) ||
+             ((dcode128->character >= BUFFER_MIN) &&
+              size_buf(dcode, dcode128->character + 1))) {
+         dprintf(1, (c < 0) ? " [aborted]\n" : " [overflow]\n");
+-        dcode->lock = 0;
++        if(dcode128->character > 1)
++            release_lock(dcode, ZBAR_CODE128);
+         dcode128->character = -1;
+         return(0);
+     }
++    else {
++        unsigned dw;
++        if(dcode128->width > dcode128->s6)
++            dw = dcode128->width - dcode128->s6;
++        else
++            dw = dcode128->s6 - dcode128->width;
++        dw *= 4;
++        if(dw > dcode128->width) {
++            dprintf(1, " [width var]\n");
++            if(dcode128->character > 1)
++                release_lock(dcode, ZBAR_CODE128);
++            dcode128->character = -1;
++            return(0);
++        }
++    }
++    dcode128->width = dcode128->s6;
+ 
+     zassert(dcode->buf_alloc > dcode128->character, 0,
+             "alloc=%x idx=%x c=%02x %s\n",
+             dcode->buf_alloc, dcode128->character, c,
+             _zbar_decoder_buf_dump(dcode->buf, dcode->buf_alloc));
+ 
++    if(dcode128->character == 1) {
++        /* lock shared resources */
++        if(acquire_lock(dcode, ZBAR_CODE128)) {
++            dcode128->character = -1;
++            return(0);
++        }
++        dcode->buf[0] = dcode128->start;
++    }
++
+     dcode->buf[dcode128->character++] = c;
+ 
+     if(dcode128->character > 2 &&
+@@ -506,7 +556,7 @@ zbar_symbol_type_t _zbar_decode_code128 
+             dprintf(2, " [valid end]\n");
+         dcode128->character = -1;
+         if(!sym)
+-            dcode->lock = 0;
++            release_lock(dcode, ZBAR_CODE128);
+         return(sym);
+     }
+ 
+diff --git a/zbar/decoder/code128.h b/zbar/decoder/code128.h
+--- a/zbar/decoder/code128.h
++++ b/zbar/decoder/code128.h
+@@ -28,7 +28,9 @@ typedef struct code128_decoder_s {
+     unsigned direction : 1;     /* scan direction: 0=fwd/space, 1=rev/bar */
+     unsigned element : 3;       /* element offset 0-5 */
+     int character : 12;         /* character position in symbol */
++    unsigned char start;        /* start character */
+     unsigned s6;                /* character width */
++    unsigned width;             /* last character width */
+ 
+     unsigned config;
+     int configs[NUM_CFGS];      /* int valued configurations */
+diff --git a/zbar/decoder/code39.c b/zbar/decoder/code39.c
+--- a/zbar/decoder/code39.c
++++ b/zbar/decoder/code39.c
+@@ -1,5 +1,5 @@
+ /*------------------------------------------------------------------------
+- *  Copyright 2008-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++ *  Copyright 2008-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
+  *
+  *  This file is part of the ZBar Bar Code Reader.
+  *
+@@ -25,12 +25,12 @@
+ #include <string.h>     /* memmove */
+ 
+ #include <zbar.h>
+-#include "decoder.h"
+ 
+ #ifdef DEBUG_CODE39
+ # define DEBUG_LEVEL (DEBUG_CODE39)
+ #endif
+ #include "debug.h"
++#include "decoder.h"
+ 
+ #define NUM_CHARS (0x2c)
+ 
+@@ -130,11 +130,11 @@ static inline unsigned char code39_decod
+                                             unsigned e,
+                                             unsigned s)
+ {
+-    unsigned char E = decode_e(e, s, 36);
+-    if(E > 7)
++    unsigned char E = decode_e(e, s, 72);
++    if(E > 18)
+         return(0xff);
+     enc <<= 1;
+-    if(E > 2) {
++    if(E > 6) {
+         enc |= 1;
+         dprintf(2, "1");
+     }
+@@ -147,7 +147,6 @@ static inline signed char code39_decode9
+ {
+     code39_decoder_t *dcode39 = &dcode->code39;
+ 
+-    dprintf(2, " s=%d ", dcode39->s9);
+     if(dcode39->s9 < 9)
+         return(-1);
+ 
+@@ -192,14 +191,14 @@ static inline signed char code39_decode9
+ static inline signed char code39_decode_start (zbar_decoder_t *dcode)
+ {
+     code39_decoder_t *dcode39 = &dcode->code39;
++    dprintf(2, " s=%d ", dcode39->s9);
+ 
+     signed char c = code39_decode9(dcode);
+-    if(c == 0x19)
+-        dcode39->direction ^= 1;
+-    else if(c != 0x2b) {
++    if(c != 0x19 && c != 0x2b) {
+         dprintf(2, "\n");
+         return(ZBAR_NONE);
+     }
++    dcode39->direction ^= (c == 0x19);
+ 
+     /* check leading quiet zone - spec is 10x */
+     unsigned quiet = get_width(dcode, 9);
+@@ -217,6 +216,7 @@ static inline signed char code39_decode_
+ static inline void code39_postprocess (zbar_decoder_t *dcode)
+ {
+     code39_decoder_t *dcode39 = &dcode->code39;
++    dcode->direction = 1 - 2 * dcode39->direction;
+     int i;
+     if(dcode39->direction) {
+         /* reverse buffer */
+@@ -234,6 +234,17 @@ static inline void code39_postprocess (z
+                          : '?');
+     dcode->buflen = i;
+     dcode->buf[i] = '\0';
++    dcode->modifiers = 0;
++}
++
++static inline int
++check_width (unsigned ref,
++             unsigned w)
++{
++    unsigned dref = ref;
++    ref *= 4;
++    w *= 4;
++    return(ref - dref <= w && w <= ref + dref);
+ }
+ 
+ zbar_symbol_type_t _zbar_decode_code39 (zbar_decoder_t *dcode)
+@@ -284,27 +295,36 @@ zbar_symbol_type_t _zbar_decode_code39 (
+             }
+             dcode39->character = -1;
+             if(!sym)
+-                dcode->lock = 0;
++                release_lock(dcode, ZBAR_CODE39);
+             return(sym);
+         }
+         if(space > dcode39->width / 2) {
+             /* inter-character space check failure */
+-            dcode->lock = 0;
++            dprintf(2, " ics>%d [invalid ics]", dcode39->width);
++            if(dcode39->character)
++                release_lock(dcode, ZBAR_CODE39);
+             dcode39->character = -1;
+-            dprintf(2, " ics>%d [invalid ics]", dcode39->width);
+         }
+         dcode39->element = 0;
+         dprintf(2, "\n");
+         return(ZBAR_NONE);
+     }
+ 
++    dprintf(2, " s=%d ", dcode39->s9);
++    if(!check_width(dcode39->width, dcode39->s9)) {
++        dprintf(2, " [width]\n");
++        if(dcode39->character)
++            release_lock(dcode, ZBAR_CODE39);
++        dcode39->character = -1;
++        return(ZBAR_NONE);
++    }
++
+     signed char c = code39_decode9(dcode);
+     dprintf(2, " c=%d", c);
+ 
+     /* lock shared resources */
+-    if(!dcode39->character && get_lock(dcode, ZBAR_CODE39)) {
++    if(!dcode39->character && acquire_lock(dcode, ZBAR_CODE39)) {
+         dcode39->character = -1;
+-        dprintf(1, " [locked %d]\n", dcode->lock);
+         return(ZBAR_PARTIAL);
+     }
+ 
+@@ -312,7 +332,7 @@ zbar_symbol_type_t _zbar_decode_code39 (
+        ((dcode39->character >= BUFFER_MIN) &&
+         size_buf(dcode, dcode39->character + 1))) {
+         dprintf(1, (c < 0) ? " [aborted]\n" : " [overflow]\n");
+-        dcode->lock = 0;
++        release_lock(dcode, ZBAR_CODE39);
+         dcode39->character = -1;
+         return(ZBAR_NONE);
+     }
+diff --git a/zbar/decoder/code93.c b/zbar/decoder/code93.c
+new file mode 100644
+--- /dev/null
++++ b/zbar/decoder/code93.c
+@@ -0,0 +1,398 @@
++/*------------------------------------------------------------------------
++ *  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
++ *
++ *  This file is part of the ZBar Bar Code Reader.
++ *
++ *  The ZBar Bar Code Reader is free software; you can redistribute it
++ *  and/or modify it under the terms of the GNU Lesser Public License as
++ *  published by the Free Software Foundation; either version 2.1 of
++ *  the License, or (at your option) any later version.
++ *
++ *  The ZBar Bar Code Reader is distributed in the hope that it will be
++ *  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
++ *  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU Lesser Public License for more details.
++ *
++ *  You should have received a copy of the GNU Lesser Public License
++ *  along with the ZBar Bar Code Reader; if not, write to the Free
++ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++ *  Boston, MA  02110-1301  USA
++ *
++ *  http://sourceforge.net/projects/zbar
++ *------------------------------------------------------------------------*/
++
++#include <config.h>
++#include <zbar.h>
++
++#ifdef DEBUG_CODE93
++# define DEBUG_LEVEL (DEBUG_CODE93)
++#endif
++#include "debug.h"
++#include "decoder.h"
++
++static const signed char code93_hash[0x40] = {
++    0x0f, 0x2b, 0x30, 0x38, 0x13, 0x1b, 0x11, 0x2a,
++    0x0a,   -1, 0x2f, 0x0f, 0x38, 0x38, 0x2f, 0x37,
++    0x24, 0x3a, 0x1b, 0x36, 0x18, 0x26, 0x02, 0x2c,
++    0x2b, 0x05, 0x21, 0x3b, 0x04, 0x15, 0x12, 0x0c,
++    0x00, 0x26, 0x23, 0x00,   -1, 0x2e, 0x3f, 0x13,
++    0x2e, 0x36,   -1, 0x08, 0x09,   -1, 0x15, 0x14,
++      -1, 0x00, 0x21, 0x3b,   -1, 0x33, 0x00,   -1,
++    0x2d, 0x0c, 0x1b, 0x0a, 0x3f, 0x3f, 0x29, 0x1c,
++};
++
++static inline int
++check_width (unsigned cur,
++             unsigned prev)
++{
++    unsigned dw;
++    if(prev > cur)
++        dw = prev - cur;
++    else
++        dw = cur - prev;
++    dw *= 4;
++    return(dw > prev);
++}
++
++static inline int
++encode6 (zbar_decoder_t *dcode)
++{
++    /* build edge signature of character */
++    unsigned s = dcode->s6;
++    int sig = 0, i;
++
++    dprintf(2, " s=%d ", s);
++    if(s < 9)
++        return(-1);
++
++    for(i = 6; --i > 0; ) {
++        unsigned c = decode_e(pair_width(dcode, i), s, 9);
++        if(c > 3)
++            return(-1);
++        sig = (sig << 2) | c;
++        dprintf(2, "%d", c);
++    }
++    dprintf(2, " sig=%03x", sig);
++
++    return(sig);
++}
++
++static inline int
++validate_sig (int sig)
++{
++    int i, sum = 0, emin = 0, sig0 = 0, sig1 = 0;
++    dprintf(3, " sum=0");
++    for(i = 3; --i >= 0; ) {
++        int e = sig & 3;
++        sig >>= 2;
++        sum = e - sum;
++        sig1 <<= 4;
++        sig1 += sum;
++        dprintf(3, "%d", sum);
++        if(!i)
++            break;
++
++        e = sig & 3;
++        sig >>= 2;
++        sum = e - sum;
++        sig0 <<= 4;
++        if(emin > sum)
++            emin = sum;
++        sig0 += sum;
++        dprintf(3, "%d", sum);
++    }
++
++    dprintf(3, " emin=%d sig=%03x/%03x", emin, sig1 & 0xfff, sig0 & 0xfff);
++
++    emin = emin + (emin << 4) + (emin << 8);
++    sig0 -= emin;
++    sig1 += emin;
++
++    dprintf(3, "=%03x/%03x", sig1 & 0xfff, sig0 & 0xfff);
++    return((sig0 | sig1) & 0x888);
++}
++
++static inline int
++decode6 (zbar_decoder_t *dcode)
++{
++    int sig = encode6(dcode);
++    int g0, g1, c;
++    if(sig < 0 ||
++       (sig & 0x3) + ((sig >> 4) & 0x3) + ((sig >> 8) & 0x3) != 3 ||
++       validate_sig(sig))
++        return(-1);
++
++    if(dcode->code93.direction) {
++        /* reverse signature */
++        unsigned tmp = sig & 0x030;
++        sig = ((sig & 0x3c0) >> 6) | ((sig & 0x00f) << 6);
++        sig = ((sig & 0x30c) >> 2) | ((sig & 0x0c3) << 2) | tmp;
++    }
++
++    g0 = code93_hash[(sig - (sig >> 4)) & 0x3f];
++    g1 = code93_hash[((sig >> 2) - (sig >> 7)) & 0x3f];
++    zassert(g0 >= 0 && g1 >= 0, -1,
++            "dir=%x sig=%03x g0=%03x g1=%03x %s\n",
++            dcode->code93.direction, sig, g0, g1,
++            _zbar_decoder_buf_dump(dcode->buf, dcode->code93.character));
++
++    c = (g0 + g1) & 0x3f;
++    dprintf(2, " g0=%x g1=%x c=%02x", g0, g1, c);
++    return(c);
++}
++
++static inline zbar_symbol_type_t
++decode_start (zbar_decoder_t *dcode)
++{
++    code93_decoder_t *dcode93 = &dcode->code93;
++    unsigned dir, qz, s = dcode->s6;
++    int c;
++
++    dprintf(2, "      code93:");
++    c = encode6(dcode);
++    if(c < 0 || (c != 0x00f && c != 0x0f0))
++        return(ZBAR_NONE);
++
++    dir = (c >> 7);
++
++    if(dir) {
++        if(decode_e(pair_width(dcode, 0), s, 9))
++            return(ZBAR_NONE);
++        qz = get_width(dcode, 8);
++    }
++
++    qz = get_width(dcode, 7);
++    if(qz && qz < (s * 3) / 4) {
++        dprintf(2, " [invalid qz %d]", qz);
++        return(ZBAR_NONE);
++    }
++
++    /* decoded valid start/stop - initialize state */
++    dcode93->direction = dir;
++    dcode93->element = (!dir) ? 0 : 7;
++    dcode93->character = 0;
++    dcode93->width = s;
++
++    dprintf(2, " dir=%x [valid start]", dir);
++    return(ZBAR_PARTIAL);
++}
++
++static inline zbar_symbol_type_t
++decode_abort (zbar_decoder_t *dcode,
++              const char *reason)
++{
++    code93_decoder_t *dcode93 = &dcode->code93;
++    if(dcode93->character > 1)
++        release_lock(dcode, ZBAR_CODE93);
++    dcode93->character = -1;
++    if(reason)
++        dprintf(1, " [%s]\n", reason);
++    return(ZBAR_NONE);
++}
++
++static inline zbar_symbol_type_t
++check_stop (zbar_decoder_t *dcode)
++{
++    code93_decoder_t *dcode93 = &dcode->code93;
++    unsigned n = dcode93->character, s = dcode->s6;
++    int max_len = CFG(*dcode93, ZBAR_CFG_MAX_LEN);
++    if(n < 2 ||
++       n < CFG(*dcode93, ZBAR_CFG_MIN_LEN) ||
++       (max_len && n > max_len))
++        return(decode_abort(dcode, "invalid len"));
++
++    if(dcode93->direction) {
++        unsigned qz = get_width(dcode, 0);
++        if(qz && qz < (s * 3) / 4)
++            return(decode_abort(dcode, "invalid qz"));
++    }
++    else if(decode_e(pair_width(dcode, 0), s, 9))
++        /* FIXME forward-trailing QZ check */
++        return(decode_abort(dcode, "invalid stop"));
++
++    return(ZBAR_CODE93);
++}
++
++#define CHKMOD (47)
++
++static inline int
++plusmod47 (int acc,
++           int add)
++{
++    acc += add;
++    if(acc >= CHKMOD)
++        acc -= CHKMOD;
++    return(acc);
++}
++
++static inline int
++validate_checksums (zbar_decoder_t *dcode)
++{
++    code93_decoder_t *dcode93 = &dcode->code93;
++    unsigned d, i, n = dcode93->character;
++    unsigned sum_c = 0, acc_c = 0, i_c = (n - 2) % 20;
++    unsigned sum_k = 0, acc_k = 0, i_k = (n - 1) % 15;
++
++    for(i = 0; i < n - 2; i++) {
++        d = dcode->buf[(dcode93->direction) ? n - 1 - i : i];
++
++        if(!i_c--) {
++            acc_c = 0;
++            i_c = 19;
++        }
++        acc_c = plusmod47(acc_c, d);
++        sum_c = plusmod47(sum_c, acc_c);
++
++        if(!i_k--) {
++            acc_k = 0;
++            i_k = 14;
++        }
++        acc_k = plusmod47(acc_k, d);
++        sum_k = plusmod47(sum_k, acc_k);
++    }
++
++    d = dcode->buf[(dcode93->direction) ? 1 : n - 2];
++    dprintf(2, " C=%02x?=%02x", d, sum_c);
++    if(d != sum_c)
++        return(1);
++
++    acc_k = plusmod47(acc_k, sum_c);
++    sum_k = plusmod47(sum_k, acc_k);
++    d = dcode->buf[(dcode93->direction) ? 0 : n - 1];
++    dprintf(2, " K=%02x?=%02x", d, sum_k);
++    if(d != sum_k)
++        return(1);
++
++    return(0);
++}
++
++/* resolve scan direction and convert to ASCII */
++static inline int
++postprocess (zbar_decoder_t *dcode)
++{
++    code93_decoder_t *dcode93 = &dcode->code93;
++    unsigned i, j, n = dcode93->character;
++    static const unsigned char code93_graph[] = "-. $/+%";
++    static const unsigned char code93_s2[] =
++        "\x1b\x1c\x1d\x1e\x1f;<=>?[\\]^_{|}~\x7f\x00\x40`\x7f\x7f\x7f";
++
++    dprintf(2, "\n    postproc len=%d", n);
++    dcode->direction = 1 - 2 * dcode93->direction;
++    if(dcode93->direction) {
++        /* reverse buffer */
++        dprintf(2, " (rev)");
++        for(i = 0; i < n / 2; i++) {
++            unsigned j = n - 1 - i;
++            unsigned char d = dcode->buf[i];
++            dcode->buf[i] = dcode->buf[j];
++            dcode->buf[j] = d;
++        }
++    }
++
++    n -= 2;
++    for(i = 0, j = 0; i < n; ) {
++        unsigned char d = dcode->buf[i++];
++        if(d < 0xa)
++            d = '0' + d;
++        else if(d < 0x24)
++            d = 'A' + d - 0xa;
++        else if(d < 0x2b)
++            d = code93_graph[d - 0x24];
++        else {
++            unsigned shift = d;
++            zassert(shift < 0x2f, -1, "%s\n",
++                    _zbar_decoder_buf_dump(dcode->buf, dcode93->character));
++            d = dcode->buf[i++];
++            if(d < 0xa || d >= 0x24)
++                return(1);
++            d -= 0xa;
++            switch(shift)
++            {
++            case 0x2b: d++; break;
++            case 0x2c: d = code93_s2[d]; break;
++            case 0x2d: d += 0x21; break;
++            case 0x2e: d += 0x61; break;
++            default: return(1);
++            }
++        }
++        dcode->buf[j++] = d;
++    }
++
++    dcode->buflen = j;
++    dcode->buf[j] = '\0';
++    dcode->modifiers = 0;
++    return(0);
++}
++
++zbar_symbol_type_t
++_zbar_decode_code93 (zbar_decoder_t *dcode)
++{
++    code93_decoder_t *dcode93 = &dcode->code93;
++    int c;
++
++    if(dcode93->character < 0) {
++        zbar_symbol_type_t sym;
++        if(get_color(dcode) != ZBAR_BAR)
++            return(ZBAR_NONE);
++        sym = decode_start(dcode);
++        dprintf(2, "\n");
++        return(sym);
++    }
++
++    if(/* process every 6th element of active symbol */
++       ++dcode93->element != 6 ||
++       /* decode color based on direction */
++       get_color(dcode) == dcode93->direction)
++        return(ZBAR_NONE);
++
++    dcode93->element = 0;
++
++    dprintf(2, "      code93[%c%02d+%x]:",
++            (dcode93->direction) ? '<' : '>',
++            dcode93->character, dcode93->element);
++
++    if(check_width(dcode->s6, dcode93->width))
++        return(decode_abort(dcode, "width var"));
++
++    c = decode6(dcode);
++    if(c < 0)
++        return(decode_abort(dcode, "aborted"));
++
++    if(c == 0x2f) {
++        if(!check_stop(dcode))
++            return(ZBAR_NONE);
++        if(validate_checksums(dcode))
++            return(decode_abort(dcode, "checksum error"));
++        if(postprocess(dcode))
++            return(decode_abort(dcode, "invalid encoding"));
++
++        dprintf(2, " [valid end]\n");
++        dprintf(3, "    %s\n",
++                _zbar_decoder_buf_dump(dcode->buf, dcode93->character));
++
++        dcode93->character = -1;
++        return(ZBAR_CODE93);
++    }
++
++    if(dcode93->character >= BUFFER_MIN &&
++       size_buf(dcode, dcode93->character + 1))
++        return(decode_abort(dcode, "overflow"));
++
++    dcode93->width = dcode->s6;
++
++    if(dcode93->character == 1) {
++        /* lock shared resources */
++        if(acquire_lock(dcode, ZBAR_CODE93))
++            return(decode_abort(dcode, NULL));
++        dcode->buf[0] = dcode93->buf;
++    }
++
++    if(!dcode93->character)
++        dcode93->buf = c;
++    else 
++        dcode->buf[dcode93->character] = c;
++    dcode93->character++;
++
++    dprintf(2, "\n");
++    return(ZBAR_NONE);
++}
+diff --git a/zbar/decoder/code93.h b/zbar/decoder/code93.h
+new file mode 100644
+--- /dev/null
++++ b/zbar/decoder/code93.h
+@@ -0,0 +1,49 @@
++/*------------------------------------------------------------------------
++ *  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
++ *
++ *  This file is part of the ZBar Bar Code Reader.
++ *
++ *  The ZBar Bar Code Reader is free software; you can redistribute it
++ *  and/or modify it under the terms of the GNU Lesser Public License as
++ *  published by the Free Software Foundation; either version 2.1 of
++ *  the License, or (at your option) any later version.
++ *
++ *  The ZBar Bar Code Reader is distributed in the hope that it will be
++ *  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
++ *  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU Lesser Public License for more details.
++ *
++ *  You should have received a copy of the GNU Lesser Public License
++ *  along with the ZBar Bar Code Reader; if not, write to the Free
++ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++ *  Boston, MA  02110-1301  USA
++ *
++ *  http://sourceforge.net/projects/zbar
++ *------------------------------------------------------------------------*/
++#ifndef _CODE93_H_
++#define _CODE93_H_
++
++/* Code 93 specific decode state */
++typedef struct code93_decoder_s {
++    unsigned direction : 1;     /* scan direction: 0=fwd/space, 1=rev/bar */
++    unsigned element : 3;       /* element offset 0-5 */
++    int character : 12;         /* character position in symbol */
++    unsigned width;             /* last character width */
++    unsigned char buf;          /* first character */
++
++    unsigned config;
++    int configs[NUM_CFGS];      /* int valued configurations */
++} code93_decoder_t;
++
++/* reset Code 93 specific state */
++static inline void code93_reset (code93_decoder_t *dcode93)
++{
++    dcode93->direction = 0;
++    dcode93->element = 0;
++    dcode93->character = -1;
++}
++
++/* decode Code 93 symbols */
++zbar_symbol_type_t _zbar_decode_code93(zbar_decoder_t *dcode);
++
++#endif
+diff --git a/zbar/decoder/databar.c b/zbar/decoder/databar.c
+new file mode 100644
+--- /dev/null
++++ b/zbar/decoder/databar.c
+@@ -0,0 +1,1277 @@
++/*------------------------------------------------------------------------
++ *  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
++ *
++ *  This file is part of the ZBar Bar Code Reader.
++ *
++ *  The ZBar Bar Code Reader is free software; you can redistribute it
++ *  and/or modify it under the terms of the GNU Lesser Public License as
++ *  published by the Free Software Foundation; either version 2.1 of
++ *  the License, or (at your option) any later version.
++ *
++ *  The ZBar Bar Code Reader is distributed in the hope that it will be
++ *  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
++ *  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU Lesser Public License for more details.
++ *
++ *  You should have received a copy of the GNU Lesser Public License
++ *  along with the ZBar Bar Code Reader; if not, write to the Free
++ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++ *  Boston, MA  02110-1301  USA
++ *
++ *  http://sourceforge.net/projects/zbar
++ *------------------------------------------------------------------------*/
++
++#include <config.h>
++#include <zbar.h>
++
++#ifdef DEBUG_DATABAR
++# define DEBUG_LEVEL (DEBUG_DATABAR)
++#endif
++#include "debug.h"
++#include "decoder.h"
++
++#define GS ('\035')
++
++enum { SCH_NUM, SCH_ALNUM, SCH_ISO646 };
++
++static const signed char finder_hash[0x20] = {
++    0x16, 0x1f, 0x02, 0x00, 0x03, 0x00, 0x06, 0x0b,
++    0x1f, 0x0e, 0x17, 0x0c, 0x0b, 0x14, 0x11, 0x0c,
++    0x1f, 0x03, 0x13, 0x08, 0x00, 0x0a,   -1, 0x16,
++    0x0c, 0x09,   -1, 0x1a, 0x1f, 0x1c, 0x00,   -1,
++};
++
++/* DataBar character encoding groups */
++struct group_s {
++    unsigned short sum;
++    unsigned char wmax;
++    unsigned char todd;
++    unsigned char teven;
++} groups[] = {
++    /* (17,4) DataBar Expanded character groups */
++    {    0, 7,  87,   4 },
++    {  348, 5,  52,  20 },
++    { 1388, 4,  30,  52 },
++    { 2948, 3,  10, 104 },
++    { 3988, 1,   1, 204 },
++
++    /* (16,4) DataBar outer character groups */
++    {    0, 8, 161,   1 },
++    {  161, 6,  80,  10 },
++    {  961, 4,  31,  34 },
++    { 2015, 3,  10,  70 },
++    { 2715, 1,   1, 126 },
++
++    /* (15,4) DataBar inner character groups */
++    { 1516, 8,  81,   1 },
++    { 1036, 6,  48,  10 },
++    {  336, 4,  20,  35 },
++    {    0, 2,   4,  84 },
++};
++
++static const unsigned char exp_sequences[] = {
++    /* sequence Group 1 */
++    0x01,
++    0x23,
++    0x25, 0x07,
++    0x29, 0x47,
++    0x29, 0x67, 0x0b,
++    0x29, 0x87, 0xab,
++    /* sequence Group 2 */
++    0x21, 0x43, 0x65, 0x07,
++    0x21, 0x43, 0x65, 0x89,
++    0x21, 0x43, 0x65, 0xa9, 0x0b,
++    0x21, 0x43, 0x67, 0x89, 0xab
++};
++
++/* DataBar expanded checksum multipliers */
++static const unsigned char exp_checksums[] = {
++    1, 189, 62, 113, 46, 43, 109, 134, 6, 79, 161, 45
++};
++
++static inline void
++append_check14 (unsigned char *buf)
++{
++    unsigned char chk = 0, d;
++    int i;
++    for(i = 13; --i >= 0; ) {
++        d = *(buf++) - '0';
++        chk += d;
++        if(!(i & 1))
++            chk += d << 1;
++    }
++    chk %= 10;
++    if(chk)
++        chk = 10 - chk;
++    *buf = chk + '0';
++}
++
++static inline void
++decode10 (unsigned char *buf,
++          unsigned long n,
++          int i)
++{
++    buf += i;
++    while(--i >= 0) {
++        unsigned char d = n % 10;
++        n /= 10;
++        *--buf = '0' + d;
++    }
++}
++
++#define VAR_MAX(l, i) ((((l) * 12 + (i)) * 2 + 6) / 7)
++
++#define FEED_BITS(b)                         \
++    while(i < (b) && len) {                  \
++        d = (d << 12) | (*(data++) & 0xfff); \
++        i += 12;                             \
++        len--;                               \
++        dprintf(2, " %03lx", d & 0xfff);     \
++    }
++
++#define PUSH_CHAR(c) \
++    *(buf++) = (c)
++
++#define PUSH_CHAR4(c0, c1, c2, c3) do { \
++        PUSH_CHAR(c0);                  \
++        PUSH_CHAR(c1);                  \
++        PUSH_CHAR(c2);                  \
++        PUSH_CHAR(c3);                  \
++    } while(0);
++
++static inline int
++databar_postprocess_exp (zbar_decoder_t *dcode,
++                         int *data)
++{
++    int i = 0, enc;
++    unsigned n;
++    unsigned char *buf;
++    unsigned long d = *(data++);
++    int len = d / 211 + 4, buflen;
++
++    /* grok encodation method */
++    d = *(data++);
++    dprintf(2, "\n    len=%d %03lx", len, d & 0xfff);
++    n = (d >> 4) & 0x7f;
++    if(n >= 0x40) {
++        i = 10;
++        enc = 1;
++        buflen = 2 + 14 + VAR_MAX(len, 10 - 2 - 44 + 6) + 2;
++    }
++    else if(n >= 0x38) {
++        i = 4;
++        enc = 6 + (n & 7);
++        buflen = 2 + 14 + 4 + 6 + 2 + 6 + 2;
++    }
++    else if(n >= 0x30) {
++        i = 6;
++        enc = 2 + ((n >> 2) & 1);
++        buflen = 2 + 14 + 4 + 3 + VAR_MAX(len, 6 - 2 - 44 - 2 - 10) + 2;
++    }
++    else if(n >= 0x20) {
++        i = 7;
++        enc = 4 + ((n >> 3) & 1);
++        buflen = 2 + 14 + 4 + 6;
++    }
++    else {
++        i = 9;
++        enc = 0;
++        buflen = VAR_MAX(len, 9 - 2) + 2;
++    }
++    dprintf(2, " buflen=%d enc=%d", buflen, enc);
++    zassert(buflen > 2, -1, "buflen=%d\n", buflen);
++
++    if(enc < 4) {
++        /* grok variable length symbol bit field */
++        if((len ^ (d >> (--i))) & 1)
++            /* even/odd length mismatch */
++            return(-1);
++        if(((d >> (--i)) & 1) != (len > 14))
++            /* size group mismatch */
++            return(-1);
++    }
++    len -= 2;
++    dprintf(2, " [%d+%d]", i, len);
++
++    if(size_buf(dcode, buflen))
++        return(-1);
++    buf = dcode->buf;
++
++    /* handle compressed fields */
++    if(enc) {
++        PUSH_CHAR('0');
++        PUSH_CHAR('1');
++    }
++
++    if(enc == 1) {
++        i -= 4;
++        n = (d >> i) & 0xf;
++        if(i >= 10)
++            return(-1);
++        PUSH_CHAR('0' + n);
++    }
++    else if(enc)
++        PUSH_CHAR('9');
++
++    if(enc) {
++        int j;
++        for(j = 0; j < 4; j++) {
++            FEED_BITS(10);
++            i -= 10;
++            n = (d >> i) & 0x3ff;
++            if(n >= 1000)
++                return(-1);
++            decode10(buf, n, 3);
++            buf += 3;
++        }
++        append_check14(buf - 13);
++        buf++;
++    }
++
++    switch(enc)
++    {
++    case 2: /* 01100: AI 392x */
++        FEED_BITS(2);
++        i -= 2;
++        n = (d >> i) & 0x3;
++        PUSH_CHAR4('3', '9', '2', '0' + n);
++        break;
++
++    case 3: /* 01101: AI 393x */
++        FEED_BITS(12);
++        i -= 2;
++        n = (d >> i) & 0x3;
++        PUSH_CHAR4('3', '9', '3', '0' + n);
++        i -= 10;
++        n = (d >> i) & 0x3ff;
++        if(n >= 1000)
++            return(-1);
++        decode10(buf, n, 3);
++        buf += 3;
++        break;
++
++    case 4: /* 0100: AI 3103 */
++        FEED_BITS(15);
++        i -= 15;
++        n = (d >> i) & 0x7fff;
++        PUSH_CHAR4('3', '1', '0', '3');
++        decode10(buf, n, 6);
++        buf += 6;
++        break;
++
++    case 5: /* 0101: AI 3202/3203 */
++        FEED_BITS(15);
++        i -= 15;
++        n = (d >> i) & 0x7fff;
++        dprintf(2, " v=%d", n);
++        PUSH_CHAR4('3', '2', '0', (n >= 10000) ? '3' : '2' );
++        if(n >= 10000)
++            n -= 10000;
++        decode10(buf, n, 6);
++        buf += 6;
++        break;
++    }
++    if(enc >= 6) {
++        /* 0111000 - 0111111: AI 310x/320x + AI 11/13/15/17 */
++        PUSH_CHAR4('3', '1' + (enc & 1), '0', 'x');
++        FEED_BITS(20);
++        i -= 20;
++        n = (d >> i) & 0xfffff;
++        dprintf(2, " [%d+%d] %d", i, len, n);
++        if(n >= 1000000)
++            return(-1);
++        decode10(buf, n, 6);
++        *(buf - 1) = *buf;
++        *buf = '0';
++        buf += 6;
++
++        FEED_BITS(16);
++        i -= 16;
++        n = (d >> i) & 0xffff;
++        if(n < 38400) {
++            int dd, mm, yy;
++            dd = n % 32;
++            n /= 32;
++            mm = n % 12 + 1;
++            n /= 12;
++            yy = n;
++            PUSH_CHAR('1');
++            PUSH_CHAR('0' + (enc - 6) | 1);
++            decode10(buf, yy, 2);
++            buf += 2;
++            decode10(buf, mm, 2);
++            buf += 2;
++            decode10(buf, dd, 2);
++            buf += 2;
++        }
++        else if(n > 38400)
++            return(-1);
++    }
++
++    if(enc < 4) {
++        /* remainder is general-purpose data compaction */
++        int scheme = SCH_NUM;
++        while(i > 0 || len > 0) {
++            FEED_BITS(8);
++            dprintf(2, " [%d+%d]", i, len);
++
++            if(scheme == SCH_NUM) {
++                int n1;
++                i -= 4;
++                if(i < 0)
++                    break;
++                if(!((d >> i) & 0xf)) {
++                    scheme = SCH_ALNUM;
++                    dprintf(2, ">A");
++                    continue;
++                }
++                if(!len && i < 3) {
++                    /* special case last digit */
++                    n = ((d >> i) & 0xf) - 1;
++                    if(n > 9)
++                        return(-1);
++                    *(buf++) = '0' + n;
++                    break;
++                }
++                i -= 3;
++                zassert(i >= 0, -1, "\n");
++                n = ((d >> i) & 0x7f) - 8;
++                n1 = n % 11;
++                n = n / 11;
++                dprintf(2, "N%d%d", n, n1);
++                *(buf++) = (n < 10) ? '0' + n : GS;
++                *(buf++) = (n1 < 10) ? '0' + n1 : GS;
++            }
++            else  {
++                unsigned c = 0;
++                i -= 3;
++                if(i < 0)
++                    break;
++                if(!((d >> i) & 0x7)) {
++                    scheme = SCH_NUM;
++                    continue;
++                }
++                i -= 2;
++                if(i < 0)
++                    break;
++                n = (d >> i) & 0x1f;
++                if(n == 0x04) {
++                    scheme ^= 0x3;
++                    dprintf(2, ">%d", scheme);
++                }
++                else if(n == 0x0f)
++                    c = GS;
++                else if(n < 0x0f)
++                    c = 43 + n;
++                else if(scheme == SCH_ALNUM) {
++                    i--;
++                    if(i < 0)
++                        return(-1);
++                    n = (d >> i) & 0x1f;
++                    if(n < 0x1a)
++                        c = 'A' + n;
++                    else if(n == 0x1a)
++                        c = '*';
++                    else if(n < 0x1f)
++                        c = ',' + n - 0x1b;
++                    else
++                        return(-1);
++                }
++                else if(scheme == SCH_ISO646 && n < 0x1d) {
++                    i -= 2;
++                    if(i < 0)
++                        return(-1);
++                    n = (d >> i) & 0x3f;
++                    if(n < 0x1a)
++                        c = 'A' + n;
++                    else if(n < 0x34)
++                        c = 'a' + n - 0x1a;
++                    else
++                        return(-1);
++                }
++                else if(scheme == SCH_ISO646) {
++                    i -= 3;
++                    if(i < 0)
++                        return(-1);
++                    n = ((d >> i) & 0x1f);
++                    dprintf(2, "(%02x)", n);
++                    if(n < 0xa)
++                        c = '!' + n - 8;
++                    else if(n < 0x15)
++                        c = '%' + n - 0xa;
++                    else if(n < 0x1b)
++                        c = ':' + n - 0x15;
++                    else if(n == 0x1b)
++                        c = '_';
++                    else if(n == 0x1c)
++                        c = ' ';
++                    else
++                        return(-1);
++                }
++                else
++                    return(-1);
++
++                if(c) {
++                    dprintf(2, "%d%c", scheme, c);
++                    *(buf++) = c;
++                }
++            }
++        }
++        /* FIXME check pad? */
++    }
++
++    *buf = 0;
++    i = buf - dcode->buf;
++    dcode->buflen = i;
++    if(i && *--buf == GS) {
++        *buf = 0;
++        dcode->buflen--;
++    }
++
++    dprintf(2, "\n    %s", _zbar_decoder_buf_dump(dcode->buf, dcode->buflen));
++    return(0);
++}
++#undef FEED_BITS
++
++/* convert from heterogeneous base {1597,2841}
++ * to base 10 character representation
++ */
++static inline void
++databar_postprocess (zbar_decoder_t *dcode,
++                     unsigned d[4])
++{
++    databar_decoder_t *db = &dcode->databar;
++    int i;
++    unsigned c, chk = 0;
++    unsigned char *buf = dcode->buf;
++    *(buf++) = '0';
++    *(buf++) = '1';
++    buf += 15;
++    *--buf = '\0';
++    *--buf = '\0';
++
++    dprintf(2, "\n    d={%d,%d,%d,%d}", d[0], d[1], d[2], d[3]);
++    unsigned long r = d[0] * 1597 + d[1];
++    d[1] = r / 10000;
++    r %= 10000;
++    r = r * 2841 + d[2];
++    d[2] = r / 10000;
++    r %= 10000;
++    r = r * 1597 + d[3];
++    d[3] = r / 10000;
++    dprintf(2, " r=%ld", r);
++
++    for(i = 4; --i >= 0; ) {
++        c = r % 10;
++        chk += c;
++        if(i & 1)
++            chk += c << 1;
++        *--buf = c + '0';
++        if(i)
++            r /= 10;
++    }
++
++    dprintf(2, " d={%d,%d,%d}", d[1], d[2], d[3]);
++    r = d[1] * 2841 + d[2];
++    d[2] = r / 10000;
++    r %= 10000;
++    r = r * 1597 + d[3];
++    d[3] = r / 10000;
++    dprintf(2, " r=%ld", r);
++
++    for(i = 4; --i >= 0; ) {
++        c = r % 10;
++        chk += c;
++        if(i & 1)
++            chk += c << 1;
++        *--buf = c + '0';
++        if(i)
++            r /= 10;
++    }
++
++    r = d[2] * 1597 + d[3];
++    dprintf(2, " d={%d,%d} r=%ld", d[2], d[3], r);
++
++    for(i = 5; --i >= 0; ) {
++        c = r % 10;
++        chk += c;
++        if(!(i & 1))
++            chk += c << 1;
++        *--buf = c + '0';
++        if(i)
++            r /= 10;
++    }
++
++    /* NB linkage flag not supported */
++    if(TEST_CFG(db->config, ZBAR_CFG_EMIT_CHECK)) {
++        chk %= 10;
++        if(chk)
++            chk = 10 - chk;
++        buf[13] = chk + '0';
++        dcode->buflen = buf - dcode->buf + 14;
++    }
++    else
++        dcode->buflen = buf - dcode->buf + 13;
++
++    dprintf(2, "\n    %s", _zbar_decoder_buf_dump(dcode->buf, 16));
++}
++
++static inline int
++check_width (unsigned wf,
++             unsigned wd,
++             unsigned n)
++{
++    unsigned dwf = wf * 3;
++    wd *= 14;
++    wf *= n;
++    return(wf - dwf <= wd && wd <= wf + dwf);
++}
++
++static inline void
++merge_segment (databar_decoder_t *db,
++               databar_segment_t *seg)
++{
++    unsigned csegs = db->csegs;
++    int i;
++    for(i = 0; i < csegs; i++) {
++        databar_segment_t *s = db->segs + i;
++        if(s != seg && s->finder == seg->finder && s->exp == seg->exp &&
++           s->color == seg->color && s->side == seg->side &&
++           s->data == seg->data && s->check == seg->check &&
++           check_width(seg->width, s->width, 14)) {
++            /* merge with existing segment */
++            unsigned cnt = s->count;
++            if(cnt < 0x7f)
++                cnt++;
++            seg->count = cnt;
++            seg->partial &= s->partial;
++            seg->width = (3 * seg->width + s->width + 2) / 4;
++            s->finder = -1;
++            dprintf(2, " dup@%d(%d,%d)",
++                    i, cnt, (db->epoch - seg->epoch) & 0xff);
++        }
++        else if(s->finder >= 0) {
++            unsigned age = (db->epoch - s->epoch) & 0xff;
++            if(age >= 248 || (age >= 128 && s->count < 2))
++                s->finder = -1;
++        }
++    }
++}
++
++static inline zbar_symbol_type_t
++match_segment (zbar_decoder_t *dcode,
++               databar_segment_t *seg)
++{
++    databar_decoder_t *db = &dcode->databar;
++    unsigned csegs = db->csegs, maxage = 0xfff;
++    int i0, i1, i2, maxcnt = 0;
++    databar_segment_t *smax[3] = { NULL, };
++
++    if(seg->partial && seg->count < 4)
++        return(ZBAR_PARTIAL);
++
++    for(i0 = 0; i0 < csegs; i0++) {
++        databar_segment_t *s0 = db->segs + i0;
++        if(s0 == seg || s0->finder != seg->finder || s0->exp ||
++           s0->color != seg->color || s0->side == seg->side ||
++           (s0->partial && s0->count < 4) ||
++           !check_width(seg->width, s0->width, 14))
++            continue;
++
++        for(i1 = 0; i1 < csegs; i1++) {
++            databar_segment_t *s1 = db->segs + i1;
++            int chkf, chks, chk;
++            unsigned age1;
++            if(i1 == i0 || s1->finder < 0 || s1->exp ||
++               s1->color == seg->color ||
++               (s1->partial && s1->count < 4) ||
++               !check_width(seg->width, s1->width, 14))
++                continue;
++            dprintf(2, "\n\t[%d,%d] f=%d(0%xx)/%d(%x%x%x)",
++                    i0, i1, seg->finder, seg->color,
++                    s1->finder, s1->exp, s1->color, s1->side);
++
++            if(seg->color)
++                chkf = seg->finder + s1->finder * 9;
++            else
++                chkf = s1->finder + seg->finder * 9;
++            if(chkf > 72)
++                chkf--;
++            if(chkf > 8)
++                chkf--;
++
++            chks = (seg->check + s0->check + s1->check) % 79;
++
++            if(chkf >= chks)
++                chk = chkf - chks;
++            else
++                chk = 79 + chkf - chks;
++
++            dprintf(2, " chk=(%d,%d) => %d", chkf, chks, chk);
++            age1 = ((db->epoch - s0->epoch) & 0xff +
++                    (db->epoch - s1->epoch) & 0xff);
++
++            for(i2 = i1 + 1; i2 < csegs; i2++) {
++                databar_segment_t *s2 = db->segs + i2;
++                unsigned cnt, age2, age;
++                if(i2 == i0 || s2->finder != s1->finder || s2->exp ||
++                   s2->color != s1->color || s2->side == s1->side ||
++                   s2->check != chk ||
++                   (s2->partial && s2->count < 4) ||
++                   !check_width(seg->width, s2->width, 14))
++                    continue;
++                age2 = (db->epoch - s2->epoch) & 0xff;
++                age = age1 + age2;
++                cnt = s0->count + s1->count + s2->count;
++                dprintf(2, " [%d] MATCH cnt=%d age=%d", i2, cnt, age);
++                if(maxcnt < cnt ||
++                   (maxcnt == cnt && maxage > age)) {
++                    maxcnt = cnt;
++                    maxage = age;
++                    smax[0] = s0;
++                    smax[1] = s1;
++                    smax[2] = s2;
++                }
++            }
++        }
++    }
++
++    if(!smax[0])
++        return(ZBAR_PARTIAL);
++
++    unsigned d[4];
++    d[(seg->color << 1) | seg->side] = seg->data;
++    for(i0 = 0; i0 < 3; i0++) {
++        d[(smax[i0]->color << 1) | smax[i0]->side] = smax[i0]->data;
++        if(!--(smax[i0]->count))
++            smax[i0]->finder = -1;
++    }
++    seg->finder = -1;
++
++    if(size_buf(dcode, 18))
++        return(ZBAR_PARTIAL);
++
++    if(acquire_lock(dcode, ZBAR_DATABAR))
++        return(ZBAR_PARTIAL);
++
++    databar_postprocess(dcode, d);
++    dcode->modifiers = MOD(ZBAR_MOD_GS1);
++    dcode->direction = 1 - 2 * (seg->side ^ seg->color ^ 1);
++    return(ZBAR_DATABAR);
++}
++
++static inline unsigned
++lookup_sequence (databar_segment_t *seg,
++                 int fixed,
++                 int seq[22])
++{
++    unsigned n = seg->data / 211, i;
++    const unsigned char *p;
++    i = (n + 1) / 2 + 1;
++    n += 4;
++    i = (i * i) / 4;
++    dprintf(2, " {%d,%d:", i, n);
++    p = exp_sequences + i;
++
++    fixed >>= 1;
++    seq[0] = 0;
++    seq[1] = 1;
++    for(i = 2; i < n; ) {
++        int s = *p;
++        if(!(i & 2)) {
++            p++;
++            s >>= 4;
++        }
++        else
++            s &= 0xf;
++        if(s == fixed)
++            fixed = -1;
++        s <<= 1;
++        dprintf(2, "%x", s);
++        seq[i++] = s++;
++        seq[i++] = s;
++    }
++    dprintf(2, "}");
++    seq[n] = -1;
++    return(fixed < 1);
++}
++
++#define IDX(s) \
++    (((s)->finder << 2) | ((s)->color << 1) | ((s)->color ^ (s)->side))
++
++static inline zbar_symbol_type_t
++match_segment_exp (zbar_decoder_t *dcode,
++                   databar_segment_t *seg,
++                   int dir)
++{
++    databar_decoder_t *db = &dcode->databar;
++    int bestsegs[22], i = 0, segs[22], seq[22];
++    int ifixed = seg - db->segs, fixed = IDX(seg), maxcnt = 0;
++    int iseg[DATABAR_MAX_SEGMENTS];
++    unsigned csegs = db->csegs, width = seg->width, maxage = 0x7fff;
++
++    bestsegs[0] = segs[0] = seq[1] = -1;
++    seq[0] = 0;
++
++    dprintf(2, "\n    fixed=%d@%d: ", fixed, ifixed);
++    for(i = csegs, seg = db->segs + csegs - 1; --i >= 0; seg--) {
++        if(seg->exp && seg->finder >= 0 &&
++           (!seg->partial || seg->count >= 4))
++            iseg[i] = IDX(seg);
++        else
++            iseg[i] = -1;
++        dprintf(2, " %d", iseg[i]);
++    }
++
++    for(i = 0; ; i--) {
++        if(!i)
++            dprintf(2, "\n   ");
++        for(; i >= 0 && seq[i] >= 0; i--) {
++            int j;
++            dprintf(2, " [%d]%d", i, seq[i]);
++
++            if(seq[i] == fixed) {
++                seg = db->segs + ifixed;
++                if(segs[i] < 0 && check_width(width, seg->width, 14)) {
++                    dprintf(2, "*");
++                    j = ifixed;
++                }
++                else
++                    continue;
++            }
++            else {
++                for(j = segs[i] + 1; j < csegs; j++) {
++                    if(iseg[j] == seq[i] &&
++                       (!i || check_width(width, db->segs[j].width, 14))) {
++                        seg = db->segs + j;
++                        break;
++                    }
++                }
++                if(j == csegs)
++                    continue;
++            }
++
++            if(!i) {
++                if(!lookup_sequence(seg, fixed, seq)) {
++                    dprintf(2, "[nf]");
++                    continue;
++                }
++                width = seg->width;
++                dprintf(2, " A00@%d", j);
++            }
++            else {
++                width = (width + seg->width) / 2;
++                dprintf(2, " %c%x%x@%d",
++                        'A' + seg->finder, seg->color, seg->side, j);
++            }
++            segs[i++] = j;
++            segs[i++] = -1;
++        }
++        if(i < 0)
++            break;
++
++        seg = db->segs + segs[0];
++        unsigned cnt = 0, chk = 0, age = (db->epoch - seg->epoch) & 0xff;
++        for(i = 1; segs[i] >= 0; i++) {
++            seg = db->segs + segs[i];
++            chk += seg->check;
++            cnt += seg->count;
++            age += (db->epoch - seg->epoch) & 0xff;
++        }
++
++        unsigned data0 = db->segs[segs[0]].data;
++        unsigned chk0 = data0 % 211;
++        chk %= 211;
++
++        dprintf(2, " chk=%d ?= %d", chk, chk0);
++        if(chk != chk0)
++            continue;
++
++        dprintf(2, " cnt=%d age=%d", cnt, age);
++        if(maxcnt > cnt || (maxcnt == cnt && maxage <= age))
++            continue;
++
++        dprintf(2, " !");
++        maxcnt = cnt;
++        maxage = age;
++        for(i = 0; segs[i] >= 0; i++)
++            bestsegs[i] = segs[i];
++        bestsegs[i] = -1;
++    }
++
++    if(bestsegs[0] < 0)
++        return(ZBAR_PARTIAL);
++
++    if(acquire_lock(dcode, ZBAR_DATABAR_EXP))
++        return(ZBAR_PARTIAL);
++
++    for(i = 0; bestsegs[i] >= 0; i++)
++        segs[i] = db->segs[bestsegs[i]].data;
++
++    if(databar_postprocess_exp(dcode, segs)) {
++        release_lock(dcode, ZBAR_DATABAR_EXP);
++        return(ZBAR_PARTIAL);
++    }
++
++    for(i = 0; bestsegs[i] >= 0; i++)
++        if(bestsegs[i] != ifixed) {
++            seg = db->segs + bestsegs[i];
++            if(!--seg->count)
++                seg->finder = -1;
++        }
++
++    /* FIXME stacked rows are frequently reversed,
++     * so direction is impossible to determine at this level
++     */
++    dcode->direction = (1 - 2 * (seg->side ^ seg->color)) * dir;
++    dcode->modifiers = MOD(ZBAR_MOD_GS1);
++    return(ZBAR_DATABAR_EXP);
++}
++#undef IDX
++
++static inline unsigned
++calc_check (unsigned sig0,
++            unsigned sig1,
++            unsigned side,
++            unsigned mod)
++{
++    unsigned chk = 0;
++    int i;
++    for(i = 4; --i >= 0; ) {
++        chk = (chk * 3 + (sig1 & 0xf) + 1) * 3 + (sig0 & 0xf) + 1;
++        sig1 >>= 4;
++        sig0 >>= 4;
++        if(!(i & 1))
++            chk %= mod;
++    }
++    dprintf(2, " chk=%d", chk);
++
++    if(side)
++        chk = (chk * (6561 % mod)) % mod;
++    return(chk);
++}
++
++static inline int
++calc_value4 (unsigned sig,
++             unsigned n,
++             unsigned wmax,
++             unsigned nonarrow)
++{
++    unsigned v = 0;
++    n--;
++
++    unsigned w0 = (sig >> 12) & 0xf;
++    if(w0 > 1) {
++        if(w0 > wmax)
++            return(-1);
++        unsigned n0 = n - w0;
++        unsigned sk20 = (n - 1) * n * (2 * n - 1);
++        unsigned sk21 = n0 * (n0 + 1) * (2 * n0 + 1);
++        v = sk20 - sk21 - 3 * (w0 - 1) * (2 * n - w0);
++
++        if(!nonarrow && w0 > 2 && n > 4) {
++            unsigned k = (n - 2) * (n - 1) * (2 * n - 3) - sk21;
++            k -= 3 * (w0 - 2) * (14 * n - 7 * w0 - 31);
++            v -= k;
++        }
++
++        if(n - 2 > wmax) {
++            unsigned wm20 = 2 * wmax * (wmax + 1);
++            unsigned wm21 = (2 * wmax + 1);
++            unsigned k = sk20;
++            if(n0 > wmax) {
++                k -= sk21;
++                k += 3 * (w0 - 1) * (wm20 - wm21 * (2 * n - w0));
++            }
++            else {
++                k -= (wmax + 1) * (wmax + 2) * (2 * wmax + 3);
++                k += 3 * (n - wmax - 2) * (wm20 - wm21 * (n + wmax + 1));
++            }
++            k *= 3;
++            v -= k;
++        }
++        v /= 12;
++    }
++    else
++        nonarrow = 1;
++    n -= w0;
++
++    unsigned w1 = (sig >> 8) & 0xf;
++    if(w1 > 1) {
++        if(w1 > wmax)
++            return(-1);
++        v += (2 * n - w1) * (w1 - 1) / 2;
++        if(!nonarrow && w1 > 2 && n > 3)
++            v -= (2 * n - w1 - 5) * (w1 - 2) / 2;
++        if(n - 1 > wmax) {
++            if(n - w1 > wmax)
++                v -= (w1 - 1) * (2 * n - w1 - 2 * wmax);
++            else
++                v -= (n - wmax) * (n - wmax - 1);
++        }
++    }
++    else
++        nonarrow = 1;
++    n -= w1;
++
++    unsigned w2 = (sig >> 4) & 0xf;
++    if(w2 > 1) {
++        if(w2 > wmax)
++            return(-1);
++        v += w2 - 1;
++        if(!nonarrow && w2 > 2 && n > 2)
++            v -= n - 2;
++        if(n > wmax)
++            v -= n - wmax;
++    }
++    else
++        nonarrow = 1;
++
++    unsigned w3 = sig & 0xf;
++    if(w3 == 1)
++        nonarrow = 1;
++    else if(w3 > wmax)
++        return(-1);
++
++    if(!nonarrow)
++        return(-1);
++
++    return(v);
++}
++
++static inline zbar_symbol_type_t
++decode_char (zbar_decoder_t *dcode,
++             databar_segment_t *seg,
++             int off,
++             int dir)
++{
++    databar_decoder_t *db = &dcode->databar;
++    unsigned s = calc_s(dcode, (dir > 0) ? off : off - 6, 8);
++    int n, i, emin[2] = { 0, }, sum = 0;
++    unsigned sig0 = 0, sig1 = 0;
++
++    if(seg->exp)
++        n = 17;
++    else if(seg->side)
++        n = 15;
++    else
++        n = 16;
++    emin[1] = -n;
++
++    dprintf(2, "\n        char[%c%d]: n=%d s=%d w=%d sig=",
++            (dir < 0) ? '>' : '<', off, n, s, seg->width);
++    if(s < 13 || !check_width(seg->width, s, n))
++        return(ZBAR_NONE);
++
++    for(i = 4; --i >= 0; ) {
++        int e = decode_e(pair_width(dcode, off), s, n);
++        if(e < 0)
++            return(ZBAR_NONE);
++        dprintf(2, "%d", e);
++        sum = e - sum;
++        off += dir;
++        sig1 <<= 4;
++        if(emin[1] < -sum)
++            emin[1] = -sum;
++        sig1 += sum;
++        if(!i)
++            break;
++
++        e = decode_e(pair_width(dcode, off), s, n);
++        if(e < 0)
++            return(ZBAR_NONE);
++        dprintf(2, "%d", e);
++        sum = e - sum;
++        off += dir;
++        sig0 <<= 4;
++        if(emin[0] > sum)
++            emin[0] = sum;
++        sig0 += sum;
++    }
++
++    int diff = emin[~n & 1];
++    diff = diff + (diff << 4);
++    diff = diff + (diff << 8);
++
++    sig0 -= diff;
++    sig1 += diff;
++
++    dprintf(2, " emin=%d,%d el=%04x/%04x", emin[0], emin[1], sig0, sig1);
++
++    unsigned sum0 = sig0 + (sig0 >> 8);
++    unsigned sum1 = sig1 + (sig1 >> 8);
++    sum0 += sum0 >> 4;
++    sum1 += sum1 >> 4;
++    sum0 &= 0xf;
++    sum1 &= 0xf;
++
++    dprintf(2, " sum=%d/%d", sum0, sum1);
++
++    if(sum0 + sum1 + 8 != n) {
++        dprintf(2, " [SUM]");
++        return(ZBAR_NONE);
++    }
++
++    if(((sum0 ^ (n >> 1)) | (sum1 ^ (n >> 1) ^ n)) & 1) {
++        dprintf(2, " [ODD]");
++        return(ZBAR_NONE);
++    }
++
++    i = ((n & 0x3) ^ 1) * 5 + (sum1 >> 1);
++    zassert(i < sizeof(groups) / sizeof(*groups), -1,
++            "n=%d sum=%d/%d sig=%04x/%04x g=%d",
++            n, sum0, sum1, sig0, sig1, i);
++    struct group_s *g = groups + i;
++    dprintf(2, "\n            g=%d(%d,%d,%d/%d)",
++            i, g->sum, g->wmax, g->todd, g->teven);
++
++    int vodd = calc_value4(sig0 + 0x1111, sum0 + 4, g->wmax, ~n & 1);
++    dprintf(2, " v=%d", vodd);
++    if(vodd < 0 || vodd > g->todd)
++        return(ZBAR_NONE);
++
++    int veven = calc_value4(sig1 + 0x1111, sum1 + 4, 9 - g->wmax, n & 1);
++    dprintf(2, "/%d", veven);
++    if(veven < 0 || veven > g->teven)
++        return(ZBAR_NONE);
++
++    int v = g->sum;
++    if(n & 2)
++        v += vodd + veven * g->todd;
++    else
++        v += veven + vodd * g->teven;
++
++    dprintf(2, " f=%d(%x%x%x)", seg->finder, seg->exp, seg->color, seg->side);
++
++    unsigned chk = 0;
++    if(seg->exp) {
++        unsigned side = seg->color ^ seg->side ^ 1;
++        if(v >= 4096)
++            return(ZBAR_NONE);
++        /* skip A1 left */
++        chk = calc_check(sig0, sig1, side, 211);
++        if(seg->finder || seg->color || seg->side) {
++            i = (seg->finder << 1) - side + seg->color;
++            zassert(i >= 0 && i < 12, ZBAR_NONE,
++                    "f=%d(%x%x%x) side=%d i=%d\n",
++                    seg->finder, seg->exp, seg->color, seg->side, side, i);
++            chk = (chk * exp_checksums[i]) % 211;
++        }
++        else if(v >= 4009)
++            return(ZBAR_NONE);
++        else
++            chk = 0;
++    }
++    else {
++        chk = calc_check(sig0, sig1, seg->side, 79);
++        if(seg->color)
++            chk = (chk * 16) % 79;
++    }
++    dprintf(2, " => %d val=%d", chk, v);
++
++    seg->check = chk;
++    seg->data = v;
++
++    merge_segment(db, seg);
++
++    if(seg->exp)
++        return(match_segment_exp(dcode, seg, dir));
++    else if(dir > 0)
++        return(match_segment(dcode, seg));
++    return(ZBAR_PARTIAL);
++}
++
++static inline int
++alloc_segment (databar_decoder_t *db)
++{
++    unsigned maxage = 0, csegs = db->csegs;
++    int i, old = -1;
++    for(i = 0; i < csegs; i++) {
++        databar_segment_t *seg = db->segs + i;
++        unsigned age;
++        if(seg->finder < 0) {
++            dprintf(2, " free@%d", i);
++            return(i);
++        }
++        age = (db->epoch - seg->epoch) & 0xff;
++        if(age >= 128 && seg->count < 2) {
++            seg->finder = -1;
++            dprintf(2, " stale@%d (%d - %d = %d)",
++                    i, db->epoch, seg->epoch, age);
++            return(i);
++        }
++
++        /* score based on both age and count */
++        if(age > seg->count)
++            age = age - seg->count + 1;
++        else
++            age = 1;
++
++        if(maxage < age) {
++            maxage = age;
++            old = i;
++            dprintf(2, " old@%d(%u)", i, age);
++        }
++    }
++
++    if(csegs < DATABAR_MAX_SEGMENTS) {
++        dprintf(2, " new@%d", i);
++        i = csegs;
++        csegs *= 2;
++        if(csegs > DATABAR_MAX_SEGMENTS)
++            csegs = DATABAR_MAX_SEGMENTS;
++        if(csegs != db->csegs) {
++            databar_segment_t *seg;
++            db->segs = realloc(db->segs, csegs * sizeof(*db->segs));
++            db->csegs = csegs;
++            seg = db->segs + csegs;
++            while(--seg, --csegs >= i) {
++                seg->finder = -1;
++                seg->exp = 0;
++                seg->color = 0;
++                seg->side = 0;
++                seg->partial = 0;
++                seg->count = 0;
++                seg->epoch = 0;
++                seg->check = 0;
++            }
++            return(i);
++        }
++    }
++    zassert(old >= 0, -1, "\n");
++
++    db->segs[old].finder = -1;
++    return(old);
++}
++
++static inline zbar_symbol_type_t
++decode_finder (zbar_decoder_t *dcode)
++{
++    databar_decoder_t *db = &dcode->databar;
++    databar_segment_t *seg;
++    unsigned e0 = pair_width(dcode, 1);
++    unsigned e2 = pair_width(dcode, 3);
++    unsigned e1, e3, s, finder, dir;
++    int sig, iseg;
++    dprintf(2, "      databar: e0=%d e2=%d", e0, e2);
++    if(e0 < e2) {
++        unsigned e = e2 * 4;
++        if(e < 15 * e0 || e > 34 * e0)
++            return(ZBAR_NONE);
++        dir = 0;
++        e3 = pair_width(dcode, 4);
++    }
++    else {
++        unsigned e = e0 * 4;
++        if(e < 15 * e2 || e > 34 * e2)
++            return(ZBAR_NONE);
++        dir = 1;
++        e2 = e0;
++        e3 = pair_width(dcode, 0);
++    }
++    e1 = pair_width(dcode, 2);
++
++    s = e1 + e3;
++    dprintf(2, " e1=%d e3=%d dir=%d s=%d", e1, e3, dir, s);
++    if(s < 12)
++        return(ZBAR_NONE);
++
++    sig = ((decode_e(e3, s, 14) << 8) | (decode_e(e2, s, 14) << 4) |
++           decode_e(e1, s, 14));
++    dprintf(2, " sig=%04x", sig & 0xfff);
++    if(sig < 0 ||
++       ((sig >> 4) & 0xf) < 8 ||
++       ((sig >> 4) & 0xf) > 10 ||
++       (sig & 0xf) >= 10 ||
++       ((sig >> 8) & 0xf) >= 10 ||
++       (((sig >> 8) + sig) & 0xf) != 10)
++        return(ZBAR_NONE);
++
++    finder = (finder_hash[(sig - (sig >> 5)) & 0x1f] +
++              finder_hash[(sig >> 1) & 0x1f]) & 0x1f;
++    dprintf(2, " finder=%d", finder);
++    if(finder == 0x1f ||
++       !TEST_CFG((finder < 9) ? db->config : db->config_exp, ZBAR_CFG_ENABLE))
++        return(ZBAR_NONE);
++
++    zassert(finder >= 0, ZBAR_NONE, "dir=%d sig=%04x f=%d\n",
++            dir, sig & 0xfff, finder);
++
++    iseg = alloc_segment(db);
++    if(iseg < 0)
++        return(ZBAR_NONE);
++
++    seg = db->segs + iseg;
++    seg->finder = (finder >= 9) ? finder - 9 : finder;
++    seg->exp = (finder >= 9);
++    seg->color = get_color(dcode) ^ dir ^ 1;
++    seg->side = dir;
++    seg->partial = 0;
++    seg->count = 1;
++    seg->width = s;
++    seg->epoch = db->epoch;
++
++    int rc = decode_char(dcode, seg, 12 - dir, -1);
++    if(!rc)
++        seg->partial = 1;
++    else
++        db->epoch++;
++
++    int i = (dcode->idx + 8 + dir) & 0xf;
++    zassert(db->chars[i] == -1, ZBAR_NONE, "\n");
++    db->chars[i] = iseg;
++    return(rc);
++}
++
++zbar_symbol_type_t
++_zbar_decode_databar (zbar_decoder_t *dcode)
++{
++    databar_decoder_t *db = &dcode->databar;
++    databar_segment_t *seg, *pair;
++    zbar_symbol_type_t sym;
++    int iseg, i = dcode->idx & 0xf;
++
++    sym = decode_finder(dcode);
++    dprintf(2, "\n");
++
++    iseg = db->chars[i];
++    if(iseg < 0)
++        return(sym);
++
++    db->chars[i] = -1;
++    seg = db->segs + iseg;
++    dprintf(2, "        databar: i=%d part=%d f=%d(%x%x%x)",
++            iseg, seg->partial, seg->finder, seg->exp, seg->color, seg->side);
++    zassert(seg->finder >= 0, ZBAR_NONE, "i=%d f=%d(%x%x%x) part=%x\n",
++            iseg, seg->finder, seg->exp, seg->color, seg->side, seg->partial);
++
++    if(seg->partial) {
++        pair = NULL;
++        seg->side = !seg->side;
++    }
++    else {
++        int jseg = alloc_segment(db);
++        pair = db->segs + iseg;
++        seg = db->segs + jseg;
++        seg->finder = pair->finder;
++        seg->exp = pair->exp;
++        seg->color = pair->color;
++        seg->side = !pair->side;
++        seg->partial = 0;
++        seg->count = 1;
++        seg->width = pair->width;
++        seg->epoch = db->epoch;
++    }
++
++    sym = decode_char(dcode, seg, 1, 1);
++    if(!sym) {
++        seg->finder = -1;
++        if(pair)
++            pair->partial = 1;
++    }
++    else
++        db->epoch++;
++    dprintf(2, "\n");
++
++    return(sym);
++}
+diff --git a/zbar/decoder/databar.h b/zbar/decoder/databar.h
+new file mode 100644
+--- /dev/null
++++ b/zbar/decoder/databar.h
+@@ -0,0 +1,80 @@
++/*------------------------------------------------------------------------
++ *  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
++ *
++ *  This file is part of the ZBar Bar Code Reader.
++ *
++ *  The ZBar Bar Code Reader is free software; you can redistribute it
++ *  and/or modify it under the terms of the GNU Lesser Public License as
++ *  published by the Free Software Foundation; either version 2.1 of
++ *  the License, or (at your option) any later version.
++ *
++ *  The ZBar Bar Code Reader is distributed in the hope that it will be
++ *  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
++ *  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU Lesser Public License for more details.
++ *
++ *  You should have received a copy of the GNU Lesser Public License
++ *  along with the ZBar Bar Code Reader; if not, write to the Free
++ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++ *  Boston, MA  02110-1301  USA
++ *
++ *  http://sourceforge.net/projects/zbar
++ *------------------------------------------------------------------------*/
++#ifndef _DATABAR_H_
++#define _DATABAR_H_
++
++#define DATABAR_MAX_SEGMENTS 32
++
++/* active DataBar (partial) segment entry */
++typedef struct databar_segment_s {
++    signed finder : 5;          /* finder pattern */
++    unsigned exp : 1;           /* DataBar expanded finder */
++    unsigned color : 1;         /* finder coloring */
++    unsigned side : 1;          /* data character side of finder */
++
++    unsigned partial : 1;       /* unpaired partial segment */
++    unsigned count : 7;         /* times encountered */
++    unsigned epoch : 8;         /* age, in characters scanned */
++    unsigned check : 8;         /* bar checksum */
++    signed short data;          /* decoded character data */
++    unsigned short width;       /* measured width of finder (14 modules) */
++} databar_segment_t;
++
++/* DataBar specific decode state */
++typedef struct databar_decoder_s {
++    unsigned config;            /* decoder configuration flags */
++    unsigned config_exp;
++
++    unsigned csegs : 8;         /* allocated segments */
++    unsigned epoch : 8;         /* current scan */
++
++    databar_segment_t *segs;    /* active segment list */
++    signed char chars[16];      /* outstanding character indices */
++} databar_decoder_t;
++
++/* reset DataBar segment decode state */
++static inline void databar_new_scan (databar_decoder_t *db)
++{
++    int i;
++    for(i = 0; i < 16; i++)
++        if(db->chars[i] >= 0) {
++            databar_segment_t *seg = db->segs + db->chars[i];
++            if(seg->partial)
++                seg->finder = -1;
++            db->chars[i] = -1;
++        }
++}
++
++/* reset DataBar accumulated segments */
++static inline void databar_reset (databar_decoder_t *db)
++{
++    int i, n = db->csegs;
++    databar_new_scan(db);
++    for(i = 0; i < n; i++)
++        db->segs[i].finder = -1;
++}
++
++/* decode DataBar symbols */
++zbar_symbol_type_t _zbar_decode_databar(zbar_decoder_t *dcode);
++
++#endif
+diff --git a/zbar/decoder/ean.c b/zbar/decoder/ean.c
+--- a/zbar/decoder/ean.c
++++ b/zbar/decoder/ean.c
+@@ -1,5 +1,5 @@
+ /*------------------------------------------------------------------------
+- *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
+  *
+  *  This file is part of the ZBar Bar Code Reader.
+  *
+@@ -23,12 +23,12 @@
+ 
+ #include <config.h>
+ #include <zbar.h>
+-#include "decoder.h"
+ 
+ #ifdef DEBUG_EAN
+ # define DEBUG_LEVEL (DEBUG_EAN)
+ #endif
+ #include "debug.h"
++#include "decoder.h"
+ 
+ /* partial decode symbol location */
+ typedef enum symbol_partial_e {
+@@ -109,25 +109,35 @@ static inline const unsigned char *dspri
+ }
+ #endif
+ 
++static inline int check_width (unsigned w0,
++                               unsigned w1)
++{
++    unsigned dw0 = w0;
++    w0 *= 8;
++    w1 *= 8;
++    return(w0 - dw0 <= w1 && w1 <= w0 + dw0);
++}
++
+ /* evaluate previous N (>= 2) widths as auxiliary pattern,
+  * using preceding 4 as character width
+  */
+ static inline signed char aux_end (zbar_decoder_t *dcode,
+                                    unsigned char fwd)
+ {
++    signed char code, i;
++
+     /* reference width from previous character */
+     unsigned s = calc_s(dcode, 4 + fwd, 4);
+ 
+     /* check quiet zone */
+     unsigned qz = get_width(dcode, 0);
+-    if(!fwd && qz && qz < s * 3 / 4) {
++    if(!fwd && qz && qz <= s * 3 / 4) {
+         dprintf(2, " [invalid quiet]");
+         return(-1);
+     }
+ 
+     dprintf(2, " (");
+-    signed char code = 0;
+-    unsigned char i;
++    code = 0;
+     for(i = 1 - fwd; i < 3 + fwd; i++) {
+         unsigned e = get_width(dcode, i) + get_width(dcode, i + 1);
+         dprintf(2, " %d", e);
+@@ -147,27 +157,32 @@ static inline signed char aux_end (zbar_
+ static inline signed char aux_start (zbar_decoder_t *dcode)
+ {
+     /* FIXME NB add-on has no guard in reverse */
+-    unsigned e2 = get_width(dcode, 5) + get_width(dcode, 6);
++    unsigned e1, e2 = get_width(dcode, 5) + get_width(dcode, 6);
++    unsigned char E1;
++    if(dcode->ean.s4 < 6)
++        return(-1);
+     if(decode_e(e2, dcode->ean.s4, 7)) {
+         dprintf(2, " [invalid any]");
+         return(/*FIXME (get_color(dcode) == ZBAR_SPACE) ? STATE_ADDON : */-1);
+     }
+ 
+-    unsigned e1 = get_width(dcode, 4) + get_width(dcode, 5);
+-    unsigned char E1 = decode_e(e1, dcode->ean.s4, 7);
++    e1 = get_width(dcode, 4) + get_width(dcode, 5);
++    E1 = decode_e(e1, dcode->ean.s4, 7);
+ 
+     if(get_color(dcode) == ZBAR_BAR) {
+         /* check for quiet-zone */
+         unsigned qz = get_width(dcode, 7);
+-        if(!qz || qz >= dcode->ean.s4 * 3 / 4) {
++        if(!qz || qz > dcode->ean.s4 * 3 / 4) {
+             if(!E1) {
+                 dprintf(2, " [valid normal]");
+                 return(0); /* normal symbol start */
+             }
++#if 0
+             else if(E1 == 1) {
+                 dprintf(2, " [valid add-on]");
+                 return(STATE_ADDON); /* add-on symbol start */
+             }
++#endif
+         }
+         dprintf(2, " [invalid start]");
+         return(-1);
+@@ -176,7 +191,9 @@ static inline signed char aux_start (zba
+     if(!E1) {
+         /* attempting decode from SPACE => validate center guard */
+         unsigned e3 = get_width(dcode, 6) + get_width(dcode, 7);
+-        if(!decode_e(e3, dcode->ean.s4, 7)) {
++        unsigned e4 = get_width(dcode, 7) + get_width(dcode, 8);
++        if(!decode_e(e3, dcode->ean.s4, 7) &&
++           !decode_e(e4, dcode->ean.s4, 7)) {
+             dprintf(2, " [valid center]");
+             return(0); /* start after center guard */
+         }
+@@ -188,6 +205,8 @@ static inline signed char aux_start (zba
+ /* attempt to decode previous 4 widths (2 bars and 2 spaces) as a character */
+ static inline signed char decode4 (zbar_decoder_t *dcode)
+ {
++    signed char code;
++
+     /* calculate similar edge measurements */
+     unsigned e1 = ((get_color(dcode) == ZBAR_BAR)
+                    ? get_width(dcode, 0) + get_width(dcode, 1)
+@@ -195,9 +214,12 @@ static inline signed char decode4 (zbar_
+     unsigned e2 = get_width(dcode, 1) + get_width(dcode, 2);
+     dprintf(2, "\n        e1=%d e2=%d", e1, e2);
+ 
++    if(dcode->ean.s4 < 6)
++        return(-1);
++
+     /* create compacted encoding for direct lookup */
+-    signed char code = ((decode_e(e1, dcode->ean.s4, 7) << 2) |
+-                        decode_e(e2, dcode->ean.s4, 7));
++    code = ((decode_e(e1, dcode->ean.s4, 7) << 2) |
++             decode_e(e2, dcode->ean.s4, 7));
+     if(code < 0)
+         return(-1);
+     dprintf(2, " code=%x", code);
+@@ -209,15 +231,16 @@ static inline signed char decode4 (zbar_
+        E1E2 == 44 (1010)
+      */
+     if((1 << code) & 0x0660) {
++        unsigned char mid, alt;
+         /* use sum of bar widths */
+         unsigned d2 = ((get_color(dcode) == ZBAR_BAR)
+                        ? get_width(dcode, 0) + get_width(dcode, 2)
+                        : get_width(dcode, 1) + get_width(dcode, 3));
+         d2 *= 7;
+-        unsigned char mid = (((1 << code) & 0x0420)
++        mid = (((1 << code) & 0x0420)
+                              ? 3     /* E1E2 in 33,44 */
+                              : 4);   /* E1E2 in 34,43 */
+-        unsigned char alt = d2 > (mid * dcode->ean.s4);
++        alt = d2 > (mid * dcode->ean.s4);
+         if(alt)
+             code = ((code >> 1) & 3) | 0x10; /* compress code space */
+         dprintf(2, " (d2=%d(%d) alt=%d)", d2, mid * dcode->ean.s4, alt);
+@@ -245,6 +268,7 @@ static inline zbar_symbol_type_t ean_par
+     if(!par == fwd) {
+         /* reverse sampled digits */
+         unsigned char tmp = pass->raw[1];
++        pass->state |= STATE_REV;
+         pass->raw[1] = pass->raw[4];
+         pass->raw[4] = tmp;
+         tmp = pass->raw[2];
+@@ -292,8 +316,9 @@ static inline zbar_symbol_type_t ean_par
+         return(ZBAR_NONE);
+ 
+     if(!par == fwd) {
++        unsigned char i;
++        pass->state |= STATE_REV;
+         /* reverse sampled digits */
+-        unsigned char i;
+         for(i = 1; i < 4; i++) {
+             unsigned char tmp = pass->raw[i];
+             pass->raw[i] = pass->raw[7 - i];
+@@ -324,33 +349,52 @@ static inline zbar_symbol_type_t ean_par
+ static inline zbar_symbol_type_t decode_pass (zbar_decoder_t *dcode,
+                                               ean_pass_t *pass)
+ {
++    unsigned char idx, fwd;
+     pass->state++;
+-    unsigned char idx = pass->state & STATE_IDX;
+-    unsigned char fwd = pass->state & 1;
++    idx = pass->state & STATE_IDX;
++    fwd = pass->state & 1;
+ 
+     if(get_color(dcode) == ZBAR_SPACE &&
+        (idx == 0x10 || idx == 0x11) &&
+        TEST_CFG(dcode->ean.ean8_config, ZBAR_CFG_ENABLE) &&
+        !aux_end(dcode, fwd)) {
++        zbar_symbol_type_t part;
+         dprintf(2, " fwd=%x", fwd);
+-        zbar_symbol_type_t part = ean_part_end4(pass, fwd);
++        part = ean_part_end4(pass, fwd);
++        if(part)
++            dcode->ean.direction = (pass->state & STATE_REV) != 0;
+         pass->state = -1;
+         return(part);
+     }
+ 
+     if(!(idx & 0x03) && idx <= 0x14) {
++        signed char code = -1;
++        unsigned w = pass->width;
+         if(!dcode->ean.s4)
+             return(0);
+         /* validate guard bars before decoding first char of symbol */
+         if(!pass->state) {
+             pass->state = aux_start(dcode);
++            pass->width = dcode->ean.s4;
+             if(pass->state < 0)
+                 return(0);
+             idx = pass->state & STATE_IDX;
+         }
+-        signed char code = decode4(dcode);
+-        if(code < 0)
++        else {
++            w = check_width(w, dcode->ean.s4);
++            if(w)
++                pass->width = (pass->width + dcode->ean.s4 * 3) / 4;
++        }
++
++        if(w)
++            code = decode4(dcode);
++        else
++            dprintf(2, " [bad width]");
++
++        if(code < 0 && idx != 0x10)
+             pass->state = -1;
++        else if(code < 0)
++            pass->raw[5] = 0xff;
+         else {
+             dprintf(2, "\n        raw[%x]=%02x =>", idx >> 2,
+                     digits[(unsigned char)code]);
+@@ -367,8 +411,10 @@ static inline zbar_symbol_type_t decode_
+        (idx == 0x18 || idx == 0x19)) {
+         zbar_symbol_type_t part = ZBAR_NONE;
+         dprintf(2, " fwd=%x", fwd);
+-        if(!aux_end(dcode, fwd))
++        if(!aux_end(dcode, fwd) && pass->raw[5] != 0xff)
+             part = ean_part_end7(&dcode->ean, pass, fwd);
++        if(part)
++            dcode->ean.direction = (pass->state & STATE_REV) != 0;
+         pass->state = -1;
+         return(part);
+     }
+@@ -379,7 +425,7 @@ static inline signed char ean_verify_che
+                                                int n)
+ {
+     unsigned char chk = 0;
+-    unsigned char i;
++    unsigned char i, d;
+     for(i = 0; i < n; i++) {
+         unsigned char d = ean->buf[i];
+         zassert(d < 10, -1, "i=%x d=%x chk=%x %s\n", i, d, chk,
+@@ -397,7 +443,7 @@ static inline signed char ean_verify_che
+             _zbar_decoder_buf_dump((void*)ean->buf, 18));
+     if(chk)
+         chk = 10 - chk;
+-    unsigned char d = ean->buf[n];
++    d = ean->buf[n];
+     zassert(d < 10, -1, "n=%x d=%x chk=%x %s\n", n, d, chk,
+             _zbar_decoder_buf_dump((void*)ean->buf, 18));
+     if(chk != d) {
+@@ -431,10 +477,11 @@ static inline void ean_expand_upce (ean_
+                                     ean_pass_t *pass)
+ {
+     int i = 0;
++    unsigned char decode;
+     /* parity encoded digit is checksum */
+     ean->buf[12] = pass->raw[i++];
+ 
+-    unsigned char decode = pass->raw[6] & 0xf;
++    decode = pass->raw[6] & 0xf;
+     ean->buf[0] = 0;
+     ean->buf[1] = 0;
+     ean->buf[2] = pass->raw[i++] & 0xf;
+@@ -446,17 +493,19 @@ static inline void ean_expand_upce (ean_
+     ean->buf[8] = 0;
+     ean->buf[9] = (decode < 3) ? pass->raw[i++] & 0xf : 0;
+     ean->buf[10] = (decode < 4) ? pass->raw[i++] & 0xf : 0;
+-    ean->buf[11] = (decode < 5) ? pass->raw[i++] & 0xf : decode;
++    ean->buf[11] = (decode < 5) ? pass->raw[i] & 0xf : decode;
+ }
+ 
+ static inline zbar_symbol_type_t integrate_partial (ean_decoder_t *ean,
+                                                     ean_pass_t *pass,
+                                                     zbar_symbol_type_t part)
+ {
++    signed char i, j, right = !!(part & EAN_RIGHT);
+     /* copy raw data into holding buffer */
+     /* if same partial is not consistent, reset others */
+-    dprintf(2, " integrate part=%x (%s)", part, dsprintbuf(ean));
+-    signed char i, j;
++    dprintf(2, " integrate part=%x (%s) w=%d=>%d",
++            part, dsprintbuf(ean), ean->width, pass->width);
++
+     if(part & ZBAR_ADDON) {
+         /* FIXME TBD */
+         for(i = (part == ZBAR_ADDON5) ? 4 : 1; i >= 0; i--) {
+@@ -477,7 +526,13 @@ static inline zbar_symbol_type_t integra
+             ean->left = ean->right = ean->addon = ZBAR_NONE;
+         }
+ 
+-        if(part & EAN_RIGHT) {
++        if((ean->left || ean->right || ean->addon) &&
++           !check_width(ean->width, pass->width)) {
++            dprintf(2, " rst(width %d)", pass->width);
++            ean->left = ean->right = ean->addon = ZBAR_NONE;
++        }
++
++        if(right) {
+             part &= ZBAR_SYMBOL;
+             j = (part == ZBAR_EAN13) ? 12 : 7;
+             for(i = (part == ZBAR_EAN13) ? 6 : 4; i; i--, j--) {
+@@ -507,6 +562,7 @@ static inline zbar_symbol_type_t integra
+         else /* ZBAR_UPCE */
+             ean_expand_upce(ean, pass);
+     }
++    ean->width = pass->width;
+ 
+     if((part & ZBAR_SYMBOL) != ZBAR_UPCE) {
+         part = (ean->left & ean->right);
+@@ -516,9 +572,14 @@ static inline zbar_symbol_type_t integra
+ 
+     if(((part == ZBAR_EAN13 ||
+          part == ZBAR_UPCE) && ean_verify_checksum(ean, 12)) ||
+-       (part == ZBAR_EAN8 && ean_verify_checksum(ean, 7)))
+-        /* invalid parity */
++       (part == ZBAR_EAN8 && ean_verify_checksum(ean, 7))) {
++        /* invalid checksum */
++        if(right)
++            ean->left = ZBAR_NONE;
++        else
++            ean->right = ZBAR_NONE;
+         part = ZBAR_NONE;
++    }
+ 
+     if(part == ZBAR_EAN13) {
+         /* special case EAN-13 subsets */
+@@ -556,7 +617,8 @@ static inline zbar_symbol_type_t integra
+     if(part > ZBAR_PARTIAL)
+         part |= ean->addon;
+ 
+-    dprintf(2, " %x/%x=%x", ean->left, ean->right, part);
++    dprintf(2, " dir=%d %x/%x=%x",
++            ean->direction, ean->left, ean->right, part);
+     return(part);
+ }
+ 
+@@ -596,6 +658,8 @@ static inline void postprocess (zbar_dec
+             dcode->buf[j] = ean->buf[i] + '0';
+     dcode->buflen = j;
+     dcode->buf[j] = '\0';
++    dcode->direction = 1 - 2 * ean->direction;
++    dcode->modifiers = 0;
+ }
+ 
+ zbar_symbol_type_t _zbar_decode_ean (zbar_decoder_t *dcode)
+@@ -603,20 +667,21 @@ zbar_symbol_type_t _zbar_decode_ean (zba
+     /* process upto 4 separate passes */
+     zbar_symbol_type_t sym = ZBAR_NONE;
+     unsigned char pass_idx = dcode->idx & 3;
++    unsigned char i;
+ 
+     /* update latest character width */
+     dcode->ean.s4 -= get_width(dcode, 4);
+     dcode->ean.s4 += get_width(dcode, 0);
+ 
+-    unsigned char i;
+     for(i = 0; i < 4; i++) {
+         ean_pass_t *pass = &dcode->ean.pass[i];
+         if(pass->state >= 0 ||
+            i == pass_idx)
+         {
++            zbar_symbol_type_t part;
+             dprintf(2, "      ean[%x/%x]: idx=%x st=%d s=%d",
+                     pass_idx, i, dcode->idx, pass->state, dcode->ean.s4);
+-            zbar_symbol_type_t part = decode_pass(dcode, pass);
++            part = decode_pass(dcode, pass);
+             if(part) {
+                 /* update accumulated data from new partial decode */
+                 sym = integrate_partial(&dcode->ean, pass, part);
+@@ -626,7 +691,7 @@ zbar_symbol_type_t _zbar_decode_ean (zba
+                     dcode->ean.pass[0].state = dcode->ean.pass[1].state = -1;
+                     dcode->ean.pass[2].state = dcode->ean.pass[3].state = -1;
+                     if(sym > ZBAR_PARTIAL) {
+-                        if(!get_lock(dcode, ZBAR_EAN13))
++                        if(!acquire_lock(dcode, sym))
+                             postprocess(dcode, sym);
+                         else {
+                             dprintf(1, " [locked %d]", dcode->lock);
+diff --git a/zbar/decoder/ean.h b/zbar/decoder/ean.h
+--- a/zbar/decoder/ean.h
++++ b/zbar/decoder/ean.h
+@@ -1,5 +1,5 @@
+ /*------------------------------------------------------------------------
+- *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
+  *
+  *  This file is part of the ZBar Bar Code Reader.
+  *
+@@ -26,18 +26,21 @@
+ /* state of each parallel decode attempt */
+ typedef struct ean_pass_s {
+     signed char state;          /* module position of w[idx] in symbol */
++#define STATE_REV   0x80        /*   scan direction reversed */
+ #define STATE_ADDON 0x40        /*   scanning add-on */
+ #define STATE_IDX   0x1f        /*   element offset into symbol */
++    unsigned width;             /* width of last character */
+     unsigned char raw[7];       /* decode in process */
+ } ean_pass_t;
+ 
+ /* EAN/UPC specific decode state */
+ typedef struct ean_decoder_s {
+     ean_pass_t pass[4];         /* state of each parallel decode attempt */
+-    zbar_symbol_type_t left;   /* current holding buffer contents */
++    zbar_symbol_type_t left;    /* current holding buffer contents */
+     zbar_symbol_type_t right;
+     zbar_symbol_type_t addon;
+-    unsigned s4;                /* character width */
++    int direction;              /* scan direction */
++    unsigned s4, width;         /* character width */
+     signed char buf[18];        /* holding buffer */
+ 
+     signed char enable;
+diff --git a/zbar/decoder/i25.c b/zbar/decoder/i25.c
+--- a/zbar/decoder/i25.c
++++ b/zbar/decoder/i25.c
+@@ -1,5 +1,5 @@
+ /*------------------------------------------------------------------------
+- *  Copyright 2008-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++ *  Copyright 2008-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
+  *
+  *  This file is part of the ZBar Bar Code Reader.
+  *
+@@ -25,12 +25,12 @@
+ #include <string.h>     /* memmove */
+ 
+ #include <zbar.h>
+-#include "decoder.h"
+ 
+ #ifdef DEBUG_I25
+ # define DEBUG_LEVEL (DEBUG_I25)
+ #endif
+ #include "debug.h"
++#include "decoder.h"
+ 
+ static inline unsigned char i25_decode1 (unsigned char enc,
+                                          unsigned e,
+@@ -111,7 +111,7 @@ static inline signed char i25_decode_sta
+      * we require 5.25n for w=2n to 6.75n for w=3n
+      * (FIXME should really factor in w:n ratio)
+      */
+-    unsigned quiet = get_width(dcode, i++);
++    unsigned quiet = get_width(dcode, i);
+     if(quiet && quiet < dcode25->s10 * 3 / 8) {
+         dprintf(3, "      i25: s=%d enc=%x q=%d [invalid qz]\n",
+                 dcode25->s10, enc, quiet);
+@@ -124,6 +124,21 @@ static inline signed char i25_decode_sta
+     return(ZBAR_PARTIAL);
+ }
+ 
++static inline int i25_acquire_lock (zbar_decoder_t *dcode)
++{
++    int i;
++    /* lock shared resources */
++    if(acquire_lock(dcode, ZBAR_I25)) {
++        dcode->i25.character = -1;
++        return(1);
++    }
++
++    /* copy holding buffer */
++    for(i = 4; --i >= 0; )
++        dcode->buf[i] = dcode->i25.buf[i];
++    return(0);
++}
++
+ static inline signed char i25_decode_end (zbar_decoder_t *dcode)
+ {
+     i25_decoder_t *dcode25 = &dcode->i25;
+@@ -133,7 +148,8 @@ static inline signed char i25_decode_end
+     if((quiet && quiet < dcode25->width * 3 / 8) ||
+        decode_e(get_width(dcode, 1), dcode25->width, 45) > 2 ||
+        decode_e(get_width(dcode, 2), dcode25->width, 45) > 2) {
+-        dprintf(3, " s=%d q=%d [invalid qz]\n", dcode25->width, quiet);
++        dprintf(3, "      i25: s=%d q=%d [invalid qz]\n",
++                dcode25->width, quiet);
+         return(ZBAR_NONE);
+     }
+ 
+@@ -145,6 +161,11 @@ static inline signed char i25_decode_end
+           decode_e(get_width(dcode, 4), dcode25->width, 45) > 2))
+         return(ZBAR_NONE);
+ 
++    if(dcode25->character <= 4 &&
++       i25_acquire_lock(dcode))
++        return(ZBAR_PARTIAL);
++
++    dcode->direction = 1 - 2 * dcode25->direction;
+     if(dcode25->direction) {
+         /* reverse buffer */
+         dprintf(2, " (rev)");
+@@ -161,13 +182,14 @@ static inline signed char i25_decode_end
+        (CFG(*dcode25, ZBAR_CFG_MAX_LEN) > 0 &&
+         dcode25->character > CFG(*dcode25, ZBAR_CFG_MAX_LEN))) {
+         dprintf(2, " [invalid len]\n");
+-        dcode->lock = 0;
++        release_lock(dcode, ZBAR_I25);
+         dcode25->character = -1;
+         return(ZBAR_NONE);
+     }
+ 
+     dcode->buflen = dcode25->character;
+     dcode->buf[dcode25->character] = '\0';
++    dcode->modifiers = 0;
+     dprintf(2, " [valid end]\n");
+     dcode25->character = -1;
+     return(ZBAR_I25);
+@@ -197,38 +219,45 @@ zbar_symbol_type_t _zbar_decode_i25 (zba
+             (dcode25->direction) ? '<' : '>',
+             dcode25->character, dcode25->element);
+ 
+-    /* lock shared resources */
+-    if(!dcode25->character && get_lock(dcode, ZBAR_I25)) {
+-        dcode25->character = -1;
+-        dprintf(2, " [locked %d]\n", dcode->lock);
++    if(dcode25->character == 4 && i25_acquire_lock(dcode))
+         return(ZBAR_PARTIAL);
+-    }
+ 
+     unsigned char c = i25_decode10(dcode, 1);
+     dprintf(2, " c=%x", c);
++    if(c > 9) {
++        dprintf(2, " [aborted]\n");
++        goto reset;
++    }
+ 
+-    if(c > 9 ||
+-       ((dcode25->character >= BUFFER_MIN) &&
+-        size_buf(dcode, dcode25->character + 2))) {
+-        dprintf(2, (c > 9) ? " [aborted]\n" : " [overflow]\n");
+-        dcode->lock = 0;
+-        dcode25->character = -1;
+-        return(ZBAR_NONE);
++    if((dcode25->character >= BUFFER_MIN) &&
++       size_buf(dcode, dcode25->character + 2)) {
++        dprintf(2, " [overflow]\n");
++        goto reset;
+     }
+-    dcode->buf[dcode25->character++] = c + '0';
++
++    unsigned char *buf;
++    if(dcode25->character >= 4)
++        buf = dcode->buf;
++    else
++        buf = dcode25->buf;
++    buf[dcode25->character++] = c + '0';
+ 
+     c = i25_decode10(dcode, 0);
+     dprintf(2, " c=%x", c);
+     if(c > 9) {
+         dprintf(2, " [aborted]\n");
+-        dcode->lock = 0;
+-        dcode25->character = -1;
+-        return(ZBAR_NONE);
++        goto reset;
+     }
+     else
+         dprintf(2, "\n");
+ 
+-    dcode->buf[dcode25->character++] = c + '0';
++    buf[dcode25->character++] = c + '0';
+     dcode25->element = 10;
+     return((dcode25->character == 2) ? ZBAR_PARTIAL : ZBAR_NONE);
++
++reset:
++    if(dcode25->character >= 4)
++        release_lock(dcode, ZBAR_I25);
++    dcode25->character = -1;
++    return(ZBAR_NONE);
+ }
+diff --git a/zbar/decoder/i25.h b/zbar/decoder/i25.h
+--- a/zbar/decoder/i25.h
++++ b/zbar/decoder/i25.h
+@@ -30,6 +30,7 @@ typedef struct i25_decoder_s {
+     int character : 12;         /* character position in symbol */
+     unsigned s10;               /* current character width */
+     unsigned width;             /* last character width */
++    unsigned char buf[4];       /* initial scan buffer */
+ 
+     unsigned config;
+     int configs[NUM_CFGS];      /* int valued configurations */
+diff --git a/zbar/decoder/pdf417.c b/zbar/decoder/pdf417.c
+--- a/zbar/decoder/pdf417.c
++++ b/zbar/decoder/pdf417.c
+@@ -1,5 +1,5 @@
+ /*------------------------------------------------------------------------
+- *  Copyright 2008-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++ *  Copyright 2008-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
+  *
+  *  This file is part of the ZBar Bar Code Reader.
+  *
+@@ -24,14 +24,14 @@
+ #include <config.h>
+ 
+ #include <zbar.h>
+-#include "decoder.h"
+-
+-#include "pdf417_hash.h"
+ 
+ #ifdef DEBUG_PDF417
+ # define DEBUG_LEVEL (DEBUG_PDF417)
+ #endif
+ #include "debug.h"
++#include "decoder.h"
++
++#include "pdf417_hash.h"
+ 
+ #define PDF417_STOP 0xbff
+ 
+@@ -152,7 +152,7 @@ static inline signed char pdf417_decode_
+     }
+ 
+     /* lock shared resources */
+-    if(get_lock(dcode, ZBAR_PDF417)) {
++    if(acquire_lock(dcode, ZBAR_PDF417)) {
+         dprintf(2, " [locked %d]\n", dcode->lock);
+         return(0);
+     }
+@@ -190,7 +190,7 @@ zbar_symbol_type_t _zbar_decode_pdf417 (
+ 
+     if(get_color(dcode) != dcode417->direction) {
+         int c = dcode417->character;
+-        dcode->lock = 0;
++        release_lock(dcode, ZBAR_PDF417);
+         dcode417->character = -1;
+         zassert(get_color(dcode) == dcode417->direction, ZBAR_NONE,
+                 "color=%x dir=%x char=%d elem=0 %s\n",
+@@ -203,7 +203,7 @@ zbar_symbol_type_t _zbar_decode_pdf417 (
+        ((dcode417->character >= BUFFER_MIN) &&
+         size_buf(dcode, dcode417->character + 1))) {
+         dprintf(1, (c < 0) ? " [aborted]\n" : " [overflow]\n");
+-        dcode->lock = 0;
++        release_lock(dcode, ZBAR_PDF417);
+         dcode417->character = -1;
+         return(0);
+     }
+@@ -213,7 +213,9 @@ zbar_symbol_type_t _zbar_decode_pdf417 (
+     if(c == PDF417_STOP) {
+         dprintf(1, " [valid stop]");
+         /* FIXME check trailing bar and qz */
+-        dcode->lock = 0;
++        dcode->direction = 1 - 2 * dcode417->direction;
++        dcode->modifiers = 0;
++        release_lock(dcode, ZBAR_PDF417);
+         dcode417->character = -1;
+     }
+ 
+diff --git a/zbar/decoder/qr_finder.c b/zbar/decoder/qr_finder.c
+--- a/zbar/decoder/qr_finder.c
++++ b/zbar/decoder/qr_finder.c
+@@ -1,13 +1,36 @@
++/*------------------------------------------------------------------------
++ *  Copyright 2009-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
++ *
++ *  This file is part of the ZBar Bar Code Reader.
++ *
++ *  The ZBar Bar Code Reader is free software; you can redistribute it
++ *  and/or modify it under the terms of the GNU Lesser Public License as
++ *  published by the Free Software Foundation; either version 2.1 of
++ *  the License, or (at your option) any later version.
++ *
++ *  The ZBar Bar Code Reader is distributed in the hope that it will be
++ *  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
++ *  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU Lesser Public License for more details.
++ *
++ *  You should have received a copy of the GNU Lesser Public License
++ *  along with the ZBar Bar Code Reader; if not, write to the Free
++ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++ *  Boston, MA  02110-1301  USA
++ *
++ *  http://sourceforge.net/projects/zbar
++ *------------------------------------------------------------------------*/
++
+ #include <config.h>
+ #include <assert.h>
+ 
+ #include <zbar.h>
+-#include "decoder.h"
+ 
+ #ifdef DEBUG_QR_FINDER
+ # define DEBUG_LEVEL (DEBUG_QR_FINDER)
+ #endif
+ #include "debug.h"
++#include "decoder.h"
+ 
+ /* at this point lengths are all decode unit offsets from the decode edge
+  * NB owned by finder
+@@ -20,18 +43,20 @@ qr_finder_line *_zbar_decoder_get_qr_fin
+ zbar_symbol_type_t _zbar_find_qr (zbar_decoder_t *dcode)
+ {
+     qr_finder_t *qrf = &dcode->qrf;
++    unsigned s, qz, w;
++    int ei;
+ 
+     /* update latest finder pattern width */
+     qrf->s5 -= get_width(dcode, 6);
+     qrf->s5 += get_width(dcode, 1);
+-    unsigned s = qrf->s5;
++    s = qrf->s5;
+ 
+     if(get_color(dcode) != ZBAR_SPACE || s < 7)
+         return(0);
+ 
+     dprintf(2, "    qrf: s=%d", s);
+ 
+-    int ei = decode_e(pair_width(dcode, 1), s, 7);
++    ei = decode_e(pair_width(dcode, 1), s, 7);
+     dprintf(2, " %d", ei);
+     if(ei)
+         goto invalid;
+@@ -54,8 +79,8 @@ zbar_symbol_type_t _zbar_find_qr (zbar_d
+     /* valid QR finder symbol
+      * mark positions needed by decoder
+      */
+-    unsigned qz = get_width(dcode, 0);
+-    unsigned w = get_width(dcode, 1);
++    qz = get_width(dcode, 0);
++    w = get_width(dcode, 1);
+     qrf->line.eoffs = qz + (w + 1) / 2;
+     qrf->line.len = qz + w + get_width(dcode, 2);
+     qrf->line.pos[0] = qrf->line.len + get_width(dcode, 3);
+@@ -67,6 +92,8 @@ zbar_symbol_type_t _zbar_find_qr (zbar_d
+             qrf->line.boffs, qrf->line.pos[0], qrf->line.len,
+             qrf->line.eoffs);
+ 
++    dcode->direction = 0;
++    dcode->buflen = 0;
+     return(ZBAR_QRCODE);
+ 
+ invalid:
+diff --git a/zbar/error.c b/zbar/error.c
+--- a/zbar/error.c
++++ b/zbar/error.c
+@@ -1,5 +1,5 @@
+ /*------------------------------------------------------------------------
+- *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
+  *
+  *  This file is part of the ZBar Bar Code Reader.
+  *
+@@ -36,7 +36,7 @@ static const char * const mod_str[] = {
+ };
+ #define MOD_MAX (strlen(mod_str[ZBAR_MOD_IMAGE_SCANNER]))
+ 
+-static const char const * err_str[] = {
++static const char * const err_str[] = {
+     "no error",                 /* OK */
+     "out of memory",            /* NOMEM */
+     "internal library error",   /* INTERNAL */
+@@ -99,32 +99,32 @@ zbar_error_t _zbar_get_error_code (const
+ const char *_zbar_error_string (const void *container,
+                                 int verbosity)
+ {
++    static const char basefmt[] = "%s: zbar %s in %s():\n    %s: ";
+     errinfo_t *err = (errinfo_t*)container;
++    const char *sev, *mod, *func, *type;
++    int len;
++
+     assert(err->magic == ERRINFO_MAGIC);
+ 
+-    const char *sev;
+     if(err->sev >= SEV_FATAL && err->sev <= SEV_NOTE)
+         sev = sev_str[err->sev + 2];
+     else
+         sev = sev_str[1];
+ 
+-    const char *mod;
+     if(err->module >= ZBAR_MOD_PROCESSOR &&
+        err->module < ZBAR_MOD_UNKNOWN)
+         mod = mod_str[err->module];
+     else
+         mod = mod_str[ZBAR_MOD_UNKNOWN];
+ 
+-    const char *func = (err->func) ? err->func : "<unknown>";
++    func = (err->func) ? err->func : "<unknown>";
+ 
+-    const char *type;
+     if(err->type >= 0 && err->type < ZBAR_ERR_NUM)
+         type = err_str[err->type];
+     else
+         type = err_str[ZBAR_ERR_NUM];
+ 
+-    char basefmt[] = "%s: zbar %s in %s():\n    %s: ";
+-    int len = SEV_MAX + MOD_MAX + ERR_MAX + strlen(func) + sizeof(basefmt);
++    len = SEV_MAX + MOD_MAX + ERR_MAX + strlen(func) + sizeof(basefmt);
+     err->buf = realloc(err->buf, len);
+     len = sprintf(err->buf, basefmt, sev, mod, func, type);
+     if(len <= 0)
+@@ -150,12 +150,14 @@ const char *_zbar_error_string (const vo
+             return("<unknown>");
+     }
+ 
++#ifdef HAVE_ERRNO_H
+     if(err->type == ZBAR_ERR_SYSTEM) {
+-        char sysfmt[] = ": %s (%d)\n";
++        static const char sysfmt[] = ": %s (%d)\n";
+         const char *syserr = strerror(err->errnum);
+         err->buf = realloc(err->buf, len + strlen(sysfmt) + strlen(syserr));
+         len += sprintf(err->buf + len, sysfmt, syserr, err->errnum);
+     }
++#endif
+ #ifdef _WIN32
+     else if(err->type == ZBAR_ERR_WINAPI) {
+         char *syserr = NULL;
+diff --git a/zbar/error.h b/zbar/error.h
+--- a/zbar/error.h
++++ b/zbar/error.h
+@@ -1,5 +1,5 @@
+ /*------------------------------------------------------------------------
+- *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
+  *
+  *  This file is part of the ZBar Bar Code Reader.
+  *
+@@ -30,7 +30,9 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+-#include <errno.h>
++#ifdef HAVE_ERRNO_H
++# include <errno.h>
++#endif
+ #include <assert.h>
+ 
+ #include <zbar.h>
+@@ -146,10 +148,12 @@ static inline int err_capture (const voi
+ {
+     errinfo_t *err = (errinfo_t*)container;
+     assert(err->magic == ERRINFO_MAGIC);
++#ifdef HAVE_ERRNO_H
+     if(type == ZBAR_ERR_SYSTEM)
+         err->errnum = errno;
++#endif
+ #ifdef _WIN32
+-    else if(type == ZBAR_ERR_WINAPI)
++    if(type == ZBAR_ERR_WINAPI)
+         err->errnum = GetLastError();
+ #endif
+     err->sev = sev;
+diff --git a/zbar/image.c b/zbar/image.c
+--- a/zbar/image.c
++++ b/zbar/image.c
+@@ -1,5 +1,5 @@
+ /*------------------------------------------------------------------------
+- *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
+  *
+  *  This file is part of the ZBar Bar Code Reader.
+  *
+@@ -74,6 +74,26 @@ unsigned zbar_image_get_height (const zb
+     return(img->height);
+ }
+ 
++void zbar_image_get_size (const zbar_image_t *img,
++                          unsigned *w,
++                          unsigned *h)
++{
++    if(w) *w = img->width;
++    if(h) *h = img->height;
++}
++
++void zbar_image_get_crop (const zbar_image_t *img,
++                          unsigned *x,
++                          unsigned *y,
++                          unsigned *w,
++                          unsigned *h)
++{
++    if(x) *x = img->crop_x;
++    if(y) *y = img->crop_y;
++    if(w) *w = img->crop_w;
++    if(h) *h = img->crop_h;
++}
++
+ const void *zbar_image_get_data (const zbar_image_t *img)
+ {
+     return(img->data);
+@@ -100,8 +120,28 @@ void zbar_image_set_size (zbar_image_t *
+                           unsigned w,
+                           unsigned h)
+ {
+-    img->width = w;
+-    img->height = h;
++    img->crop_x = img->crop_y = 0;
++    img->width = img->crop_w = w;
++    img->height = img->crop_h = h;
++}
++
++void zbar_image_set_crop (zbar_image_t *img,
++                          unsigned x,
++                          unsigned y,
++                          unsigned w,
++                          unsigned h)
++{
++    unsigned img_w = img->width;
++    if(x > img_w) x = img_w;
++    if(x + w > img_w) w = img_w - x;
++    img->crop_x = x;
++    img->crop_w = w;
++
++    unsigned img_h = img->height;
++    if(y > img_h) y = img_h;
++    if(y + h > img_h) h = img_h - y;
++    img->crop_y = y;
++    img->crop_h = h;
+ }
+ 
+ inline void zbar_image_free_data (zbar_image_t *img)
+@@ -109,9 +149,10 @@ inline void zbar_image_free_data (zbar_i
+     if(!img)
+         return;
+     if(img->src) {
++        zbar_image_t *newimg;
+         /* replace video image w/new copy */
+         assert(img->refcnt); /* FIXME needs lock */
+-        zbar_image_t *newimg = zbar_image_create();
++        newimg = zbar_image_create();
+         memcpy(newimg, img, sizeof(zbar_image_t));
+         /* recycle video image */
+         newimg->cleanup(newimg);
+@@ -162,8 +203,7 @@ zbar_image_t *zbar_image_copy (const zba
+ {
+     zbar_image_t *dst = zbar_image_create();
+     dst->format = src->format;
+-    dst->width = src->width;
+-    dst->height = src->height;
++    _zbar_image_copy_size(dst, src);
+     dst->datalen = src->datalen;
+     dst->data = malloc(src->datalen);
+     assert(dst->data);
+@@ -180,11 +220,11 @@ const zbar_symbol_set_t *zbar_image_get_
+ void zbar_image_set_symbols (zbar_image_t *img,
+                              const zbar_symbol_set_t *syms)
+ {
++    if(syms)
++        zbar_symbol_set_ref(syms, 1);
+     if(img->syms)
+         zbar_symbol_set_ref(img->syms, -1);
+     img->syms = (zbar_symbol_set_t*)syms;
+-    if(syms)
+-        zbar_symbol_set_ref(img->syms, 1);
+ }
+ 
+ const zbar_symbol_t *zbar_image_first_symbol (const zbar_image_t *img)
+@@ -202,29 +242,34 @@ int zbar_image_write (const zbar_image_t
+                       const char *filebase)
+ {
+     int len = strlen(filebase) + 16;
+-    char filename[len];
++    char *filename = malloc(len);
++    int n = 0, rc = 0;
++    FILE *f;
++    zimg_hdr_t hdr;
+     strcpy(filename, filebase);
+-    int n = 0;
+-    if(*(char*)&img->format >= ' ')
++    if((img->format & 0xff) >= ' ')
+         n = snprintf(filename, len, "%s.%.4s.zimg",
+                      filebase, (char*)&img->format);
+     else
+         n = snprintf(filename, len, "%s.%08" PRIx32 ".zimg",
+                      filebase, img->format);
+-    assert(n < len);
+-    filename[len] = '\0';
++    assert(n < len - 1);
++    filename[len - 1] = '\0';
+ 
+     zprintf(1, "dumping %.4s(%08" PRIx32 ") image to %s\n",
+             (char*)&img->format, img->format, filename);
+ 
+-    FILE *f = fopen(filename, "w");
++    f = fopen(filename, "w");
+     if(!f) {
+-        int rc = errno;
++#ifdef HAVE_ERRNO_H
++        rc = errno;
+         zprintf(1, "ERROR opening %s: %s\n", filename, strerror(rc));
+-        return(rc);
++#else
++        rc = 1;
++#endif
++        goto error;
+     }
+ 
+-    zimg_hdr_t hdr;
+     hdr.magic = 0x676d697a;
+     hdr.format = img->format;
+     hdr.width = img->width;
+@@ -233,12 +278,21 @@ int zbar_image_write (const zbar_image_t
+ 
+     if(fwrite(&hdr, sizeof(hdr), 1, f) != 1 ||
+        fwrite(img->data, 1, img->datalen, f) != img->datalen) {
+-        int rc = errno;
++#ifdef HAVE_ERRNO_H
++        rc = errno;
+         zprintf(1, "ERROR writing %s: %s\n", filename, strerror(rc));
++#else
++        rc = 1;
++#endif
+         fclose(f);
+-        return(rc);
++        goto error;
+     }
+-    return(fclose(f));
++
++    rc = fclose(f);
++
++error:
++    free(filename);
++    return(rc);
+ }
+ 
+ #ifdef DEBUG_SVG
+diff --git a/zbar/image.h b/zbar/image.h
+--- a/zbar/image.h
++++ b/zbar/image.h
+@@ -1,5 +1,5 @@
+ /*------------------------------------------------------------------------
+- *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
+  *
+  *  This file is part of the ZBar Bar Code Reader.
+  *
+@@ -35,10 +35,7 @@
+ #include "symbol.h"
+ #include "refcnt.h"
+ 
+-/* adapted from v4l2 spec */
+-#define fourcc(a, b, c, d)                      \
+-    ((uint32_t)(a) | ((uint32_t)(b) << 8) |     \
+-     ((uint32_t)(c) << 16) | ((uint32_t)(d) << 24))
++#define fourcc zbar_fourcc
+ 
+ /* unpack size/location of component */
+ #define RGB_SIZE(c)   ((c) >> 5)
+@@ -65,6 +62,8 @@ struct zbar_image_s {
+     unsigned width, height;     /* image size */
+     const void *data;           /* image sample data */
+     unsigned long datalen;      /* allocated/mapped size of data */
++    unsigned crop_x, crop_y;    /* crop rectangle */
++    unsigned crop_w, crop_h;
+     void *userdata;             /* user specified data associated w/image */
+ 
+     /* cleanup handler */
+@@ -129,4 +128,15 @@ static inline void _zbar_image_swap_symb
+     b->syms = tmp;
+ }
+ 
++static inline void _zbar_image_copy_size (zbar_image_t *dst,
++                                          const zbar_image_t *src)
++{
++    dst->width = src->width;
++    dst->height = src->height;
++    dst->crop_x = src->crop_x;
++    dst->crop_y = src->crop_y;
++    dst->crop_w = src->crop_w;
++    dst->crop_h = src->crop_h;
++}
++
+ #endif
+diff --git a/zbar/img_scanner.c b/zbar/img_scanner.c
+--- a/zbar/img_scanner.c
++++ b/zbar/img_scanner.c
+@@ -1,5 +1,5 @@
+ /*------------------------------------------------------------------------
+- *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
+  *
+  *  This file is part of the ZBar Bar Code Reader.
+  *
+@@ -22,19 +22,20 @@
+  *------------------------------------------------------------------------*/
+ 
+ #include <config.h>
+-#include <unistd.h>
++#ifdef HAVE_UNISTD_H
++# include <unistd.h>
++#endif
+ #ifdef HAVE_INTTYPES_H
+ # include <inttypes.h>
+ #endif
+ #include <stdlib.h>     /* malloc, free */
+-#include <time.h>       /* clock_gettime */
+-#include <sys/time.h>   /* gettimeofday */
+ #include <string.h>     /* memcmp, memset, memcpy */
+ #include <assert.h>
+ 
+ #include <zbar.h>
+ #include "error.h"
+ #include "image.h"
++#include "timer.h"
+ #ifdef ENABLE_QRCODE
+ # include "qrcode.h"
+ #endif
+@@ -50,11 +51,6 @@
+ 
+ /* FIXME cache setting configurability */
+ 
+-/* number of times the same result must be detected
+- * in "nearby" images before being reported
+- */
+-#define CACHE_CONSISTENCY    3 /* images */
+-
+ /* time interval for which two images are considered "nearby"
+  */
+ #define CACHE_PROXIMITY   1000 /* ms */
+@@ -112,6 +108,7 @@ struct zbar_image_scanner_s {
+     /* configuration settings */
+     unsigned config;            /* config flags */
+     int configs[NUM_SCN_CFGS];  /* int valued configurations */
++    int sym_configs[1][NUM_SYMS]; /* per-symbology configurations */
+ 
+ #ifndef NO_STATS
+     int stat_syms_new;
+@@ -136,6 +133,8 @@ void _zbar_image_scanner_recycle_syms (z
+             sym->next = NULL;
+         }
+         else {
++            int i;
++            recycle_bucket_t *bucket;
+             /* recycle unreferenced symbol */
+             if(!sym->data_alloc) {
+                 sym->data = NULL;
+@@ -149,7 +148,6 @@ void _zbar_image_scanner_recycle_syms (z
+                 _zbar_symbol_set_free(sym->syms);
+                 sym->syms = NULL;
+             }
+-            int i;
+             for(i = 0; i < RECYCLE_BUCKETS; i++)
+                 if(sym->data_alloc < 1 << (i * 2))
+                     break;
+@@ -160,7 +158,7 @@ void _zbar_image_scanner_recycle_syms (z
+                 sym->data_alloc = 0;
+                 i = 0;
+             }
+-            recycle_bucket_t *bucket = &iscn->recycle[i];
++            bucket = &iscn->recycle[i];
+             /* FIXME cap bucket fill */
+             bucket->nsyms++;
+             sym->next = bucket->head;
+@@ -196,18 +194,14 @@ inline void zbar_image_scanner_recycle_i
+ 
+     syms = img->syms;
+     img->syms = NULL;
+-    if(syms && recycle_syms(iscn, syms)) {
++    if(syms && recycle_syms(iscn, syms))
+         STAT(img_syms_inuse);
+-        syms = iscn->syms;
+-    }
+     else if(syms) {
+         STAT(img_syms_recycle);
+ 
+         /* select one set to resurrect, destroy the other */
+-        if(iscn->syms) {
++        if(iscn->syms)
+             _zbar_symbol_set_free(syms);
+-            syms = iscn->syms;
+-        }
+         else
+             iscn->syms = syms;
+     }
+@@ -219,12 +213,12 @@ _zbar_image_scanner_alloc_sym (zbar_imag
+                                int datalen)
+ {
+     /* recycle old or alloc new symbol */
++    zbar_symbol_t *sym = NULL;
+     int i;
+     for(i = 0; i < RECYCLE_BUCKETS - 1; i++)
+         if(datalen <= 1 << (i * 2))
+             break;
+ 
+-    zbar_symbol_t *sym = NULL;
+     for(; i > 0; i--)
+         if((sym = iscn->recycle[i].head)) {
+             STAT(sym_recycle[i]);
+@@ -246,6 +240,7 @@ _zbar_image_scanner_alloc_sym (zbar_imag
+     sym->type = type;
+     sym->quality = 1;
+     sym->npts = 0;
++    sym->orient = ZBAR_ORIENT_UNKNOWN;
+     sym->cache_count = 0;
+     sym->time = iscn->time;
+     assert(!sym->syms);
+@@ -295,27 +290,33 @@ static inline void cache_sym (zbar_image
+                               zbar_symbol_t *sym)
+ {
+     if(iscn->enable_cache) {
++        uint32_t age, near_thresh, far_thresh, dup;
+         zbar_symbol_t *entry = cache_lookup(iscn, sym);
+         if(!entry) {
+             /* FIXME reuse sym */
+             entry = _zbar_image_scanner_alloc_sym(iscn, sym->type,
+                                                   sym->datalen + 1);
++            entry->configs = sym->configs;
++            entry->modifiers = sym->modifiers;
+             memcpy(entry->data, sym->data, sym->datalen);
+             entry->time = sym->time - CACHE_HYSTERESIS;
+-            entry->cache_count = -CACHE_CONSISTENCY;
++            entry->cache_count = 0;
+             /* add to cache */
+             entry->next = iscn->cache;
+             iscn->cache = entry;
+         }
+ 
+         /* consistency check and hysteresis */
+-        uint32_t age = sym->time - entry->time;
++        age = sym->time - entry->time;
+         entry->time = sym->time;
+-        int near_thresh = (age < CACHE_PROXIMITY);
+-        int far_thresh = (age >= CACHE_HYSTERESIS);
+-        int dup = (entry->cache_count >= 0);
+-        if((!dup && !near_thresh) || far_thresh)
+-            entry->cache_count = -CACHE_CONSISTENCY;
++        near_thresh = (age < CACHE_PROXIMITY);
++        far_thresh = (age >= CACHE_HYSTERESIS);
++        dup = (entry->cache_count >= 0);
++        if((!dup && !near_thresh) || far_thresh) {
++            int type = sym->type;
++            int h = _zbar_get_symbol_hash(type);
++            entry->cache_count = -iscn->sym_configs[0][h];
++        }
+         else if(dup || near_thresh)
+             entry->cache_count++;
+ 
+@@ -328,9 +329,10 @@ static inline void cache_sym (zbar_image
+ void _zbar_image_scanner_add_sym(zbar_image_scanner_t *iscn,
+                                  zbar_symbol_t *sym)
+ {
++    zbar_symbol_set_t *syms;
+     cache_sym(iscn, sym);
+ 
+-    zbar_symbol_set_t *syms = iscn->syms;
++    syms = iscn->syms;
+     if(sym->cache_count || !syms->tail) {
+         sym->next = syms->head;
+         syms->head = sym;
+@@ -358,10 +360,12 @@ extern qr_finder_line *_zbar_decoder_get
+ 
+ static inline void qr_handler (zbar_image_scanner_t *iscn)
+ {
++    unsigned u;
++    int vert;
+     qr_finder_line *line = _zbar_decoder_get_qr_finder_line(iscn->dcode);
+     assert(line);
+-    unsigned u = zbar_scanner_get_edge(iscn->scn, line->pos[0],
+-                                       QR_FINDER_SUBPREC);
++    u = zbar_scanner_get_edge(iscn->scn, line->pos[0],
++                              QR_FINDER_SUBPREC);
+     line->boffs = u - zbar_scanner_get_edge(iscn->scn, line->boffs,
+                                             QR_FINDER_SUBPREC);
+     line->len = zbar_scanner_get_edge(iscn->scn, line->len,
+@@ -372,12 +376,12 @@ static inline void qr_handler (zbar_imag
+ 
+     u = QR_FIXED(iscn->umin, 0) + iscn->du * u;
+     if(iscn->du < 0) {
+-        u -= line->len;
+         int tmp = line->boffs;
+         line->boffs = line->eoffs;
+         line->eoffs = tmp;
++        u -= line->len;
+     }
+-    int vert = !iscn->dx;
++    vert = !iscn->dx;
+     line->pos[vert] = u;
+     line->pos[!vert] = QR_FIXED(iscn->v, 1);
+ 
+@@ -389,10 +393,10 @@ static void symbol_handler (zbar_decoder
+ {
+     zbar_image_scanner_t *iscn = zbar_decoder_get_userdata(dcode);
+     zbar_symbol_type_t type = zbar_decoder_get_type(dcode);
+-    /* FIXME assert(type == ZBAR_PARTIAL) */
+-    /* FIXME debug flag to save/display all PARTIALs */
+-    if(type <= ZBAR_PARTIAL)
+-        return;
++    int x = 0, y = 0, dir;
++    const char *data;
++    unsigned datalen;
++    zbar_symbol_t *sym;
+ 
+ #ifdef ENABLE_QRCODE
+     if(type == ZBAR_QRCODE) {
+@@ -403,10 +407,6 @@ static void symbol_handler (zbar_decoder
+     assert(type != ZBAR_QRCODE);
+ #endif
+ 
+-    const char *data = zbar_decoder_get_data(dcode);
+-    unsigned datalen = zbar_decoder_get_data_length(dcode);
+-
+-    int x = 0, y = 0;
+     if(TEST_CFG(iscn, ZBAR_CFG_POSITION)) {
+         /* tmp position fixup */
+         int w = zbar_scanner_get_width(iscn->scn);
+@@ -421,13 +421,23 @@ static void symbol_handler (zbar_decoder
+         }
+     }
+ 
++    /* FIXME debug flag to save/display all PARTIALs */
++    if(type <= ZBAR_PARTIAL) {
++        zprintf(256, "partial symbol @(%d,%d)\n", x, y);
++        return;
++    }
++
++    data = zbar_decoder_get_data(dcode);
++    datalen = zbar_decoder_get_data_length(dcode);
++
+     /* FIXME need better symbol matching */
+-    zbar_symbol_t *sym;
+     for(sym = iscn->syms->head; sym; sym = sym->next)
+         if(sym->type == type &&
+            sym->datalen == datalen &&
+            !memcmp(sym->data, data, datalen)) {
+             sym->quality++;
++            zprintf(224, "dup symbol @(%d,%d): dup %s: %.20s\n",
++                    x, y, zbar_get_symbol_name(type), data);
+             if(TEST_CFG(iscn, ZBAR_CFG_POSITION))
+                 /* add new point to existing set */
+                 /* FIXME should be polygon */
+@@ -436,12 +446,21 @@ static void symbol_handler (zbar_decoder
+         }
+ 
+     sym = _zbar_image_scanner_alloc_sym(iscn, type, datalen + 1);
++    sym->configs = zbar_decoder_get_configs(dcode, type);
++    sym->modifiers = zbar_decoder_get_modifiers(dcode);
+     /* FIXME grab decoder buffer */
+     memcpy(sym->data, data, datalen + 1);
+ 
+     /* initialize first point */
+-    if(TEST_CFG(iscn, ZBAR_CFG_POSITION))
++    if(TEST_CFG(iscn, ZBAR_CFG_POSITION)) {
++        zprintf(192, "new symbol @(%d,%d): %s: %.20s\n",
++                x, y, zbar_get_symbol_name(type), data);
+         sym_add_point(sym, x, y);
++    }
++
++    dir = zbar_decoder_get_direction(dcode);
++    if(dir)
++        sym->orient = (iscn->dy != 0) + ((iscn->du ^ dir) & 2);
+ 
+     _zbar_image_scanner_add_sym(iscn, sym);
+ }
+@@ -468,19 +487,24 @@ zbar_image_scanner_t *zbar_image_scanner
+     CFG(iscn, ZBAR_CFG_X_DENSITY) = 1;
+     CFG(iscn, ZBAR_CFG_Y_DENSITY) = 1;
+     zbar_image_scanner_set_config(iscn, 0, ZBAR_CFG_POSITION, 1);
++    zbar_image_scanner_set_config(iscn, 0, ZBAR_CFG_UNCERTAINTY, 2);
++    zbar_image_scanner_set_config(iscn, ZBAR_QRCODE, ZBAR_CFG_UNCERTAINTY, 0);
++    zbar_image_scanner_set_config(iscn, ZBAR_CODE128, ZBAR_CFG_UNCERTAINTY, 0);
++    zbar_image_scanner_set_config(iscn, ZBAR_CODE93, ZBAR_CFG_UNCERTAINTY, 0);
++    zbar_image_scanner_set_config(iscn, ZBAR_CODE39, ZBAR_CFG_UNCERTAINTY, 0);
+     return(iscn);
+ }
+ 
+ #ifndef NO_STATS
+ static inline void dump_stats (const zbar_image_scanner_t *iscn)
+ {
++    int i;
+     zprintf(1, "symbol sets allocated   = %-4d\n", iscn->stat_syms_new);
+     zprintf(1, "    scanner syms in use = %-4d\trecycled  = %-4d\n",
+             iscn->stat_iscn_syms_inuse, iscn->stat_iscn_syms_recycle);
+     zprintf(1, "    image syms in use   = %-4d\trecycled  = %-4d\n",
+             iscn->stat_img_syms_inuse, iscn->stat_img_syms_recycle);
+     zprintf(1, "symbols allocated       = %-4d\n", iscn->stat_sym_new);
+-    int i;
+     for(i = 0; i < RECYCLE_BUCKETS; i++)
+         zprintf(1, "     recycled[%d]        = %-4d\n",
+                 i, iscn->stat_sym_recycle[i]);
+@@ -489,6 +513,7 @@ static inline void dump_stats (const zba
+ 
+ void zbar_image_scanner_destroy (zbar_image_scanner_t *iscn)
+ {
++    int i;
+     dump_stats(iscn);
+     if(iscn->syms) {
+         if(iscn->syms->refcnt)
+@@ -503,7 +528,6 @@ void zbar_image_scanner_destroy (zbar_im
+     if(iscn->dcode)
+         zbar_decoder_destroy(iscn->dcode);
+     iscn->dcode = NULL;
+-    int i;
+     for(i = 0; i < RECYCLE_BUCKETS; i++) {
+         zbar_symbol_t *sym, *next;
+         for(sym = iscn->recycle[i].head; sym; sym = next) {
+@@ -536,9 +560,24 @@ int zbar_image_scanner_set_config (zbar_
+                                    zbar_config_t cfg,
+                                    int val)
+ {
+-    if(cfg < ZBAR_CFG_POSITION)
++    if(cfg < ZBAR_CFG_UNCERTAINTY)
+         return(zbar_decoder_set_config(iscn->dcode, sym, cfg, val));
+ 
++    if(cfg < ZBAR_CFG_POSITION) {
++        int c, i;
++        if(cfg > ZBAR_CFG_UNCERTAINTY)
++            return(1);
++        c = cfg - ZBAR_CFG_UNCERTAINTY;
++        if(sym > ZBAR_PARTIAL) {
++            i = _zbar_get_symbol_hash(sym);
++            iscn->sym_configs[c][i] = val;
++        }
++        else
++            for(i = 0; i < NUM_SYMS; i++)
++                iscn->sym_configs[c][i] = val;
++        return(0);
++    }
++
+     if(sym > ZBAR_PARTIAL)
+         return(1);
+ 
+@@ -591,30 +630,28 @@ static inline void quiet_border (zbar_im
+ #define movedelta(dx, dy) do {                  \
+         x += (dx);                              \
+         y += (dy);                              \
+-        p += (dx) + ((intptr_t)(dy) * w);       \
++        p += (dx) + ((uintptr_t)(dy) * w);       \
+     } while(0);
+ 
+ int zbar_scan_image (zbar_image_scanner_t *iscn,
+                      zbar_image_t *img)
+ {
++    zbar_symbol_set_t *syms;
++    const uint8_t *data;
++    zbar_scanner_t *scn = iscn->scn;
++    unsigned w, h, cx1, cy1;
++    int density;
++
+     /* timestamp image
+      * FIXME prefer video timestamp
+      */
+-#if _POSIX_TIMERS > 0
+-    struct timespec abstime;
+-    clock_gettime(CLOCK_REALTIME, &abstime);
+-    iscn->time = (abstime.tv_sec * 1000) + ((abstime.tv_nsec / 500000) + 1) / 2;
+-#else
+-    struct timeval abstime;
+-    gettimeofday(&abstime, NULL);
+-    iscn->time = (abstime.tv_sec * 1000) + ((abstime.tv_usec / 500) + 1) / 2;
+-#endif
++    iscn->time = _zbar_timer_now();
+ 
+ #ifdef ENABLE_QRCODE
+     _zbar_qr_reset(iscn->qr);
+ #endif
+ 
+-    /* get grayscale image, convert if necessary */
++    /* image must be in grayscale format */
+     if(img->format != fourcc('Y','8','0','0') &&
+        img->format != fourcc('G','R','E','Y'))
+         return(-1);
+@@ -622,7 +659,7 @@ int zbar_scan_image (zbar_image_scanner_
+ 
+     /* recycle previous scanner and image results */
+     zbar_image_scanner_recycle_image(iscn, img);
+-    zbar_symbol_set_t *syms = iscn->syms;
++    syms = iscn->syms;
+     if(!syms) {
+         syms = iscn->syms = _zbar_symbol_set_create();
+         STAT(syms_new);
+@@ -632,37 +669,43 @@ int zbar_scan_image (zbar_image_scanner_
+         zbar_symbol_set_ref(syms, 2);
+     img->syms = syms;
+ 
+-    unsigned w = img->width;
+-    unsigned h = img->height;
+-    const uint8_t *data = img->data;
++    w = img->width;
++    h = img->height;
++    cx1 = img->crop_x + img->crop_w;
++    assert(cx1 <= w);
++    cy1 = img->crop_y + img->crop_h;
++    assert(cy1 <= h);
++    data = img->data;
+ 
+     zbar_image_write_png(img, "debug.png");
+     svg_open("debug.svg", 0, 0, w, h);
+     svg_image("debug.png", w, h);
+ 
+-    zbar_scanner_t *scn = iscn->scn;
++    zbar_scanner_new_scan(scn);
+ 
+-    int density = CFG(iscn, ZBAR_CFG_Y_DENSITY);
++    density = CFG(iscn, ZBAR_CFG_Y_DENSITY);
+     if(density > 0) {
+-        svg_group_start("scanner", 0, 1, 1, 0, 0);
+         const uint8_t *p = data;
+         int x = 0, y = 0;
++
++        int border = (((img->crop_h - 1) % density) + 1) / 2;
++        if(border > img->crop_h / 2)
++            border = img->crop_h / 2;
++        border += img->crop_y;
++        assert(border <= h);
++        svg_group_start("scanner", 0, 1, 1, 0, 0);
+         iscn->dy = 0;
+ 
+-        int border = (((h - 1) % density) + 1) / 2;
+-        if(border > h / 2)
+-            border = h / 2;
+-        movedelta(0, border);
++        movedelta(img->crop_x, border);
+         iscn->v = y;
+ 
+-        zbar_scanner_new_scan(scn);
+-
+-        while(y < h) {
++        while(y < cy1) {
++            int cx0 = img->crop_x;;
+             zprintf(128, "img_x+: %04d,%04d @%p\n", x, y, p);
+             svg_path_start("vedge", 1. / 32, 0, y + 0.5);
+             iscn->dx = iscn->du = 1;
+-            iscn->umin = 0;
+-            while(x < w) {
++            iscn->umin = cx0;
++            while(x < cx1) {
+                 uint8_t d = *p;
+                 movedelta(1, 0);
+                 zbar_scan_y(scn, d);
+@@ -673,14 +716,14 @@ int zbar_scan_image (zbar_image_scanner_
+ 
+             movedelta(-1, density);
+             iscn->v = y;
+-            if(y >= h)
++            if(y >= cy1)
+                 break;
+ 
+             zprintf(128, "img_x-: %04d,%04d @%p\n", x, y, p);
+             svg_path_start("vedge", -1. / 32, w, y + 0.5);
+             iscn->dx = iscn->du = -1;
+-            iscn->umin = w;
+-            while(x >= 0) {
++            iscn->umin = cx1;
++            while(x >= cx0) {
+                 uint8_t d = *p;
+                 movedelta(-1, 0);
+                 zbar_scan_y(scn, d);
+@@ -698,22 +741,25 @@ int zbar_scan_image (zbar_image_scanner_
+ 
+     density = CFG(iscn, ZBAR_CFG_X_DENSITY);
+     if(density > 0) {
+-        svg_group_start("scanner", 90, 1, -1, 0, 0);
+         const uint8_t *p = data;
+         int x = 0, y = 0;
+ 
+-        int border = (((w - 1) % density) + 1) / 2;
+-        if(border > w / 2)
+-            border = w / 2;
+-        movedelta(border, 0);
++        int border = (((img->crop_w - 1) % density) + 1) / 2;
++        if(border > img->crop_w / 2)
++            border = img->crop_w / 2;
++        border += img->crop_x;
++        assert(border <= w);
++        svg_group_start("scanner", 90, 1, -1, 0, 0);
++        movedelta(border, img->crop_y);
+         iscn->v = x;
+ 
+-        while(x < w) {
++        while(x < cx1) {
++            int cy0 = img->crop_y;
+             zprintf(128, "img_y+: %04d,%04d @%p\n", x, y, p);
+             svg_path_start("vedge", 1. / 32, 0, x + 0.5);
+             iscn->dy = iscn->du = 1;
+-            iscn->umin = 0;
+-            while(y < h) {
++            iscn->umin = cy0;
++            while(y < cy1) {
+                 uint8_t d = *p;
+                 movedelta(0, 1);
+                 zbar_scan_y(scn, d);
+@@ -724,14 +770,14 @@ int zbar_scan_image (zbar_image_scanner_
+ 
+             movedelta(density, -1);
+             iscn->v = x;
+-            if(x >= w)
++            if(x >= cx1)
+                 break;
+ 
+             zprintf(128, "img_y-: %04d,%04d @%p\n", x, y, p);
+             svg_path_start("vedge", -1. / 32, h, x + 0.5);
+             iscn->dy = iscn->du = -1;
+-            iscn->umin = h;
+-            while(y >= 0) {
++            iscn->umin = cy1;
++            while(y >= cy0) {
+                 uint8_t d = *p;
+                 movedelta(0, -1);
+                 zbar_scan_y(scn, d);
+@@ -757,8 +803,9 @@ int zbar_scan_image (zbar_image_scanner_
+        (density == 1 || CFG(iscn, ZBAR_CFG_Y_DENSITY) == 1)) {
+         zbar_symbol_t **symp = &syms->head, *sym;
+         while((sym = *symp)) {
+-            if(sym->type < ZBAR_I25 && sym->type > ZBAR_PARTIAL &&
+-               sym->quality < 3) {
++            if(((sym->type < ZBAR_I25 && sym->type > ZBAR_PARTIAL) ||
++                sym->type == ZBAR_DATABAR || sym->type == ZBAR_DATABAR_EXP) &&
++               sym->quality < 4) {
+                 /* recycle */
+                 *symp = sym->next;
+                 syms->nsyms--;
+diff --git a/zbar/jpeg.c b/zbar/jpeg.c
+--- a/zbar/jpeg.c
++++ b/zbar/jpeg.c
+@@ -195,10 +195,16 @@ void _zbar_convert_jpeg_to_y (zbar_image
+     jpeg_start_decompress(cinfo);
+ 
+     /* adjust dst image parameters to match(?) decompressor */
+-    if(dst->width < cinfo->output_width)
++    if(dst->width < cinfo->output_width) {
+         dst->width = cinfo->output_width;
+-    if(dst->height < cinfo->output_height)
++        if(dst->crop_x + dst->crop_w > dst->width)
++            dst->crop_w = dst->width - dst->crop_x;
++    }
++    if(dst->height < cinfo->output_height) {
+         dst->height = cinfo->output_height;
++        if(dst->crop_y + dst->crop_h > dst->height)
++            dst->crop_h = dst->height - dst->crop_y;
++    }
+     unsigned long datalen = (cinfo->output_width *
+                              cinfo->output_height *
+                              cinfo->out_color_components);
+diff --git a/zbar/processor.c b/zbar/processor.c
+--- a/zbar/processor.c
++++ b/zbar/processor.c
+@@ -1,5 +1,5 @@
+ /*------------------------------------------------------------------------
+- *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
+  *
+  *  This file is part of the ZBar Bar Code Reader.
+  *
+@@ -95,11 +95,12 @@ int _zbar_process_image (zbar_processor_
+             while(sym) {
+                 zbar_symbol_type_t type = zbar_symbol_get_type(sym);
+                 int count = zbar_symbol_get_count(sym);
+-                zprintf(8, "%s%s: %s (%d pts) (q=%d) (%s)\n",
++                zprintf(8, "%s%s: %s (%d pts) (dir=%d) (q=%d) (%s)\n",
+                         zbar_get_symbol_name(type),
+                         zbar_get_addon_name(type),
+                         zbar_symbol_get_data(sym),
+                         zbar_symbol_get_loc_size(sym),
++                        zbar_symbol_get_orientation(sym),
+                         zbar_symbol_get_quality(sym),
+                         (count < 0) ? "uncertain" :
+                         (count > 0) ? "duplicate" : "new");
+@@ -288,6 +289,10 @@ void zbar_processor_destroy (zbar_proces
+ {
+     zbar_processor_init(proc, NULL, 0);
+ 
++    if(proc->syms) {
++        zbar_symbol_set_ref(proc->syms, -1);
++        proc->syms = NULL;
++    }
+     if(proc->scanner) {
+         zbar_image_scanner_destroy(proc->scanner);
+         proc->scanner = NULL;
+diff --git a/zbar/qrcode/qrdec.c b/zbar/qrcode/qrdec.c
+--- a/zbar/qrcode/qrdec.c
++++ b/zbar/qrcode/qrdec.c
+@@ -3,6 +3,7 @@
+    GNU Lesser General Public License as published by the Free Software
+    Foundation; either version 2.1 of the License, or (at your option) any later
+    version.*/
++#include <config.h>
+ #include <stdlib.h>
+ #include <limits.h>
+ #include <string.h>
+@@ -2577,8 +2578,8 @@ static inline void qr_svg_points(const c
+                                  qr_point *p,
+                                  int n)
+ {
++    int i;
+     svg_path_start(cls, 1, 0, 0);
+-    int i;
+     for(i = 0; i < n; i++, p++)
+         svg_path_moveto(SVG_ABS, p[0][0], p[0][1]);
+     svg_path_end();
+@@ -3913,7 +3914,7 @@ int _zbar_qr_decode (qr_reader *reader,
+                      zbar_image_scanner_t *iscn,
+                      zbar_image_t *img)
+ {
+-    int nqrdata = 0;
++    int nqrdata = 0, ncenters;
+     qr_finder_edge_pt *edge_pts = NULL;
+     qr_finder_center *centers = NULL;
+ 
+@@ -3923,7 +3924,7 @@ int _zbar_qr_decode (qr_reader *reader,
+ 
+     svg_group_start("finder", 0, 1. / (1 << QR_FINDER_SUBPREC), 0, 0, 0);
+ 
+-    int ncenters = qr_finder_centers_locate(&centers, &edge_pts, reader, 0, 0);
++    ncenters = qr_finder_centers_locate(&centers, &edge_pts, reader, 0, 0);
+ 
+     zprintf(14, "%dx%d finders, %d centers:\n",
+             reader->finder_lines[0].nlines,
+diff --git a/zbar/qrcode/qrdectxt.c b/zbar/qrcode/qrdectxt.c
+--- a/zbar/qrcode/qrdectxt.c
++++ b/zbar/qrcode/qrdectxt.c
+@@ -1,8 +1,9 @@
+-/*Copyright (C) 2008-2009  Timothy B. Terriberry (tterribe@xiph.org)
++/*Copyright (C) 2008-2010  Timothy B. Terriberry (tterribe@xiph.org)
+   You can redistribute this library and/or modify it under the terms of the
+    GNU Lesser General Public License as published by the Free Software
+    Foundation; either version 2.1 of the License, or (at your option) any later
+    version.*/
++#include <config.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+@@ -50,12 +51,10 @@ int qr_code_data_list_extract_text(const
+   const qr_code_data  *qrdata;
+   int                  nqrdata;
+   unsigned char       *mark;
+-  char               **text;
+   int                  ntext;
+   int                  i;
+   qrdata=_qrlist->qrdata;
+   nqrdata=_qrlist->nqrdata;
+-  text=(char **)malloc(nqrdata*sizeof(*text));
+   mark=(unsigned char *)calloc(nqrdata,sizeof(*mark));
+   ntext=0;
+   /*This is the encoding the standard says is the default.*/
+@@ -79,6 +78,10 @@ int qr_code_data_list_extract_text(const
+     int                       err;
+     int                       j;
+     int                       k;
++    zbar_symbol_t *syms = NULL, **sym = &syms;
++    qr_point dir;
++    int horiz;
++
+     /*Step 0: Collect the other QR codes belonging to this S-A group.*/
+     if(qrdata[i].sa_size){
+       unsigned sa_parity;
+@@ -138,7 +141,6 @@ int qr_code_data_list_extract_text(const
+     enc_list[2]=utf8_cd;
+     eci_cd=(iconv_t)-1;
+     err=0;
+-    zbar_symbol_t *syms = NULL, **sym = &syms;
+     for(j = 0; j < sa_size && !err; j++, sym = &(*sym)->next) {
+       *sym = _zbar_image_scanner_alloc_sym(iscn, ZBAR_QRCODE, 0);
+       (*sym)->datalen = sa_ntext;
+@@ -167,6 +169,14 @@ int qr_code_data_list_extract_text(const
+       sym_add_point(*sym, qrdataj->bbox[3][0], qrdataj->bbox[3][1]);
+       sym_add_point(*sym, qrdataj->bbox[1][0], qrdataj->bbox[1][1]);
+ 
++      /* approx symbol "up" direction */
++      dir[0] = (qrdataj->bbox[0][0] - qrdataj->bbox[2][0] +
++                qrdataj->bbox[1][0] - qrdataj->bbox[3][0]);
++      dir[1] = (qrdataj->bbox[2][1] - qrdataj->bbox[0][1] +
++                qrdataj->bbox[3][1] - qrdataj->bbox[1][1]);
++      horiz = abs(dir[0]) > abs(dir[1]);
++      (*sym)->orient = horiz + 2 * (dir[1 - horiz] < 0);
++
+       for(k=0;k<qrdataj->nentries&&!err;k++){
+         size_t              inleft;
+         size_t              outleft;
+@@ -331,26 +341,27 @@ int qr_code_data_list_extract_text(const
+     }
+     if(eci_cd!=(iconv_t)-1)iconv_close(eci_cd);
+     if(!err){
++      zbar_symbol_t *sa_sym;
+       sa_text[sa_ntext++]='\0';
+       if(sa_ctext+1>sa_ntext){
+         sa_text=(char *)realloc(sa_text,sa_ntext*sizeof(*sa_text));
+       }
+ 
+-      zbar_symbol_t *sa_sym;
+       if(sa_size == 1)
+           sa_sym = syms;
+       else {
++          /* cheap out w/axis aligned bbox for now */
++          int xmin = img->width, xmax = -2;
++          int ymin = img->height, ymax = -2;
++
+           /* create "virtual" container symbol for composite result */
+           sa_sym = _zbar_image_scanner_alloc_sym(iscn, ZBAR_QRCODE, 0);
+           sa_sym->syms = _zbar_symbol_set_create();
+           sa_sym->syms->head = syms;
+ 
+-          /* cheap out w/axis aligned bbox for now */
+-          int xmin = img->width, xmax = -2;
+-          int ymin = img->height, ymax = -2;
+-
+           /* fixup data references */
+           for(; syms; syms = syms->next) {
++              int next;
+               _zbar_symbol_refcnt(syms, 1);
+               if(syms->type == ZBAR_PARTIAL)
+                   sa_sym->type = ZBAR_PARTIAL;
+@@ -364,7 +375,7 @@ int qr_code_data_list_extract_text(const
+                       if(ymax <= u) ymax = u + 1;
+                   }
+               syms->data = sa_text + syms->datalen;
+-              int next = (syms->next) ? syms->next->datalen : sa_ntext;
++              next = (syms->next) ? syms->next->datalen : sa_ntext;
+               assert(next > syms->datalen);
+               syms->datalen = next - syms->datalen - 1;
+           }
+diff --git a/zbar/refcnt.c b/zbar/refcnt.c
+--- a/zbar/refcnt.c
++++ b/zbar/refcnt.c
+@@ -23,7 +23,7 @@
+ 
+ #include "refcnt.h"
+ 
+-#ifdef HAVE_LIBPTHREAD
++#if !defined(_WIN32) && !defined(TARGET_OS_MAC) && defined(HAVE_LIBPTHREAD)
+ 
+ pthread_once_t initialized = PTHREAD_ONCE_INIT;
+ pthread_mutex_t _zbar_reflock;
+diff --git a/zbar/refcnt.h b/zbar/refcnt.h
+--- a/zbar/refcnt.h
++++ b/zbar/refcnt.h
+@@ -1,5 +1,5 @@
+ /*------------------------------------------------------------------------
+- *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
+  *
+  *  This file is part of the ZBar Bar Code Reader.
+  *
+@@ -29,7 +29,7 @@
+ #if defined(_WIN32)
+ # include <windows.h>
+ 
+-typedef volatile LONG refcnt_t;  /* FIXME where did volatile come from? */
++typedef LONG refcnt_t;
+ 
+ static inline int _zbar_refcnt (refcnt_t *cnt,
+                                 int delta)
+@@ -45,6 +45,18 @@ static inline int _zbar_refcnt (refcnt_t
+     return(rc);
+ }
+ 
++#elif defined(TARGET_OS_MAC)
++# include <libkern/OSAtomic.h>
++
++typedef int32_t refcnt_t;
++
++static inline int _zbar_refcnt (refcnt_t *cnt,
++                                int delta)
++{
++    int rc = OSAtomicAdd32Barrier(delta, cnt);
++    assert(rc >= 0);
++    return(rc);
++}
+ 
+ #elif defined(HAVE_LIBPTHREAD)
+ # include <pthread.h>
+diff --git a/zbar/scanner.c b/zbar/scanner.c
+--- a/zbar/scanner.c
++++ b/zbar/scanner.c
+@@ -1,5 +1,5 @@
+ /*------------------------------------------------------------------------
+- *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
+  *
+  *  This file is part of the ZBar Bar Code Reader.
+  *
+@@ -23,6 +23,7 @@
+ 
+ #include <config.h>
+ #include <stdlib.h>     /* malloc, free, abs */
++#include <stddef.h>
+ #include <string.h>     /* memset */
+ 
+ #include <zbar.h>
+@@ -91,7 +92,7 @@ void zbar_scanner_destroy (zbar_scanner_
+ 
+ zbar_symbol_type_t zbar_scanner_reset (zbar_scanner_t *scn)
+ {
+-    memset(&scn->x, 0, sizeof(zbar_scanner_t) + (void*)scn - (void*)&scn->x);
++    memset(&scn->x, 0, sizeof(zbar_scanner_t) - offsetof(zbar_scanner_t, x));
+     scn->y1_thresh = scn->y1_min_thresh;
+     if(scn->decoder)
+         zbar_decoder_reset(scn->decoder);
+@@ -125,14 +126,15 @@ zbar_color_t zbar_scanner_get_color (con
+ static inline unsigned calc_thresh (zbar_scanner_t *scn)
+ {
+     /* threshold 1st to improve noise rejection */
+-    unsigned thresh = scn->y1_thresh;
++    unsigned dx, thresh = scn->y1_thresh;
++    unsigned long t;
+     if((thresh <= scn->y1_min_thresh) || !scn->width) {
+         dprintf(1, " tmin=%d", scn->y1_min_thresh);
+         return(scn->y1_min_thresh);
+     }
+     /* slowly return threshold to min */
+-    unsigned dx = (scn->x << ZBAR_FIXED) - scn->last_edge;
+-    unsigned long t = thresh * dx;
++    dx = (scn->x << ZBAR_FIXED) - scn->last_edge;
++    t = thresh * dx;
+     t /= scn->width;
+     t /= ZBAR_SCANNER_THRESH_FADE;
+     dprintf(1, " thr=%d t=%ld x=%d last=%d.%d (%d)",
+@@ -174,14 +176,15 @@ static inline zbar_symbol_type_t process
+ 
+ inline zbar_symbol_type_t zbar_scanner_flush (zbar_scanner_t *scn)
+ {
++    unsigned x;
+     if(!scn->y1_sign)
+         return(ZBAR_NONE);
+ 
+-    unsigned x = (scn->x << ZBAR_FIXED) + ROUND;
++    x = (scn->x << ZBAR_FIXED) + ROUND;
+ 
+     if(scn->cur_edge != x || scn->y1_sign > 0) {
++        zbar_symbol_type_t edge = process_edge(scn, -scn->y1_sign);
+         dprintf(1, "flush0:");
+-        zbar_symbol_type_t edge = process_edge(scn, -scn->y1_sign);
+         scn->cur_edge = x;
+         scn->y1_sign = -scn->y1_sign;
+         return(edge);
+@@ -203,7 +206,7 @@ zbar_symbol_type_t zbar_scanner_new_scan
+     }
+ 
+     /* reset scanner and associated decoder */
+-    memset(&scn->x, 0, sizeof(zbar_scanner_t) + (void*)scn - (void*)&scn->x);
++    memset(&scn->x, 0, sizeof(zbar_scanner_t) - offsetof(zbar_scanner_t, x));
+     scn->y1_thresh = scn->y1_min_thresh;
+     if(scn->decoder)
+         zbar_decoder_new_scan(scn->decoder);
+@@ -218,6 +221,8 @@ zbar_symbol_type_t zbar_scan_y (zbar_sca
+     register int x = scn->x;
+     register int y0_1 = scn->y0[(x - 1) & 3];
+     register int y0_0 = y0_1;
++    register int y0_2, y0_3, y1_1, y2_1, y2_2;
++    zbar_symbol_type_t edge;
+     if(x) {
+         /* update weighted moving average */
+         y0_0 += ((int)((y - y0_1) * EWMA_WEIGHT)) >> ZBAR_FIXED;
+@@ -225,10 +230,10 @@ zbar_symbol_type_t zbar_scan_y (zbar_sca
+     }
+     else
+         y0_0 = y0_1 = scn->y0[0] = scn->y0[1] = scn->y0[2] = scn->y0[3] = y;
+-    register int y0_2 = scn->y0[(x - 2) & 3];
+-    register int y0_3 = scn->y0[(x - 3) & 3];
++    y0_2 = scn->y0[(x - 2) & 3];
++    y0_3 = scn->y0[(x - 3) & 3];
+     /* 1st differential @ x-1 */
+-    register int y1_1 = y0_1 - y0_2;
++    y1_1 = y0_1 - y0_2;
+     {
+         register int y1_2 = y0_2 - y0_3;
+         if((abs(y1_1) < abs(y1_2)) &&
+@@ -237,13 +242,13 @@ zbar_symbol_type_t zbar_scan_y (zbar_sca
+     }
+ 
+     /* 2nd differentials @ x-1 & x-2 */
+-    register int y2_1 = y0_0 - (y0_1 * 2) + y0_2;
+-    register int y2_2 = y0_1 - (y0_2 * 2) + y0_3;
++    y2_1 = y0_0 - (y0_1 * 2) + y0_2;
++    y2_2 = y0_1 - (y0_2 * 2) + y0_3;
+ 
+     dprintf(1, "scan: x=%d y=%d y0=%d y1=%d y2=%d",
+             x, y, y0_1, y1_1, y2_1);
+ 
+-    zbar_symbol_type_t edge = ZBAR_NONE;
++    edge = ZBAR_NONE;
+     /* 2nd zero-crossing is 1st local min/max - could be edge */
+     if((!y2_1 ||
+         ((y2_1 > 0) ? y2_2 < 0 : y2_2 > 0)) &&
+@@ -256,6 +261,7 @@ zbar_symbol_type_t zbar_scan_y (zbar_sca
+             edge = process_edge(scn, y1_1);
+ 
+         if(y1_rev || (abs(scn->y1_sign) < abs(y1_1))) {
++            int d;
+             scn->y1_sign = y1_1;
+ 
+             /* adaptive thresholding */
+@@ -266,7 +272,7 @@ zbar_symbol_type_t zbar_scan_y (zbar_sca
+                 scn->y1_thresh = scn->y1_min_thresh;
+ 
+             /* update current edge */
+-            int d = y2_1 - y2_2;
++            d = y2_1 - y2_2;
+             scn->cur_edge = 1 << ZBAR_FIXED;
+             if(!d)
+                 scn->cur_edge >>= 1;
+@@ -298,14 +304,14 @@ void zbar_scanner_get_state (const zbar_
+     register int y0_0 = scn->y0[(scn->x - 1) & 3];
+     register int y0_1 = scn->y0[(scn->x - 2) & 3];
+     register int y0_2 = scn->y0[(scn->x - 3) & 3];
++    zbar_scanner_t *mut_scn;
+     if(x) *x = scn->x - 1;
+-    if(cur_edge) *cur_edge = scn->cur_edge;
+     if(last_edge) *last_edge = scn->last_edge;
+     if(y0) *y0 = y0_1;
+     if(y1) *y1 = y0_1 - y0_2;
+     if(y2) *y2 = y0_0 - (y0_1 * 2) + y0_2;
+     /* NB not quite accurate (uses updated x) */
+-    zbar_scanner_t *mut_scn = (zbar_scanner_t*)scn;
++    mut_scn = (zbar_scanner_t*)scn;
+     if(y1_thresh) *y1_thresh = calc_thresh(mut_scn);
+     dprintf(1, "\n");
+ }
+diff --git a/zbar/symbol.c b/zbar/symbol.c
+--- a/zbar/symbol.c
++++ b/zbar/symbol.c
+@@ -1,5 +1,5 @@
+ /*------------------------------------------------------------------------
+- *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
+  *
+  *  This file is part of the ZBar Bar Code Reader.
+  *
+@@ -39,7 +39,10 @@ const char *zbar_get_symbol_name (zbar_s
+     case ZBAR_EAN13: return("EAN-13");
+     case ZBAR_ISBN13: return("ISBN-13");
+     case ZBAR_I25: return("I2/5");
++    case ZBAR_DATABAR: return("DataBar");
++    case ZBAR_DATABAR_EXP: return("DataBar-Exp");
+     case ZBAR_CODE39: return("CODE-39");
++    case ZBAR_CODE93: return("CODE-93");
+     case ZBAR_CODE128: return("CODE-128");
+     case ZBAR_PDF417: return("PDF417");
+     case ZBAR_QRCODE: return("QR-Code");
+@@ -56,6 +59,58 @@ const char *zbar_get_addon_name (zbar_sy
+     }
+ }
+ 
++const char *zbar_get_config_name (zbar_config_t cfg)
++{
++    switch(cfg) {
++    case ZBAR_CFG_ENABLE: return("ENABLE");
++    case ZBAR_CFG_ADD_CHECK: return("ADD_CHECK");
++    case ZBAR_CFG_EMIT_CHECK: return("EMIT_CHECK");
++    case ZBAR_CFG_ASCII: return("ASCII");
++    case ZBAR_CFG_MIN_LEN: return("MIN_LEN");
++    case ZBAR_CFG_MAX_LEN: return("MAX_LEN");
++    case ZBAR_CFG_UNCERTAINTY: return("UNCERTAINTY");
++    case ZBAR_CFG_POSITION: return("POSITION");
++    case ZBAR_CFG_X_DENSITY: return("X_DENSITY");
++    case ZBAR_CFG_Y_DENSITY: return("Y_DENSITY");
++    default: return("");
++    }
++}
++
++const char *zbar_get_modifier_name (zbar_modifier_t mod)
++{
++    switch(mod) {
++    case ZBAR_MOD_GS1: return("GS1");
++    case ZBAR_MOD_AIM: return("AIM");
++    default: return("");
++    }
++}
++
++const char *zbar_get_orientation_name (zbar_orientation_t orient)
++{
++    switch(orient) {
++    case ZBAR_ORIENT_UP: return("UP");
++    case ZBAR_ORIENT_RIGHT: return("RIGHT");
++    case ZBAR_ORIENT_DOWN: return("DOWN");
++    case ZBAR_ORIENT_LEFT: return("LEFT");
++    default: return("UNKNOWN");
++    }
++}
++
++int _zbar_get_symbol_hash (zbar_symbol_type_t sym)
++{
++    static const signed char hash[0x20] = {
++        0x00, 0x01, 0x0d, 0x0e,   -1,   -1,   -1, 0x09,
++        0x05, 0x06, 0x08,   -1, 0x04, 0x03, 0x07,   -1,
++          -1,   -1,   -1,   -1,   -1,   -1,   -1, 0x02,
++          -1, 0x00, 0x0f, 0x0c, 0x0b, 0x00, 0x0a, 0x00,
++    };
++    int g0 = hash[sym & 0x1f];
++    int g1 = hash[~(sym >> 4) & 0x1f];
++    assert(g0 >= 0 && g1 >= 0);
++    if(g0 < 0 || g1 < 0)
++        return(0);
++    return((g0 + g1) & 0x1f);
++}
+ 
+ void _zbar_symbol_free (zbar_symbol_t *sym)
+ {
+@@ -82,6 +137,16 @@ zbar_symbol_type_t zbar_symbol_get_type 
+     return(sym->type);
+ }
+ 
++unsigned int zbar_symbol_get_configs (const zbar_symbol_t *sym)
++{
++    return(sym->configs);
++}
++
++unsigned int zbar_symbol_get_modifiers (const zbar_symbol_t *sym)
++{
++    return(sym->modifiers);
++}
++
+ const char *zbar_symbol_get_data (const zbar_symbol_t *sym)
+ {
+     return(sym->data);
+@@ -125,6 +190,11 @@ int zbar_symbol_get_loc_y (const zbar_sy
+         return(-1);
+ }
+ 
++zbar_orientation_t zbar_symbol_get_orientation (const zbar_symbol_t *sym)
++{
++    return(sym->orient);
++}
++
+ const zbar_symbol_t *zbar_symbol_next (const zbar_symbol_t *sym)
+ {
+     return((sym) ? sym->next : NULL);
+@@ -142,26 +212,100 @@ const zbar_symbol_t *zbar_symbol_first_c
+ }
+ 
+ 
+-static const char *xmlfmt[] = {
+-    "<symbol type='%s' quality='%d'",
+-    " count='%d'",
+-    "><data><![CDATA[",
+-    "]]></data></symbol>",
++unsigned base64_encode (char *dst,
++                        const char *src,
++                        unsigned srclen)
++{
++    static const char alphabet[] =
++        "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
++    char *start = dst;
++    int nline = 19;
++    for(; srclen; srclen -= 3) {
++        unsigned int buf = *(src++) << 16;
++        if(srclen > 1) buf |= *(src++) << 8;
++        if(srclen > 2) buf |= *(src++);
++        *(dst++) = alphabet[(buf >> 18) & 0x3f];
++        *(dst++) = alphabet[(buf >> 12) & 0x3f];
++        *(dst++) = (srclen > 1) ? alphabet[(buf >> 6) & 0x3f] : '=';
++        *(dst++) = (srclen > 2) ? alphabet[buf & 0x3f] : '=';
++        if(srclen < 3) break;
++        if(!--nline) { *(dst++) = '\n'; nline = 19; }
++    }
++    *(dst++) = '\n';
++    *(dst++) = '\0';
++    return(dst - start - 1);
++}
++
++enum {
++    TMPL_START,
++    TMPL_MOD_START, TMPL_MOD_ITEM, TMPL_MOD_END,
++    TMPL_COUNT,
++    TMPL_DATA_START, TMPL_FORMAT, TMPL_CDATA,
++    TMPL_NL,
++    TMPL_END,
+ };
+ 
+ /* FIXME suspect... */
++#define MAX_STATIC 256
++#define MAX_MOD (5 * ZBAR_MOD_NUM)
++#define MAX_CFG (10 * ZBAR_CFG_NUM)
+ #define MAX_INT_DIGITS 10
+ 
++#define TMPL_COPY(t) do {             \
++        static const char *_st = (t); \
++        i = strlen(_st);              \
++        memcpy(*buf + n, _st, i + 1); \
++        n += i;                       \
++        assert(n <= maxlen);          \
++    } while(0)
++
++#define TMPL_FMT(t, ...) do {                                 \
++        static const char *_st = (t);                         \
++        i = snprintf(*buf + n, maxlen - n, _st, __VA_ARGS__); \
++        assert(i > 0);                                        \
++        n += i;                                               \
++        assert(n <= maxlen);                                  \
++    } while(0)
++
+ char *zbar_symbol_xml (const zbar_symbol_t *sym,
+                        char **buf,
+                        unsigned *len)
+ {
++    unsigned int datalen, maxlen;
++    int i, n = 0;
++
+     const char *type = zbar_get_symbol_name(sym->type);
+-    /* FIXME binary data */
+-    unsigned datalen = strlen(sym->data);
+-    unsigned maxlen = (strlen(xmlfmt[0]) + strlen(xmlfmt[1]) +
+-                       strlen(xmlfmt[2]) + strlen(xmlfmt[3]) +
+-                       strlen(type) + datalen + MAX_INT_DIGITS + 1);
++    const char *orient = zbar_get_orientation_name(sym->orient);
++
++    /* check for binary data */
++    unsigned char *data = (unsigned char*)sym->data;
++    char binary = ((data[0] == 0xff && data[1] == 0xfe) ||
++                   (data[0] == 0xfe && data[1] == 0xff) ||
++                   !strncmp(sym->data, "<?xml", 5));
++    for(i = 0; !binary && i < sym->datalen; i++) {
++        unsigned char c = sym->data[i];
++        binary = ((c < 0x20 && ((~0x00002600 >> c) & 1)) ||
++                  (c >= 0x7f && c < 0xa0) ||
++                  (c == ']' && i + 2 < sym->datalen &&
++                   sym->data[i + 1] == ']' &&
++                   sym->data[i + 2] == '>'));
++    }
++
++    datalen = strlen(sym->data);
++    if(binary)
++        datalen = (sym->datalen + 2) / 3 * 4 + sym->datalen / 57 + 3;
++
++    maxlen = (MAX_STATIC + strlen(type) + strlen(orient) +
++              datalen + MAX_INT_DIGITS + 1);
++    unsigned int mods = sym->modifiers;
++    if(mods)
++        maxlen += MAX_MOD;
++    unsigned int cfgs = sym->configs & ~(1 << ZBAR_CFG_ENABLE);
++    if(cfgs)
++        maxlen += MAX_CFG;
++    if(binary)
++        maxlen += MAX_INT_DIGITS;
++
+     if(!*buf || (*len < maxlen)) {
+         if(*buf)
+             free(*buf);
+@@ -170,32 +314,50 @@ char *zbar_symbol_xml (const zbar_symbol
+         *len = maxlen;
+     }
+ 
+-    int n = snprintf(*buf, maxlen, xmlfmt[0], type, sym->quality);
+-    assert(n > 0);
++    TMPL_FMT("<symbol type='%s' quality='%d' orientation='%s'",
++             type, sym->quality, orient);
++
++    if(mods) {
++        int j;
++        TMPL_COPY(" modifiers='");
++        for(j = 0; mods && j < ZBAR_MOD_NUM; j++, mods >>= 1)
++            if(mods & 1)
++                TMPL_FMT("%s ", zbar_get_modifier_name(j));
++        /* cleanup trailing space */
++        n--;
++        TMPL_COPY("'");
++    }
++
++    if(cfgs) {
++        int j;
++        TMPL_COPY(" configs='");
++        for(j = 0; cfgs && j < ZBAR_CFG_NUM; j++, cfgs >>= 1)
++            if(cfgs & 1)
++                TMPL_FMT("%s ", zbar_get_config_name(j));
++        /* cleanup trailing space */
++        n--;
++        TMPL_COPY("'");
++    }
++
++    if(sym->cache_count)
++        TMPL_FMT(" count='%d'", sym->cache_count);
++
++    TMPL_COPY("><data");
++    if(binary)
++        TMPL_FMT(" format='base64' length='%d'", sym->datalen);
++    TMPL_COPY("><![CDATA[");
++
++    if(!binary) {
++        memcpy(*buf + n, sym->data, sym->datalen + 1);
++        n += sym->datalen;
++    }
++    else {
++        TMPL_COPY("\n");
++        n += base64_encode(*buf + n, sym->data, sym->datalen);
++    }
+     assert(n <= maxlen);
+ 
+-    if(sym->cache_count) {
+-        int i = snprintf(*buf + n, maxlen - n, xmlfmt[1], sym->cache_count);
+-        assert(i > 0);
+-        n += i;
+-        assert(n <= maxlen);
+-    }
+-
+-    int i = strlen(xmlfmt[2]);
+-    memcpy(*buf + n, xmlfmt[2], i + 1);
+-    n += i;
+-    assert(n <= maxlen);
+-
+-    /* FIXME binary data */
+-    /* FIXME handle "]]>" */
+-    strncpy(*buf + n, sym->data, datalen + 1);
+-    n += datalen;
+-    assert(n <= maxlen);
+-
+-    i = strlen(xmlfmt[3]);
+-    memcpy(*buf + n, xmlfmt[3], i + 1);
+-    n += i;
+-    assert(n <= maxlen);
++    TMPL_COPY("]]></data></symbol>");
+ 
+     *len = n;
+     return(*buf);
+@@ -242,3 +404,9 @@ zbar_symbol_set_first_symbol (const zbar
+         return(sym->next);
+     return(syms->head);
+ }
++
++const zbar_symbol_t*
++zbar_symbol_set_first_unfiltered (const zbar_symbol_set_t *syms)
++{
++    return(syms->head);
++}
+diff --git a/zbar/symbol.h b/zbar/symbol.h
+--- a/zbar/symbol.h
++++ b/zbar/symbol.h
+@@ -1,5 +1,5 @@
+ /*------------------------------------------------------------------------
+- *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
+  *
+  *  This file is part of the ZBar Bar Code Reader.
+  *
+@@ -27,6 +27,8 @@
+ #include <zbar.h>
+ #include "refcnt.h"
+ 
++#define NUM_SYMS  16
++
+ typedef struct point_s {
+     int x, y;
+ } point_t;
+@@ -40,6 +42,8 @@ struct zbar_symbol_set_s {
+ 
+ struct zbar_symbol_s {
+     zbar_symbol_type_t type;    /* symbol type */
++    unsigned int configs;       /* symbology boolean config bitmask */
++    unsigned int modifiers;     /* symbology modifier bitmask */
+     unsigned int data_alloc;    /* allocation size of data */
+     unsigned int datalen;       /* length of binary symbol data */
+     char *data;                 /* symbol data */
+@@ -47,6 +51,7 @@ struct zbar_symbol_s {
+     unsigned pts_alloc;         /* allocation size of pts */
+     unsigned npts;              /* number of points in location polygon */
+     point_t *pts;               /* list of points in location polygon */
++    zbar_orientation_t orient;  /* coarse orientation */
+ 
+     refcnt_t refcnt;            /* reference count */
+     zbar_symbol_t *next;        /* linked list of results (or siblings) */
+@@ -56,6 +61,8 @@ struct zbar_symbol_s {
+     int quality;                /* relative symbol reliability metric */
+ };
+ 
++extern int _zbar_get_symbol_hash(zbar_symbol_type_t);
++
+ extern void _zbar_symbol_free(zbar_symbol_t*);
+ 
+ extern zbar_symbol_set_t *_zbar_symbol_set_create(void);
+diff --git a/zbar/timer.h b/zbar/timer.h
+--- a/zbar/timer.h
++++ b/zbar/timer.h
+@@ -1,5 +1,5 @@
+ /*------------------------------------------------------------------------
+- *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
+  *
+  *  This file is part of the ZBar Bar Code Reader.
+  *
+@@ -24,7 +24,9 @@
+ #define _ZBAR_TIMER_H_
+ 
+ #include <time.h>
+-#include <sys/time.h>   /* gettimeofday */
++#ifdef HAVE_SYS_TIME_H
++# include <sys/time.h>   /* gettimeofday */
++#endif
+ 
+ /* platform timer abstraction
+  *
+@@ -41,6 +43,13 @@
+ 
+ typedef struct timespec zbar_timer_t;
+ 
++static inline int _zbar_timer_now ()
++{
++    struct timespec now;
++    clock_gettime(CLOCK_REALTIME, &now);
++    return(now.tv_sec * 1000 + now.tv_nsec / 1000000);
++}
++
+ static inline zbar_timer_t *_zbar_timer_init (zbar_timer_t *timer,
+                                               int delay)
+ {
+@@ -56,13 +65,14 @@ static inline zbar_timer_t *_zbar_timer_
+ 
+ static inline int _zbar_timer_check (zbar_timer_t *timer)
+ {
++    struct timespec now;
++    int delay;
+     if(!timer)
+         return(-1);
+ 
+-    struct timespec now;
+     clock_gettime(CLOCK_REALTIME, &now);
+-    int delay = ((timer->tv_sec - now.tv_sec) * 1000 +
+-                 (timer->tv_nsec - now.tv_nsec) / 1000000);
++    delay = ((timer->tv_sec - now.tv_sec) * 1000 +
++             (timer->tv_nsec - now.tv_nsec) / 1000000);
+     return((delay >= 0) ? delay : 0);
+ }
+ 
+@@ -73,6 +83,11 @@ static inline int _zbar_timer_check (zba
+ 
+ typedef DWORD zbar_timer_t;
+ 
++static inline int _zbar_timer_now ()
++{
++    return(timeGetTime());
++}
++
+ static inline zbar_timer_t *_zbar_timer_init (zbar_timer_t *timer,
+                                               int delay)
+ {
+@@ -85,18 +100,26 @@ static inline zbar_timer_t *_zbar_timer_
+ 
+ static inline int _zbar_timer_check (zbar_timer_t *timer)
+ {
++    int delay;
+     if(!timer)
+         return(INFINITE);
+ 
+-    int delay = *timer - timeGetTime();
++    delay = *timer - timeGetTime();
+     return((delay >= 0) ? delay : 0);
+ }
+ 
+ 
+-#else
++#elif defined(HAVE_SYS_TIME_H)
+ 
+ typedef struct timeval zbar_timer_t;
+ 
++static inline int _zbar_timer_now ()
++{
++    struct timeval now;
++    gettimeofday(&now, NULL);
++    return(now.tv_sec * 1000 + now.tv_usec / 1000);
++}
++
+ static inline zbar_timer_t *_zbar_timer_init (zbar_timer_t *timer,
+                                               int delay)
+ {
+@@ -112,15 +135,17 @@ static inline zbar_timer_t *_zbar_timer_
+ 
+ static inline int _zbar_timer_check (zbar_timer_t *timer)
+ {
++    struct timeval now;
+     if(!timer)
+         return(-1);
+ 
+-    struct timeval now;
+     gettimeofday(&now, NULL);
+     return((timer->tv_sec - now.tv_sec) * 1000 +
+            (timer->tv_usec - now.tv_usec) / 1000);
+ }
+ 
++#else
++# error "unable to find a timer interface"
+ #endif
+ 
+ #endif
+diff --git a/zbar/video.c b/zbar/video.c
+--- a/zbar/video.c
++++ b/zbar/video.c
+@@ -1,5 +1,5 @@
+ /*------------------------------------------------------------------------
+- *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
+  *
+  *  This file is part of the ZBar Bar Code Reader.
+  *
+@@ -58,6 +58,7 @@ static void _zbar_video_recycle_shadow (
+ zbar_video_t *zbar_video_create ()
+ {
+     zbar_video_t *vdo = calloc(1, sizeof(zbar_video_t));
++    int i;
+     if(!vdo)
+         return(NULL);
+     err_init(&vdo->err, ZBAR_MOD_VIDEO);
+@@ -73,7 +74,6 @@ zbar_video_t *zbar_video_create ()
+         return(NULL);
+     }
+ 
+-    int i;
+     for(i = 0; i < ZBAR_VIDEO_IMAGES_MAX; i++) {
+         zbar_image_t *img = vdo->images[i] = zbar_image_create();
+         if(!img) {
+@@ -97,7 +97,7 @@ void zbar_video_destroy (zbar_video_t *v
+         int i;
+         for(i = 0; i < ZBAR_VIDEO_IMAGES_MAX; i++)
+             if(vdo->images[i])
+-                free(vdo->images[i]);
++                _zbar_image_free(vdo->images[i]);
+         free(vdo->images);
+     }
+     while(vdo->shadow_image) {
+@@ -130,6 +130,8 @@ void zbar_video_destroy (zbar_video_t *v
+ int zbar_video_open (zbar_video_t *vdo,
+                      const char *dev)
+ {
++    char *ldev = NULL;
++    int rc;
+     zbar_video_enable(vdo, 0);
+     video_lock(vdo);
+     if(vdo->intf != VIDEO_INVALID) {
+@@ -145,7 +147,6 @@ int zbar_video_open (zbar_video_t *vdo,
+     if(!dev)
+         return(0);
+ 
+-    char *ldev = NULL;
+     if((unsigned char)dev[0] < 0x10) {
+         /* default linux device, overloaded for other platforms */
+         int id = dev[0];
+@@ -153,7 +154,7 @@ int zbar_video_open (zbar_video_t *vdo,
+         ldev[10] = '0' + id;
+     }
+ 
+-    int rc = _zbar_video_open(vdo, dev);
++    rc = _zbar_video_open(vdo, dev);
+ 
+     if(ldev)
+         free(ldev);
+@@ -227,12 +228,12 @@ uint32_t zbar_video_get_format (const zb
+ 
+ static inline int video_init_images (zbar_video_t *vdo)
+ {
+-    
++    int i;
+     assert(vdo->datalen);
+     if(vdo->iomode != VIDEO_MMAP) {
+         assert(!vdo->buf);
+         vdo->buflen = vdo->num_images * vdo->datalen;
+-        vdo->buf = malloc(vdo->buflen);
++        vdo->buf = calloc(1, vdo->buflen);
+         if(!vdo->buf)
+             return(err_capture(vdo, SEV_FATAL, ZBAR_ERR_NOMEM, __func__,
+                                "unable to allocate image buffers"));
+@@ -240,16 +241,14 @@ static inline int video_init_images (zba
+                 (vdo->iomode == VIDEO_READWRITE) ? "READ" : "USERPTR",
+                 vdo->buflen);
+     }
+-    int i;
+     for(i = 0; i < vdo->num_images; i++) {
+         zbar_image_t *img = vdo->images[i];
+         img->format = vdo->format;
+-        img->width = vdo->width;
+-        img->height = vdo->height;
++        zbar_image_set_size(img, vdo->width, vdo->height);
+         if(vdo->iomode != VIDEO_MMAP) {
++            unsigned long offset = i * vdo->datalen;
+             img->datalen = vdo->datalen;
+-            unsigned long offset = i * vdo->datalen;
+-            img->data = vdo->buf + offset;
++            img->data = (uint8_t*)vdo->buf + offset;
+             zprintf(2, "    [%02d] @%08lx\n", i, offset);
+         }
+     }
+@@ -259,6 +258,9 @@ static inline int video_init_images (zba
+ int zbar_video_init (zbar_video_t *vdo,
+                      unsigned long fmt)
+ {
++#ifdef HAVE_LIBJPEG
++    const zbar_format_def_t *vidfmt;
++#endif
+     if(vdo->initialized)
+         /* FIXME re-init different format? */
+         return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_INVALID, __func__,
+@@ -270,8 +272,9 @@ int zbar_video_init (zbar_video_t *vdo,
+     if(video_init_images(vdo))
+         return(-1);
+ #ifdef HAVE_LIBJPEG
+-    const zbar_format_def_t *vidfmt = _zbar_format_lookup(fmt);
++    vidfmt = _zbar_format_lookup(fmt);
+     if(vidfmt && vidfmt->group == ZBAR_FMT_JPEG) {
++        zbar_image_t *img;
+         /* prepare for decoding */
+         if(!vdo->jpeg)
+             vdo->jpeg = _zbar_jpeg_decomp_create();
+@@ -279,10 +282,9 @@ int zbar_video_init (zbar_video_t *vdo,
+             zbar_image_destroy(vdo->jpeg_img);
+ 
+         /* create intermediate image for decoder to use*/
+-        zbar_image_t *img = vdo->jpeg_img = zbar_image_create();
++        img = vdo->jpeg_img = zbar_image_create();
+         img->format = fourcc('Y','8','0','0');
+-        img->width = vdo->width;
+-        img->height = vdo->height;
++        zbar_image_set_size(img, vdo->width, vdo->height);
+         img->datalen = vdo->width * vdo->height;
+     }
+ #endif
+@@ -333,6 +335,9 @@ int zbar_video_enable (zbar_video_t *vdo
+ 
+ zbar_image_t *zbar_video_next_image (zbar_video_t *vdo)
+ {
++    unsigned frame;
++    zbar_image_t *img;
++
+     if(video_lock(vdo))
+         return(NULL);
+     if(!vdo->active) {
+@@ -340,8 +345,8 @@ zbar_image_t *zbar_video_next_image (zba
+         return(NULL);
+     }
+ 
+-    unsigned frame = vdo->frame++;
+-    zbar_image_t *img = vdo->dq(vdo);
++    frame = vdo->frame++;
++    img = vdo->dq(vdo);
+     if(img) {
+         img->seq = frame;
+         if(vdo->num_images < 2) {
+@@ -362,8 +367,7 @@ zbar_image_t *zbar_video_next_image (zba
+                 /* recycle the shadow images */
+ 
+                 img->format = vdo->format;
+-                img->width = vdo->width;
+-                img->height = vdo->height;
++                zbar_image_set_size(img, vdo->width, vdo->height);
+                 img->datalen = vdo->datalen;
+                 img->data = malloc(vdo->datalen);
+             }
+diff --git a/zbar/window.c b/zbar/window.c
+--- a/zbar/window.c
++++ b/zbar/window.c
+@@ -1,5 +1,5 @@
+ /*------------------------------------------------------------------------
+- *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
+  *
+  *  This file is part of the ZBar Bar Code Reader.
+  *
+@@ -23,8 +23,11 @@
+ 
+ #include "window.h"
+ #include "image.h"
++#include "timer.h"
+ #include <time.h>       /* clock_gettime */
+-#include <sys/time.h>   /* gettimeofday */
++#ifdef HAVE_SYS_TIME_H
++# include <sys/time.h>   /* gettimeofday */
++#endif
+ 
+ zbar_window_t *zbar_window_create ()
+ {
+@@ -117,20 +120,11 @@ static inline int window_draw_overlay (z
+ 
+     if(w->overlay >= 2) {
+         /* calculate/display frame rate */
+-        unsigned long time;
+-#if _POSIX_TIMERS > 0
+-        struct timespec abstime;
+-        clock_gettime(CLOCK_REALTIME, &abstime);
+-        time = (abstime.tv_sec * 1000) + ((abstime.tv_nsec / 500000) + 1) / 2;
+-#else
+-        struct timeval abstime;
+-        gettimeofday(&abstime, NULL);
+-        time = (abstime.tv_sec * 1000) + ((abstime.tv_usec / 500) + 1) / 2;
+-#endif
+-        point_t p = { -8, -1 };
+-        char text[32];
++        unsigned long time = _zbar_timer_now();
+         if(w->time) {
+             int avg = w->time_avg = (w->time_avg + time - w->time) / 2;
++            point_t p = { -8, -1 };
++            char text[32];
+             sprintf(text, "%d.%01d fps", 1000 / avg, (10000 / avg) % 10);
+             _zbar_window_draw_text(w, 3, p, text);
+         }
+@@ -141,6 +135,8 @@ static inline int window_draw_overlay (z
+ 
+ inline int zbar_window_redraw (zbar_window_t *w)
+ {
++    int rc = 0;
++    zbar_image_t *img;
+     if(window_lock(w))
+         return(-1);
+     if(!w->display || _zbar_window_begin(w)) {
+@@ -148,8 +144,7 @@ inline int zbar_window_redraw (zbar_wind
+         return(-1);
+     }
+ 
+-    int rc = 0;
+-    zbar_image_t *img = w->image;
++    img = w->image;
+     if(w->init && w->draw_image && img) {
+         int format_change = (w->src_format != img->format &&
+                              w->format != img->format);
+@@ -163,6 +158,7 @@ inline int zbar_window_redraw (zbar_wind
+         }
+ 
+         if(!rc && (format_change || !w->scaled_size.x || !w->dst_width)) {
++            point_t size = { w->width, w->height };
+             zprintf(24, "init: src=%.4s(%08x) %dx%d dst=%.4s(%08x) %dx%d\n",
+                     (char*)&w->src_format, w->src_format,
+                     w->src_width, w->src_height,
+@@ -173,7 +169,6 @@ inline int zbar_window_redraw (zbar_wind
+                 w->src_height = img->height;
+             }
+ 
+-            point_t size = { w->width, w->height };
+             if(size.x > w->max_width)
+                 size.x = w->max_width;
+             if(size.y > w->max_height)
+@@ -226,9 +221,10 @@ inline int zbar_window_redraw (zbar_wind
+         }
+ 
+         if(!rc) {
++            point_t org;
+             rc = w->draw_image(w, img);
+ 
+-            point_t org = w->scaled_offset;
++            org = w->scaled_offset;
+             if(org.x > 0) {
+                 point_t p = { 0, org.y };
+                 point_t s = { org.x, w->scaled_size.y };
+@@ -300,9 +296,10 @@ void zbar_window_set_overlay (zbar_windo
+ int zbar_window_get_overlay (const zbar_window_t *w)
+ {
+     zbar_window_t *ncw = (zbar_window_t*)w;
++    int lvl;
+     if(window_lock(ncw))
+         return(-1);
+-    int lvl = w->overlay;
++    lvl = w->overlay;
+     (void)window_unlock(ncw);
+     return(lvl);
+ }
+diff --git a/zbarcam/zbarcam.c b/zbarcam/zbarcam.c
+--- a/zbarcam/zbarcam.c
++++ b/zbarcam/zbarcam.c
+@@ -105,17 +105,27 @@ static void data_handler (zbar_image_t *
+         if(type == ZBAR_PARTIAL)
+             continue;
+ 
+-        if(!format)
+-            printf("%s%s:%s\n",
+-                   zbar_get_symbol_name(type), zbar_get_addon_name(type),
+-                   zbar_symbol_get_data(sym));
+-        else if(format == RAW)
+-            printf("%s\n", zbar_symbol_get_data(sym));
++        if(!format) {
++            printf("%s:", zbar_get_symbol_name(type));
++            if(fwrite(zbar_symbol_get_data(sym),
++                      zbar_symbol_get_data_length(sym),
++                      1, stdout) != 1)
++                continue;
++        }
++        else if(format == RAW) {
++            if(fwrite(zbar_symbol_get_data(sym),
++                      zbar_symbol_get_data_length(sym),
++                      1, stdout) != 1)
++                continue;
++        }
+         else if(format == XML) {
+             if(!n)
+                 printf("<index num='%u'>\n", zbar_image_get_sequence(img));
+-            printf("%s\n", zbar_symbol_xml(sym, &xml_buf, &xml_len));
++            zbar_symbol_xml(sym, &xml_buf, &xml_len);
++            if(fwrite(xml_buf, xml_len, 1, stdout) != 1)
++                continue;
+         }
++        printf("\n");
+         n++;
+     }
+ 
+diff --git a/zbarcam/zbarcam.rc b/zbarcam/zbarcam.rc
+--- a/zbarcam/zbarcam.rc
++++ b/zbarcam/zbarcam.rc
+@@ -19,7 +19,7 @@ VS_VERSION_INFO VERSIONINFO
+ 
+             VALUE "FileDescription", "Scan bar codes from video devices"
+ 
+-            VALUE "LegalCopyright", "Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>"
++            VALUE "LegalCopyright", "Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>"
+         }
+     }
+     BLOCK "VarFileInfo" {
+diff --git a/zbarimg/Makefile.am.inc b/zbarimg/Makefile.am.inc
+--- a/zbarimg/Makefile.am.inc
++++ b/zbarimg/Makefile.am.inc
+@@ -12,10 +12,10 @@ endif
+ 
+ EXTRA_DIST += test/barcodetest.py
+ 
+-check-local:
++check-images: zbarimg/zbarimg
+ 	$(PYTHON) $(srcdir)/test/barcodetest.py
+ 
+-regress:
++regress-images: zbarimg/zbarimg
+ 	suite='$(ZBAR_TESTS)'; \
+ 	if test "x$$suite" = "x"; then suite='http://zbar.sf.net/test'; fi ; \
+ 	$(PYTHON) $(srcdir)/test/barcodetest.py $$suite
+diff --git a/zbarimg/zbarimg.c b/zbarimg/zbarimg.c
+--- a/zbarimg/zbarimg.c
++++ b/zbarimg/zbarimg.c
+@@ -1,5 +1,5 @@
+ /*------------------------------------------------------------------------
+- *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
+  *
+  *  This file is part of the ZBar Bar Code Reader.
+  *
+@@ -45,7 +45,7 @@
+  *  how does MagickGetAuthenticImagePixels fit in?)
+  * ref http://bugs.gentoo.org/247292
+  */
+-#if MagickLibVersion < 0x645
++#if MagickLibVersion <= 0x645
+ # define MagickExportImagePixels MagickGetImagePixels
+ #endif
+ 
+@@ -76,8 +76,8 @@ static const char *warning_not_found =
+     "  things to check:\n"
+     "    - is the barcode type supported?"
+     "  currently supported symbologies are:\n"
+-    "      EAN/UPC (EAN-13, EAN-8, UPC-A, UPC-E, ISBN-10, ISBN-13),\n"
+-    "      Code 128, Code 39 and Interleaved 2 of 5\n"
++    "      EAN/UPC (EAN-13, EAN-8, UPC-A, UPC-E, ISBN-10, ISBN-13), Code 128,\n"
++    "      Code 93, Code 39, DataBar, DataBar Expanded, and Interleaved 2 of 5\n"
+     "    - is the barcode large enough in the image?\n"
+     "    - is the barcode mostly in focus?\n"
+     "    - is there sufficient contrast/illumination?\n"
+@@ -137,7 +137,7 @@ static int scan_image (const char *filen
+ 
+         zbar_image_t *zimage = zbar_image_create();
+         assert(zimage);
+-        zbar_image_set_format(zimage, *(unsigned long*)"Y800");
++        zbar_image_set_format(zimage, zbar_fourcc('Y','8','0','0'));
+ 
+         int width = MagickGetImageWidth(images);
+         int height = MagickGetImageHeight(images);
+@@ -165,23 +165,30 @@ static int scan_image (const char *filen
+         const zbar_symbol_t *sym = zbar_image_first_symbol(zimage);
+         for(; sym; sym = zbar_symbol_next(sym)) {
+             zbar_symbol_type_t typ = zbar_symbol_get_type(sym);
++            unsigned len = zbar_symbol_get_data_length(sym);
+             if(typ == ZBAR_PARTIAL)
+                 continue;
+-            else if(!xmllvl)
+-                printf("%s%s:%s\n",
+-                       zbar_get_symbol_name(typ),
+-                       zbar_get_addon_name(typ),
+-                       zbar_symbol_get_data(sym));
+-            else if(xmllvl < 0)
+-                printf("%s\n", zbar_symbol_get_data(sym));
++            else if(xmllvl <= 0) {
++                if(!xmllvl)
++                    printf("%s:", zbar_get_symbol_name(typ));
++                if(len &&
++                   fwrite(zbar_symbol_get_data(sym), len, 1, stdout) != 1) {
++                    exit_code = 1;
++                    return(-1);
++                }
++            }
+             else {
+                 if(xmllvl < 3) {
+                     xmllvl++;
+                     printf("<index num='%u'>\n", seq);
+                 }
+                 zbar_symbol_xml(sym, &xmlbuf, &xmlbuflen);
+-                printf("%s\n", xmlbuf);
++                if(fwrite(xmlbuf, xmlbuflen, 1, stdout) != 1) {
++                    exit_code = 1;
++                    return(-1);
++                }
+             }
++            printf("\n");
+             found++;
+             num_symbols++;
+         }
+diff --git a/zbarimg/zbarimg.rc b/zbarimg/zbarimg.rc
+--- a/zbarimg/zbarimg.rc
++++ b/zbarimg/zbarimg.rc
+@@ -19,7 +19,7 @@ VS_VERSION_INFO VERSIONINFO
+ 
+             VALUE "FileDescription", "Scan bar codes from image files"
+ 
+-            VALUE "LegalCopyright", "Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>"
++            VALUE "LegalCopyright", "Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>"
+         }
+     }
+     BLOCK "VarFileInfo" {
diff --git a/zbar_use_libv4l.patch b/zbar_use_libv4l.patch
new file mode 100644
index 0000000..ea1bb60
--- /dev/null
+++ b/zbar_use_libv4l.patch
@@ -0,0 +1,755 @@
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -179,20 +179,13 @@ AC_ARG_ENABLE([video],
+ with_video="no"
+ AS_IF([test "x$enable_video" != "xno"],
+   [AS_IF([test "x$win32" = "xno"],
+-    [AC_CHECK_HEADERS([linux/videodev.h], [with_video="v4l1"],
+-      [AC_MSG_FAILURE([test for video support failed!
+-rebuild your kernel to include video4linux support or
+-configure --disable-video to skip building video support.])])
+-       AC_CHECK_HEADERS([linux/videodev2.h], [with_video="v4l2"],
++    [AC_CHECK_LIB([v4l2], [v4l2_open], [],
+          [AC_MSG_WARN([v4l2 API not detected, upgrade your kernel!])])],
+     [AC_CHECK_HEADERS([vfw.h], [with_video="vfw"],
+       [AC_MSG_FAILURE([test for VfW video support failed!
+ configure --disable-video to skip building vidoe support.])])])
+ ])
+ AM_CONDITIONAL([HAVE_VIDEO], [test "x$enable_video" != "xno"])
+-AM_CONDITIONAL([HAVE_V4L1],
+-  [test "x$with_video" = "xv4l1" || test "x$with_video" = "xv4l2"])
+-AM_CONDITIONAL([HAVE_V4L2], [test "x$with_video" = "xv4l2"])
+ 
+ dnl X
+ AC_ARG_VAR([XSHM_LIBS], [linker flags for X shared memory extension])
+@@ -500,7 +493,7 @@ echo "please verify that the detected co
+ echo "------------------------------------------------------------------------"
+ echo "X                 --with-x=$have_x"
+ echo "pthreads          --enable-pthread=$enable_pthread"
+-echo "v4l               --enable-video=$enable_video"
++echo "v4l2              --enable-video=$enable_video"
+ AS_IF([test "x$enable_video" != "xyes"],
+   [echo "        => zbarcam video scanner will *NOT* be built"])
+ echo "jpeg              --with-jpeg=$with_jpeg"
+diff --git a/zbar/Makefile.am.inc b/zbar/Makefile.am.inc
+--- a/zbar/Makefile.am.inc
++++ b/zbar/Makefile.am.inc
+@@ -59,21 +59,17 @@ else
+ zbar_libzbar_la_SOURCES += zbar/processor/posix.h zbar/processor/posix.c
+ endif
+ 
+-if HAVE_V4L1
+-zbar_libzbar_la_SOURCES += zbar/video/v4l1.c
+-if HAVE_V4L2
+-zbar_libzbar_la_SOURCES += zbar/video/v4l2.c
+-endif
+-endif
++if HAVE_VIDEO
+ if WIN32
+-if HAVE_VIDEO
+ zbar_libzbar_la_SOURCES += zbar/video/vfw.c
+ zbar_libzbar_la_LIBADD += -lvfw32
+-endif
+-endif
+-if !HAVE_VIDEO
++else
++zbar_libzbar_la_SOURCES += zbar/video/v4l2.c
++zbar_libzbar_la_LDFLAGS += -lv4l2
++endif #WIN32
++else
+ zbar_libzbar_la_SOURCES += zbar/video/null.c
+-endif
++endif #HAVE_VIDEO
+ 
+ if HAVE_JPEG
+ zbar_libzbar_la_SOURCES += zbar/jpeg.c
+diff --git a/zbar/video/v4l1.c b/zbar/video/v4l1.c
+deleted file mode 100644
+--- a/zbar/video/v4l1.c
++++ /dev/null
+@@ -1,435 +0,0 @@
+-/*------------------------------------------------------------------------
+- *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
+- *
+- *  This file is part of the ZBar Bar Code Reader.
+- *
+- *  The ZBar Bar Code Reader is free software; you can redistribute it
+- *  and/or modify it under the terms of the GNU Lesser Public License as
+- *  published by the Free Software Foundation; either version 2.1 of
+- *  the License, or (at your option) any later version.
+- *
+- *  The ZBar Bar Code Reader is distributed in the hope that it will be
+- *  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+- *  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- *  GNU Lesser Public License for more details.
+- *
+- *  You should have received a copy of the GNU Lesser Public License
+- *  along with the ZBar Bar Code Reader; if not, write to the Free
+- *  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+- *  Boston, MA  02110-1301  USA
+- *
+- *  http://sourceforge.net/projects/zbar
+- *------------------------------------------------------------------------*/
+-
+-#include <config.h>
+-#ifdef HAVE_INTTYPES_H
+-# include <inttypes.h>
+-#endif
+-#ifdef HAVE_STDLIB_H
+-# include <stdlib.h>
+-#endif
+-#include <string.h>
+-#include <sys/types.h>
+-#include <sys/stat.h>
+-#include <unistd.h>
+-#include <fcntl.h>
+-#include <errno.h>
+-#include <assert.h>
+-#ifdef HAVE_SYS_IOCTL_H
+-# include <sys/ioctl.h>
+-#endif
+-#ifdef HAVE_SYS_MMAN_H
+-# include <sys/mman.h>
+-#endif
+-#include <linux/videodev.h>
+-
+-#include "video.h"
+-#include "image.h"
+-
+-extern int _zbar_v4l2_probe(zbar_video_t*);
+-
+-typedef struct v4l1_format_s {
+-    uint32_t format;
+-    uint8_t bpp;
+-} v4l1_format_t;
+-
+-/* static v4l1 "palette" mappings
+- * documentation for v4l1 formats is terrible...
+- */
+-static const v4l1_format_t v4l1_formats[17] = {
+-    /* format                   bpp */
+-    { 0,                         0 },
+-    { fourcc('G','R','E','Y'),   8 }, /* GREY */
+-    { fourcc('H','I','2','4'),   8 }, /* HI240 (BT848) */
+-
+-    /* component ordering for RGB palettes is unspecified,
+-     * convention appears to place red in the most significant bits
+-     * FIXME is this true for other drivers? big endian machines?
+-     */
+-    { fourcc('R','G','B','P'),  16 }, /* RGB565 */
+-    { fourcc('B','G','R','3'),  24 }, /* RGB24 */
+-    { fourcc('B','G','R','4'),  32 }, /* RGB32 */
+-    { fourcc('R','G','B','O'),  16 }, /* RGB555 */
+-    { fourcc('Y','U','Y','2'),  16 }, /* YUV422 (8 bpp?!) */
+-    { fourcc('Y','U','Y','V'),  16 }, /* YUYV */
+-    { fourcc('U','Y','V','Y'),  16 }, /* UYVY */
+-    { 0,                        12 }, /* YUV420 (24 bpp?) FIXME?! */
+-    { fourcc('Y','4','1','P'),  12 }, /* YUV411 */
+-    { 0,                         0 }, /* Bt848 raw */
+-    { fourcc('4','2','2','P'),  16 }, /* YUV422P (24 bpp?) */
+-    { fourcc('4','1','1','P'),  12 }, /* YUV411P */
+-    { fourcc('Y','U','1','2'),  12 }, /* YUV420P */
+-    { fourcc('Y','U','V','9'),   9 }, /* YUV410P */
+-};
+-
+-static int v4l1_nq (zbar_video_t *vdo,
+-                    zbar_image_t *img)
+-{
+-    if(video_nq_image(vdo, img))
+-        return(-1);
+-
+-    if(vdo->iomode != VIDEO_MMAP)
+-        return(0);
+-
+-    struct video_mmap vmap;
+-    vmap.frame = img->srcidx;
+-    vmap.width = vdo->width;
+-    vmap.height = vdo->height;
+-    vmap.format = vdo->palette;
+-    if(ioctl(vdo->fd, VIDIOCMCAPTURE, &vmap) < 0)
+-        return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
+-                           "initiating video capture (VIDIOCMCAPTURE)"));
+-
+-    return(0);
+-}
+-
+-static zbar_image_t *v4l1_dq (zbar_video_t *vdo)
+-{
+-    video_iomode_t iomode = vdo->iomode;
+-    int fd = vdo->fd;
+-    zbar_image_t *img = video_dq_image(vdo);
+-    if(!img)
+-        return(NULL);
+-
+-    if(iomode == VIDEO_MMAP) {
+-        int frame = img->srcidx;
+-        if(ioctl(fd, VIDIOCSYNC, &frame) < 0)
+-            return(NULL);
+-    }
+-    else if(read(fd, (void*)img->data, img->datalen) != img->datalen)
+-        return(NULL);
+-
+-    return(img);
+-}
+-
+-static int v4l1_mmap_buffers (zbar_video_t *vdo)
+-{
+-#ifdef HAVE_SYS_MMAN_H
+-    /* map camera image to memory */
+-    struct video_mbuf vbuf;
+-    memset(&vbuf, 0, sizeof(vbuf));
+-    if(ioctl(vdo->fd, VIDIOCGMBUF, &vbuf) < 0)
+-        return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
+-                           "querying video frame buffers (VIDIOCGMBUF)"));
+-    assert(vbuf.frames && vbuf.size);
+-
+-    zprintf(1, "mapping %d buffers size=0x%x\n", vbuf.frames, vbuf.size);
+-    vdo->buflen = vbuf.size;
+-    vdo->buf = mmap(0, vbuf.size, PROT_READ | PROT_WRITE, MAP_SHARED,
+-                    vdo->fd, 0);
+-    if(vdo->buf == MAP_FAILED)
+-        return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
+-                           "mapping video frame buffers"));
+-
+-    int i;
+-    for(i = 0; i < vbuf.frames; i++) {
+-        zbar_image_t *img = vdo->images[i];
+-        zprintf(2, "    [%02d] @%08x\n", img->srcidx, vbuf.offsets[i]);
+-        img->data = vdo->buf + vbuf.offsets[i];
+-        img->datalen = vdo->datalen;
+-        int next_offset = ((i + 1 < vdo->num_images)
+-                           ? vbuf.offsets[i + 1]
+-                           : vbuf.size);
+-        if(next_offset < vbuf.offsets[i] + vdo->datalen)
+-            fprintf(stderr, "WARNING: insufficient v4l1 video buffer size:\n"
+-                    "\tvbuf[%d]=%x vbuf[%d]=%x datalen=%lx\n"
+-                    "\timage=%d x %d %.4s(%08x) palette=%d\n",
+-                    i, vbuf.offsets[i], i + 1, next_offset,
+-                    vdo->datalen, vdo->width, vdo->height,
+-                    (char*)&vdo->format, vdo->format, vdo->palette);
+-    }
+-    return(0);
+-#else
+-    return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_UNSUPPORTED, __func__,
+-                       "memory mapping not supported"));
+-#endif
+-}
+-
+-static int v4l1_start (zbar_video_t *vdo)
+-{
+-    return(0);
+-}
+-
+-static int v4l1_stop (zbar_video_t *vdo)
+-{
+-    return(0);
+-}
+-
+-static inline int v4l1_set_format (zbar_video_t *vdo,
+-                                   uint32_t fmt)
+-{
+-    struct video_picture vpic;
+-    memset(&vpic, 0, sizeof(vpic));
+-    if(ioctl(vdo->fd, VIDIOCGPICT, &vpic) < 0)
+-        return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
+-                           "querying video format (VIDIOCGPICT)"));
+-
+-    vdo->palette = 0;
+-    int ifmt;
+-    for(ifmt = 1; ifmt <= VIDEO_PALETTE_YUV410P; ifmt++)
+-        if(v4l1_formats[ifmt].format == fmt)
+-            break;
+-    if(!fmt || ifmt >= VIDEO_PALETTE_YUV410P)
+-        return(err_capture_int(vdo, SEV_ERROR, ZBAR_ERR_INVALID, __func__,
+-                               "invalid v4l1 format: %x", fmt));
+-
+-    vpic.palette = ifmt;
+-    vpic.depth = v4l1_formats[ifmt].bpp;
+-    if(ioctl(vdo->fd, VIDIOCSPICT, &vpic) < 0)
+-        return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
+-                           "setting format (VIDIOCSPICT)"));
+-
+-    memset(&vpic, 0, sizeof(vpic));
+-    if(ioctl(vdo->fd, VIDIOCGPICT, &vpic) < 0)
+-        return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
+-                           "querying video format (VIDIOCGPICT)"));
+-
+-    if(vpic.palette != ifmt || vpic.depth != v4l1_formats[ifmt].bpp) {
+-        fprintf(stderr,
+-                "WARNING: set v4l1 palette %d which should have depth %d bpp\n"
+-                "    but probed palette %d with depth %d bpp?"
+-                "  ...continuing anyway\n",
+-                ifmt, v4l1_formats[ifmt].bpp, vpic.palette, vpic.depth);
+-        err_capture_int(vdo, SEV_WARNING, ZBAR_ERR_INVALID, __func__,
+-                        "driver format (%x) inconsistency", fmt);
+-    }
+-    vdo->format = fmt;
+-    vdo->palette = ifmt;
+-    vdo->datalen = (vdo->width * vdo->height * v4l1_formats[ifmt].bpp + 7) >> 3;
+-
+-    zprintf(1, "set new format: %.4s(%08x) depth=%d palette=%d size=0x%lx\n",
+-            (char*)&vdo->format, vdo->format, vpic.depth, vdo->palette,
+-            vdo->datalen);
+-    return(0);
+-}
+-
+-static int v4l1_init (zbar_video_t *vdo,
+-                      uint32_t fmt)
+-{
+-    if(v4l1_set_format(vdo, fmt))
+-        return(-1);
+-    if(vdo->iomode == VIDEO_MMAP && v4l1_mmap_buffers(vdo))
+-        return(-1);
+-    return(0);
+-}
+-
+-static int v4l1_cleanup (zbar_video_t *vdo)
+-{
+-#ifdef HAVE_SYS_MMAN_H
+-    /* FIXME should avoid holding onto mmap'd buffers so long? */
+-    if(vdo->iomode == VIDEO_MMAP && vdo->buf) {
+-        if(munmap(vdo->buf, vdo->buflen))
+-            return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
+-                               "unmapping video frame buffers"));
+-        vdo->buf = NULL;
+-        /* FIXME reset image */
+-    }
+-#endif
+-
+-    /* close open device */
+-    if(vdo->fd >= 0) {
+-        close(vdo->fd);
+-        vdo->fd = -1;
+-    }
+-    return(0);
+-}
+-
+-static int v4l1_probe_iomode (zbar_video_t *vdo)
+-{
+-    vdo->iomode = VIDEO_READWRITE;
+-#ifdef HAVE_SYS_MMAN_H
+-    struct video_mbuf vbuf;
+-    memset(&vbuf, 0, sizeof(vbuf));
+-    if(ioctl(vdo->fd, VIDIOCGMBUF, &vbuf) < 0) {
+-        if(errno != EINVAL)
+-            return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
+-                               "querying video frame buffers (VIDIOCGMBUF)"));
+-        /* not supported */
+-        return(0);
+-    }
+-    if(!vbuf.frames || !vbuf.size)
+-        return(0);
+-    vdo->iomode = VIDEO_MMAP;
+-    if(vdo->num_images > vbuf.frames)
+-        vdo->num_images = vbuf.frames;
+-#endif
+-    zprintf(1, "using %d images in %s mode\n", vdo->num_images,
+-            (vdo->iomode == VIDEO_READWRITE) ? "READ" : "MMAP");
+-    return(0);
+-}
+-
+-static inline int v4l1_probe_formats (zbar_video_t *vdo)
+-{
+-    struct video_picture vpic;
+-    memset(&vpic, 0, sizeof(vpic));
+-    if(ioctl(vdo->fd, VIDIOCGPICT, &vpic) < 0)
+-        return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
+-                           "querying format (VIDIOCGPICT)"));
+-
+-    vdo->format = 0;
+-    if(vpic.palette <= VIDEO_PALETTE_YUV410P)
+-        vdo->format = v4l1_formats[vpic.palette].format;
+-
+-    zprintf(1, "current format: %.4s(%08x) depth=%d palette=%d\n",
+-            (char*)&vdo->format, vdo->format, vpic.depth, vpic.palette);
+-
+-    vdo->formats = calloc(16, sizeof(uint32_t));
+-    if(!vdo->formats)
+-        return(err_capture(vdo, SEV_FATAL, ZBAR_ERR_NOMEM, __func__,
+-                           "allocating format list"));
+-
+-    int num_formats = 0;
+-    zprintf(2, "probing supported formats:\n");
+-    int i;
+-    for(i = 1; i <= VIDEO_PALETTE_YUV410P; i++) {
+-        if(!v4l1_formats[i].format)
+-            continue;
+-        vpic.depth = v4l1_formats[i].bpp;
+-        vpic.palette = i;
+-        if(ioctl(vdo->fd, VIDIOCSPICT, &vpic) < 0) {
+-            zprintf(2, "    [%02d] %.4s...no (set fails)\n",
+-                    i, (char*)&v4l1_formats[i].format);
+-            continue;
+-        }
+-        if(ioctl(vdo->fd, VIDIOCGPICT, &vpic) < 0 ||
+-           vpic.palette != i) {
+-            zprintf(2, "    [%02d] %.4s...no (set ignored)\n",
+-                    i, (char*)&v4l1_formats[i].format);
+-            continue;
+-        }
+-        zprintf(2, "    [%02d] %.4s...yes\n",
+-                i, (char*)&v4l1_formats[i].format);
+-        vdo->formats[num_formats++] = v4l1_formats[i].format;
+-    }
+-    vdo->formats = realloc(vdo->formats, (num_formats + 1) * sizeof(uint32_t));
+-    assert(vdo->formats);
+-
+-    return(v4l1_set_format(vdo, vdo->format));
+-}
+-
+-static inline int v4l1_init_window (zbar_video_t *vdo)
+-{
+-    struct video_window vwin;
+-    memset(&vwin, 0, sizeof(vwin));
+-    if(ioctl(vdo->fd, VIDIOCGWIN, &vwin) < 0)
+-        return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
+-                           "querying video window settings (VIDIOCGWIN)"));
+-
+-    zprintf(1, "current window: %d x %d @(%d, %d)%s\n",
+-            vwin.width, vwin.height, vwin.x, vwin.y,
+-            (vwin.flags & 1) ? " INTERLACE" : "");
+-
+-    if(vwin.width == vdo->width && vwin.height == vdo->height)
+-        /* max window already set */
+-        return(0);
+-
+-    struct video_window maxwin;
+-    memcpy(&maxwin, &vwin, sizeof(maxwin));
+-    maxwin.width = vdo->width;
+-    maxwin.height = vdo->height;
+-
+-    zprintf(1, "setting max win: %d x %d @(%d, %d)%s\n",
+-            maxwin.width, maxwin.height, maxwin.x, maxwin.y,
+-            (maxwin.flags & 1) ? " INTERLACE" : "");
+-    if(ioctl(vdo->fd, VIDIOCSWIN, &maxwin) < 0) {
+-        zprintf(1, "set FAILED...trying to recover original window\n");
+-        /* ignore errors (driver broken anyway) */
+-        ioctl(vdo->fd, VIDIOCSWIN, &vwin);
+-    }
+-
+-    /* re-query resulting parameters */
+-    memset(&vwin, 0, sizeof(vwin));
+-    if(ioctl(vdo->fd, VIDIOCGWIN, &vwin) < 0)
+-        return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
+-                           "querying video window settings (VIDIOCGWIN)"));
+-
+-    zprintf(1, "    final window: %d x %d @(%d, %d)%s\n",
+-            vwin.width, vwin.height, vwin.x, vwin.y,
+-            (vwin.flags & 1) ? " INTERLACE" : "");
+-    vdo->width = vwin.width;
+-    vdo->height = vwin.height;
+-    return(0);
+-}
+-
+-static int _zbar_v4l1_probe (zbar_video_t *vdo)
+-{
+-    /* check capabilities */
+-    struct video_capability vcap;
+-    memset(&vcap, 0, sizeof(vcap));
+-    if(ioctl(vdo->fd, VIDIOCGCAP, &vcap) < 0)
+-        return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_UNSUPPORTED, __func__,
+-                           "video4linux version 1 not supported (VIDIOCGCAP)"));
+-
+-    zprintf(1, "%s (%sCAPTURE) (%d x %d) - (%d x %d)\n",
+-            vcap.name, (vcap.type & VID_TYPE_CAPTURE) ? "" : "*NO* ",
+-            vcap.minwidth, vcap.minheight, vcap.maxwidth, vcap.maxheight);
+-
+-    if(!(vcap.type & VID_TYPE_CAPTURE))
+-        return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_UNSUPPORTED, __func__,
+-                           "v4l1 device does not support CAPTURE"));
+-
+-    if(!vdo->width || !vdo->height) {
+-        vdo->width = vcap.maxwidth;
+-        vdo->height = vcap.maxheight;
+-    }
+-
+-    if(v4l1_init_window(vdo) ||
+-       v4l1_probe_formats(vdo) ||
+-       v4l1_probe_iomode(vdo))
+-        return(-1);
+-
+-    vdo->intf = VIDEO_V4L1;
+-    vdo->init = v4l1_init;
+-    vdo->cleanup = v4l1_cleanup;
+-    vdo->start = v4l1_start;
+-    vdo->stop = v4l1_stop;
+-    vdo->nq = v4l1_nq;
+-    vdo->dq = v4l1_dq;
+-    return(0);
+-}
+-
+-int _zbar_video_open (zbar_video_t *vdo,
+-                      const char *dev)
+-{
+-    vdo->fd = open(dev, O_RDWR);
+-    if(vdo->fd < 0)
+-        return(err_capture_str(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
+-                               "opening video device '%s'", dev));
+-    zprintf(1, "opened camera device %s (fd=%d)\n", dev, vdo->fd);
+-
+-    int rc = -1;
+-#ifdef HAVE_LINUX_VIDEODEV2_H
+-    if(vdo->intf != VIDEO_V4L1)
+-        rc = _zbar_v4l2_probe(vdo);
+-    if(rc)
+-#else
+-    zprintf(1, "WARNING: not compiled with v4l2 support, trying v4l1\n");
+-#endif
+-        rc = _zbar_v4l1_probe(vdo);
+-
+-    if(rc && vdo->fd >= 0) {
+-        close(vdo->fd);
+-        vdo->fd = -1;
+-    }
+-    return(rc);
+-}
+diff --git a/zbar/video/v4l2.c b/zbar/video/v4l2.c
+--- a/zbar/video/v4l2.c
++++ b/zbar/video/v4l2.c
+@@ -38,6 +38,8 @@
+ #ifdef HAVE_SYS_MMAN_H
+ # include <sys/mman.h>
+ #endif
++#include <fcntl.h>
++#include <libv4l2.h>
+ #include <linux/videodev2.h>
+ 
+ #include "video.h"
+@@ -67,7 +69,7 @@ static int v4l2_nq (zbar_video_t *vdo,
+         vbuf.length = img->datalen;
+         vbuf.index = img->srcidx; /* FIXME workaround broken drivers */
+     }
+-    if(ioctl(vdo->fd, VIDIOC_QBUF, &vbuf) < 0)
++    if(v4l2_ioctl(vdo->fd, VIDIOC_QBUF, &vbuf) < 0)
+         return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
+                            "queuing video buffer (VIDIOC_QBUF)"));
+     return(0);
+@@ -91,7 +93,7 @@ static zbar_image_t *v4l2_dq (zbar_video
+         else
+             vbuf.memory = V4L2_MEMORY_USERPTR;
+ 
+-        if(ioctl(fd, VIDIOC_DQBUF, &vbuf) < 0)
++        if(v4l2_ioctl(fd, VIDIOC_DQBUF, &vbuf) < 0)
+             return(NULL);
+ 
+         if(iomode == VIDEO_MMAP) {
+@@ -132,7 +134,7 @@ static int v4l2_start (zbar_video_t *vdo
+         return(0);
+ 
+     enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+-    if(ioctl(vdo->fd, VIDIOC_STREAMON, &type) < 0)
++    if(v4l2_ioctl(vdo->fd, VIDIOC_STREAMON, &type) < 0)
+         return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
+                            "starting video stream (VIDIOC_STREAMON)"));
+     return(0);
+@@ -144,7 +146,7 @@ static int v4l2_stop (zbar_video_t *vdo)
+         return(0);
+ 
+     enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+-    if(ioctl(vdo->fd, VIDIOC_STREAMOFF, &type) < 0)
++    if(v4l2_ioctl(vdo->fd, VIDIOC_STREAMOFF, &type) < 0)
+         return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
+                            "stopping video stream (VIDIOC_STREAMOFF)"));
+     return(0);
+@@ -164,7 +166,7 @@ static int v4l2_cleanup (zbar_video_t *v
+         for(i = 0; i < vdo->num_images; i++) {
+             zbar_image_t *img = vdo->images[i];
+             if(img->data &&
+-               munmap((void*)img->data, img->datalen))
++               v4l2_munmap((void*)img->data, img->datalen))
+                 err_capture(vdo, SEV_WARNING, ZBAR_ERR_SYSTEM, __func__,
+                             "unmapping video frame buffers");
+             img->data = NULL;
+@@ -177,27 +179,27 @@ static int v4l2_cleanup (zbar_video_t *v
+     /* requesting 0 buffers
+      * should implicitly disable streaming
+      */
+-    if(ioctl(vdo->fd, VIDIOC_REQBUFS, &rb) < 0)
++    if(v4l2_ioctl(vdo->fd, VIDIOC_REQBUFS, &rb) < 0)
+         err_capture(vdo, SEV_WARNING, ZBAR_ERR_SYSTEM, __func__,
+                     "releasing video frame buffers (VIDIOC_REQBUFS)");
+ 
+ 
+-    /* close open device */
++    /* v4l2_close v4l2_open device */
+     if(vdo->fd >= 0) {
+-        close(vdo->fd);
++        v4l2_close(vdo->fd);
+         vdo->fd = -1;
+     }
+     return(0);
+ }
+ 
+-static int v4l2_mmap_buffers (zbar_video_t *vdo)
++static int v4l2_v4l2_mmap_buffers (zbar_video_t *vdo)
+ {
+     struct v4l2_requestbuffers rb;
+     memset(&rb, 0, sizeof(rb));
+     rb.count = vdo->num_images;
+     rb.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+     rb.memory = V4L2_MEMORY_MMAP;
+-    if(ioctl(vdo->fd, VIDIOC_REQBUFS, &rb) < 0)
++    if(v4l2_ioctl(vdo->fd, VIDIOC_REQBUFS, &rb) < 0)
+         return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
+                            "requesting video frame buffers (VIDIOC_REQBUFS)"));
+     zprintf(1, "mapping %u buffers (of %d requested)\n",
+@@ -216,7 +218,7 @@ static int v4l2_mmap_buffers (zbar_video
+     int i;
+     for(i = 0; i < vdo->num_images; i++) {
+         vbuf.index = i;
+-        if(ioctl(vdo->fd, VIDIOC_QUERYBUF, &vbuf) < 0)
++        if(v4l2_ioctl(vdo->fd, VIDIOC_QUERYBUF, &vbuf) < 0)
+             /* FIXME cleanup */
+             return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
+                                "querying video buffer (VIDIOC_QUERYBUF)"));
+@@ -229,7 +231,7 @@ static int v4l2_mmap_buffers (zbar_video
+ 
+         zbar_image_t *img = vdo->images[i];
+         img->datalen = vbuf.length;
+-        img->data = mmap(NULL, vbuf.length, PROT_READ | PROT_WRITE, MAP_SHARED,
++        img->data = v4l2_mmap(NULL, vbuf.length, PROT_READ | PROT_WRITE, MAP_SHARED,
+                          vdo->fd, vbuf.m.offset);
+         if(img->data == MAP_FAILED)
+             /* FIXME cleanup */
+@@ -253,7 +255,7 @@ static int v4l2_set_format (zbar_video_t
+     vpix->pixelformat = fmt;
+     vpix->field = V4L2_FIELD_NONE;
+     int rc = 0;
+-    if((rc = ioctl(vdo->fd, VIDIOC_S_FMT, &vfmt)) < 0) {
++    if((rc = v4l2_ioctl(vdo->fd, VIDIOC_S_FMT, &vfmt)) < 0) {
+         /* several broken drivers return an error if we request
+          * no interlacing (NB v4l2 spec violation)
+          * ...try again with an interlaced request
+@@ -264,7 +266,7 @@ static int v4l2_set_format (zbar_video_t
+         /* FIXME this might be _ANY once we can de-interlace */
+         vpix->field = V4L2_FIELD_INTERLACED;
+ 
+-        if(ioctl(vdo->fd, VIDIOC_S_FMT, &vfmt) < 0)
++        if(v4l2_ioctl(vdo->fd, VIDIOC_S_FMT, &vfmt) < 0)
+             return(err_capture_int(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
+                                    "setting format %x (VIDIOC_S_FMT)", fmt));
+ 
+@@ -276,7 +278,7 @@ static int v4l2_set_format (zbar_video_t
+     struct v4l2_pix_format *newpix = &newfmt.fmt.pix;
+     memset(&newfmt, 0, sizeof(newfmt));
+     newfmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+-    if(ioctl(vdo->fd, VIDIOC_G_FMT, &newfmt) < 0)
++    if(v4l2_ioctl(vdo->fd, VIDIOC_G_FMT, &newfmt) < 0)
+         return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
+                            "querying format (VIDIOC_G_FMT)"));
+ 
+@@ -307,7 +309,7 @@ static int v4l2_init (zbar_video_t *vdo,
+     if(v4l2_set_format(vdo, fmt))
+         return(-1);
+     if(vdo->iomode == VIDEO_MMAP)
+-        return(v4l2_mmap_buffers(vdo));
++        return(v4l2_v4l2_mmap_buffers(vdo));
+     return(0);
+ }
+ 
+@@ -322,7 +324,7 @@ static int v4l2_probe_iomode (zbar_video
+     else
+         rb.memory = V4L2_MEMORY_USERPTR;
+ 
+-    if(ioctl(vdo->fd, VIDIOC_REQBUFS, &rb) < 0) {
++    if(v4l2_ioctl(vdo->fd, VIDIOC_REQBUFS, &rb) < 0) {
+         if(vdo->iomode)
+             return(err_capture_int(vdo, SEV_ERROR, ZBAR_ERR_INVALID, __func__,
+                                    "unsupported iomode requested (%d)",
+@@ -350,7 +352,7 @@ static inline int v4l2_probe_formats (zb
+     memset(&desc, 0, sizeof(desc));
+     desc.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+     for(desc.index = 0; desc.index < V4L2_FORMATS_MAX; desc.index++) {
+-        if(ioctl(vdo->fd, VIDIOC_ENUM_FMT, &desc) < 0)
++        if(v4l2_ioctl(vdo->fd, VIDIOC_ENUM_FMT, &desc) < 0)
+             break;
+         zprintf(2, "    [%d] %.4s : %s%s\n",
+                 desc.index, (char*)&desc.pixelformat, desc.description,
+@@ -368,7 +370,7 @@ static inline int v4l2_probe_formats (zb
+     struct v4l2_pix_format *pix = &fmt.fmt.pix;
+     memset(&fmt, 0, sizeof(fmt));
+     fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+-    if(ioctl(vdo->fd, VIDIOC_G_FMT, &fmt) < 0)
++    if(v4l2_ioctl(vdo->fd, VIDIOC_G_FMT, &fmt) < 0)
+         return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
+                            "querying current video format (VIDIO_G_FMT)"));
+ 
+@@ -390,15 +392,15 @@ static inline int v4l2_probe_formats (zb
+     maxpix->height = vdo->height;
+ 
+     zprintf(1, "setting requested size: %d x %d\n", vdo->width, vdo->height);
+-    if(ioctl(vdo->fd, VIDIOC_S_FMT, &maxfmt) < 0) {
++    if(v4l2_ioctl(vdo->fd, VIDIOC_S_FMT, &maxfmt) < 0) {
+         zprintf(1, "set FAILED...trying to recover original format\n");
+         /* ignore errors (driver broken anyway) */
+-        ioctl(vdo->fd, VIDIOC_S_FMT, &fmt);
++        v4l2_ioctl(vdo->fd, VIDIOC_S_FMT, &fmt);
+     }
+ 
+     memset(&fmt, 0, sizeof(fmt));
+     fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+-    if(ioctl(vdo->fd, VIDIOC_G_FMT, &fmt) < 0)
++    if(v4l2_ioctl(vdo->fd, VIDIOC_G_FMT, &fmt) < 0)
+         return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
+                            "querying current video format (VIDIOC_G_FMT)"));
+ 
+@@ -420,7 +422,7 @@ static inline int v4l2_reset_crop (zbar_
+     struct v4l2_cropcap ccap;
+     memset(&ccap, 0, sizeof(ccap));
+     ccap.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+-    if(ioctl(vdo->fd, VIDIOC_CROPCAP, &ccap) < 0)
++    if(v4l2_ioctl(vdo->fd, VIDIOC_CROPCAP, &ccap) < 0)
+         return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
+                            "querying crop support (VIDIOC_CROPCAP)"));
+ 
+@@ -442,7 +444,7 @@ static inline int v4l2_reset_crop (zbar_
+     memset(&crop, 0, sizeof(crop));
+     crop.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+     crop.c = ccap.defrect;
+-    if(ioctl(vdo->fd, VIDIOC_S_CROP, &crop) < 0 && errno != EINVAL)
++    if(v4l2_ioctl(vdo->fd, VIDIOC_S_CROP, &crop) < 0 && errno != EINVAL)
+         return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
+                            "setting default crop window (VIDIOC_S_CROP)"));
+     return(0);
+@@ -453,7 +455,7 @@ int _zbar_v4l2_probe (zbar_video_t *vdo)
+     /* check capabilities */
+     struct v4l2_capability vcap;
+     memset(&vcap, 0, sizeof(vcap));
+-    if(ioctl(vdo->fd, VIDIOC_QUERYCAP, &vcap) < 0)
++    if(v4l2_ioctl(vdo->fd, VIDIOC_QUERYCAP, &vcap) < 0)
+         return(err_capture(vdo, SEV_WARNING, ZBAR_ERR_UNSUPPORTED, __func__,
+                            "video4linux version 2 not supported (VIDIOC_QUERYCAP)"));
+ 
+@@ -507,3 +509,21 @@ int _zbar_v4l2_probe (zbar_video_t *vdo)
+     vdo->dq = v4l2_dq;
+     return(0);
+ }
++
++int _zbar_video_open (zbar_video_t *vdo,
++                      const char *dev)
++{
++    vdo->fd = v4l2_open(dev, O_RDWR);
++    if(vdo->fd < 0)
++        return(err_capture_str(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
++                               "opening video device '%s'", dev));
++    zprintf(1, "opened camera device %s (fd=%d)\n", dev, vdo->fd);
++
++    int rc = _zbar_v4l2_probe(vdo);
++
++    if(rc && vdo->fd >= 0) {
++        v4l2_close(vdo->fd);
++        vdo->fd = -1;
++    }
++    return(rc);
++}
+diff --git a/zbarcam/Makefile.am.inc b/zbarcam/Makefile.am.inc
+--- a/zbarcam/Makefile.am.inc
++++ b/zbarcam/Makefile.am.inc
+@@ -7,4 +7,6 @@ CLEANFILES += zbarcam/.libs/zbarcam
+ if WIN32
+ zbarcam_zbarcam_SOURCES += zbarcam/zbarcam.rc
+ zbarcam_zbarcam_LDADD += zbarcam/zbarcam-rc.o
++else
++zbarcam_zbarcam_LDADD += -lv4l2
+ endif

From 6bdec7f0f06905abc1c1303436689b0b90bdb5cf Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Sat, 25 Dec 2010 10:57:22 -0200
Subject: [PATCH 013/108] Only use emulated formats if real formats aren't
 supported

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---
 zbar.spec                                |   7 +-
 zbar_choose_supported_format_first.patch | 128 +++++++++++++++++++++++
 2 files changed, 134 insertions(+), 1 deletion(-)
 create mode 100644 zbar_choose_supported_format_first.patch

diff --git a/zbar.spec b/zbar.spec
index a99c126..148bc4c 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -3,7 +3,7 @@
 
 Name:           zbar
 Version:        0.10
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Bar code reader
 
 Group:          User Interface/X Hardware Support
@@ -13,6 +13,7 @@ Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.
 Patch0:		zbar_update_to_617889f8f73.patch
 Patch1:		zbar_dont_user_reserved_dprintf.patch
 Patch2:		zbar_use_libv4l.patch
+Patch3:		zbar_choose_supported_format_first.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	ImageMagick-c++ libv4l libXv
  
@@ -87,6 +88,7 @@ scanning widget.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 autoreconf
@@ -178,6 +180,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/zbar/QZBar*.h
 
 %changelog
+* Sun Dec 25 2010 mchehab - 0.10-7
+- Prefer to use non-emulated formats
+
 * Sun Dec 05 2010 mchehab - 0.10-6
 - Update it to the newest version available at zbar git directory
 - Use libv4l to communicate with video devices
diff --git a/zbar_choose_supported_format_first.patch b/zbar_choose_supported_format_first.patch
new file mode 100644
index 0000000..5289d25
--- /dev/null
+++ b/zbar_choose_supported_format_first.patch
@@ -0,0 +1,128 @@
+diff -r 60f92d860a1f zbar/convert.c
+--- a/zbar/convert.c	Sat Dec 25 08:29:33 2010 -0200
++++ b/zbar/convert.c	Sat Dec 25 14:36:04 2010 -0200
+@@ -1157,6 +1157,42 @@
+                 break;
+         }
+     }
++    if(!min_fmt && vdo->emu_formats) {
++        /* As vdo->formats aren't compatible, just free them */
++        free(vdo->formats);
++        vdo->formats = vdo->emu_formats;
++        vdo->emu_formats = NULL;
++
++        /*
++        * Use the same cost algorithm to select emulated formats.
++        * This might select a sub-optimal conversion, but, in practice,
++        * it will select a conversion to YUV at libv4l, and a YUY->Y8
++        * in zbar, with it is OK. Yet, it is better to not select the
++        * most performatic conversion than to not support the webcam.
++        */
++        for(fmt = _zbar_formats; *fmt; fmt++) {
++            /* only consider formats supported by video device */
++            uint32_t win_fmt = 0;
++            int cost;
++            if(!has_format(*fmt, srcs))
++                continue;
++            cost = _zbar_best_format(*fmt, &win_fmt, dsts);
++            if(cost < 0) {
++                zprintf(4, "%.4s(%08" PRIx32 ") -> ? (unsupported)\n",
++                        (char*)fmt, *fmt);
++                continue;
++            }
++            zprintf(4, "%.4s(%08" PRIx32 ") -> %.4s(%08" PRIx32 ") (%d)\n",
++                    (char*)fmt, *fmt, (char*)&win_fmt, win_fmt, cost);
++            if(min_cost > cost) {
++                min_cost = cost;
++                min_fmt = *fmt;
++                if(!cost)
++                    break;
++            }
++        }
++    }
++
+     if(win)
+         (void)window_unlock(win);
+ 
+diff -r 60f92d860a1f zbar/video.c
+--- a/zbar/video.c	Sat Dec 25 08:29:33 2010 -0200
++++ b/zbar/video.c	Sat Dec 25 14:36:04 2010 -0200
+@@ -111,6 +111,9 @@
+         free(vdo->buf);
+     if(vdo->formats)
+         free(vdo->formats);
++    if(vdo->emu_formats)
++        free(vdo->emu_formats);
++
+     err_cleanup(&vdo->err);
+     _zbar_mutex_destroy(&vdo->qlock);
+ 
+diff -r 60f92d860a1f zbar/video.h
+--- a/zbar/video.h	Sat Dec 25 08:29:33 2010 -0200
++++ b/zbar/video.h	Sat Dec 25 14:36:04 2010 -0200
+@@ -69,6 +69,7 @@
+     uint32_t format;            /* selected fourcc */
+     unsigned palette;           /* v4l1 format index corresponding to format */
+     uint32_t *formats;          /* 0 terminated list of supported formats */
++    uint32_t *emu_formats;      /* 0 terminated list of emulated formats */
+ 
+     unsigned long datalen;      /* size of image data for selected format */
+     unsigned long buflen;       /* total size of image data buffer */
+diff -r 60f92d860a1f zbar/video/v4l2.c
+--- a/zbar/video/v4l2.c	Sat Dec 25 08:29:33 2010 -0200
++++ b/zbar/video/v4l2.c	Sat Dec 25 14:36:04 2010 -0200
+@@ -347,6 +347,8 @@
+ 
+ static inline int v4l2_probe_formats (zbar_video_t *vdo)
+ {
++    int n_formats = 0, n_emu_formats = 0;
++
+     zprintf(2, "enumerating supported formats:\n");
+     struct v4l2_fmtdesc desc;
+     memset(&desc, 0, sizeof(desc));
+@@ -354,17 +356,39 @@
+     for(desc.index = 0; desc.index < V4L2_FORMATS_MAX; desc.index++) {
+         if(v4l2_ioctl(vdo->fd, VIDIOC_ENUM_FMT, &desc) < 0)
+             break;
+-        zprintf(2, "    [%d] %.4s : %s%s\n",
++        zprintf(2, "    [%d] %.4s : %s%s%s\n",
+                 desc.index, (char*)&desc.pixelformat, desc.description,
+-                (desc.flags & V4L2_FMT_FLAG_COMPRESSED) ? " COMPRESSED" : "");
+-        vdo->formats = realloc(vdo->formats,
+-                               (desc.index + 2) * sizeof(uint32_t));
+-        vdo->formats[desc.index] = desc.pixelformat;
++                (desc.flags & V4L2_FMT_FLAG_COMPRESSED) ? " COMPRESSED" : "",
++                (desc.flags & V4L2_FMT_FLAG_EMULATED) ? " EMULATED" : "");
++        if (desc.flags & V4L2_FMT_FLAG_EMULATED) {
++            vdo->emu_formats = realloc(vdo->emu_formats,
++                                   (n_emu_formats + 2) * sizeof(uint32_t));
++            vdo->emu_formats[n_emu_formats++] = desc.pixelformat;
++        } else {
++            vdo->formats = realloc(vdo->formats,
++                                   (n_formats + 2) * sizeof(uint32_t));
++            vdo->formats[n_formats++] = desc.pixelformat;
++        }
+     }
+     if(!desc.index)
+         return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
+                            "enumerating video formats (VIDIOC_ENUM_FMT)"));
+-    vdo->formats[desc.index] = 0;
++    if(vdo->formats)
++       vdo->formats[n_formats] = 0;
++    if(vdo->emu_formats)
++       vdo->emu_formats[n_emu_formats] = 0;
++    if(!vdo->formats && vdo->emu_formats) {
++       /*
++        * If only emu formats are available, just move them to vdo->formats.
++        * This happens when libv4l detects that the only available fourcc
++        * formats are webcam proprietary formats or bayer formats.
++        */
++       vdo->formats = vdo->emu_formats;
++       vdo->emu_formats = NULL;
++    }
++
++    zprintf(2, "Found %d formats and %d emulated formats.\n",
++            n_formats, n_emu_formats);
+ 
+     struct v4l2_format fmt;
+     struct v4l2_pix_format *pix = &fmt.fmt.pix;

From c9a56b30f54c2ea07b83b371c5ff3f1fc7576162 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Wed, 9 Feb 2011 16:29:25 -0600
Subject: [PATCH 014/108] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

---
 zbar.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zbar.spec b/zbar.spec
index 148bc4c..98fd2f1 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -3,7 +3,7 @@
 
 Name:           zbar
 Version:        0.10
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Bar code reader
 
 Group:          User Interface/X Hardware Support
@@ -180,6 +180,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/zbar/QZBar*.h
 
 %changelog
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
 * Sun Dec 25 2010 mchehab - 0.10-7
 - Prefer to use non-emulated formats
 

From 1d4fc4435c4aef5d8acb336065d8bfab555325a5 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Tue, 6 Dec 2011 01:50:27 -0500
Subject: [PATCH 015/108] Rebuild for new libpng

---
 zbar.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zbar.spec b/zbar.spec
index 98fd2f1..4d3a323 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -3,7 +3,7 @@
 
 Name:           zbar
 Version:        0.10
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Bar code reader
 
 Group:          User Interface/X Hardware Support
@@ -180,6 +180,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/zbar/QZBar*.h
 
 %changelog
+* Tue Dec 06 2011 Adam Jackson <ajax@redhat.com> - 0.10-9
+- Rebuild for new libpng
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 

From 76abed2c9b724e98066b9d3e8c83812afcf14083 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Sat, 14 Jan 2012 03:34:31 -0600
Subject: [PATCH 016/108] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild

---
 zbar.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zbar.spec b/zbar.spec
index 4d3a323..f5d06f4 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -3,7 +3,7 @@
 
 Name:           zbar
 Version:        0.10
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Bar code reader
 
 Group:          User Interface/X Hardware Support
@@ -180,6 +180,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/zbar/QZBar*.h
 
 %changelog
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
 * Tue Dec 06 2011 Adam Jackson <ajax@redhat.com> - 0.10-9
 - Rebuild for new libpng
 

From a60e145d841cbdf325fa9c31a2b99cff3d941264 Mon Sep 17 00:00:00 2001
From: Brian Pepple <bpepple@fedoraproject.org>
Date: Thu, 1 Mar 2012 11:16:44 -0500
Subject: [PATCH 017/108] Rebuild

---
 zbar.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zbar.spec b/zbar.spec
index f5d06f4..1a50386 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -3,7 +3,7 @@
 
 Name:           zbar
 Version:        0.10
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Bar code reader
 
 Group:          User Interface/X Hardware Support
@@ -180,6 +180,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/zbar/QZBar*.h
 
 %changelog
+* Thu Mar 01 2012 Brian Pepple <bpepple@fedoraproject.org> - 0.10-11
+- Rebuild
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 

From acecaed306c8fbf2c2de1ef4c5a9be6b48f18747 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Sun, 22 Jul 2012 03:06:12 -0500
Subject: [PATCH 018/108] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild

---
 zbar.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zbar.spec b/zbar.spec
index 1a50386..71bb69a 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -3,7 +3,7 @@
 
 Name:           zbar
 Version:        0.10
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Bar code reader
 
 Group:          User Interface/X Hardware Support
@@ -180,6 +180,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/zbar/QZBar*.h
 
 %changelog
+* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
 * Thu Mar 01 2012 Brian Pepple <bpepple@fedoraproject.org> - 0.10-11
 - Rebuild
 

From 5d3e6e1367be0d454d18e65e5c3b0ee1b5a58a19 Mon Sep 17 00:00:00 2001
From: Adam Tkac <atkac@redhat.com>
Date: Fri, 21 Dec 2012 20:44:29 +0100
Subject: [PATCH 019/108] rebuild against new libjpeg

Signed-off-by: Adam Tkac <atkac@redhat.com>
---
 zbar.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zbar.spec b/zbar.spec
index 71bb69a..dd5a0e4 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -3,7 +3,7 @@
 
 Name:           zbar
 Version:        0.10
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        Bar code reader
 
 Group:          User Interface/X Hardware Support
@@ -180,6 +180,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/zbar/QZBar*.h
 
 %changelog
+* Fri Dec 21 2012 Adam Tkac <atkac redhat com> - 0.10-13
+- rebuild against new libjpeg
+
 * Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 

From c65e967d987baa44ac15f7bb30335576e253af85 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Thu, 14 Feb 2013 22:17:44 -0600
Subject: [PATCH 020/108] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild

---
 zbar.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zbar.spec b/zbar.spec
index dd5a0e4..04e851a 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -3,7 +3,7 @@
 
 Name:           zbar
 Version:        0.10
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        Bar code reader
 
 Group:          User Interface/X Hardware Support
@@ -180,6 +180,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/zbar/QZBar*.h
 
 %changelog
+* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
 * Fri Dec 21 2012 Adam Tkac <atkac redhat com> - 0.10-13
 - rebuild against new libjpeg
 

From 23c808b6cc5346609c80f79e680100e430d6c6ad Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Fri, 22 Feb 2013 08:26:55 -0300
Subject: [PATCH 021/108] Update to the very latest version of zbar

zbar was using a 2010 snapshot of its hg tree.
Take a new snapshot to get zbar's improvements.
---
 sources                                       |     2 +-
 zbar.spec                                     |    19 +-
 ...7889f8f73.patch => zbar_update_to_hg.patch | 31476 ++++++++++------
 zbar_use_libv4l.patch                         |   684 +-
 4 files changed, 19257 insertions(+), 12924 deletions(-)
 rename zbar_update_to_617889f8f73.patch => zbar_update_to_hg.patch (63%)

diff --git a/sources b/sources
index 32db79b..e58d80a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0fd61eb590ac1bab62a77913c8b086a5  zbar-0.10.tar.bz2
+d8b9dddcf28d6603d8b066816941a9d2  zbar-0.10.tar.bz2
diff --git a/zbar.spec b/zbar.spec
index 04e851a..3447be5 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -3,17 +3,16 @@
 
 Name:           zbar
 Version:        0.10
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        Bar code reader
 
 Group:          User Interface/X Hardware Support
 License:        LGPLv2+
 URL:            http://zbar.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
-Patch0:		zbar_update_to_617889f8f73.patch
-Patch1:		zbar_dont_user_reserved_dprintf.patch
-Patch2:		zbar_use_libv4l.patch
-Patch3:		zbar_choose_supported_format_first.patch
+Patch0:		zbar_update_to_hg.patch
+Patch1:		zbar_use_libv4l.patch
+Patch2:		zbar_choose_supported_format_first.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	ImageMagick-c++ libv4l libXv
  
@@ -88,10 +87,9 @@ scanning widget.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
-autoreconf
+autoreconf -vfi
 autoconf
 %configure --docdir=%{_docdir}/%{name}-%{version}
 
@@ -180,6 +178,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/zbar/QZBar*.h
 
 %changelog
+* Fri Feb 22 2013 Mauro Carvalho Chehab <mchehab@redhat.com> - 0.10-15
+- zbar 0.10 source generated via hg archive -r 0.10 ../zbar-0.10.tar.bz2
+  That allows to better handle the difference from 0.10 to -hg
+- Update to the latest hg patch
+
 * Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
@@ -204,7 +207,7 @@ rm -rf $RPM_BUILD_ROOT
 * Sun Dec 25 2010 mchehab - 0.10-7
 - Prefer to use non-emulated formats
 
-* Sun Dec 05 2010 mchehab - 0.10-6
+* Sun Dec 05 2010 Mauro Carvalho Chehab <mchehab@redhat.com>
 - Update it to the newest version available at zbar git directory
 - Use libv4l to communicate with video devices
 
diff --git a/zbar_update_to_617889f8f73.patch b/zbar_update_to_hg.patch
similarity index 63%
rename from zbar_update_to_617889f8f73.patch
rename to zbar_update_to_hg.patch
index adf6455..bbe77fb 100644
--- a/zbar_update_to_617889f8f73.patch
+++ b/zbar_update_to_hg.patch
@@ -1,15 +1,186 @@
-diff --git a/COPYING b/COPYING
---- a/COPYING
-+++ b/COPYING
+diff -r 563557a923d0 .hgignore
+--- a/.hgignore	Tue Oct 27 11:25:59 2009 -0400
++++ b/.hgignore	Fri Feb 22 08:54:29 2013 -0300
+@@ -7,7 +7,7 @@
+ configure
+ config
+ config.guess
+-config.h
++config/config.h
+ config.h.in
+ config.log
+ config.status
+@@ -19,3 +19,18 @@
+ ltmain.sh
+ autom4te.cache
+ missing
++python/MANIFEST
++build
++*.xcodeproj/*.mode1v3
++*.xcodeproj/*.pbxuser
++xcuserdata
++contents.xcworkspacedata
++.DS_Store
++android/obj
++*.class
++*.dex
++android/libs
++android/examples/*/libs
++android/*.zip
++android/local.properties
++android/examples/*/local.properties
+diff -r 563557a923d0 .hgtags
+--- a/.hgtags	Tue Oct 27 11:25:59 2009 -0400
++++ b/.hgtags	Fri Feb 22 08:54:29 2013 -0300
+@@ -9,3 +9,21 @@
+ 38265c7b4ad4dfafe7b5e9eae4bb0d43d68b4143 0.9
+ 2dc2d73c468a032edc68a127e9ddbbfe5f520777 0.9
+ f3670ba47f2e070f4c43e97f4de3200903720e73 0.10
++f3670ba47f2e070f4c43e97f4de3200903720e73 0.10
++563557a923d0e23e36c81878d660aefc1c0fe3e7 0.10
++b21098d27ff88c4f1a529fe0762f1cb307e04399 iPhoneSDK-0.1
++b0bda6247b2fe4ffb52db89a776f91244f25d897 iPhoneSDK-0.1.1
++d1655a680c3df68b3466d3b2c714f30af7223ec6 iPhoneSDK-0.1.2
++4556c996acaaa6fcd5e8e9879f410f8120746e2b iPhoneSDK-1.0
++12de07e51dce0d1cfc3e9699bbf9d5c8774a5371 iPhoneSDK-1.0.1
++12de07e51dce0d1cfc3e9699bbf9d5c8774a5371 iPhoneSDK-1.0.1
++2541a66ae7d64fbd923168ae677abb156021e88d iPhoneSDK-1.0.1
++5e5060b563a1878ea297af5a50261d14cf1cb449 iPhoneSDK-1.1
++f9e46865dbcebd04683ca7592ab32aeda615e772 iPhoneSDK-1.1.1
++801318a6195060c31259da1f076ecc9a609616cc iPhoneSDK-1.1.2
++4bbb4e2bdba8c41a282df7e65a02797250f44daa iPhoneSDK-1.1.3
++1ad84c3c03252c366a82552fa952674ec593c73f iPhoneSDK-1.2
++9e7bad13ae6a4b65e0f0964512f96284d37f0dc8 iPhoneSDK-1.2.1
++146b857ff41ae462cc52f8dddf46d867763433a1 iPhoneSDK-1.2.2
++9b946a7ead73ac99e121de2e7f495213cda88e6f AndroidSDK-0.1
++5eb3c8786845fe3ad2c74f6a660e70176b88347f iPhoneSDK-1.3.1
+diff -r 563557a923d0 COPYING
+--- a/COPYING	Tue Oct 27 11:25:59 2009 -0400
++++ b/COPYING	Fri Feb 22 08:54:29 2013 -0300
 @@ -1,4 +1,4 @@
 -The ZBar Bar Code Reader is Copyright (C) 2007-2009 Jeff Brown
-+The ZBar Bar Code Reader is Copyright (C) 2007-2010 Jeff Brown
++The ZBar Bar Code Reader is Copyright (C) 2007-2011 Jeff Brown
   <spadix@users.sourceforge.net>
  The QR Code reader is Copyright (C) 1999-2009 Timothy B. Terriberry
   <tterribe@xiph.org>
-diff --git a/Makefile.am b/Makefile.am
---- a/Makefile.am
-+++ b/Makefile.am
+diff -r 563557a923d0 ChangeLog
+--- a/ChangeLog	Tue Oct 27 11:25:59 2009 -0400
++++ b/ChangeLog	Fri Feb 22 08:54:29 2013 -0300
+@@ -1,3 +1,95 @@
++current:
++  * Codabar reliability enhancements
++    - fix missing check
++    - require minimum quality
++    - bump default uncertainty
++  * tweak Codabar bar/space ratio validation
++  * finish Codabar support for python, perl, java and iPhone interfaces
++    - reduce Codabar uncertainty to minimum
++  * add core support for Codabar symbology
++    - TBD: python, perl, java and iPhone interfaces
++  * fix v4l config and build variations (bug #3348888)
++    - thanks to jarekczek for reporting this!
++    - NB v4l1 removed from kernel as of 2.6.38
++  * fix missing python thread initialization (bug #3349199)
++    - thanks to jarekczek for reporting this problem!
++  * fix missing configure check for Python.h (bug #3092663)
++    - thanks to Zoltan Kovacs for reporting this problem!
++  * fix C++ wrapper missing Symbol.quality (bug #3076524)
++    - thanks to Rudy Melli for pointing this out!
++  * fix C++ wrapper bugs (bug #3396068)
++    - thanks to anotheruser1 for reporting this!
++    - add new C++ wrapper test
++  * fix avoid compositing ISBN10 data
++  * add support for GraphicsMagick as ImageMagick alternative
++  * mention xmlto in HACKING (patch #3297039)
++    - thanks to jarekczek for the patch!
++  * disable addons by default until synchronization with main symbol is working
++  * fix image scanner min quality filtering
++  * fix i25 buffer overrun corner case
++  * fix EAN addon enables
++  * fix zbarimg to accept autodetected stdin (lone dash)
++  * fix Qt 4.6.3 compilation error (patch #3178244)
++    - thanks to hrhristov for the patch!
++  * add Python Processor support for request_size interface
++  * fix Python Processor support for GIL, allowing asynchronous scanning
++  * fix jpeg decoder skip handling
++    - thanks to jarekczek for the patch!
++  * rename dprintf macro to avoid conflicts (patch #3128538)
++    - thanks to maurochehab for the patch!
++  * add support for EAN/UPC 2 and 5 digit add-on symbols
++    - deprecate original, unfinished add-on APIs
++    - add self-checking to test_decode
++  * fix support for GS1 AIs
++    - thanks to jockusch for a patch!
++    - add decoder/symbol "modifier" flags and config read access
++    - set flags or emit GS appropriately for Code 128 FNC1
++    - add iphone, java, perl, python bindings for modifiers and configs
++  * add support for Code 93 symbology
++  * add video size request to (Py)GTK widget (req #3034522)
++    - thanks to Jerome Charaoui for the patch!
++  * add support for GS1 DataBar Expanded (RSS Expanded) symbology
++  * add language bindings for DataBar
++  * add preliminary support for GS1 DataBar (RSS-14) symbology
++  * enhance decoder reliability (EAN, Code 39, Code 128)
++    - enhance decoder test
++  * fix documentation of command exit codes (bug #3017322)
++  * fix C++ video callback bug
++    - add C and C++ processor examples
++  * add per-symbology cache consistency
++    - reliable symbologies decode immediately by default
++    - no more need to disable cache with video
++    - also fix crop bugs w/video scanning
++  * add support for scanning partial images (cropping)
++    - update c++, python, perl, java bindings and tests
++  * fix couple of leaks
++  * remove doc hints about GFDL (bug #3004411)
++    - apply LGPL to API docs
++  * relax Code 39 width ratio checks
++  * core library portability improvements
++    - remove some unnecessary C99 syntax
++    - add configure checks for errno
++    - enhance C++ Symbol interface
++  * adjust Python module README (add examples and note DLL in path)
++  * fix QR Code missing from man pages (bug #2969857)
++  * cleanup decoder assertions and locking (bug #2966916)
++  * add Java interface to library via JNI
++    - add Java tools and JNI build tests to configure
++    - fix compiler warnings from binary output changes
++  * fix output of binary data in zbarimg and zbarcam
++    - thanks to fukuchi for a patch!
++    - add base64 format for binary xml output
++  * add coarse symbol orientation information (patch #2913094)
++    - thanks to Anssi for a patch!
++    - add decode direction feedback to decoder
++    - update C++, Python, Perl and ObjC wrappers
++    - add orientation to test suites
++  * fix inconsistent fourcc endian handling bugs (bug #2918994)
++    - thanks to jdccdevel for a patch!
++    - add fourcc conversion and parse interfaces to zbar.h
++  * report QR immediately for video (no inter-frame consistency check)
++  * add python distutils build infrastructure
++
+ version 0.10:
+   * hotfix add MinGW import lib to Windows installer
+   * attempt fix for Qt4 < 4.4
+diff -r 563557a923d0 HACKING
+--- a/HACKING	Tue Oct 27 11:25:59 2009 -0400
++++ b/HACKING	Fri Feb 22 08:54:29 2013 -0300
+@@ -13,6 +13,12 @@
+     GNU autoconf 2.61
+     GNU automake 1.10.1
+     GNU libtool 2.2.6
++    GNU gettext 0.18.1.1
++    GNU pkg-config 0.25
++    xmlto 0.0.20-5 (for docs building)
++all above mentioned tools (except xmlto) must be installed in the same
++prefix. mixing prefixes (i.g. /usr/bin and /usr/local/bin) may lead to
++errors in configuration stages
+ 
+ when you're done hacking and want to make your patch, run:
+ 
+diff -r 563557a923d0 Makefile.am
+--- a/Makefile.am	Tue Oct 27 11:25:59 2009 -0400
++++ b/Makefile.am	Fri Feb 22 08:54:29 2013 -0300
 @@ -1,6 +1,3 @@
 -AM_CPPFLAGS = -I$(srcdir)/include
 -AM_CFLAGS = -Wall -Wno-parentheses
@@ -17,7 +188,7 @@ diff --git a/Makefile.am b/Makefile.am
  ACLOCAL_AMFLAGS = -I config
  bin_PROGRAMS =
  check_PROGRAMS =
-@@ -9,8 +6,10 @@ lib_LTLIBRARIES =
+@@ -9,8 +6,10 @@
  pyexec_LTLIBRARIES =
  CLEANFILES =
  DISTCLEANFILES =
@@ -28,7 +199,7 @@ diff --git a/Makefile.am b/Makefile.am
  
  pkgconfigdir = $(libdir)/pkgconfig
  pkgconfig_DATA = zbar.pc
-@@ -39,6 +38,9 @@ if HAVE_QT
+@@ -39,6 +38,9 @@
  include $(srcdir)/qt/Makefile.am.inc
  pkgconfig_DATA += zbar-qt.pc
  endif
@@ -38,7 +209,7 @@ diff --git a/Makefile.am b/Makefile.am
  if HAVE_NPAPI
  include $(srcdir)/plugin/Makefile.am.inc
  endif
-@@ -47,11 +49,8 @@ include $(srcdir)/doc/Makefile.am.inc
+@@ -47,11 +49,8 @@
  
  EXTRA_DIST += zbar.ico zbar.nsi
  
@@ -52,3668 +223,3832 @@ diff --git a/Makefile.am b/Makefile.am
  
  EXTRA_DIST += perl/MANIFEST perl/README perl/Changes perl/COPYING.LIB \
      perl/Makefile.PL perl/typemap perl/ZBar.xs perl/ppport.h \
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -46,6 +46,13 @@ AC_DEFINE_UNQUOTED([LIB_VERSION_REVISION
-   [[`echo "$LIB_VERSION" | sed -e 's/^[^:]*:\([^:]*\):.*$/\1/'`]],
-   [Library revision])
- 
-+AM_CPPFLAGS="-I$srcdir/include"
-+AM_CFLAGS="-Wall -Wno-parentheses"
-+AM_CXXFLAGS="$AM_CFLAGS"
-+AC_SUBST([AM_CPPFLAGS])
-+AC_SUBST([AM_CFLAGS])
-+AC_SUBST([AM_CXXFLAGS])
+diff -r 563557a923d0 README
+--- a/README	Tue Oct 27 11:25:59 2009 -0400
++++ b/README	Fri Feb 22 08:54:29 2013 -0300
+@@ -4,9 +4,9 @@
+ 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, Code 128,
+-Code 39, Interleaved 2 of 5 and QR Code.  Included with the library
+-are basic applications for decoding captured bar code images and using
+-a video device (eg, webcam) as a bar code scanner.  For application
++Code 39, Codabar, Interleaved 2 of 5 and QR Code.  Included with the
++library are basic applications for decoding captured bar code images and
++using a video device (eg, webcam) as a bar code scanner.  For application
+ developers, language bindings are included for C, C++, Python and Perl
+ as well as GUI widgets for Qt, GTK and PyGTK.
+ 
+diff -r 563557a923d0 README.windows
+--- a/README.windows	Tue Oct 27 11:25:59 2009 -0400
++++ b/README.windows	Fri Feb 22 08:54:29 2013 -0300
+@@ -3,8 +3,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, Code 128, Code 39,
+-Interleaved 2 of 5 and QR Code.  Included with the library are basic
++sensors. It supports EAN-13/UPC-A, UPC-E, EAN-8, Code 128, Code 93, Code 39,
++Codabar, Interleaved 2 of 5 and QR Code.  Included with the library are basic
+ applications for decoding captured bar code images and using a video device
+ (eg, webcam) as a bar code scanner.  For application developers, language
+ bindings are included for C, C++, Python and Perl as well as GUI widgets for
+diff -r 563557a923d0 TODO
+--- a/TODO	Tue Oct 27 11:25:59 2009 -0400
++++ b/TODO	Fri Feb 22 08:54:29 2013 -0300
+@@ -25,7 +25,6 @@
+   * Code 39, i25 optional features (check digit and ASCII escapes)
+   * handle Code 128 function characters (FNC1-4)
+   * Code 128 trailing quiet zone checks
+-  * finish addon decoding
+ 
+ decoder:
+   * start/stop/abort and location detail APIs (PDF417, OMR)
+diff -r 563557a923d0 android/AndroidManifest.xml
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/android/AndroidManifest.xml	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,15 @@
++<?xml version="1.0" encoding="utf-8"?>
++<manifest xmlns:android="http://schemas.android.com/apk/res/android"
++      package="net.sourceforge.zbar.android"
++      android:versionCode="1"
++      android:versionName="1.0">
++    <application android:label="@string/app_name" >
++        <activity android:name="ACTIVITY_ENTRY_NAME"
++                  android:label="@string/app_name">
++            <intent-filter>
++                <action android:name="android.intent.action.MAIN" />
++                <category android:name="android.intent.category.LAUNCHER" />
++            </intent-filter>
++        </activity>
++    </application>
++</manifest> 
+diff -r 563557a923d0 android/ChangeLog
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/android/ChangeLog	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,2 @@
++version 0.1:
++  * Add initial support for Android platform
+diff -r 563557a923d0 android/README
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/android/README	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,112 @@
++ZBar Android SDK
++================
 +
- dnl windows build
- 
- AC_CANONICAL_HOST
-@@ -73,13 +80,36 @@ documentation generation])
- AC_ARG_VAR([XMLTOFLAGS], [additional arguments for xmlto])
- AC_CHECK_PROGS([XMLTO], [xmlto], [:])
- 
-+have_java="maybe"
-+AC_ARG_VAR([JAVA_HOME], [root location of JDK])
-+AS_IF([test "x$JAVA_HOME" = "x"],
-+  [JAVA_PATH="$PATH"],
-+  [JAVA_PATH="$JAVA_HOME/bin$PATH_SEPARATOR$PATH"])
++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, Code 128,
++Code 93, Code 39, Codabar, Interleaved 2 of 5, QR Code and
++DataBar. These are the JNI wrappers for developing the library on
++Android platform.
 +
-+AC_ARG_VAR([JAVAC], [location of Java language compiler])
-+AC_PATH_PROGS([JAVAC], [javac jikes ecj gcj], [:], [$JAVA_PATH])
-+AS_IF([test "x$JAVAC" = "x:"], [have_java="no"])
++Check the ZBar home page for the latest release, mailing lists, etc.
++    http://zbar.sourceforge.net/
 +
-+AC_ARG_VAR([JAVAH], [location of Java header generator])
-+AC_PATH_PROGS([JAVAH], [javah], [/bin/false], [$JAVA_PATH])
++Copyright and License
++---------------------
++Licensed under the GNU Lesser General Public License, version 2.1.
++http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
 +
-+AC_ARG_VAR([JAR], [location of Java archive tool])
-+AC_PATH_PROGS([JAR], [jar], [:], [$JAVA_PATH])
-+AS_IF([test "x$JAR" = "x:"], [have_java="no"])
++Copyright 2008-2012 � Jeff Brown <spadix@users.sourceforge.net> et al
 +
-+AC_ARG_VAR([JAVA], [location of Java application launcher])
-+AC_PATH_PROGS([JAVA], [java], [/bin/false], [$JAVA_PATH])
++The Android distribution also includes pre-compiled binaries of
++supporting libaries, for which copyright, license and source code
++locations are as follows:
++  * The GNU libiconv character set conversion library
++    Copyright (C) 1999-2011 Free Software Foundation, Inc.
++    This distribution includes GNU libiconv version 1.14, licensed under
++    the LGPL version 2.  The source code is available from
++        http://www.gnu.org/software/libiconv
 +
-+AC_ARG_VAR([CLASSPATH], [Java class path (include JUnit to run java tests)])
-+AS_IF([test "x$CLASSPATH" = "x"], [CLASSPATH="."])
++See included files COPYING and LICENSE for details.
 +
- dnl symbologies
- 
- AC_ARG_ENABLE([codes],
-   [AS_HELP_STRING([--enable-codes=SYMS],
--    [select symbologies to compile [default=ean,i25,code39,code128,qrcode]])],
-+    [select symbologies to compile [default=ean,databar,code128,code93,code39,i25,qrcode]])],
-   [],
--  [enable_codes="ean,code39,code128,i25,qrcode"]) dnl pdf417
-+  [enable_codes="ean,databar,code128,code93,code39,i25,qrcode"])
- 
- AC_DEFUN([ZBAR_CHK_CODE], [
-   AC_MSG_CHECKING([whether to build $2])
-@@ -97,11 +127,13 @@ AC_DEFUN([ZBAR_CHK_CODE], [
- ])dnl
- 
- ZBAR_CHK_CODE([ean], [EAN symbologies])
-+ZBAR_CHK_CODE([databar], [DataBar symbology])
- ZBAR_CHK_CODE([code128], [Code 128 symbology])
-+ZBAR_CHK_CODE([code93], [Code 93 symbology])
- ZBAR_CHK_CODE([code39], [Code 39 symbology])
--ZBAR_CHK_CODE([pdf417], [PDF417 symbology])
- ZBAR_CHK_CODE([i25], [Interleaved 2 of 5 symbology])
- ZBAR_CHK_CODE([qrcode], [QR Code])
-+ZBAR_CHK_CODE([pdf417], [PDF417 symbology])
- 
- dnl libraries
- 
-@@ -255,7 +287,7 @@ AM_CONDITIONAL([HAVE_JPEG], [test "x$wit
- dnl ImageMagick
- AC_ARG_WITH([imagemagick],
-   [AS_HELP_STRING([--without-imagemagick],
--    [disable support for scanning images using ImageMagick])],
-+    [disable support for scanning images with ImageMagick])],
-   [],
-   [with_imagemagick="yes"])
- 
-@@ -296,7 +328,7 @@ AM_CONDITIONAL([HAVE_MAGICK], [test "x$w
- dnl Mozilla NPAPI
- AC_ARG_WITH([npapi],
-   [AS_HELP_STRING([--with-npapi],
--    [enable support for Firefox/Mozilla/OpenOffice NPAPI plugin])],
-+    [enable support for Firefox/Mozilla/OpenOffice plugin])],
-   [],
-   [with_npapi="no"])
- 
-@@ -383,13 +415,38 @@ AS_IF([test "x$with_qt" != "xno"],
- 
- AM_CONDITIONAL([HAVE_QT], [test "x$with_qt" = "xyes"])
- 
-+dnl Java
-+AC_ARG_WITH([java],
-+  [AS_HELP_STRING([--without-java],
-+    [disable support for Java interface])],
-+  [],
-+  [with_java="check"])
 +
-+AC_ARG_VAR([JAVA_CFLAGS], [compiler flags for building JNI extensions])
-+AS_IF([test "x$JAVA_CFLAGS" = "x" && test "x$JAVA_HOME" != "x"],
-+  [JAVA_CFLAGS="-I$JAVA_HOME/include"])
++Installation
++------------
 +
-+AS_IF([test "x$with_java" != "xno"],
-+  [CPPFLAGS_save="$CPPFLAGS"
-+   CPPFLAGS="$CPPFLAGS $JAVA_CFLAGS"
-+   AC_CHECK_HEADER([jni.h], [], [have_java="no"])
-+   CPPFLAGS="$CPPFLAGS_save"
-+   AS_IF([test "x$have_java" != "xno"],
-+     [with_java="yes"],
-+     [test "x$with_java" = "xyes"],
-+     [AC_MSG_FAILURE([unable to find Java JNI! ensure CFLAGS are set
-+appropriately or configure --without-java])],
-+     [with_java="no"])
-+])
-+AM_CONDITIONAL([HAVE_JAVA], [test "x$with_java" = "xyes"])
++After downloading the ZBar-Android-Lib-<version>.zip file, you need to
++unzip the file and add it to your Android project. Unzip the file
++using your favorite method (ie: command-line, finder, windows
++explorer...)
++
++Follow one of the two options.
++Option 1 - via command line
++  cd <android project>
++  cp -r ZBar-Android-SDK-<version>/libs .
++
++Option 2 - via Eclipse
++  Right click on Android Project
++  Select "Import" -> "File System"
++  Select "Browse" (next to "From directory File" and select the
++    ZBar-Android-SDK-<verion>/libs directory and click "Open".
++  Click the check box next to "libs" and the "Options" "Create top-level folder"
++  check box (below).
++  Then click "Finish".
++      
++  You should then see a "libs" folder under your project.
 +
- 
- dnl header files
- 
- dnl FIXME switches for shm, mmap
- AC_HEADER_ASSERT
--AC_CHECK_HEADERS([fcntl.h features.h inttypes.h stdlib.h string.h unistd.h \
--  sys/ioctl.h sys/time.h sys/times.h sys/ipc.h sys/shm.h sys/mman.h])
-+AC_CHECK_HEADERS([errno.h fcntl.h features.h inttypes.h stdlib.h string.h \
-+  unistd.h sys/ioctl.h sys/time.h sys/times.h sys/ipc.h sys/shm.h sys/mman.h])
- 
- dnl types
- 
-@@ -428,6 +485,7 @@ AC_CONFIG_COMMANDS([doc/reldate.xml],
- 
- AC_CONFIG_FILES([
- Makefile
-+java/Makefile
- zbar.pc
- zbar-gtk.pc
- zbar-qt.pc
-@@ -460,6 +518,9 @@ AS_IF([test "x$with_gtk" != "xyes"],
- echo "Qt4               --with-qt=$with_qt"
- AS_IF([test "x$with_qt" != "xyes"],
-   [echo "        => the Qt4 widget will *NOT* be built"])
-+echo "Java              --with-java=$with_java"
-+AS_IF([test "x$with_java" != "xyes"],
-+  [echo "        => the Java interface will *NOT* be built"])
- #echo "NPAPI Plugin     --with-npapi=$with_npapi"
- #AS_IF([test "x$with_mozilla" != "xyes"],
- #  [echo "       => the Mozilla/Firefox/OpenOffice plugin will *NOT* be built"])
-diff --git a/doc/Makefile.am.inc b/doc/Makefile.am.inc
---- a/doc/Makefile.am.inc
-+++ b/doc/Makefile.am.inc
-@@ -2,6 +2,7 @@
- DOCSOURCES = doc/manual.xml doc/version.xml doc/reldate.xml \
-     doc/ref/zbarimg.xml doc/ref/zbarcam.xml doc/ref/commonoptions.xml
- 
-+MAINTAINERCLEANFILES += doc/man/man.stamp doc/version.xml doc/reldate.xml
- 
- # man page targets to distribute and install
- dist_man_MANS =
-diff --git a/doc/api/footer.html b/doc/api/footer.html
---- a/doc/api/footer.html
-+++ b/doc/api/footer.html
-@@ -9,9 +9,12 @@
- 
- <address><a href="mailto:spadix@users.sourceforge.net">spadix@users.sourceforge.net</a></address>
- 
--<p>Copyright 2008-2009 (c) Jeff Brown - All Rights Reserved.</p>
--<p>Verbatim copying and distribution of this entire article are
--  permitted worldwide, without royalty, in any medium, provided this
--  notice, and the copyright notice, are preserved.</p>
-+<p>Copyright 2008-2010 (c) Jeff Brown</p>
-+<p>This documentation is part of the ZBar Barcode Reader; you can
-+redistribute it and/or modify it under the terms of the
-+<a href="http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html">GNU
-+Lesser General Public License</a> as published by the Free Software
-+Foundation; either version 2.1 of the License, or (at your option) any
-+later version.</p>
- 
- </body></html>
-diff --git a/doc/manual.xml b/doc/manual.xml
---- a/doc/manual.xml
-+++ b/doc/manual.xml
-@@ -29,10 +29,10 @@
-       <year>2007</year>
-       <year>2008</year>
-       <year>2009</year>
-+      <year>2010</year>
-       <holder>Jeff Brown</holder>
-     </copyright>
-     <legalnotice><para>All Rights Reserved</para></legalnotice>
--    <!-- <legalnotice><para>insert GNU FDL header?</para></legalnotice> -->
-   </bookinfo>
- 
-   <chapter id="intro">
-@@ -47,7 +47,4 @@
-     &refzbarimg;
- 
-   </reference>
--
--  <!-- insert GNU FDL? -->
--
- </book>
-diff --git a/doc/ref/commonoptions.xml b/doc/ref/commonoptions.xml
---- a/doc/ref/commonoptions.xml
-+++ b/doc/ref/commonoptions.xml
-@@ -47,8 +47,9 @@
-       <option>ean13</option>, <option>ean8</option>,
-       <option>upca</option>, <option>upce</option>,
-       <option>isbn13</option>, <option>isbn10</option>,
--      <option>i25</option>, <option>code39</option>,
--      <option>code128</option> or the special value <option>*</option>.
-+      <option>i25</option>, <option>code39</option>, <option>code93</option>,
-+      <option>code128</option>, <option>qrcode</option>
-+      or the special value <option>*</option>.
-       If <replaceable class="parameter">symbology</replaceable> is
-       omitted or <option>*</option>, the <replaceable
-       class="parameter">config</replaceable> will be set for all
-diff --git a/doc/ref/zbarcam.xml b/doc/ref/zbarcam.xml
---- a/doc/ref/zbarcam.xml
-+++ b/doc/ref/zbarcam.xml
-@@ -60,9 +60,10 @@
-     <filename>/dev/video0</filename></para>
- 
-     <para>The underlying library currently supports EAN-13 (including
--    UPC and ISBN subsets), EAN-8, Code 128, Code 39, and Interleaved
--    2 of 5 symbologies.  The specific type of each detected symbol is
--    printed with the decoded data.</para>
-+    UPC and ISBN subsets), EAN-8, DataBar, DataBar Expanded, Code 128,
-+    Code 93, Code 39, Interleaved 2 of 5 and QR Code symbologies.  The
-+    specific type of each detected symbol is printed with the decoded
-+    data.</para>
- 
-   </refsection>
- 
-@@ -160,6 +161,37 @@
-   </refsection>
- 
-   <refsection>
-+    <title>Exit Status</title>
++Building
++--------
 +
-+    <para><command>zbarcam</command> returns an exit code to indicate the
-+    status of the program execution. Current exit codes are:</para>
++Via Eclipse
++You have to add the zbar.jar file to your build path
++  1) select zbar.jar under libs
++  2) right-click, select "Build Path" -> "Add to Build Path"
++  
++Via command-line
++You are all set; ant will automatcially find jar files under the "libs"
++subdirectory.
 +
-+    <variablelist>
-+      <varlistentry>
-+        <term>0</term>
-+        <listitem>
-+          <para>Successful program completion.</para>
-+        </listitem>
-+      </varlistentry>
++Documentation
++-------------
++   TDB
 +
-+      <varlistentry>
-+        <term>1</term>
-+        <listitem>
-+          <para>An error occurred.  This includes bad arguments and I/O
-+          errors.</para>
-+        </listitem>
-+      </varlistentry>
++Examples
++--------
 +
-+      <varlistentry>
-+        <term>2</term>
-+        <listitem>
-+          <para>A fatal error occurred.</para>
-+        </listitem>
-+      </varlistentry>
-+    </variablelist>
-+  </refsection>
++You should be able to open and build the examples directly from the
++unzipped directory. You will need to run the android tools to setup
++the local.properties file which sets sdk.dir.
++  1) cd <unzip dir>/examples/CameraTest
++  2) android update project --path .
++  3) ant debug install
 +
-+  <refsection>
-     <title>See Also</title>
-     <para><xref linkend="zbarimg"/></para>
-     <para><link xlink:href="http://zbar.sf.net/"/></para>
-diff --git a/doc/ref/zbarimg.xml b/doc/ref/zbarimg.xml
---- a/doc/ref/zbarimg.xml
-+++ b/doc/ref/zbarimg.xml
-@@ -59,9 +59,10 @@
-     displayed to the screen.</para>
- 
-     <para>The underlying library currently supports EAN-13 (including
--    UPC and ISBN subsets), EAN-8, Code 128, Code 39, and Interleaved
--    2 of 5 symbologies.  The specific type of each detected symbol is
--    printed with the decoded data.</para>
-+    UPC and ISBN subsets), EAN-8, DataBar, DataBar Expanded, Code 128,
-+    Code 93, Code 39, Interleaved 2 of 5 and QR Code symbologies.  The
-+    specific type of each detected symbol is printed with the decoded
-+    data.</para>
- 
-     <para>Note that "<filename><replaceable>image</replaceable></filename>"
- 
-@@ -166,6 +167,56 @@
-   </refsection>
- 
-   <refsection>
-+    <title>Exit Status</title>
++If you have problems with this, please create a new Android project
++and copy the necessary files from the examples.
 +
-+    <para><command>zbarimg</command> returns an exit code to indicate the
-+    status of the program execution. Current exit codes are:</para>
++examples/CameraTest is a simple demonstration of how to integrate the
++ZBar image scanner with the camera.
 +
-+    <variablelist>
-+      <varlistentry>
-+        <term>0</term>
-+        <listitem>
-+          <para>Barcodes successfully detected in all images. Warnings may
-+          have been generated, but no errors.</para>
-+        </listitem>
-+      </varlistentry>
++Manually building ZBar JNI library
++----------------------------------
++First download and unzip the iconv library source from 
++  http://www.gnu.org/software/libiconv/
 +
-+      <varlistentry>
-+        <term>1</term>
-+        <listitem>
-+          <para>An error occurred while processing some image(s).  This
-+          includes bad arguments, I/O errors and image handling errors from
-+          ImageMagick.</para>
-+        </listitem>
-+      </varlistentry>
++Then kick off the build from the ZBar android directory. You will
++need to run the android tools to setup the local.properties file which
++setups sdk.dir.
 +
-+      <varlistentry>
-+        <term>2</term>
-+        <listitem>
-+          <para>ImageMagick fatal error.</para>
-+        </listitem>
-+      </varlistentry>
++  1) cd <zbar project>/android
++  2) android update project --path . 
++  3) ant -Dndk.dir=<NDK path> -Diconv.src=<iconv library src> zbar-all
 +
-+      <varlistentry>
-+        <term>3</term>
-+        <listitem>
-+          <para>The user quit the program before all images were scanned.
-+          Only applies when running in interactive mode
-+          (with <option>--display</option>)</para>
-+        </listitem>
-+      </varlistentry>
++This will rebuild all source files, create zbar.jar and
++ZBarAndroidSDK.zip file (which bundles the jar and shared
++libraries). From here, you can follow the steps for "Integrating ZBar
++JNI library in Android project".
 +
-+      <varlistentry>
-+        <term>4</term>
-+        <listitem>
-+          <para>No barcode was detected in one or more of the images.  No
-+          other errors occurred.</para>
-+        </listitem>
-+      </varlistentry>
-+    </variablelist>
-+  </refsection>
++To clean run:
++  ant -Dndk.dir=<NDK path> zbar-clean
 +
-+  <refsection>
-     <title>See Also</title>
-     <para><xref linkend="zbarcam"/></para>
-     <para><link xlink:href="http://zbar.sf.net/"/></para>
-diff --git a/examples/paginate.pl b/examples/paginate.pl
-deleted file mode 100755
---- a/examples/paginate.pl
-+++ /dev/null
-@@ -1,71 +0,0 @@
--#!/usr/bin/perl
--#------------------------------------------------------------------------
--#  Copyright 2009 (c) Jeff Brown <spadix@users.sourceforge.net>
--#
--#  This file is part of the ZBar Bar Code Reader.
--#
--#  The ZBar Bar Code Reader is free software; you can redistribute it
--#  and/or modify it under the terms of the GNU Lesser Public License as
--#  published by the Free Software Foundation; either version 2.1 of
--#  the License, or (at your option) any later version.
--#
--#  The ZBar Bar Code Reader is distributed in the hope that it will be
--#  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
--#  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--#  GNU Lesser Public License for more details.
--#
--#  You should have received a copy of the GNU Lesser Public License
--#  along with the ZBar Bar Code Reader; if not, write to the Free
--#  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
--#  Boston, MA  02110-1301  USA
--#
--#  http://sourceforge.net/projects/zbar
--#------------------------------------------------------------------------
--use warnings;
--use strict;
--
--use Barcode::ZBar;
--use Image::Magick;
--
--warn("no input files specified?\n") if(!@ARGV);
--
--# running output document
--my $out = undef;
--
--# barcode scanner
--my $scanner = Barcode::ZBar::ImageScanner->new();
--
--foreach my $file (@ARGV) {
--    print "scanning from \"$file\"\n";
--    my $imseq = Image::Magick->new();
--    my $err = $imseq->Read($file);
--    warn($err) if($err);
--
--    foreach my $page (@$imseq) {
--        # convert ImageMagick page to ZBar image
--        my $zimg = Barcode::ZBar::Image->new();
--        $zimg->set_format('Y800');
--        $zimg->set_size($page->Get(qw(columns rows)));
--        $zimg->set_data($page->Clone()->ImageToBlob(magick => 'GRAY', depth => 8));
--
--        # scan for barcodes
--        if($scanner->scan_image($zimg)) {
--            # write out previous document
--            $out->write() if($out);
--
--            # use first symbol found to name next image (FIXME sanitize)
--            my $data = ($zimg->get_symbols())[0]->get_data();
--            my $idx = $page->Get('scene') + 1;
--            print "splitting $data from page $idx\n";
--
--            # create new output document
--            $out = Image::Magick->new(filename => $data);
--        }
--
--        # append this page to current output
--        push(@$out, $page) if($out);
--    }
--
--    # write out final document
--    $out->write() if($out);
--}
-diff --git a/examples/processor.c b/examples/processor.c
-new file mode 100644
---- /dev/null
-+++ b/examples/processor.c
-@@ -0,0 +1,47 @@
-+#include <stdio.h>
-+#include <zbar.h>
++See build-ndk.xml for additional target options.
 +
-+static void my_handler (zbar_image_t *image,
-+                        const void *userdata)
-+{
-+    /* extract results */
-+    const zbar_symbol_t *symbol = zbar_image_first_symbol(image);
-+    for(; symbol; symbol = zbar_symbol_next(symbol)) {
-+        /* do something useful with results */
-+        zbar_symbol_type_t typ = zbar_symbol_get_type(symbol);
-+        const char *data = zbar_symbol_get_data(symbol);
-+        printf("decoded %s symbol \"%s\"\n",
-+               zbar_get_symbol_name(typ), data);
-+    }
-+}
 +
-+int main (int argc, char **argv)
-+{
-+    const char *device = "/dev/video0";
+diff -r 563557a923d0 android/ant.properties
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/android/ant.properties	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,17 @@
++# This file is used to override default values used by the Ant build system.
++#
++# This file must be checked in Version Control Systems, as it is
++# integral to the build system of your project.
++
++# This file is only used by the Ant script.
++
++# You can use this to override default values such as
++#  'source.dir' for the location of your java source folder and
++#  'out.dir' for the location of your output folder.
++
++# You can also use it define how the release builds are signed by declaring
++# the following properties:
++#  'key.store' for the location of your keystore and
++#  'key.alias' for the name of the key to use.
++# The password will be asked during the build when you use the 'release' target.
++
+diff -r 563557a923d0 android/build-ndk.xml
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/android/build-ndk.xml	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,66 @@
++<!-- 
++Ant build file to compile the ZBar JNI files using Android NDK tool
++targets:
++  zbar-clean     - removes build generated files, build dir, jar and zip files
++  zbar-ndk-build - builds the zbarjni and iconv shared libraries
++  zbar-compile   - builds the zbar java files
++  zbar-jar       - builds and jars the zbar java files
++  zbar-zip       - Creates ZBarAndroidSDK-x.y.zip of jar, .so, etc
++  zbar-all       - performs all the above :)
++-->
++<project name="zbar">
++  <property name="project.name" value="zbar" />
++  <property name="project.sdk.name" value="ZBarAndroidSDK" />
++
++  <target name="zbar-clean">
++      <delete dir="../java/build"/>
++      <delete file="libs/${project.name}.jar"/>
++      <delete file="${ant.project.name}.zip"/>
++      <exec executable="${ndk.dir}/ndk-build" failonerror="true">
++          <arg value="clean"/>
++      </exec>
++  </target>
++
++  <target name="zbar-ndk-build">
++      <exec executable="${ndk.dir}/ndk-build" failonerror="true">
++          <arg value="ICONV_SRC=${iconv.src}" />
++      </exec>
++  </target>
++
++  <target name="zbar-compile" depends="zbar-ndk-build">
++      <mkdir dir="../java/build" />
++      <javac srcdir="../java/net" destdir="../java/build" />
++  </target>
++
++  <target name="zbar-jar" depends="zbar-compile">
++      <jar destfile="libs/${project.name}.jar" basedir="../java/build">
++      </jar>
++  </target>
++
++  <target name="zbar-zip">
++      <if><condition><not><isset property="version"/></not></condition><then>
++         <property name="version" value="0.2" />
++      </then></if>
++      <zip destfile="${project.sdk.name}-${version}.zip" >
++          <zipfileset dir="../" prefix="${project.sdk.name}-${version}" includes="COPYING, LICENSE"/>
++          <zipfileset dir="." prefix="${project.sdk.name}-${version}" includes="README"/>
++          <zipfileset dir="libs" prefix="${project.sdk.name}-${version}/libs"/>
++          <zipfileset dir="examples" prefix="${project.sdk.name}-${version}/examples"/>
++          <zipfileset dir="libs" prefix="${project.sdk.name}-${version}/examples/CameraTest/libs"/>
++      </zip>
++  </target>
++
++  <target name="zbar-all" depends="zbar-jar">
++      <if><condition><not><isset property="version"/></not></condition><then>
++         <property name="version" value="0.2" />
++      </then></if>
++      <zip destfile="${project.sdk.name}-${version}.zip" >
++          <zipfileset dir="../" prefix="${project.sdk.name}-${version}" includes="COPYING, LICENSE"/>
++          <zipfileset dir="." prefix="${project.sdk.name}-${version}" includes="README"/>
++          <zipfileset dir="libs" prefix="${project.sdk.name}-${version}/libs"/>
++          <zipfileset dir="examples" prefix="${project.sdk.name}-${version}/examples"/>
++          <zipfileset dir="libs" prefix="${project.sdk.name}-${version}/examples/CameraTest/libs"/>
++      </zip>
++  </target>
++</project>
++
+diff -r 563557a923d0 android/build.xml
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/android/build.xml	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,86 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<project name="ZBarAndroidSDK" default="help">
 +
-+    /* create a Processor */
-+    zbar_processor_t *proc = zbar_processor_create(1);
++    <!-- The local.properties file is created and updated by the 'android' tool.
++         It contains the path to the SDK. It should *NOT* be checked into
++         Version Control Systems. -->
++    <property file="local.properties" />
 +
-+    /* configure the Processor */
-+    zbar_processor_set_config(proc, 0, ZBAR_CFG_ENABLE, 1);
++    <!-- The ant.properties file can be created by you. It is only edited by the
++         'android' tool to add properties to it.
++         This is the place to change some Ant specific build properties.
++         Here are some properties you may want to change/update:
 +
-+    /* initialize the Processor */
-+    if(argc > 1)
-+        device = argv[1];
-+    zbar_processor_init(proc, device, 1);
++         source.dir
++             The name of the source directory. Default is 'src'.
++         out.dir
++             The name of the output directory. Default is 'bin'.
 +
-+    /* setup a callback */
-+    zbar_processor_set_data_handler(proc, my_handler, NULL);
++         For other overridable properties, look at the beginning of the rules
++         files in the SDK, at tools/ant/build.xml
 +
-+    /* enable the preview window */
-+    zbar_processor_set_visible(proc, 1);
-+    zbar_processor_set_active(proc, 1);
++         Properties related to the SDK location or the project target should
++         be updated using the 'android' tool with the 'update' action.
 +
-+    /* keep scanning until user provides key/mouse input */
-+    zbar_processor_user_wait(proc, -1);
++         This file is an integral part of the build system for your
++         application and should be checked into Version Control Systems.
 +
-+    /* clean up */
-+    zbar_processor_destroy(proc);
++         -->
++    <property file="ant.properties" />
 +
-+    return(0);
++    <!-- The project.properties file is created and updated by the 'android'
++         tool, as well as ADT.
++
++         This contains project specific properties such as project target, and library
++         dependencies. Lower level build properties are stored in ant.properties
++         (or in .classpath for Eclipse projects).
++
++         This file is an integral part of the build system for your
++         application and should be checked into Version Control Systems. -->
++    <loadproperties srcFile="project.properties" />
++
++    <!-- quick check on sdk.dir -->
++    <fail
++            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through an env var"
++            unless="sdk.dir"
++    />
++
++
++<!-- extension targets. Uncomment the ones where you want to do custom work
++     in between standard targets -->
++<!--
++    <target name="-pre-build">
++    </target>
++    <target name="-pre-compile">
++    </target>
++
++    /* This is typically used for code obfuscation.
++       Compiled code location: ${out.classes.absolute.dir}
++       If this is not done in place, override ${out.dex.input.absolute.dir} */
++    <target name="-post-compile">
++      <copy file="${out.absolute.dir}/classes.jar" tofile="${jar.libs.dir}/zbar_android.jar" />
++    </target>
++-->
++
++    <!-- Import the actual build file.
++
++         To customize existing targets, there are two options:
++         - Customize only one target:
++             - copy/paste the target into this file, *before* the
++               <import> task.
++             - customize it to your needs.
++         - Customize the whole content of build.xml
++             - copy/paste the content of the rules files (minus the top node)
++               into this file, replacing the <import> task.
++             - customize to your needs.
++
++         ***********************
++         ****** IMPORTANT ******
++         ***********************
++         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
++         in order to avoid having your file be overridden by tools such as "android update project"
++    -->
++    <!-- version-tag: 1 -->
++    <import file="build-ndk.xml" />
++    <import file="${sdk.dir}/tools/ant/build.xml" />
++</project>
+diff -r 563557a923d0 android/examples/CameraTest/AndroidManifest.xml
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/android/examples/CameraTest/AndroidManifest.xml	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,19 @@
++<?xml version="1.0" encoding="utf-8"?>
++<manifest xmlns:android="http://schemas.android.com/apk/res/android"
++      package="net.sourceforge.zbar.android.CameraTest"
++      android:versionCode="1"
++      android:versionName="1.0">
++    <uses-sdk android:minSdkVersion="8" />
++    <uses-permission android:name="android.permission.CAMERA" />
++    <uses-feature android:name="android.hardware.camera" />
++    <uses-feature android:name="android.hardware.camera.autofocus" />
++    <application android:label="@string/app_name" >
++        <activity android:name="CameraTestActivity"
++                  android:label="@string/app_name">
++            <intent-filter>
++                <action android:name="android.intent.action.MAIN" />
++                <category android:name="android.intent.category.LAUNCHER" />
++            </intent-filter>
++        </activity>
++    </application>
++</manifest> 
+diff -r 563557a923d0 android/examples/CameraTest/ant.properties
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/android/examples/CameraTest/ant.properties	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,17 @@
++# This file is used to override default values used by the Ant build system.
++#
++# This file must be checked in Version Control Systems, as it is
++# integral to the build system of your project.
++
++# This file is only used by the Ant script.
++
++# You can use this to override default values such as
++#  'source.dir' for the location of your java source folder and
++#  'out.dir' for the location of your output folder.
++
++# You can also use it define how the release builds are signed by declaring
++# the following properties:
++#  'key.store' for the location of your keystore and
++#  'key.alias' for the name of the key to use.
++# The password will be asked during the build when you use the 'release' target.
++
+diff -r 563557a923d0 android/examples/CameraTest/build.xml
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/android/examples/CameraTest/build.xml	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,85 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<project name="CameraTest" default="help">
++
++    <!-- The local.properties file is created and updated by the 'android' tool.
++         It contains the path to the SDK. It should *NOT* be checked into
++         Version Control Systems. -->
++    <property file="local.properties" />
++
++    <!-- The ant.properties file can be created by you. It is only edited by the
++         'android' tool to add properties to it.
++         This is the place to change some Ant specific build properties.
++         Here are some properties you may want to change/update:
++
++         source.dir
++             The name of the source directory. Default is 'src'.
++         out.dir
++             The name of the output directory. Default is 'bin'.
++
++         For other overridable properties, look at the beginning of the rules
++         files in the SDK, at tools/ant/build.xml
++
++         Properties related to the SDK location or the project target should
++         be updated using the 'android' tool with the 'update' action.
++
++         This file is an integral part of the build system for your
++         application and should be checked into Version Control Systems.
++
++         -->
++    <property file="ant.properties" />
++
++    <!-- The project.properties file is created and updated by the 'android'
++         tool, as well as ADT.
++
++         This contains project specific properties such as project target, and library
++         dependencies. Lower level build properties are stored in ant.properties
++         (or in .classpath for Eclipse projects).
++
++         This file is an integral part of the build system for your
++         application and should be checked into Version Control Systems. -->
++    <loadproperties srcFile="project.properties" />
++
++    <!-- quick check on sdk.dir -->
++    <fail
++            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through an env var"
++            unless="sdk.dir"
++    />
++
++
++<!-- extension targets. Uncomment the ones where you want to do custom work
++     in between standard targets -->
++<!--
++    <target name="-pre-build">
++    </target>
++    <target name="-pre-compile">
++    </target>
++
++    /* This is typically used for code obfuscation.
++       Compiled code location: ${out.classes.absolute.dir}
++       If this is not done in place, override ${out.dex.input.absolute.dir} */
++    <target name="-post-compile">
++    </target>
++-->
++
++    <!-- Import the actual build file.
++
++         To customize existing targets, there are two options:
++         - Customize only one target:
++             - copy/paste the target into this file, *before* the
++               <import> task.
++             - customize it to your needs.
++         - Customize the whole content of build.xml
++             - copy/paste the content of the rules files (minus the top node)
++               into this file, replacing the <import> task.
++             - customize to your needs.
++
++         ***********************
++         ****** IMPORTANT ******
++         ***********************
++         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
++         in order to avoid having your file be overridden by tools such as "android update project"
++    -->
++    <!-- version-tag: 1 -->
++    <import file="${sdk.dir}/tools/ant/build.xml" />
++
++</project>
+diff -r 563557a923d0 android/examples/CameraTest/proguard.cfg
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/android/examples/CameraTest/proguard.cfg	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,40 @@
++-optimizationpasses 5
++-dontusemixedcaseclassnames
++-dontskipnonpubliclibraryclasses
++-dontpreverify
++-verbose
++-optimizations !code/simplification/arithmetic,!field/*,!class/merging/*
++
++-keep public class * extends android.app.Activity
++-keep public class * extends android.app.Application
++-keep public class * extends android.app.Service
++-keep public class * extends android.content.BroadcastReceiver
++-keep public class * extends android.content.ContentProvider
++-keep public class * extends android.app.backup.BackupAgentHelper
++-keep public class * extends android.preference.Preference
++-keep public class com.android.vending.licensing.ILicensingService
++
++-keepclasseswithmembernames class * {
++    native <methods>;
 +}
-diff --git a/examples/processor.cpp b/examples/processor.cpp
-new file mode 100644
---- /dev/null
-+++ b/examples/processor.cpp
-@@ -0,0 +1,45 @@
-+#include <iostream>
-+#include <zbar.h>
 +
-+using namespace std;
-+using namespace zbar;
++-keepclasseswithmembers class * {
++    public <init>(android.content.Context, android.util.AttributeSet);
++}
 +
-+class MyHandler : public Image::Handler
-+{
-+    void image_callback (Image &image)
-+    {
-+        for(SymbolIterator symbol = image.symbol_begin();
-+            symbol != image.symbol_end();
-+            ++symbol)
-+            cout << "decoded " << symbol->get_type_name() << " symbol "
-+                 << "\"" << symbol->get_data() << "\"" << endl;
-+    }
-+};
++-keepclasseswithmembers class * {
++    public <init>(android.content.Context, android.util.AttributeSet, int);
++}
 +
-+int main (int argc, char **argv)
-+{
-+    // create and initialize a Processor
-+    const char *device = "/dev/video0";
-+    if(argc > 1)
-+        device = argv[1];
-+    Processor proc(true, device);
++-keepclassmembers class * extends android.app.Activity {
++   public void *(android.view.View);
++}
 +
-+    // configure the Processor
-+    proc.set_config(ZBAR_NONE, ZBAR_CFG_ENABLE, 1);
++-keepclassmembers enum * {
++    public static **[] values();
++    public static ** valueOf(java.lang.String);
++}
 +
-+    // setup a callback
-+    MyHandler my_handler;
-+    proc.set_handler(my_handler);
++-keep class * implements android.os.Parcelable {
++  public static final android.os.Parcelable$Creator *;
++}
+diff -r 563557a923d0 android/examples/CameraTest/project.properties
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/android/examples/CameraTest/project.properties	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,11 @@
++# This file is automatically generated by Android Tools.
++# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
++#
++# This file must be checked in Version Control Systems.
++#
++# To customize properties used by the Ant build system use,
++# "ant.properties", and override values to adapt the script to your
++# project structure.
++
++# Project target.
++target=android-15
+diff -r 563557a923d0 android/examples/CameraTest/res/layout/main.xml
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/android/examples/CameraTest/res/layout/main.xml	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,28 @@
++<?xml version="1.0" encoding="utf-8"?>
++<LinearLayout
++  xmlns:android="http://schemas.android.com/apk/res/android"
++  android:orientation="vertical"
++  android:layout_width="match_parent"
++  android:layout_height="match_parent">
++
++  <FrameLayout
++    android:id="@+id/cameraPreview"
++    android:layout_width="match_parent"
++    android:layout_height="match_parent"
++    android:layout_weight="1"
++  />
++
++  <TextView
++    android:id="@+id/scanText"
++    android:text="Scanning..."
++    android:layout_height="wrap_content" 
++    android:layout_width="match_parent">
++  </TextView>
++  <Button
++    android:id="@+id/ScanButton"
++    android:text="Scan"
++    android:layout_width="wrap_content"
++    android:layout_height="wrap_content"
++    android:layout_gravity="center"
++  />
++</LinearLayout>
+diff -r 563557a923d0 android/examples/CameraTest/res/values/strings.xml
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/android/examples/CameraTest/res/values/strings.xml	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,4 @@
++<?xml version="1.0" encoding="utf-8"?>
++<resources>
++    <string name="app_name">ZBar CameraTest</string>
++</resources>
+diff -r 563557a923d0 android/examples/CameraTest/src/net/sourceforge/zbar/android/CameraTest/CameraPreview.java
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/android/examples/CameraTest/src/net/sourceforge/zbar/android/CameraTest/CameraPreview.java	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,108 @@
++/*
++ * Barebones implementation of displaying camera preview.
++ * 
++ * Created by lisah0 on 2012-02-24
++ */
++package net.sourceforge.zbar.android.CameraTest;
++
++import java.io.IOException;
++
++import android.app.Activity;
++import android.os.Bundle;
++
++import android.util.Log;
++
++import android.view.View;
++import android.view.Surface;
++import android.view.SurfaceView;
++import android.view.SurfaceHolder;
++
++import android.content.Context;
++
++import android.hardware.Camera;
++import android.hardware.Camera.PreviewCallback;
++import android.hardware.Camera.AutoFocusCallback;
++import android.hardware.Camera.Parameters;
++
++/** A basic Camera preview class */
++public class CameraPreview extends SurfaceView implements SurfaceHolder.Callback {
++    private SurfaceHolder mHolder;
++    private Camera mCamera;
++    private PreviewCallback previewCallback;
++    private AutoFocusCallback autoFocusCallback;
++
++    public CameraPreview(Context context, Camera camera,
++                         PreviewCallback previewCb,
++                         AutoFocusCallback autoFocusCb) {
++        super(context);
++        mCamera = camera;
++        previewCallback = previewCb;
++        autoFocusCallback = autoFocusCb;
++
++        /* 
++         * Set camera to continuous focus if supported, otherwise use
++         * software auto-focus. Only works for API level >=9.
++         */
++        /*
++        Camera.Parameters parameters = camera.getParameters();
++        for (String f : parameters.getSupportedFocusModes()) {
++            if (f == Parameters.FOCUS_MODE_CONTINUOUS_PICTURE) {
++                mCamera.setFocusMode(Parameters.FOCUS_MODE_CONTINUOUS_PICTURE);
++                autoFocusCallback = null;
++                break;
++            }
++        }
++        */
 +
-+    // enable the preview window
-+    proc.set_visible();
-+    proc.set_active();
++        // Install a SurfaceHolder.Callback so we get notified when the
++        // underlying surface is created and destroyed.
++        mHolder = getHolder();
++        mHolder.addCallback(this);
 +
-+    try {
-+        // keep scanning until user provides key/mouse input
-+        proc.user_wait();
++        // deprecated setting, but required on Android versions prior to 3.0
++        mHolder.setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS);
 +    }
-+    catch(ClosedError &e) {
++
++    public void surfaceCreated(SurfaceHolder holder) {
++        // The Surface has been created, now tell the camera where to draw the preview.
++        try {
++            mCamera.setPreviewDisplay(holder);
++        } catch (IOException e) {
++            Log.d("DBG", "Error setting camera preview: " + e.getMessage());
++        }
 +    }
-+    return(0);
-+}
-diff --git a/examples/processor.pl b/examples/processor.pl
-deleted file mode 100755
---- a/examples/processor.pl
-+++ /dev/null
-@@ -1,35 +0,0 @@
--#!/usr/bin/env perl
--use warnings;
--use strict;
--require Barcode::ZBar;
--
--# create a Processor
--my $proc = Barcode::ZBar::Processor->new();
--
--# configure the Processor
--$proc->parse_config("enable");
--
--# initialize the Processor
--$proc->init($ARGV[0] || '/dev/video0');
--
--# setup a callback
--sub my_handler {
--    my ($proc, $image, $closure) = @_;
--
--    # extract results
--    foreach my $symbol ($proc->get_results()) {
--        # do something useful with results
--        print('decoded ' . $symbol->get_type() .
--              ' symbol "' . $symbol->get_data() . "\"\n");
--    }
--}
--$proc->set_data_handler(\&my_handler);
--
--# enable the preview window
--$proc->set_visible();
--
--# initiate scanning
--$proc->set_active();
--
--# keep scanning until user provides key/mouse input
--$proc->user_wait();
-diff --git a/examples/read_one.pl b/examples/read_one.pl
-deleted file mode 100755
---- a/examples/read_one.pl
-+++ /dev/null
-@@ -1,29 +0,0 @@
--#!/usr/bin/env perl
--use warnings;
--use strict;
--require Barcode::ZBar;
--
--# create a Processor
--my $proc = Barcode::ZBar::Processor->new();
--
--# configure the Processor
--$proc->parse_config("enable");
--
--# initialize the Processor
--$proc->init($ARGV[0] || '/dev/video0');
--
--# enable the preview window
--$proc->set_visible();
--
--# read at least one barcode (or until window closed)
--$proc->process_one();
--
--# hide the preview window
--$proc->set_visible(0);
--
--# extract results
--foreach my $symbol ($proc->get_results()) {
--  # do something useful with results
--  print('decoded ' . $symbol->get_type() .
--        ' symbol "' . $symbol->get_data() . "\"\n");
--}
-diff --git a/examples/scan_image.c b/examples/scan_image.c
---- a/examples/scan_image.c
-+++ b/examples/scan_image.c
-@@ -65,7 +65,7 @@ int main (int argc, char **argv)
- 
-     /* wrap image data */
-     zbar_image_t *image = zbar_image_create();
--    zbar_image_set_format(image, *(int*)"Y800");
-+    zbar_image_set_format(image, zbar_fourcc('Y','8','0','0'));
-     zbar_image_set_size(image, width, height);
-     zbar_image_set_data(image, raw, width * height, zbar_image_free_data);
- 
-diff --git a/examples/scan_image.pl b/examples/scan_image.pl
-deleted file mode 100755
---- a/examples/scan_image.pl
-+++ /dev/null
-@@ -1,37 +0,0 @@
--#!/usr/bin/perl
--use warnings;
--use strict;
--require Image::Magick;
--require Barcode::ZBar;
--
--$ARGV[0] || die;
--
--# create a reader
--my $scanner = Barcode::ZBar::ImageScanner->new();
--
--# configure the reader
--$scanner->parse_config("enable");
--
--# obtain image data
--my $magick = Image::Magick->new();
--$magick->Read($ARGV[0]) && die;
--my $raw = $magick->ImageToBlob(magick => 'GRAY', depth => 8);
--
--# wrap image data
--my $image = Barcode::ZBar::Image->new();
--$image->set_format('Y800');
--$image->set_size($magick->Get(qw(columns rows)));
--$image->set_data($raw);
--
--# scan the image for barcodes
--my $n = $scanner->scan_image($image);
--
--# extract results
--foreach my $symbol ($image->get_symbols()) {
--    # do something useful with results
--    print('decoded ' . $symbol->get_type() .
--          ' symbol "' . $symbol->get_data() . "\"\n");
--}
--
--# clean up
--undef($image);
-diff --git a/examples/upcrpc.pl b/examples/upcrpc.pl
---- a/examples/upcrpc.pl
-+++ b/examples/upcrpc.pl
-@@ -3,7 +3,7 @@ use warnings;
- use strict;
- use Frontier::Client;
- use Data::Dumper;
--my $s = Frontier::Client->new('url' => 'http://dev.upcdatabase.com/rpc');
-+my $s = Frontier::Client->new('url' => 'http://www.upcdatabase.com/rpc');
- 
- $| = 1; # autoflush
- 
-diff --git a/examples/upcrpc.py b/examples/upcrpc.py
---- a/examples/upcrpc.py
-+++ b/examples/upcrpc.py
-@@ -2,7 +2,7 @@
- from xmlrpclib import ServerProxy
- import sys, re
- 
--server = ServerProxy("http://dev.upcdatabase.com/rpc")
-+server = ServerProxy("http://www.upcdatabase.com/rpc")
- ean_re = re.compile(r'^(UPC-A:|EAN-13:)?(\d{11,13})$', re.M)
- 
- def lookup(decode):
-diff --git a/gtk/zbargtk.c b/gtk/zbargtk.c
---- a/gtk/zbargtk.c
-+++ b/gtk/zbargtk.c
-@@ -1,5 +1,5 @@
- /*------------------------------------------------------------------------
-- *  Copyright 2008-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+ *  Copyright 2008-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-  *
-  *  This file is part of the ZBar Bar Code Reader.
-  *
-@@ -35,11 +35,6 @@
- #define DEFAULT_WIDTH 640
- #define DEFAULT_HEIGHT 480
- 
--/* adapted from v4l2 spec */
--#define fourcc(a, b, c, d)                      \
--    ((long)(a) | ((long)(b) << 8) |             \
--     ((long)(c) << 16) | ((long)(d) << 24))
--
- enum {
-     DECODED,
-     DECODED_TEXT,
-@@ -88,15 +83,15 @@ gboolean zbar_gtk_image_from_pixbuf (zba
- 
-     /* these are all guesses... */
-     if(nchannels == 3 && bps == 8)
--        type = fourcc('R','G','B','3');
-+        type = zbar_fourcc('R','G','B','3');
-     else if(nchannels == 4 && bps == 8)
--        type = fourcc('B','G','R','4'); /* FIXME alpha flipped?! */
-+        type = zbar_fourcc('B','G','R','4'); /* FIXME alpha flipped?! */
-     else if(nchannels == 1 && bps == 8)
--        type = fourcc('Y','8','0','0');
-+        type = zbar_fourcc('Y','8','0','0');
-     else if(nchannels == 3 && bps == 5)
--        type = fourcc('R','G','B','R');
-+        type = zbar_fourcc('R','G','B','R');
-     else if(nchannels == 3 && bps == 4)
--        type = fourcc('R','4','4','4'); /* FIXME maybe? */
-+        type = zbar_fourcc('R','4','4','4'); /* FIXME maybe? */
-     else {
-         g_warning("unsupported combination: nchannels=%d bps=%d\n",
-                   nchannels, bps);
-@@ -142,10 +137,6 @@ static inline gboolean zbar_gtk_video_op
- 
-     gdk_threads_enter();
- 
--    zbar->req_width = DEFAULT_WIDTH;
--    zbar->req_height = DEFAULT_HEIGHT;
--    gtk_widget_queue_resize(GTK_WIDGET(self));
--
-     zbar->video_opened = FALSE;
-     if(zbar->thread)
-         g_object_notify(G_OBJECT(self), "video-opened");
-@@ -184,6 +175,10 @@ static inline gboolean zbar_gtk_video_op
-          */
-         gdk_threads_enter();
- 
-+        if(zbar->video_width && zbar->video_height)
-+            zbar_video_request_size(zbar->video,
-+                                    zbar->video_width, zbar->video_height);
 +
-         video_opened = !zbar_negotiate_format(zbar->video, zbar->window);
- 
-         if(video_opened) {
-@@ -209,7 +204,7 @@ static inline int zbar_gtk_process_image
-     if(!image)
-         return(-1);
- 
--    zbar_image_t *tmp = zbar_image_convert(image, fourcc('Y','8','0','0'));
-+    zbar_image_t *tmp = zbar_image_convert(image, zbar_fourcc('Y','8','0','0'));
-     if(!tmp)
-         return(-1);
- 
-@@ -560,6 +555,19 @@ gboolean zbar_gtk_get_video_opened (ZBar
-     return(zbar->video_opened);
- }
- 
-+void zbar_gtk_request_video_size (ZBarGtk *self,
-+                                  int width,
-+                                  int height)
-+{
-+    if(!self->_private || width < 0 || height < 0)
-+        return;
-+    ZBarGtkPrivate *zbar = ZBAR_GTK_PRIVATE(self->_private);
++    public void surfaceDestroyed(SurfaceHolder holder) {
++        // Camera preview released in activity
++    }
 +
-+    zbar->req_width = zbar->video_width = width;
-+    zbar->req_height = zbar->video_height = height;
-+    gtk_widget_queue_resize(GTK_WIDGET(self));
-+}
++    public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
++        /*
++         * If your preview can change or rotate, take care of those events here.
++         * Make sure to stop the preview before resizing or reformatting it.
++         */
++        if (mHolder.getSurface() == null){
++          // preview surface does not exist
++          return;
++        }
 +
- static void zbar_gtk_set_property (GObject *object,
-                                    guint prop_id,
-                                    const GValue *value,
-@@ -613,8 +621,8 @@ static void zbar_gtk_init (ZBarGtk *self
-     zbar->window = zbar_window_create();
-     g_assert(zbar->window);
- 
--    zbar->req_width = DEFAULT_WIDTH;
--    zbar->req_height = DEFAULT_HEIGHT;
-+    zbar->req_width = zbar->video_width = DEFAULT_WIDTH;
-+    zbar->req_height = zbar->video_width = DEFAULT_HEIGHT;
- 
-     /* spawn a thread to handle decoding and video */
-     zbar->queue = g_async_queue_new();
-diff --git a/gtk/zbargtkprivate.h b/gtk/zbargtkprivate.h
---- a/gtk/zbargtkprivate.h
-+++ b/gtk/zbargtkprivate.h
-@@ -71,6 +71,7 @@ typedef struct _ZBarGtkPrivate
-      * protected by main gui lock
-      */
-     unsigned req_width, req_height;
-+    unsigned video_width, video_height;
-     gboolean video_opened;
- 
-     /* window is shared: owned by main gui thread.
-diff --git a/include/zbar.h b/include/zbar.h
---- a/include/zbar.h
-+++ b/include/zbar.h
-@@ -1,5 +1,5 @@
- /*------------------------------------------------------------------------
-- *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-  *
-  *  This file is part of the ZBar Bar Code Reader.
-  *
-@@ -93,9 +93,12 @@ typedef enum zbar_symbol_type_e {
-     ZBAR_EAN13       =     13,  /**< EAN-13 */
-     ZBAR_ISBN13      =     14,  /**< ISBN-13 (from EAN-13). @since 0.4 */
-     ZBAR_I25         =     25,  /**< Interleaved 2 of 5. @since 0.4 */
-+    ZBAR_DATABAR     =     34,  /**< GS1 DataBar (RSS). @since 0.11 */
-+    ZBAR_DATABAR_EXP =     35,  /**< GS1 DataBar Expanded. @since 0.11 */
-     ZBAR_CODE39      =     39,  /**< Code 39. @since 0.4 */
-     ZBAR_PDF417      =     57,  /**< PDF417. @since 0.6 */
-     ZBAR_QRCODE      =     64,  /**< QR Code. @since 0.10 */
-+    ZBAR_CODE93      =     93,  /**< Code 93. @since 0.11 */
-     ZBAR_CODE128     =    128,  /**< Code 128 */
-     ZBAR_SYMBOL      = 0x00ff,  /**< mask for base symbol type */
-     ZBAR_ADDON2      = 0x0200,  /**< 2-digit add-on flag */
-@@ -103,6 +106,17 @@ typedef enum zbar_symbol_type_e {
-     ZBAR_ADDON       = 0x0700,  /**< add-on flag mask */
- } zbar_symbol_type_t;
- 
-+/** decoded symbol coarse orientation.
-+ * @since 0.11
++        // stop preview before making changes
++        try {
++            mCamera.stopPreview();
++        } catch (Exception e){
++          // ignore: tried to stop a non-existent preview
++        }
++
++        try {
++            // Hard code camera surface rotation 90 degs to match Activity view in portrait
++            mCamera.setDisplayOrientation(90);
++
++            mCamera.setPreviewDisplay(mHolder);
++            mCamera.setPreviewCallback(previewCallback);
++            mCamera.startPreview();
++            mCamera.autoFocus(autoFocusCallback);
++        } catch (Exception e){
++            Log.d("DBG", "Error starting camera preview: " + e.getMessage());
++        }
++    }
++}
+diff -r 563557a923d0 android/examples/CameraTest/src/net/sourceforge/zbar/android/CameraTest/CameraTestActivity.java
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/android/examples/CameraTest/src/net/sourceforge/zbar/android/CameraTest/CameraTestActivity.java	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,155 @@
++/*
++ * Basic no frills app which integrates the ZBar barcode scanner with
++ * the camera.
++ * 
++ * Created by lisah0 on 2012-02-24
 + */
-+typedef enum zbar_orientation_e {
-+    ZBAR_ORIENT_UNKNOWN = -1,   /**< unable to determine orientation */
-+    ZBAR_ORIENT_UP,             /**< upright, read left to right */
-+    ZBAR_ORIENT_RIGHT,          /**< sideways, read top to bottom */
-+    ZBAR_ORIENT_DOWN,           /**< upside-down, read right to left */
-+    ZBAR_ORIENT_LEFT,           /**< sideways, read bottom to top */
-+} zbar_orientation_t;
-+
- /** error codes. */
- typedef enum zbar_error_e {
-     ZBAR_OK = 0,                /**< no error */
-@@ -133,12 +147,33 @@ typedef enum zbar_config_e {
-     ZBAR_CFG_MIN_LEN = 0x20,    /**< minimum data length for valid decode */
-     ZBAR_CFG_MAX_LEN,           /**< maximum data length for valid decode */
- 
-+    ZBAR_CFG_UNCERTAINTY = 0x40,/**< required video consistency frames */
-+
-     ZBAR_CFG_POSITION = 0x80,   /**< enable scanner to collect position data */
- 
-     ZBAR_CFG_X_DENSITY = 0x100, /**< image scanner vertical scan density */
-     ZBAR_CFG_Y_DENSITY,         /**< image scanner horizontal scan density */
- } zbar_config_t;
- 
-+/** decoder symbology modifier flags.
-+ * @since 0.11
-+ */
-+typedef enum zbar_modifier_e {
-+    /** barcode tagged as GS1 (EAN.UCC) reserved
-+     * (eg, FNC1 before first data character).
-+     * data may be parsed as a sequence of GS1 AIs
-+     */
-+    ZBAR_MOD_GS1 = 0,
++package net.sourceforge.zbar.android.CameraTest;
 +
-+    /** barcode tagged as AIM reserved
-+     * (eg, FNC1 after first character or digit pair)
-+     */
-+    ZBAR_MOD_AIM,
++import net.sourceforge.zbar.android.CameraTest.CameraPreview;
 +
-+    /** number of modifiers */
-+    ZBAR_MOD_NUM,
-+} zbar_modifier_t;
++import android.app.Activity;
++import android.content.pm.ActivityInfo;
++import android.os.Bundle;
++import android.os.Handler;
++import android.util.Log;
 +
- /** retrieve runtime library version information.
-  * @param major set to the running major version (unless NULL)
-  * @param minor set to the running minor version (unless NULL)
-@@ -171,6 +206,28 @@ extern const char *zbar_get_symbol_name(
-  */
- extern const char *zbar_get_addon_name(zbar_symbol_type_t sym);
- 
-+/** retrieve string name for configuration setting.
-+ * @param config setting to name
-+ * @returns static string name for config,
-+ * or the empty string if value is not a known config
-+ */
-+extern const char *zbar_get_config_name(zbar_config_t config);
++import android.view.View;
++import android.view.View.OnClickListener;
++import android.view.Window;
++import android.widget.FrameLayout;
++import android.widget.Button;
 +
-+/** retrieve string name for modifier.
-+ * @param modifier flag to name
-+ * @returns static string name for modifier,
-+ * or the empty string if the value is not a known flag
-+ */
-+extern const char *zbar_get_modifier_name(zbar_modifier_t modifier);
++import android.hardware.Camera;
++import android.hardware.Camera.PreviewCallback;
++import android.hardware.Camera.AutoFocusCallback;
++import android.hardware.Camera.Parameters;
++import android.hardware.Camera.Size;
 +
-+/** retrieve string name for orientation.
-+ * @param orientation orientation encoding
-+ * @returns the static string name for the specified orientation,
-+ * or "UNKNOWN" if the orientation is not recognized
-+ * @since 0.11
-+ */
-+extern const char *zbar_get_orientation_name(zbar_orientation_t orientation);
++import android.widget.TextView;
++import android.graphics.ImageFormat;
 +
- /** parse a configuration string of the form "[symbology.]config[=value]".
-  * the config must match one of the recognized names.
-  * the symbology, if present, must match one of the recognized names.
-@@ -184,6 +241,30 @@ extern int zbar_parse_config(const char 
-                              zbar_config_t *config,
-                              int *value);
- 
-+/** consistently compute fourcc values across architectures
-+ * (adapted from v4l2 specification)
-+ * @since 0.11
-+ */
-+#define zbar_fourcc(a, b, c, d)                 \
-+        ((unsigned long)(a) |                   \
-+         ((unsigned long)(b) << 8) |            \
-+         ((unsigned long)(c) << 16) |           \
-+         ((unsigned long)(d) << 24))
++/* Import ZBar Class files */
++import net.sourceforge.zbar.ImageScanner;
++import net.sourceforge.zbar.Image;
++import net.sourceforge.zbar.Symbol;
++import net.sourceforge.zbar.SymbolSet;
++import net.sourceforge.zbar.Config;
 +
-+/** parse a fourcc string into its encoded integer value.
-+ * @since 0.11
-+ */
-+static inline unsigned long zbar_fourcc_parse (const char *format)
++public class CameraTestActivity extends Activity
 +{
-+    unsigned long fourcc = 0;
-+    if(format) {
-+        int i;
-+        for(i = 0; i < 4 && format[i]; i++)
-+            fourcc |= ((unsigned long)format[i]) << (i * 8);
-+    }
-+    return(fourcc);
-+}
++    private Camera mCamera;
++    private CameraPreview mPreview;
++    private Handler autoFocusHandler;
 +
- /** @internal type unsafe error API (don't use) */
- extern int _zbar_error_spew(const void *object,
-                             int verbosity);
-@@ -229,6 +310,20 @@ extern void zbar_symbol_ref(const zbar_s
-  */
- extern zbar_symbol_type_t zbar_symbol_get_type(const zbar_symbol_t *symbol);
- 
-+/** retrieve symbology boolean config settings.
-+ * @returns a bitmask indicating which configs were set for the detected
-+ * symbology during decoding.
-+ * @since 0.11
-+ */
-+extern unsigned int zbar_symbol_get_configs(const zbar_symbol_t *symbol);
++    TextView scanText;
++    Button scanButton;
 +
-+/** retrieve symbology modifier flag settings.
-+ * @returns a bitmask indicating which characteristics were detected
-+ * during decoding.
-+ * @since 0.11
-+ */
-+extern unsigned int zbar_symbol_get_modifiers(const zbar_symbol_t *symbol);
++    ImageScanner scanner;
 +
- /** retrieve data decoded from symbol.
-  * @returns the data string
-  */
-@@ -284,6 +379,14 @@ extern int zbar_symbol_get_loc_x(const z
- extern int zbar_symbol_get_loc_y(const zbar_symbol_t *symbol,
-                                  unsigned index);
- 
-+/** retrieve general orientation of decoded symbol.
-+ * @returns a coarse, axis-aligned indication of symbol orientation or
-+ * ZBAR_ORIENT_UNKNOWN if unknown
-+ * @since 0.11
-+ */
-+extern zbar_orientation_t
-+zbar_symbol_get_orientation(const zbar_symbol_t *symbol);
++    private boolean barcodeScanned = false;
++    private boolean previewing = true;
 +
- /** iterate the set to which this symbol belongs (there can be only one).
-  * @returns the next symbol in the set, or
-  * @returns NULL when no more results are available
-@@ -357,6 +460,14 @@ extern int zbar_symbol_set_get_size(cons
- extern const zbar_symbol_t*
- zbar_symbol_set_first_symbol(const zbar_symbol_set_t *symbols);
- 
-+/** raw result iterator.
-+ * @returns the first decoded symbol result in a set, *before* filtering
-+ * @returns NULL if the set is empty
-+ * @since 0.11
-+ */
-+extern const zbar_symbol_t*
-+zbar_symbol_set_first_unfiltered(const zbar_symbol_set_t *symbols);
++    static {
++        System.loadLibrary("iconv");
++    } 
 +
- /*@}*/
- 
- /*------------------------------------------------------------*/
-@@ -456,6 +567,25 @@ extern unsigned zbar_image_get_width(con
-  */
- extern unsigned zbar_image_get_height(const zbar_image_t *image);
- 
-+/** retrieve both dimensions of the image.
-+ * fills in the width and height in samples
-+ */
-+extern void zbar_image_get_size(const zbar_image_t *image,
-+                                unsigned *width,
-+                                unsigned *height);
++    public void onCreate(Bundle savedInstanceState) {
++        super.onCreate(savedInstanceState);
 +
-+/** retrieve the crop rectangle.
-+ * fills in the image coordinates of the upper left corner and size
-+ * of an axis-aligned rectangular area of the image that will be scanned.
-+ * defaults to the full image
-+ * @since 0.11
-+ */
-+extern void zbar_image_get_crop(const zbar_image_t *image,
-+                                unsigned *x,
-+                                unsigned *y,
-+                                unsigned *width,
-+                                unsigned *height);
++        setContentView(R.layout.main);
 +
- /** return the image sample data.  the returned data buffer is only
-  * valid until zbar_image_destroy() is called
-  */
-@@ -505,12 +635,24 @@ extern void zbar_image_set_sequence(zbar
-                                     unsigned sequence_num);
- 
- /** specify the pixel size of the image.
-+ * @note this also resets the crop rectangle to the full image
-+ * (0, 0, width, height)
-  * @note this does not affect the data!
-  */
- extern void zbar_image_set_size(zbar_image_t *image,
-                                 unsigned width,
-                                 unsigned height);
- 
-+/** specify a rectangular region of the image to scan.
-+ * the rectangle will be clipped to the image boundaries.
-+ * defaults to the full image specified by zbar_image_set_size()
-+ */
-+extern void zbar_image_set_crop(zbar_image_t *image,
-+                                unsigned x,
-+                                unsigned y,
-+                                unsigned width,
-+                                unsigned height);
++        setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
 +
- /** specify image sample data.  when image data is no longer needed by
-  * the library the specific data cleanup handler will be called
-  * (unless NULL)
-@@ -1148,6 +1290,14 @@ static inline int zbar_decoder_parse_con
-            zbar_decoder_set_config(decoder, sym, cfg, val));
- }
- 
-+/** retrieve symbology boolean config settings.
-+ * @returns a bitmask indicating which configs are currently set for the
-+ * specified symbology.
-+ * @since 0.11
-+ */
-+extern unsigned int zbar_decoder_get_configs(const zbar_decoder_t *decoder,
-+                                             zbar_symbol_type_t symbology);
++        autoFocusHandler = new Handler();
++        mCamera = getCameraInstance();
 +
- /** clear all decoder state.
-  * any partial symbols are flushed
-  */
-@@ -1195,6 +1345,20 @@ zbar_decoder_get_data_length(const zbar_
- extern zbar_symbol_type_t
- zbar_decoder_get_type(const zbar_decoder_t *decoder);
- 
-+/** retrieve modifier flags for the last decoded symbol.
-+ * @returns a bitmask indicating which characteristics were detected
-+ * during decoding.
-+ * @since 0.11
-+ */
-+extern unsigned int zbar_decoder_get_modifiers(const zbar_decoder_t *decoder);
++        /* Instance barcode scanner */
++        scanner = new ImageScanner();
++        scanner.setConfig(0, Config.X_DENSITY, 3);
++        scanner.setConfig(0, Config.Y_DENSITY, 3);
++
++        mPreview = new CameraPreview(this, mCamera, previewCb, autoFocusCB);
++        FrameLayout preview = (FrameLayout)findViewById(R.id.cameraPreview);
++        preview.addView(mPreview);
++
++        scanText = (TextView)findViewById(R.id.scanText);
++
++        scanButton = (Button)findViewById(R.id.ScanButton);
++
++        scanButton.setOnClickListener(new OnClickListener() {
++                public void onClick(View v) {
++                    if (barcodeScanned) {
++                        barcodeScanned = false;
++                        scanText.setText("Scanning...");
++                        mCamera.setPreviewCallback(previewCb);
++                        mCamera.startPreview();
++                        previewing = true;
++                        mCamera.autoFocus(autoFocusCB);
++                    }
++                }
++            });
++    }
 +
-+/** retrieve last decode direction.
-+ * @returns 1 for forward and -1 for reverse
-+ * @returns 0 if the decode direction is unknown or does not apply
-+ * @since 0.11
-+ */
-+extern int zbar_decoder_get_direction(const zbar_decoder_t *decoder);
++    public void onPause() {
++        super.onPause();
++        releaseCamera();
++    }
 +
- /** setup data handler callback.
-  * the registered function will be called by the decoder
-  * just before zbar_decode_width() returns a non-zero value.
-diff --git a/include/zbar/Decoder.h b/include/zbar/Decoder.h
---- a/include/zbar/Decoder.h
-+++ b/include/zbar/Decoder.h
-@@ -1,5 +1,5 @@
- //------------------------------------------------------------------------
--//  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+//  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
- //
- //  This file is part of the ZBar Bar Code Reader.
- //
-@@ -149,6 +149,14 @@ class Decoder {
-         return(zbar_decoder_get_data_length(_decoder));
-     }
- 
-+    /// retrieve last decode direction.
-+    /// see zbar_decoder_get_direction()
-+    /// @since 0.11
-+    int get_direction() const
-+    {
-+        return(zbar_decoder_get_direction(_decoder));
++    /** A safe way to get an instance of the Camera object. */
++    public static Camera getCameraInstance(){
++        Camera c = null;
++        try {
++            c = Camera.open();
++        } catch (Exception e){
++        }
++        return c;
 +    }
 +
-     /// setup callback to handle result data.
-     void set_handler (Handler &handler)
-     {
-diff --git a/include/zbar/Image.h b/include/zbar/Image.h
---- a/include/zbar/Image.h
-+++ b/include/zbar/Image.h
-@@ -1,5 +1,5 @@
- //------------------------------------------------------------------------
--//  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+//  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
- //
- //  This file is part of the ZBar Bar Code Reader.
- //
-@@ -67,7 +67,12 @@ public:
-         {
-             if(userdata) {
-                 Image *image = (Image*)zbar_image_get_userdata(zimg);
--                ((Handler*)userdata)->image_callback(*image);
-+                if(image)
-+                    ((Handler*)userdata)->image_callback(*image);
-+                else {
-+                    Image tmp(zimg, 1);
-+                    ((Handler*)userdata)->image_callback(tmp);
-+                }
-             }
-         }
-     };
-@@ -110,6 +115,8 @@ public:
- 
-     ~Image ()
-     {
-+        set_data(NULL, 0);
-+        zbar_image_set_userdata(_img, NULL);
-         zbar_image_ref(_img, -1);
-     }
- 
-@@ -143,12 +150,7 @@ public:
-     /// see zbar_image_set_format()
-     void set_format (const std::string& format)
-     {
--        if(format.length() != 4)
--            throw FormatError();
--        unsigned long fourcc = ((format[0] & 0xff) |
--                                ((format[1] & 0xff) << 8) |
--                                ((format[2] & 0xff) << 16) |
--                                ((format[3] & 0xff) << 24));
-+        unsigned long fourcc = zbar_fourcc_parse(format.c_str());
-         zbar_image_set_format(_img, fourcc);
-     }
- 
-@@ -183,6 +185,15 @@ public:
-         return(zbar_image_get_height(_img));
-     }
- 
-+    /// retrieve both dimensions of the image.
-+    /// see zbar_image_get_size()
-+    /// @since 0.11
-+    void get_size (unsigned &width,
-+                   unsigned &height) const
-+    {
-+        zbar_image_get_size(_img, &width, &height);
++    private void releaseCamera() {
++        if (mCamera != null) {
++            previewing = false;
++            mCamera.setPreviewCallback(null);
++            mCamera.release();
++            mCamera = null;
++        }
 +    }
 +
-     /// specify the pixel size of the image.
-     /// see zbar_image_set_size()
-     void set_size (unsigned width,
-@@ -191,6 +202,26 @@ public:
-         zbar_image_set_size(_img, width, height);
-     }
- 
-+    /// retrieve the scan crop rectangle.
-+    /// see zbar_image_get_crop()
-+    void get_crop (unsigned &x,
-+                   unsigned &y,
-+                   unsigned &width,
-+                   unsigned &height) const
-+    {
-+        zbar_image_get_crop(_img, &x, &y, &width, &height);
-+    }
++    private Runnable doAutoFocus = new Runnable() {
++            public void run() {
++                if (previewing)
++                    mCamera.autoFocus(autoFocusCB);
++            }
++        };
++
++    PreviewCallback previewCb = new PreviewCallback() {
++            public void onPreviewFrame(byte[] data, Camera camera) {
++                Camera.Parameters parameters = camera.getParameters();
++                Size size = parameters.getPreviewSize();
++
++                Image barcode = new Image(size.width, size.height, "Y800");
++                barcode.setData(data);
++
++                int result = scanner.scanImage(barcode);
++                
++                if (result != 0) {
++                    previewing = false;
++                    mCamera.setPreviewCallback(null);
++                    mCamera.stopPreview();
++                    
++                    SymbolSet syms = scanner.getResults();
++                    for (Symbol sym : syms) {
++                        scanText.setText("barcode result " + sym.getData());
++                        barcodeScanned = true;
++                    }
++                }
++            }
++        };
 +
-+    /// set the scan crop rectangle.
-+    /// see zbar_image_set_crop()
-+    void set_crop (unsigned x,
-+                   unsigned y,
-+                   unsigned width,
-+                   unsigned height)
-+    {
-+        zbar_image_set_crop(_img, x, y, width, height);
-+    }
++    // Mimic continuous auto-focusing
++    AutoFocusCallback autoFocusCB = new AutoFocusCallback() {
++            public void onAutoFocus(boolean success, Camera camera) {
++                autoFocusHandler.postDelayed(doAutoFocus, 1000);
++            }
++        };
++}
+diff -r 563557a923d0 android/jni/Android.mk
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/android/jni/Android.mk	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,76 @@
++#
++# Android NDK makefile 
++#
++# build - <ndk path>/ndk-build ICONV_SRC=<iconv library src> 
++# clean -  <ndk path>/ndk-build clean
++#
++MY_LOCAL_PATH := $(call my-dir)
++
++# libiconv
++include $(CLEAR_VARS)
++LOCAL_PATH := $(ICONV_SRC)
++
++LOCAL_MODULE := libiconv
++
++LOCAL_CFLAGS := \
++    -Wno-multichar \
++    -D_ANDROID \
++    -DLIBDIR="c" \
++    -DBUILDING_LIBICONV \
++    -DBUILDING_LIBCHARSET \
++    -DIN_LIBRARY
++
++LOCAL_SRC_FILES := \
++	lib/iconv.c \
++	libcharset/lib/localcharset.c \
++	lib/relocatable.c
++
++LOCAL_C_INCLUDES := \
++	$(ICONV_SRC)/include \
++	$(ICONV_SRC)/libcharset \
++	$(ICONV_SRC)/libcharset/include
++
++include $(BUILD_SHARED_LIBRARY)
++
++LOCAL_LDLIBS := -llog -lcharset
++
++# libzbarjni
++include $(CLEAR_VARS)
++
++LOCAL_PATH := $(MY_LOCAL_PATH)
++LOCAL_MODULE := zbarjni
++LOCAL_SRC_FILES := ../../java/zbarjni.c \
++		   ../../zbar/img_scanner.c \
++		   ../../zbar/decoder.c \
++		   ../../zbar/image.c \
++		   ../../zbar/symbol.c \
++		   ../../zbar/convert.c \
++		   ../../zbar/config.c \
++		   ../../zbar/scanner.c \
++		   ../../zbar/error.c \
++		   ../../zbar/refcnt.c \
++		   ../../zbar/video.c \
++		   ../../zbar/video/null.c \
++		   ../../zbar/decoder/code128.c \
++		   ../../zbar/decoder/code39.c \
++		   ../../zbar/decoder/code93.c \
++		   ../../zbar/decoder/codabar.c \
++		   ../../zbar/decoder/databar.c \
++		   ../../zbar/decoder/ean.c \
++		   ../../zbar/decoder/i25.c \
++		   ../../zbar/decoder/qr_finder.c \
++		   ../../zbar/qrcode/bch15_5.c \
++		   ../../zbar/qrcode/binarize.c \
++		   ../../zbar/qrcode/isaac.c \
++		   ../../zbar/qrcode/qrdec.c \
++		   ../../zbar/qrcode/qrdectxt.c \
++		   ../../zbar/qrcode/rs.c \
++		   ../../zbar/qrcode/util.c
++
++LOCAL_C_INCLUDES := ../include \
++		    ../zbar \
++		    $(ICONV_SRC)/include 
++
++LOCAL_SHARED_LIBRARIES := libiconv
++
++include $(BUILD_SHARED_LIBRARY)
+\ No newline at end of file
+diff -r 563557a923d0 android/jni/Application.mk
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/android/jni/Application.mk	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,1 @@
++APP_ABI := armeabi armeabi-v7a x86
+diff -r 563557a923d0 android/jni/config.h
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/android/jni/config.h	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,236 @@
++/* manually customized for iPhone platform */
 +
-     /// return the image sample data.
-     /// see zbar_image_get_data()
-     const void *get_data () const
-diff --git a/include/zbar/Processor.h b/include/zbar/Processor.h
---- a/include/zbar/Processor.h
-+++ b/include/zbar/Processor.h
-@@ -1,5 +1,5 @@
- //------------------------------------------------------------------------
--//  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+//  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
- //
- //  This file is part of the ZBar Bar Code Reader.
- //
-@@ -183,8 +183,8 @@ class Processor {
-     void force_format (std::string& input_format,
-                        std::string& output_format)
-     {
--        unsigned long ifourcc = *(unsigned long*)input_format.c_str();
--        unsigned long ofourcc = *(unsigned long*)output_format.c_str();
-+        unsigned long ifourcc = zbar_fourcc_parse(input_format.c_str());
-+        unsigned long ofourcc = zbar_fourcc_parse(output_format.c_str());
-         if(zbar_processor_force_format(_processor, ifourcc, ofourcc))
-             throw_exception(_processor);
-     }
-diff --git a/include/zbar/QZBarImage.h b/include/zbar/QZBarImage.h
---- a/include/zbar/QZBarImage.h
-+++ b/include/zbar/QZBarImage.h
-@@ -1,5 +1,5 @@
- //------------------------------------------------------------------------
--//  Copyright 2008-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+//  Copyright 2008-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
- //
- //  This file is part of the ZBar Bar Code Reader.
- //
-@@ -53,7 +53,7 @@ public:
-         unsigned width = bpl / 4;
-         unsigned height = qimg.height();
-         set_size(width, height);
--        set_format('B' | ('G' << 8) | ('R' << 16) | ('4' << 24));
-+        set_format(zbar_fourcc('B','G','R','4'));
-         unsigned long datalen = qimg.numBytes();
-         set_data(qimg.bits(), datalen);
- 
-diff --git a/include/zbar/Symbol.h b/include/zbar/Symbol.h
---- a/include/zbar/Symbol.h
-+++ b/include/zbar/Symbol.h
-@@ -1,5 +1,5 @@
- //------------------------------------------------------------------------
--//  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+//  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
- //
- //  This file is part of the ZBar Bar Code Reader.
- //
-@@ -64,6 +64,21 @@ public:
-         ref(-1);
-     }
- 
-+    /// assignment.
-+    SymbolSet& operator= (const SymbolSet& syms)
-+    {
-+        syms.ref();
-+        ref(-1);
-+        _syms = syms._syms;
-+        return(*this);
-+    }
++#define HAVE_LANGINFO_CODESET 0
 +
-+    /// truth testing.
-+    bool operator! () const
-+    {
-+        return(!_syms || !get_size());
-+    }
++/* whether to build support for Code 128 symbology */
++#define ENABLE_CODE128 1
 +
-     /// manipulate reference count.
-     void ref (int delta = 1) const
-     {
-@@ -77,7 +92,7 @@ public:
-         return(_syms);
-     }
- 
--    int get_size ()
-+    int get_size () const
-     {
-         return((_syms) ? zbar_symbol_set_get_size(_syms) : 0);
-     }
-@@ -112,9 +127,16 @@ public:
- 
-         /// copy constructor.
-         Point (const Point& pt)
-+            : x(pt.x),
-+              y(pt.y)
-+        { }
++/* whether to build support for Code 93 symbology */
++#define ENABLE_CODE93 1
 +
-+        /// assignment.
-+        Point& operator= (const Point& pt)
-         {
-             x = pt.x;
-             y = pt.y;
-+            return(*this);
-         }
-     };
- 
-@@ -135,7 +157,7 @@ public:
-                 _index = -1;
-         }
- 
--        /// constructor.
-+        /// copy constructor.
-         PointIterator (const PointIterator& iter)
-             : _sym(iter._sym),
-               _index(iter._index)
-@@ -149,6 +171,22 @@ public:
-             _sym->ref(-1);
-         }
- 
-+        /// assignment.
-+        PointIterator& operator= (const PointIterator& iter)
-+        {
-+            iter._sym->ref();
-+            _sym->ref(-1);
-+            _sym = iter._sym;
-+            _index = iter._index;
-+            return(*this);
-+        }
++/* whether to build support for Code 39 symbology */
++#define ENABLE_CODE39 1
 +
-+        /// truth testing.
-+        bool operator! () const
-+        {
-+            return(!_sym || _index < 0);
-+        }
++/* whether to build support for Codabar symbology */
++#define ENABLE_CODABAR 1
 +
-         /// advance iterator to next Point.
-         PointIterator& operator++ ()
-         {
-@@ -161,7 +199,9 @@ public:
-         /// retrieve currently referenced Point.
-         const Point operator* () const
-         {
--            assert(_index >= 0);
-+            assert(!!*this);
-+            if(!*this)
-+                return(Point());
-             return(Point(zbar_symbol_get_loc_x(*_sym, _index),
-                          zbar_symbol_get_loc_y(*_sym, _index)));
-         }
-@@ -213,6 +253,32 @@ public:
-         ref(-1);
-     }
- 
-+    /// assignment.
-+    Symbol& operator= (const Symbol& sym)
-+    {
-+        sym.ref(1);
-+        ref(-1);
-+        _sym = sym._sym;
-+        _type = sym._type;
-+        _data = sym._data;
-+        return(*this);
-+    }
++/* whether to build support for DataBar symbology */
++#define ENABLE_DATABAR 1
 +
-+    Symbol& operator= (const zbar_symbol_t *sym)
-+    {
-+        if(sym)
-+            zbar_symbol_ref(sym, 1);
-+        ref(-1);
-+        init(sym);
-+        return(*this);
-+    }
++/* whether to build support for EAN symbologies */
++#define ENABLE_EAN 1
 +
-+    /// truth testing.
-+    bool operator! () const
-+    {
-+        return(!_sym);
-+    }
++/* whether to build support for Interleaved 2 of 5 symbology */
++#define ENABLE_I25 1
 +
-     void ref (int delta = 1) const
-     {
-         if(_sym)
-@@ -311,6 +377,13 @@ public:
-         return((_sym) ? zbar_symbol_get_loc_y(_sym, index) : -1);
-     }
- 
-+    /// see zbar_symbol_get_orientation().
-+    /// @since 0.11
-+    int get_orientation () const
-+    {
-+        return(zbar_symbol_get_orientation(_sym));
-+    }
++/* whether to build support for PDF417 symbology */
++#undef ENABLE_PDF417
 +
-     /// see zbar_symbol_xml().
-     const std::string xml () const
-     {
-@@ -320,9 +393,6 @@ public:
-     }
- 
- protected:
--
--    friend class SymbolIterator;
--
-     /// (re)initialize Symbol from C symbol object.
-     void init (const zbar_symbol_t *sym = NULL)
-     {
-@@ -361,7 +431,7 @@ public:
-     {
-         const zbar_symbol_set_t *zsyms = _syms;
-         if(zsyms)
--            _sym.init(zbar_symbol_set_first_symbol(zsyms));
-+            _sym = zbar_symbol_set_first_symbol(zsyms);
-     }
- 
-     /// copy constructor.
-@@ -370,25 +440,33 @@ public:
-     {
-         const zbar_symbol_set_t *zsyms = _syms;
-         if(zsyms)
--            _sym.init(zbar_symbol_set_first_symbol(zsyms));
-+            _sym = zbar_symbol_set_first_symbol(zsyms);
-     }
- 
-     ~SymbolIterator ()
-     {
--        _sym.init();
-+    }
++/* whether to build support for QR Code */
++#define ENABLE_QRCODE 1
 +
-+    /// assignment.
-+    SymbolIterator& operator= (const SymbolIterator& iter)
-+    {
-+        _syms = iter._syms;
-+        _sym = iter._sym;
-+        return(*this);
-+    }
++/* Define to 1 if you have the `atexit' function. */
++#undef HAVE_ATEXIT
 +
-+    bool operator! () const
-+    {
-+        return(!_syms || !_sym);
-     }
- 
-     /// advance iterator to next Symbol.
-     SymbolIterator& operator++ ()
-     {
--        const zbar_symbol_t *zsym = _sym;
--        if(zsym)
--            _sym.init(zbar_symbol_next(zsym));
--        else {
--            const zbar_symbol_set_t *zsyms = _syms;
--            if(zsyms)
--                _sym.init(zbar_symbol_set_first_symbol(zsyms));
--        }
-+        if(!!_sym)
-+            _sym = zbar_symbol_next(_sym);
-+        else if(!!_syms)
-+            _sym = zbar_symbol_set_first_symbol(_syms);
-         return(*this);
-     }
- 
-diff --git a/include/zbar/Video.h b/include/zbar/Video.h
---- a/include/zbar/Video.h
-+++ b/include/zbar/Video.h
-@@ -1,5 +1,5 @@
- //------------------------------------------------------------------------
--//  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+//  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
- //
- //  This file is part of the ZBar Bar Code Reader.
- //
-@@ -92,7 +92,7 @@ public:
-     /// see zbar_video_init()
-     void init (std::string& format)
-     {
--        unsigned int fourcc = *(unsigned int*)format.c_str();
-+        unsigned int fourcc = zbar_fourcc_parse(format.c_str());
-         if(zbar_video_init(_video, fourcc))
-             throw_exception(_video);
-     }
-diff --git a/include/zbar/zbargtk.h b/include/zbar/zbargtk.h
---- a/include/zbar/zbargtk.h
-+++ b/include/zbar/zbargtk.h
-@@ -136,7 +136,7 @@ struct _ZBarGtkClass {
- 
- GType zbar_gtk_get_type(void) G_GNUC_CONST;
- 
--/** 
-+/**
-  * zbar_gtk_new:
-  * create a new barcode reader widget instance.
-  * initially has no associated video device or image.
-@@ -189,7 +189,17 @@ void zbar_gtk_set_video_enabled(ZBarGtk 
-  */
- gboolean zbar_gtk_get_video_opened(ZBarGtk *zbar);
- 
--/** 
-+/** set video camera resolution.
-+ * @width: width in pixels
-+ * @height: height in pixels
-+ *
-+ * @note this call must be made before video is initialized
-+ */
-+void zbar_gtk_request_video_size(ZBarGtk *zbar,
-+                                 int width,
-+                                 int height);
++/* Define to 1 if you have the <dlfcn.h> header file. */
++#undef HAVE_DLFCN_H
 +
-+/**
-  * utility function to populate a zbar_image_t from a GdkPixbuf.
-  * @image: the zbar library image destination to populate
-  * @pixbuf: the GdkPixbuf source
-diff --git a/iphone/ChangeLog b/iphone/ChangeLog
-new file mode 100644
---- /dev/null
-+++ b/iphone/ChangeLog
-@@ -0,0 +1,70 @@
-+version 1.0.1:
-+  * hotfix broken ZBarHelpController back button
-+  * 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
-+  * workaround iOS 4.2 hang
-+    - update to use latest SDK
-+  * add support for Code 93 symbology
++/* Define to 1 if you have the <fcntl.h> header file. */
++#undef HAVE_FCNTL_H
 +
-+version 1.0:
-+  * update to SDK 4.1, clean out LLVM warnings
-+  * fix camera simulation gesture
++/* Define to 1 if you have the <features.h> header file. */
++#undef HAVE_FEATURES_H
 +
-+version 0.1.2:
-+  * fix missing header dependency
-+  * doc enhancements
-+  * force controls to front when showsZBarControls is enabled
-+  * fix initial zoom crop (performance bug)
-+  * workaround iPhone quartz access past image data
++/* Define to 1 if you have the `getpagesize' function. */
++#undef HAVE_GETPAGESIZE
 +
-+version 0.1.1:
-+  * migrate to binary iPhone SDK distribution (NB backward incompatibilities!)
-+    - restructure headers
++/* Define if you have the iconv() function and it works. */
++#undef HAVE_ICONV
 +
-+version 0.1:
-+  * workaround for iPhone simulator builds
-+    - refactor ZBarReaderView for capture/simulator specific implementations
-+    - fix tracking calculations
-+    - fix captured video frame color conversion
-+  * fix for poor iPhone 4 performance
-+  * enable torch for iPhone 4
-+  * fix iPhone circular ref bug
-+  * add iPhone cache flush, change new libs to weak refs
-+  * fix iPhone async ref bug
-+  * enhance iPhone readertest w/more options
-+  * add iPhone zoom support, integrate with crop
-+  * add iPhone OS 4.0 video capture support
-+    - replacement view controller for new camera reader
-+    - separate view for use without controller
-+    - separate capture delegate for use standalone
-+    - add continuous autofocus
-+  * cleanup and expose iphone help display API
-+  * fixes to new iphone help display
-+  * migrate iphone help display to integrated web page (NB resource updates!)
-+    - allows easier customization
-+    - local links open directly, external links confirm and jump out to Safari
-+    - JavaScript hook for help context customization
-+    - also enhanced default help (note this changes the required resources)
-+    - fix to disable scanning during help overlay
-+    - thanks to iafanasyev and others for detailed suggestions
-+  * fix iphone custom overlay response (bug #2959617)
-+    - thanks to an anonymous user for the patch!
-+  * iphone widget performance tuning enhancements
-+    - fix crop calculation bug in ZBarImage
-+    - add properties to control pre-scan image cropping and scaling
-+    - add property for scanner cache control
-+    - enable some scanner density control (FIXME should be property)
-+    - fix ifdef for quality control (FIXME should be property)
-+    - add "sequence" mode test (not actually so useful)
-+  * realtime scanning for iphone widget
-+    - uses UIGetScreenImage() (NB private)
-+    - ZBarImage from CGImage (instead of UIImage)
-+    - add crop to scaling step
-+    - expose symbol set unfiltered results
-+  * iphone widget back compat updates, add basic test app
-+  * add Obj-C wrapper
-+  * first pass working iPhone "widget"
-diff --git a/iphone/README b/iphone/README
-new file mode 100644
---- /dev/null
-+++ b/iphone/README
-@@ -0,0 +1,59 @@
-+ZBar iPhone SDK
-+===============
++/* Define to 1 if you have the <inttypes.h> header file. */
++#define HAVE_INTTYPES_H 1
 +
-+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 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.
++/* Define to 1 if you have the <jpeglib.h> header file. */
++#undef HAVE_JPEGLIB_H
 +
-+Check the ZBar project home page for the latest release, forums, etc.
++/* Define to 1 if you have the `jpeg' library (-ljpeg). */
++#undef HAVE_LIBJPEG
 +
-+* http://zbar.sourceforge.net/iphone
++/* Define to 1 if you have the `pthread' library (-lpthread). */
++#undef HAVE_LIBPTHREAD
 +
-+Installation
-+------------
++/* Define to 1 if you have the <linux/videodev2.h> header file. */
++#undef HAVE_LINUX_VIDEODEV2_H
 +
-+If you are migrating from a pre-SDK source version of the library,
-+first make sure you remove all of the old references to zbar.xcodeproj
-+and libzbar.a and revert any related build settings.
++/* Define to 1 if you have the <linux/videodev.h> header file. */
++#undef HAVE_LINUX_VIDEODEV_H
 +
-+To add the SDK to an Xcode project:
++/* Define to 1 if you have the <memory.h> header file. */
++#undef HAVE_MEMORY_H
 +
-+   1. Drag ZBarSDK into your Xcode project.
-+   3. Add these system frameworks to your project:
-+      * AVFoundation.framework (weak)
-+      * CoreMedia.framework (weak)
-+      * CoreVideo.framework (weak)
-+      * QuartzCore.framework
-+      * libiconv.dylib
++/* Define to 1 if you have the `memset' function. */
++#define HAVE_MEMSET 1
 +
-+Documentation
-+-------------
++/* Define to 1 if you have a working `mmap' system call. */
++#undef HAVE_MMAP
 +
-+See Documentation.html for complete SDK documentation.
++/* Define to 1 if you have the <poll.h> header file. */
++#undef HAVE_POLL_H
 +
-+Examples
-+--------
++/* Define to 1 if you have the <pthread.h> header file. */
++#undef HAVE_PTHREAD_H
 +
-+A tutorial that walks through installing and using the SDK is
-+available in the documentation.  The SDK disk image also contains the
-+resulting Xcode project at Examples/ReaderSample.
++/* Define to 1 if you have the `setenv' function. */
++#undef HAVE_SETENV
 +
-+Examples/readertest demonstrates most of the configuration options
-+available for the reader.
++/* Define to 1 if you have the <stdint.h> header file. */
++#define HAVE_STDINT_H 1
 +
-+You should be able to open and build the examples directly from the
-+disk image.  If not, please copy them to your local drive and build
-+from there.
++/* Define to 1 if you have the <stdlib.h> header file. */
++#define HAVE_STDLIB_H 1
 +
-+Copyright and License
-+---------------------
++/* Define to 1 if you have the <strings.h> header file. */
++#define HAVE_STRINGS_H 1
 +
-+Licensed under the GNU Lesser General Public License, version 2.1.
-+http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
++/* Define to 1 if you have the <string.h> header file. */
++#define HAVE_STRING_H 1
 +
-+Copyright 2008-2010 � Jeff Brown <spadix@users.sourceforge.net> et al
++/* Define to 1 if you have the <sys/ioctl.h> header file. */
++#undef HAVE_SYS_IOCTL_H
 +
-+See the included files COPYING and LICENSE for details
-diff --git a/iphone/ZBarCVImage.h b/iphone/ZBarCVImage.h
-new file mode 100644
---- /dev/null
-+++ b/iphone/ZBarCVImage.h
-@@ -0,0 +1,43 @@
-+//------------------------------------------------------------------------
-+//  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-+//
-+//  This file is part of the ZBar Bar Code Reader.
-+//
-+//  The ZBar Bar Code Reader is free software; you can redistribute it
-+//  and/or modify it under the terms of the GNU Lesser Public License as
-+//  published by the Free Software Foundation; either version 2.1 of
-+//  the License, or (at your option) any later version.
-+//
-+//  The ZBar Bar Code Reader is distributed in the hope that it will be
-+//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-+//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+//  GNU Lesser Public License for more details.
-+//
-+//  You should have received a copy of the GNU Lesser Public License
-+//  along with the ZBar Bar Code Reader; if not, write to the Free
-+//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-+//  Boston, MA  02110-1301  USA
-+//
-+//  http://sourceforge.net/projects/zbar
-+//------------------------------------------------------------------------
++/* Define to 1 if you have the <sys/ipc.h> header file. */
++#undef HAVE_SYS_IPC_H
 +
-+#import <ZBarSDK/ZBarImage.h>
-+#import <CoreVideo/CoreVideo.h>
++/* Define to 1 if you have the <sys/mman.h> header file. */
++#undef HAVE_SYS_MMAN_H
 +
-+// ZBarImage referring to a CVPixelBuffer.  used internally to handle
-+// asynchronous conversion to UIImage
++/* Define to 1 if you have the <sys/shm.h> header file. */
++#undef HAVE_SYS_SHM_H
 +
-+@interface ZBarCVImage
-+    : ZBarImage
-+{
-+    CVPixelBufferRef pixelBuffer;
-+    void *rgbBuffer;
-+    NSInvocationOperation *conversion;
-+}
++/* Define to 1 if you have the <sys/stat.h> header file. */
++#define HAVE_SYS_STAT_H 1
 +
-+- (void) waitUntilConverted;
++/* Define to 1 if you have the <sys/times.h> header file. */
++#define HAVE_SYS_TIMES_H 1
 +
-+@property (nonatomic) CVPixelBufferRef pixelBuffer;
-+@property (nonatomic, readonly) void *rgbBuffer;
++/* Define to 1 if you have the <sys/time.h> header file. */
++#define HAVE_SYS_TIME_H 1
 +
-+@end
-diff --git a/iphone/ZBarCVImage.m b/iphone/ZBarCVImage.m
-new file mode 100644
---- /dev/null
-+++ b/iphone/ZBarCVImage.m
-@@ -0,0 +1,195 @@
-+//------------------------------------------------------------------------
-+//  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-+//
-+//  This file is part of the ZBar Bar Code Reader.
-+//
-+//  The ZBar Bar Code Reader is free software; you can redistribute it
-+//  and/or modify it under the terms of the GNU Lesser Public License as
-+//  published by the Free Software Foundation; either version 2.1 of
-+//  the License, or (at your option) any later version.
-+//
-+//  The ZBar Bar Code Reader is distributed in the hope that it will be
-+//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-+//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+//  GNU Lesser Public License for more details.
-+//
-+//  You should have received a copy of the GNU Lesser Public License
-+//  along with the ZBar Bar Code Reader; if not, write to the Free
-+//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-+//  Boston, MA  02110-1301  USA
-+//
-+//  http://sourceforge.net/projects/zbar
-+//------------------------------------------------------------------------
++/* Define to 1 if you have the <sys/types.h> header file. */
++#define HAVE_SYS_TYPES_H 1
 +
-+#import "ZBarCVImage.h"
-+#define MODULE ZBarCVImage
-+#import "debug.h"
++/* Define to 1 if the system has the type `uintptr_t'. */
++#define HAVE_UINTPTR_T 1
 +
-+static NSOperationQueue *conversionQueue;
++/* Define to 1 if you have the <unistd.h> header file. */
++#define HAVE_UNISTD_H 1
 +
-+static const void*
-+asyncProvider_getBytePointer (void *info)
-+{
-+    // block until data is available
-+    ZBarCVImage *image = info;
-+    assert(image);
-+    [image waitUntilConverted];
-+    void *buf = image.rgbBuffer;
-+    assert(buf);
-+    return(buf);
-+}
++/* Define to 1 if you have the <vfw.h> header file. */
++#undef HAVE_VFW_H
 +
-+static const CGDataProviderDirectCallbacks asyncProvider = {
-+    .version = 0,
-+    .getBytePointer = asyncProvider_getBytePointer,
-+    .releaseBytePointer = NULL,
-+    .getBytesAtPosition = NULL,
-+    .releaseInfo = (void*)CFRelease,
-+};
++/* Define to 1 if you have the <X11/extensions/XShm.h> header file. */
++#undef HAVE_X11_EXTENSIONS_XSHM_H
 +
-+@implementation ZBarCVImage
++/* Define to 1 if you have the <X11/extensions/Xvlib.h> header file. */
++#undef HAVE_X11_EXTENSIONS_XVLIB_H
 +
-+@synthesize pixelBuffer, rgbBuffer;
++/* Define as const if the declaration of iconv() needs const. */
++#undef ICONV_CONST
 +
-+- (void) dealloc
-+{
-+    self.pixelBuffer = NULL;
-+    if(rgbBuffer) {
-+        free(rgbBuffer);
-+        rgbBuffer = NULL;
-+    }
-+    [conversion release];
-+    conversion = nil;
-+    [super dealloc];
-+}
++/* Library major version */
++#define LIB_VERSION_MAJOR 0
 +
-+- (void) setPixelBuffer: (CVPixelBufferRef) newbuf
-+{
-+    CVPixelBufferRef oldbuf = pixelBuffer;
-+    if(newbuf)
-+        CVPixelBufferRetain(newbuf);
-+    pixelBuffer = newbuf;
-+    if(oldbuf)
-+        CVPixelBufferRelease(oldbuf);
-+}
++/* Library minor version */
++#define LIB_VERSION_MINOR 2
 +
-+- (void) waitUntilConverted
-+{
-+    // operation will at least have been queued already
-+    NSOperation *op = [conversion retain];
-+    if(!op)
-+        return;
-+    [op waitUntilFinished];
-+    [op release];
-+}
++/* Library revision */
++#define LIB_VERSION_REVISION 0
 +
-+- (UIImage*) UIImageWithOrientation: (UIImageOrientation) orient
-+{
-+    if(!conversion && !rgbBuffer) {
-+        // start format conversion in separate thread
-+        NSOperationQueue *queue = conversionQueue;
-+        if(!queue) {
-+            queue = conversionQueue = [NSOperationQueue new];
-+            queue.maxConcurrentOperationCount = 1;
-+        }
-+        else
-+            [queue waitUntilAllOperationsAreFinished];
++/* Define to the sub-directory in which libtool stores uninstalled libraries.
++   */
++#undef LT_OBJDIR
 +
-+        conversion = [[NSInvocationOperation alloc]
-+                         initWithTarget: self
-+                         selector: @selector(convertCVtoRGB)
-+                         object: nil];
-+        [queue addOperation: conversion];
-+        [conversion release];
-+    }
++/* Define to 1 if assertions should be disabled. */
++//#undef NDEBUG
 +
-+    // create UIImage before converted data is available
-+    CGSize size = self.size;
-+    int w = size.width;
-+    int h = size.height;
++/* Define to 1 if your C compiler doesn't accept -c and -o together. */
++#undef NO_MINUS_C_MINUS_O
 +
-+    CGDataProviderRef datasrc =
-+        CGDataProviderCreateDirect([self retain], 3 * w * h, &asyncProvider);
-+    CGColorSpaceRef cs = CGColorSpaceCreateDeviceRGB();
-+    CGImageRef cgimg =
-+        CGImageCreate(w, h, 8, 24, 3 * w, cs,
-+                      kCGBitmapByteOrderDefault, datasrc,
-+                      NULL, YES, kCGRenderingIntentDefault);
-+    CGColorSpaceRelease(cs);
-+    CGDataProviderRelease(datasrc);
++/* Name of package */
++#define PACKAGE "zbar"
 +
-+    UIImage *uiimg =
-+        [UIImage imageWithCGImage: cgimg
-+                 scale: 1
-+                 orientation: orient];
-+    CGImageRelease(cgimg);
++/* Define to the address where bug reports for this package should be sent. */
++#define PACKAGE_BUGREPORT "spadix@users.sourceforge.net"
 +
-+    return(uiimg);
-+}
++/* Define to the full name of this package. */
++#define PACKAGE_NAME "zbar"
 +
-+// convert video frame to a CGImage compatible RGB format
-+// FIXME this is temporary until we can find the native way...
-+- (void) convertCVtoRGB
-+{
-+    timer_start;
-+    unsigned long format = self.format;
-+    assert(format == zbar_fourcc('C','V','2','P'));
-+    if(format != zbar_fourcc('C','V','2','P'))
-+        return;
++/* Define to the full name and version of this package. */
++#define PACKAGE_STRING "zbar 0.10"
 +
-+    CVPixelBufferLockBaseAddress(pixelBuffer, kCVPixelBufferLock_ReadOnly);
-+    int w = CVPixelBufferGetWidth(pixelBuffer);
-+    int h = CVPixelBufferGetHeight(pixelBuffer);
-+    int dy = CVPixelBufferGetBytesPerRowOfPlane(pixelBuffer, 0);
-+    int duv = CVPixelBufferGetBytesPerRowOfPlane(pixelBuffer, 1);
-+    uint8_t *py = CVPixelBufferGetBaseAddressOfPlane(pixelBuffer, 0);
-+    uint8_t *puv = CVPixelBufferGetBaseAddressOfPlane(pixelBuffer, 1);
-+    if(!py || !puv || dy < w || duv < w)
-+        goto error;
++/* Define to the one symbol short name of this package. */
++#define PACKAGE_TARNAME "zbar"
 +
-+    int datalen = 3 * w * h;
-+    // Quartz accesses some undocumented amount past allocated data?
-+    // ...allocate extra to compensate
-+    uint8_t *pdst = rgbBuffer = malloc(datalen + 3 * w);
-+    if(!pdst)
-+        goto error;
-+    [self setData: rgbBuffer
-+          withLength: datalen];
++/* Define to the version of this package. */
++#define PACKAGE_VERSION "0.10"
 +
-+    for(int y = 0; y < h; y++) {
-+        const uint8_t *qy = py;
-+        const uint8_t *quv = puv;
-+        for(int x = 0; x < w; x++) {
-+            int Y1 = *(qy++) - 16;
-+            int Cb = *(quv) - 128;
-+            int Cr = *(quv + 1) - 128;
-+            Y1 *= 4769;
-+            quv += (x & 1) << 1;
-+            int r = (Y1 + 6537 * Cr + 2048) / 4096;
-+            int g = (Y1 - 1604 * Cb - 3329 * Cr + 2048) / 4096;
-+            int b = (Y1 + 8263 * Cb + 2048) / 4096;
++/* Define to 1 if you have the ANSI C header files. */
++#define STDC_HEADERS 1
 +
-+            r = (r | -!!(r >> 8)) & -((r >> 8) >= 0);
-+            g = (g | -!!(g >> 8)) & -((g >> 8) >= 0);
-+            b = (b | -!!(b >> 8)) & -((b >> 8) >= 0);
++/* Version number of package */
++#define VERSION "0.10"
 +
-+            *(pdst++) = r;
-+            *(pdst++) = g;
-+            *(pdst++) = b;
-+        }
-+        py += dy;
-+        if(y & 1)
-+            puv += duv;
-+    }
++/* Define to 1 if the X Window System is missing or not being used. */
++#define X_DISPLAY_MISSING 1
 +
-+error:
-+    CVPixelBufferUnlockBaseAddress(pixelBuffer, kCVPixelBufferLock_ReadOnly);
-+    zlog(@"convert time %gs", timer_elapsed(t_start, timer_now()));
++/* Program major version (before the '.') as a number */
++#define ZBAR_VERSION_MAJOR 0
 +
-+    // release buffer as soon as conversion is complete
-+    self.pixelBuffer = NULL;
++/* Program minor version (after '.') as a number */
++#define ZBAR_VERSION_MINOR 10
 +
-+    conversion = nil;
-+}
++/* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
++   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
++   #define below would cause a syntax error. */
++#undef _UINT32_T
 +
-+@end
-diff --git a/iphone/ZBarCaptureReader.m b/iphone/ZBarCaptureReader.m
-new file mode 100644
---- /dev/null
-+++ b/iphone/ZBarCaptureReader.m
-@@ -0,0 +1,355 @@
-+//------------------------------------------------------------------------
-+//  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-+//
-+//  This file is part of the ZBar Bar Code Reader.
-+//
-+//  The ZBar Bar Code Reader is free software; you can redistribute it
-+//  and/or modify it under the terms of the GNU Lesser Public License as
-+//  published by the Free Software Foundation; either version 2.1 of
-+//  the License, or (at your option) any later version.
-+//
-+//  The ZBar Bar Code Reader is distributed in the hope that it will be
-+//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-+//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+//  GNU Lesser Public License for more details.
-+//
-+//  You should have received a copy of the GNU Lesser Public License
-+//  along with the ZBar Bar Code Reader; if not, write to the Free
-+//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-+//  Boston, MA  02110-1301  USA
-+//
-+//  http://sourceforge.net/projects/zbar
-+//------------------------------------------------------------------------
-+
-+#import <libkern/OSAtomic.h>
-+#import <AVFoundation/AVFoundation.h>
-+#import <CoreMedia/CoreMedia.h>
-+#import <CoreVideo/CoreVideo.h>
-+#import <ZBarSDK/ZBarCaptureReader.h>
-+#import <ZBarSDK/ZBarImageScanner.h>
-+#import "ZBarCVImage.h"
-+
-+#define MODULE ZBarCaptureReader
-+#import "debug.h"
-+
-+@implementation ZBarCaptureReader
-+
-+@synthesize captureOutput, captureDelegate, scanner, scanCrop, size,
-+    framesPerSecond, enableCache;
-+@dynamic enableReader;
-+
-+- (void) initResult
-+{
-+    [result release];
-+    result = [ZBarCVImage new];
-+    result.format = [ZBarImage fourcc: @"CV2P"];
-+}
-+
-+- (id) initWithImageScanner: (ZBarImageScanner*) _scanner
-+{
-+    self = [super init];
-+    if(!self)
-+        return(nil);
++/* Define for Solaris 2.5.1 so the uint8_t typedef from <sys/synch.h>,
++   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
++   #define below would cause a syntax error. */
++#undef _UINT8_T
 +
-+    t_fps = t_frame = timer_now();
-+    enableCache = YES;
++/* Minimum Windows API version */
++#undef _WIN32_WINNT
 +
-+    scanner = [_scanner retain];
-+    scanCrop = CGRectMake(0, 0, 1, 1);
-+    image = [ZBarImage new];
-+    image.format = [ZBarImage fourcc: @"Y800"];
-+    [self initResult];
++/* used only for pthread debug attributes */
++#undef __USE_UNIX98
 +
-+    captureOutput = [AVCaptureVideoDataOutput new];
-+    captureOutput.alwaysDiscardsLateVideoFrames = YES;
++/* Define to empty if `const' does not conform to ANSI C. */
++#undef const
 +
-+#ifdef FIXED_8697526
-+    /* iOS 4.2 introduced a bug that causes [session startRunning] to
-+     * hang if the session has a preview layer and this property is
-+     * specified at the output.  As this happens to be the default
-+     * setting for the currently supported devices, it can be omitted
-+     * without causing a functional problem (for now...).  Of course,
-+     * we still have no idea what the real problem is, or how robust
-+     * this is as a workaround...
-+     */
-+    captureOutput.videoSettings = 
-+        [NSDictionary
-+            dictionaryWithObject:
-+                [NSNumber numberWithInt:
-+                    kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange]
-+            forKey: (NSString*)kCVPixelBufferPixelFormatTypeKey];
++/* Define to `__inline__' or `__inline' if that's what the C compiler
++   calls it, or to nothing if 'inline' is not supported under any name.  */
++#ifndef __cplusplus
++#undef inline
 +#endif
 +
-+    queue = dispatch_queue_create("ZBarCaptureReader", NULL);
-+    [captureOutput setSampleBufferDelegate:
-+                       (id<AVCaptureVideoDataOutputSampleBufferDelegate>)self
-+                   queue: queue];
-+
-+    return(self);
-+}
-+
-+- (id) init
-+{
-+    self = [self initWithImageScanner:
-+               [[ZBarImageScanner new]
-+                   autorelease]];
-+    if(!self)
-+        return(nil);
++/* Define to the type of a signed integer type of width exactly 32 bits if
++   such a type exists and the standard includes do not define it. */
++#undef int32_t
 +
-+    [scanner setSymbology: 0
-+             config: ZBAR_CFG_X_DENSITY
-+             to: 3];
-+    [scanner setSymbology: 0
-+             config: ZBAR_CFG_Y_DENSITY
-+             to: 3];
-+    return(self);
-+}
++/* Define to the type of an unsigned integer type of width exactly 32 bits if
++   such a type exists and the standard includes do not define it. */
++#undef uint32_t
 +
-+- (void) dealloc
-+{
-+    captureDelegate = nil;
++/* Define to the type of an unsigned integer type of width exactly 8 bits if
++   such a type exists and the standard includes do not define it. */
++#undef uint8_t
 +
-+    // queue continues to run after stopping (NB even after DidStopRunning!);
-+    // ensure released delegate is not called. (also NB that the queue
-+    // may not be null, even in this case...)
-+    [captureOutput setSampleBufferDelegate: nil
-+                   queue: queue];
-+    [captureOutput release];
-+    captureOutput = nil;
-+    dispatch_release(queue);
++/* Define to the type of an unsigned integer type wide enough to hold a
++   pointer, if such a type exists, and if the system does not define it. */
++#undef uintptr_t
 +
-+    [image release];
-+    image = nil;
-+    [result release];
-+    result = nil;
-+    [scanner release];
-+    scanner = nil;
-+    [super dealloc];
-+}
++#ifndef X_DISPLAY_MISSING
++# define HAVE_X
++#endif
 +
-+- (BOOL) enableReader
-+{
-+    return(!OSAtomicCompareAndSwap32Barrier(0, 0, &running));
-+}
+diff -r 563557a923d0 android/proguard.cfg
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/android/proguard.cfg	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,40 @@
++-optimizationpasses 5
++-dontusemixedcaseclassnames
++-dontskipnonpubliclibraryclasses
++-dontpreverify
++-verbose
++-optimizations !code/simplification/arithmetic,!field/*,!class/merging/*
 +
-+- (void) setEnableReader: (BOOL) enable
-+{
-+    if(!enable)
-+        OSAtomicAnd32OrigBarrier(0, (void*)&running);
-+    else if(OSAtomicCompareAndSwap32Barrier(0, 1, &running))
-+        @synchronized(scanner) {
-+            scanner.enableCache = enableCache;
-+        }
-+}
++-keep public class * extends android.app.Activity
++-keep public class * extends android.app.Application
++-keep public class * extends android.app.Service
++-keep public class * extends android.content.BroadcastReceiver
++-keep public class * extends android.content.ContentProvider
++-keep public class * extends android.app.backup.BackupAgentHelper
++-keep public class * extends android.preference.Preference
++-keep public class com.android.vending.licensing.ILicensingService
 +
-+- (void) willStartRunning
-+{
-+    self.enableReader = YES;
++-keepclasseswithmembernames class * {
++    native <methods>;
 +}
 +
-+- (void) willStopRunning
-+{
-+    self.enableReader = NO;
++-keepclasseswithmembers class * {
++    public <init>(android.content.Context, android.util.AttributeSet);
 +}
 +
-+- (void) flushCache
-+{
-+    @synchronized(scanner) {
-+        scanner.enableCache = enableCache;
-+    }
++-keepclasseswithmembers class * {
++    public <init>(android.content.Context, android.util.AttributeSet, int);
 +}
 +
-+- (void) setCaptureDelegate: (id<ZBarCaptureDelegate>) delegate
-+{
-+    @synchronized(scanner) {
-+        captureDelegate = delegate;
-+    }
++-keepclassmembers class * extends android.app.Activity {
++   public void *(android.view.View);
 +}
 +
-+- (void) cropUpdate
-+{
-+    @synchronized(scanner) {
-+        image.crop = CGRectMake(scanCrop.origin.x * width,
-+                                scanCrop.origin.y * height,
-+                                scanCrop.size.width * width,
-+                                scanCrop.size.height * height);
-+    }
++-keepclassmembers enum * {
++    public static **[] values();
++    public static ** valueOf(java.lang.String);
 +}
 +
-+- (void) setScanCrop: (CGRect) crop
-+{
-+    if(CGRectEqualToRect(scanCrop, crop))
-+        return;
-+    scanCrop = crop;
-+    [self cropUpdate];
++-keep class * implements android.os.Parcelable {
++  public static final android.os.Parcelable$Creator *;
 +}
+diff -r 563557a923d0 android/project.properties
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/android/project.properties	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,12 @@
++# This file is automatically generated by Android Tools.
++# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
++#
++# This file must be checked in Version Control Systems.
++#
++# To customize properties used by the Ant build system use,
++# "ant.properties", and override values to adapt the script to your
++# project structure.
++
++android.library=true
++# Project target.
++target=android-8
+diff -r 563557a923d0 android/res/layout/main.xml
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/android/res/layout/main.xml	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,13 @@
++<?xml version="1.0" encoding="utf-8"?>
++<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
++    android:orientation="vertical"
++    android:layout_width="fill_parent"
++    android:layout_height="fill_parent"
++    >
++<TextView  
++    android:layout_width="fill_parent" 
++    android:layout_height="wrap_content" 
++    android:text="Hello World, ACTIVITY_ENTRY_NAME"
++    />
++</LinearLayout>
++
+diff -r 563557a923d0 android/res/values/strings.xml
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/android/res/values/strings.xml	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,4 @@
++<?xml version="1.0" encoding="utf-8"?>
++<resources>
++    <string name="app_name">ACTIVITY_ENTRY_NAME</string>
++</resources>
+diff -r 563557a923d0 configure.ac
+--- a/configure.ac	Tue Oct 27 11:25:59 2009 -0400
++++ b/configure.ac	Fri Feb 22 08:54:29 2013 -0300
+@@ -46,6 +46,13 @@
+   [[`echo "$LIB_VERSION" | sed -e 's/^[^:]*:\([^:]*\):.*$/\1/'`]],
+   [Library revision])
+ 
++AM_CPPFLAGS="-I$srcdir/include"
++AM_CFLAGS="-Wall -Wno-parentheses -Werror"
++AM_CXXFLAGS="$AM_CFLAGS"
++AC_SUBST([AM_CPPFLAGS])
++AC_SUBST([AM_CFLAGS])
++AC_SUBST([AM_CXXFLAGS])
 +
-+- (void) didTrackSymbols: (ZBarSymbolSet*) syms
-+{
-+    [captureDelegate
-+        captureReader: self
-+        didTrackSymbols: syms];
-+}
+ dnl windows build
+ 
+ AC_CANONICAL_HOST
+@@ -73,13 +80,36 @@
+ AC_ARG_VAR([XMLTOFLAGS], [additional arguments for xmlto])
+ AC_CHECK_PROGS([XMLTO], [xmlto], [:])
+ 
++have_java="maybe"
++AC_ARG_VAR([JAVA_HOME], [root location of JDK])
++AS_IF([test "x$JAVA_HOME" = "x"],
++  [JAVA_PATH="$PATH"],
++  [JAVA_PATH="$JAVA_HOME/bin$PATH_SEPARATOR$PATH"])
 +
-+- (void) didReadNewSymbolsFromImage: (ZBarImage*) img
-+{
-+    timer_start;
-+    [captureDelegate
-+        captureReader: self
-+        didReadNewSymbolsFromImage: img];
-+    OSAtomicCompareAndSwap32Barrier(2, 1, &running);
-+    zlog(@"latency: delegate=%gs total=%gs",
-+         timer_elapsed(t_start, timer_now()),
-+         timer_elapsed(t_scan, timer_now()));
-+}
++AC_ARG_VAR([JAVAC], [location of Java language compiler])
++AC_PATH_PROGS([JAVAC], [javac jikes ecj gcj], [:], [$JAVA_PATH])
++AS_IF([test "x$JAVAC" = "x:"], [have_java="no"])
 +
-+- (void) setFramesPerSecond: (CGFloat) fps
-+{
-+    framesPerSecond = fps;
-+}
++AC_ARG_VAR([JAVAH], [location of Java header generator])
++AC_PATH_PROGS([JAVAH], [javah], [/bin/false], [$JAVA_PATH])
 +
-+- (void) updateFPS: (NSNumber*) val
-+{
-+    [self setFramesPerSecond: val.doubleValue];
-+}
++AC_ARG_VAR([JAR], [location of Java archive tool])
++AC_PATH_PROGS([JAR], [jar], [:], [$JAVA_PATH])
++AS_IF([test "x$JAR" = "x:"], [have_java="no"])
 +
-+- (void) setSize: (CGSize) _size
-+{
-+    size = _size;
-+}
++AC_ARG_VAR([JAVA], [location of Java application launcher])
++AC_PATH_PROGS([JAVA], [java], [/bin/false], [$JAVA_PATH])
 +
-+- (void) updateSize: (CFDictionaryRef) val
-+{
-+    CGSize _size;
-+    if(CGSizeMakeWithDictionaryRepresentation(val, &_size))
-+        [self setSize: _size];
-+}
++AC_ARG_VAR([CLASSPATH], [Java class path (include JUnit to run java tests)])
++AS_IF([test "x$CLASSPATH" = "x"], [CLASSPATH="."])
 +
-+- (void)  captureOutput: (AVCaptureOutput*) output
-+  didOutputSampleBuffer: (CMSampleBufferRef) samp
-+         fromConnection: (AVCaptureConnection*) conn
-+{
-+    // queue is apparently not flushed when stopping;
-+    // only process when running
-+    if(!OSAtomicCompareAndSwap32Barrier(1, 1, &running))
-+        return;
-+
-+    NSAutoreleasePool *pool = [NSAutoreleasePool new];
-+    image.sequence = framecnt++;
+ dnl symbologies
+ 
+ AC_ARG_ENABLE([codes],
+   [AS_HELP_STRING([--enable-codes=SYMS],
+-    [select symbologies to compile [default=ean,i25,code39,code128,qrcode]])],
++    [select symbologies to compile [default=ean,databar,code128,code93,code39,codabar,i25,qrcode]])],
+   [],
+-  [enable_codes="ean,code39,code128,i25,qrcode"]) dnl pdf417
++  [enable_codes="ean,databar,code128,code93,code39,codabar,i25,qrcode"])
+ 
+ AC_DEFUN([ZBAR_CHK_CODE], [
+   AC_MSG_CHECKING([whether to build $2])
+@@ -97,11 +127,14 @@
+ ])dnl
+ 
+ ZBAR_CHK_CODE([ean], [EAN symbologies])
++ZBAR_CHK_CODE([databar], [DataBar symbology])
+ ZBAR_CHK_CODE([code128], [Code 128 symbology])
++ZBAR_CHK_CODE([code93], [Code 93 symbology])
+ ZBAR_CHK_CODE([code39], [Code 39 symbology])
+-ZBAR_CHK_CODE([pdf417], [PDF417 symbology])
++ZBAR_CHK_CODE([codabar], [Codabar symbology])
+ ZBAR_CHK_CODE([i25], [Interleaved 2 of 5 symbology])
+ ZBAR_CHK_CODE([qrcode], [QR Code])
++ZBAR_CHK_CODE([pdf417], [PDF417 symbology])
+ 
+ dnl libraries
+ 
+@@ -144,23 +177,26 @@
+   [],
+   [enable_video="yes"])
+ 
+-with_video="no"
+-AS_IF([test "x$enable_video" != "xno"],
+-  [AS_IF([test "x$win32" = "xno"],
+-    [AC_CHECK_HEADERS([linux/videodev.h], [with_video="v4l1"],
+-      [AC_MSG_FAILURE([test for video support failed!
++have_v4l1="no"
++have_v4l2="no"
++AS_IF([test "x$enable_video" = "xno"],
++  [],
++  [test "x$win32" = "xno"],
++  [AC_CHECK_HEADERS([linux/videodev.h], [have_v4l1="yes"])
++   AC_CHECK_HEADERS([linux/videodev2.h], [have_v4l2="yes"])
++   AS_IF([test "x$have_v4l2" = "xno" && test "x$have_v4l1" = "xno"],
++     [AC_MSG_FAILURE([test for video support failed!
+ rebuild your kernel to include video4linux support or
+-configure --disable-video to skip building video support.])])
+-       AC_CHECK_HEADERS([linux/videodev2.h], [with_video="v4l2"],
+-         [AC_MSG_WARN([v4l2 API not detected, upgrade your kernel!])])],
+-    [AC_CHECK_HEADERS([vfw.h], [with_video="vfw"],
+-      [AC_MSG_FAILURE([test for VfW video support failed!
+-configure --disable-video to skip building vidoe support.])])])
+-])
++configure --disable-video to skip building video support.])],
++     [test "x$have_v4l2" = "xno"],
++     [AC_MSG_WARN([v4l2 API not detected, upgrade your kernel!])])],
++  [AC_CHECK_HEADERS([vfw.h], [with_video="vfw"],
++    [AC_MSG_FAILURE([test for VfW video support failed!
++configure --disable-video to skip building video support.])])])
++
+ AM_CONDITIONAL([HAVE_VIDEO], [test "x$enable_video" != "xno"])
+-AM_CONDITIONAL([HAVE_V4L1],
+-  [test "x$with_video" = "xv4l1" || test "x$with_video" = "xv4l2"])
+-AM_CONDITIONAL([HAVE_V4L2], [test "x$with_video" = "xv4l2"])
++AM_CONDITIONAL([HAVE_V4L1], [test "x$have_v4l1" != "xno"])
++AM_CONDITIONAL([HAVE_V4L2], [test "x$have_v4l2" != "xno"])
+ 
+ dnl X
+ AC_ARG_VAR([XSHM_LIBS], [linker flags for X shared memory extension])
+@@ -252,51 +288,105 @@
+ ])
+ AM_CONDITIONAL([HAVE_JPEG], [test "x$with_jpeg" = "xyes"])
+ 
+-dnl ImageMagick
++dnl ImageMagick or GraphicsMagick
++dnl disable both if IM is explicitly disabled to preserve old behavior
 +
-+    uint64_t now = timer_now();
-+    double dt = timer_elapsed(t_frame, now);
-+    t_frame = now;
-+    if(dt > 2) {
-+        t_fps = now;
-+        dt_frame = 0;
-+    }
-+    else if(!dt_frame)
-+        dt_frame = dt;
-+    dt_frame = (dt_frame + dt) / 2;
-+    if(timer_elapsed(t_fps, now) >= 1) {
-+        [self performSelectorOnMainThread: @selector(updateFPS:)
-+              withObject: [NSNumber numberWithDouble: 1 / dt_frame]
-+              waitUntilDone: NO];
-+        t_fps = now;
-+    }
+ AC_ARG_WITH([imagemagick],
+   [AS_HELP_STRING([--without-imagemagick],
+-    [disable support for scanning images using ImageMagick])],
++    [disable support for scanning images with ImageMagick])],
+   [],
+-  [with_imagemagick="yes"])
++  [with_imagemagick="check"])
+ 
+-AS_IF([test "x$with_imagemagick" != "xno"],
+-  [PKG_CHECK_MODULES([MAGICK], [MagickWand >= 6.2.6], [],
+-     [dnl Wand is deprecated in favor of MagickWand,
+-      dnl but the latter doesn't exist in older verisons (bug #2848437)
++AC_ARG_WITH([graphicsmagick],
++  [AS_HELP_STRING([--with-graphicsmagick],
++    [use GraphicsMagick alternative to ImageMagick])],
++  [],
++  [with_graphicsmagick="check"])
++
++magick="UnknownMagick"
++have_IM="maybe"
++AS_IF([test "x$with_imagemagick" = "xno"], [],
++      [test "x$with_imagemagick" = "xyes" || \
++       test "x$with_graphicsmagick" != "xyes"],
++  [looked_for="ImageMagick >= 6.2.6"
++   PKG_CHECK_MODULES([MAGICK], [MagickWand >= 6.2.6],
++     [MAGICK_VERSION=`$PKG_CONFIG MagickWand --modversion`],
++     [dnl
++dnl Wand is deprecated in favor of MagickWand,
++dnl but the latter doesn't exist in older verisons (bug #2848437)
+       saved_error=$MAGICK_PKG_ERRORS
+-      PKG_CHECK_MODULES([MAGICK], [Wand >= 6.2.6], [],
+-        [AC_MSG_FAILURE([dnl
+-Unable to find ImageMagick >= 6.2.6:
++      PKG_CHECK_MODULES([MAGICK], [Wand >= 6.2.6],
++        [MAGICK_VERSION=`$PKG_CONFIG Wand --modversion`],
++        [have_IM="no"])])
++   AS_IF([test "x$have_IM" != "xno"],
++     [magick="ImageMagick"
++      AC_MSG_NOTICE([trying ImageMagick version $MAGICK_VERSION])
++dnl double check ImageMagick install (bug #2582232)
++      CPPFLAGS_save="$CPPFLAGS"
++      CPPFLAGS="$CPPFLAGS $MAGICK_CFLAGS"
++      AC_CHECK_HEADER([wand/MagickWand.h],
++        [have_IM="yes"],
++        [have_IM="broken"])
++      CPPFLAGS="$CPPFLAGS_save"])])
++
++have_GM="maybe"
++AS_IF([test "x$have_IM" = "xyes"], [],
++      [test "x$with_graphicsmagick" = "xno"], [],
++      [test "x$with_graphicsmagick" = "xyes" || \
++       test "x$with_imagemagick" = "xcheck"],
++  [AS_IF([test "x$looked_for" = "x"],
++     [looked_for="GraphicsMagick"],
++     [looked_for="$looked_for or GraphicsMagick"])
++   PKG_CHECK_MODULES([MAGICK], [GraphicsMagickWand],
++     [have_GM="yes"
++      magick="GraphicsMagick"
++      MAGICK_VERSION=`$PKG_CONFIG GraphicsMagickWand --modversion`],
++     [have_GM="no"
++      AS_IF([test "x$saved_error" = "x"],
++        [saved_error=$MAGICK_PKG_ERRORS])])])
++
++dnl now that we have collected all the info abt what Magick is available
++dnl let the user know what we will or can't do
++AS_IF([test "x$have_IM" = "xbroken" && test "x$have_GM" = "xyes"],
++  [AC_MSG_WARN([Your ImageMagick install is broken, using GraphicsMagick instead])])
++
++AS_IF([test "x$have_IM" = "xyes" || test "x$have_GM" = "xyes"],
++  [AC_MSG_NOTICE([using $magick version $MAGICK_VERSION])],
++  [test "x$with_imagemagick" = "xno" && \
++   test "x$with_graphicsmagick" != "xyes"],
++  [AC_MSG_NOTICE([image scanning disabled -- zbarimg will *not* be built])],
++  [test "x$have_IM" = "xbroken"],
++  [AC_MSG_FAILURE([$magick package found but wand/MagickWand.h not installed?!
++this is a problem with your $magick install, please try again after
++resolving the inconsistency or installing GraphicsMagick alternative...])],
++  [AC_MSG_FAILURE([dnl
++Unable to find $looked_for:
+ 
+ $saved_error
+ 
+-* Ensure that you installed any "development" packages for ImageMagick.
++* Ensure that you installed any "development" packages for ImageMagick or
++  GraphicsMagick.
+ * Consider adjusting the PKG_CONFIG_PATH environment variable if you
+   installed software in a non-standard prefix.
+ * You may set the environment variables MAGICK_CFLAGS and MAGICK_LIBS
+   to avoid the need to call pkg-config.
+   See the pkg-config man page for more details.
+-* To avoid using ImageMagick altogether you may add the --without-imagemagick
+-  flag to the configure command; the zbarimg program will not be built.
+-])])])
+-   MAGICK_VERSION=`$PKG_CONFIG MagickWand --modversion`
+-   AC_MSG_NOTICE([using ImageMagick version $MAGICK_VERSION])
++* To avoid using ImageMagick or GraphicsMagick altogether you may add the
++  --without-imagemagick flag to the configure command; the zbarimg program
++  will *not* be built.
++])])
+ 
+-dnl double check ImageMagick install (bug #2582232)
+-   CPPFLAGS_save="$CPPFLAGS"
+-   CPPFLAGS="$CPPFLAGS $MAGICK_CFLAGS"
+-   AC_CHECK_HEADER([wand/MagickWand.h], [],
+-     [AC_MSG_FAILURE([ImageMagick package found but wand/MagickWand.h not installed?!
+-this is a problem with your ImageMagick install,
+-please resolve the inconsistency and try again...])])
+-   CPPFLAGS="$CPPFLAGS_save"])
+-
+-AM_CONDITIONAL([HAVE_MAGICK], [test "x$with_imagemagick" = "xyes"])
++AS_IF([test "x$have_IM" = "xyes"],
++  [AC_DEFINE([HAVE_IMAGEMAGICK], [1], [Define to 1 to use ImageMagick])],
++  [test "x$have_GM" = "xyes"],
++  [AC_DEFINE([HAVE_GRAPHICSMAGICK], [1], [Define to 1 to use GraphicsMagick])])
++AM_CONDITIONAL([HAVE_MAGICK],
++  [test "x$have_IM" = "xyes" || test "x$have_GM" = "xyes"])
+ 
+ dnl Mozilla NPAPI
+ AC_ARG_WITH([npapi],
+   [AS_HELP_STRING([--with-npapi],
+-    [enable support for Firefox/Mozilla/OpenOffice NPAPI plugin])],
++    [enable support for Firefox/Mozilla/OpenOffice plugin])],
+   [],
+   [with_npapi="no"])
+ 
+@@ -350,7 +440,16 @@
+      [test -x "$PYTHON-config"],
+      [PYTHON_CFLAGS=`$PYTHON-config --cflags`],
+      [PYTHON_CFLAGS=`$PYTHON -c 'import distutils.sysconfig as s; print " ".join(s.get_config_vars("CFLAGS")) + " -I"+s.get_python_inc() + " -I"+s.get_python_inc(plat_specific=True)'`])
+-dnl FIXME now should check that #include <Python.h> compiles
++
++dnl check that #include <Python.h> compiles (bug #3092663)
++   CPPFLAGS_save="$CPPFLAGS"
++   CPPFLAGS="$CPPFLAGS $PYTHON_CFLAGS"
++   AC_CHECK_HEADER([Python.h], [], [AC_MSG_ERROR([dnl
++Python module enabled, but unable to compile Python.h.
++Install the development package for python-$am_cv_python_version, or configure
++--without-python to disable the python bindings.dnl
++])])
++   CPPFLAGS="$CPPFLAGS_save"
+ 
+    AS_IF([test "x$with_gtk" = "xyes"],
+      [PKG_CHECK_MODULES([PYGTK], [pygtk-2.0])
+@@ -383,13 +482,39 @@
+ 
+ AM_CONDITIONAL([HAVE_QT], [test "x$with_qt" = "xyes"])
+ 
++dnl Java
++AC_ARG_WITH([java],
++  [AS_HELP_STRING([--without-java],
++    [disable support for Java interface])],
++  [],
++  [with_java="check"])
 +
-+    CVImageBufferRef buf = CMSampleBufferGetImageBuffer(samp);
-+    if(CMSampleBufferGetNumSamples(samp) != 1 ||
-+       !CMSampleBufferIsValid(samp) ||
-+       !CMSampleBufferDataIsReady(samp) ||
-+       !buf) {
-+        zlog(@"ERROR: invalid sample");
-+        goto error;
-+    }
++AC_ARG_VAR([JAVA_CFLAGS], [compiler flags for building JNI extensions])
++AS_IF([test "x$JAVA_CFLAGS" = "x" && test "x$JAVA_HOME" != "x"],
++  [JAVA_CFLAGS="-I$JAVA_HOME/include"])
 +
-+    OSType format = CVPixelBufferGetPixelFormatType(buf);
-+    int planes = CVPixelBufferGetPlaneCount(buf);
++AS_IF([test "x$with_java" != "xno"],
++  [CPPFLAGS_save="$CPPFLAGS"
++   CPPFLAGS="$CPPFLAGS $JAVA_CFLAGS"
++   AC_CHECK_HEADER([jni.h], [], [have_java="no"])
++   CPPFLAGS="$CPPFLAGS_save"
++   AS_IF([test "x$have_java" != "xno"],
++     [with_java="yes"],
++     [test "x$with_java" = "xyes"],
++     [AC_MSG_FAILURE([unable to find Java JNI! ensure CFLAGS are set
++appropriately or configure --without-java])],
++     [with_java="no"])
++])
++AM_CONDITIONAL([HAVE_JAVA], [test "x$with_java" = "xyes"])
 +
-+    if(format != kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange ||
-+       !planes) {
-+        zlog(@"ERROR: invalid buffer format");
-+        goto error;
-+    }
+ 
+ dnl header files
+ 
+ dnl FIXME switches for shm, mmap
+ AC_HEADER_ASSERT
+-AC_CHECK_HEADERS([fcntl.h features.h inttypes.h stdlib.h string.h unistd.h \
+-  sys/ioctl.h sys/time.h sys/times.h sys/ipc.h sys/shm.h sys/mman.h])
++AC_CHECK_HEADERS([errno.h fcntl.h features.h inttypes.h stdlib.h string.h \
++  unistd.h sys/types.h sys/stat.h sys/ioctl.h sys/time.h sys/times.h \
++  sys/ipc.h sys/shm.h sys/mman.h])
+ 
+ dnl types
+ 
+@@ -428,6 +553,7 @@
+ 
+ AC_CONFIG_FILES([
+ Makefile
++java/Makefile
+ zbar.pc
+ zbar-gtk.pc
+ zbar-qt.pc
+@@ -448,8 +574,10 @@
+ echo "jpeg              --with-jpeg=$with_jpeg"
+ AS_IF([test "x$with_jpeg" != "xyes"],
+   [echo "        => JPEG image conversions will *NOT* be supported"])
+-echo "Magick++          --with-imagemagick=$with_imagemagick"
+-AS_IF([test "x$with_imagemagick" != "xyes"],
++AS_IF([test "x$have_GM" = "xyes"],
++  [echo "GraphicsMagick    --with-graphicsmagick=yes"],
++  [echo "ImageMagick       --with-imagemagick=$with_imagemagick"])
++AS_IF([test "x$have_IM" != "xyes" && test "x$have_GM" != "xyes"],
+   [echo "        => the zbarimg file scanner will *NOT* be built"])
+ echo "Python            --with-python=$with_python"
+ echo "GTK+              --with-gtk=$with_gtk"
+@@ -460,6 +588,9 @@
+ echo "Qt4               --with-qt=$with_qt"
+ AS_IF([test "x$with_qt" != "xyes"],
+   [echo "        => the Qt4 widget will *NOT* be built"])
++echo "Java              --with-java=$with_java"
++AS_IF([test "x$with_java" != "xyes"],
++  [echo "        => the Java interface will *NOT* be built"])
+ #echo "NPAPI Plugin     --with-npapi=$with_npapi"
+ #AS_IF([test "x$with_mozilla" != "xyes"],
+ #  [echo "       => the Mozilla/Firefox/OpenOffice plugin will *NOT* be built"])
+diff -r 563557a923d0 doc/Makefile.am.inc
+--- a/doc/Makefile.am.inc	Tue Oct 27 11:25:59 2009 -0400
++++ b/doc/Makefile.am.inc	Fri Feb 22 08:54:29 2013 -0300
+@@ -2,6 +2,7 @@
+ DOCSOURCES = doc/manual.xml doc/version.xml doc/reldate.xml \
+     doc/ref/zbarimg.xml doc/ref/zbarcam.xml doc/ref/commonoptions.xml
+ 
++MAINTAINERCLEANFILES += doc/man/man.stamp doc/version.xml doc/reldate.xml
+ 
+ # man page targets to distribute and install
+ dist_man_MANS =
+diff -r 563557a923d0 doc/api/footer.html
+--- a/doc/api/footer.html	Tue Oct 27 11:25:59 2009 -0400
++++ b/doc/api/footer.html	Fri Feb 22 08:54:29 2013 -0300
+@@ -9,9 +9,12 @@
+ 
+ <address><a href="mailto:spadix@users.sourceforge.net">spadix@users.sourceforge.net</a></address>
+ 
+-<p>Copyright 2008-2009 (c) Jeff Brown - All Rights Reserved.</p>
+-<p>Verbatim copying and distribution of this entire article are
+-  permitted worldwide, without royalty, in any medium, provided this
+-  notice, and the copyright notice, are preserved.</p>
++<p>Copyright 2008-2010 (c) Jeff Brown</p>
++<p>This documentation is part of the ZBar Barcode Reader; you can
++redistribute it and/or modify it under the terms of the
++<a href="http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html">GNU
++Lesser General Public License</a> as published by the Free Software
++Foundation; either version 2.1 of the License, or (at your option) any
++later version.</p>
+ 
+ </body></html>
+diff -r 563557a923d0 doc/manual.xml
+--- a/doc/manual.xml	Tue Oct 27 11:25:59 2009 -0400
++++ b/doc/manual.xml	Fri Feb 22 08:54:29 2013 -0300
+@@ -29,10 +29,10 @@
+       <year>2007</year>
+       <year>2008</year>
+       <year>2009</year>
++      <year>2010</year>
+       <holder>Jeff Brown</holder>
+     </copyright>
+     <legalnotice><para>All Rights Reserved</para></legalnotice>
+-    <!-- <legalnotice><para>insert GNU FDL header?</para></legalnotice> -->
+   </bookinfo>
+ 
+   <chapter id="intro">
+@@ -47,7 +47,4 @@
+     &refzbarimg;
+ 
+   </reference>
+-
+-  <!-- insert GNU FDL? -->
+-
+ </book>
+diff -r 563557a923d0 doc/ref/commonoptions.xml
+--- a/doc/ref/commonoptions.xml	Tue Oct 27 11:25:59 2009 -0400
++++ b/doc/ref/commonoptions.xml	Fri Feb 22 08:54:29 2013 -0300
+@@ -47,8 +47,9 @@
+       <option>ean13</option>, <option>ean8</option>,
+       <option>upca</option>, <option>upce</option>,
+       <option>isbn13</option>, <option>isbn10</option>,
+-      <option>i25</option>, <option>code39</option>,
+-      <option>code128</option> or the special value <option>*</option>.
++      <option>i25</option>, <option>codabar</option>, <option>code39</option>,
++      <option>code93</option>, <option>code128</option>,
++      <option>qrcode</option> or the special value <option>*</option>.
+       If <replaceable class="parameter">symbology</replaceable> is
+       omitted or <option>*</option>, the <replaceable
+       class="parameter">config</replaceable> will be set for all
+@@ -128,11 +129,12 @@
+           If a decode result is outside the configured min/max range
+           (inclusive), it will not be reported.  Set to 0 to disable the
+           corresponding check.  This setting applies to variable-length
+-          symbologies: <option>i25</option>, <option>code39</option>,
+-          <option>code128</option> and <option>pdf417</option>.
+-          <option>min-length</option> defaults to 6 for <option>i25</option>
+-          and 1 for <option>code39</option> (per Code 39 autodiscrimination
+-          recommendation); all others default to 0</simpara>
++          symbologies: <option>i25</option>, <option>codabar</option>,
++          <option>code39</option>, <option>code128</option> and
++          <option>pdf417</option>. <option>min-length</option> defaults to 6
++          for <option>i25</option> and 1 for <option>code39</option> (per Code
++          39 autodiscrimination recommendation); all others default to
++          0</simpara>
+         </listitem>
+       </varlistentry>
+ 
+diff -r 563557a923d0 doc/ref/zbarcam.xml
+--- a/doc/ref/zbarcam.xml	Tue Oct 27 11:25:59 2009 -0400
++++ b/doc/ref/zbarcam.xml	Fri Feb 22 08:54:29 2013 -0300
+@@ -60,9 +60,10 @@
+     <filename>/dev/video0</filename></para>
+ 
+     <para>The underlying library currently supports EAN-13 (including
+-    UPC and ISBN subsets), EAN-8, Code 128, Code 39, and Interleaved
+-    2 of 5 symbologies.  The specific type of each detected symbol is
+-    printed with the decoded data.</para>
++    UPC and ISBN subsets), EAN-8, DataBar, DataBar Expanded, Code 128,
++    Code 93, Code 39, Codabar, Interleaved 2 of 5 and QR Code symbologies.
++    The specific type of each detected symbol is printed with the decoded
++    data.</para>
+ 
+   </refsection>
+ 
+@@ -160,6 +161,37 @@
+   </refsection>
+ 
+   <refsection>
++    <title>Exit Status</title>
 +
-+    int w = CVPixelBufferGetBytesPerRowOfPlane(buf, 0);
-+    int h = CVPixelBufferGetHeightOfPlane(buf, 0);
-+    CVReturn rc =
-+        CVPixelBufferLockBaseAddress(buf, kCVPixelBufferLock_ReadOnly);
-+    if(!w || !h || rc) {
-+        zlog(@"ERROR: invalid buffer data");
-+        goto error;
-+    }
++    <para><command>zbarcam</command> returns an exit code to indicate the
++    status of the program execution. Current exit codes are:</para>
 +
-+    void *data = CVPixelBufferGetBaseAddressOfPlane(buf, 0);
-+    if(data) {
-+        [image setData: data
-+               withLength: w * h];
++    <variablelist>
++      <varlistentry>
++        <term>0</term>
++        <listitem>
++          <para>Successful program completion.</para>
++        </listitem>
++      </varlistentry>
 +
-+        BOOL doTrack = NO;
-+        int ngood = 0;
-+        ZBarSymbolSet *syms = nil;
-+        @synchronized(scanner) {
-+            if(width != w || height != h) {
-+                width = w;
-+                height = h;
-+                CGSize _size = CGSizeMake(w, h);
-+                CFDictionaryRef sized =
-+                    CGSizeCreateDictionaryRepresentation(_size);
-+                if(sized) {
-+                    [self performSelectorOnMainThread: @selector(updateSize:)
-+                          withObject: (id)sized
-+                          waitUntilDone: NO];
-+                    CFRelease(sized);
-+                }
-+                image.size = _size;
-+                [self cropUpdate];
-+            }
++      <varlistentry>
++        <term>1</term>
++        <listitem>
++          <para>An error occurred.  This includes bad arguments and I/O
++          errors.</para>
++        </listitem>
++      </varlistentry>
 +
-+            ngood = [scanner scanImage: image];
-+            syms = scanner.results;
-+            doTrack = [captureDelegate respondsToSelector:
-+                          @selector(captureReader:didTrackSymbols:)];
-+        }
-+        now = timer_now();
++      <varlistentry>
++        <term>2</term>
++        <listitem>
++          <para>A fatal error occurred.</para>
++        </listitem>
++      </varlistentry>
++    </variablelist>
++  </refsection>
 +
-+        if(ngood >= 0) {
-+            // return unfiltered results for tracking feedback
-+            syms.filterSymbols = NO;
-+            int nraw = syms.count;
-+            if(nraw > 0)
-+                zlog(@"scan image: %dx%d crop=%@ ngood=%d nraw=%d",
-+                     w, h, NSStringFromCGRect(image.crop), ngood, nraw);
++  <refsection>
+     <title>See Also</title>
+     <para><xref linkend="zbarimg"/></para>
+     <para><link xlink:href="http://zbar.sf.net/"/></para>
+diff -r 563557a923d0 doc/ref/zbarimg.xml
+--- a/doc/ref/zbarimg.xml	Tue Oct 27 11:25:59 2009 -0400
++++ b/doc/ref/zbarimg.xml	Fri Feb 22 08:54:29 2013 -0300
+@@ -59,9 +59,10 @@
+     displayed to the screen.</para>
+ 
+     <para>The underlying library currently supports EAN-13 (including
+-    UPC and ISBN subsets), EAN-8, Code 128, Code 39, and Interleaved
+-    2 of 5 symbologies.  The specific type of each detected symbol is
+-    printed with the decoded data.</para>
++    UPC and ISBN subsets), EAN-8, DataBar, DataBar Expanded, Code 128,
++    Code 93, Code 39, Codabar, Interleaved 2 of 5 and QR Code symbologies.
++    The specific type of each detected symbol is printed with the decoded
++    data.</para>
+ 
+     <para>Note that "<filename><replaceable>image</replaceable></filename>"
+ 
+@@ -166,6 +167,56 @@
+   </refsection>
+ 
+   <refsection>
++    <title>Exit Status</title>
 +
-+            if(ngood) {
-+                // copy image data so we can release the buffer
-+                result.size = CGSizeMake(w, h);
-+                result.pixelBuffer = buf;
-+                result.symbols = syms;
-+                t_scan = now;
-+                OSAtomicCompareAndSwap32Barrier(1, 2, &running);
-+                [self performSelectorOnMainThread:
-+                          @selector(didReadNewSymbolsFromImage:)
-+                      withObject: result
-+                      waitUntilDone: NO];
-+                [self initResult];
-+            }
++    <para><command>zbarimg</command> returns an exit code to indicate the
++    status of the program execution. Current exit codes are:</para>
 +
-+            if(nraw && doTrack)
-+                [self performSelectorOnMainThread:
-+                          @selector(didTrackSymbols:)
-+                      withObject: syms
-+                      waitUntilDone: NO];
-+        }
-+        [image setData: NULL
-+               withLength: 0];
-+    }
-+    else
-+        zlog(@"ERROR: invalid data");
-+    CVPixelBufferUnlockBaseAddress(buf, kCVPixelBufferLock_ReadOnly);
++    <variablelist>
++      <varlistentry>
++        <term>0</term>
++        <listitem>
++          <para>Barcodes successfully detected in all images. Warnings may
++          have been generated, but no errors.</para>
++        </listitem>
++      </varlistentry>
 +
-+ error:
-+    [pool release];
-+}
++      <varlistentry>
++        <term>1</term>
++        <listitem>
++          <para>An error occurred while processing some image(s).  This
++          includes bad arguments, I/O errors and image handling errors from
++          ImageMagick.</para>
++        </listitem>
++      </varlistentry>
 +
-+@end
-diff --git a/iphone/ZBarHelpController.m b/iphone/ZBarHelpController.m
-new file mode 100644
---- /dev/null
-+++ b/iphone/ZBarHelpController.m
-@@ -0,0 +1,271 @@
-+//------------------------------------------------------------------------
-+//  Copyright 2009-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-+//
-+//  This file is part of the ZBar Bar Code Reader.
-+//
-+//  The ZBar Bar Code Reader is free software; you can redistribute it
-+//  and/or modify it under the terms of the GNU Lesser Public License as
-+//  published by the Free Software Foundation; either version 2.1 of
-+//  the License, or (at your option) any later version.
-+//
-+//  The ZBar Bar Code Reader is distributed in the hope that it will be
-+//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-+//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+//  GNU Lesser Public License for more details.
-+//
-+//  You should have received a copy of the GNU Lesser Public License
-+//  along with the ZBar Bar Code Reader; if not, write to the Free
-+//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-+//  Boston, MA  02110-1301  USA
-+//
-+//  http://sourceforge.net/projects/zbar
-+//------------------------------------------------------------------------
++      <varlistentry>
++        <term>2</term>
++        <listitem>
++          <para>ImageMagick fatal error.</para>
++        </listitem>
++      </varlistentry>
 +
-+#import <ZBarSDK/ZBarHelpController.h>
++      <varlistentry>
++        <term>3</term>
++        <listitem>
++          <para>The user quit the program before all images were scanned.
++          Only applies when running in interactive mode
++          (with <option>--display</option>)</para>
++        </listitem>
++      </varlistentry>
 +
-+@implementation ZBarHelpController
++      <varlistentry>
++        <term>4</term>
++        <listitem>
++          <para>No barcode was detected in one or more of the images.  No
++          other errors occurred.</para>
++        </listitem>
++      </varlistentry>
++    </variablelist>
++  </refsection>
 +
-+@synthesize delegate;
++  <refsection>
+     <title>See Also</title>
+     <para><xref linkend="zbarcam"/></para>
+     <para><link xlink:href="http://zbar.sf.net/"/></para>
+diff -r 563557a923d0 examples/paginate.pl
+--- a/examples/paginate.pl	Tue Oct 27 11:25:59 2009 -0400
++++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
+@@ -1,71 +0,0 @@
+-#!/usr/bin/perl
+-#------------------------------------------------------------------------
+-#  Copyright 2009 (c) Jeff Brown <spadix@users.sourceforge.net>
+-#
+-#  This file is part of the ZBar Bar Code Reader.
+-#
+-#  The ZBar Bar Code Reader is free software; you can redistribute it
+-#  and/or modify it under the terms of the GNU Lesser Public License as
+-#  published by the Free Software Foundation; either version 2.1 of
+-#  the License, or (at your option) any later version.
+-#
+-#  The ZBar Bar Code Reader is distributed in the hope that it will be
+-#  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+-#  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-#  GNU Lesser Public License for more details.
+-#
+-#  You should have received a copy of the GNU Lesser Public License
+-#  along with the ZBar Bar Code Reader; if not, write to the Free
+-#  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+-#  Boston, MA  02110-1301  USA
+-#
+-#  http://sourceforge.net/projects/zbar
+-#------------------------------------------------------------------------
+-use warnings;
+-use strict;
+-
+-use Barcode::ZBar;
+-use Image::Magick;
+-
+-warn("no input files specified?\n") if(!@ARGV);
+-
+-# running output document
+-my $out = undef;
+-
+-# barcode scanner
+-my $scanner = Barcode::ZBar::ImageScanner->new();
+-
+-foreach my $file (@ARGV) {
+-    print "scanning from \"$file\"\n";
+-    my $imseq = Image::Magick->new();
+-    my $err = $imseq->Read($file);
+-    warn($err) if($err);
+-
+-    foreach my $page (@$imseq) {
+-        # convert ImageMagick page to ZBar image
+-        my $zimg = Barcode::ZBar::Image->new();
+-        $zimg->set_format('Y800');
+-        $zimg->set_size($page->Get(qw(columns rows)));
+-        $zimg->set_data($page->Clone()->ImageToBlob(magick => 'GRAY', depth => 8));
+-
+-        # scan for barcodes
+-        if($scanner->scan_image($zimg)) {
+-            # write out previous document
+-            $out->write() if($out);
+-
+-            # use first symbol found to name next image (FIXME sanitize)
+-            my $data = ($zimg->get_symbols())[0]->get_data();
+-            my $idx = $page->Get('scene') + 1;
+-            print "splitting $data from page $idx\n";
+-
+-            # create new output document
+-            $out = Image::Magick->new(filename => $data);
+-        }
+-
+-        # append this page to current output
+-        push(@$out, $page) if($out);
+-    }
+-
+-    # write out final document
+-    $out->write() if($out);
+-}
+diff -r 563557a923d0 examples/processor.c
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/examples/processor.c	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,47 @@
++#include <stdio.h>
++#include <zbar.h>
 +
-+- (id) initWithReason: (NSString*) _reason
++static void my_handler (zbar_image_t *image,
++                        const void *userdata)
 +{
-+    self = [super init];
-+    if(!self)
-+        return(nil);
-+
-+    if(!_reason)
-+        _reason = @"INFO";
-+    reason = [_reason retain];
-+    orientations = ((1 << UIInterfaceOrientationPortrait) |
-+                    (1 << UIInterfaceOrientationPortraitUpsideDown) |
-+                    (1 << UIInterfaceOrientationLandscapeLeft) |
-+                    (1 << UIInterfaceOrientationLandscapeRight));
-+
-+    return(self);
++    /* extract results */
++    const zbar_symbol_t *symbol = zbar_image_first_symbol(image);
++    for(; symbol; symbol = zbar_symbol_next(symbol)) {
++        /* do something useful with results */
++        zbar_symbol_type_t typ = zbar_symbol_get_type(symbol);
++        const char *data = zbar_symbol_get_data(symbol);
++        printf("decoded %s symbol \"%s\"\n",
++               zbar_get_symbol_name(typ), data);
++    }
 +}
 +
-+- (id) init
++int main (int argc, char **argv)
 +{
-+    return([self initWithReason: nil]);
-+}
++    const char *device = "/dev/video0";
 +
-+- (void) cleanup
-+{
-+    [toolbar release];
-+    toolbar = nil;
-+    [webView release];
-+    webView = nil;
-+    [doneBtn release];
-+    doneBtn = nil;
-+    [backBtn release];
-+    backBtn = nil;
-+    [space release];
-+    space = nil;
-+}
++    /* create a Processor */
++    zbar_processor_t *proc = zbar_processor_create(1);
 +
-+- (void) dealloc
-+{
-+    [self cleanup];
-+    [reason release];
-+    reason = nil;
-+    [linkURL release];
-+    linkURL = nil;
-+    [super dealloc];
-+}
-+
-+- (void) layoutSubviewsForOrientation: (UIInterfaceOrientation) orient
-+{
-+    CGFloat h;
-+    if(orient == UIInterfaceOrientationPortrait ||
-+       orient == UIInterfaceOrientationPortraitUpsideDown)
-+        h = 44;
-+    else
-+        h = 32;
-+    CGRect r = self.view.bounds;
-+    r.origin.y += r.size.height - h;
-+    r.size.height = h;
-+    toolbar.frame = r;
-+
-+    r = self.view.bounds;
-+    r.size.height -= h;
-+    webView.frame = r;
-+}
-+
-+- (void) viewDidLoad
-+{
-+    [super viewDidLoad];
-+
-+    UIView *view = self.view;
-+    view.backgroundColor = [UIColor colorWithWhite: .125f
-+                                    alpha: 1];
-+    view.autoresizingMask = (UIViewAutoresizingFlexibleWidth |
-+                             UIViewAutoresizingFlexibleHeight);
-+
-+    webView = [UIWebView new];
-+    webView.delegate = self;
-+    webView.backgroundColor = [UIColor colorWithWhite: .125f
-+                                       alpha: 1 ];
-+    webView.autoresizingMask = (UIViewAutoresizingFlexibleWidth |
-+                                UIViewAutoresizingFlexibleHeight);
-+
-+    toolbar = [UIToolbar new];
-+    toolbar.barStyle = UIBarStyleBlackOpaque;
-+    toolbar.autoresizingMask = (UIViewAutoresizingFlexibleWidth |
-+                                UIViewAutoresizingFlexibleTopMargin);
-+
-+    doneBtn = [[UIBarButtonItem alloc]
-+                  initWithBarButtonSystemItem: UIBarButtonSystemItemDone
-+                  target: self
-+                  action: @selector(dismiss)];
-+
-+    backBtn = [[UIBarButtonItem alloc]
-+                  initWithImage: [UIImage imageNamed: @"zbar-back.png"]
-+                  style: UIBarButtonItemStylePlain
-+                  target: webView
-+                  action: @selector(goBack)];
-+
-+    space = [[UIBarButtonItem alloc]
-+                initWithBarButtonSystemItem:
-+                    UIBarButtonSystemItemFlexibleSpace
-+                target: nil
-+                action: nil];
-+
-+    toolbar.items = [NSArray arrayWithObjects: space, doneBtn, nil];
++    /* configure the Processor */
++    zbar_processor_set_config(proc, 0, ZBAR_CFG_ENABLE, 1);
 +
-+    [view addSubview: toolbar];
++    /* initialize the Processor */
++    if(argc > 1)
++        device = argv[1];
++    zbar_processor_init(proc, device, 1);
 +
-+    UIInterfaceOrientation orient = self.interfaceOrientation;
-+    if(!((orientations >> orient) & 1))
-+        for(orient = UIInterfaceOrientationPortrait;
-+            (orientations >> orient) && !((orientations >> orient) & 1);
-+            orient++);
-+    [self layoutSubviewsForOrientation: orient];
++    /* setup a callback */
++    zbar_processor_set_data_handler(proc, my_handler, NULL);
 +
-+    NSString *path = [[NSBundle mainBundle]
-+                         pathForResource: @"zbar-help"
-+                         ofType: @"html"];
++    /* enable the preview window */
++    zbar_processor_set_visible(proc, 1);
++    zbar_processor_set_active(proc, 1);
 +
-+    NSURLRequest *req = nil;
-+    if(path) {
-+        NSURL *url = [NSURL fileURLWithPath: path
-+                            isDirectory: NO];
-+        if(url)
-+            req = [NSURLRequest requestWithURL: url];
-+    }
-+    if(req)
-+        [webView loadRequest: req];
-+    else
-+        NSLog(@"ERROR: unable to load zbar-help.html from bundle");
-+}
++    /* keep scanning until user provides key/mouse input */
++    zbar_processor_user_wait(proc, -1);
 +
-+- (void) viewDidUnload
-+{
-+    [self cleanup];
-+    [super viewDidUnload];
-+}
++    /* clean up */
++    zbar_processor_destroy(proc);
 +
-+- (void) viewWillAppear: (BOOL) animated
-+{
-+    assert(webView);
-+    if(webView.loading)
-+        [webView removeFromSuperview];
-+    [super viewWillAppear: animated];
++    return(0);
 +}
+diff -r 563557a923d0 examples/processor.cpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/examples/processor.cpp	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,45 @@
++#include <iostream>
++#include <zbar.h>
 +
-+- (void) viewWillDisappear: (BOOL) animated
-+{
-+    [webView stopLoading];
-+    webView.delegate = nil;
-+    [super viewWillDisappear: animated];
-+}
++using namespace std;
++using namespace zbar;
 +
-+- (BOOL) shouldAutorotateToInterfaceOrientation: (UIInterfaceOrientation) orient
++class MyHandler : public Image::Handler
 +{
-+    return([self isInterfaceOrientationSupported: orient]);
-+}
++    void image_callback (Image &image)
++    {
++        for(SymbolIterator symbol = image.symbol_begin();
++            symbol != image.symbol_end();
++            ++symbol)
++            cout << "decoded " << symbol->get_type_name() << " symbol "
++                 << "\"" << symbol->get_data() << "\"" << endl;
++    }
++};
 +
-+- (void) willAnimateRotationToInterfaceOrientation: (UIInterfaceOrientation) orient
-+                                          duration: (NSTimeInterval) duration
++int main (int argc, char **argv)
 +{
-+    [self layoutSubviewsForOrientation: orient];
-+    [webView reload];
-+}
++    // create and initialize a Processor
++    const char *device = "/dev/video0";
++    if(argc > 1)
++        device = argv[1];
++    Processor proc(true, device);
 +
-+- (BOOL) isInterfaceOrientationSupported: (UIInterfaceOrientation) orient
-+{
-+    return((orientations >> orient) & 1);
-+}
++    // configure the Processor
++    proc.set_config(ZBAR_NONE, ZBAR_CFG_ENABLE, 1);
 +
-+- (void) setInterfaceOrientation: (UIInterfaceOrientation) orient
-+                       supported: (BOOL) supported
-+{
-+    NSUInteger mask = 1 << orient;
-+    if(supported)
-+        orientations |= mask;
-+    else
-+        orientations &= ~mask;
-+}
++    // setup a callback
++    MyHandler my_handler;
++    proc.set_handler(my_handler);
 +
-+- (void) dismiss
-+{
-+    if([delegate respondsToSelector: @selector(helpControllerDidFinish:)])
-+        [delegate helpControllerDidFinish: self];
-+    else
-+        [self dismissModalViewControllerAnimated: YES];
-+}
++    // enable the preview window
++    proc.set_visible();
++    proc.set_active();
 +
-+- (void) webViewDidFinishLoad: (UIWebView*) view
-+{
-+    if(!view.superview) {
-+        [view stringByEvaluatingJavaScriptFromString:
-+            [NSString stringWithFormat:
-+                @"onZBarHelp({reason:\"%@\"});", reason]];
-+        [UIView beginAnimations: @"ZBarHelp"
-+                context: nil];
-+        [self.view addSubview: webView];
-+        [UIView commitAnimations];
++    try {
++        // keep scanning until user provides key/mouse input
++        proc.user_wait();
 +    }
-+
-+    BOOL canGoBack = [view canGoBack];
-+    NSArray *items = toolbar.items;
-+    if(canGoBack != ([items objectAtIndex: 0] == backBtn)) {
-+        if(canGoBack)
-+            items = [NSArray arrayWithObjects: backBtn, space, doneBtn, nil];
-+        else
-+            items = [NSArray arrayWithObjects: space, doneBtn, nil];
-+        [toolbar setItems: items
-+                 animated: YES];
++    catch(ClosedError &e) {
 +    }
++    return(0);
 +}
-+
-+- (BOOL)             webView: (UIWebView*) view
-+  shouldStartLoadWithRequest: (NSURLRequest*) req
-+              navigationType: (UIWebViewNavigationType) nav
-+{
-+    NSURL *url = [req URL];
-+    if([url isFileURL])
-+        return(YES);
-+
-+    linkURL = [url retain];
-+    UIAlertView *alert =
-+        [[UIAlertView alloc]
-+            initWithTitle: @"Open External Link"
-+            message: @"Close this application and open link in Safari?"
-+            delegate: nil
-+            cancelButtonTitle: @"Cancel"
-+            otherButtonTitles: @"OK", nil];
-+    alert.delegate = self;
-+    [alert show];
-+    [alert release];
-+    return(NO);
-+}
-+
-+- (void)     alertView: (UIAlertView*) view
-+  clickedButtonAtIndex: (NSInteger) idx
-+{
-+    if(idx)
-+        [[UIApplication sharedApplication]
-+            openURL: linkURL];
-+}
-+
-+@end
-diff --git a/iphone/ZBarImage.m b/iphone/ZBarImage.m
-new file mode 100644
---- /dev/null
-+++ b/iphone/ZBarImage.m
-@@ -0,0 +1,306 @@
-+//------------------------------------------------------------------------
-+//  Copyright 2009-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-+//
-+//  This file is part of the ZBar Bar Code Reader.
-+//
-+//  The ZBar Bar Code Reader is free software; you can redistribute it
-+//  and/or modify it under the terms of the GNU Lesser Public License as
-+//  published by the Free Software Foundation; either version 2.1 of
-+//  the License, or (at your option) any later version.
-+//
-+//  The ZBar Bar Code Reader is distributed in the hope that it will be
-+//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-+//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+//  GNU Lesser Public License for more details.
-+//
-+//  You should have received a copy of the GNU Lesser Public License
-+//  along with the ZBar Bar Code Reader; if not, write to the Free
-+//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-+//  Boston, MA  02110-1301  USA
-+//
-+//  http://sourceforge.net/projects/zbar
-+//------------------------------------------------------------------------
-+
-+#import <UIKit/UIKit.h>
-+#import <ZBarSDK/ZBarImage.h>
-+#import "debug.h"
-+
-+static void image_cleanup(zbar_image_t *zimg)
-+{
-+    ZBarImage *image = zbar_image_get_userdata(zimg);
-+    [image cleanup];
-+}
-+
-+@implementation ZBarImage
-+
-+@dynamic format, sequence, size, crop, data, dataLength, symbols, zbarImage,
-+    UIImage;
-+
-++ (unsigned long) fourcc: (NSString*) format
-+{
-+    return(zbar_fourcc_parse([format UTF8String]));
-+}
-+
-+- (id) initWithImage: (zbar_image_t*) image
-+{
-+    if(!image) {
-+        [self release];
-+        return(nil);
-+    }
-+    if(self = [super init]) {
-+        zimg = image;
-+        zbar_image_ref(image, 1);
-+        zbar_image_set_userdata(zimg, self);
-+    }
-+    return(self);
-+}
-+
-+- (id) init
-+{
-+    zbar_image_t *image = zbar_image_create();
-+    self = [self initWithImage: image];
-+    zbar_image_ref(image, -1);
-+    return(self);
-+}
-+
-+- (void) dealloc
-+{
-+    if(zimg) {
-+        zbar_image_ref(zimg, -1);
-+        zimg = NULL;
-+    }
-+    [super dealloc];
-+}
-+
-+- (id) initWithCGImage: (CGImageRef) image
-+                  crop: (CGRect) crop
-+                  size: (CGSize) size
-+{
-+    if(!(self = [self init]))
-+        return(nil);
-+    uint64_t t_start = timer_now();
-+
-+    unsigned int w = size.width + 0.5;
-+    unsigned int h = size.height + 0.5;
-+
-+    unsigned long datalen = w * h;
-+    uint8_t *raw = malloc(datalen);
-+    if(!raw) {
-+        [self release];
-+        return(nil);
-+    }
-+
-+    zbar_image_set_data(zimg, raw, datalen, zbar_image_free_data);
-+    zbar_image_set_format(zimg, zbar_fourcc('Y','8','0','0'));
-+    zbar_image_set_size(zimg, w, h);
-+
-+    // scale and crop simultaneously
-+    CGFloat scale = size.width / crop.size.width;
-+    crop.origin.x *= -scale;
-+    crop.size.width = scale * (CGFloat)CGImageGetWidth(image);
-+    scale = size.height / crop.size.height;
-+    CGFloat height = CGImageGetHeight(image);
-+    // compensate for wacky origin
-+    crop.origin.y = height - crop.origin.y - crop.size.height;
-+    crop.origin.y *= -scale;
-+    crop.size.height = scale * height;
-+
-+    // generate grayscale image data
-+    CGColorSpaceRef cs = CGColorSpaceCreateDeviceGray();
-+    CGContextRef ctx =
-+        CGBitmapContextCreate(raw, w, h, 8, w, cs, kCGImageAlphaNone);
-+    CGColorSpaceRelease(cs);
-+    CGContextSetAllowsAntialiasing(ctx, 0);
-+
-+    CGContextDrawImage(ctx, crop, image);
-+
-+#if 0
-+    zlog(@"convert image %dx%d: crop %g,%g %gx%g size %gx%g (%dx%d)",
-+         CGImageGetWidth(image), CGImageGetHeight(image),
-+         crop.origin.x, crop.origin.y, crop.size.width, crop.size.height,
-+         size.width, size.height, w, h);
-+    CGImageRef cgdump = CGBitmapContextCreateImage(ctx);
-+    UIImage *uidump = [[UIImage alloc]
-+                          initWithCGImage: cgdump];
-+    CGImageRelease(cgdump);
-+    UIImageWriteToSavedPhotosAlbum(uidump, nil, nil, NULL);
-+    [uidump release];
+diff -r 563557a923d0 examples/processor.pl
+--- a/examples/processor.pl	Tue Oct 27 11:25:59 2009 -0400
++++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
+@@ -1,35 +0,0 @@
+-#!/usr/bin/env perl
+-use warnings;
+-use strict;
+-require Barcode::ZBar;
+-
+-# create a Processor
+-my $proc = Barcode::ZBar::Processor->new();
+-
+-# configure the Processor
+-$proc->parse_config("enable");
+-
+-# initialize the Processor
+-$proc->init($ARGV[0] || '/dev/video0');
+-
+-# setup a callback
+-sub my_handler {
+-    my ($proc, $image, $closure) = @_;
+-
+-    # extract results
+-    foreach my $symbol ($proc->get_results()) {
+-        # do something useful with results
+-        print('decoded ' . $symbol->get_type() .
+-              ' symbol "' . $symbol->get_data() . "\"\n");
+-    }
+-}
+-$proc->set_data_handler(\&my_handler);
+-
+-# enable the preview window
+-$proc->set_visible();
+-
+-# initiate scanning
+-$proc->set_active();
+-
+-# keep scanning until user provides key/mouse input
+-$proc->user_wait();
+diff -r 563557a923d0 examples/processor.py
+--- a/examples/processor.py	Tue Oct 27 11:25:59 2009 -0400
++++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
+@@ -1,35 +0,0 @@
+-#!/usr/bin/python
+-from sys import argv
+-import zbar
+-
+-# create a Processor
+-proc = zbar.Processor()
+-
+-# configure the Processor
+-proc.parse_config('enable')
+-
+-# initialize the Processor
+-device = '/dev/video0'
+-if len(argv) > 1:
+-    device = argv[1]
+-proc.init(device)
+-
+-# setup a callback
+-def my_handler(proc, image, closure):
+-    # extract results
+-    for symbol in image.symbols:
+-        # do something useful with results
+-        print 'decoded', symbol.type, 'symbol', '"%s"' % symbol.data
+-
+-proc.set_data_handler(my_handler)
+-
+-# enable the preview window
+-proc.visible = True
+-
+-# initiate scanning
+-proc.active = True
+-try:
+-    # keep scanning until user provides key/mouse input
+-    proc.user_wait()
+-except zbar.WindowClosed, e:
+-    pass
+diff -r 563557a923d0 examples/read_one.pl
+--- a/examples/read_one.pl	Tue Oct 27 11:25:59 2009 -0400
++++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
+@@ -1,29 +0,0 @@
+-#!/usr/bin/env perl
+-use warnings;
+-use strict;
+-require Barcode::ZBar;
+-
+-# create a Processor
+-my $proc = Barcode::ZBar::Processor->new();
+-
+-# configure the Processor
+-$proc->parse_config("enable");
+-
+-# initialize the Processor
+-$proc->init($ARGV[0] || '/dev/video0');
+-
+-# enable the preview window
+-$proc->set_visible();
+-
+-# read at least one barcode (or until window closed)
+-$proc->process_one();
+-
+-# hide the preview window
+-$proc->set_visible(0);
+-
+-# extract results
+-foreach my $symbol ($proc->get_results()) {
+-  # do something useful with results
+-  print('decoded ' . $symbol->get_type() .
+-        ' symbol "' . $symbol->get_data() . "\"\n");
+-}
+diff -r 563557a923d0 examples/read_one.py
+--- a/examples/read_one.py	Tue Oct 27 11:25:59 2009 -0400
++++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
+@@ -1,29 +0,0 @@
+-#!/usr/bin/python
+-from sys import argv
+-import zbar
+-
+-# create a Processor
+-proc = zbar.Processor()
+-
+-# configure the Processor
+-proc.parse_config('enable')
+-
+-# initialize the Processor
+-device = '/dev/video0'
+-if len(argv) > 1:
+-    device = argv[1]
+-proc.init(device)
+-
+-# enable the preview window
+-proc.visible = True
+-
+-# read at least one barcode (or until window closed)
+-proc.process_one()
+-
+-# hide the preview window
+-proc.visible = False
+-
+-# extract results
+-for symbol in proc.results:
+-    # do something useful with results
+-    print 'decoded', symbol.type, 'symbol', '"%s"' % symbol.data
+diff -r 563557a923d0 examples/scan_image.c
+--- a/examples/scan_image.c	Tue Oct 27 11:25:59 2009 -0400
++++ b/examples/scan_image.c	Fri Feb 22 08:54:29 2013 -0300
+@@ -3,6 +3,20 @@
+ #include <png.h>
+ #include <zbar.h>
+ 
++#if !defined(PNG_LIBPNG_VER) || \
++    PNG_LIBPNG_VER < 10018 ||   \
++    (PNG_LIBPNG_VER > 10200 &&  \
++     PNG_LIBPNG_VER < 10209)
++  /* Changes to Libpng from version 1.2.42 to 1.4.0 (January 4, 2010)
++   * ...
++   * 2. m. The function png_set_gray_1_2_4_to_8() was removed. It has been
++   *       deprecated since libpng-1.0.18 and 1.2.9, when it was replaced with
++   *       png_set_expand_gray_1_2_4_to_8() because the former function also
++   *       expanded palette images.
++   */
++# define png_set_expand_gray_1_2_4_to_8 png_set_gray_1_2_4_to_8
 +#endif
 +
-+    CGContextRelease(ctx);
-+
-+    t_convert = timer_elapsed(t_start, timer_now());
-+    return(self);
-+}
-+
-+- (id) initWithCGImage: (CGImageRef) image
-+                  size: (CGSize) size
-+{
-+    CGRect crop = CGRectMake(0, 0,
-+                             CGImageGetWidth(image),
-+                             CGImageGetHeight(image));
-+    return([self initWithCGImage: image
-+                 crop: crop
-+                 size: size]);
-+}
-+
-+- (id) initWithCGImage: (CGImageRef) image
-+{
-+    CGRect crop = CGRectMake(0, 0,
-+                             CGImageGetWidth(image),
-+                             CGImageGetHeight(image));
-+    return([self initWithCGImage: image
-+                 crop: crop
-+                 size: crop.size]);
-+}
-+
-+- (zbar_image_t*) image
-+{
-+    return(zimg);
-+}
-+
-+- (unsigned long) format
-+{
-+    return(zbar_image_get_format(zimg));
-+}
-+
-+- (void) setFormat: (unsigned long) format
-+{
-+    zbar_image_set_format(zimg, format);
-+}
-+
-+- (unsigned) sequence
-+{
-+    return(zbar_image_get_sequence(zimg));
-+}
-+
-+- (void) setSequence: (unsigned) seq
-+{
-+    zbar_image_set_sequence(zimg, seq);
-+}
-+
-+- (CGSize) size
-+{
-+    unsigned w, h;
-+    zbar_image_get_size(zimg, &w, &h);
-+    return(CGSizeMake(w, h));
-+}
-+
-+- (void) setSize: (CGSize) size
-+{
-+    zbar_image_set_size(zimg, size.width + .5, size.height + .5);
-+}
-+
-+- (CGRect) crop
-+{
-+    unsigned x, y, w, h;
-+    zbar_image_get_crop(zimg, &x, &y, &w, &h);
-+    return(CGRectMake(x, y, w, h));
-+}
-+
-+- (void) setCrop: (CGRect) crop
-+{
-+    zbar_image_set_crop(zimg, crop.origin.x + .5, crop.origin.y + .5,
-+                        crop.size.width + .5, crop.size.height + .5);
-+}
-+
-+- (ZBarSymbolSet*) symbols
-+{
-+    return([[[ZBarSymbolSet alloc]
-+                initWithSymbolSet: zbar_image_get_symbols(zimg)]
-+               autorelease]);
-+}
+ zbar_image_scanner_t *scanner = NULL;
+ 
+ /* to complete a runnable example, this abbreviated implementation of
+@@ -30,7 +44,7 @@
+     if(color & PNG_COLOR_TYPE_PALETTE)
+         png_set_palette_to_rgb(png);
+     if(color == PNG_COLOR_TYPE_GRAY && bits < 8)
+-        png_set_gray_1_2_4_to_8(png);
++        png_set_expand_gray_1_2_4_to_8(png);
+     if(bits == 16)
+         png_set_strip_16(png);
+     if(color & PNG_COLOR_MASK_ALPHA)
+@@ -65,7 +79,7 @@
+ 
+     /* wrap image data */
+     zbar_image_t *image = zbar_image_create();
+-    zbar_image_set_format(image, *(int*)"Y800");
++    zbar_image_set_format(image, zbar_fourcc('Y','8','0','0'));
+     zbar_image_set_size(image, width, height);
+     zbar_image_set_data(image, raw, width * height, zbar_image_free_data);
+ 
+diff -r 563557a923d0 examples/scan_image.pl
+--- a/examples/scan_image.pl	Tue Oct 27 11:25:59 2009 -0400
++++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
+@@ -1,37 +0,0 @@
+-#!/usr/bin/perl
+-use warnings;
+-use strict;
+-require Image::Magick;
+-require Barcode::ZBar;
+-
+-$ARGV[0] || die;
+-
+-# create a reader
+-my $scanner = Barcode::ZBar::ImageScanner->new();
+-
+-# configure the reader
+-$scanner->parse_config("enable");
+-
+-# obtain image data
+-my $magick = Image::Magick->new();
+-$magick->Read($ARGV[0]) && die;
+-my $raw = $magick->ImageToBlob(magick => 'GRAY', depth => 8);
+-
+-# wrap image data
+-my $image = Barcode::ZBar::Image->new();
+-$image->set_format('Y800');
+-$image->set_size($magick->Get(qw(columns rows)));
+-$image->set_data($raw);
+-
+-# scan the image for barcodes
+-my $n = $scanner->scan_image($image);
+-
+-# extract results
+-foreach my $symbol ($image->get_symbols()) {
+-    # do something useful with results
+-    print('decoded ' . $symbol->get_type() .
+-          ' symbol "' . $symbol->get_data() . "\"\n");
+-}
+-
+-# clean up
+-undef($image);
+diff -r 563557a923d0 examples/scan_image.py
+--- a/examples/scan_image.py	Tue Oct 27 11:25:59 2009 -0400
++++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
+@@ -1,31 +0,0 @@
+-#!/usr/bin/python
+-from sys import argv
+-import zbar
+-import Image
+-
+-if len(argv) < 2: exit(1)
+-
+-# create a reader
+-scanner = zbar.ImageScanner()
+-
+-# configure the reader
+-scanner.parse_config('enable')
+-
+-# obtain image data
+-pil = Image.open(argv[1]).convert('L')
+-width, height = pil.size
+-raw = pil.tostring()
+-
+-# wrap image data
+-image = zbar.Image(width, height, 'Y800', raw)
+-
+-# scan the image for barcodes
+-scanner.scan(image)
+-
+-# extract results
+-for symbol in image:
+-    # do something useful with results
+-    print 'decoded', symbol.type, 'symbol', '"%s"' % symbol.data
+-
+-# clean up
+-del(image)
+diff -r 563557a923d0 examples/upcrpc.pl
+--- a/examples/upcrpc.pl	Tue Oct 27 11:25:59 2009 -0400
++++ b/examples/upcrpc.pl	Fri Feb 22 08:54:29 2013 -0300
+@@ -3,7 +3,7 @@
+ use strict;
+ use Frontier::Client;
+ use Data::Dumper;
+-my $s = Frontier::Client->new('url' => 'http://dev.upcdatabase.com/rpc');
++my $s = Frontier::Client->new('url' => 'http://www.upcdatabase.com/rpc');
+ 
+ $| = 1; # autoflush
+ 
+diff -r 563557a923d0 examples/upcrpc.py
+--- a/examples/upcrpc.py	Tue Oct 27 11:25:59 2009 -0400
++++ b/examples/upcrpc.py	Fri Feb 22 08:54:29 2013 -0300
+@@ -2,7 +2,7 @@
+ from xmlrpclib import ServerProxy
+ import sys, re
+ 
+-server = ServerProxy("http://dev.upcdatabase.com/rpc")
++server = ServerProxy("http://www.upcdatabase.com/rpc")
+ ean_re = re.compile(r'^(UPC-A:|EAN-13:)?(\d{11,13})$', re.M)
+ 
+ def lookup(decode):
+diff -r 563557a923d0 gtk/zbargtk.c
+--- a/gtk/zbargtk.c	Tue Oct 27 11:25:59 2009 -0400
++++ b/gtk/zbargtk.c	Fri Feb 22 08:54:29 2013 -0300
+@@ -1,5 +1,5 @@
+ /*------------------------------------------------------------------------
+- *  Copyright 2008-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++ *  Copyright 2008-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
+  *
+  *  This file is part of the ZBar Bar Code Reader.
+  *
+@@ -35,11 +35,6 @@
+ #define DEFAULT_WIDTH 640
+ #define DEFAULT_HEIGHT 480
+ 
+-/* adapted from v4l2 spec */
+-#define fourcc(a, b, c, d)                      \
+-    ((long)(a) | ((long)(b) << 8) |             \
+-     ((long)(c) << 16) | ((long)(d) << 24))
+-
+ enum {
+     DECODED,
+     DECODED_TEXT,
+@@ -88,15 +83,15 @@
+ 
+     /* these are all guesses... */
+     if(nchannels == 3 && bps == 8)
+-        type = fourcc('R','G','B','3');
++        type = zbar_fourcc('R','G','B','3');
+     else if(nchannels == 4 && bps == 8)
+-        type = fourcc('B','G','R','4'); /* FIXME alpha flipped?! */
++        type = zbar_fourcc('B','G','R','4'); /* FIXME alpha flipped?! */
+     else if(nchannels == 1 && bps == 8)
+-        type = fourcc('Y','8','0','0');
++        type = zbar_fourcc('Y','8','0','0');
+     else if(nchannels == 3 && bps == 5)
+-        type = fourcc('R','G','B','R');
++        type = zbar_fourcc('R','G','B','R');
+     else if(nchannels == 3 && bps == 4)
+-        type = fourcc('R','4','4','4'); /* FIXME maybe? */
++        type = zbar_fourcc('R','4','4','4'); /* FIXME maybe? */
+     else {
+         g_warning("unsupported combination: nchannels=%d bps=%d\n",
+                   nchannels, bps);
+@@ -142,10 +137,6 @@
+ 
+     gdk_threads_enter();
+ 
+-    zbar->req_width = DEFAULT_WIDTH;
+-    zbar->req_height = DEFAULT_HEIGHT;
+-    gtk_widget_queue_resize(GTK_WIDGET(self));
+-
+     zbar->video_opened = FALSE;
+     if(zbar->thread)
+         g_object_notify(G_OBJECT(self), "video-opened");
+@@ -184,6 +175,10 @@
+          */
+         gdk_threads_enter();
+ 
++        if(zbar->video_width && zbar->video_height)
++            zbar_video_request_size(zbar->video,
++                                    zbar->video_width, zbar->video_height);
 +
-+- (void) setSymbols: (ZBarSymbolSet*) symbols
+         video_opened = !zbar_negotiate_format(zbar->video, zbar->window);
+ 
+         if(video_opened) {
+@@ -209,7 +204,7 @@
+     if(!image)
+         return(-1);
+ 
+-    zbar_image_t *tmp = zbar_image_convert(image, fourcc('Y','8','0','0'));
++    zbar_image_t *tmp = zbar_image_convert(image, zbar_fourcc('Y','8','0','0'));
+     if(!tmp)
+         return(-1);
+ 
+@@ -236,7 +231,6 @@
+ 
+                 /* FIXME skip this when unconnected? */
+                 gchar *text = g_strconcat(zbar_get_symbol_name(type),
+-                                          zbar_get_addon_name(type),
+                                           ":",
+                                           data,
+                                           NULL);
+@@ -560,6 +554,19 @@
+     return(zbar->video_opened);
+ }
+ 
++void zbar_gtk_request_video_size (ZBarGtk *self,
++                                  int width,
++                                  int height)
 +{
-+    zbar_image_set_symbols(zimg, [symbols zbarSymbolSet]);
-+}
++    if(!self->_private || width < 0 || height < 0)
++        return;
++    ZBarGtkPrivate *zbar = ZBAR_GTK_PRIVATE(self->_private);
 +
-+- (const void*) data
-+{
-+    return(zbar_image_get_data(zimg));
++    zbar->req_width = zbar->video_width = width;
++    zbar->req_height = zbar->video_height = height;
++    gtk_widget_queue_resize(GTK_WIDGET(self));
 +}
 +
-+- (unsigned long) dataLength
-+{
-+    return(zbar_image_get_data_length(zimg));
-+}
+ static void zbar_gtk_set_property (GObject *object,
+                                    guint prop_id,
+                                    const GValue *value,
+@@ -613,8 +620,8 @@
+     zbar->window = zbar_window_create();
+     g_assert(zbar->window);
+ 
+-    zbar->req_width = DEFAULT_WIDTH;
+-    zbar->req_height = DEFAULT_HEIGHT;
++    zbar->req_width = zbar->video_width = DEFAULT_WIDTH;
++    zbar->req_height = zbar->video_width = DEFAULT_HEIGHT;
+ 
+     /* spawn a thread to handle decoding and video */
+     zbar->queue = g_async_queue_new();
+diff -r 563557a923d0 gtk/zbargtkprivate.h
+--- a/gtk/zbargtkprivate.h	Tue Oct 27 11:25:59 2009 -0400
++++ b/gtk/zbargtkprivate.h	Fri Feb 22 08:54:29 2013 -0300
+@@ -71,6 +71,7 @@
+      * protected by main gui lock
+      */
+     unsigned req_width, req_height;
++    unsigned video_width, video_height;
+     gboolean video_opened;
+ 
+     /* window is shared: owned by main gui thread.
+diff -r 563557a923d0 include/zbar.h
+--- a/include/zbar.h	Tue Oct 27 11:25:59 2009 -0400
++++ b/include/zbar.h	Fri Feb 22 08:54:29 2013 -0300
+@@ -1,5 +1,5 @@
+ /*------------------------------------------------------------------------
+- *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
+  *
+  *  This file is part of the ZBar Bar Code Reader.
+  *
+@@ -86,23 +86,58 @@
+ typedef enum zbar_symbol_type_e {
+     ZBAR_NONE        =      0,  /**< no symbol decoded */
+     ZBAR_PARTIAL     =      1,  /**< intermediate status */
++    ZBAR_EAN2        =      2,  /**< GS1 2-digit add-on */
++    ZBAR_EAN5        =      5,  /**< GS1 5-digit add-on */
+     ZBAR_EAN8        =      8,  /**< EAN-8 */
+     ZBAR_UPCE        =      9,  /**< UPC-E */
+     ZBAR_ISBN10      =     10,  /**< ISBN-10 (from EAN-13). @since 0.4 */
+     ZBAR_UPCA        =     12,  /**< UPC-A */
+     ZBAR_EAN13       =     13,  /**< EAN-13 */
+     ZBAR_ISBN13      =     14,  /**< ISBN-13 (from EAN-13). @since 0.4 */
++    ZBAR_COMPOSITE   =     15,  /**< EAN/UPC composite */
+     ZBAR_I25         =     25,  /**< Interleaved 2 of 5. @since 0.4 */
++    ZBAR_DATABAR     =     34,  /**< GS1 DataBar (RSS). @since 0.11 */
++    ZBAR_DATABAR_EXP =     35,  /**< GS1 DataBar Expanded. @since 0.11 */
++    ZBAR_CODABAR     =     38,  /**< Codabar. @since 0.11 */
+     ZBAR_CODE39      =     39,  /**< Code 39. @since 0.4 */
+     ZBAR_PDF417      =     57,  /**< PDF417. @since 0.6 */
+     ZBAR_QRCODE      =     64,  /**< QR Code. @since 0.10 */
++    ZBAR_CODE93      =     93,  /**< Code 93. @since 0.11 */
+     ZBAR_CODE128     =    128,  /**< Code 128 */
+-    ZBAR_SYMBOL      = 0x00ff,  /**< mask for base symbol type */
+-    ZBAR_ADDON2      = 0x0200,  /**< 2-digit add-on flag */
+-    ZBAR_ADDON5      = 0x0500,  /**< 5-digit add-on flag */
+-    ZBAR_ADDON       = 0x0700,  /**< add-on flag mask */
 +
-+- (void) setData: (const void*) data
-+      withLength: (unsigned long) length
-+{
-+    zbar_image_set_data(zimg, data, length, image_cleanup);
-+}
++    /** mask for base symbol type.
++     * @deprecated in 0.11, remove this from existing code
++     */
++    ZBAR_SYMBOL      = 0x00ff,
++    /** 2-digit add-on flag.
++     * @deprecated in 0.11, a ::ZBAR_EAN2 component is used for
++     * 2-digit GS1 add-ons
++     */
++    ZBAR_ADDON2      = 0x0200,
++    /** 5-digit add-on flag.
++     * @deprecated in 0.11, a ::ZBAR_EAN5 component is used for
++     * 5-digit GS1 add-ons
++     */
++    ZBAR_ADDON5      = 0x0500,
++    /** add-on flag mask.
++     * @deprecated in 0.11, GS1 add-ons are represented using composite
++     * symbols of type ::ZBAR_COMPOSITE; add-on components use ::ZBAR_EAN2
++     * or ::ZBAR_EAN5
++     */
++    ZBAR_ADDON       = 0x0700,
+ } zbar_symbol_type_t;
+ 
++/** decoded symbol coarse orientation.
++ * @since 0.11
++ */
++typedef enum zbar_orientation_e {
++    ZBAR_ORIENT_UNKNOWN = -1,   /**< unable to determine orientation */
++    ZBAR_ORIENT_UP,             /**< upright, read left to right */
++    ZBAR_ORIENT_RIGHT,          /**< sideways, read top to bottom */
++    ZBAR_ORIENT_DOWN,           /**< upside-down, read right to left */
++    ZBAR_ORIENT_LEFT,           /**< sideways, read bottom to top */
++} zbar_orientation_t;
 +
-+- (zbar_image_t*) zbarImage
-+{
-+    return(zimg);
-+}
+ /** error codes. */
+ typedef enum zbar_error_e {
+     ZBAR_OK = 0,                /**< no error */
+@@ -133,12 +168,33 @@
+     ZBAR_CFG_MIN_LEN = 0x20,    /**< minimum data length for valid decode */
+     ZBAR_CFG_MAX_LEN,           /**< maximum data length for valid decode */
+ 
++    ZBAR_CFG_UNCERTAINTY = 0x40,/**< required video consistency frames */
 +
-+- (UIImage*) UIImageWithOrientation: (UIImageOrientation) orient
-+{
-+    unsigned long format = self.format;
-+    size_t bpc, bpp;
-+    switch(format)
-+    {
-+    case zbar_fourcc('R','G','B','3'):
-+        bpc = 8;
-+        bpp = 24;
-+        break;
-+    case zbar_fourcc('R','G','B','4'):
-+        bpc = 8;
-+        bpp = 32;
-+        break;
-+    case zbar_fourcc('R','G','B','Q'):
-+        bpc = 5;
-+        bpp = 16;
-+        break;
-+    default:
-+        NSLog(@"ERROR: format %.4s(%08lx) is unsupported",
-+              (char*)&format, format);
-+        assert(0);
-+        return(nil);
-+    };
-+
-+    unsigned w = zbar_image_get_width(zimg);
-+    unsigned h = zbar_image_get_height(zimg);
-+    const void *data = zbar_image_get_data(zimg);
-+    size_t datalen = zbar_image_get_data_length(zimg);
-+    CGDataProviderRef datasrc =
-+        CGDataProviderCreateWithData(self, data, datalen, (void*)CFRelease);
-+    CGColorSpaceRef cs = CGColorSpaceCreateDeviceRGB();
-+    CGImageRef cgimg =
-+        CGImageCreate(w, h, bpc, bpp, ((bpp + 7) >> 3) * w, cs,
-+                      kCGBitmapByteOrderDefault |
-+                      kCGImageAlphaNoneSkipFirst,
-+                      datasrc, NULL, YES, kCGRenderingIntentDefault);
-+    CGColorSpaceRelease(cs);
-+    CGDataProviderRelease(datasrc);
-+
-+    UIImage *uiimg =
-+        [UIImage imageWithCGImage: cgimg
-+                 scale: 1
-+                 orientation: orient];
-+    CGImageRelease(cgimg);
-+    return(uiimg);
-+}
-+
-+- (UIImage*) UIImage
-+{
-+    return([self UIImageWithOrientation: UIImageOrientationUp]);
-+}
-+
-+- (void) cleanup
-+{
-+}
+     ZBAR_CFG_POSITION = 0x80,   /**< enable scanner to collect position data */
+ 
+     ZBAR_CFG_X_DENSITY = 0x100, /**< image scanner vertical scan density */
+     ZBAR_CFG_Y_DENSITY,         /**< image scanner horizontal scan density */
+ } zbar_config_t;
+ 
++/** decoder symbology modifier flags.
++ * @since 0.11
++ */
++typedef enum zbar_modifier_e {
++    /** barcode tagged as GS1 (EAN.UCC) reserved
++     * (eg, FNC1 before first data character).
++     * data may be parsed as a sequence of GS1 AIs
++     */
++    ZBAR_MOD_GS1 = 0,
 +
-+#if 0
-+- (ZBarImage*) convertToFormat: (unsigned long) format
-+{
-+    zbar_image_t *zdst = zbar_image_convert(zimg, format);
-+    ZBarImage *image = ;
-+    return([[[ZBarImage alloc] initWithImage: zdst] autorelease]);
-+}
-+#endif
++    /** barcode tagged as AIM reserved
++     * (eg, FNC1 after first character or digit pair)
++     */
++    ZBAR_MOD_AIM,
 +
-+@end
-diff --git a/iphone/ZBarImageScanner.m b/iphone/ZBarImageScanner.m
-new file mode 100644
---- /dev/null
-+++ b/iphone/ZBarImageScanner.m
-@@ -0,0 +1,85 @@
-+//------------------------------------------------------------------------
-+//  Copyright 2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+//
-+//  This file is part of the ZBar Bar Code Reader.
-+//
-+//  The ZBar Bar Code Reader is free software; you can redistribute it
-+//  and/or modify it under the terms of the GNU Lesser Public License as
-+//  published by the Free Software Foundation; either version 2.1 of
-+//  the License, or (at your option) any later version.
-+//
-+//  The ZBar Bar Code Reader is distributed in the hope that it will be
-+//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-+//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+//  GNU Lesser Public License for more details.
-+//
-+//  You should have received a copy of the GNU Lesser Public License
-+//  along with the ZBar Bar Code Reader; if not, write to the Free
-+//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-+//  Boston, MA  02110-1301  USA
-+//
-+//  http://sourceforge.net/projects/zbar
-+//------------------------------------------------------------------------
++    /** number of modifiers */
++    ZBAR_MOD_NUM,
++} zbar_modifier_t;
 +
-+#import <ZBarSDK/ZBarImageScanner.h>
-+#import "debug.h"
+ /** retrieve runtime library version information.
+  * @param major set to the running major version (unless NULL)
+  * @param minor set to the running minor version (unless NULL)
+@@ -168,9 +224,32 @@
+  * @param sym symbol type encoding
+  * @returns static string name for any addon, or the empty string
+  * if no addons were decoded
++ * @deprecated in 0.11
+  */
+ extern const char *zbar_get_addon_name(zbar_symbol_type_t sym);
+ 
++/** retrieve string name for configuration setting.
++ * @param config setting to name
++ * @returns static string name for config,
++ * or the empty string if value is not a known config
++ */
++extern const char *zbar_get_config_name(zbar_config_t config);
 +
-+@implementation ZBarImageScanner
++/** retrieve string name for modifier.
++ * @param modifier flag to name
++ * @returns static string name for modifier,
++ * or the empty string if the value is not a known flag
++ */
++extern const char *zbar_get_modifier_name(zbar_modifier_t modifier);
 +
-+@dynamic enableCache, results;
++/** retrieve string name for orientation.
++ * @param orientation orientation encoding
++ * @returns the static string name for the specified orientation,
++ * or "UNKNOWN" if the orientation is not recognized
++ * @since 0.11
++ */
++extern const char *zbar_get_orientation_name(zbar_orientation_t orientation);
 +
-+- (id) init
-+{
-+    if(self = [super init]) {
-+        scanner = zbar_image_scanner_create();
-+    }
-+    return(self);
-+}
+ /** parse a configuration string of the form "[symbology.]config[=value]".
+  * the config must match one of the recognized names.
+  * the symbology, if present, must match one of the recognized names.
+@@ -184,6 +263,30 @@
+                              zbar_config_t *config,
+                              int *value);
+ 
++/** consistently compute fourcc values across architectures
++ * (adapted from v4l2 specification)
++ * @since 0.11
++ */
++#define zbar_fourcc(a, b, c, d)                 \
++        ((unsigned long)(a) |                   \
++         ((unsigned long)(b) << 8) |            \
++         ((unsigned long)(c) << 16) |           \
++         ((unsigned long)(d) << 24))
 +
-+- (void) dealloc
++/** parse a fourcc string into its encoded integer value.
++ * @since 0.11
++ */
++static inline unsigned long zbar_fourcc_parse (const char *format)
 +{
-+    if(scanner) {
-+        zbar_image_scanner_destroy(scanner);
-+        scanner = NULL;
++    unsigned long fourcc = 0;
++    if(format) {
++        int i;
++        for(i = 0; i < 4 && format[i]; i++)
++            fourcc |= ((unsigned long)format[i]) << (i * 8);
 +    }
-+    [super dealloc];
-+}
-+
-+- (BOOL) enableCache
-+{
-+    assert(0); // FIXME
-+    return(NO);
++    return(fourcc);
 +}
 +
-+- (void) setEnableCache: (BOOL) enable
-+{
-+    zbar_image_scanner_enable_cache(scanner, enable);
-+}
+ /** @internal type unsafe error API (don't use) */
+ extern int _zbar_error_spew(const void *object,
+                             int verbosity);
+@@ -229,6 +332,20 @@
+  */
+ extern zbar_symbol_type_t zbar_symbol_get_type(const zbar_symbol_t *symbol);
+ 
++/** retrieve symbology boolean config settings.
++ * @returns a bitmask indicating which configs were set for the detected
++ * symbology during decoding.
++ * @since 0.11
++ */
++extern unsigned int zbar_symbol_get_configs(const zbar_symbol_t *symbol);
 +
-+- (ZBarSymbolSet*) results
-+{
-+    const zbar_symbol_set_t *set = zbar_image_scanner_get_results(scanner);
-+    return([[[ZBarSymbolSet alloc] initWithSymbolSet: set] autorelease]);
-+}
++/** retrieve symbology modifier flag settings.
++ * @returns a bitmask indicating which characteristics were detected
++ * during decoding.
++ * @since 0.11
++ */
++extern unsigned int zbar_symbol_get_modifiers(const zbar_symbol_t *symbol);
 +
-+// image scanner config wrappers
-+- (void) parseConfig: (NSString*) cfg
-+{
-+    zbar_image_scanner_parse_config(scanner, [cfg UTF8String]);
-+    // FIXME throw errors
-+}
+ /** retrieve data decoded from symbol.
+  * @returns the data string
+  */
+@@ -284,6 +401,14 @@
+ extern int zbar_symbol_get_loc_y(const zbar_symbol_t *symbol,
+                                  unsigned index);
+ 
++/** retrieve general orientation of decoded symbol.
++ * @returns a coarse, axis-aligned indication of symbol orientation or
++ * ::ZBAR_ORIENT_UNKNOWN if unknown
++ * @since 0.11
++ */
++extern zbar_orientation_t
++zbar_symbol_get_orientation(const zbar_symbol_t *symbol);
 +
-+- (void) setSymbology: (zbar_symbol_type_t) sym
-+               config: (zbar_config_t) cfg
-+                   to: (int) val
-+{
-+    zbar_image_scanner_set_config(scanner, sym, cfg, val);
-+    // FIXME throw errors
-+}
+ /** iterate the set to which this symbol belongs (there can be only one).
+  * @returns the next symbol in the set, or
+  * @returns NULL when no more results are available
+@@ -357,6 +482,14 @@
+ extern const zbar_symbol_t*
+ zbar_symbol_set_first_symbol(const zbar_symbol_set_t *symbols);
+ 
++/** raw result iterator.
++ * @returns the first decoded symbol result in a set, *before* filtering
++ * @returns NULL if the set is empty
++ * @since 0.11
++ */
++extern const zbar_symbol_t*
++zbar_symbol_set_first_unfiltered(const zbar_symbol_set_t *symbols);
 +
-+- (NSInteger) scanImage: (ZBarImage*) image
-+{
-+    return(zbar_scan_image(scanner, image.zbarImage));
-+}
+ /*@}*/
+ 
+ /*------------------------------------------------------------*/
+@@ -456,6 +589,25 @@
+  */
+ extern unsigned zbar_image_get_height(const zbar_image_t *image);
+ 
++/** retrieve both dimensions of the image.
++ * fills in the width and height in samples
++ */
++extern void zbar_image_get_size(const zbar_image_t *image,
++                                unsigned *width,
++                                unsigned *height);
 +
-+@end
-diff --git a/iphone/ZBarReaderController.m b/iphone/ZBarReaderController.m
-new file mode 100644
---- /dev/null
-+++ b/iphone/ZBarReaderController.m
-@@ -0,0 +1,747 @@
-+//------------------------------------------------------------------------
-+//  Copyright 2009-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-+//
-+//  This file is part of the ZBar Bar Code Reader.
-+//
-+//  The ZBar Bar Code Reader is free software; you can redistribute it
-+//  and/or modify it under the terms of the GNU Lesser Public License as
-+//  published by the Free Software Foundation; either version 2.1 of
-+//  the License, or (at your option) any later version.
-+//
-+//  The ZBar Bar Code Reader is distributed in the hope that it will be
-+//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-+//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+//  GNU Lesser Public License for more details.
-+//
-+//  You should have received a copy of the GNU Lesser Public License
-+//  along with the ZBar Bar Code Reader; if not, write to the Free
-+//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-+//  Boston, MA  02110-1301  USA
-+//
-+//  http://sourceforge.net/projects/zbar
-+//------------------------------------------------------------------------
-+
-+#import <ZBarSDK/ZBarReaderController.h>
-+#import <ZBarSDK/ZBarHelpController.h>
-+#import "debug.h"
-+
-+/* the use of UIGetScreenImage() may no longer be sanctioned, even
-+ * though it was previously "allowed".  define this to 0 to rip it out
-+ * and fall back to cameraMode=Default (manual capture)
++/** retrieve the crop rectangle.
++ * fills in the image coordinates of the upper left corner and size
++ * of an axis-aligned rectangular area of the image that will be scanned.
++ * defaults to the full image
++ * @since 0.11
 + */
-+#ifndef USE_PRIVATE_APIS
-+# define USE_PRIVATE_APIS 0
-+#endif
-+
-+#ifndef MIN_QUALITY
-+# define MIN_QUALITY 10
-+#endif
-+
-+NSString* const ZBarReaderControllerResults = @"ZBarReaderControllerResults";
++extern void zbar_image_get_crop(const zbar_image_t *image,
++                                unsigned *x,
++                                unsigned *y,
++                                unsigned *width,
++                                unsigned *height);
 +
-+#if USE_PRIVATE_APIS
-+// expose undocumented API
-+CF_RETURNS_RETAINED
-+CGImageRef UIGetScreenImage(void);
-+#endif
+ /** return the image sample data.  the returned data buffer is only
+  * valid until zbar_image_destroy() is called
+  */
+@@ -505,12 +657,24 @@
+                                     unsigned sequence_num);
+ 
+ /** specify the pixel size of the image.
++ * @note this also resets the crop rectangle to the full image
++ * (0, 0, width, height)
+  * @note this does not affect the data!
+  */
+ extern void zbar_image_set_size(zbar_image_t *image,
+                                 unsigned width,
+                                 unsigned height);
+ 
++/** specify a rectangular region of the image to scan.
++ * the rectangle will be clipped to the image boundaries.
++ * defaults to the full image specified by zbar_image_set_size()
++ */
++extern void zbar_image_set_crop(zbar_image_t *image,
++                                unsigned x,
++                                unsigned y,
++                                unsigned width,
++                                unsigned height);
 +
-+@implementation ZBarReaderController
+ /** specify image sample data.  when image data is no longer needed by
+  * the library the specific data cleanup handler will be called
+  * (unless NULL)
+@@ -1148,6 +1312,14 @@
+            zbar_decoder_set_config(decoder, sym, cfg, val));
+ }
+ 
++/** retrieve symbology boolean config settings.
++ * @returns a bitmask indicating which configs are currently set for the
++ * specified symbology.
++ * @since 0.11
++ */
++extern unsigned int zbar_decoder_get_configs(const zbar_decoder_t *decoder,
++                                             zbar_symbol_type_t symbology);
 +
-+@synthesize scanner, readerDelegate, cameraMode, scanCrop, maxScanDimension,
-+    showsHelpOnFail, takesPicture, enableCache, tracksSymbols;
-+@dynamic showsZBarControls;
+ /** clear all decoder state.
+  * any partial symbols are flushed
+  */
+@@ -1195,6 +1367,20 @@
+ extern zbar_symbol_type_t
+ zbar_decoder_get_type(const zbar_decoder_t *decoder);
+ 
++/** retrieve modifier flags for the last decoded symbol.
++ * @returns a bitmask indicating which characteristics were detected
++ * during decoding.
++ * @since 0.11
++ */
++extern unsigned int zbar_decoder_get_modifiers(const zbar_decoder_t *decoder);
 +
-+- (id) init
-+{
-+    if(self = [super init]) {
-+        showsHelpOnFail = YES;
-+        hasOverlay = showsZBarControls =
-+            [self respondsToSelector: @selector(cameraOverlayView)];
-+        enableCache = tracksSymbols = YES;
-+        scanCrop = CGRectMake(0, 0, 1, 1);
-+        maxScanDimension = 640;
++/** retrieve last decode direction.
++ * @returns 1 for forward and -1 for reverse
++ * @returns 0 if the decode direction is unknown or does not apply
++ * @since 0.11
++ */
++extern int zbar_decoder_get_direction(const zbar_decoder_t *decoder);
 +
-+        scanner = [ZBarImageScanner new];
-+        [scanner setSymbology: 0
-+                 config: ZBAR_CFG_X_DENSITY
-+                 to: 2];
-+        [scanner setSymbology: 0
-+                 config: ZBAR_CFG_Y_DENSITY
-+                 to: 2];
+ /** setup data handler callback.
+  * the registered function will be called by the decoder
+  * just before zbar_decode_width() returns a non-zero value.
+diff -r 563557a923d0 include/zbar/Decoder.h
+--- a/include/zbar/Decoder.h	Tue Oct 27 11:25:59 2009 -0400
++++ b/include/zbar/Decoder.h	Fri Feb 22 08:54:29 2013 -0300
+@@ -1,5 +1,5 @@
+ //------------------------------------------------------------------------
+-//  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++//  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
+ //
+ //  This file is part of the ZBar Bar Code Reader.
+ //
+@@ -115,6 +115,7 @@
+ 
+     /// retrieve string name for last decode addon.
+     /// see zbar_get_addon_name()
++    /// @deprecated in 0.11
+     const char *get_addon_name () const
+     {
+         return(zbar_get_addon_name(zbar_decoder_get_type(_decoder)));
+@@ -149,6 +150,14 @@
+         return(zbar_decoder_get_data_length(_decoder));
+     }
+ 
++    /// retrieve last decode direction.
++    /// see zbar_decoder_get_direction()
++    /// @since 0.11
++    int get_direction() const
++    {
++        return(zbar_decoder_get_direction(_decoder));
++    }
 +
-+        if([UIImagePickerController
-+               isSourceTypeAvailable: UIImagePickerControllerSourceTypeCamera])
-+            self.sourceType = UIImagePickerControllerSourceTypeCamera;
+     /// setup callback to handle result data.
+     void set_handler (Handler &handler)
+     {
+diff -r 563557a923d0 include/zbar/Image.h
+--- a/include/zbar/Image.h	Tue Oct 27 11:25:59 2009 -0400
++++ b/include/zbar/Image.h	Fri Feb 22 08:54:29 2013 -0300
+@@ -1,5 +1,5 @@
+ //------------------------------------------------------------------------
+-//  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++//  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
+ //
+ //  This file is part of the ZBar Bar Code Reader.
+ //
+@@ -67,7 +67,12 @@
+         {
+             if(userdata) {
+                 Image *image = (Image*)zbar_image_get_userdata(zimg);
+-                ((Handler*)userdata)->image_callback(*image);
++                if(image)
++                    ((Handler*)userdata)->image_callback(*image);
++                else {
++                    Image tmp(zimg, 1);
++                    ((Handler*)userdata)->image_callback(tmp);
++                }
+             }
+         }
+     };
+@@ -110,6 +115,8 @@
+ 
+     ~Image ()
+     {
++        if(zbar_image_get_userdata(_img) == this)
++            zbar_image_set_userdata(_img, NULL);
+         zbar_image_ref(_img, -1);
+     }
+ 
+@@ -143,12 +150,7 @@
+     /// see zbar_image_set_format()
+     void set_format (const std::string& format)
+     {
+-        if(format.length() != 4)
+-            throw FormatError();
+-        unsigned long fourcc = ((format[0] & 0xff) |
+-                                ((format[1] & 0xff) << 8) |
+-                                ((format[2] & 0xff) << 16) |
+-                                ((format[3] & 0xff) << 24));
++        unsigned long fourcc = zbar_fourcc_parse(format.c_str());
+         zbar_image_set_format(_img, fourcc);
+     }
+ 
+@@ -183,6 +185,15 @@
+         return(zbar_image_get_height(_img));
+     }
+ 
++    /// retrieve both dimensions of the image.
++    /// see zbar_image_get_size()
++    /// @since 0.11
++    void get_size (unsigned &width,
++                   unsigned &height) const
++    {
++        zbar_image_get_size(_img, &width, &height);
++    }
 +
-+#if USE_PRIVATE_APIS
-+        cameraMode = ZBarReaderControllerCameraModeSampling;
-+#else
-+        cameraMode = ZBarReaderControllerCameraModeDefault;
-+#endif
+     /// specify the pixel size of the image.
+     /// see zbar_image_set_size()
+     void set_size (unsigned width,
+@@ -191,6 +202,26 @@
+         zbar_image_set_size(_img, width, height);
+     }
+ 
++    /// retrieve the scan crop rectangle.
++    /// see zbar_image_get_crop()
++    void get_crop (unsigned &x,
++                   unsigned &y,
++                   unsigned &width,
++                   unsigned &height) const
++    {
++        zbar_image_get_crop(_img, &x, &y, &width, &height);
 +    }
-+    return(self);
-+}
 +
-+- (void) initOverlay
-+{
-+    CGRect bounds = self.view.bounds;
-+    overlay = [[UIView alloc] initWithFrame: bounds];
-+    overlay.backgroundColor = [UIColor clearColor];
++    /// set the scan crop rectangle.
++    /// see zbar_image_set_crop()
++    void set_crop (unsigned x,
++                   unsigned y,
++                   unsigned width,
++                   unsigned height)
++    {
++        zbar_image_set_crop(_img, x, y, width, height);
++    }
 +
-+    CGRect r = bounds;
-+    r.size.height -= 54;
-+    boxView = [[UIView alloc] initWithFrame: r];
+     /// return the image sample data.
+     /// see zbar_image_get_data()
+     const void *get_data () const
+@@ -224,6 +255,15 @@
+         throw FormatError();
+     }
+ 
++    /// image format conversion.
++    /// see zbar_image_convert()
++    /// @since 0.11
++    Image convert (std::string format) const
++    {
++        unsigned long fourcc = zbar_fourcc_parse(format.c_str());
++        return(convert(fourcc));
++    }
 +
-+    boxLayer = [CALayer new];
-+    boxLayer.frame = r;
-+    boxLayer.borderWidth = 1;
-+    boxLayer.borderColor = [UIColor greenColor].CGColor;
-+    [boxView.layer addSublayer: boxLayer];
-+
-+    toolbar = [UIToolbar new];
-+    toolbar.barStyle = UIBarStyleBlackOpaque;
-+    r.origin.y = r.size.height;
-+    r.size.height = 54;
-+    toolbar.frame = r;
+     /// image format conversion with crop/pad.
+     /// see zbar_image_convert_resize()
+     /// @since 0.4
+@@ -278,7 +318,6 @@
+     {
+         // by default nothing is cleaned
+         assert(img);
+-        assert(zbar_image_get_userdata(img));
+     }
+ 
+ private:
+diff -r 563557a923d0 include/zbar/Processor.h
+--- a/include/zbar/Processor.h	Tue Oct 27 11:25:59 2009 -0400
++++ b/include/zbar/Processor.h	Fri Feb 22 08:54:29 2013 -0300
+@@ -1,5 +1,5 @@
+ //------------------------------------------------------------------------
+-//  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++//  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
+ //
+ //  This file is part of the ZBar Bar Code Reader.
+ //
+@@ -183,8 +183,8 @@
+     void force_format (std::string& input_format,
+                        std::string& output_format)
+     {
+-        unsigned long ifourcc = *(unsigned long*)input_format.c_str();
+-        unsigned long ofourcc = *(unsigned long*)output_format.c_str();
++        unsigned long ifourcc = zbar_fourcc_parse(input_format.c_str());
++        unsigned long ofourcc = zbar_fourcc_parse(output_format.c_str());
+         if(zbar_processor_force_format(_processor, ifourcc, ofourcc))
+             throw_exception(_processor);
+     }
+diff -r 563557a923d0 include/zbar/QZBarImage.h
+--- a/include/zbar/QZBarImage.h	Tue Oct 27 11:25:59 2009 -0400
++++ b/include/zbar/QZBarImage.h	Fri Feb 22 08:54:29 2013 -0300
+@@ -1,5 +1,5 @@
+ //------------------------------------------------------------------------
+-//  Copyright 2008-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++//  Copyright 2008-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
+ //
+ //  This file is part of the ZBar Bar Code Reader.
+ //
+@@ -53,7 +53,7 @@
+         unsigned width = bpl / 4;
+         unsigned height = qimg.height();
+         set_size(width, height);
+-        set_format('B' | ('G' << 8) | ('R' << 16) | ('4' << 24));
++        set_format(zbar_fourcc('B','G','R','4'));
+         unsigned long datalen = qimg.numBytes();
+         set_data(qimg.bits(), datalen);
+ 
+diff -r 563557a923d0 include/zbar/Symbol.h
+--- a/include/zbar/Symbol.h	Tue Oct 27 11:25:59 2009 -0400
++++ b/include/zbar/Symbol.h	Fri Feb 22 08:54:29 2013 -0300
+@@ -1,5 +1,5 @@
+ //------------------------------------------------------------------------
+-//  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++//  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
+ //
+ //  This file is part of the ZBar Bar Code Reader.
+ //
+@@ -64,6 +64,21 @@
+         ref(-1);
+     }
+ 
++    /// assignment.
++    SymbolSet& operator= (const SymbolSet& syms)
++    {
++        syms.ref();
++        ref(-1);
++        _syms = syms._syms;
++        return(*this);
++    }
 +
-+    cancelBtn = [[UIBarButtonItem alloc]
-+                    initWithBarButtonSystemItem: UIBarButtonSystemItemCancel
-+                    target: self
-+                    action: @selector(cancel)];
-+    cancelBtn.width = r.size.width / 4 - 16;
++    /// truth testing.
++    bool operator! () const
++    {
++        return(!_syms || !get_size());
++    }
 +
-+    scanBtn = [[UIBarButtonItem alloc]
-+                  initWithTitle: @"Scan!"
-+                  style: UIBarButtonItemStyleDone
-+                  target: self
-+                  action: @selector(scan)];
-+    scanBtn.width = r.size.width / 2 - 16;
+     /// manipulate reference count.
+     void ref (int delta = 1) const
+     {
+@@ -77,7 +92,7 @@
+         return(_syms);
+     }
+ 
+-    int get_size ()
++    int get_size () const
+     {
+         return((_syms) ? zbar_symbol_set_get_size(_syms) : 0);
+     }
+@@ -112,9 +127,16 @@
+ 
+         /// copy constructor.
+         Point (const Point& pt)
++            : x(pt.x),
++              y(pt.y)
++        { }
 +
-+    for(int i = 0; i < 2; i++)
-+        space[i] = [[UIBarButtonItem alloc]
-+                       initWithBarButtonSystemItem:
-+                           UIBarButtonSystemItemFlexibleSpace
-+                       target: nil
-+                       action: nil];
++        /// assignment.
++        Point& operator= (const Point& pt)
+         {
+             x = pt.x;
+             y = pt.y;
++            return(*this);
+         }
+     };
+ 
+@@ -129,31 +151,52 @@
+             : _sym(sym),
+               _index(index)
+         {
+-            sym->ref(1);
++            if(sym)
++                sym->ref(1);
+             if(!sym ||
+                (unsigned)_index >= zbar_symbol_get_loc_size(*_sym))
+                 _index = -1;
+         }
+ 
+-        /// constructor.
++        /// copy constructor.
+         PointIterator (const PointIterator& iter)
+             : _sym(iter._sym),
+               _index(iter._index)
+         {
+-            _sym->ref();
++            if(_sym)
++                _sym->ref();
+         }
+ 
+         /// destructor.
+         ~PointIterator ()
+         {
+-            _sym->ref(-1);
++            if(_sym)
++                _sym->ref(-1);
++        }
 +
-+    space[2] = [[UIBarButtonItem alloc]
-+                    initWithBarButtonSystemItem:
-+                        UIBarButtonSystemItemFixedSpace
-+                    target: nil
-+                    action: nil];
-+    space[2].width = r.size.width / 4 - 16;
++        /// assignment.
++        PointIterator& operator= (const PointIterator& iter)
++        {
++            if(iter._sym)
++                iter._sym->ref();
++            if(_sym)
++                _sym->ref(-1);
++            _sym = iter._sym;
++            _index = iter._index;
++            return(*this);
++        }
 +
-+    infoBtn = [[UIButton buttonWithType: UIButtonTypeInfoLight] retain];
-+    r.origin.x = r.size.width - 54;
-+    r.size.width = 54;
-+    infoBtn.frame = r;
-+    [infoBtn addTarget: self
-+             action: @selector(info)
-+             forControlEvents: UIControlEventTouchUpInside];
-+}
++        /// truth testing.
++        bool operator! () const
++        {
++            return(!_sym || _index < 0);
+         }
+ 
+         /// advance iterator to next Point.
+         PointIterator& operator++ ()
+         {
+             unsigned int i = ++_index;
+-            if(i >= zbar_symbol_get_loc_size(*_sym))
++            if(!_sym || i >= zbar_symbol_get_loc_size(*_sym))
+                 _index = -1;
+             return(*this);
+         }
+@@ -161,7 +204,9 @@
+         /// retrieve currently referenced Point.
+         const Point operator* () const
+         {
+-            assert(_index >= 0);
++            assert(!!*this);
++            if(!*this)
++                return(Point());
+             return(Point(zbar_symbol_get_loc_x(*_sym, _index),
+                          zbar_symbol_get_loc_y(*_sym, _index)));
+         }
+@@ -213,6 +258,32 @@
+         ref(-1);
+     }
+ 
++    /// assignment.
++    Symbol& operator= (const Symbol& sym)
++    {
++        sym.ref(1);
++        ref(-1);
++        _sym = sym._sym;
++        _type = sym._type;
++        _data = sym._data;
++        return(*this);
++    }
 +
-+- (void) viewDidLoad
-+{
-+    [super viewDidLoad];
-+    [super setDelegate: self];
-+    if(hasOverlay)
-+        [self initOverlay];
-+}
++    Symbol& operator= (const zbar_symbol_t *sym)
++    {
++        if(sym)
++            zbar_symbol_ref(sym, 1);
++        ref(-1);
++        init(sym);
++        return(*this);
++    }
 +
-+- (void) cleanup
-+{
-+    [overlay release];
-+    overlay = nil;
-+    [boxView release];
-+    boxView = nil;
-+    [boxLayer release];
-+    boxLayer = nil;
-+    [toolbar release];
-+    toolbar = nil;
-+    [cancelBtn release];
-+    cancelBtn = nil;
-+    [scanBtn release];
-+    scanBtn = nil;
-+    for(int i = 0; i < 3; i++) {
-+        [space[i] release];
-+        space[i] = nil;
++    /// truth testing.
++    bool operator! () const
++    {
++        return(!_sym);
 +    }
-+    [infoBtn release];
-+    infoBtn = nil;
-+    [help release];
-+    help = nil;
-+}
 +
-+- (void) viewDidUnload
-+{
-+    [self cleanup];
-+    [super viewDidUnload];
-+}
+     void ref (int delta = 1) const
+     {
+         if(_sym)
+@@ -250,6 +321,7 @@
+     }
+ 
+     /// retrieve the string name for any addon.
++    /// @deprecated in 0.11
+     const std::string get_addon_name () const
+     {
+         return(zbar_get_addon_name(_type));
+@@ -269,12 +341,20 @@
+ 
+     /// retrieve inter-frame coherency count.
+     /// see zbar_symbol_get_count()
+-    /// @since 1.5
++    /// @since 0.5
+     int get_count () const
+     {
+         return((_sym) ? zbar_symbol_get_count(_sym) : -1);
+     }
+ 
++    /// retrieve loosely defined relative quality metric.
++    /// see zbar_symbol_get_quality()
++    /// @since 0.11
++    int get_quality () const
++    {
++        return((_sym) ? zbar_symbol_get_quality(_sym) : 0);
++    }
 +
-+- (void) dealloc
-+{
-+    [self cleanup];
-+    [scanner release];
-+    scanner = nil;
-+    [super dealloc];
-+}
+     SymbolSet get_components () const
+     {
+         return(SymbolSet((_sym) ? zbar_symbol_get_components(_sym) : NULL));
+@@ -311,6 +391,13 @@
+         return((_sym) ? zbar_symbol_get_loc_y(_sym, index) : -1);
+     }
+ 
++    /// see zbar_symbol_get_orientation().
++    /// @since 0.11
++    int get_orientation () const
++    {
++        return(zbar_symbol_get_orientation(_sym));
++    }
 +
-+- (void) scan
-+{
-+    scanBtn.enabled = NO;
-+    self.view.userInteractionEnabled = NO;
-+    [self takePicture];
-+}
+     /// see zbar_symbol_xml().
+     const std::string xml () const
+     {
+@@ -320,9 +407,6 @@
+     }
+ 
+ protected:
+-
+-    friend class SymbolIterator;
+-
+     /// (re)initialize Symbol from C symbol object.
+     void init (const zbar_symbol_t *sym = NULL)
+     {
+@@ -361,7 +445,7 @@
+     {
+         const zbar_symbol_set_t *zsyms = _syms;
+         if(zsyms)
+-            _sym.init(zbar_symbol_set_first_symbol(zsyms));
++            _sym = zbar_symbol_set_first_symbol(zsyms);
+     }
+ 
+     /// copy constructor.
+@@ -370,25 +454,33 @@
+     {
+         const zbar_symbol_set_t *zsyms = _syms;
+         if(zsyms)
+-            _sym.init(zbar_symbol_set_first_symbol(zsyms));
++            _sym = zbar_symbol_set_first_symbol(zsyms);
+     }
+ 
+     ~SymbolIterator ()
+     {
+-        _sym.init();
++    }
 +
-+- (void) cancel
-+{
-+    [self performSelector: @selector(imagePickerControllerDidCancel:)
-+          withObject: self
-+          afterDelay: 0.1];
-+}
++    /// assignment.
++    SymbolIterator& operator= (const SymbolIterator& iter)
++    {
++        _syms = iter._syms;
++        _sym = iter._sym;
++        return(*this);
++    }
 +
-+- (void) reenable
-+{
-+    scanBtn.enabled = YES;
-+    self.view.userInteractionEnabled = YES;
-+}
++    bool operator! () const
++    {
++        return(!_syms || !_sym);
+     }
+ 
+     /// advance iterator to next Symbol.
+     SymbolIterator& operator++ ()
+     {
+-        const zbar_symbol_t *zsym = _sym;
+-        if(zsym)
+-            _sym.init(zbar_symbol_next(zsym));
+-        else {
+-            const zbar_symbol_set_t *zsyms = _syms;
+-            if(zsyms)
+-                _sym.init(zbar_symbol_set_first_symbol(zsyms));
+-        }
++        if(!!_sym)
++            _sym = zbar_symbol_next(_sym);
++        else if(!!_syms)
++            _sym = zbar_symbol_set_first_symbol(_syms);
+         return(*this);
+     }
+ 
+@@ -440,9 +532,7 @@
+ static inline std::ostream& operator<< (std::ostream& out,
+                                         const Symbol& sym)
+ {
+-    out << sym.get_type_name()
+-        << sym.get_addon_name()
+-        << ":" << sym.get_data();
++    out << sym.get_type_name() << ":" << sym.get_data();
+     return(out);
+ }
+ 
+diff -r 563557a923d0 include/zbar/Video.h
+--- a/include/zbar/Video.h	Tue Oct 27 11:25:59 2009 -0400
++++ b/include/zbar/Video.h	Fri Feb 22 08:54:29 2013 -0300
+@@ -1,5 +1,5 @@
+ //------------------------------------------------------------------------
+-//  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++//  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
+ //
+ //  This file is part of the ZBar Bar Code Reader.
+ //
+@@ -92,7 +92,7 @@
+     /// see zbar_video_init()
+     void init (std::string& format)
+     {
+-        unsigned int fourcc = *(unsigned int*)format.c_str();
++        unsigned int fourcc = zbar_fourcc_parse(format.c_str());
+         if(zbar_video_init(_video, fourcc))
+             throw_exception(_video);
+     }
+diff -r 563557a923d0 include/zbar/zbargtk.h
+--- a/include/zbar/zbargtk.h	Tue Oct 27 11:25:59 2009 -0400
++++ b/include/zbar/zbargtk.h	Fri Feb 22 08:54:29 2013 -0300
+@@ -136,7 +136,7 @@
+ 
+ GType zbar_gtk_get_type(void) G_GNUC_CONST;
+ 
+-/** 
++/**
+  * zbar_gtk_new:
+  * create a new barcode reader widget instance.
+  * initially has no associated video device or image.
+@@ -189,7 +189,17 @@
+  */
+ gboolean zbar_gtk_get_video_opened(ZBarGtk *zbar);
+ 
+-/** 
++/** set video camera resolution.
++ * @width: width in pixels
++ * @height: height in pixels
++ *
++ * @note this call must be made before video is initialized
++ */
++void zbar_gtk_request_video_size(ZBarGtk *zbar,
++                                 int width,
++                                 int height);
 +
-+- (void) initScanning
-+{
-+    if(hasOverlay &&
-+       self.sourceType == UIImagePickerControllerSourceTypeCamera) {
-+        if(showsZBarControls || ![self cameraOverlayView])
-+            [self setCameraOverlayView: overlay];
++/**
+  * utility function to populate a zbar_image_t from a GdkPixbuf.
+  * @image: the zbar library image destination to populate
+  * @pixbuf: the GdkPixbuf source
+diff -r 563557a923d0 iphone/ChangeLog
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/ChangeLog	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,138 @@
++version 1.3.1:
++  * fix examples
++    - fix EmbedReader initial iPad orientation
++    - fix TabReader shouldn't show controls
++  * add retry workaround when device lock fails
++    - add iPhone 5 launch image to examples
++    - doc updates
++  * Lion and Xcode updates
++    - fix new warnings/errors
++    - find missing buddy
++    - fix SDK bg image: force resoution to 72dpi
++  * Fix EmbedReader example rotation interaction
++
++version 1.2.2:
++  * reduce controller present and dismiss latency
++    - add simple shutter to mask video start
++
++version 1.2.1:
++  * fix overlay resizing bug
++
++version 1.2:
++  * release updates
 +
-+        UIView *activeOverlay = [self cameraOverlayView];
++version 1.1.3:
++  * fix UITabViewController rotation interaction
++
++version 1.1.2:
++  * add maxZoom for increasing zoom range
++    - workaround camera preview initial location/size bug
++  * add emulation for UI videoQuality to adjust camera resolution
++  * fix several simulator-related bugs
++    - fix device property missing from simulated ZBarReaderView
++    - fix AVCaptureDevice referenced from ZBarReaderViewController
++    - fix simulated camera gesture multiple recognition
++
++version 1.1.1:
++  * fix ReaderSample project path to ZBarSDK
++  * README document new examples
++    - make ReaderSample scheme public
++  * documentation updates
++  * add emulation for UI camera device and flash mode properties
++  * workaround orientation bugs in parent controllers
++    - enable orientation and iPad support for all examples
++  * add orientation detection fall back
++  * fix captureReader not exposed to simulator
++  * fix camera preview stale rotation corner
++    - fix ZBarReaderViewController toolbar layout accomodation
++    - switch pre-release samples to use debug library
++  * update docs to note possible link order dependency
++  * add missing references to new samples
++  * add IB support to ZBarReaderViewController
++    - add tabbed reader sample
++  * add embedded reader sample
++    - factor out camera simulation logic
++  * fix readertest max quality result filtering
++    - thanks to John Boydon for finding this!
++  * improve support for resizing, rotating and embedding the reader
++  * add readertest fixed zoom stops
++  * add manual frame capture
++    - readertest save as PNG
++  * enhance readertest to support default/demo pre-config and distribution
++  * updates for Xcode 4
++  * expose tracking box color
++
++version 1.1:
++  * fix doc typo (bug #3139087)
++    - add modifier bit docs
 +
-+        if(showsZBarControls) {
-+            if(!toolbar.superview) {
-+                [overlay addSubview: toolbar];
-+                [overlay addSubview: infoBtn];
-+            }
-+            [self setShowsCameraControls: NO];
-+        }
-+        else {
-+            [toolbar removeFromSuperview];
-+            [infoBtn removeFromSuperview];
-+            if(activeOverlay == overlay)
-+                [self setShowsCameraControls: YES];
-+        }
++version 1.0.1:
++  * hotfix broken ZBarHelpController back button
++  * 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
++  * workaround iOS 4.2 hang
++    - update to use latest SDK
++  * add support for Code 93 symbology
 +
-+        self.view.userInteractionEnabled = YES;
++version 1.0:
++  * update to SDK 4.1, clean out LLVM warnings
++  * fix camera simulation gesture
 +
-+        sampling = (cameraMode == ZBarReaderControllerCameraModeSampling ||
-+                    cameraMode == ZBarReaderControllerCameraModeSequence);
++version 0.1.2:
++  * fix missing header dependency
++  * doc enhancements
++  * force controls to front when showsZBarControls is enabled
++  * fix initial zoom crop (performance bug)
++  * workaround iPhone quartz access past image data
 +
-+        if(sampling) {
-+            toolbar.items = [NSArray arrayWithObjects:
-+                                cancelBtn, space[0], nil];
++version 0.1.1:
++  * migrate to binary iPhone SDK distribution (NB backward incompatibilities!)
++    - restructure headers
 +
-+            t_frame = timer_now();
-+            dt_frame = 0;
-+            boxLayer.opacity = 0;
-+            if(boxView.superview != activeOverlay)
-+                [boxView removeFromSuperview];
-+            if(!boxView.superview)
-+                [activeOverlay insertSubview: boxView atIndex:0];
-+            scanner.enableCache = enableCache;
++version 0.1:
++  * workaround for iPhone simulator builds
++    - refactor ZBarReaderView for capture/simulator specific implementations
++    - fix tracking calculations
++    - fix captured video frame color conversion
++  * fix for poor iPhone 4 performance
++  * enable torch for iPhone 4
++  * fix iPhone circular ref bug
++  * add iPhone cache flush, change new libs to weak refs
++  * fix iPhone async ref bug
++  * enhance iPhone readertest w/more options
++  * add iPhone zoom support, integrate with crop
++  * add iPhone OS 4.0 video capture support
++    - replacement view controller for new camera reader
++    - separate view for use without controller
++    - separate capture delegate for use standalone
++    - add continuous autofocus
++  * cleanup and expose iphone help display API
++  * fixes to new iphone help display
++  * migrate iphone help display to integrated web page (NB resource updates!)
++    - allows easier customization
++    - local links open directly, external links confirm and jump out to Safari
++    - JavaScript hook for help context customization
++    - also enhanced default help (note this changes the required resources)
++    - fix to disable scanning during help overlay
++    - thanks to iafanasyev and others for detailed suggestions
++  * fix iphone custom overlay response (bug #2959617)
++    - thanks to an anonymous user for the patch!
++  * iphone widget performance tuning enhancements
++    - fix crop calculation bug in ZBarImage
++    - add properties to control pre-scan image cropping and scaling
++    - add property for scanner cache control
++    - enable some scanner density control (FIXME should be property)
++    - fix ifdef for quality control (FIXME should be property)
++    - add "sequence" mode test (not actually so useful)
++  * realtime scanning for iphone widget
++    - uses UIGetScreenImage() (NB private)
++    - ZBarImage from CGImage (instead of UIImage)
++    - add crop to scaling step
++    - expose symbol set unfiltered results
++  * iphone widget back compat updates, add basic test app
++  * add Obj-C wrapper
++  * first pass working iPhone "widget"
+diff -r 563557a923d0 iphone/README
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/README	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,66 @@
++ZBar iOS SDK
++============
 +
-+            SEL meth = nil;
-+            if(cameraMode == ZBarReaderControllerCameraModeSampling) {
-+                // ensure crop rect does not include controls
-+                if(scanCrop.origin.x + scanCrop.size.width > .8875)
-+                    scanCrop.size.width = .8875 - scanCrop.origin.x;
++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 93, Code 39, Codabar, Interleaved 2 of 5 and QR Code.
++These are the Objective C wrappers and integrated widget for developing
++with the library on the iOS platform.
 +
-+                meth = @selector(scanScreen);
-+            }
-+            else
-+                meth = @selector(takePicture);
++Check the ZBar project home page for the latest release, forums, etc.
 +
-+            [self performSelector: meth
-+                  withObject: nil
-+                  afterDelay: 2];
-+#ifdef DEBUG_OBJC
-+            [self performSelector: @selector(dumpFPS)
-+                  withObject: nil
-+                  afterDelay: 4];
-+#endif
-+        }
-+        else {
-+            scanBtn.enabled = NO;
-+            toolbar.items = [NSArray arrayWithObjects:
-+                        cancelBtn, space[0], scanBtn, space[1], space[2], nil];
++* http://zbar.sourceforge.net/iphone
 +
-+            [self performSelector: @selector(reenable)
-+                  withObject: nil
-+                  afterDelay: .5];
++Installation
++------------
 +
-+            [boxView removeFromSuperview];
-+        }
-+    }
-+}
++If you are migrating from a pre-SDK source version of the library,
++first make sure you remove all of the old references to zbar.xcodeproj
++and libzbar.a and revert any related build settings.
 +
-+- (void) viewWillAppear: (BOOL) animated
-+{
-+    [self initScanning];
-+    [super viewWillAppear: animated];
-+}
++To add the SDK to an Xcode project:
 +
-+- (void) viewWillDisappear: (BOOL) animated
-+{
-+    sampling = NO;
-+    scanner.enableCache = NO;
-+    [super viewWillDisappear: animated];
-+}
++   1. Drag ZBarSDK into your Xcode project.
++   3. Add these system frameworks to your project:
++      * AVFoundation.framework (weak)
++      * CoreMedia.framework (weak)
++      * CoreVideo.framework (weak)
++      * QuartzCore.framework
++      * libiconv.dylib
 +
-+- (BOOL) showsZBarControls
-+{
-+    return(showsZBarControls);
-+}
++Documentation
++-------------
 +
-+- (void) setCameraMode: (ZBarReaderControllerCameraMode) mode
-+{
-+#if !USE_PRIVATE_APIS
-+    if(mode == ZBarReaderControllerCameraModeSampling)
-+        [NSException raise: NSInvalidArgumentException
-+            format: @"ZBarReaderController cannot set cameraMode=Sampling"
-+                    @" when USE_PRIVATE_APIS=0"];
-+#endif
-+    cameraMode = mode;
-+}
++See Documentation.html for complete SDK documentation.
 +
-+- (void) setShowsZBarControls: (BOOL) show
-+{
-+    if(show && !hasOverlay)
-+        [NSException raise: NSInvalidArgumentException
-+            format: @"ZBarReaderController cannot set showsZBarControls=YES for OS<3.1"];
++Examples
++--------
 +
-+    showsZBarControls = show;
-+}
++You should be able to open and build the examples directly from the
++disk image (ignore warnings about the read-only volume).  If you have
++problems with this, please copy the examples to your local drive
++instead and build from there.
 +
-+// intercept delegate as readerDelegate
++A tutorial that walks through installing and using the SDK is
++available in the documentation.  The SDK disk image also contains the
++resulting Xcode project at Examples/ReaderSample.
 +
-+- (void) setDelegate: (id <UINavigationControllerDelegate,
-+                           UIImagePickerControllerDelegate>) delegate
-+{
-+    self.readerDelegate = (id <ZBarReaderDelegate>)delegate;
-+}
++Examples/readertest demonstrates most of the configuration options
++available for the reader.
 +
++Examples/TabReader shows how you can use Interface Builder to add the
++reader as a tab in a UITabBarController.
 +
-+#ifdef DEBUG_OBJC
-+- (void) dumpFPS
++Examples/EmbedReader shows how a ZBarReaderView may be embedded
++directly in the application view hierarchy.
++
++Copyright and License
++---------------------
++
++Licensed under the GNU Lesser General Public License, version 2.1.
++http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
++
++Copyright 2008-2011 � Jeff Brown <spadix@users.sourceforge.net> et al
++
++See the included files COPYING and LICENSE for details
+diff -r 563557a923d0 iphone/ZBarCVImage.h
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/ZBarCVImage.h	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,43 @@
++//------------------------------------------------------------------------
++//  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
++//
++//  This file is part of the ZBar Bar Code Reader.
++//
++//  The ZBar Bar Code Reader is free software; you can redistribute it
++//  and/or modify it under the terms of the GNU Lesser Public License as
++//  published by the Free Software Foundation; either version 2.1 of
++//  the License, or (at your option) any later version.
++//
++//  The ZBar Bar Code Reader is distributed in the hope that it will be
++//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
++//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++//  GNU Lesser Public License for more details.
++//
++//  You should have received a copy of the GNU Lesser Public License
++//  along with the ZBar Bar Code Reader; if not, write to the Free
++//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++//  Boston, MA  02110-1301  USA
++//
++//  http://sourceforge.net/projects/zbar
++//------------------------------------------------------------------------
++
++#import <ZBarSDK/ZBarImage.h>
++#import <CoreVideo/CoreVideo.h>
++
++// ZBarImage referring to a CVPixelBuffer.  used internally to handle
++// asynchronous conversion to UIImage
++
++@interface ZBarCVImage
++    : ZBarImage
 +{
-+    if(!sampling)
-+        return;
-+    [self performSelector: @selector(dumpFPS)
-+          withObject: nil
-+          afterDelay: 2];
-+    zlog(@"fps=%g", 1 / dt_frame);
++    CVPixelBufferRef pixelBuffer;
++    void *rgbBuffer;
++    NSInvocationOperation *conversion;
 +}
-+#endif
 +
-+- (NSInteger) scanImage: (CGImageRef) image
-+            withScaling: (CGFloat) scale
-+{
-+    uint64_t now = timer_now();
-+    if(dt_frame)
-+        dt_frame = (dt_frame + timer_elapsed(t_frame, now)) / 2;
-+    else
-+        dt_frame = timer_elapsed(t_frame, now);
-+    t_frame = now;
++- (void) waitUntilConverted;
 +
-+    int w = CGImageGetWidth(image);
-+    int h = CGImageGetHeight(image);
-+    CGRect crop;
-+    if(w >= h)
-+        crop = CGRectMake(scanCrop.origin.x * w, scanCrop.origin.y * h,
-+                          scanCrop.size.width * w, scanCrop.size.height * h);
-+    else
-+        crop = CGRectMake(scanCrop.origin.y * w, scanCrop.origin.x * h,
-+                          scanCrop.size.height * w, scanCrop.size.width * h);
++@property (nonatomic) CVPixelBufferRef pixelBuffer;
++@property (nonatomic, readonly) void *rgbBuffer;
 +
-+    CGSize size;
-+    if(crop.size.width >= crop.size.height &&
-+       crop.size.width > maxScanDimension)
-+        size = CGSizeMake(maxScanDimension,
-+                          crop.size.height * maxScanDimension / crop.size.width);
-+    else if(crop.size.height > maxScanDimension)
-+        size = CGSizeMake(crop.size.width * maxScanDimension / crop.size.height,
-+                          maxScanDimension);
-+    else
-+        size = crop.size;
++@end
+diff -r 563557a923d0 iphone/ZBarCVImage.m
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/ZBarCVImage.m	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,195 @@
++//------------------------------------------------------------------------
++//  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
++//
++//  This file is part of the ZBar Bar Code Reader.
++//
++//  The ZBar Bar Code Reader is free software; you can redistribute it
++//  and/or modify it under the terms of the GNU Lesser Public License as
++//  published by the Free Software Foundation; either version 2.1 of
++//  the License, or (at your option) any later version.
++//
++//  The ZBar Bar Code Reader is distributed in the hope that it will be
++//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
++//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++//  GNU Lesser Public License for more details.
++//
++//  You should have received a copy of the GNU Lesser Public License
++//  along with the ZBar Bar Code Reader; if not, write to the Free
++//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++//  Boston, MA  02110-1301  USA
++//
++//  http://sourceforge.net/projects/zbar
++//------------------------------------------------------------------------
 +
-+    if(scale) {
-+        size.width *= scale;
-+        size.height *= scale;
-+    }
++#import "ZBarCVImage.h"
++#define MODULE ZBarCVImage
++#import "debug.h"
 +
-+    if(self.sourceType != UIImagePickerControllerSourceTypeCamera ||
-+       cameraMode == ZBarReaderControllerCameraModeDefault) {
-+        // limit the maximum number of scan passes
-+        int density;
-+        if(size.width > 720)
-+            density = (size.width / 240 + 1) / 2;
-+        else
-+            density = 1;
-+        [scanner setSymbology: 0
-+                 config: ZBAR_CFG_X_DENSITY
-+                 to: density];
++static NSOperationQueue *conversionQueue;
 +
-+        if(size.height > 720)
-+            density = (size.height / 240 + 1) / 2;
-+        else
-+            density = 1;
-+        [scanner setSymbology: 0
-+                 config: ZBAR_CFG_Y_DENSITY
-+                 to: density];
-+    }
++static const void*
++asyncProvider_getBytePointer (void *info)
++{
++    // block until data is available
++    ZBarCVImage *image = info;
++    assert(image);
++    [image waitUntilConverted];
++    void *buf = image.rgbBuffer;
++    assert(buf);
++    return(buf);
++}
 +
-+    ZBarImage *zimg = [[ZBarImage alloc]
-+                          initWithCGImage: image
-+                          crop: crop
-+                          size: size];
-+    int nsyms = [scanner scanImage: zimg];
-+    [zimg release];
++static const CGDataProviderDirectCallbacks asyncProvider = {
++    .version = 0,
++    .getBytePointer = asyncProvider_getBytePointer,
++    .releaseBytePointer = NULL,
++    .getBytesAtPosition = NULL,
++    .releaseInfo = (void*)CFRelease,
++};
 +
-+    return(nsyms);
-+}
++@implementation ZBarCVImage
 +
-+- (ZBarSymbol*) extractBestResult: (BOOL) filter
++@synthesize pixelBuffer, rgbBuffer;
++
++- (void) dealloc
 +{
-+    ZBarSymbol *sym = nil;
-+    ZBarSymbolSet *results = scanner.results;
-+    results.filterSymbols = filter;
-+    for(ZBarSymbol *s in results)
-+        if(!sym || sym.quality < s.quality)
-+            sym = s;
-+    return(sym);
++    self.pixelBuffer = NULL;
++    if(rgbBuffer) {
++        free(rgbBuffer);
++        rgbBuffer = NULL;
++    }
++    [conversion release];
++    conversion = nil;
++    [super dealloc];
 +}
 +
-+- (void) updateBox: (ZBarSymbol*) sym
-+         imageSize: (CGSize) size
++- (void) setPixelBuffer: (CVPixelBufferRef) newbuf
 +{
-+    [CATransaction begin];
-+    [CATransaction setAnimationDuration: .3];
-+    [CATransaction setAnimationTimingFunction:
-+        [CAMediaTimingFunction functionWithName:
-+            kCAMediaTimingFunctionLinear]];
++    CVPixelBufferRef oldbuf = pixelBuffer;
++    if(newbuf)
++        CVPixelBufferRetain(newbuf);
++    pixelBuffer = newbuf;
++    if(oldbuf)
++        CVPixelBufferRelease(oldbuf);
++}
 +
-+    CGFloat alpha = boxLayer.opacity;
-+    if(sym) {
-+        CGRect r = sym.bounds;
-+        if(r.size.width > 16 && r.size.height > 16) {
-+            r.origin.x += scanCrop.origin.y * size.width;
-+            r.origin.y += scanCrop.origin.x * size.height;
-+            r = CGRectInset(r, -16, -16);
-+            if(alpha > .25) {
-+                CGRect frame = boxLayer.frame;
-+                r.origin.x = (r.origin.x * 3 + frame.origin.x) / 4;
-+                r.origin.y = (r.origin.y * 3 + frame.origin.y) / 4;
-+                r.size.width = (r.size.width * 3 + frame.size.width) / 4;
-+                r.size.height = (r.size.height * 3 + frame.size.height) / 4;
-+            }
-+            boxLayer.frame = r;
-+            boxLayer.opacity = 1;
++- (void) waitUntilConverted
++{
++    // operation will at least have been queued already
++    NSOperation *op = [conversion retain];
++    if(!op)
++        return;
++    [op waitUntilFinished];
++    [op release];
++}
++
++- (UIImage*) UIImageWithOrientation: (UIImageOrientation) orient
++{
++    if(!conversion && !rgbBuffer) {
++        // start format conversion in separate thread
++        NSOperationQueue *queue = conversionQueue;
++        if(!queue) {
++            queue = conversionQueue = [NSOperationQueue new];
++            queue.maxConcurrentOperationCount = 1;
 +        }
++        else
++            [queue waitUntilAllOperationsAreFinished];
++
++        conversion = [[NSInvocationOperation alloc]
++                         initWithTarget: self
++                         selector: @selector(convertCVtoRGB)
++                         object: nil];
++        [queue addOperation: conversion];
++        [conversion release];
 +    }
-+    else {
-+        if(alpha > .1)
-+            boxLayer.opacity = alpha / 2;
-+        else if(alpha)
-+            boxLayer.opacity = 0;
-+    }
-+    [CATransaction commit];
-+}
 +
-+#if USE_PRIVATE_APIS
++    // create UIImage before converted data is available
++    CGSize size = self.size;
++    int w = size.width;
++    int h = size.height;
 +
-+- (void) scanScreen
++    CGDataProviderRef datasrc =
++        CGDataProviderCreateDirect([self retain], 3 * w * h, &asyncProvider);
++    CGColorSpaceRef cs = CGColorSpaceCreateDeviceRGB();
++    CGImageRef cgimg =
++        CGImageCreate(w, h, 8, 24, 3 * w, cs,
++                      kCGBitmapByteOrderDefault, datasrc,
++                      NULL, YES, kCGRenderingIntentDefault);
++    CGColorSpaceRelease(cs);
++    CGDataProviderRelease(datasrc);
++
++    UIImage *uiimg =
++        [UIImage imageWithCGImage: cgimg
++                 scale: 1
++                 orientation: orient];
++    CGImageRelease(cgimg);
++
++    return(uiimg);
++}
++
++// convert video frame to a CGImage compatible RGB format
++// FIXME this is temporary until we can find the native way...
++- (void) convertCVtoRGB
 +{
-+    if(!sampling)
++    timer_start;
++    unsigned long format = self.format;
++    assert(format == zbar_fourcc('C','V','2','P'));
++    if(format != zbar_fourcc('C','V','2','P'))
 +        return;
 +
-+    // FIXME ugly hack: use private API to sample screen
-+    CGImageRef image = UIGetScreenImage();
-+
-+    [self scanImage: image
-+          withScaling: 0];
-+    CGSize size = CGSizeMake(CGImageGetWidth(image), CGImageGetHeight(image));
-+    CGImageRelease(image);
++    CVPixelBufferLockBaseAddress(pixelBuffer, kCVPixelBufferLock_ReadOnly);
++    int w = CVPixelBufferGetWidth(pixelBuffer);
++    int h = CVPixelBufferGetHeight(pixelBuffer);
++    int dy = CVPixelBufferGetBytesPerRowOfPlane(pixelBuffer, 0);
++    int duv = CVPixelBufferGetBytesPerRowOfPlane(pixelBuffer, 1);
++    uint8_t *py = CVPixelBufferGetBaseAddressOfPlane(pixelBuffer, 0);
++    uint8_t *puv = CVPixelBufferGetBaseAddressOfPlane(pixelBuffer, 1);
++    if(!py || !puv || dy < w || duv < w)
++        goto error;
 +
-+    ZBarSymbol *sym = [self extractBestResult: NO];
++    int datalen = 3 * w * h;
++    // Quartz accesses some undocumented amount past allocated data?
++    // ...allocate extra to compensate
++    uint8_t *pdst = rgbBuffer = malloc(datalen + 3 * w);
++    if(!pdst)
++        goto error;
++    [self setData: rgbBuffer
++          withLength: datalen];
 +
-+    if(sym && !sym.count) {
-+        SEL cb = @selector(imagePickerController:didFinishPickingMediaWithInfo:);
-+        if(takesPicture) {
-+            symbol = [sym retain];
-+            [self takePicture];
-+        }
-+        else if([readerDelegate respondsToSelector: cb]) {
-+            symbol = [sym retain];
++    for(int y = 0; y < h; y++) {
++        const uint8_t *qy = py;
++        const uint8_t *quv = puv;
++        for(int x = 0; x < w; x++) {
++            int Y1 = *(qy++) - 16;
++            int Cb = *(quv) - 128;
++            int Cr = *(quv + 1) - 128;
++            Y1 *= 4769;
++            quv += (x & 1) << 1;
++            int r = (Y1 + 6537 * Cr + 2048) / 4096;
++            int g = (Y1 - 1604 * Cb - 3329 * Cr + 2048) / 4096;
++            int b = (Y1 + 8263 * Cb + 2048) / 4096;
 +
-+            [CATransaction begin];
-+            [CATransaction setDisableActions: YES];
-+            boxLayer.opacity = 0;
-+            [CATransaction commit];
++            r = (r | -!!(r >> 8)) & -((r >> 8) >= 0);
++            g = (g | -!!(g >> 8)) & -((g >> 8) >= 0);
++            b = (b | -!!(b >> 8)) & -((b >> 8) >= 0);
 +
-+            // capture preview image and send to delegate
-+            // after box has been hidden
-+            [self performSelector: @selector(captureScreen)
-+                  withObject: nil
-+                  afterDelay: 0.001];
-+            return;
++            *(pdst++) = r;
++            *(pdst++) = g;
++            *(pdst++) = b;
 +        }
++        py += dy;
++        if(y & 1)
++            puv += duv;
 +    }
 +
-+    // reschedule
-+    [self performSelector: @selector(scanScreen)
-+          withObject: nil
-+          afterDelay: 0.001];
++error:
++    CVPixelBufferUnlockBaseAddress(pixelBuffer, kCVPixelBufferLock_ReadOnly);
++    zlog(@"convert time %gs", timer_elapsed(t_start, timer_now()));
 +
-+    if(tracksSymbols)
-+        [self updateBox: sym
-+              imageSize: size];
++    // release buffer as soon as conversion is complete
++    self.pixelBuffer = NULL;
++
++    conversion = nil;
 +}
 +
-+- (void) captureScreen
++@end
+diff -r 563557a923d0 iphone/ZBarCameraSimulator.m
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/ZBarCameraSimulator.m	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,120 @@
++//------------------------------------------------------------------------
++//  Copyright 2010-2011 (c) Jeff Brown <spadix@users.sourceforge.net>
++//
++//  This file is part of the ZBar Bar Code Reader.
++//
++//  The ZBar Bar Code Reader is free software; you can redistribute it
++//  and/or modify it under the terms of the GNU Lesser Public License as
++//  published by the Free Software Foundation; either version 2.1 of
++//  the License, or (at your option) any later version.
++//
++//  The ZBar Bar Code Reader is distributed in the hope that it will be
++//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
++//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++//  GNU Lesser Public License for more details.
++//
++//  You should have received a copy of the GNU Lesser Public License
++//  along with the ZBar Bar Code Reader; if not, write to the Free
++//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++//  Boston, MA  02110-1301  USA
++//
++//  http://sourceforge.net/projects/zbar
++//------------------------------------------------------------------------
++
++#import <ZBarSDK/ZBarCameraSimulator.h>
++#import <ZBarSDK/ZBarReaderView.h>
++
++// hack around missing simulator support for AVCapture interfaces
++
++@implementation ZBarCameraSimulator
++
++@synthesize readerView;
++
++- (id) initWithViewController: (UIViewController*) vc
 +{
-+    CGImageRef screen = UIGetScreenImage();
++    if(!TARGET_IPHONE_SIMULATOR) {
++        [self release];
++        return(nil);
++    }
++    self = [super init];
++    if(!self)
++        return(nil);
 +
-+    CGRect r = CGRectMake(0, 0,
-+                          CGImageGetWidth(screen), CGImageGetHeight(screen));
-+    if(r.size.width > r.size.height)
-+        r.size.width -= 54;
-+    else
-+        r.size.height -= 54;
-+    CGImageRef preview = CGImageCreateWithImageInRect(screen, r);
-+    CGImageRelease(screen);
++    viewController = vc;
 +
-+    UIImage *image = [UIImage imageWithCGImage: preview];
-+    CGImageRelease(preview);
++    return(self);
++}
 +
-+    [readerDelegate
-+        imagePickerController: self
-+        didFinishPickingMediaWithInfo:
-+            [NSDictionary dictionaryWithObjectsAndKeys:
-+                image, UIImagePickerControllerOriginalImage,
-+                [NSArray arrayWithObject: symbol],
-+                    ZBarReaderControllerResults,
-+                nil]];
-+    [symbol release];
-+    symbol = nil;
++- (void) dealloc
++{
++    viewController = nil;
++    readerView = nil;
++    [picker release];
++    picker = nil;
++    [pickerPopover release];
++    pickerPopover = nil;
++    [super dealloc];
++}
 +
-+    // continue scanning until dismissed
-+    [self performSelector: @selector(scanScreen)
-+          withObject: nil
-+          afterDelay: 0.001];
++- (void) setReaderView: (ZBarReaderView*) view
++{
++    ZBarReaderView *oldView = readerView;
++    readerView = [view retain];
++    [oldView release];
++
++    UILongPressGestureRecognizer *gesture =
++        [[UILongPressGestureRecognizer alloc]
++            initWithTarget: self
++            action: @selector(didLongPress:)];
++    gesture.numberOfTouchesRequired = 2;
++    [view addGestureRecognizer: gesture];
++    [gesture release];
 +}
 +
-+#endif /* USE_PRIVATE_APIS */
++- (void) didLongPress: (UILongPressGestureRecognizer*) gesture
++{
++    if(gesture.state == UIGestureRecognizerStateBegan)
++        [self takePicture];
++}
 +
-+- (void) scanSequence: (UIImage*) image
++- (void) takePicture
 +{
-+    if(!sampling) {
-+        [image release];
-+        return;
++    if(!picker) {
++        picker = [UIImagePickerController new];
++        picker.delegate = self;
++    }
++    if(UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
++        if(!pickerPopover)
++            pickerPopover = [[UIPopoverController alloc]
++                                initWithContentViewController: picker];
++        [pickerPopover presentPopoverFromRect: CGRectZero
++                       inView: readerView
++                       permittedArrowDirections: UIPopoverArrowDirectionAny
++                       animated: YES];
 +    }
++    else
++        [viewController presentModalViewController: picker
++                        animated: YES];
++}
 +
-+    int nsyms = [self scanImage: image.CGImage
-+                      withScaling: 0];
++- (void)  imagePickerController: (UIImagePickerController*) _picker
++  didFinishPickingMediaWithInfo: (NSDictionary*) info
++{
++    UIImage *image = [info objectForKey: UIImagePickerControllerOriginalImage];
 +
-+    ZBarSymbol *sym = nil;
-+    if(nsyms)
-+        [self extractBestResult: NO];
++    if(UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad)
++        [pickerPopover dismissPopoverAnimated: YES];
++    else
++        [_picker dismissModalViewControllerAnimated: YES];
 +
-+    SEL cb = @selector(imagePickerController:didFinishPickingMediaWithInfo:);
-+    if(sym && !sym.count &&
-+       [readerDelegate respondsToSelector: cb])
-+        [readerDelegate
-+            imagePickerController: self
-+            didFinishPickingMediaWithInfo:
-+                [NSDictionary dictionaryWithObjectsAndKeys:
-+                    image, UIImagePickerControllerOriginalImage,
-+                    [NSArray arrayWithObject: sym],
-+                        ZBarReaderControllerResults,
-+                    nil]];
-+    CGSize size = image.size;
-+    [image release];
-+
-+    // reschedule
-+    [self performSelector: @selector(takePicture)
-+          withObject: nil
-+          afterDelay: 0.001];
-+
-+    if(tracksSymbols)
-+        [self updateBox: sym
-+              imageSize: size];
-+}
-+
-+- (void) showHelpWithReason: (NSString*) reason
-+{
-+    if(help) {
-+        [help.view removeFromSuperview];
-+        [help release];
-+    }
-+    help = [[ZBarHelpController alloc]
-+               initWithReason: reason];
-+    help.delegate = (id<ZBarHelpDelegate>)self;
-+
-+    if(self.sourceType != UIImagePickerControllerSourceTypeCamera) {
-+        [self presentModalViewController: help
-+              animated: YES];
-+        return;
-+    }
-+
-+    // show help as overlay view to workaround controller bugs
-+    sampling = NO;
-+    scanner.enableCache = NO;
-+    help.wantsFullScreenLayout = YES;
-+    help.view.alpha = 0;
-+
-+    UIView *activeOverlay = [self cameraOverlayView];
-+    help.view.frame = [activeOverlay
-+                          convertRect: CGRectMake(0, 0, 320, 480)
-+                          fromView: nil];
-+    [activeOverlay addSubview: help.view];
-+    [UIView beginAnimations: @"ZBarHelp"
-+            context: nil];
-+    help.view.alpha = 1;
-+    [UIView commitAnimations];
-+}
-+
-+- (void) info
-+{
-+    [self showHelpWithReason: @"INFO"];
-+}
-+
-+- (void)  imagePickerController: (UIImagePickerController*) picker
-+  didFinishPickingMediaWithInfo: (NSDictionary*) info
-+{
-+    UIImage *img = [info objectForKey: UIImagePickerControllerOriginalImage];
-+
-+    id results = nil;
-+    if(self.sourceType == UIImagePickerControllerSourceTypeCamera &&
-+       cameraMode == ZBarReaderControllerCameraModeSequence) {
-+        if(sampling)
-+            [self performSelector: @selector(scanSequence:)
-+                  withObject: [img retain]
-+                  afterDelay: 0.001];
-+        return;
-+    }
-+    else if(!sampling)
-+        results = [self scanImage: img.CGImage];
-+    else {
-+        results = [NSArray arrayWithObject: symbol];
-+        [symbol release];
-+        symbol = nil;
-+    }
-+
-+    [self performSelector: @selector(reenable)
-+         withObject: nil
-+         afterDelay: .25];
-+
-+    if(results) {
-+        NSMutableDictionary *newinfo = [info mutableCopy];
-+        [newinfo setObject: results
-+                 forKey: ZBarReaderControllerResults];
-+        SEL cb = @selector(imagePickerController:didFinishPickingMediaWithInfo:);
-+        if([readerDelegate respondsToSelector: cb])
-+            [readerDelegate imagePickerController: self
-+                            didFinishPickingMediaWithInfo: newinfo];
-+        else
-+            [self dismissModalViewControllerAnimated: YES];
-+        [newinfo release];
-+        return;
-+    }
-+
-+    BOOL camera = (self.sourceType == UIImagePickerControllerSourceTypeCamera);
-+    BOOL retry = !camera || (hasOverlay && ![self showsCameraControls]);
-+    if(showsHelpOnFail && retry)
-+        [self showHelpWithReason: @"FAIL"];
-+
-+    SEL cb = @selector(readerControllerDidFailToRead:withRetry:);
-+    if([readerDelegate respondsToSelector: cb])
-+        // assume delegate dismisses controller if necessary
-+        [readerDelegate readerControllerDidFailToRead: self
-+                        withRetry: retry];
-+    else if(!retry)
-+        // must dismiss stock controller
-+        [self dismissModalViewControllerAnimated: YES];
-+}
-+
-+- (void) imagePickerControllerDidCancel: (UIImagePickerController*) picker
-+{
-+    SEL cb = @selector(imagePickerControllerDidCancel:);
-+    if([readerDelegate respondsToSelector: cb])
-+        [readerDelegate imagePickerControllerDidCancel: self];
-+    else
-+        [self dismissModalViewControllerAnimated: YES];
-+}
-+
-+// ZBarHelpDelegate
-+
-+- (void) helpControllerDidFinish: (ZBarHelpController*) hlp
-+{
-+    if(self.sourceType == UIImagePickerControllerSourceTypeCamera) {
-+        [UIView beginAnimations: @"ZBarHelp"
-+                context: nil];
-+        hlp.view.alpha = 0;
-+        [UIView commitAnimations];
-+        [self initScanning];
-+    }
-+    else
-+        [hlp dismissModalViewControllerAnimated: YES];
++    [readerView performSelector: @selector(scanImage:)
++                withObject: image
++                afterDelay: .1];
 +}
 +
-+- (id <NSFastEnumeration>) scanImage: (CGImageRef) image
++- (void) imagePickerControllerDidCancel: (UIImagePickerController*) _picker
 +{
-+    timer_start;
-+
-+    int nsyms = [self scanImage: image
-+                      withScaling: 0];
-+
-+    if(!nsyms &&
-+       CGImageGetWidth(image) >= 640 &&
-+       CGImageGetHeight(image) >= 640)
-+        // make one more attempt for close up, grainy images
-+        nsyms = [self scanImage: image
-+                      withScaling: .5];
-+
-+    NSMutableArray *syms = nil;
-+    if(nsyms) {
-+        // quality/type filtering
-+        int max_quality = MIN_QUALITY;
-+        for(ZBarSymbol *sym in scanner.results) {
-+            zbar_symbol_type_t type = sym.type;
-+            int quality;
-+            if(type == ZBAR_QRCODE)
-+                quality = INT_MAX;
-+            else
-+                quality = sym.quality;
-+
-+            if(quality < max_quality) {
-+                zlog(@"    type=%d quality=%d < %d\n",
-+                     type, quality, max_quality);
-+                continue;
-+            }
-+
-+            if(max_quality < quality) {
-+                max_quality = quality;
-+                if(syms)
-+                    [syms removeAllObjects];
-+            }
-+            zlog(@"    type=%d quality=%d\n", type, quality);
-+            if(!syms)
-+                syms = [NSMutableArray arrayWithCapacity: 1];
-+
-+            [syms addObject: sym];
-+        }
-+    }
-+
-+    zlog(@"read %d filtered symbols in %gs total\n",
-+          (!syms) ? 0 : [syms count], timer_elapsed(t_start, timer_now()));
-+    return(syms);
++    [_picker dismissModalViewControllerAnimated: YES];
 +}
 +
 +@end
-diff --git a/iphone/ZBarReaderView.m b/iphone/ZBarReaderView.m
-new file mode 100644
---- /dev/null
-+++ b/iphone/ZBarReaderView.m
-@@ -0,0 +1,408 @@
+diff -r 563557a923d0 iphone/ZBarCaptureReader.m
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/ZBarCaptureReader.m	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,370 @@
 +//------------------------------------------------------------------------
 +//  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
 +//
@@ -3737,109 +4072,85 @@ new file mode 100644
 +//  http://sourceforge.net/projects/zbar
 +//------------------------------------------------------------------------
 +
-+#import <ZBarSDK/ZBarReaderView.h>
++#import <libkern/OSAtomic.h>
++#import <AVFoundation/AVFoundation.h>
++#import <CoreMedia/CoreMedia.h>
++#import <CoreVideo/CoreVideo.h>
++#import <ZBarSDK/ZBarCaptureReader.h>
++#import <ZBarSDK/ZBarImageScanner.h>
++#import "ZBarCVImage.h"
 +
-+#define MODULE ZBarReaderView
++#define MODULE ZBarCaptureReader
 +#import "debug.h"
 +
-+// silence warning
-+@interface ZBarReaderViewImpl : NSObject
-+@end
++enum {
++    STOPPED = 0,
++    RUNNING = 1,
++    PAUSED = 2,
++    CAPTURE = 4,
++};
 +
-+@implementation ZBarReaderView
++@implementation ZBarCaptureReader
 +
-+@synthesize readerDelegate, tracksSymbols, torchMode, showsFPS, zoom, scanCrop,
-+    previewTransform;
-+@dynamic scanner, allowsPinchZoom, enableCache, device, session, captureReader;
++@synthesize captureOutput, captureDelegate, scanner, scanCrop, size,
++    framesPerSecond, enableCache;
++@dynamic enableReader;
 +
-++ (id) alloc
++- (void) initResult
 +{
-+    if(self == [ZBarReaderView class]) {
-+        // this is an abstract wrapper for implementation selected
-+        // at compile time.  replace with concrete subclass.
-+        return([ZBarReaderViewImpl alloc]);
-+    }
-+    return([super alloc]);
++    [result release];
++    result = [ZBarCVImage new];
++    result.format = [ZBarImage fourcc: @"CV2P"];
 +}
 +
-+- (void) initSubviews
++- (id) initWithImageScanner: (ZBarImageScanner*) _scanner
 +{
-+    assert(preview);
++    self = [super init];
++    if(!self)
++        return(nil);
 +
-+    CGRect r = preview.bounds;
-+    overlay = [CALayer new];
-+    overlay.frame = r;
-+    overlay.backgroundColor = [UIColor clearColor].CGColor;
-+    [preview addSublayer: overlay];
++    t_fps = t_frame = timer_now();
++    enableCache = YES;
 +
-+    tracking = [CALayer new];
-+    tracking.frame = r;
-+    tracking.opacity = 0;
-+    tracking.borderWidth = 1;
-+    tracking.backgroundColor = [UIColor clearColor].CGColor;
-+    tracking.borderColor = [UIColor greenColor].CGColor;
-+    [overlay addSublayer: tracking];
++    scanner = [_scanner retain];
++    scanCrop = CGRectMake(0, 0, 1, 1);
++    image = [ZBarImage new];
++    image.format = [ZBarImage fourcc: @"Y800"];
++    [self initResult];
 +
-+    r.origin.x = 3 * r.size.width / 4;
-+    r.origin.y = r.size.height - 32;
-+    r.size.width = r.size.width - r.origin.x + 12;
-+    r.size.height = 32 + 12;
-+    fpsView = [[UIView alloc]
-+                   initWithFrame: r];
-+    fpsView.backgroundColor = [UIColor colorWithWhite: 0
-+                                       alpha: .333];
-+    fpsView.layer.cornerRadius = 12;
-+    fpsView.hidden = YES;
-+    [self addSubview: fpsView];
++    captureOutput = [AVCaptureVideoDataOutput new];
++    captureOutput.alwaysDiscardsLateVideoFrames = YES;
 +
-+    fpsLabel = [[UILabel alloc]
-+                   initWithFrame: CGRectMake(0, 0,
-+                                             r.size.width - 12,
-+                                             r.size.height - 12)];
-+    fpsLabel.backgroundColor = [UIColor clearColor];
-+    fpsLabel.textColor = [UIColor colorWithRed: .333
-+                                  green: .666
-+                                  blue: 1
-+                                  alpha: 1];
-+    fpsLabel.font = [UIFont systemFontOfSize: 18];
-+    fpsLabel.textAlignment = UITextAlignmentRight;
-+    [fpsView addSubview: fpsLabel];
-+
-+    self.zoom = 1.25;
-+}
-+
-+- (id) initWithImageScanner: (ZBarImageScanner*) scanner
-+{
-+    self = [super initWithFrame: CGRectMake(0, 0, 320, 426)];
-+    if(!self)
-+        return(nil);
-+
-+    self.backgroundColor = [UIColor blackColor];
-+    self.contentMode = UIViewContentModeScaleAspectFill;
-+    self.autoresizingMask =
-+        UIViewAutoresizingFlexibleWidth |
-+        UIViewAutoresizingFlexibleHeight;
-+
-+    tracksSymbols = YES;
-+    torchMode = 2; // AVCaptureTorchModeAuto
-+    scanCrop = zoomCrop = CGRectMake(0, 0, 1, 1);
-+    imageScale = 1;
-+    previewTransform = CGAffineTransformIdentity;
++#ifdef FIXED_8697526
++    /* iOS 4.2 introduced a bug that causes [session startRunning] to
++     * hang if the session has a preview layer and this property is
++     * specified at the output.  As this happens to be the default
++     * setting for the currently supported devices, it can be omitted
++     * without causing a functional problem (for now...).  Of course,
++     * we still have no idea what the real problem is, or how robust
++     * this is as a workaround...
++     */
++    captureOutput.videoSettings = 
++        [NSDictionary
++            dictionaryWithObject:
++                [NSNumber numberWithInt:
++                    kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange]
++            forKey: (NSString*)kCVPixelBufferPixelFormatTypeKey];
++#endif
 +
-+    pinch = [[UIPinchGestureRecognizer alloc]
-+                initWithTarget: self
-+                action: @selector(handlePinch)];
-+    [self addGestureRecognizer: pinch];
++    queue = dispatch_queue_create("ZBarCaptureReader", NULL);
++    [captureOutput setSampleBufferDelegate:
++                       (id<AVCaptureVideoDataOutputSampleBufferDelegate>)self
++                   queue: queue];
 +
 +    return(self);
 +}
 +
 +- (id) init
 +{
-+    ZBarImageScanner *scanner =
-+        [[ZBarImageScanner new]
-+            autorelease];
-+    self = [self initWithImageScanner: scanner];
++    self = [self initWithImageScanner:
++               [[ZBarImageScanner new]
++                   autorelease]];
 +    if(!self)
 +        return(nil);
 +
@@ -3854,281 +4165,266 @@ new file mode 100644
 +
 +- (void) dealloc
 +{
-+    [preview removeFromSuperlayer];
-+    [preview release];
-+    preview = nil;
-+    [overlay release];
-+    overlay = nil;
-+    [tracking release];
-+    tracking = nil;
-+    [fpsLabel release];
-+    fpsLabel = nil;
-+    [fpsView release];
-+    fpsView = nil;
-+    [pinch release];
-+    pinch = nil;
++    captureDelegate = nil;
++
++    // queue continues to run after stopping (NB even after DidStopRunning!);
++    // ensure released delegate is not called. (also NB that the queue
++    // may not be null, even in this case...)
++    [captureOutput setSampleBufferDelegate: nil
++                   queue: queue];
++    [captureOutput release];
++    captureOutput = nil;
++    dispatch_release(queue);
++
++    [image release];
++    image = nil;
++    [result release];
++    result = nil;
++    [scanner release];
++    scanner = nil;
 +    [super dealloc];
 +}
 +
-+- (void) resetTracking
++- (BOOL) enableReader
 +{
-+    [tracking removeAllAnimations];
-+    [CATransaction begin];
-+    [CATransaction setDisableActions: YES];
-+    CGSize size = overlay.bounds.size;
-+    CGRect crop = zoomCrop;
-+    tracking.frame = CGRectMake(crop.origin.x * size.width,
-+                                crop.origin.y * size.height,
-+                                crop.size.width * size.width,
-+                                crop.size.height * size.height);
-+    tracking.opacity = 0;
-+    [CATransaction commit];
++    return(OSAtomicOr32Barrier(0, &state) & RUNNING);
 +}
 +
-+- (void) setImageSize: (CGSize) size
++- (void) setEnableReader: (BOOL) enable
 +{
-+    CGSize psize = preview.bounds.size;
-+    CGFloat scalex = size.width / psize.height;
-+    CGFloat scaley = size.height / psize.width;
-+    imageScale = (scalex > scaley) ? scalex : scaley;
-+
-+    // match overlay to preview image
-+    overlay.bounds = CGRectMake(0, 0, size.width, size.height);
-+    CGFloat scale = 1 / imageScale;
-+    CATransform3D xform = CATransform3DMakeRotation(M_PI / 2, 0, 0, 1);
-+    overlay.transform = CATransform3DScale(xform, scale, scale, 1);
-+    tracking.borderWidth = imageScale / zoom;
-+
-+    zlog(@"scaling: layer=%@ image=%@ scale=%g %c %g = 1/%g",
-+         NSStringFromCGSize(psize), NSStringFromCGSize(size),
-+         scalex, (scalex > scaley) ? '>' : '<', scaley, scale);
-+    [self resetTracking];
++    if(!enable)
++        OSAtomicAnd32Barrier(STOPPED, &state);
++    else if(!(OSAtomicOr32OrigBarrier(RUNNING, &state) & RUNNING)) {
++        OSAtomicAnd32Barrier(~PAUSED, &state);
++        @synchronized(scanner) {
++            scanner.enableCache = enableCache;
++        }
++    }
 +}
 +
-+- (void) cropUpdate
++- (void) willStartRunning
 +{
-+    CGAffineTransform xfrm =
-+        CGAffineTransformMakeTranslation(.5, .5);
-+    CGFloat z = 1 / zoom;
-+    xfrm = CGAffineTransformScale(xfrm, z, z);
-+    xfrm = CGAffineTransformTranslate(xfrm, -.5, -.5);
-+    zoomCrop = CGRectApplyAffineTransform(scanCrop, xfrm);
-+    [self resetTracking];
++    self.enableReader = YES;
 +}
 +
-+- (void) setScanCrop: (CGRect) r
++- (void) willStopRunning
 +{
-+    if(CGRectEqualToRect(scanCrop, r))
-+        return;
-+    scanCrop = r;
-+    [self cropUpdate];
++    self.enableReader = NO;
 +}
 +
-+- (void) setTracksSymbols: (BOOL) track
++- (void) flushCache
 +{
-+    if(track == tracksSymbols)
-+        return;
-+    tracksSymbols = track;
-+    [self resetTracking];
++    @synchronized(scanner) {
++        scanner.enableCache = enableCache;
++    }
 +}
 +
-+- (BOOL) allowsPinchZoom
++- (void) captureFrame
 +{
-+    return(pinch.enabled);
++    OSAtomicOr32(CAPTURE, &state);
 +}
 +
-+- (void) setAllowsPinchZoom: (BOOL) enabled
++- (void) setCaptureDelegate: (id<ZBarCaptureDelegate>) delegate
 +{
-+    pinch.enabled = enabled;
++    @synchronized(scanner) {
++        captureDelegate = delegate;
++    }
 +}
 +
-+- (void) setShowsFPS: (BOOL) show
++- (void) cropUpdate
 +{
-+    if(show == showsFPS)
-+        return;
-+    fpsView.hidden = !show;
++    @synchronized(scanner) {
++        image.crop = CGRectMake(scanCrop.origin.x * width,
++                                scanCrop.origin.y * height,
++                                scanCrop.size.width * width,
++                                scanCrop.size.height * height);
++    }
 +}
 +
-+- (void) setZoom: (CGFloat) z
++- (void) setScanCrop: (CGRect) crop
 +{
-+    if(z < 1.0)
-+        z = 1.0;
-+    if(z > 2.0)
-+        z = 2.0;
-+    if(z == zoom)
++    if(CGRectEqualToRect(scanCrop, crop))
 +        return;
-+    zoom = z;
-+
-+    [CATransaction begin];
-+    [CATransaction setAnimationDuration: .1];
-+    [CATransaction setAnimationTimingFunction:
-+        [CAMediaTimingFunction functionWithName:
-+            kCAMediaTimingFunctionLinear]];
-+    [preview setAffineTransform:
-+        CGAffineTransformScale(previewTransform, z, z)];
-+    tracking.borderWidth = imageScale / zoom;
-+    [CATransaction commit];
-+
++    scanCrop = crop;
 +    [self cropUpdate];
 +}
 +
-+- (void) setPreviewTransform: (CGAffineTransform) xfrm
++- (void) didTrackSymbols: (ZBarSymbolSet*) syms
 +{
-+    previewTransform = xfrm;
-+    [preview setAffineTransform:
-+        CGAffineTransformScale(previewTransform, zoom, zoom)];
++    [captureDelegate
++        captureReader: self
++        didTrackSymbols: syms];
 +}
 +
-+- (void) start
++- (void) didReadNewSymbolsFromImage: (ZBarImage*) img
 +{
-+    if(started)
-+        return;
-+    started = YES;
-+
-+    [self resetTracking];
-+    fpsLabel.text = @"--- fps ";
-+
-+    [[UIDevice currentDevice]
-+        beginGeneratingDeviceOrientationNotifications];
++    timer_start;
++    [captureDelegate
++        captureReader: self
++        didReadNewSymbolsFromImage: img];
++    OSAtomicAnd32Barrier(~PAUSED, &state);
++    zlog(@"latency: delegate=%gs total=%gs",
++         timer_elapsed(t_start, timer_now()),
++         timer_elapsed(t_scan, timer_now()));
 +}
 +
-+- (void) stop
++- (void) setFramesPerSecond: (CGFloat) fps
 +{
-+    if(!started)
-+        return;
-+    started = NO;
-+
-+    [[UIDevice currentDevice]
-+        endGeneratingDeviceOrientationNotifications];
++    framesPerSecond = fps;
 +}
 +
-+- (void) flushCache
++- (void) updateFPS: (NSNumber*) val
 +{
++    [self setFramesPerSecond: val.doubleValue];
 +}
 +
-+// UIGestureRecognizer callback
-+
-+- (void) handlePinch
++- (void) setSize: (CGSize) _size
 +{
-+    if(pinch.state == UIGestureRecognizerStateBegan)
-+        zoom0 = zoom;
-+    CGFloat z = zoom0 * pinch.scale;
-+    self.zoom = z;
++    size = _size;
++}
 +
-+    if((zoom < 1.5) != (z < 1.5)) {
-+        int d = (z < 1.5) ? 3 : 2;
-+        ZBarImageScanner *scanner = self.scanner;
-+        @synchronized(scanner) {
-+            [scanner setSymbology: 0
-+                     config: ZBAR_CFG_X_DENSITY
-+                     to: d];
-+            [scanner setSymbology: 0
-+                     config: ZBAR_CFG_Y_DENSITY
-+                     to: d];
-+        }
-+    }
++- (void) updateSize: (CFDictionaryRef) val
++{
++    CGSize _size;
++    if(CGSizeMakeWithDictionaryRepresentation(val, &_size))
++        [self setSize: _size];
 +}
 +
-+- (void) updateTracking: (CALayer*) trk
-+             withSymbol: (ZBarSymbol*) sym
++- (void)  captureOutput: (AVCaptureOutput*) output
++  didOutputSampleBuffer: (CMSampleBufferRef) samp
++         fromConnection: (AVCaptureConnection*) conn
 +{
-+    if(!sym)
++    // queue is apparently not flushed when stopping;
++    // only process when running
++    uint32_t _state = OSAtomicOr32Barrier(0, &state);
++    if((_state & (PAUSED | RUNNING)) != RUNNING)
 +        return;
 +
-+    CGRect r = sym.bounds;
-+    if(r.size.width <= 32 && r.size.height <= 32)
-+        return;
-+    r = CGRectInset(r, -24, -24);
++    NSAutoreleasePool *pool = [NSAutoreleasePool new];
++    image.sequence = framecnt++;
 +
-+    CALayer *current = trk.presentationLayer;
-+    CGPoint cp = current.position;
-+    CGPoint p = CGPointMake(CGRectGetMidX(r), CGRectGetMidY(r));
-+    p = CGPointMake((p.x * 3 + cp.x) / 4, (p.y * 3 + cp.y) / 4);
++    uint64_t now = timer_now();
++    double dt = timer_elapsed(t_frame, now);
++    t_frame = now;
++    if(dt > 2) {
++        t_fps = now;
++        dt_frame = 0;
++    }
++    else if(!dt_frame)
++        dt_frame = dt;
++    dt_frame = (dt_frame + dt) / 2;
++    if(timer_elapsed(t_fps, now) >= 1) {
++        [self performSelectorOnMainThread: @selector(updateFPS:)
++              withObject: [NSNumber numberWithDouble: 1 / dt_frame]
++              waitUntilDone: NO];
++        t_fps = now;
++    }
 +
-+    CGRect cr = current.bounds;
-+    r.origin = cr.origin;
-+    r.size.width = (r.size.width * 3 + cr.size.width) / 4;
-+    r.size.height = (r.size.height * 3 + cr.size.height) / 4;
++    CVImageBufferRef buf = CMSampleBufferGetImageBuffer(samp);
++    if(CMSampleBufferGetNumSamples(samp) != 1 ||
++       !CMSampleBufferIsValid(samp) ||
++       !CMSampleBufferDataIsReady(samp) ||
++       !buf) {
++        zlog(@"ERROR: invalid sample");
++        goto error;
++    }
 +
-+    CAMediaTimingFunction *linear =
-+        [CAMediaTimingFunction functionWithName: kCAMediaTimingFunctionLinear];
++    OSType format = CVPixelBufferGetPixelFormatType(buf);
++    int planes = CVPixelBufferGetPlaneCount(buf);
 +
-+    CABasicAnimation *resize =
-+        [CABasicAnimation animationWithKeyPath: @"bounds"];
-+    resize.fromValue = [NSValue valueWithCGRect: cr];
-+    resize.toValue = [NSValue valueWithCGRect: r];
-+    resize.duration = .2;
-+    resize.timingFunction = linear;
-+    resize.fillMode = kCAFillModeForwards;
-+    resize.removedOnCompletion = NO;
++    if(format != kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange ||
++       !planes) {
++        zlog(@"ERROR: invalid buffer format");
++        goto error;
++    }
 +
-+    CABasicAnimation *move =
-+        [CABasicAnimation animationWithKeyPath: @"position"];
-+    move.fromValue = [NSValue valueWithCGPoint: cp];
-+    move.toValue = [NSValue valueWithCGPoint: p];
-+    move.duration = .2;
-+    move.timingFunction = linear;
-+    move.fillMode = kCAFillModeForwards;
-+    move.removedOnCompletion = NO;
++    int w = CVPixelBufferGetBytesPerRowOfPlane(buf, 0);
++    int h = CVPixelBufferGetHeightOfPlane(buf, 0);
++    CVReturn rc =
++        CVPixelBufferLockBaseAddress(buf, kCVPixelBufferLock_ReadOnly);
++    if(!w || !h || rc) {
++        zlog(@"ERROR: invalid buffer data");
++        goto error;
++    }
 +
-+    CABasicAnimation *on =
-+        [CABasicAnimation animationWithKeyPath: @"opacity"];
-+    on.fromValue = [NSNumber numberWithDouble: current.opacity];
-+    on.toValue = [NSNumber numberWithDouble: 1];
-+    on.duration = .2;
-+    on.timingFunction = linear;
-+    on.fillMode = kCAFillModeForwards;
-+    on.removedOnCompletion = NO;
++    void *data = CVPixelBufferGetBaseAddressOfPlane(buf, 0);
++    if(data) {
++        [image setData: data
++               withLength: w * h];
 +
-+    CABasicAnimation *off = nil;
-+    if(!TARGET_IPHONE_SIMULATOR) {
-+        off = [CABasicAnimation animationWithKeyPath: @"opacity"];
-+        off.fromValue = [NSNumber numberWithDouble: 1];
-+        off.toValue = [NSNumber numberWithDouble: 0];
-+        off.beginTime = .5;
-+        off.duration = .5;
-+        off.timingFunction = linear;
-+    }
++        BOOL doTrack = NO;
++        int ngood = 0;
++        ZBarSymbolSet *syms = nil;
++        @synchronized(scanner) {
++            if(width != w || height != h) {
++                width = w;
++                height = h;
++                CGSize _size = CGSizeMake(w, h);
++                CFDictionaryRef sized =
++                    CGSizeCreateDictionaryRepresentation(_size);
++                if(sized) {
++                    [self performSelectorOnMainThread: @selector(updateSize:)
++                          withObject: (id)sized
++                          waitUntilDone: NO];
++                    CFRelease(sized);
++                }
++                image.size = _size;
++                [self cropUpdate];
++            }
 +
-+    CAAnimationGroup *group = [CAAnimationGroup animation];
-+    group.animations = [NSArray arrayWithObjects: resize, move, on, off, nil];
-+    group.duration = 1;
-+    group.fillMode = kCAFillModeForwards;
-+    group.removedOnCompletion = !TARGET_IPHONE_SIMULATOR;
-+    [trk addAnimation: group
-+         forKey: @"tracking"];
-+}
++            ngood = [scanner scanImage: image];
++            syms = scanner.results;
++            doTrack = [captureDelegate respondsToSelector:
++                          @selector(captureReader:didTrackSymbols:)];
++        }
++        now = timer_now();
 +
-+- (void) didTrackSymbols: (ZBarSymbolSet*) syms
-+{
-+    if(!tracksSymbols)
-+        return;
++        if(ngood >= 0) {
++            // return unfiltered results for tracking feedback
++            syms.filterSymbols = NO;
++            int nraw = syms.count;
++            if(nraw > 0 || (_state & CAPTURE))
++                zlog(@"scan image: %dx%d crop=%@ ngood=%d nraw=%d st=%d",
++                     w, h, NSStringFromCGRect(image.crop), ngood, nraw, _state);
 +
-+    int n = syms.count;
-+    assert(n);
-+    if(!n)
-+        return;
++            if(ngood || (_state & CAPTURE)) {
++                // copy image data so we can release the buffer
++                result.size = CGSizeMake(w, h);
++                result.pixelBuffer = buf;
++                result.symbols = syms;
++                t_scan = now;
++                OSAtomicXor32Barrier((_state & CAPTURE) | PAUSED, &state);
++                [self performSelectorOnMainThread:
++                          @selector(didReadNewSymbolsFromImage:)
++                      withObject: result
++                      waitUntilDone: NO];
++                [self initResult];
++            }
 +
-+    ZBarSymbol *sym = nil;
-+    for(ZBarSymbol *s in syms)
-+        if(!sym || s.type == ZBAR_QRCODE || s.quality > sym.quality)
-+            sym = s;
-+    assert(sym);
-+    if(!sym)
-+        return;
++            if(nraw && doTrack)
++                [self performSelectorOnMainThread:
++                          @selector(didTrackSymbols:)
++                      withObject: syms
++                      waitUntilDone: NO];
++        }
++        [image setData: NULL
++               withLength: 0];
++    }
++    else
++        zlog(@"ERROR: invalid data");
++    CVPixelBufferUnlockBaseAddress(buf, kCVPixelBufferLock_ReadOnly);
 +
-+    [self updateTracking: tracking
-+          withSymbol: sym];
++ error:
++    [pool release];
 +}
 +
 +@end
-diff --git a/iphone/ZBarReaderViewController.m b/iphone/ZBarReaderViewController.m
-new file mode 100644
---- /dev/null
-+++ b/iphone/ZBarReaderViewController.m
-@@ -0,0 +1,383 @@
+diff -r 563557a923d0 iphone/ZBarHelpController.m
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/ZBarHelpController.m	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,267 @@
 +//------------------------------------------------------------------------
-+//  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
++//  Copyright 2009-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
 +//
 +//  This file is part of the ZBar Bar Code Reader.
 +//
@@ -4150,373 +4446,256 @@ new file mode 100644
 +//  http://sourceforge.net/projects/zbar
 +//------------------------------------------------------------------------
 +
-+#import <ZBarSDK/ZBarReaderViewController.h>
-+#import <ZBarSDK/ZBarReaderView.h>
 +#import <ZBarSDK/ZBarHelpController.h>
 +
-+#define MODULE ZBarReaderViewController
++#define MODULE ZBarHelpController
 +#import "debug.h"
 +
-+@implementation ZBarReaderViewController
-+
-+@synthesize scanner, readerDelegate, showsZBarControls, tracksSymbols,
-+    enableCache, cameraOverlayView, cameraViewTransform, readerView, scanCrop;
-+@dynamic sourceType, allowsEditing, allowsImageEditing, showsCameraControls,
-+    showsHelpOnFail, cameraMode, takesPicture, maxScanDimension;
++@implementation ZBarHelpController
 +
-++ (BOOL) isSourceTypeAvailable: (UIImagePickerControllerSourceType) sourceType
-+{
-+    if(sourceType != UIImagePickerControllerSourceTypeCamera)
-+        return(NO);
-+    return(TARGET_IPHONE_SIMULATOR ||
-+           [UIImagePickerController isSourceTypeAvailable: sourceType]);
-+}
++@synthesize delegate;
 +
-+- (id) init
++- (id) initWithReason: (NSString*) _reason
 +{
-+    if(!TARGET_IPHONE_SIMULATOR &&
-+       !NSClassFromString(@"AVCaptureSession")) {
-+        // fallback to old interface
-+        zlog(@"Falling back to ZBarReaderController");
-+        [self release];
-+        return([ZBarReaderController new]);
-+    }
-+
 +    self = [super init];
 +    if(!self)
 +        return(nil);
 +
-+    self.wantsFullScreenLayout = YES;
-+
-+    showsZBarControls = tracksSymbols = enableCache = YES;
-+    scanCrop = CGRectMake(0, 0, 1, 1);
-+    cameraViewTransform = CGAffineTransformIdentity;
-+
-+    // create our own scanner to store configuration,
-+    // independent of whether view is loaded
-+    scanner = [ZBarImageScanner new];
-+    [scanner setSymbology: 0
-+             config: ZBAR_CFG_X_DENSITY
-+             to: 3];
-+    [scanner setSymbology: 0
-+             config: ZBAR_CFG_Y_DENSITY
-+             to: 3];
-+
++    if(!_reason)
++        _reason = @"INFO";
++    reason = [_reason retain];
 +    return(self);
 +}
 +
++- (id) init
++{
++    return([self initWithReason: nil]);
++}
++
 +- (void) cleanup
 +{
-+    readerView.readerDelegate = nil;
-+    [readerView release];
-+    readerView = nil;
-+    [controls release];
-+    controls = nil;
++    [toolbar release];
++    toolbar = nil;
++    [webView release];
++    webView = nil;
++    [doneBtn release];
++    doneBtn = nil;
++    [backBtn release];
++    backBtn = nil;
++    [space release];
++    space = nil;
 +}
 +
 +- (void) dealloc
 +{
 +    [self cleanup];
-+    [cameraOverlayView release];
-+    cameraOverlayView = nil;
-+    [scanner release];
-+    scanner = nil;
++    [reason release];
++    reason = nil;
++    [linkURL release];
++    linkURL = nil;
 +    [super dealloc];
 +}
 +
-+- (void) initControls
++- (void) viewDidLoad
 +{
-+    if(!showsZBarControls && controls) {
-+        [controls removeFromSuperview];
-+        [controls release];
-+        controls = nil;
-+    }
-+    if(!showsZBarControls)
-+        return;
++    [super viewDidLoad];
 +
 +    UIView *view = self.view;
-+    if(controls) {
-+        assert(controls.superview == view);
-+        [view bringSubviewToFront: controls];
-+        return;
-+    }
-+
-+    CGRect r = view.bounds;
-+    r.origin.y = r.size.height - 54;
-+    r.size.height = 54;
-+    controls = [[UIView alloc]
-+                   initWithFrame: r];
-+    controls.backgroundColor = [UIColor blackColor];
++    CGRect bounds = self.view.bounds;
++    if(!bounds.size.width || !bounds.size.height)
++        view.frame = bounds = CGRectMake(0, 0, 320, 480);
++    view.backgroundColor = [UIColor colorWithWhite: .125f
++                                    alpha: 1];
++    view.autoresizingMask = (UIViewAutoresizingFlexibleWidth |
++                             UIViewAutoresizingFlexibleHeight);
 +
-+    UIToolbar *toolbar =
-+        [UIToolbar new];
-+    r.origin.y = 0;
-+    toolbar.frame = r;
++    webView = [[UIWebView alloc]
++                  initWithFrame: CGRectMake(0, 0,
++                                            bounds.size.width,
++                                            bounds.size.height - 44)];
++    webView.delegate = self;
++    webView.backgroundColor = [UIColor colorWithWhite: .125f
++                                       alpha: 1];
++    webView.autoresizingMask = (UIViewAutoresizingFlexibleWidth |
++                                UIViewAutoresizingFlexibleHeight |
++                                UIViewAutoresizingFlexibleBottomMargin);
++    webView.hidden = YES;
++    [view addSubview: webView];
++
++    toolbar = [[UIToolbar alloc]
++                  initWithFrame: CGRectMake(0, bounds.size.height - 44,
++                                            bounds.size.width, 44)];
 +    toolbar.barStyle = UIBarStyleBlackOpaque;
++    toolbar.autoresizingMask = (UIViewAutoresizingFlexibleWidth |
++                                UIViewAutoresizingFlexibleHeight |
++                                UIViewAutoresizingFlexibleTopMargin);
 +
-+    toolbar.items =
-+        [NSArray arrayWithObjects:
-+            [[[UIBarButtonItem alloc]
-+                 initWithBarButtonSystemItem: UIBarButtonSystemItemCancel
-+                 target: self
-+                 action: @selector(cancel)]
-+                autorelease],
-+            [[[UIBarButtonItem alloc]
-+                 initWithBarButtonSystemItem: UIBarButtonSystemItemFlexibleSpace
-+                 target: nil
-+                 action: nil]
-+                autorelease],
-+            nil];
-+    [controls addSubview: toolbar];
-+    [toolbar release];
-+
-+    UIButton *info =
-+        [UIButton buttonWithType: UIButtonTypeInfoLight];
-+    r.origin.x = r.size.width - 54;
-+    r.size.width = 54;
-+    info.frame = r;
-+    [info addTarget: self
-+             action: @selector(info)
-+             forControlEvents: UIControlEventTouchUpInside];
-+    [controls addSubview: info];
++    doneBtn = [[UIBarButtonItem alloc]
++                  initWithBarButtonSystemItem: UIBarButtonSystemItemDone
++                  target: self
++                  action: @selector(dismiss)];
 +
-+    [view addSubview: controls];
-+}
++    backBtn = [[UIBarButtonItem alloc]
++                  initWithImage: [UIImage imageNamed: @"zbar-back.png"]
++                  style: UIBarButtonItemStylePlain
++                  target: webView
++                  action: @selector(goBack)];
 +
-+- (void) initSimulator
-+{
-+    // simulator specific hooks
-+}
++    space = [[UIBarButtonItem alloc]
++                initWithBarButtonSystemItem:
++                    UIBarButtonSystemItemFlexibleSpace
++                target: nil
++                action: nil];
 +
-+- (void) loadView
-+{
-+    self.view = [[UIView alloc]
-+                    initWithFrame: CGRectMake(0, 0, 320, 480)];
-+}
++    toolbar.items = [NSArray arrayWithObjects: space, doneBtn, nil];
 +
-+- (void) viewDidLoad
-+{
-+    [super viewDidLoad];
-+    UIView *view = self.view;
-+    view.backgroundColor = [UIColor blackColor];
++    [view addSubview: toolbar];
 +
-+    readerView = [[ZBarReaderView alloc]
-+                     initWithImageScanner: scanner];
-+    readerView.readerDelegate = (id<ZBarReaderViewDelegate>)self;
-+    readerView.scanCrop = scanCrop;
-+    readerView.previewTransform = cameraViewTransform;
-+    readerView.tracksSymbols = tracksSymbols;
-+    readerView.enableCache = enableCache;
-+    [view addSubview: readerView];
++    NSString *path = [[NSBundle mainBundle]
++                         pathForResource: @"zbar-help"
++                         ofType: @"html"];
 +
-+    if(cameraOverlayView) {
-+        assert(!cameraOverlayView.superview);
-+        [cameraOverlayView removeFromSuperview];
-+        [view addSubview: cameraOverlayView];
++    NSURLRequest *req = nil;
++    if(path) {
++        NSURL *url = [NSURL fileURLWithPath: path
++                            isDirectory: NO];
++        if(url)
++            req = [NSURLRequest requestWithURL: url];
 +    }
-+
-+    [self initControls];
-+    [self initSimulator];
++    if(req)
++        [webView loadRequest: req];
++    else
++        NSLog(@"ERROR: unable to load zbar-help.html from bundle");
 +}
 +
 +- (void) viewDidUnload
 +{
-+    [cameraOverlayView removeFromSuperview];
 +    [self cleanup];
 +    [super viewDidUnload];
 +}
 +
 +- (void) viewWillAppear: (BOOL) animated
 +{
-+    [self initControls];
++    assert(webView);
++    if(webView.loading)
++        webView.hidden = YES;
++    webView.delegate = self;
 +    [super viewWillAppear: animated];
-+
-+    [readerView start];
-+
-+    UIApplication *app = [UIApplication sharedApplication];
-+    BOOL willHideStatusBar =
-+        !didHideStatusBar && self.wantsFullScreenLayout && !app.statusBarHidden;
-+    if(willHideStatusBar)
-+        [app setStatusBarHidden: YES
-+             withAnimation: UIStatusBarAnimationFade];
-+    didHideStatusBar = didHideStatusBar || willHideStatusBar;
-+}
-+
-+- (void) dismissModalViewControllerAnimated: (BOOL) animated
-+{
-+    if(didHideStatusBar) {
-+        [[UIApplication sharedApplication]
-+            setStatusBarHidden: NO
-+            withAnimation: UIStatusBarAnimationFade];
-+        didHideStatusBar = NO;
-+    }
-+    [super dismissModalViewControllerAnimated: animated];
 +}
 +
 +- (void) viewWillDisappear: (BOOL) animated
 +{
-+    [readerView stop];
-+
-+    if(didHideStatusBar) {
-+        [[UIApplication sharedApplication]
-+            setStatusBarHidden: NO
-+            withAnimation: UIStatusBarAnimationFade];
-+        didHideStatusBar = NO;
-+    }
-+
++    [webView stopLoading];
++    webView.delegate = nil;
 +    [super viewWillDisappear: animated];
 +}
 +
-+- (ZBarReaderView*) readerView
-+{
-+    // force view to load
-+    (void)self.view;
-+    assert(readerView);
-+    return(readerView);
-+}
-+
-+- (void) setTracksSymbols: (BOOL) track
++- (BOOL) shouldAutorotateToInterfaceOrientation: (UIInterfaceOrientation) orient
 +{
-+    tracksSymbols = track;
-+    if(readerView)
-+        readerView.tracksSymbols = track;
++    return([self isInterfaceOrientationSupported: orient]);
 +}
 +
-+- (void) setEnableCache: (BOOL) enable
++- (void) willAnimateRotationToInterfaceOrientation: (UIInterfaceOrientation) orient
++                                          duration: (NSTimeInterval) duration
 +{
-+    enableCache = enable;
-+    if(readerView)
-+        readerView.enableCache = enable;
++    [webView reload];
 +}
 +
-+- (void) setScanCrop: (CGRect) r
++- (void) didRotateFromInterfaceOrientation: (UIInterfaceOrientation) orient
 +{
-+    scanCrop = r;
-+    if(readerView)
-+        readerView.scanCrop = r;
++    zlog(@"frame=%@ webView.frame=%@ toolbar.frame=%@",
++         NSStringFromCGRect(self.view.frame),
++         NSStringFromCGRect(webView.frame),
++         NSStringFromCGRect(toolbar.frame));
 +}
 +
-+- (void) setCameraOverlayView: (UIView*) newview
++- (BOOL) isInterfaceOrientationSupported: (UIInterfaceOrientation) orient
 +{
-+    UIView *oldview = cameraOverlayView;
-+    [oldview removeFromSuperview];
-+
-+    cameraOverlayView = [newview retain];
-+    if([self isViewLoaded] && newview)
-+        [self.view addSubview: newview];
-+
-+    [oldview release];
++    UIViewController *parent = self.parentViewController;
++    if(parent && !orientations)
++        return([parent shouldAutorotateToInterfaceOrientation: orient]);
++    return((orientations >> orient) & 1);
 +}
 +
-+- (void) setCameraViewTransform: (CGAffineTransform) xfrm
++- (void) setInterfaceOrientation: (UIInterfaceOrientation) orient
++                       supported: (BOOL) supported
 +{
-+    cameraViewTransform = xfrm;
-+    if(readerView)
-+        readerView.previewTransform = xfrm;
++    NSUInteger mask = 1 << orient;
++    if(supported)
++        orientations |= mask;
++    else
++        orientations &= ~mask;
 +}
 +
-+- (void) cancel
++- (void) dismiss
 +{
-+    if(!readerDelegate)
-+        return;
-+    SEL cb = @selector(imagePickerControllerDidCancel:);
-+    if([readerDelegate respondsToSelector: cb])
-+        [readerDelegate
-+            imagePickerControllerDidCancel: (UIImagePickerController*)self];
++    if([delegate respondsToSelector: @selector(helpControllerDidFinish:)])
++        [delegate helpControllerDidFinish: self];
 +    else
 +        [self dismissModalViewControllerAnimated: YES];
 +}
 +
-+- (void) info
++- (void) webViewDidFinishLoad: (UIWebView*) view
 +{
-+    [self showHelpWithReason: @"INFO"];
-+}
++    if(view.hidden) {
++        [view stringByEvaluatingJavaScriptFromString:
++            [NSString stringWithFormat:
++                @"onZBarHelp({reason:\"%@\"});", reason]];
++        [UIView beginAnimations: @"ZBarHelp"
++                context: nil];
++        view.hidden = NO;
++        [UIView commitAnimations];
++    }
 +
-+- (void) showHelpWithReason: (NSString*) reason
-+{
-+    ZBarHelpController *help =
-+        [[ZBarHelpController alloc]
-+            initWithReason: reason];
-+    help.delegate = (id<ZBarHelpDelegate>)self;
-+    help.wantsFullScreenLayout = YES;
-+    UIView *helpView = help.view;
-+    helpView.alpha = 0;
-+    [self.view addSubview: helpView];
-+    [UIView beginAnimations: @"ZBarHelp"
-+            context: nil];
-+    help.view.alpha = 1;
-+    [UIView commitAnimations];
++    BOOL canGoBack = [view canGoBack];
++    NSArray *items = toolbar.items;
++    if(canGoBack != ([items objectAtIndex: 0] == backBtn)) {
++        if(canGoBack)
++            items = [NSArray arrayWithObjects: backBtn, space, doneBtn, nil];
++        else
++            items = [NSArray arrayWithObjects: space, doneBtn, nil];
++        [toolbar setItems: items
++                 animated: YES];
++    }
 +}
 +
-+// ZBarHelpDelegate
-+
-+- (void) helpControllerDidFinish: (ZBarHelpController*) help
++- (BOOL)             webView: (UIWebView*) view
++  shouldStartLoadWithRequest: (NSURLRequest*) req
++              navigationType: (UIWebViewNavigationType) nav
 +{
-+    [UIView beginAnimations: @"ZBarHelp"
-+            context: help];
-+    [UIView setAnimationDelegate: self];
-+    [UIView setAnimationDidStopSelector: @selector(removeHelp:done:context:)];
-+    help.view.alpha = 0;
-+    [UIView commitAnimations];
-+}
++    NSURL *url = [req URL];
++    if([url isFileURL])
++        return(YES);
 +
-+- (void) removeHelp: (NSString*) id
-+               done: (NSNumber*) done
-+            context: (void*) ctx
-+{
-+    if([id isEqualToString: @"ZBarHelp"]) {
-+        ZBarHelpController *help = ctx;
-+        [help.view removeFromSuperview];
-+        [help release];
-+    }
++    linkURL = [url retain];
++    UIAlertView *alert =
++        [[UIAlertView alloc]
++            initWithTitle: @"Open External Link"
++            message: @"Close this application and open link in Safari?"
++            delegate: nil
++            cancelButtonTitle: @"Cancel"
++            otherButtonTitles: @"OK", nil];
++    alert.delegate = self;
++    [alert show];
++    [alert release];
++    return(NO);
 +}
 +
-+// ZBarReaderViewDelegate
-+
-+- (void) readerView: (ZBarReaderView*) view
-+     didReadSymbols: (ZBarSymbolSet*) syms
-+          fromImage: (UIImage*) image
++- (void)     alertView: (UIAlertView*) view
++  clickedButtonAtIndex: (NSInteger) idx
 +{
-+    [readerDelegate
-+        imagePickerController: (UIImagePickerController*)self
-+        didFinishPickingMediaWithInfo:
-+            [NSDictionary dictionaryWithObjectsAndKeys:
-+                image, UIImagePickerControllerOriginalImage,
-+                syms, ZBarReaderControllerResults,
-+                nil]];
++    if(idx)
++        [[UIApplication sharedApplication]
++            openURL: linkURL];
 +}
 +
-+// "deprecated" properties
-+
-+#define DEPRECATED_PROPERTY(getter, setter, type, val, ignore) \
-+    - (type) getter                                    \
-+    {                                                  \
-+        return(val);                                   \
-+    }                                                  \
-+    - (void) setter: (type) v                          \
-+    {                                                  \
-+        NSAssert2(ignore || v == val,                  \
-+                  @"attempt to set unsupported value (%d)" \
-+                  @" for %@ property", val, @#getter); \
-+    }
-+
-+DEPRECATED_PROPERTY(sourceType, setSourceType, UIImagePickerControllerSourceType, UIImagePickerControllerSourceTypeCamera, NO)
-+DEPRECATED_PROPERTY(allowsEditing, setAllowsEditing, BOOL, NO, NO)
-+DEPRECATED_PROPERTY(allowsImageEditing, setAllowsImageEditing, BOOL, NO, NO)
-+DEPRECATED_PROPERTY(showsCameraControls, setShowsCameraControls, BOOL, NO, NO)
-+DEPRECATED_PROPERTY(showsHelpOnFail, setShowsHelpOnFail, BOOL, NO, YES)
-+DEPRECATED_PROPERTY(cameraMode, setCameraMode, ZBarReaderControllerCameraMode, ZBarReaderControllerCameraModeSampling, NO)
-+DEPRECATED_PROPERTY(takesPicture, setTakesPicture, BOOL, NO, NO)
-+DEPRECATED_PROPERTY(maxScanDimension, setMaxScanDimension, NSInteger, 640, YES)
-+
 +@end
-diff --git a/iphone/ZBarReaderViewImpl_Capture.m b/iphone/ZBarReaderViewImpl_Capture.m
-new file mode 100644
---- /dev/null
-+++ b/iphone/ZBarReaderViewImpl_Capture.m
-@@ -0,0 +1,355 @@
+diff -r 563557a923d0 iphone/ZBarImage.m
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/ZBarImage.m	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,306 @@
 +//------------------------------------------------------------------------
-+//  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
++//  Copyright 2009-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
 +//
 +//  This file is part of the ZBar Bar Code Reader.
 +//
@@ -4538,345 +4717,295 @@ new file mode 100644
 +//  http://sourceforge.net/projects/zbar
 +//------------------------------------------------------------------------
 +
-+#import <AVFoundation/AVFoundation.h>
-+#import <CoreMedia/CoreMedia.h>
-+#import <CoreVideo/CoreVideo.h>
-+#import <ZBarSDK/ZBarReaderView.h>
-+#import <ZBarSDK/ZBarCaptureReader.h>
-+
-+#define MODULE ZBarReaderView
++#import <UIKit/UIKit.h>
++#import <ZBarSDK/ZBarImage.h>
 +#import "debug.h"
 +
-+// protected APIs
-+@interface ZBarReaderView()
-+- (void) initSubviews;
-+- (void) cropUpdate;
-+- (void) setImageSize: (CGSize) size;
-+- (void) didTrackSymbols: (ZBarSymbolSet*) syms;
-+@end
-+
-+@interface ZBarReaderViewImpl
-+    : ZBarReaderView
++static void image_cleanup(zbar_image_t *zimg)
 +{
-+    AVCaptureSession *session;
-+    AVCaptureDevice *device;
-+    AVCaptureInput *input;
-+    ZBarCaptureReader *captureReader;
++    ZBarImage *image = zbar_image_get_userdata(zimg);
++    [image cleanup];
 +}
 +
-+@end
++@implementation ZBarImage
 +
-+@implementation ZBarReaderViewImpl
++@dynamic format, sequence, size, crop, data, dataLength, symbols, zbarImage,
++    UIImage;
 +
-+@synthesize device, session, captureReader;
+++ (unsigned long) fourcc: (NSString*) format
++{
++    return(zbar_fourcc_parse([format UTF8String]));
++}
 +
-+- (id) initWithImageScanner: (ZBarImageScanner*) scanner
++- (id) initWithImage: (zbar_image_t*) image
 +{
-+    self = [super initWithImageScanner: scanner];
-+    if(!self)
++    if(!image) {
++        [self release];
 +        return(nil);
-+
-+    session = [AVCaptureSession new];
-+    NSNotificationCenter *notify =
-+        [NSNotificationCenter defaultCenter];
-+    [notify addObserver: self
-+            selector: @selector(onVideoError:)
-+            name: AVCaptureSessionRuntimeErrorNotification
-+            object: session];
-+    [notify addObserver: self
-+            selector: @selector(onVideoStart:)
-+            name: AVCaptureSessionDidStartRunningNotification
-+            object: session];
-+    [notify addObserver: self
-+            selector: @selector(onVideoStop:)
-+            name: AVCaptureSessionDidStopRunningNotification
-+            object: session];
-+    [notify addObserver: self
-+            selector: @selector(onVideoStop:)
-+            name: AVCaptureSessionWasInterruptedNotification
-+            object: session];
-+    [notify addObserver: self
-+            selector: @selector(onVideoStart:)
-+            name: AVCaptureSessionInterruptionEndedNotification
-+            object: session];
-+
-+    self.device = [AVCaptureDevice
-+                      defaultDeviceWithMediaType: AVMediaTypeVideo];
-+
-+    captureReader = [[ZBarCaptureReader alloc]
-+                        initWithImageScanner: scanner];
-+    captureReader.captureDelegate = (id<ZBarCaptureDelegate>)self;
-+    [session addOutput: captureReader.captureOutput];
-+
-+    if([session canSetSessionPreset: AVCaptureSessionPreset640x480])
-+        session.sessionPreset = AVCaptureSessionPreset640x480;
-+
-+    [captureReader addObserver: self
-+                   forKeyPath: @"size"
-+                   options: 0
-+                   context: NULL];
-+
-+    [self initSubviews];
-+    [self cropUpdate];
++    }
++    if(self = [super init]) {
++        zimg = image;
++        zbar_image_ref(image, 1);
++        zbar_image_set_userdata(zimg, self);
++    }
 +    return(self);
 +}
 +
-+- (void) initSubviews
++- (id) init
 +{
-+    AVCaptureVideoPreviewLayer *videoPreview =
-+        [[AVCaptureVideoPreviewLayer
-+             layerWithSession: session]
-+            retain];
-+    videoPreview.videoGravity = AVLayerVideoGravityResizeAspectFill;
-+    preview = videoPreview;
-+    preview.frame = self.bounds;
-+    [self.layer addSublayer: preview];
-+
-+    [super initSubviews];
-+
-+    // camera image is rotated
-+    overlay.transform = CATransform3DMakeRotation(M_PI / 2, 0, 0, 1);
++    zbar_image_t *image = zbar_image_create();
++    self = [self initWithImage: image];
++    zbar_image_ref(image, -1);
++    return(self);
 +}
 +
 +- (void) dealloc
 +{
-+    [[NSNotificationCenter defaultCenter]
-+        removeObserver: self];
-+    if(showsFPS) {
-+        @try {
-+            [captureReader removeObserver: self
-+                           forKeyPath: @"framesPerSecond"];
-+        }
-+        @catch(...) { }
-+    }
-+    @try {
-+        [captureReader removeObserver: self
-+                       forKeyPath: @"size"];
++    if(zimg) {
++        zbar_image_ref(zimg, -1);
++        zimg = NULL;
 +    }
-+    @catch(...) { }
-+    captureReader.captureDelegate = nil;
-+    [captureReader release];
-+    captureReader = nil;
-+    [device release];
-+    device = nil;
-+    [input release];
-+    input = nil;
-+    [session release];
-+    session = nil;
 +    [super dealloc];
 +}
 +
-+- (void) cropUpdate
-+{
-+    [super cropUpdate];
-+    captureReader.scanCrop = zoomCrop;
-+}
-+
-+- (ZBarImageScanner*) scanner
++- (id) initWithCGImage: (CGImageRef) image
++                  crop: (CGRect) crop
++                  size: (CGSize) size
 +{
-+    return(captureReader.scanner);
-+}
++    if(!(self = [self init]))
++        return(nil);
++    uint64_t t_start = timer_now();
 +
-+- (void) setDevice: (AVCaptureDevice*) newdev
-+{
-+    id olddev = device;
-+    AVCaptureInput *oldinput = input;
-+    assert(!olddev == !oldinput);
++    unsigned int w = size.width + 0.5;
++    unsigned int h = size.height + 0.5;
 +
-+    NSError *error = nil;
-+    device = [newdev retain];
-+    if(device) {
-+        assert([device hasMediaType: AVMediaTypeVideo]);
-+        input = [[AVCaptureDeviceInput alloc]
-+                    initWithDevice: newdev
-+                    error: &error];
-+        assert(input);
++    unsigned long datalen = w * h;
++    uint8_t *raw = malloc(datalen);
++    if(!raw) {
++        [self release];
++        return(nil);
 +    }
-+    else
-+        input = nil;
 +
-+    [session beginConfiguration];
-+    if(oldinput)
-+        [session removeInput: input];
-+    if(input)
-+        [session addInput: input];
-+    [session commitConfiguration];
++    zbar_image_set_data(zimg, raw, datalen, zbar_image_free_data);
++    zbar_image_set_format(zimg, zbar_fourcc('Y','8','0','0'));
++    zbar_image_set_size(zimg, w, h);
 +
-+    [olddev release];
-+    [oldinput release];
++    // scale and crop simultaneously
++    CGFloat scale = size.width / crop.size.width;
++    crop.origin.x *= -scale;
++    crop.size.width = scale * (CGFloat)CGImageGetWidth(image);
++    scale = size.height / crop.size.height;
++    CGFloat height = CGImageGetHeight(image);
++    // compensate for wacky origin
++    crop.origin.y = height - crop.origin.y - crop.size.height;
++    crop.origin.y *= -scale;
++    crop.size.height = scale * height;
++
++    // generate grayscale image data
++    CGColorSpaceRef cs = CGColorSpaceCreateDeviceGray();
++    CGContextRef ctx =
++        CGBitmapContextCreate(raw, w, h, 8, w, cs, kCGImageAlphaNone);
++    CGColorSpaceRelease(cs);
++    CGContextSetAllowsAntialiasing(ctx, 0);
++
++    CGContextDrawImage(ctx, crop, image);
++
++#if 0
++    zlog(@"convert image %dx%d: crop %g,%g %gx%g size %gx%g (%dx%d)",
++         CGImageGetWidth(image), CGImageGetHeight(image),
++         crop.origin.x, crop.origin.y, crop.size.width, crop.size.height,
++         size.width, size.height, w, h);
++    CGImageRef cgdump = CGBitmapContextCreateImage(ctx);
++    UIImage *uidump = [[UIImage alloc]
++                          initWithCGImage: cgdump];
++    CGImageRelease(cgdump);
++    UIImageWriteToSavedPhotosAlbum(uidump, nil, nil, NULL);
++    [uidump release];
++#endif
++
++    CGContextRelease(ctx);
++
++    t_convert = timer_elapsed(t_start, timer_now());
++    return(self);
 +}
 +
-+- (BOOL) enableCache
++- (id) initWithCGImage: (CGImageRef) image
++                  size: (CGSize) size
 +{
-+    return(captureReader.enableCache);
++    CGRect crop = CGRectMake(0, 0,
++                             CGImageGetWidth(image),
++                             CGImageGetHeight(image));
++    return([self initWithCGImage: image
++                 crop: crop
++                 size: size]);
 +}
 +
-+- (void) setEnableCache: (BOOL) enable
++- (id) initWithCGImage: (CGImageRef) image
 +{
-+    captureReader.enableCache = enable;
++    CGRect crop = CGRectMake(0, 0,
++                             CGImageGetWidth(image),
++                             CGImageGetHeight(image));
++    return([self initWithCGImage: image
++                 crop: crop
++                 size: crop.size]);
 +}
 +
-+- (void) setTorchMode: (NSInteger) mode
++- (zbar_image_t*) image
 +{
-+    [super setTorchMode: mode];
-+    if(running && [device isTorchModeSupported: mode])
-+        @try {
-+            device.torchMode = mode;
-+        }
-+        @catch(...) { }
++    return(zimg);
 +}
 +
-+- (void) setShowsFPS: (BOOL) show
++- (unsigned long) format
 +{
-+    [super setShowsFPS: show];
-+    @try {
-+        if(show)
-+            [captureReader addObserver: self
-+                           forKeyPath: @"framesPerSecond"
-+                           options: 0
-+                           context: NULL];
-+        else
-+            [captureReader removeObserver: self
-+                           forKeyPath: @"framesPerSecond"];
-+    }
-+    @catch(...) { }
++    return(zbar_image_get_format(zimg));
 +}
 +
-+- (void) start
++- (void) setFormat: (unsigned long) format
 +{
-+    if(started)
-+        return;
-+    [super start];
-+
-+    [session startRunning];
-+    captureReader.enableReader = YES;
++    zbar_image_set_format(zimg, format);
 +}
 +
-+- (void) stop
++- (unsigned) sequence
 +{
-+    if(!started)
-+        return;
-+    [super stop];
-+
-+    captureReader.enableReader = NO;
-+    [session stopRunning];
++    return(zbar_image_get_sequence(zimg));
 +}
 +
-+- (void) flushCache
++- (void) setSequence: (unsigned) seq
 +{
-+    [captureReader flushCache];
++    zbar_image_set_sequence(zimg, seq);
 +}
 +
-+// AVCaptureSession notifications
-+
-+- (void) onVideoStart: (NSNotification*) note
++- (CGSize) size
 +{
-+    zlog(@"onVideoStart: running=%d %@", running, note);
-+    if(running)
-+        return;
-+    running = YES;
++    unsigned w, h;
++    zbar_image_get_size(zimg, &w, &h);
++    return(CGSizeMake(w, h));
++}
 +
-+    // lock device and set focus mode
-+    NSError *error = nil;
-+    if([device lockForConfiguration: &error]) {
-+        if([device isFocusModeSupported: AVCaptureFocusModeContinuousAutoFocus])
-+            device.focusMode = AVCaptureFocusModeContinuousAutoFocus;
-+        if([device isTorchModeSupported: torchMode])
-+            device.torchMode = torchMode;
-+    }
-+    else
-+        zlog(@"failed to lock device: %@", error);
++- (void) setSize: (CGSize) size
++{
++    zbar_image_set_size(zimg, size.width + .5, size.height + .5);
 +}
 +
-+- (void) onVideoStop: (NSNotification*) note
++- (CGRect) crop
 +{
-+    zlog(@"onVideoStop: %@", note);
-+    if(!running)
-+        return;
++    unsigned x, y, w, h;
++    zbar_image_get_crop(zimg, &x, &y, &w, &h);
++    return(CGRectMake(x, y, w, h));
++}
 +
-+    [device unlockForConfiguration];
-+    running = NO;
++- (void) setCrop: (CGRect) crop
++{
++    zbar_image_set_crop(zimg, crop.origin.x + .5, crop.origin.y + .5,
++                        crop.size.width + .5, crop.size.height + .5);
 +}
 +
-+- (void) onVideoError: (NSNotification*) note
++- (ZBarSymbolSet*) symbols
 +{
-+    zlog(@"onVideoError: %@", note);
-+    if(running) {
-+        // FIXME does session always stop on error?
-+        running = started = NO;
-+        [device unlockForConfiguration];
-+    }
-+    NSError *err =
-+        [note.userInfo objectForKey: AVCaptureSessionErrorKey];
-+    NSLog(@"ZBarReaderView: ERROR during capture: %@: %@",
-+          [err localizedDescription],
-+          [err localizedFailureReason]);
++    return([[[ZBarSymbolSet alloc]
++                initWithSymbolSet: zbar_image_get_symbols(zimg)]
++               autorelease]);
 +}
 +
-+// NSKeyValueObserving
++- (void) setSymbols: (ZBarSymbolSet*) symbols
++{
++    zbar_image_set_symbols(zimg, [symbols zbarSymbolSet]);
++}
 +
-+- (void) observeValueForKeyPath: (NSString*) path
-+                       ofObject: (id) obj
-+                         change: (NSDictionary*) info
-+                        context: (void*) ctx
++- (const void*) data
 +{
-+    if(obj == captureReader &&
-+       [path isEqualToString: @"size"])
-+        // adjust preview to match image size
-+        [self setImageSize: captureReader.size];
-+    else if(obj == captureReader &&
-+       [path isEqualToString: @"framesPerSecond"])
-+        fpsLabel.text = [NSString stringWithFormat: @"%.2ffps ",
-+                                  captureReader.framesPerSecond];
++    return(zbar_image_get_data(zimg));
 +}
 +
-+// ZBarCaptureDelegate
++- (unsigned long) dataLength
++{
++    return(zbar_image_get_data_length(zimg));
++}
 +
-+- (void) captureReader: (ZBarCaptureReader*) reader
-+       didTrackSymbols: (ZBarSymbolSet*) syms
++- (void) setData: (const void*) data
++      withLength: (unsigned long) length
 +{
-+    [self didTrackSymbols: syms];
++    zbar_image_set_data(zimg, data, length, image_cleanup);
 +}
 +
-+- (void)       captureReader: (ZBarCaptureReader*) reader
-+  didReadNewSymbolsFromImage: (ZBarImage*) zimg
++- (zbar_image_t*) zbarImage
 +{
-+    zlog(@"scanned %d symbols: %@", zimg.symbols.count, zimg);
-+    if(!readerDelegate)
-+        return;
++    return(zimg);
++}
 +
-+    UIImageOrientation orient;
-+    switch([UIDevice currentDevice].orientation)
++- (UIImage*) UIImageWithOrientation: (UIImageOrientation) orient
++{
++    unsigned long format = self.format;
++    size_t bpc, bpp;
++    switch(format)
 +    {
-+    case UIDeviceOrientationPortraitUpsideDown:
-+        orient = UIImageOrientationLeft;
++    case zbar_fourcc('R','G','B','3'):
++        bpc = 8;
++        bpp = 24;
 +        break;
-+    case UIDeviceOrientationLandscapeLeft:
-+        orient = UIImageOrientationUp;
++    case zbar_fourcc('R','G','B','4'):
++        bpc = 8;
++        bpp = 32;
 +        break;
-+    case UIDeviceOrientationLandscapeRight:
-+        orient = UIImageOrientationDown;
++    case zbar_fourcc('R','G','B','Q'):
++        bpc = 5;
++        bpp = 16;
 +        break;
 +    default:
-+        orient = UIImageOrientationRight;
-+        break;
-+    }
++        NSLog(@"ERROR: format %.4s(%08lx) is unsupported",
++              (char*)&format, format);
++        assert(0);
++        return(nil);
++    };
 +
-+    UIImage *uiimg = [zimg UIImageWithOrientation: orient];
-+    [readerDelegate
-+        readerView: self
-+        didReadSymbols: zimg.symbols
-+        fromImage: uiimg];
++    unsigned w = zbar_image_get_width(zimg);
++    unsigned h = zbar_image_get_height(zimg);
++    const void *data = zbar_image_get_data(zimg);
++    size_t datalen = zbar_image_get_data_length(zimg);
++    CGDataProviderRef datasrc =
++        CGDataProviderCreateWithData(self, data, datalen, (void*)CFRelease);
++    CGColorSpaceRef cs = CGColorSpaceCreateDeviceRGB();
++    CGImageRef cgimg =
++        CGImageCreate(w, h, bpc, bpp, ((bpp + 7) >> 3) * w, cs,
++                      kCGBitmapByteOrderDefault |
++                      kCGImageAlphaNoneSkipFirst,
++                      datasrc, NULL, YES, kCGRenderingIntentDefault);
++    CGColorSpaceRelease(cs);
++    CGDataProviderRelease(datasrc);
++
++    UIImage *uiimg =
++        [UIImage imageWithCGImage: cgimg
++                 scale: 1
++                 orientation: orient];
++    CGImageRelease(cgimg);
++    return(uiimg);
++}
++
++- (UIImage*) UIImage
++{
++    return([self UIImageWithOrientation: UIImageOrientationUp]);
++}
++
++- (void) cleanup
++{
 +}
 +
++#if 0
++- (ZBarImage*) convertToFormat: (unsigned long) format
++{
++    zbar_image_t *zdst = zbar_image_convert(zimg, format);
++    ZBarImage *image = ;
++    return([[[ZBarImage alloc] initWithImage: zdst] autorelease]);
++}
++#endif
++
 +@end
-diff --git a/iphone/ZBarReaderViewImpl_Simulator.m b/iphone/ZBarReaderViewImpl_Simulator.m
-new file mode 100644
---- /dev/null
-+++ b/iphone/ZBarReaderViewImpl_Simulator.m
-@@ -0,0 +1,223 @@
+diff -r 563557a923d0 iphone/ZBarImageScanner.m
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/ZBarImageScanner.m	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,85 @@
 +//------------------------------------------------------------------------
-+//  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
++//  Copyright 2009 (c) Jeff Brown <spadix@users.sourceforge.net>
 +//
 +//  This file is part of the ZBar Bar Code Reader.
 +//
@@ -4898,211 +5027,72 @@ new file mode 100644
 +//  http://sourceforge.net/projects/zbar
 +//------------------------------------------------------------------------
 +
-+#import <ZBarSDK/ZBarReaderView.h>
-+#import <ZBarSDK/ZBarReaderViewController.h>
-+
-+#define MODULE ZBarReaderView
++#import <ZBarSDK/ZBarImageScanner.h>
 +#import "debug.h"
 +
-+// hack around missing simulator support for AVCapture interfaces
-+
-+@interface ZBarReaderViewController(Simulator)
-+@end
++@implementation ZBarImageScanner
 +
-+@implementation ZBarReaderViewController(Simulator)
++@dynamic enableCache, results;
 +
-+- (void) initSimulator
++- (id) init
 +{
-+    UILongPressGestureRecognizer *press =
-+        [[UILongPressGestureRecognizer alloc]
-+            initWithTarget: self
-+            action: @selector(didLongPress:)];
-+    [self.view addGestureRecognizer: press];
-+    press.numberOfTouchesRequired = 2;
-+    [press release];
++    if(self = [super init]) {
++        scanner = zbar_image_scanner_create();
++    }
++    return(self);
 +}
 +
-+- (void) takePicture
++- (void) dealloc
 +{
-+    UIImagePickerController *picker =
-+        [UIImagePickerController new];
-+    picker.delegate = (id<UINavigationControllerDelegate,
-+                          UIImagePickerControllerDelegate>)self;
-+    [self presentModalViewController: picker
-+          animated: YES];
-+    [picker release];
++    if(scanner) {
++        zbar_image_scanner_destroy(scanner);
++        scanner = NULL;
++    }
++    [super dealloc];
 +}
 +
-+- (void) didLongPress: (UIGestureRecognizer*) press
++- (BOOL) enableCache
 +{
-+    if(press.state == UIGestureRecognizerStateBegan)
-+        [self takePicture];
++    assert(0); // FIXME
++    return(NO);
 +}
 +
-+- (void)  imagePickerController: (UIImagePickerController*) picker
-+  didFinishPickingMediaWithInfo: (NSDictionary*) info
++- (void) setEnableCache: (BOOL) enable
 +{
-+    UIImage *image = [info objectForKey: UIImagePickerControllerOriginalImage];
-+    [picker dismissModalViewControllerAnimated: YES];
-+    [readerView performSelector: @selector(scanImage:)
-+                withObject: image
-+                afterDelay: .1];
++    zbar_image_scanner_enable_cache(scanner, enable);
 +}
 +
-+- (void) imagePickerControllerDidCancel: (UIImagePickerController*) picker
++- (ZBarSymbolSet*) results
 +{
-+    [picker dismissModalViewControllerAnimated: YES];
++    const zbar_symbol_set_t *set = zbar_image_scanner_get_results(scanner);
++    return([[[ZBarSymbolSet alloc] initWithSymbolSet: set] autorelease]);
 +}
 +
-+@end
++// image scanner config wrappers
++- (void) parseConfig: (NSString*) cfg
++{
++    zbar_image_scanner_parse_config(scanner, [cfg UTF8String]);
++    // FIXME throw errors
++}
 +
-+// protected APIs
-+@interface ZBarReaderView()
-+- (void) initSubviews;
-+- (void) setImageSize: (CGSize) size;
-+- (void) didTrackSymbols: (ZBarSymbolSet*) syms;
-+@end
-+
-+@interface ZBarReaderViewImpl
-+    : ZBarReaderView
-+{
-+    ZBarImageScanner *scanner;
-+    UIImage *scanImage;
-+    CALayer *previewImage;
-+    BOOL enableCache;
-+}
-+@end
-+
-+@implementation ZBarReaderViewImpl
-+
-+@synthesize scanner, enableCache;
-+
-+- (id) initWithImageScanner: (ZBarImageScanner*) _scanner
-+{
-+    self = [super initWithImageScanner: _scanner];
-+    if(!self)
-+        return(nil);
-+
-+    scanner = [_scanner retain];
-+
-+    [self initSubviews];
-+    return(self);
-+}
-+
-+- (void) initSubviews
-+{
-+    UILabel *label =
-+        [[UILabel alloc]
-+            initWithFrame: CGRectMake(16, 165, 288, 96)];
-+    label.backgroundColor = [UIColor clearColor];
-+    label.textColor = [UIColor whiteColor];
-+    label.font = [UIFont boldSystemFontOfSize: 20];
-+    label.numberOfLines = 4;
-+    label.textAlignment = UITextAlignmentCenter;
-+    label.text = @"Camera Simulation\n\n"
-+        @"Tap and hold with two \"fingers\" to select image";
-+    [self addSubview: label];
-+    [label release];
-+
-+    preview = [CALayer new];
-+    preview.frame = self.bounds;
-+    [self.layer addSublayer: preview];
-+
-+    previewImage = [CALayer new];
-+    previewImage.frame = self.bounds;
-+    [preview addSublayer: previewImage];
-+
-+    [super initSubviews];
-+}
-+
-+- (void) dealloc
-+{
-+    [scanner release];
-+    scanner = nil;
-+    [previewImage release];
-+    previewImage = nil;
-+    [super dealloc];
-+}
-+
-+- (void) start
-+{
-+    if(started)
-+        return;
-+    [super start];
-+    running = YES;
-+}
-+
-+- (void) stop
-+{
-+    if(!started)
-+        return;
-+    [super stop];
-+    running = NO;
-+}
-+
-+- (void) scanImage: (UIImage*) image
++- (void) setSymbology: (zbar_symbol_type_t) sym
++               config: (zbar_config_t) cfg
++                   to: (int) val
 +{
-+    // strip EXIF info
-+    CGImageRef cgimage = image.CGImage;
-+    image = [[UIImage alloc]
-+                initWithCGImage: cgimage
-+                scale: 1.0
-+                orientation: UIImageOrientationUp];
-+
-+    [self setImageSize: image.size];
-+
-+    [CATransaction begin];
-+    [CATransaction setDisableActions: YES];
-+    previewImage.contentsScale = imageScale;
-+    previewImage.contentsGravity = kCAGravityCenter;
-+    previewImage.transform = CATransform3DMakeRotation(M_PI_2, 0, 0, 1);
-+    previewImage.contents = (id)cgimage;
-+    [CATransaction commit];
-+
-+    ZBarImage *zimg =
-+        [[ZBarImage alloc]
-+            initWithCGImage: cgimage];
-+
-+    CGSize size = zimg.size;
-+    zimg.crop = CGRectMake(zoomCrop.origin.x * size.width,
-+                           zoomCrop.origin.y * size.height,
-+                           zoomCrop.size.width * size.width,
-+                           zoomCrop.size.height * size.height);
-+
-+    int nsyms = [scanner scanImage: zimg];
-+    zlog(@"scan image: %@ crop=%@ nsyms=%d",
-+         NSStringFromCGSize(size), NSStringFromCGRect(zimg.crop), nsyms);
-+    [zimg release];
-+
-+    if(nsyms > 0) {
-+        scanImage = [image retain];
-+        ZBarSymbolSet *syms = scanner.results;
-+        [self performSelector: @selector(didReadSymbols:)
-+              withObject: syms
-+              afterDelay: .4];
-+        [self performSelector: @selector(didTrackSymbols:)
-+              withObject: syms
-+              afterDelay: .001];
-+    }
-+    [image release];
++    zbar_image_scanner_set_config(scanner, sym, cfg, val);
++    // FIXME throw errors
 +}
 +
-+- (void) didReadSymbols: (ZBarSymbolSet*) syms
++- (NSInteger) scanImage: (ZBarImage*) image
 +{
-+    [readerDelegate
-+        readerView: self
-+        didReadSymbols: syms
-+        fromImage: scanImage];
-+    [scanImage release];
-+    scanImage = nil;
++    return(zbar_scan_image(scanner, image.zbarImage));
 +}
 +
 +@end
-diff --git a/iphone/ZBarSymbol.m b/iphone/ZBarSymbol.m
-new file mode 100644
---- /dev/null
-+++ b/iphone/ZBarSymbol.m
-@@ -0,0 +1,197 @@
+diff -r 563557a923d0 iphone/ZBarReaderController.m
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/ZBarReaderController.m	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,747 @@
 +//------------------------------------------------------------------------
 +//  Copyright 2009-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
 +//
@@ -5126,5938 +5116,8342 @@ new file mode 100644
 +//  http://sourceforge.net/projects/zbar
 +//------------------------------------------------------------------------
 +
-+#import <ZBarSDK/ZBarSymbol.h>
-+
-+@implementation ZBarSymbol
++#import <ZBarSDK/ZBarReaderController.h>
++#import <ZBarSDK/ZBarHelpController.h>
++#import "debug.h"
 +
-+@dynamic type, typeName, configMask, modifierMask, data, quality, count,
-+    zbarSymbol;
++/* the use of UIGetScreenImage() may no longer be sanctioned, even
++ * though it was previously "allowed".  define this to 0 to rip it out
++ * and fall back to cameraMode=Default (manual capture)
++ */
++#ifndef USE_PRIVATE_APIS
++# define USE_PRIVATE_APIS 0
++#endif
 +
-++ (NSString*) nameForType: (zbar_symbol_type_t) type
-+{
-+    return([NSString stringWithUTF8String: zbar_get_symbol_name(type)]);
-+}
++#ifndef MIN_QUALITY
++# define MIN_QUALITY 10
++#endif
 +
-+- (id) initWithSymbol: (const zbar_symbol_t*) sym
-+{
-+    if(self = [super init]) {
-+        symbol = sym;
-+        zbar_symbol_ref(sym, 1);
-+    }
-+    return(self);
-+}
++NSString* const ZBarReaderControllerResults = @"ZBarReaderControllerResults";
 +
-+- (void) dealloc
-+{
-+    if(symbol) {
-+        zbar_symbol_ref(symbol, -1);
-+        symbol = NULL;
-+    }
-+    [super dealloc];
-+}
++#if USE_PRIVATE_APIS
++// expose undocumented API
++CF_RETURNS_RETAINED
++CGImageRef UIGetScreenImage(void);
++#endif
 +
-+- (zbar_symbol_type_t) type
-+{
-+    return(zbar_symbol_get_type(symbol));
-+}
++@implementation ZBarReaderController
 +
-+- (NSString*) typeName
-+{
-+    return([[self class] nameForType: zbar_symbol_get_type(symbol)]);
-+}
++@synthesize scanner, readerDelegate, cameraMode, scanCrop, maxScanDimension,
++    showsHelpOnFail, takesPicture, enableCache, tracksSymbols;
++@dynamic showsZBarControls;
 +
-+- (NSUInteger) configMask
++- (id) init
 +{
-+    return(zbar_symbol_get_configs(symbol));
-+}
++    if(self = [super init]) {
++        showsHelpOnFail = YES;
++        hasOverlay = showsZBarControls =
++            [self respondsToSelector: @selector(cameraOverlayView)];
++        enableCache = tracksSymbols = YES;
++        scanCrop = CGRectMake(0, 0, 1, 1);
++        maxScanDimension = 640;
 +
-+- (NSUInteger) modifierMask
-+{
-+    return(zbar_symbol_get_modifiers(symbol));
-+}
++        scanner = [ZBarImageScanner new];
++        [scanner setSymbology: 0
++                 config: ZBAR_CFG_X_DENSITY
++                 to: 2];
++        [scanner setSymbology: 0
++                 config: ZBAR_CFG_Y_DENSITY
++                 to: 2];
 +
-+- (NSString*) data
-+{
-+    return([NSString stringWithUTF8String: zbar_symbol_get_data(symbol)]);
-+}
++        if([UIImagePickerController
++               isSourceTypeAvailable: UIImagePickerControllerSourceTypeCamera])
++            self.sourceType = UIImagePickerControllerSourceTypeCamera;
 +
-+- (int) quality
-+{
-+    return(zbar_symbol_get_quality(symbol));
++#if USE_PRIVATE_APIS
++        cameraMode = ZBarReaderControllerCameraModeSampling;
++#else
++        cameraMode = ZBarReaderControllerCameraModeDefault;
++#endif
++    }
++    return(self);
 +}
 +
-+- (int) count
++- (void) initOverlay
 +{
-+    return(zbar_symbol_get_count(symbol));
-+}
++    CGRect bounds = self.view.bounds;
++    overlay = [[UIView alloc] initWithFrame: bounds];
++    overlay.backgroundColor = [UIColor clearColor];
 +
-+- (zbar_orientation_t) orientation
-+{
-+    return(zbar_symbol_get_orientation(symbol));
-+}
++    CGRect r = bounds;
++    r.size.height -= 54;
++    boxView = [[UIView alloc] initWithFrame: r];
 +
-+- (const zbar_symbol_t*) zbarSymbol
-+{
-+    return(symbol);
-+}
++    boxLayer = [CALayer new];
++    boxLayer.frame = r;
++    boxLayer.borderWidth = 1;
++    boxLayer.borderColor = [UIColor greenColor].CGColor;
++    [boxView.layer addSublayer: boxLayer];
 +
-+- (ZBarSymbolSet*) components
-+{
-+    return([[[ZBarSymbolSet alloc]
-+                initWithSymbolSet: zbar_symbol_get_components(symbol)]
-+               autorelease]);
-+}
++    toolbar = [UIToolbar new];
++    toolbar.barStyle = UIBarStyleBlackOpaque;
++    r.origin.y = r.size.height;
++    r.size.height = 54;
++    toolbar.frame = r;
 +
-+- (CGRect) bounds
-+{
-+    int n = zbar_symbol_get_loc_size(symbol);
-+    if(!n)
-+        return(CGRectNull);
-+
-+    int xmin = INT_MAX, xmax = INT_MIN;
-+    int ymin = INT_MAX, ymax = INT_MIN;
++    cancelBtn = [[UIBarButtonItem alloc]
++                    initWithBarButtonSystemItem: UIBarButtonSystemItemCancel
++                    target: self
++                    action: @selector(cancel)];
++    cancelBtn.width = r.size.width / 4 - 16;
 +
-+    for(int i = 0; i < n; i++) {
-+        int t = zbar_symbol_get_loc_x(symbol, i);
-+        if(xmin > t) xmin = t;
-+        if(xmax < t) xmax = t;
-+        t = zbar_symbol_get_loc_y(symbol, i);
-+        if(ymin > t) ymin = t;
-+        if(ymax < t) ymax = t;
-+    }
-+    return(CGRectMake(xmin, ymin, xmax - xmin, ymax - ymin));
-+}
++    scanBtn = [[UIBarButtonItem alloc]
++                  initWithTitle: @"Scan!"
++                  style: UIBarButtonItemStyleDone
++                  target: self
++                  action: @selector(scan)];
++    scanBtn.width = r.size.width / 2 - 16;
 +
-+@end
++    for(int i = 0; i < 2; i++)
++        space[i] = [[UIBarButtonItem alloc]
++                       initWithBarButtonSystemItem:
++                           UIBarButtonSystemItemFlexibleSpace
++                       target: nil
++                       action: nil];
 +
++    space[2] = [[UIBarButtonItem alloc]
++                    initWithBarButtonSystemItem:
++                        UIBarButtonSystemItemFixedSpace
++                    target: nil
++                    action: nil];
++    space[2].width = r.size.width / 4 - 16;
 +
-+@implementation ZBarSymbolSet
++    infoBtn = [[UIButton buttonWithType: UIButtonTypeInfoLight] retain];
++    r.origin.x = r.size.width - 54;
++    r.size.width = 54;
++    infoBtn.frame = r;
++    [infoBtn addTarget: self
++             action: @selector(info)
++             forControlEvents: UIControlEventTouchUpInside];
++}
 +
-+@dynamic count, zbarSymbolSet;
-+@synthesize filterSymbols;
++- (void) viewDidLoad
++{
++    [super viewDidLoad];
++    [super setDelegate: self];
++    if(hasOverlay)
++        [self initOverlay];
++}
 +
-+- (id) initWithSymbolSet: (const zbar_symbol_set_t*) s
++- (void) cleanup
 +{
-+    if(!s) {
-+        [self release];
-+        return(nil);
-+    }
-+    if(self = [super init]) {
-+        set = s;
-+        zbar_symbol_set_ref(s, 1);
-+        filterSymbols = YES;
++    [overlay release];
++    overlay = nil;
++    [boxView release];
++    boxView = nil;
++    [boxLayer release];
++    boxLayer = nil;
++    [toolbar release];
++    toolbar = nil;
++    [cancelBtn release];
++    cancelBtn = nil;
++    [scanBtn release];
++    scanBtn = nil;
++    for(int i = 0; i < 3; i++) {
++        [space[i] release];
++        space[i] = nil;
 +    }
-+    return(self);
++    [infoBtn release];
++    infoBtn = nil;
++    [help release];
++    help = nil;
++}
++
++- (void) viewDidUnload
++{
++    [self cleanup];
++    [super viewDidUnload];
 +}
 +
 +- (void) dealloc
 +{
-+    if(set) {
-+        zbar_symbol_set_ref(set, -1);
-+        set = NULL;
-+    }
++    [self cleanup];
++    [scanner release];
++    scanner = nil;
 +    [super dealloc];
 +}
 +
-+- (int) count
++- (void) scan
 +{
-+    if(filterSymbols)
-+        return(zbar_symbol_set_get_size(set));
-+
-+    int n = 0;
-+    const zbar_symbol_t *sym = zbar_symbol_set_first_unfiltered(set);
-+    for(; sym; sym = zbar_symbol_next(sym))
-+        n++;
-+    return(n);
++    scanBtn.enabled = NO;
++    self.view.userInteractionEnabled = NO;
++    [self takePicture];
 +}
 +
-+- (const zbar_symbol_set_t*) zbarSymbolSet
++- (void) cancel
 +{
-+    return(set);
++    [self performSelector: @selector(imagePickerControllerDidCancel:)
++          withObject: self
++          afterDelay: 0.1];
 +}
 +
-+- (NSUInteger) countByEnumeratingWithState: (NSFastEnumerationState*) state
-+                                   objects: (id*) stackbuf
-+                                     count: (NSUInteger) len
++- (void) reenable
 +{
-+    const zbar_symbol_t *sym = (void*)state->state; // FIXME
-+    if(sym)
-+        sym = zbar_symbol_next(sym);
-+    else if(set && filterSymbols)
-+        sym = zbar_symbol_set_first_symbol(set);
-+    else if(set)
-+        sym = zbar_symbol_set_first_unfiltered(set);
-+
-+    if(sym)
-+        *stackbuf = [[[ZBarSymbol alloc]
-+                         initWithSymbol: sym]
-+                        autorelease];
-+
-+    state->state = (unsigned long)sym; // FIXME
-+    state->itemsPtr = stackbuf;
-+    state->mutationsPtr = (void*)self;
-+    return((sym) ? 1 : 0);
++    scanBtn.enabled = YES;
++    self.view.userInteractionEnabled = YES;
 +}
 +
-+@end
-diff --git a/iphone/bin/BuildUniversal.sh b/iphone/bin/BuildUniversal.sh
-new file mode 100755
---- /dev/null
-+++ b/iphone/bin/BuildUniversal.sh
-@@ -0,0 +1,23 @@
-+#!/bin/sh
-+set -ux
-+SUBTARGET=${1:?}
-+OUTDIR=${2:-$TARGET_BUILD_DIR}
++- (void) initScanning
++{
++    if(hasOverlay &&
++       self.sourceType == UIImagePickerControllerSourceTypeCamera) {
++        if(showsZBarControls || ![self cameraOverlayView])
++            [self setCameraOverlayView: overlay];
 +
-+# build library for device and simulator
-+xcodebuild -target $SUBTARGET -configuration $CONFIGURATION -sdk iphoneos \
-+    || exit 1
-+xcodebuild -target $SUBTARGET -configuration $CONFIGURATION -sdk iphonesimulator \
-+    || exit 1
++        UIView *activeOverlay = [self cameraOverlayView];
 +
-+mkdir -p $OUTDIR
++        if(showsZBarControls) {
++            if(!toolbar.superview) {
++                [overlay addSubview: toolbar];
++                [overlay addSubview: infoBtn];
++            }
++            [self setShowsCameraControls: NO];
++        }
++        else {
++            [toolbar removeFromSuperview];
++            [infoBtn removeFromSuperview];
++            if(activeOverlay == overlay)
++                [self setShowsCameraControls: YES];
++        }
 +
-+# combine device and simulator libs into single fat lib.
-+# others have indicated that this approach is "wrong", but for us
-+# the ease of including the universal lib in a project without complicated
-+# changes to build settings outweighs any lack of purity in the approach
-+# ...we can always fix things later, if necessary
-+lipo -create \
-+    $BUILD_DIR/$CONFIGURATION-iphoneos/$SUBTARGET.a \
-+    $BUILD_DIR/$CONFIGURATION-iphonesimulator/$SUBTARGET.a \
-+    -output $OUTDIR/$SUBTARGET.a \
-+    || exit 1
-diff --git a/iphone/bin/CreateDMG.sh b/iphone/bin/CreateDMG.sh
-new file mode 100755
---- /dev/null
-+++ b/iphone/bin/CreateDMG.sh
-@@ -0,0 +1,35 @@
-+#!/bin/sh
-+set -ux
-+VOLNAME=${1:?}
-+shift
-+RES=$SOURCE_ROOT/res
-+BUDDY=$(xcrun -find PlistBuddy) \
-+    || exit 1
-+VERSION=$($BUDDY -c 'Print :CFBundleVersion' $RES/$VOLNAME-Info.plist) \
-+    || exit 1
-+DMG=$VOLNAME-$VERSION
++        self.view.userInteractionEnabled = YES;
 +
-+mkdir -p $TARGET_BUILD_DIR/.background \
-+    || exit 1
-+cp -af $RES/$VOLNAME.DS_Store $TARGET_BUILD_DIR/.DS_Store
-+cp -af $RES/$VOLNAME-bg.png $TARGET_BUILD_DIR/.background/
++        sampling = (cameraMode == ZBarReaderControllerCameraModeSampling ||
++                    cameraMode == ZBarReaderControllerCameraModeSequence);
 +
-+# copy remaining arguments to image directly
-+for content
-+do
-+    cp -af $content $TARGET_BUILD_DIR/ \
-+        || exit 1
-+done
++        if(sampling) {
++            toolbar.items = [NSArray arrayWithObjects:
++                                cancelBtn, space[0], nil];
 +
-+# prepare examples for distribution
-+for example in $(find $TARGET_BUILD_DIR/Examples -depth 1)
-+do
-+    rm -rf $example/{*.xcodeproj/*.{mode1v3,pbxuser},ZBarSDK}
-+    cp -af $BUILT_PRODUCTS_DIR/ZBarSDK $example/
-+done
++            t_frame = timer_now();
++            dt_frame = 0;
++            boxLayer.opacity = 0;
++            if(boxView.superview != activeOverlay)
++                [boxView removeFromSuperview];
++            if(!boxView.superview)
++                [activeOverlay insertSubview: boxView atIndex:0];
++            scanner.enableCache = enableCache;
 +
-+hdiutil create -ov -fs HFS+ -format UDZO -imagekey zlib-level=9 \
-+    -volname $VOLNAME \
-+    -srcdir $TARGET_BUILD_DIR \
-+    $BUILT_PRODUCTS_DIR/$DMG.dmg \
-+    || exit 1
-diff --git a/iphone/bin/CreateDSStore.pl b/iphone/bin/CreateDSStore.pl
-new file mode 100755
---- /dev/null
-+++ b/iphone/bin/CreateDSStore.pl
-@@ -0,0 +1,72 @@
-+#!/usr/bin/perl
++            SEL meth = nil;
++            if(cameraMode == ZBarReaderControllerCameraModeSampling) {
++                // ensure crop rect does not include controls
++                if(scanCrop.origin.x + scanCrop.size.width > .8875)
++                    scanCrop.size.width = .8875 - scanCrop.origin.x;
 +
-+# Quick hack script to generate the .DS_Store for the DMG, which
-+#   * allows us to precisely position the window and icons
-+#   * is more usefully versioned
-+#   * avoids references to my local HD(!?)
++                meth = @selector(scanScreen);
++            }
++            else
++                meth = @selector(takePicture);
 +
-+use warnings;
-+use strict;
++            [self performSelector: meth
++                  withObject: nil
++                  afterDelay: 2];
++#ifdef DEBUG_OBJC
++            [self performSelector: @selector(dumpFPS)
++                  withObject: nil
++                  afterDelay: 4];
++#endif
++        }
++        else {
++            scanBtn.enabled = NO;
++            toolbar.items = [NSArray arrayWithObjects:
++                        cancelBtn, space[0], scanBtn, space[1], space[2], nil];
 +
-+BEGIN {
-+  use File::Spec::Functions qw(rel2abs splitpath);
-+  use lib (splitpath(rel2abs($0)))[1];
-+}
-+
-+use Data::Plist::BinaryWriter;
-+use Mac::Finder::DSStore qw(writeDSDBEntries makeEntries);
-+use Mac::Finder::AliasRecord;
-+
-+$Mac::Finder::DSStore::Entry::types{bwsp} = 'blob';
-+$Mac::Finder::DSStore::Entry::types{icvp} = 'blob';
-+
-+writeDSDBEntries($ARGV[0] || "DS_Store",
-+    makeEntries(".",
-+        bwsp => Data::Plist::BinaryWriter->new(serialize => 0)->write([
-+            dict => {
-+                WindowBounds => [
-+                    string => sprintf('{{%d, %d}, {%d, %d}}',
-+                                      512, 128, 512, 608 + 22)
-+                ],
-+                SidebarWidth => [integer => 0],
-+                ShowToolbar => [false => 0],
-+                ShowSidebar => [false => 0],
-+                ShowPathbar => [false => 0],
-+                ShowStatusBar => [false => 0],
-+            }
-+        ]),
-+        icvp => Data::Plist::BinaryWriter->new(serialize => 0)->write([
-+            dict => {
-+                viewOptionsVersion => [integer => 0],
-+                arrangeBy => [string => "none"],
-+                iconSize => [real => 64],
-+                textSize => [real => 12],
-+                labelOnBottom => [true => 1],
-+                gridSpacing => [real => 100],
-+                gridOffsetX => [real => 0],
-+                gridOffsetY => [real => 0],
-+                showItemInfo => [false => 0],
-+                showIconPreview => [false => 0],
-+                backgroundType => [integer => 2],
-+                backgroundColorRed => [real => 0],
-+                backgroundColorGreen => [real => 0],
-+                backgroundColorBlue => [real => .5],
-+                backgroundImageAlias => [
-+                    data => Mac::Finder::AliasRecord->new(
-+                        path => 'ZBarSDK:.background:ZBarSDK-bg.png',
-+                        volumeFS => 'HFS+')->write()
-+                ],
-+            },
-+        ]),
-+        vstl => "icnv",
-+    ),
-+    makeEntries("README",       Iloc_xy => [ 4.5 * 32,  2.5  * 32 ]),
-+    makeEntries("ZBarSDK",      Iloc_xy => [ 4.5 * 32,  7.5  * 32 ]),
-+    makeEntries("ChangeLog",    Iloc_xy => [  4  * 32, 12.5  * 32 ]),
-+    makeEntries("Documentation.html",
-+                                Iloc_xy => [  8  * 32, 12.5  * 32 ]),
-+    makeEntries("Examples",     Iloc_xy => [ 12  * 32, 12.5  * 32 ]),
-+    makeEntries("COPYING",      Iloc_xy => [  4  * 32,  16   * 32 ]),
-+    makeEntries("LICENSE",      Iloc_xy => [  8  * 32,  16   * 32 ]),
-+    makeEntries("Documentation",Iloc_xy => [ 12  * 32,  16   * 32 ]),
-+);
-diff --git a/iphone/bin/Mac/Finder/AliasRecord.pm b/iphone/bin/Mac/Finder/AliasRecord.pm
-new file mode 100644
---- /dev/null
-+++ b/iphone/bin/Mac/Finder/AliasRecord.pm
-@@ -0,0 +1,169 @@
-+package Mac::Finder::AliasRecord;
++            [self performSelector: @selector(reenable)
++                  withObject: nil
++                  afterDelay: .5];
 +
-+# Generate(/Parse) a Mac "alias record" binary string/file.
-+#
-+# Currently just enough is implemented to satisfy immediate requirements
-+# (ie, write backgroundImageAlias to .DS_Store for DMG)
-+#
-+# based on these documents:
-+# http://www.geocities.com/xhelmboyx/quicktime/formats/alias-layout.txt
-+# http://sebastien.kirche.free.fr/python_stuff/MacOS-aliases.txt
-+#
-+# FIXME interface is very poor...
++            [boxView removeFromSuperview];
++        }
++    }
++}
 +
-+use warnings;
-+use strict;
-+use DateTime;
-+use File::Spec;
-+use File::Spec::Mac;
-+use Encode qw(encode);
-+require Exporter;
++- (void) viewWillAppear: (BOOL) animated
++{
++    [self initScanning];
++    [super viewWillAppear: animated];
++}
 +
-+our $VERSION = '0.1';
-+our @ISA = qw(Exporter);
++- (void) viewWillDisappear: (BOOL) animated
++{
++    sampling = NO;
++    scanner.enableCache = NO;
++    [super viewWillDisappear: animated];
++}
 +
-+my %FSEncodings = (
-+  MacFS   => ['RW', ''],
-+  MFS     => ['RW', ''],
-+  HFS     => ['BD', ''],
-+  'HFS+'  => ['H+', ''],
++- (BOOL) showsZBarControls
++{
++    return(showsZBarControls);
++}
 +
-+  AudioCD => ['', 'JH'],
-+  ISO9660 => ['', 'AG'],
-+  FAT     => ['', 'IS'],
-+  Joliet  => ['', 'Jo'],
-+  'ISO9660+Joliet' => ['', 'Jo'],
-+);
++- (void) setCameraMode: (ZBarReaderControllerCameraMode) mode
++{
++#if !USE_PRIVATE_APIS
++    if(mode == ZBarReaderControllerCameraModeSampling)
++        [NSException raise: NSInvalidArgumentException
++            format: @"ZBarReaderController cannot set cameraMode=Sampling"
++                    @" when USE_PRIVATE_APIS=0"];
++#endif
++    cameraMode = mode;
++}
 +
-+my %DiskEncodings = (
-+  HD          => 0,
-+  FixedHD     => 0,
-+  Network     => 1,
-+  NetworkDisk => 1,
-+  Floppy      => 4,
-+  Floppy1440  => 4,
-+  Other       => 5,
-+  OtherDisk   => 5,
-+);
++- (void) setShowsZBarControls: (BOOL) show
++{
++    if(show && !hasOverlay)
++        [NSException raise: NSInvalidArgumentException
++            format: @"ZBarReaderController cannot set showsZBarControls=YES for OS<3.1"];
 +
-+my %RecordEncodings = (
-+  parentDir     => 0x00,
-+  absolutePath  => 0x02,
-+  unicodeFile   => 0x0e,
-+  unicodeVolume => 0x0f,
-+  volumePath    => 0x12,
-+);
++    showsZBarControls = show;
++}
 +
-+sub new {
-+  my $class = shift || __PACKAGE__;
-+  my $self = {
-+    aliasCreator => '',
-+    aliasVersion => 2,
-+    aliasType => 'file',
-+    volume => '',
-+    volumeCreated => 0,
-+    volumeFS => 'HFS',
-+    volumeDisk => undef,
-+    volumeAttrs => 0,
-+    directoryID => 0,
-+    file => '',
-+    fileID => 0,
-+    fileCreated => 0,
-+    fileType => '',
-+    fileCreator => '',
-+    nlvlFrom => -1,
-+    nlvlTo => -1,
-+    records => { },
-+    @_
-+  };
-+  if(exists($self->{path})) {
-+    my $path = $self->{path};
-+    my ($vol, $dir, $file) = File::Spec::Mac->splitpath($path);
-+    $vol =~ s/:$//;
-+    my @dir = File::Spec::Mac->splitdir($dir);
-+    while(@dir && !$dir[0]) {
-+      shift(@dir);
-+    }
-+    while(@dir && !$dir[-1]) {
-+      pop(@dir);
-+    }
-+    $self->{volume} ||= $vol;
-+    $self->{records}{unicodeVolume} ||=
-+      pack('na*', length($vol), encode('utf-16be', $vol));
++// intercept delegate as readerDelegate
 +
-+    $self->{file} ||= $file;
-+    $self->{records}{parentDir} ||= $dir[-1]
-+      if(@dir);
-+    $self->{records}{absolutePath} ||= $path;
-+    $self->{records}{volumePath} ||= File::Spec->catfile('', @dir, $file);
-+    $self->{records}{unicodeFile} ||=
-+      pack('na*', length($file), encode('utf-16be', $file));
-+  }
-+  return(bless($self, ref($class) || $class));
++- (void) setDelegate: (id <UINavigationControllerDelegate,
++                           UIImagePickerControllerDelegate>) delegate
++{
++    self.readerDelegate = (id <ZBarReaderDelegate>)delegate;
 +}
 +
-+sub toFSTime {
-+  my $val = shift;
-+  if(ref($val) && $val->isa("DateTime")) {
-+    $val = $val->epoch - DateTime->new(year => 1904)->epoch();
-+  }
-+  return($val);
++
++#ifdef DEBUG_OBJC
++- (void) dumpFPS
++{
++    if(!sampling)
++        return;
++    [self performSelector: @selector(dumpFPS)
++          withObject: nil
++          afterDelay: 2];
++    zlog(@"fps=%g", 1 / dt_frame);
 +}
++#endif
 +
-+sub write {
-+  my ($self, $out) = @_;
++- (NSInteger) scanImage: (CGImageRef) image
++            withScaling: (CGFloat) scale
++{
++    uint64_t now = timer_now();
++    if(dt_frame)
++        dt_frame = (dt_frame + timer_elapsed(t_frame, now)) / 2;
++    else
++        dt_frame = timer_elapsed(t_frame, now);
++    t_frame = now;
 +
-+  my $aliasType = $self->{aliasType};
-+  $aliasType = (($aliasType =~ /^d(ir(ectory)?)?$/i && 1) ||
-+                ($aliasType !~ /^f(ile)?$/ && $aliasType) || 0);
++    int w = CGImageGetWidth(image);
++    int h = CGImageGetHeight(image);
++    CGRect crop;
++    if(w >= h)
++        crop = CGRectMake(scanCrop.origin.x * w, scanCrop.origin.y * h,
++                          scanCrop.size.width * w, scanCrop.size.height * h);
++    else
++        crop = CGRectMake(scanCrop.origin.y * w, scanCrop.origin.x * h,
++                          scanCrop.size.height * w, scanCrop.size.width * h);
 +
-+  my $volumeCreated = toFSTime($self->{volumeCreated});
-+  my $volumeFS = $self->{volumeFS};
-+  if(ref($volumeFS) ne 'ARRAY') {
-+    $volumeFS = $FSEncodings{$volumeFS} || ['', ''];
-+  }
++    CGSize size;
++    if(crop.size.width >= crop.size.height &&
++       crop.size.width > maxScanDimension)
++        size = CGSizeMake(maxScanDimension,
++                          crop.size.height * maxScanDimension / crop.size.width);
++    else if(crop.size.height > maxScanDimension)
++        size = CGSizeMake(crop.size.width * maxScanDimension / crop.size.height,
++                          maxScanDimension);
++    else
++        size = crop.size;
 +
-+  my $volumeDisk = $self->{volumeDisk};
-+  if(!defined($volumeDisk)) {
-+    if($volumeFS->[0] eq 'H+') {
-+      $volumeDisk = 'Floppy';
-+    }
-+    elsif($volumeFS->[0]) {
-+      $volumeDisk = 'HD';
-+    }
-+    else {
-+      $volumeDisk = 'Other';
++    if(scale) {
++        size.width *= scale;
++        size.height *= scale;
 +    }
-+  }
-+  $volumeDisk = (exists($DiskEncodings{$volumeDisk})
-+                 ? $DiskEncodings{$volumeDisk}
-+                 : $volumeDisk);
-+
-+  my $fileCreated = toFSTime($self->{fileCreated});
-+
-+  my $buf =
-+    pack('nn (C/a @28)Na2n N(C/a @64)NNa4a4 n!n!Na2 x10 (n!n/ax!2)*',
-+         $self->{aliasVersion}, $aliasType,
-+         $self->{volume}, $volumeCreated, $volumeFS->[0], $volumeDisk,
-+         $self->{directoryID}, $self->{file}, $self->{fileID}, $fileCreated,
-+         $self->{fileType}, $self->{fileCreator}, $self->{nlvlFrom},
-+         $self->{nlvlTo}, $self->{volumeAttrs}, $volumeFS->[1],
-+         map(((exists($RecordEncodings{$_}) ? $RecordEncodings{$_} : $_)
-+              => $self->{records}{$_}),
-+             keys(%{$self->{records}})),
-+         (-1, ''));
-+  $buf = pack('a4n', $self->{aliasCreator}, length($buf) + 6) . $buf;
-+
-+  if(!$out) {
-+    return($buf);
-+  }
-+  elsif(ref($out) eq 'GLOB') {
-+    print $out $buf;
-+  }
-+  else {
-+    open(my $outfh, '>', $out) || die;
-+    print $outfh $buf;
-+  }
-+}
-+
-+1;
-diff --git a/iphone/debug.h b/iphone/debug.h
-new file mode 100644
---- /dev/null
-+++ b/iphone/debug.h
-@@ -0,0 +1,53 @@
-+//------------------------------------------------------------------------
-+//  Copyright 2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+//
-+//  This file is part of the ZBar Bar Code Reader.
-+//
-+//  The ZBar Bar Code Reader is free software; you can redistribute it
-+//  and/or modify it under the terms of the GNU Lesser Public License as
-+//  published by the Free Software Foundation; either version 2.1 of
-+//  the License, or (at your option) any later version.
-+//
-+//  The ZBar Bar Code Reader is distributed in the hope that it will be
-+//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-+//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+//  GNU Lesser Public License for more details.
-+//
-+//  You should have received a copy of the GNU Lesser Public License
-+//  along with the ZBar Bar Code Reader; if not, write to the Free
-+//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-+//  Boston, MA  02110-1301  USA
-+//
-+//  http://sourceforge.net/projects/zbar
-+//------------------------------------------------------------------------
 +
-+#include <mach/mach_time.h>
-+#define xNSSTR(s) @#s
-+#define NSSTR(s) xNSSTR(s)
++    if(self.sourceType != UIImagePickerControllerSourceTypeCamera ||
++       cameraMode == ZBarReaderControllerCameraModeDefault) {
++        // limit the maximum number of scan passes
++        int density;
++        if(size.width > 720)
++            density = (size.width / 240 + 1) / 2;
++        else
++            density = 1;
++        [scanner setSymbology: 0
++                 config: ZBAR_CFG_X_DENSITY
++                 to: density];
 +
-+#ifdef DEBUG_OBJC
-+# ifndef MODULE
-+#  define MODULE ZBarReaderController
-+# endif
-+# define zlog(fmt, ...) \
-+    NSLog(NSSTR(MODULE) @": " fmt , ##__VA_ARGS__)
++        if(size.height > 720)
++            density = (size.height / 240 + 1) / 2;
++        else
++            density = 1;
++        [scanner setSymbology: 0
++                 config: ZBAR_CFG_Y_DENSITY
++                 to: density];
++    }
 +
-+#define timer_start \
-+    uint64_t t_start = timer_now();
++    ZBarImage *zimg = [[ZBarImage alloc]
++                          initWithCGImage: image
++                          crop: crop
++                          size: size];
++    int nsyms = [scanner scanImage: zimg];
++    [zimg release];
 +
-+#else
-+# define zlog(...) while(0)
-+# define timer_start
-+#endif
++    return(nsyms);
++}
 +
-+static inline uint64_t timer_now ()
++- (ZBarSymbol*) extractBestResult: (BOOL) filter
 +{
-+    return(mach_absolute_time());
++    ZBarSymbol *sym = nil;
++    ZBarSymbolSet *results = scanner.results;
++    results.filterSymbols = filter;
++    for(ZBarSymbol *s in results)
++        if(!sym || sym.quality < s.quality)
++            sym = s;
++    return(sym);
 +}
 +
-+static inline double timer_elapsed (uint64_t start, uint64_t end)
++- (void) updateBox: (ZBarSymbol*) sym
++         imageSize: (CGSize) size
 +{
-+    mach_timebase_info_data_t info;
-+    mach_timebase_info(&info);
-+    return((double)(end - start) * info.numer / (info.denom * 1000000000.));
++    [CATransaction begin];
++    [CATransaction setAnimationDuration: .3];
++    [CATransaction setAnimationTimingFunction:
++        [CAMediaTimingFunction functionWithName:
++            kCAMediaTimingFunctionLinear]];
++
++    CGFloat alpha = boxLayer.opacity;
++    if(sym) {
++        CGRect r = sym.bounds;
++        if(r.size.width > 16 && r.size.height > 16) {
++            r.origin.x += scanCrop.origin.y * size.width;
++            r.origin.y += scanCrop.origin.x * size.height;
++            r = CGRectInset(r, -16, -16);
++            if(alpha > .25) {
++                CGRect frame = boxLayer.frame;
++                r.origin.x = (r.origin.x * 3 + frame.origin.x) / 4;
++                r.origin.y = (r.origin.y * 3 + frame.origin.y) / 4;
++                r.size.width = (r.size.width * 3 + frame.size.width) / 4;
++                r.size.height = (r.size.height * 3 + frame.size.height) / 4;
++            }
++            boxLayer.frame = r;
++            boxLayer.opacity = 1;
++        }
++    }
++    else {
++        if(alpha > .1)
++            boxLayer.opacity = alpha / 2;
++        else if(alpha)
++            boxLayer.opacity = 0;
++    }
++    [CATransaction commit];
 +}
-diff --git a/iphone/doc/Documentation.html b/iphone/doc/Documentation.html
-new file mode 100644
---- /dev/null
-+++ b/iphone/doc/Documentation.html
-@@ -0,0 +1,11 @@
-+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-+<html xmlns="http://www.w3.org/1999/xhtml">
-+<head>
-+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-+<meta http-equiv="Refresh" content="0; url=Documentation/index.html"/>
-+</head>
-+<body>
-+<p>redirecting to <a href="Documentation/index.html">Documentation/index.html</a></p>
-+</body>
-+</html>
-diff --git a/iphone/doc/ReaderSample.png b/iphone/doc/ReaderSample.png
-new file mode 100644
-index 0000000000000000000000000000000000000000..a71b5a4af2dbf6a6122b24e085b868d07b5ec8bb
-GIT binary patch
-literal 131381
-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
-
-diff --git a/iphone/doc/ZBarImage.rst b/iphone/doc/ZBarImage.rst
-new file mode 100644
---- /dev/null
-+++ b/iphone/doc/ZBarImage.rst
-@@ -0,0 +1,150 @@
-+ZBarImage Class Reference
-+=========================
 +
-+.. class:: ZBarImage
++#if USE_PRIVATE_APIS
 +
-+   :Inherits from: :class:`NSObject`
++- (void) scanScreen
++{
++    if(!sampling)
++        return;
 +
-+   A :class:`ZBarImage` is a wrapper for images passed to the barcode reader.
-+   It encapsulates raw image data with the format and size metadata necessary
-+   to interpret it.
++    // FIXME ugly hack: use private API to sample screen
++    CGImageRef image = UIGetScreenImage();
 +
-+   An image must be wrapped in a :class:`ZBarImage` in order to be scanned by
-+   the library.  At least the format, size and data must be set.  There are
-+   also initialization methods for automatically extracting the data and
-+   format from a `CGImage`.
++    [self scanImage: image
++          withScaling: 0];
++    CGSize size = CGSizeMake(CGImageGetWidth(image), CGImageGetHeight(image));
++    CGImageRelease(image);
 +
-+   This class is a wrapper around a :type:`zbar_image_t` C object (q.v.)
++    ZBarSymbol *sym = [self extractBestResult: NO];
 +
++    if(sym && !sym.count) {
++        SEL cb = @selector(imagePickerController:didFinishPickingMediaWithInfo:);
++        if(takesPicture) {
++            symbol = [sym retain];
++            [self takePicture];
++        }
++        else if([readerDelegate respondsToSelector: cb]) {
++            symbol = [sym retain];
 +
-+Properties
-+----------
++            [CATransaction begin];
++            [CATransaction setDisableActions: YES];
++            boxLayer.opacity = 0;
++            [CATransaction commit];
 +
-+   .. member:: unsigned long format
++            // capture preview image and send to delegate
++            // after box has been hidden
++            [self performSelector: @selector(captureScreen)
++                  withObject: nil
++                  afterDelay: 0.001];
++            return;
++        }
++    }
 +
-+      The image format four-charcter code (fourcc) as a 4-byte integer.  Use
-+      :ref:`fourcc:` to create a fourcc value from a string.
++    // reschedule
++    [self performSelector: @selector(scanScreen)
++          withObject: nil
++          afterDelay: 0.001];
 +
-+   .. member:: unsigned sequence
++    if(tracksSymbols)
++        [self updateBox: sym
++              imageSize: size];
++}
 +
-+      A "sequence number" associated with the image.  This reference value is
-+      unused by the library.
++- (void) captureScreen
++{
++    CGImageRef screen = UIGetScreenImage();
 +
-+   .. member:: CGSize size
++    CGRect r = CGRectMake(0, 0,
++                          CGImageGetWidth(screen), CGImageGetHeight(screen));
++    if(r.size.width > r.size.height)
++        r.size.width -= 54;
++    else
++        r.size.height -= 54;
++    CGImageRef preview = CGImageCreateWithImageInRect(screen, r);
++    CGImageRelease(screen);
 +
-+      The size of the image in pixels.
++    UIImage *image = [UIImage imageWithCGImage: preview];
++    CGImageRelease(preview);
 +
-+      .. note::
++    [readerDelegate
++        imagePickerController: self
++        didFinishPickingMediaWithInfo:
++            [NSDictionary dictionaryWithObjectsAndKeys:
++                image, UIImagePickerControllerOriginalImage,
++                [NSArray arrayWithObject: symbol],
++                    ZBarReaderControllerResults,
++                nil]];
++    [symbol release];
++    symbol = nil;
 +
-+         There is no separate "bytesPerLine" property, the width must match
-+         the image data (which is not always the logical image width).
++    // continue scanning until dismissed
++    [self performSelector: @selector(scanScreen)
++          withObject: nil
++          afterDelay: 0.001];
++}
 +
-+   .. member:: CGRect crop
++#endif /* USE_PRIVATE_APIS */
 +
-+      Optionally limit the scan region to this rectangle without having to
-+      generate a cropped image.
++- (void) scanSequence: (UIImage*) image
++{
++    if(!sampling) {
++        [image release];
++        return;
++    }
 +
-+   .. member:: const void *data
++    int nsyms = [self scanImage: image.CGImage
++                      withScaling: 0];
 +
-+      Obtain a pointer to the raw image data.  This property is read-only, use
-+      :ref:`setData:withLength:` to set the image data.
++    ZBarSymbol *sym = nil;
++    if(nsyms)
++        [self extractBestResult: NO];
 +
-+   .. member:: unsigned long dataLength
++    SEL cb = @selector(imagePickerController:didFinishPickingMediaWithInfo:);
++    if(sym && !sym.count &&
++       [readerDelegate respondsToSelector: cb])
++        [readerDelegate
++            imagePickerController: self
++            didFinishPickingMediaWithInfo:
++                [NSDictionary dictionaryWithObjectsAndKeys:
++                    image, UIImagePickerControllerOriginalImage,
++                    [NSArray arrayWithObject: sym],
++                        ZBarReaderControllerResults,
++                    nil]];
++    CGSize size = image.size;
++    [image release];
 +
-+      Byte length of the raw image data.  This property is read-only, use 
-+      :ref:`setData:withLength:` to set the image data.
++    // reschedule
++    [self performSelector: @selector(takePicture)
++          withObject: nil
++          afterDelay: 0.001];
 +
-+   .. member:: ZBarSymbolSet *symbols
++    if(tracksSymbols)
++        [self updateBox: sym
++              imageSize: size];
++}
 +
-+      Barcode results from the last scan.
++- (void) showHelpWithReason: (NSString*) reason
++{
++    if(help) {
++        [help.view removeFromSuperview];
++        [help release];
++    }
++    help = [[ZBarHelpController alloc]
++               initWithReason: reason];
++    help.delegate = (id<ZBarHelpDelegate>)self;
 +
-+   .. member:: zbar_image_t *zbarImage
++    if(self.sourceType != UIImagePickerControllerSourceTypeCamera) {
++        [self presentModalViewController: help
++              animated: YES];
++        return;
++    }
 +
-+      Retrieve the underlying C object instance. (read-only)
++    // show help as overlay view to workaround controller bugs
++    sampling = NO;
++    scanner.enableCache = NO;
++    help.wantsFullScreenLayout = YES;
++    help.view.alpha = 0;
 +
-+   .. member:: UIImage *UIImage
++    UIView *activeOverlay = [self cameraOverlayView];
++    help.view.frame = [activeOverlay
++                          convertRect: CGRectMake(0, 0, 320, 480)
++                          fromView: nil];
++    [activeOverlay addSubview: help.view];
++    [UIView beginAnimations: @"ZBarHelp"
++            context: nil];
++    help.view.alpha = 1;
++    [UIView commitAnimations];
++}
 +
-+      Convert the image to a UIImage.  Only certain image formats are
-+      supported for conversion (read-only)
++- (void) info
++{
++    [self showHelpWithReason: @"INFO"];
++}
 +
-+      :See also: :ref:`UIImageWithOrientation:`
++- (void)  imagePickerController: (UIImagePickerController*) picker
++  didFinishPickingMediaWithInfo: (NSDictionary*) info
++{
++    UIImage *img = [info objectForKey: UIImagePickerControllerOriginalImage];
 +
++    id results = nil;
++    if(self.sourceType == UIImagePickerControllerSourceTypeCamera &&
++       cameraMode == ZBarReaderControllerCameraModeSequence) {
++        if(sampling)
++            [self performSelector: @selector(scanSequence:)
++                  withObject: [img retain]
++                  afterDelay: 0.001];
++        return;
++    }
++    else if(!sampling)
++        results = [self scanImage: img.CGImage];
++    else {
++        results = [NSArray arrayWithObject: symbol];
++        [symbol release];
++        symbol = nil;
++    }
 +
-+Class Methods
-+-------------
++    [self performSelector: @selector(reenable)
++         withObject: nil
++         afterDelay: .25];
 +
-+   .. _`fourcc:`:
-+   .. describe:: + (unsigned long) fourcc:(NSString*)format
++    if(results) {
++        NSMutableDictionary *newinfo = [info mutableCopy];
++        [newinfo setObject: results
++                 forKey: ZBarReaderControllerResults];
++        SEL cb = @selector(imagePickerController:didFinishPickingMediaWithInfo:);
++        if([readerDelegate respondsToSelector: cb])
++            [readerDelegate imagePickerController: self
++                            didFinishPickingMediaWithInfo: newinfo];
++        else
++            [self dismissModalViewControllerAnimated: YES];
++        [newinfo release];
++        return;
++    }
 +
-+      Parse the integer four-character code from a string.  Alternatively use
-+      the :func:`zbar_fourcc` macro to create a constant expression.
++    BOOL camera = (self.sourceType == UIImagePickerControllerSourceTypeCamera);
++    BOOL retry = !camera || (hasOverlay && ![self showsCameraControls]);
++    if(showsHelpOnFail && retry)
++        [self showHelpWithReason: @"FAIL"];
 +
-+      :format: A four character string representing an image format.
-+      :Returns: The corresponding 4-byte integer format code.
++    SEL cb = @selector(readerControllerDidFailToRead:withRetry:);
++    if([readerDelegate respondsToSelector: cb])
++        // assume delegate dismisses controller if necessary
++        [readerDelegate readerControllerDidFailToRead: self
++                        withRetry: retry];
++    else if(!retry)
++        // must dismiss stock controller
++        [self dismissModalViewControllerAnimated: YES];
++}
 +
++- (void) imagePickerControllerDidCancel: (UIImagePickerController*) picker
++{
++    SEL cb = @selector(imagePickerControllerDidCancel:);
++    if([readerDelegate respondsToSelector: cb])
++        [readerDelegate imagePickerControllerDidCancel: self];
++    else
++        [self dismissModalViewControllerAnimated: YES];
++}
 +
-+Instance Methods
-+----------------
++// ZBarHelpDelegate
 +
-+   .. _`initWithImage:`:
-+   .. describe:: - (id) initWithImage:(zbar_image_t*)image
++- (void) helpControllerDidFinish: (ZBarHelpController*) hlp
++{
++    if(self.sourceType == UIImagePickerControllerSourceTypeCamera) {
++        [UIView beginAnimations: @"ZBarHelp"
++                context: nil];
++        hlp.view.alpha = 0;
++        [UIView commitAnimations];
++        [self initScanning];
++    }
++    else
++        [hlp dismissModalViewControllerAnimated: YES];
++}
 +
-+      Initialize an image wrapper, given the C object to wrap.
++- (id <NSFastEnumeration>) scanImage: (CGImageRef) image
++{
++    timer_start;
 +
-+      :image: The C object to wrap.
-+      :Returns: The initialized :class:`ZBarImage`.
++    int nsyms = [self scanImage: image
++                      withScaling: 0];
 +
-+   .. _`initWithCGImage:`:
-+   .. describe:: - (id) initWithCGImage:(CGImageRef)image
++    if(!nsyms &&
++       CGImageGetWidth(image) >= 640 &&
++       CGImageGetHeight(image) >= 640)
++        // make one more attempt for close up, grainy images
++        nsyms = [self scanImage: image
++                      withScaling: .5];
 +
-+      Initialize a :class:`ZBarImage` from the data and metadata extracted
-+      from a `CGImage`.  The image is converted to `Y800` (grayscale) format.
++    NSMutableArray *syms = nil;
++    if(nsyms) {
++        // quality/type filtering
++        int max_quality = MIN_QUALITY;
++        for(ZBarSymbol *sym in scanner.results) {
++            zbar_symbol_type_t type = sym.type;
++            int quality;
++            if(type == ZBAR_QRCODE)
++                quality = INT_MAX;
++            else
++                quality = sym.quality;
 +
-+      :image: A `CGImage` to source the data and metadata.
-+      :Returns: The initialized :class:`ZBarImage`.
-+      :See also: :ref:`initWithCGImage:size:`
++            if(quality < max_quality) {
++                zlog(@"    type=%d quality=%d < %d\n",
++                     type, quality, max_quality);
++                continue;
++            }
 +
-+   .. _`initWithCGImage:size:`:
-+   .. describe:: - (id) initWithCGImage:(CGImageRef)image size:(CGSize)size
++            if(max_quality < quality) {
++                max_quality = quality;
++                if(syms)
++                    [syms removeAllObjects];
++            }
++            zlog(@"    type=%d quality=%d\n", type, quality);
++            if(!syms)
++                syms = [NSMutableArray arrayWithCapacity: 1];
 +
-+      Initialize a :class:`ZBarImage` from the data and metadata extracted
-+      from a `CGImage`.  The image is converted to `Y800` (grayscale) format
-+      and scaled to the specified size.
++            [syms addObject: sym];
++        }
++    }
 +
-+      :image: A `CGImage` to source the data and metadata.
-+      :size: The pixel size of the resulting ZBarImage.
-+      :Returns: The initialized :class:`ZBarImage`.
-+      :See also: :ref:`initWithCGImage:crop:size:`
++    zlog(@"read %d filtered symbols in %gs total\n",
++          (!syms) ? 0 : [syms count], timer_elapsed(t_start, timer_now()));
++    return(syms);
++}
 +
-+   .. _`initWithCGImage:crop:size:`:
-+   .. describe:: - (id) initWithCGImage:(CGImageRef)image crop:(CGRect)crop size:(CGSize)size
++@end
+diff -r 563557a923d0 iphone/ZBarReaderView.m
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/ZBarReaderView.m	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,596 @@
++//------------------------------------------------------------------------
++//  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
++//
++//  This file is part of the ZBar Bar Code Reader.
++//
++//  The ZBar Bar Code Reader is free software; you can redistribute it
++//  and/or modify it under the terms of the GNU Lesser Public License as
++//  published by the Free Software Foundation; either version 2.1 of
++//  the License, or (at your option) any later version.
++//
++//  The ZBar Bar Code Reader is distributed in the hope that it will be
++//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
++//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++//  GNU Lesser Public License for more details.
++//
++//  You should have received a copy of the GNU Lesser Public License
++//  along with the ZBar Bar Code Reader; if not, write to the Free
++//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++//  Boston, MA  02110-1301  USA
++//
++//  http://sourceforge.net/projects/zbar
++//------------------------------------------------------------------------
 +
-+      Initialize a :class:`ZBarImage` from the data and metadata extracted
-+      from a `CGImage`.  The image is simultaneously converted to `Y800`
-+      (grayscale) format, cropped and scaled to the specified size.
++#import <ZBarSDK/ZBarReaderView.h>
 +
-+      :image: A `CGImage` to source the data and metadata.
-+      :crop: The region to convert, in image coordinates.
-+      :size: The pixel size of the resulting ZBarImage.
-+      :Returns: The initialized :class:`ZBarImage`.
-+
-+   .. _`setData:withLength:`:
-+   .. describe:: - (void) setData:(const void*)data withLength:(unsigned long)length
++#define MODULE ZBarReaderView
++#import "debug.h"
 +
-+      Specify a pointer to the raw image data, for the image format and size.
-+      The length of the data must also be provided.  Note that the data must
-+      remain valid as long as the image has a reference to it.  Set data to
-+      ``NULL`` to clear a previous reference.
++// silence warning
++@interface ZBarReaderViewImpl : NSObject
++@end
 +
-+      :data: A pointer to a raw image data buffer.
-+      :length: The size of the image data buffer.
++@implementation ZBarReaderView
 +
-+   .. _`UIImageWithOrientation:`:
-+   .. describe:: - (UIImage*) UIImageWithOrientation:(UIImageOrientation)orient
++@synthesize readerDelegate, tracksSymbols, trackingColor, torchMode, showsFPS,
++    zoom, maxZoom, scanCrop, previewTransform, captureReader;
++@dynamic scanner, allowsPinchZoom, enableCache, device, session;
 +
-+      Convert the image to a UIImage with the specified orientation.  Only
-+      certain image formats are supported for conversion.  (currently
-+      ``RGB3``, ``RGB4``, ``RGBQ``)
+++ (id) alloc
++{
++    if(self == [ZBarReaderView class]) {
++        // this is an abstract wrapper for implementation selected
++        // at compile time.  replace with concrete subclass.
++        return((id)[ZBarReaderViewImpl alloc]);
++    }
++    return([super alloc]);
++}
 +
-+      :orient: Desired orientation of the image.
-+      :Returns: A new :class:`UIImage`, or ``nil`` in case of error.
-diff --git a/iphone/doc/ZBarImageScanner.rst b/iphone/doc/ZBarImageScanner.rst
-new file mode 100644
---- /dev/null
-+++ b/iphone/doc/ZBarImageScanner.rst
-@@ -0,0 +1,99 @@
-+ZBarImageScanner Class Reference
-+================================
++- (void) initSubviews
++{
++    assert(preview);
 +
-+.. class:: ZBarImageScanner
++    overlay = [CALayer new];
++    overlay.backgroundColor = [UIColor clearColor].CGColor;
++    [preview addSublayer: overlay];
 +
-+   :Inherits from: :class:`NSObject`
++#ifndef NDEBUG
++    overlay.borderWidth = 2;
++    overlay.borderColor = [UIColor colorWithRed: 1
++                                   green: 0
++                                   blue: 0
++                                   alpha: .5].CGColor;
++    cropLayer = [CALayer new];
++    cropLayer.backgroundColor = [UIColor clearColor].CGColor;
++    cropLayer.borderWidth = 2;
++    cropLayer.borderColor = [UIColor colorWithRed: 0
++                                     green: 0
++                                     blue: 1
++                                     alpha: .5].CGColor;
++    [overlay addSublayer: cropLayer];
++#endif
 +
-+   This is a low-level interface for programmatically scanning images without
-+   a user interface.  If you want to scan images manually selected by the user
-+   (from the photo library or using the camera), you may prefer to use a
-+   :class:`ZBarReaderController` instead.
++    tracking = [CALayer new];
++    tracking.opacity = 0;
++    tracking.borderWidth = 1;
++    tracking.backgroundColor = [UIColor clearColor].CGColor;
++    [overlay addSublayer: tracking];
 +
-+   This class is a wrapper around a :type:`zbar_image_scanner_t` C object
-+   (q.v.)
++    trackingColor = [[UIColor greenColor]
++                        retain];
++    tracking.borderColor = trackingColor.CGColor;
 +
++    fpsView = [UIView new];
++    fpsView.backgroundColor = [UIColor colorWithWhite: 0
++                                       alpha: .333];
++    fpsView.layer.cornerRadius = 12;
++    fpsView.hidden = YES;
++    [self addSubview: fpsView];
 +
-+Properties
-+----------
++    fpsLabel = [[UILabel alloc]
++                   initWithFrame: CGRectMake(0, 0, 80, 32)];
++    fpsLabel.backgroundColor = [UIColor clearColor];
++    fpsLabel.textColor = [UIColor colorWithRed: .333
++                                  green: .666
++                                  blue: 1
++                                  alpha: 1];
++    fpsLabel.font = [UIFont systemFontOfSize: 18];
++    fpsLabel.textAlignment = UITextAlignmentRight;
++    [fpsView addSubview: fpsLabel];
 +
-+   .. member:: BOOL enableCache
++    self.zoom = 1.25;
++}
 +
-+      Enable the inter-frame consistency cache.  Set to ``YES`` for scanning
-+      video or ``NO`` for scanning images.
++- (void) _initWithImageScanner: (ZBarImageScanner*) scanner
++{
++    assert(scanner);
 +
-+   .. member:: ZBarSymbolSet results
++    tracksSymbols = YES;
++    interfaceOrientation = UIInterfaceOrientationPortrait;
++    torchMode = 2; // AVCaptureTorchModeAuto
++    scanCrop = effectiveCrop = CGRectMake(0, 0, 1, 1);
++    imageScale = 1;
++    previewTransform = CGAffineTransformIdentity;
++    maxZoom = 2;
 +
-+      Decoded symbols resulting from the last scan.
++    pinch = [[UIPinchGestureRecognizer alloc]
++                initWithTarget: self
++                action: @selector(handlePinch)];
++    [self addGestureRecognizer: pinch];
++}
 +
++- (id) initWithImageScanner: (ZBarImageScanner*) scanner
++{
++    self = [super initWithFrame: CGRectMake(0, 0, 320, 426)];
++    if(!self)
++        return(nil);
 +
-+Instance Methods
-+----------------
++    self.backgroundColor = [UIColor blackColor];
++    self.contentMode = UIViewContentModeScaleAspectFill;
++    self.clipsToBounds = YES;
++    self.autoresizingMask =
++        UIViewAutoresizingFlexibleWidth |
++        UIViewAutoresizingFlexibleHeight;
 +
-+   .. _`parseConfig:`:
-+   .. describe:: - (void) parseConfig:(NSString*)config
++    [self _initWithImageScanner: scanner];
++    return(self);
++}
 +
-+      Apply scanner/decoder configuration parsed from a string.
++- (id) init
++{
++    ZBarImageScanner *scanner =
++        [[ZBarImageScanner new]
++            autorelease];
++    self = [self initWithImageScanner: scanner];
++    if(!self)
++        return(nil);
 +
-+      :config: A configuration setting of the form: `symbology.config[=value]`.
++    [scanner setSymbology: 0
++             config: ZBAR_CFG_X_DENSITY
++             to: 3];
++    [scanner setSymbology: 0
++             config: ZBAR_CFG_Y_DENSITY
++             to: 3];
++    return(self);
++}
 +
-+   .. _`setSymbology:config:to:`:
-+   .. describe:: - (void) setSymbology:(zbar_symbol_type_t)symbology config:(zbar_config_t)config to:(int)value
++- (id) initWithCoder: (NSCoder*) decoder
++{
++    self = [super initWithCoder: decoder];
++    if(!self)
++        return(nil);
++    ZBarImageScanner *scanner =
++        [[ZBarImageScanner new]
++            autorelease];
++    [self _initWithImageScanner: scanner];
 +
-+      Apply generic scanner/decoder configuration.
++    [scanner setSymbology: 0
++             config: ZBAR_CFG_X_DENSITY
++             to: 3];
++    [scanner setSymbology: 0
++             config: ZBAR_CFG_Y_DENSITY
++             to: 3];
++    return(self);
++}
 +
-+      :symbology: The symbology to effect, or 0 for all.
-+      :config: The configuration setting to adjust.
-+      :value: The value to set for the specific configuration/symbology.
++- (void) dealloc
++{
++    [preview removeFromSuperlayer];
++    [preview release];
++    preview = nil;
++    [overlay release];
++    overlay = nil;
++    [cropLayer release];
++    cropLayer = nil;
++    [tracking release];
++    tracking = nil;
++    [trackingColor release];
++    trackingColor = nil;
++    [fpsLabel release];
++    fpsLabel = nil;
++    [fpsView release];
++    fpsView = nil;
++    [pinch release];
++    pinch = nil;
++    [super dealloc];
++}
 +
-+   .. _`scanImage:`:
-+   .. describe:: - (NSInteger) scanImage:(ZBarImage*)image
++- (void) resetTracking
++{
++    [tracking removeAllAnimations];
++    [CATransaction begin];
++    [CATransaction setDisableActions: YES];
++    CGSize size = overlay.bounds.size;
++    CGRect crop = effectiveCrop;
++    tracking.frame = CGRectMake(crop.origin.x * size.width,
++                                crop.origin.y * size.height,
++                                crop.size.width * size.width,
++                                crop.size.height * size.height);
++    tracking.opacity = 0;
++    [CATransaction commit];
++}
 +
-+      Scan an image for barcodes using the current configuration.  The image
-+      must be in ``Y800`` format (8-bpp graysale).
++- (void) updateCrop
++{
++}
 +
-+      :image: The :class:`ZBarImage` to scan.
-+      :Returns: The number of barcode symbols decoded in the image.
++static inline CGFloat rotationForInterfaceOrientation (int orient)
++{
++    // resolve camera/device image orientation to view/interface orientation
++    switch(orient)
++    {
++    case UIInterfaceOrientationLandscapeLeft:
++        return(M_PI_2);
++    case UIInterfaceOrientationPortraitUpsideDown:
++        return(M_PI);
++    case UIInterfaceOrientationLandscapeRight:
++        return(3 * M_PI_2);
++    case UIInterfaceOrientationPortrait:
++        return(2 * M_PI);
++    }
++    return(0);
++}
 +
++- (void) layoutSubviews
++{
++    CGRect bounds = self.bounds;
++    if(!bounds.size.width || !bounds.size.height)
++        return;
 +
-+Constants
-+---------
++    [CATransaction begin];
++    if(animationDuration) {
++        [CATransaction setAnimationDuration: animationDuration];
++        [CATransaction setAnimationTimingFunction:
++            [CAMediaTimingFunction functionWithName:
++                kCAMediaTimingFunctionEaseInEaseOut]];
++    }
++    else
++        [CATransaction setDisableActions: YES];
 +
-+.. type:: zbar_config_t
++    [super layoutSubviews];
++    fpsView.frame = CGRectMake(bounds.size.width - 80, bounds.size.height - 32,
++                               80 + 12, 32 + 12);
 +
-+   ZBAR_CFG_ENABLE
-+      Control whether specific symbologies will be recognized.  Disabling
-+      unused symbologies improves performance and prevents bad scans.
++    // orient view bounds to match camera image
++    CGSize psize;
++    if(UIInterfaceOrientationIsPortrait(interfaceOrientation))
++        psize = CGSizeMake(bounds.size.height, bounds.size.width);
++    else
++        psize = bounds.size;
++
++    // calculate scale from view coordinates to image coordinates
++    // FIXME assumes AVLayerVideoGravityResizeAspectFill
++    CGFloat scalex = imageSize.width / psize.width;
++    CGFloat scaley = imageSize.height / psize.height;
++    imageScale = (scalex < scaley) ? scalex : scaley;
++    if(!imageScale)
++        imageScale = 1;
++    // apply zoom
++    imageScale /= zoom;
++
++    // scale crop by zoom factor
++    CGFloat z = 1 / zoom;
++    CGFloat t = (1 - z) / 2;
++    CGRect zoomCrop =
++        CGRectMake(scanCrop.origin.x * z + t,
++                   scanCrop.origin.y * z + t,
++                   scanCrop.size.width * z,
++                   scanCrop.size.height * z);
++
++    // convert effective preview area to normalized image coordinates
++    CGRect previewCrop;
++    if(scalex < scaley && imageSize.height)
++        previewCrop.size =
++            CGSizeMake(z, psize.height * imageScale / imageSize.height);
++    else if(imageSize.width)
++        previewCrop.size =
++            CGSizeMake(psize.width * imageScale / imageSize.width, z);
++    else
++        previewCrop.size = CGSizeMake(1, 1);
++    previewCrop.origin = CGPointMake((1 - previewCrop.size.width) / 2,
++                                     (1 - previewCrop.size.height) / 2);
++
++    // clip crop to visible preview area
++    effectiveCrop = CGRectIntersection(zoomCrop, previewCrop);
++    if(CGRectIsNull(effectiveCrop))
++        effectiveCrop = zoomCrop;
++
++    // size preview to match image in view coordinates
++    CGFloat viewScale = 1 / imageScale;
++    if(imageSize.width && imageSize.height)
++        psize = CGSizeMake(imageSize.width * viewScale,
++                           imageSize.height * viewScale);
++
++    preview.bounds = CGRectMake(0, 0, psize.height, psize.width);
++    // center preview in view
++    preview.position = CGPointMake(bounds.size.width / 2,
++                                   bounds.size.height / 2);
++
++    CGFloat angle = rotationForInterfaceOrientation(interfaceOrientation);
++    CATransform3D xform =
++        CATransform3DMakeAffineTransform(previewTransform);
++    preview.transform = CATransform3DRotate(xform, angle, 0, 0, 1);
++
++    // scale overlay to match actual image
++    if(imageSize.width && imageSize.height)
++        overlay.bounds = CGRectMake(0, 0, imageSize.width, imageSize.height);
++    else
++        overlay.bounds = CGRectMake(0, 0, psize.width, psize.height);
++    // center overlay in preview
++    overlay.position = CGPointMake(psize.height / 2, psize.width / 2);
++
++    // image coordinates rotated from preview
++    xform = CATransform3DMakeRotation(M_PI_2, 0, 0, 1);
++    overlay.transform = CATransform3DScale(xform, viewScale, viewScale, 1);
++    tracking.borderWidth = imageScale;
++
++#ifndef NDEBUG
++    preview.backgroundColor = [UIColor yellowColor].CGColor;
++    overlay.borderWidth = 2 * imageScale;
++    cropLayer.borderWidth = 2 * imageScale;
++    cropLayer.frame = CGRectMake(effectiveCrop.origin.x * imageSize.width,
++                                 effectiveCrop.origin.y * imageSize.height,
++                                 effectiveCrop.size.width * imageSize.width,
++                                 effectiveCrop.size.height * imageSize.height);
++    zlog(@"layoutSubviews: bounds=%@ orient=%d image=%@ crop=%@ zoom=%g\n"
++         @"=> preview=%@ crop=(z%@ p%@ %@ i%@) scale=%g %c %g = 1/%g",
++         NSStringFromCGSize(bounds.size), interfaceOrientation,
++         NSStringFromCGSize(imageSize), NSStringFromCGRect(scanCrop), zoom,
++         NSStringFromCGSize(psize), NSStringFromCGRect(zoomCrop),
++         NSStringFromCGRect(previewCrop), NSStringFromCGRect(effectiveCrop),
++         NSStringFromCGRect(cropLayer.frame),
++         scalex, (scalex > scaley) ? '>' : '<', scaley, viewScale);
++#endif
 +
-+   ZBAR_CFG_EMIT_CHECK
-+      Whether to include the check digit in the result data string.  This
-+      value may be set individually for symbologies where it makes sense.
++    [self resetTracking];
++    [self updateCrop];
 +
-+   ZBAR_CFG_MIN_LEN
-+      The minimum data length for a symbol to be valid, set to 0 to disable.
-+      Use with eg, I2/5 to avoid short scans.  This value may be set
-+      individually for variable-length symbologies.
++    [CATransaction commit];
++    animationDuration = 0;
++}
 +
-+   ZBAR_CFG_MAX_LEN
-+      The maximum data length for which a symbol is valid, set to 0 to
-+      disable.  Use with eg, I2/5 to enforce a specific range of data lengths.
-+      This value may be set individually for variable-length symbologies.
++- (void) setImageSize: (CGSize) size
++{
++    zlog(@"imageSize=%@", NSStringFromCGSize(size));
++    imageSize = size;
 +
-+   ZBAR_CFG_UNCERTAINTY
-+      Number of "nearby" frames that must contain a symbol before it will be
-+      considered valid.  This value may be set for individual symbologies.
++    // FIXME bug in AVCaptureVideoPreviewLayer fails to update preview location
++    preview.bounds = CGRectMake(0, 0, size.width, size.height);
 +
-+   ZBAR_CFG_POSITION
-+      Whether to track position information.  
++    [self setNeedsLayout];
++}
 +
-+   ZBAR_CFG_X_DENSITY
-+      The stride to use for scanning vertical columns of the image.  This many
-+      pixel columns will be skipped between vertical scan passes.  Useful for
-+      trading off between resolution and performance.  This is a scanner
-+      setting (use 0 for the symbology).
++- (void) willRotateToInterfaceOrientation: (UIInterfaceOrientation) orient
++                                 duration: (NSTimeInterval) duration
++{
++    if(interfaceOrientation != orient) {
++        zlog(@"orient=%d #%g", orient, duration);
++        interfaceOrientation = orient;
++        animationDuration = duration;
++    }
++}
 +
-+   ZBAR_CFG_Y_DENSITY
-+      The stride to use for scanning horizontal columns of the image.  This
-+      many pixel rows will be skipped between horizontal scan passes.  Useful
-+      for trading off between resolution and performance.  This is a scanner
-+      setting (use 0 for the symbology).
-diff --git a/iphone/doc/ZBarReaderController.rst b/iphone/doc/ZBarReaderController.rst
-new file mode 100644
---- /dev/null
-+++ b/iphone/doc/ZBarReaderController.rst
-@@ -0,0 +1,156 @@
-+ZBarReaderController Class Reference
-+====================================
++- (void) setScanCrop: (CGRect) r
++{
++    if(CGRectEqualToRect(scanCrop, r))
++        return;
++    scanCrop = r;
++    [self setNeedsLayout];
++}
 +
-+.. class:: ZBarReaderController
++- (void) setTracksSymbols: (BOOL) track
++{
++    if(track == tracksSymbols)
++        return;
++    tracksSymbols = track;
++    [self resetTracking];
++}
 +
-+   :Inherits from: :class:`UIImagePickerController`
-+
-+   This is the controller to use for scanning images selected by a
-+   :class:`UIImagePickerController` either captured manually using the camera,
-+   or selected from the Photo Library.  For more information, see
-+   :doc:`picker`.
++- (BOOL) allowsPinchZoom
++{
++    return(pinch.enabled);
++}
 +
-+   It can support automatic capture from the camera only if the library is
-+   re-built to use private APIs (see :doc:`compat`).
++- (void) setAllowsPinchZoom: (BOOL) enabled
++{
++    pinch.enabled = enabled;
++}
 +
++- (void) setTrackingColor: (UIColor*) color
++{
++    if(!color)
++        return;
++    [color retain];
++    [trackingColor release];
++    trackingColor = color;
++    tracking.borderColor = color.CGColor;
++}
 +
-+Properties
-+----------
++- (void) setShowsFPS: (BOOL) show
++{
++    if(show == showsFPS)
++        return;
++    fpsView.hidden = !show;
++}
 +
-+   .. member:: ZBarImageScanner *scanner
++- (void) setZoom: (CGFloat) z
++{
++    if(z < 1.0)
++        z = 1.0;
++    if(z > maxZoom)
++        z = maxZoom;
++    if(z == zoom)
++        return;
++    zoom = z;
 +
-+      Access to the image scanner for configuration. (read-only)
++    [self setNeedsLayout];
++}
 +
-+   .. member:: id<ZBarReaderDelegate> readerDelegate
++- (void) setZoom: (CGFloat) z
++        animated: (BOOL) animated
++{
++    [CATransaction begin];
++    if(animated) {
++        [CATransaction setAnimationDuration: .1];
++        [CATransaction setAnimationTimingFunction:
++            [CAMediaTimingFunction functionWithName:
++                kCAMediaTimingFunctionLinear]];
++    }
++    else
++        [CATransaction setDisableActions: YES];
++    // FIXME animate from current value
++    self.zoom = z;
++    [self layoutIfNeeded];
++    [CATransaction commit];
++}
 +
-+      The delegate that will be notified when new barcode results are
-+      available.
++- (void) setPreviewTransform: (CGAffineTransform) xfrm
++{
++    previewTransform = xfrm;
++    [self setNeedsLayout];
++}
 +
-+   .. member:: BOOL showsZBarControls
++- (void) start
++{
++    if(started)
++        return;
++    started = YES;
 +
-+      Whether to display a default control set consisting of cancel, scan and
-+      info buttons.  Disable these if you provide your own controls using the
-+      :member:`cameraOverlayView`.  Enabling this automatically disables the
-+      system controls :member:`showsCameraControls`.  (Default ``YES``).
++    [self resetTracking];
++    fpsLabel.text = @"--- fps ";
 +
-+   .. member:: BOOL showsHelpOnFail
++    [[UIDevice currentDevice]
++        beginGeneratingDeviceOrientationNotifications];
++}
 +
-+      Whether to automatically display the integrated help viewer when an
-+      image fails to decode.  Even if this is disabled, the integrated help
-+      may still be presented manually using ``showHelpWithReason:``.
-+      (Default ``YES``)
++- (void) stop
++{
++    if(!started)
++        return;
++    started = NO;
 +
-+   .. member:: ZBarReaderControllerCameraMode cameraMode
++    [[UIDevice currentDevice]
++        endGeneratingDeviceOrientationNotifications];
++}
 +
-+      Scanning mode to use with the camera.  It is generally appropriate to
-+      leave this at the default.
++- (void) flushCache
++{
++}
 +
-+   .. member:: BOOL tracksSymbols
++// UIGestureRecognizer callback
 +
-+      Whether to display the tracking rectangle around detected barcodes.
++- (void) handlePinch
++{
++    if(pinch.state == UIGestureRecognizerStateBegan)
++        zoom0 = zoom;
++    CGFloat z = zoom0 * pinch.scale;
++    [self setZoom: z
++          animated: YES];
 +
-+   .. member:: BOOL takesPicture
++    if((zoom < 1.5) != (z < 1.5)) {
++        int d = (z < 1.5) ? 3 : 2;
++        ZBarImageScanner *scanner = self.scanner;
++        @synchronized(scanner) {
++            [scanner setSymbology: 0
++                     config: ZBAR_CFG_X_DENSITY
++                     to: d];
++            [scanner setSymbology: 0
++                     config: ZBAR_CFG_Y_DENSITY
++                     to: d];
++        }
++    }
++}
 +
-+      Whether to take a full picture (with ``takePicture``) when a barcode
-+      is detected with ``ZBarReaderControllerCameraModeSampling``.  The
-+      resulting image will be delayed from the actual decode.
++- (void) updateTracking: (CALayer*) trk
++             withSymbol: (ZBarSymbol*) sym
++{
++    if(!sym)
++        return;
 +
-+   .. member:: BOOL enableCache
++    CGRect r = sym.bounds;
++    if(r.size.width <= 32 && r.size.height <= 32)
++        return;
++    r = CGRectInset(r, -24, -24);
 +
-+      This property is deprecated and should not be modified.
++    CALayer *current = trk.presentationLayer;
++    CGPoint cp = current.position;
++    CGPoint p = CGPointMake(CGRectGetMidX(r), CGRectGetMidY(r));
++    p = CGPointMake((p.x * 3 + cp.x) / 4, (p.y * 3 + cp.y) / 4);
 +
-+   .. member:: CGRect scanCrop
++    CGRect cr = current.bounds;
++    r.origin = cr.origin;
++    r.size.width = (r.size.width * 3 + cr.size.width) / 4;
++    r.size.height = (r.size.height * 3 + cr.size.height) / 4;
 +
-+      Crop images before scanning.  The original image will be cropped to this
-+      rectangle, which should be in normalized image coordinates, x-axis
-+      major.  Defaults to the full image ``{{0, 0}, {1, 1}}``.
++    CAMediaTimingFunction *linear =
++        [CAMediaTimingFunction functionWithName: kCAMediaTimingFunctionLinear];
 +
-+   .. member:: NSInteger maxScanDimension
++    CABasicAnimation *resize =
++        [CABasicAnimation animationWithKeyPath: @"bounds"];
++    resize.fromValue = [NSValue valueWithCGRect: cr];
++    resize.toValue = [NSValue valueWithCGRect: r];
++    resize.duration = .2;
++    resize.timingFunction = linear;
++    resize.fillMode = kCAFillModeForwards;
++    resize.removedOnCompletion = NO;
 +
-+      Scale image to scan.  After cropping, the image will be scaled if
-+      necessary, such that neither of its dimensions exceed this value.
-+      Defaults to 640.
++    CABasicAnimation *move =
++        [CABasicAnimation animationWithKeyPath: @"position"];
++    move.fromValue = [NSValue valueWithCGPoint: cp];
++    move.toValue = [NSValue valueWithCGPoint: p];
++    move.duration = .2;
++    move.timingFunction = linear;
++    move.fillMode = kCAFillModeForwards;
++    move.removedOnCompletion = NO;
 +
-+   .. note::
++    CABasicAnimation *on =
++        [CABasicAnimation animationWithKeyPath: @"opacity"];
++    on.fromValue = [NSNumber numberWithDouble: current.opacity];
++    on.toValue = [NSNumber numberWithDouble: 1];
++    on.duration = .2;
++    on.timingFunction = linear;
++    on.fillMode = kCAFillModeForwards;
++    on.removedOnCompletion = NO;
 +
-+      The remaining properties are inherited from
-+      :class:`UIImagePickerController`.
++    CABasicAnimation *off = nil;
++    if(!TARGET_IPHONE_SIMULATOR) {
++        off = [CABasicAnimation animationWithKeyPath: @"opacity"];
++        off.fromValue = [NSNumber numberWithDouble: 1];
++        off.toValue = [NSNumber numberWithDouble: 0];
++        off.beginTime = .5;
++        off.duration = .5;
++        off.timingFunction = linear;
++    }
 +
-+   .. member:: UIImagePickerControllerSourceType sourceType
++    CAAnimationGroup *group = [CAAnimationGroup animation];
++    group.animations = [NSArray arrayWithObjects: resize, move, on, off, nil];
++    group.duration = 1;
++    group.fillMode = kCAFillModeForwards;
++    group.removedOnCompletion = !TARGET_IPHONE_SIMULATOR;
++    [trk addAnimation: group
++         forKey: @"tracking"];
++}
 +
-+      Image source.  Use to select between the camera and photo library.
++- (void) didTrackSymbols: (ZBarSymbolSet*) syms
++{
++    if(!tracksSymbols)
++        return;
 +
-+   .. member:: BOOL showsCameraControls
++    int n = syms.count;
++    assert(n);
++    if(!n)
++        return;
 +
-+      Whether to display the system camera controls.  Overridden to ``NO``
-+      when :member:`showsZBarControls` is ``YES``.
++    ZBarSymbol *sym = nil;
++    for(ZBarSymbol *s in syms)
++        if(!sym || s.type == ZBAR_QRCODE || s.quality > sym.quality)
++            sym = s;
++    assert(sym);
++    if(!sym)
++        return;
 +
-+   .. member:: UIView *cameraOverlayView
++    [self updateTracking: tracking
++          withSymbol: sym];
++}
 +
-+      A custom view to display over the camera preview.  The tracking layer
-+      and default controls will be added to this view if they are enabled.
++@end
+diff -r 563557a923d0 iphone/ZBarReaderViewController.m
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/ZBarReaderViewController.m	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,699 @@
++//------------------------------------------------------------------------
++//  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
++//
++//  This file is part of the ZBar Bar Code Reader.
++//
++//  The ZBar Bar Code Reader is free software; you can redistribute it
++//  and/or modify it under the terms of the GNU Lesser Public License as
++//  published by the Free Software Foundation; either version 2.1 of
++//  the License, or (at your option) any later version.
++//
++//  The ZBar Bar Code Reader is distributed in the hope that it will be
++//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
++//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++//  GNU Lesser Public License for more details.
++//
++//  You should have received a copy of the GNU Lesser Public License
++//  along with the ZBar Bar Code Reader; if not, write to the Free
++//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++//  Boston, MA  02110-1301  USA
++//
++//  http://sourceforge.net/projects/zbar
++//------------------------------------------------------------------------
 +
-+   .. member:: CGAffineTransform cameraViewTransform
++#import <ZBarSDK/ZBarReaderViewController.h>
++#import <ZBarSDK/ZBarReaderView.h>
++#import <ZBarSDK/ZBarCaptureReader.h>
++#import <ZBarSDK/ZBarHelpController.h>
++#import <ZBarSDK/ZBarCameraSimulator.h>
 +
-+      A transform to apply to the camera preview.  Ignored by the reader.
-+      Possibly useful for eg, a digital zoom effect.
++#define MODULE ZBarReaderViewController
++#import "debug.h"
 +
-+   .. member:: BOOL allowsEditing
++static inline AVCaptureDevicePosition
++AVPositionForUICamera (UIImagePickerControllerCameraDevice camera)
++{
++    switch(camera) {
++    case UIImagePickerControllerCameraDeviceRear:
++        return(AVCaptureDevicePositionBack);
++    case UIImagePickerControllerCameraDeviceFront:
++        return(AVCaptureDevicePositionFront);
++    }
++    return(-1);
++}
 +
-+      Whether to enable the system image editing dialog after a picture is
-+      taken.  Possibly useful to improve reader results in some cases using
-+      manual intervention.
++static inline UIImagePickerControllerCameraDevice
++UICameraForAVPosition (AVCaptureDevicePosition position)
++{
++    switch(position)
++    {
++    case AVCaptureDevicePositionBack:
++        return(UIImagePickerControllerCameraDeviceRear);
++    case AVCaptureDevicePositionFront:
++        return(UIImagePickerControllerCameraDeviceFront);
++    }
++    return(-1);
++}
 +
++static inline AVCaptureDevice*
++AVDeviceForUICamera (UIImagePickerControllerCameraDevice camera)
++{
++    AVCaptureDevicePosition position = AVPositionForUICamera(camera);
++    if(position < 0)
++        return(nil);
 +
-+Instance Methods
-+----------------
++#if !TARGET_IPHONE_SIMULATOR
++    NSArray *allDevices =
++        [AVCaptureDevice devicesWithMediaType: AVMediaTypeVideo];
++    for(AVCaptureDevice *device in allDevices)
++        // FIXME how to quantify "best" of several (theoretical) possibilities
++        if(device.position == position)
++            return(device);
++#endif
++    return(nil);
++}
 +
-+   .. _`showHelpWithReason:`:
-+   .. describe:: - (void) showHelpWithReason:(NSString*)reason
++static inline AVCaptureTorchMode
++AVTorchModeForUIFlashMode (UIImagePickerControllerCameraFlashMode mode)
++{
++    switch(mode)
++    {
++    case UIImagePickerControllerCameraFlashModeAuto:
++        return(AVCaptureTorchModeAuto);
++    case UIImagePickerControllerCameraFlashModeOn:
++        return(AVCaptureTorchModeOn);
++    case UIImagePickerControllerCameraFlashModeOff:
++        break;
++    }
++    return(AVCaptureTorchModeOff);
++}
 +
-+      Display the integrated help browser.  Use this with custom overlays if
-+      you don't also want to create your own help view.  Should only be called
-+      when the reader is displayed.  The ``reason`` argument will be passed to
-+      the :func:`onZBarHelp` javascript function.
++static inline NSString*
++AVSessionPresetForUIVideoQuality (UIImagePickerControllerQualityType quality)
++{
++#if !TARGET_IPHONE_SIMULATOR
++    switch(quality)
++    {
++    case UIImagePickerControllerQualityTypeHigh:
++        return(AVCaptureSessionPresetHigh);
++    case UIImagePickerControllerQualityType640x480:
++        return(AVCaptureSessionPreset640x480);
++    case UIImagePickerControllerQualityTypeMedium:
++        return(AVCaptureSessionPresetMedium);
++    case UIImagePickerControllerQualityTypeLow:
++        return(AVCaptureSessionPresetLow);
++    case UIImagePickerControllerQualityTypeIFrame1280x720:
++        return(AVCaptureSessionPresetiFrame1280x720);
++    case UIImagePickerControllerQualityTypeIFrame960x540:
++        return(AVCaptureSessionPresetiFrame960x540);
++    }
++#endif
++    return(nil);
++}
 +
-+      :reason: A string parameter passed to javascript.
 +
-+   .. _`scanImage:`:
-+   .. describe:: - (id <NSFastEnumeration>) scanImage:(CGImageRef)image
++@implementation ZBarReaderViewController
 +
-+      Scan an image for barcodes.  This is a wrapper around
-+      ``scanner.scanImage`` that applies scanCrop and maxScanDimension.  Some
-+      additional result filtering is also performed.
++@synthesize scanner, readerDelegate, showsZBarControls,
++    supportedOrientationsMask, tracksSymbols, enableCache, cameraOverlayView,
++    cameraViewTransform, cameraDevice, cameraFlashMode, videoQuality,
++    readerView, scanCrop;
++@dynamic sourceType, allowsEditing, allowsImageEditing, showsCameraControls,
++    showsHelpOnFail, cameraMode, takesPicture, maxScanDimension;
 +
-+      :image: A :class:`CGImage` to scan.
-+      :Returns: The result set containing :class:`ZBarSymbol` objects.
+++ (BOOL) isSourceTypeAvailable: (UIImagePickerControllerSourceType) sourceType
++{
++    if(sourceType != UIImagePickerControllerSourceTypeCamera)
++        return(NO);
++    return(TARGET_IPHONE_SIMULATOR ||
++           [UIImagePickerController isSourceTypeAvailable: sourceType]);
++}
 +
+++ (BOOL) isCameraDeviceAvailable: (UIImagePickerControllerCameraDevice) camera
++{
++    return(TARGET_IPHONE_SIMULATOR ||
++           [UIImagePickerController isCameraDeviceAvailable: camera]);
++}
 +
-+Constants
-+---------
+++ (BOOL) isFlashAvailableForCameraDevice: (UIImagePickerControllerCameraDevice) camera
++{
++    return(TARGET_IPHONE_SIMULATOR ||
++           [UIImagePickerController isFlashAvailableForCameraDevice: camera]);
++}
 +
-+.. type:: ZBarReaderControllerCameraMode
+++ (NSArray*) availableCaptureModesForCameraDevice: (UIImagePickerControllerCameraDevice) camera
++{
++    if(![self isCameraDeviceAvailable: camera])
++        return([NSArray array]);
 +
-+   The scanning mode to use with the camera.
++    // current reader only supports automatic detection
++    return([NSArray arrayWithObject:
++               [NSNumber numberWithInteger:
++                   UIImagePickerControllerCameraCaptureModeVideo]]);
++}
 +
-+   ZBarReaderControllerCameraModeDefault
-+      The standard mode provided by UIImagePickerController - the user
-+      manually captures an image by tapping a control.  This is the default
-+      unless private APIs are enabled.
++- (void) _init
++{
++    supportedOrientationsMask =
++        ZBarOrientationMask(UIInterfaceOrientationPortrait);
++    showsZBarControls = tracksSymbols = enableCache = YES;
++    scanCrop = CGRectMake(0, 0, 1, 1);
++    cameraViewTransform = CGAffineTransformIdentity;
 +
-+   ZBarReaderControllerCameraModeSampling
-+      Automatically capture by taking screenshots with
-+      :func:`UIGetScreenImage`.  Resolution is limited to the screen
-+      resolution, so this mode is inappropriate for longer codes.  Only
-+      available when private APIs are enabled, and becomes the default mode in
-+      that case.
++    cameraFlashMode = UIImagePickerControllerCameraFlashModeAuto;
++    videoQuality = UIImagePickerControllerQualityType640x480;
++    AVCaptureDevice *device = nil;
++#if !TARGET_IPHONE_SIMULATOR
++    device = [AVCaptureDevice defaultDeviceWithMediaType: AVMediaTypeVideo];
++#endif
++    if(device)
++        cameraDevice = UICameraForAVPosition(device.position);
++    else
++        cameraDevice = UIImagePickerControllerCameraDeviceRear;
 +
-+   ZBarReaderControllerCameraModeSequence
-+      Experimental mode that automatically scans by "rapidly" scanning
-+      pictures captured with ``takePicture``.  Not recommended for serious
-+      use.
++    // create our own scanner to store configuration,
++    // independent of whether view is loaded
++    scanner = [ZBarImageScanner new];
++    [scanner setSymbology: 0
++             config: ZBAR_CFG_X_DENSITY
++             to: 3];
++    [scanner setSymbology: 0
++             config: ZBAR_CFG_Y_DENSITY
++             to: 3];
++}
 +
-+.. c:var:: NSString *ZBarReaderControllerResults
++- (id) init
++{
++    if(!TARGET_IPHONE_SIMULATOR &&
++       !NSClassFromString(@"AVCaptureSession")) {
++        // fallback to old interface
++        zlog(@"Falling back to ZBarReaderController");
++        [self release];
++        return((id)[ZBarReaderController new]);
++    }
 +
-+   The info dictionary key used to return decode results to
-+   ``imagePickerController:didFinishPickingMediaWithInfo:``
-diff --git a/iphone/doc/ZBarReaderDelegate.rst b/iphone/doc/ZBarReaderDelegate.rst
-new file mode 100644
---- /dev/null
-+++ b/iphone/doc/ZBarReaderDelegate.rst
-@@ -0,0 +1,70 @@
-+ZBarReaderDelegate Protocol Reference
-+=====================================
++    self = [super init];
++    if(!self)
++        return(nil);
 +
-+.. class:: ZBarReaderDelegate
++    self.wantsFullScreenLayout = YES;
++    [self _init];
++    return(self);
++}
 +
-+   :Inherits from: :class:`UIImagePickerControllerDelegate`
++- (id) initWithCoder: (NSCoder*) decoder
++{
++    self = [super initWithCoder: decoder];
++    if(!self)
++        return(nil);
 +
-+   This protocol must be implemented by the
-+   :member:`~ZBarReaderViewController::readerDelegate` provided to a
-+   :class:`ZBarReaderViewController` or :class:`ZBarReaderController`.  It is
-+   used to notify the delegate of new decode results, when an image fails to
-+   decode, or when the user dismisses the reader with the built-in controls.
++    [self _init];
++    return(self);
++}
 +
++- (void) cleanup
++{
++    [cameraOverlayView removeFromSuperview];
++    cameraSim.readerView = nil;
++    [cameraSim release];
++    cameraSim = nil;
++    readerView.readerDelegate = nil;
++    [readerView release];
++    readerView = nil;
++    [controls release];
++    controls = nil;
++    [shutter release];
++    shutter = nil;
++}
 +
-+Instance Methods
-+----------------
++- (void) dealloc
++{
++    [self cleanup];
++    [cameraOverlayView release];
++    cameraOverlayView = nil;
++    [scanner release];
++    scanner = nil;
++    [super dealloc];
++}
 +
-+   .. describe:: - (void) imagePickerController:(UIImagePickerController*)picker didFinishPickingMediaWithInfo:(NSDictionary*)info
++- (void) initControls
++{
++    if(!showsZBarControls && controls) {
++        [controls removeFromSuperview];
++        [controls release];
++        controls = nil;
++    }
++    if(!showsZBarControls)
++        return;
 +
-+      This inherited delegate method is called when a barcode is successfully
-+      decoded.  The decoded symbols are available from the dictionary as a
-+      :class:`ZBarSymbolSet` using the :c:data:`ZBarReaderControllerResults`
-+      key.  The image from which the barcodes were scanned is available using
-+      the :c:data:`UIImagePickerControllerOriginalImage` key.  No other keys
-+      are guaranteed to be valid.
++    UIView *view = self.view;
++    if(controls) {
++        assert(controls.superview == view);
++        [view bringSubviewToFront: controls];
++        return;
++    }
 +
-+      .. note::
++    CGRect r = view.bounds;
++    r.origin.y = r.size.height - 54;
++    r.size.height = 54;
++    controls = [[UIView alloc]
++                   initWithFrame: r];
++    controls.autoresizingMask =
++        UIViewAutoresizingFlexibleWidth |
++        UIViewAutoresizingFlexibleHeight |
++        UIViewAutoresizingFlexibleTopMargin;
++    controls.backgroundColor = [UIColor blackColor];
 +
-+         The ``picker`` parameter will be the reader controller instance that
-+         read the barcodes - not necessarily a
-+         :class:`UIImagePickerController` instance.  You should cast it to the
-+         correct type for anything other than basic view controller access.
++    UIToolbar *toolbar =
++        [UIToolbar new];
++    r.origin.y = 0;
++    toolbar.frame = r;
++    toolbar.barStyle = UIBarStyleBlackOpaque;
++    toolbar.autoresizingMask =
++        UIViewAutoresizingFlexibleWidth |
++        UIViewAutoresizingFlexibleHeight;
 +
-+      :picker: The reader controller that scanned the barcode(s).
-+      :info: A dictionary containing the image and decode results.
++    UIButton *info =
++        [UIButton buttonWithType: UIButtonTypeInfoLight];
++    [info addTarget: self
++          action: @selector(info)
++          forControlEvents: UIControlEventTouchUpInside];
 +
-+   .. describe:: - (void) imagePickerControllerDidCancel:(UIImagePickerController*)picker
++    toolbar.items =
++        [NSArray arrayWithObjects:
++            [[[UIBarButtonItem alloc]
++                 initWithBarButtonSystemItem: UIBarButtonSystemItemCancel
++                 target: self
++                 action: @selector(cancel)]
++                autorelease],
++            [[[UIBarButtonItem alloc]
++                 initWithBarButtonSystemItem: UIBarButtonSystemItemFlexibleSpace
++                 target: nil
++                 action: nil]
++                autorelease],
++            [[[UIBarButtonItem alloc]
++                 initWithCustomView: info]
++                autorelease],
++            nil];
++    [controls addSubview: toolbar];
++    [toolbar release];
 +
-+      Called when the user taps the "Cancel" button provided by the built-in
-+      controls (when :member:`showsZBarControls`\ ``=YES``).  The default
-+      implementation dismisses the reader.  If this method is implemented, it
-+      should do the same.
++    [view addSubview: controls];
++}
 +
-+      .. note::
++- (void) initVideoQuality
++{
++    if(!readerView) {
++        assert(0);
++        return;
++    }
 +
-+         The ``picker`` parameter will be the reader controller instance that
-+         read the barcodes - not necessarily a
-+         :class:`UIImagePickerController` instance.  You should cast it to the
-+         correct type for anything other than basic view controller access.
++    AVCaptureSession *session = readerView.session;
++    NSString *preset = AVSessionPresetForUIVideoQuality(videoQuality);
++    if(session && preset && [session canSetSessionPreset: preset]) {
++        zlog(@"set session preset=%@", preset);
++        session.sessionPreset = preset;
++    }
++    else
++        zlog(@"unable to set session preset=%@", preset);
++}
 +
-+      :picker: The reader controller that scanned the barcode(s).
++- (void) loadView
++{
++    self.view = [[UIView alloc]
++                    initWithFrame: CGRectMake(0, 0, 320, 480)];
++}
 +
-+   .. describe:: - (void) readerControllerDidFailToRead:(ZBarReaderController*)reader withRetry:(BOOL)retry
++- (void) viewDidLoad
++{
++    [super viewDidLoad];
++    UIView *view = self.view;
++    view.backgroundColor = [UIColor blackColor];
++    view.autoresizingMask =
++        UIViewAutoresizingFlexibleWidth |
++        UIViewAutoresizingFlexibleHeight;
 +
-+      Called when an image, manually captured or selected from the photo
-+      library, is scanned and no barcodes were detected.
++    readerView = [[ZBarReaderView alloc]
++                     initWithImageScanner: scanner];
++    CGRect bounds = view.bounds;
++    CGRect r = bounds;
++    NSUInteger autoresize =
++        UIViewAutoresizingFlexibleWidth |
++        UIViewAutoresizingFlexibleHeight;
 +
-+      If the ``retry`` parameter is ``NO``, the controller must be dismissed
-+      before this method returns.  Otherwise, another scan may be attempted
-+      without re-presenting the controller.
++    if(showsZBarControls ||
++       self.parentViewController.modalViewController == self)
++    {
++        autoresize |= UIViewAutoresizingFlexibleBottomMargin;
++        r.size.height -= 54;
++    }
++    readerView.frame = r;
++    readerView.autoresizingMask = autoresize;
++    AVCaptureDevice *device = AVDeviceForUICamera(cameraDevice);
++    if(device && device != readerView.device)
++        readerView.device = device;
++    readerView.torchMode = AVTorchModeForUIFlashMode(cameraFlashMode);
++    [self initVideoQuality];
 +
-+      If the :member:`~ZBarReaderController::showsHelpOnFail` is ``YES`` *and*
-+      ``retry`` is ``YES``, the integrated help viewer will already be
-+      presenting.
++    readerView.readerDelegate = (id<ZBarReaderViewDelegate>)self;
++    readerView.scanCrop = scanCrop;
++    readerView.previewTransform = cameraViewTransform;
++    readerView.tracksSymbols = tracksSymbols;
++    readerView.enableCache = enableCache;
++    [view addSubview: readerView];
 +
-+      If this method is not implemented, the controller will be dismissed iff
-+      ``retry`` is ``NO``.
++    shutter = [[UIView alloc]
++                  initWithFrame: r];
++    shutter.backgroundColor = [UIColor blackColor];
++    shutter.opaque = NO;
++    shutter.autoresizingMask =
++        UIViewAutoresizingFlexibleWidth |
++        UIViewAutoresizingFlexibleHeight;
++    [view addSubview: shutter];
 +
-+      :reader: The :class:`ZBarReaderController` that scanned the barcode(s).
-+      :retry: Whether another scan may be attempted.
-diff --git a/iphone/doc/ZBarReaderView.rst b/iphone/doc/ZBarReaderView.rst
-new file mode 100644
---- /dev/null
-+++ b/iphone/doc/ZBarReaderView.rst
-@@ -0,0 +1,104 @@
-+ZBarReaderView Class Reference
-+==============================
-+
-+.. class:: ZBarReaderView
++    if(cameraOverlayView) {
++        assert(!cameraOverlayView.superview);
++        [cameraOverlayView removeFromSuperview];
++        [view addSubview: cameraOverlayView];
++    }
 +
-+   :Inherits from: :class:`UIView`
++    [self initControls];
 +
-+   This is a barcode reader encapsulted in a UIView.  It manages an
-+   :class:`AVCaptureSession` with a camera device and a
-+   :class:`ZBarCaptureReader`, presents the video preview and optionally
-+   tracks detected barcode symbols.  A delegate will usually be assigned for
-+   notification of new decode results.
++    if(TARGET_IPHONE_SIMULATOR) {
++        cameraSim = [[ZBarCameraSimulator alloc]
++                        initWithViewController: self];
++        cameraSim.readerView = readerView;
++    }
++}
 +
++- (void) viewDidUnload
++{
++    [cameraOverlayView removeFromSuperview];
++    [self cleanup];
++    [super viewDidUnload];
++}
 +
-+Properties
-+----------
++- (void) viewWillAppear: (BOOL) animated
++{
++    zlog(@"willAppear: anim=%d orient=%d",
++         animated, self.interfaceOrientation);
++    [self initControls];
++    [super viewWillAppear: animated];
 +
-+   .. member:: id<ZBarReaderViewDelegate> readerDelegate
++    [readerView willRotateToInterfaceOrientation: self.interfaceOrientation
++                duration: 0];
++    [readerView performSelector: @selector(start)
++                withObject: nil
++                afterDelay: .001];
++    shutter.alpha = 1;
++    shutter.hidden = NO;
 +
-+      The delegate that will be notified of new decode results.
++    UIApplication *app = [UIApplication sharedApplication];
++    BOOL willHideStatusBar =
++        !didHideStatusBar && self.wantsFullScreenLayout && !app.statusBarHidden;
++    if(willHideStatusBar)
++        [app setStatusBarHidden: YES
++             withAnimation: UIStatusBarAnimationFade];
++    didHideStatusBar = didHideStatusBar || willHideStatusBar;
++}
 +
-+   .. member:: ZBarImageScanner *scanner
++- (void) dismissModalViewControllerAnimated: (BOOL) animated
++{
++    if(didHideStatusBar) {
++        [[UIApplication sharedApplication]
++            setStatusBarHidden: NO
++            withAnimation: UIStatusBarAnimationFade];
++        didHideStatusBar = NO;
++    }
++    [super dismissModalViewControllerAnimated: animated];
++}
 +
-+      Access to the image scanner is provided for configuration. (read-only)
++- (void) viewWillDisappear: (BOOL) animated
++{
++    readerView.captureReader.enableReader = NO;
 +
-+   .. member:: BOOL tracksSymbols
++    if(didHideStatusBar) {
++        [[UIApplication sharedApplication]
++            setStatusBarHidden: NO
++            withAnimation: UIStatusBarAnimationFade];
++        didHideStatusBar = NO;
++    }
 +
-+      Whether to display the tracking annotation (default ``YES``).
++    [super viewWillDisappear: animated];
++}
 +
-+   .. member:: BOOL allowsPinchZoom
++- (void) viewDidDisappear: (BOOL) animated
++{
++    // stopRunning can take a really long time (>1s observed),
++    // so defer until the view transitions are complete
++    [readerView stop];
++}
 +
-+      Enable pinch gesture recognition for manually zooming the preview/decode
-+      (default ``YES``).
++- (BOOL) shouldAutorotateToInterfaceOrientation: (UIInterfaceOrientation) orient
++{
++    return((supportedOrientationsMask >> orient) & 1);
++}
 +
-+   .. member:: NSInteger torchMode
++- (void) willRotateToInterfaceOrientation: (UIInterfaceOrientation) orient
++                                 duration: (NSTimeInterval) duration
++{
++    zlog(@"willRotate: orient=%d #%g", orient, duration);
++    rotating = YES;
++    if(readerView)
++        [readerView willRotateToInterfaceOrientation: orient
++                    duration: duration];
++}
 +
-+      An :type:`AVCaptureTorchMode` value that will be applied if/when
-+      appropriate.  (default Auto)
++- (void) willAnimateRotationToInterfaceOrientation: (UIInterfaceOrientation) orient
++                                          duration: (NSTimeInterval) duration
++{
++    zlog(@"willAnimateRotation: orient=%d #%g", orient, duration);
++    if(helpController)
++        [helpController willAnimateRotationToInterfaceOrientation: orient
++                        duration: duration];
++    if(readerView)
++        [readerView setNeedsLayout];
++}
 +
-+   .. member:: BOOL showsFPS
++- (void) didRotateFromInterfaceOrientation: (UIInterfaceOrientation) orient
++{
++    zlog(@"didRotate(%d): orient=%d", rotating, orient);
++    if(!rotating && readerView) {
++        // work around UITabBarController bug: willRotate is not called
++        // for non-portrait initial interface orientation
++        [readerView willRotateToInterfaceOrientation: self.interfaceOrientation
++                    duration: 0];
++        [readerView setNeedsLayout];
++    }
++    rotating = NO;
++}
 +
-+      Overlay the decode frame rate on the preview to help with performance
-+      optimization.  This is for *debug only* and should not be set for
-+      production.  (default ``NO``)
++- (ZBarReaderView*) readerView
++{
++    // force view to load
++    (void)self.view;
++    assert(readerView);
++    return(readerView);
++}
 +
-+   .. member:: CGFloat zoom
++- (void) setTracksSymbols: (BOOL) track
++{
++    tracksSymbols = track;
++    if(readerView)
++        readerView.tracksSymbols = track;
++}
 +
-+      Zoom scale factor applied to the video preview *and* scanCrop.  This
-+      value is also updated by the pinch-zoom gesture.  Valid values are in
-+      the range [1,2].  (default 1.25)
++- (void) setEnableCache: (BOOL) enable
++{
++    enableCache = enable;
++    if(readerView)
++        readerView.enableCache = enable;
++}
 +
-+   .. member:: CGRect scanCrop
++- (void) setScanCrop: (CGRect) r
++{
++    scanCrop = r;
++    if(readerView)
++        readerView.scanCrop = r;
++}
 +
-+      The region of the video image that will be scanned, in normalized image
-+      coordinates.  Note that the video image is in landscape mode (default
-+      {{0, 0}, {1, 1}})
++- (void) setCameraOverlayView: (UIView*) newview
++{
++    UIView *oldview = cameraOverlayView;
++    [oldview removeFromSuperview];
 +
-+   .. member:: CGAffineTransform previewTransform
++    cameraOverlayView = [newview retain];
++    if([self isViewLoaded] && newview)
++        [self.view addSubview: newview];
 +
-+      Additional transform that will be applied to the video preview.  Note
-+      that this transform is *not* applied to scanCrop.
++    [oldview release];
++}
 +
-+   .. member:: AVCaptureDevice *device
++- (void) setCameraViewTransform: (CGAffineTransform) xfrm
++{
++    cameraViewTransform = xfrm;
++    if(readerView)
++        readerView.previewTransform = xfrm;
++}
 +
-+      The capture device may be manipulated or replaced.
++- (void) cancel
++{
++    if(!readerDelegate)
++        return;
++    SEL cb = @selector(imagePickerControllerDidCancel:);
++    if([readerDelegate respondsToSelector: cb])
++        [readerDelegate
++            imagePickerControllerDidCancel: (UIImagePickerController*)self];
++    else
++        [self dismissModalViewControllerAnimated: YES];
++}
 +
-+   .. member:: AVCaptureSession *session
++- (void) info
++{
++    [self showHelpWithReason: @"INFO"];
++}
 +
-+      Direct access to the capture session.  Warranty void if opened.
-+      (read-only)
++- (void) showHelpWithReason: (NSString*) reason
++{
++    if(helpController)
++        return;
++    helpController = [[ZBarHelpController alloc]
++                         initWithReason: reason];
++    helpController.delegate = (id<ZBarHelpDelegate>)self;
++    helpController.wantsFullScreenLayout = YES;
++    UIView *helpView = helpController.view;
++    helpView.alpha = 0;
++    helpView.frame = self.view.bounds;
++    [helpController viewWillAppear: YES];
++    [self.view addSubview: helpView];
++    [UIView beginAnimations: @"ZBarHelp"
++            context: nil];
++    helpController.view.alpha = 1;
++    [UIView commitAnimations];
++}
 +
-+   .. member:: ZBarCaptureReader *captureReader
++- (void) takePicture
++{
++    if(TARGET_IPHONE_SIMULATOR) {
++        [cameraSim takePicture];
++        // FIXME return selected image
++    }
++    else if(readerView)
++        [readerView.captureReader captureFrame];
++}
 +
-+      Direct access to the capture reader.  Warranty void if opened.
-+      (read-only)
++- (void) setCameraDevice: (UIImagePickerControllerCameraDevice) camera
++{
++    cameraDevice = camera;
++    if(readerView) {
++        AVCaptureDevice *device = AVDeviceForUICamera(camera);
++        if(device)
++            readerView.device = device;
++    }
++}
 +
-+   .. member:: BOOL enableCache
++- (void) setCameraFlashMode: (UIImagePickerControllerCameraFlashMode) mode
++{
++    cameraFlashMode = mode;
++    if(readerView)
++        readerView.torchMode = AVTorchModeForUIFlashMode(mode);
++}
 +
-+      :Deprecated:
++- (UIImagePickerControllerCameraCaptureMode) cameraCaptureMode
++{
++    return(UIImagePickerControllerCameraCaptureModeVideo);
++}
 +
-+      Whether to use the inter-frame consistency cache.  This should always be
-+      set to ``YES``.
++- (void) setCameraCaptureMode: (UIImagePickerControllerCameraCaptureMode) mode
++{
++    NSAssert2(mode == UIImagePickerControllerCameraCaptureModeVideo,
++              @"attempt to set unsupported value (%d)"
++              @" for %@ property", mode, @"cameraCaptureMode");
++}
 +
++- (void) setVideoQuality: (UIImagePickerControllerQualityType) quality
++{
++    videoQuality = quality;
++    if(readerView)
++        [self initVideoQuality];
++}
 +
-+Instance Methods
-+----------------
 +
-+   .. describe:: - (id) initWithImageScanner:(ZBarImageScanner*)imageScanner
++// ZBarHelpDelegate
 +
-+      :imageScanner: A pre-configured :class:`ZBarImageScanner` to use for scanning
-+      :Returns: The initialized :class:`ZBarReaderView`
++- (void) helpControllerDidFinish: (ZBarHelpController*) help
++{
++    assert(help == helpController);
++    [help viewWillDisappear: YES];
++    [UIView beginAnimations: @"ZBarHelp"
++            context: NULL];
++    [UIView setAnimationDelegate: self];
++    [UIView setAnimationDidStopSelector: @selector(removeHelp:done:context:)];
++    help.view.alpha = 0;
++    [UIView commitAnimations];
++}
 +
-+   .. describe:: - (void) start
++- (void) removeHelp: (NSString*) tag
++               done: (NSNumber*) done
++            context: (void*) ctx
++{
++    if([tag isEqualToString: @"ZBarHelp"] && helpController) {
++        [helpController.view removeFromSuperview];
++        [helpController release];
++        helpController = nil;
++    }
++}
 +
-+      Begin/resume scanning after a call to ``stop``.
 +
-+   .. describe:: - (void) stop
++// ZBarReaderViewDelegate
 +
-+      Stop scanning and pause the video feed.
++- (void) readerView: (ZBarReaderView*) readerView
++     didReadSymbols: (ZBarSymbolSet*) syms
++          fromImage: (UIImage*) image
++{
++    [readerDelegate
++        imagePickerController: (UIImagePickerController*)self
++        didFinishPickingMediaWithInfo:
++            [NSDictionary dictionaryWithObjectsAndKeys:
++                image, UIImagePickerControllerOriginalImage,
++                syms, ZBarReaderControllerResults,
++                nil]];
++}
 +
-+   .. describe:: - (void) flushCache
++- (void) readerViewDidStart: (ZBarReaderView*) readerView
++{
++    if(!shutter.hidden)
++        [UIView animateWithDuration: .25
++                animations: ^{
++                    shutter.alpha = 0;
++                }
++                completion: ^(BOOL finished) {
++                    shutter.hidden = YES;
++                }];
++}
 +
-+      Flush the inter-frame consistency cache.  Any barcodes in the frame will
-+      be re-recognized in subsequent frames.
-diff --git a/iphone/doc/ZBarReaderViewController.rst b/iphone/doc/ZBarReaderViewController.rst
-new file mode 100644
---- /dev/null
-+++ b/iphone/doc/ZBarReaderViewController.rst
-@@ -0,0 +1,128 @@
-+ZBarReaderViewController Class Reference
-+========================================
 +
-+.. class:: ZBarReaderViewController
++// "deprecated" properties
 +
-+   :Inherits from: :class:`UIViewController`
++#define DEPRECATED_PROPERTY(getter, setter, type, val, ignore) \
++    - (type) getter                                    \
++    {                                                  \
++        return(val);                                   \
++    }                                                  \
++    - (void) setter: (type) v                          \
++    {                                                  \
++        NSAssert2(ignore || v == val,                  \
++                  @"attempt to set unsupported value (%d)" \
++                  @" for %@ property", val, @#getter); \
++    }
 +
-+   This is the controller to use for live scanning from the camera feed with
-+   automatic capture.  For scanning from image files or with manual capture,
-+   see :class:`ZBarReaderController`.
++DEPRECATED_PROPERTY(sourceType, setSourceType, UIImagePickerControllerSourceType, UIImagePickerControllerSourceTypeCamera, NO)
++DEPRECATED_PROPERTY(allowsEditing, setAllowsEditing, BOOL, NO, NO)
++DEPRECATED_PROPERTY(allowsImageEditing, setAllowsImageEditing, BOOL, NO, NO)
++DEPRECATED_PROPERTY(showsCameraControls, setShowsCameraControls, BOOL, NO, NO)
++DEPRECATED_PROPERTY(showsHelpOnFail, setShowsHelpOnFail, BOOL, NO, YES)
++DEPRECATED_PROPERTY(cameraMode, setCameraMode, ZBarReaderControllerCameraMode, ZBarReaderControllerCameraModeSampling, NO)
++DEPRECATED_PROPERTY(takesPicture, setTakesPicture, BOOL, NO, NO)
++DEPRECATED_PROPERTY(maxScanDimension, setMaxScanDimension, NSInteger, 640, YES)
 +
++@end
+diff -r 563557a923d0 iphone/ZBarReaderViewImpl_Capture.m
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/ZBarReaderViewImpl_Capture.m	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,402 @@
++//------------------------------------------------------------------------
++//  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
++//
++//  This file is part of the ZBar Bar Code Reader.
++//
++//  The ZBar Bar Code Reader is free software; you can redistribute it
++//  and/or modify it under the terms of the GNU Lesser Public License as
++//  published by the Free Software Foundation; either version 2.1 of
++//  the License, or (at your option) any later version.
++//
++//  The ZBar Bar Code Reader is distributed in the hope that it will be
++//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
++//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++//  GNU Lesser Public License for more details.
++//
++//  You should have received a copy of the GNU Lesser Public License
++//  along with the ZBar Bar Code Reader; if not, write to the Free
++//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++//  Boston, MA  02110-1301  USA
++//
++//  http://sourceforge.net/projects/zbar
++//------------------------------------------------------------------------
 +
-+Properties
-+----------
++#import <AVFoundation/AVFoundation.h>
++#import <CoreMedia/CoreMedia.h>
++#import <CoreVideo/CoreVideo.h>
++#import <ZBarSDK/ZBarReaderView.h>
++#import <ZBarSDK/ZBarCaptureReader.h>
 +
-+   .. member:: ZBarImageScanner *scanner
++#define MODULE ZBarReaderView
++#import "debug.h"
 +
-+      Access to the image scanner for configuration. (read-only)
++// protected APIs
++@interface ZBarReaderView()
++- (void) _initWithImageScanner: (ZBarImageScanner*) _scanner;
++- (void) initSubviews;
++- (void) updateCrop;
++- (void) setImageSize: (CGSize) size;
++- (void) didTrackSymbols: (ZBarSymbolSet*) syms;
++@end
 +
-+   .. member:: id <ZBarReaderDelegate> readerDelegate
++@interface ZBarReaderViewImpl
++    : ZBarReaderView
++{
++    AVCaptureSession *session;
++    AVCaptureDevice *device;
++    AVCaptureInput *input;
++}
 +
-+      The delegate that will be notified when new barcode results are
-+      available.
++@end
 +
-+   .. member:: BOOL showsZBarControls
++@implementation ZBarReaderViewImpl
 +
-+      Whether to display a default control set consisting of cancel, scan and
-+      info buttons.  Disable these if you provide your own controls using the
-+      :member:`cameraOverlayView`.  (Default ``YES``).
++@synthesize device, session;
 +
-+   .. member:: BOOL tracksSymbols
++- (void) _initWithImageScanner: (ZBarImageScanner*) scanner
++{
++    [super _initWithImageScanner: scanner];
 +
-+      Whether to display the tracking rectangle around detected barcodes.
++    session = [AVCaptureSession new];
++    NSNotificationCenter *notify =
++        [NSNotificationCenter defaultCenter];
++    [notify addObserver: self
++            selector: @selector(onVideoError:)
++            name: AVCaptureSessionRuntimeErrorNotification
++            object: session];
++    [notify addObserver: self
++            selector: @selector(onVideoStart:)
++            name: AVCaptureSessionDidStartRunningNotification
++            object: session];
++    [notify addObserver: self
++            selector: @selector(onVideoStop:)
++            name: AVCaptureSessionDidStopRunningNotification
++            object: session];
++    [notify addObserver: self
++            selector: @selector(onVideoStop:)
++            name: AVCaptureSessionWasInterruptedNotification
++            object: session];
++    [notify addObserver: self
++            selector: @selector(onVideoStart:)
++            name: AVCaptureSessionInterruptionEndedNotification
++            object: session];
 +
-+   .. member:: CGRect scanCrop
++    self.device = [AVCaptureDevice
++                      defaultDeviceWithMediaType: AVMediaTypeVideo];
 +
-+      Crop images before scanning.  The original image will be cropped to this
-+      rectangle, which should be in normalized image coordinates (NB the
-+      camera image x-axis is *vertical* on the screen).  Defaults to the full
-+      image ``{{0, 0}, {1, 1}}``.
++    captureReader = [[ZBarCaptureReader alloc]
++                        initWithImageScanner: scanner];
++    captureReader.captureDelegate = (id<ZBarCaptureDelegate>)self;
++    [session addOutput: captureReader.captureOutput];
 +
-+   .. member:: UIView *cameraOverlayView
++    if([session canSetSessionPreset: AVCaptureSessionPreset640x480])
++        session.sessionPreset = AVCaptureSessionPreset640x480;
 +
-+      A custom view to display over the camera preview.
++    [captureReader addObserver: self
++                   forKeyPath: @"size"
++                   options: 0
++                   context: NULL];
 +
-+   .. member:: CGAffineTransform cameraViewTransform
++    [self initSubviews];
++}
 +
-+      A transform to apply to the camera preview.  Ignored by the reader.
++- (void) initSubviews
++{
++    AVCaptureVideoPreviewLayer *videoPreview =
++        [[AVCaptureVideoPreviewLayer
++             layerWithSession: session]
++            retain];
++    preview = videoPreview;
++    CGRect bounds = self.bounds;
++    bounds.origin = CGPointZero;
++    preview.bounds = bounds;
++    preview.position = CGPointMake(bounds.size.width / 2,
++                                   bounds.size.height / 2);
++    videoPreview.videoGravity = AVLayerVideoGravityResizeAspectFill;
++    [self.layer addSublayer: preview];
 +
-+   .. member:: ZBarReaderView *readerView
++    [super initSubviews];
++}
 +
-+      View that presents the camera preview and performs the scanning.  This
-+      view has other properties you may use to control the appearance and
-+      behavior of the reader.
++- (void) dealloc
++{
++    [[NSNotificationCenter defaultCenter]
++        removeObserver: self];
++    if(showsFPS) {
++        @try {
++            [captureReader removeObserver: self
++                           forKeyPath: @"framesPerSecond"];
++        }
++        @catch(...) { }
++    }
++    @try {
++        [captureReader removeObserver: self
++                       forKeyPath: @"size"];
++    }
++    @catch(...) { }
++    captureReader.captureDelegate = nil;
++    [captureReader release];
++    captureReader = nil;
++    [device release];
++    device = nil;
++    [input release];
++    input = nil;
++    [session release];
++    session = nil;
++    [super dealloc];
++}
 +
-+      Note that this view may be released when it is not displayed (eg, under
-+      low memory conditions).  You should apply any configuration just before
-+      you present the reader.
++- (void) updateCrop
++{
++    [super updateCrop];
++    captureReader.scanCrop = effectiveCrop;
++}
 +
-+   .. member:: BOOL enableCache
++- (ZBarImageScanner*) scanner
++{
++    return(captureReader.scanner);
++}
 +
-+      This property is deprecated and should not be modified.
++- (void) setDevice: (AVCaptureDevice*) newdev
++{
++    id olddev = device;
++    AVCaptureInput *oldinput = input;
++    assert(!olddev == !oldinput);
 +
-+   .. warning::
++    NSError *error = nil;
++    device = [newdev retain];
++    if(device) {
++        assert([device hasMediaType: AVMediaTypeVideo]);
++        input = [[AVCaptureDeviceInput alloc]
++                    initWithDevice: newdev
++                    error: &error];
++        assert(input);
++    }
++    else
++        input = nil;
 +
-+      The remaining properties are deprecated, they are only present for
-+      backward compatibility with :class:`ZBarReaderController` and will raise
-+      an exception if inappropriate/unsupported values are set.
++    [session beginConfiguration];
++    if(oldinput)
++        [session removeInput: oldinput];
++    if(input)
++        [session addInput: input];
++    [session commitConfiguration];
 +
-+   .. member:: UIImagePickerControllerSourceType sourceType
++    [olddev release];
++    [oldinput release];
++}
 +
-+      Raises an exception if anything other than
-+      ``UIImagePickerControllerSourceTypeCamera`` is set.  If you want to scan
-+      images, use a :class:`ZBarReaderController` instead of this class.
++- (BOOL) enableCache
++{
++    return(captureReader.enableCache);
++}
 +
-+   .. member:: BOOL allowsEditing
++- (void) setEnableCache: (BOOL) enable
++{
++    captureReader.enableCache = enable;
++}
 +
-+      Raises an exception if anything other than ``NO`` is set.
++- (void) setTorchMode: (NSInteger) mode
++{
++    [super setTorchMode: mode];
++    if(running && [device isTorchModeSupported: mode])
++        @try {
++            device.torchMode = mode;
++        }
++        @catch(...) { }
++}
 +
-+   .. member:: BOOL showsCameraControls
++- (void) setShowsFPS: (BOOL) show
++{
++    [super setShowsFPS: show];
++    @try {
++        if(show)
++            [captureReader addObserver: self
++                           forKeyPath: @"framesPerSecond"
++                           options: 0
++                           context: NULL];
++        else
++            [captureReader removeObserver: self
++                           forKeyPath: @"framesPerSecond"];
++    }
++    @catch(...) { }
++}
 +
-+      Raises an exception if anything other than ``NO`` is set.  Use
-+      :member:`showsZBarControls` to disable the buit-in overlay.
++- (void) start
++{
++    if(started)
++        return;
++    [super start];
 +
-+   .. member:: BOOL showsHelpOnFail
++    [session startRunning];
++    captureReader.enableReader = YES;
++}
 +
-+      Any value set to this property is ignored.  It is only useful for
-+      scanning images, for which you should use :class:`ZBarReaderController`.
++- (void) stop
++{
++    if(!started)
++        return;
++    [super stop];
 +
-+   .. member:: ZBarReaderControllerCameraMode cameraMode
++    captureReader.enableReader = NO;
++    [session stopRunning];
++}
 +
-+      This reader only supports scanning from the camera feed.  If you want to
-+      scan manually captured images, use a :class:`ZBarReaderController`
-+      instead of this class.
++- (void) flushCache
++{
++    [captureReader flushCache];
++}
 +
-+   .. member:: BOOL takesPicture
++- (void) configureDevice
++{
++    if([device isFocusModeSupported: AVCaptureFocusModeContinuousAutoFocus])
++        device.focusMode = AVCaptureFocusModeContinuousAutoFocus;
++    if([device isTorchModeSupported: torchMode])
++        device.torchMode = torchMode;
++}
 +
-+      Raises an exception if anything other than ``NO`` is set.  This
-+      controller automatically returns the scanned camera frame and does not
-+      support capturing a separate image.
++- (void) lockDevice
++{
++    if(!running || locked) {
++        assert(0);
++        return;
++    }
 +
-+   .. member:: NSInteger maxScanDimension
++    // lock device and set focus mode
++    NSError *error = nil;
++    if([device lockForConfiguration: &error]) {
++        locked = YES;
++        [self configureDevice];
++    }
++    else {
++        zlog(@"failed to lock device: %@", error);
++        // just keep trying
++        [self performSelector: @selector(lockDevice)
++              withObject: nil
++              afterDelay: .5];
++    }
++}
 +
-+      Any value set to this property is ignored.  It is only useful for
-+      scanning images, for which you should use :class:`ZBarReaderController`.
 +
++// AVCaptureSession notifications
 +
-+Class Methods
-+-------------
++- (void) onVideoStart: (NSNotification*) note
++{
++    zlog(@"onVideoStart: running=%d %@", running, note);
++    if(running)
++        return;
++    running = YES;
++    locked = NO;
 +
-+   .. describe:: + (BOOL) isSourceTypeAvailable:(UIImagePickerControllerSourceType)source
++    [self lockDevice];
 +
-+      Returns ``YES`` only if ``source`` is ``Camera`` and the
-+      :class:`UImagePickerController` method of the same name also returns
-+      ``YES``.
++    if([readerDelegate respondsToSelector: @selector(readerViewDidStart:)])
++        [readerDelegate readerViewDidStart: self];
++}
 +
-+Instance Methods
-+----------------
++- (void) onVideoStop: (NSNotification*) note
++{
++    zlog(@"onVideoStop: %@", note);
++    if(!running)
++        return;
++    running = NO;
 +
-+   .. _`showHelpWithReason:`:
-+   .. describe:: - (void) showHelpWithReason:(NSString*)reason
++    if(locked)
++        [device unlockForConfiguration];
++    else
++        [NSObject cancelPreviousPerformRequestsWithTarget: self
++                  selector: @selector(lockDevice)
++                  object: nil];
++    locked = NO;
 +
-+      Display the integrated help browser.  Use this with custom overlays if
-+      you don't also want to create your own help view.  Should only be called
-+      when the reader is displayed.  The ``reason`` argument will be passed to
-+      the :func:`onZBarHelp` javascript function.
++    if([readerDelegate respondsToSelector:
++                           @selector(readerView:didStopWithError:)])
++        [readerDelegate readerView: self
++                        didStopWithError: nil];
++}
 +
-+      :reason: A string parameter passed to javascript.
-diff --git a/iphone/doc/ZBarReaderViewDelegate.rst b/iphone/doc/ZBarReaderViewDelegate.rst
-new file mode 100644
---- /dev/null
-+++ b/iphone/doc/ZBarReaderViewDelegate.rst
-@@ -0,0 +1,26 @@
-+ZBarReaderViewDelegate Protocol Reference
-+=========================================
++- (void) onVideoError: (NSNotification*) note
++{
++    zlog(@"onVideoError: %@", note);
++    if(running) {
++        // FIXME does session always stop on error?
++        running = started = NO;
++        [device unlockForConfiguration];
++    }
++    NSError *err =
++        [note.userInfo objectForKey: AVCaptureSessionErrorKey];
 +
-+.. class:: ZBarReaderViewDelegate
++    if([readerDelegate respondsToSelector:
++                           @selector(readerView:didStopWithError:)])
++        [readerDelegate readerView: self
++                        didStopWithError: err];
++    else
++        NSLog(@"ZBarReaderView: ERROR during capture: %@: %@",
++              [err localizedDescription],
++              [err localizedFailureReason]);
++}
 +
-+   :Inherits from: :class:`NSObject`
++// NSKeyValueObserving
 +
-+   This protocol, which must be implemented by the `readerDelegate` provided
-+   to a :class:`ZBarReaderView`, is used to notify the delegate of new decode
-+   results.
++- (void) observeValueForKeyPath: (NSString*) path
++                       ofObject: (id) obj
++                         change: (NSDictionary*) info
++                        context: (void*) ctx
++{
++    if(obj == captureReader &&
++       [path isEqualToString: @"size"])
++        // adjust preview to match image size
++        [self setImageSize: captureReader.size];
++    else if(obj == captureReader &&
++       [path isEqualToString: @"framesPerSecond"])
++        fpsLabel.text = [NSString stringWithFormat: @"%.2ffps ",
++                                  captureReader.framesPerSecond];
++}
 +
++// ZBarCaptureDelegate
 +
-+Instance Methods
-+----------------
++- (void) captureReader: (ZBarCaptureReader*) reader
++       didTrackSymbols: (ZBarSymbolSet*) syms
++{
++    [self didTrackSymbols: syms];
++}
 +
-+   .. describe:: - (void) readerView:(ZBarReaderView*)readerView didReadSymbols:(ZBarSymbolSet*)symbols fromImage:(UIImage*)image
++- (void)       captureReader: (ZBarCaptureReader*) reader
++  didReadNewSymbolsFromImage: (ZBarImage*) zimg
++{
++    zlog(@"scanned %d symbols: %@", zimg.symbols.count, zimg);
++    if(!readerDelegate)
++        return;
 +
-+      Called to notify the delegate of new decode results.
++    UIImageOrientation orient = [UIDevice currentDevice].orientation;
++    if(!UIDeviceOrientationIsValidInterfaceOrientation(orient)) {
++        orient = interfaceOrientation;
++        if(orient == UIInterfaceOrientationLandscapeLeft)
++            orient = UIDeviceOrientationLandscapeLeft;
++        else if(orient == UIInterfaceOrientationLandscapeRight)
++            orient = UIDeviceOrientationLandscapeRight;
++    }
++    switch(orient)
++    {
++    case UIDeviceOrientationPortraitUpsideDown:
++        orient = UIImageOrientationLeft;
++        break;
++    case UIDeviceOrientationLandscapeLeft:
++        orient = UIImageOrientationUp;
++        break;
++    case UIDeviceOrientationLandscapeRight:
++        orient = UIImageOrientationDown;
++        break;
++    default:
++        orient = UIImageOrientationRight;
++        break;
++    }
 +
-+      Note that the referenced image is a proxy for a video buffer that is
-+      asynchronously being converted to a :class:`UIImage`, attempting to
-+      access the data will block until the conversion is complete.
++    UIImage *uiimg = [zimg UIImageWithOrientation: orient];
++    [readerDelegate
++        readerView: self
++        didReadSymbols: zimg.symbols
++        fromImage: uiimg];
++}
 +
-+      :readerView: :class:`ZBarReaderView` that scanned the barcode(s).
-+      :symbols: :class:`ZBarSymbolSet` containing the decode results.
-+      :image: :class:`UIImage` from which the barcode(s) were scanned.
-diff --git a/iphone/doc/ZBarSymbol.rst b/iphone/doc/ZBarSymbol.rst
-new file mode 100644
---- /dev/null
-+++ b/iphone/doc/ZBarSymbol.rst
-@@ -0,0 +1,166 @@
-+ZBarSymbol Class Reference
-+==========================
++@end
+diff -r 563557a923d0 iphone/ZBarReaderViewImpl_Simulator.m
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/ZBarReaderViewImpl_Simulator.m	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,219 @@
++//------------------------------------------------------------------------
++//  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
++//
++//  This file is part of the ZBar Bar Code Reader.
++//
++//  The ZBar Bar Code Reader is free software; you can redistribute it
++//  and/or modify it under the terms of the GNU Lesser Public License as
++//  published by the Free Software Foundation; either version 2.1 of
++//  the License, or (at your option) any later version.
++//
++//  The ZBar Bar Code Reader is distributed in the hope that it will be
++//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
++//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++//  GNU Lesser Public License for more details.
++//
++//  You should have received a copy of the GNU Lesser Public License
++//  along with the ZBar Bar Code Reader; if not, write to the Free
++//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++//  Boston, MA  02110-1301  USA
++//
++//  http://sourceforge.net/projects/zbar
++//------------------------------------------------------------------------
 +
-+.. class:: ZBarSymbol
++#import <ZBarSDK/ZBarReaderView.h>
++#import <ZBarSDK/ZBarReaderViewController.h>
 +
-+   :Inherits from: :class:`NSObject`
++#define MODULE ZBarReaderView
++#import "debug.h"
 +
-+   A symbol wraps all of the information the library has about a decoded
-+   barcode.  Use the available properties to retrieve the barcode data, the
-+   symbology (type of barcode), location and more.
++// hack around missing simulator support for AVCapture interfaces
 +
-+   This class is a simple wrapper around a :type:`zbar_symbol_t` C object
-+   (q.v.)
++// protected APIs
++@interface ZBarReaderView()
++- (void) _initWithImageScanner: (ZBarImageScanner*) _scanner;
++- (void) initSubviews;
++- (void) setImageSize: (CGSize) size;
++- (void) didTrackSymbols: (ZBarSymbolSet*) syms;
++@end
 +
++@interface ZBarReaderViewImpl
++    : ZBarReaderView
++{
++    ZBarImageScanner *scanner;
++    UILabel *simLabel;
++    UIImage *scanImage;
++    CALayer *previewImage;
++    BOOL enableCache;
++}
++@end
 +
-+Properties
-+----------
++@implementation ZBarReaderViewImpl
 +
-+   .. member:: zbar_symbol_type_t type
++@synthesize scanner, enableCache;
 +
-+      The type of symbology that was decoded. (read-only)
++- (void) _initWithImageScanner: (ZBarImageScanner*) _scanner
++{
++    [super _initWithImageScanner: _scanner];
++    scanner = [_scanner retain];
 +
-+   .. member:: NSString *typeName
++    [self initSubviews];
++}
 +
-+      The canonical name used by the library to represent the symbology.
-+      (read-only)
++- (void) initSubviews
++{
++    simLabel = [UILabel new];
++    simLabel.backgroundColor = [UIColor clearColor];
++    simLabel.textColor = [UIColor whiteColor];
++    simLabel.font = [UIFont boldSystemFontOfSize: 20];
++    simLabel.numberOfLines = 4;
++    simLabel.textAlignment = UITextAlignmentCenter;
++    simLabel.text = @"Camera Simulation\n\n"
++        @"Tap and hold with two \"fingers\" to select image";
++    simLabel.autoresizingMask =
++        UIViewAutoresizingFlexibleWidth |
++        UIViewAutoresizingFlexibleHeight;
++    [self addSubview: simLabel];
 +
-+   .. member:: NSUInteger configMask
++    preview = [CALayer new];
++    [self.layer addSublayer: preview];
 +
-+      Bitmask of symbology config settings used during decode.
++    previewImage = [CALayer new];
++    [preview addSublayer: previewImage];
 +
-+   .. member:: NSUInteger modifierMask
++    [super initSubviews];
++}
 +
-+      Bitmask of symbology characteristics detected during decode.
++- (void) dealloc
++{
++    [scanner release];
++    scanner = nil;
++    [simLabel release];
++    simLabel = nil;
++    [previewImage release];
++    previewImage = nil;
++    [super dealloc];
++}
 +
-+   .. member:: NSString *data
++- (AVCaptureDevice*) device
++{
++    return(nil);
++}
 +
-+      The raw decoded barcode data. (read-only)
++- (void) setDevice: (AVCaptureDevice*) device
++{
++    // simulated camera does nothing with this
++}
 +
-+   .. member:: int quality
++- (AVCaptureSession*) session
++{
++    return(nil);
++}
 +
-+      A relative metric indicating rough confidence in the decoded value.
-+      Larger values are better than smaller values. (read-only)
++- (void) updateCrop
++{
++    previewImage.frame = preview.bounds;
++    CGRect bounds = self.bounds;
++    simLabel.frame = CGRectInset(bounds,
++                                 bounds.size.width * .05,
++                                 bounds.size.height * .05);
++}
 +
-+   .. member:: zbar_orientation_t orientation
++- (void) start
++{
++    if(started)
++        return;
++    [super start];
++    running = YES;
 +
-+      The general, axis-aligned orientation of the symbol, or
-+      ZBAR_ORIENT_UNKNOWN if unknown. (read-only)
++    [self performSelector: @selector(onVideoStart)
++          withObject: nil
++          afterDelay: 0.5];
++}
 +
-+   .. member:: ZBarSymbolSet *components
++- (void) stop
++{
++    if(!started)
++        return;
++    [super stop];
++    running = NO;
 +
-+      The components of a composite symbol. (read-only)
-+
-+   .. member:: const zbar_symbol_t *zbarSymbol
++    [self performSelector: @selector(onVideoStop)
++          withObject: nil
++          afterDelay: 0.5];
++}
 +
-+      Retrieve the underlying C object instance. (read-only)
++- (void) scanImage: (UIImage*) image
++{
++    // strip EXIF info
++    CGImageRef cgimage = image.CGImage;
++    image = [[UIImage alloc]
++                initWithCGImage: cgimage
++                scale: 1.0
++                orientation: UIImageOrientationUp];
 +
-+   .. member:: CGRect bounds
++    [self setImageSize: image.size];
++    [self layoutIfNeeded];
 +
-+      Calculate a rough bounding box for the symbol. (read-only)
++    [CATransaction begin];
++    [CATransaction setDisableActions: YES];
++    previewImage.contentsGravity = kCAGravityResizeAspectFill;
++    previewImage.transform = CATransform3DMakeRotation(M_PI_2, 0, 0, 1);
++    previewImage.contents = (id)cgimage;
++    [CATransaction commit];
 +
-+      .. note::
++    ZBarImage *zimg =
++        [[ZBarImage alloc]
++            initWithCGImage: cgimage];
 +
-+         Coordinates are relative to the image *data*, which may not match a
-+         displayed UIImage.  Make sure to account for the UIImage orientation
-+         when using these values.
++    CGSize size = zimg.size;
++    zimg.crop = CGRectMake(effectiveCrop.origin.x * size.width,
++                           effectiveCrop.origin.y * size.height,
++                           effectiveCrop.size.width * size.width,
++                           effectiveCrop.size.height * size.height);
 +
++    int nsyms = [scanner scanImage: zimg];
++    zlog(@"scan image: %@ crop=%@ nsyms=%d",
++         NSStringFromCGSize(size), NSStringFromCGRect(zimg.crop), nsyms);
++    [zimg release];
 +
-+Class Methods
-+-------------
++    if(nsyms > 0) {
++        scanImage = [image retain];
++        ZBarSymbolSet *syms = scanner.results;
++        [self performSelector: @selector(didReadSymbols:)
++              withObject: syms
++              afterDelay: .4];
++        [self performSelector: @selector(didTrackSymbols:)
++              withObject: syms
++              afterDelay: .001];
++    }
++    [image release];
++}
 +
-+   .. _`nameForType:`:
-+   .. describe:: + (NSString*) nameForType:(zbar_symbol_type_t)type
++- (void) didReadSymbols: (ZBarSymbolSet*) syms
++{
++    [readerDelegate
++        readerView: self
++        didReadSymbols: syms
++        fromImage: scanImage];
++    [scanImage release];
++    scanImage = nil;
++}
 +
-+      Retrieve the canonical name for a symbology used by the library, given
-+      its enumerated value.
++- (void) onVideoStart
++{
++    if(running &&
++       [readerDelegate respondsToSelector: @selector(readerViewDidStart:)])
++        [readerDelegate readerViewDidStart: self];
++}
 +
-+      :type: The :type:`zbar_symbol_type_t` enumerated symbology value.
-+      :Returns: A short string name for the symbology.
++- (void) onVideoStop
++{
++    if(!running &&
++       [readerDelegate respondsToSelector:
++                           @selector(readerView:didStopWithError:)])
++        [readerDelegate readerView: self
++                        didStopWithError: nil];
++}
 +
++@end
+diff -r 563557a923d0 iphone/ZBarSymbol.m
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/ZBarSymbol.m	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,197 @@
++//------------------------------------------------------------------------
++//  Copyright 2009-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
++//
++//  This file is part of the ZBar Bar Code Reader.
++//
++//  The ZBar Bar Code Reader is free software; you can redistribute it
++//  and/or modify it under the terms of the GNU Lesser Public License as
++//  published by the Free Software Foundation; either version 2.1 of
++//  the License, or (at your option) any later version.
++//
++//  The ZBar Bar Code Reader is distributed in the hope that it will be
++//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
++//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++//  GNU Lesser Public License for more details.
++//
++//  You should have received a copy of the GNU Lesser Public License
++//  along with the ZBar Bar Code Reader; if not, write to the Free
++//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++//  Boston, MA  02110-1301  USA
++//
++//  http://sourceforge.net/projects/zbar
++//------------------------------------------------------------------------
 +
-+Instance Methods
-+----------------
++#import <ZBarSDK/ZBarSymbol.h>
 +
-+   .. _`initWithSymbol:`:
-+   .. describe:: - (id) initWithSymbol:(const zbar_symbol_t*)symbol
++@implementation ZBarSymbol
 +
-+      Initialize a symbol wrapper, given the C object to wrap.
++@dynamic type, typeName, configMask, modifierMask, data, quality, count,
++    zbarSymbol;
 +
-+      :symbol: The C object to wrap.
-+      :Returns: The initialized symbol, or nil if an error occurred.
+++ (NSString*) nameForType: (zbar_symbol_type_t) type
++{
++    return([NSString stringWithUTF8String: zbar_get_symbol_name(type)]);
++}
 +
++- (id) initWithSymbol: (const zbar_symbol_t*) sym
++{
++    if(self = [super init]) {
++        symbol = sym;
++        zbar_symbol_ref(sym, 1);
++    }
++    return(self);
++}
 +
-+Constants
-+---------
++- (void) dealloc
++{
++    if(symbol) {
++        zbar_symbol_ref(symbol, -1);
++        symbol = NULL;
++    }
++    [super dealloc];
++}
 +
-+.. type:: zbar_symbol_type_t
++- (zbar_symbol_type_t) type
++{
++    return(zbar_symbol_get_type(symbol));
++}
 +
-+   Symbology identifiers.
++- (NSString*) typeName
++{
++    return([[self class] nameForType: zbar_symbol_get_type(symbol)]);
++}
 +
-+   ZBAR_NONE
-+      No symbol was decoded.
++- (NSUInteger) configMask
++{
++    return(zbar_symbol_get_configs(symbol));
++}
 +
-+   ZBAR_PARTIAL
-+      Intermediate status.
++- (NSUInteger) modifierMask
++{
++    return(zbar_symbol_get_modifiers(symbol));
++}
 +
-+   ZBAR_EAN8
-+      EAN-8
++- (NSString*) data
++{
++    return([NSString stringWithUTF8String: zbar_symbol_get_data(symbol)]);
++}
 +
-+   ZBAR_UPCE
-+      UPC-E
++- (int) quality
++{
++    return(zbar_symbol_get_quality(symbol));
++}
 +
-+   ZBAR_ISBN10
-+      ISBN-10, converted from EAN-13
++- (int) count
++{
++    return(zbar_symbol_get_count(symbol));
++}
 +
-+   ZBAR_UPCA
-+      UPC-A
++- (zbar_orientation_t) orientation
++{
++    return(zbar_symbol_get_orientation(symbol));
++}
 +
-+   ZBAR_EAN13
-+      EAN-13
++- (const zbar_symbol_t*) zbarSymbol
++{
++    return(symbol);
++}
 +
-+   ZBAR_ISBN13
-+      ISBN-13, converted from EAN-13
++- (ZBarSymbolSet*) components
++{
++    return([[[ZBarSymbolSet alloc]
++                initWithSymbolSet: zbar_symbol_get_components(symbol)]
++               autorelease]);
++}
 +
-+   ZBAR_I25
-+      Interleaved 2 of 5
++- (CGRect) bounds
++{
++    int n = zbar_symbol_get_loc_size(symbol);
++    if(!n)
++        return(CGRectNull);
 +
-+   ZBAR_DATABAR
-+      GS1 DataBar (RSS)
++    int xmin = INT_MAX, xmax = INT_MIN;
++    int ymin = INT_MAX, ymax = INT_MIN;
 +
-+   ZBAR_DATABAR_EXP
-+      GS1 DataBar Expanded
++    for(int i = 0; i < n; i++) {
++        int t = zbar_symbol_get_loc_x(symbol, i);
++        if(xmin > t) xmin = t;
++        if(xmax < t) xmax = t;
++        t = zbar_symbol_get_loc_y(symbol, i);
++        if(ymin > t) ymin = t;
++        if(ymax < t) ymax = t;
++    }
++    return(CGRectMake(xmin, ymin, xmax - xmin, ymax - ymin));
++}
 +
-+   ZBAR_CODE39
-+      Code 39 (3 of 9)
++@end
 +
-+   ZBAR_QRCODE
-+      QR Code
 +
-+   ZBAR_CODE128
-+      Code 128
++@implementation ZBarSymbolSet
 +
-+.. type:: zbar_orientation_t
++@dynamic count, zbarSymbolSet;
++@synthesize filterSymbols;
 +
-+   The coarse orientation of a symbol.
++- (id) initWithSymbolSet: (const zbar_symbol_set_t*) s
++{
++    if(!s) {
++        [self release];
++        return(nil);
++    }
++    if(self = [super init]) {
++        set = s;
++        zbar_symbol_set_ref(s, 1);
++        filterSymbols = YES;
++    }
++    return(self);
++}
 +
-+   .. note::
++- (void) dealloc
++{
++    if(set) {
++        zbar_symbol_set_ref(set, -1);
++        set = NULL;
++    }
++    [super dealloc];
++}
 +
-+      Orientation is relative to the image *data*, which may not match a
-+      displayed UIImage.  Make sure to account for the UIImage orientation
-+      when using these values.
++- (int) count
++{
++    if(filterSymbols)
++        return(zbar_symbol_set_get_size(set));
 +
-+   ZBAR_ORIENT_UNKNOWN
-+      Unable to determine orientation.
++    int n = 0;
++    const zbar_symbol_t *sym = zbar_symbol_set_first_unfiltered(set);
++    for(; sym; sym = zbar_symbol_next(sym))
++        n++;
++    return(n);
++}
 +
-+   ZBAR_ORIENT_UP
-+      Upright, read left to right
-+
-+   ZBAR_ORIENT_RIGHT
-+      Sideways, read top to bottom
-+
-+   ZBAR_ORIENT_DOWN
-+      Upside-down, read right to left
++- (const zbar_symbol_set_t*) zbarSymbolSet
++{
++    return(set);
++}
 +
-+   ZBAR_ORIENT_LEFT
-+      Sideways, read bottom to top
-diff --git a/iphone/doc/ZBarSymbolSet.rst b/iphone/doc/ZBarSymbolSet.rst
-new file mode 100644
---- /dev/null
-+++ b/iphone/doc/ZBarSymbolSet.rst
-@@ -0,0 +1,43 @@
-+ZBarSymbolSet Class Reference
-+=============================
++- (NSUInteger) countByEnumeratingWithState: (NSFastEnumerationState*) state
++                                   objects: (id*) stackbuf
++                                     count: (NSUInteger) len
++{
++    const zbar_symbol_t *sym = (void*)state->state; // FIXME
++    if(sym)
++        sym = zbar_symbol_next(sym);
++    else if(set && filterSymbols)
++        sym = zbar_symbol_set_first_symbol(set);
++    else if(set)
++        sym = zbar_symbol_set_first_unfiltered(set);
 +
-+.. class:: ZBarSymbolSet
++    if(sym)
++        *stackbuf = [[[ZBarSymbol alloc]
++                         initWithSymbol: sym]
++                        autorelease];
 +
-+   :Inherits from: :class:`NSObject`
-+   :Conforms to: :class:`NSFastEnumeration`
++    state->state = (unsigned long)sym; // FIXME
++    state->itemsPtr = stackbuf;
++    state->mutationsPtr = (void*)self;
++    return((sym) ? 1 : 0);
++}
 +
-+   A symbol set is a simple container for the symbols scanned from an image.
-+   It supports :class:`NSFastEnumeration`, and not much else...  Use it to
-+   iterate through the :class:`ZBarSymbol` objects in a decode result set::
++@end
+diff -r 563557a923d0 iphone/bin/BuildUniversal.sh
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/bin/BuildUniversal.sh	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,23 @@
++#!/bin/sh
++set -ux
++SUBTARGET=${1:?}
++OUTDIR=${2:-$TARGET_BUILD_DIR}
 +
-+      ZBarSymbolSet *symbols = image.symbols;
-+      for(ZBarSymbol *symbol in symbols) {
-+          // process result
-+      }
++# build library for device and simulator
++xcodebuild -target $SUBTARGET -configuration $CONFIGURATION -sdk iphoneos BUILD_DIR=$BUILD_DIR BUILD_ROOT=$BUILD_ROOT\
++    || exit 1
++xcodebuild -target $SUBTARGET -configuration $CONFIGURATION -sdk iphonesimulator BUILD_DIR=$BUILD_DIR BUILD_ROOT=$BUILD_ROOT\
++    || exit 1
 +
-+   This class is a simple wrapper around a :type:`zbar_symbol_set_t` C object
-+   (q.v.)
++mkdir -p $OUTDIR
 +
++# combine device and simulator libs into single fat lib.
++# others have indicated that this approach is "wrong", but for us
++# the ease of including the universal lib in a project without complicated
++# changes to build settings outweighs any lack of purity in the approach
++# ...we can always fix things later, if necessary
++lipo -create \
++    $BUILD_ROOT/$CONFIGURATION-iphoneos/$SUBTARGET.a \
++    $BUILD_ROOT/$CONFIGURATION-iphonesimulator/$SUBTARGET.a \
++    -output $OUTDIR/$SUBTARGET.a \
++    || exit 1
+diff -r 563557a923d0 iphone/bin/CreateDMG.sh
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/bin/CreateDMG.sh	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,44 @@
++#!/bin/sh
++set -ux
++VOLNAME=${1:?}
++shift
++RES=$SOURCE_ROOT/res
++BUDDY=/usr/libexec/PlistBuddy
++if [ ! -x "$BUDDY" ]; then
++    BUDDY=$(xcrun -find PlistBuddy) \
++        || exit 1
++fi
++VERSION=$($BUDDY -c 'Print :CFBundleVersion' $RES/$VOLNAME-Info.plist) \
++    || exit 1
++DMG=$VOLNAME-$VERSION
 +
-+Properties
-+----------
++mkdir -p $TARGET_BUILD_DIR/.background \
++    || exit 1
++cp -af $RES/$VOLNAME.DS_Store $TARGET_BUILD_DIR/.DS_Store
++cp -af $RES/$VOLNAME-bg.png $TARGET_BUILD_DIR/.background/
 +
-+   .. member:: int count
++# copy remaining arguments to image directly
++for content
++do
++    cp -af $content $TARGET_BUILD_DIR/ \
++        || exit 1
++done
 +
-+      The number of symbols in the set. (read-only)
++# prepare examples for distribution
++for example in $(find $TARGET_BUILD_DIR/Examples -depth 1 -not -name '.*')
++do
++    rm -rf $example/{build,*.xcodeproj/{*.{mode1v3,pbxuser},project.xcworkspace,xcuserdata},ZBarSDK}
++    cp -af $BUILT_PRODUCTS_DIR/ZBarSDK $example/
++done
 +
-+   .. member:: const zbar_symbol_set_t *zbarSymbolSet
++# override subdir .DS_Stores
++for dir in $(find $TARGET_BUILD_DIR -type d -depth 1)
++do
++    cp -af $RES/Columns.DS_Store $dir/.DS_Store
++done
 +
-+      Retrieve the underlying C object instance. (read-only)
++hdiutil create -ov -fs HFS+ -format UDZO -imagekey zlib-level=9 \
++    -volname $VOLNAME \
++    -srcdir $TARGET_BUILD_DIR \
++    $BUILT_PRODUCTS_DIR/$DMG.dmg \
++    || exit 1
+diff -r 563557a923d0 iphone/bin/CreateDSStore.pl
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/bin/CreateDSStore.pl	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,72 @@
++#!/usr/bin/perl
 +
++# Quick hack script to generate the .DS_Store for the DMG, which
++#   * allows us to precisely position the window and icons
++#   * is more usefully versioned
++#   * avoids references to my local HD(!?)
 +
-+Instance Methods
-+----------------
++use warnings;
++use strict;
 +
-+   .. _`initWithSymbolSet:`:
-+   .. describe:: - (id) initWithSymbolSet:(const zbar_symbol_set_t*)set
++BEGIN {
++  use File::Spec::Functions qw(rel2abs splitpath);
++  use lib (splitpath(rel2abs($0)))[1];
++}
 +
-+      Initialize a symbol set wrapper, given the C object to wrap.
++use Data::Plist::BinaryWriter;
++use Mac::Finder::DSStore qw(writeDSDBEntries makeEntries);
++use Mac::Finder::AliasRecord;
 +
-+      :set: The C object to wrap.
-+      :Returns: The initialized symbol set, or nil if an error occurred.
-diff --git a/iphone/doc/apiref.rst b/iphone/doc/apiref.rst
-new file mode 100644
---- /dev/null
-+++ b/iphone/doc/apiref.rst
-@@ -0,0 +1,16 @@
-+*******************
-+   API Reference
-+*******************
++$Mac::Finder::DSStore::Entry::types{bwsp} = 'blob';
++$Mac::Finder::DSStore::Entry::types{icvp} = 'blob';
 +
-+.. toctree::
-+   :maxdepth: 1
++writeDSDBEntries($ARGV[0] || "DS_Store",
++    makeEntries(".",
++        bwsp => Data::Plist::BinaryWriter->new(serialize => 0)->write([
++            dict => {
++                WindowBounds => [
++                    string => sprintf('{{%d, %d}, {%d, %d}}',
++                                      512, 128, 512, 608 + 22)
++                ],
++                SidebarWidth => [integer => 0],
++                ShowToolbar => [false => 0],
++                ShowSidebar => [false => 0],
++                ShowPathbar => [false => 0],
++                ShowStatusBar => [false => 0],
++            }
++        ]),
++        icvp => Data::Plist::BinaryWriter->new(serialize => 0)->write([
++            dict => {
++                viewOptionsVersion => [integer => 0],
++                arrangeBy => [string => "none"],
++                iconSize => [real => 64],
++                textSize => [real => 12],
++                labelOnBottom => [true => 1],
++                gridSpacing => [real => 100],
++                gridOffsetX => [real => 0],
++                gridOffsetY => [real => 0],
++                showItemInfo => [false => 0],
++                showIconPreview => [false => 0],
++                backgroundType => [integer => 2],
++                backgroundColorRed => [real => 0],
++                backgroundColorGreen => [real => 0],
++                backgroundColorBlue => [real => .5],
++                backgroundImageAlias => [
++                    data => Mac::Finder::AliasRecord->new(
++                        path => 'ZBarSDK:.background:ZBarSDK-bg.png',
++                        volumeFS => 'HFS+')->write()
++                ],
++            },
++        ]),
++        vstl => "icnv",
++    ),
++    makeEntries("README",       Iloc_xy => [ 4.5 * 32,  2.5  * 32 ]),
++    makeEntries("ZBarSDK",      Iloc_xy => [ 4.5 * 32,  7.5  * 32 ]),
++    makeEntries("ChangeLog",    Iloc_xy => [  4  * 32, 12.5  * 32 ]),
++    makeEntries("Documentation.html",
++                                Iloc_xy => [  8  * 32, 12.5  * 32 ]),
++    makeEntries("Examples",     Iloc_xy => [ 12  * 32, 12.5  * 32 ]),
++    makeEntries("COPYING",      Iloc_xy => [  4  * 32,  16   * 32 ]),
++    makeEntries("LICENSE",      Iloc_xy => [  8  * 32,  16   * 32 ]),
++    makeEntries("Documentation",Iloc_xy => [ 12  * 32,  16   * 32 ]),
++);
+diff -r 563557a923d0 iphone/bin/Mac/Finder/AliasRecord.pm
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/bin/Mac/Finder/AliasRecord.pm	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,169 @@
++package Mac::Finder::AliasRecord;
 +
-+   ZBarImage
-+   ZBarImageScanner
-+   ZBarReaderController
-+   ZBarReaderDelegate
-+   ZBarReaderView
-+   ZBarReaderViewController
-+   ZBarReaderViewDelegate
-+   ZBarSymbol
-+   ZBarSymbolSet
-diff --git a/iphone/doc/camera.rst b/iphone/doc/camera.rst
-new file mode 100644
---- /dev/null
-+++ b/iphone/doc/camera.rst
-@@ -0,0 +1,129 @@
-+Scanning From the Camera Feed
-+=============================
++# Generate(/Parse) a Mac "alias record" binary string/file.
++#
++# Currently just enough is implemented to satisfy immediate requirements
++# (ie, write backgroundImageAlias to .DS_Store for DMG)
++#
++# based on these documents:
++# http://www.geocities.com/xhelmboyx/quicktime/formats/alias-layout.txt
++# http://sebastien.kirche.free.fr/python_stuff/MacOS-aliases.txt
++#
++# FIXME interface is very poor...
 +
-+Many iPhone developers want their application to support automatic recognition
-+of barcodes from the camera feed in real-time.  ZBar makes this easy!
++use warnings;
++use strict;
++use DateTime;
++use File::Spec;
++use File::Spec::Mac;
++use Encode qw(encode);
++require Exporter;
 +
-+There are three levels that you may choose to integrate at, from least complex
-+(recommended) to most complex these are:
++our $VERSION = '0.1';
++our @ISA = qw(Exporter);
 +
-+* Use the fully integrated view controller - this is very easy to implement
-+  and is the recommended approach.
-+* Use the reader view with your own controller - this is not recommended, it
-+  does not give you much more flexibility than using the full controller.
-+* Use the capture component with your own AVCapture session - this is not
-+  supported and only provided for advanced developers with special needs who
-+  are already familiar with AVCapture.
++my %FSEncodings = (
++  MacFS   => ['RW', ''],
++  MFS     => ['RW', ''],
++  HFS     => ['BD', ''],
++  'HFS+'  => ['H+', ''],
 +
++  AudioCD => ['', 'JH'],
++  ISO9660 => ['', 'AG'],
++  FAT     => ['', 'IS'],
++  Joliet  => ['', 'Jo'],
++  'ISO9660+Joliet' => ['', 'Jo'],
++);
 +
-+Using a ZBarReaderViewController
-+--------------------------------
++my %DiskEncodings = (
++  HD          => 0,
++  FixedHD     => 0,
++  Network     => 1,
++  NetworkDisk => 1,
++  Floppy      => 4,
++  Floppy1440  => 4,
++  Other       => 5,
++  OtherDisk   => 5,
++);
 +
-+This is the fastest, easiest and recommend way to get the barcode reader into
-+your application.  It is also the only way to support :doc:`automatic fallback
-+for iOS 3.1 <compat>`.  The procedure is the same as using a
-+UIImagePickerController to take a picture with the camera, so it will help if
-+you are familiar with that.  Basically you:
++my %RecordEncodings = (
++  parentDir     => 0x00,
++  absolutePath  => 0x02,
++  unicodeFile   => 0x0e,
++  unicodeVolume => 0x0f,
++  volumePath    => 0x12,
++);
 +
-+1. Create the reader.
++sub new {
++  my $class = shift || __PACKAGE__;
++  my $self = {
++    aliasCreator => '',
++    aliasVersion => 2,
++    aliasType => 'file',
++    volume => '',
++    volumeCreated => 0,
++    volumeFS => 'HFS',
++    volumeDisk => undef,
++    volumeAttrs => 0,
++    directoryID => 0,
++    file => '',
++    fileID => 0,
++    fileCreated => 0,
++    fileType => '',
++    fileCreator => '',
++    nlvlFrom => -1,
++    nlvlTo => -1,
++    records => { },
++    @_
++  };
++  if(exists($self->{path})) {
++    my $path = $self->{path};
++    my ($vol, $dir, $file) = File::Spec::Mac->splitpath($path);
++    $vol =~ s/:$//;
++    my @dir = File::Spec::Mac->splitdir($dir);
++    while(@dir && !$dir[0]) {
++      shift(@dir);
++    }
++    while(@dir && !$dir[-1]) {
++      pop(@dir);
++    }
++    $self->{volume} ||= $vol;
++    $self->{records}{unicodeVolume} ||=
++      pack('na*', length($vol), encode('utf-16be', $vol));
 +
-+   This is as simple as creating a new :class:`ZBarReaderViewController`::
++    $self->{file} ||= $file;
++    $self->{records}{parentDir} ||= $dir[-1]
++      if(@dir);
++    $self->{records}{absolutePath} ||= $path;
++    $self->{records}{volumePath} ||= File::Spec->catfile('', @dir, $file);
++    $self->{records}{unicodeFile} ||=
++      pack('na*', length($file), encode('utf-16be', $file));
++  }
++  return(bless($self, ref($class) || $class));
++}
 +
-+      ZBarReaderViewController *reader = [ZBarReaderViewController new];
++sub toFSTime {
++  my $val = shift;
++  if(ref($val) && $val->isa("DateTime")) {
++    $val = $val->epoch - DateTime->new(year => 1904)->epoch();
++  }
++  return($val);
++}
 +
-+2. Setup a delegate to receive the results.
++sub write {
++  my ($self, $out) = @_;
 +
-+   The delegate should implement the :class:`ZBarReaderDelegate` protocol,
-+   which inherits from :class:`UIImagePickerControllerDelegate`::
++  my $aliasType = $self->{aliasType};
++  $aliasType = (($aliasType =~ /^d(ir(ectory)?)?$/i && 1) ||
++                ($aliasType !~ /^f(ile)?$/ && $aliasType) || 0);
 +
-+      reader.readerDelegate = self;
++  my $volumeCreated = toFSTime($self->{volumeCreated});
++  my $volumeFS = $self->{volumeFS};
++  if(ref($volumeFS) ne 'ARRAY') {
++    $volumeFS = $FSEncodings{$volumeFS} || ['', ''];
++  }
 +
-+3. Configure the reader.
++  my $volumeDisk = $self->{volumeDisk};
++  if(!defined($volumeDisk)) {
++    if($volumeFS->[0] eq 'H+') {
++      $volumeDisk = 'Floppy';
++    }
++    elsif($volumeFS->[0]) {
++      $volumeDisk = 'HD';
++    }
++    else {
++      $volumeDisk = 'Other';
++    }
++  }
++  $volumeDisk = (exists($DiskEncodings{$volumeDisk})
++                 ? $DiskEncodings{$volumeDisk}
++                 : $volumeDisk);
 +
-+   Aside from the properties of the reader itself, you can configure the
-+   decoder via the :member:`~ZBarReaderViewController::scanner` property and
-+   further customize the view via the
-+   :member:`~ZBarReaderViewController::readerView` property::
++  my $fileCreated = toFSTime($self->{fileCreated});
 +
-+      [reader.scanner setSymbology: ZBAR_QRCODE
-+                      config: ZBAR_CFG_ENABLE
-+                      to: 0];
-+      reader.readerView.zoom = 1.0;
++  my $buf =
++    pack('nn (C/a @28)Na2n N(C/a @64)NNa4a4 n!n!Na2 x10 (n!n/ax!2)*',
++         $self->{aliasVersion}, $aliasType,
++         $self->{volume}, $volumeCreated, $volumeFS->[0], $volumeDisk,
++         $self->{directoryID}, $self->{file}, $self->{fileID}, $fileCreated,
++         $self->{fileType}, $self->{fileCreator}, $self->{nlvlFrom},
++         $self->{nlvlTo}, $self->{volumeAttrs}, $volumeFS->[1],
++         map(((exists($RecordEncodings{$_}) ? $RecordEncodings{$_} : $_)
++              => $self->{records}{$_}),
++             keys(%{$self->{records}})),
++         (-1, ''));
++  $buf = pack('a4n', $self->{aliasCreator}, length($buf) + 6) . $buf;
 +
-+   See :doc:`custom` and :doc:`optimizing` for more details.
++  if(!$out) {
++    return($buf);
++  }
++  elsif(ref($out) eq 'GLOB') {
++    print $out $buf;
++  }
++  else {
++    open(my $outfh, '>', $out) || die;
++    print $outfh $buf;
++  }
++}
 +
-+4. Present the reader to the user.
++1;
+diff -r 563557a923d0 iphone/debug.h
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/debug.h	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,53 @@
++//------------------------------------------------------------------------
++//  Copyright 2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++//
++//  This file is part of the ZBar Bar Code Reader.
++//
++//  The ZBar Bar Code Reader is free software; you can redistribute it
++//  and/or modify it under the terms of the GNU Lesser Public License as
++//  published by the Free Software Foundation; either version 2.1 of
++//  the License, or (at your option) any later version.
++//
++//  The ZBar Bar Code Reader is distributed in the hope that it will be
++//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
++//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++//  GNU Lesser Public License for more details.
++//
++//  You should have received a copy of the GNU Lesser Public License
++//  along with the ZBar Bar Code Reader; if not, write to the Free
++//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++//  Boston, MA  02110-1301  USA
++//
++//  http://sourceforge.net/projects/zbar
++//------------------------------------------------------------------------
 +
-+   Typically the controller is presented modally, although the new controller
-+   does not require it (note that modal presentation is the only option if you
-+   want to support :doc:`iOS 3.1 fallback <compat>`)::
++#include <mach/mach_time.h>
++#define xNSSTR(s) @#s
++#define NSSTR(s) xNSSTR(s)
 +
-+      [self presentModalViewController: reader
-+            animated: YES];
++#ifdef DEBUG_OBJC
++# ifndef MODULE
++#  define MODULE ZBarReaderController
++# endif
++# define zlog(fmt, ...) \
++    NSLog(NSSTR(MODULE) @": " fmt , ##__VA_ARGS__)
 +
-+5. Process the results.
++#define timer_start \
++    uint64_t t_start = timer_now();
 +
-+   The controller will call the
-+   :member:`imagePickerController:didFinishPickingMediaWithInfo:` method of
-+   your delegate every time new results become available.  The barcode data
-+   can be obtained using the :c:data:`ZBarReaderControllerResults` key of the
-+   info dictionary.  This key will return "something enumerable"; keep in mind
-+   that there may be multiple results.  You may also retrieve the
-+   corresponding image with :c:data:`UIImagePickerControllerOriginalImage` as
-+   usual::
++#else
++# define zlog(...) while(0)
++# define timer_start
++#endif
 +
-+      - (void) imagePickerController: (UIImagePickerController*) reader
-+       didFinishPickingMediaWithInfo: (NSDictionary*) info
-+      {
-+          id<NSFastEnumeration> results =
-+              [info objectForKey: ZBarReaderControllerResults];
-+          UIImage *image =
-+              [info objectForKey: UIImagePickerControllerOriginalImage];
-+          ...
++static inline uint64_t timer_now ()
++{
++    return(mach_absolute_time());
++}
 +
-+   The ``reader`` parameter will be the actual type of the reader (not
-+   necessarily a :class:`UIImagePickerController`).
++static inline double timer_elapsed (uint64_t start, uint64_t end)
++{
++    mach_timebase_info_data_t info;
++    mach_timebase_info(&info);
++    return((double)(end - start) * info.numer / (info.denom * 1000000000.));
++}
+diff -r 563557a923d0 iphone/doc/Documentation.html
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/doc/Documentation.html	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,11 @@
++<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
++  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
++<html xmlns="http://www.w3.org/1999/xhtml">
++<head>
++<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
++<meta http-equiv="Refresh" content="0; url=Documentation/index.html"/>
++</head>
++<body>
++<p>redirecting to <a href="Documentation/index.html">Documentation/index.html</a></p>
++</body>
++</html>
+diff -r 563557a923d0 iphone/doc/ReaderSample.png
+Binary file iphone/doc/ReaderSample.png has changed
+diff -r 563557a923d0 iphone/doc/ZBarImage.rst
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/doc/ZBarImage.rst	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,150 @@
++ZBarImage Class Reference
++=========================
 +
-+   .. note::
++.. class:: ZBarImage
 +
-+      The delegate method should queue the interface response and return as
-+      soon as possible; any processing of the results should be deferred until
-+      later, otherwise the user will experience unacceptable latency between
-+      the actual scan completion and the visual interface feedback.
++   :Inherits from: :class:`NSObject`
 +
-+6. Dismiss the reader (or not).
++   A :class:`ZBarImage` is a wrapper for images passed to the barcode reader.
++   It encapsulates raw image data with the format and size metadata necessary
++   to interpret it.
 +
-+   Once you have the results you may dismiss the reader::
++   An image must be wrapped in a :class:`ZBarImage` in order to be scanned by
++   the library.  At least the format, size and data must be set.  There are
++   also initialization methods for automatically extracting the data and
++   format from a `CGImage`.
 +
-+      [reader dismissModalViewControllerAnimated: YES];
++   This class is a wrapper around a :type:`zbar_image_t` C object (q.v.)
 +
-+   .. warning::
 +
-+      It is very important to dismiss from the *reader* (not the presenting
-+      controller) to avoid corrupting the interface.
++Properties
++----------
 +
-+   Alternatively, you may choose to continue scanning and provide visual
-+   feedback another way (eg, maybe by updating your custom overlay with the
-+   results).  The "continuous" mode of the readertest example does this.
++   .. member:: unsigned long format
 +
++      The image format four-charcter code (fourcc) as a 4-byte integer.  Use
++      :ref:`fourcc:<fourcc:>` to create a fourcc value from a string.
 +
-+Using a ZBarReaderView
-+----------------------
++   .. member:: unsigned sequence
 +
-+:class:`ZBarReaderViewController` is a relatively thin wrapper around a
-+:class:`ZBarReaderView`; it is possible to use the view directly.  You will
-+lose the automatic fallback for iOS 3.1 and some of the simulator hooks, so
-+this approach is not currently recommended (or well tested).
++      A "sequence number" associated with the image.  This reference value is
++      unused by the library.
 +
++   .. member:: CGSize size
 +
-+Using the ZBarCaptureReader
-+---------------------------
++      The size of the image in pixels.
 +
-+If you have special requirements for the capture session or just want to use
-+your own preview, you can add your own :class:`ZBarCaptureReader` to your
-+session.  You must have a solid understanding of the AVCapture infrastructure
-+if you plan to use this approach.
++      .. note::
 +
-+.. admonition:: TBD
++         There is no separate "bytesPerLine" property, the width must match
++         the image data (which is not always the logical image width).
 +
-+   sorry, you're on your own here - UTSL  :)
-diff --git a/iphone/doc/compat.rst b/iphone/doc/compat.rst
-new file mode 100644
---- /dev/null
-+++ b/iphone/doc/compat.rst
-@@ -0,0 +1,183 @@
-+Backward Compatibility
-+======================
++   .. member:: CGRect crop
 +
-+Generally speaking, we take great care to ensure that each release of the
-+library is backward compatible with previous versions - upgrading the library
-+should not require any changes to your code and will continue to provide
-+equivalent functionality.  The notable exception to this is the iOS 4 upgrade
-+and associated "deprecation" of the former automatic capture method by our
-+vendor.
++      Optionally limit the scan region to this rectangle without having to
++      generate a cropped image.
 +
++   .. member:: const void *data
 +
-+The Private API
-+---------------
++      Obtain a pointer to the raw image data.  This property is read-only, use
++      :ref:`setData:withLength:<setData:withLength:>` to set the image data.
 +
-+The API that we use for automatic capture with iOS 3.x (namely
-+:func:`UIGetScreenImage`) has an interesting history.  It has changed status
-+several times, starting with "Private, unless we like you" moving to
-+"reluctantly Public but undocumeted" by popular demand and reverting to
-+"strictly Private" as of iOS 4.  The current story: if you want to distribute
-+on the App Store, you had better not be using it - IOW, no automatic capture
-+for you with iOS 3.x.
++   .. member:: unsigned long dataLength
 +
-+Since App Store distribution is the most common use for the library, the
-+default configuration, and thus the binary SDK, does *not* use any private
-+APIs.
++      Byte length of the raw image data.  This property is read-only, use 
++      :ref:`setData:withLength:<setData:withLength:>` to set the image data.
 +
-+Users targeting ad-hoc or enterprise distribution may not care about the
-+status of the API and may prefer to continue supporting automatic capture for
-+iOS 3.x.  To do this you will need to rebuild the library with the following
-+define set for all configurations:
++   .. member:: ZBarSymbolSet *symbols
 +
-+.. sourcecode:: sh
++      Barcode results from the last scan.
 +
-+   USE_PRIVATE_APIS=1
++   .. member:: zbar_image_t *zbarImage
 +
-+For reference, you can check whether your app refers to the offensive function
-+with this command:
++      Retrieve the underlying C object instance. (read-only)
 +
-+.. sourcecode:: sh
++   .. member:: UIImage *UIImage
 +
-+   $ otool -vI MyApp.app/MyApp | grep UIGetScreenImage
++      Convert the image to a UIImage.  Only certain image formats are
++      supported for conversion (read-only)
 +
-+If there is any output, then the executable includes the private API and is
-+bound to be rejected if submitted for review.  Otherwise it is "clean" as far
-+as this library is concerned.
++      :See also: :ref:`UIImageWithOrientation:<UIImageWithOrientation:>`
 +
 +
-+Upgrading to iOS 4
-+------------------
++Class Methods
++-------------
 +
-+If you were using the reader before iOS 4 was introduced, you will want to
-+upgrade to the new reader controller.  The performance has improved quite a
-+bit, and you can continue to support automatic capture on the App Store.
++   .. _`fourcc:`:
++   .. describe:: + (unsigned long) fourcc:(NSString*)format
 +
-+.. note::
++      Parse the integer four-character code from a string.  Alternatively use
++      the :func:`zbar_fourcc` macro to create a constant expression.
 +
-+   This discussion only applies to automatic capture from the camera.  If you
-+   are only scanning image files, or prefer/need to use manual capture, you
-+   should not change anything.
++      :format: A four character string representing an image format.
++      :Returns: The corresponding 4-byte integer format code.
 +
-+Basically just replace your old :class:`ZBarReaderController` with a new
-+:class:`ZBarReaderViewController` and you're done!  See the reference and the
-+next section for compatibility between the two classes.
 +
-+Also see the :doc:`install` instructions for details about upgrading the
-+header references to use the SDK.
++Instance Methods
++----------------
 +
++   .. _`initWithImage:`:
++   .. describe:: - (id) initWithImage:(zbar_image_t*)image
 +
-+Supporting iOS 3.x
-+------------------
++      Initialize an image wrapper, given the C object to wrap.
 +
-+The new :class:`ZBarReaderViewController` is intentionally designed to be
-+compatible with the old :class:`ZBarReaderController` in most aspects that
-+relate to reading barcodes.  When a :class:`ZBarReaderViewController` is
-+initialized under iOS 3.x, it will *replace* itself with a
-+:class:`ZBarReaderController`.  You can leverage the compatibility of these
-+controllers to continue supporting iOS 3.x.
++      :image: The C object to wrap.
++      :Returns: The initialized :class:`ZBarImage`.
 +
-+The following properties and methods should be equivalent across
-+implementations.  You may use them without regard for the actual instance
-+type.
++   .. _`initWithCGImage:`:
++   .. describe:: - (id) initWithCGImage:(CGImageRef)image
 +
-+========================================================  ====
-+Equivalent Members
-+========================================================  ====
-+:member:`~ZBarReaderViewController::cameraOverlayView`
-+:member:`~ZBarReaderViewController::cameraViewTransform`
-+:member:`~ZBarReaderViewController::enableCache`
-+:member:`~ZBarReaderViewController::scanner`
-+:member:`~ZBarReaderViewController::readerDelegate`
-+:member:`~ZBarReaderViewController::scanCrop`
-+``showHelpWithReason:``
-+:member:`~ZBarReaderViewController::showsZBarControls`
-+:member:`~ZBarReaderViewController::tracksSymbols`
-+========================================================  ====
++      Initialize a :class:`ZBarImage` from the data and metadata extracted
++      from a `CGImage`.  The image is converted to `Y800` (grayscale) format.
 +
-+Some properties are available with :class:`ZBarReaderViewController` only for
-+backward compatibility.  If these are configured, they must be set as
-+indicated; attempts to set another value will raise an exception.
++      :image: A `CGImage` to source the data and metadata.
++      :Returns: The initialized :class:`ZBarImage`.
++      :See also: :ref:`initWithCGImage:size:<initWithCGImage:size:>`
 +
-+====================================================  =======================================
-+:class:`ZBarReaderController` Property                :class:`ZBarReaderViewController` Value
-+====================================================  =======================================
-+:member:`~ZBarReaderController::allowsEditing`        ``NO``
-+:member:`~ZBarReaderController::cameraMode`           ``Sampling``
-+:member:`~ZBarReaderController::maxScanDimension`     (ignored)
-+:member:`~ZBarReaderController::showsCameraControls`  ``NO``
-+:member:`~ZBarReaderController::showsHelpOnFail`      (ignored)
-+:member:`~ZBarReaderController::sourceType`           ``Camera``
-+:member:`~ZBarReaderController::takesPicture`         ``NO``
-+====================================================  =======================================
++   .. _`initWithCGImage:size:`:
++   .. describe:: - (id) initWithCGImage:(CGImageRef)image size:(CGSize)size
 +
-+Also, the ``isSourceTypeAvailable:`` class method of
-+:class:`ZBarReaderViewController` will return ``YES`` only for the ``Camera``
-+source.
++      Initialize a :class:`ZBarImage` from the data and metadata extracted
++      from a `CGImage`.  The image is converted to `Y800` (grayscale) format
++      and scaled to the specified size.
 +
-+All other members of :class:`ZBarReaderController`, including those inherited
-+from :class:`UIImagePickerController` are not supported by
-+:class:`ZBarReaderViewController`.  This includes ``takePicture`` and
-+``scanImage:``, among others.
++      :image: A `CGImage` to source the data and metadata.
++      :size: The pixel size of the resulting ZBarImage.
++      :Returns: The initialized :class:`ZBarImage`.
++      :See also: :ref:`initWithCGImage:crop:size:<initWithCGImage:crop:size:>`
 +
-+Remaining members of :class:`ZBarReaderViewController`: are only available
-+with the new implementation.  At the moment this is only
-+:member:`~ZBarReaderViewController::readerView`, but any new properties or
-+methods not listed here will also fall in this category.
++   .. _`initWithCGImage:crop:size:`:
++   .. describe:: - (id) initWithCGImage:(CGImageRef)image crop:(CGRect)crop size:(CGSize)size
 +
-+To access settings that may not be available in a potential fallback
-+environment, you must verify that they exist and may be set as desired - eg,
-+by testing the specific reader subtype.
++      Initialize a :class:`ZBarImage` from the data and metadata extracted
++      from a `CGImage`.  The image is simultaneously converted to `Y800`
++      (grayscale) format, cropped and scaled to the specified size.
 +
-+Weak Linking
-+^^^^^^^^^^^^
++      :image: A `CGImage` to source the data and metadata.
++      :crop: The region to convert, in image coordinates.
++      :size: The pixel size of the resulting ZBarImage.
++      :Returns: The initialized :class:`ZBarImage`.
 +
-+When leveraging fallbacks to iOS 3.x, it is important that features introduced
-+in iOS 4 are referenced using *weak* links.  You must configure your project
-+correctly to support this:
++   .. _`setData:withLength:`:
++   .. describe:: - (void) setData:(const void*)data withLength:(unsigned long)length
 +
-+* Make sure the iOS 4 frameworks are set to *Weak*.  Specifically, these are
-+  AVCapture, CoreMedia and CoreVideo.
++      Specify a pointer to the raw image data, for the image format and size.
++      The length of the data must also be provided.  Note that the data must
++      remain valid as long as the image has a reference to it.  Set data to
++      ``NULL`` to clear a previous reference.
 +
-+* Build with the latest SDK - do *not* use the "Base SDK" setting to target
-+  earlier devices.
++      :data: A pointer to a raw image data buffer.
++      :length: The size of the image data buffer.
 +
-+* Set the correct iOS 3.x version for the "iPhone OS Deployment Target"
-+  build setting.
++   .. _`UIImageWithOrientation:`:
++   .. describe:: - (UIImage*) UIImageWithOrientation:(UIImageOrientation)orient
 +
++      Convert the image to a UIImage with the specified orientation.  Only
++      certain image formats are supported for conversion.  (currently
++      ``RGB3``, ``RGB4``, ``RGBQ``)
 +
-+Example: Fallback to Manual Capture
-+-----------------------------------
++      :orient: Desired orientation of the image.
++      :Returns: A new :class:`UIImage`, or ``nil`` in case of error.
+diff -r 563557a923d0 iphone/doc/ZBarImageScanner.rst
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/doc/ZBarImageScanner.rst	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,99 @@
++ZBarImageScanner Class Reference
++================================
 +
-+This code example will configure the reader for automatic capture from the
-+camera for iOS 4 and fall back to manual or automatic capture for iOS 3.x,
-+depending on whether the library was compiled to use private APIs::
++.. class:: ZBarImageScanner
 +
-+   if(![ZBarReaderController isSourceTypeAvailable:
-+                                 UIImagePickerControllerSoureTypeCamera]) {
-+       // camera unavailable: display warning and abort
-+       // or resort to keypad entry, etc...
-+       return;
-+   }
-+   
-+   ZBarReaderViewController *reader = [ZBarReaderViewController new];
-+   // reader will be a ZBarReaderController for iOS 3.x
-+   // or a ZBarReaderViewController for iOS 4
-+   
-+   reader.readerDelegate = self;
-+   reader.sourceType = UIImagePickerControllerSoureTypeCamera;
-+   reader.showsZBarControls = YES;
-+   
-+   if(reader.cameraMode == ZBarReaderControllerCameraModeSampling) {
-+       // additional automatic capture configuration here
-+   }
-+   else {
-+       // additional manual capture configuration here
-+   }
-+   
-+   [self presentModalViewController: reader
-+         animated: YES];
++   :Inherits from: :class:`NSObject`
 +
-+If you are using a custom control set
-+(:member:`~ZBarReaderViewController::showsZBarControls`\ ``=NO``), you will
-+want to provide a button attached to ``takePicture`` for the manual capture
-+case.  The built-in controls do this automatically.
-diff --git a/iphone/doc/conf.py b/iphone/doc/conf.py
-new file mode 100644
---- /dev/null
-+++ b/iphone/doc/conf.py
-@@ -0,0 +1,77 @@
-+import sys, os
-+from plistlib import readPlist
++   This is a low-level interface for programmatically scanning images without
++   a user interface.  If you want to scan images manually selected by the user
++   (from the photo library or using the camera), you may prefer to use a
++   :class:`ZBarReaderController` instead.
 +
-+# General configuration
++   This class is a wrapper around a :type:`zbar_image_scanner_t` C object
++   (q.v.)
 +
-+extensions = []
-+templates_path = ['ext']
-+source_suffix = '.rst'
-+master_doc = 'index'
-+exclude_patterns = ['.#*']
 +
-+project = u'ZBar iPhone SDK'
-+copyright = u'2010, Jeff Brown et al'
++Properties
++----------
 +
-+today_fmt = '%Y-%m-%d'
-+info = readPlist('../res/ZBarSDK-Info.plist')
-+version = 'X.Y'
-+if info:
-+    version = info['CFBundleVersion']
-+release = version
++   .. member:: BOOL enableCache
 +
-+#add_module_names = False
++      Enable the inter-frame consistency cache.  Set to ``YES`` for scanning
++      video or ``NO`` for scanning images.
 +
-+pygments_style = 'sphinx'
-+highlight_language = 'objc'
-+primary_domain = 'cpp'
++   .. member:: ZBarSymbolSet results
 +
-+# Options for HTML output
++      Decoded symbols resulting from the last scan.
 +
-+html_theme = 'default'
-+html_theme_options = {
-+    'bgcolor': 'white',
-+    'textcolor': 'black',
-+    'linkcolor': '#247',
-+    'headbgcolor': '#edeff0',
-+    'headtextcolor': '#247',
-+    'headlinkcolor': '#c11',
-+    'sidebarbgcolor': '#247',
-+    'sidebartextcolor': 'white',
-+    'sidebarlinkcolor': '#cde',
-+    'relbarbgcolor': '#247',
-+    'relbartextcolor': '#ccc',
-+    'relbarlinkcolor': 'white',
-+    'footerbgcolor': 'white',
-+    'footertextcolor': 'black',
-+    'codebgcolor': '#dfe',
-+    'codetextcolor': 'black',
-+}
 +
-+html_short_title = 'ZBarSDK ' + version
-+html_title = 'ZBar iPhone SDK Documentation'
-+html_static_path = ['static']
-+html_favicon = '../../zbar.ico'
-+html_style = 'style.css'
-+html_use_modindex = False
-+html_use_index = False
-+html_copy_source = False
-+html_show_sourcelink = False
-+htmlhelp_basename = 'doc'
++Instance Methods
++----------------
 +
-+# Options for LaTeX output
++   .. _`parseConfig:`:
++   .. describe:: - (void) parseConfig:(NSString*)config
 +
-+latex_paper_size = 'letter'
-+latex_font_size = '10pt'
++      Apply scanner/decoder configuration parsed from a string.
 +
-+# Grouping the document tree into LaTeX files. List of tuples
-+# (source start file, target name, title, author, documentclass [howto/manual])
-+latex_documents = [
-+  ('index', 'ZBarSDK.tex', u'ZBar iPhone SDK Documentation',
-+   u'Jeff Brown', 'manual'),
-+]
++      :config: A configuration setting of the form: `symbology.config[=value]`.
 +
-+#latex_logo = ''
-+#latex_use_parts = False
-+#latex_preamble = ''
-+#latex_appendices = []
-+#latex_use_modindex = False
-diff --git a/iphone/doc/custom.rst b/iphone/doc/custom.rst
-new file mode 100644
---- /dev/null
-+++ b/iphone/doc/custom.rst
-@@ -0,0 +1,72 @@
-+Customizing the Interface
-+=========================
++   .. _`setSymbology:config:to:`:
++   .. describe:: - (void) setSymbology:(zbar_symbol_type_t)symbology config:(zbar_config_t)config to:(int)value
 +
-+The reader supports customization of the camera overlay and the integrated
-+help that is displayed.
++      Apply generic scanner/decoder configuration.
 +
++      :symbology: The symbology to effect, or 0 for all.
++      :config: The configuration setting to adjust.
++      :value: The value to set for the specific configuration/symbology.
 +
-+Customizing the Overlay
-+-----------------------
++   .. _`scanImage:`:
++   .. describe:: - (NSInteger) scanImage:(ZBarImage*)image
 +
-+If you are scanning with the camera, whether using a
-+:class:`ZBarReaderViewController` for automatic capture or manually with
-+:class:`ZBarReaderController`, you may want to customize the appearance of the
-+reader.  You do this mainly by setting a
-+:member:`~ZBarReaderViewController::cameraOverlayView`.
++      Scan an image for barcodes using the current configuration.  The image
++      must be in ``Y800`` format (8-bpp graysale).
 +
-+Note that if you are scanning images from the photo library, there is no
-+customization - you are limited to the system picker interface provided by the
-+:class:`UIImagePickerController`.
++      :image: The :class:`ZBarImage` to scan.
++      :Returns: The number of barcode symbols decoded in the image.
 +
-+If you are using a :class:`ZBarReaderViewController`, are *only* planning to
-+support iOS 4 and just want to add to the existing controls, you can simply
-+set your overlay to include the additional view hierarchy::
 +
-+   reader.cameraOverlayView = myLogoImageView;
++Constants
++---------
 +
-+Otherwise, if you are using a :class:`ZBarReaderController`, still need the
-+iOS 3.1 fallback or prefer to completely replace the default controls, you
-+should disable those first.  Note that you will need to provide your own
-+controls, which should at least include a way to dismiss the reader::
++.. type:: zbar_config_t
 +
-+   reader.showsCameraControls = NO;  // for UIImagePickerController
-+   reader.showsZBarControls = NO;
-+   reader.cameraOverlayView = myControlView;
++   ZBAR_CFG_ENABLE
++      Control whether specific symbologies will be recognized.  Disabling
++      unused symbologies improves performance and prevents bad scans.
 +
-+For manual capture with :class:`ZBarReaderController`, you should also include
-+a control connected to :member:`~ZBarReaderController::takePicture`.
++   ZBAR_CFG_EMIT_CHECK
++      Whether to include the check digit in the result data string.  This
++      value may be set individually for symbologies where it makes sense.
 +
-+See :doc:`compat` for more information about iOS 3.1 fallbacks.
++   ZBAR_CFG_MIN_LEN
++      The minimum data length for a symbol to be valid, set to 0 to disable.
++      Use with eg, I2/5 to avoid short scans.  This value may be set
++      individually for variable-length symbologies.
 +
-+In either case, the overlay view may be loaded from a NIB, or simply created
-+programmatically.
++   ZBAR_CFG_MAX_LEN
++      The maximum data length for which a symbol is valid, set to 0 to
++      disable.  Use with eg, I2/5 to enforce a specific range of data lengths.
++      This value may be set individually for variable-length symbologies.
 +
-+You can also disable the tracking rectangle that highlights barcodes with
-+:member:`~ZBarReaderViewController::tracksSymbols`.
++   ZBAR_CFG_UNCERTAINTY
++      Number of "nearby" frames that must contain a symbol before it will be
++      considered valid.  This value may be set for individual symbologies.
 +
++   ZBAR_CFG_POSITION
++      Whether to track position information.  
 +
-+Presenting Help
-+---------------
++   ZBAR_CFG_X_DENSITY
++      The stride to use for scanning vertical columns of the image.  This many
++      pixel columns will be skipped between vertical scan passes.  Useful for
++      trading off between resolution and performance.  This is a scanner
++      setting (use 0 for the symbology).
 +
-+If you have set ``showsZBarControls = NO`` and replaced the default controls,
-+you may still present the built-in help viewer.  Just hook your custom control
-+to the ``showsHelpWithReason:`` method of the controller.  You should only
-+call this method when the reader is actually presented.
++   ZBAR_CFG_Y_DENSITY
++      The stride to use for scanning horizontal columns of the image.  This
++      many pixel rows will be skipped between horizontal scan passes.  Useful
++      for trading off between resolution and performance.  This is a scanner
++      setting (use 0 for the symbology).
+diff -r 563557a923d0 iphone/doc/ZBarReaderController.rst
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/doc/ZBarReaderController.rst	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,156 @@
++ZBarReaderController Class Reference
++====================================
 +
-+The default reader controls invoke ``showsHelpWithReason:`` with a reason
-+parameter of ``"INFO"`` when the info button is tapped.
++.. class:: ZBarReaderController
 +
++   :Inherits from: :class:`UIImagePickerController`
 +
-+Customizing the Help Content
-+----------------------------
++   This is the controller to use for scanning images selected by a
++   :class:`UIImagePickerController` either captured manually using the camera,
++   or selected from the Photo Library.  For more information, see
++   :doc:`picker`.
 +
-+Whether you use the default controls or provide your own, you can still
-+customize the content of the help that is displayed.  The integrated viewer
-+uses a UIWebView to display the contents of :file:`zbar-help.html` that we
-+copied into your Resources.  You should hack this up as you see fit to give
-+your users the best help experience.
++   It can support automatic capture from the camera only if the library is
++   re-built to use private APIs (see :doc:`compat`).
 +
-+To allow for runtime customization based on the reason for presenting help,
-+the javascript function ``onZBarHelp`` will be called just before the page is
-+displayed, with the ``reason`` argument set as provided to
-+``showsHelpWithReason:``.
-diff --git a/iphone/doc/devguide.rst b/iphone/doc/devguide.rst
-new file mode 100644
---- /dev/null
-+++ b/iphone/doc/devguide.rst
-@@ -0,0 +1,13 @@
-+***********************
-+   Developer's Guide
-+***********************
 +
-+.. toctree::
-+   :maxdepth: 2
++Properties
++----------
 +
-+   camera
-+   picker
-+   custom
-+   optimizing
-+   compat
-+   licensing
-diff --git a/iphone/doc/faq.rst b/iphone/doc/faq.rst
-new file mode 100644
---- /dev/null
-+++ b/iphone/doc/faq.rst
-@@ -0,0 +1,113 @@
-+Frequently Asked Questions (FAQ)
-+================================
++   .. member:: ZBarImageScanner *scanner
 +
-+This is the ever-growing list of answers to commonly asked questions.  Please
-+feel free to post you question in our `iPhone Developers forum`_ if you do not
-+find the information you need in this documentation.
++      Access to the image scanner for configuration. (read-only)
 +
-+.. _`iPhone Developers Forum`:
-+   http://sourceforge.net/projects/zbar/forums/forum/1072195
++   .. member:: id<ZBarReaderDelegate> readerDelegate
 +
++      The delegate that will be notified when new barcode results are
++      available.
 +
-+General
-+-------
++   .. member:: BOOL showsZBarControls
 +
-+This looks great...  Where can I get it?
-+   You can download the latest version of the SDK from
-+   http://zbar.sf.net/iphone
++      Whether to display a default control set consisting of cancel, scan and
++      info buttons.  Disable these if you provide your own controls using the
++      :member:`cameraOverlayView`.  Enabling this automatically disables the
++      system controls :member:`showsCameraControls`.  (Default ``YES``).
 +
++   .. member:: BOOL showsHelpOnFail
 +
-+Compatibility
-+-------------
++      Whether to automatically display the integrated help viewer when an
++      image fails to decode.  Even if this is disabled, the integrated help
++      may still be presented manually using ``showHelpWithReason:``.
++      (Default ``YES``)
 +
-+Which iPhone devices does this library support?
-+   The library works *only* with the iPhone 3GS and iPhone 4.
++   .. member:: ZBarReaderControllerCameraMode cameraMode
 +
-+Will you make it work with the iPhone 3G?
-+   *No* - the 3G it is not supported and is unlikely to ever be supported.
++      Scanning mode to use with the camera.  It is generally appropriate to
++      leave this at the default.
 +
-+   To be fair, you *can* use the 3G to scan image files, as long as they're in
-+   focus (ie, *not* images taken by the built-in fixed-focus camera).  There
-+   is at least one application that found a use for this...
++   .. member:: BOOL tracksSymbols
 +
-+What target iOS versions does this library work with?
-+   iOS 4 is fully supported, including the latest video streaming interfaces.
-+   Since Apple has dropped support for earlier versions of iOS on the App
-+   Store, we recommend that you target only iOS 4 for reading barcodes.
++      Whether to display the tracking rectangle around detected barcodes.
 +
-+   iOS 3.1 is also supported, but you will have to resort to manual capture if
-+   you intend to distribute on the App Store.
++   .. member:: BOOL takesPicture
 +
-+   The library should work all the way back to iOS 3.0, although we no longer
-+   test with it.  For most cases we recommend you use at least iOS 3.1, which
-+   introduced several must-have enhancements for the UIImagePickerController
-+   (ie, :member:`~ZBarReaderController::cameraOverlayView` and ``takePicture``)
++      Whether to take a full picture (with ``takePicture``) when a barcode
++      is detected with ``ZBarReaderControllerCameraModeSampling``.  The
++      resulting image will be delayed from the actual decode.
 +
-+   In all cases you will need at least a 4.0 SDK to build.
++   .. member:: BOOL enableCache
 +
-+   See :doc:`compat` for details about iOS version fallbacks.
++      This property is deprecated and should not be modified.
 +
-+Are any private APIs in use?
-+   No - the binary release of the SDK does not use any private APIs.
++   .. member:: CGRect scanCrop
 +
-+   OTOH, if you do not care about private APIs (for instance, you are
-+   targeting AdHoc or enterprise distribution) and you want to enable
-+   automatic capture with iOS 3.1, you can build a version that uses
-+   UIGetScreenImage (which is again a private API).
++      Crop images before scanning.  The original image will be cropped to this
++      rectangle, which should be in normalized image coordinates, x-axis
++      major.  Defaults to the full image ``{{0, 0}, {1, 1}}``.
 +
-+   See :doc:`compat` for details.
++   .. member:: NSInteger maxScanDimension
 +
-+Does this support "automatic" barcode capture?
-+   Yes - if you use iOS 4, the default configuration will capture barcodes
-+   automatically from the video stream.
++      Scale image to scan.  After cropping, the image will be scaled if
++      necessary, such that neither of its dimensions exceed this value.
++      Defaults to 640.
 +
-+   Again, automatic capture is no longer supported with iOS 3.1 for apps
-+   distributed on the App Store.
++   .. note::
 +
++      The remaining properties are inherited from
++      :class:`UIImagePickerController`.
 +
-+Building
-+--------
++   .. member:: UIImagePickerControllerSourceType sourceType
 +
-+I get "Undefined symbols" errors when I try to build?
-+   Most likely you did not add all of the necessary framework dependencies.
-+   See :doc:`tutorial` or :doc:`install` for the list of frameworks you need
-+   to link against.
++      Image source.  Use to select between the camera and photo library.
 +
++   .. member:: BOOL showsCameraControls
 +
-+Licensing
-+---------
++      Whether to display the system camera controls.  Overridden to ``NO``
++      when :member:`showsZBarControls` is ``YES``.
 +
-+Please refer to :doc:`licensing` for questions about licensing.
++   .. member:: UIView *cameraOverlayView
 +
++      A custom view to display over the camera preview.  The tracking layer
++      and default controls will be added to this view if they are enabled.
 +
-+Barcodes
-+--------
++   .. member:: CGAffineTransform cameraViewTransform
 +
-+Why do my UPC barcodes have an extra 0 at the front?
-+   The UPC-A_ symbology is the subset of EAN-13_ that starts with a leading 0.
-+   The ZBar decoder enables only EAN-13_ by default, so GTIN-13_ product codes
-+   are consistently reported.  You can choose to receive the 12-digit results
-+   instead by explicitly enabling UPC-A_.
++      A transform to apply to the camera preview.  Ignored by the reader.
++      Possibly useful for eg, a digital zoom effect.
 +
-+   The :member:`~ZBarSymbol::type` property of the symbol can be used to see
-+   which type of barcode is reported.
++   .. member:: BOOL allowsEditing
 +
-+   See EAN-13_ and UPC-A_ for more information.
++      Whether to enable the system image editing dialog after a picture is
++      taken.  Possibly useful to improve reader results in some cases using
++      manual intervention.
 +
-+Why does my UPC-E (short version) barcode data look completely wrong?
-+   UPC-E_ is a "zero compressed" version of UPC-A_; certain of the zeros are
-+   removed from the UPC-A_ data to generate the UPC-E_ barcode.  The ZBar
-+   decoder *expands* this compression by default, again to consistently report
-+   GTIN-13_ product codes.  You can choose to receive the compressed 8-digit
-+   results instead by explicitly enabling UPC-E_.
 +
-+   The :member:`~ZBarSymbol::type` property of the symbol can be used to see
-+   which type of barcode is reported.
++Instance Methods
++----------------
 +
-+   See UPC-E_ for more information.
++   .. _`showHelpWithReason:`:
++   .. describe:: - (void) showHelpWithReason:(NSString*)reason
 +
-+.. _GTIN-13:
-+.. _GTIN: http://wikipedia.org/wiki/GTIN
-+.. _EAN-13: http://wikipedia.org/wiki/EAN-13
-+.. _UPC-A: http://wikipedia.org/wiki/UPC-A
-+.. _UPC-E: http://wikipedia.org/wiki/UPC-E#Zero-compressed_UPC-E
-diff --git a/iphone/doc/getstarted.rst b/iphone/doc/getstarted.rst
-new file mode 100644
---- /dev/null
-+++ b/iphone/doc/getstarted.rst
-@@ -0,0 +1,12 @@
-+*********************
-+   Getting Started
-+*********************
++      Display the integrated help browser.  Use this with custom overlays if
++      you don't also want to create your own help view.  Should only be called
++      when the reader is displayed.  The ``reason`` argument will be passed to
++      the :func:`onZBarHelp` javascript function.
 +
-+.. toctree::
-+   :maxdepth: 2
-+   :numbered:
++      :reason: A string parameter passed to javascript.
 +
-+   install
-+   tutorial
-+   faq
-+   support
-diff --git a/iphone/doc/index.rst b/iphone/doc/index.rst
-new file mode 100644
---- /dev/null
-+++ b/iphone/doc/index.rst
-@@ -0,0 +1,20 @@
-+###################
-+  ZBar iPhone SDK
-+###################
++   .. _`scanImage:`:
++   .. describe:: - (id <NSFastEnumeration>) scanImage:(CGImageRef)image
 +
-+Welcome to the ZBar SDK for iPhone!
++      Scan an image for barcodes.  This is a wrapper around
++      ``scanner.scanImage`` that applies scanCrop and maxScanDimension.  Some
++      additional result filtering is also performed.
 +
-+This documentation covers all aspects of developing with the SDK: from adding
-+the SDK to your project, to writing code that uses it, even licensing the
-+library with your app.
++      :image: A :class:`CGImage` to scan.
++      :Returns: The result set containing :class:`ZBarSymbol` objects.
 +
-+Please let us know if you find anything inaccurate or lacking (even better,
-+send doc patches!)
 +
-+.. toctree::
-+   :maxdepth: 2
-+   :numbered:
++Constants
++---------
 +
-+   getstarted
-+   devguide
-+   apiref
-diff --git a/iphone/doc/install.rst b/iphone/doc/install.rst
-new file mode 100644
---- /dev/null
-+++ b/iphone/doc/install.rst
-@@ -0,0 +1,135 @@
-+Installing the SDK
-+==================
++.. type:: ZBarReaderControllerCameraMode
 +
-+These are the basic instructions for obtaining the SDK and adding it to an
-+Xcode project.
++   The scanning mode to use with the camera.
 +
-+You may want to try things out with the :doc:`tutorial` before hacking at your
-+own project.
++   ZBarReaderControllerCameraModeDefault
++      The standard mode provided by UIImagePickerController - the user
++      manually captures an image by tapping a control.  This is the default
++      unless private APIs are enabled.
 +
++   ZBarReaderControllerCameraModeSampling
++      Automatically capture by taking screenshots with
++      :func:`UIGetScreenImage`.  Resolution is limited to the screen
++      resolution, so this mode is inappropriate for longer codes.  Only
++      available when private APIs are enabled, and becomes the default mode in
++      that case.
 +
-+Requirements
-+------------
++   ZBarReaderControllerCameraModeSequence
++      Experimental mode that automatically scans by "rapidly" scanning
++      pictures captured with ``takePicture``.  Not recommended for serious
++      use.
 +
-+You will need *all* of the following to develop iPhone applications
-+using this SDK:
++.. c:var:: NSString *ZBarReaderControllerResults
 +
-+* Mac OS X >= 10.6.x (Snow Leopard)
-+* Xcode >= 3.2.3
-+* iPhone SDK >= 4.0
-+* An iPhone 3GS or iPhone 4
-+* iOS >= 3.1 running on the device (>= 4.0 is preferred)
++   The info dictionary key used to return decode results to
++   ``imagePickerController:didFinishPickingMediaWithInfo:``
+diff -r 563557a923d0 iphone/doc/ZBarReaderDelegate.rst
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/doc/ZBarReaderDelegate.rst	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,70 @@
++ZBarReaderDelegate Protocol Reference
++=====================================
 +
-+.. warning::
++.. class:: ZBarReaderDelegate
 +
-+   *Only* the iPhone 3GS and iPhone 4 are supported, as they have a camera
-+   with auto-focus.  The ZBar library does not support the iPhone 3G and is
-+   unlikely to ever support it.
++   :Inherits from: :class:`UIImagePickerControllerDelegate`
 +
++   This protocol must be implemented by the
++   :member:`~ZBarReaderViewController::readerDelegate` provided to a
++   :class:`ZBarReaderViewController` or :class:`ZBarReaderController`.  It is
++   used to notify the delegate of new decode results, when an image fails to
++   decode, or when the user dismisses the reader with the built-in controls.
 +
-+Downloading
-+-----------
 +
-+Download the latest binary release of the ZBar SDK from
++Instance Methods
++----------------
 +
-+http://zbar.sourceforge.net/iphone
++   .. describe:: - (void) imagePickerController:(UIImagePickerController*)picker didFinishPickingMediaWithInfo:(NSDictionary*)info
 +
++      This inherited delegate method is called when a barcode is successfully
++      decoded.  The decoded symbols are available from the dictionary as a
++      :class:`ZBarSymbolSet` using the :c:data:`ZBarReaderControllerResults`
++      key.  The image from which the barcodes were scanned is available using
++      the :c:data:`UIImagePickerControllerOriginalImage` key.  No other keys
++      are guaranteed to be valid.
 +
-+Integration
-+-----------
++      .. note::
 +
-+The recommended installation method is to simply copy the SDK into your
-+Xcode project:
++         The ``picker`` parameter will be the reader controller instance that
++         read the barcodes - not necessarily a
++         :class:`UIImagePickerController` instance.  You should cast it to the
++         correct type for anything other than basic view controller access.
 +
-+1. Open ZBarSDK-|version|.dmg in the Finder.
++      :picker: The reader controller that scanned the barcode(s).
++      :info: A dictionary containing the image and decode results.
 +
-+2. Drag the :file:`ZBarSDK` folder into your Xcode project.  In the dialog
-+   that appears, you should choose to **copy** the SDK into your project by
-+   checking the box.  The target that you want to link with the library should
-+   also be selected in the target list.
++   .. describe:: - (void) imagePickerControllerDidCancel:(UIImagePickerController*)picker
 +
-+4. Link the following additional frameworks to any targets that link with the
-+   ZBarSDK.  You should set the first three to use weak references and
-+   configure an appropriate deployment target if you still need to support
-+   iOS 3.1:
++      Called when the user taps the "Cancel" button provided by the built-in
++      controls (when :member:`showsZBarControls`\ ``=YES``).  The default
++      implementation dismisses the reader.  If this method is implemented, it
++      should do the same.
 +
-+   * :file:`AVFoundation.framework` (weak)
-+   * :file:`CoreMedia.framework` (weak)
-+   * :file:`CoreVideo.framework` (weak)
-+   * :file:`QuartzCore.framework`
-+   * :file:`libiconv.dylib`
++      .. note::
 +
-+   If you check "Link Binary With Libraries" for the target(s), you should see
-+   all of these frameworks along with :file:`libzbar.a`.
++         The ``picker`` parameter will be the reader controller instance that
++         read the barcodes - not necessarily a
++         :class:`UIImagePickerController` instance.  You should cast it to the
++         correct type for anything other than basic view controller access.
 +
-+5. Import the SDK header from your prefix header to make the barcode reader
-+   APIs available::
++      :picker: The reader controller that scanned the barcode(s).
 +
-+      #import "ZBarSDK.h"
++   .. describe:: - (void) readerControllerDidFailToRead:(ZBarReaderController*)reader withRetry:(BOOL)retry
 +
-+Proceed to :doc:`camera` or :doc:`picker` to learn about using the reader APIs
-+to scan barcodes.  Use the :doc:`apiref` for specific interface details.
++      Called when an image, manually captured or selected from the photo
++      library, is scanned and no barcodes were detected.
 +
++      If the ``retry`` parameter is ``NO``, the controller must be dismissed
++      before this method returns.  Otherwise, another scan may be attempted
++      without re-presenting the controller.
 +
-+Upgrading from an Older Version
-+-------------------------------
++      If the :member:`~ZBarReaderController::showsHelpOnFail` is ``YES`` *and*
++      ``retry`` is ``YES``, the integrated help viewer will already be
++      presenting.
 +
-+If you are using an older version of the *SDK* (NB, skip to the next section
-+if you are currently using Mercurial), upgrading is straightforward:
++      If this method is not implemented, the controller will be dismissed iff
++      ``retry`` is ``NO``.
 +
-+1. Delete the current ZBarSDK group from your project.  You should choose
-+   to delete the files if you copied them into your project.
-+2. Drag the new ZBarSDK from the DMG into your project.
++      :reader: The :class:`ZBarReaderController` that scanned the barcode(s).
++      :retry: Whether another scan may be attempted.
+diff -r 563557a923d0 iphone/doc/ZBarReaderView.rst
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/doc/ZBarReaderView.rst	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,126 @@
++ZBarReaderView Class Reference
++==============================
 +
-+Clean out and rebuild your project with the new version.
++.. class:: ZBarReaderView
 +
++   :Inherits from: :class:`UIView`
 +
-+Upgrading a Pre-SDK Integration
-+-------------------------------
++   This is a barcode reader encapsulted in a UIView.  It manages an
++   :class:`AVCaptureSession` with a camera device and a
++   :class:`ZBarCaptureReader`, presents the video preview and optionally
++   tracks detected barcode symbols.  A delegate will usually be assigned for
++   notification of new decode results.
 +
-+If your project was using the library directly from the Mercurial repository,
-+before the SDK was introduced, there are a few incompatibilities that
-+you must resolve in order to upgrade.  Don't worry - all of you source stays
-+the same, you just need to update how the library is included in the project
-+and how the headers are imported.
 +
-+Switching to the Binary Distribution
-+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
++Properties
++----------
 +
-+This approach is recommended - the binary releases provide you with a stable
-+development platform, isolating you from temporary instability and transient
-+problems that may occur at the bleeding edge.
++   .. member:: id<ZBarReaderViewDelegate> readerDelegate
 +
-+The first task is to reverse the previous ZBar integration:
++      The delegate that will be notified of new decode results.
 +
-+1. Remove the reference to zbar.xcodeproj from your project.
-+2. Remove any :file:`zbar-*` files from your Resources.
-+3. In the target build settings, remove any "Header Search Paths" that
-+   reference zbar.
-+4. Remove any references to zbar headers in your :file:`prefix.pch` or source
-+   files.
++   .. member:: ZBarImageScanner *scanner
 +
-+Now just continue with the `integration`_ instructions above and you should be
-+back up and running!
++      Access to the image scanner is provided for configuration. (read-only)
 +
-+Continuing with Mercurial
-+^^^^^^^^^^^^^^^^^^^^^^^^^
++   .. member:: BOOL tracksSymbols
 +
-+Alternatively, you may still prefer to select Mercurial revisions.  You have a
-+few choices for this:
++      Whether to display the tracking annotation (default ``YES``).
 +
-+* You may build your own ZBarSDK and copy/link it into your project.  This is
-+  the same as `Switching to the Binary Distribution`_, except that you use
-+  your own version of the SDK.  In this case you need to manually rebuild the
-+  SDK when you update it.
-+* You may leave zbar.xcodeproj as a project dependency and pull the SDK into
-+  your project.  This is not well tested, so ymmv.
-+* You may leave zbar.xcodeproj as a project dependency and just link libzbar.a
-+  into your project, as before.  You will need to update the target dependency
-+  (the library target changed names to libzbar) and add the
-+  :file:`iphone/include/ZBarSDK` directory to "Header Search Paths"
++   .. member:: UIColor *trackingColor
 +
-+In any case, you should remove the references to the zbar headers from
-+:file:`prefix.pch` (or your source files) and replace them with::
++      The color of the tracking annotation (default green).
 +
-+   #import "ZBarSDK.h"
-diff --git a/iphone/doc/licensing.rst b/iphone/doc/licensing.rst
-new file mode 100644
---- /dev/null
-+++ b/iphone/doc/licensing.rst
-@@ -0,0 +1,187 @@
-+Licensing the Library
-+=====================
++   .. member:: BOOL allowsPinchZoom
 +
-+First of all, the big disclaimer:
++      Enable pinch gesture recognition for manually zooming the preview/decode
++      (default ``YES``).
 +
-+.. warning::
++   .. member:: NSInteger torchMode
 +
-+   We are *not* lawyers; we cannot help you decide if you should use the
-+   library or how to apply the license, only your lawyer can advise you
-+   concerning legal matters.
++      An :type:`AVCaptureTorchMode` value that will be applied if/when
++      appropriate.  (default Auto)
 +
-+That said, it should also be noted that we have neither the resources (time,
-+cash, etc) nor the patience to enforce the license (at all); the reality is
-+that all of this is left to your discretion.
++   .. member:: BOOL showsFPS
 +
-+If you prefer to leave the lawyers out of it, the rest of this section will
-+help you apply the license to your application.
++      Overlay the decode frame rate on the preview to help with performance
++      optimization.  This is for *debug only* and should not be set for
++      production.  (default ``NO``)
 +
++   .. member:: CGFloat zoom
 +
-+Licensing FAQ
-+-------------
++      Zoom scale factor applied to the video preview *and* scanCrop.  This
++      value is also updated by the pinch-zoom gesture.  Valid values are in
++      the range [1,maxZoom].  (default 1.25)
 +
-+Can I use this library with my proprietary (closed source) application?
-+   Yes, that is our intent and we do not believe there is any problem
-+   regarding the license.
++   .. member:: CGFloat maxZoom
 +
-+Will I need to open source my entire app?
-+    No, it is not required by the license.
++      Maximum settable zoom level.  The zoom property will be clipped to this
++      value.
 +
-+Will I need to distribute all of my "object files" on the App Store?
-+    No, this is also not required by the license, although you should offer to
-+    provide them upon request.  See below for more detail.
++   .. member:: CGRect scanCrop
 +
-+But I read somewhere that "iPhone apps may not use LGPL code"?
-+   That statement is an over-generalization that does not apply in this case.
-+   Most likely your source is either:
++      The region of the video image that will be scanned, in normalized image
++      coordinates.  Note that the video image is in landscape mode (default
++      {{0, 0}, {1, 1}})
 +
-+   * referring to the GPL, which is significantly different from the
-+     *L*\ GPL
-+   * referring to a different version of the LGPL; we intentionally use
-+     version 2.1, which has specific static linking exceptions.
-+   * not a lawyer either and too lazy to read the whole license
++   .. member:: CGAffineTransform previewTransform
 +
-+   Basically, if you leverage the appropriate sections of the license, it
-+   should be fully compatible with the App Store restrictions and
-+   requirements.
++      Additional transform that will be applied to the video preview.  Note
++      that this transform is *not* applied to scanCrop.
 +
-+This is too complicated, can I just pay for an easier license?
-+   No, it is not possible.  There are multiple problems with this approach,
-+   some brief highlights:
++   .. member:: AVCaptureDevice *device
 +
-+   * Most open source projects (including this one) do not have a single
-+     author.  Tracking down every contributor and getting their approval could
-+     be quite a challenge.
-+   * The license is meant to protect users' rights to the software.  Giving
-+     you special treatment bypasses the protection we offered them,
-+     effectively revoking their rights.  This would be a violation of their
-+     trust and completely defeats the purpose of the license.
++      The capture device may be manipulated or replaced.
 +
-+   You may think of this as the "price" you pay for using our open source
-+   library.  If you want to make your life easier, you should be petitioning
-+   Apple for shared library support...
++   .. member:: AVCaptureSession *session
 +
-+What if you add a clause that lets me do whatever I want?
-+   No, also not possible.  In addition to the problems mentioned above, there
-+   are even more problems with this:
++      Direct access to the capture session.  Warranty void if opened.
++      (read-only)
 +
-+   * Sourceforge requires an OSI approved license for hosting our project;
-+     an altered license would no longer be approved.
-+   * Again we are not lawyers and therefore not qualified to change the
-+     license, we would have to pay one of those slimy buggers to do it.
++   .. member:: ZBarCaptureReader *captureReader
 +
-+Do I need to add an "about" dialog to display your copyright/license?
-+   No, not as such.  We won't discourage you from plugging the library if you
-+   like, but it is not a requirement.  You should think of our license as a
-+   supplement to your own software license, therefore it is appropriate to
-+   display it where (and only where) you display your own:
++      Direct access to the capture reader.  Warranty void if opened.
++      (read-only)
 +
-+   * If you follow Apple's recommendation, the App Store is the only place
-+     that the user accesses your license, so it should also be the only place
-+     where the library supplement is available.
-+   * If your app already has some kind of "about" view that displays your
-+     copyright/license information, it is also appropriate to display the same
-+     information for the library.
++   .. member:: BOOL enableCache
 +
-+Do I need to include the entire library in my application bundle?
-+   No, it is not necessary:
++      :Deprecated:
 +
-+   * If you have not modified the library, it is sufficient to provide a link
-+     to the project and the version information.
-+   * If you are using a modified version, you may provide a link to download
-+     that instead of including it in the bundle.
++      Whether to use the inter-frame consistency cache.  This should always be
++      set to ``YES``.
 +
 +
-+Modifications
-+-------------
++Instance Methods
++----------------
 +
-+What is a "modification"?  Again, we leave it to your discretion with this
-+guidance:
++   .. describe:: - (id) initWithImageScanner:(ZBarImageScanner*)imageScanner
 +
-+* If you use the distributed binary SDK you have certainly not modified the
-+  library.
-+* If you are working from Mercurial, *any* change you have made to the
-+  "source code" of the library is a modification, it does not matter how
-+  trivial.  You can see what changes have been made by running
-+  ``hg status -mard``; if this command outputs anything, you have modified
-+  the library.
++      :imageScanner: A pre-configured :class:`ZBarImageScanner` to use for scanning
++      :Returns: The initialized :class:`ZBarReaderView`
 +
-+If you find that you have made changes to the library, you should carefully
-+consider how far you want to proceed down that path.  Once you publish your
-+changes you have created a "fork" of the project which you now need to
-+maintain.  Are you prepared to merge every time the library is updated?
++   .. describe:: - (void) start
 +
-+If your change adds a useful feature to the library, we absolutely encourage
-+you to submit patches.  Assuming you can get your patch into the project, then
-+you will no longer need to use a modified version!  When submitting patches,
-+ensure that your changes are appropriate for all of our users.  Specifically,
-+we are not interested in patches that simply hack up the library to work the
-+way you want.  Compare a patch that changes the default behavior to your
-+preference (probably not acceptable), to a patch that adds a new configuration
-+to support the feature you have added (probably fine).
++      Begin/resume scanning after a call to ``stop``.
 +
++   .. describe:: - (void) stop
 +
-+Object File Distribution
-+------------------------
++      Stop scanning and pause the video feed.
 +
-+Section 6 of the LGPL v2.1 specifically permits static linking with the
-+library.  If your project is not open source, this section does require that
-+you make your object files available to your users.  The intent, as indicated
-+in the license, is that a user who has obtained your software may exercise
-+their right to modify the library and then re-link their modified version into
-+your application.
++   .. describe:: - (void) flushCache
 +
-+We recommend that you apply Subsection 6c, which only requires that you make a
-+written offer to provide the object files.  Now...if you consider the actual
-+utility of this mechanism - that it is only applicable to developers, and only
-+those with in depth knowledge of the tools, the time required for development
-+- all to have a new barcode reader in a specific version of your application
-+that only they can use, the reality is that no one is going to request this.
-+You probably should not even waste time preparing for it until a request is
-+made.
++      Flush the inter-frame consistency cache.  Any barcodes in the frame will
++      be re-recognized in subsequent frames.
 +
-+Additionally, to avoid "casual requests" from nefarious types that just want
-+to inconvenience you, also consider charging a fee for the distribution of
-+this material (as permitted by the license); just add up the cost of burning
-+and shipping a disk.  If this cost is "large" compared to the price of your
-+app, the likelyhood of a request is reduced even further.
++   .. _`setZoom:animated:`:
++   .. describe:: - (void) setZoom:(CGFloat)zoom animated:(BOOL)animated
 +
++      Set the zoom property with optional animation.
 +
-+Using the Unmodified Library
-+----------------------------
++   .. _`willRotateTointerfaceOrientation:duration:`:
++   .. describe:: - (void) willRotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation duration:(NSTimeInterval)duration
 +
-+Applying the license in this case is somewhat simpler.  These are the basic
-+steps you can follow:
++      Compensate for device / camera / interface orientation.  Must be called
++      by containing view controller that supports any non-portrait orientation
++      to restore the camera preview to the correct orientation.  Call from
++      view controller method of the same name for correct animation.
+diff -r 563557a923d0 iphone/doc/ZBarReaderViewController.rst
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/doc/ZBarReaderViewController.rst	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,190 @@
++ZBarReaderViewController Class Reference
++========================================
 +
-+1. Verify that the rest of your software license is compatible with the LGPL.
-+   You cannot use the library if they are incompatible.
++.. class:: ZBarReaderViewController
 +
-+   For those using the default App Store license, we have reviewed this and
-+   believe it is compatible with the LGPL.
++   :Inherits from: :class:`UIViewController`
 +
-+2. At the end of your license text, in an annex or supplement, start by
-+   declaring your use of the library and offering a link to the project.
-+   Something like this:
++   This is the controller to use for live scanning from the camera feed with
++   automatic capture.  For scanning from image files or with manual capture,
++   see :class:`ZBarReaderController`.
 +
-+      This software uses the open source ZBar Barcode Reader library, version
-+      |version|, which is available from http://zbar.sourceforge.net/iphone
 +
-+   If you built your own version of the library, replace the version callout
-+   with eg, "cloned from Mercurial revision xxxxxxxx"
++Properties
++----------
 +
-+3. Then append the contents of the text file COPYING, included with the
-+   library.  This is all of the copyright information for the library.
++   .. member:: ZBarImageScanner *scanner
 +
-+4. Then append the contents of the text file LICENSE, also included with the
-+   library.  This is just the LGPL version 2.1 which you may also obtain from
-+   http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html
++      Access to the image scanner for configuration. (read-only)
 +
-+5. You may choose to make the written offer for the object files explicit.
-+   Provide some text and whatever link or email address is appropriate.
++   .. member:: id <ZBarReaderDelegate> readerDelegate
 +
++      The delegate that will be notified when new barcode results are
++      available.
 +
-+Using a Modified Library
-+------------------------
++   .. member:: BOOL showsZBarControls
 +
-+We intentionally leave this option vague and force you to refer to the license
-+as an underhanded way of encouraging you to contribute back to the project ;)
-diff --git a/iphone/doc/optimizing.rst b/iphone/doc/optimizing.rst
-new file mode 100644
---- /dev/null
-+++ b/iphone/doc/optimizing.rst
-@@ -0,0 +1,437 @@
-+Optimizing the Reader
-+=====================
++      Whether to display a default control set consisting of cancel, scan and
++      info buttons.  Disable these if you provide your own controls using the
++      :member:`cameraOverlayView`.  (Default ``YES``).
 +
-+As good as the iPhone performance is for a mobile device, the reality from an
-+image processing perspective is that it represents a lower performance target.
-+While the default configuration of the iPhone reader has been carefully tuned
-+for the general case, you can often obtain much better results if you optimize
-+for your specific application.
++   .. member:: BOOL tracksSymbols
 +
-+.. note::
++      Whether to display the tracking rectangle around detected barcodes.
 +
-+   Performance is a complex topic.  The only way to tune performance is by
-+   changing settings and comparing measured results.  If you are not
-+   comfortable with the concepts presented here, it is recommended that you
-+   leave the settings at the defaults and avoid compromising reliability.
++   .. member:: NSUInteger supportedOrientationsMask
 +
-+Performance of the barcode reader is generally evaluated by two factors:
++      Set of interface orientations that the controller should support.  Use
++      :func:`ZBarOrientationMask` or ``ZBarOrientationMaskAll`` to
++      generate the mask.
 +
-+* The **latency** - how quickly it "recognizes" a barcode.  Specifically this
-+  is the time from when the user puts a barcode in the frame or selects an
-+  image until a response is indicated back to the them.
++   .. member:: CGRect scanCrop
 +
-+* The **reliability** - it does not matter how quickly an image is scanned if
-+  an incorrect result is returned.  That may seem obvious, but bad decodes
-+  *are* possible and you need to keep this in mind when changing settings that
-+  affect the reliability of the reader.
++      Crop images before scanning.  The original image will be cropped to this
++      rectangle, which should be in normalized image coordinates (NB the
++      camera image x-axis is *vertical* on the screen).  Defaults to the full
++      image ``{{0, 0}, {1, 1}}``.
 +
-+Basically our goal is to optimize the latency without sacrificing reliability.
-+There are several factors that contribue to latency:
++   .. member:: UIView *cameraOverlayView
 +
-+* The **quality** of the barcode image.  Quality includes the available
-+  resolution, focus, lighting, noise, etc.  We have more control over some of
-+  these than others.
++      A custom view to display over the camera preview.
 +
-+* The **camera**.  When scanning from the camera, the time for the
-+  autoexposure and autofocus to converge on an image that can be decoded is a
-+  significant contribution to the overall latency.
++   .. member:: CGAffineTransform cameraViewTransform
 +
-+* The **frame rate** of the reader - this translates to the time it takes the
-+  scanner to process an image.
++      A transform to apply to the camera preview.  Ignored by the reader.
 +
-+* The **effort level** of the reader - some of the available settings control
-+  "how hard" the reader tries to find barcodes in each frame.
++   .. member:: UIImagePickerControllerCameraDevice cameraDevice
 +
-+* The **delegate latency** - the time spent in your application after a
-+  barcode has been detected until the user is notified.
++      The camera device to use for scanning.  Defaults to the system default
++      camera.
 +
-+Most of these factors are interrelated.  We will discuss those we can control
-+in detail, as well the settings you use to affect them.  Then we will provide
-+a few specific case examples.
++   .. member:: UIImagePickerControllerCameraFlashMode cameraFlashMode
 +
++      The "flash" (aka torch) mode to use while scanning.  Defaults to
++      UIImagePickerControllerCameraFlashModeAuto.
 +
-+Measuring Performance
-+---------------------
++   .. member:: UIImagePickerControllerQualityType videoQuality
 +
-+Subjective response times are a good place to start (does it "feel" responsive
-+to you?), and possibly the only way to evaluate the overall experience, but to
-+compare incremental changes to interrelated settings and have meaningful
-+performance discussions with others, we need a more quantitative approach.
++      The resolution to use while scanning.  Defaults to
++      UIImagePickerControllerQuality640x480.
 +
-+The :func:`mach_absolute_time` function is a good tool for accurately
-+measuring small delays.  Research this function and learn how to apply it.  As
-+when measuring any real-world value, keep in mind that some variance is to be
-+expected - even if you perform exactly the same operation multiple times, you
-+will not see exactly the same measurement.  You should collect several
-+samples, discard any obvious outliers, and average the remaining measurements.
++   .. member:: ZBarReaderView *readerView
 +
-+One way that the overall reader latency may be evaluated is by manually
-+marking the time when the barcode is presented to the reader.  Add a control
-+to your overlay that captures the start time when tapped and compare this to
-+the end time, just before your delegate returns.
++      View that presents the camera preview and performs the scanning.  This
++      view has other properties you may use to control the appearance and
++      behavior of the reader.
 +
-+The reader continually monitors the frame rate at which it is running.  The
-+measured value may be displayed for debugging purposes by enabling the
-+:member:`~ZBarReaderView::showsFPS` property.  The readertest example does
-+this and also provides control over many of the available settings, so you can
-+quickly test how each setting affects the frame rate.  You should target your
-+optimization efforts to achieve a frame rate of at least 8-10fps, although
-+12-15fps is preferable.
++      Note that this view may be released when it is not displayed (eg, under
++      low memory conditions).  You should apply any configuration just before
++      you present the reader.
 +
-+You can measure the latency of your delegate using :func:`mach_absolute_time`.
-+The measured value should be less than about 100ms, the smaller the better, to
-+avoid noticeable lag.
++   .. member:: BOOL enableCache
 +
-+The readertest is a good tool for testing the performance of the reader.  You
-+can tune the settings appropriately for your application and evaluate the
-+effect each change has on the performance.
++      This property is deprecated and should not be modified.
 +
++   .. warning::
 +
-+Delegate Latency
-+----------------
++      The remaining properties are deprecated, they are only present for
++      backward compatibility with :class:`ZBarReaderController` and will raise
++      an exception if inappropriate/unsupported values are set.
 +
-+This latency contributor is the easiest for you to effect (and sometimes the
-+easiest to overlook).  You delegate method should update the interface -
-+dismiss the controller or update your overlay to indicate success - and
-+*nothing* else.  All other processing should be deferred until after the
-+animations have started.
++   .. member:: UIImagePickerControllerSourceType sourceType
 +
++      Raises an exception if anything other than
++      ``UIImagePickerControllerSourceTypeCamera`` is set.  If you want to scan
++      images, use a :class:`ZBarReaderController` instead of this class.
 +
-+Image Quality
-+-------------
++   .. member:: UIImagePickerControllerCameraCaptureMode cameraCaptureMode
 +
-+Resolution
-+^^^^^^^^^^
++      Raises an exception if anything other than
++      ``UIImagePickerControllerCameraCaptureModeVideo`` is set.
 +
-+One might think that "more is better" in terms of resolution, but this is not
-+necessarily the case.  Given average image quality, the ideal resolution for
-+scanning is right around three pixels per barcode "module" (the width of the
-+smallest bar or space).  Note that this measure is not an absolute image size
-+or even a measure of the physical dimensions represented by a pixel sample, it
-+*only* describes the sampled size of the barcode in the image.
++   .. member:: BOOL allowsEditing
 +
-+As the resolution decreases below about two pixels per module, edge fidelity
-+is lost and the bars and spaces start to merge together, making it impossible
-+(for this library) to scan.  This affects the density (feature size) and
-+maximum size (data capacity) of the barcodes that can be detected.
-+Conversely, as the resolution increases above about 4 pixels per module, noise
-+can interfere with the edge detection and images will take longer to process.
++      Raises an exception if anything other than ``NO`` is set.
 +
-+Other quality factors, such as poor focus, bad lighting or even excessive
-+noise, can increase (or decrease) the resolution requirement.
++   .. member:: BOOL showsCameraControls
 +
-+When scanning from the camera, the reader defaults to 640x480, which is good
-+for most applications.  On the iPhone 4, you can increase this using a capture
-+:member:`~ZBarReaderView::session` preset.  The iPhone 3GS does not have a
-+higher resolution option available.
++      Raises an exception if anything other than ``NO`` is set.  Use
++      :member:`showsZBarControls` to disable the buit-in overlay.
 +
-+For scanning images, you can use
-+:member:`~ZBarReaderController::maxScanDimension` to control the scaled size
-+of the converted image, or resort to converting them yourself.
++   .. member:: BOOL showsHelpOnFail
 +
-+If you want to read long linear barcodes or dense 2-D symbols, you will
-+probably want to increase the resolution by adjusting these settings.
++      Any value set to this property is ignored.  It is only useful for
++      scanning images, for which you should use :class:`ZBarReaderController`.
 +
-+Keep in mind that more pixels will take longer to scan, refer to the `frame
-+rate`_ discussion for ways to compensate.
++   .. member:: ZBarReaderControllerCameraMode cameraMode
 +
-+Focus
-+^^^^^
++      This reader only supports scanning from the camera feed.  If you want to
++      scan manually captured images, use a :class:`ZBarReaderController`
++      instead of this class.
 +
-+Ideally we would fix the focus at a calculated optimum distance and optimize
-+the aperture selection to maximize the depth of field.  Unfortunately the APIs
-+do not currently give us control over any of these settings, the best we can
-+do (as of iOS 4) is continuous auto-focus mode - this mode is configured by
-+the reader automatically.  It can still take the device as long as 1-2 seconds
-+to find the appropriate macro focus setting, but there just isn't much we can
-+do about that.
++   .. member:: BOOL takesPicture
 +
-+Lighting and Exposure
-+^^^^^^^^^^^^^^^^^^^^^
++      Raises an exception if anything other than ``NO`` is set.  This
++      controller automatically returns the scanned camera frame and does not
++      support capturing a separate image.
 +
-+An image that is too bright or overexposed can completely wash out any
-+barcodes.  An image that is too dark or underexposed will not provide
-+sufficient contrast for the scanner.  Low light levels also tend to produce
-+noisier images, possibly because the driver uses a faster "ISO" setting to
-+compensate for the lighting.
++   .. member:: NSInteger maxScanDimension
 +
-+The camera defaults to continuous automatic exposure and white balance.  Since
-+there are no other useful values, the reader leaves these unchanged from their
-+default setting.
++      Any value set to this property is ignored.  It is only useful for
++      scanning images, for which you should use :class:`ZBarReaderController`.
 +
-+For the iPhone 4 device, the "torch" can be enabled to provide additional
-+illumination for the camera in low-light conditions.  The reader sets the
-+torch to automatic by default, so it should turn on only when needeed...
-+There have been some reports that the torch turns on inappropriately, washing
-+out the image.  If you find that this occurs, you should instead set the
-+:member:`~ZBarReaderView::torchMode` property of the :class:`ZBarReaderView`
-+to ``Off``.
 +
-+For scanning images from another source, you are again stuck with the
-+available image quality.  If you have any control over the image source, you
-+should do what you can to fix quality problems there.
++Class Methods
++-------------
 +
-+Noise
-+^^^^^
++   .. describe:: + (BOOL) isSourceTypeAvailable:(UIImagePickerControllerSourceType)source
 +
-+Some level of noise is filtered by the reader, but excessive noise levels
-+create additional edges in the image which corrupt barcodes and increase
-+scanning time (decreasing the frame rate).
++      Returns ``YES`` only if ``source`` is ``Camera`` and the
++      :class:`UImagePickerController` method of the same name also returns
++      ``YES``.
 +
-+As mentioned with `lighting and exposure`_, noise mostly becomes a problem
-+when the light-level is too low, but high-resolution images may also increase
-+exposure to sensor noise.
++   .. describe:: + (BOOL) isCameraDeviceAvailable:(UIImagePickerControllerCameraDevice)cameraDevice
 +
-+We compensate for noise by *reducing* the `resolution`_ from the sensor
-+maximum.  Scaling the image down has the effect of averaging several pixels
-+into one value, filtering out the high-frequency noise component.
++      See the :class:`UImagePickerController` method of the same name.
 +
++   .. describe:: + (BOOL) isFlashAvailableForCameraDevice:(UIImagePickerControllerCameraDevice)cameraDevice
 +
-+Frame Rate
-+----------
++      See the :class:`UImagePickerController` method of the same name.
 +
-+The time it takes to scan and decode an image/frame is roughly proportional to
-+the number of pixels that are processed.  The number and type of enabled
-+symbologies and image noise can also affect the processing time.
++   .. describe:: + (NSArray*) availableCaptureModesForCameraDevice:(UIImagePickerControllerCameraDevice)cameraDevice
 +
-+We have several knobs available that affect the frame rate.  Most of these are
-+geared toward reducing the number of image pixels that are scanned.
++      Returns an array with the single element
++      ``UIImagePickerControllerCameraCaptureModeVideo`` if the device is
++      avilable, otherwise returns an empty array.
 +
-+Decrease the Resolution
-+^^^^^^^^^^^^^^^^^^^^^^^
 +
-+Adjusting the resolution of the image is an easy way to quickly reduce the
-+number of pixels.  Smaller images also mean there is less data to carry
-+around, which helps performance in other ways.  For example, reducing each
-+image dimension by 30% (eg, from 640x480 to 448x336) will about double the
-+speed of the reader (to a point).  [FIXME verify!]
++Instance Methods
++----------------
 +
-+Adjusting the resolution is `described above <resolution>`_.  As mentioned
-+there, reducing the resolution will negatively impact the minimum feature size
-+and maximum barcode size that can be scanned, but it will help filter noise.
++   .. _`showHelpWithReason:`:
++   .. describe:: - (void) showHelpWithReason:(NSString*)reason
 +
-+Crop the Scan Region
-+^^^^^^^^^^^^^^^^^^^^
++      Display the integrated help browser.  Use this with custom overlays if
++      you don't also want to create your own help view.  Should only be called
++      when the reader is displayed.  The ``reason`` argument will be passed to
++      the :func:`onZBarHelp` javascript function.
 +
-+It may not always be necessary for an application to scan all the way to the
-+edges of the image.  By cropping the scan area, you can get most of the
-+benefits of reduced resolution without sacrificing the minimum feature size.
-+Cropping will also not affect image noise, but similar to decreasing the
-+resolution, it does affect the maximum size barcode that can be scanned.
++      :reason: A string parameter passed to javascript.
 +
-+For all cases you set the crop rectangle
-+:class:`~ZBarReaderViewController::scanCrop` property.  Note that the
-+rectangle provided to the controller is *normalized* across image size and
-+rotation.  This means that the coordinates range from 0 to 1 and the axes will
-+be arranged such that the x-axis of the crop rectangle corresponds to the
-+major (longer) image axis.
++   .. _`takePicture`:
++   .. describe:: - (void) takePicture
 +
-+Your interface will typically need to indicate the cropped scan area to the
-+user with visual queues.  Use the
-+:class:`~ZBarReaderViewController::cameraOverlayView` to provide this.
++      Capture the next available frame and send it over the usual delegate
++      path.
 +
-+By default, the :class:`ZBarReaderView` recognizes a pinch gesture to
-+digitally zoom the preview around the center of the image.  This zoom does not
-+affect the resolution of the image, but it does crop the scan region to the
-+visible area.  You can also disable the pinch gesture and set the
-+:class:`~ZBarReaderView::zoom` programmatically.
 +
-+Limit the Scan Density
-+^^^^^^^^^^^^^^^^^^^^^^
++Macros
++------
 +
-+The scanner works by making scan passes across the pixel rows and colums of
-+the image.  The density of the passes is configured at the scanner as a pixel
-+stride for each axis.  ``ZBAR_CFG_Y_DENSITY`` (``ZBAR_CFG_X_DENSITY``)
-+controls the number of pixel rows (columns) that are skipped between
-+successive horizontal (vertical) scan passes.  (Note that "density" is really
-+not a good name for the configuation settings... "stride" might be more
-+appropriate.)
++   .. function:: ZBarOrientationMask(interfaceOrientation)
 +
-+Decreasing the scan density (by increasing the stride setting) is a great way
-+to limit the processing (increasing the frame rate) without sacrificing scan
-+resolution - each scan pass is still made at full image resolution, there are
-+just fewer passes (less redundancy).
++      Generate a bit-mask for the specified interface orientation, suitable
++      for setting :member:`supportedOrientationsMask`.
 +
-+Setting the stride value to 0 completely disables scanning in that direction.
-+This is very useful when reading linear codes with a visual alignment guide -
-+scanning parallel to the bars is a waste of cycles which may be better applied
-+to support higher resolution or increased density of scans across the symbol.
-+Note that some 2-D symbologies (QR Code) require scans in both directions.
++   .. describe:: ZBarOrientationMaskAll
 +
-+Setting the stride to a very large value will generate a single scan pass
-+through the center of the image.  Note that some symbologies will not be
-+detected without multiple successful passes; it is usually better to combine
-+this setting with cropping to generate a number of closely clustered scan
-+passes in the target area.
++      Combination of :func:`ZBarOrientationMask` for all interface
++      orientations (Portrait, PortraitUpsideDown, LandscapeLeft and
++      LandscapeRight)
+diff -r 563557a923d0 iphone/doc/ZBarReaderViewDelegate.rst
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/doc/ZBarReaderViewDelegate.rst	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,26 @@
++ZBarReaderViewDelegate Protocol Reference
++=========================================
 +
-+Note that the density also affects the aspect ratio and rotation that can be
-+tolerated.  If you set it too large, some barcodes will become more difficult
-+to read.
++.. class:: ZBarReaderViewDelegate
 +
-+In general, 2 to 4 is a good target for the stride setting, unless you have
-+very high or low resolution images.
++   :Inherits from: :class:`NSObject`
 +
-+Disable unused symbologies
-+^^^^^^^^^^^^^^^^^^^^^^^^^^
++   This protocol, which must be implemented by the `readerDelegate` provided
++   to a :class:`ZBarReaderView`, is used to notify the delegate of new decode
++   results.
 +
-+Limiting the symbologies to the set of interest should provide a small
-+performance boost.  It also improves decode reliability - it is impossible to
-+receive an incorrect or unexpected decode result from a symbology that is
-+disabled.
 +
-+The reader does support full auto-discrimination among the supported
-+symbologies, but with all of them enabled you may need to compensate elsewhere
-+to get a good frame rate.
++Instance Methods
++----------------
 +
-+For example, if you are only interested in QR codes, disable the others.  The
-+robust way to do this is by disabling *all* symbologies and then reenabling
-+only those you want.  This helps isolate you from encountering new symbologies
-+that may be added in future versions of the library until you are ready to
-+handle them::
++   .. describe:: - (void) readerView:(ZBarReaderView*)readerView didReadSymbols:(ZBarSymbolSet*)symbols fromImage:(UIImage*)image
 +
-+   [scanner setSymbology: 0
-+            config: ZBAR_CFG_ENABLE
-+            to: 0];
-+   [scanner setSymbology: ZBAR_QRCODE
-+            config: ZBAR_CFG_ENABLE
-+            to: 1];
++      Called to notify the delegate of new decode results.
 +
-+Even if you would like your application to support multiple symbologies, you
-+may consider if there is a way to limit the enabled subset based on the
-+scanning context, etc...
++      Note that the referenced image is a proxy for a video buffer that is
++      asynchronously being converted to a :class:`UIImage`, attempting to
++      access the data will block until the conversion is complete.
 +
++      :readerView: :class:`ZBarReaderView` that scanned the barcode(s).
++      :symbols: :class:`ZBarSymbolSet` containing the decode results.
++      :image: :class:`UIImage` from which the barcode(s) were scanned.
+diff -r 563557a923d0 iphone/doc/ZBarSymbol.rst
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/doc/ZBarSymbol.rst	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,186 @@
++ZBarSymbol Class Reference
++==========================
 +
-+Examples
-+--------
++.. class:: ZBarSymbol
 +
-+These examples demonstrate several scenarios for scanning from the camera with
-+automatic capture using iOS 4.  You can try them yourself using the
-+readertest.  For each example, start with the default settings (by tapping the
-+``ZBarReaderViewController`` class), then enable continuous mode and the
-+custom overlay (by disabling
-+:member:`~ZBarReaderViewController::showsZBarControls`).  You should also use
-+a release build and avoid running in the debugger.
++   :Inherits from: :class:`NSObject`
 +
-+Frame rates are approximate, measured on an iPhone 3GS running iOS 4.0.1 in a
-+well lit room.  Two measurements are taken for each sample: the rate with the
-+camera pointed at a blank white page such that it fills the frame, and the
-+rate while continuously decoding the provided example.  For best results, it
-+is recommended that you print the examples rather than scanning them from the
-+screen.
++   A symbol wraps all of the information the library has about a decoded
++   barcode.  Use the available properties to retrieve the barcode data, the
++   symbology (type of barcode), location and more.
 +
-+For reference, the base frame rates with default settings are 12fps for a
-+blank white page, 7.5fps for this `basic EAN symbol`_ and 2.2fps for this
-+`basic QR symbol`_.
++   This class is a simple wrapper around a :type:`zbar_symbol_t` C object
++   (q.v.)
 +
-+.. _`basic EAN symbol`:
-+   http://zbar.sf.net/test/ean13/9876543210128.png
-+.. _`basic QR symbol`:
-+   http://chart.apis.google.com/chart?cht=qr&chs=512x512&chl=http://zbar.sf.net/iphone
 +
-+Long Linear Symbols
-+^^^^^^^^^^^^^^^^^^^
++Properties
++----------
 +
-+For this example, we will use a relatively `long Code 128 barcode`_.
++   .. member:: zbar_symbol_type_t type
 +
-+.. _`long Code 128 barcode`:
-+   http://zbar.sf.net/test/code128/ALPHA.png
++      The type of symbology that was decoded. (read-only)
 +
-+While it should be possible to read this symbol with the default settings, you
-+may notice that it is not very reliable.  You will have to stretch the symbol
-+across the entire screen, and even then the default settings will only give
-+you about 1.6 pixels per module, well below the ideal target of 3.  To improve
-+these results, we want to maximize scanning resolution for the long image
-+axis.
++   .. member:: NSString *typeName
 +
-+1. Disable the default zoom/crop - zoom all the way out by hitting "Scan" and
-+   pinching the preview; the frame rate immediately drops to 8fps / 4.8fps.
++      The canonical name used by the library to represent the symbology.
++      (read-only)
 +
-+We should compensate for this reduction in the frame rate:
++   .. member:: NSUInteger configMask
 +
-+2. Crop the image to a long, skinny rectangle - set the
-+   :member:`~ZBarReaderViewController::scanCrop` setting to
-+   ``{{0, 0.3}, {1, 0.4}}``;  The frame rate jumps up to 18fps / 8.7fps.
++      Bitmask of symbology config settings used during decode.
 +
-+3. Disable scans across the short image axis - set the ``CFG_X_DENSITY``
-+   setting to 0.  The frame rate goes all the way to 30fps / 13fps.
++   .. member:: NSUInteger modifierMask
 +
-+Since we have plenty of margin with the frame rate, we can minimize the total
-+decode latency by performing more scan passes through the symbol:
++      Bitmask of symbology characteristics detected during decode.  See
++      :type:`zbar_modifier_t` for the currently defined modifier bits.
 +
-+4. Increase the scan density - set the ``CFG_Y_DENSITY`` setting to 1 (13.5fps
-+   / 5fps) or 2 (24fps / 9fps).
++   .. member:: NSString *data
 +
-+You should now be able to quickly and reliably decode long linear symbols.
++      The raw decoded barcode data. (read-only)
 +
-+If have an iPhone 4, you may also try increasing the resolution to support
-+even longer symbols (NB there is no readertest setting for resolution).  You
-+may have to compensate elsewhere to bring the frame rate back to a reasonable
-+level.
++   .. member:: int quality
 +
-+High Density QR Symbols
-+^^^^^^^^^^^^^^^^^^^^^^^
++      A relative metric indicating rough confidence in the decoded value.
++      Larger values are better than smaller values. (read-only)
 +
-+For this example we will use a `version 29 QR Code symbol`_.
++   .. member:: zbar_orientation_t orientation
 +
-+.. _`version 29 QR Code symbol`:
-+   http://www.qrcomic.com/images/5.png
++      The general, axis-aligned orientation of the symbol, or
++      ZBAR_ORIENT_UNKNOWN if unknown. (read-only)
 +
-+In this case we still want to maximize the resolution, but we also need to
-+increase the scan density to reliably pick up the small finder patterns:
++   .. member:: ZBarSymbolSet *components
 +
-+1. Maximize scan density in both directions - set the ``CFG_X_DENSITY`` and
-+   ``CFG_Y_DENSITY`` settings both to 1.  You should be able to scan the symbol
-+   now, although the frame rate drops to 4.5fps / 1fps
++      The components of a composite symbol. (read-only)
 +
-+2. Disable the default zoom/crop - zoom all the way out by hitting "Scan" and
-+   pinching the preview; the frame rate drops further to 3fps / 0.7fps
++   .. member:: const zbar_symbol_t *zbarSymbol
 +
-+We can compensate somewhat for the reduced frame rate:
++      Retrieve the underlying C object instance. (read-only)
 +
-+3. Crop the image to a square - set ``scanCrop`` to ``{{0.125, 0}, {.75, 1}}``.
-+   This boosts the frame rate slightly to 3.7fps / 0.75fps.
++   .. member:: CGRect bounds
 +
-+4. Disable linear symbologies - set the symbologies such that only QR Code is
-+   enabled (4fps / 1fps)
++      Calculate a rough bounding box for the symbol. (read-only)
 +
-+Even though the frame rate is still pretty bad, the QR recognition latency
-+should be acceptable.
++      .. note::
 +
-+If have an iPhone 4, you may also try increasing the resolution to support
-+even denser QR symbols (NB there is no readertest setting for resolution).
-+You may have to compensate elsewhere to bring the frame rate back to a
-+reasonable level.
++         Coordinates are relative to the image *data*, which may not match a
++         displayed UIImage.  Make sure to account for the UIImage orientation
++         when using these values.
 +
-+Small DataBar Symbols
-+^^^^^^^^^^^^^^^^^^^^^
 +
-+For this example we will use a `DataBar symbol`_ printed with a small feature
-+size, typical of the stickers used to tag produce.  Scale it when printing
-+such that the printed dimensions are about 1cm square.  This symbol should
-+scan with the default settings, but we will attempt to optimize the scan
-+latency for this case.
++Class Methods
++-------------
 +
-+.. _`DataBar symbol`:
-+   http://zbar.sf.net/test/databar/0109876543210128-so.png
++   .. _`nameForType:`:
++   .. describe:: + (NSString*) nameForType:(zbar_symbol_type_t)type
 +
-+As well as high barcode resolution, we also want high density passes in both
-+directions to minimize sensitivity to rotation:
++      Retrieve the canonical name for a symbology used by the library, given
++      its enumerated value.
 +
-+1. Maximize scan density in both directions - set the ``CFG_X_DENSITY`` and
-+   ``CFG_Y_DENSITY`` settings both to 1.  The frame rate drops to 4.5fps /
-+   3fps.
++      :type: The :type:`zbar_symbol_type_t` enumerated symbology value.
++      :Returns: A short string name for the symbology.
 +
-+Compensate for the reduction in frame rate by zooming in on the small symbol,
-+which crops the scanned image.  Zooming also helps the user see the small
-+barcode:
 +
-+2. Zoom all the way in - hit "Scan" and un-pinch the preview.  The frame rate
-+   recovers to 11fps / 6.2fps.
++Instance Methods
++----------------
 +
-+3. Crop the image to a square - set ``scanCrop`` to ``{{0.125, 0}, {0.75, 1}}``
-+   (14fps / 7.5fps)
++   .. _`initWithSymbol:`:
++   .. describe:: - (id) initWithSymbol:(const zbar_symbol_t*)symbol
 +
-+4. Disable all symbologies except DataBar and DataBar Expanded (14.5fps / 9fps)
++      Initialize a symbol wrapper, given the C object to wrap.
 +
-+The reader should now be very sensitive to DataBar, even when scanned at an
-+angle.
-diff --git a/iphone/doc/picker.rst b/iphone/doc/picker.rst
-new file mode 100644
---- /dev/null
-+++ b/iphone/doc/picker.rst
-@@ -0,0 +1,104 @@
-+Scanning a User-Selected Image
-+==============================
++      :symbol: The C object to wrap.
++      :Returns: The initialized symbol, or nil if an error occurred.
 +
-+Some applications may need the full resolution offered by camera snapshots, or
-+need to scan an image from the user's photo library.  In these cases you use a
-+:class:`ZBarReaderController`.  This reader is a *subclass* of
-+:class:`UIImagePickerController`, and you use it the same way.  See the
-+documentation for :class:`UIImagePickerController` for more detais.
 +
-+1. Create the reader.
++Constants
++---------
 +
-+   This is as simple as creating a new :class:`ZBarReaderController`::
++.. type:: zbar_symbol_type_t
 +
-+      ZBarReaderController *reader = [ZBarReaderController new];
++   Symbology identifiers.
 +
-+2. Setup a delegate to receive the results.
++   ZBAR_NONE
++      No symbol was decoded.
 +
-+   The delegate should implement the :class:`ZBarReaderDelegate` protocol,
-+   which inherits from :class:`UIImagePickerControllerDelegate`::
++   ZBAR_PARTIAL
++      Intermediate status.
 +
-+      reader.readerDelegate = self;
++   ZBAR_EAN8
++      EAN-8
 +
-+3. Configure the reader.
++   ZBAR_UPCE
++      UPC-E
 +
-+   You will need to set the :member:`~ZBarReaderController::sourceType`
-+   appropriately.  Aside from the properties of the reader itself, you can
-+   configure the decoder via the :member:`~ZBarReaderController::scanner`
-+   property::
++   ZBAR_ISBN10
++      ISBN-10, converted from EAN-13
 +
-+      if([ZBarReaderController isSourceTypeAvailable:
-+                                   UIImagePickerControllerSoureTypeCamera])
-+          reader.sourceType = UIImagePickerControllerSoureTypeCamera;
-+      [reader.scanner setSymbology: ZBAR_I25
-+                      config: ZBAR_CFG_ENABLE
-+                      to: 0];
++   ZBAR_UPCA
++      UPC-A
 +
-+   See :doc:`custom` and :doc:`optimizing` for more details.
++   ZBAR_EAN13
++      EAN-13
 +
-+4. Present the reader to the user.
++   ZBAR_ISBN13
++      ISBN-13, converted from EAN-13
 +
-+   As the reader is a UIImagePickerController, it must be presented modally::
++   ZBAR_I25
++      Interleaved 2 of 5
 +
-+      [self presentModalViewController: reader
-+            animated: YES];
++   ZBAR_DATABAR
++      GS1 DataBar (RSS)
 +
-+5. Process the results.
++   ZBAR_DATABAR_EXP
++      GS1 DataBar Expanded
 +
-+   The controller will call the
-+   :member:`imagePickerController:didFinishPickingMediaWithInfo:` method of
-+   your delegate for a successful decode (NB *not* every time the user takes a
-+   picture or selects an image).  The barcode data can be obtained using the
-+   :c:data:`ZBarReaderControllerResults` key of the info dictionary.  This key
-+   will return "something enumerable"; keep in mind that there may be multiple
-+   results.  You may also retrieve the corresponding image with
-+   :c:data:`UIImagePickerControllerOriginalImage` as usual::
++   ZBAR_CODABAR
++      Codabar
 +
-+      - (void) imagePickerController: (UIImagePickerController*) reader
-+       didFinishPickingMediaWithInfo: (NSDictionary*) info
-+      {
-+          id<NSFastEnumeration> results =
-+              [info objectForKey: ZBarReaderControllerResults];
-+          UIImage *image =
-+              [info objectForKey: UIImagePickerControllerOriginalImage];
-+          ...
++   ZBAR_CODE39
++      Code 39 (3 of 9)
 +
-+   The ``reader`` parameter will be the actual :class:`ZBarReaderController`
-+   (again, a subclass :class:`UIImagePickerController`).
++   ZBAR_QRCODE
++      QR Code
++
++   ZBAR_CODE128
++      Code 128
++
++.. type:: zbar_orientation_t
++
++   The coarse orientation of a symbol.
 +
 +   .. note::
 +
-+      The delegate method should dismiss the reader and return as soon as
-+      possible; any processing of the results should be deferred until later,
-+      otherwise the user will experience unacceptable latency between the
-+      actual scan completion and the visual interface feedback.
++      Orientation is relative to the image *data*, which may not match a
++      displayed UIImage.  Make sure to account for the UIImage orientation
++      when using these values.
 +
-+6. Dismiss the reader.
++   ZBAR_ORIENT_UNKNOWN
++      Unable to determine orientation.
 +
-+   Once you have the results you should dismiss the reader::
++   ZBAR_ORIENT_UP
++      Upright, read left to right
 +
-+      [reader dismissModalViewControllerAnimated: YES];
++   ZBAR_ORIENT_RIGHT
++      Sideways, read top to bottom
 +
-+   .. warning::
++   ZBAR_ORIENT_DOWN
++      Upside-down, read right to left
 +
-+      It is very important to dismiss from the *reader* (not the presenting
-+      controller) to avoid corrupting the interface.
++   ZBAR_ORIENT_LEFT
++      Sideways, read bottom to top
 +
++.. type:: zbar_modifier_t
 +
-+Handling Failure
-+----------------
++   Decoder symbology modifier flags.
 +
-+It is always possible the user selects/takes an image that does not contain
-+barcodes, or that the image quality is not sufficient for the ZBar library to
-+scan successfully.
++   .. note::
 +
-+In this case, and if :member:`~ZBarReaderController::showsHelpOnFail` is
-+``YES``, the integrated help controller will automatically be displayed with
-+reason set to ``"FAIL"``.
++      These are bit indices, use eg, (1 << ZBAR_MOD_GS1) to test the
++      modifierMask property.
 +
-+Your delegate may also choose to implement the optional
-+``readerControllerDidFailToRead:withRetry:`` method to explicitly handle
-+failures.  If the ``retry`` parameter is ``NO``, you *must* dismiss the reader
-+before returning, otherwise you may continue and allow the user to retry the
-+operation.  Note that, if it is enabled, the integrated help will be displayed
-+when this delegate method is invoked.
-diff --git a/iphone/doc/static/style.css b/iphone/doc/static/style.css
-new file mode 100644
---- /dev/null
-+++ b/iphone/doc/static/style.css
-@@ -0,0 +1,36 @@
-+@import url("default.css");
++   ZBAR_MOD_GS1
++      Barcode tagged as GS1 (EAN.UCC) reserved (eg, FNC1 before first data
++      character).  Data may be parsed as a sequence of GS1 AIs.
 +
-+h1, h2, h3, h4, h5, h6 {
-+    clear: both;
-+}
++   ZBAR_MOD_AIM
++      Barcode tagged as AIM reserved.
+diff -r 563557a923d0 iphone/doc/ZBarSymbolSet.rst
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/doc/ZBarSymbolSet.rst	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,43 @@
++ZBarSymbolSet Class Reference
++=============================
 +
-+img.logo {
-+    vertical-align: middle;
-+}
++.. class:: ZBarSymbolSet
 +
-+img.floatright {
-+    float: right;
-+    clear: both;
-+    margin-left: 2em;
-+    margin-right: 2em;
-+}
++   :Inherits from: :class:`NSObject`
++   :Conforms to: :class:`NSFastEnumeration`
 +
-+dl.docutils dt {
-+    font-weight: bold;
-+}
-+dl.docutils dd {
-+    margin-top: 1em;
-+    margin-bottom: 1em;
-+}
++   A symbol set is a simple container for the symbols scanned from an image.
++   It supports :class:`NSFastEnumeration`, and not much else...  Use it to
++   iterate through the :class:`ZBarSymbol` objects in a decode result set::
++
++      ZBarSymbolSet *symbols = image.symbols;
++      for(ZBarSymbol *symbol in symbols) {
++          // process result
++      }
++
++   This class is a simple wrapper around a :type:`zbar_symbol_set_t` C object
++   (q.v.)
++
++
++Properties
++----------
++
++   .. member:: int count
++
++      The number of symbols in the set. (read-only)
++
++   .. member:: const zbar_symbol_set_t *zbarSymbolSet
++
++      Retrieve the underlying C object instance. (read-only)
++
++
++Instance Methods
++----------------
++
++   .. _`initWithSymbolSet:`:
++   .. describe:: - (id) initWithSymbolSet:(const zbar_symbol_set_t*)set
++
++      Initialize a symbol set wrapper, given the C object to wrap.
++
++      :set: The C object to wrap.
++      :Returns: The initialized symbol set, or nil if an error occurred.
+diff -r 563557a923d0 iphone/doc/apiref.rst
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/doc/apiref.rst	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,16 @@
++*******************
++   API Reference
++*******************
++
++.. toctree::
++   :maxdepth: 1
++
++   ZBarImage
++   ZBarImageScanner
++   ZBarReaderController
++   ZBarReaderDelegate
++   ZBarReaderView
++   ZBarReaderViewController
++   ZBarReaderViewDelegate
++   ZBarSymbol
++   ZBarSymbolSet
+diff -r 563557a923d0 iphone/doc/camera.rst
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/doc/camera.rst	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,130 @@
++Scanning From the Camera Feed
++=============================
++
++Many iOS developers want their application to support automatic recognition of
++barcodes from the camera feed in real-time.  ZBar makes this easy!
++
++There are three levels that you may choose to integrate at, from least complex
++(recommended) to most complex these are:
++
++* Use the fully integrated view controller - this is very easy to implement
++  and is the recommended approach.
++* Use the reader view with your own controller - this more advanced approach
++  allows you to embed the view directly in your view hierarchy.
++* Use the capture component with your own AVCapture session - this is not
++  supported and only provided for advanced developers with special needs who
++  are already familiar with AVCapture.
++
++
++Using a ZBarReaderViewController
++--------------------------------
++
++This is the fastest, easiest and recommend way to get the barcode reader into
++your application.  The procedure is the same as using a
++UIImagePickerController to take a picture with the camera, so it will help if
++you are familiar with that.  Basically you:
++
++1. Create the reader.
++
++   This is as simple as creating a new :class:`ZBarReaderViewController`::
++
++      ZBarReaderViewController *reader = [[ZBarReaderViewController alloc] init];
++
++2. Setup a delegate to receive the results.
++
++   The delegate should implement the :class:`ZBarReaderDelegate` protocol,
++   which inherits from :class:`UIImagePickerControllerDelegate`::
++
++      reader.readerDelegate = self;
++
++3. Configure the reader.
++
++   Aside from the properties of the reader itself, you can configure the
++   decoder via the :member:`~ZBarReaderViewController::scanner` property and
++   further customize the view via the
++   :member:`~ZBarReaderViewController::readerView` property::
++
++      // disable QR Code
++      [reader.scanner setSymbology: ZBAR_QRCODE
++                      config: ZBAR_CFG_ENABLE
++                      to: 0];
++      reader.readerView.zoom = 1.0;
++
++   See :doc:`custom` and :doc:`optimizing` for more details.
++
++4. Present the reader to the user.
++
++   Typically the controller is presented modally::
++
++      [self presentModalViewController: reader
++            animated: YES];
++
++   Alternatively, it may be added to a container controller.
++
++5. Process the results.
++
++   The controller will call the
++   ``imagePickerController:didFinishPickingMediaWithInfo:`` method of
++   your delegate every time new results become available.  The barcode data
++   can be obtained using the :c:data:`ZBarReaderControllerResults` key of the
++   info dictionary.  This key will return "something enumerable"; keep in mind
++   that there may be multiple results.  You may also retrieve the
++   corresponding image with :c:data:`UIImagePickerControllerOriginalImage` as
++   usual::
++
++      - (void) imagePickerController: (UIImagePickerController*) reader
++       didFinishPickingMediaWithInfo: (NSDictionary*) info
++      {
++          id<NSFastEnumeration> results =
++              [info objectForKey: ZBarReaderControllerResults];
++          UIImage *image =
++              [info objectForKey: UIImagePickerControllerOriginalImage];
++          ...
++
++   The ``reader`` parameter will be the actual type of the reader (not
++   necessarily a :class:`UIImagePickerController`).
++
++   .. note::
++
++      The delegate method should queue the interface response and return as
++      soon as possible; any processing of the results should be deferred until
++      later, otherwise the user will experience unacceptable latency between
++      the actual scan completion and the visual interface feedback.
++
++6. Dismiss the reader (or not).
++
++   Once you have the results you may dismiss the reader::
++
++      [reader dismissModalViewControllerAnimated: YES];
++
++   .. warning::
++
++      It is very important to dismiss from the *reader* (not the presenting
++      controller) to avoid corrupting the interface.
++
++   Alternatively, you may choose to continue scanning and provide visual
++   feedback another way (eg, maybe by updating your custom overlay with the
++   results).  The "continuous" mode of the readertest example does this.
++
++
++Using a ZBarReaderView
++----------------------
++
++:class:`ZBarReaderViewController` is a relatively thin wrapper around a
++:class:`ZBarReaderView`; it is possible to use the view directly, even from
++Interface Builder.  You lose only some of the simulator and rotation hooks.
++The documentation is also less complete, so you need to be able to UTSL.  See
++the :file:`EmbedReader` sample for a working example.
++
++
++Using the ZBarCaptureReader
++---------------------------
++
++If you have special requirements for the capture session or just want to use
++your own preview, you can add your own :class:`ZBarCaptureReader` to your
++session.  You must have a solid understanding of the AVCapture infrastructure
++if you plan to use this approach.
++
++.. admonition:: TBD
++
++   sorry, you're on your own here - UTSL  :)
+diff -r 563557a923d0 iphone/doc/compat.rst
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/doc/compat.rst	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,190 @@
++Backward Compatibility
++======================
++
++Generally speaking, we take great care to ensure that each release of the
++library is backward compatible with previous versions - upgrading the library
++should not require any changes to your code and will continue to provide
++equivalent functionality.  The notable exception to this is the iOS 4 upgrade
++and associated "deprecation" of the former automatic capture method by our
++vendor.
++
++
++.. warning::
++
++   Versions before iOS 4 are no longer supported by the library.  We are no
++   longer able to test anything in this section, so you're on your own if you
++   try to make use of it.
++
++
++The Private API
++---------------
++
++The API that we use for automatic capture with iOS 3.x (namely
++:func:`UIGetScreenImage`) has an interesting history.  It has changed status
++several times, starting with "Private, unless we like you" moving to
++"reluctantly Public but undocumeted" by popular demand and reverting to
++"strictly Private" as of iOS 4.  The current story: if you want to distribute
++on the App Store, you had better not be using it - IOW, no automatic capture
++for you with iOS 3.x.
++
++Since App Store distribution is the most common use for the library, the
++default configuration, and thus the binary SDK, does *not* use any private
++APIs.
++
++Users targeting ad-hoc or enterprise distribution may not care about the
++status of the API and may prefer to continue supporting automatic capture for
++iOS 3.x.  To do this you will need to rebuild the library with the following
++define set for all configurations:
++
++.. sourcecode:: sh
++
++   USE_PRIVATE_APIS=1
++
++For reference, you can check whether your app refers to the offensive function
++with this command:
++
++.. sourcecode:: sh
++
++   $ otool -vI MyApp.app/MyApp | grep UIGetScreenImage
++
++If there is any output, then the executable includes the private API and is
++bound to be rejected if submitted for review.  Otherwise it is "clean" as far
++as this library is concerned.
++
++
++Upgrading to iOS 4
++------------------
++
++If you were using the reader before iOS 4 was introduced, you will want to
++upgrade to the new reader controller.  The performance has improved quite a
++bit, and you can continue to support automatic capture on the App Store.
++
++.. note::
++
++   This discussion only applies to automatic capture from the camera.  If you
++   are only scanning image files, or prefer/need to use manual capture, you
++   should not change anything.
++
++Basically just replace your old :class:`ZBarReaderController` with a new
++:class:`ZBarReaderViewController` and you're done!  See the reference and the
++next section for compatibility between the two classes.
++
++Also see the :doc:`install` instructions for details about upgrading the
++header references to use the SDK.
++
++
++Supporting iOS 3.x
++------------------
++
++The new :class:`ZBarReaderViewController` is intentionally designed to be
++compatible with the old :class:`ZBarReaderController` in most aspects that
++relate to reading barcodes.  When a :class:`ZBarReaderViewController` is
++initialized under iOS 3.x, it will *replace* itself with a
++:class:`ZBarReaderController`.  You can leverage the compatibility of these
++controllers to continue supporting iOS 3.x.
++
++The following properties and methods should be equivalent across
++implementations.  You may use them without regard for the actual instance
++type.
++
++========================================================  ====
++Equivalent Members
++========================================================  ====
++:member:`~ZBarReaderViewController::cameraOverlayView`
++:member:`~ZBarReaderViewController::cameraViewTransform`
++:member:`~ZBarReaderViewController::enableCache`
++:member:`~ZBarReaderViewController::scanner`
++:member:`~ZBarReaderViewController::readerDelegate`
++:member:`~ZBarReaderViewController::scanCrop`
++``showHelpWithReason:``
++:member:`~ZBarReaderViewController::showsZBarControls`
++:member:`~ZBarReaderViewController::tracksSymbols`
++========================================================  ====
++
++Some properties are available with :class:`ZBarReaderViewController` only for
++backward compatibility.  If these are configured, they must be set as
++indicated; attempts to set another value will raise an exception.
++
++====================================================  =======================================
++:class:`ZBarReaderController` Property                :class:`ZBarReaderViewController` Value
++====================================================  =======================================
++:member:`~ZBarReaderController::allowsEditing`        ``NO``
++:member:`~ZBarReaderController::cameraMode`           ``Sampling``
++:member:`~ZBarReaderController::maxScanDimension`     (ignored)
++:member:`~ZBarReaderController::showsCameraControls`  ``NO``
++:member:`~ZBarReaderController::showsHelpOnFail`      (ignored)
++:member:`~ZBarReaderController::sourceType`           ``Camera``
++:member:`~ZBarReaderController::takesPicture`         ``NO``
++====================================================  =======================================
++
++Also, the ``isSourceTypeAvailable:`` class method of
++:class:`ZBarReaderViewController` will return ``YES`` only for the ``Camera``
++source.
++
++All other members of :class:`ZBarReaderController`, including those inherited
++from :class:`UIImagePickerController` are not supported by
++:class:`ZBarReaderViewController`.  This includes ``takePicture`` and
++``scanImage:``, among others.
++
++Remaining members of :class:`ZBarReaderViewController`: are only available
++with the new implementation.  At the moment this is only
++:member:`~ZBarReaderViewController::readerView`, but any new properties or
++methods not listed here will also fall in this category.
++
++To access settings that may not be available in a potential fallback
++environment, you must verify that they exist and may be set as desired - eg,
++by testing the specific reader subtype.
++
++Weak Linking
++^^^^^^^^^^^^
++
++When leveraging fallbacks to iOS 3.x, it is important that features introduced
++in iOS 4 are referenced using *weak* links.  You must configure your project
++correctly to support this:
++
++* Make sure the iOS 4 frameworks are set to *Weak*.  Specifically, these are
++  AVCapture, CoreMedia and CoreVideo.
++
++* Build with the latest SDK - do *not* use the "Base SDK" setting to target
++  earlier devices.
++
++* Set the correct iOS 3.x version for the "iPhone OS Deployment Target"
++  build setting.
++
++
++Example: Fallback to Manual Capture
++-----------------------------------
++
++This code example will configure the reader for automatic capture from the
++camera for iOS 4 and fall back to manual or automatic capture for iOS 3.x,
++depending on whether the library was compiled to use private APIs::
++
++   if(![ZBarReaderController isSourceTypeAvailable:
++                                 UIImagePickerControllerSourceTypeCamera]) {
++       // camera unavailable: display warning and abort
++       // or resort to keypad entry, etc...
++       return;
++   }
++   
++   ZBarReaderViewController *reader = [ZBarReaderViewController new];
++   // reader will be a ZBarReaderController for iOS 3.x
++   // or a ZBarReaderViewController for iOS 4
++   
++   reader.readerDelegate = self;
++   reader.sourceType = UIImagePickerControllerSourceTypeCamera;
++   reader.showsZBarControls = YES;
++   
++   if(reader.cameraMode == ZBarReaderControllerCameraModeSampling) {
++       // additional automatic capture configuration here
++   }
++   else {
++       // additional manual capture configuration here
++   }
++   
++   [self presentModalViewController: reader
++         animated: YES];
++
++If you are using a custom control set
++(:member:`~ZBarReaderViewController::showsZBarControls`\ ``=NO``), you will
++want to provide a button attached to ``takePicture`` for the manual capture
++case.  The built-in controls do this automatically.
+diff -r 563557a923d0 iphone/doc/conf.py
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/doc/conf.py	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,77 @@
++import sys, os
++from plistlib import readPlist
++
++# General configuration
++
++extensions = []
++templates_path = ['ext']
++source_suffix = '.rst'
++master_doc = 'index'
++exclude_patterns = ['.#*']
++
++project = u'ZBar iPhone SDK'
++copyright = u'2010-2012, Jeff Brown et al'
++
++today_fmt = '%Y-%m-%d'
++info = readPlist('../res/ZBarSDK-Info.plist')
++version = 'X.Y'
++if info:
++    version = info['CFBundleVersion']
++release = version
++
++#add_module_names = False
++
++pygments_style = 'sphinx'
++highlight_language = 'objc'
++primary_domain = 'cpp'
++
++# Options for HTML output
++
++html_theme = 'default'
++html_theme_options = {
++    'bgcolor': 'white',
++    'textcolor': 'black',
++    'linkcolor': '#247',
++    'headbgcolor': '#edeff0',
++    'headtextcolor': '#247',
++    'headlinkcolor': '#c11',
++    'sidebarbgcolor': '#247',
++    'sidebartextcolor': 'white',
++    'sidebarlinkcolor': '#cde',
++    'relbarbgcolor': '#247',
++    'relbartextcolor': '#ccc',
++    'relbarlinkcolor': 'white',
++    'footerbgcolor': 'white',
++    'footertextcolor': 'black',
++    'codebgcolor': '#dfe',
++    'codetextcolor': 'black',
++}
++
++html_short_title = 'ZBarSDK ' + version
++html_title = 'ZBar iPhone SDK Documentation'
++html_static_path = ['static']
++html_favicon = '../../zbar.ico'
++html_style = 'style.css'
++html_use_modindex = False
++html_use_index = False
++html_copy_source = False
++html_show_sourcelink = False
++htmlhelp_basename = 'doc'
++
++# Options for LaTeX output
++
++latex_paper_size = 'letter'
++latex_font_size = '10pt'
++
++# Grouping the document tree into LaTeX files. List of tuples
++# (source start file, target name, title, author, documentclass [howto/manual])
++latex_documents = [
++  ('index', 'ZBarSDK.tex', u'ZBar iPhone SDK Documentation',
++   u'Jeff Brown', 'manual'),
++]
++
++#latex_logo = ''
++#latex_use_parts = False
++#latex_preamble = ''
++#latex_appendices = []
++#latex_use_modindex = False
+diff -r 563557a923d0 iphone/doc/custom.rst
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/doc/custom.rst	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,70 @@
++Customizing the Interface
++=========================
++
++The reader supports customization of the camera overlay and the integrated
++help that is displayed.
++
++
++Customizing the Overlay
++-----------------------
++
++If you are scanning with the camera, whether using a
++:class:`ZBarReaderViewController` for automatic capture or manually with
++:class:`ZBarReaderController`, you may want to customize the appearance of the
++reader.  You do this mainly by setting a
++:member:`~ZBarReaderViewController::cameraOverlayView`.
++
++Note that if you are scanning images from the photo library, there is no
++customization - you are limited to the system picker interface provided by the
++:class:`UIImagePickerController`.
++
++If you are using a :class:`ZBarReaderViewController` and just want to add to
++the existing controls, you can simply set your overlay to include the
++additional view hierarchy::
++
++   reader.cameraOverlayView = myLogoImageView;
++
++Otherwise, if you are using a :class:`ZBarReaderController` or prefer to
++completely replace the default controls, you should disable those first.  Note
++that you will need to provide your own controls, which should at least include
++a way to dismiss the reader::
++
++   reader.showsCameraControls = NO;  // for UIImagePickerController
++   reader.showsZBarControls = NO;
++   reader.cameraOverlayView = myControlView;
++
++For manual capture with :class:`ZBarReaderController`, you should also include
++a control connected to :member:`~ZBarReaderController::takePicture`.
++
++In either case, the overlay view may be loaded from a NIB, or simply created
++programmatically.
++
++You can also disable the tracking rectangle that highlights barcodes with
++:member:`~ZBarReaderViewController::tracksSymbols`.
++
++
++Presenting Help
++---------------
++
++If you have set ``showsZBarControls = NO`` and replaced the default controls,
++you may still present the built-in help viewer.  Just hook your custom control
++to the ``showsHelpWithReason:`` method of the controller.  You should only
++call this method when the reader is actually presented.
++
++The default reader controls invoke ``showsHelpWithReason:`` with a reason
++parameter of ``"INFO"`` when the info button is tapped.
++
++
++Customizing the Help Content
++----------------------------
++
++Whether you use the default controls or provide your own, you can still
++customize the content of the help that is displayed.  The integrated viewer
++uses a UIWebView to display the contents of :file:`zbar-help.html` that we
++copied into your Resources.  You should hack this up as you see fit to give
++your users the best help experience.
++
++To allow for runtime customization based on the reason for presenting help,
++the javascript function ``onZBarHelp`` will be called just before the page is
++displayed, with the ``reason`` argument set as provided to
++``showsHelpWithReason:``.
+diff -r 563557a923d0 iphone/doc/devguide.rst
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/doc/devguide.rst	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,13 @@
++***********************
++   Developer's Guide
++***********************
++
++.. toctree::
++   :maxdepth: 2
++
++   camera
++   picker
++   custom
++   optimizing
++   compat
++   licensing
+diff -r 563557a923d0 iphone/doc/faq.rst
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/doc/faq.rst	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,101 @@
++Frequently Asked Questions (FAQ)
++================================
++
++This is the ever-growing list of answers to commonly asked questions.  Please
++feel free to post you question in our `iPhone Developers forum`_ if you do not
++find the information you need in this documentation.
++
++.. _`iPhone Developers Forum`:
++   http://sourceforge.net/projects/zbar/forums/forum/1072195
++
++
++General
++-------
++
++This looks great...  Where can I get it?
++   You can download the latest version of the SDK from
++   http://zbar.sf.net/iphone
++
++
++Compatibility
++-------------
++
++Which iPhone devices does this library support?
++   The library works *only* with iOS devices that have an auto-focus camera.
++   Currently, the iPhone 3GS, iPhone 4 and newer devices.  The iPad 2 and iPad
++   3 will also work in many cases, *iff* the barcode is printed large enough
++   to achieve good focus.
++
++Will you make it work with the iPhone 3G?
++   *No* - the 3G it is not supported and is unlikely to ever be supported.
++
++   To be fair, you *can* use the 3G to scan image files, as long as they're in
++   focus (ie, *not* images taken by the built-in fixed-focus camera).  There
++   is at least one application that found a use for this...
++
++What target iOS versions does this library work with?
++   iOS 4, 5 and 6 are fully supported, including the latest video streaming
++   interfaces.  Since Apple has dropped support for earlier versions of iOS on
++   the App Store, we recommend that you target only iOS 4 and later for reading
++   barcodes.
++
++   Note that iOS 3.1 is no longer supported; if you really think you need
++   that, you should still be able to get it working...  See :doc:`compat` for
++   details about iOS version fallbacks.
++
++   In all cases you should use the latest SDK to build.
++
++Are any private APIs in use?
++   No - the binary release of the SDK does not use any private APIs.
++
++Does this support "automatic" barcode capture?
++   Yes - with recent iOS versions, the default configuration will capture
++   barcodes automatically from the video stream.
++
++
++Building
++--------
++
++I get "Undefined symbols" errors when I try to build?
++   Most likely you did not add all of the necessary framework dependencies.
++   See :doc:`tutorial` or :doc:`install` for the list of frameworks you need
++   to link against.
++
++
++Licensing
++---------
++
++Please refer to :doc:`licensing` for questions about licensing.
++
++
++Barcodes
++--------
++
++Why do my UPC barcodes have an extra 0 at the front?
++   The UPC-A_ symbology is the subset of EAN-13_ that starts with a leading 0.
++   The ZBar decoder enables only EAN-13_ by default, so GTIN-13_ product codes
++   are consistently reported.  You can choose to receive the 12-digit results
++   instead by explicitly enabling UPC-A_.
++
++   The :member:`~ZBarSymbol::type` property of the symbol can be used to see
++   which type of barcode is reported.
++
++   See EAN-13_ and UPC-A_ for more information.
++
++Why does my UPC-E (short version) barcode data look completely wrong?
++   UPC-E_ is a "zero compressed" version of UPC-A_; certain of the zeros are
++   removed from the UPC-A_ data to generate the UPC-E_ barcode.  The ZBar
++   decoder *expands* this compression by default, again to consistently report
++   GTIN-13_ product codes.  You can choose to receive the compressed 8-digit
++   results instead by explicitly enabling UPC-E_.
++
++   The :member:`~ZBarSymbol::type` property of the symbol can be used to see
++   which type of barcode is reported.
++
++   See UPC-E_ for more information.
++
++.. _GTIN-13:
++.. _GTIN: http://wikipedia.org/wiki/GTIN
++.. _EAN-13: http://wikipedia.org/wiki/EAN-13
++.. _UPC-A: http://wikipedia.org/wiki/UPC-A
++.. _UPC-E: http://wikipedia.org/wiki/UPC-E#UPC-E
+diff -r 563557a923d0 iphone/doc/getstarted.rst
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/doc/getstarted.rst	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,12 @@
++*********************
++   Getting Started
++*********************
++
++.. toctree::
++   :maxdepth: 2
++   :numbered:
++
++   install
++   tutorial
++   faq
++   support
+diff -r 563557a923d0 iphone/doc/index.rst
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/doc/index.rst	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,20 @@
++################
++  ZBar iOS SDK
++################
++
++Welcome to the ZBar SDK for iOS!
++
++This documentation covers all aspects of developing with the SDK: from adding
++the SDK to your project, to writing code that uses it, even licensing the
++library with your app.
++
++Please let us know if you find anything inaccurate or lacking (even better,
++send doc patches!)
++
++.. toctree::
++   :maxdepth: 2
++   :numbered:
++
++   getstarted
++   devguide
++   apiref
+diff -r 563557a923d0 iphone/doc/install.rst
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/doc/install.rst	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,141 @@
++Installing the SDK
++==================
++
++These are the basic instructions for obtaining the SDK and adding it to an
++Xcode project.
++
++You may want to try things out with the :doc:`tutorial` before hacking at your
++own project.
++
++
++Requirements
++------------
++
++You will need *all* of the following to develop iPhone applications
++using this SDK:
++
++* Mac OS X >= 10.6.x (Snow Leopard)
++* Xcode >= 4.5.1
++* iPhone SDK >= 4.0
++* An iPhone 3GS, iPhone 4 or newer iOS device with an auto-focus camera
++* iOS >= 4.0 running on the device
++
++.. warning::
++
++   *Only* the iPhone 3GS, iPhone 4 and newer models are supported, as they
++   have a camera with auto-focus.  The iPad 2 and iPad 3 will also work, *iff*
++   the barcode is printed large enough to achieve good focus.  The ZBar
++   library does not support the iPhone 3G and is unlikely to ever support it.
++
++
++Downloading
++-----------
++
++Download the latest binary release of the ZBar SDK from
++
++http://zbar.sourceforge.net/iphone
++
++
++Integration
++-----------
++
++The recommended installation method is to simply copy the SDK into your
++Xcode project:
++
++1. Open ZBarSDK-|version|.dmg in the Finder.
++
++2. Drag the :file:`ZBarSDK` folder into your Xcode project.  In the dialog
++   that appears, you should choose to **copy** the SDK into your project by
++   checking the box.  The target that you want to link with the library should
++   also be selected in the target list.
++
++3. Link the following additional frameworks to any targets that link with the
++   ZBarSDK.  You should set the first three to use weak references and
++   configure an appropriate deployment target if you still need to support
++   iOS 3:
++
++   * :file:`AVFoundation.framework` (weak)
++   * :file:`CoreMedia.framework` (weak)
++   * :file:`CoreVideo.framework` (weak)
++   * :file:`QuartzCore.framework`
++   * :file:`libiconv.dylib`
++
++   If you check "Link Binary With Libraries" for the target(s), you should see
++   all of these frameworks followed by :file:`libzbar.a`.
++
++   .. note::
++
++      Link order may be important for some versions of Xcode; the referenced
++      libraries should be listed *before* :file:`libzbar.a` in the link order.
++
++4. Import the SDK header from your prefix header to make the barcode reader
++   APIs available::
++
++      #import "ZBarSDK.h"
++
++Proceed to :doc:`camera` or :doc:`picker` to learn about using the reader APIs
++to scan barcodes.  Use the :doc:`apiref` for specific interface details.
++
++
++Upgrading from an Older Version
++-------------------------------
++
++If you are using an older version of the *SDK* (NB, skip to the next section
++if you are currently using Mercurial), upgrading is straightforward:
++
++1. Delete the current ZBarSDK group from your project.  You should choose
++   to delete the files if you copied them into your project.
++2. Drag the new ZBarSDK from the DMG into your project.
++
++Clean out and rebuild your project with the new version.
++
++
++Upgrading a Pre-SDK Integration
++-------------------------------
++
++If your project was using the library directly from the Mercurial repository,
++before the SDK was introduced, there are a few incompatibilities that you must
++resolve in order to upgrade.  Don't worry - all of your source stays the same,
++you just need to update how the library is included in the project and how the
++headers are imported.
++
++Switching to the Binary Distribution
++^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
++
++This approach is recommended - the binary releases provide you with a stable
++development platform, isolating you from temporary instability and transient
++problems that may occur at the bleeding edge.
++
++The first task is to reverse the previous ZBar integration:
++
++1. Remove the reference to zbar.xcodeproj from your project.
++2. Remove any :file:`zbar-*` files from your Resources.
++3. In the target build settings, remove any "Header Search Paths" that
++   reference zbar.
++4. Remove any references to zbar headers in your :file:`prefix.pch` or source
++   files.
++
++Now just continue with the `integration`_ instructions above and you should be
++back up and running!
++
++Continuing with Mercurial
++^^^^^^^^^^^^^^^^^^^^^^^^^
++
++Alternatively, you may still prefer to select Mercurial revisions.  You have a
++few choices for this:
++
++* You may build your own ZBarSDK and copy/link it into your project.  This is
++  the same as `Switching to the Binary Distribution`_, except that you use
++  your own version of the SDK.  In this case you need to manually rebuild the
++  SDK when you update it.
++* You may leave zbar.xcodeproj as a project dependency and pull the SDK into
++  your project.  This is not well tested, so ymmv.
++* You may leave zbar.xcodeproj as a project dependency and just link libzbar.a
++  into your project, as before.  You will need to update the target dependency
++  (the library target changed names to libzbar) and add the
++  :file:`iphone/include/ZBarSDK` directory to "Header Search Paths"
++
++In any case, you should remove the references to the zbar headers from
++:file:`prefix.pch` (or your source files) and replace them with::
++
++   #import "ZBarSDK.h"
+diff -r 563557a923d0 iphone/doc/licensing.rst
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/doc/licensing.rst	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,187 @@
++Licensing the Library
++=====================
++
++First of all, the big disclaimer:
++
++.. warning::
++
++   We are *not* lawyers; we cannot help you decide if you should use the
++   library or how to apply the license, only your lawyer can advise you
++   concerning legal matters.
++
++That said, it should also be noted that we have neither the resources (time,
++cash, etc) nor the patience to enforce the license (at all); the reality is
++that all of this is left to your discretion.
++
++If you prefer to leave the lawyers out of it, the rest of this section will
++help you apply the license to your application.
++
++
++Licensing FAQ
++-------------
++
++Can I use this library with my proprietary (closed source) application?
++   Yes, that is our intent and we do not believe there is any problem
++   regarding the license.
++
++Will I need to open source my entire app?
++    No, it is not required by the license.
++
++Will I need to distribute all of my "object files" on the App Store?
++    No, this is also not required by the license, although you should offer to
++    provide them upon request.  See below for more detail.
++
++But I read somewhere that "iPhone apps may not use LGPL code"?
++   That statement is an over-generalization that does not apply in this case.
++   Most likely your source is either:
++
++   * referring to the GPL, which is significantly different from the
++     *L*\ GPL
++   * referring to a different version of the LGPL; we intentionally use
++     version 2.1, which has specific static linking exceptions.
++   * not a lawyer either and too lazy to read the whole license
++
++   Basically, if you leverage the appropriate sections of the license, it
++   should be fully compatible with the App Store restrictions and
++   requirements.
++
++This is too complicated, can I just pay for an easier license?
++   No, it is not possible.  There are multiple problems with this approach,
++   some brief highlights:
++
++   * Most open source projects (including this one) do not have a single
++     author.  Tracking down every contributor and getting their approval could
++     be quite a challenge.
++   * The license is meant to protect users' rights to the software.  Giving
++     you special treatment bypasses the protection we offered them,
++     effectively revoking their rights.  This would be a violation of their
++     trust and completely defeats the purpose of the license.
++
++   You may think of this as the "price" you pay for using our open source
++   library.  If you want to make your life easier, you should be petitioning
++   Apple for shared library support...
++
++What if you add a clause that lets me do whatever I want?
++   No, also not possible.  In addition to the problems mentioned above, there
++   are even more problems with this:
++
++   * Sourceforge requires an OSI approved license for hosting our project;
++     an altered license would no longer be approved.
++   * Again we are not lawyers and therefore not qualified to change the
++     license, we would have to pay one of those slimy buggers to do it.
++
++Do I need to add an "about" dialog to display your copyright/license?
++   No, not as such.  We won't discourage you from plugging the library if you
++   like, but it is not a requirement.  You should think of our license as a
++   supplement to your own software license, therefore it is appropriate to
++   display it where (and only where) you display your own:
++
++   * If you follow Apple's recommendation, the App Store is the only place
++     that the user accesses your license, so it should also be the only place
++     where the library supplement is available.
++   * If your app already has some kind of "about" view that displays your
++     copyright/license information, it is also appropriate to display the same
++     information for the library.
++
++Do I need to include the entire library in my application bundle?
++   No, it is not necessary:
++
++   * If you have not modified the library, it is sufficient to provide a link
++     to the project and the version information.
++   * If you are using a modified version, you may provide a link to download
++     that instead of including it in the bundle.
++
++
++Modifications
++-------------
++
++What is a "modification"?  Again, we leave it to your discretion with this
++guidance:
++
++* If you use the distributed binary SDK you have certainly not modified the
++  library.
++* If you are working from Mercurial, *any* change you have made to the
++  "source code" of the library is a modification, it does not matter how
++  trivial.  You can see what changes have been made by running
++  ``hg status -mard``; if this command outputs anything, you have modified
++  the library.
++
++If you find that you have made changes to the library, you should carefully
++consider how far you want to proceed down that path.  Once you publish your
++changes you have created a "fork" of the project which you now need to
++maintain.  Are you prepared to merge every time the library is updated?
++
++If your change adds a useful feature to the library, we absolutely encourage
++you to submit patches.  Assuming you can get your patch into the project, then
++you will no longer need to use a modified version!  When submitting patches,
++ensure that your changes are appropriate for all of our users.  Specifically,
++we are not interested in patches that simply hack up the library to work the
++way you want.  Compare a patch that changes the default behavior to your
++preference (probably not acceptable), to a patch that adds a new configuration
++to support the feature you have added (probably fine).
++
++
++Object File Distribution
++------------------------
++
++Section 6 of the LGPL v2.1 specifically permits static linking with the
++library.  If your project is not open source, this section does require that
++you make your object files available to your users.  The intent, as indicated
++in the license, is that a user who has obtained your software may exercise
++their right to modify the library and then re-link their modified version into
++your application.
++
++We recommend that you apply Subsection 6c, which only requires that you make a
++written offer to provide the object files.  Now...if you consider the actual
++utility of this mechanism - that it is only applicable to developers, and only
++those with in depth knowledge of the tools, the time required for development
++- all to have a new barcode reader in a specific version of your application
++that only they can use, the reality is that no one is going to request this.
++You probably should not even waste time preparing for it until a request is
++made.
++
++Additionally, to avoid "casual requests" from nefarious types that just want
++to inconvenience you, also consider charging a fee for the distribution of
++this material (as permitted by the license); just add up the cost of burning
++and shipping a disk.  If this cost is "large" compared to the price of your
++app, the likelyhood of a request is reduced even further.
++
++
++Using the Unmodified Library
++----------------------------
++
++Applying the license in this case is somewhat simpler.  These are the basic
++steps you can follow:
++
++1. Verify that the rest of your software license is compatible with the LGPL.
++   You cannot use the library if they are incompatible.
++
++   For those using the default App Store license, we have reviewed this and
++   believe it is compatible with the LGPL.
++
++2. At the end of your license text, in an annex or supplement, start by
++   declaring your use of the library and offering a link to the project.
++   Something like this:
++
++      This software uses the open source ZBar Barcode Reader library, version
++      |version|, which is available from http://zbar.sourceforge.net/iphone
++
++   If you built your own version of the library, replace the version callout
++   with eg, "cloned from Mercurial revision xxxxxxxx"
++
++3. Then append the contents of the text file COPYING, included with the
++   library.  This is all of the copyright information for the library.
++
++4. Then append the contents of the text file LICENSE, also included with the
++   library.  This is just the LGPL version 2.1 which you may also obtain from
++   http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html
++
++5. You may choose to make the written offer for the object files explicit.
++   Provide some text and whatever link or email address is appropriate.
++
++
++Using a Modified Library
++------------------------
++
++We intentionally leave this option vague and force you to refer to the license
++as an underhanded way of encouraging you to contribute back to the project ;)
+diff -r 563557a923d0 iphone/doc/optimizing.rst
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/doc/optimizing.rst	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,435 @@
++Optimizing the Reader
++=====================
++
++As good as the iPhone performance is for a mobile device, the reality from an
++image processing perspective is that it represents a lower performance target.
++While the default configuration of the iPhone reader has been carefully tuned
++for the general case, you can often obtain much better results if you optimize
++for your specific application.
++
++.. note::
++
++   Performance is a complex topic.  The only way to tune performance is by
++   changing settings and comparing measured results.  If you are not
++   comfortable with the concepts presented here, it is recommended that you
++   leave the settings at the defaults and avoid compromising reliability.
++
++Performance of the barcode reader is generally evaluated by two factors:
++
++* The **latency** - how quickly it "recognizes" a barcode.  Specifically this
++  is the time from when the user puts a barcode in the frame or selects an
++  image until a response is indicated back to the them.
++
++* The **reliability** - it does not matter how quickly an image is scanned if
++  an incorrect result is returned.  That may seem obvious, but bad decodes
++  *are* possible and you need to keep this in mind when changing settings that
++  affect the reliability of the reader.
++
++Basically our goal is to optimize the latency without sacrificing reliability.
++There are several factors that contribue to latency:
++
++* The **quality** of the barcode image.  Quality includes the available
++  resolution, focus, lighting, noise, etc.  We have more control over some of
++  these than others.
++
++* The **camera**.  When scanning from the camera, the time for the
++  autoexposure and autofocus to converge on an image that can be decoded is a
++  significant contribution to the overall latency.
++
++* The **frame rate** of the reader - this translates to the time it takes the
++  scanner to process an image.
++
++* The **effort level** of the reader - some of the available settings control
++  "how hard" the reader tries to find barcodes in each frame.
++
++* The **delegate latency** - the time spent in your application after a
++  barcode has been detected until the user is notified.
++
++Most of these factors are interrelated.  We will discuss those we can control
++in detail, as well the settings you use to affect them.  Then we will provide
++a few specific case examples.
++
++
++Measuring Performance
++---------------------
++
++Subjective response times are a good place to start (does it "feel" responsive
++to you?), and possibly the only way to evaluate the overall experience, but to
++compare incremental changes to interrelated settings and have meaningful
++performance discussions with others, we need a more quantitative approach.
++
++The :func:`mach_absolute_time` function is a good tool for accurately
++measuring small delays.  Research this function and learn how to apply it.  As
++when measuring any real-world value, keep in mind that some variance is to be
++expected - even if you perform exactly the same operation multiple times, you
++will not see exactly the same measurement.  You should collect several
++samples, discard any obvious outliers, and average the remaining measurements.
++
++One way that the overall reader latency may be evaluated is by manually
++marking the time when the barcode is presented to the reader.  Add a control
++to your overlay that captures the start time when tapped and compare this to
++the end time, just before your delegate returns.
++
++The reader continually monitors the frame rate at which it is running.  The
++measured value may be displayed for debugging purposes by enabling the
++:member:`~ZBarReaderView::showsFPS` property.  The readertest example does
++this and also provides control over many of the available settings, so you can
++quickly test how each setting affects the frame rate.  You should target your
++optimization efforts to achieve a frame rate of at least 8-10fps, although
++12-15fps is preferable.
++
++You can measure the latency of your delegate using :func:`mach_absolute_time`.
++The measured value should be less than about 100ms, the smaller the better, to
++avoid noticeable lag.
++
++The readertest is a good tool for testing the performance of the reader.  You
++can tune the settings appropriately for your application and evaluate the
++effect each change has on the performance.
++
++
++Delegate Latency
++----------------
++
++This latency contributor is the easiest for you to effect (and sometimes the
++easiest to overlook).  Your delegate method should update the interface -
++dismiss the controller or update your overlay to indicate success - and
++*nothing* else.  All other processing should be deferred until after the
++animations have started.
++
++
++Image Quality
++-------------
++
++Resolution
++^^^^^^^^^^
++
++One might think that "more is better" in terms of resolution, but this is not
++necessarily the case.  Given average image quality, the ideal resolution for
++scanning is right around three pixels per barcode "module" (the width of the
++smallest bar or space).  Note that this measure is not an absolute image size
++or even a measure of the physical dimensions represented by a pixel sample, it
++*only* describes the sampled size of the barcode in the image.
++
++As the resolution decreases below about two pixels per module, edge fidelity
++is lost and the bars and spaces start to merge together, making it impossible
++(for this library) to scan.  This affects the density (feature size) and
++maximum size (data capacity) of the barcodes that can be detected.
++Conversely, as the resolution increases above about 4 pixels per module, noise
++can interfere with the edge detection and images will take longer to process.
++
++Other quality factors, such as poor focus, bad lighting or even excessive
++noise, can increase (or decrease) the resolution requirement.
++
++When scanning from the camera, the reader defaults to 640x480, which is good
++for most applications.  On newer devices, you can increase this using a capture
++:member:`~ZBarReaderView::session` preset.  Some older devices do not have a
++higher resolution option available.
++
++For scanning images, you can use
++:member:`~ZBarReaderController::maxScanDimension` to control the scaled size
++of the converted image, or resort to converting them yourself.
++
++If you want to read long linear barcodes or dense 2-D symbols, you will
++probably want to increase the resolution by adjusting these settings.
++
++Keep in mind that more pixels will take longer to scan, refer to the `frame
++rate`_ discussion for ways to compensate.
++
++Focus
++^^^^^
++
++Ideally we would fix the focus at a calculated optimum distance and optimize
++the aperture selection to maximize the depth of field.  Unfortunately the APIs
++do not currently give us control over any of these settings, the best we can
++do (as of iOS 4) is continuous auto-focus mode - this mode is configured by
++the reader automatically.  It can still take the device as long as 1-2 seconds
++to find the appropriate macro focus setting, but again, there is currently no
++way to reduce this delay.
++
++Lighting and Exposure
++^^^^^^^^^^^^^^^^^^^^^
++
++An image that is too bright or overexposed can completely wash out any
++barcodes.  An image that is too dark or underexposed will not provide
++sufficient contrast for the scanner.  Low light levels also tend to produce
++noisier images, possibly because the driver uses a faster "ISO" setting to
++compensate for the lighting.
++
++The camera defaults to continuous automatic exposure and white balance.  Since
++there are no other useful values, the reader leaves these unchanged from their
++default setting.
++
++For some devices, the "torch" can be enabled to provide additional
++illumination for the camera in low-light conditions.  The reader sets the
++torch to automatic by default, so it should turn on only when needeed...
++There have been some reports that the torch turns on inappropriately, washing
++out the image.  If you find that this occurs, you should instead set the
++:member:`~ZBarReaderView::torchMode` property of the :class:`ZBarReaderView`
++to ``Off``.
++
++For scanning images from another source, you are again stuck with the
++available image quality.  If you have any control over the image source, you
++should do what you can to fix quality problems there.
++
++Noise
++^^^^^
++
++Some level of noise is filtered by the reader, but excessive noise levels
++create additional edges in the image which corrupt barcodes and increase
++scanning time (decreasing the frame rate).
++
++As mentioned with `lighting and exposure`_, noise mostly becomes a problem
++when the light-level is too low, but high-resolution images may also increase
++exposure to sensor noise.
++
++We compensate for noise by *reducing* the `resolution`_ from the sensor
++maximum.  Scaling the image down has the effect of averaging several pixels
++into one value, filtering out the high-frequency noise component.
++
++
++Frame Rate
++----------
++
++The time it takes to scan and decode an image/frame is roughly proportional to
++the number of pixels that are processed.  The number and type of enabled
++symbologies and image noise can also affect the processing time.
++
++We have several knobs available that affect the frame rate.  Most of these are
++geared toward reducing the number of image pixels that are scanned.
++
++Decrease the Resolution
++^^^^^^^^^^^^^^^^^^^^^^^
++
++Adjusting the resolution of the image is an easy way to quickly reduce the
++number of pixels.  Smaller images also mean there is less data to carry
++around, which helps performance in other ways.  For example, reducing each
++image dimension by 30% (eg, from 640x480 to 448x336) will about double the
++speed of the reader (to a point).  [FIXME verify!]
++
++Adjusting the resolution is `described above <resolution>`_.  As mentioned
++there, reducing the resolution will negatively impact the minimum feature size
++and maximum barcode size that can be scanned, but it will help filter noise.
++
++Crop the Scan Region
++^^^^^^^^^^^^^^^^^^^^
++
++It may not always be necessary for an application to scan all the way to the
++edges of the image.  By cropping the scan area, you can get most of the
++benefits of reduced resolution without sacrificing the minimum feature size.
++Cropping will also not affect image noise, but similar to decreasing the
++resolution, it does affect the maximum size barcode that can be scanned.
++
++For all cases you set the crop rectangle
++:class:`~ZBarReaderViewController::scanCrop` property.  Note that the
++rectangle provided to the controller is *normalized* across image size and
++rotation.  This means that the coordinates range from 0 to 1 and the axes will
++be arranged such that the x-axis of the crop rectangle corresponds to the
++major (longer) image axis.
++
++Your interface will typically need to indicate the cropped scan area to the
++user with visual queues.  Use the
++:class:`~ZBarReaderViewController::cameraOverlayView` to provide this.
++
++By default, the :class:`ZBarReaderView` recognizes a pinch gesture to
++digitally zoom the preview around the center of the image.  This zoom does not
++affect the resolution of the image, but it does crop the scan region to the
++visible area.  You can also disable the pinch gesture and set the
++:class:`~ZBarReaderView::zoom` programmatically.
++
++Limit the Scan Density
++^^^^^^^^^^^^^^^^^^^^^^
++
++The scanner works by making scan passes across the pixel rows and colums of
++the image.  The density of the passes is configured at the scanner as a pixel
++stride for each axis.  ``ZBAR_CFG_Y_DENSITY`` (``ZBAR_CFG_X_DENSITY``)
++controls the number of pixel rows (columns) that are skipped between
++successive horizontal (vertical) scan passes.  (Note that "density" is really
++not a good name for the configuation settings... "stride" might be more
++appropriate.)
++
++Decreasing the scan density (by increasing the stride setting) is a great way
++to limit the processing (increasing the frame rate) without sacrificing scan
++resolution - each scan pass is still made at full image resolution, there are
++just fewer passes (less redundancy).
++
++Setting the stride value to 0 completely disables scanning in that direction.
++This is very useful when reading linear codes with a visual alignment guide -
++scanning parallel to the bars is a waste of cycles which may be better applied
++to support higher resolution or increased density of scans across the symbol.
++Note that some 2-D symbologies (QR Code) require scans in both directions.
++
++Setting the stride to a very large value will generate a single scan pass
++through the center of the image.  Note that some symbologies will not be
++detected without multiple successful passes; it is usually better to combine
++this setting with cropping to generate a number of closely clustered scan
++passes in the target area.
++
++Note that the density also affects the aspect ratio and rotation that can be
++tolerated.  If you set it too large, some barcodes will become more difficult
++to read.
++
++In general, 2 to 4 is a good target for the stride setting, unless you have
++very high or low resolution images.
++
++Disable unused symbologies
++^^^^^^^^^^^^^^^^^^^^^^^^^^
++
++Limiting the symbologies to the set of interest should provide a small
++performance boost.  It also improves decode reliability - it is impossible to
++receive an incorrect or unexpected decode result from a symbology that is
++disabled.
++
++The reader does support full auto-discrimination among the supported
++symbologies, but with all of them enabled you may need to compensate elsewhere
++to get a good frame rate.
++
++For example, if you are only interested in QR codes, disable the others.  The
++robust way to do this is by disabling *all* symbologies and then reenabling
++only those you want.  This helps isolate you from encountering new symbologies
++that may be added in future versions of the library until you are ready to
++handle them::
++
++   [scanner setSymbology: 0
++            config: ZBAR_CFG_ENABLE
++            to: 0];
++   [scanner setSymbology: ZBAR_QRCODE
++            config: ZBAR_CFG_ENABLE
++            to: 1];
++
++Even if you would like your application to support multiple symbologies, you
++may consider if there is a way to limit the enabled subset based on the
++scanning context, etc...
++
++
++Examples
++--------
++
++These examples demonstrate several scenarios for scanning from the camera with
++automatic capture.  You can try them yourself using the readertest.  For each
++example, start with the default settings (by tapping the
++``ZBarReaderViewController`` class), then enable continuous mode and the
++custom overlay (by disabling
++:member:`~ZBarReaderViewController::showsZBarControls`).  You should also use
++a release build and avoid running in the debugger.
++
++Frame rates are approximate, measured on an iPhone 3GS running iOS 4.0.1 in a
++well lit room.  Two measurements are taken for each sample: the rate with the
++camera pointed at a blank white page such that it fills the frame, and the
++rate while continuously decoding the provided example.  For best results, it
++is recommended that you print the examples rather than scanning them from the
++screen.
++
++For reference, the base frame rates with default settings are 12fps for a
++blank white page, 7.5fps for this `basic EAN symbol`_ and 2.2fps for this
++`basic QR symbol`_.
++
++.. _`basic EAN symbol`:
++   http://zbar.sf.net/test/ean13/9876543210128.png
++.. _`basic QR symbol`:
++   http://chart.apis.google.com/chart?cht=qr&chs=512x512&chl=http://zbar.sf.net/iphone
++
++Long Linear Symbols
++^^^^^^^^^^^^^^^^^^^
++
++For this example, we will use a relatively `long Code 128 barcode`_.
++
++.. _`long Code 128 barcode`:
++   http://zbar.sf.net/test/code128/ALPHA.png
++
++While it should be possible to read this symbol with the default settings, you
++may notice that it is not very reliable.  You will have to stretch the symbol
++across the entire screen, and even then the default settings will only give
++you about 1.6 pixels per module, well below the ideal target of 3.  To improve
++these results, we want to maximize scanning resolution for the long image
++axis.
++
++1. Disable the default zoom/crop - zoom all the way out by hitting "Scan" and
++   pinching the preview; the frame rate immediately drops to 8fps / 4.8fps.
++
++We should compensate for this reduction in the frame rate:
++
++2. Crop the image to a long, skinny rectangle - set the
++   :member:`~ZBarReaderViewController::scanCrop` setting to
++   ``{{0, 0.3}, {1, 0.4}}``;  The frame rate jumps up to 18fps / 8.7fps.
++
++3. Disable scans across the short image axis - set the ``CFG_X_DENSITY``
++   setting to 0.  The frame rate goes all the way to 30fps / 13fps.
++
++Since we have plenty of margin with the frame rate, we can minimize the total
++decode latency by performing more scan passes through the symbol:
++
++4. Increase the scan density - set the ``CFG_Y_DENSITY`` setting to 1 (13.5fps
++   / 5fps) or 2 (24fps / 9fps).
++
++You should now be able to quickly and reliably decode long linear symbols.
++
++If have a newer device, you may also try increasing the resolution to support
++even longer symbols.  You may have to compensate elsewhere to bring the frame
++rate back to a reasonable level.
++
++High Density QR Symbols
++^^^^^^^^^^^^^^^^^^^^^^^
++
++For this example we will use a `version 29 QR Code symbol`_.
++
++.. _`version 29 QR Code symbol`:
++   http://www.qrcomic.com/images/5.png
++
++In this case we still want to maximize the resolution, but we also need to
++increase the scan density to reliably pick up the small finder patterns:
++
++1. Maximize scan density in both directions - set the ``CFG_X_DENSITY`` and
++   ``CFG_Y_DENSITY`` settings both to 1.  You should be able to scan the symbol
++   now, although the frame rate drops to 4.5fps / 1fps
++
++2. Disable the default zoom/crop - zoom all the way out by hitting "Scan" and
++   pinching the preview; the frame rate drops further to 3fps / 0.7fps
++
++We can compensate somewhat for the reduced frame rate:
++
++3. Crop the image to a square - set ``scanCrop`` to ``{{0.125, 0}, {.75, 1}}``.
++   This boosts the frame rate slightly to 3.7fps / 0.75fps.
++
++4. Disable linear symbologies - set the symbologies such that only QR Code is
++   enabled (4fps / 1fps)
++
++Even though the frame rate is still pretty bad, the QR recognition latency
++should be acceptable.
++
++If have an iPhone 4, you may also try increasing the resolution to support
++even denser QR symbols. You may have to compensate elsewhere to bring the
++frame rate back to a reasonable level.
++
++Small DataBar Symbols
++^^^^^^^^^^^^^^^^^^^^^
++
++For this example we will use a `DataBar symbol`_ printed with a small feature
++size, typical of the stickers used to tag produce.  Scale it when printing
++such that the printed dimensions are about 1cm square.  This symbol should
++scan with the default settings, but we will attempt to optimize the scan
++latency for this case.
++
++.. _`DataBar symbol`:
++   http://zbar.sf.net/test/databar/0109876543210128-so.png
++
++As well as high barcode resolution, we also want high density passes in both
++directions to minimize sensitivity to rotation:
++
++1. Maximize scan density in both directions - set the ``CFG_X_DENSITY`` and
++   ``CFG_Y_DENSITY`` settings both to 1.  The frame rate drops to 4.5fps /
++   3fps.
++
++Compensate for the reduction in frame rate by zooming in on the small symbol,
++which crops the scanned image.  Zooming also helps the user see the small
++barcode:
++
++2. Zoom all the way in - hit "Scan" and un-pinch the preview.  The frame rate
++   recovers to 11fps / 6.2fps.
++
++3. Crop the image to a square - set ``scanCrop`` to ``{{0.125, 0}, {0.75, 1}}``
++   (14fps / 7.5fps)
++
++4. Disable all symbologies except DataBar and DataBar Expanded (14.5fps / 9fps)
++
++The reader should now be very sensitive to DataBar, even when scanned at an
++angle.
+diff -r 563557a923d0 iphone/doc/picker.rst
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/doc/picker.rst	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,104 @@
++Scanning a User-Selected Image
++==============================
++
++Some applications may need the full resolution offered by camera snapshots, or
++need to scan an image or document from the user's photo library.  In these
++cases you use a :class:`ZBarReaderController`.  This reader is a *subclass* of
++:class:`UIImagePickerController`, and you use it the same way.  See the
++documentation for :class:`UIImagePickerController` for more detais.
++
++1. Create the reader.
++
++   This is as simple as creating a new :class:`ZBarReaderController`::
++
++      ZBarReaderController *reader = [[ZBarReaderController alloc] init];
++
++2. Setup a delegate to receive the results.
++
++   The delegate should implement the :class:`ZBarReaderDelegate` protocol,
++   which inherits from :class:`UIImagePickerControllerDelegate`::
++
++      reader.readerDelegate = self;
++
++3. Configure the reader.
++
++   You will need to set the :member:`~ZBarReaderController::sourceType`
++   appropriately.  Aside from the properties of the reader itself, you can
++   configure the decoder via the :member:`~ZBarReaderController::scanner`
++   property::
++
++      if([ZBarReaderController isSourceTypeAvailable:
++                                   UIImagePickerControllerSourceTypeCamera])
++          reader.sourceType = UIImagePickerControllerSourceTypeCamera;
++      [reader.scanner setSymbology: ZBAR_I25
++                      config: ZBAR_CFG_ENABLE
++                      to: 0];
++
++   See :doc:`custom` and :doc:`optimizing` for more details.
++
++4. Present the reader to the user.
++
++   As the reader is a UIImagePickerController, it must be presented modally::
++
++      [self presentModalViewController: reader
++            animated: YES];
++
++5. Process the results.
++
++   The controller will call the
++   ``imagePickerController:didFinishPickingMediaWithInfo:`` method of
++   your delegate for a successful decode (NB *not* every time the user takes a
++   picture or selects an image).  The barcode data can be obtained using the
++   :c:data:`ZBarReaderControllerResults` key of the info dictionary.  This key
++   will return "something enumerable"; keep in mind that there may be multiple
++   results.  You may also retrieve the corresponding image with
++   :c:data:`UIImagePickerControllerOriginalImage` as usual::
++
++      - (void) imagePickerController: (UIImagePickerController*) reader
++       didFinishPickingMediaWithInfo: (NSDictionary*) info
++      {
++          id<NSFastEnumeration> results =
++              [info objectForKey: ZBarReaderControllerResults];
++          UIImage *image =
++              [info objectForKey: UIImagePickerControllerOriginalImage];
++          ...
++
++   The ``reader`` parameter will be the actual :class:`ZBarReaderController`
++   (again, a subclass :class:`UIImagePickerController`).
++
++   .. note::
++
++      The delegate method should dismiss the reader and return as soon as
++      possible; any processing of the results should be deferred until later,
++      otherwise the user will experience unacceptable latency between the
++      actual scan completion and the visual interface feedback.
++
++6. Dismiss the reader.
++
++   Once you have the results you should dismiss the reader::
++
++      [reader dismissModalViewControllerAnimated: YES];
++
++   .. warning::
++
++      It is very important to dismiss from the *reader* (not the presenting
++      controller) to avoid corrupting the interface.
++
++
++Handling Failure
++----------------
++
++It is always possible the user selects/takes an image that does not contain
++barcodes, or that the image quality is not sufficient for the ZBar library to
++scan successfully.
++
++In this case, and if :member:`~ZBarReaderController::showsHelpOnFail` is
++``YES``, the integrated help controller will automatically be displayed with
++reason set to ``"FAIL"``.
++
++Your delegate may also choose to implement the optional
++``readerControllerDidFailToRead:withRetry:`` method to explicitly handle
++failures.  If the ``retry`` parameter is ``NO``, you *must* dismiss the reader
++before returning, otherwise you may continue and allow the user to retry the
++operation.  Note that, if it is enabled, the integrated help will be displayed
++when this delegate method is invoked.
+diff -r 563557a923d0 iphone/doc/static/style.css
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/doc/static/style.css	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,36 @@
++@import url("default.css");
++
++h1, h2, h3, h4, h5, h6 {
++    clear: both;
++}
++
++img.logo {
++    vertical-align: middle;
++}
++
++img.floatright {
++    float: right;
++    clear: both;
++    margin-left: 2em;
++    margin-right: 2em;
++}
++
++dl.docutils dt {
++    font-weight: bold;
++}
++dl.docutils dd {
++    margin-top: 1em;
++    margin-bottom: 1em;
++}
++
++table.docutils {
++    margin-left: auto;
++    margin-right: auto;
++}
++table.docutils th, table.docutils td {
++    padding: .25em .5em;
++}
++
++table.docutils.field-list {
++    margin-left: 0;
++}
+diff -r 563557a923d0 iphone/doc/support.rst
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/doc/support.rst	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,19 @@
++Obtaining Support
++=================
++
++If this documentation does not address your question/problem and you need
++support, please feel free to post in our `iPhone Developers Forum`_.
++
++.. _`iPhone Developers Forum`:
++   http://sourceforge.net/projects/zbar/forums/forum/1072195
++
++When posting, please:
++
++* Check the :doc:`faq` and the rest of this documentation first.
++* Start a new thread for a new question - do not "hijack" an unrelated thread.
++* Post complete details of your problem - complete error messages as well as
++  relevant source code and images.
++* Log-in to receive email, or check back within a day or so - you will almost
++  always get a response.
++
++For the latest support information, please see http://zbar.sf.net/iphone
+diff -r 563557a923d0 iphone/doc/tutorial.rst
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/doc/tutorial.rst	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,228 @@
++ZBar SDK Integration Tutorial
++=============================
++
++.. image:: ReaderSample.png
++   :alt: Screenshot of the ReaderSample app
++   :width: 414
++   :height: 770
++   :scale: 40
++   :class: floatright
++
++This tutorial will quickly get you up and running with the ZBar iPhone SDK.
++
++We will develop a very simple app that presents a button the user can tap to
++invoke the barcode reader and then displays the results.  Interface Builder
++will be used to create the interface.
++
++The completed project is also available with the distributed SDK under
++:file:`Examples/ReaderSample`.
++
++
++Create the App
++--------------
++
++1. Open Xcode; you must have version 4.5.1 or later.
++
++2. Create a new project using the "View-based Application" template.  Name the
++   project "ReaderSample".  Save it wherever you like.
++
++3. Open :file:`ReaderSampleViewController.xib`
++
++4. Drag a Round Rect Button onto the view and title it "Scan".  Customize the
++   placement and appearance as you like.
++
++5. Drag an Image View onto the view.  Size it to fill about half of the
++   remaining space.  Change the view mode to Aspect Fit.
++
++6. Drag a Text View onto the view and size it to fill the remaining space.
++   Change the default text to "No barcode scanned" or something.  De-select
++   "Editable"
++
++7. Add connections to the interface elements in the code; open
++   :file:`ReaderSampleViewController.h` and change the interface to::
++
++      @interface ReaderSampleViewController : UIViewController
++      {
++          UIImageView *resultImage;
++          UITextView *resultText;
++      }
++      @property (nonatomic, retain) IBOutlet UIImageView *resultImage;
++      @property (nonatomic, retain) IBOutlet UITextView *resultText;
++      - (IBAction) scanButtonTapped;
++      @end
++
++8. Now we can finish the interface connections - open
++   :file:`ReaderSampleViewController.xib` and make these connections:
++
++   * Connect ReaderSampleViewController ``resultImage`` outlet to the
++     ImageView.
++   * Connect ReaderSampleViewController ``resultText`` outlet to the TextView.
++   * Connect ReaderSampleViewController ``scanButtonTapped`` action to the
++     RoundedRectButton(Scan) event ``TouchUpInside``.
++
++   Consult the Xcode documentation if you need help making these connections.
++   Make sure you save the XIB once they are finished.
++
++9. Finish the implementation in :file:`ReaderSampleViewController.m`::
++
++      @synthesize resultImage, resultText;
++      
++      - (IBAction) scanButtonTapped
++      {
++          NSLog(@"TBD: scan barcode here...");
++      }
++      
++      - (void) dealloc
++      {
++          self.resultImage = nil;
++          self.resultText = nil;
++          [super dealloc];
++      }
++      
++      - (BOOL) shouldAutorotateToInterfaceOrientation: (UIInterfaceOrientation) interfaceOrientation
++      {
++          return(YES);
++      }
++
++   This stub for scanButtonTapped is temporary, we'll fix it in a minute...
++
++Although it doesn't do much yet, you should now have a working skeleton app
++that you can build and run.
++
++
++Integrate the Reader
++--------------------
++
++Now for the exciting part - let's add a barcode reader!
++
++1. If you have not done so already, download the latest SDK from
++   http://zbar.sourceforge.net/iphone
++
++2. Double-click the disk image, ZBarSDK-|version|.dmg in the Finder to open it.
++
++3. Drag the :file:`ZBarSDK` folder into your Xcode project.  Make sure that
++   the "Copy Items into destination group's folder" checkbox is checked.
++
++4. Open the target build settings and find ``Link Binary With Libraries``.
++   Click the ``+`` and add each of these (NB hold down command for multiple
++   selection):
++
++   * AVFoundation.framework
++   * CoreMedia.framework
++   * CoreVideo.framework
++   * QuartzCore.framework
++   * libiconv.dylib
++
++   .. warning::
++
++      Link order may be important for some versions of Xcode; the libraries
++      referenced above should be listed *before* :file:`libzbar.a` in the
++      link order.
++
++5. Import the SDK header.  You will usually want to prefix it, so add it to
++   :file:`ReaderSample-prefix.pch`::
++
++      // ADD: import barcode reader APIs
++      #import "ZBarSDK.h"
++
++6. Declare support for the delegate protocol in
++   :file:`ReaderSampleViewController.h`::
++
++      @interface ReaderSampleViewController : UIViewController
++          // ADD: delegate protocol
++          < ZBarReaderDelegate >
++      {
++      ...
++
++7. Re-implement scanButtonTapped to present a barcode reader when the user
++   taps the Scan button.  In :file:`ReaderSampleViewController.m`::
++
++      - (IBAction) scanButtonTapped
++      {
++          // ADD: present a barcode reader that scans from the camera feed
++          ZBarReaderViewController *reader = [[ZBarReaderViewController alloc] init];
++          reader.readerDelegate = self;
++          reader.supportedOrientationsMask = ZBarOrientationMaskAll;
++      
++          ZBarImageScanner *scanner = reader.scanner;
++          // TODO: (optional) additional reader configuration here
++      
++          // EXAMPLE: disable rarely used I2/5 to improve performance
++          [scanner setSymbology: ZBAR_I25
++                   config: ZBAR_CFG_ENABLE
++                   to: 0];
++      
++          // present and release the controller
++          [self presentModalViewController: reader
++                animated: YES];
++          [reader release];
++      }
++
++8. Finally, implement the delegate method to do something useful with the
++   results.  Still in :file:`ReaderSampleViewController.m`::
++
++      - (void) imagePickerController: (UIImagePickerController*) reader
++       didFinishPickingMediaWithInfo: (NSDictionary*) info
++      {
++          // ADD: get the decode results
++          id<NSFastEnumeration> results =
++              [info objectForKey: ZBarReaderControllerResults];
++          ZBarSymbol *symbol = nil;
++          for(symbol in results)
++              // EXAMPLE: just grab the first barcode
++              break;
++      
++          // EXAMPLE: do something useful with the barcode data
++          resultText.text = symbol.data;
++      
++          // EXAMPLE: do something useful with the barcode image
++          resultImage.image =
++              [info objectForKey: UIImagePickerControllerOriginalImage];
++      
++          // ADD: dismiss the controller (NB dismiss from the *reader*!)
++          [reader dismissModalViewControllerAnimated: YES];
++      }
++
++And that's it!
++
++
++Testing
++-------
++
++1. Save everything (don't forget to save MyAppViewController.xib).
++
++2. Build and Run the project.
++
++3. Tap the Scan button.
++
++4. Aim at barcode.
++
++5. Enjoy the sweet fruits of your minimal labor
++
++
++Where to go from here
++---------------------
++
++You can learn more about using the reader APIs to scan barcodes from
++:doc:`camera` or :doc:`picker`.  Use the :doc:`apiref` to find details about a
++particular interface.
++
++
++Troubleshooting
++---------------
++
++We take great care to ensure this tutorial is working as described.  However,
++if you do have a problem
++
++1. Make sure you followed the instructions exactly - every detail is
++   important.
++2. Start from scratch with a new project and follow the instructions
++   *exactly*.
++3. Try the ReaderSample distributed with the SDK and compare your work with
++   that.
++4. If you are unable to get things working, you may post your frustrations in
++   the project `iPhone Developers Forum`_.  Please be very specific about your
++   problem, post the complete text of any errors, etc.
++
++.. _`iPhone Developers Forum`:
++   http://sourceforge.net/projects/zbar/forums/forum/1072195
+diff -r 563557a923d0 iphone/examples/EmbedReader/Default-568h@2x.png
+Binary file iphone/examples/EmbedReader/Default-568h@2x.png has changed
+diff -r 563557a923d0 iphone/examples/EmbedReader/EmbedReader.xcodeproj/project.pbxproj
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/examples/EmbedReader/EmbedReader.xcodeproj/project.pbxproj	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,416 @@
++// !$*UTF8*$!
++{
++	archiveVersion = 1;
++	classes = {
++	};
++	objectVersion = 46;
++	objects = {
++
++/* Begin PBXBuildFile section */
++		DC824612162B5E140010B2E6 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DC824611162B5E140010B2E6 /* Default-568h@2x.png */; };
++		DCFB4494136F7202004B3EE0 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCFB4493136F7202004B3EE0 /* UIKit.framework */; };
++		DCFB4496136F7202004B3EE0 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCFB4495136F7202004B3EE0 /* Foundation.framework */; };
++		DCFB4498136F7202004B3EE0 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCFB4497136F7202004B3EE0 /* CoreGraphics.framework */; };
++		DCFB449E136F7203004B3EE0 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = DCFB449C136F7203004B3EE0 /* InfoPlist.strings */; };
++		DCFB44A1136F7203004B3EE0 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = DCFB44A0136F7203004B3EE0 /* main.m */; };
++		DCFB44A4136F7203004B3EE0 /* EmbedReaderAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = DCFB44A3136F7203004B3EE0 /* EmbedReaderAppDelegate.m */; };
++		DCFB44A7136F7203004B3EE0 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = DCFB44A5136F7203004B3EE0 /* MainWindow.xib */; };
++		DCFB44AA136F7203004B3EE0 /* EmbedReaderViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DCFB44A9136F7203004B3EE0 /* EmbedReaderViewController.m */; };
++		DCFB44AD136F7203004B3EE0 /* EmbedReaderViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = DCFB44AB136F7203004B3EE0 /* EmbedReaderViewController.xib */; };
++		DCFB44D0136F722A004B3EE0 /* libzbar.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCFB44CA136F722A004B3EE0 /* libzbar.a */; };
++		DCFB44D1136F722A004B3EE0 /* zbar-back.png in Resources */ = {isa = PBXBuildFile; fileRef = DCFB44CC136F722A004B3EE0 /* zbar-back.png */; };
++		DCFB44D2136F722A004B3EE0 /* zbar-help.html in Resources */ = {isa = PBXBuildFile; fileRef = DCFB44CD136F722A004B3EE0 /* zbar-help.html */; };
++		DCFB44D3136F722A004B3EE0 /* zbar-helpicons.png in Resources */ = {isa = PBXBuildFile; fileRef = DCFB44CE136F722A004B3EE0 /* zbar-helpicons.png */; };
++		DCFB44D4136F722A004B3EE0 /* zbar-samples.png in Resources */ = {isa = PBXBuildFile; fileRef = DCFB44CF136F722A004B3EE0 /* zbar-samples.png */; };
++		DCFB44DA136F72D3004B3EE0 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCFB44D5136F72D3004B3EE0 /* AVFoundation.framework */; };
++		DCFB44DB136F72D3004B3EE0 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCFB44D6136F72D3004B3EE0 /* CoreMedia.framework */; };
++		DCFB44DC136F72D3004B3EE0 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCFB44D7136F72D3004B3EE0 /* CoreVideo.framework */; };
++		DCFB44DD136F72D3004B3EE0 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DCFB44D8136F72D3004B3EE0 /* libiconv.dylib */; };
++		DCFB44DE136F72D3004B3EE0 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCFB44D9136F72D3004B3EE0 /* QuartzCore.framework */; };
++/* End PBXBuildFile section */
++
++/* Begin PBXFileReference section */
++		DC824611162B5E140010B2E6 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = SOURCE_ROOT; };
++		DCFB448F136F7202004B3EE0 /* EmbedReader.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = EmbedReader.app; sourceTree = BUILT_PRODUCTS_DIR; };
++		DCFB4493136F7202004B3EE0 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
++		DCFB4495136F7202004B3EE0 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
++		DCFB4497136F7202004B3EE0 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
++		DCFB449B136F7202004B3EE0 /* EmbedReader-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "EmbedReader-Info.plist"; sourceTree = "<group>"; };
++		DCFB449D136F7203004B3EE0 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
++		DCFB449F136F7203004B3EE0 /* EmbedReader-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "EmbedReader-Prefix.pch"; sourceTree = "<group>"; };
++		DCFB44A0136F7203004B3EE0 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
++		DCFB44A2136F7203004B3EE0 /* EmbedReaderAppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EmbedReaderAppDelegate.h; sourceTree = "<group>"; };
++		DCFB44A3136F7203004B3EE0 /* EmbedReaderAppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = EmbedReaderAppDelegate.m; sourceTree = "<group>"; };
++		DCFB44A6136F7203004B3EE0 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/MainWindow.xib; sourceTree = "<group>"; };
++		DCFB44A8136F7203004B3EE0 /* EmbedReaderViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EmbedReaderViewController.h; sourceTree = "<group>"; };
++		DCFB44A9136F7203004B3EE0 /* EmbedReaderViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = EmbedReaderViewController.m; sourceTree = "<group>"; };
++		DCFB44AC136F7203004B3EE0 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/EmbedReaderViewController.xib; sourceTree = "<group>"; };
++		DCFB44B7136F722A004B3EE0 /* Decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Decoder.h; sourceTree = "<group>"; };
++		DCFB44B8136F722A004B3EE0 /* Exception.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Exception.h; sourceTree = "<group>"; };
++		DCFB44B9136F722A004B3EE0 /* Image.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Image.h; sourceTree = "<group>"; };
++		DCFB44BA136F722A004B3EE0 /* ImageScanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImageScanner.h; sourceTree = "<group>"; };
++		DCFB44BB136F722A004B3EE0 /* Processor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Processor.h; sourceTree = "<group>"; };
++		DCFB44BC136F722A004B3EE0 /* Scanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Scanner.h; sourceTree = "<group>"; };
++		DCFB44BD136F722A004B3EE0 /* Symbol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Symbol.h; sourceTree = "<group>"; };
++		DCFB44BE136F722A004B3EE0 /* Video.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Video.h; sourceTree = "<group>"; };
++		DCFB44BF136F722A004B3EE0 /* Window.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Window.h; sourceTree = "<group>"; };
++		DCFB44C0136F722A004B3EE0 /* zbar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zbar.h; sourceTree = "<group>"; };
++		DCFB44C1136F722A004B3EE0 /* ZBarCaptureReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarCaptureReader.h; sourceTree = "<group>"; };
++		DCFB44C2136F722A004B3EE0 /* ZBarHelpController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarHelpController.h; sourceTree = "<group>"; };
++		DCFB44C3136F722A004B3EE0 /* ZBarImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarImage.h; sourceTree = "<group>"; };
++		DCFB44C4136F722A004B3EE0 /* ZBarImageScanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarImageScanner.h; sourceTree = "<group>"; };
++		DCFB44C5136F722A004B3EE0 /* ZBarReaderController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarReaderController.h; sourceTree = "<group>"; };
++		DCFB44C6136F722A004B3EE0 /* ZBarReaderView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarReaderView.h; sourceTree = "<group>"; };
++		DCFB44C7136F722A004B3EE0 /* ZBarReaderViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarReaderViewController.h; sourceTree = "<group>"; };
++		DCFB44C8136F722A004B3EE0 /* ZBarSDK.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarSDK.h; sourceTree = "<group>"; };
++		DCFB44C9136F722A004B3EE0 /* ZBarSymbol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarSymbol.h; sourceTree = "<group>"; };
++		DCFB44CA136F722A004B3EE0 /* libzbar.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libzbar.a; sourceTree = "<group>"; };
++		DCFB44CC136F722A004B3EE0 /* zbar-back.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "zbar-back.png"; sourceTree = "<group>"; };
++		DCFB44CD136F722A004B3EE0 /* zbar-help.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "zbar-help.html"; sourceTree = "<group>"; };
++		DCFB44CE136F722A004B3EE0 /* zbar-helpicons.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "zbar-helpicons.png"; sourceTree = "<group>"; };
++		DCFB44CF136F722A004B3EE0 /* zbar-samples.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "zbar-samples.png"; sourceTree = "<group>"; };
++		DCFB44D5136F72D3004B3EE0 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
++		DCFB44D6136F72D3004B3EE0 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; };
++		DCFB44D7136F72D3004B3EE0 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; };
++		DCFB44D8136F72D3004B3EE0 /* libiconv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libiconv.dylib; path = usr/lib/libiconv.dylib; sourceTree = SDKROOT; };
++		DCFB44D9136F72D3004B3EE0 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
++/* End PBXFileReference section */
++
++/* Begin PBXFrameworksBuildPhase section */
++		DCFB448C136F7202004B3EE0 /* Frameworks */ = {
++			isa = PBXFrameworksBuildPhase;
++			buildActionMask = 2147483647;
++			files = (
++				DCFB4494136F7202004B3EE0 /* UIKit.framework in Frameworks */,
++				DCFB4496136F7202004B3EE0 /* Foundation.framework in Frameworks */,
++				DCFB4498136F7202004B3EE0 /* CoreGraphics.framework in Frameworks */,
++				DCFB44DE136F72D3004B3EE0 /* QuartzCore.framework in Frameworks */,
++				DCFB44DB136F72D3004B3EE0 /* CoreMedia.framework in Frameworks */,
++				DCFB44DC136F72D3004B3EE0 /* CoreVideo.framework in Frameworks */,
++				DCFB44DA136F72D3004B3EE0 /* AVFoundation.framework in Frameworks */,
++				DCFB44DD136F72D3004B3EE0 /* libiconv.dylib in Frameworks */,
++				DCFB44D0136F722A004B3EE0 /* libzbar.a in Frameworks */,
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++/* End PBXFrameworksBuildPhase section */
++
++/* Begin PBXGroup section */
++		DCFB4484136F7202004B3EE0 = {
++			isa = PBXGroup;
++			children = (
++				DCFB4499136F7202004B3EE0 /* EmbedReader */,
++				DCFB44B3136F722A004B3EE0 /* ZBarSDK */,
++				DCFB4492136F7202004B3EE0 /* Frameworks */,
++				DCFB4490136F7202004B3EE0 /* Products */,
++			);
++			sourceTree = "<group>";
++		};
++		DCFB4490136F7202004B3EE0 /* Products */ = {
++			isa = PBXGroup;
++			children = (
++				DCFB448F136F7202004B3EE0 /* EmbedReader.app */,
++			);
++			name = Products;
++			sourceTree = "<group>";
++		};
++		DCFB4492136F7202004B3EE0 /* Frameworks */ = {
++			isa = PBXGroup;
++			children = (
++				DCFB4493136F7202004B3EE0 /* UIKit.framework */,
++				DCFB4495136F7202004B3EE0 /* Foundation.framework */,
++				DCFB4497136F7202004B3EE0 /* CoreGraphics.framework */,
++				DCFB44D9136F72D3004B3EE0 /* QuartzCore.framework */,
++				DCFB44D6136F72D3004B3EE0 /* CoreMedia.framework */,
++				DCFB44D7136F72D3004B3EE0 /* CoreVideo.framework */,
++				DCFB44D5136F72D3004B3EE0 /* AVFoundation.framework */,
++				DCFB44D8136F72D3004B3EE0 /* libiconv.dylib */,
++			);
++			name = Frameworks;
++			sourceTree = "<group>";
++		};
++		DCFB4499136F7202004B3EE0 /* EmbedReader */ = {
++			isa = PBXGroup;
++			children = (
++				DCFB44A2136F7203004B3EE0 /* EmbedReaderAppDelegate.h */,
++				DCFB44A3136F7203004B3EE0 /* EmbedReaderAppDelegate.m */,
++				DCFB44A5136F7203004B3EE0 /* MainWindow.xib */,
++				DCFB44A8136F7203004B3EE0 /* EmbedReaderViewController.h */,
++				DCFB44A9136F7203004B3EE0 /* EmbedReaderViewController.m */,
++				DCFB44AB136F7203004B3EE0 /* EmbedReaderViewController.xib */,
++				DCFB449A136F7202004B3EE0 /* Supporting Files */,
++			);
++			path = EmbedReader;
++			sourceTree = "<group>";
++		};
++		DCFB449A136F7202004B3EE0 /* Supporting Files */ = {
++			isa = PBXGroup;
++			children = (
++				DCFB449B136F7202004B3EE0 /* EmbedReader-Info.plist */,
++				DCFB449C136F7203004B3EE0 /* InfoPlist.strings */,
++				DC824611162B5E140010B2E6 /* Default-568h@2x.png */,
++				DCFB449F136F7203004B3EE0 /* EmbedReader-Prefix.pch */,
++				DCFB44A0136F7203004B3EE0 /* main.m */,
++			);
++			name = "Supporting Files";
++			sourceTree = "<group>";
++		};
++		DCFB44B3136F722A004B3EE0 /* ZBarSDK */ = {
++			isa = PBXGroup;
++			children = (
++				DCFB44B4136F722A004B3EE0 /* Headers */,
++				DCFB44CA136F722A004B3EE0 /* libzbar.a */,
++				DCFB44CB136F722A004B3EE0 /* Resources */,
++			);
++			path = ZBarSDK;
++			sourceTree = "<group>";
++		};
++		DCFB44B4136F722A004B3EE0 /* Headers */ = {
++			isa = PBXGroup;
++			children = (
++				DCFB44B5136F722A004B3EE0 /* ZBarSDK */,
++			);
++			path = Headers;
++			sourceTree = "<group>";
++		};
++		DCFB44B5136F722A004B3EE0 /* ZBarSDK */ = {
++			isa = PBXGroup;
++			children = (
++				DCFB44B6136F722A004B3EE0 /* zbar */,
++				DCFB44C0136F722A004B3EE0 /* zbar.h */,
++				DCFB44C1136F722A004B3EE0 /* ZBarCaptureReader.h */,
++				DCFB44C2136F722A004B3EE0 /* ZBarHelpController.h */,
++				DCFB44C3136F722A004B3EE0 /* ZBarImage.h */,
++				DCFB44C4136F722A004B3EE0 /* ZBarImageScanner.h */,
++				DCFB44C5136F722A004B3EE0 /* ZBarReaderController.h */,
++				DCFB44C6136F722A004B3EE0 /* ZBarReaderView.h */,
++				DCFB44C7136F722A004B3EE0 /* ZBarReaderViewController.h */,
++				DCFB44C8136F722A004B3EE0 /* ZBarSDK.h */,
++				DCFB44C9136F722A004B3EE0 /* ZBarSymbol.h */,
++			);
++			path = ZBarSDK;
++			sourceTree = "<group>";
++		};
++		DCFB44B6136F722A004B3EE0 /* zbar */ = {
++			isa = PBXGroup;
++			children = (
++				DCFB44B7136F722A004B3EE0 /* Decoder.h */,
++				DCFB44B8136F722A004B3EE0 /* Exception.h */,
++				DCFB44B9136F722A004B3EE0 /* Image.h */,
++				DCFB44BA136F722A004B3EE0 /* ImageScanner.h */,
++				DCFB44BB136F722A004B3EE0 /* Processor.h */,
++				DCFB44BC136F722A004B3EE0 /* Scanner.h */,
++				DCFB44BD136F722A004B3EE0 /* Symbol.h */,
++				DCFB44BE136F722A004B3EE0 /* Video.h */,
++				DCFB44BF136F722A004B3EE0 /* Window.h */,
++			);
++			path = zbar;
++			sourceTree = "<group>";
++		};
++		DCFB44CB136F722A004B3EE0 /* Resources */ = {
++			isa = PBXGroup;
++			children = (
++				DCFB44CC136F722A004B3EE0 /* zbar-back.png */,
++				DCFB44CD136F722A004B3EE0 /* zbar-help.html */,
++				DCFB44CE136F722A004B3EE0 /* zbar-helpicons.png */,
++				DCFB44CF136F722A004B3EE0 /* zbar-samples.png */,
++			);
++			path = Resources;
++			sourceTree = "<group>";
++		};
++/* End PBXGroup section */
++
++/* Begin PBXNativeTarget section */
++		DCFB448E136F7202004B3EE0 /* EmbedReader */ = {
++			isa = PBXNativeTarget;
++			buildConfigurationList = DCFB44B0136F7203004B3EE0 /* Build configuration list for PBXNativeTarget "EmbedReader" */;
++			buildPhases = (
++				DCFB448B136F7202004B3EE0 /* Sources */,
++				DCFB448C136F7202004B3EE0 /* Frameworks */,
++				DCFB448D136F7202004B3EE0 /* Resources */,
++			);
++			buildRules = (
++			);
++			dependencies = (
++			);
++			name = EmbedReader;
++			productName = EmbedReader;
++			productReference = DCFB448F136F7202004B3EE0 /* EmbedReader.app */;
++			productType = "com.apple.product-type.application";
++		};
++/* End PBXNativeTarget section */
++
++/* Begin PBXProject section */
++		DCFB4486136F7202004B3EE0 /* Project object */ = {
++			isa = PBXProject;
++			buildConfigurationList = DCFB4489136F7202004B3EE0 /* Build configuration list for PBXProject "EmbedReader" */;
++			compatibilityVersion = "Xcode 3.2";
++			developmentRegion = English;
++			hasScannedForEncodings = 0;
++			knownRegions = (
++				en,
++			);
++			mainGroup = DCFB4484136F7202004B3EE0;
++			productRefGroup = DCFB4490136F7202004B3EE0 /* Products */;
++			projectDirPath = "";
++			projectRoot = "";
++			targets = (
++				DCFB448E136F7202004B3EE0 /* EmbedReader */,
++			);
++		};
++/* End PBXProject section */
++
++/* Begin PBXResourcesBuildPhase section */
++		DCFB448D136F7202004B3EE0 /* Resources */ = {
++			isa = PBXResourcesBuildPhase;
++			buildActionMask = 2147483647;
++			files = (
++				DCFB449E136F7203004B3EE0 /* InfoPlist.strings in Resources */,
++				DCFB44A7136F7203004B3EE0 /* MainWindow.xib in Resources */,
++				DCFB44AD136F7203004B3EE0 /* EmbedReaderViewController.xib in Resources */,
++				DCFB44D1136F722A004B3EE0 /* zbar-back.png in Resources */,
++				DCFB44D2136F722A004B3EE0 /* zbar-help.html in Resources */,
++				DCFB44D3136F722A004B3EE0 /* zbar-helpicons.png in Resources */,
++				DCFB44D4136F722A004B3EE0 /* zbar-samples.png in Resources */,
++				DC824612162B5E140010B2E6 /* Default-568h@2x.png in Resources */,
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++/* End PBXResourcesBuildPhase section */
++
++/* Begin PBXSourcesBuildPhase section */
++		DCFB448B136F7202004B3EE0 /* Sources */ = {
++			isa = PBXSourcesBuildPhase;
++			buildActionMask = 2147483647;
++			files = (
++				DCFB44A1136F7203004B3EE0 /* main.m in Sources */,
++				DCFB44A4136F7203004B3EE0 /* EmbedReaderAppDelegate.m in Sources */,
++				DCFB44AA136F7203004B3EE0 /* EmbedReaderViewController.m in Sources */,
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++/* End PBXSourcesBuildPhase section */
++
++/* Begin PBXVariantGroup section */
++		DCFB449C136F7203004B3EE0 /* InfoPlist.strings */ = {
++			isa = PBXVariantGroup;
++			children = (
++				DCFB449D136F7203004B3EE0 /* en */,
++			);
++			name = InfoPlist.strings;
++			sourceTree = "<group>";
++		};
++		DCFB44A5136F7203004B3EE0 /* MainWindow.xib */ = {
++			isa = PBXVariantGroup;
++			children = (
++				DCFB44A6136F7203004B3EE0 /* en */,
++			);
++			name = MainWindow.xib;
++			sourceTree = "<group>";
++		};
++		DCFB44AB136F7203004B3EE0 /* EmbedReaderViewController.xib */ = {
++			isa = PBXVariantGroup;
++			children = (
++				DCFB44AC136F7203004B3EE0 /* en */,
++			);
++			name = EmbedReaderViewController.xib;
++			sourceTree = "<group>";
++		};
++/* End PBXVariantGroup section */
++
++/* Begin XCBuildConfiguration section */
++		DCFB44AE136F7203004B3EE0 /* Debug */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
++				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
++				GCC_C_LANGUAGE_STANDARD = gnu99;
++				GCC_OPTIMIZATION_LEVEL = 0;
++				GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
++				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
++				GCC_VERSION = com.apple.compilers.llvmgcc42;
++				GCC_WARN_ABOUT_RETURN_TYPE = YES;
++				GCC_WARN_UNUSED_VARIABLE = YES;
++				IPHONEOS_DEPLOYMENT_TARGET = 4.0;
++				SDKROOT = iphoneos;
++			};
++			name = Debug;
++		};
++		DCFB44AF136F7203004B3EE0 /* Release */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
++				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
++				GCC_C_LANGUAGE_STANDARD = gnu99;
++				GCC_VERSION = com.apple.compilers.llvmgcc42;
++				GCC_WARN_ABOUT_RETURN_TYPE = YES;
++				GCC_WARN_UNUSED_VARIABLE = YES;
++				IPHONEOS_DEPLOYMENT_TARGET = 4.0;
++				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
++				SDKROOT = iphoneos;
++			};
++			name = Release;
++		};
++		DCFB44B1136F7203004B3EE0 /* Debug */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				ALWAYS_SEARCH_USER_PATHS = NO;
++				COPY_PHASE_STRIP = NO;
++				GCC_DYNAMIC_NO_PIC = NO;
++				GCC_PRECOMPILE_PREFIX_HEADER = YES;
++				GCC_PREFIX_HEADER = "EmbedReader/EmbedReader-Prefix.pch";
++				INFOPLIST_FILE = "EmbedReader/EmbedReader-Info.plist";
++				LIBRARY_SEARCH_PATHS = (
++					"$(inherited)",
++					"\"$(SRCROOT)/ZBarSDK\"",
++				);
++				PRODUCT_NAME = "$(TARGET_NAME)";
++				TARGETED_DEVICE_FAMILY = "1,2";
++				WRAPPER_EXTENSION = app;
++			};
++			name = Debug;
++		};
++		DCFB44B2136F7203004B3EE0 /* Release */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				ALWAYS_SEARCH_USER_PATHS = NO;
++				COPY_PHASE_STRIP = YES;
++				GCC_PRECOMPILE_PREFIX_HEADER = YES;
++				GCC_PREFIX_HEADER = "EmbedReader/EmbedReader-Prefix.pch";
++				INFOPLIST_FILE = "EmbedReader/EmbedReader-Info.plist";
++				LIBRARY_SEARCH_PATHS = (
++					"$(inherited)",
++					"\"$(SRCROOT)/ZBarSDK\"",
++				);
++				PRODUCT_NAME = "$(TARGET_NAME)";
++				TARGETED_DEVICE_FAMILY = "1,2";
++				VALIDATE_PRODUCT = YES;
++				WRAPPER_EXTENSION = app;
++			};
++			name = Release;
++		};
++/* End XCBuildConfiguration section */
++
++/* Begin XCConfigurationList section */
++		DCFB4489136F7202004B3EE0 /* Build configuration list for PBXProject "EmbedReader" */ = {
++			isa = XCConfigurationList;
++			buildConfigurations = (
++				DCFB44AE136F7203004B3EE0 /* Debug */,
++				DCFB44AF136F7203004B3EE0 /* Release */,
++			);
++			defaultConfigurationIsVisible = 0;
++			defaultConfigurationName = Release;
++		};
++		DCFB44B0136F7203004B3EE0 /* Build configuration list for PBXNativeTarget "EmbedReader" */ = {
++			isa = XCConfigurationList;
++			buildConfigurations = (
++				DCFB44B1136F7203004B3EE0 /* Debug */,
++				DCFB44B2136F7203004B3EE0 /* Release */,
++			);
++			defaultConfigurationIsVisible = 0;
++			defaultConfigurationName = Release;
++		};
++/* End XCConfigurationList section */
++	};
++	rootObject = DCFB4486136F7202004B3EE0 /* Project object */;
++}
+diff -r 563557a923d0 iphone/examples/EmbedReader/EmbedReader.xcodeproj/xcshareddata/xcschemes/EmbedReader.xcscheme
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/examples/EmbedReader/EmbedReader.xcodeproj/xcshareddata/xcschemes/EmbedReader.xcscheme	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,76 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<Scheme
++   version = "1.3">
++   <BuildAction
++      parallelizeBuildables = "YES"
++      buildImplicitDependencies = "YES">
++      <BuildActionEntries>
++         <BuildActionEntry
++            buildForTesting = "YES"
++            buildForRunning = "YES"
++            buildForProfiling = "YES"
++            buildForArchiving = "YES"
++            buildForAnalyzing = "YES">
++            <BuildableReference
++               BuildableIdentifier = "primary"
++               BlueprintIdentifier = "DCFB448E136F7202004B3EE0"
++               BuildableName = "EmbedReader.app"
++               BlueprintName = "EmbedReader"
++               ReferencedContainer = "container:EmbedReader.xcodeproj">
++            </BuildableReference>
++         </BuildActionEntry>
++      </BuildActionEntries>
++   </BuildAction>
++   <TestAction
++      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
++      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
++      shouldUseLaunchSchemeArgsEnv = "YES"
++      buildConfiguration = "Debug">
++      <Testables>
++      </Testables>
++   </TestAction>
++   <LaunchAction
++      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
++      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
++      displayScaleIsEnabled = "NO"
++      displayScale = "1.00"
++      launchStyle = "0"
++      useCustomWorkingDirectory = "NO"
++      buildConfiguration = "Debug">
++      <BuildableProductRunnable>
++         <BuildableReference
++            BuildableIdentifier = "primary"
++            BlueprintIdentifier = "DCFB448E136F7202004B3EE0"
++            BuildableName = "EmbedReader.app"
++            BlueprintName = "EmbedReader"
++            ReferencedContainer = "container:EmbedReader.xcodeproj">
++         </BuildableReference>
++      </BuildableProductRunnable>
++      <AdditionalOptions>
++      </AdditionalOptions>
++   </LaunchAction>
++   <ProfileAction
++      displayScaleIsEnabled = "NO"
++      displayScale = "1.00"
++      shouldUseLaunchSchemeArgsEnv = "YES"
++      savedToolIdentifier = ""
++      useCustomWorkingDirectory = "NO"
++      buildConfiguration = "Release">
++      <BuildableProductRunnable>
++         <BuildableReference
++            BuildableIdentifier = "primary"
++            BlueprintIdentifier = "DCFB448E136F7202004B3EE0"
++            BuildableName = "EmbedReader.app"
++            BlueprintName = "EmbedReader"
++            ReferencedContainer = "container:EmbedReader.xcodeproj">
++         </BuildableReference>
++      </BuildableProductRunnable>
++   </ProfileAction>
++   <AnalyzeAction
++      buildConfiguration = "Debug">
++   </AnalyzeAction>
++   <ArchiveAction
++      buildConfiguration = "Release"
++      revealArchiveInOrganizer = "YES">
++   </ArchiveAction>
++</Scheme>
+diff -r 563557a923d0 iphone/examples/EmbedReader/EmbedReader/EmbedReader-Info.plist
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/examples/EmbedReader/EmbedReader/EmbedReader-Info.plist	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,39 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
++<plist version="1.0">
++<dict>
++	<key>CFBundleDevelopmentRegion</key>
++	<string>en</string>
++	<key>CFBundleDisplayName</key>
++	<string>${PRODUCT_NAME}</string>
++	<key>CFBundleExecutable</key>
++	<string>${EXECUTABLE_NAME}</string>
++	<key>CFBundleIconFile</key>
++	<string></string>
++	<key>CFBundleIdentifier</key>
++	<string>net.sourceforge.zbar.${PRODUCT_NAME:rfc1034identifier}</string>
++	<key>CFBundleInfoDictionaryVersion</key>
++	<string>6.0</string>
++	<key>CFBundleName</key>
++	<string>${PRODUCT_NAME}</string>
++	<key>CFBundlePackageType</key>
++	<string>APPL</string>
++	<key>CFBundleShortVersionString</key>
++	<string>1.0</string>
++	<key>CFBundleSignature</key>
++	<string>????</string>
++	<key>CFBundleVersion</key>
++	<string>1.0</string>
++	<key>LSRequiresIPhoneOS</key>
++	<true/>
++	<key>NSMainNibFile</key>
++	<string>MainWindow</string>
++	<key>UISupportedInterfaceOrientations</key>
++	<array>
++		<string>UIInterfaceOrientationPortrait</string>
++		<string>UIInterfaceOrientationLandscapeLeft</string>
++		<string>UIInterfaceOrientationLandscapeRight</string>
++		<string>UIInterfaceOrientationPortraitUpsideDown</string>
++	</array>
++</dict>
++</plist>
+diff -r 563557a923d0 iphone/examples/EmbedReader/EmbedReader/EmbedReader-Prefix.pch
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/examples/EmbedReader/EmbedReader/EmbedReader-Prefix.pch	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,11 @@
++#import <Availability.h>
++
++#ifndef __IPHONE_3_0
++#warning "This project uses features only available in iPhone SDK 3.0 and later."
++#endif
++
++#ifdef __OBJC__
++# import <UIKit/UIKit.h>
++# import <Foundation/Foundation.h>
++# import "ZBarSDK.h"
++#endif
+diff -r 563557a923d0 iphone/examples/EmbedReader/EmbedReader/EmbedReaderAppDelegate.h
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/examples/EmbedReader/EmbedReader/EmbedReaderAppDelegate.h	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,21 @@
++//
++//  EmbedReaderAppDelegate.h
++//  EmbedReader
++//
++//  Created by spadix on 5/2/11.
++//
++
++#import <UIKit/UIKit.h>
++
++@class EmbedReaderViewController;
++
++@interface EmbedReaderAppDelegate
++    : NSObject
++    < UIApplicationDelegate >
++{
++}
++
++@property (nonatomic, retain) IBOutlet UIWindow *window;
++@property (nonatomic, retain) IBOutlet EmbedReaderViewController *viewController;
++
++@end
+diff -r 563557a923d0 iphone/examples/EmbedReader/EmbedReader/EmbedReaderAppDelegate.m
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/examples/EmbedReader/EmbedReader/EmbedReaderAppDelegate.m	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,34 @@
++//
++//  EmbedReaderAppDelegate.m
++//  EmbedReader
++//
++//  Created by spadix on 5/2/11.
++//
++
++#import "EmbedReaderAppDelegate.h"
++#import "EmbedReaderViewController.h"
++
++@implementation EmbedReaderAppDelegate
++@synthesize window=_window;
++@synthesize viewController=_viewController;
++
++- (BOOL)            application: (UIApplication*) application
++  didFinishLaunchingWithOptions: (NSDictionary*) launchOptions
++{
++    self.window.rootViewController = self.viewController;
++    [self.window makeKeyAndVisible];
++
++    // force view class to load so it may be referenced directly from NIB
++    [ZBarReaderView class];
++
++    return(YES);
++}
++
++- (void) dealloc
++{
++    [_window release];
++    [_viewController release];
++    [super dealloc];
++}
++
++@end
+diff -r 563557a923d0 iphone/examples/EmbedReader/EmbedReader/EmbedReaderViewController.h
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/examples/EmbedReader/EmbedReader/EmbedReaderViewController.h	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,22 @@
++//
++//  EmbedReaderViewController.h
++//  EmbedReader
++//
++//  Created by spadix on 5/2/11.
++//
++
++#import <UIKit/UIKit.h>
++
++@interface EmbedReaderViewController
++    : UIViewController
++    < ZBarReaderViewDelegate >
++{
++    ZBarReaderView *readerView;
++    UITextView *resultText;
++    ZBarCameraSimulator *cameraSim;
++}
++
++@property (nonatomic, retain) IBOutlet ZBarReaderView *readerView;
++@property (nonatomic, retain) IBOutlet UITextView *resultText;
++
++@end
+diff -r 563557a923d0 iphone/examples/EmbedReader/EmbedReader/EmbedReaderViewController.m
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/examples/EmbedReader/EmbedReader/EmbedReaderViewController.m	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,101 @@
++//
++//  EmbedReaderViewController.m
++//  EmbedReader
++//
++//  Created by spadix on 5/2/11.
++//
++
++#import "EmbedReaderViewController.h"
++
++@implementation EmbedReaderViewController
++
++@synthesize readerView, resultText;
++
++- (void) cleanup
++{
++    [cameraSim release];
++    cameraSim = nil;
++    readerView.readerDelegate = nil;
++    [readerView release];
++    readerView = nil;
++    [resultText release];
++    resultText = nil;
++}
++
++- (void) dealloc
++{
++    [self cleanup];
++    [super dealloc];
++}
++
++- (void) viewDidLoad
++{
++    [super viewDidLoad];
++
++    // the delegate receives decode results
++    readerView.readerDelegate = self;
++
++    // ensure initial camera orientation is correctly set
++    UIApplication *app = [UIApplication sharedApplication];
++    [readerView willRotateToInterfaceOrientation: app.statusBarOrientation
++                                        duration: 0];
++
++    // you can use this to support the simulator
++    if(TARGET_IPHONE_SIMULATOR) {
++        cameraSim = [[ZBarCameraSimulator alloc]
++                        initWithViewController: self];
++        cameraSim.readerView = readerView;
++    }
++}
++
++- (void) viewDidUnload
++{
++    [self cleanup];
++    [super viewDidUnload];
++}
++
++- (BOOL) shouldAutorotateToInterfaceOrientation: (UIInterfaceOrientation) orient
++{
++    // auto-rotation is supported
++    return(YES);
++}
++
++- (void) willRotateToInterfaceOrientation: (UIInterfaceOrientation) orient
++                                 duration: (NSTimeInterval) duration
++{
++    // compensate for view rotation so camera preview is not rotated
++    [readerView willRotateToInterfaceOrientation: orient
++                                        duration: duration];
++}
++
++- (void) willAnimateRotationToInterfaceOrientation: (UIInterfaceOrientation) orient
++                                          duration: (NSTimeInterval) duration
++{
++    // perform rotation in animation loop so camera preview does not move
++    // wrt device orientation
++    [readerView setNeedsLayout];
++}
++
++- (void) viewDidAppear: (BOOL) animated
++{
++    // run the reader when the view is visible
++    [readerView start];
++}
++
++- (void) viewWillDisappear: (BOOL) animated
++{
++    [readerView stop];
++}
++
++- (void) readerView: (ZBarReaderView*) view
++     didReadSymbols: (ZBarSymbolSet*) syms
++          fromImage: (UIImage*) img
++{
++    // do something useful with results
++    for(ZBarSymbol *sym in syms) {
++        resultText.text = sym.data;
++        break;
++    }
++}
++
++@end
+diff -r 563557a923d0 iphone/examples/EmbedReader/EmbedReader/en.lproj/EmbedReaderViewController.xib
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/examples/EmbedReader/EmbedReader/en.lproj/EmbedReaderViewController.xib	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,336 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
++	<data>
++		<int key="IBDocument.SystemTarget">1056</int>
++		<string key="IBDocument.SystemVersion">10J869</string>
++		<string key="IBDocument.InterfaceBuilderVersion">1306</string>
++		<string key="IBDocument.AppKitVersion">1038.35</string>
++		<string key="IBDocument.HIToolboxVersion">461.00</string>
++		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
++			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
++			<string key="NS.object.0">301</string>
++		</object>
++		<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
++			<bool key="EncodedWithXMLCoder">YES</bool>
++			<string>IBUINavigationItem</string>
++			<string>IBUIToolbar</string>
++			<string>IBUITextView</string>
++			<string>IBUIView</string>
++			<string>IBUINavigationBar</string>
++			<string>IBProxyObject</string>
++		</object>
++		<object class="NSArray" key="IBDocument.PluginDependencies">
++			<bool key="EncodedWithXMLCoder">YES</bool>
++			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
++		</object>
++		<object class="NSMutableDictionary" key="IBDocument.Metadata">
++			<bool key="EncodedWithXMLCoder">YES</bool>
++			<object class="NSArray" key="dict.sortedKeys" id="0">
++				<bool key="EncodedWithXMLCoder">YES</bool>
++			</object>
++			<reference key="dict.values" ref="0"/>
++		</object>
++		<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
++			<bool key="EncodedWithXMLCoder">YES</bool>
++			<object class="IBProxyObject" id="372490531">
++				<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
++				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
++			</object>
++			<object class="IBProxyObject" id="843779117">
++				<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
++				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
++			</object>
++			<object class="IBUIView" id="774585933">
++				<reference key="NSNextResponder"/>
++				<int key="NSvFlags">274</int>
++				<object class="NSMutableArray" key="NSSubviews">
++					<bool key="EncodedWithXMLCoder">YES</bool>
++					<object class="IBUIView" id="461611788">
++						<reference key="NSNextResponder" ref="774585933"/>
++						<int key="NSvFlags">306</int>
++						<string key="NSFrame">{{8, 52}, {304, 228}}</string>
++						<reference key="NSSuperview" ref="774585933"/>
++						<reference key="NSWindow"/>
++						<reference key="NSNextKeyView" ref="971445553"/>
++						<object class="NSColor" key="IBUIBackgroundColor">
++							<int key="NSColorSpace">3</int>
++							<bytes key="NSWhite">MAA</bytes>
++						</object>
++						<bool key="IBUIClipsSubviews">YES</bool>
++						<bool key="IBUIMultipleTouchEnabled">YES</bool>
++						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
++					</object>
++					<object class="IBUINavigationBar" id="583656854">
++						<reference key="NSNextResponder" ref="774585933"/>
++						<int key="NSvFlags">290</int>
++						<string key="NSFrameSize">{320, 44}</string>
++						<reference key="NSSuperview" ref="774585933"/>
++						<reference key="NSWindow"/>
++						<reference key="NSNextKeyView" ref="461611788"/>
++						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
++						<object class="NSArray" key="IBUIItems">
++							<bool key="EncodedWithXMLCoder">YES</bool>
++							<object class="IBUINavigationItem" id="889758731">
++								<reference key="IBUINavigationBar" ref="583656854"/>
++								<string key="IBUITitle">EmbedReader</string>
++								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
++							</object>
++						</object>
++					</object>
++					<object class="IBUIToolbar" id="89745263">
++						<reference key="NSNextResponder" ref="774585933"/>
++						<int key="NSvFlags">266</int>
++						<string key="NSFrame">{{0, 416}, {320, 44}}</string>
++						<reference key="NSSuperview" ref="774585933"/>
++						<reference key="NSWindow"/>
++						<reference key="NSNextKeyView"/>
++						<bool key="IBUIOpaque">NO</bool>
++						<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
++						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
++						<object class="NSMutableArray" key="IBUIItems">
++							<bool key="EncodedWithXMLCoder">YES</bool>
++						</object>
++					</object>
++					<object class="IBUITextView" id="971445553">
++						<reference key="NSNextResponder" ref="774585933"/>
++						<int key="NSvFlags">314</int>
++						<string key="NSFrame">{{8, 300}, {304, 94}}</string>
++						<reference key="NSSuperview" ref="774585933"/>
++						<reference key="NSWindow"/>
++						<reference key="NSNextKeyView" ref="89745263"/>
++						<object class="NSColor" key="IBUIBackgroundColor">
++							<int key="NSColorSpace">3</int>
++							<bytes key="NSWhite">MCAwAA</bytes>
++						</object>
++						<bool key="IBUIClipsSubviews">YES</bool>
++						<bool key="IBUIMultipleTouchEnabled">YES</bool>
++						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
++						<bool key="IBUIEditable">NO</bool>
++						<string key="IBUIText">No barcode scanned...</string>
++						<object class="NSFont" key="IBUIFont">
++							<string key="NSName">Helvetica</string>
++							<double key="NSSize">17</double>
++							<int key="NSfFlags">16</int>
++						</object>
++						<object class="IBUITextInputTraits" key="IBUITextInputTraits">
++							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
++						</object>
++					</object>
++				</object>
++				<string key="NSFrame">{{0, 20}, {320, 460}}</string>
++				<reference key="NSSuperview"/>
++				<reference key="NSWindow"/>
++				<reference key="NSNextKeyView" ref="583656854"/>
++				<object class="NSColor" key="IBUIBackgroundColor">
++					<int key="NSColorSpace">3</int>
++					<bytes key="NSWhite">MC43NQA</bytes>
++					<object class="NSColorSpace" key="NSCustomColorSpace">
++						<int key="NSID">2</int>
++					</object>
++				</object>
++				<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
++				<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
++				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
++			</object>
++		</object>
++		<object class="IBObjectContainer" key="IBDocument.Objects">
++			<object class="NSMutableArray" key="connectionRecords">
++				<bool key="EncodedWithXMLCoder">YES</bool>
++				<object class="IBConnectionRecord">
++					<object class="IBCocoaTouchOutletConnection" key="connection">
++						<string key="label">view</string>
++						<reference key="source" ref="372490531"/>
++						<reference key="destination" ref="774585933"/>
++					</object>
++					<int key="connectionID">7</int>
++				</object>
++				<object class="IBConnectionRecord">
++					<object class="IBCocoaTouchOutletConnection" key="connection">
++						<string key="label">readerView</string>
++						<reference key="source" ref="372490531"/>
++						<reference key="destination" ref="461611788"/>
++					</object>
++					<int key="connectionID">16</int>
++				</object>
++				<object class="IBConnectionRecord">
++					<object class="IBCocoaTouchOutletConnection" key="connection">
++						<string key="label">resultText</string>
++						<reference key="source" ref="372490531"/>
++						<reference key="destination" ref="971445553"/>
++					</object>
++					<int key="connectionID">17</int>
++				</object>
++			</object>
++			<object class="IBMutableOrderedSet" key="objectRecords">
++				<object class="NSArray" key="orderedObjects">
++					<bool key="EncodedWithXMLCoder">YES</bool>
++					<object class="IBObjectRecord">
++						<int key="objectID">0</int>
++						<reference key="object" ref="0"/>
++						<reference key="children" ref="1000"/>
++						<nil key="parent"/>
++					</object>
++					<object class="IBObjectRecord">
++						<int key="objectID">-1</int>
++						<reference key="object" ref="372490531"/>
++						<reference key="parent" ref="0"/>
++						<string key="objectName">File's Owner</string>
++					</object>
++					<object class="IBObjectRecord">
++						<int key="objectID">-2</int>
++						<reference key="object" ref="843779117"/>
++						<reference key="parent" ref="0"/>
++					</object>
++					<object class="IBObjectRecord">
++						<int key="objectID">6</int>
++						<reference key="object" ref="774585933"/>
++						<object class="NSMutableArray" key="children">
++							<bool key="EncodedWithXMLCoder">YES</bool>
++							<reference ref="583656854"/>
++							<reference ref="89745263"/>
++							<reference ref="971445553"/>
++							<reference ref="461611788"/>
++						</object>
++						<reference key="parent" ref="0"/>
++					</object>
++					<object class="IBObjectRecord">
++						<int key="objectID">8</int>
++						<reference key="object" ref="461611788"/>
++						<reference key="parent" ref="774585933"/>
++					</object>
++					<object class="IBObjectRecord">
++						<int key="objectID">11</int>
++						<reference key="object" ref="583656854"/>
++						<object class="NSMutableArray" key="children">
++							<bool key="EncodedWithXMLCoder">YES</bool>
++							<reference ref="889758731"/>
++						</object>
++						<reference key="parent" ref="774585933"/>
++					</object>
++					<object class="IBObjectRecord">
++						<int key="objectID">12</int>
++						<reference key="object" ref="889758731"/>
++						<reference key="parent" ref="583656854"/>
++					</object>
++					<object class="IBObjectRecord">
++						<int key="objectID">13</int>
++						<reference key="object" ref="89745263"/>
++						<object class="NSMutableArray" key="children">
++							<bool key="EncodedWithXMLCoder">YES</bool>
++						</object>
++						<reference key="parent" ref="774585933"/>
++					</object>
++					<object class="IBObjectRecord">
++						<int key="objectID">15</int>
++						<reference key="object" ref="971445553"/>
++						<reference key="parent" ref="774585933"/>
++					</object>
++				</object>
++			</object>
++			<object class="NSMutableDictionary" key="flattenedProperties">
++				<bool key="EncodedWithXMLCoder">YES</bool>
++				<object class="NSArray" key="dict.sortedKeys">
++					<bool key="EncodedWithXMLCoder">YES</bool>
++					<string>-1.CustomClassName</string>
++					<string>-2.CustomClassName</string>
++					<string>11.IBPluginDependency</string>
++					<string>12.IBPluginDependency</string>
++					<string>13.IBPluginDependency</string>
++					<string>15.IBPluginDependency</string>
++					<string>6.IBEditorWindowLastContentRect</string>
++					<string>6.IBPluginDependency</string>
++					<string>8.CustomClassName</string>
++					<string>8.IBPluginDependency</string>
++				</object>
++				<object class="NSMutableArray" key="dict.values">
++					<bool key="EncodedWithXMLCoder">YES</bool>
++					<string>EmbedReaderViewController</string>
++					<string>UIResponder</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>
++					<string>{{239, 654}, {320, 480}}</string>
++					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
++					<string>ZBarReaderView</string>
++					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
++				</object>
++			</object>
++			<object class="NSMutableDictionary" key="unlocalizedProperties">
++				<bool key="EncodedWithXMLCoder">YES</bool>
++				<reference key="dict.sortedKeys" ref="0"/>
++				<reference key="dict.values" ref="0"/>
++			</object>
++			<nil key="activeLocalization"/>
++			<object class="NSMutableDictionary" key="localizations">
++				<bool key="EncodedWithXMLCoder">YES</bool>
++				<reference key="dict.sortedKeys" ref="0"/>
++				<reference key="dict.values" ref="0"/>
++			</object>
++			<nil key="sourceID"/>
++			<int key="maxID">18</int>
++		</object>
++		<object class="IBClassDescriber" key="IBDocument.Classes">
++			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
++				<bool key="EncodedWithXMLCoder">YES</bool>
++				<object class="IBPartialClassDescription">
++					<string key="className">EmbedReaderViewController</string>
++					<string key="superclassName">UIViewController</string>
++					<object class="NSMutableDictionary" key="outlets">
++						<bool key="EncodedWithXMLCoder">YES</bool>
++						<object class="NSArray" key="dict.sortedKeys">
++							<bool key="EncodedWithXMLCoder">YES</bool>
++							<string>readerView</string>
++							<string>resultText</string>
++						</object>
++						<object class="NSMutableArray" key="dict.values">
++							<bool key="EncodedWithXMLCoder">YES</bool>
++							<string>ZBarReaderView</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>readerView</string>
++							<string>resultText</string>
++						</object>
++						<object class="NSMutableArray" key="dict.values">
++							<bool key="EncodedWithXMLCoder">YES</bool>
++							<object class="IBToOneOutletInfo">
++								<string key="name">readerView</string>
++								<string key="candidateClassName">ZBarReaderView</string>
++							</object>
++							<object class="IBToOneOutletInfo">
++								<string key="name">resultText</string>
++								<string key="candidateClassName">UITextView</string>
++							</object>
++						</object>
++					</object>
++					<object class="IBClassDescriptionSource" key="sourceIdentifier">
++						<string key="majorKey">IBProjectSource</string>
++						<string key="minorKey">./Classes/EmbedReaderViewController.h</string>
++					</object>
++				</object>
++				<object class="IBPartialClassDescription">
++					<string key="className">ZBarReaderView</string>
++					<string key="superclassName">UIView</string>
++					<object class="IBClassDescriptionSource" key="sourceIdentifier">
++						<string key="majorKey">IBProjectSource</string>
++						<string key="minorKey">./Classes/ZBarReaderView.h</string>
++					</object>
++				</object>
++			</object>
++		</object>
++		<int key="IBDocument.localizationMode">0</int>
++		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
++		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
++			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
++			<integer value="3100" key="NS.object.0"/>
++		</object>
++		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
++		<int key="IBDocument.defaultPropertyAccessControl">3</int>
++		<string key="IBCocoaTouchPluginVersion">301</string>
++	</data>
++</archive>
+diff -r 563557a923d0 iphone/examples/EmbedReader/EmbedReader/en.lproj/InfoPlist.strings
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/examples/EmbedReader/EmbedReader/en.lproj/InfoPlist.strings	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,2 @@
++/* Localized versions of Info.plist keys */
++
+diff -r 563557a923d0 iphone/examples/EmbedReader/EmbedReader/en.lproj/MainWindow.xib
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/examples/EmbedReader/EmbedReader/en.lproj/MainWindow.xib	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,444 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
++	<data>
++		<int key="IBDocument.SystemTarget">1024</int>
++		<string key="IBDocument.SystemVersion">10D571</string>
++		<string key="IBDocument.InterfaceBuilderVersion">786</string>
++		<string key="IBDocument.AppKitVersion">1038.29</string>
++		<string key="IBDocument.HIToolboxVersion">460.00</string>
++		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
++			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
++			<string key="NS.object.0">112</string>
++		</object>
++		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
++			<bool key="EncodedWithXMLCoder">YES</bool>
++			<integer value="10"/>
++		</object>
++		<object class="NSArray" key="IBDocument.PluginDependencies">
++			<bool key="EncodedWithXMLCoder">YES</bool>
++			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
++		</object>
++		<object class="NSMutableDictionary" key="IBDocument.Metadata">
++			<bool key="EncodedWithXMLCoder">YES</bool>
++			<object class="NSArray" key="dict.sortedKeys" id="0">
++				<bool key="EncodedWithXMLCoder">YES</bool>
++			</object>
++			<object class="NSMutableArray" key="dict.values">
++				<bool key="EncodedWithXMLCoder">YES</bool>
++			</object>
++		</object>
++		<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
++			<bool key="EncodedWithXMLCoder">YES</bool>
++			<object class="IBProxyObject" id="841351856">
++				<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
++				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
++			</object>
++			<object class="IBProxyObject" id="427554174">
++				<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
++				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
++			</object>
++			<object class="IBUICustomObject" id="664661524">
++				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
++			</object>
++			<object class="IBUIViewController" id="943309135">
++				<string key="IBUINibName">EmbedReaderViewController</string>
++				<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
++				<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
++					<int key="interfaceOrientation">1</int>
++				</object>
++				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
++				<bool key="IBUIHorizontal">NO</bool>
++			</object>
++			<object class="IBUIWindow" id="117978783">
++				<nil key="NSNextResponder"/>
++				<int key="NSvFlags">292</int>
++				<string key="NSFrameSize">{320, 480}</string>
++				<object class="NSColor" key="IBUIBackgroundColor">
++					<int key="NSColorSpace">1</int>
++					<bytes key="NSRGB">MSAxIDEAA</bytes>
++				</object>
++				<bool key="IBUIOpaque">NO</bool>
++				<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
++				<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
++				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
++				<bool key="IBUIResizesToFullScreen">YES</bool>
++			</object>
++		</object>
++		<object class="IBObjectContainer" key="IBDocument.Objects">
++			<object class="NSMutableArray" key="connectionRecords">
++				<bool key="EncodedWithXMLCoder">YES</bool>
++				<object class="IBConnectionRecord">
++					<object class="IBCocoaTouchOutletConnection" key="connection">
++						<string key="label">delegate</string>
++						<reference key="source" ref="841351856"/>
++						<reference key="destination" ref="664661524"/>
++					</object>
++					<int key="connectionID">4</int>
++				</object>
++				<object class="IBConnectionRecord">
++					<object class="IBCocoaTouchOutletConnection" key="connection">
++						<string key="label">viewController</string>
++						<reference key="source" ref="664661524"/>
++						<reference key="destination" ref="943309135"/>
++					</object>
++					<int key="connectionID">11</int>
++				</object>
++				<object class="IBConnectionRecord">
++					<object class="IBCocoaTouchOutletConnection" key="connection">
++						<string key="label">window</string>
++						<reference key="source" ref="664661524"/>
++						<reference key="destination" ref="117978783"/>
++					</object>
++					<int key="connectionID">14</int>
++				</object>
++			</object>
++			<object class="IBMutableOrderedSet" key="objectRecords">
++				<object class="NSArray" key="orderedObjects">
++					<bool key="EncodedWithXMLCoder">YES</bool>
++					<object class="IBObjectRecord">
++						<int key="objectID">0</int>
++						<reference key="object" ref="0"/>
++						<reference key="children" ref="1000"/>
++						<nil key="parent"/>
++					</object>
++					<object class="IBObjectRecord">
++						<int key="objectID">-1</int>
++						<reference key="object" ref="841351856"/>
++						<reference key="parent" ref="0"/>
++						<string key="objectName">File's Owner</string>
++					</object>
++					<object class="IBObjectRecord">
++						<int key="objectID">3</int>
++						<reference key="object" ref="664661524"/>
++						<reference key="parent" ref="0"/>
++						<string key="objectName">EmbedReader App Delegate</string>
++					</object>
++					<object class="IBObjectRecord">
++						<int key="objectID">-2</int>
++						<reference key="object" ref="427554174"/>
++						<reference key="parent" ref="0"/>
++					</object>
++					<object class="IBObjectRecord">
++						<int key="objectID">10</int>
++						<reference key="object" ref="943309135"/>
++						<reference key="parent" ref="0"/>
++					</object>
++					<object class="IBObjectRecord">
++						<int key="objectID">12</int>
++						<reference key="object" ref="117978783"/>
++						<reference key="parent" ref="0"/>
++					</object>
++				</object>
++			</object>
++			<object class="NSMutableDictionary" key="flattenedProperties">
++				<bool key="EncodedWithXMLCoder">YES</bool>
++				<object class="NSArray" key="dict.sortedKeys">
++					<bool key="EncodedWithXMLCoder">YES</bool>
++					<string>-1.CustomClassName</string>
++					<string>-2.CustomClassName</string>
++					<string>10.CustomClassName</string>
++					<string>10.IBEditorWindowLastContentRect</string>
++					<string>10.IBPluginDependency</string>
++					<string>12.IBEditorWindowLastContentRect</string>
++					<string>12.IBPluginDependency</string>
++					<string>3.CustomClassName</string>
++					<string>3.IBPluginDependency</string>
++				</object>
++				<object class="NSMutableArray" key="dict.values">
++					<bool key="EncodedWithXMLCoder">YES</bool>
++					<string>UIApplication</string>
++					<string>UIResponder</string>
++					<string>EmbedReaderViewController</string>
++					<string>{{234, 376}, {320, 480}}</string>
++					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
++					<string>{{525, 346}, {320, 480}}</string>
++					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
++					<string>EmbedReaderAppDelegate</string>
++					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
++				</object>
++			</object>
++			<object class="NSMutableDictionary" key="unlocalizedProperties">
++				<bool key="EncodedWithXMLCoder">YES</bool>
++				<reference key="dict.sortedKeys" ref="0"/>
++				<object class="NSMutableArray" key="dict.values">
++					<bool key="EncodedWithXMLCoder">YES</bool>
++				</object>
++			</object>
++			<nil key="activeLocalization"/>
++			<object class="NSMutableDictionary" key="localizations">
++				<bool key="EncodedWithXMLCoder">YES</bool>
++				<reference key="dict.sortedKeys" ref="0"/>
++				<object class="NSMutableArray" key="dict.values">
++					<bool key="EncodedWithXMLCoder">YES</bool>
++				</object>
++			</object>
++			<nil key="sourceID"/>
++			<int key="maxID">15</int>
++		</object>
++		<object class="IBClassDescriber" key="IBDocument.Classes">
++			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
++				<bool key="EncodedWithXMLCoder">YES</bool>
++				<object class="IBPartialClassDescription">
++					<string key="className">UIWindow</string>
++					<string key="superclassName">UIView</string>
++					<object class="IBClassDescriptionSource" key="sourceIdentifier">
++						<string key="majorKey">IBUserSource</string>
++						<string key="minorKey"/>
++					</object>
++				</object>
++				<object class="IBPartialClassDescription">
++					<string key="className">EmbedReaderAppDelegate</string>
++					<string key="superclassName">NSObject</string>
++					<object class="NSMutableDictionary" key="outlets">
++						<bool key="EncodedWithXMLCoder">YES</bool>
++						<object class="NSArray" key="dict.sortedKeys">
++							<bool key="EncodedWithXMLCoder">YES</bool>
++							<string>viewController</string>
++							<string>window</string>
++						</object>
++						<object class="NSMutableArray" key="dict.values">
++							<bool key="EncodedWithXMLCoder">YES</bool>
++							<string>EmbedReaderViewController</string>
++							<string>UIWindow</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>viewController</string>
++							<string>window</string>
++						</object>
++						<object class="NSMutableArray" key="dict.values">
++							<bool key="EncodedWithXMLCoder">YES</bool>
++							<object class="IBToOneOutletInfo">
++								<string key="name">viewController</string>
++								<string key="candidateClassName">EmbedReaderViewController</string>
++							</object>
++							<object class="IBToOneOutletInfo">
++								<string key="name">window</string>
++								<string key="candidateClassName">UIWindow</string>
++							</object>
++						</object>
++					</object>
++					<object class="IBClassDescriptionSource" key="sourceIdentifier">
++						<string key="majorKey">IBProjectSource</string>
++						<string key="minorKey">EmbedReaderAppDelegate.h</string>
++					</object>
++				</object>
++				<object class="IBPartialClassDescription">
++					<string key="className">EmbedReaderAppDelegate</string>
++					<string key="superclassName">NSObject</string>
++					<object class="IBClassDescriptionSource" key="sourceIdentifier">
++						<string key="majorKey">IBUserSource</string>
++						<string key="minorKey"/>
++					</object>
++				</object>
++				<object class="IBPartialClassDescription">
++					<string key="className">EmbedReaderViewController</string>
++					<string key="superclassName">UIViewController</string>
++					<object class="IBClassDescriptionSource" key="sourceIdentifier">
++						<string key="majorKey">IBProjectSource</string>
++						<string key="minorKey">EmbedReaderViewController.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="356479594">
++						<string key="majorKey">IBFrameworkSource</string>
++						<string key="minorKey">UIKit.framework/Headers/UIResponder.h</string>
++					</object>
++				</object>
++				<object class="IBPartialClassDescription">
++					<string key="className">UIApplication</string>
++					<string key="superclassName">UIResponder</string>
++					<object class="IBClassDescriptionSource" key="sourceIdentifier">
++						<string key="majorKey">IBFrameworkSource</string>
++						<string key="minorKey">UIKit.framework/Headers/UIApplication.h</string>
++					</object>
++				</object>
++				<object class="IBPartialClassDescription">
++					<string key="className">UIResponder</string>
++					<string key="superclassName">NSObject</string>
++					<reference key="sourceIdentifier" ref="356479594"/>
++				</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">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 class="IBPartialClassDescription">
++					<string key="className">UIWindow</string>
++					<string key="superclassName">UIView</string>
++					<object class="IBClassDescriptionSource" key="sourceIdentifier">
++						<string key="majorKey">IBFrameworkSource</string>
++						<string key="minorKey">UIKit.framework/Headers/UIWindow.h</string>
++					</object>
++				</object>
++			</object>
++		</object>
++		<int key="IBDocument.localizationMode">0</int>
++		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
++		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
++			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
++			<integer value="1024" key="NS.object.0"/>
++		</object>
++		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
++			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
++			<integer value="3100" key="NS.object.0"/>
++		</object>
++		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
++		<string key="IBDocument.LastKnownRelativeProjectPath">EmbedReader.xcodeproj</string>
++		<int key="IBDocument.defaultPropertyAccessControl">3</int>
++		<string key="IBCocoaTouchPluginVersion">112</string>
++	</data>
++</archive>
+diff -r 563557a923d0 iphone/examples/EmbedReader/EmbedReader/main.m
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/examples/EmbedReader/EmbedReader/main.m	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,16 @@
++//
++//  main.m
++//  EmbedReader
++//
++//  Created by spadix on 5/2/11.
++//
 +
-+table.docutils {
-+    margin-left: auto;
-+    margin-right: auto;
-+}
-+table.docutils th, table.docutils td {
-+    padding: .25em .5em;
-+}
++#import <UIKit/UIKit.h>
 +
-+table.docutils.field-list {
-+    margin-left: 0;
++int main(int argc, char *argv[])
++{
++    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
++    int retVal = UIApplicationMain(argc, argv, nil, nil);
++    [pool release];
++    return retVal;
 +}
-diff --git a/iphone/doc/support.rst b/iphone/doc/support.rst
-new file mode 100644
---- /dev/null
-+++ b/iphone/doc/support.rst
-@@ -0,0 +1,19 @@
-+Obtaining Support
-+=================
-+
-+If this documentation does not address your question/problem and you need
-+support, please feel free to post in our `iPhone Developers Forum`_.
-+
-+.. _`iPhone Developers Forum`:
-+   http://sourceforge.net/projects/zbar/forums/forum/1072195
-+
-+When posting, please:
-+
-+* Check the :doc:`faq` and the rest of this documentation first.
-+* Start a new thread for a new question - do not "hijack" an unrelated thread.
-+* Post complete details of your problem - complete error messages as well as
-+  relevant source code and images.
-+* Log-in to receive email, or check back within a day or so - you will almost
-+  always get a response.
-+
-+For the latest support information, please see http://zbar.sf.net/iphone
-diff --git a/iphone/doc/tutorial.rst b/iphone/doc/tutorial.rst
-new file mode 100644
---- /dev/null
-+++ b/iphone/doc/tutorial.rst
-@@ -0,0 +1,216 @@
-+ZBar SDK Integration Tutorial
-+=============================
-+
-+.. image:: ReaderSample.png
-+   :alt: Screenshot of the ReaderSample app
-+   :width: 414
-+   :height: 770
-+   :scale: 40
-+   :class: floatright
-+
-+This tutorial will quickly get you up and running with the ZBar iPhone SDK.
-+
-+We will develop a very simple app that presents a button the user can tap to
-+invoke the barcode reader and then displays the results.  Interface Builder
-+will be used to create the interface.
-+
-+The completed project is also available with the distributed SDK under
-+:file:`Examples/ReaderSample`.
-+
-+
-+Create the App
-+--------------
-+
-+1. Open Xcode; you must have version 3.2.3 or later.
-+
-+2. Create a new project using the "View-based Application" template.  Name the
-+   project "ReaderSample".  Save it wherever you like.
-+
-+3. Open :file:`ReaderSampleViewController.xib`
-+
-+4. Drag a Round Rect Button onto the view and title it "Scan".  Customize the
-+   placement and appearance as you like.
-+
-+5. Drag an Image View onto the view.  Size it to fill about half of the
-+   remaining space.  Change the view mode to Aspect Fit.
-+
-+6. Drag a Text View onto the view and size it to fill the remaining space.
-+   Change the default text to "No barcode scanned" or something.  De-select
-+   "Editable"
-+
-+7. Add connections to the interface elements in the code; open
-+   :file:`ReaderSampleViewController.h` and change the interface to::
-+
-+      @interface ReaderSampleViewController : UIViewController
-+      {
-+          UIImageView *resultImage;
-+          UITextView *resultText;
-+      }
-+      @property (nonatomic, retain) IBOutlet UIImageView *resultImage;
-+      @property (nonatomic, retain) IBOutlet UITextView *resultText;
-+      - (IBAction) scanButtonTapped;
-+      @end
-+
-+8. Now we can finish the interface connections - open
-+   :file:`ReaderSampleViewController.xib` and make these connections:
-+
-+   * Connect ReaderSampleViewController ``resultImage`` outlet to the
-+     ImageView.
-+   * Connect ReaderSampleViewController ``resultText`` outlet to the TextView.
-+   * Connect ReaderSampleViewController ``scanButtonTapped`` action to the
-+     RoundedRectButton(Scan) event ``TouchUpInside``.
-+
-+   Consult the Xcode documentation if you need help making these connections.
-+   Make sure you save the XIB once they are finished.
-+
-+9. Finish the implementation in :file:`ReaderSampleViewController.m`::
-+
-+      @synthesize resultImage, resultText;
-+      
-+      - (IBAction) scanButtonTapped
-+      {
-+          NSLog(@"TBD: scan barcode here...");
-+      }
-+      
-+      - (void) dealloc {
-+          self.resultImage = nil;
-+          self.resultText = nil;
-+          [super dealloc];
-+      }
-+
-+   This stub for scanButtonTapped is temporary, we'll fix it in a minute...
-+
-+Although it doesn't do much yet, you should now have a working skeleton app
-+that you can build and run.
-+
-+
-+Integrate the Reader
-+--------------------
-+
-+Now for the exciting part - let's add a barcode reader!
-+
-+1. If you have not done so already, download the latest SDK from
-+   http://zbar.sourceforge.net/iphone
-+
-+2. Double-click the disk image, ZBarSDK-|version|.dmg in the Finder to open it.
-+
-+3. Drag the :file:`ZBarSDK` folder into your Xcode project.  Make sure that
-+   the "Copy Items into destination group's folder" checkbox is checked.
-+
-+4. Right-click the ``Frameworks`` group in your project.  Select
-+   ``Add -> Existing Frameworks...``  Make sure "All" are listed and add each
-+   of these from the ``Device`` list (NB hold down command for multiple
-+   selection):
-+
-+   * AVFoundation.framework
-+   * CoreMedia.framework
-+   * CoreVideo.framework
-+   * QuartzCore.framework
-+   * libiconv.dylib
-+
-+5. Import the SDK header.  You will usually want to prefix it, so add it to
-+   :file:`ReaderSample_prefix.pch`::
-+
-+      // ADD: import barcode reader APIs
-+      #import "ZBarSDK.h"
-+
-+6. Declare support for the delegate protocol in
-+   :file:`ReaderSampleViewController.h`::
-+
-+      @interface ReaderSampleViewController : UIViewController
-+          // ADD: delegate protocol
-+          < ZBarReaderDelegate >
-+      {
-+      ...
-+
-+7. Re-implement scanButtonTapped to present a barcode reader when the user
-+   taps the Scan button.  In :file:`ReaderSampleViewController.m`::
-+
-+      - (IBAction) scanButtonTapped
-+      {
-+          // ADD: present a barcode reader that scans from the camera feed
-+          ZBarReaderViewController *reader = [ZBarReaderViewController new];
-+          reader.readerDelegate = self;
-+      
-+          ZBarImageScanner *scanner = reader.scanner;
-+          // TODO: (optional) additional reader configuration here
-+      
-+          // EXAMPLE: disable rarely used I2/5 to improve performance
-+          [scanner setSymbology: ZBAR_I25
-+                   config: ZBAR_CFG_ENABLE
-+                   to: 0];
-+      
-+          // present and release the controller
-+          [self presentModalViewController: reader
-+                animated: YES];
-+          [reader release];
-+      }
-+
-+8. Finally, implement the delegate method to do something useful with the
-+   results.  Still in :file:`ReaderSampleViewController.m`::
-+
-+      - (void) imagePickerController: (UIImagePickerController*) reader
-+       didFinishPickingMediaWithInfo: (NSDictionary*) info
-+      {
-+          // ADD: get the decode results
-+          id<NSFastEnumeration> results =
-+              [info objectForKey: ZBarReaderControllerResults];
-+          ZBarSymbol *symbol = nil;
-+          for(symbol in results)
-+              // EXAMPLE: just grab the first barcode
-+              break;
-+      
-+          // EXAMPLE: do something useful with the barcode data
-+          resultText.text = symbol.data;
-+      
-+          // EXAMPLE: do something useful with the barcode image
-+          resultImage.image =
-+              [info objectForKey: UIImagePickerControllerOriginalImage];
-+      
-+          // ADD: dismiss the controller (NB dismiss from the *reader*!)
-+          [reader dismissModalViewControllerAnimated: YES];
-+      }
-+
-+And that's it!
-+
+diff -r 563557a923d0 iphone/examples/EmbedReader/ZBarSDK
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/examples/EmbedReader/ZBarSDK	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,1 @@
++../../build/Debug-iphoneos/ZBarSDK
+\ No newline at end of file
+diff -r 563557a923d0 iphone/examples/EmbedReader/build
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/examples/EmbedReader/build	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,1 @@
++/tmp/EmbedReader.build
+\ No newline at end of file
+diff -r 563557a923d0 iphone/examples/ReaderSample/Default-568h@2x.png
+Binary file iphone/examples/ReaderSample/Default-568h@2x.png has changed
+diff -r 563557a923d0 iphone/examples/ReaderSample/ReaderSample.xcodeproj/project.pbxproj
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/examples/ReaderSample/ReaderSample.xcodeproj/project.pbxproj	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,419 @@
++// !$*UTF8*$!
++{
++	archiveVersion = 1;
++	classes = {
++	};
++	objectVersion = 46;
++	objects = {
 +
-+Testing
-+-------
++/* Begin PBXBuildFile section */
++		DC8245F5162B549F0010B2E6 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DC8245F4162B549F0010B2E6 /* Default-568h@2x.png */; };
++		DC8F289413579EFF005B8862 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8F289313579EFF005B8862 /* UIKit.framework */; };
++		DC8F289613579EFF005B8862 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8F289513579EFF005B8862 /* Foundation.framework */; };
++		DC8F289813579EFF005B8862 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8F289713579EFF005B8862 /* CoreGraphics.framework */; };
++		DC8F289E13579EFF005B8862 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = DC8F289C13579EFF005B8862 /* InfoPlist.strings */; };
++		DC8F28A113579EFF005B8862 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = DC8F28A013579EFF005B8862 /* main.m */; };
++		DC8F28A413579EFF005B8862 /* ReaderSampleAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = DC8F28A313579EFF005B8862 /* ReaderSampleAppDelegate.m */; };
++		DC8F28A713579EFF005B8862 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = DC8F28A513579EFF005B8862 /* MainWindow.xib */; };
++		DC8F28AA13579EFF005B8862 /* ReaderSampleViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DC8F28A913579EFF005B8862 /* ReaderSampleViewController.m */; };
++		DC8F28AD13579F00005B8862 /* ReaderSampleViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = DC8F28AB13579EFF005B8862 /* ReaderSampleViewController.xib */; };
++		DC8F28D01357A29D005B8862 /* libzbar.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8F28CA1357A29D005B8862 /* libzbar.a */; };
++		DC8F28D11357A29D005B8862 /* zbar-back.png in Resources */ = {isa = PBXBuildFile; fileRef = DC8F28CC1357A29D005B8862 /* zbar-back.png */; };
++		DC8F28D21357A29D005B8862 /* zbar-help.html in Resources */ = {isa = PBXBuildFile; fileRef = DC8F28CD1357A29D005B8862 /* zbar-help.html */; };
++		DC8F28D31357A29D005B8862 /* zbar-helpicons.png in Resources */ = {isa = PBXBuildFile; fileRef = DC8F28CE1357A29D005B8862 /* zbar-helpicons.png */; };
++		DC8F28D41357A29D005B8862 /* zbar-samples.png in Resources */ = {isa = PBXBuildFile; fileRef = DC8F28CF1357A29D005B8862 /* zbar-samples.png */; };
++		DC8F28DA1357A42E005B8862 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8F28D51357A42E005B8862 /* AVFoundation.framework */; };
++		DC8F28DB1357A42E005B8862 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8F28D61357A42E005B8862 /* CoreMedia.framework */; };
++		DC8F28DC1357A42E005B8862 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8F28D71357A42E005B8862 /* CoreVideo.framework */; };
++		DC8F28DD1357A42E005B8862 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8F28D81357A42E005B8862 /* libiconv.dylib */; };
++		DC8F28DE1357A42E005B8862 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8F28D91357A42E005B8862 /* QuartzCore.framework */; };
++/* End PBXBuildFile section */
 +
-+1. Save everything (don't forget to save MyAppViewController.xib).
++/* Begin PBXFileReference section */
++		DC8245F4162B549F0010B2E6 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = SOURCE_ROOT; };
++		DC8F288F13579EFF005B8862 /* ReaderSample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ReaderSample.app; sourceTree = BUILT_PRODUCTS_DIR; };
++		DC8F289313579EFF005B8862 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
++		DC8F289513579EFF005B8862 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
++		DC8F289713579EFF005B8862 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
++		DC8F289B13579EFF005B8862 /* ReaderSample-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "ReaderSample-Info.plist"; sourceTree = "<group>"; };
++		DC8F289D13579EFF005B8862 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
++		DC8F289F13579EFF005B8862 /* ReaderSample-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "ReaderSample-Prefix.pch"; sourceTree = "<group>"; };
++		DC8F28A013579EFF005B8862 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
++		DC8F28A213579EFF005B8862 /* ReaderSampleAppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ReaderSampleAppDelegate.h; sourceTree = "<group>"; };
++		DC8F28A313579EFF005B8862 /* ReaderSampleAppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ReaderSampleAppDelegate.m; sourceTree = "<group>"; };
++		DC8F28A613579EFF005B8862 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/MainWindow.xib; sourceTree = "<group>"; };
++		DC8F28A813579EFF005B8862 /* ReaderSampleViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ReaderSampleViewController.h; sourceTree = "<group>"; };
++		DC8F28A913579EFF005B8862 /* ReaderSampleViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ReaderSampleViewController.m; sourceTree = "<group>"; };
++		DC8F28AC13579F00005B8862 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/ReaderSampleViewController.xib; sourceTree = "<group>"; };
++		DC8F28B71357A29D005B8862 /* Decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Decoder.h; sourceTree = "<group>"; };
++		DC8F28B81357A29D005B8862 /* Exception.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Exception.h; sourceTree = "<group>"; };
++		DC8F28B91357A29D005B8862 /* Image.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Image.h; sourceTree = "<group>"; };
++		DC8F28BA1357A29D005B8862 /* ImageScanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImageScanner.h; sourceTree = "<group>"; };
++		DC8F28BB1357A29D005B8862 /* Processor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Processor.h; sourceTree = "<group>"; };
++		DC8F28BC1357A29D005B8862 /* Scanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Scanner.h; sourceTree = "<group>"; };
++		DC8F28BD1357A29D005B8862 /* Symbol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Symbol.h; sourceTree = "<group>"; };
++		DC8F28BE1357A29D005B8862 /* Video.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Video.h; sourceTree = "<group>"; };
++		DC8F28BF1357A29D005B8862 /* Window.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Window.h; sourceTree = "<group>"; };
++		DC8F28C01357A29D005B8862 /* zbar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zbar.h; sourceTree = "<group>"; };
++		DC8F28C11357A29D005B8862 /* ZBarCaptureReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarCaptureReader.h; sourceTree = "<group>"; };
++		DC8F28C21357A29D005B8862 /* ZBarHelpController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarHelpController.h; sourceTree = "<group>"; };
++		DC8F28C31357A29D005B8862 /* ZBarImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarImage.h; sourceTree = "<group>"; };
++		DC8F28C41357A29D005B8862 /* ZBarImageScanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarImageScanner.h; sourceTree = "<group>"; };
++		DC8F28C51357A29D005B8862 /* ZBarReaderController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarReaderController.h; sourceTree = "<group>"; };
++		DC8F28C61357A29D005B8862 /* ZBarReaderView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarReaderView.h; sourceTree = "<group>"; };
++		DC8F28C71357A29D005B8862 /* ZBarReaderViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarReaderViewController.h; sourceTree = "<group>"; };
++		DC8F28C81357A29D005B8862 /* ZBarSDK.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarSDK.h; sourceTree = "<group>"; };
++		DC8F28C91357A29D005B8862 /* ZBarSymbol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarSymbol.h; sourceTree = "<group>"; };
++		DC8F28CA1357A29D005B8862 /* libzbar.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libzbar.a; sourceTree = "<group>"; };
++		DC8F28CC1357A29D005B8862 /* zbar-back.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "zbar-back.png"; sourceTree = "<group>"; };
++		DC8F28CD1357A29D005B8862 /* zbar-help.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "zbar-help.html"; sourceTree = "<group>"; };
++		DC8F28CE1357A29D005B8862 /* zbar-helpicons.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "zbar-helpicons.png"; sourceTree = "<group>"; };
++		DC8F28CF1357A29D005B8862 /* zbar-samples.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "zbar-samples.png"; sourceTree = "<group>"; };
++		DC8F28D51357A42E005B8862 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
++		DC8F28D61357A42E005B8862 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; };
++		DC8F28D71357A42E005B8862 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; };
++		DC8F28D81357A42E005B8862 /* libiconv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libiconv.dylib; path = usr/lib/libiconv.dylib; sourceTree = SDKROOT; };
++		DC8F28D91357A42E005B8862 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
++/* End PBXFileReference section */
 +
-+2. Select "Build and Run".
++/* Begin PBXFrameworksBuildPhase section */
++		DC8F288C13579EFF005B8862 /* Frameworks */ = {
++			isa = PBXFrameworksBuildPhase;
++			buildActionMask = 2147483647;
++			files = (
++				DC8F28DA1357A42E005B8862 /* AVFoundation.framework in Frameworks */,
++				DC8F28DB1357A42E005B8862 /* CoreMedia.framework in Frameworks */,
++				DC8F28DC1357A42E005B8862 /* CoreVideo.framework in Frameworks */,
++				DC8F28DD1357A42E005B8862 /* libiconv.dylib in Frameworks */,
++				DC8F28DE1357A42E005B8862 /* QuartzCore.framework in Frameworks */,
++				DC8F289413579EFF005B8862 /* UIKit.framework in Frameworks */,
++				DC8F289613579EFF005B8862 /* Foundation.framework in Frameworks */,
++				DC8F289813579EFF005B8862 /* CoreGraphics.framework in Frameworks */,
++				DC8F28D01357A29D005B8862 /* libzbar.a in Frameworks */,
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++/* End PBXFrameworksBuildPhase section */
 +
-+3. Tap the Scan button.
++/* Begin PBXGroup section */
++		DC8F288413579EFF005B8862 = {
++			isa = PBXGroup;
++			children = (
++				DC8F289913579EFF005B8862 /* ReaderSample */,
++				DC8F28B31357A29D005B8862 /* ZBarSDK */,
++				DC8F289213579EFF005B8862 /* Frameworks */,
++				DC8F289013579EFF005B8862 /* Products */,
++			);
++			sourceTree = "<group>";
++		};
++		DC8F289013579EFF005B8862 /* Products */ = {
++			isa = PBXGroup;
++			children = (
++				DC8F288F13579EFF005B8862 /* ReaderSample.app */,
++			);
++			name = Products;
++			sourceTree = "<group>";
++		};
++		DC8F289213579EFF005B8862 /* Frameworks */ = {
++			isa = PBXGroup;
++			children = (
++				DC8F289313579EFF005B8862 /* UIKit.framework */,
++				DC8F289513579EFF005B8862 /* Foundation.framework */,
++				DC8F289713579EFF005B8862 /* CoreGraphics.framework */,
++				DC8F28D91357A42E005B8862 /* QuartzCore.framework */,
++				DC8F28D61357A42E005B8862 /* CoreMedia.framework */,
++				DC8F28D71357A42E005B8862 /* CoreVideo.framework */,
++				DC8F28D51357A42E005B8862 /* AVFoundation.framework */,
++				DC8F28D81357A42E005B8862 /* libiconv.dylib */,
++			);
++			name = Frameworks;
++			sourceTree = "<group>";
++		};
++		DC8F289913579EFF005B8862 /* ReaderSample */ = {
++			isa = PBXGroup;
++			children = (
++				DC8F28A213579EFF005B8862 /* ReaderSampleAppDelegate.h */,
++				DC8F28A313579EFF005B8862 /* ReaderSampleAppDelegate.m */,
++				DC8F28A513579EFF005B8862 /* MainWindow.xib */,
++				DC8F28A813579EFF005B8862 /* ReaderSampleViewController.h */,
++				DC8F28A913579EFF005B8862 /* ReaderSampleViewController.m */,
++				DC8F28AB13579EFF005B8862 /* ReaderSampleViewController.xib */,
++				DC8F289A13579EFF005B8862 /* Supporting Files */,
++			);
++			path = ReaderSample;
++			sourceTree = "<group>";
++		};
++		DC8F289A13579EFF005B8862 /* Supporting Files */ = {
++			isa = PBXGroup;
++			children = (
++				DC8F289B13579EFF005B8862 /* ReaderSample-Info.plist */,
++				DC8F289C13579EFF005B8862 /* InfoPlist.strings */,
++				DC8245F4162B549F0010B2E6 /* Default-568h@2x.png */,
++				DC8F289F13579EFF005B8862 /* ReaderSample-Prefix.pch */,
++				DC8F28A013579EFF005B8862 /* main.m */,
++			);
++			name = "Supporting Files";
++			sourceTree = "<group>";
++		};
++		DC8F28B31357A29D005B8862 /* ZBarSDK */ = {
++			isa = PBXGroup;
++			children = (
++				DC8F28B41357A29D005B8862 /* Headers */,
++				DC8F28CA1357A29D005B8862 /* libzbar.a */,
++				DC8F28CB1357A29D005B8862 /* Resources */,
++			);
++			path = ZBarSDK;
++			sourceTree = "<group>";
++		};
++		DC8F28B41357A29D005B8862 /* Headers */ = {
++			isa = PBXGroup;
++			children = (
++				DC8F28B51357A29D005B8862 /* ZBarSDK */,
++			);
++			path = Headers;
++			sourceTree = "<group>";
++		};
++		DC8F28B51357A29D005B8862 /* ZBarSDK */ = {
++			isa = PBXGroup;
++			children = (
++				DC8F28B61357A29D005B8862 /* zbar */,
++				DC8F28C01357A29D005B8862 /* zbar.h */,
++				DC8F28C11357A29D005B8862 /* ZBarCaptureReader.h */,
++				DC8F28C21357A29D005B8862 /* ZBarHelpController.h */,
++				DC8F28C31357A29D005B8862 /* ZBarImage.h */,
++				DC8F28C41357A29D005B8862 /* ZBarImageScanner.h */,
++				DC8F28C51357A29D005B8862 /* ZBarReaderController.h */,
++				DC8F28C61357A29D005B8862 /* ZBarReaderView.h */,
++				DC8F28C71357A29D005B8862 /* ZBarReaderViewController.h */,
++				DC8F28C81357A29D005B8862 /* ZBarSDK.h */,
++				DC8F28C91357A29D005B8862 /* ZBarSymbol.h */,
++			);
++			path = ZBarSDK;
++			sourceTree = "<group>";
++		};
++		DC8F28B61357A29D005B8862 /* zbar */ = {
++			isa = PBXGroup;
++			children = (
++				DC8F28B71357A29D005B8862 /* Decoder.h */,
++				DC8F28B81357A29D005B8862 /* Exception.h */,
++				DC8F28B91357A29D005B8862 /* Image.h */,
++				DC8F28BA1357A29D005B8862 /* ImageScanner.h */,
++				DC8F28BB1357A29D005B8862 /* Processor.h */,
++				DC8F28BC1357A29D005B8862 /* Scanner.h */,
++				DC8F28BD1357A29D005B8862 /* Symbol.h */,
++				DC8F28BE1357A29D005B8862 /* Video.h */,
++				DC8F28BF1357A29D005B8862 /* Window.h */,
++			);
++			path = zbar;
++			sourceTree = "<group>";
++		};
++		DC8F28CB1357A29D005B8862 /* Resources */ = {
++			isa = PBXGroup;
++			children = (
++				DC8F28CC1357A29D005B8862 /* zbar-back.png */,
++				DC8F28CD1357A29D005B8862 /* zbar-help.html */,
++				DC8F28CE1357A29D005B8862 /* zbar-helpicons.png */,
++				DC8F28CF1357A29D005B8862 /* zbar-samples.png */,
++			);
++			path = Resources;
++			sourceTree = "<group>";
++		};
++/* End PBXGroup section */
 +
-+4. Aim at barcode.
++/* Begin PBXNativeTarget section */
++		DC8F288E13579EFF005B8862 /* ReaderSample */ = {
++			isa = PBXNativeTarget;
++			buildConfigurationList = DC8F28B013579F00005B8862 /* Build configuration list for PBXNativeTarget "ReaderSample" */;
++			buildPhases = (
++				DC8F288B13579EFF005B8862 /* Sources */,
++				DC8F288C13579EFF005B8862 /* Frameworks */,
++				DC8F288D13579EFF005B8862 /* Resources */,
++			);
++			buildRules = (
++			);
++			dependencies = (
++			);
++			name = ReaderSample;
++			productName = ReaderSample;
++			productReference = DC8F288F13579EFF005B8862 /* ReaderSample.app */;
++			productType = "com.apple.product-type.application";
++		};
++/* End PBXNativeTarget section */
 +
-+5. Enjoy the sweet fruits of your minimal labor
++/* Begin PBXProject section */
++		DC8F288613579EFF005B8862 /* Project object */ = {
++			isa = PBXProject;
++			attributes = {
++				ORGANIZATIONNAME = "ZBar Consulting Services";
++			};
++			buildConfigurationList = DC8F288913579EFF005B8862 /* Build configuration list for PBXProject "ReaderSample" */;
++			compatibilityVersion = "Xcode 3.2";
++			developmentRegion = English;
++			hasScannedForEncodings = 0;
++			knownRegions = (
++				en,
++			);
++			mainGroup = DC8F288413579EFF005B8862;
++			productRefGroup = DC8F289013579EFF005B8862 /* Products */;
++			projectDirPath = "";
++			projectRoot = "";
++			targets = (
++				DC8F288E13579EFF005B8862 /* ReaderSample */,
++			);
++		};
++/* End PBXProject section */
 +
++/* Begin PBXResourcesBuildPhase section */
++		DC8F288D13579EFF005B8862 /* Resources */ = {
++			isa = PBXResourcesBuildPhase;
++			buildActionMask = 2147483647;
++			files = (
++				DC8F289E13579EFF005B8862 /* InfoPlist.strings in Resources */,
++				DC8F28A713579EFF005B8862 /* MainWindow.xib in Resources */,
++				DC8F28AD13579F00005B8862 /* ReaderSampleViewController.xib in Resources */,
++				DC8F28D11357A29D005B8862 /* zbar-back.png in Resources */,
++				DC8F28D21357A29D005B8862 /* zbar-help.html in Resources */,
++				DC8F28D31357A29D005B8862 /* zbar-helpicons.png in Resources */,
++				DC8F28D41357A29D005B8862 /* zbar-samples.png in Resources */,
++				DC8245F5162B549F0010B2E6 /* Default-568h@2x.png in Resources */,
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++/* End PBXResourcesBuildPhase section */
 +
-+Where to go from here
-+---------------------
++/* Begin PBXSourcesBuildPhase section */
++		DC8F288B13579EFF005B8862 /* Sources */ = {
++			isa = PBXSourcesBuildPhase;
++			buildActionMask = 2147483647;
++			files = (
++				DC8F28A113579EFF005B8862 /* main.m in Sources */,
++				DC8F28A413579EFF005B8862 /* ReaderSampleAppDelegate.m in Sources */,
++				DC8F28AA13579EFF005B8862 /* ReaderSampleViewController.m in Sources */,
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++/* End PBXSourcesBuildPhase section */
 +
-+You can learn more about using the reader APIs to scan barcodes from
-+:doc:`camera` or :doc:`picker`.  Use the :doc:`apiref` to find details about a
-+particular interface.
++/* Begin PBXVariantGroup section */
++		DC8F289C13579EFF005B8862 /* InfoPlist.strings */ = {
++			isa = PBXVariantGroup;
++			children = (
++				DC8F289D13579EFF005B8862 /* en */,
++			);
++			name = InfoPlist.strings;
++			sourceTree = "<group>";
++		};
++		DC8F28A513579EFF005B8862 /* MainWindow.xib */ = {
++			isa = PBXVariantGroup;
++			children = (
++				DC8F28A613579EFF005B8862 /* en */,
++			);
++			name = MainWindow.xib;
++			sourceTree = "<group>";
++		};
++		DC8F28AB13579EFF005B8862 /* ReaderSampleViewController.xib */ = {
++			isa = PBXVariantGroup;
++			children = (
++				DC8F28AC13579F00005B8862 /* en */,
++			);
++			name = ReaderSampleViewController.xib;
++			sourceTree = "<group>";
++		};
++/* End PBXVariantGroup section */
 +
++/* Begin XCBuildConfiguration section */
++		DC8F28AE13579F00005B8862 /* Debug */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
++				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
++				GCC_C_LANGUAGE_STANDARD = gnu99;
++				GCC_OPTIMIZATION_LEVEL = 0;
++				GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
++				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
++				GCC_VERSION = com.apple.compilers.llvmgcc42;
++				GCC_WARN_ABOUT_RETURN_TYPE = YES;
++				GCC_WARN_UNUSED_VARIABLE = YES;
++				IPHONEOS_DEPLOYMENT_TARGET = 4.0;
++				SDKROOT = iphoneos;
++			};
++			name = Debug;
++		};
++		DC8F28AF13579F00005B8862 /* Release */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
++				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
++				GCC_C_LANGUAGE_STANDARD = gnu99;
++				GCC_VERSION = com.apple.compilers.llvmgcc42;
++				GCC_WARN_ABOUT_RETURN_TYPE = YES;
++				GCC_WARN_UNUSED_VARIABLE = YES;
++				IPHONEOS_DEPLOYMENT_TARGET = 4.0;
++				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
++				SDKROOT = iphoneos;
++			};
++			name = Release;
++		};
++		DC8F28B113579F00005B8862 /* Debug */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				ALWAYS_SEARCH_USER_PATHS = NO;
++				COPY_PHASE_STRIP = NO;
++				GCC_DYNAMIC_NO_PIC = NO;
++				GCC_PRECOMPILE_PREFIX_HEADER = YES;
++				GCC_PREFIX_HEADER = "ReaderSample/ReaderSample-Prefix.pch";
++				INFOPLIST_FILE = "ReaderSample/ReaderSample-Info.plist";
++				LIBRARY_SEARCH_PATHS = (
++					"$(inherited)",
++					"\"$(SRCROOT)/ZBarSDK\"",
++				);
++				PRODUCT_NAME = "$(TARGET_NAME)";
++				TARGETED_DEVICE_FAMILY = "1,2";
++				WRAPPER_EXTENSION = app;
++			};
++			name = Debug;
++		};
++		DC8F28B213579F00005B8862 /* Release */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				ALWAYS_SEARCH_USER_PATHS = NO;
++				COPY_PHASE_STRIP = YES;
++				GCC_PRECOMPILE_PREFIX_HEADER = YES;
++				GCC_PREFIX_HEADER = "ReaderSample/ReaderSample-Prefix.pch";
++				INFOPLIST_FILE = "ReaderSample/ReaderSample-Info.plist";
++				LIBRARY_SEARCH_PATHS = (
++					"$(inherited)",
++					"\"$(SRCROOT)/ZBarSDK\"",
++				);
++				PRODUCT_NAME = "$(TARGET_NAME)";
++				TARGETED_DEVICE_FAMILY = "1,2";
++				VALIDATE_PRODUCT = YES;
++				WRAPPER_EXTENSION = app;
++			};
++			name = Release;
++		};
++/* End XCBuildConfiguration section */
 +
-+Troubleshooting
-+---------------
++/* Begin XCConfigurationList section */
++		DC8F288913579EFF005B8862 /* Build configuration list for PBXProject "ReaderSample" */ = {
++			isa = XCConfigurationList;
++			buildConfigurations = (
++				DC8F28AE13579F00005B8862 /* Debug */,
++				DC8F28AF13579F00005B8862 /* Release */,
++			);
++			defaultConfigurationIsVisible = 0;
++			defaultConfigurationName = Release;
++		};
++		DC8F28B013579F00005B8862 /* Build configuration list for PBXNativeTarget "ReaderSample" */ = {
++			isa = XCConfigurationList;
++			buildConfigurations = (
++				DC8F28B113579F00005B8862 /* Debug */,
++				DC8F28B213579F00005B8862 /* Release */,
++			);
++			defaultConfigurationIsVisible = 0;
++			defaultConfigurationName = Release;
++		};
++/* End XCConfigurationList section */
++	};
++	rootObject = DC8F288613579EFF005B8862 /* Project object */;
++}
+diff -r 563557a923d0 iphone/examples/ReaderSample/ReaderSample.xcodeproj/xcshareddata/xcschemes/ReaderSample.xcscheme
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/examples/ReaderSample/ReaderSample.xcodeproj/xcshareddata/xcschemes/ReaderSample.xcscheme	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,76 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<Scheme
++   version = "1.3">
++   <BuildAction
++      parallelizeBuildables = "YES"
++      buildImplicitDependencies = "YES">
++      <BuildActionEntries>
++         <BuildActionEntry
++            buildForTesting = "YES"
++            buildForRunning = "YES"
++            buildForProfiling = "YES"
++            buildForArchiving = "YES"
++            buildForAnalyzing = "YES">
++            <BuildableReference
++               BuildableIdentifier = "primary"
++               BlueprintIdentifier = "DC8F288E13579EFF005B8862"
++               BuildableName = "ReaderSample.app"
++               BlueprintName = "ReaderSample"
++               ReferencedContainer = "container:ReaderSample.xcodeproj">
++            </BuildableReference>
++         </BuildActionEntry>
++      </BuildActionEntries>
++   </BuildAction>
++   <TestAction
++      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
++      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
++      shouldUseLaunchSchemeArgsEnv = "YES"
++      buildConfiguration = "Debug">
++      <Testables>
++      </Testables>
++   </TestAction>
++   <LaunchAction
++      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
++      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
++      displayScaleIsEnabled = "NO"
++      displayScale = "1.00"
++      launchStyle = "0"
++      useCustomWorkingDirectory = "NO"
++      buildConfiguration = "Debug">
++      <BuildableProductRunnable>
++         <BuildableReference
++            BuildableIdentifier = "primary"
++            BlueprintIdentifier = "DC8F288E13579EFF005B8862"
++            BuildableName = "ReaderSample.app"
++            BlueprintName = "ReaderSample"
++            ReferencedContainer = "container:ReaderSample.xcodeproj">
++         </BuildableReference>
++      </BuildableProductRunnable>
++      <AdditionalOptions>
++      </AdditionalOptions>
++   </LaunchAction>
++   <ProfileAction
++      displayScaleIsEnabled = "NO"
++      displayScale = "1.00"
++      shouldUseLaunchSchemeArgsEnv = "YES"
++      savedToolIdentifier = ""
++      useCustomWorkingDirectory = "NO"
++      buildConfiguration = "Release">
++      <BuildableProductRunnable>
++         <BuildableReference
++            BuildableIdentifier = "primary"
++            BlueprintIdentifier = "DC8F288E13579EFF005B8862"
++            BuildableName = "ReaderSample.app"
++            BlueprintName = "ReaderSample"
++            ReferencedContainer = "container:ReaderSample.xcodeproj">
++         </BuildableReference>
++      </BuildableProductRunnable>
++   </ProfileAction>
++   <AnalyzeAction
++      buildConfiguration = "Debug">
++   </AnalyzeAction>
++   <ArchiveAction
++      buildConfiguration = "Release"
++      revealArchiveInOrganizer = "YES">
++   </ArchiveAction>
++</Scheme>
+diff -r 563557a923d0 iphone/examples/ReaderSample/ReaderSample/ReaderSample-Info.plist
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/examples/ReaderSample/ReaderSample/ReaderSample-Info.plist	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,38 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
++<plist version="1.0">
++<dict>
++	<key>CFBundleDevelopmentRegion</key>
++	<string>en</string>
++	<key>CFBundleDisplayName</key>
++	<string>${PRODUCT_NAME}</string>
++	<key>CFBundleExecutable</key>
++	<string>${EXECUTABLE_NAME}</string>
++	<key>CFBundleIconFile</key>
++	<string></string>
++	<key>CFBundleIdentifier</key>
++	<string>com.yourcompany.${PRODUCT_NAME:rfc1034identifier}</string>
++	<key>CFBundleInfoDictionaryVersion</key>
++	<string>6.0</string>
++	<key>CFBundleName</key>
++	<string>${PRODUCT_NAME}</string>
++	<key>CFBundlePackageType</key>
++	<string>APPL</string>
++	<key>CFBundleShortVersionString</key>
++	<string>1.0</string>
++	<key>CFBundleSignature</key>
++	<string>????</string>
++	<key>CFBundleVersion</key>
++	<string>1.0</string>
++	<key>LSRequiresIPhoneOS</key>
++	<true/>
++	<key>NSMainNibFile</key>
++	<string>MainWindow</string>
++	<key>UISupportedInterfaceOrientations</key>
++	<array>
++		<string>UIInterfaceOrientationPortrait</string>
++		<string>UIInterfaceOrientationLandscapeLeft</string>
++		<string>UIInterfaceOrientationLandscapeRight</string>
++	</array>
++</dict>
++</plist>
+diff -r 563557a923d0 iphone/examples/ReaderSample/ReaderSample/ReaderSample-Prefix.pch
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/examples/ReaderSample/ReaderSample/ReaderSample-Prefix.pch	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,16 @@
++//
++// Prefix header for all source files of the 'ReaderSample' target in the 'ReaderSample' project
++//
 +
-+We take great care to ensure this tutorial is working as described.  However,
-+if you do have a problem
++#import <Availability.h>
 +
-+1. Make sure you followed the instructions exactly - every detail is
-+   important.
-+2. Start from scratch with a new project and follow the instructions
-+   *exactly*.
-+3. Try the ReaderSample distributed with the SDK and compare your work with
-+   that.
-+4. If you are unable to get things working, you may post your frustrations in
-+   the project `iPhone Developers Forum`_.  Please be very specific about your
-+   problem, post the complete text of any errors, etc.
++#ifndef __IPHONE_3_0
++#warning "This project uses features only available in iPhone SDK 3.0 and later."
++#endif
 +
-+.. _`iPhone Developers Forum`:
-+   http://sourceforge.net/projects/zbar/forums/forum/1072195
-diff --git a/iphone/examples/ReaderSample/Classes/ReaderSampleAppDelegate.h b/iphone/examples/ReaderSample/Classes/ReaderSampleAppDelegate.h
-new file mode 100644
---- /dev/null
-+++ b/iphone/examples/ReaderSample/Classes/ReaderSampleAppDelegate.h
-@@ -0,0 +1,21 @@
++#ifdef __OBJC__
++    #import <UIKit/UIKit.h>
++    #import <Foundation/Foundation.h>
++    // ADD: import barcode reader APIs
++    #import "ZBarSDK.h"
++#endif
+diff -r 563557a923d0 iphone/examples/ReaderSample/ReaderSample/ReaderSampleAppDelegate.h
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/examples/ReaderSample/ReaderSample/ReaderSampleAppDelegate.h	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,20 @@
 +//
 +//  ReaderSampleAppDelegate.h
 +//  ReaderSample
 +//
-+//  Created by spadix on 8/4/10.
++//  Created by spadix on 4/14/11.
 +//
 +
 +#import <UIKit/UIKit.h>
@@ -11065,116 +13459,94 @@ new file mode 100644
 +@class ReaderSampleViewController;
 +
 +@interface ReaderSampleAppDelegate : NSObject <UIApplicationDelegate> {
-+    UIWindow *window;
-+    ReaderSampleViewController *viewController;
++
 +}
 +
 +@property (nonatomic, retain) IBOutlet UIWindow *window;
++
 +@property (nonatomic, retain) IBOutlet ReaderSampleViewController *viewController;
 +
 +@end
-+
-diff --git a/iphone/examples/ReaderSample/Classes/ReaderSampleAppDelegate.m b/iphone/examples/ReaderSample/Classes/ReaderSampleAppDelegate.m
-new file mode 100644
---- /dev/null
-+++ b/iphone/examples/ReaderSample/Classes/ReaderSampleAppDelegate.m
-@@ -0,0 +1,86 @@
+diff -r 563557a923d0 iphone/examples/ReaderSample/ReaderSample/ReaderSampleAppDelegate.m
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/examples/ReaderSample/ReaderSample/ReaderSampleAppDelegate.m	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,67 @@
 +//
 +//  ReaderSampleAppDelegate.m
 +//  ReaderSample
 +//
-+//  Created by spadix on 8/4/10.
++//  Created by spadix on 4/14/11.
 +//
 +
 +#import "ReaderSampleAppDelegate.h"
++
 +#import "ReaderSampleViewController.h"
 +
 +@implementation ReaderSampleAppDelegate
 +
-+@synthesize window;
-+@synthesize viewController;
 +
++@synthesize window=_window;
 +
-+#pragma mark -
-+#pragma mark Application lifecycle
++@synthesize viewController=_viewController;
 +
-+- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
++- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
++{
 +    // Override point for customization after application launch.
-+
-+    // Add the view controller's view to the window and display.
-+    [window addSubview:viewController.view];
-+    [window makeKeyAndVisible];
-+
++     
++    self.window.rootViewController = self.viewController;
++    [self.window makeKeyAndVisible];
 +    return YES;
 +}
 +
-+
-+- (void)applicationWillResignActive:(UIApplication *)application {
++- (void)applicationWillResignActive:(UIApplication *)application
++{
 +    /*
 +     Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
 +     Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
 +     */
 +}
 +
-+
-+- (void)applicationDidEnterBackground:(UIApplication *)application {
++- (void)applicationDidEnterBackground:(UIApplication *)application
++{
 +    /*
 +     Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. 
-+     If your application supports background execution, called instead of applicationWillTerminate: when the user quits.
++     If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
 +     */
 +}
 +
-+
-+- (void)applicationWillEnterForeground:(UIApplication *)application {
++- (void)applicationWillEnterForeground:(UIApplication *)application
++{
 +    /*
-+     Called as part of  transition from the background to the inactive state: here you can undo many of the changes made on entering the background.
++     Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
 +     */
 +}
 +
-+
-+- (void)applicationDidBecomeActive:(UIApplication *)application {
++- (void)applicationDidBecomeActive:(UIApplication *)application
++{
 +    /*
 +     Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
 +     */
 +}
 +
-+
-+- (void)applicationWillTerminate:(UIApplication *)application {
-+    /*
-+     Called when the application is about to terminate.
-+     See also applicationDidEnterBackground:.
-+     */
-+}
-+
-+
-+#pragma mark -
-+#pragma mark Memory management
-+
-+- (void)applicationDidReceiveMemoryWarning:(UIApplication *)application {
-+    /*
-+     Free up as much memory as possible by purging cached data objects that can be recreated (or reloaded from disk) later.
-+     */
-+}
-+
-+
-+- (void)dealloc {
-+    [viewController release];
-+    [window release];
-+    [super dealloc];
-+}
-+
++- (void)applicationWillTerminate:(UIApplication *)application
++{
++    /*
++     Called when the application is about to terminate.
++     Save data if appropriate.
++     See also applicationDidEnterBackground:.
++     */
++}
 +
 +@end
-diff --git a/iphone/examples/ReaderSample/Classes/ReaderSampleViewController.h b/iphone/examples/ReaderSample/Classes/ReaderSampleViewController.h
-new file mode 100644
---- /dev/null
-+++ b/iphone/examples/ReaderSample/Classes/ReaderSampleViewController.h
+diff -r 563557a923d0 iphone/examples/ReaderSample/ReaderSample/ReaderSampleViewController.h
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/examples/ReaderSample/ReaderSample/ReaderSampleViewController.h	Fri Feb 22 08:54:29 2013 -0300
 @@ -0,0 +1,21 @@
 +//
 +//  ReaderSampleViewController.h
 +//  ReaderSample
 +//
-+//  Created by spadix on 8/4/10.
++//  Created by spadix on 4/14/11.
 +//
 +
 +#import <UIKit/UIKit.h>
@@ -11191,16 +13563,15 @@ new file mode 100644
 +@property (nonatomic, retain) IBOutlet UITextView *resultText;
 +- (IBAction) scanButtonTapped;
 +@end
-diff --git a/iphone/examples/ReaderSample/Classes/ReaderSampleViewController.m b/iphone/examples/ReaderSample/Classes/ReaderSampleViewController.m
-new file mode 100644
---- /dev/null
-+++ b/iphone/examples/ReaderSample/Classes/ReaderSampleViewController.m
+diff -r 563557a923d0 iphone/examples/ReaderSample/ReaderSample/ReaderSampleViewController.m
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/examples/ReaderSample/ReaderSample/ReaderSampleViewController.m	Fri Feb 22 08:54:29 2013 -0300
 @@ -0,0 +1,68 @@
 +//
 +//  ReaderSampleViewController.m
 +//  ReaderSample
 +//
-+//  Created by spadix on 8/4/10.
++//  Created by spadix on 4/14/11.
 +//
 +
 +#import "ReaderSampleViewController.h"
@@ -11212,20 +13583,21 @@ new file mode 100644
 +- (IBAction) scanButtonTapped
 +{
 +    // ADD: present a barcode reader that scans from the camera feed
-+    ZBarReaderViewController *reader = [ZBarReaderViewController new];
++    ZBarReaderViewController *reader = [[ZBarReaderViewController alloc] init];
 +    reader.readerDelegate = self;
++    reader.supportedOrientationsMask = ZBarOrientationMaskAll;
 +
 +    ZBarImageScanner *scanner = reader.scanner;
 +    // TODO: (optional) additional reader configuration here
 +
 +    // EXAMPLE: disable rarely used I2/5 to improve performance
 +    [scanner setSymbology: ZBAR_I25
-+             config: ZBAR_CFG_ENABLE
-+             to: 0];
++                   config: ZBAR_CFG_ENABLE
++                       to: 0];
 +
 +    // present and release the controller
 +    [self presentModalViewController: reader
-+          animated: YES];
++                            animated: YES];
 +    [reader release];
 +}
 +
@@ -11234,7 +13606,7 @@ new file mode 100644
 +{
 +    // ADD: get the decode results
 +    id<NSFastEnumeration> results =
-+        [info objectForKey: ZBarReaderControllerResults];
++    [info objectForKey: ZBarReaderControllerResults];
 +    ZBarSymbol *symbol = nil;
 +    for(symbol in results)
 +        // EXAMPLE: just grab the first barcode
@@ -11245,29 +13617,33 @@ new file mode 100644
 +
 +    // EXAMPLE: do something useful with the barcode image
 +    resultImage.image =
-+        [info objectForKey: UIImagePickerControllerOriginalImage];
++    [info objectForKey: UIImagePickerControllerOriginalImage];
 +
 +    // ADD: dismiss the controller (NB dismiss from the *reader*!)
 +    [reader dismissModalViewControllerAnimated: YES];
 +}
 +
-+- (void)didReceiveMemoryWarning {
-+    // Releases the view if it doesn't have a superview.
-+    [super didReceiveMemoryWarning];
-+    // Release any cached data, images, etc that aren't in use.
++- (BOOL) shouldAutorotateToInterfaceOrientation: (UIInterfaceOrientation) orient
++{
++    return(YES);
 +}
 +
-+- (void)dealloc {
++- (void) dealloc {
 +    self.resultImage = nil;
 +    self.resultText = nil;
 +    [super dealloc];
 +}
 +
 +@end
-diff --git a/iphone/examples/ReaderSample/MainWindow.xib b/iphone/examples/ReaderSample/MainWindow.xib
-new file mode 100644
---- /dev/null
-+++ b/iphone/examples/ReaderSample/MainWindow.xib
+diff -r 563557a923d0 iphone/examples/ReaderSample/ReaderSample/en.lproj/InfoPlist.strings
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/examples/ReaderSample/ReaderSample/en.lproj/InfoPlist.strings	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,2 @@
++/* Localized versions of Info.plist keys */
++
+diff -r 563557a923d0 iphone/examples/ReaderSample/ReaderSample/en.lproj/MainWindow.xib
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/examples/ReaderSample/ReaderSample/en.lproj/MainWindow.xib	Fri Feb 22 08:54:29 2013 -0300
 @@ -0,0 +1,444 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
@@ -11494,7 +13870,7 @@ new file mode 100644
 +					</object>
 +					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 +						<string key="majorKey">IBProjectSource</string>
-+						<string key="minorKey">Classes/ReaderSampleAppDelegate.h</string>
++						<string key="minorKey">ReaderSampleAppDelegate.h</string>
 +					</object>
 +				</object>
 +				<object class="IBPartialClassDescription">
@@ -11510,7 +13886,7 @@ new file mode 100644
 +					<string key="superclassName">UIViewController</string>
 +					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 +						<string key="majorKey">IBProjectSource</string>
-+						<string key="minorKey">Classes/ReaderSampleViewController.h</string>
++						<string key="minorKey">ReaderSampleViewController.h</string>
 +					</object>
 +				</object>
 +			</object>
@@ -11658,318 +14034,640 @@ new file mode 100644
 +						<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 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 class="IBPartialClassDescription">
++					<string key="className">UIWindow</string>
++					<string key="superclassName">UIView</string>
++					<object class="IBClassDescriptionSource" key="sourceIdentifier">
++						<string key="majorKey">IBFrameworkSource</string>
++						<string key="minorKey">UIKit.framework/Headers/UIWindow.h</string>
++					</object>
++				</object>
++			</object>
++		</object>
++		<int key="IBDocument.localizationMode">0</int>
++		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
++		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
++			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
++			<integer value="1024" key="NS.object.0"/>
++		</object>
++		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
++			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
++			<integer value="3100" key="NS.object.0"/>
++		</object>
++		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
++		<string key="IBDocument.LastKnownRelativeProjectPath">ReaderSample.xcodeproj</string>
++		<int key="IBDocument.defaultPropertyAccessControl">3</int>
++		<string key="IBCocoaTouchPluginVersion">112</string>
++	</data>
++</archive>
+diff -r 563557a923d0 iphone/examples/ReaderSample/ReaderSample/en.lproj/ReaderSampleViewController.xib
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/examples/ReaderSample/ReaderSample/en.lproj/ReaderSampleViewController.xib	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,319 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
++	<data>
++		<int key="IBDocument.SystemTarget">1056</int>
++		<string key="IBDocument.SystemVersion">10J869</string>
++		<string key="IBDocument.InterfaceBuilderVersion">1306</string>
++		<string key="IBDocument.AppKitVersion">1038.35</string>
++		<string key="IBDocument.HIToolboxVersion">461.00</string>
++		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
++			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
++			<string key="NS.object.0">301</string>
++		</object>
++		<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
++			<bool key="EncodedWithXMLCoder">YES</bool>
++			<string>IBUITextView</string>
++			<string>IBUIButton</string>
++			<string>IBUIImageView</string>
++			<string>IBUIView</string>
++			<string>IBProxyObject</string>
++		</object>
++		<object class="NSArray" key="IBDocument.PluginDependencies">
++			<bool key="EncodedWithXMLCoder">YES</bool>
++			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
++		</object>
++		<object class="NSMutableDictionary" key="IBDocument.Metadata">
++			<bool key="EncodedWithXMLCoder">YES</bool>
++			<object class="NSArray" key="dict.sortedKeys" id="0">
++				<bool key="EncodedWithXMLCoder">YES</bool>
++			</object>
++			<reference key="dict.values" ref="0"/>
++		</object>
++		<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
++			<bool key="EncodedWithXMLCoder">YES</bool>
++			<object class="IBProxyObject" id="372490531">
++				<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
++				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
++			</object>
++			<object class="IBProxyObject" id="843779117">
++				<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
++				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
++			</object>
++			<object class="IBUIView" id="774585933">
++				<reference key="NSNextResponder"/>
++				<int key="NSvFlags">274</int>
++				<object class="NSMutableArray" key="NSSubviews">
++					<bool key="EncodedWithXMLCoder">YES</bool>
++					<object class="IBUIButton" id="973537804">
++						<reference key="NSNextResponder" ref="774585933"/>
++						<int key="NSvFlags">282</int>
++						<string key="NSFrame">{{20, 396}, {280, 44}}</string>
++						<reference key="NSSuperview" ref="774585933"/>
++						<reference key="NSWindow"/>
++						<bool key="IBUIOpaque">NO</bool>
++						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
++						<int key="IBUIContentHorizontalAlignment">0</int>
++						<int key="IBUIContentVerticalAlignment">0</int>
++						<object class="NSFont" key="IBUIFont">
++							<string key="NSName">Helvetica-Bold</string>
++							<double key="NSSize">19</double>
++							<int key="NSfFlags">16</int>
++						</object>
++						<int key="IBUIButtonType">1</int>
++						<string key="IBUINormalTitle">Scan</string>
++						<object class="NSColor" key="IBUIHighlightedTitleColor">
++							<int key="NSColorSpace">3</int>
++							<bytes key="NSWhite">MQA</bytes>
++						</object>
++						<object class="NSColor" key="IBUINormalTitleColor">
++							<int key="NSColorSpace">1</int>
++							<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
++						</object>
++						<object class="NSColor" key="IBUINormalTitleShadowColor">
++							<int key="NSColorSpace">3</int>
++							<bytes key="NSWhite">MC41AA</bytes>
++						</object>
++					</object>
++					<object class="IBUIImageView" id="409141881">
++						<reference key="NSNextResponder" ref="774585933"/>
++						<int key="NSvFlags">311</int>
++						<string key="NSFrame">{{20, 20}, {280, 210}}</string>
++						<reference key="NSSuperview" ref="774585933"/>
++						<reference key="NSWindow"/>
++						<reference key="NSNextKeyView" ref="790976943"/>
++						<int key="IBUIContentMode">1</int>
++						<bool key="IBUIUserInteractionEnabled">NO</bool>
++						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
++					</object>
++					<object class="IBUITextView" id="790976943">
++						<reference key="NSNextResponder" ref="774585933"/>
++						<int key="NSvFlags">282</int>
++						<string key="NSFrame">{{20, 238}, {280, 150}}</string>
++						<reference key="NSSuperview" ref="774585933"/>
++						<reference key="NSWindow"/>
++						<reference key="NSNextKeyView" ref="973537804"/>
++						<object class="NSColor" key="IBUIBackgroundColor">
++							<int key="NSColorSpace">3</int>
++							<bytes key="NSWhite">MCAwAA</bytes>
++						</object>
++						<bool key="IBUIClipsSubviews">YES</bool>
++						<bool key="IBUIMultipleTouchEnabled">YES</bool>
++						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
++						<bool key="IBUIEditable">NO</bool>
++						<string key="IBUIText">No barcode scanned...</string>
++						<object class="NSFont" key="IBUIFont">
++							<string key="NSName">Helvetica</string>
++							<double key="NSSize">17</double>
++							<int key="NSfFlags">16</int>
++						</object>
++						<object class="IBUITextInputTraits" key="IBUITextInputTraits">
++							<int key="IBUIAutocapitalizationType">2</int>
++							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
++						</object>
++					</object>
++				</object>
++				<string key="NSFrame">{{0, 20}, {320, 460}}</string>
++				<reference key="NSSuperview"/>
++				<reference key="NSWindow"/>
++				<reference key="NSNextKeyView" ref="409141881"/>
++				<object class="NSColor" key="IBUIBackgroundColor">
++					<int key="NSColorSpace">3</int>
++					<bytes key="NSWhite">MC43NQA</bytes>
++					<object class="NSColorSpace" key="NSCustomColorSpace">
++						<int key="NSID">2</int>
++					</object>
++				</object>
++				<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
++				<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
++				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
++			</object>
++		</object>
++		<object class="IBObjectContainer" key="IBDocument.Objects">
++			<object class="NSMutableArray" key="connectionRecords">
++				<bool key="EncodedWithXMLCoder">YES</bool>
++				<object class="IBConnectionRecord">
++					<object class="IBCocoaTouchOutletConnection" key="connection">
++						<string key="label">view</string>
++						<reference key="source" ref="372490531"/>
++						<reference key="destination" ref="774585933"/>
++					</object>
++					<int key="connectionID">7</int>
++				</object>
++				<object class="IBConnectionRecord">
++					<object class="IBCocoaTouchOutletConnection" key="connection">
++						<string key="label">resultImage</string>
++						<reference key="source" ref="372490531"/>
++						<reference key="destination" ref="409141881"/>
++					</object>
++					<int key="connectionID">11</int>
++				</object>
++				<object class="IBConnectionRecord">
++					<object class="IBCocoaTouchOutletConnection" key="connection">
++						<string key="label">resultText</string>
++						<reference key="source" ref="372490531"/>
++						<reference key="destination" ref="790976943"/>
++					</object>
++					<int key="connectionID">12</int>
++				</object>
++				<object class="IBConnectionRecord">
++					<object class="IBCocoaTouchEventConnection" key="connection">
++						<string key="label">scanButtonTapped</string>
++						<reference key="source" ref="973537804"/>
++						<reference key="destination" ref="372490531"/>
++						<int key="IBEventType">7</int>
++					</object>
++					<int key="connectionID">13</int>
++				</object>
++			</object>
++			<object class="IBMutableOrderedSet" key="objectRecords">
++				<object class="NSArray" key="orderedObjects">
++					<bool key="EncodedWithXMLCoder">YES</bool>
++					<object class="IBObjectRecord">
++						<int key="objectID">0</int>
++						<reference key="object" ref="0"/>
++						<reference key="children" ref="1000"/>
++						<nil key="parent"/>
++					</object>
++					<object class="IBObjectRecord">
++						<int key="objectID">-1</int>
++						<reference key="object" ref="372490531"/>
++						<reference key="parent" ref="0"/>
++						<string key="objectName">File's Owner</string>
++					</object>
++					<object class="IBObjectRecord">
++						<int key="objectID">-2</int>
++						<reference key="object" ref="843779117"/>
++						<reference key="parent" ref="0"/>
++					</object>
++					<object class="IBObjectRecord">
++						<int key="objectID">6</int>
++						<reference key="object" ref="774585933"/>
++						<object class="NSMutableArray" key="children">
++							<bool key="EncodedWithXMLCoder">YES</bool>
++							<reference ref="973537804"/>
++							<reference ref="409141881"/>
++							<reference ref="790976943"/>
++						</object>
++						<reference key="parent" ref="0"/>
++					</object>
++					<object class="IBObjectRecord">
++						<int key="objectID">8</int>
++						<reference key="object" ref="973537804"/>
++						<reference key="parent" ref="774585933"/>
++					</object>
++					<object class="IBObjectRecord">
++						<int key="objectID">9</int>
++						<reference key="object" ref="409141881"/>
++						<reference key="parent" ref="774585933"/>
++					</object>
++					<object class="IBObjectRecord">
++						<int key="objectID">10</int>
++						<reference key="object" ref="790976943"/>
++						<reference key="parent" ref="774585933"/>
++					</object>
++				</object>
++			</object>
++			<object class="NSMutableDictionary" key="flattenedProperties">
++				<bool key="EncodedWithXMLCoder">YES</bool>
++				<object class="NSArray" key="dict.sortedKeys">
++					<bool key="EncodedWithXMLCoder">YES</bool>
++					<string>-1.CustomClassName</string>
++					<string>-2.CustomClassName</string>
++					<string>10.IBPluginDependency</string>
++					<string>6.IBEditorWindowLastContentRect</string>
++					<string>6.IBPluginDependency</string>
++					<string>8.IBPluginDependency</string>
++					<string>9.IBPluginDependency</string>
++				</object>
++				<object class="NSMutableArray" key="dict.values">
++					<bool key="EncodedWithXMLCoder">YES</bool>
++					<string>ReaderSampleViewController</string>
++					<string>UIResponder</string>
++					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
++					<string>{{239, 654}, {320, 480}}</string>
++					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
++					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
++					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 +				</object>
++			</object>
++			<object class="NSMutableDictionary" key="unlocalizedProperties">
++				<bool key="EncodedWithXMLCoder">YES</bool>
++				<reference key="dict.sortedKeys" ref="0"/>
++				<reference key="dict.values" ref="0"/>
++			</object>
++			<nil key="activeLocalization"/>
++			<object class="NSMutableDictionary" key="localizations">
++				<bool key="EncodedWithXMLCoder">YES</bool>
++				<reference key="dict.sortedKeys" ref="0"/>
++				<reference key="dict.values" ref="0"/>
++			</object>
++			<nil key="sourceID"/>
++			<int key="maxID">13</int>
++		</object>
++		<object class="IBClassDescriber" key="IBDocument.Classes">
++			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
++				<bool key="EncodedWithXMLCoder">YES</bool>
 +				<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>
++					<string key="className">ReaderSampleViewController</string>
++					<string key="superclassName">UIViewController</string>
++					<object class="NSMutableDictionary" key="actions">
++						<string key="NS.key.0">scanButtonTapped</string>
++						<string key="NS.object.0">id</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 class="NSMutableDictionary" key="actionInfosByName">
++						<string key="NS.key.0">scanButtonTapped</string>
++						<object class="IBActionInfo" key="NS.object.0">
++							<string key="name">scanButtonTapped</string>
++							<string key="candidateClassName">id</string>
++						</object>
 +					</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 class="NSMutableDictionary" key="outlets">
++						<bool key="EncodedWithXMLCoder">YES</bool>
++						<object class="NSArray" key="dict.sortedKeys">
++							<bool key="EncodedWithXMLCoder">YES</bool>
++							<string>resultImage</string>
++							<string>resultText</string>
++						</object>
++						<object class="NSMutableArray" key="dict.values">
++							<bool key="EncodedWithXMLCoder">YES</bool>
++							<string>UIImageView</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>resultImage</string>
++							<string>resultText</string>
++						</object>
++						<object class="NSMutableArray" key="dict.values">
++							<bool key="EncodedWithXMLCoder">YES</bool>
++							<object class="IBToOneOutletInfo">
++								<string key="name">resultImage</string>
++								<string key="candidateClassName">UIImageView</string>
++							</object>
++							<object class="IBToOneOutletInfo">
++								<string key="name">resultText</string>
++								<string key="candidateClassName">UITextView</string>
++							</object>
++						</object>
 +					</object>
-+				</object>
-+				<object class="IBPartialClassDescription">
-+					<string key="className">UIWindow</string>
-+					<string key="superclassName">UIView</string>
 +					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-+						<string key="majorKey">IBFrameworkSource</string>
-+						<string key="minorKey">UIKit.framework/Headers/UIWindow.h</string>
++						<string key="majorKey">IBProjectSource</string>
++						<string key="minorKey">./Classes/ReaderSampleViewController.h</string>
 +					</object>
 +				</object>
 +			</object>
 +		</object>
 +		<int key="IBDocument.localizationMode">0</int>
 +		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-+			<integer value="1024" key="NS.object.0"/>
-+		</object>
 +		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
 +			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
 +			<integer value="3100" key="NS.object.0"/>
 +		</object>
 +		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-+		<string key="IBDocument.LastKnownRelativeProjectPath">ReaderSample.xcodeproj</string>
 +		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-+		<string key="IBCocoaTouchPluginVersion">112</string>
++		<string key="IBCocoaTouchPluginVersion">301</string>
 +	</data>
 +</archive>
-diff --git a/iphone/examples/ReaderSample/ReaderSample-Info.plist b/iphone/examples/ReaderSample/ReaderSample-Info.plist
-new file mode 100644
---- /dev/null
-+++ b/iphone/examples/ReaderSample/ReaderSample-Info.plist
-@@ -0,0 +1,30 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-+<plist version="1.0">
-+<dict>
-+	<key>CFBundleDevelopmentRegion</key>
-+	<string>English</string>
-+	<key>CFBundleDisplayName</key>
-+	<string>${PRODUCT_NAME}</string>
-+	<key>CFBundleExecutable</key>
-+	<string>${EXECUTABLE_NAME}</string>
-+	<key>CFBundleIconFile</key>
-+	<string></string>
-+	<key>CFBundleIdentifier</key>
-+	<string>com.yourcompany.${PRODUCT_NAME:rfc1034identifier}</string>
-+	<key>CFBundleInfoDictionaryVersion</key>
-+	<string>6.0</string>
-+	<key>CFBundleName</key>
-+	<string>${PRODUCT_NAME}</string>
-+	<key>CFBundlePackageType</key>
-+	<string>APPL</string>
-+	<key>CFBundleSignature</key>
-+	<string>????</string>
-+	<key>CFBundleVersion</key>
-+	<string>1.0</string>
-+	<key>LSRequiresIPhoneOS</key>
-+	<true/>
-+	<key>NSMainNibFile</key>
-+	<string>MainWindow</string>
-+</dict>
-+</plist>
-diff --git a/iphone/examples/ReaderSample/ReaderSample.xcodeproj/project.pbxproj b/iphone/examples/ReaderSample/ReaderSample.xcodeproj/project.pbxproj
-new file mode 100755
---- /dev/null
-+++ b/iphone/examples/ReaderSample/ReaderSample.xcodeproj/project.pbxproj
-@@ -0,0 +1,386 @@
+diff -r 563557a923d0 iphone/examples/ReaderSample/ReaderSample/main.m
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/examples/ReaderSample/ReaderSample/main.m	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,16 @@
++//
++//  main.m
++//  ReaderSample
++//
++//  Created by spadix on 4/14/11.
++//
++
++#import <UIKit/UIKit.h>
++
++int main(int argc, char *argv[])
++{
++    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
++    int retVal = UIApplicationMain(argc, argv, nil, nil);
++    [pool release];
++    return retVal;
++}
+diff -r 563557a923d0 iphone/examples/ReaderSample/ZBarSDK
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/examples/ReaderSample/ZBarSDK	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,1 @@
++../../build/Debug-iphoneos/ZBarSDK
+\ No newline at end of file
+diff -r 563557a923d0 iphone/examples/ReaderSample/build
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/examples/ReaderSample/build	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,1 @@
++/tmp/ReaderSample.build
+\ No newline at end of file
+diff -r 563557a923d0 iphone/examples/TabReader/Default-568h@2x.png
+Binary file iphone/examples/TabReader/Default-568h@2x.png has changed
+diff -r 563557a923d0 iphone/examples/TabReader/TabReader.xcodeproj/project.pbxproj
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/examples/TabReader/TabReader.xcodeproj/project.pbxproj	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,420 @@
 +// !$*UTF8*$!
 +{
 +	archiveVersion = 1;
 +	classes = {
 +	};
-+	objectVersion = 45;
++	objectVersion = 46;
 +	objects = {
 +
 +/* Begin PBXBuildFile section */
-+		1D3623260D0F684500981E51 /* ReaderSampleAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D3623250D0F684500981E51 /* ReaderSampleAppDelegate.m */; };
-+		1D60589B0D05DD56006BFB54 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; };
-+		1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; };
-+		1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; };
-+		288765A50DF7441C002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765A40DF7441C002DB57D /* CoreGraphics.framework */; };
-+		2899E5220DE3E06400AC0155 /* ReaderSampleViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2899E5210DE3E06400AC0155 /* ReaderSampleViewController.xib */; };
-+		28AD733F0D9D9553002E5188 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 28AD733E0D9D9553002E5188 /* MainWindow.xib */; };
-+		28D7ACF80DDB3853001CB0EB /* ReaderSampleViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 28D7ACF70DDB3853001CB0EB /* ReaderSampleViewController.m */; };
-+		DC3CEC791209F83E00D7A786 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC3CEC781209F83E00D7A786 /* AVFoundation.framework */; };
-+		DC3CEC7B1209F83E00D7A786 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC3CEC7A1209F83E00D7A786 /* CoreMedia.framework */; };
-+		DC3CEC7D1209F83E00D7A786 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC3CEC7C1209F83E00D7A786 /* CoreVideo.framework */; };
-+		DC3CEC7F1209F83E00D7A786 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC3CEC7E1209F83E00D7A786 /* QuartzCore.framework */; };
-+		DC3CEC811209F83E00D7A786 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DC3CEC801209F83E00D7A786 /* libiconv.dylib */; };
-+		DC48C40C1219E1A20047193B /* libzbar.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC48C4061219E1A20047193B /* libzbar.a */; };
-+		DC48C40D1219E1A20047193B /* zbar-back.png in Resources */ = {isa = PBXBuildFile; fileRef = DC48C4081219E1A20047193B /* zbar-back.png */; };
-+		DC48C40E1219E1A20047193B /* zbar-help.html in Resources */ = {isa = PBXBuildFile; fileRef = DC48C4091219E1A20047193B /* zbar-help.html */; };
-+		DC48C40F1219E1A20047193B /* zbar-helpicons.png in Resources */ = {isa = PBXBuildFile; fileRef = DC48C40A1219E1A20047193B /* zbar-helpicons.png */; };
-+		DC48C4101219E1A20047193B /* zbar-samples.png in Resources */ = {isa = PBXBuildFile; fileRef = DC48C40B1219E1A20047193B /* zbar-samples.png */; };
++		DC52DED31370F5340048DADA /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52DECE1370F5340048DADA /* AVFoundation.framework */; };
++		DC52DED41370F5340048DADA /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52DECF1370F5340048DADA /* CoreMedia.framework */; };
++		DC52DED51370F5340048DADA /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52DED01370F5340048DADA /* CoreVideo.framework */; };
++		DC52DED61370F5340048DADA /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52DED11370F5340048DADA /* libiconv.dylib */; };
++		DC52DED71370F5340048DADA /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52DED21370F5340048DADA /* QuartzCore.framework */; };
++		DC5D76D71370EE8F0069AEF5 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC5D76D61370EE8F0069AEF5 /* UIKit.framework */; };
++		DC5D76D91370EE8F0069AEF5 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC5D76D81370EE8F0069AEF5 /* Foundation.framework */; };
++		DC5D76DB1370EE8F0069AEF5 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC5D76DA1370EE8F0069AEF5 /* CoreGraphics.framework */; };
++		DC5D76E11370EE8F0069AEF5 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = DC5D76DF1370EE8F0069AEF5 /* InfoPlist.strings */; };
++		DC5D76E41370EE8F0069AEF5 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = DC5D76E31370EE8F0069AEF5 /* main.m */; };
++		DC5D76E71370EE8F0069AEF5 /* TabReaderAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = DC5D76E61370EE8F0069AEF5 /* TabReaderAppDelegate.m */; };
++		DC5D76EA1370EE8F0069AEF5 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = DC5D76E81370EE8F0069AEF5 /* MainWindow.xib */; };
++		DC5D76F01370EE8F0069AEF5 /* ResultsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DC5D76EF1370EE8F0069AEF5 /* ResultsViewController.m */; };
++		DC5D76F61370EE8F0069AEF5 /* ResultsView.xib in Resources */ = {isa = PBXBuildFile; fileRef = DC5D76F41370EE8F0069AEF5 /* ResultsView.xib */; };
++		DC5D771A1370F0E30069AEF5 /* libzbar.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC5D77141370F0E30069AEF5 /* libzbar.a */; };
++		DC5D771B1370F0E30069AEF5 /* zbar-back.png in Resources */ = {isa = PBXBuildFile; fileRef = DC5D77161370F0E30069AEF5 /* zbar-back.png */; };
++		DC5D771C1370F0E30069AEF5 /* zbar-help.html in Resources */ = {isa = PBXBuildFile; fileRef = DC5D77171370F0E30069AEF5 /* zbar-help.html */; };
++		DC5D771D1370F0E30069AEF5 /* zbar-helpicons.png in Resources */ = {isa = PBXBuildFile; fileRef = DC5D77181370F0E30069AEF5 /* zbar-helpicons.png */; };
++		DC5D771E1370F0E30069AEF5 /* zbar-samples.png in Resources */ = {isa = PBXBuildFile; fileRef = DC5D77191370F0E30069AEF5 /* zbar-samples.png */; };
++		DC82460B162B5A1D0010B2E6 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DC82460A162B5A1D0010B2E6 /* Default-568h@2x.png */; };
 +/* End PBXBuildFile section */
 +
 +/* Begin PBXFileReference section */
-+		1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
-+		1D3623240D0F684500981E51 /* ReaderSampleAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReaderSampleAppDelegate.h; sourceTree = "<group>"; };
-+		1D3623250D0F684500981E51 /* ReaderSampleAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ReaderSampleAppDelegate.m; sourceTree = "<group>"; };
-+		1D6058910D05DD3D006BFB54 /* ReaderSample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ReaderSample.app; sourceTree = BUILT_PRODUCTS_DIR; };
-+		1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
-+		288765A40DF7441C002DB57D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
-+		2899E5210DE3E06400AC0155 /* ReaderSampleViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ReaderSampleViewController.xib; sourceTree = "<group>"; };
-+		28AD733E0D9D9553002E5188 /* MainWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MainWindow.xib; sourceTree = "<group>"; };
-+		28D7ACF60DDB3853001CB0EB /* ReaderSampleViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReaderSampleViewController.h; sourceTree = "<group>"; };
-+		28D7ACF70DDB3853001CB0EB /* ReaderSampleViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ReaderSampleViewController.m; sourceTree = "<group>"; };
-+		29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
-+		32CA4F630368D1EE00C91783 /* ReaderSample_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReaderSample_Prefix.pch; sourceTree = "<group>"; };
-+		8D1107310486CEB800E47090 /* ReaderSample-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "ReaderSample-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = "<group>"; };
-+		DC3CEC781209F83E00D7A786 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
-+		DC3CEC7A1209F83E00D7A786 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; };
-+		DC3CEC7C1209F83E00D7A786 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; };
-+		DC3CEC7E1209F83E00D7A786 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
-+		DC3CEC801209F83E00D7A786 /* libiconv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libiconv.dylib; path = usr/lib/libiconv.dylib; sourceTree = SDKROOT; };
-+		DC48C3F41219E1A20047193B /* Decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Decoder.h; sourceTree = "<group>"; };
-+		DC48C3F51219E1A20047193B /* Exception.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Exception.h; sourceTree = "<group>"; };
-+		DC48C3F61219E1A20047193B /* Image.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Image.h; sourceTree = "<group>"; };
-+		DC48C3F71219E1A20047193B /* ImageScanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImageScanner.h; sourceTree = "<group>"; };
-+		DC48C3F81219E1A20047193B /* Processor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Processor.h; sourceTree = "<group>"; };
-+		DC48C3F91219E1A20047193B /* Scanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Scanner.h; sourceTree = "<group>"; };
-+		DC48C3FA1219E1A20047193B /* Symbol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Symbol.h; sourceTree = "<group>"; };
-+		DC48C3FB1219E1A20047193B /* Video.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Video.h; sourceTree = "<group>"; };
-+		DC48C3FC1219E1A20047193B /* Window.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Window.h; sourceTree = "<group>"; };
-+		DC48C3FD1219E1A20047193B /* zbar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zbar.h; sourceTree = "<group>"; };
-+		DC48C3FE1219E1A20047193B /* ZBarCaptureReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarCaptureReader.h; sourceTree = "<group>"; };
-+		DC48C3FF1219E1A20047193B /* ZBarImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarImage.h; sourceTree = "<group>"; };
-+		DC48C4001219E1A20047193B /* ZBarImageScanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarImageScanner.h; sourceTree = "<group>"; };
-+		DC48C4011219E1A20047193B /* ZBarReaderController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarReaderController.h; sourceTree = "<group>"; };
-+		DC48C4021219E1A20047193B /* ZBarReaderView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarReaderView.h; sourceTree = "<group>"; };
-+		DC48C4031219E1A20047193B /* ZBarReaderViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarReaderViewController.h; sourceTree = "<group>"; };
-+		DC48C4041219E1A20047193B /* ZBarSDK.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarSDK.h; sourceTree = "<group>"; };
-+		DC48C4051219E1A20047193B /* ZBarSymbol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarSymbol.h; sourceTree = "<group>"; };
-+		DC48C4061219E1A20047193B /* libzbar.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libzbar.a; sourceTree = "<group>"; };
-+		DC48C4081219E1A20047193B /* zbar-back.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "zbar-back.png"; sourceTree = "<group>"; };
-+		DC48C4091219E1A20047193B /* zbar-help.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "zbar-help.html"; sourceTree = "<group>"; };
-+		DC48C40A1219E1A20047193B /* zbar-helpicons.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "zbar-helpicons.png"; sourceTree = "<group>"; };
-+		DC48C40B1219E1A20047193B /* zbar-samples.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "zbar-samples.png"; sourceTree = "<group>"; };
++		DC52DECE1370F5340048DADA /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
++		DC52DECF1370F5340048DADA /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; };
++		DC52DED01370F5340048DADA /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; };
++		DC52DED11370F5340048DADA /* libiconv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libiconv.dylib; path = usr/lib/libiconv.dylib; sourceTree = SDKROOT; };
++		DC52DED21370F5340048DADA /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
++		DC5D76D21370EE8F0069AEF5 /* TabReader.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TabReader.app; sourceTree = BUILT_PRODUCTS_DIR; };
++		DC5D76D61370EE8F0069AEF5 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
++		DC5D76D81370EE8F0069AEF5 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
++		DC5D76DA1370EE8F0069AEF5 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
++		DC5D76DE1370EE8F0069AEF5 /* TabReader-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "TabReader-Info.plist"; sourceTree = "<group>"; };
++		DC5D76E01370EE8F0069AEF5 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
++		DC5D76E21370EE8F0069AEF5 /* TabReader-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "TabReader-Prefix.pch"; sourceTree = "<group>"; };
++		DC5D76E31370EE8F0069AEF5 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
++		DC5D76E51370EE8F0069AEF5 /* TabReaderAppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TabReaderAppDelegate.h; sourceTree = "<group>"; };
++		DC5D76E61370EE8F0069AEF5 /* TabReaderAppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TabReaderAppDelegate.m; sourceTree = "<group>"; };
++		DC5D76E91370EE8F0069AEF5 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/MainWindow.xib; sourceTree = "<group>"; };
++		DC5D76EE1370EE8F0069AEF5 /* ResultsViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ResultsViewController.h; sourceTree = "<group>"; };
++		DC5D76EF1370EE8F0069AEF5 /* ResultsViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ResultsViewController.m; sourceTree = "<group>"; };
++		DC5D76F51370EE8F0069AEF5 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/ResultsView.xib; sourceTree = "<group>"; };
++		DC5D77001370F0E30069AEF5 /* Decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Decoder.h; sourceTree = "<group>"; };
++		DC5D77011370F0E30069AEF5 /* Exception.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Exception.h; sourceTree = "<group>"; };
++		DC5D77021370F0E30069AEF5 /* Image.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Image.h; sourceTree = "<group>"; };
++		DC5D77031370F0E30069AEF5 /* ImageScanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImageScanner.h; sourceTree = "<group>"; };
++		DC5D77041370F0E30069AEF5 /* Processor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Processor.h; sourceTree = "<group>"; };
++		DC5D77051370F0E30069AEF5 /* Scanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Scanner.h; sourceTree = "<group>"; };
++		DC5D77061370F0E30069AEF5 /* Symbol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Symbol.h; sourceTree = "<group>"; };
++		DC5D77071370F0E30069AEF5 /* Video.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Video.h; sourceTree = "<group>"; };
++		DC5D77081370F0E30069AEF5 /* Window.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Window.h; sourceTree = "<group>"; };
++		DC5D77091370F0E30069AEF5 /* zbar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zbar.h; sourceTree = "<group>"; };
++		DC5D770A1370F0E30069AEF5 /* ZBarCameraSimulator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarCameraSimulator.h; sourceTree = "<group>"; };
++		DC5D770B1370F0E30069AEF5 /* ZBarCaptureReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarCaptureReader.h; sourceTree = "<group>"; };
++		DC5D770C1370F0E30069AEF5 /* ZBarHelpController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarHelpController.h; sourceTree = "<group>"; };
++		DC5D770D1370F0E30069AEF5 /* ZBarImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarImage.h; sourceTree = "<group>"; };
++		DC5D770E1370F0E30069AEF5 /* ZBarImageScanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarImageScanner.h; sourceTree = "<group>"; };
++		DC5D770F1370F0E30069AEF5 /* ZBarReaderController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarReaderController.h; sourceTree = "<group>"; };
++		DC5D77101370F0E30069AEF5 /* ZBarReaderView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarReaderView.h; sourceTree = "<group>"; };
++		DC5D77111370F0E30069AEF5 /* ZBarReaderViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarReaderViewController.h; sourceTree = "<group>"; };
++		DC5D77121370F0E30069AEF5 /* ZBarSDK.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarSDK.h; sourceTree = "<group>"; };
++		DC5D77131370F0E30069AEF5 /* ZBarSymbol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarSymbol.h; sourceTree = "<group>"; };
++		DC5D77141370F0E30069AEF5 /* libzbar.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libzbar.a; sourceTree = "<group>"; };
++		DC5D77161370F0E30069AEF5 /* zbar-back.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "zbar-back.png"; sourceTree = "<group>"; };
++		DC5D77171370F0E30069AEF5 /* zbar-help.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "zbar-help.html"; sourceTree = "<group>"; };
++		DC5D77181370F0E30069AEF5 /* zbar-helpicons.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "zbar-helpicons.png"; sourceTree = "<group>"; };
++		DC5D77191370F0E30069AEF5 /* zbar-samples.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "zbar-samples.png"; sourceTree = "<group>"; };
++		DC82460A162B5A1D0010B2E6 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = SOURCE_ROOT; };
 +/* End PBXFileReference section */
 +
 +/* Begin PBXFrameworksBuildPhase section */
-+		1D60588F0D05DD3D006BFB54 /* Frameworks */ = {
++		DC5D76CF1370EE8F0069AEF5 /* Frameworks */ = {
 +			isa = PBXFrameworksBuildPhase;
 +			buildActionMask = 2147483647;
 +			files = (
-+				1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */,
-+				288765A50DF7441C002DB57D /* CoreGraphics.framework in Frameworks */,
-+				1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */,
-+				DC3CEC791209F83E00D7A786 /* AVFoundation.framework in Frameworks */,
-+				DC3CEC7B1209F83E00D7A786 /* CoreMedia.framework in Frameworks */,
-+				DC3CEC7D1209F83E00D7A786 /* CoreVideo.framework in Frameworks */,
-+				DC3CEC7F1209F83E00D7A786 /* QuartzCore.framework in Frameworks */,
-+				DC3CEC811209F83E00D7A786 /* libiconv.dylib in Frameworks */,
-+				DC48C40C1219E1A20047193B /* libzbar.a in Frameworks */,
++				DC52DED31370F5340048DADA /* AVFoundation.framework in Frameworks */,
++				DC52DED41370F5340048DADA /* CoreMedia.framework in Frameworks */,
++				DC52DED51370F5340048DADA /* CoreVideo.framework in Frameworks */,
++				DC52DED61370F5340048DADA /* libiconv.dylib in Frameworks */,
++				DC52DED71370F5340048DADA /* QuartzCore.framework in Frameworks */,
++				DC5D76D71370EE8F0069AEF5 /* UIKit.framework in Frameworks */,
++				DC5D76D91370EE8F0069AEF5 /* Foundation.framework in Frameworks */,
++				DC5D76DB1370EE8F0069AEF5 /* CoreGraphics.framework in Frameworks */,
++				DC5D771A1370F0E30069AEF5 /* libzbar.a in Frameworks */,
 +			);
 +			runOnlyForDeploymentPostprocessing = 0;
 +		};
 +/* End PBXFrameworksBuildPhase section */
 +
 +/* Begin PBXGroup section */
-+		080E96DDFE201D6D7F000001 /* Classes */ = {
++		DC5D76C71370EE8D0069AEF5 = {
 +			isa = PBXGroup;
 +			children = (
-+				1D3623240D0F684500981E51 /* ReaderSampleAppDelegate.h */,
-+				1D3623250D0F684500981E51 /* ReaderSampleAppDelegate.m */,
-+				28D7ACF60DDB3853001CB0EB /* ReaderSampleViewController.h */,
-+				28D7ACF70DDB3853001CB0EB /* ReaderSampleViewController.m */,
++				DC5D76DC1370EE8F0069AEF5 /* TabReader */,
++				DC5D76FC1370F0E30069AEF5 /* ZBarSDK */,
++				DC5D76D51370EE8F0069AEF5 /* Frameworks */,
++				DC5D76D31370EE8F0069AEF5 /* Products */,
 +			);
-+			path = Classes;
 +			sourceTree = "<group>";
 +		};
-+		19C28FACFE9D520D11CA2CBB /* Products */ = {
++		DC5D76D31370EE8F0069AEF5 /* Products */ = {
 +			isa = PBXGroup;
 +			children = (
-+				1D6058910D05DD3D006BFB54 /* ReaderSample.app */,
++				DC5D76D21370EE8F0069AEF5 /* TabReader.app */,
 +			);
 +			name = Products;
 +			sourceTree = "<group>";
 +		};
-+		29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
-+			isa = PBXGroup;
-+			children = (
-+				080E96DDFE201D6D7F000001 /* Classes */,
-+				29B97315FDCFA39411CA2CEA /* Other Sources */,
-+				29B97317FDCFA39411CA2CEA /* Resources */,
-+				DC48C3F01219E1A20047193B /* ZBarSDK */,
-+				29B97323FDCFA39411CA2CEA /* Frameworks */,
-+				19C28FACFE9D520D11CA2CBB /* Products */,
-+			);
-+			name = CustomTemplate;
-+			sourceTree = "<group>";
-+		};
-+		29B97315FDCFA39411CA2CEA /* Other Sources */ = {
++		DC5D76D51370EE8F0069AEF5 /* Frameworks */ = {
 +			isa = PBXGroup;
 +			children = (
-+				32CA4F630368D1EE00C91783 /* ReaderSample_Prefix.pch */,
-+				29B97316FDCFA39411CA2CEA /* main.m */,
++				DC5D76D61370EE8F0069AEF5 /* UIKit.framework */,
++				DC5D76D81370EE8F0069AEF5 /* Foundation.framework */,
++				DC5D76DA1370EE8F0069AEF5 /* CoreGraphics.framework */,
++				DC52DECE1370F5340048DADA /* AVFoundation.framework */,
++				DC52DECF1370F5340048DADA /* CoreMedia.framework */,
++				DC52DED01370F5340048DADA /* CoreVideo.framework */,
++				DC52DED11370F5340048DADA /* libiconv.dylib */,
++				DC52DED21370F5340048DADA /* QuartzCore.framework */,
 +			);
-+			name = "Other Sources";
++			name = Frameworks;
 +			sourceTree = "<group>";
 +		};
-+		29B97317FDCFA39411CA2CEA /* Resources */ = {
++		DC5D76DC1370EE8F0069AEF5 /* TabReader */ = {
 +			isa = PBXGroup;
 +			children = (
-+				2899E5210DE3E06400AC0155 /* ReaderSampleViewController.xib */,
-+				28AD733E0D9D9553002E5188 /* MainWindow.xib */,
-+				8D1107310486CEB800E47090 /* ReaderSample-Info.plist */,
++				DC5D76E51370EE8F0069AEF5 /* TabReaderAppDelegate.h */,
++				DC5D76E61370EE8F0069AEF5 /* TabReaderAppDelegate.m */,
++				DC5D76E81370EE8F0069AEF5 /* MainWindow.xib */,
++				DC5D76EE1370EE8F0069AEF5 /* ResultsViewController.h */,
++				DC5D76EF1370EE8F0069AEF5 /* ResultsViewController.m */,
++				DC5D76F41370EE8F0069AEF5 /* ResultsView.xib */,
++				DC5D76DD1370EE8F0069AEF5 /* Supporting Files */,
 +			);
-+			name = Resources;
++			path = TabReader;
 +			sourceTree = "<group>";
 +		};
-+		29B97323FDCFA39411CA2CEA /* Frameworks */ = {
++		DC5D76DD1370EE8F0069AEF5 /* Supporting Files */ = {
 +			isa = PBXGroup;
 +			children = (
-+				1D30AB110D05D00D00671497 /* Foundation.framework */,
-+				288765A40DF7441C002DB57D /* CoreGraphics.framework */,
-+				1DF5F4DF0D08C38300B7A737 /* UIKit.framework */,
-+				DC3CEC7E1209F83E00D7A786 /* QuartzCore.framework */,
-+				DC3CEC781209F83E00D7A786 /* AVFoundation.framework */,
-+				DC3CEC7A1209F83E00D7A786 /* CoreMedia.framework */,
-+				DC3CEC7C1209F83E00D7A786 /* CoreVideo.framework */,
-+				DC3CEC801209F83E00D7A786 /* libiconv.dylib */,
++				DC5D76DE1370EE8F0069AEF5 /* TabReader-Info.plist */,
++				DC5D76DF1370EE8F0069AEF5 /* InfoPlist.strings */,
++				DC82460A162B5A1D0010B2E6 /* Default-568h@2x.png */,
++				DC5D76E21370EE8F0069AEF5 /* TabReader-Prefix.pch */,
++				DC5D76E31370EE8F0069AEF5 /* main.m */,
 +			);
-+			name = Frameworks;
++			name = "Supporting Files";
 +			sourceTree = "<group>";
 +		};
-+		DC48C3F01219E1A20047193B /* ZBarSDK */ = {
++		DC5D76FC1370F0E30069AEF5 /* ZBarSDK */ = {
 +			isa = PBXGroup;
 +			children = (
-+				DC48C3F11219E1A20047193B /* Headers */,
-+				DC48C4061219E1A20047193B /* libzbar.a */,
-+				DC48C4071219E1A20047193B /* Resources */,
++				DC5D76FD1370F0E30069AEF5 /* Headers */,
++				DC5D77141370F0E30069AEF5 /* libzbar.a */,
++				DC5D77151370F0E30069AEF5 /* Resources */,
 +			);
 +			path = ZBarSDK;
 +			sourceTree = "<group>";
 +		};
-+		DC48C3F11219E1A20047193B /* Headers */ = {
++		DC5D76FD1370F0E30069AEF5 /* Headers */ = {
 +			isa = PBXGroup;
 +			children = (
-+				DC48C3F21219E1A20047193B /* ZBarSDK */,
++				DC5D76FE1370F0E30069AEF5 /* ZBarSDK */,
 +			);
 +			path = Headers;
 +			sourceTree = "<group>";
 +		};
-+		DC48C3F21219E1A20047193B /* ZBarSDK */ = {
++		DC5D76FE1370F0E30069AEF5 /* ZBarSDK */ = {
 +			isa = PBXGroup;
 +			children = (
-+				DC48C3F31219E1A20047193B /* zbar */,
-+				DC48C3FD1219E1A20047193B /* zbar.h */,
-+				DC48C3FE1219E1A20047193B /* ZBarCaptureReader.h */,
-+				DC48C3FF1219E1A20047193B /* ZBarImage.h */,
-+				DC48C4001219E1A20047193B /* ZBarImageScanner.h */,
-+				DC48C4011219E1A20047193B /* ZBarReaderController.h */,
-+				DC48C4021219E1A20047193B /* ZBarReaderView.h */,
-+				DC48C4031219E1A20047193B /* ZBarReaderViewController.h */,
-+				DC48C4041219E1A20047193B /* ZBarSDK.h */,
-+				DC48C4051219E1A20047193B /* ZBarSymbol.h */,
++				DC5D76FF1370F0E30069AEF5 /* zbar */,
++				DC5D77091370F0E30069AEF5 /* zbar.h */,
++				DC5D770A1370F0E30069AEF5 /* ZBarCameraSimulator.h */,
++				DC5D770B1370F0E30069AEF5 /* ZBarCaptureReader.h */,
++				DC5D770C1370F0E30069AEF5 /* ZBarHelpController.h */,
++				DC5D770D1370F0E30069AEF5 /* ZBarImage.h */,
++				DC5D770E1370F0E30069AEF5 /* ZBarImageScanner.h */,
++				DC5D770F1370F0E30069AEF5 /* ZBarReaderController.h */,
++				DC5D77101370F0E30069AEF5 /* ZBarReaderView.h */,
++				DC5D77111370F0E30069AEF5 /* ZBarReaderViewController.h */,
++				DC5D77121370F0E30069AEF5 /* ZBarSDK.h */,
++				DC5D77131370F0E30069AEF5 /* ZBarSymbol.h */,
 +			);
 +			path = ZBarSDK;
 +			sourceTree = "<group>";
 +		};
-+		DC48C3F31219E1A20047193B /* zbar */ = {
++		DC5D76FF1370F0E30069AEF5 /* zbar */ = {
 +			isa = PBXGroup;
 +			children = (
-+				DC48C3F41219E1A20047193B /* Decoder.h */,
-+				DC48C3F51219E1A20047193B /* Exception.h */,
-+				DC48C3F61219E1A20047193B /* Image.h */,
-+				DC48C3F71219E1A20047193B /* ImageScanner.h */,
-+				DC48C3F81219E1A20047193B /* Processor.h */,
-+				DC48C3F91219E1A20047193B /* Scanner.h */,
-+				DC48C3FA1219E1A20047193B /* Symbol.h */,
-+				DC48C3FB1219E1A20047193B /* Video.h */,
-+				DC48C3FC1219E1A20047193B /* Window.h */,
++				DC5D77001370F0E30069AEF5 /* Decoder.h */,
++				DC5D77011370F0E30069AEF5 /* Exception.h */,
++				DC5D77021370F0E30069AEF5 /* Image.h */,
++				DC5D77031370F0E30069AEF5 /* ImageScanner.h */,
++				DC5D77041370F0E30069AEF5 /* Processor.h */,
++				DC5D77051370F0E30069AEF5 /* Scanner.h */,
++				DC5D77061370F0E30069AEF5 /* Symbol.h */,
++				DC5D77071370F0E30069AEF5 /* Video.h */,
++				DC5D77081370F0E30069AEF5 /* Window.h */,
 +			);
 +			path = zbar;
 +			sourceTree = "<group>";
 +		};
-+		DC48C4071219E1A20047193B /* Resources */ = {
++		DC5D77151370F0E30069AEF5 /* Resources */ = {
 +			isa = PBXGroup;
 +			children = (
-+				DC48C4081219E1A20047193B /* zbar-back.png */,
-+				DC48C4091219E1A20047193B /* zbar-help.html */,
-+				DC48C40A1219E1A20047193B /* zbar-helpicons.png */,
-+				DC48C40B1219E1A20047193B /* zbar-samples.png */,
++				DC5D77161370F0E30069AEF5 /* zbar-back.png */,
++				DC5D77171370F0E30069AEF5 /* zbar-help.html */,
++				DC5D77181370F0E30069AEF5 /* zbar-helpicons.png */,
++				DC5D77191370F0E30069AEF5 /* zbar-samples.png */,
 +			);
 +			path = Resources;
 +			sourceTree = "<group>";
@@ -11977,188 +14675,927 @@ new file mode 100755
 +/* End PBXGroup section */
 +
 +/* Begin PBXNativeTarget section */
-+		1D6058900D05DD3D006BFB54 /* ReaderSample */ = {
++		DC5D76D11370EE8F0069AEF5 /* TabReader */ = {
 +			isa = PBXNativeTarget;
-+			buildConfigurationList = 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "ReaderSample" */;
++			buildConfigurationList = DC5D76F91370EE900069AEF5 /* Build configuration list for PBXNativeTarget "TabReader" */;
 +			buildPhases = (
-+				1D60588D0D05DD3D006BFB54 /* Resources */,
-+				1D60588E0D05DD3D006BFB54 /* Sources */,
-+				1D60588F0D05DD3D006BFB54 /* Frameworks */,
++				DC5D76CE1370EE8F0069AEF5 /* Sources */,
++				DC5D76CF1370EE8F0069AEF5 /* Frameworks */,
++				DC5D76D01370EE8F0069AEF5 /* Resources */,
 +			);
 +			buildRules = (
 +			);
 +			dependencies = (
 +			);
-+			name = ReaderSample;
-+			productName = ReaderSample;
-+			productReference = 1D6058910D05DD3D006BFB54 /* ReaderSample.app */;
++			name = TabReader;
++			productName = TabReader;
++			productReference = DC5D76D21370EE8F0069AEF5 /* TabReader.app */;
 +			productType = "com.apple.product-type.application";
 +		};
 +/* End PBXNativeTarget section */
 +
 +/* Begin PBXProject section */
-+		29B97313FDCFA39411CA2CEA /* Project object */ = {
++		DC5D76C91370EE8D0069AEF5 /* Project object */ = {
 +			isa = PBXProject;
-+			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "ReaderSample" */;
-+			compatibilityVersion = "Xcode 3.1";
++			buildConfigurationList = DC5D76CC1370EE8D0069AEF5 /* Build configuration list for PBXProject "TabReader" */;
++			compatibilityVersion = "Xcode 3.2";
 +			developmentRegion = English;
-+			hasScannedForEncodings = 1;
++			hasScannedForEncodings = 0;
 +			knownRegions = (
-+				English,
-+				Japanese,
-+				French,
-+				German,
++				en,
 +			);
-+			mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */;
++			mainGroup = DC5D76C71370EE8D0069AEF5;
++			productRefGroup = DC5D76D31370EE8F0069AEF5 /* Products */;
 +			projectDirPath = "";
 +			projectRoot = "";
 +			targets = (
-+				1D6058900D05DD3D006BFB54 /* ReaderSample */,
++				DC5D76D11370EE8F0069AEF5 /* TabReader */,
 +			);
 +		};
 +/* End PBXProject section */
 +
 +/* Begin PBXResourcesBuildPhase section */
-+		1D60588D0D05DD3D006BFB54 /* Resources */ = {
++		DC5D76D01370EE8F0069AEF5 /* Resources */ = {
 +			isa = PBXResourcesBuildPhase;
 +			buildActionMask = 2147483647;
 +			files = (
-+				28AD733F0D9D9553002E5188 /* MainWindow.xib in Resources */,
-+				2899E5220DE3E06400AC0155 /* ReaderSampleViewController.xib in Resources */,
-+				DC48C40D1219E1A20047193B /* zbar-back.png in Resources */,
-+				DC48C40E1219E1A20047193B /* zbar-help.html in Resources */,
-+				DC48C40F1219E1A20047193B /* zbar-helpicons.png in Resources */,
-+				DC48C4101219E1A20047193B /* zbar-samples.png in Resources */,
++				DC5D76E11370EE8F0069AEF5 /* InfoPlist.strings in Resources */,
++				DC5D76EA1370EE8F0069AEF5 /* MainWindow.xib in Resources */,
++				DC5D76F61370EE8F0069AEF5 /* ResultsView.xib in Resources */,
++				DC5D771B1370F0E30069AEF5 /* zbar-back.png in Resources */,
++				DC5D771C1370F0E30069AEF5 /* zbar-help.html in Resources */,
++				DC5D771D1370F0E30069AEF5 /* zbar-helpicons.png in Resources */,
++				DC5D771E1370F0E30069AEF5 /* zbar-samples.png in Resources */,
++				DC82460B162B5A1D0010B2E6 /* Default-568h@2x.png in Resources */,
 +			);
 +			runOnlyForDeploymentPostprocessing = 0;
 +		};
 +/* End PBXResourcesBuildPhase section */
 +
 +/* Begin PBXSourcesBuildPhase section */
-+		1D60588E0D05DD3D006BFB54 /* Sources */ = {
++		DC5D76CE1370EE8F0069AEF5 /* Sources */ = {
 +			isa = PBXSourcesBuildPhase;
 +			buildActionMask = 2147483647;
 +			files = (
-+				1D60589B0D05DD56006BFB54 /* main.m in Sources */,
-+				1D3623260D0F684500981E51 /* ReaderSampleAppDelegate.m in Sources */,
-+				28D7ACF80DDB3853001CB0EB /* ReaderSampleViewController.m in Sources */,
++				DC5D76E41370EE8F0069AEF5 /* main.m in Sources */,
++				DC5D76E71370EE8F0069AEF5 /* TabReaderAppDelegate.m in Sources */,
++				DC5D76F01370EE8F0069AEF5 /* ResultsViewController.m in Sources */,
 +			);
 +			runOnlyForDeploymentPostprocessing = 0;
 +		};
 +/* End PBXSourcesBuildPhase section */
 +
++/* Begin PBXVariantGroup section */
++		DC5D76DF1370EE8F0069AEF5 /* InfoPlist.strings */ = {
++			isa = PBXVariantGroup;
++			children = (
++				DC5D76E01370EE8F0069AEF5 /* en */,
++			);
++			name = InfoPlist.strings;
++			sourceTree = "<group>";
++		};
++		DC5D76E81370EE8F0069AEF5 /* MainWindow.xib */ = {
++			isa = PBXVariantGroup;
++			children = (
++				DC5D76E91370EE8F0069AEF5 /* en */,
++			);
++			name = MainWindow.xib;
++			sourceTree = "<group>";
++		};
++		DC5D76F41370EE8F0069AEF5 /* ResultsView.xib */ = {
++			isa = PBXVariantGroup;
++			children = (
++				DC5D76F51370EE8F0069AEF5 /* en */,
++			);
++			name = ResultsView.xib;
++			sourceTree = "<group>";
++		};
++/* End PBXVariantGroup section */
++
 +/* Begin XCBuildConfiguration section */
-+		1D6058940D05DD3E006BFB54 /* Debug */ = {
++		DC5D76F71370EE900069AEF5 /* Debug */ = {
 +			isa = XCBuildConfiguration;
 +			buildSettings = {
-+				ALWAYS_SEARCH_USER_PATHS = NO;
-+				COPY_PHASE_STRIP = NO;
-+				GCC_DYNAMIC_NO_PIC = NO;
++				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
++				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
++				GCC_C_LANGUAGE_STANDARD = gnu99;
 +				GCC_OPTIMIZATION_LEVEL = 0;
-+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-+				GCC_PREFIX_HEADER = ReaderSample_Prefix.pch;
-+				INFOPLIST_FILE = "ReaderSample-Info.plist";
-+				LIBRARY_SEARCH_PATHS = (
-+					"$(inherited)",
-+					"\"$(SRCROOT)/ZBarSDK\"",
-+				);
-+				PRODUCT_NAME = ReaderSample;
-+				SYMROOT = /tmp/ReaderSample.build;
++				GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
++				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
++				GCC_VERSION = com.apple.compilers.llvmgcc42;
++				GCC_WARN_ABOUT_RETURN_TYPE = YES;
++				GCC_WARN_UNUSED_VARIABLE = YES;
++				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
++				SDKROOT = iphoneos;
 +			};
 +			name = Debug;
 +		};
-+		1D6058950D05DD3E006BFB54 /* Release */ = {
++		DC5D76F81370EE900069AEF5 /* Release */ = {
 +			isa = XCBuildConfiguration;
 +			buildSettings = {
-+				ALWAYS_SEARCH_USER_PATHS = NO;
-+				COPY_PHASE_STRIP = YES;
-+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-+				GCC_PREFIX_HEADER = ReaderSample_Prefix.pch;
-+				INFOPLIST_FILE = "ReaderSample-Info.plist";
-+				LIBRARY_SEARCH_PATHS = (
-+					"$(inherited)",
-+					"\"$(SRCROOT)/ZBarSDK\"",
-+				);
-+				PRODUCT_NAME = ReaderSample;
-+				SYMROOT = /tmp/ReaderSample.build;
-+				VALIDATE_PRODUCT = YES;
++				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
++				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
++				GCC_C_LANGUAGE_STANDARD = gnu99;
++				GCC_VERSION = com.apple.compilers.llvmgcc42;
++				GCC_WARN_ABOUT_RETURN_TYPE = YES;
++				GCC_WARN_UNUSED_VARIABLE = YES;
++				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
++				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
++				SDKROOT = iphoneos;
 +			};
 +			name = Release;
 +		};
-+		C01FCF4F08A954540054247B /* Debug */ = {
++		DC5D76FA1370EE900069AEF5 /* Debug */ = {
 +			isa = XCBuildConfiguration;
 +			buildSettings = {
-+				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
-+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-+				GCC_C_LANGUAGE_STANDARD = c99;
-+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-+				GCC_WARN_UNUSED_VARIABLE = YES;
++				ALWAYS_SEARCH_USER_PATHS = NO;
++				COPY_PHASE_STRIP = NO;
++				GCC_DYNAMIC_NO_PIC = NO;
++				GCC_PRECOMPILE_PREFIX_HEADER = YES;
++				GCC_PREFIX_HEADER = "TabReader/TabReader-Prefix.pch";
++				INFOPLIST_FILE = "TabReader/TabReader-Info.plist";
 +				IPHONEOS_DEPLOYMENT_TARGET = 4.0;
-+				PREBINDING = NO;
-+				SDKROOT = iphoneos;
++				LIBRARY_SEARCH_PATHS = (
++					"$(inherited)",
++					"\"$(SRCROOT)/ZBarSDK\"",
++				);
++				PRODUCT_NAME = "$(TARGET_NAME)";
++				TARGETED_DEVICE_FAMILY = "1,2";
++				WRAPPER_EXTENSION = app;
 +			};
 +			name = Debug;
 +		};
-+		C01FCF5008A954540054247B /* Release */ = {
++		DC5D76FB1370EE900069AEF5 /* Release */ = {
 +			isa = XCBuildConfiguration;
 +			buildSettings = {
-+				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
-+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-+				GCC_C_LANGUAGE_STANDARD = c99;
-+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-+				GCC_WARN_UNUSED_VARIABLE = YES;
++				ALWAYS_SEARCH_USER_PATHS = NO;
++				COPY_PHASE_STRIP = YES;
++				GCC_PRECOMPILE_PREFIX_HEADER = YES;
++				GCC_PREFIX_HEADER = "TabReader/TabReader-Prefix.pch";
++				INFOPLIST_FILE = "TabReader/TabReader-Info.plist";
 +				IPHONEOS_DEPLOYMENT_TARGET = 4.0;
-+				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
-+				PREBINDING = NO;
-+				SDKROOT = iphoneos;
++				LIBRARY_SEARCH_PATHS = (
++					"$(inherited)",
++					"\"$(SRCROOT)/ZBarSDK\"",
++				);
++				PRODUCT_NAME = "$(TARGET_NAME)";
++				TARGETED_DEVICE_FAMILY = "1,2";
++				VALIDATE_PRODUCT = YES;
++				WRAPPER_EXTENSION = app;
 +			};
 +			name = Release;
 +		};
 +/* End XCBuildConfiguration section */
 +
 +/* Begin XCConfigurationList section */
-+		1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "ReaderSample" */ = {
++		DC5D76CC1370EE8D0069AEF5 /* Build configuration list for PBXProject "TabReader" */ = {
 +			isa = XCConfigurationList;
 +			buildConfigurations = (
-+				1D6058940D05DD3E006BFB54 /* Debug */,
-+				1D6058950D05DD3E006BFB54 /* Release */,
++				DC5D76F71370EE900069AEF5 /* Debug */,
++				DC5D76F81370EE900069AEF5 /* Release */,
 +			);
 +			defaultConfigurationIsVisible = 0;
 +			defaultConfigurationName = Release;
 +		};
-+		C01FCF4E08A954540054247B /* Build configuration list for PBXProject "ReaderSample" */ = {
++		DC5D76F91370EE900069AEF5 /* Build configuration list for PBXNativeTarget "TabReader" */ = {
 +			isa = XCConfigurationList;
 +			buildConfigurations = (
-+				C01FCF4F08A954540054247B /* Debug */,
-+				C01FCF5008A954540054247B /* Release */,
++				DC5D76FA1370EE900069AEF5 /* Debug */,
++				DC5D76FB1370EE900069AEF5 /* Release */,
 +			);
 +			defaultConfigurationIsVisible = 0;
 +			defaultConfigurationName = Release;
 +		};
 +/* End XCConfigurationList section */
 +	};
-+	rootObject = 29B97313FDCFA39411CA2CEA /* Project object */;
++	rootObject = DC5D76C91370EE8D0069AEF5 /* Project object */;
++}
+diff -r 563557a923d0 iphone/examples/TabReader/TabReader.xcodeproj/xcshareddata/xcschemes/TabReader.xcscheme
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/examples/TabReader/TabReader.xcodeproj/xcshareddata/xcschemes/TabReader.xcscheme	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,80 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<Scheme
++   version = "1.8">
++   <BuildAction
++      parallelizeBuildables = "YES"
++      buildImplicitDependencies = "YES">
++      <BuildActionEntries>
++         <BuildActionEntry
++            buildForTesting = "YES"
++            buildForRunning = "YES"
++            buildForProfiling = "YES"
++            buildForArchiving = "YES"
++            buildForAnalyzing = "YES">
++            <BuildableReference
++               BuildableIdentifier = "primary"
++               BlueprintIdentifier = "DC5D76D11370EE8F0069AEF5"
++               BuildableName = "TabReader.app"
++               BlueprintName = "TabReader"
++               ReferencedContainer = "container:TabReader.xcodeproj">
++            </BuildableReference>
++         </BuildActionEntry>
++      </BuildActionEntries>
++   </BuildAction>
++   <TestAction
++      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
++      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
++      shouldUseLaunchSchemeArgsEnv = "YES"
++      buildConfiguration = "Debug">
++      <Testables>
++      </Testables>
++   </TestAction>
++   <LaunchAction
++      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
++      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
++      displayScaleIsEnabled = "NO"
++      displayScale = "1.00"
++      launchStyle = "0"
++      useCustomWorkingDirectory = "NO"
++      buildConfiguration = "Debug"
++      ignoresPersistentStateOnLaunch = "NO"
++      debugDocumentVersioning = "YES"
++      allowLocationSimulation = "YES">
++      <BuildableProductRunnable>
++         <BuildableReference
++            BuildableIdentifier = "primary"
++            BlueprintIdentifier = "DC5D76D11370EE8F0069AEF5"
++            BuildableName = "TabReader.app"
++            BlueprintName = "TabReader"
++            ReferencedContainer = "container:TabReader.xcodeproj">
++         </BuildableReference>
++      </BuildableProductRunnable>
++      <AdditionalOptions>
++      </AdditionalOptions>
++   </LaunchAction>
++   <ProfileAction
++      displayScaleIsEnabled = "NO"
++      displayScale = "1.00"
++      shouldUseLaunchSchemeArgsEnv = "YES"
++      savedToolIdentifier = ""
++      useCustomWorkingDirectory = "NO"
++      buildConfiguration = "Release"
++      debugDocumentVersioning = "YES">
++      <BuildableProductRunnable>
++         <BuildableReference
++            BuildableIdentifier = "primary"
++            BlueprintIdentifier = "DC5D76D11370EE8F0069AEF5"
++            BuildableName = "TabReader.app"
++            BlueprintName = "TabReader"
++            ReferencedContainer = "container:TabReader.xcodeproj">
++         </BuildableReference>
++      </BuildableProductRunnable>
++   </ProfileAction>
++   <AnalyzeAction
++      buildConfiguration = "Debug">
++   </AnalyzeAction>
++   <ArchiveAction
++      buildConfiguration = "Release"
++      revealArchiveInOrganizer = "YES">
++   </ArchiveAction>
++</Scheme>
+diff -r 563557a923d0 iphone/examples/TabReader/TabReader/ResultsViewController.h
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/examples/TabReader/TabReader/ResultsViewController.h	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,18 @@
++//
++//  SecondViewController.h
++//  TabReader
++//
++//  Created by spadix on 5/3/11.
++//
++
++#import <UIKit/UIKit.h>
++
++@interface ResultsViewController
++    : UIViewController
++{
++}
++
++@property (nonatomic, retain) IBOutlet UIImageView *resultImage;
++@property (nonatomic, retain) IBOutlet UITextView *resultText;
++
++@end
+diff -r 563557a923d0 iphone/examples/TabReader/TabReader/ResultsViewController.m
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/examples/TabReader/TabReader/ResultsViewController.m	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,20 @@
++//
++//  SecondViewController.m
++//  TabReader
++//
++//  Created by spadix on 5/3/11.
++//
++
++#import "ResultsViewController.h"
++
++
++@implementation ResultsViewController
++
++@synthesize resultImage, resultText;
++
++- (BOOL) shouldAutorotateToInterfaceOrientation: (UIInterfaceOrientation) orient
++{
++    return(YES);
++}
++
++@end
+diff -r 563557a923d0 iphone/examples/TabReader/TabReader/TabReader-Info.plist
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/examples/TabReader/TabReader/TabReader-Info.plist	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,38 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
++<plist version="1.0">
++<dict>
++	<key>CFBundleDevelopmentRegion</key>
++	<string>en</string>
++	<key>CFBundleDisplayName</key>
++	<string>${PRODUCT_NAME}</string>
++	<key>CFBundleExecutable</key>
++	<string>${EXECUTABLE_NAME}</string>
++	<key>CFBundleIconFile</key>
++	<string></string>
++	<key>CFBundleIdentifier</key>
++	<string>net.sourceforge.zbar.${PRODUCT_NAME:rfc1034identifier}</string>
++	<key>CFBundleInfoDictionaryVersion</key>
++	<string>6.0</string>
++	<key>CFBundleName</key>
++	<string>${PRODUCT_NAME}</string>
++	<key>CFBundlePackageType</key>
++	<string>APPL</string>
++	<key>CFBundleShortVersionString</key>
++	<string>1.0</string>
++	<key>CFBundleSignature</key>
++	<string>????</string>
++	<key>CFBundleVersion</key>
++	<string>1.0</string>
++	<key>LSRequiresIPhoneOS</key>
++	<true/>
++	<key>NSMainNibFile</key>
++	<string>MainWindow</string>
++	<key>UISupportedInterfaceOrientations</key>
++	<array>
++		<string>UIInterfaceOrientationPortrait</string>
++		<string>UIInterfaceOrientationLandscapeLeft</string>
++		<string>UIInterfaceOrientationLandscapeRight</string>
++	</array>
++</dict>
++</plist>
+diff -r 563557a923d0 iphone/examples/TabReader/TabReader/TabReader-Prefix.pch
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/examples/TabReader/TabReader/TabReader-Prefix.pch	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,15 @@
++//
++// Prefix header for all source files of the 'TabReader' target in the 'TabReader' project
++//
++
++#import <Availability.h>
++
++#ifndef __IPHONE_3_0
++#warning "This project uses features only available in iPhone SDK 3.0 and later."
++#endif
++
++#ifdef __OBJC__
++# import <UIKit/UIKit.h>
++# import <Foundation/Foundation.h>
++# import "ZBarSDK.h"
++#endif
+diff -r 563557a923d0 iphone/examples/TabReader/TabReader/TabReaderAppDelegate.h
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/examples/TabReader/TabReader/TabReaderAppDelegate.h	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,21 @@
++//
++//  TabReaderAppDelegate.h
++//  TabReader
++//
++//  Created by spadix on 5/3/11.
++//
++
++#import <UIKit/UIKit.h>
++
++@interface TabReaderAppDelegate
++    : NSObject
++    < UIApplicationDelegate,
++      UITabBarControllerDelegate,
++      ZBarReaderDelegate >
++{
++}
++
++@property (nonatomic, retain) IBOutlet UIWindow *window;
++@property (nonatomic, retain) IBOutlet UITabBarController *tabBarController;
++
++@end
+diff -r 563557a923d0 iphone/examples/TabReader/TabReader/TabReaderAppDelegate.m
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/examples/TabReader/TabReader/TabReaderAppDelegate.m	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,62 @@
++//
++//  TabReaderAppDelegate.m
++//  TabReader
++//
++//  Created by spadix on 5/3/11.
++//
++
++#import "TabReaderAppDelegate.h"
++#import "ResultsViewController.h"
++
++@implementation TabReaderAppDelegate
++
++@synthesize window=_window;
++@synthesize tabBarController=_tabBarController;
++
++- (BOOL)            application: (UIApplication*) application
++  didFinishLaunchingWithOptions: (NSDictionary*) options
++{
++    // force class to load so it may be referenced directly from nib
++    [ZBarReaderViewController class];
++
++    ZBarReaderViewController *reader =
++        [self.tabBarController.viewControllers objectAtIndex: 0];
++    reader.readerDelegate = self;
++    reader.showsZBarControls = NO;
++    reader.supportedOrientationsMask = ZBarOrientationMaskAll;
++
++    self.window.rootViewController = self.tabBarController;
++    [self.window makeKeyAndVisible];
++
++    return(YES);
++}
++
++- (void) dealloc
++{
++    [_window release];
++    [_tabBarController release];
++    [super dealloc];
++}
++
++
++// ZBarReaderDelegate
++
++- (void)  imagePickerController: (UIImagePickerController*) picker
++  didFinishPickingMediaWithInfo: (NSDictionary*) info
++{
++    // do something useful with results
++    UITabBarController *tabs = self.tabBarController;
++    tabs.selectedIndex = 1;
++    ResultsViewController *results = [tabs.viewControllers objectAtIndex: 1];
++    UIImage *image = [info objectForKey: UIImagePickerControllerOriginalImage];
++    results.resultImage.image = image;
++
++    id <NSFastEnumeration> syms =
++    [info objectForKey: ZBarReaderControllerResults];
++    for(ZBarSymbol *sym in syms) {
++        results.resultText.text = sym.data;
++        break;
++    }
 +}
-diff --git a/iphone/examples/ReaderSample/ReaderSampleViewController.xib b/iphone/examples/ReaderSample/ReaderSampleViewController.xib
-new file mode 100644
---- /dev/null
-+++ b/iphone/examples/ReaderSample/ReaderSampleViewController.xib
-@@ -0,0 +1,521 @@
++
++@end
+diff -r 563557a923d0 iphone/examples/TabReader/TabReader/en.lproj/InfoPlist.strings
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/examples/TabReader/TabReader/en.lproj/InfoPlist.strings	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,2 @@
++/* Localized versions of Info.plist keys */
++
+diff -r 563557a923d0 iphone/examples/TabReader/TabReader/en.lproj/MainWindow.xib
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/examples/TabReader/TabReader/en.lproj/MainWindow.xib	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,411 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
++	<data>
++		<int key="IBDocument.SystemTarget">1024</int>
++		<string key="IBDocument.SystemVersion">10J869</string>
++		<string key="IBDocument.InterfaceBuilderVersion">1306</string>
++		<string key="IBDocument.AppKitVersion">1038.35</string>
++		<string key="IBDocument.HIToolboxVersion">461.00</string>
++		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
++			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
++			<string key="NS.object.0">301</string>
++		</object>
++		<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
++			<bool key="EncodedWithXMLCoder">YES</bool>
++			<string>IBProxyObject</string>
++			<string>IBUITabBarItem</string>
++			<string>IBUIViewController</string>
++			<string>IBUICustomObject</string>
++			<string>IBUITabBarController</string>
++			<string>IBUIWindow</string>
++			<string>IBUITabBar</string>
++		</object>
++		<object class="NSArray" key="IBDocument.PluginDependencies">
++			<bool key="EncodedWithXMLCoder">YES</bool>
++			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
++		</object>
++		<object class="NSMutableDictionary" key="IBDocument.Metadata">
++			<bool key="EncodedWithXMLCoder">YES</bool>
++			<object class="NSArray" key="dict.sortedKeys" id="0">
++				<bool key="EncodedWithXMLCoder">YES</bool>
++			</object>
++			<reference key="dict.values" ref="0"/>
++		</object>
++		<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
++			<bool key="EncodedWithXMLCoder">YES</bool>
++			<object class="IBProxyObject" id="841351856">
++				<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
++				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
++			</object>
++			<object class="IBProxyObject" id="532797962">
++				<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
++				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
++			</object>
++			<object class="IBUICustomObject" id="664661524">
++				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
++			</object>
++			<object class="IBUIWindow" id="380026005">
++				<reference key="NSNextResponder"/>
++				<int key="NSvFlags">1316</int>
++				<object class="NSPSMatrix" key="NSFrameMatrix"/>
++				<string key="NSFrameSize">{320, 480}</string>
++				<reference key="NSSuperview"/>
++				<reference key="NSWindow"/>
++				<object class="NSColor" key="IBUIBackgroundColor">
++					<int key="NSColorSpace">1</int>
++					<bytes key="NSRGB">MSAxIDEAA</bytes>
++				</object>
++				<bool key="IBUIOpaque">NO</bool>
++				<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
++				<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
++				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
++				<bool key="IBUIResizesToFullScreen">YES</bool>
++			</object>
++			<object class="IBUITabBarController" id="1034742383">
++				<object class="IBUISimulatedTabBarMetrics" key="IBUISimulatedBottomBarMetrics"/>
++				<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
++				<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
++					<int key="IBUIInterfaceOrientation">1</int>
++					<int key="interfaceOrientation">1</int>
++				</object>
++				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
++				<bool key="IBUIHorizontal">NO</bool>
++				<object class="IBUIViewController" key="IBUISelectedViewController" id="538989659">
++					<object class="IBUITabBarItem" key="IBUITabBarItem" id="896756232">
++						<string key="IBUITitle">Scan</string>
++						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
++						<reference key="IBUITabBar" ref="795333663"/>
++					</object>
++					<reference key="IBUIParentViewController" ref="1034742383"/>
++					<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
++					<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
++						<int key="IBUIInterfaceOrientation">1</int>
++						<int key="interfaceOrientation">1</int>
++					</object>
++					<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
++					<bool key="IBUIHorizontal">NO</bool>
++				</object>
++				<object class="NSMutableArray" key="IBUIViewControllers">
++					<bool key="EncodedWithXMLCoder">YES</bool>
++					<reference ref="538989659"/>
++					<object class="IBUIViewController" id="268481961">
++						<object class="IBUITabBarItem" key="IBUITabBarItem" id="807309489">
++							<string key="IBUITitle">Results</string>
++							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
++							<reference key="IBUITabBar" ref="795333663"/>
++						</object>
++						<reference key="IBUIParentViewController" ref="1034742383"/>
++						<string key="IBUINibName">ResultsView</string>
++						<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
++							<int key="IBUIInterfaceOrientation">1</int>
++							<int key="interfaceOrientation">1</int>
++						</object>
++						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
++						<bool key="IBUIHorizontal">NO</bool>
++					</object>
++				</object>
++				<object class="IBUITabBar" key="IBUITabBar" id="795333663">
++					<reference key="NSNextResponder"/>
++					<int key="NSvFlags">266</int>
++					<string key="NSFrame">{{0, 431}, {320, 49}}</string>
++					<reference key="NSSuperview"/>
++					<reference key="NSWindow"/>
++					<object class="NSColor" key="IBUIBackgroundColor">
++						<int key="NSColorSpace">3</int>
++						<bytes key="NSWhite">MCAwAA</bytes>
++					</object>
++					<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
++					<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
++					<object class="NSMutableArray" key="IBUIItems">
++						<bool key="EncodedWithXMLCoder">YES</bool>
++						<reference ref="896756232"/>
++						<reference ref="807309489"/>
++					</object>
++					<reference key="IBUISelectedItem" ref="896756232"/>
++				</object>
++			</object>
++		</object>
++		<object class="IBObjectContainer" key="IBDocument.Objects">
++			<object class="NSMutableArray" key="connectionRecords">
++				<bool key="EncodedWithXMLCoder">YES</bool>
++				<object class="IBConnectionRecord">
++					<object class="IBCocoaTouchOutletConnection" key="connection">
++						<string key="label">window</string>
++						<reference key="source" ref="664661524"/>
++						<reference key="destination" ref="380026005"/>
++					</object>
++					<int key="connectionID">9</int>
++				</object>
++				<object class="IBConnectionRecord">
++					<object class="IBCocoaTouchOutletConnection" key="connection">
++						<string key="label">delegate</string>
++						<reference key="source" ref="841351856"/>
++						<reference key="destination" ref="664661524"/>
++					</object>
++					<int key="connectionID">99</int>
++				</object>
++				<object class="IBConnectionRecord">
++					<object class="IBCocoaTouchOutletConnection" key="connection">
++						<string key="label">tabBarController</string>
++						<reference key="source" ref="664661524"/>
++						<reference key="destination" ref="1034742383"/>
++					</object>
++					<int key="connectionID">113</int>
++				</object>
++				<object class="IBConnectionRecord">
++					<object class="IBCocoaTouchOutletConnection" key="connection">
++						<string key="label">delegate</string>
++						<reference key="source" ref="1034742383"/>
++						<reference key="destination" ref="664661524"/>
++					</object>
++					<int key="connectionID">127</int>
++				</object>
++			</object>
++			<object class="IBMutableOrderedSet" key="objectRecords">
++				<object class="NSArray" key="orderedObjects">
++					<bool key="EncodedWithXMLCoder">YES</bool>
++					<object class="IBObjectRecord">
++						<int key="objectID">0</int>
++						<reference key="object" ref="0"/>
++						<reference key="children" ref="1000"/>
++						<nil key="parent"/>
++					</object>
++					<object class="IBObjectRecord">
++						<int key="objectID">2</int>
++						<reference key="object" ref="380026005"/>
++						<object class="NSMutableArray" key="children">
++							<bool key="EncodedWithXMLCoder">YES</bool>
++						</object>
++						<reference key="parent" ref="0"/>
++					</object>
++					<object class="IBObjectRecord">
++						<int key="objectID">-1</int>
++						<reference key="object" ref="841351856"/>
++						<reference key="parent" ref="0"/>
++						<string key="objectName">File's Owner</string>
++					</object>
++					<object class="IBObjectRecord">
++						<int key="objectID">3</int>
++						<reference key="object" ref="664661524"/>
++						<reference key="parent" ref="0"/>
++					</object>
++					<object class="IBObjectRecord">
++						<int key="objectID">106</int>
++						<reference key="object" ref="1034742383"/>
++						<object class="NSMutableArray" key="children">
++							<bool key="EncodedWithXMLCoder">YES</bool>
++							<reference ref="795333663"/>
++							<reference ref="538989659"/>
++							<reference ref="268481961"/>
++						</object>
++						<reference key="parent" ref="0"/>
++					</object>
++					<object class="IBObjectRecord">
++						<int key="objectID">107</int>
++						<reference key="object" ref="795333663"/>
++						<reference key="parent" ref="1034742383"/>
++					</object>
++					<object class="IBObjectRecord">
++						<int key="objectID">-2</int>
++						<reference key="object" ref="532797962"/>
++						<reference key="parent" ref="0"/>
++					</object>
++					<object class="IBObjectRecord">
++						<int key="objectID">125</int>
++						<reference key="object" ref="538989659"/>
++						<object class="NSMutableArray" key="children">
++							<bool key="EncodedWithXMLCoder">YES</bool>
++							<reference ref="896756232"/>
++						</object>
++						<reference key="parent" ref="1034742383"/>
++						<string key="objectName">Barcode Reader Controller</string>
++					</object>
++					<object class="IBObjectRecord">
++						<int key="objectID">126</int>
++						<reference key="object" ref="896756232"/>
++						<reference key="parent" ref="538989659"/>
++					</object>
++					<object class="IBObjectRecord">
++						<int key="objectID">109</int>
++						<reference key="object" ref="268481961"/>
++						<object class="NSMutableArray" key="children">
++							<bool key="EncodedWithXMLCoder">YES</bool>
++							<reference ref="807309489"/>
++						</object>
++						<reference key="parent" ref="1034742383"/>
++						<string key="objectName">Barcode Results Controller</string>
++					</object>
++					<object class="IBObjectRecord">
++						<int key="objectID">110</int>
++						<reference key="object" ref="807309489"/>
++						<reference key="parent" ref="268481961"/>
++					</object>
++				</object>
++			</object>
++			<object class="NSMutableDictionary" key="flattenedProperties">
++				<bool key="EncodedWithXMLCoder">YES</bool>
++				<object class="NSArray" key="dict.sortedKeys">
++					<bool key="EncodedWithXMLCoder">YES</bool>
++					<string>-1.CustomClassName</string>
++					<string>-2.CustomClassName</string>
++					<string>106.IBEditorWindowLastContentRect</string>
++					<string>106.IBPluginDependency</string>
++					<string>107.IBPluginDependency</string>
++					<string>109.CustomClassName</string>
++					<string>109.IBPluginDependency</string>
++					<string>110.IBPluginDependency</string>
++					<string>125.CustomClassName</string>
++					<string>125.IBPluginDependency</string>
++					<string>126.IBPluginDependency</string>
++					<string>2.IBAttributePlaceholdersKey</string>
++					<string>2.IBEditorWindowLastContentRect</string>
++					<string>2.IBPluginDependency</string>
++					<string>3.CustomClassName</string>
++					<string>3.IBPluginDependency</string>
++				</object>
++				<object class="NSMutableArray" key="dict.values">
++					<bool key="EncodedWithXMLCoder">YES</bool>
++					<string>UIApplication</string>
++					<string>UIResponder</string>
++					<string>{{1323, 676}, {320, 480}}</string>
++					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
++					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
++					<string>ResultsViewController</string>
++					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
++					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
++					<string>ZBarReaderViewController</string>
++					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
++					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
++					<object class="NSMutableDictionary">
++						<bool key="EncodedWithXMLCoder">YES</bool>
++						<reference key="dict.sortedKeys" ref="0"/>
++						<reference key="dict.values" ref="0"/>
++					</object>
++					<string>{{229, 373}, {320, 480}}</string>
++					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
++					<string>TabReaderAppDelegate</string>
++					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
++				</object>
++			</object>
++			<object class="NSMutableDictionary" key="unlocalizedProperties">
++				<bool key="EncodedWithXMLCoder">YES</bool>
++				<reference key="dict.sortedKeys" ref="0"/>
++				<reference key="dict.values" ref="0"/>
++			</object>
++			<nil key="activeLocalization"/>
++			<object class="NSMutableDictionary" key="localizations">
++				<bool key="EncodedWithXMLCoder">YES</bool>
++				<reference key="dict.sortedKeys" ref="0"/>
++				<reference key="dict.values" ref="0"/>
++			</object>
++			<nil key="sourceID"/>
++			<int key="maxID">127</int>
++		</object>
++		<object class="IBClassDescriber" key="IBDocument.Classes">
++			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
++				<bool key="EncodedWithXMLCoder">YES</bool>
++				<object class="IBPartialClassDescription">
++					<string key="className">ResultsViewController</string>
++					<string key="superclassName">UIViewController</string>
++					<object class="NSMutableDictionary" key="outlets">
++						<bool key="EncodedWithXMLCoder">YES</bool>
++						<object class="NSArray" key="dict.sortedKeys">
++							<bool key="EncodedWithXMLCoder">YES</bool>
++							<string>resultImage</string>
++							<string>resultText</string>
++						</object>
++						<object class="NSMutableArray" key="dict.values">
++							<bool key="EncodedWithXMLCoder">YES</bool>
++							<string>UIImageView</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>resultImage</string>
++							<string>resultText</string>
++						</object>
++						<object class="NSMutableArray" key="dict.values">
++							<bool key="EncodedWithXMLCoder">YES</bool>
++							<object class="IBToOneOutletInfo">
++								<string key="name">resultImage</string>
++								<string key="candidateClassName">UIImageView</string>
++							</object>
++							<object class="IBToOneOutletInfo">
++								<string key="name">resultText</string>
++								<string key="candidateClassName">UITextView</string>
++							</object>
++						</object>
++					</object>
++					<object class="IBClassDescriptionSource" key="sourceIdentifier">
++						<string key="majorKey">IBProjectSource</string>
++						<string key="minorKey">./Classes/ResultsViewController.h</string>
++					</object>
++				</object>
++				<object class="IBPartialClassDescription">
++					<string key="className">TabReaderAppDelegate</string>
++					<string key="superclassName">NSObject</string>
++					<object class="NSMutableDictionary" key="outlets">
++						<bool key="EncodedWithXMLCoder">YES</bool>
++						<object class="NSArray" key="dict.sortedKeys">
++							<bool key="EncodedWithXMLCoder">YES</bool>
++							<string>tabBarController</string>
++							<string>window</string>
++						</object>
++						<object class="NSMutableArray" key="dict.values">
++							<bool key="EncodedWithXMLCoder">YES</bool>
++							<string>UITabBarController</string>
++							<string>UIWindow</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>tabBarController</string>
++							<string>window</string>
++						</object>
++						<object class="NSMutableArray" key="dict.values">
++							<bool key="EncodedWithXMLCoder">YES</bool>
++							<object class="IBToOneOutletInfo">
++								<string key="name">tabBarController</string>
++								<string key="candidateClassName">UITabBarController</string>
++							</object>
++							<object class="IBToOneOutletInfo">
++								<string key="name">window</string>
++								<string key="candidateClassName">UIWindow</string>
++							</object>
++						</object>
++					</object>
++					<object class="IBClassDescriptionSource" key="sourceIdentifier">
++						<string key="majorKey">IBProjectSource</string>
++						<string key="minorKey">./Classes/TabReaderAppDelegate.h</string>
++					</object>
++				</object>
++				<object class="IBPartialClassDescription">
++					<string key="className">ZBarReaderViewController</string>
++					<string key="superclassName">UIViewController</string>
++					<object class="IBClassDescriptionSource" key="sourceIdentifier">
++						<string key="majorKey">IBProjectSource</string>
++						<string key="minorKey">./Classes/ZBarReaderViewController.h</string>
++					</object>
++				</object>
++			</object>
++		</object>
++		<int key="IBDocument.localizationMode">0</int>
++		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
++		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
++			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
++			<integer value="1024" key="NS.object.0"/>
++		</object>
++		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
++			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
++			<integer value="3100" key="NS.object.0"/>
++		</object>
++		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
++		<int key="IBDocument.defaultPropertyAccessControl">3</int>
++		<string key="IBCocoaTouchPluginVersion">301</string>
++	</data>
++</archive>
+diff -r 563557a923d0 iphone/examples/TabReader/TabReader/en.lproj/ResultsView.xib
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/examples/TabReader/TabReader/en.lproj/ResultsView.xib	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,303 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
 +	<data>
 +		<int key="IBDocument.SystemTarget">1024</int>
-+		<string key="IBDocument.SystemVersion">10F569</string>
-+		<string key="IBDocument.InterfaceBuilderVersion">788</string>
-+		<string key="IBDocument.AppKitVersion">1038.29</string>
++		<string key="IBDocument.SystemVersion">10J869</string>
++		<string key="IBDocument.InterfaceBuilderVersion">1306</string>
++		<string key="IBDocument.AppKitVersion">1038.35</string>
 +		<string key="IBDocument.HIToolboxVersion">461.00</string>
 +		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 +			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-+			<string key="NS.object.0">117</string>
++			<string key="NS.object.0">301</string>
 +		</object>
-+		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
++		<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
 +			<bool key="EncodedWithXMLCoder">YES</bool>
-+			<integer value="6"/>
++			<string>IBUITextView</string>
++			<string>IBUIImageView</string>
++			<string>IBUIView</string>
++			<string>IBUILabel</string>
++			<string>IBProxyObject</string>
 +		</object>
 +		<object class="NSArray" key="IBDocument.PluginDependencies">
 +			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -12169,9 +15606,7 @@ new file mode 100644
 +			<object class="NSArray" key="dict.sortedKeys" id="0">
 +				<bool key="EncodedWithXMLCoder">YES</bool>
 +			</object>
-+			<object class="NSMutableArray" key="dict.values">
-+				<bool key="EncodedWithXMLCoder">YES</bool>
-+			</object>
++			<reference key="dict.values" ref="0"/>
 +		</object>
 +		<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
 +			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -12179,85 +15614,92 @@ new file mode 100644
 +				<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
 +				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 +			</object>
-+			<object class="IBProxyObject" id="843779117">
++			<object class="IBProxyObject" id="263589821">
 +				<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
 +				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 +			</object>
-+			<object class="IBUIView" id="774585933">
++			<object class="IBUIView" id="191373211">
 +				<reference key="NSNextResponder"/>
 +				<int key="NSvFlags">274</int>
 +				<object class="NSMutableArray" key="NSSubviews">
 +					<bool key="EncodedWithXMLCoder">YES</bool>
-+					<object class="IBUIButton" id="651640269">
-+						<reference key="NSNextResponder" ref="774585933"/>
-+						<int key="NSvFlags">292</int>
-+						<string key="NSFrame">{{20, 392}, {280, 48}}</string>
-+						<reference key="NSSuperview" ref="774585933"/>
++					<object class="IBUILabel" id="483052203">
++						<reference key="NSNextResponder" ref="191373211"/>
++						<int key="NSvFlags">306</int>
++						<string key="NSFrame">{{20, 20}, {280, 28}}</string>
++						<reference key="NSSuperview" ref="191373211"/>
++						<reference key="NSWindow"/>
++						<reference key="NSNextKeyView" ref="255779567"/>
++						<object class="NSColor" key="IBUIBackgroundColor">
++							<int key="NSColorSpace">3</int>
++							<bytes key="NSWhite">MQA</bytes>
++							<object class="NSColorSpace" key="NSCustomColorSpace">
++								<int key="NSID">2</int>
++							</object>
++						</object>
 +						<bool key="IBUIOpaque">NO</bool>
++						<bool key="IBUIClipsSubviews">YES</bool>
++						<bool key="IBUIUserInteractionEnabled">NO</bool>
 +						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-+						<int key="IBUIContentHorizontalAlignment">0</int>
-+						<int key="IBUIContentVerticalAlignment">0</int>
++						<string key="IBUIText">Results Tab</string>
 +						<object class="NSFont" key="IBUIFont">
-+							<string key="NSName">Helvetica-Bold</string>
-+							<double key="NSSize">18</double>
++							<string key="NSName">Helvetica</string>
++							<double key="NSSize">24</double>
 +							<int key="NSfFlags">16</int>
 +						</object>
-+						<int key="IBUIButtonType">1</int>
-+						<string key="IBUINormalTitle">Scan</string>
-+						<object class="NSColor" key="IBUIHighlightedTitleColor">
-+							<int key="NSColorSpace">3</int>
-+							<bytes key="NSWhite">MQA</bytes>
-+						</object>
-+						<object class="NSColor" key="IBUINormalTitleColor">
++						<object class="NSColor" key="IBUITextColor">
 +							<int key="NSColorSpace">1</int>
-+							<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
-+						</object>
-+						<object class="NSColor" key="IBUINormalTitleShadowColor">
-+							<int key="NSColorSpace">3</int>
-+							<bytes key="NSWhite">MC41AA</bytes>
++							<bytes key="NSRGB">MCAwIDAAA</bytes>
 +						</object>
++						<nil key="IBUIHighlightedColor"/>
++						<int key="IBUIBaselineAdjustment">1</int>
++						<float key="IBUIMinimumFontSize">10</float>
++						<int key="IBUITextAlignment">1</int>
 +					</object>
-+					<object class="IBUIImageView" id="122884923">
-+						<reference key="NSNextResponder" ref="774585933"/>
-+						<int key="NSvFlags">292</int>
-+						<string key="NSFrame">{{20, 20}, {280, 210}}</string>
-+						<reference key="NSSuperview" ref="774585933"/>
-+						<int key="IBUIContentMode">1</int>
-+						<bool key="IBUIUserInteractionEnabled">NO</bool>
-+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-+					</object>
-+					<object class="IBUITextView" id="854633925">
-+						<reference key="NSNextResponder" ref="774585933"/>
-+						<int key="NSvFlags">292</int>
-+						<string key="NSFrame">{{20, 238}, {280, 146}}</string>
-+						<reference key="NSSuperview" ref="774585933"/>
-+						<object class="NSColor" key="IBUIBackgroundColor">
-+							<int key="NSColorSpace">3</int>
-+							<bytes key="NSWhite">MCAwAA</bytes>
-+						</object>
++					<object class="IBUITextView" id="255779567">
++						<reference key="NSNextResponder" ref="191373211"/>
++						<int key="NSvFlags">282</int>
++						<string key="NSFrame">{{20, 274}, {280, 117}}</string>
++						<reference key="NSSuperview" ref="191373211"/>
++						<reference key="NSWindow"/>
 +						<bool key="IBUIOpaque">NO</bool>
 +						<bool key="IBUIClipsSubviews">YES</bool>
 +						<bool key="IBUIMultipleTouchEnabled">YES</bool>
++						<bool key="IBUIUserInteractionEnabled">NO</bool>
 +						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
++						<bool key="IBUIShowsHorizontalScrollIndicator">NO</bool>
++						<bool key="IBUIDelaysContentTouches">NO</bool>
++						<bool key="IBUICanCancelContentTouches">NO</bool>
++						<float key="IBUIMinimumZoomScale">0.0</float>
++						<float key="IBUIMaximumZoomScale">0.0</float>
++						<bool key="IBUIBouncesZoom">NO</bool>
 +						<bool key="IBUIEditable">NO</bool>
-+						<string key="IBUIText">No barcode scanned</string>
++						<string key="IBUIText">No barcode scanned.</string>
 +						<object class="IBUITextInputTraits" key="IBUITextInputTraits">
-+							<int key="IBUIAutocapitalizationType">2</int>
 +							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 +						</object>
 +					</object>
++					<object class="IBUIImageView" id="809997790">
++						<reference key="NSNextResponder" ref="191373211"/>
++						<int key="NSvFlags">306</int>
++						<string key="NSFrame">{{20, 56}, {280, 210}}</string>
++						<reference key="NSSuperview" ref="191373211"/>
++						<reference key="NSWindow"/>
++						<int key="IBUIContentMode">1</int>
++						<bool key="IBUIUserInteractionEnabled">NO</bool>
++						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
++					</object>
 +				</object>
-+				<string key="NSFrameSize">{320, 460}</string>
++				<string key="NSFrame">{{0, 20}, {320, 411}}</string>
 +				<reference key="NSSuperview"/>
++				<reference key="NSWindow"/>
++				<reference key="NSNextKeyView" ref="483052203"/>
 +				<object class="NSColor" key="IBUIBackgroundColor">
 +					<int key="NSColorSpace">3</int>
-+					<bytes key="NSWhite">MC43NQA</bytes>
-+					<object class="NSColorSpace" key="NSCustomColorSpace">
-+						<int key="NSID">2</int>
-+					</object>
++					<bytes key="NSWhite">MQA</bytes>
 +				</object>
-+				<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 +				<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
++				<object class="IBUISimulatedTabBarMetrics" key="IBUISimulatedBottomBarMetrics"/>
 +				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 +			</object>
 +		</object>
@@ -12268,34 +15710,25 @@ new file mode 100644
 +					<object class="IBCocoaTouchOutletConnection" key="connection">
 +						<string key="label">view</string>
 +						<reference key="source" ref="372490531"/>
-+						<reference key="destination" ref="774585933"/>
++						<reference key="destination" ref="191373211"/>
 +					</object>
-+					<int key="connectionID">7</int>
++					<int key="connectionID">3</int>
 +				</object>
 +				<object class="IBConnectionRecord">
 +					<object class="IBCocoaTouchOutletConnection" key="connection">
 +						<string key="label">resultImage</string>
 +						<reference key="source" ref="372490531"/>
-+						<reference key="destination" ref="122884923"/>
++						<reference key="destination" ref="809997790"/>
 +					</object>
-+					<int key="connectionID">11</int>
++					<int key="connectionID">9</int>
 +				</object>
 +				<object class="IBConnectionRecord">
 +					<object class="IBCocoaTouchOutletConnection" key="connection">
 +						<string key="label">resultText</string>
 +						<reference key="source" ref="372490531"/>
-+						<reference key="destination" ref="854633925"/>
-+					</object>
-+					<int key="connectionID">12</int>
-+				</object>
-+				<object class="IBConnectionRecord">
-+					<object class="IBCocoaTouchEventConnection" key="connection">
-+						<string key="label">scanButtonTapped</string>
-+						<reference key="source" ref="651640269"/>
-+						<reference key="destination" ref="372490531"/>
-+						<int key="IBEventType">7</int>
++						<reference key="destination" ref="255779567"/>
 +					</object>
-+					<int key="connectionID">13</int>
++					<int key="connectionID">10</int>
 +				</object>
 +			</object>
 +			<object class="IBMutableOrderedSet" key="objectRecords">
@@ -12308,6 +15741,17 @@ new file mode 100644
 +						<nil key="parent"/>
 +					</object>
 +					<object class="IBObjectRecord">
++						<int key="objectID">1</int>
++						<reference key="object" ref="191373211"/>
++						<object class="NSMutableArray" key="children">
++							<bool key="EncodedWithXMLCoder">YES</bool>
++							<reference ref="255779567"/>
++							<reference ref="483052203"/>
++							<reference ref="809997790"/>
++						</object>
++						<reference key="parent" ref="0"/>
++					</object>
++					<object class="IBObjectRecord">
 +						<int key="objectID">-1</int>
 +						<reference key="object" ref="372490531"/>
 +						<reference key="parent" ref="0"/>
@@ -12315,34 +15759,23 @@ new file mode 100644
 +					</object>
 +					<object class="IBObjectRecord">
 +						<int key="objectID">-2</int>
-+						<reference key="object" ref="843779117"/>
-+						<reference key="parent" ref="0"/>
-+					</object>
-+					<object class="IBObjectRecord">
-+						<int key="objectID">6</int>
-+						<reference key="object" ref="774585933"/>
-+						<object class="NSMutableArray" key="children">
-+							<bool key="EncodedWithXMLCoder">YES</bool>
-+							<reference ref="651640269"/>
-+							<reference ref="122884923"/>
-+							<reference ref="854633925"/>
-+						</object>
++						<reference key="object" ref="263589821"/>
 +						<reference key="parent" ref="0"/>
 +					</object>
 +					<object class="IBObjectRecord">
-+						<int key="objectID">8</int>
-+						<reference key="object" ref="651640269"/>
-+						<reference key="parent" ref="774585933"/>
++						<int key="objectID">5</int>
++						<reference key="object" ref="483052203"/>
++						<reference key="parent" ref="191373211"/>
 +					</object>
 +					<object class="IBObjectRecord">
-+						<int key="objectID">9</int>
-+						<reference key="object" ref="122884923"/>
-+						<reference key="parent" ref="774585933"/>
++						<int key="objectID">7</int>
++						<reference key="object" ref="255779567"/>
++						<reference key="parent" ref="191373211"/>
 +					</object>
 +					<object class="IBObjectRecord">
-+						<int key="objectID">10</int>
-+						<reference key="object" ref="854633925"/>
-+						<reference key="parent" ref="774585933"/>
++						<int key="objectID">8</int>
++						<reference key="object" ref="809997790"/>
++						<reference key="parent" ref="191373211"/>
 +					</object>
 +				</object>
 +			</object>
@@ -12352,58 +15785,47 @@ new file mode 100644
 +					<bool key="EncodedWithXMLCoder">YES</bool>
 +					<string>-1.CustomClassName</string>
 +					<string>-2.CustomClassName</string>
-+					<string>10.IBPluginDependency</string>
-+					<string>6.IBEditorWindowLastContentRect</string>
-+					<string>6.IBPluginDependency</string>
++					<string>1.IBEditorWindowLastContentRect</string>
++					<string>1.IBPluginDependency</string>
++					<string>5.IBPluginDependency</string>
++					<string>7.IBPluginDependency</string>
++					<string>7.IBViewBoundsToFrameTransform</string>
 +					<string>8.IBPluginDependency</string>
-+					<string>9.IBPluginDependency</string>
 +				</object>
 +				<object class="NSMutableArray" key="dict.values">
 +					<bool key="EncodedWithXMLCoder">YES</bool>
-+					<string>ReaderSampleViewController</string>
++					<string>ResultsViewController</string>
 +					<string>UIResponder</string>
++					<string>{{187, 376}, {320, 480}}</string>
 +					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-+					<string>{{239, 276}, {320, 480}}</string>
 +					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 +					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
++					<object class="NSAffineTransform">
++						<bytes key="NSTransformStruct">P4AAAL+AAABA4AAAw7GAAA</bytes>
++					</object>
 +					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 +				</object>
 +			</object>
 +			<object class="NSMutableDictionary" key="unlocalizedProperties">
 +				<bool key="EncodedWithXMLCoder">YES</bool>
 +				<reference key="dict.sortedKeys" ref="0"/>
-+				<object class="NSMutableArray" key="dict.values">
-+					<bool key="EncodedWithXMLCoder">YES</bool>
-+				</object>
++				<reference key="dict.values" ref="0"/>
 +			</object>
 +			<nil key="activeLocalization"/>
 +			<object class="NSMutableDictionary" key="localizations">
 +				<bool key="EncodedWithXMLCoder">YES</bool>
 +				<reference key="dict.sortedKeys" ref="0"/>
-+				<object class="NSMutableArray" key="dict.values">
-+					<bool key="EncodedWithXMLCoder">YES</bool>
-+				</object>
++				<reference key="dict.values" ref="0"/>
 +			</object>
 +			<nil key="sourceID"/>
-+			<int key="maxID">13</int>
++			<int key="maxID">10</int>
 +		</object>
 +		<object class="IBClassDescriber" key="IBDocument.Classes">
 +			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
 +				<bool key="EncodedWithXMLCoder">YES</bool>
 +				<object class="IBPartialClassDescription">
-+					<string key="className">ReaderSampleViewController</string>
++					<string key="className">ResultsViewController</string>
 +					<string key="superclassName">UIViewController</string>
-+					<object class="NSMutableDictionary" key="actions">
-+						<string key="NS.key.0">scanButtonTapped</string>
-+						<string key="NS.object.0">id</string>
-+					</object>
-+					<object class="NSMutableDictionary" key="actionInfosByName">
-+						<string key="NS.key.0">scanButtonTapped</string>
-+						<object class="IBActionInfo" key="NS.object.0">
-+							<string key="name">scanButtonTapped</string>
-+							<string key="candidateClassName">id</string>
-+						</object>
-+					</object>
 +					<object class="NSMutableDictionary" key="outlets">
 +						<bool key="EncodedWithXMLCoder">YES</bool>
 +						<object class="NSArray" key="dict.sortedKeys">
@@ -12438,213 +15860,7 @@ new file mode 100644
 +					</object>
 +					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 +						<string key="majorKey">IBProjectSource</string>
-+						<string key="minorKey">Classes/ReaderSampleViewController.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="1005214018">
-+						<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">UIImageView</string>
-+					<string key="superclassName">UIView</string>
-+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-+						<string key="majorKey">IBFrameworkSource</string>
-+						<string key="minorKey">UIKit.framework/Headers/UIImageView.h</string>
-+					</object>
-+				</object>
-+				<object class="IBPartialClassDescription">
-+					<string key="className">UIResponder</string>
-+					<string key="superclassName">NSObject</string>
-+					<reference key="sourceIdentifier" ref="1005214018"/>
-+				</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/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>
++						<string key="minorKey">./Classes/ResultsViewController.h</string>
 +					</object>
 +				</object>
 +			</object>
@@ -12660,79 +15876,59 @@ new file mode 100644
 +			<integer value="3100" key="NS.object.0"/>
 +		</object>
 +		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-+		<string key="IBDocument.LastKnownRelativeProjectPath">ReaderSample.xcodeproj</string>
 +		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-+		<string key="IBCocoaTouchPluginVersion">117</string>
++		<string key="IBCocoaTouchPluginVersion">301</string>
 +	</data>
 +</archive>
-diff --git a/iphone/examples/ReaderSample/ReaderSample_Prefix.pch b/iphone/examples/ReaderSample/ReaderSample_Prefix.pch
-new file mode 100644
---- /dev/null
-+++ b/iphone/examples/ReaderSample/ReaderSample_Prefix.pch
-@@ -0,0 +1,11 @@
-+//
-+// Prefix header for all source files of the 'ReaderSample' target in the 'ReaderSample' project
-+//
-+
-+#ifdef __OBJC__
-+# import <Foundation/Foundation.h>
-+# import <UIKit/UIKit.h>
-+
-+// ADD: barcode reader APIs
-+# import "ZBarSDK.h"
-+#endif
-diff --git a/iphone/examples/ReaderSample/ZBarSDK b/iphone/examples/ReaderSample/ZBarSDK
-new file mode 120000
---- /dev/null
-+++ b/iphone/examples/ReaderSample/ZBarSDK
-@@ -0,0 +1,1 @@
-+../../build/Release-iphoneos/ZBarSDK
-\ No newline at end of file
-diff --git a/iphone/examples/ReaderSample/build b/iphone/examples/ReaderSample/build
-new file mode 120000
---- /dev/null
-+++ b/iphone/examples/ReaderSample/build
-@@ -0,0 +1,1 @@
-+/tmp/ReaderSample.build
-\ No newline at end of file
-diff --git a/iphone/examples/ReaderSample/main.m b/iphone/examples/ReaderSample/main.m
-new file mode 100644
---- /dev/null
-+++ b/iphone/examples/ReaderSample/main.m
-@@ -0,0 +1,15 @@
+diff -r 563557a923d0 iphone/examples/TabReader/TabReader/main.m
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/examples/TabReader/TabReader/main.m	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,16 @@
 +//
 +//  main.m
-+//  ReaderSample
++//  TabReader
 +//
-+//  Created by spadix on 8/4/10.
++//  Created by spadix on 5/3/11.
 +//
 +
 +#import <UIKit/UIKit.h>
 +
-+int main(int argc, char *argv[]) {
-+    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
++int main(int argc, char *argv[])
++{
++    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 +    int retVal = UIApplicationMain(argc, argv, nil, nil);
 +    [pool release];
 +    return retVal;
 +}
-diff --git a/iphone/examples/readertest/ZBarSDK b/iphone/examples/readertest/ZBarSDK
-new file mode 120000
---- /dev/null
-+++ b/iphone/examples/readertest/ZBarSDK
+diff -r 563557a923d0 iphone/examples/TabReader/ZBarSDK
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/examples/TabReader/ZBarSDK	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,1 @@
++../../build/Debug-iphoneos/ZBarSDK
+\ No newline at end of file
+diff -r 563557a923d0 iphone/examples/TabReader/build
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/examples/TabReader/build	Fri Feb 22 08:54:29 2013 -0300
 @@ -0,0 +1,1 @@
-+../../build/Release-iphoneos/ZBarSDK
++/tmp/TabReader.build
 \ No newline at end of file
-diff --git a/iphone/examples/readertest/build b/iphone/examples/readertest/build
-new file mode 120000
---- /dev/null
-+++ b/iphone/examples/readertest/build
+diff -r 563557a923d0 iphone/examples/readertest/Default-568h@2x.png
+Binary file iphone/examples/readertest/Default-568h@2x.png has changed
+diff -r 563557a923d0 iphone/examples/readertest/ZBarSDK
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/examples/readertest/ZBarSDK	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,1 @@
++../../build/Debug-iphoneos/ZBarSDK
+\ No newline at end of file
+diff -r 563557a923d0 iphone/examples/readertest/build
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/examples/readertest/build	Fri Feb 22 08:54:29 2013 -0300
 @@ -0,0 +1,1 @@
 +/tmp/readertest.build
 \ No newline at end of file
-diff --git a/iphone/examples/readertest/entitlements.plist b/iphone/examples/readertest/entitlements.plist
-new file mode 100644
---- /dev/null
-+++ b/iphone/examples/readertest/entitlements.plist
+diff -r 563557a923d0 iphone/examples/readertest/entitlements.plist
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/examples/readertest/entitlements.plist	Fri Feb 22 08:54:29 2013 -0300
 @@ -0,0 +1,8 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
@@ -12742,10 +15938,9 @@ new file mode 100644
 +	<false/>
 +</dict>
 +</plist>
-diff --git a/iphone/examples/readertest/prefix.pch b/iphone/examples/readertest/prefix.pch
-new file mode 100644
---- /dev/null
-+++ b/iphone/examples/readertest/prefix.pch
+diff -r 563557a923d0 iphone/examples/readertest/prefix.pch
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/examples/readertest/prefix.pch	Fri Feb 22 08:54:29 2013 -0300
 @@ -0,0 +1,11 @@
 +#ifdef __OBJC__
 +# import <Foundation/Foundation.h>
@@ -12758,19 +15953,17 @@ new file mode 100644
 +# import <CoreVideo/CoreVideo.h>
 +# import "ZBarSDK.h"
 +#endif
-diff --git a/iphone/examples/readertest/readertest.m b/iphone/examples/readertest/readertest.m
-new file mode 100644
---- /dev/null
-+++ b/iphone/examples/readertest/readertest.m
-@@ -0,0 +1,829 @@
-+#if 0
-+# define VALGRIND "/usr/local/bin/valgrind"
-+#endif
-+
+diff -r 563557a923d0 iphone/examples/readertest/readertest.m
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/examples/readertest/readertest.m	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,991 @@
 +enum {
 +    CLASS_SECTION = 0,
 +    SOURCE_SECTION,
 +    CAMODE_SECTION,
++    DEVICE_SECTION,
++    FLASH_SECTION,
++    QUALITY_SECTION,
 +    CONFIG_SECTION,
 +    CUSTOM_SECTION,
 +    SYMBOL_SECTION,
@@ -12782,6 +15975,9 @@ new file mode 100644
 +    @"Classes",
 +    @"SourceType",
 +    @"CameraMode",
++    @"CaptureDevice",
++    @"CameraFlashMode",
++    @"VideoQuality",
 +    @"Reader Configuration",
 +    nil,
 +    @"Enabled Symbologies",
@@ -12799,6 +15995,10 @@ new file mode 100644
 +    3, 2, 1, 0, 4, -1
 +};
 +
++static const CGFloat const zoom_choices[] = {
++    1, 10/9., 10/8., 8/6., 10/7., 9/6., 10/6., 7/4., 2, 0, -1
++};
++
 +@interface AppDelegate
 +    : UITableViewController
 +    < UIApplicationDelegate,
@@ -12811,7 +16011,11 @@ new file mode 100644
 +    UIWindow *window;
 +    UINavigationController *nav;
 +
++    NSSet *defaultSymbologies;
++    CGFloat zoom;
++
 +    NSMutableArray *sections, *symbolEnables;
++    NSInteger xDensity, yDensity;
 +
 +    BOOL found, paused, continuous;
 +    NSInteger dataHeight;
@@ -12832,18 +16036,49 @@ new file mode 100644
 +
 +- (id) init
 +{
-+    // force these classes to load
-+    [ZBarReaderViewController class];
-+    [ZBarReaderController class];
-+
 +    return([super initWithStyle: UITableViewStyleGrouped]);
 +}
 +
 +- (void) initReader: (NSString*) clsName
 +{
 +    [reader release];
-+    reader = [NSClassFromString(clsName) new];
++    Class cls = [[NSBundle mainBundle]
++                    classNamed: clsName];
++    assert(cls);
++    reader = [cls new];
++    assert(reader);
 +    reader.readerDelegate = self;
++    xDensity = yDensity = 3;
++
++#if 0
++    // apply defaults for demo
++    ZBarImageScanner *scanner = reader.scanner;
++    continuous = NO;
++    zoom = 1;
++    reader.showsZBarControls = NO;
++    reader.scanCrop = CGRectMake(0, .35, 1, .3);
++
++    [defaultSymbologies release];
++    defaultSymbologies =
++        [[NSSet alloc]
++            initWithObjects:
++                [NSNumber numberWithInteger: ZBAR_CODE128],
++                nil];
++    [scanner setSymbology: 0
++             config: ZBAR_CFG_ENABLE
++             to: 0];
++    for(NSNumber *sym in defaultSymbologies)
++        [scanner setSymbology: sym.integerValue
++                 config: ZBAR_CFG_ENABLE
++                 to: 1];
++
++    [scanner setSymbology: 0
++             config: ZBAR_CFG_X_DENSITY
++             to: (xDensity = 0)];
++    [scanner setSymbology: 0
++             config: ZBAR_CFG_Y_DENSITY
++             to: (yDensity = 1)];
++#endif
 +}
 +
 +- (void) initOverlay
@@ -12911,6 +16146,13 @@ new file mode 100644
 +                    target: self
 +                    action: @selector(manualCapture)];
 +
++
++    UIButton *info =
++        [UIButton buttonWithType: UIButtonTypeInfoLight];
++    [info addTarget: self
++          action: @selector(info)
++          forControlEvents: UIControlEventTouchUpInside];
++
 +    toolbar.items =
 +        [NSArray arrayWithObjects:
 +            [[[UIBarButtonItem alloc]
@@ -12940,18 +16182,34 @@ new file mode 100644
 +                 target: nil
 +                 action: nil]
 +                autorelease],
++            [[[UIBarButtonItem alloc]
++                 initWithCustomView: info]
++                autorelease],
 +            nil];
 +    [overlay addSubview: toolbar];
 +    [toolbar release];
++}
++
++- (void) updateCropMask
++{
++    CGRect r = reader.scanCrop;
++    r.origin.x *= 426;
++    r.origin.y *= 320;
++    r.size.width *= 426;
++    r.size.height *= 320;
++    UIView *mask = [masks objectAtIndex: 0];
++    mask.frame = CGRectMake(0, -426, 320, r.origin.x);
++    mask = [masks objectAtIndex: 1];
++    mask.frame = CGRectMake(0, r.origin.x - 426, r.origin.y, r.size.width);
 +
++    r.origin.y += r.size.height;
++    mask = [masks objectAtIndex: 2];
++    mask.frame = CGRectMake(r.origin.y, r.origin.x - 426,
++                            320 - r.origin.y, r.size.width);
 +
-+    UIButton *info =
-+        [UIButton buttonWithType: UIButtonTypeInfoLight];
-+    info.frame = CGRectMake(266, 0, 54, 54);
-+    [info addTarget: self
-+             action: @selector(info)
-+             forControlEvents: UIControlEventTouchUpInside];
-+    [overlay addSubview: info];
++    r.origin.x += r.size.width;
++    mask = [masks objectAtIndex: 3];
++    mask.frame = CGRectMake(0, r.origin.x - 426, 320, 426 - r.origin.x);
 +}
 +
 +- (void) setCheck: (BOOL) state
@@ -13034,6 +16292,45 @@ new file mode 100644
 +    [sections replaceObjectAtIndex: CAMODE_SECTION
 +              withObject: modes];
 +
++    static NSString *const deviceNames[] = {
++        @"Rear", @"Front", nil
++    };
++    NSMutableArray *devices = [NSMutableArray array];
++    for(int i = 0; deviceNames[i]; i++)
++        if([[reader class]
++               isCameraDeviceAvailable: i])
++            [devices addObject:
++                [self cellWithTitle: deviceNames[i]
++                      tag: i
++                      checked: (reader.cameraDevice == i)]];
++    assert(devices.count);
++    [sections replaceObjectAtIndex: DEVICE_SECTION
++              withObject: devices];
++
++    static NSString *const flashNames[] = {
++        @"Off", @"Auto", @"On", nil
++    };
++    NSMutableArray *flashModes = [NSMutableArray array];
++    for(int i = 0; flashNames[i]; i++)
++        [flashModes addObject:
++            [self cellWithTitle: flashNames[i]
++                  tag: i - 1
++                  checked: (reader.cameraFlashMode == i - 1)]];
++    [sections replaceObjectAtIndex: FLASH_SECTION
++              withObject: flashModes];
++
++    static NSString *const qualityNames[] = {
++        @"High", @"Medium", @"Low", @"640x480", nil
++    };
++    NSMutableArray *qualities = [NSMutableArray array];
++    for(int i = 0; qualityNames[i]; i++)
++        [qualities addObject:
++            [self cellWithTitle: qualityNames[i]
++                  tag: i
++                  checked: (reader.videoQuality == i)]];
++    [sections replaceObjectAtIndex: QUALITY_SECTION
++              withObject: qualities];
++
 +    static NSString* const configNames[] = {
 +        @"showsCameraControls", @"showsZBarControls", @"tracksSymbols",
 +        @"enableCache", @"showsHelpOnFail", @"takesPicture",
@@ -13052,14 +16349,6 @@ new file mode 100644
 +    [sections replaceObjectAtIndex: CONFIG_SECTION
 +              withObject: configs];
 +
-+    UITableViewCell *cropCell =
-+        [[[UITableViewCell alloc]
-+             initWithStyle: UITableViewCellStyleValue1
-+             reuseIdentifier: nil]
-+            autorelease];
-+    cropCell.textLabel.text = @"scanCrop";
-+    cropCell.detailTextLabel.text = NSStringFromCGRect(crop_choices[0]);
-+
 +    UITableViewCell *xDensityCell =
 +        [[[UITableViewCell alloc]
 +             initWithStyle: UITableViewCellStyleValue1
@@ -13068,7 +16357,7 @@ new file mode 100644
 +    xDensityCell.textLabel.text = @"CFG_X_DENSITY";
 +    xDensityCell.detailTextLabel.tag = ZBAR_CFG_X_DENSITY;
 +    xDensityCell.detailTextLabel.text =
-+        [NSString stringWithFormat: @"%d", density_choices[0]];
++        [NSString stringWithFormat: @"%d", xDensity];
 +
 +    UITableViewCell *yDensityCell =
 +        [[[UITableViewCell alloc]
@@ -13078,33 +16367,60 @@ new file mode 100644
 +    yDensityCell.textLabel.text = @"CFG_Y_DENSITY";
 +    yDensityCell.detailTextLabel.tag = ZBAR_CFG_Y_DENSITY;
 +    yDensityCell.detailTextLabel.text =
-+        [NSString stringWithFormat: @"%d", density_choices[0]];
++        [NSString stringWithFormat: @"%d", yDensity];
++
++    UITableViewCell *cropCell =
++        [[[UITableViewCell alloc]
++             initWithStyle: UITableViewCellStyleValue1
++             reuseIdentifier: nil]
++            autorelease];
++    cropCell.textLabel.text = @"scanCrop";
++    cropCell.detailTextLabel.text = NSStringFromCGRect(reader.scanCrop);
++
++    UITableViewCell *zoomCell =
++        [[[UITableViewCell alloc]
++             initWithStyle: UITableViewCellStyleValue1
++             reuseIdentifier: nil]
++            autorelease];
++    zoomCell.textLabel.text = @"zoom";
++    zoomCell.detailTextLabel.text =
++        [NSString stringWithFormat: @"%g", zoom];
 +
 +    [sections replaceObjectAtIndex: CUSTOM_SECTION
 +              withObject: [NSArray arrayWithObjects:
 +                              xDensityCell,
 +                              yDensityCell,
 +                              cropCell,
++                              zoomCell,
 +                              [self cellWithTitle: @"continuous"
 +                                    tag: 1
 +                                    checked: continuous],
 +                              nil]];
 +
-+    static const int symbolValues[] = {
-+        ZBAR_QRCODE, ZBAR_CODE128, ZBAR_CODE93, ZBAR_CODE39, ZBAR_I25,
-+        ZBAR_DATABAR, ZBAR_DATABAR_EXP,
-+        ZBAR_EAN13, ZBAR_EAN8, ZBAR_UPCA, ZBAR_UPCE, ZBAR_ISBN13, ZBAR_ISBN10,
++    static const zbar_symbol_type_t allSymbologies[] = {
++        ZBAR_QRCODE, ZBAR_CODE128, ZBAR_CODE93, ZBAR_CODE39, ZBAR_CODABAR,
++        ZBAR_I25, ZBAR_DATABAR, ZBAR_DATABAR_EXP,
++        ZBAR_EAN13, ZBAR_EAN8, 
++        ZBAR_EAN2, ZBAR_EAN5, ZBAR_COMPOSITE,
++        ZBAR_UPCA, ZBAR_UPCE,
++        ZBAR_ISBN13, ZBAR_ISBN10,
 +        0
 +    };
 +    NSMutableArray *symbols = [NSMutableArray array];
 +    [symbolEnables release];
-+    symbolEnables = [[NSMutableArray alloc] init];
++    symbolEnables = [NSMutableArray new];
 +    BOOL en = YES;
-+    for(int i = 0; symbolValues[i]; i++) {
-+        en = en && (symbolValues[i] != ZBAR_UPCA);
++    for(int i = 0; allSymbologies[i]; i++) {
++        zbar_symbol_type_t sym = allSymbologies[i];
++        if(defaultSymbologies)
++            en = !![defaultSymbologies member:
++                       [NSNumber numberWithInteger: sym]];
++        else
++            /* symbologies after ZBAR_EAN5 are disabled by default */
++            en = en && (sym != ZBAR_EAN2);
 +        [symbols addObject:
-+            [self cellWithTitle: [ZBarSymbol nameForType: symbolValues[i]]
-+                  tag: symbolValues[i]
++            [self cellWithTitle: [ZBarSymbol nameForType: sym]
++                  tag: sym
 +                  checked: en]];
 +        [symbolEnables addObject: [NSNumber numberWithBool: en]];
 +    }
@@ -13123,6 +16439,7 @@ new file mode 100644
 +    view.dataSource = self;
 +
 +    [self initOverlay];
++    [self updateCropMask];
 +
 +    sections = [[NSMutableArray alloc]
 +                   initWithCapacity: NUM_SECTIONS];
@@ -13200,6 +16517,11 @@ new file mode 100644
 +    [super dealloc];
 +}
 +
++- (BOOL) shouldAutorotateToInterfaceOrientation: (UIInterfaceOrientation) orient
++{
++    return(YES);
++}
++
 +- (void) scan
 +{
 +    found = paused = NO;
@@ -13209,12 +16531,19 @@ new file mode 100644
 +    typeOvl.text = nil;
 +    dataOvl.text = nil;
 +    [self.tableView reloadData];
-+    if([reader respondsToSelector: @selector(readerView)])
-+        reader.readerView.showsFPS = YES;
 +    if(reader.sourceType == UIImagePickerControllerSourceTypeCamera)
 +        reader.cameraOverlayView = (reader.showsZBarControls) ? nil : overlay;
++    if([reader respondsToSelector: @selector(readerView)]) {
++        reader.readerView.showsFPS = YES;
++        if(zoom)
++            reader.readerView.zoom = zoom;
++        reader.supportedOrientationsMask = (reader.showsZBarControls)
++            ? ZBarOrientationMaskAll
++            : ZBarOrientationMask(UIInterfaceOrientationPortrait); // tmp disable
++    }
 +    manualBtn.enabled = TARGET_IPHONE_SIMULATOR ||
-+        (reader.cameraMode == ZBarReaderControllerCameraModeDefault);
++        (reader.cameraMode == ZBarReaderControllerCameraModeDefault) ||
++        [reader isKindOfClass: [ZBarReaderViewController class]];
 +    [self presentModalViewController: reader
 +          animated: YES];
 +}
@@ -13337,35 +16666,33 @@ new file mode 100644
 +    reader.scanCrop = r;
 +    label.text = NSStringFromCGRect(r);
 +
-+    r.origin.x *= 426;
-+    r.origin.y *= 320;
-+    r.size.width *= 426;
-+    r.size.height *= 320;
-+    UIView *mask = [masks objectAtIndex: 0];
-+    mask.frame = CGRectMake(0, -426, 320, r.origin.x);
-+    mask = [masks objectAtIndex: 1];
-+    mask.frame = CGRectMake(0, r.origin.x - 426, r.origin.y, r.size.width);
-+
-+    r.origin.y += r.size.height;
-+    mask = [masks objectAtIndex: 2];
-+    mask.frame = CGRectMake(r.origin.y, r.origin.x - 426,
-+                            320 - r.origin.y, r.size.width);
++    [self updateCropMask];
++}
 +
-+    r.origin.x += r.size.width;
-+    mask = [masks objectAtIndex: 3];
-+    mask.frame = CGRectMake(0, r.origin.x - 426, 320, 426 - r.origin.x);
++- (void) advanceZoom: (UILabel*) label
++{
++    int i;
++    for(i = 0; zoom_choices[i] >= 0;)
++        if(zoom == zoom_choices[i++])
++            break;
++    if(zoom_choices[i] < 0)
++        i = 0;
++    zoom = zoom_choices[i];
++    assert(zoom >= 0);
++    label.text = [NSString stringWithFormat: @"%g", zoom];
 +}
 +
 +- (void) advanceDensity: (UILabel*) label
++                  value: (NSInteger*) value
 +{
-+    NSInteger d = [label.text integerValue];
++    NSInteger d = *value;
 +    int i;
 +    for(i = 0; density_choices[i] >= 0;)
 +        if(d == density_choices[i++])
 +            break;
 +    if(density_choices[i] < 0)
 +        i = 0;
-+    d = density_choices[i];
++    *value = d = density_choices[i];
 +    assert(d >= 0);
 +    [reader.scanner setSymbology: 0
 +           config: label.tag
@@ -13386,6 +16713,7 @@ new file mode 100644
 +    case CLASS_SECTION: {
 +        NSString *name = cell.textLabel.text;
 +        [self initReader: name];
++        [self updateCropMask];
 +        [self initControlCells];
 +        [self setCheckForName: name
 +              inSection: CLASS_SECTION];
@@ -13408,6 +16736,24 @@ new file mode 100644
 +              inSection: CAMODE_SECTION];
 +        break;
 +
++    case DEVICE_SECTION:
++        reader.cameraDevice = cell.tag;
++        [self setCheckForTag: reader.cameraDevice
++              inSection: DEVICE_SECTION];
++        break;
++
++    case FLASH_SECTION:
++        reader.cameraFlashMode = cell.tag;
++        [self setCheckForTag: reader.cameraFlashMode
++              inSection: FLASH_SECTION];
++        break;
++
++    case QUALITY_SECTION:
++        reader.videoQuality = cell.tag;
++        [self setCheckForTag: reader.videoQuality
++              inSection: QUALITY_SECTION];
++        break;
++
 +    case CONFIG_SECTION: {
 +        BOOL state;
 +        NSString *key = cell.textLabel.text;
@@ -13431,13 +16777,20 @@ new file mode 100644
 +        switch(path.row)
 +        {
 +        case 0:
++            [self advanceDensity: cell.detailTextLabel
++                  value: &xDensity];
++            break;
 +        case 1:
-+            [self advanceDensity: cell.detailTextLabel];
++            [self advanceDensity: cell.detailTextLabel
++                  value: &yDensity];
 +            break;
 +        case 2:
 +            [self advanceCrop: cell.detailTextLabel];
 +            break;
 +        case 3:
++            [self advanceZoom: cell.detailTextLabel];
++            break;
++        case 4:
 +            [self setCheck: continuous = !continuous
 +                  forCell: cell];
 +            break;
@@ -13496,8 +16849,12 @@ new file mode 100644
 +    if(idx == sheet.cancelButtonIndex)
 +        return;
 +    idx -= sheet.firstOtherButtonIndex;
-+    if(!idx)
-+        UIImageWriteToSavedPhotosAlbum(imageView.image, nil, NULL, NULL);
++    if(!idx) {
++        UIImage *img =
++            [UIImage imageWithData:
++                         UIImagePNGRepresentation(imageView.image)];
++        UIImageWriteToSavedPhotosAlbum(img, nil, NULL, NULL);
++    }
 +}
 +
 +// ZBarReaderDelegate
@@ -13516,10 +16873,13 @@ new file mode 100644
 +
 +    int quality = 0;
 +    ZBarSymbol *bestResult = nil;
-+    for(ZBarSymbol *sym in results)
-+        if(sym.quality > quality)
++    for(ZBarSymbol *sym in results) {
++        int q = sym.quality;
++        if(quality < q) {
++            quality = q;
 +            bestResult = sym;
-+    assert(!!bestResult);
++        }
++    }
 +
 +    [self performSelector: @selector(presentResult:)
 +          withObject: bestResult
@@ -13530,10 +16890,14 @@ new file mode 100644
 +
 +- (void) presentResult: (ZBarSymbol*) sym
 +{
-+    found = !!sym;
-+    NSString *typeName = sym.typeName;
++    found = sym || imageView.image;
++    NSString *typeName = @"NONE";
++    NSString *data = @"";
++    if(sym) {
++        typeName = sym.typeName;
++        data = sym.data;
++    }
 +    typeLabel.text = typeName;
-+    NSString *data = sym.data;
 +    dataLabel.text = data;
 +
 +    if(continuous) {
@@ -13542,7 +16906,7 @@ new file mode 100644
 +    }
 +
 +    NSLog(@"imagePickerController:didFinishPickingMediaWithInfo:\n");
-+    NSLog(@"    type=%@ data=%@\n", sym.typeName, data);
++    NSLog(@"    type=%@ data=%@\n", typeName, data);
 +
 +    CGSize size = [data sizeWithFont: [UIFont systemFontOfSize: 17]
 +                        constrainedToSize: CGSizeMake(288, 2000)
@@ -13579,23 +16943,14 @@ new file mode 100644
 +
 +int main (int argc, char *argv[])
 +{
-+#ifdef VALGRIND
-+    if(argc < 2 || (argc >= 2 && strcmp(argv[1], "-valgrind")))
-+        execl(VALGRIND, VALGRIND,
-+              "--log-file=/tmp/memcheck.log", "--leak-check=full",
-+              argv[0], "-valgrind",
-+              NULL);
-+#endif
-+
 +    NSAutoreleasePool *pool = [NSAutoreleasePool new];
 +    int rc = UIApplicationMain(argc, argv, nil, @"AppDelegate");
 +    [pool release];
 +    return(rc);
 +}
-diff --git a/iphone/examples/readertest/readertest.plist b/iphone/examples/readertest/readertest.plist
-new file mode 100644
---- /dev/null
-+++ b/iphone/examples/readertest/readertest.plist
+diff -r 563557a923d0 iphone/examples/readertest/readertest.plist
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/examples/readertest/readertest.plist	Fri Feb 22 08:54:29 2013 -0300
 @@ -0,0 +1,28 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
@@ -13625,11 +16980,10 @@ new file mode 100644
 +	<true/>
 +</dict>
 +</plist>
-diff --git a/iphone/examples/readertest/readertest.xcodeproj/project.pbxproj b/iphone/examples/readertest/readertest.xcodeproj/project.pbxproj
-new file mode 100755
---- /dev/null
-+++ b/iphone/examples/readertest/readertest.xcodeproj/project.pbxproj
-@@ -0,0 +1,345 @@
+diff -r 563557a923d0 iphone/examples/readertest/readertest.xcodeproj/project.pbxproj
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/examples/readertest/readertest.xcodeproj/project.pbxproj	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,351 @@
 +// !$*UTF8*$!
 +{
 +	archiveVersion = 1;
@@ -13647,6 +17001,7 @@ new file mode 100755
 +		DC48C4D81219E5F70047193B /* zbar-help.html in Resources */ = {isa = PBXBuildFile; fileRef = DC48C4D31219E5F70047193B /* zbar-help.html */; };
 +		DC48C4D91219E5F70047193B /* zbar-helpicons.png in Resources */ = {isa = PBXBuildFile; fileRef = DC48C4D41219E5F70047193B /* zbar-helpicons.png */; };
 +		DC48C4DA1219E5F70047193B /* zbar-samples.png in Resources */ = {isa = PBXBuildFile; fileRef = DC48C4D51219E5F70047193B /* zbar-samples.png */; };
++		DC824600162B568A0010B2E6 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DC8245FF162B568A0010B2E6 /* Default-568h@2x.png */; };
 +		DCB9118510BC5DA200B907F0 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCB9118410BC5DA200B907F0 /* QuartzCore.framework */; };
 +		DCB9118810BC5DB500B907F0 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DCD6E13B10B0AFD4002005CD /* libiconv.dylib */; };
 +		DCD6E0D010B0AD41002005CD /* readertest.m in Sources */ = {isa = PBXBuildFile; fileRef = DCD6E0CF10B0AD41002005CD /* readertest.m */; };
@@ -13683,6 +17038,7 @@ new file mode 100755
 +		DC48C4D31219E5F70047193B /* zbar-help.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "zbar-help.html"; sourceTree = "<group>"; };
 +		DC48C4D41219E5F70047193B /* zbar-helpicons.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "zbar-helpicons.png"; sourceTree = "<group>"; };
 +		DC48C4D51219E5F70047193B /* zbar-samples.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "zbar-samples.png"; sourceTree = "<group>"; };
++		DC8245FF162B568A0010B2E6 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
 +		DCB9118410BC5DA200B907F0 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
 +		DCD6E0CE10B0AD41002005CD /* prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = prefix.pch; sourceTree = "<group>"; };
 +		DCD6E0CF10B0AD41002005CD /* readertest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = readertest.m; sourceTree = "<group>"; };
@@ -13753,6 +17109,7 @@ new file mode 100755
 +			isa = PBXGroup;
 +			children = (
 +				DCD6E0D810B0AD55002005CD /* readertest.plist */,
++				DC8245FF162B568A0010B2E6 /* Default-568h@2x.png */,
 +			);
 +			name = Resources;
 +			sourceTree = "<group>";
@@ -13872,6 +17229,7 @@ new file mode 100755
 +				DC48C4D81219E5F70047193B /* zbar-help.html in Resources */,
 +				DC48C4D91219E5F70047193B /* zbar-helpicons.png in Resources */,
 +				DC48C4DA1219E5F70047193B /* zbar-samples.png in Resources */,
++				DC824600162B568A0010B2E6 /* Default-568h@2x.png in Resources */,
 +			);
 +			runOnlyForDeploymentPostprocessing = 0;
 +		};
@@ -13929,6 +17287,7 @@ new file mode 100755
 +				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 +				GCC_WARN_UNUSED_VARIABLE = YES;
 +				IPHONEOS_DEPLOYMENT_TARGET = 3.1;
++				OTHER_LDFLAGS = "-all_load";
 +				PREBINDING = NO;
 +				SDKROOT = iphoneos;
 +				SYMROOT = /tmp/readertest.build;
@@ -13944,6 +17303,7 @@ new file mode 100755
 +				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 +				GCC_WARN_UNUSED_VARIABLE = YES;
 +				IPHONEOS_DEPLOYMENT_TARGET = 3.1;
++				OTHER_LDFLAGS = "-all_load";
 +				PREBINDING = NO;
 +				SDKROOT = iphoneos;
 +				SYMROOT = /tmp/readertest.build;
@@ -13975,11 +17335,139 @@ new file mode 100755
 +	};
 +	rootObject = 29B97313FDCFA39411CA2CEA /* Project object */;
 +}
-diff --git a/iphone/include/ZBarSDK/ZBarCaptureReader.h b/iphone/include/ZBarSDK/ZBarCaptureReader.h
-new file mode 100644
---- /dev/null
-+++ b/iphone/include/ZBarSDK/ZBarCaptureReader.h
-@@ -0,0 +1,105 @@
+diff -r 563557a923d0 iphone/examples/readertest/readertest.xcodeproj/xcshareddata/xcschemes/readertest.xcscheme
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/examples/readertest/readertest.xcodeproj/xcshareddata/xcschemes/readertest.xcscheme	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,76 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<Scheme
++   version = "1.3">
++   <BuildAction
++      parallelizeBuildables = "YES"
++      buildImplicitDependencies = "YES">
++      <BuildActionEntries>
++         <BuildActionEntry
++            buildForTesting = "YES"
++            buildForRunning = "YES"
++            buildForProfiling = "YES"
++            buildForArchiving = "YES"
++            buildForAnalyzing = "YES">
++            <BuildableReference
++               BuildableIdentifier = "primary"
++               BlueprintIdentifier = "1D6058900D05DD3D006BFB54"
++               BuildableName = "readertest.app"
++               BlueprintName = "readertest"
++               ReferencedContainer = "container:readertest.xcodeproj">
++            </BuildableReference>
++         </BuildActionEntry>
++      </BuildActionEntries>
++   </BuildAction>
++   <TestAction
++      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
++      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
++      shouldUseLaunchSchemeArgsEnv = "YES"
++      buildConfiguration = "Debug">
++      <Testables>
++      </Testables>
++   </TestAction>
++   <LaunchAction
++      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
++      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
++      displayScaleIsEnabled = "NO"
++      displayScale = "1.00"
++      launchStyle = "0"
++      useCustomWorkingDirectory = "NO"
++      buildConfiguration = "Debug">
++      <BuildableProductRunnable>
++         <BuildableReference
++            BuildableIdentifier = "primary"
++            BlueprintIdentifier = "1D6058900D05DD3D006BFB54"
++            BuildableName = "readertest.app"
++            BlueprintName = "readertest"
++            ReferencedContainer = "container:readertest.xcodeproj">
++         </BuildableReference>
++      </BuildableProductRunnable>
++      <AdditionalOptions>
++      </AdditionalOptions>
++   </LaunchAction>
++   <ProfileAction
++      displayScaleIsEnabled = "NO"
++      displayScale = "1.00"
++      shouldUseLaunchSchemeArgsEnv = "YES"
++      savedToolIdentifier = ""
++      useCustomWorkingDirectory = "NO"
++      buildConfiguration = "Release">
++      <BuildableProductRunnable>
++         <BuildableReference
++            BuildableIdentifier = "primary"
++            BlueprintIdentifier = "1D6058900D05DD3D006BFB54"
++            BuildableName = "readertest.app"
++            BlueprintName = "readertest"
++            ReferencedContainer = "container:readertest.xcodeproj">
++         </BuildableReference>
++      </BuildableProductRunnable>
++   </ProfileAction>
++   <AnalyzeAction
++      buildConfiguration = "Debug">
++   </AnalyzeAction>
++   <ArchiveAction
++      buildConfiguration = "Release"
++      revealArchiveInOrganizer = "YES">
++   </ArchiveAction>
++</Scheme>
+diff -r 563557a923d0 iphone/include/ZBarSDK/ZBarCameraSimulator.h
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/include/ZBarSDK/ZBarCameraSimulator.h	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,45 @@
++//------------------------------------------------------------------------
++//  Copyright 2010-2011 (c) Jeff Brown <spadix@users.sourceforge.net>
++//
++//  This file is part of the ZBar Bar Code Reader.
++//
++//  The ZBar Bar Code Reader is free software; you can redistribute it
++//  and/or modify it under the terms of the GNU Lesser Public License as
++//  published by the Free Software Foundation; either version 2.1 of
++//  the License, or (at your option) any later version.
++//
++//  The ZBar Bar Code Reader is distributed in the hope that it will be
++//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
++//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++//  GNU Lesser Public License for more details.
++//
++//  You should have received a copy of the GNU Lesser Public License
++//  along with the ZBar Bar Code Reader; if not, write to the Free
++//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++//  Boston, MA  02110-1301  USA
++//
++//  http://sourceforge.net/projects/zbar
++//------------------------------------------------------------------------
++
++@class ZBarReaderView;
++
++// hack around missing simulator support for AVCapture interfaces
++
++@interface ZBarCameraSimulator
++    : NSObject
++    < UINavigationControllerDelegate,
++      UIImagePickerControllerDelegate,
++      UIPopoverControllerDelegate >
++{
++    UIViewController *viewController;
++    ZBarReaderView *readerView;
++    UIImagePickerController *picker;
++    UIPopoverController *pickerPopover;
++}
++
++- (id) initWithViewController: (UIViewController*) viewController;
++- (void) takePicture;
++
++@property (nonatomic, assign) ZBarReaderView *readerView;
++
++@end
+diff -r 563557a923d0 iphone/include/ZBarSDK/ZBarCaptureReader.h
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/include/ZBarSDK/ZBarCaptureReader.h	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,111 @@
 +//------------------------------------------------------------------------
 +//  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
 +//
@@ -14028,6 +17516,7 @@ new file mode 100644
 +@interface ZBarCaptureReader
 +    : NSObject
 +{
++#if !TARGET_IPHONE_SIMULATOR
 +    AVCaptureVideoDataOutput *captureOutput;
 +    id<ZBarCaptureDelegate> captureDelegate;
 +    ZBarImageScanner *scanner;
@@ -14039,11 +17528,12 @@ new file mode 100644
 +    dispatch_queue_t queue;
 +    ZBarImage *image;
 +    ZBarCVImage *result;
-+    int32_t running;
++    volatile uint32_t state;
 +    int framecnt;
 +    unsigned width, height;
 +    uint64_t t_frame, t_fps, t_scan;
 +    CGFloat dt_frame;
++#endif
 +}
 +
 +// supply a pre-configured image scanner
@@ -14058,6 +17548,10 @@ new file mode 100644
 +// clear the internal result cache
 +- (void) flushCache;
 +
++// capture the next frame after processing.  the captured image will
++// follow the same delegate path as an image with decoded symbols.
++- (void) captureFrame;
++
 +// the capture output.  add this to an instance of AVCaptureSession
 +@property (nonatomic, readonly) AVCaptureOutput *captureOutput;
 +
@@ -14085,10 +17579,9 @@ new file mode 100644
 +@property (nonatomic) BOOL enableCache;
 +
 +@end
-diff --git a/iphone/include/ZBarSDK/ZBarHelpController.h b/iphone/include/ZBarSDK/ZBarHelpController.h
-new file mode 100644
---- /dev/null
-+++ b/iphone/include/ZBarSDK/ZBarHelpController.h
+diff -r 563557a923d0 iphone/include/ZBarSDK/ZBarHelpController.h
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/include/ZBarSDK/ZBarHelpController.h	Fri Feb 22 08:54:29 2013 -0300
 @@ -0,0 +1,60 @@
 +//------------------------------------------------------------------------
 +//  Copyright 2009-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
@@ -14150,10 +17643,9 @@ new file mode 100644
 +                       supported: (BOOL) supported;
 +
 +@end
-diff --git a/iphone/include/ZBarSDK/ZBarImage.h b/iphone/include/ZBarSDK/ZBarImage.h
-new file mode 100644
---- /dev/null
-+++ b/iphone/include/ZBarSDK/ZBarImage.h
+diff -r 563557a923d0 iphone/include/ZBarSDK/ZBarImage.h
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/include/ZBarSDK/ZBarImage.h	Fri Feb 22 08:54:29 2013 -0300
 @@ -0,0 +1,69 @@
 +//------------------------------------------------------------------------
 +//  Copyright 2009 (c) Jeff Brown <spadix@users.sourceforge.net>
@@ -14224,10 +17716,9 @@ new file mode 100644
 +#endif
 +
 +@end
-diff --git a/iphone/include/ZBarSDK/ZBarImageScanner.h b/iphone/include/ZBarSDK/ZBarImageScanner.h
-new file mode 100644
---- /dev/null
-+++ b/iphone/include/ZBarSDK/ZBarImageScanner.h
+diff -r 563557a923d0 iphone/include/ZBarSDK/ZBarImageScanner.h
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/include/ZBarSDK/ZBarImageScanner.h	Fri Feb 22 08:54:29 2013 -0300
 @@ -0,0 +1,51 @@
 +//------------------------------------------------------------------------
 +//  Copyright 2009 (c) Jeff Brown <spadix@users.sourceforge.net>
@@ -14280,10 +17771,9 @@ new file mode 100644
 +- (NSInteger) scanImage: (ZBarImage*) image;
 +
 +@end
-diff --git a/iphone/include/ZBarSDK/ZBarReaderController.h b/iphone/include/ZBarSDK/ZBarReaderController.h
-new file mode 100644
---- /dev/null
-+++ b/iphone/include/ZBarSDK/ZBarReaderController.h
+diff -r 563557a923d0 iphone/include/ZBarSDK/ZBarReaderController.h
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/include/ZBarSDK/ZBarReaderController.h	Fri Feb 22 08:54:29 2013 -0300
 @@ -0,0 +1,142 @@
 +//------------------------------------------------------------------------
 +//  Copyright 2009-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
@@ -14427,11 +17917,10 @@ new file mode 100644
 +@end
 +
 +extern NSString* const ZBarReaderControllerResults;
-diff --git a/iphone/include/ZBarSDK/ZBarReaderView.h b/iphone/include/ZBarSDK/ZBarReaderView.h
-new file mode 100644
---- /dev/null
-+++ b/iphone/include/ZBarSDK/ZBarReaderView.h
-@@ -0,0 +1,118 @@
+diff -r 563557a923d0 iphone/include/ZBarSDK/ZBarReaderView.h
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/include/ZBarSDK/ZBarReaderView.h	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,140 @@
 +//------------------------------------------------------------------------
 +//  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
 +//
@@ -14470,6 +17959,11 @@ new file mode 100644
 +     didReadSymbols: (ZBarSymbolSet*) symbols
 +          fromImage: (UIImage*) image;
 +
++@optional
++- (void) readerViewDidStart: (ZBarReaderView*) readerView;
++- (void) readerView: (ZBarReaderView*) readerView
++   didStopWithError: (NSError*) error;
++
 +@end
 +
 +// read barcodes from the displayed video preview.  the view maintains
@@ -14480,18 +17974,23 @@ new file mode 100644
 +    : UIView
 +{
 +    id<ZBarReaderViewDelegate> readerDelegate;
-+    CGRect scanCrop, zoomCrop;
++    ZBarCaptureReader *captureReader;
++    CGRect scanCrop, effectiveCrop;
 +    CGAffineTransform previewTransform;
-+    CGFloat zoom, zoom0;
++    CGFloat zoom, zoom0, maxZoom;
++    UIColor *trackingColor;
 +    BOOL tracksSymbols, showsFPS;
 +    NSInteger torchMode;
++    UIInterfaceOrientation interfaceOrientation;
++    NSTimeInterval animationDuration;
 +
-+    CALayer *preview, *overlay, *tracking;
++    CALayer *preview, *overlay, *tracking, *cropLayer;
 +    UIView *fpsView;
 +    UILabel *fpsLabel;
 +    UIPinchGestureRecognizer *pinch;
 +    CGFloat imageScale;
-+    BOOL started, running;
++    CGSize imageSize;
++    BOOL started, running, locked;
 +}
 +
 +// supply a pre-configured image scanner.
@@ -14506,6 +18005,10 @@ new file mode 100644
 +// clear the internal result cache
 +- (void) flushCache;
 +
++// compensate for device/camera/interface orientation
++- (void) willRotateToInterfaceOrientation: (UIInterfaceOrientation) orient
++                                 duration: (NSTimeInterval) duration;
++
 +// delegate is notified of decode results.
 +@property (nonatomic, assign) id<ZBarReaderViewDelegate> readerDelegate;
 +
@@ -14516,6 +18019,9 @@ new file mode 100644
 +// (default YES).
 +@property (nonatomic) BOOL tracksSymbols;
 +
++// color of the tracking box (default green)
++@property (nonatomic, retain) UIColor *trackingColor;
++
 +// enable pinch gesture recognition for zooming the preview/decode
 +// (default YES).
 +@property (nonatomic) BOOL allowsPinchZoom;
@@ -14528,9 +18034,14 @@ new file mode 100644
 +@property (nonatomic) BOOL showsFPS;
 +
 +// zoom scale factor applied to video preview *and* scanCrop.
-+// also updated by pinch-zoom gesture.  clipped to range [1,2],
++// also updated by pinch-zoom gesture.  clipped to range [1,maxZoom],
 +// defaults to 1.25
 +@property (nonatomic) CGFloat zoom;
++- (void) setZoom: (CGFloat) zoom
++        animated: (BOOL) animated;
++
++// maximum settable zoom factor.
++@property (nonatomic) CGFloat maxZoom;
 +
 +// the region of the image that will be scanned.  normalized coordinates.
 +@property (nonatomic) CGRect scanCrop;
@@ -14550,11 +18061,10 @@ new file mode 100644
 +@property (nonatomic) BOOL enableCache;
 +
 +@end
-diff --git a/iphone/include/ZBarSDK/ZBarReaderViewController.h b/iphone/include/ZBarSDK/ZBarReaderViewController.h
-new file mode 100644
---- /dev/null
-+++ b/iphone/include/ZBarSDK/ZBarReaderViewController.h
-@@ -0,0 +1,100 @@
+diff -r 563557a923d0 iphone/include/ZBarSDK/ZBarReaderViewController.h
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/include/ZBarSDK/ZBarReaderViewController.h	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,130 @@
 +//------------------------------------------------------------------------
 +//  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
 +//
@@ -14581,7 +18091,15 @@ new file mode 100644
 +#import <UIKit/UIKit.h>
 +#import "ZBarReaderController.h"
 +
-+@class ZBarReaderView;
++// orientation set support
++#define ZBarOrientationMask(orient) (1 << orient)
++#define ZBarOrientationMaskAll \
++    (ZBarOrientationMask(UIInterfaceOrientationPortrait) | \
++     ZBarOrientationMask(UIInterfaceOrientationPortraitUpsideDown) | \
++     ZBarOrientationMask(UIInterfaceOrientationLandscapeLeft) | \
++     ZBarOrientationMask(UIInterfaceOrientationLandscapeRight))
++
++@class ZBarReaderView, ZBarCameraSimulator;
 +
 +// drop in video scanning replacement for ZBarReaderController.
 +// this is a thin controller around a ZBarReaderView that adds the UI
@@ -14598,10 +18116,16 @@ new file mode 100644
 +    UIView *cameraOverlayView;
 +    CGAffineTransform cameraViewTransform;
 +    CGRect scanCrop;
++    NSUInteger supportedOrientationsMask;
++    UIImagePickerControllerCameraDevice cameraDevice;
++    UIImagePickerControllerCameraFlashMode cameraFlashMode;
++    UIImagePickerControllerQualityType videoQuality;
 +    BOOL showsZBarControls, tracksSymbols, enableCache;
 +
-+    UIView *controls;
-+    BOOL didHideStatusBar;
++    ZBarHelpController *helpController;
++    UIView *controls, *shutter;
++    BOOL didHideStatusBar, rotating;
++    ZBarCameraSimulator *cameraSim;
 +}
 +
 +// access to configure image scanner
@@ -14617,6 +18141,10 @@ new file mode 100644
 +// enabled, the box will only be visible when scanning EAN and I2/5.
 +@property (nonatomic) BOOL tracksSymbols;
 +
++// interface orientation support.  bit-mask of accepted orientations.
++// see eg ZBarOrientationMask() and ZBarOrientationMaskAll
++@property (nonatomic) NSUInteger supportedOrientationsMask;
++
 +// crop images for scanning.  the image will be cropped to this
 +// rectangle before scanning.  the rectangle is normalized to the
 +// image size and aspect ratio; useful values will place the rectangle
@@ -14635,6 +18163,18 @@ new file mode 100644
 +// the onZBarHelp() javascript function.
 +- (void) showHelpWithReason: (NSString*) reason;
 +
++// capture the next frame and send it over the usual delegate path.
++- (void) takePicture;
++
++// these attempt to emulate UIImagePickerController
+++ (BOOL) isCameraDeviceAvailable: (UIImagePickerControllerCameraDevice) cameraDevice;
+++ (BOOL) isFlashAvailableForCameraDevice: (UIImagePickerControllerCameraDevice) cameraDevice;
+++ (NSArray*) availableCaptureModesForCameraDevice: (UIImagePickerControllerCameraDevice) cameraDevice;
++@property(nonatomic) UIImagePickerControllerCameraDevice cameraDevice;
++@property(nonatomic) UIImagePickerControllerCameraFlashMode cameraFlashMode;
++@property(nonatomic) UIImagePickerControllerCameraCaptureMode cameraCaptureMode;
++@property(nonatomic) UIImagePickerControllerQualityType videoQuality;
++
 +// direct access to the ZBarReaderView
 +@property (nonatomic, readonly) ZBarReaderView *readerView;
 +
@@ -14655,11 +18195,10 @@ new file mode 100644
 ++ (BOOL) isSourceTypeAvailable: (UIImagePickerControllerSourceType) sourceType;
 +
 +@end
-diff --git a/iphone/include/ZBarSDK/ZBarSDK.h b/iphone/include/ZBarSDK/ZBarSDK.h
-new file mode 100644
---- /dev/null
-+++ b/iphone/include/ZBarSDK/ZBarSDK.h
-@@ -0,0 +1,33 @@
+diff -r 563557a923d0 iphone/include/ZBarSDK/ZBarSDK.h
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/include/ZBarSDK/ZBarSDK.h	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,34 @@
 +/*------------------------------------------------------------------------
 + *  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
 + *
@@ -14693,10 +18232,10 @@ new file mode 100644
 +#import "ZBarReaderController.h"
 +#import "ZBarCaptureReader.h"
 +#import "ZBarHelpController.h"
-diff --git a/iphone/include/ZBarSDK/ZBarSymbol.h b/iphone/include/ZBarSDK/ZBarSymbol.h
-new file mode 100644
---- /dev/null
-+++ b/iphone/include/ZBarSDK/ZBarSymbol.h
++#import "ZBarCameraSimulator.h"
+diff -r 563557a923d0 iphone/include/ZBarSDK/ZBarSymbol.h
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/include/ZBarSDK/ZBarSymbol.h	Fri Feb 22 08:54:29 2013 -0300
 @@ -0,0 +1,71 @@
 +//------------------------------------------------------------------------
 +//  Copyright 2009-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
@@ -14769,11 +18308,10 @@ new file mode 100644
 ++ (NSString*) nameForType: (zbar_symbol_type_t) type;
 +
 +@end
-diff --git a/iphone/include/config.h b/iphone/include/config.h
-new file mode 100644
---- /dev/null
-+++ b/iphone/include/config.h
-@@ -0,0 +1,231 @@
+diff -r 563557a923d0 iphone/include/config.h
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/include/config.h	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,234 @@
 +/* manually customized for iPhone platform */
 +
 +/* whether to build support for Code 128 symbology */
@@ -14785,6 +18323,9 @@ new file mode 100644
 +/* whether to build support for Code 39 symbology */
 +#define ENABLE_CODE39 1
 +
++/* whether to build support for Codabar symbology */
++#define ENABLE_CODABAR 1
++
 +/* whether to build support for DataBar symbology */
 +#define ENABLE_DATABAR 1
 +
@@ -15005,10 +18546,9 @@ new file mode 100644
 +# define HAVE_X
 +#endif
 +
-diff --git a/iphone/include/prefix.pch b/iphone/include/prefix.pch
-new file mode 100644
---- /dev/null
-+++ b/iphone/include/prefix.pch
+diff -r 563557a923d0 iphone/include/prefix.pch
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/include/prefix.pch	Fri Feb 22 08:54:29 2013 -0300
 @@ -0,0 +1,10 @@
 +#ifdef __OBJC__
 +# import <Foundation/Foundation.h>
@@ -15020,10 +18560,11 @@ new file mode 100644
 +# import <CoreMedia/CoreMedia.h>
 +# import <CoreVideo/CoreVideo.h>
 +#endif
-diff --git a/iphone/res/ZBarSDK-Info.plist b/iphone/res/ZBarSDK-Info.plist
-new file mode 100644
---- /dev/null
-+++ b/iphone/res/ZBarSDK-Info.plist
+diff -r 563557a923d0 iphone/res/Columns.DS_Store
+Binary file iphone/res/Columns.DS_Store has changed
+diff -r 563557a923d0 iphone/res/ZBarSDK-Info.plist
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/res/ZBarSDK-Info.plist	Fri Feb 22 08:54:29 2013 -0300
 @@ -0,0 +1,16 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
@@ -15034,459 +18575,18 @@ new file mode 100644
 +	<key>CFBundleName</key>
 +	<string>ZBarSDK</string>
 +	<key>CFBundleVersion</key>
-+	<string>1.0.1</string>
++	<string>1.3.1</string>
 +	<key>CFBundleSignature</key>
 +	<string>????</string>
 +	<key>NSHumanReadableCopyright</key>
 +	<string>Copyright 2010 © Jeff Brown et al</string>
 +</dict>
 +</plist>
-diff --git a/iphone/res/ZBarSDK-bg.png b/iphone/res/ZBarSDK-bg.png
-new file mode 100644
-index 0000000000000000000000000000000000000000..5c633ace7cfc63684aed03aa53c71c7b752eb317
-GIT binary patch
-literal 23569
-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%0D~81_Z(L+
-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
-VH=rocyi2gz*3&|1Rv_)e{|ElIn@s=!
-
-diff --git a/iphone/res/ZBarSDK-bg.svg b/iphone/res/ZBarSDK-bg.svg
-new file mode 100644
---- /dev/null
-+++ b/iphone/res/ZBarSDK-bg.svg
+diff -r 563557a923d0 iphone/res/ZBarSDK-bg.png
+Binary file iphone/res/ZBarSDK-bg.png has changed
+diff -r 563557a923d0 iphone/res/ZBarSDK-bg.svg
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/res/ZBarSDK-bg.svg	Fri Feb 22 08:54:29 2013 -0300
 @@ -0,0 +1,78 @@
 +<?xml version="1.0"?>
 +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
@@ -15566,33 +18666,11 @@ new file mode 100644
 +  </g>
 +-->
 +</svg>
-diff --git a/iphone/res/ZBarSDK.DS_Store b/iphone/res/ZBarSDK.DS_Store
-new file mode 100644
-index 0000000000000000000000000000000000000000..6e71b2f4e8aa91b36e4a25535611f49c4e466a9a
-GIT binary patch
-literal 8196
-zc%1E5TTc@~6h1Spbh$_u6fcmNMwFPS2pElGjHT2_1JcG4X%Qv6?Xcaj-D!5W;3Y)j
-zi?93*6JLGx5BO?)Gx`&Z@g2{0r_yf47hg2YmrTE%IhQ#z=j==u07$A{o&-=}zo~ur
-z^BN%03jwHLzfVvO5)u*;5)u;sJt6@q{{4Pl-2W015{C;Un$D+F(D;*ouoAYU;GKYp
-z7^i}xA^n8lq~M)^iI7vlQNfB}Rd7OZQt(c|B1l4;!3$Odi_a925S;wOq9h~^H-c~b
-zaed3J=@!?q_eQT-rt3{itS*~&nQx_d-7dRp>Zunmu1!u|N=#1O*uInqp08h>*xp{v
-zn`NeJ&azqdDk?n6SNN6~QW~8l&MoXbZU{WhtGg-9X-IOKS3$`qpwX_FLLx^H%Fx8^
-zJM#;Lbtj0h`NBhw;BLV$gV4>=rU;#WXokL~#$9xuDRDdJuuYR~DQoI+T`O%Ej=!8)
-zZgJ<H!<aqV+=$hNfyb&Dd!0YoS6zBmV=66p?5USGpR>{Ag+RZ}U#6-VY{oJ*H#<Pa
-z8c~n==UZ$ASDH`HAGG^(7lYHUU+7)djq#do{B>6M5FLXQ&WdTK$M-{@4ow}$^EU=7
-zkOB=H$U_?Dp&!m*YahD|Iv6kxHL#HfVdP4S(<`0p>1`2%A6>!3>;zkyYi{YWP>NDk
-zosHi4+7u7^natKaliTh?=D5gMZ-!%*v+L_F^NNoxO=nitPI1rU)$WEUU(-saZHy+1
-zzubgodBDm=&2co_V5w(IHn&-e&%zfqj^%kI*4=wFJ}`Lv#L3enLb{ZmzJ4`wY$$Rn
-zf*02?jKCD!f;m`*B5uqEydrPOJMx}<B%jH5@`D2Hr*S$$&(WK7md?>7k&|X|j|d(X
-z<8^2h_onMv9#)`PvNypm{aL7B68tS^umBv4jKxdh&Gm1-9W>kB+xt}jF|^1+4x`Gz
-zBHZiLrqH5&6jRHg1a+vQe;YiU%L5a~>~>2Mwj4az5{smQ&sDHOJ|GmU0(apl+EuZr
-zEcD`b&KX+U0<LNntroE;?{<1`i?9nGpymw5c|WWRyV!DVp4*E3H`?D?v?U}YBqSsx
-KBqSvMdHe+GEK9fm
-
-diff --git a/iphone/res/buttondown.svg b/iphone/res/buttondown.svg
-new file mode 100644
---- /dev/null
-+++ b/iphone/res/buttondown.svg
+diff -r 563557a923d0 iphone/res/ZBarSDK.DS_Store
+Binary file iphone/res/ZBarSDK.DS_Store has changed
+diff -r 563557a923d0 iphone/res/buttondown.svg
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/res/buttondown.svg	Fri Feb 22 08:54:29 2013 -0300
 @@ -0,0 +1,57 @@
 +<?xml version="1.0"?>
 +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
@@ -15651,10 +18729,9 @@ new file mode 100644
 +-->
 +  <rect id="button" width="1" height="1" rx=".25" ry=".25"/>
 +</svg>
-diff --git a/iphone/res/buttonmask.svg b/iphone/res/buttonmask.svg
-new file mode 100644
---- /dev/null
-+++ b/iphone/res/buttonmask.svg
+diff -r 563557a923d0 iphone/res/buttonmask.svg
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/res/buttonmask.svg	Fri Feb 22 08:54:29 2013 -0300
 @@ -0,0 +1,26 @@
 +<?xml version="1.0"?>
 +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
@@ -15682,10 +18759,9 @@ new file mode 100644
 +  <!--<rect id="bg" x="-1" y="-1" width="3" height="3"/>-->
 +  <rect id="mask" width="1" height="1" rx=".25" ry=".25"/>
 +</svg>
-diff --git a/iphone/res/buttonup.svg b/iphone/res/buttonup.svg
-new file mode 100644
---- /dev/null
-+++ b/iphone/res/buttonup.svg
+diff -r 563557a923d0 iphone/res/buttonup.svg
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/res/buttonup.svg	Fri Feb 22 08:54:29 2013 -0300
 @@ -0,0 +1,57 @@
 +<?xml version="1.0"?>
 +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
@@ -15744,10 +18820,9 @@ new file mode 100644
 +-->
 +  <rect id="button" width="1" height="1" rx=".25" ry=".25"/>
 +</svg>
-diff --git a/iphone/res/lightbulb.svg b/iphone/res/lightbulb.svg
-new file mode 100644
---- /dev/null
-+++ b/iphone/res/lightbulb.svg
+diff -r 563557a923d0 iphone/res/lightbulb.svg
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/res/lightbulb.svg	Fri Feb 22 08:54:29 2013 -0300
 @@ -0,0 +1,108 @@
 +<?xml version="1.0"?>
 +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
@@ -15857,10 +18932,9 @@ new file mode 100644
 +"/>
 +
 +</svg>
-diff --git a/iphone/res/shakyhand.svg b/iphone/res/shakyhand.svg
-new file mode 100644
---- /dev/null
-+++ b/iphone/res/shakyhand.svg
+diff -r 563557a923d0 iphone/res/shakyhand.svg
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/res/shakyhand.svg	Fri Feb 22 08:54:29 2013 -0300
 @@ -0,0 +1,108 @@
 +<?xml version="1.0"?>
 +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
@@ -15970,10 +19044,9 @@ new file mode 100644
 +"/>
 +
 +</svg>
-diff --git a/iphone/res/shakyphone.svg b/iphone/res/shakyphone.svg
-new file mode 100644
---- /dev/null
-+++ b/iphone/res/shakyphone.svg
+diff -r 563557a923d0 iphone/res/shakyphone.svg
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/res/shakyphone.svg	Fri Feb 22 08:54:29 2013 -0300
 @@ -0,0 +1,51 @@
 +<?xml version="1.0"?>
 +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
@@ -16026,10 +19099,9 @@ new file mode 100644
 +    </g>
 +  </g>
 +</svg>
-diff --git a/iphone/res/stopwatch.svg b/iphone/res/stopwatch.svg
-new file mode 100644
---- /dev/null
-+++ b/iphone/res/stopwatch.svg
+diff -r 563557a923d0 iphone/res/stopwatch.svg
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/res/stopwatch.svg	Fri Feb 22 08:54:29 2013 -0300
 @@ -0,0 +1,88 @@
 +<?xml version="1.0"?>
 +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
@@ -16119,22 +19191,11 @@ new file mode 100644
 +  </g>
 +
 +</svg>
-diff --git a/iphone/res/zbar-back.png b/iphone/res/zbar-back.png
-new file mode 100644
-index 0000000000000000000000000000000000000000..6a0681d0deeaa2cfbeffa620ea31a3cc279fd0da
-GIT binary patch
-literal 319
-zc%17D@N?(olHy`uVBq!ia0vp^vOp}s!VDz86uj;SQVPi)LB0$ORcZ_j4J`}|zkosw
-zFBlj~4Hy_+B``2p&0t^<FPO6{&;}^MlJ4m1$iT3%ujY5)WFVihILO_JVcj{Imp~3@
-zfk$L90|Va?5N4dJ%_j{MR1fe8aRt)<i2&<ty)1!Bc}jx(f*F|OG7cU-b?w&OH-7?y
-zl5IhjC3(BM@HB1?Oa^iSJY5_^B*M3z+9=pyz~daaydgA!b%jv{7u$(|n52^%**bQ8
-z_fOj$HczYO_wqAxKJ#MA+8k#s@t<H<b@_iUgZl!>Lma2&CZ(T{bIf_VD(OCd&<l@Q
-U9$QY%0-DX>>FVdQ&MBb@08P+*g8%>k
-
-diff --git a/iphone/res/zbar-back.svg b/iphone/res/zbar-back.svg
-new file mode 100644
---- /dev/null
-+++ b/iphone/res/zbar-back.svg
+diff -r 563557a923d0 iphone/res/zbar-back.png
+Binary file iphone/res/zbar-back.png has changed
+diff -r 563557a923d0 iphone/res/zbar-back.svg
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/res/zbar-back.svg	Fri Feb 22 08:54:29 2013 -0300
 @@ -0,0 +1,31 @@
 +<?xml version="1.0"?>
 +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
@@ -16167,11 +19228,10 @@ new file mode 100644
 +    <path id="arrow" d="M.1,.5 L.9,.1 .9,.9 z"/>
 +  </g>
 +</svg>
-diff --git a/iphone/res/zbar-help.html b/iphone/res/zbar-help.html
-new file mode 100644
---- /dev/null
-+++ b/iphone/res/zbar-help.html
-@@ -0,0 +1,88 @@
+diff -r 563557a923d0 iphone/res/zbar-help.html
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/res/zbar-help.html	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,89 @@
 +<?xml version="1.0"?>
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
 +"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
@@ -16220,6 +19280,7 @@ new file mode 100644
 +<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/Codabar">Codabar</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>
@@ -16260,400 +19321,14 @@ new file mode 100644
 +</script>
 +</body>
 +</html>
-diff --git a/iphone/res/zbar-helpicons.png b/iphone/res/zbar-helpicons.png
-new file mode 100644
-index 0000000000000000000000000000000000000000..2a07e7c44478cd30a1e297395de2f25c8a7bb52a
-GIT binary patch
-literal 18350
-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
-JPDHLkV1mE0dd2_%
-
-diff --git a/iphone/res/zbar-samples.png b/iphone/res/zbar-samples.png
-new file mode 100644
-index 0000000000000000000000000000000000000000..7c805e2ca96ad96e391803e6ffb0bdb35f9696ed
-GIT binary patch
-literal 1181
-zc$@*91Y-M%P)<h;3K|Lk000e1NJLTq007ni003YJ00000L>tqZ00009a7bBm0000;
-z0000;07l7cJ^%m&Pf0{URCwC$oIhylTok}Fbu14$35AS>4!PR{LFm#Y&_(F>aH)e^
-z=_DDl+`*-|38jm;b$GZ44&8L<^gwWUn?n#XxP{>6@_R#K%%>);{qM&)keHi$PjY`=
-z@9~`DjRyZqF$7Dn1WT|4OR(N7c4&vT8QP{9VuxUdtCL`d*rplUp>0Ml%hn<B7Aq#D
-z=xBK@JNzOn6{tWNfijE$6@Us>CqV@$!w6KMjOb<AIw0O+#iSG+Ew815tyso3NvhHZ
-zYx^uM!4j-jV6EGe)R{HPq?oTISc3Hmtj#W`i)&;#T7o55AAz-L=><!$z62}F;}9&t
-z`ZzCR?R=IOyl>8vV0}}pt&!8S`~3_f1?xLvWy!N1$BRX<1Zy`hBg?s9TQcCeStVG4
-zwZq)n+PkeC-#W>1$plNVcJMOR5I19~twDd*yCPVEwQIcfY~ZyS=x;U_EWvu6f!`X?
-z=i_GOp9D*=-k5oMNv@sjOn_hs*4yK)O{Zh)@8SF7WeC>3Vr_C{Wu9J^krFJy+Reb{
-zpyX%kzxVf+V0~+>EXm15W%<a0C0OsiRyPZU+|0dT3D!HV%gD++<<CFC60CPzp_b!@
-z?BZ((mSDXJ%g9|s`R&u6`-o-9Xz{XTlKF-|AIsVi%UWSs?=)H;h-KwsSvjL+#aQ8&
-zWBDGw=YdbO;WK6GMWw0d;p2OrhmQ)Zz@OrKEVo$E_h9PbM|ysAo!30Sm6ZU<NzA9k
-zZ{E*Y-Fnn$&l$R|)&pj(<_sp<bv=MvSUfbwq*^o7odrM}m^E87fPn`*=mF5veZB;1
-zR;bpBi{#c%1?S>|fveq<ZeU(l%mvMo)*jF_p!TzVG){H2TX2e3z`X&BlS;*0!02!Q
-zHRT+4xK*yz{1U8I1**N|)(waG0l@H*+iSS<x#|EgJ~p5>quxki)w%=+P%j(MKZo-^
-zU3EGDE1-9d-KTE@R-giCUQb>cZ$0~KPkxjJjXF_JqmFvTdf5R`6E5#6b{|yn;5=ku
-z^$dWX8k2MsV0;2247jaBy~*E2X&Aj>ReB}2)J?7(c1johPr@1%em@j+Y#rdqa>`dg
-zuMB6Z_fQy99WJVMZmJkScv*amY>6L#h^<~c0@?+wfzklr&+(MIqFZdITThDR&%vT=
-z-_%-3sr(yG$8gz&i(WjC49@-@+-SoE@Q(gta8!Hw!D>dM1!n_bXpZ2=jM<M>W6x2}
-z^mCr+_wV5BDJfob;dBH?Avi6#x}W@l_SMwYuA#9e%ns8ACmJhQ&8-OQ&*=m>4ARY8
-zR(rlSw?0hfX039zDn1_9%O#kc08{g(Y6cW9>&N4`JC1TyBc)wd+SPI0!mLzI77<oh
-zC~MuuQLb{5#=)i~{J`Ogzqgiit<j#tv>jEoe3;+gMi$Hkx{b%QvevG4mvysda|Y1y
-vn7Z249q8-c<{jm4Km<#$1WT|4YoFvFczj9D2djhT00000NkvXXu0mjf>ajvZ
-
-diff --git a/iphone/zbar.xcodeproj/project.pbxproj b/iphone/zbar.xcodeproj/project.pbxproj
-new file mode 100644
---- /dev/null
-+++ b/iphone/zbar.xcodeproj/project.pbxproj
-@@ -0,0 +1,993 @@
+diff -r 563557a923d0 iphone/res/zbar-helpicons.png
+Binary file iphone/res/zbar-helpicons.png has changed
+diff -r 563557a923d0 iphone/res/zbar-samples.png
+Binary file iphone/res/zbar-samples.png has changed
+diff -r 563557a923d0 iphone/zbar.xcodeproj/project.pbxproj
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/zbar.xcodeproj/project.pbxproj	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,1105 @@
 +// !$*UTF8*$!
 +{
 +	archiveVersion = 1;
@@ -16697,6 +19372,7 @@ new file mode 100644
 +
 +/* Begin PBXBuildFile section */
 +		DC26004C118631C200FA987B /* ZBarCaptureReader.m in Sources */ = {isa = PBXBuildFile; fileRef = DC26004B118631C200FA987B /* ZBarCaptureReader.m */; };
++		DC290E281351496400A9B857 /* codabar.c in Sources */ = {isa = PBXBuildFile; fileRef = DC290E261351496400A9B857 /* codabar.c */; };
 +		DC299A9D1208B5E8006A023C /* libzbar.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D2AAC07E0554694100DB518D /* libzbar.a */; };
 +		DC299AA01208B61C006A023C /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC50453D1203396B009FF359 /* AVFoundation.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
 +		DC299AA11208B61C006A023C /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC50453F1203396B009FF359 /* CoreMedia.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
@@ -16747,6 +19423,8 @@ new file mode 100644
 +		DC48C5A8121B1F910047193B /* Documentation.html in Copy SDK */ = {isa = PBXBuildFile; fileRef = DC48C5A7121B1F840047193B /* Documentation.html */; };
 +		DC4920EE10A70475000E4D43 /* ZBarImage.m in Sources */ = {isa = PBXBuildFile; fileRef = DC4920EC10A70475000E4D43 /* ZBarImage.m */; };
 +		DC4920EF10A70475000E4D43 /* ZBarImageScanner.m in Sources */ = {isa = PBXBuildFile; fileRef = DC4920ED10A70475000E4D43 /* ZBarImageScanner.m */; };
++		DC5D76C3136FA8C40069AEF5 /* ZBarCameraSimulator.m in Sources */ = {isa = PBXBuildFile; fileRef = DC5D76C2136FA8C40069AEF5 /* ZBarCameraSimulator.m */; };
++		DC5D76C6136FA94B0069AEF5 /* ZBarCameraSimulator.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = DC5D76C5136FA8F20069AEF5 /* ZBarCameraSimulator.h */; };
 +		DC67C17110A07AD30033B702 /* config.c in Sources */ = {isa = PBXBuildFile; fileRef = DC67C11F10A07AD30033B702 /* config.c */; };
 +		DC67C17410A07AD30033B702 /* code128.c in Sources */ = {isa = PBXBuildFile; fileRef = DC67C12310A07AD30033B702 /* code128.c */; };
 +		DC67C17610A07AD30033B702 /* code39.c in Sources */ = {isa = PBXBuildFile; fileRef = DC67C12510A07AD30033B702 /* code39.c */; };
@@ -16770,7 +19448,10 @@ new file mode 100644
 +		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 */; };
++		DC8245EF1629DC340010B2E6 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DC8245EE1629DC140010B2E6 /* Default-568h@2x.png */; };
 +		DCB3789B12A43CAC0059B07B /* ZBarHelpController.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = DCB3789A12A43C7E0059B07B /* ZBarHelpController.h */; };
++		DCC93259137B50CB0040A82D /* EmbedReader in Copy Examples */ = {isa = PBXBuildFile; fileRef = DCC9324E137B509B0040A82D /* EmbedReader */; };
++		DCC9325A137B50CB0040A82D /* TabReader in Copy Examples */ = {isa = PBXBuildFile; fileRef = DCC9324F137B509B0040A82D /* TabReader */; };
 +		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 */; };
@@ -16807,6 +19488,7 @@ new file mode 100644
 +			dstPath = Headers/ZBarSDK;
 +			dstSubfolderSpec = 1;
 +			files = (
++				DC5D76C6136FA94B0069AEF5 /* ZBarCameraSimulator.h in Copy Headers */,
 +				DC3CEFB51216349700D7A786 /* ZBarCaptureReader.h in Copy Headers */,
 +				DCB3789B12A43CAC0059B07B /* ZBarHelpController.h in Copy Headers */,
 +				DC3CEFB61216349700D7A786 /* ZBarImage.h in Copy Headers */,
@@ -16862,6 +19544,8 @@ new file mode 100644
 +			files = (
 +				DC3CF29A1218359400D7A786 /* ReaderSample in Copy Examples */,
 +				DC3CF29B1218359400D7A786 /* readertest in Copy Examples */,
++				DCC93259137B50CB0040A82D /* EmbedReader in Copy Examples */,
++				DCC9325A137B50CB0040A82D /* TabReader in Copy Examples */,
 +			);
 +			name = "Copy Examples";
 +			runOnlyForDeploymentPostprocessing = 0;
@@ -16892,6 +19576,8 @@ new file mode 100644
 +		DC1A49A411FF33B300BCDA30 /* zbar-samples.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "zbar-samples.png"; path = "res/zbar-samples.png"; sourceTree = "<group>"; };
 +		DC1A49C111FF537000BCDA30 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
 +		DC26004B118631C200FA987B /* ZBarCaptureReader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ZBarCaptureReader.m; sourceTree = "<group>"; usesTabs = 0; };
++		DC290E261351496400A9B857 /* codabar.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = codabar.c; sourceTree = "<group>"; };
++		DC290E271351496400A9B857 /* codabar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = codabar.h; sourceTree = "<group>"; };
 +		DC299AF51208B7BD006A023C /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = config.h; path = include/config.h; sourceTree = "<group>"; };
 +		DC299B051208FC11006A023C /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
 +		DC299BEC1208FE40006A023C /* prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = prefix.pch; path = include/prefix.pch; sourceTree = "<group>"; };
@@ -16934,6 +19620,8 @@ new file mode 100644
 +		DC50467B12034D60009FF359 /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README; sourceTree = "<group>"; };
 +		DC50467C12034D71009FF359 /* COPYING */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = COPYING; path = ../COPYING; sourceTree = SOURCE_ROOT; };
 +		DC50467D12034D71009FF359 /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = SOURCE_ROOT; };
++		DC5D76C2136FA8C40069AEF5 /* ZBarCameraSimulator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ZBarCameraSimulator.m; sourceTree = "<group>"; };
++		DC5D76C5136FA8F20069AEF5 /* ZBarCameraSimulator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ZBarCameraSimulator.h; path = include/ZBarSDK/ZBarCameraSimulator.h; sourceTree = "<group>"; };
 +		DC67C08210A079BE0033B702 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
 +		DC67C11710A07A810033B702 /* zbar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = zbar.h; path = ../include/zbar.h; sourceTree = SOURCE_ROOT; usesTabs = 0; };
 +		DC67C11F10A07AD30033B702 /* config.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = config.c; sourceTree = "<group>"; usesTabs = 0; };
@@ -16979,7 +19667,10 @@ new file mode 100644
 +		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; };
++		DC8245EE1629DC140010B2E6 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-568h@2x.png"; path = "examples/readertest/Default-568h@2x.png"; sourceTree = "<group>"; };
 +		DCB3789A12A43C7E0059B07B /* ZBarHelpController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ZBarHelpController.h; path = include/ZBarSDK/ZBarHelpController.h; sourceTree = "<group>"; };
++		DCC9324E137B509B0040A82D /* EmbedReader */ = {isa = PBXFileReference; lastKnownFileType = folder; name = EmbedReader; path = examples/EmbedReader; sourceTree = "<group>"; };
++		DCC9324F137B509B0040A82D /* TabReader */ = {isa = PBXFileReference; lastKnownFileType = folder; name = TabReader; path = examples/TabReader; 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>"; };
@@ -17066,6 +19757,7 @@ new file mode 100644
 +		DC299BE41208FE09006A023C /* ZBarSDK */ = {
 +			isa = PBXGroup;
 +			children = (
++				DC5D76C5136FA8F20069AEF5 /* ZBarCameraSimulator.h */,
 +				DC3CEFA51216347100D7A786 /* ZBarCaptureReader.h */,
 +				DCB3789A12A43C7E0059B07B /* ZBarHelpController.h */,
 +				DC3CEFA61216347100D7A786 /* ZBarImage.h */,
@@ -17092,6 +19784,7 @@ new file mode 100644
 +				DCDC6E2F11ADCA8E00021380 /* ZBarReaderView.m */,
 +				DC3CE47611FA1622008FAF88 /* ZBarReaderViewImpl_Capture.m */,
 +				DC3CE47711FA1622008FAF88 /* ZBarReaderViewImpl_Simulator.m */,
++				DC5D76C2136FA8C40069AEF5 /* ZBarCameraSimulator.m */,
 +				DC67C1BE10A07B6B0033B702 /* ZBarHelpController.m */,
 +				DC3EBB2C119DDB2100107EE9 /* ZBarReaderViewController.m */,
 +				DC67C1BF10A07B6B0033B702 /* ZBarReaderController.m */,
@@ -17105,6 +19798,8 @@ new file mode 100644
 +			children = (
 +				DC3CF2081218358C00D7A786 /* ReaderSample */,
 +				DC3CF2651218358C00D7A786 /* readertest */,
++				DCC9324E137B509B0040A82D /* EmbedReader */,
++				DCC9324F137B509B0040A82D /* TabReader */,
 +			);
 +			name = Examples;
 +			sourceTree = "<group>";
@@ -17112,6 +19807,7 @@ new file mode 100644
 +		DC48C5361219FE2F0047193B /* readertest */ = {
 +			isa = PBXGroup;
 +			children = (
++				DC8245EE1629DC140010B2E6 /* Default-568h@2x.png */,
 +				DC48C5401219FE550047193B /* readertest.m */,
 +			);
 +			name = readertest;
@@ -17186,6 +19882,8 @@ new file mode 100644
 +				DC67C12610A07AD30033B702 /* code39.h */,
 +				DC67C12710A07AD30033B702 /* ean.c */,
 +				DC67C12810A07AD30033B702 /* ean.h */,
++				DC290E261351496400A9B857 /* codabar.c */,
++				DC290E271351496400A9B857 /* codabar.h */,
 +				DC67C12910A07AD30033B702 /* i25.c */,
 +				DC67C12A10A07AD30033B702 /* i25.h */,
 +				DC67C12E10A07AD30033B702 /* qr_finder.c */,
@@ -17289,6 +19987,7 @@ new file mode 100644
 +				DC299AA61208B63C006A023C /* zbar-helpicons.png in Resources */,
 +				DC299AA71208B63C006A023C /* zbar-samples.png in Resources */,
 +				DC48C5341219FDDE0047193B /* zbar-back.png in Resources */,
++				DC8245EF1629DC340010B2E6 /* Default-568h@2x.png in Resources */,
 +			);
 +			runOnlyForDeploymentPostprocessing = 0;
 +		};
@@ -17380,6 +20079,8 @@ new file mode 100644
 +				DC3CE47811FA1622008FAF88 /* ZBarReaderViewImpl_Capture.m in Sources */,
 +				DC3CE47911FA1622008FAF88 /* ZBarReaderViewImpl_Simulator.m in Sources */,
 +				DCE9900D129719F100D2655C /* code93.c in Sources */,
++				DC5D76C3136FA8C40069AEF5 /* ZBarCameraSimulator.m in Sources */,
++				DC290E281351496400A9B857 /* codabar.c in Sources */,
 +			);
 +			runOnlyForDeploymentPostprocessing = 0;
 +		};
@@ -17416,7 +20117,6 @@ new file mode 100644
 +			isa = XCBuildConfiguration;
 +			buildSettings = {
 +				ALWAYS_SEARCH_USER_PATHS = NO;
-+				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
 +				COPY_PHASE_STRIP = NO;
 +				GCC_DYNAMIC_NO_PIC = NO;
 +				GCC_ENABLE_FIX_AND_CONTINUE = YES;
@@ -17431,6 +20131,7 @@ new file mode 100644
 +				);
 +				OTHER_LDFLAGS = "";
 +				PRODUCT_NAME = zbar;
++				SKIP_INSTALL = YES;
 +			};
 +			name = Debug;
 +		};
@@ -17438,7 +20139,6 @@ new file mode 100644
 +			isa = XCBuildConfiguration;
 +			buildSettings = {
 +				ALWAYS_SEARCH_USER_PATHS = NO;
-+				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
 +				GCC_MODEL_TUNING = G5;
 +				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 +				GCC_PREFIX_HEADER = include/prefix.pch;
@@ -17449,6 +20149,7 @@ new file mode 100644
 +				);
 +				OTHER_LDFLAGS = "";
 +				PRODUCT_NAME = zbar;
++				SKIP_INSTALL = YES;
 +			};
 +			name = Release;
 +		};
@@ -17456,6 +20157,7 @@ new file mode 100644
 +			isa = XCBuildConfiguration;
 +			buildSettings = {
 +				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
++				CODE_SIGN_IDENTITY = "iPhone Developer";
 +				EXCLUDED_SOURCE_FILE_NAMES = "";
 +				"EXCLUDED_SOURCE_FILE_NAMES[sdk=iphoneos*][arch=*]" = ZBarReaderViewImpl_Simulator.m;
 +				"EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*][arch=*]" = (
@@ -17467,9 +20169,10 @@ new file mode 100644
 +				GCC_PREPROCESSOR_DEFINITIONS = "DEBUG_OBJC=1";
 +				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 +				GCC_WARN_UNUSED_VARIABLE = YES;
-+				IPHONEOS_DEPLOYMENT_TARGET = 3.0;
-+				OTHER_LDFLAGS = "-ObjC";
++				IPHONEOS_DEPLOYMENT_TARGET = 3.1;
++				OTHER_LDFLAGS = "-all_load";
 +				PREBINDING = NO;
++				PROVISIONING_PROFILE = "";
 +				RUN_CLANG_STATIC_ANALYZER = NO;
 +				SDKROOT = iphoneos;
 +				USE_HEADERMAP = NO;
@@ -17480,6 +20183,7 @@ new file mode 100644
 +			isa = XCBuildConfiguration;
 +			buildSettings = {
 +				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
++				CODE_SIGN_IDENTITY = "iPhone Developer";
 +				EXCLUDED_SOURCE_FILE_NAMES = "";
 +				"EXCLUDED_SOURCE_FILE_NAMES[sdk=iphoneos*][arch=*]" = ZBarReaderViewImpl_Simulator.m;
 +				"EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*][arch=*]" = (
@@ -17490,9 +20194,10 @@ new file mode 100644
 +				GCC_PREPROCESSOR_DEFINITIONS = "NDEBUG=1";
 +				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 +				GCC_WARN_UNUSED_VARIABLE = YES;
-+				IPHONEOS_DEPLOYMENT_TARGET = 3.0;
-+				OTHER_LDFLAGS = "-ObjC";
++				IPHONEOS_DEPLOYMENT_TARGET = 3.1;
++				OTHER_LDFLAGS = "-all_load";
 +				PREBINDING = NO;
++				PROVISIONING_PROFILE = "";
 +				RUN_CLANG_STATIC_ANALYZER = NO;
 +				SDKROOT = iphoneos;
 +				USE_HEADERMAP = NO;
@@ -17521,7 +20226,6 @@ new file mode 100644
 +			isa = XCBuildConfiguration;
 +			buildSettings = {
 +				ALWAYS_SEARCH_USER_PATHS = NO;
-+				CODE_SIGN_IDENTITY = "iPhone Developer";
 +				COPY_PHASE_STRIP = NO;
 +				GCC_DYNAMIC_NO_PIC = NO;
 +				GCC_OPTIMIZATION_LEVEL = 0;
@@ -17533,14 +20237,10 @@ new file mode 100644
 +				);
 +				INFOPLIST_FILE = examples/readertest/readertest.plist;
 +				INSTALL_PATH = "$(HOME)/Applications";
-+				OTHER_LDFLAGS = (
-+					"-framework",
-+					Foundation,
-+					"-framework",
-+					UIKit,
-+				);
++				IPHONEOS_DEPLOYMENT_TARGET = 4.0;
 +				PREBINDING = NO;
 +				PRODUCT_NAME = readertest;
++				TARGETED_DEVICE_FAMILY = "1,2";
 +			};
 +			name = Debug;
 +		};
@@ -17548,7 +20248,6 @@ new file mode 100644
 +			isa = XCBuildConfiguration;
 +			buildSettings = {
 +				ALWAYS_SEARCH_USER_PATHS = NO;
-+				CODE_SIGN_IDENTITY = "iPhone Developer";
 +				COPY_PHASE_STRIP = YES;
 +				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 +				GCC_ENABLE_FIX_AND_CONTINUE = NO;
@@ -17560,18 +20259,101 @@ new file mode 100644
 +				);
 +				INFOPLIST_FILE = examples/readertest/readertest.plist;
 +				INSTALL_PATH = "$(HOME)/Applications";
-+				OTHER_LDFLAGS = (
-+					"-framework",
-+					Foundation,
-+					"-framework",
-+					UIKit,
-+				);
++				IPHONEOS_DEPLOYMENT_TARGET = 4.0;
 +				PREBINDING = NO;
 +				PRODUCT_NAME = readertest;
++				TARGETED_DEVICE_FAMILY = "1,2";
 +				ZERO_LINK = NO;
 +			};
 +			name = Release;
 +		};
++		DC3748D71357BC69004E69D6 /* Distribution */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
++				CODE_SIGN_IDENTITY = "iPhone Distribution";
++				EXCLUDED_SOURCE_FILE_NAMES = "";
++				"EXCLUDED_SOURCE_FILE_NAMES[sdk=iphoneos*][arch=*]" = ZBarReaderViewImpl_Simulator.m;
++				"EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*][arch=*]" = (
++					ZBarReaderViewImpl_Capture.m,
++					ZBarCaptureReader.m,
++				);
++				GCC_C_LANGUAGE_STANDARD = c99;
++				GCC_PREPROCESSOR_DEFINITIONS = "NDEBUG=1";
++				GCC_WARN_ABOUT_RETURN_TYPE = YES;
++				GCC_WARN_UNUSED_VARIABLE = YES;
++				IPHONEOS_DEPLOYMENT_TARGET = 3.1;
++				OTHER_LDFLAGS = "-all_load";
++				PREBINDING = NO;
++				PROVISIONING_PROFILE = "";
++				RUN_CLANG_STATIC_ANALYZER = NO;
++				SDKROOT = iphoneos;
++				USE_HEADERMAP = NO;
++			};
++			name = Distribution;
++		};
++		DC3748D81357BC69004E69D6 /* Distribution */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				ALWAYS_SEARCH_USER_PATHS = NO;
++				GCC_MODEL_TUNING = G5;
++				GCC_PRECOMPILE_PREFIX_HEADER = YES;
++				GCC_PREFIX_HEADER = include/prefix.pch;
++				HEADER_SEARCH_PATHS = (
++					include,
++					../include,
++					../zbar,
++				);
++				OTHER_LDFLAGS = "";
++				PRODUCT_NAME = zbar;
++				SKIP_INSTALL = YES;
++			};
++			name = Distribution;
++		};
++		DC3748D91357BC69004E69D6 /* Distribution */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				COPY_PHASE_STRIP = YES;
++				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
++				GCC_ENABLE_FIX_AND_CONTINUE = NO;
++				PRODUCT_NAME = ZBarSDK;
++				TARGET_BUILD_DIR = "$(TARGET_BUILD_DIR)/$(PRODUCT_NAME)";
++				ZERO_LINK = NO;
++			};
++			name = Distribution;
++		};
++		DC3748DA1357BC69004E69D6 /* Distribution */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				COPY_PHASE_STRIP = NO;
++				PRODUCT_NAME = ZBarSDK.dmg;
++				TARGET_BUILD_DIR = "$(TARGET_BUILD_DIR)/$(PRODUCT_NAME)";
++			};
++			name = Distribution;
++		};
++		DC3748DB1357BC69004E69D6 /* Distribution */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				ALWAYS_SEARCH_USER_PATHS = NO;
++				COPY_PHASE_STRIP = YES;
++				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
++				GCC_ENABLE_FIX_AND_CONTINUE = NO;
++				GCC_PRECOMPILE_PREFIX_HEADER = YES;
++				GCC_PREFIX_HEADER = examples/readertest/prefix.pch;
++				HEADER_SEARCH_PATHS = (
++					include/ZBarSDK,
++					../include,
++				);
++				INFOPLIST_FILE = examples/readertest/readertest.plist;
++				INSTALL_PATH = "$(HOME)/Applications";
++				IPHONEOS_DEPLOYMENT_TARGET = 4.0;
++				PREBINDING = NO;
++				PRODUCT_NAME = readertest;
++				TARGETED_DEVICE_FAMILY = "1,2";
++				ZERO_LINK = NO;
++			};
++			name = Distribution;
++		};
 +		DC3CEE831215C7EF00D7A786 /* Debug */ = {
 +			isa = XCBuildConfiguration;
 +			buildSettings = {
@@ -17603,54 +20385,339 @@ new file mode 100644
 +			buildConfigurations = (
 +				1DEB921F08733DC00010E9CD /* Debug */,
 +				1DEB922008733DC00010E9CD /* Release */,
++				DC3748D81357BC69004E69D6 /* Distribution */,
 +			);
 +			defaultConfigurationIsVisible = 0;
-+			defaultConfigurationName = Release;
++			defaultConfigurationName = Distribution;
 +		};
 +		1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "zbar" */ = {
 +			isa = XCConfigurationList;
 +			buildConfigurations = (
 +				1DEB922308733DC00010E9CD /* Debug */,
 +				1DEB922408733DC00010E9CD /* Release */,
++				DC3748D71357BC69004E69D6 /* Distribution */,
 +			);
 +			defaultConfigurationIsVisible = 0;
-+			defaultConfigurationName = Release;
++			defaultConfigurationName = Distribution;
 +		};
 +		DC1A4A5311FF5D3D00BCDA30 /* Build configuration list for PBXAggregateTarget "ZBarSDK.dmg" */ = {
 +			isa = XCConfigurationList;
 +			buildConfigurations = (
 +				DC1A4A4F11FF5D0500BCDA30 /* Debug */,
 +				DC1A4A5011FF5D0500BCDA30 /* Release */,
++				DC3748DA1357BC69004E69D6 /* Distribution */,
 +			);
 +			defaultConfigurationIsVisible = 0;
-+			defaultConfigurationName = Release;
++			defaultConfigurationName = Distribution;
 +		};
 +		DC299A9A1208B5D5006A023C /* Build configuration list for PBXNativeTarget "readertest" */ = {
 +			isa = XCConfigurationList;
 +			buildConfigurations = (
 +				DC299A981208B5D5006A023C /* Debug */,
 +				DC299A991208B5D5006A023C /* Release */,
++				DC3748DB1357BC69004E69D6 /* Distribution */,
 +			);
 +			defaultConfigurationIsVisible = 0;
-+			defaultConfigurationName = Release;
++			defaultConfigurationName = Distribution;
 +		};
 +		DC3CEE851215C83500D7A786 /* Build configuration list for PBXAggregateTarget "ZBarSDK" */ = {
 +			isa = XCConfigurationList;
 +			buildConfigurations = (
 +				DC3CEE831215C7EF00D7A786 /* Debug */,
 +				DC3CEE841215C7EF00D7A786 /* Release */,
++				DC3748D91357BC69004E69D6 /* Distribution */,
 +			);
 +			defaultConfigurationIsVisible = 0;
-+			defaultConfigurationName = Release;
++			defaultConfigurationName = Distribution;
 +		};
 +/* End XCConfigurationList section */
 +	};
 +	rootObject = 0867D690FE84028FC02AAC07 /* Project object */;
 +}
-diff --git a/java/Makefile.am b/java/Makefile.am
-new file mode 100644
---- /dev/null
-+++ b/java/Makefile.am
+diff -r 563557a923d0 iphone/zbar.xcodeproj/xcshareddata/xcschemes/ZBarSDK.dmg.xcscheme
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/zbar.xcodeproj/xcshareddata/xcschemes/ZBarSDK.dmg.xcscheme	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,62 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<Scheme
++   version = "1.8">
++   <BuildAction
++      parallelizeBuildables = "YES"
++      buildImplicitDependencies = "YES">
++      <BuildActionEntries>
++         <BuildActionEntry
++            buildForTesting = "YES"
++            buildForRunning = "YES"
++            buildForProfiling = "YES"
++            buildForArchiving = "YES"
++            buildForAnalyzing = "YES">
++            <BuildableReference
++               BuildableIdentifier = "primary"
++               BlueprintIdentifier = "DC1A4A4E11FF5D0500BCDA30"
++               BuildableName = "ZBarSDK.dmg"
++               BlueprintName = "ZBarSDK.dmg"
++               ReferencedContainer = "container:zbar.xcodeproj">
++            </BuildableReference>
++         </BuildActionEntry>
++      </BuildActionEntries>
++   </BuildAction>
++   <TestAction
++      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
++      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
++      shouldUseLaunchSchemeArgsEnv = "YES"
++      buildConfiguration = "Release">
++      <Testables>
++      </Testables>
++   </TestAction>
++   <LaunchAction
++      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
++      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
++      displayScaleIsEnabled = "NO"
++      displayScale = "1.00"
++      launchStyle = "0"
++      useCustomWorkingDirectory = "NO"
++      buildConfiguration = "Release"
++      ignoresPersistentStateOnLaunch = "NO"
++      debugDocumentVersioning = "YES"
++      allowLocationSimulation = "YES">
++      <AdditionalOptions>
++      </AdditionalOptions>
++   </LaunchAction>
++   <ProfileAction
++      displayScaleIsEnabled = "NO"
++      displayScale = "1.00"
++      shouldUseLaunchSchemeArgsEnv = "YES"
++      savedToolIdentifier = ""
++      useCustomWorkingDirectory = "NO"
++      buildConfiguration = "Release"
++      debugDocumentVersioning = "YES">
++   </ProfileAction>
++   <AnalyzeAction
++      buildConfiguration = "Release">
++   </AnalyzeAction>
++   <ArchiveAction
++      buildConfiguration = "Release"
++      revealArchiveInOrganizer = "YES">
++   </ArchiveAction>
++</Scheme>
+diff -r 563557a923d0 iphone/zbar.xcodeproj/xcshareddata/xcschemes/ZBarSDK.xcscheme
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/zbar.xcodeproj/xcshareddata/xcschemes/ZBarSDK.xcscheme	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,62 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<Scheme
++   version = "1.8">
++   <BuildAction
++      parallelizeBuildables = "YES"
++      buildImplicitDependencies = "YES">
++      <BuildActionEntries>
++         <BuildActionEntry
++            buildForTesting = "YES"
++            buildForRunning = "YES"
++            buildForProfiling = "YES"
++            buildForArchiving = "YES"
++            buildForAnalyzing = "YES">
++            <BuildableReference
++               BuildableIdentifier = "primary"
++               BlueprintIdentifier = "DC3CEE821215C7EF00D7A786"
++               BuildableName = "ZBarSDK"
++               BlueprintName = "ZBarSDK"
++               ReferencedContainer = "container:zbar.xcodeproj">
++            </BuildableReference>
++         </BuildActionEntry>
++      </BuildActionEntries>
++   </BuildAction>
++   <TestAction
++      selectedDebuggerIdentifier = ""
++      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
++      shouldUseLaunchSchemeArgsEnv = "YES"
++      buildConfiguration = "Release">
++      <Testables>
++      </Testables>
++   </TestAction>
++   <LaunchAction
++      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
++      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
++      displayScaleIsEnabled = "NO"
++      displayScale = "1.00"
++      launchStyle = "0"
++      useCustomWorkingDirectory = "NO"
++      buildConfiguration = "Debug"
++      ignoresPersistentStateOnLaunch = "NO"
++      debugDocumentVersioning = "YES"
++      allowLocationSimulation = "YES">
++      <AdditionalOptions>
++      </AdditionalOptions>
++   </LaunchAction>
++   <ProfileAction
++      displayScaleIsEnabled = "NO"
++      displayScale = "1.00"
++      shouldUseLaunchSchemeArgsEnv = "YES"
++      savedToolIdentifier = ""
++      useCustomWorkingDirectory = "NO"
++      buildConfiguration = "Release"
++      debugDocumentVersioning = "YES">
++   </ProfileAction>
++   <AnalyzeAction
++      buildConfiguration = "Release">
++   </AnalyzeAction>
++   <ArchiveAction
++      buildConfiguration = "Release"
++      revealArchiveInOrganizer = "YES">
++   </ArchiveAction>
++</Scheme>
+diff -r 563557a923d0 iphone/zbar.xcodeproj/xcshareddata/xcschemes/libzbar.xcscheme
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/zbar.xcodeproj/xcshareddata/xcschemes/libzbar.xcscheme	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,58 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<Scheme
++   version = "1.3">
++   <BuildAction
++      parallelizeBuildables = "YES"
++      buildImplicitDependencies = "YES">
++      <BuildActionEntries>
++         <BuildActionEntry
++            buildForTesting = "YES"
++            buildForRunning = "YES"
++            buildForProfiling = "YES"
++            buildForArchiving = "YES"
++            buildForAnalyzing = "YES">
++            <BuildableReference
++               BuildableIdentifier = "primary"
++               BlueprintIdentifier = "D2AAC07D0554694100DB518D"
++               BuildableName = "libzbar.a"
++               BlueprintName = "libzbar"
++               ReferencedContainer = "container:zbar.xcodeproj">
++            </BuildableReference>
++         </BuildActionEntry>
++      </BuildActionEntries>
++   </BuildAction>
++   <TestAction
++      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
++      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
++      shouldUseLaunchSchemeArgsEnv = "YES"
++      buildConfiguration = "Debug">
++      <Testables>
++      </Testables>
++   </TestAction>
++   <LaunchAction
++      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
++      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
++      displayScaleIsEnabled = "NO"
++      displayScale = "1.00"
++      launchStyle = "0"
++      useCustomWorkingDirectory = "NO"
++      buildConfiguration = "Debug">
++      <AdditionalOptions>
++      </AdditionalOptions>
++   </LaunchAction>
++   <ProfileAction
++      displayScaleIsEnabled = "NO"
++      displayScale = "1.00"
++      shouldUseLaunchSchemeArgsEnv = "YES"
++      savedToolIdentifier = ""
++      useCustomWorkingDirectory = "NO"
++      buildConfiguration = "Release">
++   </ProfileAction>
++   <AnalyzeAction
++      buildConfiguration = "Debug">
++   </AnalyzeAction>
++   <ArchiveAction
++      buildConfiguration = "Release"
++      revealArchiveInOrganizer = "YES">
++   </ArchiveAction>
++</Scheme>
+diff -r 563557a923d0 iphone/zbar.xcodeproj/xcshareddata/xcschemes/readertest.xcscheme
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/iphone/zbar.xcodeproj/xcshareddata/xcschemes/readertest.xcscheme	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,83 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<Scheme
++   version = "1.3">
++   <BuildAction
++      parallelizeBuildables = "YES"
++      buildImplicitDependencies = "YES">
++      <BuildActionEntries>
++         <BuildActionEntry
++            buildForTesting = "YES"
++            buildForRunning = "YES"
++            buildForProfiling = "YES"
++            buildForArchiving = "YES"
++            buildForAnalyzing = "YES">
++            <BuildableReference
++               BuildableIdentifier = "primary"
++               BlueprintIdentifier = "DC299A941208B5D4006A023C"
++               BuildableName = "readertest.app"
++               BlueprintName = "readertest"
++               ReferencedContainer = "container:zbar.xcodeproj">
++            </BuildableReference>
++         </BuildActionEntry>
++      </BuildActionEntries>
++   </BuildAction>
++   <TestAction
++      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
++      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
++      shouldUseLaunchSchemeArgsEnv = "YES"
++      buildConfiguration = "Debug">
++      <Testables>
++      </Testables>
++   </TestAction>
++   <LaunchAction
++      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
++      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
++      displayScaleIsEnabled = "NO"
++      displayScale = "1.00"
++      launchStyle = "0"
++      useCustomWorkingDirectory = "NO"
++      buildConfiguration = "Debug">
++      <BuildableProductRunnable>
++         <BuildableReference
++            BuildableIdentifier = "primary"
++            BlueprintIdentifier = "DC299A941208B5D4006A023C"
++            BuildableName = "readertest.app"
++            BlueprintName = "readertest"
++            ReferencedContainer = "container:zbar.xcodeproj">
++         </BuildableReference>
++      </BuildableProductRunnable>
++      <EnvironmentVariables>
++         <EnvironmentVariable
++            key = "NSZombieEnabled"
++            value = "YES"
++            isEnabled = "YES">
++         </EnvironmentVariable>
++      </EnvironmentVariables>
++      <AdditionalOptions>
++      </AdditionalOptions>
++   </LaunchAction>
++   <ProfileAction
++      displayScaleIsEnabled = "NO"
++      displayScale = "1.00"
++      shouldUseLaunchSchemeArgsEnv = "YES"
++      savedToolIdentifier = ""
++      useCustomWorkingDirectory = "NO"
++      buildConfiguration = "Release">
++      <BuildableProductRunnable>
++         <BuildableReference
++            BuildableIdentifier = "primary"
++            BlueprintIdentifier = "DC299A941208B5D4006A023C"
++            BuildableName = "readertest.app"
++            BlueprintName = "readertest"
++            ReferencedContainer = "container:zbar.xcodeproj">
++         </BuildableReference>
++      </BuildableProductRunnable>
++   </ProfileAction>
++   <AnalyzeAction
++      buildConfiguration = "Debug">
++   </AnalyzeAction>
++   <ArchiveAction
++      buildConfiguration = "Distribution"
++      revealArchiveInOrganizer = "YES">
++   </ArchiveAction>
++</Scheme>
+diff -r 563557a923d0 java/Makefile.am
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/java/Makefile.am	Fri Feb 22 08:54:29 2013 -0300
 @@ -0,0 +1,39 @@
 +javadir = $(pkgdatadir)/lib
 +
@@ -17691,10 +20758,9 @@ new file mode 100644
 +	echo "making check in java"
 +	cd $(abs_srcdir); $(JAVAC) -classpath $(abs_builddir)/zbar.jar:.:$(CLASSPATH) -d $(abs_builddir) $(test_SRCS)
 +	$(top_builddir)/libtool -dlopen $(top_builddir)/zbar/libzbar.la -dlopen libzbarjni.la --mode=execute $(JAVA) -Xcheck:jni -classpath zbar.jar:.:$(CLASSPATH) org.junit.runner.JUnitCore $(test_CLASSES)
-diff --git a/java/net/sourceforge/zbar/Config.java b/java/net/sourceforge/zbar/Config.java
-new file mode 100644
---- /dev/null
-+++ b/java/net/sourceforge/zbar/Config.java
+diff -r 563557a923d0 java/net/sourceforge/zbar/Config.java
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/java/net/sourceforge/zbar/Config.java	Fri Feb 22 08:54:29 2013 -0300
 @@ -0,0 +1,56 @@
 +/*------------------------------------------------------------------------
 + *  Config
@@ -17752,10 +20818,9 @@ new file mode 100644
 +    /** Image scanner horizontal scan density. */
 +    public static final int Y_DENSITY = 0x101;
 +}
-diff --git a/java/net/sourceforge/zbar/Image.java b/java/net/sourceforge/zbar/Image.java
-new file mode 100644
---- /dev/null
-+++ b/java/net/sourceforge/zbar/Image.java
+diff -r 563557a923d0 java/net/sourceforge/zbar/Image.java
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/java/net/sourceforge/zbar/Image.java	Fri Feb 22 08:54:29 2013 -0300
 @@ -0,0 +1,163 @@
 +/*------------------------------------------------------------------------
 + *  Image
@@ -17920,10 +20985,9 @@ new file mode 100644
 +    private native long getSymbols(long peer);
 +
 +}
-diff --git a/java/net/sourceforge/zbar/ImageScanner.java b/java/net/sourceforge/zbar/ImageScanner.java
-new file mode 100644
---- /dev/null
-+++ b/java/net/sourceforge/zbar/ImageScanner.java
+diff -r 563557a923d0 java/net/sourceforge/zbar/ImageScanner.java
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/java/net/sourceforge/zbar/ImageScanner.java	Fri Feb 22 08:54:29 2013 -0300
 @@ -0,0 +1,98 @@
 +/*------------------------------------------------------------------------
 + *  ImageScanner
@@ -18023,10 +21087,9 @@ new file mode 100644
 +     */
 +    public native int scanImage(Image image);
 +}
-diff --git a/java/net/sourceforge/zbar/Modifier.java b/java/net/sourceforge/zbar/Modifier.java
-new file mode 100644
---- /dev/null
-+++ b/java/net/sourceforge/zbar/Modifier.java
+diff -r 563557a923d0 java/net/sourceforge/zbar/Modifier.java
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/java/net/sourceforge/zbar/Modifier.java	Fri Feb 22 08:54:29 2013 -0300
 @@ -0,0 +1,42 @@
 +/*------------------------------------------------------------------------
 + *  Modifier
@@ -18070,10 +21133,9 @@ new file mode 100644
 +     */
 +    public static final int AIM = 1;
 +}
-diff --git a/java/net/sourceforge/zbar/Orientation.java b/java/net/sourceforge/zbar/Orientation.java
-new file mode 100644
---- /dev/null
-+++ b/java/net/sourceforge/zbar/Orientation.java
+diff -r 563557a923d0 java/net/sourceforge/zbar/Orientation.java
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/java/net/sourceforge/zbar/Orientation.java	Fri Feb 22 08:54:29 2013 -0300
 @@ -0,0 +1,42 @@
 +/*------------------------------------------------------------------------
 + *  Orientation
@@ -18117,11 +21179,10 @@ new file mode 100644
 +    /** sideways, read bottom to top */
 +    public static final int LEFT = 3;
 +}
-diff --git a/java/net/sourceforge/zbar/Symbol.java b/java/net/sourceforge/zbar/Symbol.java
-new file mode 100644
---- /dev/null
-+++ b/java/net/sourceforge/zbar/Symbol.java
-@@ -0,0 +1,197 @@
+diff -r 563557a923d0 java/net/sourceforge/zbar/Symbol.java
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/java/net/sourceforge/zbar/Symbol.java	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,199 @@
 +/*------------------------------------------------------------------------
 + *  Symbol
 + *
@@ -18177,14 +21238,16 @@ new file mode 100644
 +    public static final int DATABAR = 34;
 +    /** DataBar Expanded. */
 +    public static final int DATABAR_EXP = 35;
-+    /** Code 93. */
-+    public static final int CODE93 = 93;
++    /** Codabar. */
++    public static final int CODABAR = 38;
 +    /** Code 39. */
 +    public static final int CODE39 = 39;
 +    /** PDF417. */
 +    public static final int PDF417 = 57;
 +    /** QR Code. */
 +    public static final int QRCODE = 64;
++    /** Code 93. */
++    public static final int CODE93 = 93;
 +    /** Code 128. */
 +    public static final int CODE128 = 128;
 +
@@ -18319,10 +21382,9 @@ new file mode 100644
 +
 +    native long next();
 +}
-diff --git a/java/net/sourceforge/zbar/SymbolIterator.java b/java/net/sourceforge/zbar/SymbolIterator.java
-new file mode 100644
---- /dev/null
-+++ b/java/net/sourceforge/zbar/SymbolIterator.java
+diff -r 563557a923d0 java/net/sourceforge/zbar/SymbolIterator.java
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/java/net/sourceforge/zbar/SymbolIterator.java	Fri Feb 22 08:54:29 2013 -0300
 @@ -0,0 +1,70 @@
 +/*------------------------------------------------------------------------
 + *  SymbolIterator
@@ -18394,10 +21456,9 @@ new file mode 100644
 +              ("SymbolIterator is immutable"));
 +    }
 +}
-diff --git a/java/net/sourceforge/zbar/SymbolSet.java b/java/net/sourceforge/zbar/SymbolSet.java
-new file mode 100644
---- /dev/null
-+++ b/java/net/sourceforge/zbar/SymbolSet.java
+diff -r 563557a923d0 java/net/sourceforge/zbar/SymbolSet.java
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/java/net/sourceforge/zbar/SymbolSet.java	Fri Feb 22 08:54:29 2013 -0300
 @@ -0,0 +1,82 @@
 +/*------------------------------------------------------------------------
 + *  SymbolSet
@@ -18481,10 +21542,9 @@ new file mode 100644
 +    /** Retrieve C pointer to first symbol in the set. */
 +    private native long firstSymbol(long peer);
 +}
-diff --git a/java/test/TestImage.java b/java/test/TestImage.java
-new file mode 100644
---- /dev/null
-+++ b/java/test/TestImage.java
+diff -r 563557a923d0 java/test/TestImage.java
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/java/test/TestImage.java	Fri Feb 22 08:54:29 2013 -0300
 @@ -0,0 +1,175 @@
 +
 +import org.junit.Test;
@@ -18661,10 +21721,9 @@ new file mode 100644
 +        assertArrayEquals(exp, y800);
 +    }
 +}
-diff --git a/java/test/TestImageScanner.java b/java/test/TestImageScanner.java
-new file mode 100644
---- /dev/null
-+++ b/java/test/TestImageScanner.java
+diff -r 563557a923d0 java/test/TestImageScanner.java
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/java/test/TestImageScanner.java	Fri Feb 22 08:54:29 2013 -0300
 @@ -0,0 +1,53 @@
 +
 +import org.junit.Test;
@@ -18719,10 +21778,9 @@ new file mode 100644
 +        scanner.enableCache(false);
 +    }
 +}
-diff --git a/java/test/TestScanImage.java b/java/test/TestScanImage.java
-new file mode 100644
---- /dev/null
-+++ b/java/test/TestScanImage.java
+diff -r 563557a923d0 java/test/TestScanImage.java
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/java/test/TestScanImage.java	Fri Feb 22 08:54:29 2013 -0300
 @@ -0,0 +1,183 @@
 +
 +import org.junit.Test;
@@ -18907,10 +21965,9 @@ new file mode 100644
 +        }
 +    }
 +}
-diff --git a/java/zbarjni.c b/java/zbarjni.c
-new file mode 100644
---- /dev/null
-+++ b/java/zbarjni.c
+diff -r 563557a923d0 java/zbarjni.c
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/java/zbarjni.c	Fri Feb 22 08:54:29 2013 -0300
 @@ -0,0 +1,701 @@
 +/*------------------------------------------------------------------------
 + *  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
@@ -19211,7 +22268,7 @@ new file mode 100644
 +    assert(data);
 +
 +    JNIEnv *env = NULL;
-+    if((*jvm)->AttachCurrentThread(jvm, (void**)&env, NULL))
++    if((*jvm)->AttachCurrentThread(jvm, (void*)&env, NULL))
 +        return;
 +    assert(env);
 +    if(env && data) {
@@ -19231,7 +22288,7 @@ new file mode 100644
 +    assert(data);
 +
 +    JNIEnv *env = NULL;
-+    if((*jvm)->AttachCurrentThread(jvm, (void**)&env, NULL))
++    if((*jvm)->AttachCurrentThread(jvm, (void*)&env, NULL))
 +        return;
 +    assert(env);
 +    if(env && data) {
@@ -19613,9 +22670,9 @@ new file mode 100644
 +                  "unsupported image format");
 +    return(n);
 +}
-diff --git a/perl/Changes b/perl/Changes
---- a/perl/Changes
-+++ b/perl/Changes
+diff -r 563557a923d0 perl/Changes
+--- a/perl/Changes	Tue Oct 27 11:25:59 2009 -0400
++++ b/perl/Changes	Fri Feb 22 08:54:29 2013 -0300
 @@ -1,5 +1,17 @@
  Revision history for Perl extension Barcode::ZBar.
  
@@ -19634,9 +22691,9 @@ diff --git a/perl/Changes b/perl/Changes
  0.02  2009-04-16 spadix
  	* project name change: package becomes Barcode::ZBar
  
-diff --git a/perl/README b/perl/README
---- a/perl/README
-+++ b/perl/README
+diff -r 563557a923d0 perl/README
+--- a/perl/README	Tue Oct 27 11:25:59 2009 -0400
++++ b/perl/README	Fri Feb 22 08:54:29 2013 -0300
 @@ -1,10 +1,11 @@
  Barcode::ZBar Perl module
  =========================
@@ -19648,20 +22705,20 @@ diff --git a/perl/README b/perl/README
 +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, Code 128,
-+Code 93, Code 39, Interleaved 2 of 5 and QR Code.  These are the Perl
-+bindings for the library.
++Code 93, Code 39, Codabar, Interleaved 2 of 5 and QR Code.  These are
++the Perl bindings for the library.
  
  Check the ZBar project home page for the latest release, mailing
  lists, etc.
-@@ -34,4 +35,4 @@ COPYRIGHT AND LICENCE
+@@ -34,4 +35,4 @@
  Licensed under the GNU Lesser General Public License, version 2.1.
  http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
  
 -Copyright 2008-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
 +Copyright 2008-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-diff --git a/perl/ZBar.pm b/perl/ZBar.pm
---- a/perl/ZBar.pm
-+++ b/perl/ZBar.pm
+diff -r 563557a923d0 perl/ZBar.pm
+--- a/perl/ZBar.pm	Tue Oct 27 11:25:59 2009 -0400
++++ b/perl/ZBar.pm	Fri Feb 22 08:54:29 2013 -0300
 @@ -1,5 +1,5 @@
  #------------------------------------------------------------------------
 -#  Copyright 2008-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
@@ -19669,7 +22726,18 @@ diff --git a/perl/ZBar.pm b/perl/ZBar.pm
  #
  #  This file is part of the ZBar Bar Code Reader.
  #
-@@ -137,6 +137,56 @@ Dark area or colored bar segment.
+@@ -86,8 +86,8 @@
+ 
+ The ZBar Bar Code Reader is a library for scanning and decoding bar
+ codes from various sources such as video streams, image files or raw
+-intensity sensors.  It supports EAN, UPC, Code 128, Code 39 and
+-Interleaved 2 of 5.
++intensity sensors.  It supports EAN-13/UPC-A, UPC-E, EAN-8, Code 128,
++Code 93, Code 39, Codabar, Interleaved 2 of 5 and QR Code.
+ 
+ These are the bindings for interacting directly with the library from
+ Perl.
+@@ -137,6 +137,56 @@
  
  =back
  
@@ -19726,7 +22794,7 @@ diff --git a/perl/ZBar.pm b/perl/ZBar.pm
  
  =head1 SEE ALSO
  
-@@ -156,7 +206,7 @@ Jeff Brown, E<lt>spadix@users.sourceforg
+@@ -156,7 +206,7 @@
  
  =head1 COPYRIGHT AND LICENSE
  
@@ -19735,9 +22803,9 @@ diff --git a/perl/ZBar.pm b/perl/ZBar.pm
  
  The ZBar Bar Code Reader is free software; you can redistribute it
  and/or modify it under the terms of the GNU Lesser Public License as
-diff --git a/perl/ZBar.xs b/perl/ZBar.xs
---- a/perl/ZBar.xs
-+++ b/perl/ZBar.xs
+diff -r 563557a923d0 perl/ZBar.xs
+--- a/perl/ZBar.xs	Tue Oct 27 11:25:59 2009 -0400
++++ b/perl/ZBar.xs	Fri Feb 22 08:54:29 2013 -0300
 @@ -1,5 +1,5 @@
  //------------------------------------------------------------------------
 -//  Copyright 2008-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
@@ -19745,7 +22813,7 @@ diff --git a/perl/ZBar.xs b/perl/ZBar.xs
  //
  //  This file is part of the ZBar Bar Code Reader.
  //
-@@ -53,6 +53,8 @@ static AV *LOOKUP_zbar_color_t = NULL;
+@@ -53,6 +53,8 @@
  static AV *LOOKUP_zbar_symbol_type_t = NULL;
  static AV *LOOKUP_zbar_error_t = NULL;
  static AV *LOOKUP_zbar_config_t = NULL;
@@ -19754,7 +22822,7 @@ diff --git a/perl/ZBar.xs b/perl/ZBar.xs
  
  #define CONSTANT(typ, prefix, sym, name)                \
      do {                                                \
-@@ -93,6 +95,15 @@ static inline void check_error (int rc, 
+@@ -93,6 +95,15 @@
          }                                                               \
      } while(0);
  
@@ -19770,7 +22838,7 @@ diff --git a/perl/ZBar.xs b/perl/ZBar.xs
  static void image_cleanup_handler (zbar_image_t *image)
  {
      SV *data = zbar_image_get_userdata(image);
-@@ -151,7 +162,7 @@ static inline void activate_handler (han
+@@ -151,7 +162,7 @@
      SAVETMPS;
  
      PUSHMARK(SP);
@@ -19779,7 +22847,7 @@ diff --git a/perl/ZBar.xs b/perl/ZBar.xs
      PUSHs(sv_mortalcopy(wrap->instance));
      if(param)
          PUSHs(param);
-@@ -277,11 +288,37 @@ BOOT:
+@@ -277,11 +288,37 @@
          CONSTANT(config, CFG_, ASCII, "ascii");
          CONSTANT(config, CFG_, MIN_LEN, "min-length");
          CONSTANT(config, CFG_, MAX_LEN, "max-length");
@@ -19817,7 +22885,7 @@ diff --git a/perl/ZBar.xs b/perl/ZBar.xs
  
  MODULE = Barcode::ZBar	PACKAGE = Barcode::ZBar::Symbol	PREFIX = zbar_symbol_
  
-@@ -298,10 +335,14 @@ BOOT:
+@@ -298,10 +335,15 @@
          CONSTANT(symbol_type, , UPCA, zbar_get_symbol_name(ZBAR_UPCA));
          CONSTANT(symbol_type, , EAN13, zbar_get_symbol_name(ZBAR_EAN13));
          CONSTANT(symbol_type, , ISBN13, zbar_get_symbol_name(ZBAR_ISBN13));
@@ -19825,6 +22893,7 @@ diff --git a/perl/ZBar.xs b/perl/ZBar.xs
 +        CONSTANT(symbol_type, , DATABAR_EXP,
 +                 zbar_get_symbol_name(ZBAR_DATABAR_EXP));
          CONSTANT(symbol_type, , I25, zbar_get_symbol_name(ZBAR_I25));
++        CONSTANT(symbol_type, , CODABAR, zbar_get_symbol_name(ZBAR_CODABAR));
          CONSTANT(symbol_type, , CODE39, zbar_get_symbol_name(ZBAR_CODE39));
          CONSTANT(symbol_type, , PDF417, zbar_get_symbol_name(ZBAR_PDF417));
          CONSTANT(symbol_type, , QRCODE, zbar_get_symbol_name(ZBAR_QRCODE));
@@ -19832,7 +22901,7 @@ diff --git a/perl/ZBar.xs b/perl/ZBar.xs
          CONSTANT(symbol_type, , CODE128, zbar_get_symbol_name(ZBAR_CODE128));
      }
  
-@@ -316,6 +357,18 @@ zbar_symbol_get_type(symbol)
+@@ -316,6 +358,18 @@
  	Barcode::ZBar::Symbol symbol
  
  SV *
@@ -19851,7 +22920,7 @@ diff --git a/perl/ZBar.xs b/perl/ZBar.xs
  zbar_symbol_get_data(symbol)
  	Barcode::ZBar::Symbol symbol
      CODE:
-@@ -347,6 +400,10 @@ zbar_symbol_get_loc(symbol)
+@@ -347,6 +401,10 @@
              av_push(pt, newSVuv(zbar_symbol_get_loc_y(symbol, i)));
          }
  
@@ -19862,7 +22931,7 @@ diff --git a/perl/ZBar.xs b/perl/ZBar.xs
  SV *
  get_components(symbol)
          Barcode::ZBar::Symbol	symbol
-@@ -398,6 +455,19 @@ get_size(image)
+@@ -398,6 +456,19 @@
          mPUSHu(zbar_image_get_width(image));
          mPUSHu(zbar_image_get_height(image));
  
@@ -19882,7 +22951,7 @@ diff --git a/perl/ZBar.xs b/perl/ZBar.xs
  SV *
  zbar_image_get_data(image)
          Barcode::ZBar::Image	image
-@@ -426,8 +496,16 @@ zbar_image_set_sequence(image, seq_num)
+@@ -426,8 +497,16 @@
  void
  zbar_image_set_size(image, width, height)
          Barcode::ZBar::Image	image
@@ -19901,7 +22970,7 @@ diff --git a/perl/ZBar.xs b/perl/ZBar.xs
  
  void
  zbar_image_set_data(image, data)
-@@ -712,6 +790,25 @@ zbar_symbol_type_t
+@@ -712,6 +791,25 @@
  zbar_decoder_get_type(decoder)
  	Barcode::ZBar::Decoder	decoder
  
@@ -19911,7 +22980,7 @@ diff --git a/perl/ZBar.xs b/perl/ZBar.xs
 +        zbar_symbol_type_t	symbology
 +    PPCODE:
 +        if(symbology == ZBAR_NONE)
-+            symbology = zbar_decoder_get_type(decoder)
++            symbology = zbar_decoder_get_type(decoder);
 +        PUSH_ENUM_MASK(config, CFG, zbar_decoder_get_configs(decoder, symbology));
 +
 +SV *
@@ -19927,10 +22996,10 @@ diff --git a/perl/ZBar.xs b/perl/ZBar.xs
  void
  zbar_decoder_set_handler(decoder, handler = 0, closure = 0)
  	Barcode::ZBar::Decoder	decoder
-diff --git a/perl/ZBar/Image.pod b/perl/ZBar/Image.pod
---- a/perl/ZBar/Image.pod
-+++ b/perl/ZBar/Image.pod
-@@ -132,7 +132,7 @@ Jeff Brown, E<lt>spadix@users.sourceforg
+diff -r 563557a923d0 perl/ZBar/Image.pod
+--- a/perl/ZBar/Image.pod	Tue Oct 27 11:25:59 2009 -0400
++++ b/perl/ZBar/Image.pod	Fri Feb 22 08:54:29 2013 -0300
+@@ -132,7 +132,7 @@
  
  =head1 COPYRIGHT AND LICENSE
  
@@ -19939,10 +23008,10 @@ diff --git a/perl/ZBar/Image.pod b/perl/ZBar/Image.pod
  
  The ZBar Bar Code Reader is free software; you can redistribute it
  and/or modify it under the terms of the GNU Lesser Public License as
-diff --git a/perl/ZBar/ImageScanner.pod b/perl/ZBar/ImageScanner.pod
---- a/perl/ZBar/ImageScanner.pod
-+++ b/perl/ZBar/ImageScanner.pod
-@@ -89,7 +89,7 @@ Jeff Brown, E<lt>spadix@users.sourceforg
+diff -r 563557a923d0 perl/ZBar/ImageScanner.pod
+--- a/perl/ZBar/ImageScanner.pod	Tue Oct 27 11:25:59 2009 -0400
++++ b/perl/ZBar/ImageScanner.pod	Fri Feb 22 08:54:29 2013 -0300
+@@ -89,7 +89,7 @@
  
  =head1 COPYRIGHT AND LICENSE
  
@@ -19951,10 +23020,10 @@ diff --git a/perl/ZBar/ImageScanner.pod b/perl/ZBar/ImageScanner.pod
  
  The ZBar Bar Code Reader is free software; you can redistribute it
  and/or modify it under the terms of the GNU Lesser Public License as
-diff --git a/perl/ZBar/Processor.pod b/perl/ZBar/Processor.pod
---- a/perl/ZBar/Processor.pod
-+++ b/perl/ZBar/Processor.pod
-@@ -137,7 +137,7 @@ Jeff Brown, E<lt>spadix@users.sourceforg
+diff -r 563557a923d0 perl/ZBar/Processor.pod
+--- a/perl/ZBar/Processor.pod	Tue Oct 27 11:25:59 2009 -0400
++++ b/perl/ZBar/Processor.pod	Fri Feb 22 08:54:29 2013 -0300
+@@ -137,7 +137,7 @@
  
  =head1 COPYRIGHT AND LICENSE
  
@@ -19963,9 +23032,9 @@ diff --git a/perl/ZBar/Processor.pod b/perl/ZBar/Processor.pod
  
  The ZBar Bar Code Reader is free software; you can redistribute it
  and/or modify it under the terms of the GNU Lesser Public License as
-diff --git a/perl/ZBar/Symbol.pod b/perl/ZBar/Symbol.pod
---- a/perl/ZBar/Symbol.pod
-+++ b/perl/ZBar/Symbol.pod
+diff -r 563557a923d0 perl/ZBar/Symbol.pod
+--- a/perl/ZBar/Symbol.pod	Tue Oct 27 11:25:59 2009 -0400
++++ b/perl/ZBar/Symbol.pod	Fri Feb 22 08:54:29 2013 -0300
 @@ -1,5 +1,5 @@
  #------------------------------------------------------------------------
 -#  Copyright 2008-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
@@ -19973,7 +23042,7 @@ diff --git a/perl/ZBar/Symbol.pod b/perl/ZBar/Symbol.pod
  #
  #  This file is part of the ZBar Bar Code Reader.
  #
-@@ -72,6 +72,12 @@ Current cache count of the symbol.  This
+@@ -72,6 +72,12 @@
  inter-scan reliability and redundancy information if enabled at the
  Barcode::ZBar::ImageScanner.
  
@@ -19986,8 +23055,12 @@ diff --git a/perl/ZBar/Symbol.pod b/perl/ZBar/Symbol.pod
  =item get_components()
  
  Components of a composite result.  This yields an array of physical
-@@ -122,6 +128,8 @@ Bar code type "symbology" constants:
+@@ -120,8 +126,12 @@
+ 
+ =item I25
  
++=item CODABAR
++
  =item CODE39
  
 +=item CODE93
@@ -19995,7 +23068,7 @@ diff --git a/perl/ZBar/Symbol.pod b/perl/ZBar/Symbol.pod
  =item CODE128
  
  =item QRCODE
-@@ -144,7 +152,7 @@ Jeff Brown, E<lt>spadix@users.sourceforg
+@@ -144,7 +154,7 @@
  
  =head1 COPYRIGHT AND LICENSE
  
@@ -20004,9 +23077,9 @@ diff --git a/perl/ZBar/Symbol.pod b/perl/ZBar/Symbol.pod
  
  The ZBar Bar Code Reader is free software; you can redistribute it
  and/or modify it under the terms of the GNU Lesser Public License as
-diff --git a/perl/t/Decoder.t b/perl/t/Decoder.t
---- a/perl/t/Decoder.t
-+++ b/perl/t/Decoder.t
+diff -r 563557a923d0 perl/t/Decoder.t
+--- a/perl/t/Decoder.t	Tue Oct 27 11:25:59 2009 -0400
++++ b/perl/t/Decoder.t	Fri Feb 22 08:54:29 2013 -0300
 @@ -3,7 +3,7 @@
  
  use warnings;
@@ -20016,7 +23089,7 @@ diff --git a/perl/t/Decoder.t b/perl/t/Decoder.t
  
  #########################
  
-@@ -19,7 +19,8 @@ isa_ok($decoder, 'Barcode::ZBar::Decoder
+@@ -19,7 +19,8 @@
  #########################
  
  can_ok($decoder, qw(set_config parse_config reset new_scan decode_width
@@ -20026,7 +23099,7 @@ diff --git a/perl/t/Decoder.t b/perl/t/Decoder.t
  
  #########################
  
-@@ -58,6 +59,10 @@ is($decoder->get_color(), Barcode::ZBar:
+@@ -58,6 +59,10 @@
  
  #########################
  
@@ -20037,7 +23110,7 @@ diff --git a/perl/t/Decoder.t b/perl/t/Decoder.t
  $decoder->set_config(Barcode::ZBar::Symbol::QRCODE,
                       Barcode::ZBar::Config::ENABLE, 0);
  
-@@ -74,6 +79,17 @@ is($sym, Barcode::ZBar::Symbol::EAN13, '
+@@ -74,6 +79,17 @@
  
  #########################
  
@@ -20055,7 +23128,7 @@ diff --git a/perl/t/Decoder.t b/perl/t/Decoder.t
  is($decoder->get_data(), '6268964977804', 'EAN-13 data');
  
  #########################
-@@ -82,6 +98,10 @@ is($decoder->get_color(), Barcode::ZBar:
+@@ -82,6 +98,10 @@
  
  #########################
  
@@ -20066,9 +23139,9 @@ diff --git a/perl/t/Decoder.t b/perl/t/Decoder.t
  is($handler_type, Barcode::ZBar::Symbol::EAN13, 'handler type');
  
  #########################
-diff --git a/perl/t/Image.t b/perl/t/Image.t
---- a/perl/t/Image.t
-+++ b/perl/t/Image.t
+diff -r 563557a923d0 perl/t/Image.t
+--- a/perl/t/Image.t	Tue Oct 27 11:25:59 2009 -0400
++++ b/perl/t/Image.t	Fri Feb 22 08:54:29 2013 -0300
 @@ -3,7 +3,7 @@
  
  use warnings;
@@ -20078,7 +23151,7 @@ diff --git a/perl/t/Image.t b/perl/t/Image.t
  
  #########################
  
-@@ -48,6 +48,26 @@ is_deeply([$image->get_size()], [114, 80
+@@ -48,6 +48,26 @@
  
  #########################
  
@@ -20105,7 +23178,7 @@ diff --git a/perl/t/Image.t b/perl/t/Image.t
  # FIXME avoid skipping these (eg embed image vs ImageMagick)
  SKIP: {
      eval { require Image::Magick };
-@@ -94,7 +114,8 @@ SKIP: {
+@@ -94,7 +114,8 @@
  
      #########################
  
@@ -20115,7 +23188,7 @@ diff --git a/perl/t/Image.t b/perl/t/Image.t
  
      #########################
  
-@@ -102,6 +123,17 @@ SKIP: {
+@@ -102,6 +123,17 @@
  
      #########################
  
@@ -20133,7 +23206,7 @@ diff --git a/perl/t/Image.t b/perl/t/Image.t
      is($sym->get_data(), '9876543210128', 'result data');
  
      #########################
-@@ -133,6 +165,10 @@ SKIP: {
+@@ -133,6 +165,10 @@
  
      #########################
  
@@ -20144,9 +23217,9 @@ diff --git a/perl/t/Image.t b/perl/t/Image.t
      my @comps = $sym->get_components();
      is(scalar(@comps), 0, 'components size');
  
-diff --git a/perl/t/ZBar.t b/perl/t/ZBar.t
---- a/perl/t/ZBar.t
-+++ b/perl/t/ZBar.t
+diff -r 563557a923d0 perl/t/ZBar.t
+--- a/perl/t/ZBar.t	Tue Oct 27 11:25:59 2009 -0400
++++ b/perl/t/ZBar.t	Fri Feb 22 08:54:29 2013 -0300
 @@ -3,7 +3,7 @@
  
  use warnings;
@@ -20156,7 +23229,7 @@ diff --git a/perl/t/ZBar.t b/perl/t/ZBar.t
  
  #########################
  
-@@ -20,3 +20,49 @@ Barcode::ZBar::increase_verbosity();
+@@ -20,3 +20,49 @@
  pass('verbosity');
  
  #########################
@@ -20206,10 +23279,10 @@ diff --git a/perl/t/ZBar.t b/perl/t/ZBar.t
 +);
 +
 +#########################
-diff --git a/perl/typemap b/perl/typemap
---- a/perl/typemap
-+++ b/perl/typemap
-@@ -14,6 +14,8 @@ zbar_color_t					T_ENUM
+diff -r 563557a923d0 perl/typemap
+--- a/perl/typemap	Tue Oct 27 11:25:59 2009 -0400
++++ b/perl/typemap	Fri Feb 22 08:54:29 2013 -0300
+@@ -14,6 +14,8 @@
  zbar_error_t					T_ENUM
  zbar_symbol_type_t				T_ENUM
  zbar_config_t					T_ENUM
@@ -20218,7 +23291,7 @@ diff --git a/perl/typemap b/perl/typemap
  
  # special scalars
  fourcc_t					T_FOURCC
-@@ -30,14 +32,8 @@ T_ENUM
+@@ -30,14 +32,8 @@
  T_FOURCC
  	{
              if(SvPOK($arg)) {
@@ -20235,28 +23308,26 @@ diff --git a/perl/typemap b/perl/typemap
              }
              else
                  $var = SvUV($arg);
-diff --git a/python/MANIFEST.in b/python/MANIFEST.in
-new file mode 100644
---- /dev/null
-+++ b/python/MANIFEST.in
+diff -r 563557a923d0 python/MANIFEST.in
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/python/MANIFEST.in	Fri Feb 22 08:54:29 2013 -0300
 @@ -0,0 +1,2 @@
 +include MANIFEST MANIFEST.in zbarmodule.h test/barcode.png
 +recursive-include examples *.py
-diff --git a/python/Makefile.am.inc b/python/Makefile.am.inc
---- a/python/Makefile.am.inc
-+++ b/python/Makefile.am.inc
-@@ -9,4 +9,5 @@ python_zbar_la_SOURCES = python/zbarmodu
+diff -r 563557a923d0 python/Makefile.am.inc
+--- a/python/Makefile.am.inc	Tue Oct 27 11:25:59 2009 -0400
++++ b/python/Makefile.am.inc	Fri Feb 22 08:54:29 2013 -0300
+@@ -9,4 +9,5 @@
      python/symboliter.c python/image.c \
      python/processor.c python/imagescanner.c python/decoder.c python/scanner.c
  
 -EXTRA_DIST += python/test/barcode.png python/test/test_zbar.py
 +EXTRA_DIST += python/test/barcode.png python/test/test_zbar.py \
 +    python/examples/processor.py python/examples/read_one.py
-diff --git a/python/README b/python/README
-new file mode 100644
---- /dev/null
-+++ b/python/README
-@@ -0,0 +1,59 @@
+diff -r 563557a923d0 python/README
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/python/README	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,60 @@
 +==========================================
 +zbar -- read barcodes from images or video
 +==========================================
@@ -20264,8 +23335,8 @@ new file mode 100644
 +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, Code 128,
-+Code 93, Code 39, Interleaved 2 of 5 and QR Code.  These are the
-+Python bindings for the library.
++Code 93, Code 39, Codabar, Interleaved 2 of 5 and QR Code.  These are
++the Python bindings for the library.
 +
 +Check the ZBar project home page for the latest release, mailing
 +lists, etc.
@@ -20288,7 +23359,8 @@ new file mode 100644
 +* http://zbar.sourceforge.net/
 +
 +Windows users please note: the module *will NOT load* unless the ZBar
-+library DLL (currently libzbar-0.dll) is available in your PATH!
++library DLL (currently libzbar-0.dll) is available in your Windows system
++PATH!
 +
 +Examples
 +--------
@@ -20316,9 +23388,9 @@ new file mode 100644
 +http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
 +
 +Copyright 2008-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-diff --git a/python/decoder.c b/python/decoder.c
---- a/python/decoder.c
-+++ b/python/decoder.c
+diff -r 563557a923d0 python/decoder.c
+--- a/python/decoder.c	Tue Oct 27 11:25:59 2009 -0400
++++ b/python/decoder.c	Fri Feb 22 08:54:29 2013 -0300
 @@ -1,5 +1,5 @@
  /*------------------------------------------------------------------------
 - *  Copyright 2009 (c) Jeff Brown <spadix@users.sourceforge.net>
@@ -20326,7 +23398,7 @@ diff --git a/python/decoder.c b/python/decoder.c
   *
   *  This file is part of the ZBar Bar Code Reader.
   *
-@@ -104,6 +104,23 @@ decoder_get_type (zbarDecoder *self,
+@@ -104,6 +104,23 @@
  }
  
  static PyObject*
@@ -20350,7 +23422,7 @@ diff --git a/python/decoder.c b/python/decoder.c
  decoder_get_data (zbarDecoder *self,
                    void *closure)
  {
-@@ -111,10 +128,20 @@ decoder_get_data (zbarDecoder *self,
+@@ -111,10 +128,20 @@
                                        zbar_decoder_get_data_length(self->zdcode)));
  }
  
@@ -20374,7 +23446,7 @@ diff --git a/python/decoder.c b/python/decoder.c
      { NULL, },
  };
  
-@@ -139,6 +166,23 @@ decoder_set_config (zbarDecoder *self,
+@@ -139,6 +166,23 @@
  }
  
  static PyObject*
@@ -20398,7 +23470,7 @@ diff --git a/python/decoder.c b/python/decoder.c
  decoder_parse_config (zbarDecoder *self,
                        PyObject *args,
                        PyObject *kwds)
-@@ -262,6 +306,8 @@ decoder_decode_width (zbarDecoder *self,
+@@ -262,6 +306,8 @@
  static PyMethodDef decoder_methods[] = {
      { "set_config",   (PyCFunction)decoder_set_config,
        METH_VARARGS | METH_KEYWORDS, },
@@ -20407,9 +23479,9 @@ diff --git a/python/decoder.c b/python/decoder.c
      { "parse_config", (PyCFunction)decoder_parse_config,
        METH_VARARGS | METH_KEYWORDS, },
      { "reset",        (PyCFunction)decoder_reset,
-diff --git a/python/enum.c b/python/enum.c
---- a/python/enum.c
-+++ b/python/enum.c
+diff -r 563557a923d0 python/enum.c
+--- a/python/enum.c	Tue Oct 27 11:25:59 2009 -0400
++++ b/python/enum.c	Fri Feb 22 08:54:29 2013 -0300
 @@ -1,5 +1,5 @@
  /*------------------------------------------------------------------------
 - *  Copyright 2009 (c) Jeff Brown <spadix@users.sourceforge.net>
@@ -20417,7 +23489,7 @@ diff --git a/python/enum.c b/python/enum.c
   *
   *  This file is part of the ZBar Bar Code Reader.
   *
-@@ -192,3 +192,31 @@ zbarEnum_Add (zbarEnum *self,
+@@ -192,3 +192,31 @@
          return(-1);
      return(0);
  }
@@ -20449,18 +23521,116 @@ diff --git a/python/enum.c b/python/enum.c
 +    }
 +    return(result);
 +}
-diff --git a/examples/processor.py b/python/examples/processor.py
-rename from examples/processor.py
-rename to python/examples/processor.py
-diff --git a/examples/read_one.py b/python/examples/read_one.py
-rename from examples/read_one.py
-rename to python/examples/read_one.py
-diff --git a/examples/scan_image.py b/python/examples/scan_image.py
-rename from examples/scan_image.py
-rename to python/examples/scan_image.py
-diff --git a/python/image.c b/python/image.c
---- a/python/image.c
-+++ b/python/image.c
+diff -r 563557a923d0 python/examples/processor.py
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/python/examples/processor.py	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,35 @@
++#!/usr/bin/python
++from sys import argv
++import zbar
++
++# create a Processor
++proc = zbar.Processor()
++
++# configure the Processor
++proc.parse_config('enable')
++
++# initialize the Processor
++device = '/dev/video0'
++if len(argv) > 1:
++    device = argv[1]
++proc.init(device)
++
++# setup a callback
++def my_handler(proc, image, closure):
++    # extract results
++    for symbol in image.symbols:
++        # do something useful with results
++        print 'decoded', symbol.type, 'symbol', '"%s"' % symbol.data
++
++proc.set_data_handler(my_handler)
++
++# enable the preview window
++proc.visible = True
++
++# initiate scanning
++proc.active = True
++try:
++    # keep scanning until user provides key/mouse input
++    proc.user_wait()
++except zbar.WindowClosed, e:
++    pass
+diff -r 563557a923d0 python/examples/read_one.py
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/python/examples/read_one.py	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,29 @@
++#!/usr/bin/python
++from sys import argv
++import zbar
++
++# create a Processor
++proc = zbar.Processor()
++
++# configure the Processor
++proc.parse_config('enable')
++
++# initialize the Processor
++device = '/dev/video0'
++if len(argv) > 1:
++    device = argv[1]
++proc.init(device)
++
++# enable the preview window
++proc.visible = True
++
++# read at least one barcode (or until window closed)
++proc.process_one()
++
++# hide the preview window
++proc.visible = False
++
++# extract results
++for symbol in proc.results:
++    # do something useful with results
++    print 'decoded', symbol.type, 'symbol', '"%s"' % symbol.data
+diff -r 563557a923d0 python/examples/scan_image.py
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/python/examples/scan_image.py	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,31 @@
++#!/usr/bin/python
++from sys import argv
++import zbar
++import Image
++
++if len(argv) < 2: exit(1)
++
++# create a reader
++scanner = zbar.ImageScanner()
++
++# configure the reader
++scanner.parse_config('enable')
++
++# obtain image data
++pil = Image.open(argv[1]).convert('L')
++width, height = pil.size
++raw = pil.tostring()
++
++# wrap image data
++image = zbar.Image(width, height, 'Y800', raw)
++
++# scan the image for barcodes
++scanner.scan(image)
++
++# extract results
++for symbol in image:
++    # do something useful with results
++    print 'decoded', symbol.type, 'symbol', '"%s"' % symbol.data
++
++# clean up
++del(image)
+diff -r 563557a923d0 python/image.c
+--- a/python/image.c	Tue Oct 27 11:25:59 2009 -0400
++++ b/python/image.c	Fri Feb 22 08:54:29 2013 -0300
 @@ -1,5 +1,5 @@
  /*------------------------------------------------------------------------
 - *  Copyright 2009 (c) Jeff Brown <spadix@users.sourceforge.net>
@@ -20468,7 +23638,7 @@ diff --git a/python/image.c b/python/image.c
   *
   *  This file is part of the ZBar Bar Code Reader.
   *
-@@ -139,16 +139,18 @@ image_set_format (zbarImage *self,
+@@ -139,16 +139,18 @@
          PyErr_SetString(PyExc_TypeError, "cannot delete format attribute");
          return(-1);
      }
@@ -20489,7 +23659,7 @@ diff --git a/python/image.c b/python/image.c
      return(0);
  }
  
-@@ -156,9 +158,9 @@ static PyObject*
+@@ -156,9 +158,9 @@
  image_get_size (zbarImage *self,
                  void *closure)
  {
@@ -20502,52 +23672,40 @@ diff --git a/python/image.c b/python/image.c
  }
  
  static int
-@@ -170,33 +172,82 @@ image_set_size (zbarImage *self,
+@@ -170,34 +172,60 @@
          PyErr_SetString(PyExc_TypeError, "cannot delete size attribute");
          return(-1);
      }
 -    int rc = -1;
 -    PyObject *wobj = NULL, *hobj = NULL;
-+    int rc = -1, i, dims[2];
-     if(!PySequence_Check(value) ||
-        PySequence_Size(value) != 2)
-         goto error;
+-    if(!PySequence_Check(value) ||
+-       PySequence_Size(value) != 2)
+-        goto error;
 -    wobj = PySequence_GetItem(value, 0);
 -    hobj = PySequence_GetItem(value, 1);
 -    if(!wobj || !hobj)
 -        goto error;
-+    for(i = 0; i < 2; i++) {
-+        PyObject *dim = PySequence_GetItem(value, i);
-+        if(!dim)
-+            goto error;
-+        dims[i] = PyInt_AsSsize_t(dim);
-+        Py_DECREF(dim);
-+        if(dims[i] < 0)
-+            goto error;
-+    }
  
 -    int width = PyInt_AsSsize_t(wobj);
 -    if(width == -1 && PyErr_Occurred())
 -        goto error;
--
++    int dims[2];
++    if(parse_dimensions(value, dims, 2) ||
++       dims[0] < 0 || dims[1] < 0) {
++        PyErr_SetString(PyExc_ValueError,
++                        "size must be a sequence of two positive ints");
++        return(-1);
++    }
+ 
 -    int height = PyInt_AsSsize_t(hobj);
 -    if(height == -1 && PyErr_Occurred())
 -        goto error;
--
--    zbar_image_set_size(self->zimg, width, height);
 +    zbar_image_set_size(self->zimg, dims[0], dims[1]);
-     rc = 0;
- 
- error:
--    Py_XDECREF(wobj);
--    Py_XDECREF(hobj);
-     if(rc)
-         PyErr_SetString(PyExc_ValueError,
--                        "size must be a sequence of two ints");
-+                        "size must be a sequence of two positive ints");
-+    return(rc);
++    return(0);
 +}
-+
+ 
+-    zbar_image_set_size(self->zimg, width, height);
+-    rc = 0;
 +static PyObject*
 +image_get_crop (zbarImage *self,
 +                void *closure)
@@ -20557,7 +23715,11 @@ diff --git a/python/image.c b/python/image.c
 +    return(PyTuple_Pack(4, PyInt_FromLong(x), PyInt_FromLong(y),
 +                        PyInt_FromLong(w), PyInt_FromLong(h)));
 +}
-+
+ 
+-error:
+-    Py_XDECREF(wobj);
+-    Py_XDECREF(hobj);
+-    if(rc)
 +static int
 +image_set_crop (zbarImage *self,
 +                PyObject *value,
@@ -20569,21 +23731,17 @@ diff --git a/python/image.c b/python/image.c
 +        zbar_image_set_crop(self->zimg, 0, 0, w, h);
 +        return(0);
 +    }
-+    int rc = -1, i, dims[4];
-+    if(!PySequence_Check(value) ||
-+       PySequence_Size(value) != 4)
-+        goto error;
-+    for(i = 0; i < 4; i++) {
-+        PyObject *dim = PySequence_GetItem(value, i);
-+        if(!dim)
-+            goto error;
-+        dims[i] = PyInt_AsSsize_t(dim);
-+        Py_DECREF(dim);
-+        if(dims[i] == -1 && PyErr_Occurred())
-+            goto error;
++
++    int dims[4];
++    if(parse_dimensions(value, dims, 4) ||
++       dims[2] < 0 || dims[3] < 0) {
+         PyErr_SetString(PyExc_ValueError,
+-                        "size must be a sequence of two ints");
+-    return(rc);
++                        "crop must be a sequence of four positive ints");
++        return(-1);
 +    }
-+    if(dims[2] < 0 || dims[3] < 0)
-+        goto error;
++
 +    if(dims[0] < 0) {
 +        dims[2] += dims[0];
 +        dims[0] = 0;
@@ -20594,16 +23752,11 @@ diff --git a/python/image.c b/python/image.c
 +    }
 +
 +    zbar_image_set_crop(self->zimg, dims[0], dims[1], dims[2], dims[3]);
-+    rc = 0;
-+
-+error:
-+    if(rc)
-+        PyErr_SetString(PyExc_ValueError,
-+                        "crop must be a sequence of four positive ints");
-     return(rc);
++    return(0);
  }
  
-@@ -308,6 +359,7 @@ image_set_data (zbarImage *self,
+ static PyObject*
+@@ -308,6 +336,7 @@
  static PyGetSetDef image_getset[] = {
      { "format",   (getter)image_get_format, (setter)image_set_format, },
      { "size",     (getter)image_get_size,   (setter)image_set_size, },
@@ -20611,7 +23764,7 @@ diff --git a/python/image.c b/python/image.c
      { "width",    (getter)image_get_int,    (setter)image_set_int,
        NULL, (void*)0 },
      { "height",   (getter)image_get_int,    (setter)image_set_int,
-@@ -359,6 +411,7 @@ image_convert (zbarImage *self,
+@@ -359,6 +388,7 @@
                       format);
          return(NULL);
      }
@@ -20619,7 +23772,7 @@ diff --git a/python/image.c b/python/image.c
  
      zbarImage *img = PyObject_GC_New(zbarImage, &zbarImage_Type);
      if(!img)
-@@ -366,11 +419,9 @@ image_convert (zbarImage *self,
+@@ -366,11 +396,9 @@
      img->data = NULL;
      if(width > 0 && height > 0)
          img->zimg =
@@ -20633,10 +23786,159 @@ diff --git a/python/image.c b/python/image.c
  
      if(!img->zimg) {
          /* FIXME propagate exception */
-diff --git a/python/setup.py b/python/setup.py
-new file mode 100755
---- /dev/null
-+++ b/python/setup.py
+diff -r 563557a923d0 python/processor.c
+--- a/python/processor.c	Tue Oct 27 11:25:59 2009 -0400
++++ b/python/processor.c	Fri Feb 22 08:54:29 2013 -0300
+@@ -36,15 +36,30 @@
+                PyObject *args,
+                PyObject *kwds)
+ {
+-    static char *kwlist[] = { NULL };
+-    if(!PyArg_ParseTupleAndKeywords(args, kwds, "", kwlist))
++    static char *kwlist[] = { "enable_threads", NULL };
++    int threaded = -1;
++    if(!PyArg_ParseTupleAndKeywords(args, kwds, "|O&", kwlist,
++                                    object_to_bool, &threaded))
+         return(NULL);
+ 
++#ifdef WITH_THREAD
++    /* the processor creates a thread that calls back into python,
++     * so we must ensure that threads are initialized before attempting
++     * to manipulate the GIL (bug #3349199)
++     */
++    PyEval_InitThreads();
++#else
++    if(threaded > 0 &&
++       PyErr_WarnEx(NULL, "threading requested but not available", 1))
++        return(NULL);
++    threaded = 0;
++#endif
++
+     zbarProcessor *self = (zbarProcessor*)type->tp_alloc(type, 0);
+     if(!self)
+         return(NULL);
+ 
+-    self->zproc = zbar_processor_create(0/*FIXME*/);
++    self->zproc = zbar_processor_create(threaded);
+     zbar_processor_set_userdata(self->zproc, self);
+     if(!self->zproc) {
+         Py_DECREF(self);
+@@ -138,12 +153,35 @@
+     return(zbarSymbolSet_FromSymbolSet(zsyms));
+ }
+ 
++static int
++processor_set_request_size (zbarProcessor *self,
++                            PyObject *value,
++                            void *closure)
++{
++    if(!value) {
++        zbar_processor_request_size(self->zproc, 0, 0);
++        return(0);
++    }
++
++    int dims[2];
++    if(parse_dimensions(value, dims, 2) ||
++       dims[0] < 0 || dims[1] < 0) {
++        PyErr_SetString(PyExc_ValueError,
++                        "request_size must be a sequence of two positive ints");
++        return(-1);
++    }
++
++    zbar_processor_request_size(self->zproc, dims[0], dims[1]);
++    return(0);
++}
++
+ static PyGetSetDef processor_getset[] = {
+     { "visible",  (getter)processor_get_bool, (setter)processor_set_bool,
+       NULL, (void*)0 },
+     { "active",   NULL,                       (setter)processor_set_bool,
+       NULL, (void*)1 },
+     { "results",  (getter)processor_get_results, },
++    { "request_size", NULL, (setter)processor_set_request_size, },
+     { NULL, },
+ };
+ 
+@@ -228,7 +266,11 @@
+                                     object_to_timeout, &timeout))
+         return(NULL);
+ 
+-    int rc = zbar_processor_user_wait(self->zproc, timeout);
++    int rc = -1;
++    Py_BEGIN_ALLOW_THREADS
++    rc = zbar_processor_user_wait(self->zproc, timeout);
++    Py_END_ALLOW_THREADS
++
+     if(rc < 0)
+         return(zbarErr_Set((PyObject*)self));
+     return(PyInt_FromLong(rc));
+@@ -245,7 +287,11 @@
+                                     object_to_timeout, &timeout))
+         return(NULL);
+ 
+-    int rc = zbar_process_one(self->zproc, timeout);
++    int rc = -1;
++    Py_BEGIN_ALLOW_THREADS
++    rc = zbar_process_one(self->zproc, timeout);
++    Py_END_ALLOW_THREADS
++
+     if(rc < 0)
+         return(zbarErr_Set((PyObject*)self));
+     return(PyInt_FromLong(rc));
+@@ -265,7 +311,11 @@
+     if(zbarImage_validate(img))
+         return(NULL);
+ 
+-    int n = zbar_process_image(self->zproc, img->zimg);
++    int n = -1;
++    Py_BEGIN_ALLOW_THREADS
++    n = zbar_process_image(self->zproc, img->zimg);
++    Py_END_ALLOW_THREADS
++
+     if(n < 0)
+         return(zbarErr_Set((PyObject*)self));
+     return(PyInt_FromLong(n));
+@@ -275,6 +325,9 @@
+ process_handler (zbar_image_t *zimg,
+                  const void *userdata)
+ {
++    PyGILState_STATE gstate;
++    gstate = PyGILState_Ensure();
++
+     zbarProcessor *self = (zbarProcessor*)userdata;
+     assert(self);
+     assert(self->handler);
+@@ -285,7 +338,7 @@
+         img = zbarImage_FromImage(zimg);
+         if(!img) {
+             PyErr_NoMemory();
+-            return;
++            goto done;
+         }
+     }
+     else
+@@ -299,8 +352,17 @@
+     PyTuple_SET_ITEM(args, 2, self->closure);
+ 
+     PyObject *junk = PyObject_Call(self->handler, args, NULL);
+-    Py_XDECREF(junk);
++    if(junk)
++        Py_DECREF(junk);
++    else {
++        PySys_WriteStderr("in ZBar Processor data_handler:\n");
++        assert(PyErr_Occurred());
++        PyErr_Print();
++    }
+     Py_DECREF(args);
++
++done:
++    PyGILState_Release(gstate);
+ }
+ 
+ static PyObject*
+diff -r 563557a923d0 python/setup.py
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/python/setup.py	Fri Feb 22 08:54:29 2013 -0300
 @@ -0,0 +1,44 @@
 +#!/usr/bin/env python
 +from distutils.core import setup, Extension
@@ -20682,9 +23984,9 @@ new file mode 100755
 +        ),
 +    ],
 +)
-diff --git a/python/symbol.c b/python/symbol.c
---- a/python/symbol.c
-+++ b/python/symbol.c
+diff -r 563557a923d0 python/symbol.c
+--- a/python/symbol.c	Tue Oct 27 11:25:59 2009 -0400
++++ b/python/symbol.c	Fri Feb 22 08:54:29 2013 -0300
 @@ -1,5 +1,5 @@
  /*------------------------------------------------------------------------
 - *  Copyright 2009 (c) Jeff Brown <spadix@users.sourceforge.net>
@@ -20692,7 +23994,7 @@ diff --git a/python/symbol.c b/python/symbol.c
   *
   *  This file is part of the ZBar Bar Code Reader.
   *
-@@ -81,6 +81,22 @@ symbol_get_type (zbarSymbol *self,
+@@ -81,6 +81,22 @@
  }
  
  static PyObject*
@@ -20715,7 +24017,7 @@ diff --git a/python/symbol.c b/python/symbol.c
  symbol_get_long (zbarSymbol *self,
                   void *closure)
  {
-@@ -128,12 +144,23 @@ symbol_get_location (zbarSymbol *self,
+@@ -128,12 +144,23 @@
      return(self->loc);
  }
  
@@ -20739,10 +24041,10 @@ diff --git a/python/symbol.c b/python/symbol.c
      { "components", (getter)symbol_get_components,  },
      { NULL, },
  };
-diff --git a/python/test/test_zbar.py b/python/test/test_zbar.py
---- a/python/test/test_zbar.py
-+++ b/python/test/test_zbar.py
-@@ -20,6 +20,9 @@ def load_image():
+diff -r 563557a923d0 python/test/test_zbar.py
+--- a/python/test/test_zbar.py	Tue Oct 27 11:25:59 2009 -0400
++++ b/python/test/test_zbar.py	Fri Feb 22 08:54:29 2013 -0300
+@@ -20,6 +20,9 @@
  encoded_widths = \
      '9 111 212241113121211311141132 11111 311213121312121332111132 111 9'
  
@@ -20752,7 +24054,7 @@ diff --git a/python/test/test_zbar.py b/python/test/test_zbar.py
  VIDEO_DEVICE = None
  if 'VIDEO_DEVICE' in os.environ:
      VIDEO_DEVICE = os.environ['VIDEO_DEVICE']
-@@ -59,6 +62,7 @@ class TestZBarFunctions(ut.TestCase):
+@@ -59,6 +62,7 @@
                      zbar.Config.ASCII,
                      zbar.Config.MIN_LEN,
                      zbar.Config.MAX_LEN,
@@ -20760,7 +24062,7 @@ diff --git a/python/test/test_zbar.py b/python/test/test_zbar.py
                      zbar.Config.POSITION,
                      zbar.Config.X_DENSITY,
                      zbar.Config.Y_DENSITY):
-@@ -66,6 +70,13 @@ class TestZBarFunctions(ut.TestCase):
+@@ -66,6 +70,13 @@
              self.assert_(int(cfg) >= 0)
              self.assert_(is_identifier.match(str(cfg)))
  
@@ -20774,13 +24076,14 @@ diff --git a/python/test/test_zbar.py b/python/test/test_zbar.py
      def test_symbologies(self):
          for sym in (zbar.Symbol.NONE,
                      zbar.Symbol.PARTIAL,
-@@ -75,15 +86,28 @@ class TestZBarFunctions(ut.TestCase):
+@@ -75,15 +86,29 @@
                      zbar.Symbol.UPCA,
                      zbar.Symbol.EAN13,
                      zbar.Symbol.ISBN13,
 +                    zbar.Symbol.DATABAR,
 +                    zbar.Symbol.DATABAR_EXP,
                      zbar.Symbol.I25,
++                    zbar.Symbol.CODABAR,
                      zbar.Symbol.CODE39,
                      zbar.Symbol.PDF417,
                      zbar.Symbol.QRCODE,
@@ -20803,7 +24106,7 @@ diff --git a/python/test/test_zbar.py b/python/test/test_zbar.py
  class TestScanner(ut.TestCase):
      def setUp(self):
          self.scn = zbar.Scanner()
-@@ -135,6 +159,9 @@ class TestDecoder(ut.TestCase):
+@@ -135,6 +160,9 @@
              self.dcode.data = data
          self.assertRaises(AttributeError, set_data, 'yomama')
  
@@ -20813,7 +24116,7 @@ diff --git a/python/test/test_zbar.py b/python/test/test_zbar.py
      def test_width(self):
          sym = self.dcode.decode_width(5)
          self.assert_(sym is zbar.Symbol.NONE)
-@@ -150,6 +177,7 @@ class TestDecoder(ut.TestCase):
+@@ -150,6 +178,7 @@
          self.assert_(self.dcode.color is zbar.BAR)
          self.dcode.reset()
          self.assert_(self.dcode.color is zbar.SPACE)
@@ -20821,7 +24124,7 @@ diff --git a/python/test/test_zbar.py b/python/test/test_zbar.py
  
      def test_decode(self):
          inline_sym = [ -1 ]
-@@ -172,12 +200,33 @@ class TestDecoder(ut.TestCase):
+@@ -172,12 +201,33 @@
              else:
                  self.assert_(sym is zbar.Symbol.EAN13)
  
@@ -20855,7 +24158,7 @@ diff --git a/python/test/test_zbar.py b/python/test/test_zbar.py
      # FIXME test exception during callback
  
  class TestImage(ut.TestCase):
-@@ -194,11 +243,13 @@ class TestImage(ut.TestCase):
+@@ -194,11 +244,13 @@
      def test_new(self):
          self.assertEqual(self.image.format, 'Y800')
          self.assertEqual(self.image.size, (123, 456))
@@ -20869,7 +24172,7 @@ diff --git a/python/test/test_zbar.py b/python/test/test_zbar.py
  
      def test_format(self):
          def set_format(fmt):
-@@ -231,6 +282,23 @@ class TestImage(ut.TestCase):
+@@ -231,6 +283,23 @@
          self.assertEqual(self.image.width, 81)
          self.assertEqual(self.image.height, 64)
  
@@ -20893,7 +24196,7 @@ diff --git a/python/test/test_zbar.py b/python/test/test_zbar.py
  class TestImageScanner(ut.TestCase):
      def setUp(self):
          self.scn = zbar.ImageScanner()
-@@ -289,6 +357,20 @@ class TestImageScan(ut.TestCase):
+@@ -289,6 +358,20 @@
              self.assert_(sym.type is zbar.Symbol.EAN13)
              self.assert_(sym.type is sym.EAN13)
              self.assertEqual(str(sym.type), 'EAN13')
@@ -20914,7 +24217,7 @@ diff --git a/python/test/test_zbar.py b/python/test/test_zbar.py
              self.assert_(sym.quality > 0)
              self.assertEqual(sym.count, 0)
  
-@@ -310,6 +392,7 @@ class TestImageScan(ut.TestCase):
+@@ -310,6 +393,7 @@
                  self.assertEqual(len(pt), 2)
                  # FIXME test values (API currently in flux)
  
@@ -20922,7 +24225,7 @@ diff --git a/python/test/test_zbar.py b/python/test/test_zbar.py
              self.assert_(data is sym.data)
              self.assert_(loc is sym.location)
  
-@@ -320,6 +403,21 @@ class TestImageScan(ut.TestCase):
+@@ -320,6 +404,21 @@
          self.scn.recycle(self.image)
          self.assertEqual(len(self.image.symbols), 0)
  
@@ -20944,7 +24247,23 @@ diff --git a/python/test/test_zbar.py b/python/test/test_zbar.py
      def test_scan_again(self):
          self.test_scan()
  
-@@ -370,13 +468,14 @@ class TestProcessor(ut.TestCase):
+@@ -351,6 +450,15 @@
+         self.assertRaises(ValueError, self.proc.set_config, -1)
+         self.proc.set_config()
+ 
++    def test_request_size(self):
++        def set_size(sz):
++            self.proc.request_size = sz
++        self.assertRaises(ValueError, set_size, (1,))
++        self.assertRaises(ValueError, set_size, 1)
++        self.proc.request_size = (12, 6)
++        self.assertRaises(ValueError, set_size, (1, 2, 3))
++        self.assertRaises(ValueError, set_size, "foo")
++
+     def test_processing(self):
+         self.proc.init(VIDEO_DEVICE)
+         self.assert_(self.proc.visible is False)
+@@ -370,13 +478,14 @@
              symiter = iter(image)
              self.assert_(isinstance(symiter, zbar.SymbolIter))
  
@@ -20966,9 +24285,9 @@ diff --git a/python/test/test_zbar.py b/python/test/test_zbar.py
              closure[0] += 1
  
          explicit_closure = [ 0 ]
-diff --git a/python/zbarmodule.c b/python/zbarmodule.c
---- a/python/zbarmodule.c
-+++ b/python/zbarmodule.c
+diff -r 563557a923d0 python/zbarmodule.c
+--- a/python/zbarmodule.c	Tue Oct 27 11:25:59 2009 -0400
++++ b/python/zbarmodule.c	Fri Feb 22 08:54:29 2013 -0300
 @@ -1,5 +1,5 @@
  /*------------------------------------------------------------------------
 - *  Copyright 2009 (c) Jeff Brown <spadix@users.sourceforge.net>
@@ -20988,7 +24307,7 @@ diff --git a/python/zbarmodule.c b/python/zbarmodule.c
  static char *exc_names[] = {
      "zbar.Exception",
      NULL,
-@@ -38,6 +43,55 @@ static char *exc_names[] = {
+@@ -38,6 +43,56 @@
      "zbar.WinAPIError",
  };
  
@@ -21004,6 +24323,7 @@ diff --git a/python/zbarmodule.c b/python/zbarmodule.c
 +    { "DATABAR",        ZBAR_DATABAR },
 +    { "DATABAR_EXP",    ZBAR_DATABAR_EXP },
 +    { "I25",            ZBAR_I25 },
++    { "CODABAR",        ZBAR_CODABAR },
 +    { "CODE39",         ZBAR_CODE39 },
 +    { "PDF417",         ZBAR_PDF417 },
 +    { "QRCODE",         ZBAR_QRCODE },
@@ -21044,7 +24364,32 @@ diff --git a/python/zbarmodule.c b/python/zbarmodule.c
  int
  object_to_bool (PyObject *obj,
                  int *val)
-@@ -52,8 +106,10 @@ object_to_bool (PyObject *obj,
+@@ -49,11 +104,35 @@
+     return(1);
+ }
+ 
++int
++parse_dimensions (PyObject *seq,
++                  int *dims,
++                  int n)
++{
++    if(!PySequence_Check(seq) ||
++       PySequence_Size(seq) != n)
++        return(-1);
++
++    int i;
++    for(i = 0; i < n; i++, dims++) {
++        PyObject *dim = PySequence_GetItem(seq, i);
++        if(!dim)
++            return(-1);
++        *dims = PyInt_AsSsize_t(dim);
++        Py_DECREF(dim);
++        if(*dims == -1 && PyErr_Occurred())
++            return(-1);
++    }
++    return(0);
++}
++
  PyObject *zbar_exc[ZBAR_ERR_NUM];
  zbarEnumItem *color_enum[2];
  zbarEnum *config_enum;
@@ -21055,7 +24400,7 @@ diff --git a/python/zbarmodule.c b/python/zbarmodule.c
  
  static PyObject*
  version (PyObject *self,
-@@ -105,12 +161,6 @@ static PyMethodDef zbar_functions[] = {
+@@ -105,12 +184,6 @@
  PyMODINIT_FUNC
  initzbar (void)
  {
@@ -21068,7 +24413,7 @@ diff --git a/python/zbarmodule.c b/python/zbarmodule.c
      /* initialize types */
      zbarEnumItem_Type.tp_base = &PyInt_Type;
      zbarException_Type.tp_base = (PyTypeObject*)PyExc_Exception;
-@@ -128,6 +178,14 @@ initzbar (void)
+@@ -128,6 +201,14 @@
         PyType_Ready(&zbarScanner_Type) < 0)
          return;
  
@@ -21083,7 +24428,7 @@ diff --git a/python/zbarmodule.c b/python/zbarmodule.c
      zbar_exc[0] = (PyObject*)&zbarException_Type;
      zbar_exc[ZBAR_ERR_NOMEM] = NULL;
      zbar_error_t ei;
-@@ -151,6 +209,8 @@ initzbar (void)
+@@ -151,6 +232,8 @@
      PyModule_AddObject(mod, "EnumItem", (PyObject*)&zbarEnumItem_Type);
      PyModule_AddObject(mod, "Image", (PyObject*)&zbarImage_Type);
      PyModule_AddObject(mod, "Config", (PyObject*)config_enum);
@@ -21092,7 +24437,7 @@ diff --git a/python/zbarmodule.c b/python/zbarmodule.c
      PyModule_AddObject(mod, "Symbol", (PyObject*)&zbarSymbol_Type);
      PyModule_AddObject(mod, "SymbolSet", (PyObject*)&zbarSymbolSet_Type);
      PyModule_AddObject(mod, "SymbolIter", (PyObject*)&zbarSymbolIter_Type);
-@@ -170,29 +230,16 @@ initzbar (void)
+@@ -170,29 +253,16 @@
      color_enum[ZBAR_BAR] =
          zbarEnumItem_New(dict, NULL, ZBAR_BAR, "BAR");
  
@@ -21132,9 +24477,9 @@ diff --git a/python/zbarmodule.c b/python/zbarmodule.c
 +        zbarEnumItem_New(tp_dict, symbol_enum, item->intval, item->strval);
 +    symbol_NONE = zbarSymbol_LookupEnum(ZBAR_NONE);
  }
-diff --git a/python/zbarmodule.h b/python/zbarmodule.h
---- a/python/zbarmodule.h
-+++ b/python/zbarmodule.h
+diff -r 563557a923d0 python/zbarmodule.h
+--- a/python/zbarmodule.h	Tue Oct 27 11:25:59 2009 -0400
++++ b/python/zbarmodule.h	Fri Feb 22 08:54:29 2013 -0300
 @@ -1,5 +1,5 @@
  /*------------------------------------------------------------------------
 - *  Copyright 2009 (c) Jeff Brown <spadix@users.sourceforge.net>
@@ -21142,7 +24487,7 @@ diff --git a/python/zbarmodule.h b/python/zbarmodule.h
   *
   *  This file is part of the ZBar Bar Code Reader.
   *
-@@ -61,6 +61,10 @@ extern zbarEnum *zbarEnum_New(void);
+@@ -61,6 +61,10 @@
  extern int zbarEnum_Add(zbarEnum *self,
                           int val,
                           const char *name);
@@ -21153,7 +24498,7 @@ diff --git a/python/zbarmodule.h b/python/zbarmodule.h
  
  typedef struct {
      PyObject_HEAD
-@@ -144,8 +148,10 @@ extern PyTypeObject zbarScanner_Type;
+@@ -144,10 +148,15 @@
  
  extern zbarEnumItem *color_enum[2];
  extern zbarEnum *config_enum;
@@ -21162,63 +24507,373 @@ diff --git a/python/zbarmodule.h b/python/zbarmodule.h
  extern zbarEnumItem *symbol_NONE;
 +extern zbarEnum *orient_enum;
  
- int object_to_bool(PyObject *obj,
-                    int *val);
-diff --git a/test/Makefile.am.inc b/test/Makefile.am.inc
---- a/test/Makefile.am.inc
-+++ b/test/Makefile.am.inc
-@@ -67,3 +67,14 @@ EXTRA_DIST += test/test_pygtk.py test/te
+-int object_to_bool(PyObject *obj,
+-                   int *val);
++extern int object_to_bool(PyObject *obj,
++                          int *val);
++extern int parse_dimensions(PyObject *seq,
++                            int *dims,
++                            int n);
+ 
+ #endif
+diff -r 563557a923d0 qt/QZBarThread.cpp
+--- a/qt/QZBarThread.cpp	Tue Oct 27 11:25:59 2009 -0400
++++ b/qt/QZBarThread.cpp	Fri Feb 22 08:54:29 2013 -0300
+@@ -26,7 +26,7 @@
+ 
+ using namespace zbar;
+ 
+-static const QString textFormat("%1%2:%3");
++static const QString textFormat("%1:%2");
+ 
+ QZBarThread::QZBarThread ()
+     : _videoOpened(false),
+@@ -52,7 +52,6 @@
+ 
+             emit decodedText(textFormat.arg(
+                 QString::fromStdString(sym->get_type_name()),
+-                QString::fromStdString(sym->get_addon_name()),
+                 data));
+         }
+ }
+@@ -168,7 +167,7 @@
+ 
+ bool QZBarThread::event (QEvent *e)
+ {
+-    switch(e->type()) {
++    switch((EventType)e->type()) {
+     case VideoDevice:
+         videoDeviceEvent((VideoDeviceEvent*)e);
+         break;
+diff -r 563557a923d0 test/Makefile.am.inc
+--- a/test/Makefile.am.inc	Tue Oct 27 11:25:59 2009 -0400
++++ b/test/Makefile.am.inc	Fri Feb 22 08:54:29 2013 -0300
+@@ -28,6 +28,10 @@
+ test_test_cpp_SOURCES = test/test_cpp.cpp
+ test_test_cpp_LDADD = zbar/libzbar.la $(AM_LDADD)
+ 
++check_PROGRAMS += test/test_cpp_img
++test_test_cpp_img_SOURCES = test/test_cpp_img.cpp $(TEST_IMAGE_SOURCES)
++test_test_cpp_img_LDADD = zbar/libzbar.la $(AM_LDADD)
++
+ if HAVE_JPEG
+ check_PROGRAMS += test/test_jpeg
+ test_test_jpeg_SOURCES = test/test_jpeg.c
+@@ -67,3 +71,17 @@
  CLEANFILES += test/.libs/test_decode test/.libs/test_proc \
      test/.libs/test_convert test/.libs/test_window \
      test/.libs/test_video test/.libs/dbg_scan test/.libs/test_gtk
 +
++check-cpp: test/test_cpp_img
++	test/test_cpp_img
++
 +check-decoder: test/test_decode
 +	test/test_decode -q
 +
 +regress-decoder: test/test_decode
 +	test/test_decode -n 100000
 +
-+check-local: check-decoder check-images
-+regress: regress-decoder regress-images
++check-local: check-cpp check-decoder check-images
++regress: regress-decoder regress-images
++
++.PHONY: check-cpp check-decoder check-images regress-decoder regress-images regress
+diff -r 563557a923d0 test/barcodetest.py
+--- a/test/barcodetest.py	Tue Oct 27 11:25:59 2009 -0400
++++ b/test/barcodetest.py	Fri Feb 22 08:54:29 2013 -0300
+@@ -66,7 +66,7 @@
+         import re
+         makefile = open('Makefile')
+         for line in makefile:
+-            if re.match('^VPATH\s*=', line):
++            if re.match(r'^VPATH\s*=', line):
+                 vpath = line.split('=', 1)[1].strip()
+                 if vpath and vpath != rundir:
+                     search.append(vpath)
+@@ -124,6 +124,8 @@
+     assert rc in (0, 4), \
+            'zbarimg returned error status (%d)\n' % rc + err
+ 
++    assert not err, err
++
+     result = ET.XML(xml)
+     assert result.tag == ET.QName(BC, 'barcodes')
+     return result
+@@ -167,7 +169,8 @@
+             href = 'http://zbar.sf.net/test/barcode.png'
+ 
+         self.source = src = ET.Element(ET.QName(BC, 'source'), href=href)
+-        sym = ET.SubElement(src, ET.QName(BC, 'symbol'), type='EAN-13')
++        sym = ET.SubElement(src, ET.QName(BC, 'symbol'), type='EAN-13',
++                            orientation='UP')
+         data = ET.SubElement(sym, ET.QName(BC, 'data'))
+         data.text = '9876543210128'
+ 
+@@ -258,8 +261,9 @@
+ 
+ 
+ def compare_symbols(expect, actual):
+-    pass
+-
++    orient = expect.get('orientation')
++    if orient:
++        assert actual.get('orientation') == orient
+ 
+ # override unittest.TestLoader to populate tests from xml description
+ class TestLoader:
+@@ -348,7 +352,10 @@
+                 continue
+             if src.tag == ET.QName(BC, 'source'):
+                 test = TestCase()
+-                src.set('href', urljoin(url, href))
++                # convert file URLs to filesystem paths
++                href = urljoin(url, href)
++                href = re.sub(r'^file://', '', href)
++                src.set('href', href)
+                 test.source = src
+                 suite.addTest(test)
+             elif src.tag == ET.QName(TS, 'index'):
+diff -r 563557a923d0 test/test_cpp_img.cpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/test/test_cpp_img.cpp	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,235 @@
++//------------------------------------------------------------------------
++//  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++//
++//  This file is part of the ZBar Bar Code Reader.
++//
++//  The ZBar Bar Code Reader is free software; you can redistribute it
++//  and/or modify it under the terms of the GNU Lesser Public License as
++//  published by the Free Software Foundation; either version 2.1 of
++//  the License, or (at your option) any later version.
++//
++//  The ZBar Bar Code Reader is distributed in the hope that it will be
++//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
++//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++//  GNU Lesser Public License for more details.
++//
++//  You should have received a copy of the GNU Lesser Public License
++//  along with the ZBar Bar Code Reader; if not, write to the Free
++//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++//  Boston, MA  02110-1301  USA
++//
++//  http://sourceforge.net/projects/zbar
++//------------------------------------------------------------------------
++
++// NB do not put anything before this header
++// it's here to check that we didn't omit any dependencies
++#include <zbar.h>
++
++#include <iostream>
++#include <sstream>
++#include <iomanip>
++#include "test_images.h"
++
++bool debug = false;
++bool verbose = false;
++int errors = 0;
++zbar::zbar_symbol_type_t expect_type = zbar::ZBAR_NONE;
++std::string expect_data;
++
++template <class T>
++inline std::string to_string (const T& t)
++{
++    std::stringstream ss;
++    ss << t;
++    return ss.str();
++}
++
++static inline int
++error (const std::string &msg)
++{
++    errors++;
++    std::cerr << "ERROR: " << msg << std::endl;
++    if(debug)
++        abort();
++    return(-1);
++}
++
++static inline int
++check_loc (const zbar::Image &img,
++           const zbar::Symbol &sym)
++{
++    int n = 0;
++    int w = img.get_width();
++    int h = img.get_height();
++    for(zbar::Symbol::PointIterator p(sym.point_begin());
++        p != sym.point_end();
++        ++p, n++)
++    {
++        zbar::Symbol::Point q(*p);
++        if(q.x < 0 || q.x >= w ||
++           q.y < 0 || q.y >= h)
++            error("location point out of range");
++    }
++    return(!n);
++}
++
++static inline int
++check_symbol (const zbar::Image &img,
++              const zbar::Symbol &sym)
++{
++    zbar::zbar_symbol_type_t type(sym.get_type());
++    std::string data(sym.get_data());
++
++    bool pass =
++        expect_type &&
++        type == expect_type &&
++        data == expect_data &&
++        sym.get_data_length() == expect_data.length() &&
++        sym.get_quality() > 4;
++    if(pass)
++        pass = !check_loc(img, sym);
++
++    if(verbose || !pass)
++        std::cerr << "decode Symbol: " << sym << std::endl;
++
++    if(!expect_type)
++        error("unexpected");
++    else if(!pass)
++        error(std::string("expected: ") +
++              zbar::zbar_get_symbol_name(expect_type) +
++              " " + expect_data);
++
++    expect_type = zbar::ZBAR_NONE;
++    expect_data = "";
++    return(!pass);
++}
++
++static inline int
++check_image (const zbar::Image &img)
++{
++    zbar::SymbolSet syms(img.get_symbols());
++    int setn = syms.get_size(), countn = 0;
++
++    int rc = 0;
++    for(zbar::SymbolIterator sym(syms.symbol_begin());
++        sym != syms.symbol_end();
++        ++sym, ++countn)
++        rc |= check_symbol(img, *sym);
++
++    if(countn != setn)
++        rc |= error("SymbolSet size mismatch: exp=" + to_string(setn) +
++                    " act=" + to_string(countn));
++    return(rc);
++}
++
++static inline void
++expect (zbar::zbar_symbol_type_t type,
++        std::string data)
++{
++    if(expect_type)
++        error(std::string("missing: ") + zbar_get_symbol_name(expect_type) +
++              " " + expect_data);
++    expect_type = type;
++    expect_data = data;
++}
++
++class Handler : public zbar::Image::Handler {
++    void image_callback(zbar::Image &img);
++};
++
++void
++Handler::image_callback (zbar::Image &img)
++{
++    bool unexpected = !expect_type;
++    if(unexpected)
++        error("unexpected image callback");
++    check_image(img);
++}
++
++static inline int
++test_processor ()
++{
++    // create processor w/no video and no window
++    zbar::Processor proc(debug, NULL);
++    Handler handler;
++    proc.set_handler(handler);
++    if(debug) {
++        proc.set_visible();
++        proc.user_wait();
++    }
++
++    // generate barcode test image
++    zbar::Image rgb3(0, 0, "RGB3");
++
++    // test cast to C image
++    if(test_image_ean13(rgb3))
++        error("failed to generate image");
++
++    // test decode
++    expect(zbar::ZBAR_EAN13, test_image_ean13_data);
++    proc.process_image(rgb3);
++    if(debug)
++        proc.user_wait();
++
++    expect(zbar::ZBAR_EAN13, test_image_ean13_data);
++    check_image(rgb3);
++
++    if(rgb3.get_format() != zbar_fourcc('R','G','B','3'))
++        error("image format mismatch");
++
++    expect(zbar::ZBAR_NONE, "");
++    proc.set_config(zbar::ZBAR_EAN13,
++                    zbar::ZBAR_CFG_ENABLE,
++                    false);
++    proc.process_image(rgb3);
++    check_image(rgb3);
++    if(debug)
++        proc.user_wait();
++
++    proc.set_config("ean13.en");
++    expect(zbar::ZBAR_EAN13, test_image_ean13_data);
++    proc << rgb3;
++    expect(zbar::ZBAR_EAN13, test_image_ean13_data);
++    check_image(rgb3);
++    if(debug)
++        proc.user_wait();
++
++    {
++        zbar::Image grey(rgb3.convert(zbar_fourcc('G','R','E','Y')));
++        expect(zbar::ZBAR_EAN13, test_image_ean13_data);
++        proc << grey;
++
++        zbar::Image y800 = grey.convert("Y800");
++        expect(zbar::ZBAR_EAN13, test_image_ean13_data);
++        proc << y800;
++    }
++    if(debug)
++        // check image data retention
++        proc.user_wait();
++
++    expect(zbar::ZBAR_NONE, "");
++    return(0);
++}
++
++int main (int argc, char **argv)
++{
++    debug = (argc > 1 && std::string(argv[1]) == "-d");
++    verbose = (debug || (argc > 1 && std::string(argv[1]) == "-v"));
++
++    if(test_processor()) {
++        error("ERROR: Processor test FAILED");
++        return(2);
++    }
 +
-+.PHONY: check-decoder check-images regress-decoder regress-images regress
-diff --git a/test/barcodetest.py b/test/barcodetest.py
---- a/test/barcodetest.py
-+++ b/test/barcodetest.py
-@@ -124,6 +124,8 @@ def run_zbarimg(images):
-     assert rc in (0, 4), \
-            'zbarimg returned error status (%d)\n' % rc + err
- 
-+    assert not err, err
++    if(test_image_check_cleanup())
++        error("cleanup failed");
 +
-     result = ET.XML(xml)
-     assert result.tag == ET.QName(BC, 'barcodes')
-     return result
-@@ -167,7 +169,8 @@ class BuiltinTestCase(TestCase):
-             href = 'http://zbar.sf.net/test/barcode.png'
- 
-         self.source = src = ET.Element(ET.QName(BC, 'source'), href=href)
--        sym = ET.SubElement(src, ET.QName(BC, 'symbol'), type='EAN-13')
-+        sym = ET.SubElement(src, ET.QName(BC, 'symbol'), type='EAN-13',
-+                            orientation='UP')
-         data = ET.SubElement(sym, ET.QName(BC, 'data'))
-         data.text = '9876543210128'
- 
-@@ -258,8 +261,9 @@ def compare_indices(expect, actual):
- 
- 
- def compare_symbols(expect, actual):
--    pass
--
-+    orient = expect.get('orientation')
-+    if orient:
-+        assert actual.get('orientation') == orient
- 
- # override unittest.TestLoader to populate tests from xml description
- class TestLoader:
-diff --git a/test/test_decode.c b/test/test_decode.c
---- a/test/test_decode.c
-+++ b/test/test_decode.c
++    if(errors) {
++        std::cout << "FAIL" << std::endl;
++        return(2);
++    }
++    else {
++        std::cout << "OK" << std::endl;
++        return(0);
++    }
++}
+diff -r 563557a923d0 test/test_decode.c
+--- a/test/test_decode.c	Tue Oct 27 11:25:59 2009 -0400
++++ b/test/test_decode.c	Fri Feb 22 08:54:29 2013 -0300
 @@ -22,33 +22,86 @@
   *------------------------------------------------------------------------*/
  
@@ -21314,7 +24969,7 @@ diff --git a/test/test_decode.c b/test/test_decode.c
  }
  
  #define FWD 1
-@@ -57,8 +110,8 @@ static void encode_junk (int n)
+@@ -57,8 +110,8 @@
  static void encode (uint64_t units,
                      int fwd)
  {
@@ -21325,7 +24980,7 @@ diff --git a/test/test_decode.c b/test/test_decode.c
      if(!fwd)
          while(units && !(units >> 0x3c))
              units <<= 4;
-@@ -122,47 +175,188 @@ static const unsigned int code128[107] =
+@@ -122,47 +175,188 @@
      0x2331112a,                             /* STOP (6a) */
  };
  
@@ -21530,7 +25185,7 @@ diff --git a/test/test_decode.c b/test/test_decode.c
  }
  
  /*------------------------------------------------------------*/
-@@ -182,14 +376,29 @@ static const unsigned int code39[91-32] 
+@@ -182,14 +376,29 @@
  /* FIXME configurable/randomized ratio, ics */
  /* FIXME check digit option, ASCII escapes */
  
@@ -21565,7 +25220,7 @@ diff --git a/test/test_decode.c b/test/test_decode.c
      unsigned int raw = code39[c - 0x20];
      if(!raw)
          return; /* skip (FIXME) */
-@@ -201,15 +410,16 @@ static void encode_char39 (unsigned char
+@@ -201,15 +410,16 @@
          raw <<= 1;
      }
      enc = (enc << 4) | ics;
@@ -21587,7 +25242,7 @@ diff --git a/test/test_decode.c b/test/test_decode.c
      encode(0xa, 0);  /* leading quiet */
      encode_char39('*', 1);
      int i;
-@@ -217,10 +427,10 @@ static void encode_code39 (unsigned char
+@@ -217,10 +427,10 @@
          if(data[i] != '*') /* skip (FIXME) */
              encode_char39(data[i], 1);
      encode_char39('*', 0xa);  /* w/trailing quiet */
@@ -21600,7 +25255,7 @@ diff --git a/test/test_decode.c b/test/test_decode.c
  /*------------------------------------------------------------*/
  /* PDF417 encoding */
  
-@@ -258,32 +468,33 @@ static void encode_row417 (int r,
+@@ -258,32 +468,33 @@
  {
      int k = r % 3;
  
@@ -21642,19 +25297,117 @@ diff --git a/test/test_decode.c b/test/test_decode.c
      encode(0xa, 0);
  
      int r;
-@@ -292,9 +503,9 @@ static void encode_pdf417 (unsigned char
+@@ -292,9 +503,108 @@
          encode(0xa, 0);
      }
  
 -    printf("------------------------------------------------------------\n");
 +    print_sep(3);
- }
--
++}
 +#endif
++
++/*------------------------------------------------------------*/
++/* Codabar encoding */
++
++static const unsigned int codabar[20] = {
++    0x03, 0x06, 0x09, 0x60, 0x12, 0x42, 0x21, 0x24,
++    0x30, 0x48, 0x0c, 0x18, 0x45, 0x51, 0x54, 0x15,
++    0x1a, 0x29, 0x0b, 0x0e,
++};
++
++static const char codabar_char[0x14] =
++    "0123456789-$:/.+ABCD";
++
++/* FIXME configurable/randomized ratio, ics */
++/* FIXME check digit option */
++
++static char *convert_codabar (char *src)
++{
++    unsigned len = strlen(src);
++    char tmp[4] = { 0, };
++    if(len < 2) {
++        unsigned delim = rand() >> 8;
++        tmp[0] = delim & 3;
++        if(len)
++            tmp[1] = src[0];
++        tmp[len + 1] = (delim >> 2) & 3;
++        len += 2;
++        src = tmp;
++    }
++
++    char *result = malloc(len + 1);
++    char *dst = result;
++    *(dst++) = ((*(src++) - 1) & 0x3) + 'A';
++    for(len--; len > 1; len--) {
++        char c = *(src++);
++        if(c >= '0' && c <= '9')
++            *(dst++) = c;
++        else if(c == '-' || c == '$' || c == ':' || c == '/' ||
++                c == '.' || c == '+')
++            *(dst++) = c;
++        else
++            *(dst++) = codabar_char[c % 0x10];
++    }
++    *(dst++) = ((*(src++) - 1) & 0x3) + 'A';
++    *dst = 0;
++    return(result);
+ }
+ 
++static void encode_codachar (unsigned char c,
++                             unsigned ics,
++                             int dir)
++{
++    unsigned int idx;
++    if(c >= '0' && c <= '9')
++        idx = c - '0';
++    else if(c >= 'A' && c <= 'D')
++        idx = c - 'A' + 0x10;
++    else
++        switch(c)
++        {
++        case '-': idx = 0xa; break;
++        case '$': idx = 0xb; break;
++        case ':': idx = 0xc; break;
++        case '/': idx = 0xd; break;
++        case '.': idx = 0xe; break;
++        case '+': idx = 0xf; break;
++        default:
++            assert(0);
++        }
++
++    assert(idx < 0x14);
++    unsigned int raw = codabar[idx];
++
++    uint32_t enc = 0;
++    int j;
++    for(j = 0; j < 7; j++, raw <<= 1)
++        enc = (enc << 4) | ((raw & 0x40) ? 3 : 1);
++    zprintf(3, "    encode '%c': %07x: ", c, enc);
++    if(dir)
++        enc = (enc << 4) | ics;
++    else
++        enc |= ics << 28;
++    encode(enc, 1 - dir);
++}
++
++static void encode_codabar (char *data,
++                            int dir)
++{
++    assert(zbar_decoder_get_color(decoder) == ZBAR_SPACE);
++    print_sep(3);
++    zprintf(2, "CODABAR: %s\n", data);
++    encode(0xa, 0);  /* leading quiet */
++    int i, n = strlen(data);
++    for(i = 0; i < n; i++) {
++        int j = (dir) ? i : n - i - 1;
++        encode_codachar(data[j], (i < n - 1) ? 1 : 0xa, dir);
++    }
++    print_sep(3);
++}
  
  /*------------------------------------------------------------*/
  /* Interleaved 2 of 5 encoding */
-@@ -303,21 +514,22 @@ static const unsigned char i25[10] = {
+@@ -303,21 +613,22 @@
      0x06, 0x11, 0x09, 0x18, 0x05, 0x14, 0x0c, 0x03, 0x12, 0x0a,
  };
  
@@ -21683,7 +25436,7 @@ diff --git a/test/test_decode.c b/test/test_decode.c
          assert(c0 < 10);
          assert(c1 < 10);
  
-@@ -337,12 +549,252 @@ static void encode_i25 (unsigned char *d
+@@ -337,12 +648,252 @@
          encode(enc, dir);
      }
  
@@ -21938,16 +25691,29 @@ diff --git a/test/test_decode.c b/test/test_decode.c
  /* EAN/UPC encoding */
  
  static const unsigned int ean_digits[10] = {
-@@ -372,7 +824,7 @@ static const unsigned char ean_parity_en
+@@ -372,7 +923,20 @@
      0x25,       /* ABBABA = 9 */
  };
  
 -static void calc_ean_parity (unsigned char *data,
++static const unsigned char addon_parity_encode[] = {
++    0x07,       /* BBAAA = 0 */
++    0x0b,       /* BABAA = 1 */
++    0x0d,       /* BAABA = 2 */
++    0x0e,       /* BAAAB = 3 */
++    0x13,       /* ABBAA = 4 */
++    0x19,       /* AABBA = 5 */
++    0x1c,       /* AAABB = 6 */
++    0x15,       /* ABABA = 7 */
++    0x16,       /* ABAAB = 8 */
++    0x1a,       /* AABAB = 9 */
++};
++
 +static void calc_ean_parity (char *data,
                               int n)
  {
      int i, chk = 0;
-@@ -387,119 +839,293 @@ static void calc_ean_parity (unsigned ch
+@@ -387,119 +951,372 @@
      data[i] = 0;
  }
  
@@ -22018,6 +25784,43 @@ diff --git a/test/test_decode.c b/test/test_decode.c
      encode(ean_guard[3], REV);
 -    printf("------------------------------------------------------------\n");
 +    print_sep(3);
++}
++
++static void encode_addon (char *data,
++                          unsigned par,
++                          int n)
++{
++    int i;
++    assert(zbar_decoder_get_color(decoder) == ZBAR_SPACE);
++
++    print_sep(3);
++    zprintf(2, "EAN-%d: %s (par=%02x)\n", n, data, par);
++    zprintf(3, "    encode start guard:");
++    encode(ean_guard[4], FWD);
++    for(i = 0; i < n; i++, par <<= 1) {
++        zprintf(3, "    encode %x%c:", (par >> (n - 1)) & 1, data[i]);
++        encode(ean_digits[data[i] - '0'], (par >> (n - 1)) & 1);
++        if(i < n - 1) {
++	    zprintf(3, "    encode delineator:");
++            encode(ean_guard[2], FWD);
++        }
++    }
++    zprintf(3, "    encode trailing qz:");
++    encode(0x7, FWD);
++    print_sep(3);
++}
++
++static void encode_ean5 (char *data)
++{
++    unsigned chk = ((data[0] - '0' + data[2] - '0' + data[4] - '0') * 3 +
++                    (data[1] - '0' + data[3] - '0') * 9) % 10;
++    encode_addon(data, addon_parity_encode[chk], 5);
++}
++
++static void encode_ean2 (char *data)
++{
++    unsigned par = (~(10 * (data[0] - '0') + data[1] - '0')) & 3;
++    encode_addon(data, par, 2);
  }
  
  
@@ -22120,7 +25923,7 @@ diff --git a/test/test_decode.c b/test/test_decode.c
      encode_i25(data, FWD);
  
      encode_junk(rnd_size);
- 
+-
 +#if 0 /* FIXME encoding broken */
      encode_i25(data, REV);
  
@@ -22129,16 +25932,36 @@ diff --git a/test/test_decode.c b/test/test_decode.c
  
 -    calc_ean_parity(data, 7);
 -    encode_ean8(data);
++    char *cdb = convert_codabar(data);
++    expect(ZBAR_CODABAR, cdb);
++    encode_codabar(cdb, FWD);
++    encode_junk(rnd_size);
++
++    expect(ZBAR_CODABAR, cdb);
++    encode_codabar(cdb, REV);
++    encode_junk(rnd_size);
++    free(cdb);
++
 +    calc_ean_parity(data + 2, 12);
 +    expect(ZBAR_EAN13, data + 2);
 +    encode_ean13(data + 2);
- 
-     encode_junk(rnd_size);
- 
++    encode_junk(rnd_size);
++
 +    calc_ean_parity(data + 7, 7);
 +    expect(ZBAR_EAN8, data + 7);
 +    encode_ean8(data + 7);
+ 
+     encode_junk(rnd_size);
+ 
++    data[5] = 0;
++    expect(ZBAR_EAN5, data);
++    encode_ean5(data);
++
++    encode_junk(rnd_size);
 +
++    data[2] = 0;
++    expect(ZBAR_EAN2, data);
++    encode_ean2(data);
 +    encode_junk(rnd_size);
 +
 +    expect(ZBAR_NONE, NULL);
@@ -22162,7 +25985,16 @@ diff --git a/test/test_decode.c b/test/test_decode.c
 +
 +    encode_junk(rnd_size);
 +
-+    /*encode_code39("0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ-. $/+%");*/
++    char *cdb = convert_codabar(data);
++    expect(ZBAR_CODABAR, cdb);
++    encode_codabar(cdb, FWD);
++    encode_junk(rnd_size);
++
++    expect(ZBAR_CODABAR, cdb);
++    encode_codabar(cdb, REV);
++    encode_junk(rnd_size);
++    free(cdb);
++
 +    convert_code39(data);
 +    expect(ZBAR_CODE39, data);
 +    encode_code39(data);
@@ -22186,6 +26018,14 @@ diff --git a/test/test_decode.c b/test/test_decode.c
 +        seed = 0xbabeface;
 +    zprintf(1, "[%d] SEED=%d\n", iter++, seed);
 +    srand(seed);
++    if(/* EAN-2 within DataBar (020596539169270)
++        * (FIXME require COMPOSITE for addons)
++        */
++       seed == -862734747)
++    {
++        zprintf(2, "    FIXME known failure\n");
++        return(2);
++    }
 +
 +    int i;
 +    char data[32] = { 0, };
@@ -22220,6 +26060,11 @@ diff --git a/test/test_decode.c b/test/test_decode.c
  
 -    encode_junk(rnd_size);
 +    decoder = zbar_decoder_create();
++    /* allow empty CODE39 symbologies */
++    zbar_decoder_set_config(decoder, ZBAR_CODE39, ZBAR_CFG_MIN_LEN, 0);
++    /* enable addons */
++    zbar_decoder_set_config(decoder, ZBAR_EAN2, ZBAR_CFG_ENABLE, 1);
++    zbar_decoder_set_config(decoder, ZBAR_EAN5, ZBAR_CFG_ENABLE, 1);
 +    zbar_decoder_set_handler(decoder, symbol_handler);
  
 -    encode_pdf417(data);
@@ -22248,9 +26093,10 @@ diff --git a/test/test_decode.c b/test/test_decode.c
 +                    fprintf(stderr, "ERROR: -s needs <seed> argument\n");
 +                    return(2);
 +                }
-+                seed = strtol(argv[i] + j, &end, 0);
++                long s = strtol(argv[i] + j, &end, 0);
++                seed = s;
 +                if((!isdigit(argv[i][j]) && argv[i][j] != '-') ||
-+                   !seed || seed == LONG_MAX || seed == LONG_MIN) {
++                   !s || s == LONG_MAX || s == LONG_MIN) {
 +                    fprintf(stderr, "ERROR: invalid <seed>: \"%s\"\n",
 +                            argv[i] + j);
 +                    return(2);
@@ -22291,9 +26137,296 @@ diff --git a/test/test_decode.c b/test/test_decode.c
  
      zbar_decoder_destroy(decoder);
      return(0);
-diff --git a/test/test_images.h b/test/test_images.h
---- a/test/test_images.h
-+++ b/test/test_images.h
+diff -r 563557a923d0 test/test_gtk.c
+--- a/test/test_gtk.c	Tue Oct 27 11:25:59 2009 -0400
++++ b/test/test_gtk.c	Fri Feb 22 08:54:29 2013 -0300
+@@ -45,7 +45,6 @@
+     GtkTextIter end;
+     gtk_text_buffer_get_end_iter(resultbuf, &end);
+     gtk_text_buffer_insert(resultbuf, &end, zbar_get_symbol_name(symbol), -1);
+-    gtk_text_buffer_insert(resultbuf, &end, zbar_get_addon_name(symbol), -1);
+     gtk_text_buffer_insert(resultbuf, &end, ":", -1);
+     gtk_text_buffer_insert(resultbuf, &end, result, -1);
+     gtk_text_buffer_insert(resultbuf, &end, "\n", -1);
+diff -r 563557a923d0 test/test_images.c
+--- a/test/test_images.c	Tue Oct 27 11:25:59 2009 -0400
++++ b/test/test_images.c	Fri Feb 22 08:54:29 2013 -0300
+@@ -96,30 +96,74 @@
+     { 0 }
+ };
+ 
++static const char *encoded_widths =
++    "9 111 212241113121211311141132 11111 311213121312121332111132 111 9";
++const char *test_image_ean13_data = "6268964977804";
++
+ static int allocated_images = 0;
+ 
+-int test_image_check_cleanup ()
++int
++test_image_check_cleanup ()
+ {
+     if(allocated_images)
+         fprintf(stderr, "ERROR: %d image data buffers still allocated\n",
+                 allocated_images);
+-    else
+-        fprintf(stderr, "all image data buffers freed\n");
++    /*else
++        fprintf(stderr, "all image data buffers freed\n");*/
+     return(allocated_images);
+ }
+ 
+-static void test_cleanup_handler (zbar_image_t *img)
++static void
++test_cleanup_handler (zbar_image_t *img)
+ {
+     void *data = (void*)zbar_image_get_data(img);
+-    fprintf(stderr, "cleanup image data @%p\n", data);
++    /*fprintf(stderr, "cleanup image data @%p\n", data);*/
+     free(data);
+     allocated_images--;
+ }
+ 
++static inline const format_def_t*
++lookup_format (zbar_image_t *img)
++{
++    uint32_t ifmt = zbar_image_get_format(img);
++    const format_def_t *fmt;
++    for(fmt = formats; fmt->format; fmt++)
++        if(fmt->format == ifmt)
++            break;
++    if(!fmt->format) {
++        fprintf(stderr, "ERROR: no %.4s (%08"PRIx32") format\n",
++                (char*)&ifmt, ifmt);
++        return(NULL);
++    }
++    return(fmt);
++}
++
++static inline const format_def_t*
++alloc_data (zbar_image_t *img)
++{
++    allocated_images++;
++    const format_def_t *fmt = lookup_format(img);
++    if(!fmt)
++        return(NULL);
++
++    unsigned w = zbar_image_get_width(img);
++    unsigned h = zbar_image_get_height(img);
++    unsigned long planelen = w * h;
++    unsigned long datalen = planelen * fmt->bpp / 8;
++    uint8_t *data = malloc(datalen);
++
++    zbar_image_set_data(img, data, datalen, test_cleanup_handler);
++
++    /*fprintf(stderr, "create %.4s(%08"PRIx32") image data %lx bytes @%p\n",
++      (char*)&fmt->format, fmt->format, datalen, data);*/
++    return(fmt);
++}
++
+ /* write intensity plane */
+-static inline uint8_t *fill_bars_y (uint8_t *p,
+-                                    unsigned w,
+-                                    unsigned h)
++static inline uint8_t*
++fill_bars_y (uint8_t *p,
++             unsigned w,
++             unsigned h)
+ {
+     unsigned x, y, i;
+     unsigned y0 = (h + 31) / 30;
+@@ -145,10 +189,11 @@
+ }
+ 
+ /* write Cb (U) or Cr (V) plane */
+-static inline uint8_t *fill_bars_uv (uint8_t *p,
+-                                     unsigned w,
+-                                     unsigned h,
+-                                     const uint8_t *C)
++static inline uint8_t*
++fill_bars_uv (uint8_t *p,
++              unsigned w,
++              unsigned h,
++              const uint8_t *C)
+ {
+     unsigned x, y, i;
+     unsigned y0 = (h + 31) / 30;
+@@ -174,10 +219,11 @@
+ }
+ 
+ /* write packed CbCr plane */
+-static inline uint8_t *fill_bars_nv (uint8_t *p,
+-                                     unsigned w,
+-                                     unsigned h,
+-                                     format_type_t order)
++static inline uint8_t*
++fill_bars_nv (uint8_t *p,
++              unsigned w,
++              unsigned h,
++              format_type_t order)
+ {
+     unsigned x, y, i;
+     unsigned y0 = (h + 31) / 30;
+@@ -208,10 +254,11 @@
+ }
+ 
+ /* write packed YCbCr plane */
+-static inline uint8_t *fill_bars_yuv (uint8_t *p,
+-                                      unsigned w,
+-                                      unsigned h,
+-                                      format_type_t order)
++static inline uint8_t*
++fill_bars_yuv (uint8_t *p,
++               unsigned w,
++               unsigned h,
++               format_type_t order)
+ {
+     unsigned x, y, i;
+     unsigned y0 = (h + 31) / 30;
+@@ -253,11 +300,12 @@
+     return((uint8_t*)q);
+ }
+ 
+-static inline uint8_t *fill_bars_rgb (uint8_t *p,
+-                                      unsigned w,
+-                                      unsigned h,
+-                                      format_type_t order,
+-                                      int bpp)
++static inline uint8_t*
++fill_bars_rgb (uint8_t *p,
++               unsigned w,
++               unsigned h,
++               format_type_t order,
++               int bpp)
+ {
+     unsigned x, y, i;
+     unsigned y0 = (h + 31) / 30;
+@@ -336,26 +384,17 @@
+     return(((uint8_t*)q) + headlen);
+ }
+ 
+-int test_image_bars (zbar_image_t *img)
++int
++test_image_bars (zbar_image_t *img)
+ {
+-    allocated_images++;
++    const format_def_t *fmt = alloc_data(img);
++    if(!fmt)
++        return(-1);
++
+     unsigned w = zbar_image_get_width(img);
+     unsigned h = zbar_image_get_height(img);
+-
+-    const format_def_t *fmt;
+-    for(fmt = formats; fmt->format; fmt++)
+-        if(fmt->format == zbar_image_get_format(img))
+-            break;
+-    if(!fmt->format)
+-        return(-1);
+-
+-    unsigned long planelen = w * h;
+-    unsigned long datalen = planelen * fmt->bpp / 8;
+-    uint8_t *data = malloc(datalen);
+-    zbar_image_set_data(img, data, datalen, test_cleanup_handler);
+-    fprintf(stderr, "create %.4s(%08" PRIx32 ") image data %lx bytes @%p\n",
+-            (char*)&fmt->format, fmt->format, datalen, data);
+-
++    uint8_t *data = (void*)zbar_image_get_data(img);
++    assert(data);
+     uint8_t *p = data;
+     switch(fmt->type) {
+     case GRAY:
+@@ -390,6 +429,88 @@
+         break;
+     }
+ 
++    assert(p == data + zbar_image_get_data_length(img));
++    return(0);
++}
++
++int
++test_image_ean13 (zbar_image_t *img)
++{
++    unsigned w = 114, h = 85;
++    zbar_image_set_size(img, w, h);
++
++    const format_def_t *fmt = alloc_data(img);
++    if(!fmt)
++        return(-1);
++
++    uint8_t *data = (void*)zbar_image_get_data(img);
++    unsigned int datalen = zbar_image_get_data_length(img);
++    assert(data && datalen);
++
++    uint8_t *p = data;
++    /* FIXME randomize? */
++    memset(data, 0x80, datalen);
++
++    int nrep = 1, nskip = 0;
++    switch(fmt->type)
++    {
++    case YUVP: /* planar YUV */
++    case YVUP:
++    case GRAY:
++        break;
++
++    case UYVY: /* packed YUV */
++        p++;
++    case YUYV:
++    case YVYU:
++        nskip = 1;
++        break;
++
++    default: /* RGB */
++        nrep = fmt->bpp / 8;
++    }
++
++    int y = 0, x, i;
++    for(; y < 10 && y < h; y++)
++        for(x = 0; x < w; x++) {
++            for(i = 0; i < nrep; i++)
++                *p++ = 0xff;
++            p += nskip;
++        }
++
++    for(; y < h - 10; y++) {
++        uint8_t color = 0xff;
++        const char *c;
++        for(x = 0, c = encoded_widths; *c; c++) {
++            int dx;
++            if(*c == ' ')
++                continue;
++            for(dx = *c - '0'; dx > 0; dx--) {
++                for(i = 0; i < nrep; i++)
++                    *p++ = color;
++                p += nskip;
++                x++;
++            }
++            color = ~color;
++        }
++        assert(!color);
++        for(; x < w; x++) {
++            for(i = 0; i < nrep; i++)
++                *p++ = 0xff;
++            p += nskip;
++        }
++        assert(x == w);
++    }
++
++    for(; y < h; y++)
++        for(x = 0; x < w; x++) {
++            for(i = 0; i < nrep; i++)
++                *p++ = 0xff;
++            p += nskip;
++        }
++
++    if(fmt->type == UYVY)
++        p--;
+     assert(p == data + datalen);
+     return(0);
+ }
+diff -r 563557a923d0 test/test_images.h
+--- a/test/test_images.h	Tue Oct 27 11:25:59 2009 -0400
++++ b/test/test_images.h	Fri Feb 22 08:54:29 2013 -0300
 @@ -1,5 +1,5 @@
  /*------------------------------------------------------------------------
 - *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
@@ -22301,7 +26434,7 @@ diff --git a/test/test_images.h b/test/test_images.h
   *
   *  This file is part of the ZBar Bar Code Reader.
   *
-@@ -23,10 +23,7 @@
+@@ -23,12 +23,24 @@
  #ifndef _TEST_IMAGES_H_
  #define _TEST_IMAGES_H_
  
@@ -22310,13 +26443,110 @@ diff --git a/test/test_images.h b/test/test_images.h
 -    ((uint32_t)(a) | ((uint32_t)(b) << 8) |     \
 -     ((uint32_t)(c) << 16) | ((uint32_t)(d) << 24))
 +#define fourcc zbar_fourcc
++
++#ifdef __cplusplus
++
++extern "C" {
++    int test_image_check_cleanup(void);
++    int test_image_bars(zbar::zbar_image_t*);
++    int test_image_ean13(zbar::zbar_image_t*);
++}
++
++#else
  
  int test_image_check_cleanup(void);
  int test_image_bars(zbar_image_t*);
-diff --git a/zbar/Makefile.am.inc b/zbar/Makefile.am.inc
---- a/zbar/Makefile.am.inc
-+++ b/zbar/Makefile.am.inc
-@@ -19,9 +19,15 @@ EXTRA_zbar_libzbar_la_SOURCES = zbar/svg
++int test_image_ean13(zbar_image_t*);
+ 
+ #endif
++
++extern const char *test_image_ean13_data;
++
++#endif
+diff -r 563557a923d0 zbar.spec.in
+--- a/zbar.spec.in	Tue Oct 27 11:25:59 2009 -0400
++++ b/zbar.spec.in	Fri Feb 22 08:54:29 2013 -0300
+@@ -15,8 +15,8 @@
+ %description
+ The ZBar Bar Code Reader is a library for scanning and decoding bar
+ codes from various sources such as video streams, image files or raw
+-intensity sensors.  It supports EAN, UPC, Code 128, Code 39 and
+-Interleaved 2 of 5. The flexible, layered architecture features a
++intensity sensors.  It supports EAN, UPC, Code 128, Code 93, Code 39
++and Interleaved 2 of 5. The flexible, layered architecture features a
+ fast, streaming interface with a minimal memory footprint.
+ 
+ %package devel
+@@ -27,8 +27,8 @@
+ %description devel
+ The ZBar Bar Code Reader is a library for scanning and decoding bar
+ codes from various sources such as video streams, image files or raw
+-intensity sensors.  It supports EAN, UPC, Code 128, Code 39 and
+-Interleaved 2 of 5. The flexible, layered architecture features a
++intensity sensors.  It supports EAN, UPC, Code 128, Code 93, Code 39
++and Interleaved 2 of 5. The flexible, layered architecture features a
+ fast, streaming interface with a minimal memory footprint.
+ 
+ This package contains header files and additional libraries used for
+@@ -42,8 +42,8 @@
+ %description gtk
+ The ZBar Bar Code Reader is a library for scanning and decoding bar
+ codes from various sources such as video streams, image files or raw
+-intensity sensors.  It supports EAN, UPC, Code 128, Code 39 and
+-Interleaved 2 of 5. The flexible, layered architecture features a
++intensity sensors.  It supports EAN, UPC, Code 128, Code 93, Code 39
++and Interleaved 2 of 5. The flexible, layered architecture features a
+ fast, streaming interface with a minimal memory footprint.
+ 
+ This package contains a bar code scanning widget for use with GUI
+@@ -57,8 +57,8 @@
+ %description gtk-devel
+ The ZBar Bar Code Reader is a library for scanning and decoding bar
+ codes from various sources such as video streams, image files or raw
+-intensity sensors.  It supports EAN, UPC, Code 128, Code 39 and
+-Interleaved 2 of 5. The flexible, layered architecture features a
++intensity sensors.  It supports EAN, UPC, Code 128, Code 93, Code 39
++and Interleaved 2 of 5. The flexible, layered architecture features a
+ fast, streaming interface with a minimal memory footprint.
+ 
+ This package contains header files and additional libraries used for
+@@ -73,8 +73,8 @@
+ %description pygtk
+ The ZBar Bar Code Reader is a library for scanning and decoding bar
+ codes from various sources such as video streams, image files or raw
+-intensity sensors.  It supports EAN, UPC, Code 128, Code 39 and
+-Interleaved 2 of 5. The flexible, layered architecture features a
++intensity sensors.  It supports EAN, UPC, Code 128, Code 93, Code 39
++and Interleaved 2 of 5. The flexible, layered architecture features a
+ fast, streaming interface with a minimal memory footprint.
+ 
+ This package contains a bar code scanning widget for use in GUI
+@@ -88,8 +88,8 @@
+ %description qt
+ The ZBar Bar Code Reader is a library for scanning and decoding bar
+ codes from various sources such as video streams, image files or raw
+-intensity sensors.  It supports EAN, UPC, Code 128, Code 39 and
+-Interleaved 2 of 5. The flexible, layered architecture features a
++intensity sensors.  It supports EAN, UPC, Code 128, Code 93, Code 39
++and Interleaved 2 of 5. The flexible, layered architecture features a
+ fast, streaming interface with a minimal memory footprint.
+ 
+ This package contains a bar code scanning widget for use with GUI
+@@ -103,8 +103,8 @@
+ %description qt-devel
+ The ZBar Bar Code Reader is a library for scanning and decoding bar
+ codes from various sources such as video streams, image files or raw
+-intensity sensors.  It supports EAN, UPC, Code 128, Code 39 and
+-Interleaved 2 of 5. The flexible, layered architecture features a
++intensity sensors.  It supports EAN, UPC, Code 128, Code 93, Code 39
++and Interleaved 2 of 5. The flexible, layered architecture features a
+ fast, streaming interface with a minimal memory footprint.
+ 
+ This package contains header files and additional libraries used for
+diff -r 563557a923d0 zbar/Makefile.am.inc
+--- a/zbar/Makefile.am.inc	Tue Oct 27 11:25:59 2009 -0400
++++ b/zbar/Makefile.am.inc	Fri Feb 22 08:54:29 2013 -0300
+@@ -19,12 +19,21 @@
  if ENABLE_EAN
  zbar_libzbar_la_SOURCES += zbar/decoder/ean.h zbar/decoder/ean.c
  endif
@@ -22332,9 +26562,33 @@ diff --git a/zbar/Makefile.am.inc b/zbar/Makefile.am.inc
  if ENABLE_CODE39
  zbar_libzbar_la_SOURCES += zbar/decoder/code39.h zbar/decoder/code39.c
  endif
-diff --git a/zbar/config.c b/zbar/config.c
---- a/zbar/config.c
-+++ b/zbar/config.c
++if ENABLE_CODABAR
++zbar_libzbar_la_SOURCES += zbar/decoder/codabar.h zbar/decoder/codabar.c
++endif
+ if ENABLE_I25
+ zbar_libzbar_la_SOURCES += zbar/decoder/i25.h zbar/decoder/i25.c
+ endif
+@@ -53,11 +62,14 @@
+ zbar_libzbar_la_SOURCES += zbar/processor/posix.h zbar/processor/posix.c
+ endif
+ 
++if HAVE_V4L2
++zbar_libzbar_la_SOURCES += zbar/video/v4l.c zbar/video/v4l2.c
++endif
+ if HAVE_V4L1
++if !HAVE_V4L2
++zbar_libzbar_la_SOURCES += zbar/video/v4l.c
++endif
+ zbar_libzbar_la_SOURCES += zbar/video/v4l1.c
+-if HAVE_V4L2
+-zbar_libzbar_la_SOURCES += zbar/video/v4l2.c
+-endif
+ endif
+ if WIN32
+ if HAVE_VIDEO
+diff -r 563557a923d0 zbar/config.c
+--- a/zbar/config.c	Tue Oct 27 11:25:59 2009 -0400
++++ b/zbar/config.c	Fri Feb 22 08:54:29 2013 -0300
 @@ -1,5 +1,5 @@
  /*------------------------------------------------------------------------
 - *  Copyright 2008-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
@@ -22373,7 +26627,7 @@ diff --git a/zbar/config.c b/zbar/config.c
      if(dot) {
          int len = dot - cfgstr;
          if(!len || (len == 1 && !strncmp(cfgstr, "*", len)))
-@@ -46,6 +50,8 @@ int zbar_parse_config (const char *cfgst
+@@ -46,6 +50,8 @@
              return(1);
          else if(!strncmp(cfgstr, "qrcode", len))
              *sym = ZBAR_QRCODE;
@@ -22382,17 +26636,34 @@ diff --git a/zbar/config.c b/zbar/config.c
          else if(len < 3)
              return(1);
          else if(!strncmp(cfgstr, "upca", len))
-@@ -66,6 +72,8 @@ int zbar_parse_config (const char *cfgst
+@@ -56,6 +62,12 @@
+             *sym = ZBAR_EAN13;
+         else if(!strncmp(cfgstr, "ean8", len))
+             *sym = ZBAR_EAN8;
++        else if(!strncmp(cfgstr, "ean5", len))
++            *sym = ZBAR_EAN5;
++        else if(!strncmp(cfgstr, "ean2", len))
++            *sym = ZBAR_EAN2;
++        else if(!strncmp(cfgstr, "composite", len))
++            *sym = ZBAR_COMPOSITE;
+         else if(!strncmp(cfgstr, "i25", len))
+             *sym = ZBAR_I25;
+         else if(len < 4)
+@@ -66,15 +78,14 @@
              *sym = ZBAR_ISBN13;
          else if(!strncmp(cfgstr, "isbn10", len))
              *sym = ZBAR_ISBN10;
+-#if 0
+-        /* FIXME addons are configured per-main symbol type */
+-        else if(!strncmp(cfgstr, "addon2", len))
+-            *sym = ZBAR_ADDON2;
+-        else if(!strncmp(cfgstr, "addon5", len))
+-            *sym = ZBAR_ADDON5;
+-#endif
 +        else if(!strncmp(cfgstr, "db-exp", len))
 +            *sym = ZBAR_DATABAR_EXP;
- #if 0
-         /* FIXME addons are configured per-main symbol type */
-         else if(!strncmp(cfgstr, "addon2", len))
-@@ -75,6 +83,8 @@ int zbar_parse_config (const char *cfgst
- #endif
++        else if(!strncmp(cfgstr, "codabar", len))
++            *sym = ZBAR_CODABAR;
          else if(len < 6)
              return(1);
 +        else if(!strncmp(cfgstr, "code93", len))
@@ -22400,7 +26671,7 @@ diff --git a/zbar/config.c b/zbar/config.c
          else if(!strncmp(cfgstr, "code39", len))
              *sym = ZBAR_CODE39;
          else if(!strncmp(cfgstr, "pdf417", len))
-@@ -83,6 +93,10 @@ int zbar_parse_config (const char *cfgst
+@@ -83,6 +94,10 @@
              return(1);
          else if(!strncmp(cfgstr, "code128", len))
              *sym = ZBAR_CODE128;
@@ -22411,7 +26682,7 @@ diff --git a/zbar/config.c b/zbar/config.c
          else
              return(1);
          cfgstr = dot + 1;
-@@ -90,13 +104,13 @@ int zbar_parse_config (const char *cfgst
+@@ -90,13 +105,13 @@
      else
          *sym = 0;
  
@@ -22428,7 +26699,7 @@ diff --git a/zbar/config.c b/zbar/config.c
  
      if(len > 3 && !strncmp(cfgstr, "no-", 3)) {
          negate = 1;
-@@ -130,16 +144,22 @@ int zbar_parse_config (const char *cfgst
+@@ -130,16 +145,22 @@
          *cfg = ZBAR_CFG_ADD_CHECK;
      else if(!strncmp(cfgstr, "emit-check", len))
          *cfg = ZBAR_CFG_EMIT_CHECK;
@@ -22451,9 +26722,9 @@ diff --git a/zbar/config.c b/zbar/config.c
      }
      if(negate)
          *val = !*val;
-diff --git a/zbar/convert.c b/zbar/convert.c
---- a/zbar/convert.c
-+++ b/zbar/convert.c
+diff -r 563557a923d0 zbar/convert.c
+--- a/zbar/convert.c	Tue Oct 27 11:25:59 2009 -0400
++++ b/zbar/convert.c	Fri Feb 22 08:54:29 2013 -0300
 @@ -1,5 +1,5 @@
  /*------------------------------------------------------------------------
 - *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
@@ -22461,7 +26732,7 @@ diff --git a/zbar/convert.c b/zbar/convert.c
   *
   *  This file is part of the ZBar Bar Code Reader.
   *
-@@ -236,12 +236,13 @@ static inline void uv_round (zbar_image_
+@@ -236,12 +236,13 @@
  static inline void uv_roundup (zbar_image_t *img,
                                 const zbar_format_def_t *fmt)
  {
@@ -22477,7 +26748,7 @@ diff --git a/zbar/convert.c b/zbar/convert.c
      if(img->height & ymask)
          img->height = (img->height + ymask) & ~ymask;
  }
-@@ -306,16 +307,18 @@ static inline void convert_y_resize (zba
+@@ -306,16 +307,18 @@
                                       const zbar_format_def_t *srcfmt,
                                       size_t n)
  {
@@ -22502,7 +26773,7 @@ diff --git a/zbar/convert.c b/zbar/convert.c
      for(y = 0; y < height; y++) {
          memcpy(pdst, psrc, width);
          pdst += width;
-@@ -344,10 +347,10 @@ static void convert_copy (zbar_image_t *
+@@ -344,10 +347,10 @@
  {
      if(src->width == dst->width &&
         src->height == dst->height) {
@@ -22514,7 +26785,7 @@ diff --git a/zbar/convert.c b/zbar/convert.c
          dst->next = s;
          _zbar_image_refcnt(s, 1);
      }
-@@ -362,9 +365,10 @@ static void convert_uvp_append (zbar_ima
+@@ -362,9 +365,10 @@
                                  const zbar_image_t *src,
                                  const zbar_format_def_t *srcfmt)
  {
@@ -22526,7 +26797,7 @@ diff --git a/zbar/convert.c b/zbar/convert.c
      dst->datalen += n;
      assert(src->datalen >= src->width * src->height);
      zprintf(24, "dst=%dx%d (%lx) %lx src=%dx%d %lx\n",
-@@ -373,7 +377,7 @@ static void convert_uvp_append (zbar_ima
+@@ -373,7 +377,7 @@
      dst->data = malloc(dst->datalen);
      if(!dst->data) return;
      convert_y_resize(dst, dstfmt, src, srcfmt, n);
@@ -22535,7 +26806,7 @@ diff --git a/zbar/convert.c b/zbar/convert.c
  }
  
  /* interleave YUV planes into packed YUV */
-@@ -382,32 +386,35 @@ static void convert_yuv_pack (zbar_image
+@@ -382,32 +386,35 @@
                                const zbar_image_t *src,
                                const zbar_format_def_t *srcfmt)
  {
@@ -22584,7 +26855,7 @@ diff --git a/zbar/convert.c b/zbar/convert.c
      for(y = 0; y < dst->height; y++) {
          if(y >= src->height) {
              srcy -= src->width;
-@@ -448,25 +455,29 @@ static void convert_yuv_unpack (zbar_ima
+@@ -448,25 +455,29 @@
                                  const zbar_image_t *src,
                                  const zbar_format_def_t *srcfmt)
  {
@@ -22623,7 +26894,7 @@ diff --git a/zbar/convert.c b/zbar/convert.c
      for(y = 0; y < dst->height; y++) {
          if(y >= src->height)
              srcp -= srcl;
-@@ -491,15 +502,16 @@ static void convert_uvp_resample (zbar_i
+@@ -491,15 +502,16 @@
                                    const zbar_image_t *src,
                                    const zbar_format_def_t *srcfmt)
  {
@@ -22643,7 +26914,7 @@ diff --git a/zbar/convert.c b/zbar/convert.c
  }
  
  /* rearrange interleaved UV componets */
-@@ -508,19 +520,23 @@ static void convert_uv_resample (zbar_im
+@@ -508,19 +520,23 @@
                                   const zbar_image_t *src,
                                   const zbar_format_def_t *srcfmt)
  {
@@ -22674,7 +26945,7 @@ diff --git a/zbar/convert.c b/zbar/convert.c
      for(y = 0; y < dst->height; y++) {
          if(y >= src->height)
              srcp -= srcl;
-@@ -560,25 +576,29 @@ static void convert_yuvp_to_rgb (zbar_im
+@@ -560,25 +576,29 @@
                                   const zbar_image_t *src,
                                   const zbar_format_def_t *srcfmt)
  {
@@ -22716,7 +26987,7 @@ diff --git a/zbar/convert.c b/zbar/convert.c
      for(y = 0; y < dst->height; y++) {
          if(y >= src->height)
              srcy -= src->width;
-@@ -606,29 +626,34 @@ static void convert_rgb_to_yuvp (zbar_im
+@@ -606,29 +626,34 @@
                                   const zbar_image_t *src,
                                   const zbar_format_def_t *srcfmt)
  {
@@ -22765,7 +27036,7 @@ diff --git a/zbar/convert.c b/zbar/convert.c
      for(y = 0; y < dst->height; y++) {
          if(y >= src->height)
              srcp -= srcl;
-@@ -659,29 +684,33 @@ static void convert_yuv_to_rgb (zbar_ima
+@@ -659,29 +684,33 @@
                                  const zbar_image_t *src,
                                  const zbar_format_def_t *srcfmt)
  {
@@ -22810,7 +27081,7 @@ diff --git a/zbar/convert.c b/zbar/convert.c
      for(y = 0; y < dst->height; y++) {
          if(y >= src->height)
              srcp -= srcl;
-@@ -717,26 +746,30 @@ static void convert_rgb_to_yuv (zbar_ima
+@@ -717,26 +746,30 @@
                                  const zbar_image_t *src,
                                  const zbar_format_def_t *srcfmt)
  {
@@ -22853,7 +27124,7 @@ diff --git a/zbar/convert.c b/zbar/convert.c
      for(y = 0; y < dst->height; y++) {
          if(y >= src->height)
              srcp -= srcl;
-@@ -773,31 +806,36 @@ static void convert_rgb_resample (zbar_i
+@@ -773,31 +806,36 @@
                                    const zbar_format_def_t *srcfmt)
  {
      unsigned long dstn = dst->width * dst->height;
@@ -22907,7 +27178,7 @@ diff --git a/zbar/convert.c b/zbar/convert.c
      for(y = 0; y < dst->height; y++) {
          if(y >= src->height)
              y -= srcl;
-@@ -928,14 +966,12 @@ static void convert_jpeg (zbar_image_t *
+@@ -928,14 +966,12 @@
      if(!src->src) {
          tmp = zbar_image_create();
          tmp->format = fourcc('Y','8','0','0');
@@ -22924,7 +27195,7 @@ diff --git a/zbar/convert.c b/zbar/convert.c
      }
  
      const zbar_format_def_t *tmpfmt = _zbar_format_lookup(tmp->format);
-@@ -945,8 +981,7 @@ static void convert_jpeg (zbar_image_t *
+@@ -945,8 +981,7 @@
      _zbar_convert_jpeg_to_y(tmp, tmpfmt, src, srcfmt);
  
      /* now convert to dst */
@@ -22934,7 +27205,7 @@ diff --git a/zbar/convert.c b/zbar/convert.c
  
      conversion_handler_t *func =
          conversions[tmpfmt->group][dstfmt->group].func;
-@@ -963,10 +998,14 @@ zbar_image_t *zbar_image_convert_resize 
+@@ -963,10 +998,14 @@
                                           unsigned width,
                                           unsigned height)
  {
@@ -22949,7 +27220,7 @@ diff --git a/zbar/convert.c b/zbar/convert.c
      if(src->format == fmt &&
         src->width == width &&
         src->height == height) {
-@@ -974,8 +1013,8 @@ zbar_image_t *zbar_image_convert_resize 
+@@ -974,8 +1013,8 @@
          return(dst);
      }
  
@@ -22960,7 +27231,7 @@ diff --git a/zbar/convert.c b/zbar/convert.c
      if(!srcfmt || !dstfmt)
          /* FIXME free dst */
          return(NULL);
-@@ -988,8 +1027,7 @@ zbar_image_t *zbar_image_convert_resize 
+@@ -988,8 +1027,7 @@
          return(dst);
      }
  
@@ -22970,7 +27241,7 @@ diff --git a/zbar/convert.c b/zbar/convert.c
  
      dst->cleanup = zbar_image_free_data;
      func(dst, dstfmt, src, srcfmt);
-@@ -1021,6 +1059,9 @@ int _zbar_best_format (uint32_t src,
+@@ -1021,6 +1059,9 @@
                         uint32_t *dst,
                         const uint32_t *dsts)
  {
@@ -22980,7 +27251,7 @@ diff --git a/zbar/convert.c b/zbar/convert.c
      if(dst)
          *dst = 0;
      if(!dsts)
-@@ -1031,17 +1072,16 @@ int _zbar_best_format (uint32_t src,
+@@ -1031,17 +1072,16 @@
              *dst = src;
          return(0);
      }
@@ -23000,7 +27271,7 @@ diff --git a/zbar/convert.c b/zbar/convert.c
          if(srcfmt->group == dstfmt->group &&
             srcfmt->p.cmp == dstfmt->p.cmp)
              cost = 0;
-@@ -1065,13 +1105,20 @@ int _zbar_best_format (uint32_t src,
+@@ -1065,13 +1105,20 @@
  int zbar_negotiate_format (zbar_video_t *vdo,
                             zbar_window_t *win)
  {
@@ -23022,7 +27293,7 @@ diff --git a/zbar/convert.c b/zbar/convert.c
      if(verify_format_sort()) {
          if(win)
              (void)window_unlock(win);
-@@ -1086,19 +1133,16 @@ int zbar_negotiate_format (zbar_video_t 
+@@ -1086,19 +1133,16 @@
                             "no input or output formats available"));
      }
  
@@ -23047,30 +27318,36 @@ diff --git a/zbar/convert.c b/zbar/convert.c
          if(cost < 0) {
              zprintf(4, "%.4s(%08" PRIx32 ") -> ? (unsupported)\n",
                      (char*)fmt, *fmt);
-diff --git a/zbar/debug.h b/zbar/debug.h
---- a/zbar/debug.h
-+++ b/zbar/debug.h
-@@ -27,10 +27,10 @@
+diff -r 563557a923d0 zbar/debug.h
+--- a/zbar/debug.h	Tue Oct 27 11:25:59 2009 -0400
++++ b/zbar/debug.h	Fri Feb 22 08:54:29 2013 -0300
+@@ -23,28 +23,30 @@
+ 
+ /* varargs variations on compile time debug spew */
+ 
++# include <stdio.h>
++
+ #ifndef DEBUG_LEVEL
  
  # ifdef __GNUC__
      /* older versions of gcc (< 2.95) require a named varargs parameter */
 -#  define dprintf(args...)
-+#  define dprintf(args...) while(0)
++#  define dbprintf(args...) while(0)
  # else
      /* unfortunately named vararg parameter is a gcc-specific extension */
 -#  define dprintf(...)
-+#  define dprintf(...) while(0)
++#  define dbprintf(...) while(0)
  # endif
  
  #else
-@@ -38,13 +38,15 @@
- # include <stdio.h>
  
+-# include <stdio.h>
+-
  # ifdef __GNUC__
 -#  define dprintf(level, args...) \
 -    if((level) <= DEBUG_LEVEL)    \
 -        fprintf(stderr, args)
-+#  define dprintf(level, args...) do {  \
++#  define dbprintf(level, args...) do { \
 +        if((level) <= DEBUG_LEVEL)      \
 +            fprintf(stderr, args);      \
 +    } while(0)
@@ -23078,16 +27355,16 @@ diff --git a/zbar/debug.h b/zbar/debug.h
 -#  define dprintf(level, ...)     \
 -    if((level) <= DEBUG_LEVEL)    \
 -        fprintf(stderr, __VA_ARGS__)
-+#  define dprintf(level, ...) do {          \
++#  define dbprintf(level, ...) do {         \
 +        if((level) <= DEBUG_LEVEL)          \
 +            fprintf(stderr, __VA_ARGS__);   \
 +    } while(0)
  # endif
  
  #endif /* DEBUG_LEVEL */
-diff --git a/zbar/decoder.c b/zbar/decoder.c
---- a/zbar/decoder.c
-+++ b/zbar/decoder.c
+diff -r 563557a923d0 zbar/decoder.c
+--- a/zbar/decoder.c	Tue Oct 27 11:25:59 2009 -0400
++++ b/zbar/decoder.c	Fri Feb 22 08:54:29 2013 -0300
 @@ -1,5 +1,5 @@
  /*------------------------------------------------------------------------
 - *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
@@ -23103,10 +27380,12 @@ diff --git a/zbar/decoder.c b/zbar/decoder.c
  
 -#if defined(DEBUG_DECODER) || defined(DEBUG_EAN) ||             \
 -    defined(DEBUG_CODE39) || defined(DEBUG_I25) ||              \
+-    defined(DEBUG_CODE128) || defined(DEBUG_QR_FINDER) ||       \
+-    (defined(DEBUG_PDF417) && (DEBUG_PDF417 >= 4))
 +#if defined(DEBUG_DECODER) || defined(DEBUG_EAN) || defined(DEBUG_CODE93) || \
-+    defined(DEBUG_CODE39) || defined(DEBUG_I25) || defined(DEBUG_DATABAR) || \
-     defined(DEBUG_CODE128) || defined(DEBUG_QR_FINDER) ||       \
-     (defined(DEBUG_PDF417) && (DEBUG_PDF417 >= 4))
++    defined(DEBUG_CODE39) || defined(DEBUG_CODABAR) || defined(DEBUG_I25) || \
++    defined(DEBUG_DATABAR) || defined(DEBUG_CODE128) || \
++    defined(DEBUG_QR_FINDER) || (defined(DEBUG_PDF417) && (DEBUG_PDF417 >= 4))
  # define DEBUG_LEVEL 1
  #endif
  #include "debug.h"
@@ -23114,7 +27393,16 @@ diff --git a/zbar/decoder.c b/zbar/decoder.c
  
  zbar_decoder_t *zbar_decoder_create ()
  {
-@@ -59,10 +59,21 @@ zbar_decoder_t *zbar_decoder_create ()
+@@ -54,15 +54,34 @@
+     dcode->ean.upce_config = 1 << ZBAR_CFG_EMIT_CHECK;
+     dcode->ean.isbn10_config = 1 << ZBAR_CFG_EMIT_CHECK;
+     dcode->ean.isbn13_config = 1 << ZBAR_CFG_EMIT_CHECK;
++# ifdef FIXME_ADDON_SYNC
++    dcode->ean.ean2_config = 1 << ZBAR_CFG_ENABLE;
++    dcode->ean.ean5_config = 1 << ZBAR_CFG_ENABLE;
++# endif
+ #endif
+ #ifdef ENABLE_I25
      dcode->i25.config = 1 << ZBAR_CFG_ENABLE;
      CFG(dcode->i25, ZBAR_CFG_MIN_LEN) = 6;
  #endif
@@ -23125,6 +27413,10 @@ diff --git a/zbar/decoder.c b/zbar/decoder.c
 +                                 (1 << ZBAR_CFG_EMIT_CHECK));
 +    dcode->databar.csegs = 4;
 +    dcode->databar.segs = calloc(4, sizeof(*dcode->databar.segs));
++#endif
++#ifdef ENABLE_CODABAR
++    dcode->codabar.config = 1 << ZBAR_CFG_ENABLE;
++    CFG(dcode->codabar, ZBAR_CFG_MIN_LEN) = 4;
 +#endif
  #ifdef ENABLE_CODE39
      dcode->code39.config = 1 << ZBAR_CFG_ENABLE;
@@ -23136,7 +27428,7 @@ diff --git a/zbar/decoder.c b/zbar/decoder.c
  #ifdef ENABLE_CODE128
      dcode->code128.config = 1 << ZBAR_CFG_ENABLE;
  #endif
-@@ -79,6 +90,10 @@ zbar_decoder_t *zbar_decoder_create ()
+@@ -79,6 +98,10 @@
  
  void zbar_decoder_destroy (zbar_decoder_t *dcode)
  {
@@ -23147,12 +27439,15 @@ diff --git a/zbar/decoder.c b/zbar/decoder.c
      if(dcode->buf)
          free(dcode->buf);
      free(dcode);
-@@ -93,9 +108,15 @@ void zbar_decoder_reset (zbar_decoder_t 
+@@ -93,9 +116,18 @@
  #ifdef ENABLE_I25
      i25_reset(&dcode->i25);
  #endif
 +#ifdef ENABLE_DATABAR
 +    databar_reset(&dcode->databar);
++#endif
++#ifdef ENABLE_CODABAR
++    codabar_reset(&dcode->codabar);
 +#endif
  #ifdef ENABLE_CODE39
      code39_reset(&dcode->code39);
@@ -23163,7 +27458,7 @@ diff --git a/zbar/decoder.c b/zbar/decoder.c
  #ifdef ENABLE_CODE128
      code128_reset(&dcode->code128);
  #endif
-@@ -113,15 +134,22 @@ void zbar_decoder_new_scan (zbar_decoder
+@@ -113,15 +145,25 @@
      memset(dcode->w, 0, sizeof(dcode->w));
      dcode->lock = 0;
      dcode->idx = 0;
@@ -23176,6 +27471,9 @@ diff --git a/zbar/decoder.c b/zbar/decoder.c
  #endif
 +#ifdef ENABLE_DATABAR
 +    databar_new_scan(&dcode->databar);
++#endif
++#ifdef ENABLE_CODABAR
++    codabar_reset(&dcode->codabar);
 +#endif
  #ifdef ENABLE_CODE39
      code39_reset(&dcode->code39);
@@ -23186,7 +27484,7 @@ diff --git a/zbar/decoder.c b/zbar/decoder.c
  #ifdef ENABLE_CODE128
      code128_reset(&dcode->code128);
  #endif
-@@ -149,9 +177,14 @@ unsigned int zbar_decoder_get_data_lengt
+@@ -149,9 +191,14 @@
      return(dcode->buflen);
  }
  
@@ -23202,7 +27500,7 @@ diff --git a/zbar/decoder.c b/zbar/decoder.c
  {
      zbar_decoder_handler_t *result = dcode->handler;
      dcode->handler = handler;
-@@ -174,62 +207,82 @@ zbar_symbol_type_t zbar_decoder_get_type
+@@ -174,68 +221,101 @@
      return(dcode->type);
  }
  
@@ -23217,25 +27515,26 @@ diff --git a/zbar/decoder.c b/zbar/decoder.c
 +    zbar_symbol_type_t tmp, sym = ZBAR_NONE;
 +
      dcode->w[dcode->idx & (DECODE_WINDOW - 1)] = w;
-     dprintf(1, "    decode[%x]: w=%d (%g)\n", dcode->idx, w, (w / 32.));
- 
+-    dprintf(1, "    decode[%x]: w=%d (%g)\n", dcode->idx, w, (w / 32.));
++    dbprintf(1, "    decode[%x]: w=%d (%g)\n", dcode->idx, w, (w / 32.));
++
 +    /* update shared character width */
 +    dcode->s6 -= get_width(dcode, 7);
 +    dcode->s6 += get_width(dcode, 1);
-+
+ 
      /* each decoder processes width stream in parallel */
 -    zbar_symbol_type_t sym = dcode->type = ZBAR_NONE;
 -
++#ifdef ENABLE_QRCODE
++    if(TEST_CFG(dcode->qrf.config, ZBAR_CFG_ENABLE) &&
++       (tmp = _zbar_find_qr(dcode)) > ZBAR_PARTIAL)
++        sym = tmp;
++#endif
  #ifdef ENABLE_EAN
      if((dcode->ean.enable) &&
 -       (sym = _zbar_decode_ean(dcode)))
 -        dcode->type = sym;
 +       (tmp = _zbar_decode_ean(dcode)))
-+        sym = tmp;
-+#endif
-+#ifdef ENABLE_QRCODE
-+    if(TEST_CFG(dcode->qrf.config, ZBAR_CFG_ENABLE) &&
-+       (tmp = _zbar_find_qr(dcode)) > ZBAR_PARTIAL)
 +        sym = tmp;
  #endif
  #ifdef ENABLE_CODE39
@@ -23261,6 +27560,11 @@ diff --git a/zbar/decoder.c b/zbar/decoder.c
 +    if(TEST_CFG(dcode->databar.config | dcode->databar.config_exp,
 +                ZBAR_CFG_ENABLE) &&
 +       (tmp = _zbar_decode_databar(dcode)) > ZBAR_PARTIAL)
++        sym = tmp;
++#endif
++#ifdef ENABLE_CODABAR
++    if(TEST_CFG(dcode->codabar.config, ZBAR_CFG_ENABLE) &&
++       (tmp = _zbar_decode_codabar(dcode)) > ZBAR_PARTIAL)
 +        sym = tmp;
  #endif
  #ifdef ENABLE_I25
@@ -23311,7 +27615,21 @@ diff --git a/zbar/decoder.c b/zbar/decoder.c
      switch(sym) {
  #ifdef ENABLE_EAN
      case ZBAR_EAN13:
-@@ -263,12 +316,27 @@ static inline int decoder_set_config_boo
+         config = &dcode->ean.ean13_config;
+         break;
+ 
++    case ZBAR_EAN2:
++        config = &dcode->ean.ean2_config;
++        break;
++
++    case ZBAR_EAN5:
++        config = &dcode->ean.ean5_config;
++        break;
++
+     case ZBAR_EAN8:
+         config = &dcode->ean.ean8_config;
+         break;
+@@ -263,12 +343,33 @@
          break;
  #endif
  
@@ -23323,6 +27641,12 @@ diff --git a/zbar/decoder.c b/zbar/decoder.c
 +        config = &dcode->databar.config_exp;
 +        break;
 +#endif
++
++#ifdef ENABLE_CODABAR
++    case ZBAR_CODABAR:
++        config = &dcode->codabar.config;
++        break;
++#endif
 +
  #ifdef ENABLE_CODE39
      case ZBAR_CODE39:
@@ -23339,16 +27663,20 @@ diff --git a/zbar/decoder.c b/zbar/decoder.c
  #ifdef ENABLE_CODE128
      case ZBAR_CODE128:
          config = &dcode->code128.config;
-@@ -290,8 +358,26 @@ static inline int decoder_set_config_boo
-     /* FIXME handle addons */
+@@ -287,11 +388,27 @@
+         break;
+ #endif
  
-     default:
--        return(1);
+-    /* FIXME handle addons */
++    default:
 +        config = NULL;
-     }
++    }
 +    return(config);
 +}
-+
+ 
+-    default:
+-        return(1);
+-    }
 +unsigned int zbar_decoder_get_configs (const zbar_decoder_t *dcode,
 +                                       zbar_symbol_type_t sym)
 +{
@@ -23367,7 +27695,26 @@ diff --git a/zbar/decoder.c b/zbar/decoder.c
      if(!config || cfg >= ZBAR_CFG_NUM)
          return(1);
  
-@@ -332,6 +418,11 @@ static inline int decoder_set_config_int
+@@ -304,6 +421,8 @@
+ 
+ #ifdef ENABLE_EAN
+     dcode->ean.enable = TEST_CFG(dcode->ean.ean13_config |
++                                 dcode->ean.ean2_config |
++                                 dcode->ean.ean5_config |
+                                  dcode->ean.ean8_config |
+                                  dcode->ean.upca_config |
+                                  dcode->ean.upce_config |
+@@ -327,11 +446,21 @@
+         CFG(dcode->i25, cfg) = val;
+         break;
+ #endif
++#ifdef ENABLE_CODABAR
++    case ZBAR_CODABAR:
++        CFG(dcode->codabar, cfg) = val;
++        break;
++#endif
+ #ifdef ENABLE_CODE39
+     case ZBAR_CODE39:
          CFG(dcode->code39, cfg) = val;
          break;
  #endif
@@ -23379,18 +27726,35 @@ diff --git a/zbar/decoder.c b/zbar/decoder.c
  #ifdef ENABLE_CODE128
      case ZBAR_CODE128:
          CFG(dcode->code128, cfg) = val;
-@@ -362,7 +453,10 @@ int zbar_decoder_set_config (zbar_decode
-         zbar_decoder_set_config(dcode, ZBAR_ISBN10, cfg, val);
-         zbar_decoder_set_config(dcode, ZBAR_ISBN13, cfg, val);
-         zbar_decoder_set_config(dcode, ZBAR_I25, cfg, val);
-+        zbar_decoder_set_config(dcode, ZBAR_DATABAR, cfg, val);
-+        zbar_decoder_set_config(dcode, ZBAR_DATABAR_EXP, cfg, val);
-         zbar_decoder_set_config(dcode, ZBAR_CODE39, cfg, val);
-+        zbar_decoder_set_config(dcode, ZBAR_CODE93, cfg, val);
-         zbar_decoder_set_config(dcode, ZBAR_CODE128, cfg, val);
-         zbar_decoder_set_config(dcode, ZBAR_PDF417, cfg, val);
-         zbar_decoder_set_config(dcode, ZBAR_QRCODE, cfg, val);
-@@ -385,16 +479,18 @@ const char *_zbar_decoder_buf_dump (unsi
+@@ -355,17 +484,16 @@
+                              int val)
+ {
+     if(sym == ZBAR_NONE) {
+-        zbar_decoder_set_config(dcode, ZBAR_EAN13, cfg, val);
+-        zbar_decoder_set_config(dcode, ZBAR_EAN8, cfg, val);
+-        zbar_decoder_set_config(dcode, ZBAR_UPCA, cfg, val);
+-        zbar_decoder_set_config(dcode, ZBAR_UPCE, cfg, val);
+-        zbar_decoder_set_config(dcode, ZBAR_ISBN10, cfg, val);
+-        zbar_decoder_set_config(dcode, ZBAR_ISBN13, cfg, val);
+-        zbar_decoder_set_config(dcode, ZBAR_I25, cfg, val);
+-        zbar_decoder_set_config(dcode, ZBAR_CODE39, cfg, val);
+-        zbar_decoder_set_config(dcode, ZBAR_CODE128, cfg, val);
+-        zbar_decoder_set_config(dcode, ZBAR_PDF417, cfg, val);
+-        zbar_decoder_set_config(dcode, ZBAR_QRCODE, cfg, val);
++        static const zbar_symbol_type_t all[] = {
++	    ZBAR_EAN13, ZBAR_EAN2, ZBAR_EAN5, ZBAR_EAN8,
++            ZBAR_UPCA, ZBAR_UPCE, ZBAR_ISBN10, ZBAR_ISBN13,
++            ZBAR_I25, ZBAR_DATABAR, ZBAR_DATABAR_EXP, ZBAR_CODABAR,
++	    ZBAR_CODE39, ZBAR_CODE93, ZBAR_CODE128, ZBAR_QRCODE, 
++	    ZBAR_PDF417, 0
++        };
++        const zbar_symbol_type_t *symp;
++        for(symp = all; *symp; symp++)
++            zbar_decoder_set_config(dcode, *symp, cfg, val);
+         return(0);
+     }
+ 
+@@ -385,16 +513,18 @@
                                      unsigned int buflen)
  {
      int dumplen = (buflen * 3) + 12;
@@ -23411,9 +27775,9 @@ diff --git a/zbar/decoder.c b/zbar/decoder.c
      for(i = 0; i < buflen; i++)
          p += snprintf(p, 4, "%s%02x", (i) ? " " : "",  buf[i]);
      return(decoder_dump);
-diff --git a/zbar/decoder.h b/zbar/decoder.h
---- a/zbar/decoder.h
-+++ b/zbar/decoder.h
+diff -r 563557a923d0 zbar/decoder.h
+--- a/zbar/decoder.h	Tue Oct 27 11:25:59 2009 -0400
++++ b/zbar/decoder.h	Fri Feb 22 08:54:29 2013 -0300
 @@ -1,5 +1,5 @@
  /*------------------------------------------------------------------------
 - *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
@@ -23421,12 +27785,28 @@ diff --git a/zbar/decoder.h b/zbar/decoder.h
   *
   *  This file is part of the ZBar Bar Code Reader.
   *
-@@ -36,9 +36,15 @@
+@@ -25,9 +25,12 @@
+ 
+ #include <config.h>
+ #include <stdlib.h>     /* realloc */
++#include <limits.h>
+ 
+ #include <zbar.h>
+ 
++#include "debug.h"
++
+ #define NUM_CFGS (ZBAR_CFG_MAX_LEN - ZBAR_CFG_MIN_LEN + 1)
+ 
+ #ifdef ENABLE_EAN
+@@ -36,9 +39,18 @@
  #ifdef ENABLE_I25
  # include "decoder/i25.h"
  #endif
 +#ifdef ENABLE_DATABAR
 +# include "decoder/databar.h"
++#endif
++#ifdef ENABLE_CODABAR
++# include "decoder/codabar.h"
 +#endif
  #ifdef ENABLE_CODE39
  # include "decoder/code39.h"
@@ -23437,7 +27817,7 @@ diff --git a/zbar/decoder.h b/zbar/decoder.h
  #ifdef ENABLE_CODE128
  # include "decoder/code128.h"
  #endif
-@@ -73,6 +79,7 @@
+@@ -73,6 +85,7 @@
  
  #define CFG(dcode, cfg) ((dcode).configs[(cfg) - ZBAR_CFG_MIN_LEN])
  #define TEST_CFG(config, cfg) (((config) >> (cfg)) & 1)
@@ -23445,7 +27825,7 @@ diff --git a/zbar/decoder.h b/zbar/decoder.h
  
  /* symbology independent decoder state */
  struct zbar_decoder_s {
-@@ -80,6 +87,9 @@ struct zbar_decoder_s {
+@@ -80,6 +93,9 @@
      unsigned w[DECODE_WINDOW];          /* window of last N bar widths */
      zbar_symbol_type_t type;            /* type of last decoded data */
      zbar_symbol_type_t lock;            /* buffer lock */
@@ -23455,12 +27835,15 @@ diff --git a/zbar/decoder.h b/zbar/decoder.h
  
      /* everything above here is automatically reset */
      unsigned buf_alloc;                 /* dynamic buffer allocation */
-@@ -95,9 +105,15 @@ struct zbar_decoder_s {
+@@ -95,9 +111,18 @@
  #ifdef ENABLE_I25
      i25_decoder_t i25;                  /* Interleaved 2 of 5 decode state */
  #endif
 +#ifdef ENABLE_DATABAR
 +    databar_decoder_t databar;          /* DataBar decode state */
++#endif
++#ifdef ENABLE_CODABAR
++    codabar_decoder_t codabar;          /* Codabar decode state */
 +#endif
  #ifdef ENABLE_CODE39
      code39_decoder_t code39;            /* Code 39 decode state */
@@ -23471,9 +27854,61 @@ diff --git a/zbar/decoder.h b/zbar/decoder.h
  #ifdef ENABLE_CODE128
      code128_decoder_t code128;          /* Code 128 decode state */
  #endif
-@@ -168,19 +184,32 @@ static inline int decode_e (unsigned e,
+@@ -167,20 +192,86 @@
+     return((E >= n - 3) ? -1 : E);
  }
  
++/* sort three like-colored elements and return ordering
++ */
++static inline unsigned decode_sort3 (zbar_decoder_t *dcode,
++                                     int i0)
++{
++    unsigned w0 = get_width(dcode, i0);
++    unsigned w2 = get_width(dcode, i0 + 2);
++    unsigned w4 = get_width(dcode, i0 + 4);
++    if(w0 < w2) {
++        if(w2 < w4)
++            return((i0 << 8) | ((i0 + 2) << 4) | (i0 + 4));
++        if(w0 < w4)
++            return((i0 << 8) | ((i0 + 4) << 4) | (i0 + 2));
++        return(((i0 + 4) << 8) | (i0 << 4) | (i0 + 2));
++    }
++    if(w4 < w2)
++        return(((i0 + 4) << 8) | ((i0 + 2) << 4) | i0);
++    if(w0 < w4)
++        return(((i0 + 2) << 8) | (i0 << 4) | (i0 + 4));
++    return(((i0 + 2) << 8) | ((i0 + 4) << 4) | i0);
++}
++
++/* sort N like-colored elements and return ordering
++ */
++static inline unsigned decode_sortn (zbar_decoder_t *dcode,
++                                     int n,
++                                     int i0)
++{
++    unsigned mask = 0, sort = 0;
++    int i;
++    for(i = n - 1; i >= 0; i--) {
++        unsigned wmin = UINT_MAX;
++        int jmin = -1, j;
++        for(j = n - 1; j >= 0; j--) {
++            if((mask >> j) & 1)
++                continue;
++            unsigned w = get_width(dcode, i0 + j * 2);
++            if(wmin >= w) {
++                wmin = w;
++                jmin = j;
++            }
++        }
++        zassert(jmin >= 0, 0, "sortn(%d,%d) jmin=%d",
++                n, i0, jmin);
++        sort <<= 4;
++        mask |= 1 << jmin;
++        sort |= i0 + jmin * 2;
++    }
++    return(sort);
++}
++
  /* acquire shared state lock */
 -static inline char get_lock (zbar_decoder_t *dcode,
 -                             zbar_symbol_type_t req)
@@ -23482,51 +27917,549 @@ diff --git a/zbar/decoder.h b/zbar/decoder.h
  {
 -    if(dcode->lock)
 +    if(dcode->lock) {
-+        dprintf(2, " [locked %d]\n", dcode->lock);
++        dbprintf(2, " [locked %d]\n", dcode->lock);
+         return(1);
++    }
+     dcode->lock = req;
+     return(0);
+ }
+ 
++/* check and release shared state lock */
++static inline char release_lock (zbar_decoder_t *dcode,
++                                 zbar_symbol_type_t req)
++{
++    zassert(dcode->lock == req, 1, "lock=%d req=%d\n",
++            dcode->lock, req);
++    dcode->lock = 0;
++    return(0);
++}
++
+ /* ensure output buffer has sufficient allocation for request */
+ static inline char size_buf (zbar_decoder_t *dcode,
+                              unsigned len)
+ {
++    unsigned char *buf;
++    if(len <= BUFFER_MIN)
++        return(0);
+     if(len < dcode->buf_alloc)
+         /* FIXME size reduction heuristic? */
+         return(0);
+@@ -191,7 +282,7 @@
+         if(len > BUFFER_MAX)
+             len = BUFFER_MAX;
+     }
+-    unsigned char *buf = realloc(dcode->buf, len);
++    buf = realloc(dcode->buf, len);
+     if(!buf)
          return(1);
+     dcode->buf = buf;
+@@ -200,6 +291,6 @@
+ }
+ 
+ extern const char *_zbar_decoder_buf_dump (unsigned char *buf,
+-                                            unsigned int buflen);
++                                           unsigned int buflen);
+ 
+ #endif
+diff -r 563557a923d0 zbar/decoder/codabar.c
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/zbar/decoder/codabar.c	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,437 @@
++/*------------------------------------------------------------------------
++ *  Copyright 2011 (c) Jeff Brown <spadix@users.sourceforge.net>
++ *
++ *  This file is part of the ZBar Bar Code Reader.
++ *
++ *  The ZBar Bar Code Reader is free software; you can redistribute it
++ *  and/or modify it under the terms of the GNU Lesser Public License as
++ *  published by the Free Software Foundation; either version 2.1 of
++ *  the License, or (at your option) any later version.
++ *
++ *  The ZBar Bar Code Reader is distributed in the hope that it will be
++ *  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
++ *  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU Lesser Public License for more details.
++ *
++ *  You should have received a copy of the GNU Lesser Public License
++ *  along with the ZBar Bar Code Reader; if not, write to the Free
++ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++ *  Boston, MA  02110-1301  USA
++ *
++ *  http://sourceforge.net/projects/zbar
++ *------------------------------------------------------------------------*/
++
++#include <config.h>
++#include <string.h>     /* memmove */
++
++#include <zbar.h>
++
++#ifdef DEBUG_CODABAR
++# define DEBUG_LEVEL (DEBUG_CODABAR)
++#endif
++#include "debug.h"
++#include "decoder.h"
++
++#define NIBUF 6 /* initial scan buffer size */
++
++static const signed char codabar_lo[12] = {
++    0x0, 0x1, 0x4, 0x5, 0x2, 0xa, 0xb, 0x9,
++    0x6, 0x7, 0x8, 0x3
++};
++
++static const unsigned char codabar_hi[8] = {
++    0x1, 0x4, 0x7, 0x6, 0x2, 0x3, 0x0, 0x5
++};
++
++static const unsigned char codabar_characters[20] =
++    "0123456789-$:/.+ABCD";
++
++static inline int
++check_width (unsigned ref,
++             unsigned w)
++{
++    unsigned dref = ref;
++    ref *= 4;
++    w *= 4;
++    return(ref - dref <= w && w <= ref + dref);
++}
++
++static inline signed char
++codabar_decode7 (zbar_decoder_t *dcode)
++{
++    codabar_decoder_t *codabar = &dcode->codabar;
++    unsigned s = codabar->s7;
++    dbprintf(2, " s=%d", s);
++    if(s < 7)
++        return(-1);
++
++    /* check width */
++    if(!check_width(codabar->width, s)) {
++        dbprintf(2, " [width]");
++        return(-1);
++    }
++
++    /* extract min/max bar */
++    unsigned ibar = decode_sortn(dcode, 4, 1);
++    dbprintf(2, " bar=%04x", ibar);
++
++    unsigned wbmax = get_width(dcode, ibar & 0xf);
++    unsigned wbmin = get_width(dcode, ibar >> 12);
++    if(8 * wbmin < wbmax ||
++       3 * wbmin > 2 * wbmax)
++    {
++        dbprintf(2, " [bar outer ratio]");
++        return(-1);
++    }
++
++    unsigned wb1 = get_width(dcode, (ibar >> 8) & 0xf);
++    unsigned wb2 = get_width(dcode, (ibar >> 4) & 0xf);
++    unsigned long b0b3 = wbmin * wbmax;
++    unsigned long b1b2 = wb1 * wb2;
++    if(b1b2 + b1b2 / 8 < b0b3) {
++        /* single wide bar combinations */
++        if(8 * wbmin < 5 * wb1 ||
++           8 * wb1 < 5 * wb2 ||
++           4 * wb2 > 3 * wbmax ||
++           wb2 * wb2 >= wb1 * wbmax)
++        {
++            dbprintf(2, " [1bar inner ratios]");
++            return(-1);
++        }
++        ibar = (ibar >> 1) & 0x3;
++    }
++    else if(b1b2 > b0b3 + b0b3 / 8) {
++        /* three wide bars, no wide spaces */
++        if(4 * wbmin > 3 * wb1 ||
++           8 * wb1 < 5 * wb2 ||
++           8 * wb2 < 5 * wbmax ||
++           wbmin * wb2 >= wb1 * wb1)
++        {
++            dbprintf(2, " [3bar inner ratios]");
++            return(-1);
++        }
++        ibar = (ibar >> 13) + 4;
++    }
++    else {
++        dbprintf(2, " [bar inner ratios]");
++        return(-1);
++    }
++
++    unsigned ispc = decode_sort3(dcode, 2);
++    dbprintf(2, "(%x) spc=%03x", ibar, ispc);
++
++    unsigned wsmax = get_width(dcode, ispc & 0xf);
++    unsigned wsmid = get_width(dcode, (ispc >> 4) & 0xf);
++    unsigned wsmin = get_width(dcode, (ispc >> 8) & 0xf);
++    if(ibar >> 2) {
++        /* verify no wide spaces */
++        if(8 * wsmin < wsmax ||
++           8 * wsmin < 5 * wsmid ||
++           8 * wsmid < 5 * wsmax)
++        {
++            dbprintf(2, " [0space inner ratios]");
++            return(-1);
++        }
++        ibar &= 0x3;
++        if(codabar->direction)
++            ibar = 3 - ibar;
++        int c = (0xfcde >> (ibar << 2)) & 0xf;
++        dbprintf(2, " ex[%d]=%x", ibar, c);
++        return(c);
++    }
++    else if(8 * wsmin < wsmax ||
++            3 * wsmin > 2 * wsmax)
++    {
++        dbprintf(2, " [space outer ratio]");
++        return(-1);
++    }
++
++    unsigned long s0s2 = wsmin * wsmax;
++    unsigned long s1s1 = wsmid * wsmid;
++    if(s1s1 + s1s1 / 8 < s0s2) {
++        /* single wide space */
++        if(8 * wsmin < 5 * wsmid ||
++           4 * wsmid > 3 * wsmax)
++        {
++            dbprintf(2, " [1space inner ratios]");
++            return(-1);
++        }
++        ispc = ((ispc & 0xf) >> 1) - 1;
++        unsigned ic = (ispc << 2) | ibar;
++        if(codabar->direction)
++            ic = 11 - ic;
++        int c = codabar_lo[ic];
++        dbprintf(2, "(%d) lo[%d]=%x", ispc, ic, c);
++        return(c);
++    }
++    else if(s1s1 > s0s2 + s0s2 / 8) {
++        /* two wide spaces, check start/stop */
++        if(4 * wsmin > 3 * wsmid ||
++           8 * wsmid < 5 * wsmax)
++        {
++            dbprintf(2, " [2space inner ratios]");
++            return(-1);
++        }
++        if((ispc >> 8) == 4) {
++            dbprintf(2, " [space comb]");
++            return(-1);
++        }
++        ispc >>= 10;
++        dbprintf(2, "(%d)", ispc);
++        unsigned ic = ispc * 4 + ibar;
++        zassert(ic < 8, -1, "ic=%d ispc=%d ibar=%d", ic, ispc, ibar);
++        unsigned char c = codabar_hi[ic];
++        if(c >> 2 != codabar->direction) {
++            dbprintf(2, " [invalid stop]");
++            return(-1);
++        }
++        c = (c & 0x3) | 0x10;
++        dbprintf(2, " hi[%d]=%x", ic, c);
++        return(c);
++    }
++    else {
++        dbprintf(2, " [space inner ratios]");
++        return(-1);
++    }
++}
++
++static inline signed char
++codabar_decode_start (zbar_decoder_t *dcode)
++{
++    codabar_decoder_t *codabar = &dcode->codabar;
++    unsigned s = codabar->s7;
++    if(s < 8)
++        return(ZBAR_NONE);
++    dbprintf(2, "      codabar: s=%d", s);
++
++    /* check leading quiet zone - spec is 10x */
++    unsigned qz = get_width(dcode, 8);
++    if((qz && qz * 2 < s) ||
++       4 * get_width(dcode, 0) > 3 * s)
++    {
++        dbprintf(2, " [invalid qz/ics]\n");
++        return(ZBAR_NONE);
++    }
++
++    /* check space ratios first */
++    unsigned ispc = decode_sort3(dcode, 2);
++    dbprintf(2, " spc=%03x", ispc);
++    if((ispc >> 8) == 4) {
++        dbprintf(2, " [space comb]\n");
++        return(ZBAR_NONE);
++    }
++
++    /* require 2 wide and 1 narrow spaces */
++    unsigned wsmax = get_width(dcode, ispc & 0xf);
++    unsigned wsmin = get_width(dcode, ispc >> 8);
++    unsigned wsmid = get_width(dcode, (ispc >> 4) & 0xf);
++    if(8 * wsmin < wsmax ||
++       3 * wsmin > 2 * wsmax ||
++       4 * wsmin > 3 * wsmid ||
++       8 * wsmid < 5 * wsmax ||
++       wsmid * wsmid <= wsmax * wsmin)
++    {
++        dbprintf(2, " [space ratio]\n");
++        return(ZBAR_NONE);
++    }
++    ispc >>= 10;
++    dbprintf(2, "(%d)", ispc);
++
++    /* check bar ratios */
++    unsigned ibar = decode_sortn(dcode, 4, 1);
++    dbprintf(2, " bar=%04x", ibar);
++
++    unsigned wbmax = get_width(dcode, ibar & 0xf);
++    unsigned wbmin = get_width(dcode, ibar >> 12);
++    if(8 * wbmin < wbmax ||
++       3 * wbmin > 2 * wbmax)
++    {
++        dbprintf(2, " [bar outer ratio]\n");
++        return(ZBAR_NONE);
++    }
++
++    /* require 1 wide & 3 narrow bars */
++    unsigned wb1 = get_width(dcode, (ibar >> 8) & 0xf);
++    unsigned wb2 = get_width(dcode, (ibar >> 4) & 0xf);
++    if(8 * wbmin < 5 * wb1 ||
++       8 * wb1 < 5 * wb2 ||
++       4 * wb2 > 3 * wbmax ||
++       wb1 * wb2 >= wbmin * wbmax ||
++       wb2 * wb2 >= wb1 * wbmax)
++    {
++        dbprintf(2, " [bar inner ratios]\n");
++        return(ZBAR_NONE);
++    }
++    ibar = ((ibar & 0xf) - 1) >> 1;
++    dbprintf(2, "(%d)", ibar);
++
++    /* decode combination */
++    int ic = ispc * 4 + ibar;
++    zassert(ic < 8, ZBAR_NONE, "ic=%d ispc=%d ibar=%d", ic, ispc, ibar);
++    int c = codabar_hi[ic];
++    codabar->buf[0] = (c & 0x3) | 0x10;
++
++    /* set character direction */
++    codabar->direction = c >> 2;
++
++    codabar->element = 4;
++    codabar->character = 1;
++    codabar->width = codabar->s7;
++    dbprintf(1, " start=%c dir=%x [valid start]\n",
++             codabar->buf[0] + 0x31, codabar->direction);
++    return(ZBAR_PARTIAL);
++}
++
++static inline int
++codabar_checksum (zbar_decoder_t *dcode,
++                  unsigned n)
++{
++    unsigned chk = 0;
++    unsigned char *buf = dcode->buf;
++    while(n--)
++        chk += *(buf++);
++    return(!!(chk & 0xf));
++}
++
++static inline zbar_symbol_type_t
++codabar_postprocess (zbar_decoder_t *dcode)
++{
++    codabar_decoder_t *codabar = &dcode->codabar;
++    int dir = codabar->direction;
++    dcode->direction = 1 - 2 * dir;
++    int i, n = codabar->character;
++    for(i = 0; i < NIBUF; i++)
++        dcode->buf[i] = codabar->buf[i];
++    if(dir)
++        /* reverse buffer */
++        for(i = 0; i < n / 2; i++) {
++            unsigned j = n - 1 - i;
++            char code = dcode->buf[i];
++            dcode->buf[i] = dcode->buf[j];
++            dcode->buf[j] = code;
++        }
++
++    if(TEST_CFG(codabar->config, ZBAR_CFG_ADD_CHECK)) {
++        /* validate checksum */
++        if(codabar_checksum(dcode, n))
++            return(ZBAR_NONE);
++        if(!TEST_CFG(codabar->config, ZBAR_CFG_EMIT_CHECK)) {
++            dcode->buf[n - 2] = dcode->buf[n - 1];
++            n--;
++        }
++    }
++
++    for(i = 0; i < n; i++) {
++        unsigned c = dcode->buf[i];
++        dcode->buf[i] = ((c < 0x14)
++                         ? codabar_characters[c]
++                         : '?');
++    }
++    dcode->buflen = i;
++    dcode->buf[i] = '\0';
++    dcode->modifiers = 0;
++
++    codabar->character = -1;
++    return(ZBAR_CODABAR);
++}
++
++zbar_symbol_type_t
++_zbar_decode_codabar (zbar_decoder_t *dcode)
++{
++    codabar_decoder_t *codabar = &dcode->codabar;
++
++    /* update latest character width */
++    codabar->s7 -= get_width(dcode, 8);
++    codabar->s7 += get_width(dcode, 1);
++
++    if(get_color(dcode) != ZBAR_SPACE)
++        return(ZBAR_NONE);
++    if(codabar->character < 0)
++        return(codabar_decode_start(dcode));
++    if(codabar->character < 2 &&
++       codabar_decode_start(dcode))
++        return(ZBAR_PARTIAL);
++    if(--codabar->element)
++        return(ZBAR_NONE);
++    codabar->element = 4;
++
++    dbprintf(1, "      codabar[%c%02d+%x]",
++             (codabar->direction) ? '<' : '>',
++             codabar->character, codabar->element);
++
++    signed char c = codabar_decode7(dcode);
++    dbprintf(1, " %d", c);
++    if(c < 0) {
++        dbprintf(1, " [aborted]\n");
++        goto reset;
++    }
++
++    unsigned char *buf;
++    if(codabar->character < NIBUF)
++        buf = codabar->buf;
++    else {
++        if(codabar->character >= BUFFER_MIN &&
++           size_buf(dcode, codabar->character + 1))
++        {
++            dbprintf(1, " [overflow]\n");
++            goto reset;
++        }
++        buf = dcode->buf;
++    }
++    buf[codabar->character++] = c;
++
++    /* lock shared resources */
++    if(codabar->character == NIBUF &&
++       acquire_lock(dcode, ZBAR_CODABAR))
++    {
++        codabar->character = -1;
++        return(ZBAR_PARTIAL);
 +    }
-     dcode->lock = req;
-     return(0);
- }
- 
-+/* check and release shared state lock */
-+static inline char release_lock (zbar_decoder_t *dcode,
-+                                 zbar_symbol_type_t req)
++
++    unsigned s = codabar->s7;
++    if(c & 0x10) {
++        unsigned qz = get_width(dcode, 0);
++        if(qz && qz * 2 < s) {
++            dbprintf(2, " [invalid qz]\n");
++            goto reset;
++        }
++        unsigned n = codabar->character;
++        if(n < CFG(*codabar, ZBAR_CFG_MIN_LEN) ||
++           (CFG(*codabar, ZBAR_CFG_MAX_LEN) > 0 &&
++            n > CFG(*codabar, ZBAR_CFG_MAX_LEN)))
++        {
++            dbprintf(2, " [invalid len]\n");
++            goto reset;
++        }
++        if(codabar->character < NIBUF &&
++           acquire_lock(dcode, ZBAR_CODABAR))
++        {
++            codabar->character = -1;
++            return(ZBAR_PARTIAL);
++        }
++        dbprintf(2, " stop=%c", c + 0x31);
++
++        zbar_symbol_type_t sym = codabar_postprocess(dcode);
++        if(sym > ZBAR_PARTIAL)
++            dbprintf(2, " [valid stop]");
++        else {
++            release_lock(dcode, ZBAR_CODABAR);
++            codabar->character = -1;
++        }
++        dbprintf(2, "\n");
++        return(sym);
++    }
++    else if(4 * get_width(dcode, 0) > 3 * s) {
++        dbprintf(2, " [ics]\n");
++        goto reset;
++    }
++
++    dbprintf(2, "\n");
++    return(ZBAR_NONE);
++
++reset:
++    if(codabar->character >= NIBUF)
++        release_lock(dcode, ZBAR_CODABAR);
++    codabar->character = -1;
++    return(ZBAR_NONE);
++}
+diff -r 563557a923d0 zbar/decoder/codabar.h
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/zbar/decoder/codabar.h	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,51 @@
++/*------------------------------------------------------------------------
++ *  Copyright 2011 (c) Jeff Brown <spadix@users.sourceforge.net>
++ *
++ *  This file is part of the ZBar Bar Code Reader.
++ *
++ *  The ZBar Bar Code Reader is free software; you can redistribute it
++ *  and/or modify it under the terms of the GNU Lesser Public License as
++ *  published by the Free Software Foundation; either version 2.1 of
++ *  the License, or (at your option) any later version.
++ *
++ *  The ZBar Bar Code Reader is distributed in the hope that it will be
++ *  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
++ *  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU Lesser Public License for more details.
++ *
++ *  You should have received a copy of the GNU Lesser Public License
++ *  along with the ZBar Bar Code Reader; if not, write to the Free
++ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++ *  Boston, MA  02110-1301  USA
++ *
++ *  http://sourceforge.net/projects/zbar
++ *------------------------------------------------------------------------*/
++#ifndef _CODABAR_H_
++#define _CODABAR_H_
++
++/* Codabar specific decode state */
++typedef struct codabar_decoder_s {
++    unsigned direction : 1;     /* scan direction: 0=fwd, 1=rev */
++    unsigned element : 4;       /* element offset 0-7 */
++    int character : 12;         /* character position in symbol */
++    unsigned s7;                /* current character width */
++    unsigned width;             /* last character width */
++    unsigned char buf[6];       /* initial scan buffer */
++
++    unsigned config;
++    int configs[NUM_CFGS];      /* int valued configurations */
++} codabar_decoder_t;
++
++/* reset Codabar specific state */
++static inline void codabar_reset (codabar_decoder_t *codabar)
 +{
-+    zassert(dcode->lock == req, 1, "lock=%d req=%d\n",
-+            dcode->lock, req);
-+    dcode->lock = 0;
-+    return(0);
++    codabar->direction = 0;
++    codabar->element = 0;
++    codabar->character = -1;
++    codabar->s7 = 0;
 +}
 +
- /* ensure output buffer has sufficient allocation for request */
- static inline char size_buf (zbar_decoder_t *dcode,
-                              unsigned len)
- {
-+    unsigned char *buf;
-     if(len < dcode->buf_alloc)
-         /* FIXME size reduction heuristic? */
-         return(0);
-@@ -191,7 +220,7 @@ static inline char size_buf (zbar_decode
-         if(len > BUFFER_MAX)
-             len = BUFFER_MAX;
-     }
--    unsigned char *buf = realloc(dcode->buf, len);
-+    buf = realloc(dcode->buf, len);
-     if(!buf)
-         return(1);
-     dcode->buf = buf;
-@@ -200,6 +229,6 @@ static inline char size_buf (zbar_decode
- }
- 
- extern const char *_zbar_decoder_buf_dump (unsigned char *buf,
--                                            unsigned int buflen);
-+                                           unsigned int buflen);
- 
- #endif
-diff --git a/zbar/decoder/code128.c b/zbar/decoder/code128.c
---- a/zbar/decoder/code128.c
-+++ b/zbar/decoder/code128.c
++/* decode Codabar symbols */
++zbar_symbol_type_t _zbar_decode_codabar(zbar_decoder_t *dcode);
++
++#endif
+diff -r 563557a923d0 zbar/decoder/code128.c
+--- a/zbar/decoder/code128.c	Tue Oct 27 11:25:59 2009 -0400
++++ b/zbar/decoder/code128.c	Fri Feb 22 08:54:29 2013 -0300
 @@ -1,5 +1,5 @@
  /*------------------------------------------------------------------------
 - *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
@@ -23548,7 +28481,7 @@ diff --git a/zbar/decoder/code128.c b/zbar/decoder/code128.c
  
  #define NUM_CHARS 108           /* total number of character codes */
  
-@@ -120,6 +120,8 @@ static inline signed char decode_lo (int
+@@ -120,6 +120,8 @@
                              ((sig >> 5) & 0x18) |
                              ((sig >> 7) & 0x60));
      unsigned char idx = lo_offset[offset];
@@ -23557,7 +28490,7 @@ diff --git a/zbar/decoder/code128.c b/zbar/decoder/code128.c
      if(sig & 1)
          idx &= 0xf;
      else
-@@ -127,14 +129,14 @@ static inline signed char decode_lo (int
+@@ -127,31 +129,31 @@
      if(idx == 0xf)
          return(-1);
  
@@ -23570,11 +28503,16 @@ diff --git a/zbar/decoder/code128.c b/zbar/decoder/code128.c
      zassert(idx <= 0x50, -1, "sig=%x offset=%x base=%x idx=%x\n",
              sig, offset, base, idx);
 -    unsigned char c = characters[idx];
+-    dprintf(2, " %02x(%x(%02x)/%x(%02x)) => %02x",
+-            idx, base, lo_base[base], offset, lo_offset[offset],
+-            (unsigned char)c);
 +    c = characters[idx];
-     dprintf(2, " %02x(%x(%02x)/%x(%02x)) => %02x",
-             idx, base, lo_base[base], offset, lo_offset[offset],
-             (unsigned char)c);
-@@ -144,6 +146,7 @@ static inline signed char decode_lo (int
++    dbprintf(2, " %02x(%x(%02x)/%x(%02x)) => %02x",
++             idx, base, lo_base[base], offset, lo_offset[offset],
++             (unsigned char)c);
+     return(c);
+ }
+ 
  static inline signed char decode_hi (int sig)
  {
      unsigned char rev = (sig & 0x4400) != 0;
@@ -23582,24 +28520,27 @@ diff --git a/zbar/decoder/code128.c b/zbar/decoder/code128.c
      if(rev)
          sig = (((sig >> 12) & 0x000f) |
                 ((sig >>  4) & 0x00f0) |
-@@ -151,7 +154,6 @@ static inline signed char decode_hi (int
+                ((sig <<  4) & 0x0f00) |
                 ((sig << 12) & 0xf000));
-     dprintf(2, " rev=%x", rev != 0);
+-    dprintf(2, " rev=%x", rev != 0);
++    dbprintf(2, " rev=%x", rev != 0);
  
 -    unsigned char idx;
      switch(sig) {
      case 0x0014: idx = 0x0; break;
      case 0x0025: idx = 0x1; break;
-@@ -171,7 +173,7 @@ static inline signed char decode_hi (int
+@@ -171,8 +173,8 @@
      }
      if(rev)
          idx += 0xe;
 -    unsigned char c = characters[0x51 + idx];
+-    dprintf(2, " %02x => %02x", idx, c);
 +    c = characters[0x51 + idx];
-     dprintf(2, " %02x => %02x", idx, c);
++    dbprintf(2, " %02x => %02x", idx, c);
      return(c);
  }
-@@ -190,13 +192,18 @@ static inline unsigned char calc_check (
+ 
+@@ -190,13 +192,18 @@
  
  static inline signed char decode6 (zbar_decoder_t *dcode)
  {
@@ -23609,8 +28550,9 @@ diff --git a/zbar/decoder/code128.c b/zbar/decoder/code128.c
 +
      /* build edge signature of character */
      unsigned s = dcode->code128.s6;
+-    dprintf(2, " s=%d", s);
 +
-     dprintf(2, " s=%d", s);
++    dbprintf(2, " s=%d", s);
      if(s < 5)
          return(-1);
      /* calculate similar edge measurements */
@@ -23619,9 +28561,12 @@ diff --git a/zbar/decoder/code128.c b/zbar/decoder/code128.c
          ? ((decode_e(get_width(dcode, 0) + get_width(dcode, 1), s, 11) << 12) |
             (decode_e(get_width(dcode, 1) + get_width(dcode, 2), s, 11) << 8) |
             (decode_e(get_width(dcode, 2) + get_width(dcode, 3), s, 11) << 4) |
-@@ -209,16 +216,16 @@ static inline signed char decode6 (zbar_
+@@ -207,19 +214,19 @@
+            (decode_e(get_width(dcode, 2) + get_width(dcode, 1), s, 11)));
+     if(sig < 0)
          return(-1);
-     dprintf(2, " sig=%04x", sig);
+-    dprintf(2, " sig=%04x", sig);
++    dbprintf(2, " sig=%04x", sig);
      /* lookup edge signature */
 -    signed char c = (sig & 0x4444) ? decode_hi(sig) : decode_lo(sig);
 +    c = (sig & 0x4444) ? decode_hi(sig) : decode_lo(sig);
@@ -23635,11 +28580,13 @@ diff --git a/zbar/decoder/code128.c b/zbar/decoder/code128.c
          : (get_width(dcode, 1) + get_width(dcode, 3) + get_width(dcode, 5));
      bars = bars * 11 * 4 / s;
 -    unsigned char chk = calc_check(c);
+-    dprintf(2, " bars=%d chk=%d", bars, chk);
 +    chk = calc_check(c);
-     dprintf(2, " bars=%d chk=%d", bars, chk);
++    dbprintf(2, " bars=%d chk=%d", bars, chk);
      if(chk - 7 > bars || bars > chk + 7)
          return(-1);
-@@ -228,18 +235,20 @@ static inline signed char decode6 (zbar_
+ 
+@@ -228,18 +235,20 @@
  
  static inline unsigned char validate_checksum (zbar_decoder_t *dcode)
  {
@@ -23663,19 +28610,23 @@ diff --git a/zbar/decoder/code128.c b/zbar/decoder/code128.c
      for(i = dcode128->character - 3; i; i--) {
          zassert(sum < 103, -1, "dir=%x i=%x sum=%x acc=%x %s\n",
                  dcode128->direction, i, sum, acc,
-@@ -258,9 +267,9 @@ static inline unsigned char validate_che
+@@ -258,11 +267,11 @@
  
      /* and compare to check character */
      idx = (dcode128->direction) ? 1 : dcode128->character - 2;
 -    unsigned char check = dcode->buf[idx];
-+    check = dcode->buf[idx];
-     dprintf(2, " chk=%02x(%02x)", sum, check);
+-    dprintf(2, " chk=%02x(%02x)", sum, check);
 -    unsigned char err = (sum != check);
++    check = dcode->buf[idx];
++    dbprintf(2, " chk=%02x(%02x)", sum, check);
 +    err = (sum != check);
      if(err)
-         dprintf(1, " [checksum error]\n");
+-        dprintf(1, " [checksum error]\n");
++        dbprintf(1, " [checksum error]\n");
      return(err);
-@@ -272,6 +281,8 @@ static inline unsigned postprocess_c (zb
+ }
+ 
+@@ -272,6 +281,8 @@
                                        unsigned end,
                                        unsigned dst)
  {
@@ -23684,7 +28635,7 @@ diff --git a/zbar/decoder/code128.c b/zbar/decoder/code128.c
      /* expand buffer to accomodate 2x set C characters (2 digits per-char) */
      unsigned delta = end - start;
      unsigned newlen = dcode->code128.character + delta;
-@@ -282,7 +293,6 @@ static inline unsigned postprocess_c (zb
+@@ -282,7 +293,6 @@
              dcode->code128.character - start);
      dcode->code128.character = newlen;
  
@@ -23692,35 +28643,45 @@ diff --git a/zbar/decoder/code128.c b/zbar/decoder/code128.c
      for(i = 0, j = dst; i < delta; i++, j += 2) {
          /* convert each set C character into two ASCII digits */
          unsigned char code = dcode->buf[start + delta + i];
-@@ -317,10 +327,12 @@ static inline unsigned postprocess_c (zb
+@@ -317,13 +327,15 @@
  /* resolve scan direction and convert to ASCII */
  static inline unsigned char postprocess (zbar_decoder_t *dcode)
  {
 +    unsigned i, j, cexp;
 +    unsigned char code = 0, charset;
      code128_decoder_t *dcode128 = &dcode->code128;
-     dprintf(2, "\n    postproc len=%d", dcode128->character);
+-    dprintf(2, "\n    postproc len=%d", dcode128->character);
 -    unsigned i, j;
 -    unsigned char code = 0;
++    dbprintf(2, "\n    postproc len=%d", dcode128->character);
 +    dcode->modifiers = 0;
 +    dcode->direction = 1 - 2 * dcode128->direction;
      if(dcode128->direction) {
          /* reverse buffer */
-         dprintf(2, " (rev)");
-@@ -343,8 +355,8 @@ static inline unsigned char postprocess 
+-        dprintf(2, " (rev)");
++        dbprintf(2, " (rev)");
+         for(i = 0; i < dcode128->character / 2; i++) {
+             unsigned j = dcode128->character - 1 - i;
+             code = dcode->buf[i];
+@@ -343,9 +355,9 @@
      zassert(code >= START_A && code <= START_C, 1, "%s\n",
              _zbar_decoder_buf_dump(dcode->buf, dcode->code128.character));
  
 -    unsigned char charset = code - START_A;
 -    unsigned cexp = (code == START_C) ? 1 : 0;
+-    dprintf(2, " start=%c", 'A' + charset);
 +    charset = code - START_A;
 +    cexp = (code == START_C) ? 1 : 0;
-     dprintf(2, " start=%c", 'A' + charset);
++    dbprintf(2, " start=%c", 'A' + charset);
  
      for(i = 1, j = 0; i < dcode128->character - 2; i++) {
-@@ -370,12 +382,13 @@ static inline unsigned char postprocess 
+         unsigned char code = dcode->buf[i];
+@@ -368,14 +380,15 @@
+                 charset &= 0x7f;
+         }
          else {
-             dprintf(2, " %02x", code);
+-            dprintf(2, " %02x", code);
++            dbprintf(2, " %02x", code);
              if(charset & 0x2) {
 +                unsigned delta;
                  /* expand character set C to ASCII */
@@ -23733,7 +28694,7 @@ diff --git a/zbar/decoder/code128.c b/zbar/decoder/code128.c
                  i += delta;
                  j += delta * 2;
                  cexp = 0;
-@@ -383,28 +396,39 @@ static inline unsigned char postprocess 
+@@ -383,28 +396,39 @@
              if(code < CODE_C) {
                  if(code == SHIFT)
                      charset |= 0x80;
@@ -23761,7 +28722,8 @@ diff --git a/zbar/decoder/code128.c b/zbar/decoder/code128.c
 +                /*else drop trailing FNC1 */
 +            }
              else if(code >= START_A) {
-                 dprintf(1, " [truncated]\n");
+-                dprintf(1, " [truncated]\n");
++                dbprintf(1, " [truncated]\n");
                  return(1);
              }
              else {
@@ -23782,7 +28744,16 @@ diff --git a/zbar/decoder/code128.c b/zbar/decoder/code128.c
              }
              if(charset & 0x2)
                  cexp = i + 1;
-@@ -426,16 +450,18 @@ static inline unsigned char postprocess 
+@@ -417,6 +441,8 @@
+                                         dcode->code128.character));
+         j += postprocess_c(dcode, cexp, i, j) * 2;
+     }
++    zassert(j < dcode->buf_alloc, 1, "j=%02x %s\n", j,
++            _zbar_decoder_buf_dump(dcode->buf, dcode->code128.character));
+     dcode->buflen = j;
+     dcode->buf[j] = '\0';
+     dcode->code128.character = j;
+@@ -426,66 +452,90 @@
  zbar_symbol_type_t _zbar_decode_code128 (zbar_decoder_t *dcode)
  {
      code128_decoder_t *dcode128 = &dcode->code128;
@@ -23806,32 +28777,38 @@ diff --git a/zbar/decoder/code128.c b/zbar/decoder/code128.c
          return(0);
      dcode128->element = 0;
  
-@@ -443,49 +469,73 @@ zbar_symbol_type_t _zbar_decode_code128 
-             (dcode128->direction) ? '<' : '>',
-             dcode128->character, dcode128->element);
+-    dprintf(2, "      code128[%c%02d+%x]:",
+-            (dcode128->direction) ? '<' : '>',
+-            dcode128->character, dcode128->element);
++    dbprintf(2, "      code128[%c%02d+%x]:",
++             (dcode128->direction) ? '<' : '>',
++             dcode128->character, dcode128->element);
  
 -    signed char c = decode6(dcode);
 +    c = decode6(dcode);
      if(dcode128->character < 0) {
+-        dprintf(2, " c=%02x", c);
 +        unsigned qz;
-         dprintf(2, " c=%02x", c);
++        dbprintf(2, " c=%02x", c);
          if(c < START_A || c > STOP_REV || c == STOP_FWD) {
-             dprintf(2, " [invalid]\n");
+-            dprintf(2, " [invalid]\n");
++            dbprintf(2, " [invalid]\n");
              return(0);
          }
 -        unsigned qz = get_width(dcode, 6);
 -        if(qz && qz < (dcode->code128.s6 * 3) / 4) {
-+        qz = get_width(dcode, 6);
-+        if(qz && qz < (dcode128->s6 * 3) / 4) {
-             dprintf(2, " [invalid qz %d]\n", qz);
-             return(0);
-         }
+-            dprintf(2, " [invalid qz %d]\n", qz);
+-            return(0);
+-        }
 -        /* lock shared resources */
 -        if(get_lock(dcode, ZBAR_CODE128)) {
 -            dprintf(2, " [locked %d]\n", dcode->lock);
 -            dcode128->character = -1;
--            return(0);
--        }
++        qz = get_width(dcode, 6);
++        if(qz && qz < (dcode128->s6 * 3) / 4) {
++            dbprintf(2, " [invalid qz %d]\n", qz);
+             return(0);
+         }
          /* decoded valid start/stop */
          /* initialize state */
 -        dcode128->character = 0;
@@ -23845,14 +28822,16 @@ diff --git a/zbar/decoder/code128.c b/zbar/decoder/code128.c
 -        dprintf(2, " dir=%x [valid start]", dcode128->direction);
 +        dcode128->start = c;
 +        dcode128->width = dcode128->s6;
-+        dprintf(2, " dir=%x [valid start]\n", dcode128->direction);
++        dbprintf(2, " dir=%x [valid start]\n", dcode128->direction);
 +        return(0);
      }
-     else if((c < 0) ||
-             ((dcode128->character >= BUFFER_MIN) &&
-              size_buf(dcode, dcode128->character + 1))) {
-         dprintf(1, (c < 0) ? " [aborted]\n" : " [overflow]\n");
+-    else if((c < 0) ||
+-            ((dcode128->character >= BUFFER_MIN) &&
+-             size_buf(dcode, dcode128->character + 1))) {
+-        dprintf(1, (c < 0) ? " [aborted]\n" : " [overflow]\n");
 -        dcode->lock = 0;
++    else if(c < 0 || size_buf(dcode, dcode128->character + 1)) {
++        dbprintf(1, (c < 0) ? " [aborted]\n" : " [overflow]\n");
 +        if(dcode128->character > 1)
 +            release_lock(dcode, ZBAR_CODE128);
          dcode128->character = -1;
@@ -23866,7 +28845,7 @@ diff --git a/zbar/decoder/code128.c b/zbar/decoder/code128.c
 +            dw = dcode128->s6 - dcode128->width;
 +        dw *= 4;
 +        if(dw > dcode128->width) {
-+            dprintf(1, " [width var]\n");
++            dbprintf(1, " [width var]\n");
 +            if(dcode128->character > 1)
 +                release_lock(dcode, ZBAR_CODE128);
 +            dcode128->character = -1;
@@ -23892,8 +28871,17 @@ diff --git a/zbar/decoder/code128.c b/zbar/decoder/code128.c
      dcode->buf[dcode128->character++] = c;
  
      if(dcode128->character > 2 &&
-@@ -506,7 +556,7 @@ zbar_symbol_type_t _zbar_decode_code128 
-             dprintf(2, " [valid end]\n");
+@@ -499,17 +549,17 @@
+         else if(dcode128->character < CFG(*dcode128, ZBAR_CFG_MIN_LEN) ||
+                 (CFG(*dcode128, ZBAR_CFG_MAX_LEN) > 0 &&
+                  dcode128->character > CFG(*dcode128, ZBAR_CFG_MAX_LEN))) {
+-            dprintf(2, " [invalid len]\n");
++            dbprintf(2, " [invalid len]\n");
+             sym = ZBAR_NONE;
+         }
+         else
+-            dprintf(2, " [valid end]\n");
++            dbprintf(2, " [valid end]\n");
          dcode128->character = -1;
          if(!sym)
 -            dcode->lock = 0;
@@ -23901,10 +28889,14 @@ diff --git a/zbar/decoder/code128.c b/zbar/decoder/code128.c
          return(sym);
      }
  
-diff --git a/zbar/decoder/code128.h b/zbar/decoder/code128.h
---- a/zbar/decoder/code128.h
-+++ b/zbar/decoder/code128.h
-@@ -28,7 +28,9 @@ typedef struct code128_decoder_s {
+-    dprintf(2, "\n");
++    dbprintf(2, "\n");
+     return(0);
+ }
+diff -r 563557a923d0 zbar/decoder/code128.h
+--- a/zbar/decoder/code128.h	Tue Oct 27 11:25:59 2009 -0400
++++ b/zbar/decoder/code128.h	Fri Feb 22 08:54:29 2013 -0300
+@@ -28,7 +28,9 @@
      unsigned direction : 1;     /* scan direction: 0=fwd/space, 1=rev/bar */
      unsigned element : 3;       /* element offset 0-5 */
      int character : 12;         /* character position in symbol */
@@ -23914,9 +28906,9 @@ diff --git a/zbar/decoder/code128.h b/zbar/decoder/code128.h
  
      unsigned config;
      int configs[NUM_CFGS];      /* int valued configurations */
-diff --git a/zbar/decoder/code39.c b/zbar/decoder/code39.c
---- a/zbar/decoder/code39.c
-+++ b/zbar/decoder/code39.c
+diff -r 563557a923d0 zbar/decoder/code39.c
+--- a/zbar/decoder/code39.c	Tue Oct 27 11:25:59 2009 -0400
++++ b/zbar/decoder/code39.c	Fri Feb 22 08:54:29 2013 -0300
 @@ -1,5 +1,5 @@
  /*------------------------------------------------------------------------
 - *  Copyright 2008-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
@@ -23938,7 +28930,7 @@ diff --git a/zbar/decoder/code39.c b/zbar/decoder/code39.c
  
  #define NUM_CHARS (0x2c)
  
-@@ -130,11 +130,11 @@ static inline unsigned char code39_decod
+@@ -130,16 +130,16 @@
                                              unsigned e,
                                              unsigned s)
  {
@@ -23951,9 +28943,16 @@ diff --git a/zbar/decoder/code39.c b/zbar/decoder/code39.c
 -    if(E > 2) {
 +    if(E > 6) {
          enc |= 1;
-         dprintf(2, "1");
+-        dprintf(2, "1");
++        dbprintf(2, "1");
      }
-@@ -147,7 +147,6 @@ static inline signed char code39_decode9
+     else
+-        dprintf(2, "0");
++        dbprintf(2, "0");
+     return(enc);
+ }
+ 
+@@ -147,7 +147,6 @@
  {
      code39_decoder_t *dcode39 = &dcode->code39;
  
@@ -23961,37 +28960,70 @@ diff --git a/zbar/decoder/code39.c b/zbar/decoder/code39.c
      if(dcode39->s9 < 9)
          return(-1);
  
-@@ -192,14 +191,14 @@ static inline signed char code39_decode9
+@@ -181,7 +180,7 @@
+     zassert(idx < 0x2c, -1, " idx=%x enc=%x s9=%x\n", idx, enc, dcode39->s9);
+ 
+     const char39_t *c = &code39_encodings[idx];
+-    dprintf(2, " i=%02x chk=%02x c=%02x/%02x", idx, c->chk, c->fwd, c->rev);
++    dbprintf(2, " i=%02x chk=%02x c=%02x/%02x", idx, c->chk, c->fwd, c->rev);
+     if(enc != c->chk)
+         return(-1);
+ 
+@@ -192,35 +191,36 @@
  static inline signed char code39_decode_start (zbar_decoder_t *dcode)
  {
      code39_decoder_t *dcode39 = &dcode->code39;
-+    dprintf(2, " s=%d ", dcode39->s9);
++    dbprintf(2, " s=%d ", dcode39->s9);
  
      signed char c = code39_decode9(dcode);
 -    if(c == 0x19)
 -        dcode39->direction ^= 1;
 -    else if(c != 0x2b) {
+-        dprintf(2, "\n");
 +    if(c != 0x19 && c != 0x2b) {
-         dprintf(2, "\n");
++        dbprintf(2, "\n");
          return(ZBAR_NONE);
      }
 +    dcode39->direction ^= (c == 0x19);
  
      /* check leading quiet zone - spec is 10x */
      unsigned quiet = get_width(dcode, 9);
-@@ -217,6 +216,7 @@ static inline signed char code39_decode_
- static inline void code39_postprocess (zbar_decoder_t *dcode)
+     if(quiet && quiet < dcode39->s9 / 2) {
+-        dprintf(2, " [invalid quiet]\n");
++        dbprintf(2, " [invalid quiet]\n");
+         return(ZBAR_NONE);
+     }
+ 
+     dcode39->element = 9;
+     dcode39->character = 0;
+-    dprintf(1, " dir=%x [valid start]\n", dcode39->direction);
++    dbprintf(1, " dir=%x [valid start]\n", dcode39->direction);
+     return(ZBAR_PARTIAL);
+ }
+ 
+-static inline void code39_postprocess (zbar_decoder_t *dcode)
++static inline int code39_postprocess (zbar_decoder_t *dcode)
  {
      code39_decoder_t *dcode39 = &dcode->code39;
 +    dcode->direction = 1 - 2 * dcode39->direction;
      int i;
      if(dcode39->direction) {
          /* reverse buffer */
-@@ -234,6 +234,17 @@ static inline void code39_postprocess (z
+-        dprintf(2, " (rev)");
++        dbprintf(2, " (rev)");
+         for(i = 0; i < dcode39->character / 2; i++) {
+             unsigned j = dcode39->character - 1 - i;
+             char code = dcode->buf[i];
+@@ -232,8 +232,22 @@
+         dcode->buf[i] = ((dcode->buf[i] < 0x2b)
+                          ? code39_characters[(unsigned)dcode->buf[i]]
                           : '?');
++    zassert(i < dcode->buf_alloc, -1, "i=%02x %s\n", i,
++            _zbar_decoder_buf_dump(dcode->buf, dcode39->character));
      dcode->buflen = i;
      dcode->buf[i] = '\0';
 +    dcode->modifiers = 0;
++    return(0);
 +}
 +
 +static inline int
@@ -24005,7 +29037,57 @@ diff --git a/zbar/decoder/code39.c b/zbar/decoder/code39.c
  }
  
  zbar_symbol_type_t _zbar_decode_code39 (zbar_decoder_t *dcode)
-@@ -284,27 +295,36 @@ zbar_symbol_type_t _zbar_decode_code39 (
+@@ -247,16 +261,16 @@
+     if(dcode39->character < 0) {
+         if(get_color(dcode) != ZBAR_BAR)
+             return(ZBAR_NONE);
+-        dprintf(2, "      code39:");
++        dbprintf(2, "      code39:");
+         return(code39_decode_start(dcode));
+     }
+ 
+     if(++dcode39->element < 9)
+         return(ZBAR_NONE);
+ 
+-    dprintf(2, "      code39[%c%02d+%x]",
+-            (dcode39->direction) ? '<' : '>',
+-            dcode39->character, dcode39->element);
++    dbprintf(2, "      code39[%c%02d+%x]",
++             (dcode39->direction) ? '<' : '>',
++             dcode39->character, dcode39->element);
+ 
+     if(dcode39->element == 10) {
+         unsigned space = get_width(dcode, 0);
+@@ -264,61 +278,64 @@
+            dcode->buf[dcode39->character - 1] == 0x2b) {  /* STOP */
+             /* trim STOP character */
+             dcode39->character--;
+-            zbar_symbol_type_t sym = ZBAR_CODE39;
++            zbar_symbol_type_t sym = ZBAR_NONE;
+ 
+             /* trailing quiet zone check */
+-            if(space && space < dcode39->width / 2) {
+-                dprintf(2, " [invalid qz]\n");
+-                sym = ZBAR_NONE;
+-            }
++            if(space && space < dcode39->width / 2)
++                dbprintf(2, " [invalid qz]\n");
+             else if(dcode39->character < CFG(*dcode39, ZBAR_CFG_MIN_LEN) ||
+                     (CFG(*dcode39, ZBAR_CFG_MAX_LEN) > 0 &&
+-                     dcode39->character > CFG(*dcode39, ZBAR_CFG_MAX_LEN))) {
+-                dprintf(2, " [invalid len]\n");
+-                sym = ZBAR_NONE;
+-            }
+-            else {
+-                /* FIXME checksum (needs config enable) */
+-                code39_postprocess(dcode);
+-                dprintf(2, " [valid end]\n");
++                     dcode39->character > CFG(*dcode39, ZBAR_CFG_MAX_LEN)))
++                dbprintf(2, " [invalid len]\n");
++            else if(!code39_postprocess(dcode)) {
++                /* FIXME checksum */
++                dbprintf(2, " [valid end]\n");
++                sym = ZBAR_CODE39;
              }
              dcode39->character = -1;
              if(!sym)
@@ -24016,28 +29098,30 @@ diff --git a/zbar/decoder/code39.c b/zbar/decoder/code39.c
          if(space > dcode39->width / 2) {
              /* inter-character space check failure */
 -            dcode->lock = 0;
-+            dprintf(2, " ics>%d [invalid ics]", dcode39->width);
++            dbprintf(2, " ics>%d [invalid ics]", dcode39->width);
 +            if(dcode39->character)
 +                release_lock(dcode, ZBAR_CODE39);
              dcode39->character = -1;
 -            dprintf(2, " ics>%d [invalid ics]", dcode39->width);
          }
          dcode39->element = 0;
-         dprintf(2, "\n");
-         return(ZBAR_NONE);
-     }
- 
-+    dprintf(2, " s=%d ", dcode39->s9);
+-        dprintf(2, "\n");
++        dbprintf(2, "\n");
++        return(ZBAR_NONE);
++    }
++
++    dbprintf(2, " s=%d ", dcode39->s9);
 +    if(!check_width(dcode39->width, dcode39->s9)) {
-+        dprintf(2, " [width]\n");
++        dbprintf(2, " [width]\n");
 +        if(dcode39->character)
 +            release_lock(dcode, ZBAR_CODE39);
 +        dcode39->character = -1;
-+        return(ZBAR_NONE);
-+    }
-+
+         return(ZBAR_NONE);
+     }
+ 
      signed char c = code39_decode9(dcode);
-     dprintf(2, " c=%d", c);
+-    dprintf(2, " c=%d", c);
++    dbprintf(2, " c=%d", c);
  
      /* lock shared resources */
 -    if(!dcode39->character && get_lock(dcode, ZBAR_CODE39)) {
@@ -24047,20 +29131,28 @@ diff --git a/zbar/decoder/code39.c b/zbar/decoder/code39.c
          return(ZBAR_PARTIAL);
      }
  
-@@ -312,7 +332,7 @@ zbar_symbol_type_t _zbar_decode_code39 (
-        ((dcode39->character >= BUFFER_MIN) &&
-         size_buf(dcode, dcode39->character + 1))) {
-         dprintf(1, (c < 0) ? " [aborted]\n" : " [overflow]\n");
+-    if(c < 0 ||
+-       ((dcode39->character >= BUFFER_MIN) &&
+-        size_buf(dcode, dcode39->character + 1))) {
+-        dprintf(1, (c < 0) ? " [aborted]\n" : " [overflow]\n");
 -        dcode->lock = 0;
++    if(c < 0 || size_buf(dcode, dcode39->character + 1)) {
++        dbprintf(1, (c < 0) ? " [aborted]\n" : " [overflow]\n");
 +        release_lock(dcode, ZBAR_CODE39);
          dcode39->character = -1;
          return(ZBAR_NONE);
      }
-diff --git a/zbar/decoder/code93.c b/zbar/decoder/code93.c
-new file mode 100644
---- /dev/null
-+++ b/zbar/decoder/code93.c
-@@ -0,0 +1,398 @@
+     else {
+         zassert(c < 0x2c, ZBAR_NONE, "c=%02x s9=%x\n", c, dcode39->s9);
+-        dprintf(2, "\n");
++        dbprintf(2, "\n");
+     }
+ 
+     dcode->buf[dcode39->character++] = c;
+diff -r 563557a923d0 zbar/decoder/code93.c
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/zbar/decoder/code93.c	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,400 @@
 +/*------------------------------------------------------------------------
 + *  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
 + *
@@ -24124,7 +29216,7 @@ new file mode 100644
 +    unsigned s = dcode->s6;
 +    int sig = 0, i;
 +
-+    dprintf(2, " s=%d ", s);
++    dbprintf(2, " s=%d ", s);
 +    if(s < 9)
 +        return(-1);
 +
@@ -24133,9 +29225,9 @@ new file mode 100644
 +        if(c > 3)
 +            return(-1);
 +        sig = (sig << 2) | c;
-+        dprintf(2, "%d", c);
++        dbprintf(2, "%d", c);
 +    }
-+    dprintf(2, " sig=%03x", sig);
++    dbprintf(2, " sig=%03x", sig);
 +
 +    return(sig);
 +}
@@ -24144,14 +29236,14 @@ new file mode 100644
 +validate_sig (int sig)
 +{
 +    int i, sum = 0, emin = 0, sig0 = 0, sig1 = 0;
-+    dprintf(3, " sum=0");
++    dbprintf(3, " sum=0");
 +    for(i = 3; --i >= 0; ) {
 +        int e = sig & 3;
 +        sig >>= 2;
 +        sum = e - sum;
 +        sig1 <<= 4;
 +        sig1 += sum;
-+        dprintf(3, "%d", sum);
++        dbprintf(3, "%d", sum);
 +        if(!i)
 +            break;
 +
@@ -24162,16 +29254,16 @@ new file mode 100644
 +        if(emin > sum)
 +            emin = sum;
 +        sig0 += sum;
-+        dprintf(3, "%d", sum);
++        dbprintf(3, "%d", sum);
 +    }
 +
-+    dprintf(3, " emin=%d sig=%03x/%03x", emin, sig1 & 0xfff, sig0 & 0xfff);
++    dbprintf(3, " emin=%d sig=%03x/%03x", emin, sig1 & 0xfff, sig0 & 0xfff);
 +
 +    emin = emin + (emin << 4) + (emin << 8);
 +    sig0 -= emin;
 +    sig1 += emin;
 +
-+    dprintf(3, "=%03x/%03x", sig1 & 0xfff, sig0 & 0xfff);
++    dbprintf(3, "=%03x/%03x", sig1 & 0xfff, sig0 & 0xfff);
 +    return((sig0 | sig1) & 0x888);
 +}
 +
@@ -24200,7 +29292,7 @@ new file mode 100644
 +            _zbar_decoder_buf_dump(dcode->buf, dcode->code93.character));
 +
 +    c = (g0 + g1) & 0x3f;
-+    dprintf(2, " g0=%x g1=%x c=%02x", g0, g1, c);
++    dbprintf(2, " g0=%x g1=%x c=%02x", g0, g1, c);
 +    return(c);
 +}
 +
@@ -24211,7 +29303,7 @@ new file mode 100644
 +    unsigned dir, qz, s = dcode->s6;
 +    int c;
 +
-+    dprintf(2, "      code93:");
++    dbprintf(2, "      code93:");
 +    c = encode6(dcode);
 +    if(c < 0 || (c != 0x00f && c != 0x0f0))
 +        return(ZBAR_NONE);
@@ -24226,7 +29318,7 @@ new file mode 100644
 +
 +    qz = get_width(dcode, 7);
 +    if(qz && qz < (s * 3) / 4) {
-+        dprintf(2, " [invalid qz %d]", qz);
++        dbprintf(2, " [invalid qz %d]", qz);
 +        return(ZBAR_NONE);
 +    }
 +
@@ -24236,7 +29328,7 @@ new file mode 100644
 +    dcode93->character = 0;
 +    dcode93->width = s;
 +
-+    dprintf(2, " dir=%x [valid start]", dir);
++    dbprintf(2, " dir=%x [valid start]", dir);
 +    return(ZBAR_PARTIAL);
 +}
 +
@@ -24249,7 +29341,7 @@ new file mode 100644
 +        release_lock(dcode, ZBAR_CODE93);
 +    dcode93->character = -1;
 +    if(reason)
-+        dprintf(1, " [%s]\n", reason);
++        dbprintf(1, " [%s]\n", reason);
 +    return(ZBAR_NONE);
 +}
 +
@@ -24315,14 +29407,14 @@ new file mode 100644
 +    }
 +
 +    d = dcode->buf[(dcode93->direction) ? 1 : n - 2];
-+    dprintf(2, " C=%02x?=%02x", d, sum_c);
++    dbprintf(2, " C=%02x?=%02x", d, sum_c);
 +    if(d != sum_c)
 +        return(1);
 +
 +    acc_k = plusmod47(acc_k, sum_c);
 +    sum_k = plusmod47(sum_k, acc_k);
 +    d = dcode->buf[(dcode93->direction) ? 0 : n - 1];
-+    dprintf(2, " K=%02x?=%02x", d, sum_k);
++    dbprintf(2, " K=%02x?=%02x", d, sum_k);
 +    if(d != sum_k)
 +        return(1);
 +
@@ -24339,11 +29431,11 @@ new file mode 100644
 +    static const unsigned char code93_s2[] =
 +        "\x1b\x1c\x1d\x1e\x1f;<=>?[\\]^_{|}~\x7f\x00\x40`\x7f\x7f\x7f";
 +
-+    dprintf(2, "\n    postproc len=%d", n);
++    dbprintf(2, "\n    postproc len=%d", n);
 +    dcode->direction = 1 - 2 * dcode93->direction;
 +    if(dcode93->direction) {
 +        /* reverse buffer */
-+        dprintf(2, " (rev)");
++        dbprintf(2, " (rev)");
 +        for(i = 0; i < n / 2; i++) {
 +            unsigned j = n - 1 - i;
 +            unsigned char d = dcode->buf[i];
@@ -24381,6 +29473,9 @@ new file mode 100644
 +        dcode->buf[j++] = d;
 +    }
 +
++    zassert(j < dcode->buf_alloc, 1,
++            "j=%02x %s\n", j,
++            _zbar_decoder_buf_dump(dcode->buf, dcode->code93.character));
 +    dcode->buflen = j;
 +    dcode->buf[j] = '\0';
 +    dcode->modifiers = 0;
@@ -24398,7 +29493,7 @@ new file mode 100644
 +        if(get_color(dcode) != ZBAR_BAR)
 +            return(ZBAR_NONE);
 +        sym = decode_start(dcode);
-+        dprintf(2, "\n");
++        dbprintf(2, "\n");
 +        return(sym);
 +    }
 +
@@ -24410,9 +29505,9 @@ new file mode 100644
 +
 +    dcode93->element = 0;
 +
-+    dprintf(2, "      code93[%c%02d+%x]:",
-+            (dcode93->direction) ? '<' : '>',
-+            dcode93->character, dcode93->element);
++    dbprintf(2, "      code93[%c%02d+%x]:",
++             (dcode93->direction) ? '<' : '>',
++             dcode93->character, dcode93->element);
 +
 +    if(check_width(dcode->s6, dcode93->width))
 +        return(decode_abort(dcode, "width var"));
@@ -24429,16 +29524,15 @@ new file mode 100644
 +        if(postprocess(dcode))
 +            return(decode_abort(dcode, "invalid encoding"));
 +
-+        dprintf(2, " [valid end]\n");
-+        dprintf(3, "    %s\n",
-+                _zbar_decoder_buf_dump(dcode->buf, dcode93->character));
++        dbprintf(2, " [valid end]\n");
++        dbprintf(3, "    %s\n",
++                 _zbar_decoder_buf_dump(dcode->buf, dcode93->character));
 +
 +        dcode93->character = -1;
 +        return(ZBAR_CODE93);
 +    }
 +
-+    if(dcode93->character >= BUFFER_MIN &&
-+       size_buf(dcode, dcode93->character + 1))
++    if(size_buf(dcode, dcode93->character + 1))
 +        return(decode_abort(dcode, "overflow"));
 +
 +    dcode93->width = dcode->s6;
@@ -24456,13 +29550,12 @@ new file mode 100644
 +        dcode->buf[dcode93->character] = c;
 +    dcode93->character++;
 +
-+    dprintf(2, "\n");
++    dbprintf(2, "\n");
 +    return(ZBAR_NONE);
 +}
-diff --git a/zbar/decoder/code93.h b/zbar/decoder/code93.h
-new file mode 100644
---- /dev/null
-+++ b/zbar/decoder/code93.h
+diff -r 563557a923d0 zbar/decoder/code93.h
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/zbar/decoder/code93.h	Fri Feb 22 08:54:29 2013 -0300
 @@ -0,0 +1,49 @@
 +/*------------------------------------------------------------------------
 + *  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
@@ -24513,11 +29606,10 @@ new file mode 100644
 +zbar_symbol_type_t _zbar_decode_code93(zbar_decoder_t *dcode);
 +
 +#endif
-diff --git a/zbar/decoder/databar.c b/zbar/decoder/databar.c
-new file mode 100644
---- /dev/null
-+++ b/zbar/decoder/databar.c
-@@ -0,0 +1,1277 @@
+diff -r 563557a923d0 zbar/decoder/databar.c
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/zbar/decoder/databar.c	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,1280 @@
 +/*------------------------------------------------------------------------
 + *  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
 + *
@@ -24646,7 +29738,7 @@ new file mode 100644
 +        d = (d << 12) | (*(data++) & 0xfff); \
 +        i += 12;                             \
 +        len--;                               \
-+        dprintf(2, " %03lx", d & 0xfff);     \
++        dbprintf(2, " %03lx", d & 0xfff);     \
 +    }
 +
 +#define PUSH_CHAR(c) \
@@ -24671,7 +29763,7 @@ new file mode 100644
 +
 +    /* grok encodation method */
 +    d = *(data++);
-+    dprintf(2, "\n    len=%d %03lx", len, d & 0xfff);
++    dbprintf(2, "\n    len=%d %03lx", len, d & 0xfff);
 +    n = (d >> 4) & 0x7f;
 +    if(n >= 0x40) {
 +        i = 10;
@@ -24698,7 +29790,7 @@ new file mode 100644
 +        enc = 0;
 +        buflen = VAR_MAX(len, 9 - 2) + 2;
 +    }
-+    dprintf(2, " buflen=%d enc=%d", buflen, enc);
++    dbprintf(2, " buflen=%d enc=%d", buflen, enc);
 +    zassert(buflen > 2, -1, "buflen=%d\n", buflen);
 +
 +    if(enc < 4) {
@@ -24711,7 +29803,7 @@ new file mode 100644
 +            return(-1);
 +    }
 +    len -= 2;
-+    dprintf(2, " [%d+%d]", i, len);
++    dbprintf(2, " [%d+%d]", i, len);
 +
 +    if(size_buf(dcode, buflen))
 +        return(-1);
@@ -24783,7 +29875,7 @@ new file mode 100644
 +        FEED_BITS(15);
 +        i -= 15;
 +        n = (d >> i) & 0x7fff;
-+        dprintf(2, " v=%d", n);
++        dbprintf(2, " v=%d", n);
 +        PUSH_CHAR4('3', '2', '0', (n >= 10000) ? '3' : '2' );
 +        if(n >= 10000)
 +            n -= 10000;
@@ -24797,7 +29889,7 @@ new file mode 100644
 +        FEED_BITS(20);
 +        i -= 20;
 +        n = (d >> i) & 0xfffff;
-+        dprintf(2, " [%d+%d] %d", i, len, n);
++        dbprintf(2, " [%d+%d] %d", i, len, n);
 +        if(n >= 1000000)
 +            return(-1);
 +        decode10(buf, n, 6);
@@ -24816,7 +29908,7 @@ new file mode 100644
 +            n /= 12;
 +            yy = n;
 +            PUSH_CHAR('1');
-+            PUSH_CHAR('0' + (enc - 6) | 1);
++            PUSH_CHAR('0' + ((enc - 6) | 1));
 +            decode10(buf, yy, 2);
 +            buf += 2;
 +            decode10(buf, mm, 2);
@@ -24833,7 +29925,7 @@ new file mode 100644
 +        int scheme = SCH_NUM;
 +        while(i > 0 || len > 0) {
 +            FEED_BITS(8);
-+            dprintf(2, " [%d+%d]", i, len);
++            dbprintf(2, " [%d+%d]", i, len);
 +
 +            if(scheme == SCH_NUM) {
 +                int n1;
@@ -24842,7 +29934,7 @@ new file mode 100644
 +                    break;
 +                if(!((d >> i) & 0xf)) {
 +                    scheme = SCH_ALNUM;
-+                    dprintf(2, ">A");
++                    dbprintf(2, ">A");
 +                    continue;
 +                }
 +                if(!len && i < 3) {
@@ -24858,7 +29950,7 @@ new file mode 100644
 +                n = ((d >> i) & 0x7f) - 8;
 +                n1 = n % 11;
 +                n = n / 11;
-+                dprintf(2, "N%d%d", n, n1);
++                dbprintf(2, "N%d%d", n, n1);
 +                *(buf++) = (n < 10) ? '0' + n : GS;
 +                *(buf++) = (n1 < 10) ? '0' + n1 : GS;
 +            }
@@ -24877,7 +29969,7 @@ new file mode 100644
 +                n = (d >> i) & 0x1f;
 +                if(n == 0x04) {
 +                    scheme ^= 0x3;
-+                    dprintf(2, ">%d", scheme);
++                    dbprintf(2, ">%d", scheme);
 +                }
 +                else if(n == 0x0f)
 +                    c = GS;
@@ -24914,7 +30006,7 @@ new file mode 100644
 +                    if(i < 0)
 +                        return(-1);
 +                    n = ((d >> i) & 0x1f);
-+                    dprintf(2, "(%02x)", n);
++                    dbprintf(2, "(%02x)", n);
 +                    if(n < 0xa)
 +                        c = '!' + n - 8;
 +                    else if(n < 0x15)
@@ -24932,7 +30024,7 @@ new file mode 100644
 +                    return(-1);
 +
 +                if(c) {
-+                    dprintf(2, "%d%c", scheme, c);
++                    dbprintf(2, "%d%c", scheme, c);
 +                    *(buf++) = c;
 +                }
 +            }
@@ -24940,15 +30032,18 @@ new file mode 100644
 +        /* FIXME check pad? */
 +    }
 +
-+    *buf = 0;
 +    i = buf - dcode->buf;
++    zassert(i < dcode->buf_alloc, -1, "i=%02x %s\n", i,
++            _zbar_decoder_buf_dump(dcode->buf, i));
++
++    *buf = 0;
 +    dcode->buflen = i;
 +    if(i && *--buf == GS) {
 +        *buf = 0;
 +        dcode->buflen--;
 +    }
 +
-+    dprintf(2, "\n    %s", _zbar_decoder_buf_dump(dcode->buf, dcode->buflen));
++    dbprintf(2, "\n    %s", _zbar_decoder_buf_dump(dcode->buf, dcode->buflen));
 +    return(0);
 +}
 +#undef FEED_BITS
@@ -24970,7 +30065,7 @@ new file mode 100644
 +    *--buf = '\0';
 +    *--buf = '\0';
 +
-+    dprintf(2, "\n    d={%d,%d,%d,%d}", d[0], d[1], d[2], d[3]);
++    dbprintf(2, "\n    d={%d,%d,%d,%d}", d[0], d[1], d[2], d[3]);
 +    unsigned long r = d[0] * 1597 + d[1];
 +    d[1] = r / 10000;
 +    r %= 10000;
@@ -24979,7 +30074,7 @@ new file mode 100644
 +    r %= 10000;
 +    r = r * 1597 + d[3];
 +    d[3] = r / 10000;
-+    dprintf(2, " r=%ld", r);
++    dbprintf(2, " r=%ld", r);
 +
 +    for(i = 4; --i >= 0; ) {
 +        c = r % 10;
@@ -24991,13 +30086,13 @@ new file mode 100644
 +            r /= 10;
 +    }
 +
-+    dprintf(2, " d={%d,%d,%d}", d[1], d[2], d[3]);
++    dbprintf(2, " d={%d,%d,%d}", d[1], d[2], d[3]);
 +    r = d[1] * 2841 + d[2];
 +    d[2] = r / 10000;
 +    r %= 10000;
 +    r = r * 1597 + d[3];
 +    d[3] = r / 10000;
-+    dprintf(2, " r=%ld", r);
++    dbprintf(2, " r=%ld", r);
 +
 +    for(i = 4; --i >= 0; ) {
 +        c = r % 10;
@@ -25010,7 +30105,7 @@ new file mode 100644
 +    }
 +
 +    r = d[2] * 1597 + d[3];
-+    dprintf(2, " d={%d,%d} r=%ld", d[2], d[3], r);
++    dbprintf(2, " d={%d,%d} r=%ld", d[2], d[3], r);
 +
 +    for(i = 5; --i >= 0; ) {
 +        c = r % 10;
@@ -25033,7 +30128,7 @@ new file mode 100644
 +    else
 +        dcode->buflen = buf - dcode->buf + 13;
 +
-+    dprintf(2, "\n    %s", _zbar_decoder_buf_dump(dcode->buf, 16));
++    dbprintf(2, "\n    %s", _zbar_decoder_buf_dump(dcode->buf, 16));
 +}
 +
 +static inline int
@@ -25067,8 +30162,8 @@ new file mode 100644
 +            seg->partial &= s->partial;
 +            seg->width = (3 * seg->width + s->width + 2) / 4;
 +            s->finder = -1;
-+            dprintf(2, " dup@%d(%d,%d)",
-+                    i, cnt, (db->epoch - seg->epoch) & 0xff);
++            dbprintf(2, " dup@%d(%d,%d)",
++                     i, cnt, (db->epoch - seg->epoch) & 0xff);
 +        }
 +        else if(s->finder >= 0) {
 +            unsigned age = (db->epoch - s->epoch) & 0xff;
@@ -25107,9 +30202,9 @@ new file mode 100644
 +               (s1->partial && s1->count < 4) ||
 +               !check_width(seg->width, s1->width, 14))
 +                continue;
-+            dprintf(2, "\n\t[%d,%d] f=%d(0%xx)/%d(%x%x%x)",
-+                    i0, i1, seg->finder, seg->color,
-+                    s1->finder, s1->exp, s1->color, s1->side);
++            dbprintf(2, "\n\t[%d,%d] f=%d(0%xx)/%d(%x%x%x)",
++                     i0, i1, seg->finder, seg->color,
++                     s1->finder, s1->exp, s1->color, s1->side);
 +
 +            if(seg->color)
 +                chkf = seg->finder + s1->finder * 9;
@@ -25127,9 +30222,9 @@ new file mode 100644
 +            else
 +                chk = 79 + chkf - chks;
 +
-+            dprintf(2, " chk=(%d,%d) => %d", chkf, chks, chk);
-+            age1 = ((db->epoch - s0->epoch) & 0xff +
-+                    (db->epoch - s1->epoch) & 0xff);
++            dbprintf(2, " chk=(%d,%d) => %d", chkf, chks, chk);
++            age1 = (((db->epoch - s0->epoch) & 0xff) +
++                    ((db->epoch - s1->epoch) & 0xff));
 +
 +            for(i2 = i1 + 1; i2 < csegs; i2++) {
 +                databar_segment_t *s2 = db->segs + i2;
@@ -25143,7 +30238,7 @@ new file mode 100644
 +                age2 = (db->epoch - s2->epoch) & 0xff;
 +                age = age1 + age2;
 +                cnt = s0->count + s1->count + s2->count;
-+                dprintf(2, " [%d] MATCH cnt=%d age=%d", i2, cnt, age);
++                dbprintf(2, " [%d] MATCH cnt=%d age=%d", i2, cnt, age);
 +                if(maxcnt < cnt ||
 +                   (maxcnt == cnt && maxage > age)) {
 +                    maxcnt = cnt;
@@ -25190,7 +30285,7 @@ new file mode 100644
 +    i = (n + 1) / 2 + 1;
 +    n += 4;
 +    i = (i * i) / 4;
-+    dprintf(2, " {%d,%d:", i, n);
++    dbprintf(2, " {%d,%d:", i, n);
 +    p = exp_sequences + i;
 +
 +    fixed >>= 1;
@@ -25207,11 +30302,11 @@ new file mode 100644
 +        if(s == fixed)
 +            fixed = -1;
 +        s <<= 1;
-+        dprintf(2, "%x", s);
++        dbprintf(2, "%x", s);
 +        seq[i++] = s++;
 +        seq[i++] = s;
 +    }
-+    dprintf(2, "}");
++    dbprintf(2, "}");
 +    seq[n] = -1;
 +    return(fixed < 1);
 +}
@@ -25233,27 +30328,27 @@ new file mode 100644
 +    bestsegs[0] = segs[0] = seq[1] = -1;
 +    seq[0] = 0;
 +
-+    dprintf(2, "\n    fixed=%d@%d: ", fixed, ifixed);
++    dbprintf(2, "\n    fixed=%d@%d: ", fixed, ifixed);
 +    for(i = csegs, seg = db->segs + csegs - 1; --i >= 0; seg--) {
 +        if(seg->exp && seg->finder >= 0 &&
 +           (!seg->partial || seg->count >= 4))
 +            iseg[i] = IDX(seg);
 +        else
 +            iseg[i] = -1;
-+        dprintf(2, " %d", iseg[i]);
++        dbprintf(2, " %d", iseg[i]);
 +    }
 +
 +    for(i = 0; ; i--) {
 +        if(!i)
-+            dprintf(2, "\n   ");
++            dbprintf(2, "\n   ");
 +        for(; i >= 0 && seq[i] >= 0; i--) {
 +            int j;
-+            dprintf(2, " [%d]%d", i, seq[i]);
++            dbprintf(2, " [%d]%d", i, seq[i]);
 +
 +            if(seq[i] == fixed) {
 +                seg = db->segs + ifixed;
 +                if(segs[i] < 0 && check_width(width, seg->width, 14)) {
-+                    dprintf(2, "*");
++                    dbprintf(2, "*");
 +                    j = ifixed;
 +                }
 +                else
@@ -25273,16 +30368,16 @@ new file mode 100644
 +
 +            if(!i) {
 +                if(!lookup_sequence(seg, fixed, seq)) {
-+                    dprintf(2, "[nf]");
++                    dbprintf(2, "[nf]");
 +                    continue;
 +                }
 +                width = seg->width;
-+                dprintf(2, " A00@%d", j);
++                dbprintf(2, " A00@%d", j);
 +            }
 +            else {
 +                width = (width + seg->width) / 2;
-+                dprintf(2, " %c%x%x@%d",
-+                        'A' + seg->finder, seg->color, seg->side, j);
++                dbprintf(2, " %c%x%x@%d",
++                         'A' + seg->finder, seg->color, seg->side, j);
 +            }
 +            segs[i++] = j;
 +            segs[i++] = -1;
@@ -25303,15 +30398,15 @@ new file mode 100644
 +        unsigned chk0 = data0 % 211;
 +        chk %= 211;
 +
-+        dprintf(2, " chk=%d ?= %d", chk, chk0);
++        dbprintf(2, " chk=%d ?= %d", chk, chk0);
 +        if(chk != chk0)
 +            continue;
 +
-+        dprintf(2, " cnt=%d age=%d", cnt, age);
++        dbprintf(2, " cnt=%d age=%d", cnt, age);
 +        if(maxcnt > cnt || (maxcnt == cnt && maxage <= age))
 +            continue;
 +
-+        dprintf(2, " !");
++        dbprintf(2, " !");
 +        maxcnt = cnt;
 +        maxage = age;
 +        for(i = 0; segs[i] >= 0; i++)
@@ -25364,7 +30459,7 @@ new file mode 100644
 +        if(!(i & 1))
 +            chk %= mod;
 +    }
-+    dprintf(2, " chk=%d", chk);
++    dbprintf(2, " chk=%d", chk);
 +
 +    if(side)
 +        chk = (chk * (6561 % mod)) % mod;
@@ -25478,8 +30573,8 @@ new file mode 100644
 +        n = 16;
 +    emin[1] = -n;
 +
-+    dprintf(2, "\n        char[%c%d]: n=%d s=%d w=%d sig=",
-+            (dir < 0) ? '>' : '<', off, n, s, seg->width);
++    dbprintf(2, "\n        char[%c%d]: n=%d s=%d w=%d sig=",
++             (dir < 0) ? '>' : '<', off, n, s, seg->width);
 +    if(s < 13 || !check_width(seg->width, s, n))
 +        return(ZBAR_NONE);
 +
@@ -25487,7 +30582,7 @@ new file mode 100644
 +        int e = decode_e(pair_width(dcode, off), s, n);
 +        if(e < 0)
 +            return(ZBAR_NONE);
-+        dprintf(2, "%d", e);
++        dbprintf(2, "%d", e);
 +        sum = e - sum;
 +        off += dir;
 +        sig1 <<= 4;
@@ -25500,7 +30595,7 @@ new file mode 100644
 +        e = decode_e(pair_width(dcode, off), s, n);
 +        if(e < 0)
 +            return(ZBAR_NONE);
-+        dprintf(2, "%d", e);
++        dbprintf(2, "%d", e);
 +        sum = e - sum;
 +        off += dir;
 +        sig0 <<= 4;
@@ -25516,7 +30611,7 @@ new file mode 100644
 +    sig0 -= diff;
 +    sig1 += diff;
 +
-+    dprintf(2, " emin=%d,%d el=%04x/%04x", emin[0], emin[1], sig0, sig1);
++    dbprintf(2, " emin=%d,%d el=%04x/%04x", emin[0], emin[1], sig0, sig1);
 +
 +    unsigned sum0 = sig0 + (sig0 >> 8);
 +    unsigned sum1 = sig1 + (sig1 >> 8);
@@ -25525,15 +30620,15 @@ new file mode 100644
 +    sum0 &= 0xf;
 +    sum1 &= 0xf;
 +
-+    dprintf(2, " sum=%d/%d", sum0, sum1);
++    dbprintf(2, " sum=%d/%d", sum0, sum1);
 +
 +    if(sum0 + sum1 + 8 != n) {
-+        dprintf(2, " [SUM]");
++        dbprintf(2, " [SUM]");
 +        return(ZBAR_NONE);
 +    }
 +
 +    if(((sum0 ^ (n >> 1)) | (sum1 ^ (n >> 1) ^ n)) & 1) {
-+        dprintf(2, " [ODD]");
++        dbprintf(2, " [ODD]");
 +        return(ZBAR_NONE);
 +    }
 +
@@ -25542,16 +30637,16 @@ new file mode 100644
 +            "n=%d sum=%d/%d sig=%04x/%04x g=%d",
 +            n, sum0, sum1, sig0, sig1, i);
 +    struct group_s *g = groups + i;
-+    dprintf(2, "\n            g=%d(%d,%d,%d/%d)",
-+            i, g->sum, g->wmax, g->todd, g->teven);
++    dbprintf(2, "\n            g=%d(%d,%d,%d/%d)",
++             i, g->sum, g->wmax, g->todd, g->teven);
 +
 +    int vodd = calc_value4(sig0 + 0x1111, sum0 + 4, g->wmax, ~n & 1);
-+    dprintf(2, " v=%d", vodd);
++    dbprintf(2, " v=%d", vodd);
 +    if(vodd < 0 || vodd > g->todd)
 +        return(ZBAR_NONE);
 +
 +    int veven = calc_value4(sig1 + 0x1111, sum1 + 4, 9 - g->wmax, n & 1);
-+    dprintf(2, "/%d", veven);
++    dbprintf(2, "/%d", veven);
 +    if(veven < 0 || veven > g->teven)
 +        return(ZBAR_NONE);
 +
@@ -25561,7 +30656,7 @@ new file mode 100644
 +    else
 +        v += veven + vodd * g->teven;
 +
-+    dprintf(2, " f=%d(%x%x%x)", seg->finder, seg->exp, seg->color, seg->side);
++    dbprintf(2, " f=%d(%x%x%x)", seg->finder, seg->exp, seg->color, seg->side);
 +
 +    unsigned chk = 0;
 +    if(seg->exp) {
@@ -25587,7 +30682,7 @@ new file mode 100644
 +        if(seg->color)
 +            chk = (chk * 16) % 79;
 +    }
-+    dprintf(2, " => %d val=%d", chk, v);
++    dbprintf(2, " => %d val=%d", chk, v);
 +
 +    seg->check = chk;
 +    seg->data = v;
@@ -25610,14 +30705,14 @@ new file mode 100644
 +        databar_segment_t *seg = db->segs + i;
 +        unsigned age;
 +        if(seg->finder < 0) {
-+            dprintf(2, " free@%d", i);
++            dbprintf(2, " free@%d", i);
 +            return(i);
 +        }
 +        age = (db->epoch - seg->epoch) & 0xff;
 +        if(age >= 128 && seg->count < 2) {
 +            seg->finder = -1;
-+            dprintf(2, " stale@%d (%d - %d = %d)",
-+                    i, db->epoch, seg->epoch, age);
++            dbprintf(2, " stale@%d (%d - %d = %d)",
++                     i, db->epoch, seg->epoch, age);
 +            return(i);
 +        }
 +
@@ -25630,12 +30725,12 @@ new file mode 100644
 +        if(maxage < age) {
 +            maxage = age;
 +            old = i;
-+            dprintf(2, " old@%d(%u)", i, age);
++            dbprintf(2, " old@%d(%u)", i, age);
 +        }
 +    }
 +
 +    if(csegs < DATABAR_MAX_SEGMENTS) {
-+        dprintf(2, " new@%d", i);
++        dbprintf(2, " new@%d", i);
 +        i = csegs;
 +        csegs *= 2;
 +        if(csegs > DATABAR_MAX_SEGMENTS)
@@ -25673,7 +30768,7 @@ new file mode 100644
 +    unsigned e2 = pair_width(dcode, 3);
 +    unsigned e1, e3, s, finder, dir;
 +    int sig, iseg;
-+    dprintf(2, "      databar: e0=%d e2=%d", e0, e2);
++    dbprintf(2, "      databar: e0=%d e2=%d", e0, e2);
 +    if(e0 < e2) {
 +        unsigned e = e2 * 4;
 +        if(e < 15 * e0 || e > 34 * e0)
@@ -25692,13 +30787,13 @@ new file mode 100644
 +    e1 = pair_width(dcode, 2);
 +
 +    s = e1 + e3;
-+    dprintf(2, " e1=%d e3=%d dir=%d s=%d", e1, e3, dir, s);
++    dbprintf(2, " e1=%d e3=%d dir=%d s=%d", e1, e3, dir, s);
 +    if(s < 12)
 +        return(ZBAR_NONE);
 +
 +    sig = ((decode_e(e3, s, 14) << 8) | (decode_e(e2, s, 14) << 4) |
 +           decode_e(e1, s, 14));
-+    dprintf(2, " sig=%04x", sig & 0xfff);
++    dbprintf(2, " sig=%04x", sig & 0xfff);
 +    if(sig < 0 ||
 +       ((sig >> 4) & 0xf) < 8 ||
 +       ((sig >> 4) & 0xf) > 10 ||
@@ -25709,7 +30804,7 @@ new file mode 100644
 +
 +    finder = (finder_hash[(sig - (sig >> 5)) & 0x1f] +
 +              finder_hash[(sig >> 1) & 0x1f]) & 0x1f;
-+    dprintf(2, " finder=%d", finder);
++    dbprintf(2, " finder=%d", finder);
 +    if(finder == 0x1f ||
 +       !TEST_CFG((finder < 9) ? db->config : db->config_exp, ZBAR_CFG_ENABLE))
 +        return(ZBAR_NONE);
@@ -25752,7 +30847,7 @@ new file mode 100644
 +    int iseg, i = dcode->idx & 0xf;
 +
 +    sym = decode_finder(dcode);
-+    dprintf(2, "\n");
++    dbprintf(2, "\n");
 +
 +    iseg = db->chars[i];
 +    if(iseg < 0)
@@ -25760,8 +30855,8 @@ new file mode 100644
 +
 +    db->chars[i] = -1;
 +    seg = db->segs + iseg;
-+    dprintf(2, "        databar: i=%d part=%d f=%d(%x%x%x)",
-+            iseg, seg->partial, seg->finder, seg->exp, seg->color, seg->side);
++    dbprintf(2, "        databar: i=%d part=%d f=%d(%x%x%x)",
++             iseg, seg->partial, seg->finder, seg->exp, seg->color, seg->side);
 +    zassert(seg->finder >= 0, ZBAR_NONE, "i=%d f=%d(%x%x%x) part=%x\n",
 +            iseg, seg->finder, seg->exp, seg->color, seg->side, seg->partial);
 +
@@ -25791,14 +30886,13 @@ new file mode 100644
 +    }
 +    else
 +        db->epoch++;
-+    dprintf(2, "\n");
++    dbprintf(2, "\n");
 +
 +    return(sym);
 +}
-diff --git a/zbar/decoder/databar.h b/zbar/decoder/databar.h
-new file mode 100644
---- /dev/null
-+++ b/zbar/decoder/databar.h
+diff -r 563557a923d0 zbar/decoder/databar.h
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/zbar/decoder/databar.h	Fri Feb 22 08:54:29 2013 -0300
 @@ -0,0 +1,80 @@
 +/*------------------------------------------------------------------------
 + *  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
@@ -25880,9 +30974,9 @@ new file mode 100644
 +zbar_symbol_type_t _zbar_decode_databar(zbar_decoder_t *dcode);
 +
 +#endif
-diff --git a/zbar/decoder/ean.c b/zbar/decoder/ean.c
---- a/zbar/decoder/ean.c
-+++ b/zbar/decoder/ean.c
+diff -r 563557a923d0 zbar/decoder/ean.c
+--- a/zbar/decoder/ean.c	Tue Oct 27 11:25:59 2009 -0400
++++ b/zbar/decoder/ean.c	Fri Feb 22 08:54:29 2013 -0300
 @@ -1,5 +1,5 @@
  /*------------------------------------------------------------------------
 - *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
@@ -25904,7 +30998,7 @@ diff --git a/zbar/decoder/ean.c b/zbar/decoder/ean.c
  
  /* partial decode symbol location */
  typedef enum symbol_partial_e {
-@@ -109,25 +109,35 @@ static inline const unsigned char *dspri
+@@ -109,35 +109,45 @@
  }
  #endif
  
@@ -25931,19 +31025,34 @@ diff --git a/zbar/decoder/ean.c b/zbar/decoder/ean.c
      /* check quiet zone */
      unsigned qz = get_width(dcode, 0);
 -    if(!fwd && qz && qz < s * 3 / 4) {
+-        dprintf(2, " [invalid quiet]");
 +    if(!fwd && qz && qz <= s * 3 / 4) {
-         dprintf(2, " [invalid quiet]");
++        dbprintf(2, " [invalid quiet]");
          return(-1);
      }
  
-     dprintf(2, " (");
+-    dprintf(2, " (");
 -    signed char code = 0;
 -    unsigned char i;
++    dbprintf(2, " (");
 +    code = 0;
      for(i = 1 - fwd; i < 3 + fwd; i++) {
          unsigned e = get_width(dcode, i) + get_width(dcode, i + 1);
-         dprintf(2, " %d", e);
-@@ -147,27 +157,32 @@ static inline signed char aux_end (zbar_
+-        dprintf(2, " %d", e);
++        dbprintf(2, " %d", e);
+         code = (code << 2) | decode_e(e, s, 7);
+         if(code < 0) {
+-            dprintf(2, " [invalid end guard]");
++            dbprintf(2, " [invalid end guard]");
+             return(-1);
+         }
+     }
+-    dprintf(2, ") s=%d aux=%x", s, code);
++    dbprintf(2, ") s=%d aux=%x", s, code);
+     return(code);
+ }
+ 
+@@ -147,60 +157,79 @@
  static inline signed char aux_start (zbar_decoder_t *dcode)
  {
      /* FIXME NB add-on has no guard in reverse */
@@ -25952,9 +31061,12 @@ diff --git a/zbar/decoder/ean.c b/zbar/decoder/ean.c
 +    unsigned char E1;
 +    if(dcode->ean.s4 < 6)
 +        return(-1);
++
      if(decode_e(e2, dcode->ean.s4, 7)) {
-         dprintf(2, " [invalid any]");
-         return(/*FIXME (get_color(dcode) == ZBAR_SPACE) ? STATE_ADDON : */-1);
+-        dprintf(2, " [invalid any]");
+-        return(/*FIXME (get_color(dcode) == ZBAR_SPACE) ? STATE_ADDON : */-1);
++        dbprintf(2, " [invalid any]");
++        return(-1);
      }
  
 -    unsigned e1 = get_width(dcode, 4) + get_width(dcode, 5);
@@ -25968,30 +31080,47 @@ diff --git a/zbar/decoder/ean.c b/zbar/decoder/ean.c
 -        if(!qz || qz >= dcode->ean.s4 * 3 / 4) {
 +        if(!qz || qz > dcode->ean.s4 * 3 / 4) {
              if(!E1) {
-                 dprintf(2, " [valid normal]");
+-                dprintf(2, " [valid normal]");
++                dbprintf(2, " [valid normal]");
                  return(0); /* normal symbol start */
              }
-+#if 0
              else if(E1 == 1) {
-                 dprintf(2, " [valid add-on]");
+-                dprintf(2, " [valid add-on]");
++                dbprintf(2, " [valid add-on]");
                  return(STATE_ADDON); /* add-on symbol start */
              }
-+#endif
          }
-         dprintf(2, " [invalid start]");
+-        dprintf(2, " [invalid start]");
++        dbprintf(2, " [invalid start]");
          return(-1);
-@@ -176,7 +191,9 @@ static inline signed char aux_start (zba
+     }
+ 
      if(!E1) {
          /* attempting decode from SPACE => validate center guard */
          unsigned e3 = get_width(dcode, 6) + get_width(dcode, 7);
 -        if(!decode_e(e3, dcode->ean.s4, 7)) {
+-            dprintf(2, " [valid center]");
 +        unsigned e4 = get_width(dcode, 7) + get_width(dcode, 8);
 +        if(!decode_e(e3, dcode->ean.s4, 7) &&
 +           !decode_e(e4, dcode->ean.s4, 7)) {
-             dprintf(2, " [valid center]");
++            dbprintf(2, " [valid center]");
              return(0); /* start after center guard */
          }
-@@ -188,6 +205,8 @@ static inline signed char aux_start (zba
+     }
+-    dprintf(2, " [invalid center]");
+-    return(/*STATE_ADDON*/-1);
++    dbprintf(2, " [invalid center]");
++    return(-1);
++}
++
++/* check addon delimiter using current 4 as character
++ */
++static inline signed char aux_mid (zbar_decoder_t *dcode)
++{
++    unsigned e = get_width(dcode, 4) + get_width(dcode, 5);
++    return(decode_e(e, dcode->ean.s4, 7));
+ }
+ 
  /* attempt to decode previous 4 widths (2 bars and 2 spaces) as a character */
  static inline signed char decode4 (zbar_decoder_t *dcode)
  {
@@ -26000,13 +31129,14 @@ diff --git a/zbar/decoder/ean.c b/zbar/decoder/ean.c
      /* calculate similar edge measurements */
      unsigned e1 = ((get_color(dcode) == ZBAR_BAR)
                     ? get_width(dcode, 0) + get_width(dcode, 1)
-@@ -195,9 +214,12 @@ static inline signed char decode4 (zbar_
+                    : get_width(dcode, 2) + get_width(dcode, 3));
      unsigned e2 = get_width(dcode, 1) + get_width(dcode, 2);
-     dprintf(2, "\n        e1=%d e2=%d", e1, e2);
- 
+-    dprintf(2, "\n        e1=%d e2=%d", e1, e2);
++    dbprintf(2, "\n        e1=%d e2=%d", e1, e2);
++
 +    if(dcode->ean.s4 < 6)
 +        return(-1);
-+
+ 
      /* create compacted encoding for direct lookup */
 -    signed char code = ((decode_e(e1, dcode->ean.s4, 7) << 2) |
 -                        decode_e(e2, dcode->ean.s4, 7));
@@ -26014,8 +31144,12 @@ diff --git a/zbar/decoder/ean.c b/zbar/decoder/ean.c
 +             decode_e(e2, dcode->ean.s4, 7));
      if(code < 0)
          return(-1);
-     dprintf(2, " code=%x", code);
-@@ -209,15 +231,16 @@ static inline signed char decode4 (zbar_
+-    dprintf(2, " code=%x", code);
++    dbprintf(2, " code=%x", code);
+ 
+     /* 4 combinations require additional determinant (D2)
+        E1E2 == 34 (0110)
+@@ -209,25 +238,48 @@
         E1E2 == 44 (1010)
       */
      if((1 << code) & 0x0660) {
@@ -26033,8 +31167,51 @@ diff --git a/zbar/decoder/ean.c b/zbar/decoder/ean.c
 +        alt = d2 > (mid * dcode->ean.s4);
          if(alt)
              code = ((code >> 1) & 3) | 0x10; /* compress code space */
-         dprintf(2, " (d2=%d(%d) alt=%d)", d2, mid * dcode->ean.s4, alt);
-@@ -245,6 +268,7 @@ static inline zbar_symbol_type_t ean_par
+-        dprintf(2, " (d2=%d(%d) alt=%d)", d2, mid * dcode->ean.s4, alt);
++        dbprintf(2, " (d2=%d(%d) alt=%d)", d2, mid * dcode->ean.s4, alt);
+     }
+-    dprintf(2, " char=%02x", digits[(unsigned char)code]);
++    dbprintf(2, " char=%02x", digits[(unsigned char)code]);
+     zassert(code < 0x14, -1, "code=%02x e1=%x e2=%x s4=%x color=%x\n",
+             code, e1, e2, dcode->ean.s4, get_color(dcode));
+     return(code);
+ }
+ 
++static inline char ean_part_end2 (ean_decoder_t *ean,
++                                  ean_pass_t *pass)
++{
++    if(!TEST_CFG(ean->ean2_config, ZBAR_CFG_ENABLE))
++        return(ZBAR_NONE);
++
++    /* extract parity bits */
++    unsigned char par = ((pass->raw[1] & 0x10) >> 3 |
++                         (pass->raw[2] & 0x10) >> 4);
++    /* calculate "checksum" */
++    unsigned char chk = ~((pass->raw[1] & 0xf) * 10 +
++                          (pass->raw[2] & 0xf)) & 0x3;
++    dbprintf(2, " par=%x chk=%x", par, chk);
++    if(par != chk)
++        return(ZBAR_NONE);
++
++    dbprintf(2, "\n");
++    dbprintf(1, "decode2=%x%x\n",
++             pass->raw[1] & 0xf, pass->raw[2] & 0xf);
++    return(ZBAR_EAN2);
++}
++
+ static inline zbar_symbol_type_t ean_part_end4 (ean_pass_t *pass,
+                                                 unsigned char fwd)
+ {
+@@ -237,7 +289,7 @@
+                          (pass->raw[3] & 0x10) >> 3 |
+                          (pass->raw[4] & 0x10) >> 4);
+ 
+-    dprintf(2, " par=%x", par);
++    dbprintf(2, " par=%x", par);
+     if(par && par != 0xf)
+         /* invalid parity combination */
+         return(ZBAR_NONE);
+@@ -245,6 +297,7 @@
      if(!par == fwd) {
          /* reverse sampled digits */
          unsigned char tmp = pass->raw[1];
@@ -26042,7 +31219,71 @@ diff --git a/zbar/decoder/ean.c b/zbar/decoder/ean.c
          pass->raw[1] = pass->raw[4];
          pass->raw[4] = tmp;
          tmp = pass->raw[2];
-@@ -292,8 +316,9 @@ static inline zbar_symbol_type_t ean_par
+@@ -252,15 +305,51 @@
+         pass->raw[3] = tmp;
+     }
+ 
+-    dprintf(2, "\n");
+-    dprintf(1, "decode4=%x%x%x%x\n",
+-            pass->raw[1] & 0xf, pass->raw[2] & 0xf,
+-            pass->raw[3] & 0xf, pass->raw[4] & 0xf);
++    dbprintf(2, "\n");
++    dbprintf(1, "decode4=%x%x%x%x\n",
++             pass->raw[1] & 0xf, pass->raw[2] & 0xf,
++             pass->raw[3] & 0xf, pass->raw[4] & 0xf);
+     if(!par)
+         return(ZBAR_EAN8 | EAN_RIGHT);
+     return(ZBAR_EAN8 | EAN_LEFT);
+ }
+ 
++static inline char ean_part_end5 (ean_decoder_t *ean,
++                                  ean_pass_t *pass)
++{
++    if(!TEST_CFG(ean->ean5_config, ZBAR_CFG_ENABLE))
++        return(ZBAR_NONE);
++
++    /* extract parity bits */
++    unsigned char par = ((pass->raw[1] & 0x10) |
++                         (pass->raw[2] & 0x10) >> 1 |
++                         (pass->raw[3] & 0x10) >> 2 |
++                         (pass->raw[4] & 0x10) >> 3 |
++                         (pass->raw[5] & 0x10) >> 4);
++    /* calculate checksum */
++    unsigned char chk = (((pass->raw[1] & 0x0f) +
++                          (pass->raw[2] & 0x0f) * 3 +
++                          (pass->raw[3] & 0x0f) +
++                          (pass->raw[4] & 0x0f) * 3 +
++                          (pass->raw[5] & 0x0f)) * 3) % 10;
++
++    unsigned char parchk = parity_decode[par >> 1];
++    if(par & 1)
++        parchk >>= 4;
++    parchk &= 0xf;
++    dbprintf(2, " par=%x(%d) chk=%d", par, parchk, chk);
++    if(parchk != chk)
++        return(ZBAR_NONE);
++
++    dbprintf(2, "\n");
++    dbprintf(1, "decode5=%x%x%x%x%x\n",
++             pass->raw[1] & 0xf, pass->raw[2] & 0xf,
++             pass->raw[3] & 0xf, pass->raw[4] & 0xf,
++             pass->raw[5] & 0xf);
++
++    return(ZBAR_EAN5);
++}
++
+ static inline zbar_symbol_type_t ean_part_end7 (ean_decoder_t *ean,
+                                                 ean_pass_t *pass,
+                                                 unsigned char fwd)
+@@ -285,15 +374,16 @@
+     if(par & 1)
+         pass->raw[0] >>= 4;
+     pass->raw[0] &= 0xf;
+-    dprintf(2, " par=%02x(%x)", par, pass->raw[0]);
++    dbprintf(2, " par=%02x(%x)", par, pass->raw[0]);
+ 
+     if(pass->raw[0] == 0xf)
+         /* invalid parity combination */
          return(ZBAR_NONE);
  
      if(!par == fwd) {
@@ -26053,7 +31294,26 @@ diff --git a/zbar/decoder/ean.c b/zbar/decoder/ean.c
          for(i = 1; i < 4; i++) {
              unsigned char tmp = pass->raw[i];
              pass->raw[i] = pass->raw[7 - i];
-@@ -324,33 +349,52 @@ static inline zbar_symbol_type_t ean_par
+@@ -301,12 +391,12 @@
+         }
+     }
+ 
+-    dprintf(2, "\n");
+-    dprintf(1, "decode=%x%x%x%x%x%x%x(%02x)\n",
+-            pass->raw[0] & 0xf, pass->raw[1] & 0xf,
+-            pass->raw[2] & 0xf, pass->raw[3] & 0xf,
+-            pass->raw[4] & 0xf, pass->raw[5] & 0xf,
+-            pass->raw[6] & 0xf, par);
++    dbprintf(2, "\n");
++    dbprintf(1, "decode=%x%x%x%x%x%x%x(%02x)\n",
++             pass->raw[0] & 0xf, pass->raw[1] & 0xf,
++             pass->raw[2] & 0xf, pass->raw[3] & 0xf,
++             pass->raw[4] & 0xf, pass->raw[5] & 0xf,
++             pass->raw[6] & 0xf, par);
+ 
+     if(TEST_CFG(ean->ean13_config, ZBAR_CFG_ENABLE)) {
+         if(!par)
+@@ -324,54 +414,100 @@
  static inline zbar_symbol_type_t decode_pass (zbar_decoder_t *dcode,
                                                ean_pass_t *pass)
  {
@@ -26064,20 +31324,63 @@ diff --git a/zbar/decoder/ean.c b/zbar/decoder/ean.c
 +    idx = pass->state & STATE_IDX;
 +    fwd = pass->state & 1;
  
-     if(get_color(dcode) == ZBAR_SPACE &&
-        (idx == 0x10 || idx == 0x11) &&
-        TEST_CFG(dcode->ean.ean8_config, ZBAR_CFG_ENABLE) &&
-        !aux_end(dcode, fwd)) {
-+        zbar_symbol_type_t part;
-         dprintf(2, " fwd=%x", fwd);
+-    if(get_color(dcode) == ZBAR_SPACE &&
+-       (idx == 0x10 || idx == 0x11) &&
+-       TEST_CFG(dcode->ean.ean8_config, ZBAR_CFG_ENABLE) &&
+-       !aux_end(dcode, fwd)) {
+-        dprintf(2, " fwd=%x", fwd);
 -        zbar_symbol_type_t part = ean_part_end4(pass, fwd);
-+        part = ean_part_end4(pass, fwd);
-+        if(part)
-+            dcode->ean.direction = (pass->state & STATE_REV) != 0;
-         pass->state = -1;
-         return(part);
+-        pass->state = -1;
+-        return(part);
++    if(get_color(dcode) == ZBAR_SPACE) {
++        if(pass->state & STATE_ADDON) {
++            dbprintf(2, " i=%d", idx);
++            if(idx == 0x09 || idx == 0x21) {
++                unsigned qz = get_width(dcode, 0);
++                unsigned s = calc_s(dcode, 1, 4);
++                zbar_symbol_type_t part = !qz || (qz >= s * 3 / 4);
++                if(part && idx == 0x09)
++                    part = ean_part_end2(&dcode->ean, pass);
++                else if(part)
++                    part = ean_part_end5(&dcode->ean, pass);
++
++                if(part || idx == 0x21) {
++                    dcode->ean.direction = 0;
++                    pass->state = -1;
++                    return(part);
++                }
++            }
++            if((idx & 7) == 1) {
++                dbprintf(2, " +");
++                pass->state += 2;
++                idx += 2;
++            }
++        }
++        else if((idx == 0x10 || idx == 0x11) &&
++                TEST_CFG(dcode->ean.ean8_config, ZBAR_CFG_ENABLE) &&
++                !aux_end(dcode, fwd)) {
++            dbprintf(2, " fwd=%x", fwd);
++            zbar_symbol_type_t part = ean_part_end4(pass, fwd);
++            if(part)
++                dcode->ean.direction = (pass->state & STATE_REV) != 0;
++            pass->state = -1;
++            return(part);
++        }
++	else if((idx == 0x18 || idx == 0x19)) {
++	  zbar_symbol_type_t part = ZBAR_NONE;
++	  dbprintf(2, " fwd=%x", fwd);
++	  if(!aux_end(dcode, fwd) && pass->raw[5] != 0xff)
++	    part = ean_part_end7(&dcode->ean, pass, fwd);
++	  if(part)
++	    dcode->ean.direction = (pass->state & STATE_REV) != 0;
++	  pass->state = -1;
++	  return(part);
++        }
      }
  
++    if(pass->state & STATE_ADDON)
++        idx >>= 1;
++
      if(!(idx & 0x03) && idx <= 0x14) {
 +        signed char code = -1;
 +        unsigned w = pass->width;
@@ -26102,28 +31405,45 @@ diff --git a/zbar/decoder/ean.c b/zbar/decoder/ean.c
 +        if(w)
 +            code = decode4(dcode);
 +        else
-+            dprintf(2, " [bad width]");
++            dbprintf(2, " [bad width]");
 +
-+        if(code < 0 && idx != 0x10)
++        if((code < 0 && idx != 0x10) || 
++           (idx > 0 && (pass->state & STATE_ADDON) && aux_mid(dcode)))
              pass->state = -1;
 +        else if(code < 0)
 +            pass->raw[5] = 0xff;
          else {
-             dprintf(2, "\n        raw[%x]=%02x =>", idx >> 2,
-                     digits[(unsigned char)code]);
-@@ -367,8 +411,10 @@ static inline zbar_symbol_type_t decode_
-        (idx == 0x18 || idx == 0x19)) {
-         zbar_symbol_type_t part = ZBAR_NONE;
-         dprintf(2, " fwd=%x", fwd);
--        if(!aux_end(dcode, fwd))
-+        if(!aux_end(dcode, fwd) && pass->raw[5] != 0xff)
-             part = ean_part_end7(&dcode->ean, pass, fwd);
-+        if(part)
-+            dcode->ean.direction = (pass->state & STATE_REV) != 0;
-         pass->state = -1;
-         return(part);
+-            dprintf(2, "\n        raw[%x]=%02x =>", idx >> 2,
+-                    digits[(unsigned char)code]);
++            dbprintf(2, "\n        raw[%x]=%02x =>", idx >> 2,
++                     digits[(unsigned char)code]);
+             pass->raw[(idx >> 2) + 1] = digits[(unsigned char)code];
+-            dprintf(2, " raw=%d%d%d%d%d%d%d",
+-                    pass->raw[0] & 0xf, pass->raw[1] & 0xf,
+-                    pass->raw[2] & 0xf, pass->raw[3] & 0xf,
+-                    pass->raw[4] & 0xf, pass->raw[5] & 0xf,
+-                    pass->raw[6] & 0xf);
++            dbprintf(2, " raw=%d%d%d%d%d%d%d",
++                     pass->raw[0] & 0xf, pass->raw[1] & 0xf,
++                     pass->raw[2] & 0xf, pass->raw[3] & 0xf,
++                     pass->raw[4] & 0xf, pass->raw[5] & 0xf,
++                     pass->raw[6] & 0xf);
+         }
      }
-@@ -379,7 +425,7 @@ static inline signed char ean_verify_che
+-
+-    if(get_color(dcode) == ZBAR_SPACE &&
+-       (idx == 0x18 || idx == 0x19)) {
+-        zbar_symbol_type_t part = ZBAR_NONE;
+-        dprintf(2, " fwd=%x", fwd);
+-        if(!aux_end(dcode, fwd))
+-            part = ean_part_end7(&dcode->ean, pass, fwd);
+-        pass->state = -1;
+-        return(part);
+-    }
+     return(0);
+ }
+ 
+@@ -379,7 +515,7 @@
                                                 int n)
  {
      unsigned char chk = 0;
@@ -26132,7 +31452,7 @@ diff --git a/zbar/decoder/ean.c b/zbar/decoder/ean.c
      for(i = 0; i < n; i++) {
          unsigned char d = ean->buf[i];
          zassert(d < 10, -1, "i=%x d=%x chk=%x %s\n", i, d, chk,
-@@ -397,7 +443,7 @@ static inline signed char ean_verify_che
+@@ -397,12 +533,12 @@
              _zbar_decoder_buf_dump((void*)ean->buf, 18));
      if(chk)
          chk = 10 - chk;
@@ -26141,7 +31461,14 @@ diff --git a/zbar/decoder/ean.c b/zbar/decoder/ean.c
      zassert(d < 10, -1, "n=%x d=%x chk=%x %s\n", n, d, chk,
              _zbar_decoder_buf_dump((void*)ean->buf, 18));
      if(chk != d) {
-@@ -431,10 +477,11 @@ static inline void ean_expand_upce (ean_
+-        dprintf(1, "\nchecksum mismatch %d != %d (%s)\n",
+-                chk, d, dsprintbuf(ean));
++        dbprintf(1, "\nchecksum mismatch %d != %d (%s)\n",
++                 chk, d, dsprintbuf(ean));
+         return(-1);
+     }
+     return(0);
+@@ -431,10 +567,11 @@
                                      ean_pass_t *pass)
  {
      int i = 0;
@@ -26154,7 +31481,7 @@ diff --git a/zbar/decoder/ean.c b/zbar/decoder/ean.c
      ean->buf[0] = 0;
      ean->buf[1] = 0;
      ean->buf[2] = pass->raw[i++] & 0xf;
-@@ -446,17 +493,19 @@ static inline void ean_expand_upce (ean_
+@@ -446,7 +583,7 @@
      ean->buf[8] = 0;
      ean->buf[9] = (decode < 3) ? pass->raw[i++] & 0xf : 0;
      ean->buf[10] = (decode < 4) ? pass->raw[i++] & 0xf : 0;
@@ -26163,80 +31490,189 @@ diff --git a/zbar/decoder/ean.c b/zbar/decoder/ean.c
  }
  
  static inline zbar_symbol_type_t integrate_partial (ean_decoder_t *ean,
-                                                     ean_pass_t *pass,
-                                                     zbar_symbol_type_t part)
+@@ -455,70 +592,75 @@
  {
-+    signed char i, j, right = !!(part & EAN_RIGHT);
      /* copy raw data into holding buffer */
      /* if same partial is not consistent, reset others */
 -    dprintf(2, " integrate part=%x (%s)", part, dsprintbuf(ean));
--    signed char i, j;
-+    dprintf(2, " integrate part=%x (%s) w=%d=>%d",
-+            part, dsprintbuf(ean), ean->width, pass->width);
-+
-     if(part & ZBAR_ADDON) {
-         /* FIXME TBD */
-         for(i = (part == ZBAR_ADDON5) ? 4 : 1; i >= 0; i--) {
-@@ -477,7 +526,13 @@ static inline zbar_symbol_type_t integra
-             ean->left = ean->right = ean->addon = ZBAR_NONE;
-         }
++    dbprintf(2, " integrate part=%x (%s)", part, dsprintbuf(ean));
+     signed char i, j;
+-    if(part & ZBAR_ADDON) {
+-        /* FIXME TBD */
+-        for(i = (part == ZBAR_ADDON5) ? 4 : 1; i >= 0; i--) {
+-            unsigned char digit = pass->raw[i] & 0xf;
+-            if(ean->addon && ean->buf[i + 13] != digit) {
+-                /* partial mismatch - reset collected parts */
+-                ean->left = ean->right = ean->addon = ZBAR_NONE;
+-            }
+-            ean->buf[i + 13] = digit;
+-        }
+-        ean->addon = part;
+-    }
+-    else {
+-        if((ean->left && ((part & ZBAR_SYMBOL) != ean->left)) ||
+-           (ean->right && ((part & ZBAR_SYMBOL) != ean->right))) {
+-            /* partial mismatch - reset collected parts */
+-            dprintf(2, " rst(type %x %x)", ean->left, ean->right);
+-            ean->left = ean->right = ean->addon = ZBAR_NONE;
+-        }
  
 -        if(part & EAN_RIGHT) {
-+        if((ean->left || ean->right || ean->addon) &&
-+           !check_width(ean->width, pass->width)) {
-+            dprintf(2, " rst(width %d)", pass->width);
-+            ean->left = ean->right = ean->addon = ZBAR_NONE;
-+        }
-+
-+        if(right) {
-             part &= ZBAR_SYMBOL;
-             j = (part == ZBAR_EAN13) ? 12 : 7;
-             for(i = (part == ZBAR_EAN13) ? 6 : 4; i; i--, j--) {
-@@ -507,6 +562,7 @@ static inline zbar_symbol_type_t integra
-         else /* ZBAR_UPCE */
-             ean_expand_upce(ean, pass);
+-            part &= ZBAR_SYMBOL;
+-            j = (part == ZBAR_EAN13) ? 12 : 7;
+-            for(i = (part == ZBAR_EAN13) ? 6 : 4; i; i--, j--) {
+-                unsigned char digit = pass->raw[i] & 0xf;
+-                if(ean->right && ean->buf[j] != digit) {
+-                    /* partial mismatch - reset collected parts */
+-                    dprintf(2, " rst(right)");
+-                    ean->left = ean->right = ean->addon = ZBAR_NONE;
+-                }
+-                ean->buf[j] = digit;
+-            }
+-            ean->right = part;
+-        }
+-        else if(part != ZBAR_UPCE) /* EAN_LEFT */ {
+-            j = (part == ZBAR_EAN13) ? 6 : 3;
+-            for(i = (part == ZBAR_EAN13) ? 6 : 4; j >= 0; i--, j--) {
+-                unsigned char digit = pass->raw[i] & 0xf;
+-                if(ean->left && ean->buf[j] != digit) {
+-                    /* partial mismatch - reset collected parts */
+-                    dprintf(2, " rst(left)");
+-                    ean->left = ean->right = ean->addon = ZBAR_NONE;
+-                }
+-                ean->buf[j] = digit;
+-            }
+-            ean->left = part;
+-        }
+-        else /* ZBAR_UPCE */
+-            ean_expand_upce(ean, pass);
++    if((ean->left && ((part & ZBAR_SYMBOL) != ean->left)) ||
++       (ean->right && ((part & ZBAR_SYMBOL) != ean->right))) {
++        /* partial mismatch - reset collected parts */
++        dbprintf(2, " rst(type %x %x)", ean->left, ean->right);
++        ean->left = ean->right = ZBAR_NONE;
      }
-+    ean->width = pass->width;
  
-     if((part & ZBAR_SYMBOL) != ZBAR_UPCE) {
-         part = (ean->left & ean->right);
-@@ -516,9 +572,14 @@ static inline zbar_symbol_type_t integra
+-    if((part & ZBAR_SYMBOL) != ZBAR_UPCE) {
+-        part = (ean->left & ean->right);
+-        if(!part)
+-            part = ZBAR_PARTIAL;
++    if((ean->left || ean->right) &&
++       !check_width(ean->width, pass->width)) {
++      dbprintf(2, " rst(width %d)", pass->width);
++      ean->left = ean->right = ZBAR_NONE;
+     }
  
++
++    if(part & EAN_RIGHT) {
++        part &= ZBAR_SYMBOL;
++        j = part - 1;
++        for(i = part >> 1; i; i--, j--) {
++            unsigned char digit = pass->raw[i] & 0xf;
++            if(ean->right && ean->buf[j] != digit) {
++                /* partial mismatch - reset collected parts */
++                dbprintf(2, " rst(right)");
++                ean->left = ean->right = ZBAR_NONE;
++            }
++            ean->buf[j] = digit;
++        }
++        ean->right = part;
++        part &= ean->left;  /* FIXME!? */
++    }
++    else if(part == ZBAR_EAN13 || part == ZBAR_EAN8) /* EAN_LEFT */ {
++        j = (part - 1) >> 1;
++        for(i = part >> 1; j >= 0; i--, j--) {
++            unsigned char digit = pass->raw[i] & 0xf;
++            if(ean->left && ean->buf[j] != digit) {
++                /* partial mismatch - reset collected parts */
++                dbprintf(2, " rst(left)");
++                ean->left = ean->right = ZBAR_NONE;
++            }
++            ean->buf[j] = digit;
++        }
++        ean->left = part;
++        part &= ean->right;  /* FIXME!? */
++    }
++    else if(part != ZBAR_UPCE) /* add-ons */ {
++        for(i = part; i > 0; i--)
++            ean->buf[i - 1] = pass->raw[i] & 0xf;
++        ean->left = part;
++    }
++    else
++        ean_expand_upce(ean, pass);
++
++    ean->width = pass->width;
++
++    if(!part)
++        part = ZBAR_PARTIAL;
++
      if(((part == ZBAR_EAN13 ||
           part == ZBAR_UPCE) && ean_verify_checksum(ean, 12)) ||
 -       (part == ZBAR_EAN8 && ean_verify_checksum(ean, 7)))
 -        /* invalid parity */
 +       (part == ZBAR_EAN8 && ean_verify_checksum(ean, 7))) {
 +        /* invalid checksum */
-+        if(right)
-+            ean->left = ZBAR_NONE;
++        if(ean->right)
++	  ean->left = ZBAR_NONE;
 +        else
-+            ean->right = ZBAR_NONE;
++	  ean->right = ZBAR_NONE;
          part = ZBAR_NONE;
 +    }
  
      if(part == ZBAR_EAN13) {
          /* special case EAN-13 subsets */
-@@ -556,7 +617,8 @@ static inline zbar_symbol_type_t integra
-     if(part > ZBAR_PARTIAL)
-         part |= ean->addon;
+@@ -553,10 +695,8 @@
+             part = ZBAR_NONE;
+     }
  
+-    if(part > ZBAR_PARTIAL)
+-        part |= ean->addon;
+-
 -    dprintf(2, " %x/%x=%x", ean->left, ean->right, part);
-+    dprintf(2, " dir=%d %x/%x=%x",
-+            ean->direction, ean->left, ean->right, part);
++    dbprintf(2, " dir=%d %x/%x=%x",
++             ean->direction, ean->left, ean->right, part);
      return(part);
  }
  
-@@ -596,6 +658,8 @@ static inline void postprocess (zbar_dec
+@@ -565,7 +705,7 @@
+                                 zbar_symbol_type_t sym)
+ {
+     ean_decoder_t *ean = &dcode->ean;
+-    zbar_symbol_type_t base = sym & ZBAR_SYMBOL;
++    zbar_symbol_type_t base = sym;
+     int i = 0, j = 0;
+     if(base > ZBAR_PARTIAL) {
+         if(base == ZBAR_UPCA)
+@@ -580,22 +720,23 @@
+             i = 3;
+ 
+         if(base == ZBAR_ISBN10 ||
+-           !TEST_CFG(ean_get_config(ean, sym), ZBAR_CFG_EMIT_CHECK))
++           (base > ZBAR_EAN5 &&
++            !TEST_CFG(ean_get_config(ean, sym), ZBAR_CFG_EMIT_CHECK)))
+             base--;
+ 
+         for(; j < base && ean->buf[i] >= 0; i++, j++)
              dcode->buf[j] = ean->buf[i] + '0';
+ 
+-        if((sym & ZBAR_SYMBOL) == ZBAR_ISBN10 && j == 9 &&
++        if(sym == ZBAR_ISBN10 && j == 9 &&
+            TEST_CFG(ean->isbn10_config, ZBAR_CFG_EMIT_CHECK))
+             /* recalculate ISBN-10 check digit */
+             dcode->buf[j++] = isbn10_calc_checksum(ean);
+     }
+-    if(sym & ZBAR_ADDON)
+-        for(i = 13; ean->buf[i] >= 0; i++, j++)
+-            dcode->buf[j] = ean->buf[i] + '0';
      dcode->buflen = j;
      dcode->buf[j] = '\0';
 +    dcode->direction = 1 - 2 * ean->direction;
 +    dcode->modifiers = 0;
++    dbprintf(2, " base=%d j=%d (%s)", base, j, dcode->buf);
  }
  
  zbar_symbol_type_t _zbar_decode_ean (zbar_decoder_t *dcode)
-@@ -603,20 +667,21 @@ zbar_symbol_type_t _zbar_decode_ean (zba
+@@ -603,39 +744,40 @@
      /* process upto 4 separate passes */
      zbar_symbol_type_t sym = ZBAR_NONE;
      unsigned char pass_idx = dcode->idx & 3;
@@ -26252,15 +31688,20 @@ diff --git a/zbar/decoder/ean.c b/zbar/decoder/ean.c
          if(pass->state >= 0 ||
             i == pass_idx)
          {
-+            zbar_symbol_type_t part;
-             dprintf(2, "      ean[%x/%x]: idx=%x st=%d s=%d",
-                     pass_idx, i, dcode->idx, pass->state, dcode->ean.s4);
+-            dprintf(2, "      ean[%x/%x]: idx=%x st=%d s=%d",
+-                    pass_idx, i, dcode->idx, pass->state, dcode->ean.s4);
 -            zbar_symbol_type_t part = decode_pass(dcode, pass);
++            zbar_symbol_type_t part;
++            dbprintf(2, "      ean[%x/%x]: idx=%x st=%d s=%d",
++                     i, pass_idx, dcode->idx, pass->state, dcode->ean.s4);
 +            part = decode_pass(dcode, pass);
              if(part) {
                  /* update accumulated data from new partial decode */
                  sym = integrate_partial(&dcode->ean, pass, part);
-@@ -626,7 +691,7 @@ zbar_symbol_type_t _zbar_decode_ean (zba
+                 if(sym) {
+                     /* this pass valid => _reset_ all passes */
+-                    dprintf(2, " sym=%x", sym);
++                    dbprintf(2, " sym=%x", sym);
                      dcode->ean.pass[0].state = dcode->ean.pass[1].state = -1;
                      dcode->ean.pass[2].state = dcode->ean.pass[3].state = -1;
                      if(sym > ZBAR_PARTIAL) {
@@ -26268,10 +31709,21 @@ diff --git a/zbar/decoder/ean.c b/zbar/decoder/ean.c
 +                        if(!acquire_lock(dcode, sym))
                              postprocess(dcode, sym);
                          else {
-                             dprintf(1, " [locked %d]", dcode->lock);
-diff --git a/zbar/decoder/ean.h b/zbar/decoder/ean.h
---- a/zbar/decoder/ean.h
-+++ b/zbar/decoder/ean.h
+-                            dprintf(1, " [locked %d]", dcode->lock);
++                            dbprintf(1, " [locked %d]", dcode->lock);
+                             sym = ZBAR_PARTIAL;
+                         }
+                     }
+                 }
+             }
+-            dprintf(2, "\n");
++            dbprintf(2, "\n");
+         }
+     }
+     return(sym);
+diff -r 563557a923d0 zbar/decoder/ean.h
+--- a/zbar/decoder/ean.h	Tue Oct 27 11:25:59 2009 -0400
++++ b/zbar/decoder/ean.h	Fri Feb 22 08:54:29 2013 -0300
 @@ -1,5 +1,5 @@
  /*------------------------------------------------------------------------
 - *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
@@ -26279,13 +31731,14 @@ diff --git a/zbar/decoder/ean.h b/zbar/decoder/ean.h
   *
   *  This file is part of the ZBar Bar Code Reader.
   *
-@@ -26,18 +26,21 @@
+@@ -26,18 +26,20 @@
  /* state of each parallel decode attempt */
  typedef struct ean_pass_s {
      signed char state;          /* module position of w[idx] in symbol */
 +#define STATE_REV   0x80        /*   scan direction reversed */
  #define STATE_ADDON 0x40        /*   scanning add-on */
- #define STATE_IDX   0x1f        /*   element offset into symbol */
+-#define STATE_IDX   0x1f        /*   element offset into symbol */
++#define STATE_IDX   0x3f        /*   element offset into symbol */
 +    unsigned width;             /* width of last character */
      unsigned char raw[7];       /* decode in process */
  } ean_pass_t;
@@ -26296,16 +31749,53 @@ diff --git a/zbar/decoder/ean.h b/zbar/decoder/ean.h
 -    zbar_symbol_type_t left;   /* current holding buffer contents */
 +    zbar_symbol_type_t left;    /* current holding buffer contents */
      zbar_symbol_type_t right;
-     zbar_symbol_type_t addon;
+-    zbar_symbol_type_t addon;
 -    unsigned s4;                /* character width */
 +    int direction;              /* scan direction */
 +    unsigned s4, width;         /* character width */
      signed char buf[18];        /* holding buffer */
  
-     signed char enable;
-diff --git a/zbar/decoder/i25.c b/zbar/decoder/i25.c
---- a/zbar/decoder/i25.c
-+++ b/zbar/decoder/i25.c
+     signed char enable;
+@@ -47,6 +49,8 @@
+     unsigned upce_config;
+     unsigned isbn10_config;
+     unsigned isbn13_config;
++    unsigned ean5_config;
++    unsigned ean2_config;
+ } ean_decoder_t;
+ 
+ /* reset EAN/UPC pass specific state */
+@@ -61,20 +65,22 @@
+ static inline void ean_reset (ean_decoder_t *ean)
+ {
+     ean_new_scan(ean);
+-    ean->left = ean->right = ean->addon = ZBAR_NONE;
++    ean->left = ean->right = ZBAR_NONE;
+ }
+ 
+ static inline unsigned ean_get_config (ean_decoder_t *ean,
+                                        zbar_symbol_type_t sym)
+ {
+-    switch(sym & ZBAR_SYMBOL) {
+-    case ZBAR_EAN13:  return(ean->ean13_config);
++    switch(sym) {
++    case ZBAR_EAN2:   return(ean->ean2_config);
++    case ZBAR_EAN5:   return(ean->ean5_config);
+     case ZBAR_EAN8:   return(ean->ean8_config);
+-    case ZBAR_UPCA:   return(ean->upca_config);
+     case ZBAR_UPCE:   return(ean->upce_config);
+     case ZBAR_ISBN10: return(ean->isbn10_config);
++    case ZBAR_UPCA:   return(ean->upca_config);
++    case ZBAR_EAN13:  return(ean->ean13_config);
+     case ZBAR_ISBN13: return(ean->isbn13_config);
+-    default:           return(0);
++    default:          return(0);
+     }
+ }
+ 
+diff -r 563557a923d0 zbar/decoder/i25.c
+--- a/zbar/decoder/i25.c	Tue Oct 27 11:25:59 2009 -0400
++++ b/zbar/decoder/i25.c	Fri Feb 22 08:54:29 2013 -0300
 @@ -1,5 +1,5 @@
  /*------------------------------------------------------------------------
 - *  Copyright 2008-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
@@ -26327,16 +31817,68 @@ diff --git a/zbar/decoder/i25.c b/zbar/decoder/i25.c
  
  static inline unsigned char i25_decode1 (unsigned char enc,
                                           unsigned e,
-@@ -111,7 +111,7 @@ static inline signed char i25_decode_sta
+@@ -49,7 +49,7 @@
+                                           unsigned char offset)
+ {
+     i25_decoder_t *dcode25 = &dcode->i25;
+-    dprintf(2, " s=%d", dcode25->s10);
++    dbprintf(2, " s=%d", dcode25->s10);
+     if(dcode25->s10 < 10)
+         return(0xff);
+ 
+@@ -65,11 +65,11 @@
+             par++;
+     }
+ 
+-    dprintf(2, " enc=%02x par=%x", enc, par);
++    dbprintf(2, " enc=%02x par=%x", enc, par);
+ 
+     /* parity check */
+     if(par != 2) {
+-        dprintf(2, " [bad parity]");
++        dbprintf(2, " [bad parity]");
+         return(0xff);
+     }
+ 
+@@ -79,12 +79,12 @@
+         if(enc == 12)
+             enc = 0;
+         else if(--enc > 9) {
+-            dprintf(2, " [invalid encoding]");
++            dbprintf(2, " [invalid encoding]");
+             return(0xff);
+         }
+     }
+ 
+-    dprintf(2, " => %x", enc);
++    dbprintf(2, " => %x", enc);
+     return(enc);
+ }
+ 
+@@ -103,7 +103,7 @@
+     if((get_color(dcode) == ZBAR_BAR)
+        ? enc != 4
+        : (enc = i25_decode1(enc, get_width(dcode, i++), dcode25->s10))) {
+-        dprintf(4, "      i25: s=%d enc=%x [invalid]\n", dcode25->s10, enc);
++        dbprintf(4, "      i25: s=%d enc=%x [invalid]\n", dcode25->s10, enc);
+         return(ZBAR_NONE);
+     }
+ 
+@@ -111,10 +111,10 @@
       * we require 5.25n for w=2n to 6.75n for w=3n
       * (FIXME should really factor in w:n ratio)
       */
 -    unsigned quiet = get_width(dcode, i++);
 +    unsigned quiet = get_width(dcode, i);
      if(quiet && quiet < dcode25->s10 * 3 / 8) {
-         dprintf(3, "      i25: s=%d enc=%x q=%d [invalid qz]\n",
-                 dcode25->s10, enc, quiet);
-@@ -124,6 +124,21 @@ static inline signed char i25_decode_sta
+-        dprintf(3, "      i25: s=%d enc=%x q=%d [invalid qz]\n",
+-                dcode25->s10, enc, quiet);
++        dbprintf(3, "      i25: s=%d enc=%x q=%d [invalid qz]\n",
++                 dcode25->s10, enc, quiet);
+         return(ZBAR_NONE);
+     }
+ 
+@@ -124,6 +124,21 @@
      return(ZBAR_PARTIAL);
  }
  
@@ -26358,17 +31900,17 @@ diff --git a/zbar/decoder/i25.c b/zbar/decoder/i25.c
  static inline signed char i25_decode_end (zbar_decoder_t *dcode)
  {
      i25_decoder_t *dcode25 = &dcode->i25;
-@@ -133,7 +148,8 @@ static inline signed char i25_decode_end
+@@ -133,7 +148,8 @@
      if((quiet && quiet < dcode25->width * 3 / 8) ||
         decode_e(get_width(dcode, 1), dcode25->width, 45) > 2 ||
         decode_e(get_width(dcode, 2), dcode25->width, 45) > 2) {
 -        dprintf(3, " s=%d q=%d [invalid qz]\n", dcode25->width, quiet);
-+        dprintf(3, "      i25: s=%d q=%d [invalid qz]\n",
-+                dcode25->width, quiet);
++        dbprintf(3, "      i25: s=%d q=%d [invalid qz]\n",
++                 dcode25->width, quiet);
          return(ZBAR_NONE);
      }
  
-@@ -145,6 +161,11 @@ static inline signed char i25_decode_end
+@@ -145,9 +161,14 @@
            decode_e(get_width(dcode, 4), dcode25->width, 45) > 2))
          return(ZBAR_NONE);
  
@@ -26379,26 +31921,44 @@ diff --git a/zbar/decoder/i25.c b/zbar/decoder/i25.c
 +    dcode->direction = 1 - 2 * dcode25->direction;
      if(dcode25->direction) {
          /* reverse buffer */
-         dprintf(2, " (rev)");
-@@ -161,13 +182,14 @@ static inline signed char i25_decode_end
+-        dprintf(2, " (rev)");
++        dbprintf(2, " (rev)");
+         int i;
+         for(i = 0; i < dcode25->character / 2; i++) {
+             unsigned j = dcode25->character - 1 - i;
+@@ -160,15 +181,19 @@
+     if(dcode25->character < CFG(*dcode25, ZBAR_CFG_MIN_LEN) ||
         (CFG(*dcode25, ZBAR_CFG_MAX_LEN) > 0 &&
          dcode25->character > CFG(*dcode25, ZBAR_CFG_MAX_LEN))) {
-         dprintf(2, " [invalid len]\n");
+-        dprintf(2, " [invalid len]\n");
 -        dcode->lock = 0;
++        dbprintf(2, " [invalid len]\n");
 +        release_lock(dcode, ZBAR_I25);
          dcode25->character = -1;
          return(ZBAR_NONE);
      }
  
++    zassert(dcode25->character < dcode->buf_alloc, ZBAR_NONE, "i=%02x %s\n",
++            dcode25->character,
++            _zbar_decoder_buf_dump(dcode->buf, dcode25->character));
      dcode->buflen = dcode25->character;
      dcode->buf[dcode25->character] = '\0';
+-    dprintf(2, " [valid end]\n");
 +    dcode->modifiers = 0;
-     dprintf(2, " [valid end]\n");
++    dbprintf(2, " [valid end]\n");
      dcode25->character = -1;
      return(ZBAR_I25);
-@@ -197,38 +219,45 @@ zbar_symbol_type_t _zbar_decode_i25 (zba
-             (dcode25->direction) ? '<' : '>',
-             dcode25->character, dcode25->element);
+ }
+@@ -193,42 +218,48 @@
+     /* FIXME check current character width against previous */
+     dcode25->width = dcode25->s10;
+ 
+-    dprintf(2, "      i25[%c%02d+%x]",
+-            (dcode25->direction) ? '<' : '>',
+-            dcode25->character, dcode25->element);
++    dbprintf(2, "      i25[%c%02d+%x]",
++             (dcode25->direction) ? '<' : '>',
++             dcode25->character, dcode25->element);
  
 -    /* lock shared resources */
 -    if(!dcode25->character && get_lock(dcode, ZBAR_I25)) {
@@ -26406,12 +31966,18 @@ diff --git a/zbar/decoder/i25.c b/zbar/decoder/i25.c
 -        dprintf(2, " [locked %d]\n", dcode->lock);
 +    if(dcode25->character == 4 && i25_acquire_lock(dcode))
          return(ZBAR_PARTIAL);
--    }
- 
-     unsigned char c = i25_decode10(dcode, 1);
-     dprintf(2, " c=%x", c);
++
++    unsigned char c = i25_decode10(dcode, 1);
++    dbprintf(2, " c=%x", c);
 +    if(c > 9) {
-+        dprintf(2, " [aborted]\n");
++        dbprintf(2, " [aborted]\n");
++        goto reset;
+     }
+ 
+-    unsigned char c = i25_decode10(dcode, 1);
+-    dprintf(2, " c=%x", c);
++    if(size_buf(dcode, dcode25->character + 3)) {
++        dbprintf(2, " [overflow]\n");
 +        goto reset;
 +    }
  
@@ -26422,13 +31988,8 @@ diff --git a/zbar/decoder/i25.c b/zbar/decoder/i25.c
 -        dcode->lock = 0;
 -        dcode25->character = -1;
 -        return(ZBAR_NONE);
-+    if((dcode25->character >= BUFFER_MIN) &&
-+       size_buf(dcode, dcode25->character + 2)) {
-+        dprintf(2, " [overflow]\n");
-+        goto reset;
-     }
+-    }
 -    dcode->buf[dcode25->character++] = c + '0';
-+
 +    unsigned char *buf;
 +    if(dcode25->character >= 4)
 +        buf = dcode->buf;
@@ -26437,16 +31998,19 @@ diff --git a/zbar/decoder/i25.c b/zbar/decoder/i25.c
 +    buf[dcode25->character++] = c + '0';
  
      c = i25_decode10(dcode, 0);
-     dprintf(2, " c=%x", c);
+-    dprintf(2, " c=%x", c);
++    dbprintf(2, " c=%x", c);
      if(c > 9) {
-         dprintf(2, " [aborted]\n");
+-        dprintf(2, " [aborted]\n");
 -        dcode->lock = 0;
 -        dcode25->character = -1;
 -        return(ZBAR_NONE);
++        dbprintf(2, " [aborted]\n");
 +        goto reset;
      }
      else
-         dprintf(2, "\n");
+-        dprintf(2, "\n");
++        dbprintf(2, "\n");
  
 -    dcode->buf[dcode25->character++] = c + '0';
 +    buf[dcode25->character++] = c + '0';
@@ -26459,10 +32023,10 @@ diff --git a/zbar/decoder/i25.c b/zbar/decoder/i25.c
 +    dcode25->character = -1;
 +    return(ZBAR_NONE);
  }
-diff --git a/zbar/decoder/i25.h b/zbar/decoder/i25.h
---- a/zbar/decoder/i25.h
-+++ b/zbar/decoder/i25.h
-@@ -30,6 +30,7 @@ typedef struct i25_decoder_s {
+diff -r 563557a923d0 zbar/decoder/i25.h
+--- a/zbar/decoder/i25.h	Tue Oct 27 11:25:59 2009 -0400
++++ b/zbar/decoder/i25.h	Fri Feb 22 08:54:29 2013 -0300
+@@ -30,6 +30,7 @@
      int character : 12;         /* character position in symbol */
      unsigned s10;               /* current character width */
      unsigned width;             /* last character width */
@@ -26470,9 +32034,9 @@ diff --git a/zbar/decoder/i25.h b/zbar/decoder/i25.h
  
      unsigned config;
      int configs[NUM_CFGS];      /* int valued configurations */
-diff --git a/zbar/decoder/pdf417.c b/zbar/decoder/pdf417.c
---- a/zbar/decoder/pdf417.c
-+++ b/zbar/decoder/pdf417.c
+diff -r 563557a923d0 zbar/decoder/pdf417.c
+--- a/zbar/decoder/pdf417.c	Tue Oct 27 11:25:59 2009 -0400
++++ b/zbar/decoder/pdf417.c	Fri Feb 22 08:54:29 2013 -0300
 @@ -1,5 +1,5 @@
  /*------------------------------------------------------------------------
 - *  Copyright 2008-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
@@ -26498,16 +32062,99 @@ diff --git a/zbar/decoder/pdf417.c b/zbar/decoder/pdf417.c
  
  #define PDF417_STOP 0xbff
  
-@@ -152,7 +152,7 @@ static inline signed char pdf417_decode_
+@@ -41,7 +41,7 @@
+      * from similar edge measurements
+      */
+     unsigned s = dcode->pdf417.s8;
+-    dprintf(2, " s=%d ", s);
++    dbprintf(2, " s=%d ", s);
+     if(s < 8)
+         return(-1);
+ 
+@@ -55,19 +55,19 @@
+         else
+             e = decode_e(get_width(dcode, 7 - i) +
+                          get_width(dcode, 6 - i), s, 17);
+-        dprintf(4, "%x", e);
++        dbprintf(4, "%x", e);
+         if(e < 0 || e > 8)
+             return(-1);
+         sig = (sig << 3) ^ e;
+     }
+-    dprintf(2, " sig=%06lx", sig);
++    dbprintf(2, " sig=%06lx", sig);
+ 
+     /* determine cluster number */
+     int clst = ((sig & 7) - ((sig >> 3) & 7) +
+                 ((sig >> 12) & 7) - ((sig >> 15) & 7));
+     if(clst < 0)
+         clst += 9;
+-    dprintf(2, " k=%d", clst);
++    dbprintf(2, " k=%d", clst);
+     zassert(clst >= 0 && clst < 9, -1, "dir=%x sig=%lx k=%x %s\n",
+             dcode->pdf417.direction, sig, clst,
+             _zbar_decoder_buf_dump(dcode->buf, dcode->pdf417.character));
+@@ -89,8 +89,8 @@
+             _zbar_decoder_buf_dump(dcode->buf, dcode->pdf417.character));
+ 
+     unsigned short c = (g[0] + g[1] + g[2]) & PDF417_HASH_MASK;
+-    dprintf(2, " g0=%x g1=%x g2=%x c=%03d(%d)",
+-            g[0], g[1], g[2], c & 0x3ff, c >> 10);
++    dbprintf(2, " g0=%x g1=%x g2=%x c=%03d(%d)",
++             g[0], g[1], g[2], c & 0x3ff, c >> 10);
+     return(c);
+ }
+ 
+@@ -142,18 +142,18 @@
+         ei = decode_e(get_width(dcode, 8) + get_width(dcode, 9), s, 17);
+     }
+ 
+-    dprintf(2, "      pdf417[%c]: s=%d",
+-            (get_color(dcode)) ? '<' : '>', s);
++    dbprintf(2, "      pdf417[%c]: s=%d",
++             (get_color(dcode)) ? '<' : '>', s);
+ 
+     /* check quiet zone */
+     if(ei >= 0 && ei < ex) {
+-        dprintf(2, " [invalid quiet]\n");
++        dbprintf(2, " [invalid quiet]\n");
+         return(0);
      }
  
      /* lock shared resources */
 -    if(get_lock(dcode, ZBAR_PDF417)) {
+-        dprintf(2, " [locked %d]\n", dcode->lock);
 +    if(acquire_lock(dcode, ZBAR_PDF417)) {
-         dprintf(2, " [locked %d]\n", dcode->lock);
++        dbprintf(2, " [locked %d]\n", dcode->lock);
+         return(0);
+     }
+ 
+@@ -162,7 +162,7 @@
+     dcode417->element = 0;
+     dcode417->character = 0;
+ 
+-    dprintf(2, " [valid start]\n");
++    dbprintf(2, " [valid start]\n");
+     return(ZBAR_PARTIAL);
+ }
+ 
+@@ -176,7 +176,7 @@
+ 
+     if(dcode417->character < 0) {
+         pdf417_decode_start(dcode);
+-        dprintf(4, "\n");
++        dbprintf(4, "\n");
          return(0);
      }
-@@ -190,7 +190,7 @@ zbar_symbol_type_t _zbar_decode_pdf417 (
+ 
+@@ -185,12 +185,12 @@
+         return(0);
+     dcode417->element = 0;
+ 
+-    dprintf(2, "      pdf417[%c%02d]:",
+-            (dcode417->direction) ? '<' : '>', dcode417->character);
++    dbprintf(2, "      pdf417[%c%02d]:",
++             (dcode417->direction) ? '<' : '>', dcode417->character);
  
      if(get_color(dcode) != dcode417->direction) {
          int c = dcode417->character;
@@ -26516,18 +32163,27 @@ diff --git a/zbar/decoder/pdf417.c b/zbar/decoder/pdf417.c
          dcode417->character = -1;
          zassert(get_color(dcode) == dcode417->direction, ZBAR_NONE,
                  "color=%x dir=%x char=%d elem=0 %s\n",
-@@ -203,7 +203,7 @@ zbar_symbol_type_t _zbar_decode_pdf417 (
-        ((dcode417->character >= BUFFER_MIN) &&
-         size_buf(dcode, dcode417->character + 1))) {
-         dprintf(1, (c < 0) ? " [aborted]\n" : " [overflow]\n");
+@@ -199,11 +199,9 @@
+     }
+ 
+     signed short c = pdf417_decode8(dcode);
+-    if((c < 0) ||
+-       ((dcode417->character >= BUFFER_MIN) &&
+-        size_buf(dcode, dcode417->character + 1))) {
+-        dprintf(1, (c < 0) ? " [aborted]\n" : " [overflow]\n");
 -        dcode->lock = 0;
++    if(c < 0 || size_buf(dcode, dcode417->character + 1)) {
++        dbprintf(1, (c < 0) ? " [aborted]\n" : " [overflow]\n");
 +        release_lock(dcode, ZBAR_PDF417);
          dcode417->character = -1;
          return(0);
      }
-@@ -213,7 +213,9 @@ zbar_symbol_type_t _zbar_decode_pdf417 (
+@@ -211,12 +209,14 @@
+     /* FIXME TBD infer dimensions, save codewords */
+ 
      if(c == PDF417_STOP) {
-         dprintf(1, " [valid stop]");
+-        dprintf(1, " [valid stop]");
++        dbprintf(1, " [valid stop]");
          /* FIXME check trailing bar and qz */
 -        dcode->lock = 0;
 +        dcode->direction = 1 - 2 * dcode417->direction;
@@ -26536,9 +32192,13 @@ diff --git a/zbar/decoder/pdf417.c b/zbar/decoder/pdf417.c
          dcode417->character = -1;
      }
  
-diff --git a/zbar/decoder/qr_finder.c b/zbar/decoder/qr_finder.c
---- a/zbar/decoder/qr_finder.c
-+++ b/zbar/decoder/qr_finder.c
+-    dprintf(2, "\n");
++    dbprintf(2, "\n");
+     return(0);
+ }
+diff -r 563557a923d0 zbar/decoder/qr_finder.c
+--- a/zbar/decoder/qr_finder.c	Tue Oct 27 11:25:59 2009 -0400
++++ b/zbar/decoder/qr_finder.c	Fri Feb 22 08:54:29 2013 -0300
 @@ -1,13 +1,36 @@
 +/*------------------------------------------------------------------------
 + *  Copyright 2009-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
@@ -26577,7 +32237,7 @@ diff --git a/zbar/decoder/qr_finder.c b/zbar/decoder/qr_finder.c
  
  /* at this point lengths are all decode unit offsets from the decode edge
   * NB owned by finder
-@@ -20,18 +43,20 @@ qr_finder_line *_zbar_decoder_get_qr_fin
+@@ -20,42 +43,48 @@
  zbar_symbol_type_t _zbar_find_qr (zbar_decoder_t *dcode)
  {
      qr_finder_t *qrf = &dcode->qrf;
@@ -26590,17 +32250,41 @@ diff --git a/zbar/decoder/qr_finder.c b/zbar/decoder/qr_finder.c
 -    unsigned s = qrf->s5;
 +    s = qrf->s5;
  
++    /*TODO: The 2005 standard allows reflectance-reversed codes (light on dark
++       instead of dark on light).
++      If we find finder patterns with the opposite polarity, we should invert
++       the final binarized image and use them to search for QR codes in that.*/
      if(get_color(dcode) != ZBAR_SPACE || s < 7)
          return(0);
  
-     dprintf(2, "    qrf: s=%d", s);
+-    dprintf(2, "    qrf: s=%d", s);
++    dbprintf(2, "    qrf: s=%d", s);
  
 -    int ei = decode_e(pair_width(dcode, 1), s, 7);
+-    dprintf(2, " %d", ei);
 +    ei = decode_e(pair_width(dcode, 1), s, 7);
-     dprintf(2, " %d", ei);
++    dbprintf(2, " %d", ei);
+     if(ei)
+         goto invalid;
+ 
+     ei = decode_e(pair_width(dcode, 2), s, 7);
+-    dprintf(2, "%d", ei);
++    dbprintf(2, "%d", ei);
+     if(ei != 2)
+         goto invalid;
+ 
+     ei = decode_e(pair_width(dcode, 3), s, 7);
+-    dprintf(2, "%d", ei);
++    dbprintf(2, "%d", ei);
+     if(ei != 2)
+         goto invalid;
+ 
+     ei = decode_e(pair_width(dcode, 4), s, 7);
+-    dprintf(2, "%d", ei);
++    dbprintf(2, "%d", ei);
      if(ei)
          goto invalid;
-@@ -54,8 +79,8 @@ zbar_symbol_type_t _zbar_find_qr (zbar_d
+ 
      /* valid QR finder symbol
       * mark positions needed by decoder
       */
@@ -26611,18 +32295,29 @@ diff --git a/zbar/decoder/qr_finder.c b/zbar/decoder/qr_finder.c
      qrf->line.eoffs = qz + (w + 1) / 2;
      qrf->line.len = qz + w + get_width(dcode, 2);
      qrf->line.pos[0] = qrf->line.len + get_width(dcode, 3);
-@@ -67,6 +92,8 @@ zbar_symbol_type_t _zbar_find_qr (zbar_d
-             qrf->line.boffs, qrf->line.pos[0], qrf->line.len,
-             qrf->line.eoffs);
+@@ -63,13 +92,15 @@
+     w = get_width(dcode, 5);
+     qrf->line.boffs = qrf->line.pos[0] + get_width(dcode, 4) + (w + 1) / 2;
+ 
+-    dprintf(2, " boff=%d pos=%d len=%d eoff=%d [valid]\n",
+-            qrf->line.boffs, qrf->line.pos[0], qrf->line.len,
+-            qrf->line.eoffs);
++    dbprintf(2, " boff=%d pos=%d len=%d eoff=%d [valid]\n",
++             qrf->line.boffs, qrf->line.pos[0], qrf->line.len,
++             qrf->line.eoffs);
  
 +    dcode->direction = 0;
 +    dcode->buflen = 0;
      return(ZBAR_QRCODE);
  
  invalid:
-diff --git a/zbar/error.c b/zbar/error.c
---- a/zbar/error.c
-+++ b/zbar/error.c
+-    dprintf(2, " [invalid]\n");
++    dbprintf(2, " [invalid]\n");
+     return(0);
+ }
+diff -r 563557a923d0 zbar/error.c
+--- a/zbar/error.c	Tue Oct 27 11:25:59 2009 -0400
++++ b/zbar/error.c	Fri Feb 22 08:54:29 2013 -0300
 @@ -1,5 +1,5 @@
  /*------------------------------------------------------------------------
 - *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
@@ -26630,7 +32325,7 @@ diff --git a/zbar/error.c b/zbar/error.c
   *
   *  This file is part of the ZBar Bar Code Reader.
   *
-@@ -36,7 +36,7 @@ static const char * const mod_str[] = {
+@@ -36,7 +36,7 @@
  };
  #define MOD_MAX (strlen(mod_str[ZBAR_MOD_IMAGE_SCANNER]))
  
@@ -26639,7 +32334,7 @@ diff --git a/zbar/error.c b/zbar/error.c
      "no error",                 /* OK */
      "out of memory",            /* NOMEM */
      "internal library error",   /* INTERNAL */
-@@ -99,32 +99,32 @@ zbar_error_t _zbar_get_error_code (const
+@@ -99,32 +99,32 @@
  const char *_zbar_error_string (const void *container,
                                  int verbosity)
  {
@@ -26678,7 +32373,7 @@ diff --git a/zbar/error.c b/zbar/error.c
      err->buf = realloc(err->buf, len);
      len = sprintf(err->buf, basefmt, sev, mod, func, type);
      if(len <= 0)
-@@ -150,12 +150,14 @@ const char *_zbar_error_string (const vo
+@@ -150,12 +150,14 @@
              return("<unknown>");
      }
  
@@ -26694,9 +32389,9 @@ diff --git a/zbar/error.c b/zbar/error.c
  #ifdef _WIN32
      else if(err->type == ZBAR_ERR_WINAPI) {
          char *syserr = NULL;
-diff --git a/zbar/error.h b/zbar/error.h
---- a/zbar/error.h
-+++ b/zbar/error.h
+diff -r 563557a923d0 zbar/error.h
+--- a/zbar/error.h	Tue Oct 27 11:25:59 2009 -0400
++++ b/zbar/error.h	Fri Feb 22 08:54:29 2013 -0300
 @@ -1,5 +1,5 @@
  /*------------------------------------------------------------------------
 - *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
@@ -26715,7 +32410,7 @@ diff --git a/zbar/error.h b/zbar/error.h
  #include <assert.h>
  
  #include <zbar.h>
-@@ -146,10 +148,12 @@ static inline int err_capture (const voi
+@@ -146,10 +148,12 @@
  {
      errinfo_t *err = (errinfo_t*)container;
      assert(err->magic == ERRINFO_MAGIC);
@@ -26729,9 +32424,9 @@ diff --git a/zbar/error.h b/zbar/error.h
          err->errnum = GetLastError();
  #endif
      err->sev = sev;
-diff --git a/zbar/image.c b/zbar/image.c
---- a/zbar/image.c
-+++ b/zbar/image.c
+diff -r 563557a923d0 zbar/image.c
+--- a/zbar/image.c	Tue Oct 27 11:25:59 2009 -0400
++++ b/zbar/image.c	Fri Feb 22 08:54:29 2013 -0300
 @@ -1,5 +1,5 @@
  /*------------------------------------------------------------------------
 - *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
@@ -26739,7 +32434,7 @@ diff --git a/zbar/image.c b/zbar/image.c
   *
   *  This file is part of the ZBar Bar Code Reader.
   *
-@@ -74,6 +74,26 @@ unsigned zbar_image_get_height (const zb
+@@ -74,6 +74,26 @@
      return(img->height);
  }
  
@@ -26766,7 +32461,7 @@ diff --git a/zbar/image.c b/zbar/image.c
  const void *zbar_image_get_data (const zbar_image_t *img)
  {
      return(img->data);
-@@ -100,8 +120,28 @@ void zbar_image_set_size (zbar_image_t *
+@@ -100,8 +120,28 @@
                            unsigned w,
                            unsigned h)
  {
@@ -26797,7 +32492,7 @@ diff --git a/zbar/image.c b/zbar/image.c
  }
  
  inline void zbar_image_free_data (zbar_image_t *img)
-@@ -109,9 +149,10 @@ inline void zbar_image_free_data (zbar_i
+@@ -109,9 +149,10 @@
      if(!img)
          return;
      if(img->src) {
@@ -26809,7 +32504,7 @@ diff --git a/zbar/image.c b/zbar/image.c
          memcpy(newimg, img, sizeof(zbar_image_t));
          /* recycle video image */
          newimg->cleanup(newimg);
-@@ -162,8 +203,7 @@ zbar_image_t *zbar_image_copy (const zba
+@@ -162,8 +203,7 @@
  {
      zbar_image_t *dst = zbar_image_create();
      dst->format = src->format;
@@ -26819,7 +32514,7 @@ diff --git a/zbar/image.c b/zbar/image.c
      dst->datalen = src->datalen;
      dst->data = malloc(src->datalen);
      assert(dst->data);
-@@ -180,11 +220,11 @@ const zbar_symbol_set_t *zbar_image_get_
+@@ -180,11 +220,11 @@
  void zbar_image_set_symbols (zbar_image_t *img,
                               const zbar_symbol_set_t *syms)
  {
@@ -26833,7 +32528,7 @@ diff --git a/zbar/image.c b/zbar/image.c
  }
  
  const zbar_symbol_t *zbar_image_first_symbol (const zbar_image_t *img)
-@@ -202,29 +242,34 @@ int zbar_image_write (const zbar_image_t
+@@ -202,29 +242,34 @@
                        const char *filebase)
  {
      int len = strlen(filebase) + 16;
@@ -26877,7 +32572,7 @@ diff --git a/zbar/image.c b/zbar/image.c
      hdr.magic = 0x676d697a;
      hdr.format = img->format;
      hdr.width = img->width;
-@@ -233,12 +278,21 @@ int zbar_image_write (const zbar_image_t
+@@ -233,12 +278,21 @@
  
      if(fwrite(&hdr, sizeof(hdr), 1, f) != 1 ||
         fwrite(img->data, 1, img->datalen, f) != img->datalen) {
@@ -26902,9 +32597,9 @@ diff --git a/zbar/image.c b/zbar/image.c
  }
  
  #ifdef DEBUG_SVG
-diff --git a/zbar/image.h b/zbar/image.h
---- a/zbar/image.h
-+++ b/zbar/image.h
+diff -r 563557a923d0 zbar/image.h
+--- a/zbar/image.h	Tue Oct 27 11:25:59 2009 -0400
++++ b/zbar/image.h	Fri Feb 22 08:54:29 2013 -0300
 @@ -1,5 +1,5 @@
  /*------------------------------------------------------------------------
 - *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
@@ -26924,7 +32619,7 @@ diff --git a/zbar/image.h b/zbar/image.h
  
  /* unpack size/location of component */
  #define RGB_SIZE(c)   ((c) >> 5)
-@@ -65,6 +62,8 @@ struct zbar_image_s {
+@@ -65,6 +62,8 @@
      unsigned width, height;     /* image size */
      const void *data;           /* image sample data */
      unsigned long datalen;      /* allocated/mapped size of data */
@@ -26933,7 +32628,7 @@ diff --git a/zbar/image.h b/zbar/image.h
      void *userdata;             /* user specified data associated w/image */
  
      /* cleanup handler */
-@@ -129,4 +128,15 @@ static inline void _zbar_image_swap_symb
+@@ -129,4 +128,15 @@
      b->syms = tmp;
  }
  
@@ -26949,9 +32644,9 @@ diff --git a/zbar/image.h b/zbar/image.h
 +}
 +
  #endif
-diff --git a/zbar/img_scanner.c b/zbar/img_scanner.c
---- a/zbar/img_scanner.c
-+++ b/zbar/img_scanner.c
+diff -r 563557a923d0 zbar/img_scanner.c
+--- a/zbar/img_scanner.c	Tue Oct 27 11:25:59 2009 -0400
++++ b/zbar/img_scanner.c	Fri Feb 22 08:54:29 2013 -0300
 @@ -1,5 +1,5 @@
  /*------------------------------------------------------------------------
 - *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
@@ -26995,15 +32690,17 @@ diff --git a/zbar/img_scanner.c b/zbar/img_scanner.c
  /* time interval for which two images are considered "nearby"
   */
  #define CACHE_PROXIMITY   1000 /* ms */
-@@ -112,6 +108,7 @@ struct zbar_image_scanner_s {
+@@ -111,7 +107,9 @@
+ 
      /* configuration settings */
      unsigned config;            /* config flags */
++    unsigned ean_config;
      int configs[NUM_SCN_CFGS];  /* int valued configurations */
 +    int sym_configs[1][NUM_SYMS]; /* per-symbology configurations */
  
  #ifndef NO_STATS
      int stat_syms_new;
-@@ -136,6 +133,8 @@ void _zbar_image_scanner_recycle_syms (z
+@@ -136,6 +134,8 @@
              sym->next = NULL;
          }
          else {
@@ -27012,7 +32709,7 @@ diff --git a/zbar/img_scanner.c b/zbar/img_scanner.c
              /* recycle unreferenced symbol */
              if(!sym->data_alloc) {
                  sym->data = NULL;
-@@ -149,7 +148,6 @@ void _zbar_image_scanner_recycle_syms (z
+@@ -149,7 +149,6 @@
                  _zbar_symbol_set_free(sym->syms);
                  sym->syms = NULL;
              }
@@ -27020,7 +32717,7 @@ diff --git a/zbar/img_scanner.c b/zbar/img_scanner.c
              for(i = 0; i < RECYCLE_BUCKETS; i++)
                  if(sym->data_alloc < 1 << (i * 2))
                      break;
-@@ -160,7 +158,7 @@ void _zbar_image_scanner_recycle_syms (z
+@@ -160,7 +159,7 @@
                  sym->data_alloc = 0;
                  i = 0;
              }
@@ -27029,7 +32726,7 @@ diff --git a/zbar/img_scanner.c b/zbar/img_scanner.c
              /* FIXME cap bucket fill */
              bucket->nsyms++;
              sym->next = bucket->head;
-@@ -196,18 +194,14 @@ inline void zbar_image_scanner_recycle_i
+@@ -196,18 +195,14 @@
  
      syms = img->syms;
      img->syms = NULL;
@@ -27050,7 +32747,7 @@ diff --git a/zbar/img_scanner.c b/zbar/img_scanner.c
          else
              iscn->syms = syms;
      }
-@@ -219,12 +213,12 @@ _zbar_image_scanner_alloc_sym (zbar_imag
+@@ -219,12 +214,12 @@
                                 int datalen)
  {
      /* recycle old or alloc new symbol */
@@ -27064,7 +32761,7 @@ diff --git a/zbar/img_scanner.c b/zbar/img_scanner.c
      for(; i > 0; i--)
          if((sym = iscn->recycle[i].head)) {
              STAT(sym_recycle[i]);
-@@ -246,6 +240,7 @@ _zbar_image_scanner_alloc_sym (zbar_imag
+@@ -246,6 +241,7 @@
      sym->type = type;
      sym->quality = 1;
      sym->npts = 0;
@@ -27072,7 +32769,7 @@ diff --git a/zbar/img_scanner.c b/zbar/img_scanner.c
      sym->cache_count = 0;
      sym->time = iscn->time;
      assert(!sym->syms);
-@@ -295,27 +290,33 @@ static inline void cache_sym (zbar_image
+@@ -295,27 +291,33 @@
                                zbar_symbol_t *sym)
  {
      if(iscn->enable_cache) {
@@ -27113,7 +32810,7 @@ diff --git a/zbar/img_scanner.c b/zbar/img_scanner.c
          else if(dup || near_thresh)
              entry->cache_count++;
  
-@@ -328,9 +329,10 @@ static inline void cache_sym (zbar_image
+@@ -328,9 +330,10 @@
  void _zbar_image_scanner_add_sym(zbar_image_scanner_t *iscn,
                                   zbar_symbol_t *sym)
  {
@@ -27125,7 +32822,7 @@ diff --git a/zbar/img_scanner.c b/zbar/img_scanner.c
      if(sym->cache_count || !syms->tail) {
          sym->next = syms->head;
          syms->head = sym;
-@@ -358,10 +360,12 @@ extern qr_finder_line *_zbar_decoder_get
+@@ -358,10 +361,12 @@
  
  static inline void qr_handler (zbar_image_scanner_t *iscn)
  {
@@ -27140,7 +32837,7 @@ diff --git a/zbar/img_scanner.c b/zbar/img_scanner.c
      line->boffs = u - zbar_scanner_get_edge(iscn->scn, line->boffs,
                                              QR_FINDER_SUBPREC);
      line->len = zbar_scanner_get_edge(iscn->scn, line->len,
-@@ -372,12 +376,12 @@ static inline void qr_handler (zbar_imag
+@@ -372,12 +377,12 @@
  
      u = QR_FIXED(iscn->umin, 0) + iscn->du * u;
      if(iscn->du < 0) {
@@ -27155,7 +32852,7 @@ diff --git a/zbar/img_scanner.c b/zbar/img_scanner.c
      line->pos[vert] = u;
      line->pos[!vert] = QR_FIXED(iscn->v, 1);
  
-@@ -389,10 +393,10 @@ static void symbol_handler (zbar_decoder
+@@ -389,10 +394,10 @@
  {
      zbar_image_scanner_t *iscn = zbar_decoder_get_userdata(dcode);
      zbar_symbol_type_t type = zbar_decoder_get_type(dcode);
@@ -27170,7 +32867,7 @@ diff --git a/zbar/img_scanner.c b/zbar/img_scanner.c
  
  #ifdef ENABLE_QRCODE
      if(type == ZBAR_QRCODE) {
-@@ -403,10 +407,6 @@ static void symbol_handler (zbar_decoder
+@@ -403,10 +408,6 @@
      assert(type != ZBAR_QRCODE);
  #endif
  
@@ -27181,7 +32878,7 @@ diff --git a/zbar/img_scanner.c b/zbar/img_scanner.c
      if(TEST_CFG(iscn, ZBAR_CFG_POSITION)) {
          /* tmp position fixup */
          int w = zbar_scanner_get_width(iscn->scn);
-@@ -421,13 +421,23 @@ static void symbol_handler (zbar_decoder
+@@ -421,13 +422,23 @@
          }
      }
  
@@ -27206,7 +32903,7 @@ diff --git a/zbar/img_scanner.c b/zbar/img_scanner.c
              if(TEST_CFG(iscn, ZBAR_CFG_POSITION))
                  /* add new point to existing set */
                  /* FIXME should be polygon */
-@@ -436,12 +446,21 @@ static void symbol_handler (zbar_decoder
+@@ -436,12 +447,21 @@
          }
  
      sym = _zbar_image_scanner_alloc_sym(iscn, type, datalen + 1);
@@ -27229,7 +32926,7 @@ diff --git a/zbar/img_scanner.c b/zbar/img_scanner.c
  
      _zbar_image_scanner_add_sym(iscn, sym);
  }
-@@ -468,19 +487,24 @@ zbar_image_scanner_t *zbar_image_scanner
+@@ -468,19 +488,26 @@
      CFG(iscn, ZBAR_CFG_X_DENSITY) = 1;
      CFG(iscn, ZBAR_CFG_Y_DENSITY) = 1;
      zbar_image_scanner_set_config(iscn, 0, ZBAR_CFG_POSITION, 1);
@@ -27238,6 +32935,8 @@ diff --git a/zbar/img_scanner.c b/zbar/img_scanner.c
 +    zbar_image_scanner_set_config(iscn, ZBAR_CODE128, ZBAR_CFG_UNCERTAINTY, 0);
 +    zbar_image_scanner_set_config(iscn, ZBAR_CODE93, ZBAR_CFG_UNCERTAINTY, 0);
 +    zbar_image_scanner_set_config(iscn, ZBAR_CODE39, ZBAR_CFG_UNCERTAINTY, 0);
++    zbar_image_scanner_set_config(iscn, ZBAR_CODABAR, ZBAR_CFG_UNCERTAINTY, 1);
++    zbar_image_scanner_set_config(iscn, ZBAR_COMPOSITE, ZBAR_CFG_UNCERTAINTY, 0);
      return(iscn);
  }
  
@@ -27255,7 +32954,7 @@ diff --git a/zbar/img_scanner.c b/zbar/img_scanner.c
      for(i = 0; i < RECYCLE_BUCKETS; i++)
          zprintf(1, "     recycled[%d]        = %-4d\n",
                  i, iscn->stat_sym_recycle[i]);
-@@ -489,6 +513,7 @@ static inline void dump_stats (const zba
+@@ -489,6 +516,7 @@
  
  void zbar_image_scanner_destroy (zbar_image_scanner_t *iscn)
  {
@@ -27263,7 +32962,7 @@ diff --git a/zbar/img_scanner.c b/zbar/img_scanner.c
      dump_stats(iscn);
      if(iscn->syms) {
          if(iscn->syms->refcnt)
-@@ -503,7 +528,6 @@ void zbar_image_scanner_destroy (zbar_im
+@@ -503,7 +531,6 @@
      if(iscn->dcode)
          zbar_decoder_destroy(iscn->dcode);
      iscn->dcode = NULL;
@@ -27271,11 +32970,17 @@ diff --git a/zbar/img_scanner.c b/zbar/img_scanner.c
      for(i = 0; i < RECYCLE_BUCKETS; i++) {
          zbar_symbol_t *sym, *next;
          for(sym = iscn->recycle[i].head; sym; sym = next) {
-@@ -536,9 +560,24 @@ int zbar_image_scanner_set_config (zbar_
+@@ -536,14 +563,34 @@
                                     zbar_config_t cfg,
                                     int val)
  {
 -    if(cfg < ZBAR_CFG_POSITION)
++    if((sym == 0 || sym == ZBAR_COMPOSITE) && cfg == ZBAR_CFG_ENABLE) {
++        iscn->ean_config = !!val;
++        if(sym)
++            return(0);
++    }
++
 +    if(cfg < ZBAR_CFG_UNCERTAINTY)
          return(zbar_decoder_set_config(iscn->dcode, sym, cfg, val));
  
@@ -27297,7 +33002,12 @@ diff --git a/zbar/img_scanner.c b/zbar/img_scanner.c
      if(sym > ZBAR_PARTIAL)
          return(1);
  
-@@ -591,30 +630,28 @@ static inline void quiet_border (zbar_im
+     if(cfg >= ZBAR_CFG_X_DENSITY && cfg <= ZBAR_CFG_Y_DENSITY) {
+-
+         CFG(iscn, cfg) = val;
+         return(0);
+     }
+@@ -591,30 +638,28 @@
  #define movedelta(dx, dy) do {                  \
          x += (dx);                              \
          y += (dy);                              \
@@ -27337,7 +33047,7 @@ diff --git a/zbar/img_scanner.c b/zbar/img_scanner.c
      if(img->format != fourcc('Y','8','0','0') &&
         img->format != fourcc('G','R','E','Y'))
          return(-1);
-@@ -622,7 +659,7 @@ int zbar_scan_image (zbar_image_scanner_
+@@ -622,7 +667,7 @@
  
      /* recycle previous scanner and image results */
      zbar_image_scanner_recycle_image(iscn, img);
@@ -27346,7 +33056,7 @@ diff --git a/zbar/img_scanner.c b/zbar/img_scanner.c
      if(!syms) {
          syms = iscn->syms = _zbar_symbol_set_create();
          STAT(syms_new);
-@@ -632,37 +669,43 @@ int zbar_scan_image (zbar_image_scanner_
+@@ -632,37 +677,43 @@
          zbar_symbol_set_ref(syms, 2);
      img->syms = syms;
  
@@ -27405,7 +33115,7 @@ diff --git a/zbar/img_scanner.c b/zbar/img_scanner.c
                  uint8_t d = *p;
                  movedelta(1, 0);
                  zbar_scan_y(scn, d);
-@@ -673,14 +716,14 @@ int zbar_scan_image (zbar_image_scanner_
+@@ -673,14 +724,14 @@
  
              movedelta(-1, density);
              iscn->v = y;
@@ -27423,7 +33133,7 @@ diff --git a/zbar/img_scanner.c b/zbar/img_scanner.c
                  uint8_t d = *p;
                  movedelta(-1, 0);
                  zbar_scan_y(scn, d);
-@@ -698,22 +741,25 @@ int zbar_scan_image (zbar_image_scanner_
+@@ -698,22 +749,25 @@
  
      density = CFG(iscn, ZBAR_CFG_X_DENSITY);
      if(density > 0) {
@@ -27457,7 +33167,7 @@ diff --git a/zbar/img_scanner.c b/zbar/img_scanner.c
                  uint8_t d = *p;
                  movedelta(0, 1);
                  zbar_scan_y(scn, d);
-@@ -724,14 +770,14 @@ int zbar_scan_image (zbar_image_scanner_
+@@ -724,14 +778,14 @@
  
              movedelta(density, -1);
              iscn->v = x;
@@ -27475,22 +33185,124 @@ diff --git a/zbar/img_scanner.c b/zbar/img_scanner.c
                  uint8_t d = *p;
                  movedelta(0, -1);
                  zbar_scan_y(scn, d);
-@@ -757,8 +803,9 @@ int zbar_scan_image (zbar_image_scanner_
-        (density == 1 || CFG(iscn, ZBAR_CFG_Y_DENSITY) == 1)) {
-         zbar_symbol_t **symp = &syms->head, *sym;
-         while((sym = *symp)) {
+@@ -753,20 +807,82 @@
+ #endif
+ 
+     /* FIXME tmp hack to filter bad EAN results */
+-    if(syms->nsyms && !iscn->enable_cache &&
+-       (density == 1 || CFG(iscn, ZBAR_CFG_Y_DENSITY) == 1)) {
+-        zbar_symbol_t **symp = &syms->head, *sym;
+-        while((sym = *symp)) {
 -            if(sym->type < ZBAR_I25 && sym->type > ZBAR_PARTIAL &&
 -               sym->quality < 3) {
-+            if(((sym->type < ZBAR_I25 && sym->type > ZBAR_PARTIAL) ||
-+                sym->type == ZBAR_DATABAR || sym->type == ZBAR_DATABAR_EXP) &&
-+               sym->quality < 4) {
-                 /* recycle */
-                 *symp = sym->next;
-                 syms->nsyms--;
-diff --git a/zbar/jpeg.c b/zbar/jpeg.c
---- a/zbar/jpeg.c
-+++ b/zbar/jpeg.c
-@@ -195,10 +195,16 @@ void _zbar_convert_jpeg_to_y (zbar_image
+-                /* recycle */
+-                *symp = sym->next;
+-                syms->nsyms--;
+-                sym->next = NULL;
+-                _zbar_image_scanner_recycle_syms(iscn, sym);
++    /* FIXME tmp hack to merge simple case EAN add-ons */
++    char filter = (!iscn->enable_cache &&
++                   (density == 1 || CFG(iscn, ZBAR_CFG_Y_DENSITY) == 1));
++    int nean = 0, naddon = 0;
++    if(syms->nsyms) {
++        zbar_symbol_t **symp;
++        for(symp = &syms->head; *symp; ) {
++            zbar_symbol_t *sym = *symp;
++            if(sym->cache_count <= 0 &&
++               ((sym->type < ZBAR_COMPOSITE && sym->type > ZBAR_PARTIAL) ||
++                sym->type == ZBAR_DATABAR ||
++                sym->type == ZBAR_DATABAR_EXP ||
++                sym->type == ZBAR_CODABAR))
++            {
++	        if((sym->type == ZBAR_CODABAR || filter) && sym->quality < 4) {
++                    if(iscn->enable_cache) {
++                        /* revert cache update */
++                        zbar_symbol_t *entry = cache_lookup(iscn, sym);
++                        if(entry)
++                            entry->cache_count--;
++                        else
++                            assert(0);
++                    }
++
++                    /* recycle */
++                    *symp = sym->next;
++                    syms->nsyms--;
++                    sym->next = NULL;
++                    _zbar_image_scanner_recycle_syms(iscn, sym);
++                    continue;
++                }
++                else if(sym->type < ZBAR_COMPOSITE &&
++                        sym->type != ZBAR_ISBN10)
++                {
++                    if(sym->type > ZBAR_EAN5)
++                        nean++;
++                    else
++                        naddon++;
++                }
+             }
+-            else
+-                symp = &sym->next;
++            symp = &sym->next;
++        }
++
++        if(nean == 1 && naddon == 1 && iscn->ean_config) {
++            /* create container symbol for composite result */
++            zbar_symbol_t *ean = NULL, *addon = NULL;
++            for(symp = &syms->head; *symp; ) {
++                zbar_symbol_t *sym = *symp;
++                if(sym->type < ZBAR_COMPOSITE && sym->type > ZBAR_PARTIAL) {
++                    /* move to composite */
++                    *symp = sym->next;
++                    syms->nsyms--;
++                    sym->next = NULL;
++                    if(sym->type <= ZBAR_EAN5)
++                        addon = sym;
++                    else
++                        ean = sym;
++                }
++                else
++                    symp = &sym->next;
++            }
++            assert(ean);
++            assert(addon);
++
++            int datalen = ean->datalen + addon->datalen + 1;
++            zbar_symbol_t *ean_sym =
++                _zbar_image_scanner_alloc_sym(iscn, ZBAR_COMPOSITE, datalen);
++            ean_sym->orient = ean->orient;
++            ean_sym->syms = _zbar_symbol_set_create();
++            memcpy(ean_sym->data, ean->data, ean->datalen);
++            memcpy(ean_sym->data + ean->datalen,
++                   addon->data, addon->datalen + 1);
++            ean_sym->syms->head = ean;
++            ean->next = addon;
++            ean_sym->syms->nsyms = 2;
++            _zbar_image_scanner_add_sym(iscn, ean_sym);
+         }
+     }
+ 
+diff -r 563557a923d0 zbar/jpeg.c
+--- a/zbar/jpeg.c	Tue Oct 27 11:25:59 2009 -0400
++++ b/zbar/jpeg.c	Fri Feb 22 08:54:29 2013 -0300
+@@ -79,8 +79,15 @@
+ void skip_input_data (j_decompress_ptr cinfo,
+                       long num_bytes)
+ {
+-    cinfo->src->next_input_byte = NULL;
+-    cinfo->src->bytes_in_buffer = 0;
++    if(num_bytes > 0) {
++        if (num_bytes < cinfo->src->bytes_in_buffer) {
++            cinfo->src->next_input_byte += num_bytes;
++            cinfo->src->bytes_in_buffer -= num_bytes;
++        }
++        else {
++            fill_input_buffer(cinfo);
++        }
++    }
+ }
+ 
+ void term_source (j_decompress_ptr cinfo)
+@@ -195,10 +202,16 @@
      jpeg_start_decompress(cinfo);
  
      /* adjust dst image parameters to match(?) decompressor */
@@ -27509,9 +33321,9 @@ diff --git a/zbar/jpeg.c b/zbar/jpeg.c
      unsigned long datalen = (cinfo->output_width *
                               cinfo->output_height *
                               cinfo->out_color_components);
-diff --git a/zbar/processor.c b/zbar/processor.c
---- a/zbar/processor.c
-+++ b/zbar/processor.c
+diff -r 563557a923d0 zbar/processor.c
+--- a/zbar/processor.c	Tue Oct 27 11:25:59 2009 -0400
++++ b/zbar/processor.c	Fri Feb 22 08:54:29 2013 -0300
 @@ -1,5 +1,5 @@
  /*------------------------------------------------------------------------
 - *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
@@ -27519,21 +33331,21 @@ diff --git a/zbar/processor.c b/zbar/processor.c
   *
   *  This file is part of the ZBar Bar Code Reader.
   *
-@@ -95,11 +95,12 @@ int _zbar_process_image (zbar_processor_
+@@ -95,11 +95,11 @@
              while(sym) {
                  zbar_symbol_type_t type = zbar_symbol_get_type(sym);
                  int count = zbar_symbol_get_count(sym);
 -                zprintf(8, "%s%s: %s (%d pts) (q=%d) (%s)\n",
-+                zprintf(8, "%s%s: %s (%d pts) (dir=%d) (q=%d) (%s)\n",
++                zprintf(8, "%s: %s (%d pts) (dir=%d) (q=%d) (%s)\n",
                          zbar_get_symbol_name(type),
-                         zbar_get_addon_name(type),
+-                        zbar_get_addon_name(type),
                          zbar_symbol_get_data(sym),
                          zbar_symbol_get_loc_size(sym),
 +                        zbar_symbol_get_orientation(sym),
                          zbar_symbol_get_quality(sym),
                          (count < 0) ? "uncertain" :
                          (count > 0) ? "duplicate" : "new");
-@@ -288,6 +289,10 @@ void zbar_processor_destroy (zbar_proces
+@@ -288,6 +288,10 @@
  {
      zbar_processor_init(proc, NULL, 0);
  
@@ -27544,9 +33356,9 @@ diff --git a/zbar/processor.c b/zbar/processor.c
      if(proc->scanner) {
          zbar_image_scanner_destroy(proc->scanner);
          proc->scanner = NULL;
-diff --git a/zbar/qrcode/qrdec.c b/zbar/qrcode/qrdec.c
---- a/zbar/qrcode/qrdec.c
-+++ b/zbar/qrcode/qrdec.c
+diff -r 563557a923d0 zbar/qrcode/qrdec.c
+--- a/zbar/qrcode/qrdec.c	Tue Oct 27 11:25:59 2009 -0400
++++ b/zbar/qrcode/qrdec.c	Fri Feb 22 08:54:29 2013 -0300
 @@ -3,6 +3,7 @@
     GNU Lesser General Public License as published by the Free Software
     Foundation; either version 2.1 of the License, or (at your option) any later
@@ -27555,7 +33367,153 @@ diff --git a/zbar/qrcode/qrdec.c b/zbar/qrcode/qrdec.c
  #include <stdlib.h>
  #include <limits.h>
  #include <string.h>
-@@ -2577,8 +2578,8 @@ static inline void qr_svg_points(const c
+@@ -629,40 +630,46 @@
+   int x0;
+   int y0;
+   int res;
++  int ires;
+ };
+ 
+ 
+ static void qr_aff_init(qr_aff *_aff,
+  const qr_point _p0,const qr_point _p1,const qr_point _p2,int _res){
+   int det;
++  int ires;
+   int dx1;
+   int dy1;
+   int dx2;
+   int dy2;
+   /*det is ensured to be positive by our caller.*/
+-  det=qr_point_ccw(_p0,_p1,_p2);
+   dx1=_p1[0]-_p0[0];
+   dx2=_p2[0]-_p0[0];
+   dy1=_p1[1]-_p0[1];
+   dy2=_p2[1]-_p0[1];
++  det=dx1*dy2-dy1*dx2;
++  ires=QR_MAXI((qr_ilog(abs(det))>>1)-2,0);
+   _aff->fwd[0][0]=dx1;
+   _aff->fwd[0][1]=dx2;
+   _aff->fwd[1][0]=dy1;
+   _aff->fwd[1][1]=dy2;
+-  _aff->inv[0][0]=QR_DIVROUND(dy2<<_res,det);
+-  _aff->inv[0][1]=QR_DIVROUND(-dx2<<_res,det);
+-  _aff->inv[1][0]=QR_DIVROUND(-dy1<<_res,det);
+-  _aff->inv[1][1]=QR_DIVROUND(dx1<<_res,det);
++  _aff->inv[0][0]=QR_DIVROUND(dy2<<_res,det>>ires);
++  _aff->inv[0][1]=QR_DIVROUND(-dx2<<_res,det>>ires);
++  _aff->inv[1][0]=QR_DIVROUND(-dy1<<_res,det>>ires);
++  _aff->inv[1][1]=QR_DIVROUND(dx1<<_res,det>>ires);
+   _aff->x0=_p0[0];
+   _aff->y0=_p0[1];
+   _aff->res=_res;
++  _aff->ires=ires;
+ }
+ 
+ /*Map from the image (at subpel resolution) into the square domain.*/
+ static void qr_aff_unproject(qr_point _q,const qr_aff *_aff,
+  int _x,int _y){
+-  _q[0]=_aff->inv[0][0]*(_x-_aff->x0)+_aff->inv[0][1]*(_y-_aff->y0);
+-  _q[1]=_aff->inv[1][0]*(_x-_aff->x0)+_aff->inv[1][1]*(_y-_aff->y0);
++  _q[0]=_aff->inv[0][0]*(_x-_aff->x0)+_aff->inv[0][1]*(_y-_aff->y0)
++   +(1<<_aff->ires>>1)>>_aff->ires;
++  _q[1]=_aff->inv[1][0]*(_x-_aff->x0)+_aff->inv[1][1]*(_y-_aff->y0)
++   +(1<<_aff->ires>>1)>>_aff->ires;
+ }
+ 
+ /*Map from the square domain into the image (at subpel resolution).*/
+@@ -1893,10 +1900,10 @@
+   if(nc[0]){
+     dx=QR_DIVROUND(c[0][0],nc[0]);
+     dy=QR_DIVROUND(c[0][1],nc[0]);
+-    /*But only if it doesn't make things worse.*/
++    /*But only if it doesn't make things too much worse.*/
+     match=qr_alignment_pattern_fetch(p,bestx+dx,besty+dy,_img,_width,_height);
+     dist=qr_hamming_dist(match,0x1F8D63F,best_dist+1);
+-    if(dist<=best_dist){
++    if(dist<=best_dist+1){
+       bestx+=dx;
+       besty+=dy;
+     }
+@@ -2096,7 +2103,7 @@
+             rlastfit=nr;
+           }
+         }
+-        else nrempty=0;
++        nrempty=0;
+       }
+       else nrempty++;
+       ru+=dru;
+@@ -2217,11 +2224,11 @@
+      _p[2][0],_p[2][1],_p[3][0],_p[3][1]);
+     if(qr_alignment_pattern_search(p3,&cell,dim-7,dim-7,4,
+      _img,_width,_height)>=0){
+-      int c21;
+-      int dx21;
+-      int dy21;
+-      int mask;
+-      int w;
++      long long w;
++      long long mask;
++      int       c21;
++      int       dx21;
++      int       dy21;
+       /*There's no real need to update the bounding box corner, and in fact we
+          actively perform worse if we do.
+         Clearly it was good enough for us to find this alignment pattern, so
+@@ -2237,10 +2244,13 @@
+       c21=_p[2][0]*_p[1][1]-_p[2][1]*_p[1][0];
+       dx21=_p[2][0]-_p[1][0];
+       dy21=_p[2][1]-_p[1][1];
+-      w=(dim-7)*c21
+-       +(dim-13)*(_p[0][0]*dy21-_p[0][1]*dx21)+6*(p3[0]*dy21-p3[1]*dx21);
++      w=QR_EXTMUL(dim-7,c21,
++       QR_EXTMUL(dim-13,_p[0][0]*dy21-_p[0][1]*dx21,
++       QR_EXTMUL(6,p3[0]*dy21-p3[1]*dx21,0)));
++      /*The projection failed: invalid geometry.*/
++      if(w==0)return -1;
+       mask=QR_SIGNMASK(w);
+-      w=abs(w);
++      w=w+mask^mask;
+       brx=(int)QR_DIVROUND(QR_EXTMUL((dim-7)*_p[0][0],p3[0]*dy21,
+        QR_EXTMUL((dim-13)*p3[0],c21-_p[0][1]*dx21,
+        QR_EXTMUL(6*_p[0][0],c21-p3[1]*dx21,0)))+mask^mask,w);
+@@ -2356,11 +2366,10 @@
+     w0+=dwi;
+   }
+   ret=bch18_6_correct(&v);
+-  /*TODO: I'd certainly hope the order the version bits is accessed in is
+-     well-defined, but I seem to have images for two different codes with the
+-     same version using two different orders?
+-    Maybe the other one is a model 1 code?
+-    Even if I parse the version here, I can't decode the rest of the code.
++  /*TODO: I seem to have an image with the version bits in a different order
++     (the transpose of the standard order).
++    Even if I change the order here so I can parse the version on this image,
++     I can't decode the rest of the code.
+     If this is really needed, we should just re-order the bits.*/
+ #if 0
+   if(ret<0){
+@@ -2478,16 +2487,9 @@
+     y+=dy;
+     w+=dw;
+   }
+-  /*For the 8th bit we have 3 samples... use the majority value.
+-    TODO: The DL bit appears to be wrong as much as right? Guess it's not
+-     really a third copy after all, but doesn't appear to be used for data.
+-  i=((lo[0]>>7&1)+(lo[1]>>7&1)+(hi[1]>>7&1)>>1)<<7;
+-  lo[0]=lo[0]&~0x80|i;
+-  lo[1]=lo[1]&~0x80|i;
+-  hi[1]&=~0x80;*/
+-  /*For the remaining bits we have two samples... try them in all
+-     combinations and pick the most popular valid code, breaking ties using
+-     the number of bit errors.*/
++  /*For each group of bits we have two samples... try them in all combinations
++     and pick the most popular valid code, breaking ties using the number of
++     bit errors.*/
+   imax=2<<(hi[0]!=hi[1]);
+   di=1+(lo[0]==lo[1]);
+   nfmt_info=0;
+@@ -2577,8 +2579,8 @@
                                   qr_point *p,
                                   int n)
  {
@@ -27565,7 +33523,361 @@ diff --git a/zbar/qrcode/qrdec.c b/zbar/qrcode/qrdec.c
      for(i = 0; i < n; i++, p++)
          svg_path_moveto(SVG_ABS, p[0][0], p[0][1]);
      svg_path_end();
-@@ -3913,7 +3914,7 @@ int _zbar_qr_decode (qr_reader *reader,
+@@ -3184,6 +3186,7 @@
+ static int qr_code_data_parse(qr_code_data *_qrdata,int _version,
+  const unsigned char *_data,int _ndata){
+   qr_pack_buf qpb;
++  unsigned    self_parity;
+   int         centries;
+   int         len_bits_idx;
+   /*Entries are stored directly in the struct during parsing.
+@@ -3191,6 +3194,7 @@
+   _qrdata->entries=NULL;
+   _qrdata->nentries=0;
+   _qrdata->sa_size=0;
++  self_parity=0;
+   centries=0;
+   /*The versions are divided into 3 ranges that each use a different number of
+      bits for length fields.*/
+@@ -3209,9 +3213,10 @@
+        centries*sizeof(*_qrdata->entries));
+     }
+     entry=_qrdata->entries+_qrdata->nentries++;
+-    /*Set the mode to an invalid value until we allocate a buffer for it.
+-      This ensures we don't try to free it on clean-up until then.*/
+-    entry->mode=-1;
++    entry->mode=mode;
++    /*Set the buffer to NULL, because if parsing fails, we might try to free it
++       on clean-up.*/
++    entry->payload.data.buf=NULL;
+     switch(mode){
+       /*The number of bits used to encode the character count for each version
+          range and each data mode.*/
+@@ -3223,6 +3228,7 @@
+       case QR_MODE_NUM:{
+         unsigned char *buf;
+         unsigned       bits;
++        unsigned       c;
+         int            len;
+         int            count;
+         int            rem;
+@@ -3233,35 +3239,47 @@
+         count=len/3;
+         rem=len%3;
+         if(qr_pack_buf_avail(&qpb)<10*count+7*(rem>>1&1)+4*(rem&1))return -1;
+-        entry->mode=mode;
+         entry->payload.data.buf=buf=(unsigned char *)malloc(len*sizeof(*buf));
+         entry->payload.data.len=len;
+         /*Read groups of 3 digits encoded in 10 bits.*/
+         while(count-->0){
+           bits=qr_pack_buf_read(&qpb,10);
+           if(bits>=1000)return -1;
+-          *buf++=(unsigned char)('0'+bits/100);
++          c='0'+bits/100;
++          self_parity^=c;
++          *buf++=(unsigned char)c;
+           bits%=100;
+-          *buf++=(unsigned char)('0'+bits/10);
+-          *buf++=(unsigned char)('0'+bits%10);
++          c='0'+bits/10;
++          self_parity^=c;
++          *buf++=(unsigned char)c;
++          c='0'+bits%10;
++          self_parity^=c;
++          *buf++=(unsigned char)c;
+         }
+         /*Read the last two digits encoded in 7 bits.*/
+         if(rem>1){
+           bits=qr_pack_buf_read(&qpb,7);
+           if(bits>=100)return -1;
+-          *buf++=(unsigned char)('0'+bits/10);
+-          *buf++=(unsigned char)('0'+bits%10);
++          c='0'+bits/10;
++          self_parity^=c;
++          *buf++=(unsigned char)c;
++          c='0'+bits%10;
++          self_parity^=c;
++          *buf++=(unsigned char)c;
+         }
+         /*Or the last one digit encoded in 4 bits.*/
+         else if(rem){
+           bits=qr_pack_buf_read(&qpb,4);
+           if(bits>=10)return -1;
+-          *buf++=(unsigned char)('0'+bits);
++          c='0'+bits;
++          self_parity^=c;
++          *buf++=(unsigned char)c;
+         }
+       }break;
+       case QR_MODE_ALNUM:{
+         unsigned char *buf;
+         unsigned       bits;
++        unsigned       c;
+         int            len;
+         int            count;
+         int            rem;
+@@ -3272,56 +3290,67 @@
+         count=len>>1;
+         rem=len&1;
+         if(qr_pack_buf_avail(&qpb)<11*count+6*rem)return -1;
+-        entry->mode=mode;
+         entry->payload.data.buf=buf=(unsigned char *)malloc(len*sizeof(*buf));
+         entry->payload.data.len=len;
+         /*Read groups of two characters encoded in 11 bits.*/
+         while(count-->0){
+           bits=qr_pack_buf_read(&qpb,11);
+           if(bits>=2025)return -1;
+-          *buf++=QR_ALNUM_TABLE[bits/45];
+-          *buf++=QR_ALNUM_TABLE[bits%45];
++          c=QR_ALNUM_TABLE[bits/45];
++          self_parity^=c;
++          *buf++=(unsigned char)c;
++          c=QR_ALNUM_TABLE[bits%45];
++          self_parity^=c;
++          *buf++=(unsigned char)c;
+           len-=2;
+         }
+         /*Read the last character encoded in 6 bits.*/
+         if(rem){
+           bits=qr_pack_buf_read(&qpb,6);
+           if(bits>=45)return -1;
+-          *buf++=QR_ALNUM_TABLE[bits];
++          c=QR_ALNUM_TABLE[bits];
++          self_parity^=c;
++          *buf++=(unsigned char)c;
+         }
+       }break;
+       /*Structured-append header.*/
+       case QR_MODE_STRUCT:{
+         int bits;
+-        entry->mode=mode;
+         bits=qr_pack_buf_read(&qpb,16);
+         if(bits<0)return -1;
+-        /*We also save a copy of the data in _qrdata for easy reference when
++        /*We save a copy of the data in _qrdata for easy reference when
+            grouping structured-append codes.
+-          If for some reason the code has multiple S-A headers, last one wins
+-           (TODO: should we return an error instead?).*/
+-        _qrdata->sa_index=entry->payload.sa.sa_index=
+-         (unsigned char)(bits>>12&0xF);
+-        _qrdata->sa_size=entry->payload.sa.sa_size=
+-         (unsigned char)((bits>>8&0xF)+1);
+-        _qrdata->sa_parity=entry->payload.sa.sa_parity=
+-         (unsigned char)(bits&0xFF);
++          If for some reason the code has multiple S-A headers, first one wins,
++           since it is supposed to come before everything else (TODO: should we
++           return an error instead?).*/
++        if(_qrdata->sa_size==0){
++          _qrdata->sa_index=entry->payload.sa.sa_index=
++           (unsigned char)(bits>>12&0xF);
++          _qrdata->sa_size=entry->payload.sa.sa_size=
++           (unsigned char)((bits>>8&0xF)+1);
++          _qrdata->sa_parity=entry->payload.sa.sa_parity=
++           (unsigned char)(bits&0xFF);
++        }
+       }break;
+       case QR_MODE_BYTE:{
+         unsigned char *buf;
++        unsigned       c;
+         int            len;
+         len=qr_pack_buf_read(&qpb,LEN_BITS[len_bits_idx][2]);
+         if(len<0)return -1;
+         /*Check to see if there are enough bits left now, so we don't have to
+            in the decode loop.*/
+         if(qr_pack_buf_avail(&qpb)<len<<3)return -1;
+-        entry->mode=mode;
+         entry->payload.data.buf=buf=(unsigned char *)malloc(len*sizeof(*buf));
+         entry->payload.data.len=len;
+-        while(len-->0)*buf++=(unsigned char)qr_pack_buf_read(&qpb,8);
++        while(len-->0){
++          c=qr_pack_buf_read(&qpb,8);
++          self_parity^=c;
++          *buf++=(unsigned char)c;
++        }
+       }break;
+       /*FNC1 first position marker.*/
+-      case QR_MODE_FNC1_1ST:entry->mode=mode;break;
++      case QR_MODE_FNC1_1ST:break;
+       /*Extended Channel Interpretation data.*/
+       case QR_MODE_ECI:{
+         unsigned val;
+@@ -3349,7 +3378,6 @@
+         }
+         /*Invalid lead byte.*/
+         else return -1;
+-        entry->mode=mode;
+         entry->payload.eci=val;
+       }break;
+       case QR_MODE_KANJI:{
+@@ -3361,7 +3389,6 @@
+         /*Check to see if there are enough bits left now, so we don't have to
+            in the decode loop.*/
+         if(qr_pack_buf_avail(&qpb)<13*len)return -1;
+-        entry->mode=mode;
+         entry->payload.data.buf=buf=(unsigned char *)malloc(2*len*sizeof(*buf));
+         entry->payload.data.len=2*len;
+         /*Decode 2-byte SJIS characters encoded in 13 bits.*/
+@@ -3369,14 +3396,28 @@
+           bits=qr_pack_buf_read(&qpb,13);
+           bits=(bits/0xC0<<8|bits%0xC0)+0x8140;
+           if(bits>=0xA000)bits+=0x4000;
+-          /*Are values 0xXX7F, 0xXXFD...0xXXFF always invalid?
++          /*TODO: Are values 0xXX7F, 0xXXFD...0xXXFF always invalid?
+             Should we reject them here?*/
++          self_parity^=bits;
+           *buf++=(unsigned char)(bits>>8);
+           *buf++=(unsigned char)(bits&0xFF);
+         }
+       }break;
+       /*FNC1 second position marker.*/
+-      case QR_MODE_FNC1_2ND:entry->mode=mode;break;
++      case QR_MODE_FNC1_2ND:{
++        int bits;
++        /*FNC1 in the 2nd position encodes an Application Indicator in one
++           byte, which is either a letter (A...Z or a...z) or a 2-digit number.
++          The letters are encoded with their ASCII value plus 100, the numbers
++           are encoded directly with their numeric value.
++          Values 100...164, 191...196, and 223...255 are invalid, so we reject
++           them here.*/
++        bits=qr_pack_buf_read(&qpb,8);
++        if(!(bits>=0&&bits<100||bits>=165&&bits<191||bits>=197&&bits<223)){
++          return -1;
++        }
++        entry->payload.ai=bits;
++      }break;
+       /*Unknown mode number:*/
+       default:{
+         /*Unfortunately, because we have to understand the format of a mode to
+@@ -3386,9 +3427,11 @@
+       }break;
+     }
+   }
+-  /*TODO: If there was a S-A header, we should compute the parity of this
+-     code; how are non-data modes handled (ECI, FNC1)?*/
+-  _qrdata->self_parity=0;
++  /*Store the parity of the data from this code, for S-A.
++    The final parity is the 8-bit XOR of all the decoded bytes of literal data.
++    We don't combine the 2-byte kanji codes into one byte in the loops above,
++     because we can just do it here instead.*/
++  _qrdata->self_parity=((self_parity>>8)^self_parity)&0xFF;
+   /*Success.*/
+   _qrdata->entries=(qr_code_data_entry *)realloc(_qrdata->entries,
+    _qrdata->nentries*sizeof(*_qrdata->entries));
+@@ -3565,7 +3608,17 @@
+     int block_szi;
+     int ndatai;
+     block_szi=block_sz+(i>=nshort_blocks);
+-    if(rs_correct(_gf,QR_M0,block_data+ncodewords,block_szi,npar,NULL,0)<0){
++    ret=rs_correct(_gf,QR_M0,block_data+ncodewords,block_szi,npar,NULL,0);
++    /*For version 1 symbols and version 2-L and 3-L symbols, we aren't allowed
++       to use all the parity bytes for correction.
++      They are instead used to improve detection.
++      Version 1-L reserves 3 parity bytes for detection.
++      Versions 1-M and 2-L reserve 2 parity bytes for detection.
++      Versions 1-Q, 1-H, and 3-L reserve 1 parity byte for detection.
++      We can ignore the version 3-L restriction because it has an odd number of
++       parity bytes, and we don't support erasure detection.*/
++    if(ret<0||_version==1&&ret>ecc_level+1<<1||
++     _version==2&&ecc_level==0&&ret>4){
+       ret=-1;
+       break;
+     }
+@@ -3627,6 +3680,7 @@
+     qr_finder ul;
+     qr_finder ur;
+     qr_finder dl;
++    qr_point  bbox[4];
+     int       res;
+     int       ur_version;
+     int       dl_version;
+@@ -3663,10 +3717,11 @@
+ #endif
+     /*If we made it this far, upgrade the affine homography to a full
+        homography.*/
+-    if(qr_hom_fit(&hom,&ul,&ur,&dl,_qrdata->bbox,&aff,
++    if(qr_hom_fit(&hom,&ul,&ur,&dl,bbox,&aff,
+      &_reader->isaac,_img,_width,_height)<0){
+       continue;
+     }
++    memcpy(_qrdata->bbox,bbox,sizeof(bbox));
+     qr_hom_unproject(ul.o,&hom,ul.c->pos[0],ul.c->pos[1]);
+     qr_hom_unproject(ur.o,&hom,ur.c->pos[0],ur.c->pos[1]);
+     qr_hom_unproject(dl.o,&hom,dl.c->pos[0],dl.c->pos[1]);
+@@ -3789,14 +3844,37 @@
+       continue;
+     }
+     fmt_info=qr_finder_fmt_info_decode(&ul,&ur,&dl,&hom,_img,_width,_height);
+-    if(fmt_info<0)continue;
+-    if(qr_code_decode(_qrdata,&_reader->gf,ul.c->pos,ur.c->pos,dl.c->pos,
++    if(fmt_info<0||
++     qr_code_decode(_qrdata,&_reader->gf,ul.c->pos,ur.c->pos,dl.c->pos,
+      ur_version,fmt_info,_img,_width,_height)<0){
+-      /*TODO: Maybe somebody flipped the code?
+-        We'd still get a valid version, and probably valid (but incorrect)
+-         format info.
+-        After we've come this far, it should be a simple matter to check.*/
+-      continue;
++      /*The code may be flipped.
++        Try again, swapping the UR and DL centers.
++        We should get a valid version either way, so it's relatively cheap to
++         check this, as we've already filtered out a lot of invalid
++         configurations.*/
++      QR_SWAP2I(hom.inv[0][0],hom.inv[1][0]);
++      QR_SWAP2I(hom.inv[0][1],hom.inv[1][1]);
++      QR_SWAP2I(hom.fwd[0][0],hom.fwd[0][1]);
++      QR_SWAP2I(hom.fwd[1][0],hom.fwd[1][1]);
++      QR_SWAP2I(hom.fwd[2][0],hom.fwd[2][1]);
++      QR_SWAP2I(ul.o[0],ul.o[1]);
++      QR_SWAP2I(ul.size[0],ul.size[1]);
++      QR_SWAP2I(ur.o[0],ur.o[1]);
++      QR_SWAP2I(ur.size[0],ur.size[1]);
++      QR_SWAP2I(dl.o[0],dl.o[1]);
++      QR_SWAP2I(dl.size[0],dl.size[1]);
++#if defined(QR_DEBUG)
++      qr_finder_dump_hom_undistorted(&ul,&dl,&ur,&hom,_img,_width,_height);
++#endif
++      fmt_info=qr_finder_fmt_info_decode(&ul,&dl,&ur,&hom,_img,_width,_height);
++      if(fmt_info<0)continue;
++      QR_SWAP2I(bbox[1][0],bbox[2][0]);
++      QR_SWAP2I(bbox[1][1],bbox[2][1]);
++      memcpy(_qrdata->bbox,bbox,sizeof(bbox));
++      if(qr_code_decode(_qrdata,&_reader->gf,ul.c->pos,dl.c->pos,ur.c->pos,
++       ur_version,fmt_info,_img,_width,_height)<0){
++        continue;
++      }
+     }
+     return ur_version;
+   }
+@@ -3809,10 +3887,14 @@
+   /*The number of centers should be small, so an O(n^3) exhaustive search of
+      which ones go together should be reasonable.*/
+   unsigned char *mark;
++  int            nfailures_max;
++  int            nfailures;
+   int            i;
+   int            j;
+   int            k;
+   mark=(unsigned char *)calloc(_ncenters,sizeof(*mark));
++  nfailures_max=QR_MAXI(8192,_width*_height>>9);
++  nfailures=0;
+   for(i=0;i<_ncenters;i++){
+     /*TODO: We might be able to accelerate this step significantly by
+        considering the remaining finder centers in a more intelligent order,
+@@ -3865,6 +3947,13 @@
+           }
+           /*Mark _all_ such centers used: codes cannot partially overlap.*/
+           for(l=0;l<_ncenters;l++)if(mark[l]==2)mark[l]=1;
++          nfailures=0;
++        }
++        else if(++nfailures>nfailures_max){
++          /*Give up.
++            We're unlikely to find a valid code in all this clutter, and we
++             could spent quite a lot of time trying.*/
++          i=j=k=_ncenters;
+         }
+       }
+     }
+@@ -3913,7 +4002,7 @@
                       zbar_image_scanner_t *iscn,
                       zbar_image_t *img)
  {
@@ -27574,7 +33886,7 @@ diff --git a/zbar/qrcode/qrdec.c b/zbar/qrcode/qrdec.c
      qr_finder_edge_pt *edge_pts = NULL;
      qr_finder_center *centers = NULL;
  
-@@ -3923,7 +3924,7 @@ int _zbar_qr_decode (qr_reader *reader,
+@@ -3923,7 +4012,7 @@
  
      svg_group_start("finder", 0, 1. / (1 << QR_FINDER_SUBPREC), 0, 0, 0);
  
@@ -27583,9 +33895,32 @@ diff --git a/zbar/qrcode/qrdec.c b/zbar/qrcode/qrdec.c
  
      zprintf(14, "%dx%d finders, %d centers:\n",
              reader->finder_lines[0].nlines,
-diff --git a/zbar/qrcode/qrdectxt.c b/zbar/qrcode/qrdectxt.c
---- a/zbar/qrcode/qrdectxt.c
-+++ b/zbar/qrcode/qrdectxt.c
+diff -r 563557a923d0 zbar/qrcode/qrdec.h
+--- a/zbar/qrcode/qrdec.h	Tue Oct 27 11:25:59 2009 -0400
++++ b/zbar/qrcode/qrdec.h	Fri Feb 22 08:54:29 2013 -0300
+@@ -85,7 +85,9 @@
+   QR_ECI_ISO8859_16,
+   /*ECI 000019 is reserved?*/
+   /*Shift-JIS.*/
+-  QR_ECI_SJIS=20
++  QR_ECI_SJIS=20,
++  /*UTF-8.*/
++  QR_ECI_UTF8=26
+ }qr_eci_encoding;
+ 
+ 
+@@ -101,6 +103,8 @@
+     }data;
+     /*Decoded "Extended Channel Interpretation" data.*/
+     unsigned eci;
++    /*Decoded "Application Indicator" for FNC1 in 2nd position.*/
++    int      ai;
+     /*Structured-append header data.*/
+     struct{
+       unsigned char sa_index;
+diff -r 563557a923d0 zbar/qrcode/qrdectxt.c
+--- a/zbar/qrcode/qrdectxt.c	Tue Oct 27 11:25:59 2009 -0400
++++ b/zbar/qrcode/qrdectxt.c	Fri Feb 22 08:54:29 2013 -0300
 @@ -1,8 +1,9 @@
 -/*Copyright (C) 2008-2009  Timothy B. Terriberry (tterribe@xiph.org)
 +/*Copyright (C) 2008-2010  Timothy B. Terriberry (tterribe@xiph.org)
@@ -27597,7 +33932,15 @@ diff --git a/zbar/qrcode/qrdectxt.c b/zbar/qrcode/qrdectxt.c
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
-@@ -50,12 +51,10 @@ int qr_code_data_list_extract_text(const
+@@ -11,6 +12,7 @@
+ #include "qrdec.h"
+ #include "util.h"
+ #include "image.h"
++#include "decoder.h"
+ #include "error.h"
+ #include "img_scanner.h"
+ 
+@@ -50,12 +52,10 @@
    const qr_code_data  *qrdata;
    int                  nqrdata;
    unsigned char       *mark;
@@ -27610,7 +33953,13 @@ diff --git a/zbar/qrcode/qrdectxt.c b/zbar/qrcode/qrdectxt.c
    mark=(unsigned char *)calloc(nqrdata,sizeof(*mark));
    ntext=0;
    /*This is the encoding the standard says is the default.*/
-@@ -79,6 +78,10 @@ int qr_code_data_list_extract_text(const
+@@ -75,10 +75,16 @@
+     size_t                    sa_ntext;
+     size_t                    sa_ctext;
+     int                       fnc1;
++    int                       fnc1_2ai;
++    int                       has_kanji;
+     int                       eci;
      int                       err;
      int                       j;
      int                       k;
@@ -27621,7 +33970,60 @@ diff --git a/zbar/qrcode/qrdectxt.c b/zbar/qrcode/qrdectxt.c
      /*Step 0: Collect the other QR codes belonging to this S-A group.*/
      if(qrdata[i].sa_size){
        unsigned sa_parity;
-@@ -138,7 +141,6 @@ int qr_code_data_list_extract_text(const
+@@ -103,6 +109,8 @@
+ 
+     sa_ctext=0;
+     fnc1=0;
++    fnc1_2ai=0;
++    has_kanji=0;
+     /*Step 1: Detect FNC1 markers and estimate the required buffer size.*/
+     for(j=0;j<sa_size;j++)if(sa[j]>=0){
+       qrdataj=qrdata+sa[j];
+@@ -112,13 +120,20 @@
+         shift=0;
+         switch(entry->mode){
+           /*FNC1 applies to the entire code and ignores subsequent markers.*/
+-          case QR_MODE_FNC1_1ST:
+-          case QR_MODE_FNC1_2ND:fnc1=1;break;
+-          /*2 SJIS bytes will be at most 4 UTF-8 bytes.*/
+-          case QR_MODE_KANJI:shift++;
++          case QR_MODE_FNC1_1ST:{
++            if(!fnc1)fnc1=MOD(ZBAR_MOD_GS1);
++          }break;
++          case QR_MODE_FNC1_2ND:{
++            if(!fnc1){
++              fnc1=MOD(ZBAR_MOD_AIM);
++              fnc1_2ai=entry->payload.ai;
++              sa_ctext+=2;
++            }
++          }break;
+           /*We assume at most 4 UTF-8 bytes per input byte.
+             I believe this is true for all the encodings we actually use.*/
+-          case QR_MODE_BYTE:shift++;
++          case QR_MODE_KANJI:has_kanji=1;
++          case QR_MODE_BYTE:shift=2;
+           default:{
+             /*The remaining two modes are already valid UTF-8.*/
+             if(QR_MODE_HAS_DATA(entry->mode)){
+@@ -132,13 +147,24 @@
+     /*Step 2: Convert the entries.*/
+     sa_text=(char *)malloc((sa_ctext+1)*sizeof(*sa_text));
+     sa_ntext=0;
++    /*Add the encoded Application Indicator for FNC1 in the second position.*/
++    if(fnc1==MOD(ZBAR_MOD_AIM)){
++      if(fnc1_2ai<100){
++        /*The Application Indicator is a 2-digit number.*/
++        sa_text[sa_ntext++]='0'+fnc1_2ai/10;
++        sa_text[sa_ntext++]='0'+fnc1_2ai%10;
++      }
++      /*The Application Indicator is a single letter.
++        We already checked that it lies in one of the ranges A...Z, a...z
++         when we decoded it.*/
++      else sa_text[sa_ntext++]=(char)(fnc1_2ai-100);
++    }
+     eci=-1;
+     enc_list[0]=sjis_cd;
+     enc_list[1]=latin1_cd;
      enc_list[2]=utf8_cd;
      eci_cd=(iconv_t)-1;
      err=0;
@@ -27629,7 +34031,7 @@ diff --git a/zbar/qrcode/qrdectxt.c b/zbar/qrcode/qrdectxt.c
      for(j = 0; j < sa_size && !err; j++, sym = &(*sym)->next) {
        *sym = _zbar_image_scanner_alloc_sym(iscn, ZBAR_QRCODE, 0);
        (*sym)->datalen = sa_ntext;
-@@ -167,6 +169,14 @@ int qr_code_data_list_extract_text(const
+@@ -167,6 +193,14 @@
        sym_add_point(*sym, qrdataj->bbox[3][0], qrdataj->bbox[3][1]);
        sym_add_point(*sym, qrdataj->bbox[1][0], qrdataj->bbox[1][1]);
  
@@ -27644,7 +34046,91 @@ diff --git a/zbar/qrcode/qrdectxt.c b/zbar/qrcode/qrdectxt.c
        for(k=0;k<qrdataj->nentries&&!err;k++){
          size_t              inleft;
          size_t              outleft;
-@@ -331,26 +341,27 @@ int qr_code_data_list_extract_text(const
+@@ -220,7 +254,8 @@
+             Does such a thing occur?
+             Is it allowed?
+             It requires copying buffers around to handle correctly.*/
+-          case QR_MODE_BYTE:{
++          case QR_MODE_BYTE:
++          case QR_MODE_KANJI:{
+             in=(char *)entry->payload.data.buf;
+             inleft=entry->payload.data.len;
+             out=sa_text+sa_ntext;
+@@ -228,8 +263,13 @@
+             /*If we have no specified encoding, attempt to auto-detect it.*/
+             if(eci<0){
+               int ei;
+-              /*First check for the UTF-8 BOM.*/
+-              if(inleft>=3&&
++              /*If there was data encoded in kanji mode, assume it's SJIS.*/
++              if(has_kanji)enc_list_mtf(enc_list,sjis_cd);
++              /*Otherwise check for the UTF-8 BOM.
++                UTF-8 is rarely specified with ECI, and few decoders
++                 currently support doing so, so this is the best way for
++                 encoders to reliably indicate it.*/
++              else if(inleft>=3&&
+                in[0]==(char)0xEF&&in[1]==(char)0xBB&&in[2]==(char)0xBF){
+                 in+=3;
+                 inleft-=3;
+@@ -246,15 +286,17 @@
+                 out=sa_text+sa_ntext;
+                 outleft=sa_ctext-sa_ntext;
+               }
+-              /*If the text is 8-bit clean, prefer UTF-8 over SJIS, since SJIS
+-                 will corrupt the backslashes used for DoCoMo formats.*/
++              /*If the text is 8-bit clean, prefer UTF-8 over SJIS, since
++                 SJIS will corrupt the backslashes used for DoCoMo formats.*/
+               else if(text_is_ascii((unsigned char *)in,inleft)){
+                 enc_list_mtf(enc_list,utf8_cd);
+               }
+               /*Try our list of encodings.*/
+               for(ei=0;ei<3;ei++)if(enc_list[ei]!=(iconv_t)-1){
+-                /*According to the standard, ISO/IEC 8859-1 (one hyphen) is
+-                   supposed to be used, but reality is not always so.
++                /*According to the 2005 version of the standard,
++                   ISO/IEC 8859-1 (one hyphen) is supposed to be used, but
++                   reality is not always so (and in the 2000 version of the
++                   standard, it was JIS8/SJIS that was the default).
+                   It's got an invalid range that is used often with SJIS
+                    and UTF-8, though, which makes detection easier.
+                   However, iconv() does not properly reject characters in
+@@ -280,23 +322,16 @@
+                 outleft=sa_ctext-sa_ntext;
+               }
+             }
+-            /*We were actually given a character set; use it.*/
++            /*We were actually given a character set; use it.
++              The spec says that in this case, data should be treated as if it
++               came from the given character set even when encoded in kanji
++               mode.*/
+             else{
+               err=eci_cd==(iconv_t)-1||
+                iconv(eci_cd,&in,&inleft,&out,&outleft)==(size_t)-1;
+               if(!err)sa_ntext=out-sa_text;
+             }
+           }break;
+-          /*Kanji mode always uses SJIS.*/
+-          case QR_MODE_KANJI:{
+-            in=(char *)entry->payload.data.buf;
+-            inleft=entry->payload.data.len;
+-            out=sa_text+sa_ntext;
+-            outleft=sa_ctext-sa_ntext;
+-            err=sjis_cd==(iconv_t)-1||
+-             iconv(sjis_cd,&in,&inleft,&out,&outleft)==(size_t)-1;
+-            if(!err)sa_ntext=out-sa_text;
+-          }break;
+           /*Check to see if a character set was specified.*/
+           case QR_MODE_ECI:{
+             const char *enc;
+@@ -313,6 +348,7 @@
+               else enc="CP437";
+             }
+             else if(cur_eci==QR_ECI_SJIS)enc="SJIS";
++            else if(cur_eci==QR_ECI_UTF8)enc="UTF-8";
+             /*Don't know what this ECI code specifies, but not an encoding that
+                we recognize.*/
+             else continue;
+@@ -331,26 +367,27 @@
      }
      if(eci_cd!=(iconv_t)-1)iconv_close(eci_cd);
      if(!err){
@@ -27677,7 +34163,7 @@ diff --git a/zbar/qrcode/qrdectxt.c b/zbar/qrcode/qrdectxt.c
                _zbar_symbol_refcnt(syms, 1);
                if(syms->type == ZBAR_PARTIAL)
                    sa_sym->type = ZBAR_PARTIAL;
-@@ -364,7 +375,7 @@ int qr_code_data_list_extract_text(const
+@@ -364,7 +401,7 @@
                        if(ymax <= u) ymax = u + 1;
                    }
                syms->data = sa_text + syms->datalen;
@@ -27686,9 +34172,35 @@ diff --git a/zbar/qrcode/qrdectxt.c b/zbar/qrcode/qrdectxt.c
                assert(next > syms->datalen);
                syms->datalen = next - syms->datalen - 1;
            }
-diff --git a/zbar/refcnt.c b/zbar/refcnt.c
---- a/zbar/refcnt.c
-+++ b/zbar/refcnt.c
+@@ -378,6 +415,7 @@
+       sa_sym->data = sa_text;
+       sa_sym->data_alloc = sa_ntext;
+       sa_sym->datalen = sa_ntext - 1;
++      sa_sym->modifiers = fnc1;
+ 
+       _zbar_image_scanner_add_sym(iscn, sa_sym);
+     }
+diff -r 563557a923d0 zbar/qrcode/util.h
+--- a/zbar/qrcode/util.h	Tue Oct 27 11:25:59 2009 -0400
++++ b/zbar/qrcode/util.h	Fri Feb 22 08:54:29 2013 -0300
+@@ -17,6 +17,14 @@
+ #define QR_DIVROUND(_x,_y)  (((_x)+QR_FLIPSIGNI(_y>>1,_x))/(_y))
+ #define QR_CLAMPI(_a,_b,_c) (QR_MAXI(_a,QR_MINI(_b,_c)))
+ #define QR_CLAMP255(_x)     ((unsigned char)((((_x)<0)-1)&((_x)|-((_x)>255))))
++#define QR_SWAP2I(_a,_b) \
++  do{ \
++    int t__; \
++    t__=(_a); \
++    (_a)=(_b); \
++    (_b)=t__; \
++  } \
++  while(0)
+ /*Swaps two integers _a and _b if _a>_b.*/
+ #define QR_SORT2I(_a,_b) \
+   do{ \
+diff -r 563557a923d0 zbar/refcnt.c
+--- a/zbar/refcnt.c	Tue Oct 27 11:25:59 2009 -0400
++++ b/zbar/refcnt.c	Fri Feb 22 08:54:29 2013 -0300
 @@ -23,7 +23,7 @@
  
  #include "refcnt.h"
@@ -27698,9 +34210,9 @@ diff --git a/zbar/refcnt.c b/zbar/refcnt.c
  
  pthread_once_t initialized = PTHREAD_ONCE_INIT;
  pthread_mutex_t _zbar_reflock;
-diff --git a/zbar/refcnt.h b/zbar/refcnt.h
---- a/zbar/refcnt.h
-+++ b/zbar/refcnt.h
+diff -r 563557a923d0 zbar/refcnt.h
+--- a/zbar/refcnt.h	Tue Oct 27 11:25:59 2009 -0400
++++ b/zbar/refcnt.h	Fri Feb 22 08:54:29 2013 -0300
 @@ -1,5 +1,5 @@
  /*------------------------------------------------------------------------
 - *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
@@ -27717,7 +34229,7 @@ diff --git a/zbar/refcnt.h b/zbar/refcnt.h
  
  static inline int _zbar_refcnt (refcnt_t *cnt,
                                  int delta)
-@@ -45,6 +45,18 @@ static inline int _zbar_refcnt (refcnt_t
+@@ -45,6 +45,18 @@
      return(rc);
  }
  
@@ -27736,9 +34248,9 @@ diff --git a/zbar/refcnt.h b/zbar/refcnt.h
  
  #elif defined(HAVE_LIBPTHREAD)
  # include <pthread.h>
-diff --git a/zbar/scanner.c b/zbar/scanner.c
---- a/zbar/scanner.c
-+++ b/zbar/scanner.c
+diff -r 563557a923d0 zbar/scanner.c
+--- a/zbar/scanner.c	Tue Oct 27 11:25:59 2009 -0400
++++ b/zbar/scanner.c	Fri Feb 22 08:54:29 2013 -0300
 @@ -1,5 +1,5 @@
  /*------------------------------------------------------------------------
 - *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
@@ -27754,7 +34266,7 @@ diff --git a/zbar/scanner.c b/zbar/scanner.c
  #include <string.h>     /* memset */
  
  #include <zbar.h>
-@@ -91,7 +92,7 @@ void zbar_scanner_destroy (zbar_scanner_
+@@ -91,7 +92,7 @@
  
  zbar_symbol_type_t zbar_scanner_reset (zbar_scanner_t *scn)
  {
@@ -27763,7 +34275,7 @@ diff --git a/zbar/scanner.c b/zbar/scanner.c
      scn->y1_thresh = scn->y1_min_thresh;
      if(scn->decoder)
          zbar_decoder_reset(scn->decoder);
-@@ -125,14 +126,15 @@ zbar_color_t zbar_scanner_get_color (con
+@@ -125,19 +126,20 @@
  static inline unsigned calc_thresh (zbar_scanner_t *scn)
  {
      /* threshold 1st to improve noise rejection */
@@ -27771,7 +34283,8 @@ diff --git a/zbar/scanner.c b/zbar/scanner.c
 +    unsigned dx, thresh = scn->y1_thresh;
 +    unsigned long t;
      if((thresh <= scn->y1_min_thresh) || !scn->width) {
-         dprintf(1, " tmin=%d", scn->y1_min_thresh);
+-        dprintf(1, " tmin=%d", scn->y1_min_thresh);
++        dbprintf(1, " tmin=%d", scn->y1_min_thresh);
          return(scn->y1_min_thresh);
      }
      /* slowly return threshold to min */
@@ -27781,8 +34294,31 @@ diff --git a/zbar/scanner.c b/zbar/scanner.c
 +    t = thresh * dx;
      t /= scn->width;
      t /= ZBAR_SCANNER_THRESH_FADE;
-     dprintf(1, " thr=%d t=%ld x=%d last=%d.%d (%d)",
-@@ -174,14 +176,15 @@ static inline zbar_symbol_type_t process
+-    dprintf(1, " thr=%d t=%ld x=%d last=%d.%d (%d)",
+-            thresh, t, scn->x, scn->last_edge >> ZBAR_FIXED,
+-            scn->last_edge & ((1 << ZBAR_FIXED) - 1), dx);
++    dbprintf(1, " thr=%d t=%ld x=%d last=%d.%d (%d)",
++             thresh, t, scn->x, scn->last_edge >> ZBAR_FIXED,
++             scn->last_edge & ((1 << ZBAR_FIXED) - 1), dx);
+     if(thresh > t) {
+         thresh -= t;
+         if(thresh > scn->y1_min_thresh)
+@@ -156,10 +158,10 @@
+         scn->last_edge = scn->cur_edge;
+ 
+     scn->width = scn->cur_edge - scn->last_edge;
+-    dprintf(1, " sgn=%d cur=%d.%d w=%d (%s)\n",
+-            scn->y1_sign, scn->cur_edge >> ZBAR_FIXED,
+-            scn->cur_edge & ((1 << ZBAR_FIXED) - 1), scn->width,
+-            ((y1 > 0) ? "SPACE" : "BAR"));
++    dbprintf(1, " sgn=%d cur=%d.%d w=%d (%s)\n",
++             scn->y1_sign, scn->cur_edge >> ZBAR_FIXED,
++             scn->cur_edge & ((1 << ZBAR_FIXED) - 1), scn->width,
++             ((y1 > 0) ? "SPACE" : "BAR"));
+     scn->last_edge = scn->cur_edge;
+ 
+ #if DEBUG_SVG > 1
+@@ -174,14 +176,15 @@
  
  inline zbar_symbol_type_t zbar_scanner_flush (zbar_scanner_t *scn)
  {
@@ -27794,13 +34330,13 @@ diff --git a/zbar/scanner.c b/zbar/scanner.c
 +    x = (scn->x << ZBAR_FIXED) + ROUND;
  
      if(scn->cur_edge != x || scn->y1_sign > 0) {
-+        zbar_symbol_type_t edge = process_edge(scn, -scn->y1_sign);
-         dprintf(1, "flush0:");
--        zbar_symbol_type_t edge = process_edge(scn, -scn->y1_sign);
+-        dprintf(1, "flush0:");
+         zbar_symbol_type_t edge = process_edge(scn, -scn->y1_sign);
++        dbprintf(1, "flush0:");
          scn->cur_edge = x;
          scn->y1_sign = -scn->y1_sign;
          return(edge);
-@@ -203,7 +206,7 @@ zbar_symbol_type_t zbar_scanner_new_scan
+@@ -203,7 +206,7 @@
      }
  
      /* reset scanner and associated decoder */
@@ -27809,7 +34345,7 @@ diff --git a/zbar/scanner.c b/zbar/scanner.c
      scn->y1_thresh = scn->y1_min_thresh;
      if(scn->decoder)
          zbar_decoder_new_scan(scn->decoder);
-@@ -218,6 +221,8 @@ zbar_symbol_type_t zbar_scan_y (zbar_sca
+@@ -218,6 +221,8 @@
      register int x = scn->x;
      register int y0_1 = scn->y0[(x - 1) & 3];
      register int y0_0 = y0_1;
@@ -27818,7 +34354,7 @@ diff --git a/zbar/scanner.c b/zbar/scanner.c
      if(x) {
          /* update weighted moving average */
          y0_0 += ((int)((y - y0_1) * EWMA_WEIGHT)) >> ZBAR_FIXED;
-@@ -225,10 +230,10 @@ zbar_symbol_type_t zbar_scan_y (zbar_sca
+@@ -225,10 +230,10 @@
      }
      else
          y0_0 = y0_1 = scn->y0[0] = scn->y0[1] = scn->y0[2] = scn->y0[3] = y;
@@ -27832,7 +34368,7 @@ diff --git a/zbar/scanner.c b/zbar/scanner.c
      {
          register int y1_2 = y0_2 - y0_3;
          if((abs(y1_1) < abs(y1_2)) &&
-@@ -237,13 +242,13 @@ zbar_symbol_type_t zbar_scan_y (zbar_sca
+@@ -237,13 +242,13 @@
      }
  
      /* 2nd differentials @ x-1 & x-2 */
@@ -27841,15 +34377,17 @@ diff --git a/zbar/scanner.c b/zbar/scanner.c
 +    y2_1 = y0_0 - (y0_1 * 2) + y0_2;
 +    y2_2 = y0_1 - (y0_2 * 2) + y0_3;
  
-     dprintf(1, "scan: x=%d y=%d y0=%d y1=%d y2=%d",
-             x, y, y0_1, y1_1, y2_1);
+-    dprintf(1, "scan: x=%d y=%d y0=%d y1=%d y2=%d",
+-            x, y, y0_1, y1_1, y2_1);
++    dbprintf(1, "scan: x=%d y=%d y0=%d y1=%d y2=%d",
++             x, y, y0_1, y1_1, y2_1);
  
 -    zbar_symbol_type_t edge = ZBAR_NONE;
 +    edge = ZBAR_NONE;
      /* 2nd zero-crossing is 1st local min/max - could be edge */
      if((!y2_1 ||
          ((y2_1 > 0) ? y2_2 < 0 : y2_2 > 0)) &&
-@@ -256,6 +261,7 @@ zbar_symbol_type_t zbar_scan_y (zbar_sca
+@@ -256,17 +261,18 @@
              edge = process_edge(scn, y1_1);
  
          if(y1_rev || (abs(scn->y1_sign) < abs(y1_1))) {
@@ -27857,7 +34395,11 @@ diff --git a/zbar/scanner.c b/zbar/scanner.c
              scn->y1_sign = y1_1;
  
              /* adaptive thresholding */
-@@ -266,7 +272,7 @@ zbar_symbol_type_t zbar_scan_y (zbar_sca
+             /* start at multiple of new min/max */
+             scn->y1_thresh = (abs(y1_1) * THRESH_INIT + ROUND) >> ZBAR_FIXED;
+-            dprintf(1, "\tthr=%d", scn->y1_thresh);
++            dbprintf(1, "\tthr=%d", scn->y1_thresh);
+             if(scn->y1_thresh < scn->y1_min_thresh)
                  scn->y1_thresh = scn->y1_min_thresh;
  
              /* update current edge */
@@ -27866,7 +34408,21 @@ diff --git a/zbar/scanner.c b/zbar/scanner.c
              scn->cur_edge = 1 << ZBAR_FIXED;
              if(!d)
                  scn->cur_edge >>= 1;
-@@ -298,14 +304,14 @@ void zbar_scanner_get_state (const zbar_
+@@ -274,11 +280,11 @@
+                 /* interpolate zero crossing */
+                 scn->cur_edge -= ((y2_1 << ZBAR_FIXED) + 1) / d;
+             scn->cur_edge += x << ZBAR_FIXED;
+-            dprintf(1, "\n");
++            dbprintf(1, "\n");
+         }
+     }
+     else
+-        dprintf(1, "\n");
++        dbprintf(1, "\n");
+     /* FIXME add fall-thru pass to decoder after heuristic "idle" period
+        (eg, 6-8 * last width) */
+     scn->x = x + 1;
+@@ -298,14 +304,14 @@
      register int y0_0 = scn->y0[(scn->x - 1) & 3];
      register int y0_1 = scn->y0[(scn->x - 2) & 3];
      register int y0_2 = scn->y0[(scn->x - 3) & 3];
@@ -27881,11 +34437,12 @@ diff --git a/zbar/scanner.c b/zbar/scanner.c
 -    zbar_scanner_t *mut_scn = (zbar_scanner_t*)scn;
 +    mut_scn = (zbar_scanner_t*)scn;
      if(y1_thresh) *y1_thresh = calc_thresh(mut_scn);
-     dprintf(1, "\n");
+-    dprintf(1, "\n");
++    dbprintf(1, "\n");
  }
-diff --git a/zbar/symbol.c b/zbar/symbol.c
---- a/zbar/symbol.c
-+++ b/zbar/symbol.c
+diff -r 563557a923d0 zbar/symbol.c
+--- a/zbar/symbol.c	Tue Oct 27 11:25:59 2009 -0400
++++ b/zbar/symbol.c	Fri Feb 22 08:54:29 2013 -0300
 @@ -1,5 +1,5 @@
  /*------------------------------------------------------------------------
 - *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
@@ -27893,21 +34450,38 @@ diff --git a/zbar/symbol.c b/zbar/symbol.c
   *
   *  This file is part of the ZBar Bar Code Reader.
   *
-@@ -39,7 +39,10 @@ const char *zbar_get_symbol_name (zbar_s
+@@ -32,14 +32,21 @@
+ const char *zbar_get_symbol_name (zbar_symbol_type_t sym)
+ {
+     switch(sym & ZBAR_SYMBOL) {
++    case ZBAR_EAN2: return("EAN-2");
++    case ZBAR_EAN5: return("EAN-5");
+     case ZBAR_EAN8: return("EAN-8");
+     case ZBAR_UPCE: return("UPC-E");
+     case ZBAR_ISBN10: return("ISBN-10");
+     case ZBAR_UPCA: return("UPC-A");
      case ZBAR_EAN13: return("EAN-13");
      case ZBAR_ISBN13: return("ISBN-13");
++    case ZBAR_COMPOSITE: return("COMPOSITE");
      case ZBAR_I25: return("I2/5");
 +    case ZBAR_DATABAR: return("DataBar");
 +    case ZBAR_DATABAR_EXP: return("DataBar-Exp");
++    case ZBAR_CODABAR: return("Codabar");
      case ZBAR_CODE39: return("CODE-39");
 +    case ZBAR_CODE93: return("CODE-93");
      case ZBAR_CODE128: return("CODE-128");
      case ZBAR_PDF417: return("PDF417");
      case ZBAR_QRCODE: return("QR-Code");
-@@ -56,6 +59,58 @@ const char *zbar_get_addon_name (zbar_sy
-     }
- }
+@@ -49,13 +56,61 @@
  
+ const char *zbar_get_addon_name (zbar_symbol_type_t sym)
+ {
+-    switch(sym & ZBAR_ADDON) {
+-    case ZBAR_ADDON2: return("+2");
+-    case ZBAR_ADDON5: return("+5");
++    return("");
++}
++
 +const char *zbar_get_config_name (zbar_config_t cfg)
 +{
 +    switch(cfg) {
@@ -27921,10 +34495,10 @@ diff --git a/zbar/symbol.c b/zbar/symbol.c
 +    case ZBAR_CFG_POSITION: return("POSITION");
 +    case ZBAR_CFG_X_DENSITY: return("X_DENSITY");
 +    case ZBAR_CFG_Y_DENSITY: return("Y_DENSITY");
-+    default: return("");
-+    }
-+}
-+
+     default: return("");
+     }
+ }
+ 
 +const char *zbar_get_modifier_name (zbar_modifier_t mod)
 +{
 +    switch(mod) {
@@ -27948,11 +34522,11 @@ diff --git a/zbar/symbol.c b/zbar/symbol.c
 +int _zbar_get_symbol_hash (zbar_symbol_type_t sym)
 +{
 +    static const signed char hash[0x20] = {
-+        0x00, 0x01, 0x0d, 0x0e,   -1,   -1,   -1, 0x09,
-+        0x05, 0x06, 0x08,   -1, 0x04, 0x03, 0x07,   -1,
-+          -1,   -1,   -1,   -1,   -1,   -1,   -1, 0x02,
-+          -1, 0x00, 0x0f, 0x0c, 0x0b, 0x00, 0x0a, 0x00,
-+    };
++        0x00, 0x01, 0x10, 0x11,   -1, 0x11, 0x16, 0x0c,
++	0x05, 0x06, 0x08,   -1, 0x04, 0x03, 0x07, 0x12,
++	  -1,   -1,   -1,   -1,   -1,   -1,   -1, 0x02,
++	  -1, 0x00, 0x12, 0x0c, 0x0b, 0x1d, 0x0a, 0x00,
++     };
 +    int g0 = hash[sym & 0x1f];
 +    int g1 = hash[~(sym >> 4) & 0x1f];
 +    assert(g0 >= 0 && g1 >= 0);
@@ -27963,7 +34537,7 @@ diff --git a/zbar/symbol.c b/zbar/symbol.c
  
  void _zbar_symbol_free (zbar_symbol_t *sym)
  {
-@@ -82,6 +137,16 @@ zbar_symbol_type_t zbar_symbol_get_type 
+@@ -82,6 +137,16 @@
      return(sym->type);
  }
  
@@ -27980,7 +34554,7 @@ diff --git a/zbar/symbol.c b/zbar/symbol.c
  const char *zbar_symbol_get_data (const zbar_symbol_t *sym)
  {
      return(sym->data);
-@@ -125,6 +190,11 @@ int zbar_symbol_get_loc_y (const zbar_sy
+@@ -125,6 +190,11 @@
          return(-1);
  }
  
@@ -27992,7 +34566,7 @@ diff --git a/zbar/symbol.c b/zbar/symbol.c
  const zbar_symbol_t *zbar_symbol_next (const zbar_symbol_t *sym)
  {
      return((sym) ? sym->next : NULL);
-@@ -142,26 +212,100 @@ const zbar_symbol_t *zbar_symbol_first_c
+@@ -142,26 +212,100 @@
  }
  
  
@@ -28103,7 +34677,7 @@ diff --git a/zbar/symbol.c b/zbar/symbol.c
      if(!*buf || (*len < maxlen)) {
          if(*buf)
              free(*buf);
-@@ -170,32 +314,50 @@ char *zbar_symbol_xml (const zbar_symbol
+@@ -170,32 +314,50 @@
          *len = maxlen;
      }
  
@@ -28178,7 +34752,7 @@ diff --git a/zbar/symbol.c b/zbar/symbol.c
  
      *len = n;
      return(*buf);
-@@ -242,3 +404,9 @@ zbar_symbol_set_first_symbol (const zbar
+@@ -242,3 +404,9 @@
          return(sym->next);
      return(syms->head);
  }
@@ -28188,9 +34762,9 @@ diff --git a/zbar/symbol.c b/zbar/symbol.c
 +{
 +    return(syms->head);
 +}
-diff --git a/zbar/symbol.h b/zbar/symbol.h
---- a/zbar/symbol.h
-+++ b/zbar/symbol.h
+diff -r 563557a923d0 zbar/symbol.h
+--- a/zbar/symbol.h	Tue Oct 27 11:25:59 2009 -0400
++++ b/zbar/symbol.h	Fri Feb 22 08:54:29 2013 -0300
 @@ -1,5 +1,5 @@
  /*------------------------------------------------------------------------
 - *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
@@ -28202,12 +34776,12 @@ diff --git a/zbar/symbol.h b/zbar/symbol.h
  #include <zbar.h>
  #include "refcnt.h"
  
-+#define NUM_SYMS  16
++#define NUM_SYMS  20
 +
  typedef struct point_s {
      int x, y;
  } point_t;
-@@ -40,6 +42,8 @@ struct zbar_symbol_set_s {
+@@ -40,6 +42,8 @@
  
  struct zbar_symbol_s {
      zbar_symbol_type_t type;    /* symbol type */
@@ -28216,7 +34790,7 @@ diff --git a/zbar/symbol.h b/zbar/symbol.h
      unsigned int data_alloc;    /* allocation size of data */
      unsigned int datalen;       /* length of binary symbol data */
      char *data;                 /* symbol data */
-@@ -47,6 +51,7 @@ struct zbar_symbol_s {
+@@ -47,6 +51,7 @@
      unsigned pts_alloc;         /* allocation size of pts */
      unsigned npts;              /* number of points in location polygon */
      point_t *pts;               /* list of points in location polygon */
@@ -28224,7 +34798,7 @@ diff --git a/zbar/symbol.h b/zbar/symbol.h
  
      refcnt_t refcnt;            /* reference count */
      zbar_symbol_t *next;        /* linked list of results (or siblings) */
-@@ -56,6 +61,8 @@ struct zbar_symbol_s {
+@@ -56,6 +61,8 @@
      int quality;                /* relative symbol reliability metric */
  };
  
@@ -28233,9 +34807,9 @@ diff --git a/zbar/symbol.h b/zbar/symbol.h
  extern void _zbar_symbol_free(zbar_symbol_t*);
  
  extern zbar_symbol_set_t *_zbar_symbol_set_create(void);
-diff --git a/zbar/timer.h b/zbar/timer.h
---- a/zbar/timer.h
-+++ b/zbar/timer.h
+diff -r 563557a923d0 zbar/timer.h
+--- a/zbar/timer.h	Tue Oct 27 11:25:59 2009 -0400
++++ b/zbar/timer.h	Fri Feb 22 08:54:29 2013 -0300
 @@ -1,5 +1,5 @@
  /*------------------------------------------------------------------------
 - *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
@@ -28268,7 +34842,7 @@ diff --git a/zbar/timer.h b/zbar/timer.h
  static inline zbar_timer_t *_zbar_timer_init (zbar_timer_t *timer,
                                                int delay)
  {
-@@ -56,13 +65,14 @@ static inline zbar_timer_t *_zbar_timer_
+@@ -56,13 +65,14 @@
  
  static inline int _zbar_timer_check (zbar_timer_t *timer)
  {
@@ -28286,7 +34860,7 @@ diff --git a/zbar/timer.h b/zbar/timer.h
      return((delay >= 0) ? delay : 0);
  }
  
-@@ -73,6 +83,11 @@ static inline int _zbar_timer_check (zba
+@@ -73,6 +83,11 @@
  
  typedef DWORD zbar_timer_t;
  
@@ -28298,7 +34872,7 @@ diff --git a/zbar/timer.h b/zbar/timer.h
  static inline zbar_timer_t *_zbar_timer_init (zbar_timer_t *timer,
                                                int delay)
  {
-@@ -85,18 +100,26 @@ static inline zbar_timer_t *_zbar_timer_
+@@ -85,18 +100,26 @@
  
  static inline int _zbar_timer_check (zbar_timer_t *timer)
  {
@@ -28327,7 +34901,7 @@ diff --git a/zbar/timer.h b/zbar/timer.h
  static inline zbar_timer_t *_zbar_timer_init (zbar_timer_t *timer,
                                                int delay)
  {
-@@ -112,15 +135,17 @@ static inline zbar_timer_t *_zbar_timer_
+@@ -112,15 +135,17 @@
  
  static inline int _zbar_timer_check (zbar_timer_t *timer)
  {
@@ -28346,9 +34920,9 @@ diff --git a/zbar/timer.h b/zbar/timer.h
  #endif
  
  #endif
-diff --git a/zbar/video.c b/zbar/video.c
---- a/zbar/video.c
-+++ b/zbar/video.c
+diff -r 563557a923d0 zbar/video.c
+--- a/zbar/video.c	Tue Oct 27 11:25:59 2009 -0400
++++ b/zbar/video.c	Fri Feb 22 08:54:29 2013 -0300
 @@ -1,5 +1,5 @@
  /*------------------------------------------------------------------------
 - *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
@@ -28356,7 +34930,7 @@ diff --git a/zbar/video.c b/zbar/video.c
   *
   *  This file is part of the ZBar Bar Code Reader.
   *
-@@ -58,6 +58,7 @@ static void _zbar_video_recycle_shadow (
+@@ -58,6 +58,7 @@
  zbar_video_t *zbar_video_create ()
  {
      zbar_video_t *vdo = calloc(1, sizeof(zbar_video_t));
@@ -28364,7 +34938,7 @@ diff --git a/zbar/video.c b/zbar/video.c
      if(!vdo)
          return(NULL);
      err_init(&vdo->err, ZBAR_MOD_VIDEO);
-@@ -73,7 +74,6 @@ zbar_video_t *zbar_video_create ()
+@@ -73,7 +74,6 @@
          return(NULL);
      }
  
@@ -28372,7 +34946,7 @@ diff --git a/zbar/video.c b/zbar/video.c
      for(i = 0; i < ZBAR_VIDEO_IMAGES_MAX; i++) {
          zbar_image_t *img = vdo->images[i] = zbar_image_create();
          if(!img) {
-@@ -97,7 +97,7 @@ void zbar_video_destroy (zbar_video_t *v
+@@ -97,7 +97,7 @@
          int i;
          for(i = 0; i < ZBAR_VIDEO_IMAGES_MAX; i++)
              if(vdo->images[i])
@@ -28381,7 +34955,7 @@ diff --git a/zbar/video.c b/zbar/video.c
          free(vdo->images);
      }
      while(vdo->shadow_image) {
-@@ -130,6 +130,8 @@ void zbar_video_destroy (zbar_video_t *v
+@@ -130,6 +130,8 @@
  int zbar_video_open (zbar_video_t *vdo,
                       const char *dev)
  {
@@ -28390,7 +34964,7 @@ diff --git a/zbar/video.c b/zbar/video.c
      zbar_video_enable(vdo, 0);
      video_lock(vdo);
      if(vdo->intf != VIDEO_INVALID) {
-@@ -145,7 +147,6 @@ int zbar_video_open (zbar_video_t *vdo,
+@@ -145,7 +147,6 @@
      if(!dev)
          return(0);
  
@@ -28398,7 +34972,7 @@ diff --git a/zbar/video.c b/zbar/video.c
      if((unsigned char)dev[0] < 0x10) {
          /* default linux device, overloaded for other platforms */
          int id = dev[0];
-@@ -153,7 +154,7 @@ int zbar_video_open (zbar_video_t *vdo,
+@@ -153,7 +154,7 @@
          ldev[10] = '0' + id;
      }
  
@@ -28407,7 +34981,7 @@ diff --git a/zbar/video.c b/zbar/video.c
  
      if(ldev)
          free(ldev);
-@@ -227,12 +228,12 @@ uint32_t zbar_video_get_format (const zb
+@@ -227,12 +228,12 @@
  
  static inline int video_init_images (zbar_video_t *vdo)
  {
@@ -28422,7 +34996,7 @@ diff --git a/zbar/video.c b/zbar/video.c
          if(!vdo->buf)
              return(err_capture(vdo, SEV_FATAL, ZBAR_ERR_NOMEM, __func__,
                                 "unable to allocate image buffers"));
-@@ -240,16 +241,14 @@ static inline int video_init_images (zba
+@@ -240,16 +241,14 @@
                  (vdo->iomode == VIDEO_READWRITE) ? "READ" : "USERPTR",
                  vdo->buflen);
      }
@@ -28442,7 +35016,7 @@ diff --git a/zbar/video.c b/zbar/video.c
              zprintf(2, "    [%02d] @%08lx\n", i, offset);
          }
      }
-@@ -259,6 +258,9 @@ static inline int video_init_images (zba
+@@ -259,6 +258,9 @@
  int zbar_video_init (zbar_video_t *vdo,
                       unsigned long fmt)
  {
@@ -28452,7 +35026,7 @@ diff --git a/zbar/video.c b/zbar/video.c
      if(vdo->initialized)
          /* FIXME re-init different format? */
          return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_INVALID, __func__,
-@@ -270,8 +272,9 @@ int zbar_video_init (zbar_video_t *vdo,
+@@ -270,8 +272,9 @@
      if(video_init_images(vdo))
          return(-1);
  #ifdef HAVE_LIBJPEG
@@ -28463,7 +35037,7 @@ diff --git a/zbar/video.c b/zbar/video.c
          /* prepare for decoding */
          if(!vdo->jpeg)
              vdo->jpeg = _zbar_jpeg_decomp_create();
-@@ -279,10 +282,9 @@ int zbar_video_init (zbar_video_t *vdo,
+@@ -279,10 +282,9 @@
              zbar_image_destroy(vdo->jpeg_img);
  
          /* create intermediate image for decoder to use*/
@@ -28476,7 +35050,7 @@ diff --git a/zbar/video.c b/zbar/video.c
          img->datalen = vdo->width * vdo->height;
      }
  #endif
-@@ -333,6 +335,9 @@ int zbar_video_enable (zbar_video_t *vdo
+@@ -333,6 +335,9 @@
  
  zbar_image_t *zbar_video_next_image (zbar_video_t *vdo)
  {
@@ -28486,7 +35060,7 @@ diff --git a/zbar/video.c b/zbar/video.c
      if(video_lock(vdo))
          return(NULL);
      if(!vdo->active) {
-@@ -340,8 +345,8 @@ zbar_image_t *zbar_video_next_image (zba
+@@ -340,8 +345,8 @@
          return(NULL);
      }
  
@@ -28497,7 +35071,7 @@ diff --git a/zbar/video.c b/zbar/video.c
      if(img) {
          img->seq = frame;
          if(vdo->num_images < 2) {
-@@ -362,8 +367,7 @@ zbar_image_t *zbar_video_next_image (zba
+@@ -362,8 +367,7 @@
                  /* recycle the shadow images */
  
                  img->format = vdo->format;
@@ -28507,9 +35081,138 @@ diff --git a/zbar/video.c b/zbar/video.c
                  img->datalen = vdo->datalen;
                  img->data = malloc(vdo->datalen);
              }
-diff --git a/zbar/window.c b/zbar/window.c
---- a/zbar/window.c
-+++ b/zbar/window.c
+diff -r 563557a923d0 zbar/video/v4l.c
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/zbar/video/v4l.c	Fri Feb 22 08:54:29 2013 -0300
+@@ -0,0 +1,67 @@
++/*------------------------------------------------------------------------
++ *  Copyright 2007-2011 (c) Jeff Brown <spadix@users.sourceforge.net>
++ *
++ *  This file is part of the ZBar Bar Code Reader.
++ *
++ *  The ZBar Bar Code Reader is free software; you can redistribute it
++ *  and/or modify it under the terms of the GNU Lesser Public License as
++ *  published by the Free Software Foundation; either version 2.1 of
++ *  the License, or (at your option) any later version.
++ *
++ *  The ZBar Bar Code Reader is distributed in the hope that it will be
++ *  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
++ *  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU Lesser Public License for more details.
++ *
++ *  You should have received a copy of the GNU Lesser Public License
++ *  along with the ZBar Bar Code Reader; if not, write to the Free
++ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++ *  Boston, MA  02110-1301  USA
++ *
++ *  http://sourceforge.net/projects/zbar
++ *------------------------------------------------------------------------*/
++
++#include <config.h>
++#ifdef HAVE_SYS_TYPES_H
++# include <sys/types.h>
++#endif
++#ifdef HAVE_SYS_STAT_H
++# include <sys/stat.h>
++#endif
++#ifdef HAVE_FCNTL_H
++# include <fcntl.h>
++#endif
++#ifdef HAVE_UNISTD_H
++# include <unistd.h>
++#endif
++
++#include "video.h"
++
++extern int _zbar_v4l1_probe(zbar_video_t*);
++extern int _zbar_v4l2_probe(zbar_video_t*);
++
++int _zbar_video_open (zbar_video_t *vdo,
++                      const char *dev)
++{
++    vdo->fd = open(dev, O_RDWR);
++    if(vdo->fd < 0)
++        return(err_capture_str(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
++                               "opening video device '%s'", dev));
++    zprintf(1, "opened camera device %s (fd=%d)\n", dev, vdo->fd);
++
++    int rc = -1;
++#ifdef HAVE_LINUX_VIDEODEV2_H
++    if(vdo->intf != VIDEO_V4L1)
++        rc = _zbar_v4l2_probe(vdo);
++#endif
++#ifdef HAVE_LINUX_VIDEODEV_H
++    if(rc && vdo->intf != VIDEO_V4L2)
++        rc = _zbar_v4l1_probe(vdo);
++#endif
++
++    if(rc && vdo->fd >= 0) {
++        close(vdo->fd);
++        vdo->fd = -1;
++    }
++    return(rc);
++}
+diff -r 563557a923d0 zbar/video/v4l1.c
+--- a/zbar/video/v4l1.c	Tue Oct 27 11:25:59 2009 -0400
++++ b/zbar/video/v4l1.c	Fri Feb 22 08:54:29 2013 -0300
+@@ -1,5 +1,5 @@
+ /*------------------------------------------------------------------------
+- *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
++ *  Copyright 2007-2011 (c) Jeff Brown <spadix@users.sourceforge.net>
+  *
+  *  This file is part of the ZBar Bar Code Reader.
+  *
+@@ -46,8 +46,6 @@
+ #include "video.h"
+ #include "image.h"
+ 
+-extern int _zbar_v4l2_probe(zbar_video_t*);
+-
+ typedef struct v4l1_format_s {
+     uint32_t format;
+     uint8_t bpp;
+@@ -371,7 +369,7 @@
+     return(0);
+ }
+ 
+-static int _zbar_v4l1_probe (zbar_video_t *vdo)
++int _zbar_v4l1_probe (zbar_video_t *vdo)
+ {
+     /* check capabilities */
+     struct video_capability vcap;
+@@ -407,29 +405,3 @@
+     vdo->dq = v4l1_dq;
+     return(0);
+ }
+-
+-int _zbar_video_open (zbar_video_t *vdo,
+-                      const char *dev)
+-{
+-    vdo->fd = open(dev, O_RDWR);
+-    if(vdo->fd < 0)
+-        return(err_capture_str(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
+-                               "opening video device '%s'", dev));
+-    zprintf(1, "opened camera device %s (fd=%d)\n", dev, vdo->fd);
+-
+-    int rc = -1;
+-#ifdef HAVE_LINUX_VIDEODEV2_H
+-    if(vdo->intf != VIDEO_V4L1)
+-        rc = _zbar_v4l2_probe(vdo);
+-    if(rc)
+-#else
+-    zprintf(1, "WARNING: not compiled with v4l2 support, trying v4l1\n");
+-#endif
+-        rc = _zbar_v4l1_probe(vdo);
+-
+-    if(rc && vdo->fd >= 0) {
+-        close(vdo->fd);
+-        vdo->fd = -1;
+-    }
+-    return(rc);
+-}
+diff -r 563557a923d0 zbar/window.c
+--- a/zbar/window.c	Tue Oct 27 11:25:59 2009 -0400
++++ b/zbar/window.c	Fri Feb 22 08:54:29 2013 -0300
 @@ -1,5 +1,5 @@
  /*------------------------------------------------------------------------
 - *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
@@ -28530,7 +35233,7 @@ diff --git a/zbar/window.c b/zbar/window.c
  
  zbar_window_t *zbar_window_create ()
  {
-@@ -117,20 +120,11 @@ static inline int window_draw_overlay (z
+@@ -117,20 +120,11 @@
  
      if(w->overlay >= 2) {
          /* calculate/display frame rate */
@@ -28554,7 +35257,7 @@ diff --git a/zbar/window.c b/zbar/window.c
              sprintf(text, "%d.%01d fps", 1000 / avg, (10000 / avg) % 10);
              _zbar_window_draw_text(w, 3, p, text);
          }
-@@ -141,6 +135,8 @@ static inline int window_draw_overlay (z
+@@ -141,6 +135,8 @@
  
  inline int zbar_window_redraw (zbar_window_t *w)
  {
@@ -28563,7 +35266,7 @@ diff --git a/zbar/window.c b/zbar/window.c
      if(window_lock(w))
          return(-1);
      if(!w->display || _zbar_window_begin(w)) {
-@@ -148,8 +144,7 @@ inline int zbar_window_redraw (zbar_wind
+@@ -148,8 +144,7 @@
          return(-1);
      }
  
@@ -28573,7 +35276,7 @@ diff --git a/zbar/window.c b/zbar/window.c
      if(w->init && w->draw_image && img) {
          int format_change = (w->src_format != img->format &&
                               w->format != img->format);
-@@ -163,6 +158,7 @@ inline int zbar_window_redraw (zbar_wind
+@@ -163,6 +158,7 @@
          }
  
          if(!rc && (format_change || !w->scaled_size.x || !w->dst_width)) {
@@ -28581,7 +35284,7 @@ diff --git a/zbar/window.c b/zbar/window.c
              zprintf(24, "init: src=%.4s(%08x) %dx%d dst=%.4s(%08x) %dx%d\n",
                      (char*)&w->src_format, w->src_format,
                      w->src_width, w->src_height,
-@@ -173,7 +169,6 @@ inline int zbar_window_redraw (zbar_wind
+@@ -173,7 +169,6 @@
                  w->src_height = img->height;
              }
  
@@ -28589,7 +35292,7 @@ diff --git a/zbar/window.c b/zbar/window.c
              if(size.x > w->max_width)
                  size.x = w->max_width;
              if(size.y > w->max_height)
-@@ -226,9 +221,10 @@ inline int zbar_window_redraw (zbar_wind
+@@ -226,9 +221,10 @@
          }
  
          if(!rc) {
@@ -28601,7 +35304,7 @@ diff --git a/zbar/window.c b/zbar/window.c
              if(org.x > 0) {
                  point_t p = { 0, org.y };
                  point_t s = { org.x, w->scaled_size.y };
-@@ -300,9 +296,10 @@ void zbar_window_set_overlay (zbar_windo
+@@ -300,9 +296,10 @@
  int zbar_window_get_overlay (const zbar_window_t *w)
  {
      zbar_window_t *ncw = (zbar_window_t*)w;
@@ -28613,10 +35316,10 @@ diff --git a/zbar/window.c b/zbar/window.c
      (void)window_unlock(ncw);
      return(lvl);
  }
-diff --git a/zbarcam/zbarcam.c b/zbarcam/zbarcam.c
---- a/zbarcam/zbarcam.c
-+++ b/zbarcam/zbarcam.c
-@@ -105,17 +105,27 @@ static void data_handler (zbar_image_t *
+diff -r 563557a923d0 zbarcam/zbarcam.c
+--- a/zbarcam/zbarcam.c	Tue Oct 27 11:25:59 2009 -0400
++++ b/zbarcam/zbarcam.c	Fri Feb 22 08:54:29 2013 -0300
+@@ -105,17 +105,27 @@
          if(type == ZBAR_PARTIAL)
              continue;
  
@@ -28651,10 +35354,10 @@ diff --git a/zbarcam/zbarcam.c b/zbarcam/zbarcam.c
          n++;
      }
  
-diff --git a/zbarcam/zbarcam.rc b/zbarcam/zbarcam.rc
---- a/zbarcam/zbarcam.rc
-+++ b/zbarcam/zbarcam.rc
-@@ -19,7 +19,7 @@ VS_VERSION_INFO VERSIONINFO
+diff -r 563557a923d0 zbarcam/zbarcam.rc
+--- a/zbarcam/zbarcam.rc	Tue Oct 27 11:25:59 2009 -0400
++++ b/zbarcam/zbarcam.rc	Fri Feb 22 08:54:29 2013 -0300
+@@ -19,7 +19,7 @@
  
              VALUE "FileDescription", "Scan bar codes from video devices"
  
@@ -28663,10 +35366,10 @@ diff --git a/zbarcam/zbarcam.rc b/zbarcam/zbarcam.rc
          }
      }
      BLOCK "VarFileInfo" {
-diff --git a/zbarimg/Makefile.am.inc b/zbarimg/Makefile.am.inc
---- a/zbarimg/Makefile.am.inc
-+++ b/zbarimg/Makefile.am.inc
-@@ -12,10 +12,10 @@ endif
+diff -r 563557a923d0 zbarimg/Makefile.am.inc
+--- a/zbarimg/Makefile.am.inc	Tue Oct 27 11:25:59 2009 -0400
++++ b/zbarimg/Makefile.am.inc	Fri Feb 22 08:54:29 2013 -0300
+@@ -12,10 +12,10 @@
  
  EXTRA_DIST += test/barcodetest.py
  
@@ -28679,9 +35382,9 @@ diff --git a/zbarimg/Makefile.am.inc b/zbarimg/Makefile.am.inc
  	suite='$(ZBAR_TESTS)'; \
  	if test "x$$suite" = "x"; then suite='http://zbar.sf.net/test'; fi ; \
  	$(PYTHON) $(srcdir)/test/barcodetest.py $$suite
-diff --git a/zbarimg/zbarimg.c b/zbarimg/zbarimg.c
---- a/zbarimg/zbarimg.c
-+++ b/zbarimg/zbarimg.c
+diff -r 563557a923d0 zbarimg/zbarimg.c
+--- a/zbarimg/zbarimg.c	Tue Oct 27 11:25:59 2009 -0400
++++ b/zbarimg/zbarimg.c	Fri Feb 22 08:54:29 2013 -0300
 @@ -1,5 +1,5 @@
  /*------------------------------------------------------------------------
 - *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
@@ -28689,27 +35392,58 @@ diff --git a/zbarimg/zbarimg.c b/zbarimg/zbarimg.c
   *
   *  This file is part of the ZBar Bar Code Reader.
   *
-@@ -45,7 +45,7 @@
+@@ -38,15 +38,29 @@
+ #include <assert.h>
+ 
+ #include <zbar.h>
+-#include <wand/MagickWand.h>
++
++#ifdef HAVE_GRAPHICSMAGICK
++# include <wand/wand_api.h>
++#endif
++
++#ifdef HAVE_IMAGEMAGICK
++# include <wand/MagickWand.h>
++
++/* ImageMagick frequently changes API names - just use the original
++ * (more stable?) names to match GraphicsMagick
++ */
++# define InitializeMagick(f) MagickWandGenesis()
++# define DestroyMagick MagickWandTerminus
++# define MagickSetImageIndex MagickSetIteratorIndex
+ 
+ /* in 6.4.5.4 MagickGetImagePixels changed to MagickExportImagePixels.
+  * (still not sure this check is quite right...
   *  how does MagickGetAuthenticImagePixels fit in?)
   * ref http://bugs.gentoo.org/247292
   */
 -#if MagickLibVersion < 0x645
-+#if MagickLibVersion <= 0x645
- # define MagickExportImagePixels MagickGetImagePixels
+-# define MagickExportImagePixels MagickGetImagePixels
++# if MagickLibVersion > 0x645
++#  define MagickGetImagePixels MagickExportImagePixels
++# endif
  #endif
  
-@@ -76,8 +76,8 @@ static const char *warning_not_found =
+ static const char *note_usage =
+@@ -76,8 +90,9 @@
      "  things to check:\n"
      "    - is the barcode type supported?"
      "  currently supported symbologies are:\n"
 -    "      EAN/UPC (EAN-13, EAN-8, UPC-A, UPC-E, ISBN-10, ISBN-13),\n"
 -    "      Code 128, Code 39 and Interleaved 2 of 5\n"
-+    "      EAN/UPC (EAN-13, EAN-8, UPC-A, UPC-E, ISBN-10, ISBN-13), Code 128,\n"
-+    "      Code 93, Code 39, DataBar, DataBar Expanded, and Interleaved 2 of 5\n"
++    "      EAN/UPC (EAN-13, EAN-8, EAN-2, EAN-5, UPC-A, UPC-E,\n"
++    "      ISBN-10, ISBN-13), Code 128, Code 93, Code 39, Codabar,\n"
++    "      DataBar, DataBar Expanded, and Interleaved 2 of 5\n"
      "    - is the barcode large enough in the image?\n"
      "    - is the barcode mostly in focus?\n"
      "    - is there sufficient contrast/illumination?\n"
-@@ -137,7 +137,7 @@ static int scan_image (const char *filen
+@@ -132,12 +147,12 @@
+         if(exit_code == 3)
+             return(-1);
+ 
+-        if(!MagickSetIteratorIndex(images, seq) && dump_error(images))
++        if(!MagickSetImageIndex(images, seq) && dump_error(images))
+             return(-1);
  
          zbar_image_t *zimage = zbar_image_create();
          assert(zimage);
@@ -28718,7 +35452,18 @@ diff --git a/zbarimg/zbarimg.c b/zbarimg/zbarimg.c
  
          int width = MagickGetImageWidth(images);
          int height = MagickGetImageHeight(images);
-@@ -165,23 +165,30 @@ static int scan_image (const char *filen
+@@ -150,8 +165,8 @@
+         unsigned char *blob = malloc(bloblen);
+         zbar_image_set_data(zimage, blob, bloblen, zbar_image_free_data);
+ 
+-        if(!MagickExportImagePixels(images, 0, 0, width, height,
+-                                    "I", CharPixel, blob))
++        if(!MagickGetImagePixels(images, 0, 0, width, height,
++                                 "I", CharPixel, blob))
+             return(-1);
+ 
+         if(xmllvl == 1) {
+@@ -165,23 +180,30 @@
          const zbar_symbol_t *sym = zbar_image_first_symbol(zimage);
          for(; sym; sym = zbar_symbol_next(sym)) {
              zbar_symbol_type_t typ = zbar_symbol_get_type(sym);
@@ -28757,10 +35502,45 @@ diff --git a/zbarimg/zbarimg.c b/zbarimg/zbarimg.c
              found++;
              num_symbols++;
          }
-diff --git a/zbarimg/zbarimg.rc b/zbarimg/zbarimg.rc
---- a/zbarimg/zbarimg.rc
-+++ b/zbarimg/zbarimg.rc
-@@ -19,7 +19,7 @@ VS_VERSION_INFO VERSIONINFO
+@@ -247,7 +269,7 @@
+     int i, j;
+     for(i = 1; i < argc; i++) {
+         const char *arg = argv[i];
+-        if(arg[0] != '-')
++        if(arg[0] != '-' || !arg[1])
+             // first pass, skip images
+             num_images++;
+         else if(arg[1] != '-')
+@@ -304,7 +326,7 @@
+         return(usage(1, "ERROR: specify image file(s) to scan", NULL));
+     num_images = 0;
+ 
+-    MagickWandGenesis();
++    InitializeMagick("zbarimg");
+ 
+     processor = zbar_processor_create(0);
+     assert(processor);
+@@ -318,7 +340,7 @@
+         if(!arg)
+             continue;
+ 
+-        if(arg[0] != '-') {
++        if(arg[0] != '-' || !arg[1]) {
+             if(scan_image(arg))
+                 return(exit_code);
+         }
+@@ -417,6 +439,6 @@
+         exit_code = 4;
+ 
+     zbar_processor_destroy(processor);
+-    MagickWandTerminus();
++    DestroyMagick();
+     return(exit_code);
+ }
+diff -r 563557a923d0 zbarimg/zbarimg.rc
+--- a/zbarimg/zbarimg.rc	Tue Oct 27 11:25:59 2009 -0400
++++ b/zbarimg/zbarimg.rc	Fri Feb 22 08:54:29 2013 -0300
+@@ -19,7 +19,7 @@
  
              VALUE "FileDescription", "Scan bar codes from image files"
  
diff --git a/zbar_use_libv4l.patch b/zbar_use_libv4l.patch
index ea1bb60..3552504 100644
--- a/zbar_use_libv4l.patch
+++ b/zbar_use_libv4l.patch
@@ -1,522 +1,119 @@
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -179,20 +179,13 @@ AC_ARG_ENABLE([video],
- with_video="no"
- AS_IF([test "x$enable_video" != "xno"],
-   [AS_IF([test "x$win32" = "xno"],
--    [AC_CHECK_HEADERS([linux/videodev.h], [with_video="v4l1"],
--      [AC_MSG_FAILURE([test for video support failed!
--rebuild your kernel to include video4linux support or
--configure --disable-video to skip building video support.])])
--       AC_CHECK_HEADERS([linux/videodev2.h], [with_video="v4l2"],
-+    [AC_CHECK_LIB([v4l2], [v4l2_open], [],
-          [AC_MSG_WARN([v4l2 API not detected, upgrade your kernel!])])],
-     [AC_CHECK_HEADERS([vfw.h], [with_video="vfw"],
-       [AC_MSG_FAILURE([test for VfW video support failed!
- configure --disable-video to skip building vidoe support.])])])
- ])
+diff -r 38e78368283d configure.ac
+--- a/configure.ac	Sun Oct 14 23:02:08 2012 -0700
++++ b/configure.ac	Fri Feb 22 10:04:52 2013 -0300
+@@ -3,7 +3,8 @@
+ AC_INIT([zbar], [0.10], [spadix@users.sourceforge.net])
+ AC_CONFIG_AUX_DIR(config)
+ AC_CONFIG_MACRO_DIR(config)
+-AM_INIT_AUTOMAKE([1.10 -Wall -Werror foreign subdir-objects std-options dist-bzip2])
++AM_INIT_AUTOMAKE([1.10 -Werror foreign subdir-objects std-options dist-bzip2])
++AM_PROG_AR
+ AC_CONFIG_HEADERS([include/config.h])
+ AC_CONFIG_SRCDIR(zbar/scanner.c)
+ LT_PREREQ([2.2])
+@@ -47,7 +48,7 @@
+   [Library revision])
+ 
+ AM_CPPFLAGS="-I$srcdir/include"
+-AM_CFLAGS="-Wall -Wno-parentheses -Werror"
++AM_CFLAGS="-Wall -Wno-parentheses"
+ AM_CXXFLAGS="$AM_CFLAGS"
+ AC_SUBST([AM_CPPFLAGS])
+ AC_SUBST([AM_CFLAGS])
+@@ -179,11 +180,13 @@
+ 
+ have_v4l1="no"
+ have_v4l2="no"
++have_libv4l="no"
+ AS_IF([test "x$enable_video" = "xno"],
+   [],
+   [test "x$win32" = "xno"],
+   [AC_CHECK_HEADERS([linux/videodev.h], [have_v4l1="yes"])
+    AC_CHECK_HEADERS([linux/videodev2.h], [have_v4l2="yes"])
++   AC_CHECK_HEADERS([libv4l2.h], [have_libv4l="yes"])
+    AS_IF([test "x$have_v4l2" = "xno" && test "x$have_v4l1" = "xno"],
+      [AC_MSG_FAILURE([test for video support failed!
+ rebuild your kernel to include video4linux support or
+@@ -194,9 +197,15 @@
+     [AC_MSG_FAILURE([test for VfW video support failed!
+ configure --disable-video to skip building video support.])])])
+ 
++AS_IF([test "x$have_libv4l" = "xyes"],
++   AC_CHECK_LIB([v4l2], [v4l2_open], [],
++     [AC_MSG_FAILURE([unable to find libv4l.so])]),
++  [AC_MSG_WARN([libv4l not detected. Install it to support more cameras!])])
++
  AM_CONDITIONAL([HAVE_VIDEO], [test "x$enable_video" != "xno"])
--AM_CONDITIONAL([HAVE_V4L1],
--  [test "x$with_video" = "xv4l1" || test "x$with_video" = "xv4l2"])
--AM_CONDITIONAL([HAVE_V4L2], [test "x$with_video" = "xv4l2"])
+ AM_CONDITIONAL([HAVE_V4L1], [test "x$have_v4l1" != "xno"])
+ AM_CONDITIONAL([HAVE_V4L2], [test "x$have_v4l2" != "xno"])
++AM_CONDITIONAL([HAVE_LIBV4L], [test "x$have_libv4l" != "xno"])
  
  dnl X
  AC_ARG_VAR([XSHM_LIBS], [linker flags for X shared memory extension])
-@@ -500,7 +493,7 @@ echo "please verify that the detected co
- echo "------------------------------------------------------------------------"
- echo "X                 --with-x=$have_x"
- echo "pthreads          --enable-pthread=$enable_pthread"
--echo "v4l               --enable-video=$enable_video"
-+echo "v4l2              --enable-video=$enable_video"
+@@ -571,6 +580,8 @@
+ echo "v4l               --enable-video=$enable_video"
  AS_IF([test "x$enable_video" != "xyes"],
    [echo "        => zbarcam video scanner will *NOT* be built"])
++AS_IF([test "x$have_libv4l" != "xyes"],
++  [echo "        => libv4l will *NOT* be used"])
  echo "jpeg              --with-jpeg=$with_jpeg"
-diff --git a/zbar/Makefile.am.inc b/zbar/Makefile.am.inc
---- a/zbar/Makefile.am.inc
-+++ b/zbar/Makefile.am.inc
-@@ -59,21 +59,17 @@ else
- zbar_libzbar_la_SOURCES += zbar/processor/posix.h zbar/processor/posix.c
- endif
+ AS_IF([test "x$with_jpeg" != "xyes"],
+   [echo "        => JPEG image conversions will *NOT* be supported"])
+diff -r 38e78368283d zbar/video/v4l.c
+--- a/zbar/video/v4l.c	Sun Oct 14 23:02:08 2012 -0700
++++ b/zbar/video/v4l.c	Fri Feb 22 10:04:52 2013 -0300
+@@ -34,6 +34,13 @@
+ #ifdef HAVE_UNISTD_H
+ # include <unistd.h>
+ #endif
++#ifdef HAVE_LIBV4L2_H
++# include <fcntl.h>
++# include <libv4l2.h>
++#else
++# define v4l2_open open
++# define v4l2_close close
++#endif
  
--if HAVE_V4L1
--zbar_libzbar_la_SOURCES += zbar/video/v4l1.c
--if HAVE_V4L2
--zbar_libzbar_la_SOURCES += zbar/video/v4l2.c
--endif
--endif
-+if HAVE_VIDEO
- if WIN32
--if HAVE_VIDEO
- zbar_libzbar_la_SOURCES += zbar/video/vfw.c
- zbar_libzbar_la_LIBADD += -lvfw32
--endif
--endif
--if !HAVE_VIDEO
-+else
-+zbar_libzbar_la_SOURCES += zbar/video/v4l2.c
-+zbar_libzbar_la_LDFLAGS += -lv4l2
-+endif #WIN32
-+else
- zbar_libzbar_la_SOURCES += zbar/video/null.c
--endif
-+endif #HAVE_VIDEO
+ #include "video.h"
  
- if HAVE_JPEG
- zbar_libzbar_la_SOURCES += zbar/jpeg.c
-diff --git a/zbar/video/v4l1.c b/zbar/video/v4l1.c
-deleted file mode 100644
---- a/zbar/video/v4l1.c
-+++ /dev/null
-@@ -1,435 +0,0 @@
--/*------------------------------------------------------------------------
-- *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-- *
-- *  This file is part of the ZBar Bar Code Reader.
-- *
-- *  The ZBar Bar Code Reader is free software; you can redistribute it
-- *  and/or modify it under the terms of the GNU Lesser Public License as
-- *  published by the Free Software Foundation; either version 2.1 of
-- *  the License, or (at your option) any later version.
-- *
-- *  The ZBar Bar Code Reader is distributed in the hope that it will be
-- *  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-- *  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- *  GNU Lesser Public License for more details.
-- *
-- *  You should have received a copy of the GNU Lesser Public License
-- *  along with the ZBar Bar Code Reader; if not, write to the Free
-- *  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-- *  Boston, MA  02110-1301  USA
-- *
-- *  http://sourceforge.net/projects/zbar
-- *------------------------------------------------------------------------*/
--
--#include <config.h>
--#ifdef HAVE_INTTYPES_H
--# include <inttypes.h>
--#endif
--#ifdef HAVE_STDLIB_H
--# include <stdlib.h>
--#endif
--#include <string.h>
--#include <sys/types.h>
--#include <sys/stat.h>
--#include <unistd.h>
--#include <fcntl.h>
--#include <errno.h>
--#include <assert.h>
--#ifdef HAVE_SYS_IOCTL_H
--# include <sys/ioctl.h>
--#endif
--#ifdef HAVE_SYS_MMAN_H
--# include <sys/mman.h>
--#endif
--#include <linux/videodev.h>
--
--#include "video.h"
--#include "image.h"
--
--extern int _zbar_v4l2_probe(zbar_video_t*);
--
--typedef struct v4l1_format_s {
--    uint32_t format;
--    uint8_t bpp;
--} v4l1_format_t;
--
--/* static v4l1 "palette" mappings
-- * documentation for v4l1 formats is terrible...
-- */
--static const v4l1_format_t v4l1_formats[17] = {
--    /* format                   bpp */
--    { 0,                         0 },
--    { fourcc('G','R','E','Y'),   8 }, /* GREY */
--    { fourcc('H','I','2','4'),   8 }, /* HI240 (BT848) */
--
--    /* component ordering for RGB palettes is unspecified,
--     * convention appears to place red in the most significant bits
--     * FIXME is this true for other drivers? big endian machines?
--     */
--    { fourcc('R','G','B','P'),  16 }, /* RGB565 */
--    { fourcc('B','G','R','3'),  24 }, /* RGB24 */
--    { fourcc('B','G','R','4'),  32 }, /* RGB32 */
--    { fourcc('R','G','B','O'),  16 }, /* RGB555 */
--    { fourcc('Y','U','Y','2'),  16 }, /* YUV422 (8 bpp?!) */
--    { fourcc('Y','U','Y','V'),  16 }, /* YUYV */
--    { fourcc('U','Y','V','Y'),  16 }, /* UYVY */
--    { 0,                        12 }, /* YUV420 (24 bpp?) FIXME?! */
--    { fourcc('Y','4','1','P'),  12 }, /* YUV411 */
--    { 0,                         0 }, /* Bt848 raw */
--    { fourcc('4','2','2','P'),  16 }, /* YUV422P (24 bpp?) */
--    { fourcc('4','1','1','P'),  12 }, /* YUV411P */
--    { fourcc('Y','U','1','2'),  12 }, /* YUV420P */
--    { fourcc('Y','U','V','9'),   9 }, /* YUV410P */
--};
--
--static int v4l1_nq (zbar_video_t *vdo,
--                    zbar_image_t *img)
--{
--    if(video_nq_image(vdo, img))
--        return(-1);
--
--    if(vdo->iomode != VIDEO_MMAP)
--        return(0);
--
--    struct video_mmap vmap;
--    vmap.frame = img->srcidx;
--    vmap.width = vdo->width;
--    vmap.height = vdo->height;
--    vmap.format = vdo->palette;
--    if(ioctl(vdo->fd, VIDIOCMCAPTURE, &vmap) < 0)
--        return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
--                           "initiating video capture (VIDIOCMCAPTURE)"));
--
--    return(0);
--}
--
--static zbar_image_t *v4l1_dq (zbar_video_t *vdo)
--{
--    video_iomode_t iomode = vdo->iomode;
--    int fd = vdo->fd;
--    zbar_image_t *img = video_dq_image(vdo);
--    if(!img)
--        return(NULL);
--
--    if(iomode == VIDEO_MMAP) {
--        int frame = img->srcidx;
--        if(ioctl(fd, VIDIOCSYNC, &frame) < 0)
--            return(NULL);
--    }
--    else if(read(fd, (void*)img->data, img->datalen) != img->datalen)
--        return(NULL);
--
--    return(img);
--}
--
--static int v4l1_mmap_buffers (zbar_video_t *vdo)
--{
--#ifdef HAVE_SYS_MMAN_H
--    /* map camera image to memory */
--    struct video_mbuf vbuf;
--    memset(&vbuf, 0, sizeof(vbuf));
--    if(ioctl(vdo->fd, VIDIOCGMBUF, &vbuf) < 0)
--        return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
--                           "querying video frame buffers (VIDIOCGMBUF)"));
--    assert(vbuf.frames && vbuf.size);
--
--    zprintf(1, "mapping %d buffers size=0x%x\n", vbuf.frames, vbuf.size);
--    vdo->buflen = vbuf.size;
--    vdo->buf = mmap(0, vbuf.size, PROT_READ | PROT_WRITE, MAP_SHARED,
--                    vdo->fd, 0);
--    if(vdo->buf == MAP_FAILED)
--        return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
--                           "mapping video frame buffers"));
--
--    int i;
--    for(i = 0; i < vbuf.frames; i++) {
--        zbar_image_t *img = vdo->images[i];
--        zprintf(2, "    [%02d] @%08x\n", img->srcidx, vbuf.offsets[i]);
--        img->data = vdo->buf + vbuf.offsets[i];
--        img->datalen = vdo->datalen;
--        int next_offset = ((i + 1 < vdo->num_images)
--                           ? vbuf.offsets[i + 1]
--                           : vbuf.size);
--        if(next_offset < vbuf.offsets[i] + vdo->datalen)
--            fprintf(stderr, "WARNING: insufficient v4l1 video buffer size:\n"
--                    "\tvbuf[%d]=%x vbuf[%d]=%x datalen=%lx\n"
--                    "\timage=%d x %d %.4s(%08x) palette=%d\n",
--                    i, vbuf.offsets[i], i + 1, next_offset,
--                    vdo->datalen, vdo->width, vdo->height,
--                    (char*)&vdo->format, vdo->format, vdo->palette);
--    }
--    return(0);
--#else
--    return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_UNSUPPORTED, __func__,
--                       "memory mapping not supported"));
--#endif
--}
--
--static int v4l1_start (zbar_video_t *vdo)
--{
--    return(0);
--}
--
--static int v4l1_stop (zbar_video_t *vdo)
--{
--    return(0);
--}
--
--static inline int v4l1_set_format (zbar_video_t *vdo,
--                                   uint32_t fmt)
--{
--    struct video_picture vpic;
--    memset(&vpic, 0, sizeof(vpic));
--    if(ioctl(vdo->fd, VIDIOCGPICT, &vpic) < 0)
--        return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
--                           "querying video format (VIDIOCGPICT)"));
--
--    vdo->palette = 0;
--    int ifmt;
--    for(ifmt = 1; ifmt <= VIDEO_PALETTE_YUV410P; ifmt++)
--        if(v4l1_formats[ifmt].format == fmt)
--            break;
--    if(!fmt || ifmt >= VIDEO_PALETTE_YUV410P)
--        return(err_capture_int(vdo, SEV_ERROR, ZBAR_ERR_INVALID, __func__,
--                               "invalid v4l1 format: %x", fmt));
--
--    vpic.palette = ifmt;
--    vpic.depth = v4l1_formats[ifmt].bpp;
--    if(ioctl(vdo->fd, VIDIOCSPICT, &vpic) < 0)
--        return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
--                           "setting format (VIDIOCSPICT)"));
--
--    memset(&vpic, 0, sizeof(vpic));
--    if(ioctl(vdo->fd, VIDIOCGPICT, &vpic) < 0)
--        return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
--                           "querying video format (VIDIOCGPICT)"));
--
--    if(vpic.palette != ifmt || vpic.depth != v4l1_formats[ifmt].bpp) {
--        fprintf(stderr,
--                "WARNING: set v4l1 palette %d which should have depth %d bpp\n"
--                "    but probed palette %d with depth %d bpp?"
--                "  ...continuing anyway\n",
--                ifmt, v4l1_formats[ifmt].bpp, vpic.palette, vpic.depth);
--        err_capture_int(vdo, SEV_WARNING, ZBAR_ERR_INVALID, __func__,
--                        "driver format (%x) inconsistency", fmt);
--    }
--    vdo->format = fmt;
--    vdo->palette = ifmt;
--    vdo->datalen = (vdo->width * vdo->height * v4l1_formats[ifmt].bpp + 7) >> 3;
--
--    zprintf(1, "set new format: %.4s(%08x) depth=%d palette=%d size=0x%lx\n",
--            (char*)&vdo->format, vdo->format, vpic.depth, vdo->palette,
--            vdo->datalen);
--    return(0);
--}
--
--static int v4l1_init (zbar_video_t *vdo,
--                      uint32_t fmt)
--{
--    if(v4l1_set_format(vdo, fmt))
--        return(-1);
--    if(vdo->iomode == VIDEO_MMAP && v4l1_mmap_buffers(vdo))
--        return(-1);
--    return(0);
--}
--
--static int v4l1_cleanup (zbar_video_t *vdo)
--{
--#ifdef HAVE_SYS_MMAN_H
--    /* FIXME should avoid holding onto mmap'd buffers so long? */
--    if(vdo->iomode == VIDEO_MMAP && vdo->buf) {
--        if(munmap(vdo->buf, vdo->buflen))
--            return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
--                               "unmapping video frame buffers"));
--        vdo->buf = NULL;
--        /* FIXME reset image */
--    }
--#endif
--
--    /* close open device */
--    if(vdo->fd >= 0) {
--        close(vdo->fd);
--        vdo->fd = -1;
--    }
--    return(0);
--}
--
--static int v4l1_probe_iomode (zbar_video_t *vdo)
--{
--    vdo->iomode = VIDEO_READWRITE;
--#ifdef HAVE_SYS_MMAN_H
--    struct video_mbuf vbuf;
--    memset(&vbuf, 0, sizeof(vbuf));
--    if(ioctl(vdo->fd, VIDIOCGMBUF, &vbuf) < 0) {
--        if(errno != EINVAL)
--            return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
--                               "querying video frame buffers (VIDIOCGMBUF)"));
--        /* not supported */
--        return(0);
--    }
--    if(!vbuf.frames || !vbuf.size)
--        return(0);
--    vdo->iomode = VIDEO_MMAP;
--    if(vdo->num_images > vbuf.frames)
--        vdo->num_images = vbuf.frames;
--#endif
--    zprintf(1, "using %d images in %s mode\n", vdo->num_images,
--            (vdo->iomode == VIDEO_READWRITE) ? "READ" : "MMAP");
--    return(0);
--}
--
--static inline int v4l1_probe_formats (zbar_video_t *vdo)
--{
--    struct video_picture vpic;
--    memset(&vpic, 0, sizeof(vpic));
--    if(ioctl(vdo->fd, VIDIOCGPICT, &vpic) < 0)
--        return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
--                           "querying format (VIDIOCGPICT)"));
--
--    vdo->format = 0;
--    if(vpic.palette <= VIDEO_PALETTE_YUV410P)
--        vdo->format = v4l1_formats[vpic.palette].format;
--
--    zprintf(1, "current format: %.4s(%08x) depth=%d palette=%d\n",
--            (char*)&vdo->format, vdo->format, vpic.depth, vpic.palette);
--
--    vdo->formats = calloc(16, sizeof(uint32_t));
--    if(!vdo->formats)
--        return(err_capture(vdo, SEV_FATAL, ZBAR_ERR_NOMEM, __func__,
--                           "allocating format list"));
--
--    int num_formats = 0;
--    zprintf(2, "probing supported formats:\n");
--    int i;
--    for(i = 1; i <= VIDEO_PALETTE_YUV410P; i++) {
--        if(!v4l1_formats[i].format)
--            continue;
--        vpic.depth = v4l1_formats[i].bpp;
--        vpic.palette = i;
--        if(ioctl(vdo->fd, VIDIOCSPICT, &vpic) < 0) {
--            zprintf(2, "    [%02d] %.4s...no (set fails)\n",
--                    i, (char*)&v4l1_formats[i].format);
--            continue;
--        }
--        if(ioctl(vdo->fd, VIDIOCGPICT, &vpic) < 0 ||
--           vpic.palette != i) {
--            zprintf(2, "    [%02d] %.4s...no (set ignored)\n",
--                    i, (char*)&v4l1_formats[i].format);
--            continue;
--        }
--        zprintf(2, "    [%02d] %.4s...yes\n",
--                i, (char*)&v4l1_formats[i].format);
--        vdo->formats[num_formats++] = v4l1_formats[i].format;
--    }
--    vdo->formats = realloc(vdo->formats, (num_formats + 1) * sizeof(uint32_t));
--    assert(vdo->formats);
--
--    return(v4l1_set_format(vdo, vdo->format));
--}
--
--static inline int v4l1_init_window (zbar_video_t *vdo)
--{
--    struct video_window vwin;
--    memset(&vwin, 0, sizeof(vwin));
--    if(ioctl(vdo->fd, VIDIOCGWIN, &vwin) < 0)
--        return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
--                           "querying video window settings (VIDIOCGWIN)"));
--
--    zprintf(1, "current window: %d x %d @(%d, %d)%s\n",
--            vwin.width, vwin.height, vwin.x, vwin.y,
--            (vwin.flags & 1) ? " INTERLACE" : "");
--
--    if(vwin.width == vdo->width && vwin.height == vdo->height)
--        /* max window already set */
--        return(0);
--
--    struct video_window maxwin;
--    memcpy(&maxwin, &vwin, sizeof(maxwin));
--    maxwin.width = vdo->width;
--    maxwin.height = vdo->height;
--
--    zprintf(1, "setting max win: %d x %d @(%d, %d)%s\n",
--            maxwin.width, maxwin.height, maxwin.x, maxwin.y,
--            (maxwin.flags & 1) ? " INTERLACE" : "");
--    if(ioctl(vdo->fd, VIDIOCSWIN, &maxwin) < 0) {
--        zprintf(1, "set FAILED...trying to recover original window\n");
--        /* ignore errors (driver broken anyway) */
--        ioctl(vdo->fd, VIDIOCSWIN, &vwin);
--    }
--
--    /* re-query resulting parameters */
--    memset(&vwin, 0, sizeof(vwin));
--    if(ioctl(vdo->fd, VIDIOCGWIN, &vwin) < 0)
--        return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
--                           "querying video window settings (VIDIOCGWIN)"));
--
--    zprintf(1, "    final window: %d x %d @(%d, %d)%s\n",
--            vwin.width, vwin.height, vwin.x, vwin.y,
--            (vwin.flags & 1) ? " INTERLACE" : "");
--    vdo->width = vwin.width;
--    vdo->height = vwin.height;
--    return(0);
--}
--
--static int _zbar_v4l1_probe (zbar_video_t *vdo)
--{
--    /* check capabilities */
--    struct video_capability vcap;
--    memset(&vcap, 0, sizeof(vcap));
--    if(ioctl(vdo->fd, VIDIOCGCAP, &vcap) < 0)
--        return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_UNSUPPORTED, __func__,
--                           "video4linux version 1 not supported (VIDIOCGCAP)"));
--
--    zprintf(1, "%s (%sCAPTURE) (%d x %d) - (%d x %d)\n",
--            vcap.name, (vcap.type & VID_TYPE_CAPTURE) ? "" : "*NO* ",
--            vcap.minwidth, vcap.minheight, vcap.maxwidth, vcap.maxheight);
--
--    if(!(vcap.type & VID_TYPE_CAPTURE))
--        return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_UNSUPPORTED, __func__,
--                           "v4l1 device does not support CAPTURE"));
--
--    if(!vdo->width || !vdo->height) {
--        vdo->width = vcap.maxwidth;
--        vdo->height = vcap.maxheight;
--    }
--
--    if(v4l1_init_window(vdo) ||
--       v4l1_probe_formats(vdo) ||
--       v4l1_probe_iomode(vdo))
--        return(-1);
--
--    vdo->intf = VIDEO_V4L1;
--    vdo->init = v4l1_init;
--    vdo->cleanup = v4l1_cleanup;
--    vdo->start = v4l1_start;
--    vdo->stop = v4l1_stop;
--    vdo->nq = v4l1_nq;
--    vdo->dq = v4l1_dq;
--    return(0);
--}
--
--int _zbar_video_open (zbar_video_t *vdo,
--                      const char *dev)
--{
+@@ -43,7 +50,7 @@
+ int _zbar_video_open (zbar_video_t *vdo,
+                       const char *dev)
+ {
 -    vdo->fd = open(dev, O_RDWR);
--    if(vdo->fd < 0)
--        return(err_capture_str(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
--                               "opening video device '%s'", dev));
--    zprintf(1, "opened camera device %s (fd=%d)\n", dev, vdo->fd);
--
--    int rc = -1;
--#ifdef HAVE_LINUX_VIDEODEV2_H
--    if(vdo->intf != VIDEO_V4L1)
--        rc = _zbar_v4l2_probe(vdo);
--    if(rc)
--#else
--    zprintf(1, "WARNING: not compiled with v4l2 support, trying v4l1\n");
--#endif
--        rc = _zbar_v4l1_probe(vdo);
--
--    if(rc && vdo->fd >= 0) {
++    vdo->fd = v4l2_open(dev, O_RDWR);
+     if(vdo->fd < 0)
+         return(err_capture_str(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
+                                "opening video device '%s'", dev));
+@@ -60,7 +67,7 @@
+ #endif
+ 
+     if(rc && vdo->fd >= 0) {
 -        close(vdo->fd);
--        vdo->fd = -1;
--    }
--    return(rc);
--}
-diff --git a/zbar/video/v4l2.c b/zbar/video/v4l2.c
---- a/zbar/video/v4l2.c
-+++ b/zbar/video/v4l2.c
-@@ -38,6 +38,8 @@
++        v4l2_close(vdo->fd);
+         vdo->fd = -1;
+     }
+     return(rc);
+diff -r 38e78368283d zbar/video/v4l2.c
+--- a/zbar/video/v4l2.c	Sun Oct 14 23:02:08 2012 -0700
++++ b/zbar/video/v4l2.c	Fri Feb 22 10:04:52 2013 -0300
+@@ -38,6 +38,15 @@
  #ifdef HAVE_SYS_MMAN_H
  # include <sys/mman.h>
  #endif
-+#include <fcntl.h>
-+#include <libv4l2.h>
++#ifdef HAVE_LIBV4L2_H
++# include <fcntl.h>
++# include <libv4l2.h>
++#else
++# define v4l2_close close
++# define v4l2_ioctl ioctl
++# define v4l2_mmap mmap
++# define v4l2_munmap munmap
++#endif
  #include <linux/videodev2.h>
  
  #include "video.h"
-@@ -67,7 +69,7 @@ static int v4l2_nq (zbar_video_t *vdo,
+@@ -67,7 +76,7 @@
          vbuf.length = img->datalen;
          vbuf.index = img->srcidx; /* FIXME workaround broken drivers */
      }
@@ -525,7 +122,7 @@ diff --git a/zbar/video/v4l2.c b/zbar/video/v4l2.c
          return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
                             "queuing video buffer (VIDIOC_QBUF)"));
      return(0);
-@@ -91,7 +93,7 @@ static zbar_image_t *v4l2_dq (zbar_video
+@@ -91,7 +100,7 @@
          else
              vbuf.memory = V4L2_MEMORY_USERPTR;
  
@@ -534,7 +131,7 @@ diff --git a/zbar/video/v4l2.c b/zbar/video/v4l2.c
              return(NULL);
  
          if(iomode == VIDEO_MMAP) {
-@@ -132,7 +134,7 @@ static int v4l2_start (zbar_video_t *vdo
+@@ -132,7 +141,7 @@
          return(0);
  
      enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
@@ -543,7 +140,7 @@ diff --git a/zbar/video/v4l2.c b/zbar/video/v4l2.c
          return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
                             "starting video stream (VIDIOC_STREAMON)"));
      return(0);
-@@ -144,7 +146,7 @@ static int v4l2_stop (zbar_video_t *vdo)
+@@ -144,7 +153,7 @@
          return(0);
  
      enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
@@ -552,7 +149,7 @@ diff --git a/zbar/video/v4l2.c b/zbar/video/v4l2.c
          return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
                             "stopping video stream (VIDIOC_STREAMOFF)"));
      return(0);
-@@ -164,7 +166,7 @@ static int v4l2_cleanup (zbar_video_t *v
+@@ -164,7 +173,7 @@
          for(i = 0; i < vdo->num_images; i++) {
              zbar_image_t *img = vdo->images[i];
              if(img->data &&
@@ -561,7 +158,7 @@ diff --git a/zbar/video/v4l2.c b/zbar/video/v4l2.c
                  err_capture(vdo, SEV_WARNING, ZBAR_ERR_SYSTEM, __func__,
                              "unmapping video frame buffers");
              img->data = NULL;
-@@ -177,27 +179,27 @@ static int v4l2_cleanup (zbar_video_t *v
+@@ -177,14 +186,14 @@
      /* requesting 0 buffers
       * should implicitly disable streaming
       */
@@ -579,13 +176,7 @@ diff --git a/zbar/video/v4l2.c b/zbar/video/v4l2.c
          vdo->fd = -1;
      }
      return(0);
- }
- 
--static int v4l2_mmap_buffers (zbar_video_t *vdo)
-+static int v4l2_v4l2_mmap_buffers (zbar_video_t *vdo)
- {
-     struct v4l2_requestbuffers rb;
-     memset(&rb, 0, sizeof(rb));
+@@ -197,7 +206,7 @@
      rb.count = vdo->num_images;
      rb.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
      rb.memory = V4L2_MEMORY_MMAP;
@@ -594,7 +185,7 @@ diff --git a/zbar/video/v4l2.c b/zbar/video/v4l2.c
          return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
                             "requesting video frame buffers (VIDIOC_REQBUFS)"));
      zprintf(1, "mapping %u buffers (of %d requested)\n",
-@@ -216,7 +218,7 @@ static int v4l2_mmap_buffers (zbar_video
+@@ -216,7 +225,7 @@
      int i;
      for(i = 0; i < vdo->num_images; i++) {
          vbuf.index = i;
@@ -603,7 +194,7 @@ diff --git a/zbar/video/v4l2.c b/zbar/video/v4l2.c
              /* FIXME cleanup */
              return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
                                 "querying video buffer (VIDIOC_QUERYBUF)"));
-@@ -229,7 +231,7 @@ static int v4l2_mmap_buffers (zbar_video
+@@ -229,7 +238,7 @@
  
          zbar_image_t *img = vdo->images[i];
          img->datalen = vbuf.length;
@@ -612,7 +203,7 @@ diff --git a/zbar/video/v4l2.c b/zbar/video/v4l2.c
                           vdo->fd, vbuf.m.offset);
          if(img->data == MAP_FAILED)
              /* FIXME cleanup */
-@@ -253,7 +255,7 @@ static int v4l2_set_format (zbar_video_t
+@@ -253,7 +262,7 @@
      vpix->pixelformat = fmt;
      vpix->field = V4L2_FIELD_NONE;
      int rc = 0;
@@ -621,7 +212,7 @@ diff --git a/zbar/video/v4l2.c b/zbar/video/v4l2.c
          /* several broken drivers return an error if we request
           * no interlacing (NB v4l2 spec violation)
           * ...try again with an interlaced request
-@@ -264,7 +266,7 @@ static int v4l2_set_format (zbar_video_t
+@@ -264,7 +273,7 @@
          /* FIXME this might be _ANY once we can de-interlace */
          vpix->field = V4L2_FIELD_INTERLACED;
  
@@ -630,7 +221,7 @@ diff --git a/zbar/video/v4l2.c b/zbar/video/v4l2.c
              return(err_capture_int(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
                                     "setting format %x (VIDIOC_S_FMT)", fmt));
  
-@@ -276,7 +278,7 @@ static int v4l2_set_format (zbar_video_t
+@@ -276,7 +285,7 @@
      struct v4l2_pix_format *newpix = &newfmt.fmt.pix;
      memset(&newfmt, 0, sizeof(newfmt));
      newfmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
@@ -639,16 +230,7 @@ diff --git a/zbar/video/v4l2.c b/zbar/video/v4l2.c
          return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
                             "querying format (VIDIOC_G_FMT)"));
  
-@@ -307,7 +309,7 @@ static int v4l2_init (zbar_video_t *vdo,
-     if(v4l2_set_format(vdo, fmt))
-         return(-1);
-     if(vdo->iomode == VIDEO_MMAP)
--        return(v4l2_mmap_buffers(vdo));
-+        return(v4l2_v4l2_mmap_buffers(vdo));
-     return(0);
- }
- 
-@@ -322,7 +324,7 @@ static int v4l2_probe_iomode (zbar_video
+@@ -322,7 +331,7 @@
      else
          rb.memory = V4L2_MEMORY_USERPTR;
  
@@ -657,7 +239,7 @@ diff --git a/zbar/video/v4l2.c b/zbar/video/v4l2.c
          if(vdo->iomode)
              return(err_capture_int(vdo, SEV_ERROR, ZBAR_ERR_INVALID, __func__,
                                     "unsupported iomode requested (%d)",
-@@ -350,7 +352,7 @@ static inline int v4l2_probe_formats (zb
+@@ -350,7 +359,7 @@
      memset(&desc, 0, sizeof(desc));
      desc.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
      for(desc.index = 0; desc.index < V4L2_FORMATS_MAX; desc.index++) {
@@ -666,7 +248,7 @@ diff --git a/zbar/video/v4l2.c b/zbar/video/v4l2.c
              break;
          zprintf(2, "    [%d] %.4s : %s%s\n",
                  desc.index, (char*)&desc.pixelformat, desc.description,
-@@ -368,7 +370,7 @@ static inline int v4l2_probe_formats (zb
+@@ -368,7 +377,7 @@
      struct v4l2_pix_format *pix = &fmt.fmt.pix;
      memset(&fmt, 0, sizeof(fmt));
      fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
@@ -675,7 +257,7 @@ diff --git a/zbar/video/v4l2.c b/zbar/video/v4l2.c
          return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
                             "querying current video format (VIDIO_G_FMT)"));
  
-@@ -390,15 +392,15 @@ static inline int v4l2_probe_formats (zb
+@@ -390,15 +399,15 @@
      maxpix->height = vdo->height;
  
      zprintf(1, "setting requested size: %d x %d\n", vdo->width, vdo->height);
@@ -694,7 +276,7 @@ diff --git a/zbar/video/v4l2.c b/zbar/video/v4l2.c
          return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
                             "querying current video format (VIDIOC_G_FMT)"));
  
-@@ -420,7 +422,7 @@ static inline int v4l2_reset_crop (zbar_
+@@ -420,7 +429,7 @@
      struct v4l2_cropcap ccap;
      memset(&ccap, 0, sizeof(ccap));
      ccap.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
@@ -703,7 +285,7 @@ diff --git a/zbar/video/v4l2.c b/zbar/video/v4l2.c
          return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
                             "querying crop support (VIDIOC_CROPCAP)"));
  
-@@ -442,7 +444,7 @@ static inline int v4l2_reset_crop (zbar_
+@@ -442,7 +451,7 @@
      memset(&crop, 0, sizeof(crop));
      crop.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
      crop.c = ccap.defrect;
@@ -712,7 +294,7 @@ diff --git a/zbar/video/v4l2.c b/zbar/video/v4l2.c
          return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
                             "setting default crop window (VIDIOC_S_CROP)"));
      return(0);
-@@ -453,7 +455,7 @@ int _zbar_v4l2_probe (zbar_video_t *vdo)
+@@ -453,7 +462,7 @@
      /* check capabilities */
      struct v4l2_capability vcap;
      memset(&vcap, 0, sizeof(vcap));
@@ -721,35 +303,3 @@ diff --git a/zbar/video/v4l2.c b/zbar/video/v4l2.c
          return(err_capture(vdo, SEV_WARNING, ZBAR_ERR_UNSUPPORTED, __func__,
                             "video4linux version 2 not supported (VIDIOC_QUERYCAP)"));
  
-@@ -507,3 +509,21 @@ int _zbar_v4l2_probe (zbar_video_t *vdo)
-     vdo->dq = v4l2_dq;
-     return(0);
- }
-+
-+int _zbar_video_open (zbar_video_t *vdo,
-+                      const char *dev)
-+{
-+    vdo->fd = v4l2_open(dev, O_RDWR);
-+    if(vdo->fd < 0)
-+        return(err_capture_str(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
-+                               "opening video device '%s'", dev));
-+    zprintf(1, "opened camera device %s (fd=%d)\n", dev, vdo->fd);
-+
-+    int rc = _zbar_v4l2_probe(vdo);
-+
-+    if(rc && vdo->fd >= 0) {
-+        v4l2_close(vdo->fd);
-+        vdo->fd = -1;
-+    }
-+    return(rc);
-+}
-diff --git a/zbarcam/Makefile.am.inc b/zbarcam/Makefile.am.inc
---- a/zbarcam/Makefile.am.inc
-+++ b/zbarcam/Makefile.am.inc
-@@ -7,4 +7,6 @@ CLEANFILES += zbarcam/.libs/zbarcam
- if WIN32
- zbarcam_zbarcam_SOURCES += zbarcam/zbarcam.rc
- zbarcam_zbarcam_LDADD += zbarcam/zbarcam-rc.o
-+else
-+zbarcam_zbarcam_LDADD += -lv4l2
- endif

From 16e94d76ea1b672d4f70991e7492e16ab9272fd1 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Fri, 22 Feb 2013 11:25:39 -0300
Subject: [PATCH 022/108] Instead of using ImageMagick, use GraphicsMagick

Barcode image recognition seems a more reliable with GraphicsMagick.
So use it for f19, instead of ImageMagick.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---
 zbar.spec | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/zbar.spec b/zbar.spec
index 3447be5..571c7d9 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -3,7 +3,7 @@
 
 Name:           zbar
 Version:        0.10
-Release:        15%{?dist}
+Release:        16%{?dist}
 Summary:        Bar code reader
 
 Group:          User Interface/X Hardware Support
@@ -14,10 +14,9 @@ Patch0:		zbar_update_to_hg.patch
 Patch1:		zbar_use_libv4l.patch
 Patch2:		zbar_choose_supported_format_first.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:	ImageMagick-c++ libv4l libXv
  
 BuildRequires:	autoconf automake libtool python-devel gettext-devel
-BuildRequires:	qt4-devel gtk2-devel pygtk2-devel ImageMagick-c++-devel
+BuildRequires:	qt4-devel gtk2-devel pygtk2-devel GraphicsMagick-c++-devel
 BuildRequires:	libv4l-devel libXv-devel xmlto
 
 %description
@@ -90,8 +89,7 @@ scanning widget.
 
 %build
 autoreconf -vfi
-autoconf
-%configure --docdir=%{_docdir}/%{name}-%{version}
+%configure --with-graphicsmagick --docdir=%{_docdir}/%{name}-%{version}
 
 # rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -178,6 +176,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/zbar/QZBar*.h
 
 %changelog
+* Fri Feb 22 2013 Mauro Carvalho Chehab <mchehab@redhat.com> - 0.10-16
+- Change zbar to use GraphicsMagick instead of ImageMagick
+
 * Fri Feb 22 2013 Mauro Carvalho Chehab <mchehab@redhat.com> - 0.10-15
 - zbar 0.10 source generated via hg archive -r 0.10 ../zbar-0.10.tar.bz2
   That allows to better handle the difference from 0.10 to -hg

From 157b3dba2b2573253657e623a070316c4649a4b7 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Fri, 22 Feb 2013 21:17:40 -0300
Subject: [PATCH 023/108] Enable firefox/mozilla plugin

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---
 zbar.spec            | 20 +++++++++++++++++++-
 zbar_fix_npapi.patch | 27 +++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 zbar_fix_npapi.patch

diff --git a/zbar.spec b/zbar.spec
index 571c7d9..e88a1ac 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -13,6 +13,7 @@ Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.
 Patch0:		zbar_update_to_hg.patch
 Patch1:		zbar_use_libv4l.patch
 Patch2:		zbar_choose_supported_format_first.patch
+Patch3:		zbar_fix_npapi.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
 BuildRequires:	autoconf automake libtool python-devel gettext-devel
@@ -81,15 +82,23 @@ This package contains header files and additional libraries used for
 developing GUI applications based on Qt4 that include a bar code
 scanning widget.
 
+%package plugin
+Group: Applications/Internet
+Summary: Mozilla plugin for zbar
+
+%description plugin
+This package contains zbar plugin for mozilla Firefox
+
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 autoreconf -vfi
-%configure --with-graphicsmagick --docdir=%{_docdir}/%{name}-%{version}
+%configure --with-graphicsmagick --with-npapi --docdir=%{_docdir}/%{name}-%{version}
 
 # rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -100,6 +109,9 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins/
+mv $RPM_BUILD_ROOT%{_libdir}/libzbarplugin.so $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins/
+rm $RPM_BUILD_ROOT%{_libdir}/libzbarplugin.so.*
 
 #Remove .la and .a files
 find ${RPM_BUILD_ROOT} -name '*.la' -or -name '*.a' | xargs rm -f
@@ -175,8 +187,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/zbar-qt.pc
 %{_includedir}/zbar/QZBar*.h
 
+%files plugin
+%{_libdir}/mozilla/plugins/libzbarplugin.so
+
 %changelog
 * Fri Feb 22 2013 Mauro Carvalho Chehab <mchehab@redhat.com> - 0.10-16
+- Enable firefox/mozilla plugin
+
+* Fri Feb 22 2013 Mauro Carvalho Chehab <mchehab@redhat.com>
 - Change zbar to use GraphicsMagick instead of ImageMagick
 
 * Fri Feb 22 2013 Mauro Carvalho Chehab <mchehab@redhat.com> - 0.10-15
diff --git a/zbar_fix_npapi.patch b/zbar_fix_npapi.patch
new file mode 100644
index 0000000..521da07
--- /dev/null
+++ b/zbar_fix_npapi.patch
@@ -0,0 +1,27 @@
+diff -r cd6dc43fd063 configure.ac
+--- a/configure.ac	Fri Feb 22 13:36:53 2013 -0300
++++ b/configure.ac	Fri Feb 22 20:41:40 2013 -0300
+@@ -400,9 +400,9 @@
+   [with_npapi="no"])
+ 
+ AS_IF([test "x$with_npapi" != "xno"],
+-  [PKG_CHECK_MODULES([NPAPI], [firefox-plugin])
+-   NPAPI_VERSION=`$PKG_CONFIG firefox-plugin --modversion`
+-   AC_MSG_NOTICE([using firefox-plugin version $NPAPI_VERSION])])
++  [PKG_CHECK_MODULES([NPAPI], [mozilla-plugin])
++   NPAPI_VERSION=`$PKG_CONFIG mozilla-plugin --modversion`
++   AC_MSG_NOTICE([using mozilla-plugin version $NPAPI_VERSION])])
+ 
+ AM_CONDITIONAL([HAVE_NPAPI], [test "x$with_npapi" = "xyes"])
+ 
+diff -r cd6dc43fd063 plugin/Makefile.am.inc
+--- a/plugin/Makefile.am.inc	Fri Feb 22 13:36:53 2013 -0300
++++ b/plugin/Makefile.am.inc	Fri Feb 22 20:41:40 2013 -0300
+@@ -1,5 +1,5 @@
+ lib_LTLIBRARIES += plugin/libzbarplugin.la
+ plugin_libzbarplugin_la_SOURCES = \
+    plugin/plugin.c
+-plugin_libzbarplugin_la_CPPFLAGS = $(MOZILLA_CFLAGS) $(AM_CPPFLAGS)
+-plugin_libzbarplugin_la_LDFLAGS = $(MOZILLA_LIBS) $(AM_LDFLAGS)
++plugin_libzbarplugin_la_CPPFLAGS = $(NPAPI_CFLAGS) $(AM_CPPFLAGS)
++plugin_libzbarplugin_la_LDFLAGS = $(NPAPI_LIBS) $(AM_LDFLAGS)

From ec6571e264aae9d26c713da45861626235b82d03 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Fri, 22 Feb 2013 21:56:06 -0300
Subject: [PATCH 024/108] Revert "Enable firefox/mozilla plugin"

This reverts commit 157b3dba2b2573253657e623a070316c4649a4b7.

The plugin currently does nothing. Just revert this patch.
---
 zbar.spec            | 20 +-------------------
 zbar_fix_npapi.patch | 27 ---------------------------
 2 files changed, 1 insertion(+), 46 deletions(-)
 delete mode 100644 zbar_fix_npapi.patch

diff --git a/zbar.spec b/zbar.spec
index e88a1ac..571c7d9 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -13,7 +13,6 @@ Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.
 Patch0:		zbar_update_to_hg.patch
 Patch1:		zbar_use_libv4l.patch
 Patch2:		zbar_choose_supported_format_first.patch
-Patch3:		zbar_fix_npapi.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
 BuildRequires:	autoconf automake libtool python-devel gettext-devel
@@ -82,23 +81,15 @@ This package contains header files and additional libraries used for
 developing GUI applications based on Qt4 that include a bar code
 scanning widget.
 
-%package plugin
-Group: Applications/Internet
-Summary: Mozilla plugin for zbar
-
-%description plugin
-This package contains zbar plugin for mozilla Firefox
-
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
 autoreconf -vfi
-%configure --with-graphicsmagick --with-npapi --docdir=%{_docdir}/%{name}-%{version}
+%configure --with-graphicsmagick --docdir=%{_docdir}/%{name}-%{version}
 
 # rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -109,9 +100,6 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins/
-mv $RPM_BUILD_ROOT%{_libdir}/libzbarplugin.so $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins/
-rm $RPM_BUILD_ROOT%{_libdir}/libzbarplugin.so.*
 
 #Remove .la and .a files
 find ${RPM_BUILD_ROOT} -name '*.la' -or -name '*.a' | xargs rm -f
@@ -187,14 +175,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/zbar-qt.pc
 %{_includedir}/zbar/QZBar*.h
 
-%files plugin
-%{_libdir}/mozilla/plugins/libzbarplugin.so
-
 %changelog
 * Fri Feb 22 2013 Mauro Carvalho Chehab <mchehab@redhat.com> - 0.10-16
-- Enable firefox/mozilla plugin
-
-* Fri Feb 22 2013 Mauro Carvalho Chehab <mchehab@redhat.com>
 - Change zbar to use GraphicsMagick instead of ImageMagick
 
 * Fri Feb 22 2013 Mauro Carvalho Chehab <mchehab@redhat.com> - 0.10-15
diff --git a/zbar_fix_npapi.patch b/zbar_fix_npapi.patch
deleted file mode 100644
index 521da07..0000000
--- a/zbar_fix_npapi.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -r cd6dc43fd063 configure.ac
---- a/configure.ac	Fri Feb 22 13:36:53 2013 -0300
-+++ b/configure.ac	Fri Feb 22 20:41:40 2013 -0300
-@@ -400,9 +400,9 @@
-   [with_npapi="no"])
- 
- AS_IF([test "x$with_npapi" != "xno"],
--  [PKG_CHECK_MODULES([NPAPI], [firefox-plugin])
--   NPAPI_VERSION=`$PKG_CONFIG firefox-plugin --modversion`
--   AC_MSG_NOTICE([using firefox-plugin version $NPAPI_VERSION])])
-+  [PKG_CHECK_MODULES([NPAPI], [mozilla-plugin])
-+   NPAPI_VERSION=`$PKG_CONFIG mozilla-plugin --modversion`
-+   AC_MSG_NOTICE([using mozilla-plugin version $NPAPI_VERSION])])
- 
- AM_CONDITIONAL([HAVE_NPAPI], [test "x$with_npapi" = "xyes"])
- 
-diff -r cd6dc43fd063 plugin/Makefile.am.inc
---- a/plugin/Makefile.am.inc	Fri Feb 22 13:36:53 2013 -0300
-+++ b/plugin/Makefile.am.inc	Fri Feb 22 20:41:40 2013 -0300
-@@ -1,5 +1,5 @@
- lib_LTLIBRARIES += plugin/libzbarplugin.la
- plugin_libzbarplugin_la_SOURCES = \
-    plugin/plugin.c
--plugin_libzbarplugin_la_CPPFLAGS = $(MOZILLA_CFLAGS) $(AM_CPPFLAGS)
--plugin_libzbarplugin_la_LDFLAGS = $(MOZILLA_LIBS) $(AM_LDFLAGS)
-+plugin_libzbarplugin_la_CPPFLAGS = $(NPAPI_CFLAGS) $(AM_CPPFLAGS)
-+plugin_libzbarplugin_la_LDFLAGS = $(NPAPI_LIBS) $(AM_LDFLAGS)

From 66165c3d446ae6740bfda86a9badf2bec3561e41 Mon Sep 17 00:00:00 2001
From: Brian Pepple <bpepple@fedoraproject.org>
Date: Mon, 25 Mar 2013 20:44:17 -0400
Subject: [PATCH 025/108] Rebuild.

---
 zbar.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zbar.spec b/zbar.spec
index 571c7d9..72f3431 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -3,7 +3,7 @@
 
 Name:           zbar
 Version:        0.10
-Release:        16%{?dist}
+Release:        17%{?dist}
 Summary:        Bar code reader
 
 Group:          User Interface/X Hardware Support
@@ -176,6 +176,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/zbar/QZBar*.h
 
 %changelog
+* Tue Mar 26 2013 Brian Pepple <bpepple@fedoraproject.org> - 0.10-17
+- Rebuild.
+
 * Fri Feb 22 2013 Mauro Carvalho Chehab <mchehab@redhat.com> - 0.10-16
 - Change zbar to use GraphicsMagick instead of ImageMagick
 

From 9c927f6e5fa9c9929f971fd401be45cd46357929 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Sun, 4 Aug 2013 04:46:49 -0500
Subject: [PATCH 026/108] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild

---
 zbar.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zbar.spec b/zbar.spec
index 72f3431..870709f 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -3,7 +3,7 @@
 
 Name:           zbar
 Version:        0.10
-Release:        17%{?dist}
+Release:        18%{?dist}
 Summary:        Bar code reader
 
 Group:          User Interface/X Hardware Support
@@ -176,6 +176,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/zbar/QZBar*.h
 
 %changelog
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
 * Tue Mar 26 2013 Brian Pepple <bpepple@fedoraproject.org> - 0.10-17
 - Rebuild.
 

From 6747812698630670049781ecc2bbc9ddf2b250c7 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <m.chehab@samsung.com>
Date: Tue, 6 Aug 2013 08:22:52 -0300
Subject: [PATCH 027/108] Fix some bogus date

    bogus date in %changelog: Sun Dec 25 2010 mchehab - 0.10-7
    bogus date in %changelog: Thu Jul 28 2009 Douglas Schilling Landgraf <dougsland@redhat.com> - 0.8-5
    bogus date in %changelog: Thu Jul 27 2009 Douglas Schilling Landgraf <dougsland@redhat.com> - 0.8-4
    bogus date in %changelog: Thu Jul 24 2009 Douglas Schilling Landgraf <dougsland@redhat.com> - 0.8-3
    bogus date in %changelog: Thu Jul 15 2009 Douglas Schilling Landgraf <dougsland@redhat.com> - 0.8-1

Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
---
 zbar.spec | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/zbar.spec b/zbar.spec
index 870709f..552ed8c 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -211,7 +211,7 @@ rm -rf $RPM_BUILD_ROOT
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
-* Sun Dec 25 2010 mchehab - 0.10-7
+* Sat Dec 25 2010 Mauro Carvalho Chehab <mchehab@redhat.com> - 0.10-7
 - Prefer to use non-emulated formats
 
 * Sun Dec 05 2010 Mauro Carvalho Chehab <mchehab@redhat.com>
@@ -240,7 +240,7 @@ rm -rf $RPM_BUILD_ROOT
 * Wed Jul 29 2009 Itamar Reis Peixoto <itamar@ispbrasil.com.br> - 0.8-6
 - fix epel build
 
-* Thu Jul 28 2009 Douglas Schilling Landgraf <dougsland@redhat.com> - 0.8-5
+* Tue Jul 28 2009 Douglas Schilling Landgraf <dougsland@redhat.com> - 0.8-5
 - Now fixed Source0 url
 - Removed ldconfig calls to devel subpackages
 - Fixed directory ownership issue -pygtk
@@ -248,7 +248,7 @@ rm -rf $RPM_BUILD_ROOT
 - Added comment to rpath 
 - Improved comment for removing .la and .a files
 
-* Thu Jul 27 2009 Douglas Schilling Landgraf <dougsland@redhat.com> - 0.8-4
+* Mon Jul 27 2009 Douglas Schilling Landgraf <dougsland@redhat.com> - 0.8-4
 - Fixed sourceforge url
 - Removed redundant libX11-devel package from BuildRequires
 - Removed redundant ImageMagick package from Requires
@@ -259,7 +259,7 @@ rm -rf $RPM_BUILD_ROOT
 - Fixed ownership issue
 - Added ldconfig call to devel, qt-devel and gtk-devel
 
-* Thu Jul 24 2009 Douglas Schilling Landgraf <dougsland@redhat.com> - 0.8-3
+* Fri Jul 24 2009 Douglas Schilling Landgraf <dougsland@redhat.com> - 0.8-3
 - Fixed License from LGPLv2 to LGPLv2+
 - Added to main BuildRequires libXv-devel and xmlto packages
 - Removed pkgconfig from main BuildRequires
@@ -287,5 +287,5 @@ rm -rf $RPM_BUILD_ROOT
 - Fixed warnings from rpmlint
 - Fixed static path to docs
 
-* Thu Jul 15 2009 Douglas Schilling Landgraf <dougsland@redhat.com> - 0.8-1
+* Wed Jul 15 2009 Douglas Schilling Landgraf <dougsland@redhat.com> - 0.8-1
 - First release, based on original zbar.spec provided by sources

From bfab31e9db2ab3f7d332e7148b14979201e31898 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <m.chehab@samsung.com>
Date: Tue, 6 Aug 2013 08:45:47 -0300
Subject: [PATCH 028/108] Discard installed docs

The spec makes those files to install directly from the source
directory, and not from the installed one.

error: Installed (but unpackaged) file(s) found:
   /usr/share/doc/zbar-0.10/COPYING
   /usr/share/doc/zbar-0.10/HACKING
   /usr/share/doc/zbar-0.10/INSTALL
   /usr/share/doc/zbar-0.10/LICENSE
   /usr/share/doc/zbar-0.10/NEWS
   /usr/share/doc/zbar-0.10/README
   /usr/share/doc/zbar-0.10/TODO

Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
---
 zbar.spec | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/zbar.spec b/zbar.spec
index 552ed8c..03abbdd 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -104,6 +104,9 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 #Remove .la and .a files
 find ${RPM_BUILD_ROOT} -name '*.la' -or -name '*.a' | xargs rm -f
 
+# Remove installed doc
+rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-0.10/
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 

From c90bcf0d0c8aa425438f1de96186afa83890b182 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <m.chehab@samsung.com>
Date: Tue, 6 Aug 2013 08:53:54 -0300
Subject: [PATCH 029/108] zbar: increase version to do a new git build

Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
---
 zbar.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zbar.spec b/zbar.spec
index 03abbdd..c25ea8a 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -3,7 +3,7 @@
 
 Name:           zbar
 Version:        0.10
-Release:        18%{?dist}
+Release:        19%{?dist}
 Summary:        Bar code reader
 
 Group:          User Interface/X Hardware Support
@@ -179,6 +179,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/zbar/QZBar*.h
 
 %changelog
+* Tue Aug 06 2013 Mauro Carvalho Chehab <m.chehab@samsung.com> - 0.10-19
+- Fix Fedora 20 build problems
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10-18
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 

From 93fa0bd72372d05d9c574ec15971c27397a2b25d Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Sat, 7 Jun 2014 13:04:46 -0500
Subject: [PATCH 030/108] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild

---
 zbar.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zbar.spec b/zbar.spec
index c25ea8a..ebc863b 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -3,7 +3,7 @@
 
 Name:           zbar
 Version:        0.10
-Release:        19%{?dist}
+Release:        20%{?dist}
 Summary:        Bar code reader
 
 Group:          User Interface/X Hardware Support
@@ -179,6 +179,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/zbar/QZBar*.h
 
 %changelog
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
 * Tue Aug 06 2013 Mauro Carvalho Chehab <m.chehab@samsung.com> - 0.10-19
 - Fix Fedora 20 build problems
 

From c290aab1c8309b1b317ba9ea8d756eb43598cf8c Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@fedoraproject.org>
Date: Mon, 18 Aug 2014 11:33:36 +0000
Subject: [PATCH 031/108] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild

---
 zbar.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zbar.spec b/zbar.spec
index ebc863b..0b57bc8 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -3,7 +3,7 @@
 
 Name:           zbar
 Version:        0.10
-Release:        20%{?dist}
+Release:        21%{?dist}
 Summary:        Bar code reader
 
 Group:          User Interface/X Hardware Support
@@ -179,6 +179,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/zbar/QZBar*.h
 
 %changelog
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 

From 0753972d93566d00fa3a458f3fab4819e195a265 Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalevlember@gmail.com>
Date: Sat, 2 May 2015 18:51:15 +0200
Subject: [PATCH 032/108] Rebuilt for GCC 5 C++11 ABI change

---
 zbar.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zbar.spec b/zbar.spec
index 0b57bc8..4e1b407 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -3,7 +3,7 @@
 
 Name:           zbar
 Version:        0.10
-Release:        21%{?dist}
+Release:        22%{?dist}
 Summary:        Bar code reader
 
 Group:          User Interface/X Hardware Support
@@ -179,6 +179,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/zbar/QZBar*.h
 
 %changelog
+* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 0.10-22
+- Rebuilt for GCC 5 C++11 ABI change
+
 * Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10-21
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 

From 7f2721935eff3ec713ac928520f0777c25092915 Mon Sep 17 00:00:00 2001
From: Douglas Schilling Landgraf <dougsland@redhat.com>
Date: Sat, 6 Jun 2015 20:46:10 -0300
Subject: [PATCH 033/108] Patch: use REQBUFS properly

---
 zbar.spec                       |   7 +-
 zbar_use_REQBUFS_properly.patch | 124 ++++++++++++++++++++++++++++++++
 2 files changed, 130 insertions(+), 1 deletion(-)
 create mode 100644 zbar_use_REQBUFS_properly.patch

diff --git a/zbar.spec b/zbar.spec
index 4e1b407..bc6333e 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -3,7 +3,7 @@
 
 Name:           zbar
 Version:        0.10
-Release:        22%{?dist}
+Release:        23%{?dist}
 Summary:        Bar code reader
 
 Group:          User Interface/X Hardware Support
@@ -13,6 +13,7 @@ Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.
 Patch0:		zbar_update_to_hg.patch
 Patch1:		zbar_use_libv4l.patch
 Patch2:		zbar_choose_supported_format_first.patch
+Patch3:		zbar_use_REQBUFS_properly.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
 BuildRequires:	autoconf automake libtool python-devel gettext-devel
@@ -86,6 +87,7 @@ scanning widget.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 autoreconf -vfi
@@ -179,6 +181,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/zbar/QZBar*.h
 
 %changelog
+* Sat Jun 06 2015 Douglas Schilling Landgraf <dougsland@redhat.com> - 0.10-23
+- Add patch to use REQBUFS properly
+
 * Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 0.10-22
 - Rebuilt for GCC 5 C++11 ABI change
 
diff --git a/zbar_use_REQBUFS_properly.patch b/zbar_use_REQBUFS_properly.patch
new file mode 100644
index 0000000..b1793d8
--- /dev/null
+++ b/zbar_use_REQBUFS_properly.patch
@@ -0,0 +1,124 @@
+From a8ed8c04c119e5a323a2c79fcd0d28b4d29fc28a Mon Sep 17 00:00:00 2001
+From: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
+Date: Thu, 23 Apr 2015 22:56:09 -0300
+Subject: [PATCH] v4l2: use REQBUFS properly
+
+There are two issues on this driver with regards to buffer
+request:
+
+1) it is not calling VIDIOC_REQBUFS for USERPTR;
+
+2) It is calling VIDIOC_REQBUFS at probe, to check the max
+   number of supported buffers, but it doesn't deallocate
+   the buffers at the end of the probe function.
+
+Fix those issues. Also, improve the error/warning messages
+associated with possible problems.
+
+This is based on the issues detected by the patch proposed
+to fix this bug:
+	https://bugs.archlinux.org/task/44091
+
+Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
+
+diff --git a/zbar/video/v4l2.c b/zbar/video/v4l2.c
+index aabd16643ddc..f6662d3707f9 100644
+--- a/zbar/video/v4l2.c
++++ b/zbar/video/v4l2.c
+@@ -201,21 +201,6 @@ static int v4l2_cleanup (zbar_video_t *vdo)
+ 
+ static int v4l2_mmap_buffers (zbar_video_t *vdo)
+ {
+-    struct v4l2_requestbuffers rb;
+-    memset(&rb, 0, sizeof(rb));
+-    rb.count = vdo->num_images;
+-    rb.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+-    rb.memory = V4L2_MEMORY_MMAP;
+-    if(v4l2_ioctl(vdo->fd, VIDIOC_REQBUFS, &rb) < 0)
+-        return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
+-                           "requesting video frame buffers (VIDIOC_REQBUFS)"));
+-    zprintf(1, "mapping %u buffers (of %d requested)\n",
+-            rb.count, vdo->num_images);
+-    if(!rb.count)
+-        return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_INVALID, __func__,
+-                           "driver returned 0 buffers"));
+-    if(vdo->num_images > rb.count)
+-        vdo->num_images = rb.count;
+ 
+     struct v4l2_buffer vbuf;
+     memset(&vbuf, 0, sizeof(vbuf));
+@@ -313,8 +298,32 @@ static int v4l2_set_format (zbar_video_t *vdo,
+ static int v4l2_init (zbar_video_t *vdo,
+                       uint32_t fmt)
+ {
++    struct v4l2_requestbuffers rb;
+     if(v4l2_set_format(vdo, fmt))
+         return(-1);
++
++    memset(&rb, 0, sizeof(rb));
++    rb.count = vdo->num_images;
++    rb.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
++    if(vdo->iomode == VIDEO_MMAP)
++        rb.memory = V4L2_MEMORY_MMAP;
++    else
++        rb.memory = V4L2_MEMORY_USERPTR;
++
++    if(v4l2_ioctl(vdo->fd, VIDIOC_REQBUFS, &rb) < 0)
++        return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
++                           "requesting video frame buffers (VIDIOC_REQBUFS)"));
++
++    if(!rb.count)
++        return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_INVALID, __func__,
++                           "driver returned 0 buffers"));
++
++    if(vdo->num_images > rb.count)
++        vdo->num_images = rb.count;
++
++    zprintf(1, "using %u buffers (of %d requested)\n",
++            rb.count, vdo->num_images);
++
+     if(vdo->iomode == VIDEO_MMAP)
+         return(v4l2_mmap_buffers(vdo));
+     return(0);
+@@ -324,7 +333,7 @@ static int v4l2_probe_iomode (zbar_video_t *vdo)
+ {
+     struct v4l2_requestbuffers rb;
+     memset(&rb, 0, sizeof(rb));
+-    rb.count = vdo->num_images; /* FIXME workaround broken drivers */
++    rb.count = vdo->num_images;
+     rb.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+     if(vdo->iomode == VIDEO_MMAP)
+         rb.memory = V4L2_MEMORY_MMAP;
+@@ -340,14 +349,31 @@ static int v4l2_probe_iomode (zbar_video_t *vdo)
+             return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
+                                "querying streaming mode (VIDIOC_REQBUFS)"));
+ #ifdef HAVE_SYS_MMAN_H
++	err_capture(vdo, SEV_WARNING, ZBAR_ERR_SYSTEM, __func__,
++                               "USERPTR failed. Falling back to mmap");
+         vdo->iomode = VIDEO_MMAP;
++#else
++	return err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
++                           "Userptr not supported, and zbar was compiled without mmap support"));
+ #endif
+     }
+     else {
+         if(!vdo->iomode)
+-            vdo->iomode = VIDEO_USERPTR;
++            rb.memory = V4L2_MEMORY_USERPTR;
++	/* Update the num_images with the max supported by the driver */
+         if(rb.count)
+             vdo->num_images = rb.count;
++	else
++            err_capture(vdo, SEV_WARNING, ZBAR_ERR_SYSTEM, __func__,
++                        "Something is wrong: number of buffers returned by REQBUF is zero!");
++
++        /* requesting 0 buffers
++         * This cleans up the buffers allocated previously on probe
++         */
++	rb.count = 0;
++        if(v4l2_ioctl(vdo->fd, VIDIOC_REQBUFS, &rb) < 0)
++            err_capture(vdo, SEV_WARNING, ZBAR_ERR_SYSTEM, __func__,
++                        "releasing video frame buffers (VIDIOC_REQBUFS)");
+     }
+     return(0);
+ }

From de9d00cc732993e125ba837504dda6d3ab37884b Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Fri, 19 Jun 2015 04:44:55 +0000
Subject: [PATCH 034/108] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild

---
 zbar.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zbar.spec b/zbar.spec
index bc6333e..b42ccd0 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -3,7 +3,7 @@
 
 Name:           zbar
 Version:        0.10
-Release:        23%{?dist}
+Release:        24%{?dist}
 Summary:        Bar code reader
 
 Group:          User Interface/X Hardware Support
@@ -181,6 +181,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/zbar/QZBar*.h
 
 %changelog
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10-24
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
 * Sat Jun 06 2015 Douglas Schilling Landgraf <dougsland@redhat.com> - 0.10-23
 - Add patch to use REQBUFS properly
 

From 208e2f5d11c2fe656b3ca7eed7c502f5df2cdfdd Mon Sep 17 00:00:00 2001
From: Douglas Schilling Landgraf <dougsland@redhat.com>
Date: Mon, 17 Aug 2015 10:37:15 -0300
Subject: [PATCH 035/108] zbar - zbar-0.10-25

Added:
   zbar_configure_ac_use_m4_pattern_allow.patch

Removed:
   zbar_dont_user_reserved_dprintf.patch
---
 zbar.spec                                    |    7 +-
 zbar_configure_ac_use_m4_pattern_allow.patch |   11 +
 zbar_dont_user_reserved_dprintf.patch        | 1729 ------------------
 3 files changed, 17 insertions(+), 1730 deletions(-)
 create mode 100644 zbar_configure_ac_use_m4_pattern_allow.patch
 delete mode 100644 zbar_dont_user_reserved_dprintf.patch

diff --git a/zbar.spec b/zbar.spec
index b42ccd0..8b98173 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -3,7 +3,7 @@
 
 Name:           zbar
 Version:        0.10
-Release:        24%{?dist}
+Release:        25%{?dist}
 Summary:        Bar code reader
 
 Group:          User Interface/X Hardware Support
@@ -14,6 +14,7 @@ Patch0:		zbar_update_to_hg.patch
 Patch1:		zbar_use_libv4l.patch
 Patch2:		zbar_choose_supported_format_first.patch
 Patch3:		zbar_use_REQBUFS_properly.patch
+Patch4:		zbar_configure_ac_use_m4_pattern_allow.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
 BuildRequires:	autoconf automake libtool python-devel gettext-devel
@@ -88,6 +89,7 @@ scanning widget.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 autoreconf -vfi
@@ -181,6 +183,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/zbar/QZBar*.h
 
 %changelog
+* Fri Aug 14 2015 Douglas Schilling Landgraf <dougsland@redhat.com> - 0.10-25
+- Add patch to include m4_pattern_allow([AM_PROG_AR])
+
 * Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10-24
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
diff --git a/zbar_configure_ac_use_m4_pattern_allow.patch b/zbar_configure_ac_use_m4_pattern_allow.patch
new file mode 100644
index 0000000..38b39ec
--- /dev/null
+++ b/zbar_configure_ac_use_m4_pattern_allow.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac	2015-08-14 16:26:09.661856984 -0300
++++ b/configure.ac	2015-08-14 16:26:20.209851076 -0300
+@@ -4,7 +4,7 @@
+ AC_CONFIG_AUX_DIR(config)
+ AC_CONFIG_MACRO_DIR(config)
+ AM_INIT_AUTOMAKE([1.10 -Werror foreign subdir-objects std-options dist-bzip2])
+-AM_PROG_AR
++m4_pattern_allow([AM_PROG_AR])
+ AC_CONFIG_HEADERS([include/config.h])
+ AC_CONFIG_SRCDIR(zbar/scanner.c)
+ LT_PREREQ([2.2])
diff --git a/zbar_dont_user_reserved_dprintf.patch b/zbar_dont_user_reserved_dprintf.patch
deleted file mode 100644
index fa30ded..0000000
--- a/zbar_dont_user_reserved_dprintf.patch
+++ /dev/null
@@ -1,1729 +0,0 @@
-diff --git a/zbar/debug.h b/zbar/debug.h
---- a/zbar/debug.h
-+++ b/zbar/debug.h
-@@ -27,10 +27,10 @@
- 
- # ifdef __GNUC__
-     /* older versions of gcc (< 2.95) require a named varargs parameter */
--#  define dprintf(args...) while(0)
-+#  define debprintf(args...) while(0)
- # else
-     /* unfortunately named vararg parameter is a gcc-specific extension */
--#  define dprintf(...) while(0)
-+#  define debprintf(...) while(0)
- # endif
- 
- #else
-@@ -38,12 +38,12 @@
- # include <stdio.h>
- 
- # ifdef __GNUC__
--#  define dprintf(level, args...) do {  \
-+#  define debprintf(level, args...) do {  \
-         if((level) <= DEBUG_LEVEL)      \
-             fprintf(stderr, args);      \
-     } while(0)
- # else
--#  define dprintf(level, ...) do {          \
-+#  define debprintf(level, ...) do {          \
-         if((level) <= DEBUG_LEVEL)          \
-             fprintf(stderr, __VA_ARGS__);   \
-     } while(0)
-diff --git a/zbar/decoder.c b/zbar/decoder.c
---- a/zbar/decoder.c
-+++ b/zbar/decoder.c
-@@ -218,7 +218,7 @@ zbar_symbol_type_t zbar_decode_width (zb
-     zbar_symbol_type_t tmp, sym = ZBAR_NONE;
- 
-     dcode->w[dcode->idx & (DECODE_WINDOW - 1)] = w;
--    dprintf(1, "    decode[%x]: w=%d (%g)\n", dcode->idx, w, (w / 32.));
-+    debprintf(1, "    decode[%x]: w=%d (%g)\n", dcode->idx, w, (w / 32.));
- 
-     /* update shared character width */
-     dcode->s6 -= get_width(dcode, 7);
-diff --git a/zbar/decoder.h b/zbar/decoder.h
---- a/zbar/decoder.h
-+++ b/zbar/decoder.h
-@@ -188,7 +188,7 @@ static inline char acquire_lock (zbar_de
-                                  zbar_symbol_type_t req)
- {
-     if(dcode->lock) {
--        dprintf(2, " [locked %d]\n", dcode->lock);
-+        debprintf(2, " [locked %d]\n", dcode->lock);
-         return(1);
-     }
-     dcode->lock = req;
-diff --git a/zbar/decoder/code128.c b/zbar/decoder/code128.c
---- a/zbar/decoder/code128.c
-+++ b/zbar/decoder/code128.c
-@@ -137,7 +137,7 @@ static inline signed char decode_lo (int
-     zassert(idx <= 0x50, -1, "sig=%x offset=%x base=%x idx=%x\n",
-             sig, offset, base, idx);
-     c = characters[idx];
--    dprintf(2, " %02x(%x(%02x)/%x(%02x)) => %02x",
-+    debprintf(2, " %02x(%x(%02x)/%x(%02x)) => %02x",
-             idx, base, lo_base[base], offset, lo_offset[offset],
-             (unsigned char)c);
-     return(c);
-@@ -152,7 +152,7 @@ static inline signed char decode_hi (int
-                ((sig >>  4) & 0x00f0) |
-                ((sig <<  4) & 0x0f00) |
-                ((sig << 12) & 0xf000));
--    dprintf(2, " rev=%x", rev != 0);
-+    debprintf(2, " rev=%x", rev != 0);
- 
-     switch(sig) {
-     case 0x0014: idx = 0x0; break;
-@@ -174,7 +174,7 @@ static inline signed char decode_hi (int
-     if(rev)
-         idx += 0xe;
-     c = characters[0x51 + idx];
--    dprintf(2, " %02x => %02x", idx, c);
-+    debprintf(2, " %02x => %02x", idx, c);
-     return(c);
- }
- 
-@@ -199,7 +199,7 @@ static inline signed char decode6 (zbar_
-     /* build edge signature of character */
-     unsigned s = dcode->code128.s6;
- 
--    dprintf(2, " s=%d", s);
-+    debprintf(2, " s=%d", s);
-     if(s < 5)
-         return(-1);
-     /* calculate similar edge measurements */
-@@ -214,7 +214,7 @@ static inline signed char decode6 (zbar_
-            (decode_e(get_width(dcode, 2) + get_width(dcode, 1), s, 11)));
-     if(sig < 0)
-         return(-1);
--    dprintf(2, " sig=%04x", sig);
-+    debprintf(2, " sig=%04x", sig);
-     /* lookup edge signature */
-     c = (sig & 0x4444) ? decode_hi(sig) : decode_lo(sig);
-     if(c == -1)
-@@ -226,7 +226,7 @@ static inline signed char decode6 (zbar_
-         : (get_width(dcode, 1) + get_width(dcode, 3) + get_width(dcode, 5));
-     bars = bars * 11 * 4 / s;
-     chk = calc_check(c);
--    dprintf(2, " bars=%d chk=%d", bars, chk);
-+    debprintf(2, " bars=%d chk=%d", bars, chk);
-     if(chk - 7 > bars || bars > chk + 7)
-         return(-1);
- 
-@@ -268,10 +268,10 @@ static inline unsigned char validate_che
-     /* and compare to check character */
-     idx = (dcode128->direction) ? 1 : dcode128->character - 2;
-     check = dcode->buf[idx];
--    dprintf(2, " chk=%02x(%02x)", sum, check);
-+    debprintf(2, " chk=%02x(%02x)", sum, check);
-     err = (sum != check);
-     if(err)
--        dprintf(1, " [checksum error]\n");
-+        debprintf(1, " [checksum error]\n");
-     return(err);
- }
- 
-@@ -330,12 +330,12 @@ static inline unsigned char postprocess 
-     unsigned i, j, cexp;
-     unsigned char code = 0, charset;
-     code128_decoder_t *dcode128 = &dcode->code128;
--    dprintf(2, "\n    postproc len=%d", dcode128->character);
-+    debprintf(2, "\n    postproc len=%d", dcode128->character);
-     dcode->modifiers = 0;
-     dcode->direction = 1 - 2 * dcode128->direction;
-     if(dcode128->direction) {
-         /* reverse buffer */
--        dprintf(2, " (rev)");
-+        debprintf(2, " (rev)");
-         for(i = 0; i < dcode128->character / 2; i++) {
-             unsigned j = dcode128->character - 1 - i;
-             code = dcode->buf[i];
-@@ -357,7 +357,7 @@ static inline unsigned char postprocess 
- 
-     charset = code - START_A;
-     cexp = (code == START_C) ? 1 : 0;
--    dprintf(2, " start=%c", 'A' + charset);
-+    debprintf(2, " start=%c", 'A' + charset);
- 
-     for(i = 1, j = 0; i < dcode128->character - 2; i++) {
-         unsigned char code = dcode->buf[i];
-@@ -380,7 +380,7 @@ static inline unsigned char postprocess 
-                 charset &= 0x7f;
-         }
-         else {
--            dprintf(2, " %02x", code);
-+            debprintf(2, " %02x", code);
-             if(charset & 0x2) {
-                 unsigned delta;
-                 /* expand character set C to ASCII */
-@@ -414,7 +414,7 @@ static inline unsigned char postprocess 
-                 /*else drop trailing FNC1 */
-             }
-             else if(code >= START_A) {
--                dprintf(1, " [truncated]\n");
-+                debprintf(1, " [truncated]\n");
-                 return(1);
-             }
-             else {
-@@ -465,21 +465,21 @@ zbar_symbol_type_t _zbar_decode_code128 
-         return(0);
-     dcode128->element = 0;
- 
--    dprintf(2, "      code128[%c%02d+%x]:",
-+    debprintf(2, "      code128[%c%02d+%x]:",
-             (dcode128->direction) ? '<' : '>',
-             dcode128->character, dcode128->element);
- 
-     c = decode6(dcode);
-     if(dcode128->character < 0) {
-         unsigned qz;
--        dprintf(2, " c=%02x", c);
-+        debprintf(2, " c=%02x", c);
-         if(c < START_A || c > STOP_REV || c == STOP_FWD) {
--            dprintf(2, " [invalid]\n");
-+            debprintf(2, " [invalid]\n");
-             return(0);
-         }
-         qz = get_width(dcode, 6);
-         if(qz && qz < (dcode128->s6 * 3) / 4) {
--            dprintf(2, " [invalid qz %d]\n", qz);
-+            debprintf(2, " [invalid qz %d]\n", qz);
-             return(0);
-         }
-         /* decoded valid start/stop */
-@@ -493,13 +493,13 @@ zbar_symbol_type_t _zbar_decode_code128 
-             dcode128->direction = ZBAR_SPACE;
-         dcode128->start = c;
-         dcode128->width = dcode128->s6;
--        dprintf(2, " dir=%x [valid start]\n", dcode128->direction);
-+        debprintf(2, " dir=%x [valid start]\n", dcode128->direction);
-         return(0);
-     }
-     else if((c < 0) ||
-             ((dcode128->character >= BUFFER_MIN) &&
-              size_buf(dcode, dcode128->character + 1))) {
--        dprintf(1, (c < 0) ? " [aborted]\n" : " [overflow]\n");
-+        debprintf(1, (c < 0) ? " [aborted]\n" : " [overflow]\n");
-         if(dcode128->character > 1)
-             release_lock(dcode, ZBAR_CODE128);
-         dcode128->character = -1;
-@@ -513,7 +513,7 @@ zbar_symbol_type_t _zbar_decode_code128 
-             dw = dcode128->s6 - dcode128->width;
-         dw *= 4;
-         if(dw > dcode128->width) {
--            dprintf(1, " [width var]\n");
-+            debprintf(1, " [width var]\n");
-             if(dcode128->character > 1)
-                 release_lock(dcode, ZBAR_CODE128);
-             dcode128->character = -1;
-@@ -549,17 +549,17 @@ zbar_symbol_type_t _zbar_decode_code128 
-         else if(dcode128->character < CFG(*dcode128, ZBAR_CFG_MIN_LEN) ||
-                 (CFG(*dcode128, ZBAR_CFG_MAX_LEN) > 0 &&
-                  dcode128->character > CFG(*dcode128, ZBAR_CFG_MAX_LEN))) {
--            dprintf(2, " [invalid len]\n");
-+            debprintf(2, " [invalid len]\n");
-             sym = ZBAR_NONE;
-         }
-         else
--            dprintf(2, " [valid end]\n");
-+            debprintf(2, " [valid end]\n");
-         dcode128->character = -1;
-         if(!sym)
-             release_lock(dcode, ZBAR_CODE128);
-         return(sym);
-     }
- 
--    dprintf(2, "\n");
-+    debprintf(2, "\n");
-     return(0);
- }
-diff --git a/zbar/decoder/code39.c b/zbar/decoder/code39.c
---- a/zbar/decoder/code39.c
-+++ b/zbar/decoder/code39.c
-@@ -136,10 +136,10 @@ static inline unsigned char code39_decod
-     enc <<= 1;
-     if(E > 6) {
-         enc |= 1;
--        dprintf(2, "1");
-+        debprintf(2, "1");
-     }
-     else
--        dprintf(2, "0");
-+        debprintf(2, "0");
-     return(enc);
- }
- 
-@@ -180,7 +180,7 @@ static inline signed char code39_decode9
-     zassert(idx < 0x2c, -1, " idx=%x enc=%x s9=%x\n", idx, enc, dcode39->s9);
- 
-     const char39_t *c = &code39_encodings[idx];
--    dprintf(2, " i=%02x chk=%02x c=%02x/%02x", idx, c->chk, c->fwd, c->rev);
-+    debprintf(2, " i=%02x chk=%02x c=%02x/%02x", idx, c->chk, c->fwd, c->rev);
-     if(enc != c->chk)
-         return(-1);
- 
-@@ -191,11 +191,11 @@ static inline signed char code39_decode9
- static inline signed char code39_decode_start (zbar_decoder_t *dcode)
- {
-     code39_decoder_t *dcode39 = &dcode->code39;
--    dprintf(2, " s=%d ", dcode39->s9);
-+    debprintf(2, " s=%d ", dcode39->s9);
- 
-     signed char c = code39_decode9(dcode);
-     if(c != 0x19 && c != 0x2b) {
--        dprintf(2, "\n");
-+        debprintf(2, "\n");
-         return(ZBAR_NONE);
-     }
-     dcode39->direction ^= (c == 0x19);
-@@ -203,13 +203,13 @@ static inline signed char code39_decode_
-     /* check leading quiet zone - spec is 10x */
-     unsigned quiet = get_width(dcode, 9);
-     if(quiet && quiet < dcode39->s9 / 2) {
--        dprintf(2, " [invalid quiet]\n");
-+        debprintf(2, " [invalid quiet]\n");
-         return(ZBAR_NONE);
-     }
- 
-     dcode39->element = 9;
-     dcode39->character = 0;
--    dprintf(1, " dir=%x [valid start]\n", dcode39->direction);
-+    debprintf(1, " dir=%x [valid start]\n", dcode39->direction);
-     return(ZBAR_PARTIAL);
- }
- 
-@@ -220,7 +220,7 @@ static inline void code39_postprocess (z
-     int i;
-     if(dcode39->direction) {
-         /* reverse buffer */
--        dprintf(2, " (rev)");
-+        debprintf(2, " (rev)");
-         for(i = 0; i < dcode39->character / 2; i++) {
-             unsigned j = dcode39->character - 1 - i;
-             char code = dcode->buf[i];
-@@ -258,14 +258,14 @@ zbar_symbol_type_t _zbar_decode_code39 (
-     if(dcode39->character < 0) {
-         if(get_color(dcode) != ZBAR_BAR)
-             return(ZBAR_NONE);
--        dprintf(2, "      code39:");
-+        debprintf(2, "      code39:");
-         return(code39_decode_start(dcode));
-     }
- 
-     if(++dcode39->element < 9)
-         return(ZBAR_NONE);
- 
--    dprintf(2, "      code39[%c%02d+%x]",
-+    debprintf(2, "      code39[%c%02d+%x]",
-             (dcode39->direction) ? '<' : '>',
-             dcode39->character, dcode39->element);
- 
-@@ -279,19 +279,19 @@ zbar_symbol_type_t _zbar_decode_code39 (
- 
-             /* trailing quiet zone check */
-             if(space && space < dcode39->width / 2) {
--                dprintf(2, " [invalid qz]\n");
-+                debprintf(2, " [invalid qz]\n");
-                 sym = ZBAR_NONE;
-             }
-             else if(dcode39->character < CFG(*dcode39, ZBAR_CFG_MIN_LEN) ||
-                     (CFG(*dcode39, ZBAR_CFG_MAX_LEN) > 0 &&
-                      dcode39->character > CFG(*dcode39, ZBAR_CFG_MAX_LEN))) {
--                dprintf(2, " [invalid len]\n");
-+                debprintf(2, " [invalid len]\n");
-                 sym = ZBAR_NONE;
-             }
-             else {
-                 /* FIXME checksum (needs config enable) */
-                 code39_postprocess(dcode);
--                dprintf(2, " [valid end]\n");
-+                debprintf(2, " [valid end]\n");
-             }
-             dcode39->character = -1;
-             if(!sym)
-@@ -300,19 +300,19 @@ zbar_symbol_type_t _zbar_decode_code39 (
-         }
-         if(space > dcode39->width / 2) {
-             /* inter-character space check failure */
--            dprintf(2, " ics>%d [invalid ics]", dcode39->width);
-+            debprintf(2, " ics>%d [invalid ics]", dcode39->width);
-             if(dcode39->character)
-                 release_lock(dcode, ZBAR_CODE39);
-             dcode39->character = -1;
-         }
-         dcode39->element = 0;
--        dprintf(2, "\n");
-+        debprintf(2, "\n");
-         return(ZBAR_NONE);
-     }
- 
--    dprintf(2, " s=%d ", dcode39->s9);
-+    debprintf(2, " s=%d ", dcode39->s9);
-     if(!check_width(dcode39->width, dcode39->s9)) {
--        dprintf(2, " [width]\n");
-+        debprintf(2, " [width]\n");
-         if(dcode39->character)
-             release_lock(dcode, ZBAR_CODE39);
-         dcode39->character = -1;
-@@ -320,7 +320,7 @@ zbar_symbol_type_t _zbar_decode_code39 (
-     }
- 
-     signed char c = code39_decode9(dcode);
--    dprintf(2, " c=%d", c);
-+    debprintf(2, " c=%d", c);
- 
-     /* lock shared resources */
-     if(!dcode39->character && acquire_lock(dcode, ZBAR_CODE39)) {
-@@ -331,14 +331,14 @@ zbar_symbol_type_t _zbar_decode_code39 (
-     if(c < 0 ||
-        ((dcode39->character >= BUFFER_MIN) &&
-         size_buf(dcode, dcode39->character + 1))) {
--        dprintf(1, (c < 0) ? " [aborted]\n" : " [overflow]\n");
-+        debprintf(1, (c < 0) ? " [aborted]\n" : " [overflow]\n");
-         release_lock(dcode, ZBAR_CODE39);
-         dcode39->character = -1;
-         return(ZBAR_NONE);
-     }
-     else {
-         zassert(c < 0x2c, ZBAR_NONE, "c=%02x s9=%x\n", c, dcode39->s9);
--        dprintf(2, "\n");
-+        debprintf(2, "\n");
-     }
- 
-     dcode->buf[dcode39->character++] = c;
-diff --git a/zbar/decoder/ean.c b/zbar/decoder/ean.c
---- a/zbar/decoder/ean.c
-+++ b/zbar/decoder/ean.c
-@@ -132,22 +132,22 @@ static inline signed char aux_end (zbar_
-     /* check quiet zone */
-     unsigned qz = get_width(dcode, 0);
-     if(!fwd && qz && qz <= s * 3 / 4) {
--        dprintf(2, " [invalid quiet]");
-+        debprintf(2, " [invalid quiet]");
-         return(-1);
-     }
- 
--    dprintf(2, " (");
-+    debprintf(2, " (");
-     code = 0;
-     for(i = 1 - fwd; i < 3 + fwd; i++) {
-         unsigned e = get_width(dcode, i) + get_width(dcode, i + 1);
--        dprintf(2, " %d", e);
-+        debprintf(2, " %d", e);
-         code = (code << 2) | decode_e(e, s, 7);
-         if(code < 0) {
--            dprintf(2, " [invalid end guard]");
-+            debprintf(2, " [invalid end guard]");
-             return(-1);
-         }
-     }
--    dprintf(2, ") s=%d aux=%x", s, code);
-+    debprintf(2, ") s=%d aux=%x", s, code);
-     return(code);
- }
- 
-@@ -162,7 +162,7 @@ static inline signed char aux_start (zba
-     if(dcode->ean.s4 < 6)
-         return(-1);
-     if(decode_e(e2, dcode->ean.s4, 7)) {
--        dprintf(2, " [invalid any]");
-+        debprintf(2, " [invalid any]");
-         return(/*FIXME (get_color(dcode) == ZBAR_SPACE) ? STATE_ADDON : */-1);
-     }
- 
-@@ -174,17 +174,17 @@ static inline signed char aux_start (zba
-         unsigned qz = get_width(dcode, 7);
-         if(!qz || qz > dcode->ean.s4 * 3 / 4) {
-             if(!E1) {
--                dprintf(2, " [valid normal]");
-+                debprintf(2, " [valid normal]");
-                 return(0); /* normal symbol start */
-             }
- #if 0
-             else if(E1 == 1) {
--                dprintf(2, " [valid add-on]");
-+                debprintf(2, " [valid add-on]");
-                 return(STATE_ADDON); /* add-on symbol start */
-             }
- #endif
-         }
--        dprintf(2, " [invalid start]");
-+        debprintf(2, " [invalid start]");
-         return(-1);
-     }
- 
-@@ -194,11 +194,11 @@ static inline signed char aux_start (zba
-         unsigned e4 = get_width(dcode, 7) + get_width(dcode, 8);
-         if(!decode_e(e3, dcode->ean.s4, 7) &&
-            !decode_e(e4, dcode->ean.s4, 7)) {
--            dprintf(2, " [valid center]");
-+            debprintf(2, " [valid center]");
-             return(0); /* start after center guard */
-         }
-     }
--    dprintf(2, " [invalid center]");
-+    debprintf(2, " [invalid center]");
-     return(/*STATE_ADDON*/-1);
- }
- 
-@@ -212,7 +212,7 @@ static inline signed char decode4 (zbar_
-                    ? get_width(dcode, 0) + get_width(dcode, 1)
-                    : get_width(dcode, 2) + get_width(dcode, 3));
-     unsigned e2 = get_width(dcode, 1) + get_width(dcode, 2);
--    dprintf(2, "\n        e1=%d e2=%d", e1, e2);
-+    debprintf(2, "\n        e1=%d e2=%d", e1, e2);
- 
-     if(dcode->ean.s4 < 6)
-         return(-1);
-@@ -222,7 +222,7 @@ static inline signed char decode4 (zbar_
-              decode_e(e2, dcode->ean.s4, 7));
-     if(code < 0)
-         return(-1);
--    dprintf(2, " code=%x", code);
-+    debprintf(2, " code=%x", code);
- 
-     /* 4 combinations require additional determinant (D2)
-        E1E2 == 34 (0110)
-@@ -243,9 +243,9 @@ static inline signed char decode4 (zbar_
-         alt = d2 > (mid * dcode->ean.s4);
-         if(alt)
-             code = ((code >> 1) & 3) | 0x10; /* compress code space */
--        dprintf(2, " (d2=%d(%d) alt=%d)", d2, mid * dcode->ean.s4, alt);
-+        debprintf(2, " (d2=%d(%d) alt=%d)", d2, mid * dcode->ean.s4, alt);
-     }
--    dprintf(2, " char=%02x", digits[(unsigned char)code]);
-+    debprintf(2, " char=%02x", digits[(unsigned char)code]);
-     zassert(code < 0x14, -1, "code=%02x e1=%x e2=%x s4=%x color=%x\n",
-             code, e1, e2, dcode->ean.s4, get_color(dcode));
-     return(code);
-@@ -260,7 +260,7 @@ static inline zbar_symbol_type_t ean_par
-                          (pass->raw[3] & 0x10) >> 3 |
-                          (pass->raw[4] & 0x10) >> 4);
- 
--    dprintf(2, " par=%x", par);
-+    debprintf(2, " par=%x", par);
-     if(par && par != 0xf)
-         /* invalid parity combination */
-         return(ZBAR_NONE);
-@@ -276,8 +276,8 @@ static inline zbar_symbol_type_t ean_par
-         pass->raw[3] = tmp;
-     }
- 
--    dprintf(2, "\n");
--    dprintf(1, "decode4=%x%x%x%x\n",
-+    debprintf(2, "\n");
-+    debprintf(1, "decode4=%x%x%x%x\n",
-             pass->raw[1] & 0xf, pass->raw[2] & 0xf,
-             pass->raw[3] & 0xf, pass->raw[4] & 0xf);
-     if(!par)
-@@ -309,7 +309,7 @@ static inline zbar_symbol_type_t ean_par
-     if(par & 1)
-         pass->raw[0] >>= 4;
-     pass->raw[0] &= 0xf;
--    dprintf(2, " par=%02x(%x)", par, pass->raw[0]);
-+    debprintf(2, " par=%02x(%x)", par, pass->raw[0]);
- 
-     if(pass->raw[0] == 0xf)
-         /* invalid parity combination */
-@@ -326,8 +326,8 @@ static inline zbar_symbol_type_t ean_par
-         }
-     }
- 
--    dprintf(2, "\n");
--    dprintf(1, "decode=%x%x%x%x%x%x%x(%02x)\n",
-+    debprintf(2, "\n");
-+    debprintf(1, "decode=%x%x%x%x%x%x%x(%02x)\n",
-             pass->raw[0] & 0xf, pass->raw[1] & 0xf,
-             pass->raw[2] & 0xf, pass->raw[3] & 0xf,
-             pass->raw[4] & 0xf, pass->raw[5] & 0xf,
-@@ -359,7 +359,7 @@ static inline zbar_symbol_type_t decode_
-        TEST_CFG(dcode->ean.ean8_config, ZBAR_CFG_ENABLE) &&
-        !aux_end(dcode, fwd)) {
-         zbar_symbol_type_t part;
--        dprintf(2, " fwd=%x", fwd);
-+        debprintf(2, " fwd=%x", fwd);
-         part = ean_part_end4(pass, fwd);
-         if(part)
-             dcode->ean.direction = (pass->state & STATE_REV) != 0;
-@@ -389,17 +389,17 @@ static inline zbar_symbol_type_t decode_
-         if(w)
-             code = decode4(dcode);
-         else
--            dprintf(2, " [bad width]");
-+            debprintf(2, " [bad width]");
- 
-         if(code < 0 && idx != 0x10)
-             pass->state = -1;
-         else if(code < 0)
-             pass->raw[5] = 0xff;
-         else {
--            dprintf(2, "\n        raw[%x]=%02x =>", idx >> 2,
-+            debprintf(2, "\n        raw[%x]=%02x =>", idx >> 2,
-                     digits[(unsigned char)code]);
-             pass->raw[(idx >> 2) + 1] = digits[(unsigned char)code];
--            dprintf(2, " raw=%d%d%d%d%d%d%d",
-+            debprintf(2, " raw=%d%d%d%d%d%d%d",
-                     pass->raw[0] & 0xf, pass->raw[1] & 0xf,
-                     pass->raw[2] & 0xf, pass->raw[3] & 0xf,
-                     pass->raw[4] & 0xf, pass->raw[5] & 0xf,
-@@ -410,7 +410,7 @@ static inline zbar_symbol_type_t decode_
-     if(get_color(dcode) == ZBAR_SPACE &&
-        (idx == 0x18 || idx == 0x19)) {
-         zbar_symbol_type_t part = ZBAR_NONE;
--        dprintf(2, " fwd=%x", fwd);
-+        debprintf(2, " fwd=%x", fwd);
-         if(!aux_end(dcode, fwd) && pass->raw[5] != 0xff)
-             part = ean_part_end7(&dcode->ean, pass, fwd);
-         if(part)
-@@ -447,7 +447,7 @@ static inline signed char ean_verify_che
-     zassert(d < 10, -1, "n=%x d=%x chk=%x %s\n", n, d, chk,
-             _zbar_decoder_buf_dump((void*)ean->buf, 18));
-     if(chk != d) {
--        dprintf(1, "\nchecksum mismatch %d != %d (%s)\n",
-+        debprintf(1, "\nchecksum mismatch %d != %d (%s)\n",
-                 chk, d, dsprintbuf(ean));
-         return(-1);
-     }
-@@ -503,7 +503,7 @@ static inline zbar_symbol_type_t integra
-     signed char i, j, right = !!(part & EAN_RIGHT);
-     /* copy raw data into holding buffer */
-     /* if same partial is not consistent, reset others */
--    dprintf(2, " integrate part=%x (%s) w=%d=>%d",
-+    debprintf(2, " integrate part=%x (%s) w=%d=>%d",
-             part, dsprintbuf(ean), ean->width, pass->width);
- 
-     if(part & ZBAR_ADDON) {
-@@ -522,13 +522,13 @@ static inline zbar_symbol_type_t integra
-         if((ean->left && ((part & ZBAR_SYMBOL) != ean->left)) ||
-            (ean->right && ((part & ZBAR_SYMBOL) != ean->right))) {
-             /* partial mismatch - reset collected parts */
--            dprintf(2, " rst(type %x %x)", ean->left, ean->right);
-+            debprintf(2, " rst(type %x %x)", ean->left, ean->right);
-             ean->left = ean->right = ean->addon = ZBAR_NONE;
-         }
- 
-         if((ean->left || ean->right || ean->addon) &&
-            !check_width(ean->width, pass->width)) {
--            dprintf(2, " rst(width %d)", pass->width);
-+            debprintf(2, " rst(width %d)", pass->width);
-             ean->left = ean->right = ean->addon = ZBAR_NONE;
-         }
- 
-@@ -539,7 +539,7 @@ static inline zbar_symbol_type_t integra
-                 unsigned char digit = pass->raw[i] & 0xf;
-                 if(ean->right && ean->buf[j] != digit) {
-                     /* partial mismatch - reset collected parts */
--                    dprintf(2, " rst(right)");
-+                    debprintf(2, " rst(right)");
-                     ean->left = ean->right = ean->addon = ZBAR_NONE;
-                 }
-                 ean->buf[j] = digit;
-@@ -552,7 +552,7 @@ static inline zbar_symbol_type_t integra
-                 unsigned char digit = pass->raw[i] & 0xf;
-                 if(ean->left && ean->buf[j] != digit) {
-                     /* partial mismatch - reset collected parts */
--                    dprintf(2, " rst(left)");
-+                    debprintf(2, " rst(left)");
-                     ean->left = ean->right = ean->addon = ZBAR_NONE;
-                 }
-                 ean->buf[j] = digit;
-@@ -617,7 +617,7 @@ static inline zbar_symbol_type_t integra
-     if(part > ZBAR_PARTIAL)
-         part |= ean->addon;
- 
--    dprintf(2, " dir=%d %x/%x=%x",
-+    debprintf(2, " dir=%d %x/%x=%x",
-             ean->direction, ean->left, ean->right, part);
-     return(part);
- }
-@@ -679,7 +679,7 @@ zbar_symbol_type_t _zbar_decode_ean (zba
-            i == pass_idx)
-         {
-             zbar_symbol_type_t part;
--            dprintf(2, "      ean[%x/%x]: idx=%x st=%d s=%d",
-+            debprintf(2, "      ean[%x/%x]: idx=%x st=%d s=%d",
-                     pass_idx, i, dcode->idx, pass->state, dcode->ean.s4);
-             part = decode_pass(dcode, pass);
-             if(part) {
-@@ -687,20 +687,20 @@ zbar_symbol_type_t _zbar_decode_ean (zba
-                 sym = integrate_partial(&dcode->ean, pass, part);
-                 if(sym) {
-                     /* this pass valid => _reset_ all passes */
--                    dprintf(2, " sym=%x", sym);
-+                    debprintf(2, " sym=%x", sym);
-                     dcode->ean.pass[0].state = dcode->ean.pass[1].state = -1;
-                     dcode->ean.pass[2].state = dcode->ean.pass[3].state = -1;
-                     if(sym > ZBAR_PARTIAL) {
-                         if(!acquire_lock(dcode, sym))
-                             postprocess(dcode, sym);
-                         else {
--                            dprintf(1, " [locked %d]", dcode->lock);
-+                            debprintf(1, " [locked %d]", dcode->lock);
-                             sym = ZBAR_PARTIAL;
-                         }
-                     }
-                 }
-             }
--            dprintf(2, "\n");
-+            debprintf(2, "\n");
-         }
-     }
-     return(sym);
-diff --git a/zbar/decoder/i25.c b/zbar/decoder/i25.c
---- a/zbar/decoder/i25.c
-+++ b/zbar/decoder/i25.c
-@@ -49,7 +49,7 @@ static inline unsigned char i25_decode10
-                                           unsigned char offset)
- {
-     i25_decoder_t *dcode25 = &dcode->i25;
--    dprintf(2, " s=%d", dcode25->s10);
-+    debprintf(2, " s=%d", dcode25->s10);
-     if(dcode25->s10 < 10)
-         return(0xff);
- 
-@@ -65,11 +65,11 @@ static inline unsigned char i25_decode10
-             par++;
-     }
- 
--    dprintf(2, " enc=%02x par=%x", enc, par);
-+    debprintf(2, " enc=%02x par=%x", enc, par);
- 
-     /* parity check */
-     if(par != 2) {
--        dprintf(2, " [bad parity]");
-+        debprintf(2, " [bad parity]");
-         return(0xff);
-     }
- 
-@@ -79,12 +79,12 @@ static inline unsigned char i25_decode10
-         if(enc == 12)
-             enc = 0;
-         else if(--enc > 9) {
--            dprintf(2, " [invalid encoding]");
-+            debprintf(2, " [invalid encoding]");
-             return(0xff);
-         }
-     }
- 
--    dprintf(2, " => %x", enc);
-+    debprintf(2, " => %x", enc);
-     return(enc);
- }
- 
-@@ -103,7 +103,7 @@ static inline signed char i25_decode_sta
-     if((get_color(dcode) == ZBAR_BAR)
-        ? enc != 4
-        : (enc = i25_decode1(enc, get_width(dcode, i++), dcode25->s10))) {
--        dprintf(4, "      i25: s=%d enc=%x [invalid]\n", dcode25->s10, enc);
-+        debprintf(4, "      i25: s=%d enc=%x [invalid]\n", dcode25->s10, enc);
-         return(ZBAR_NONE);
-     }
- 
-@@ -113,7 +113,7 @@ static inline signed char i25_decode_sta
-      */
-     unsigned quiet = get_width(dcode, i);
-     if(quiet && quiet < dcode25->s10 * 3 / 8) {
--        dprintf(3, "      i25: s=%d enc=%x q=%d [invalid qz]\n",
-+        debprintf(3, "      i25: s=%d enc=%x q=%d [invalid qz]\n",
-                 dcode25->s10, enc, quiet);
-         return(ZBAR_NONE);
-     }
-@@ -148,7 +148,7 @@ static inline signed char i25_decode_end
-     if((quiet && quiet < dcode25->width * 3 / 8) ||
-        decode_e(get_width(dcode, 1), dcode25->width, 45) > 2 ||
-        decode_e(get_width(dcode, 2), dcode25->width, 45) > 2) {
--        dprintf(3, "      i25: s=%d q=%d [invalid qz]\n",
-+        debprintf(3, "      i25: s=%d q=%d [invalid qz]\n",
-                 dcode25->width, quiet);
-         return(ZBAR_NONE);
-     }
-@@ -168,7 +168,7 @@ static inline signed char i25_decode_end
-     dcode->direction = 1 - 2 * dcode25->direction;
-     if(dcode25->direction) {
-         /* reverse buffer */
--        dprintf(2, " (rev)");
-+        debprintf(2, " (rev)");
-         int i;
-         for(i = 0; i < dcode25->character / 2; i++) {
-             unsigned j = dcode25->character - 1 - i;
-@@ -181,7 +181,7 @@ static inline signed char i25_decode_end
-     if(dcode25->character < CFG(*dcode25, ZBAR_CFG_MIN_LEN) ||
-        (CFG(*dcode25, ZBAR_CFG_MAX_LEN) > 0 &&
-         dcode25->character > CFG(*dcode25, ZBAR_CFG_MAX_LEN))) {
--        dprintf(2, " [invalid len]\n");
-+        debprintf(2, " [invalid len]\n");
-         release_lock(dcode, ZBAR_I25);
-         dcode25->character = -1;
-         return(ZBAR_NONE);
-@@ -190,7 +190,7 @@ static inline signed char i25_decode_end
-     dcode->buflen = dcode25->character;
-     dcode->buf[dcode25->character] = '\0';
-     dcode->modifiers = 0;
--    dprintf(2, " [valid end]\n");
-+    debprintf(2, " [valid end]\n");
-     dcode25->character = -1;
-     return(ZBAR_I25);
- }
-@@ -215,7 +215,7 @@ zbar_symbol_type_t _zbar_decode_i25 (zba
-     /* FIXME check current character width against previous */
-     dcode25->width = dcode25->s10;
- 
--    dprintf(2, "      i25[%c%02d+%x]",
-+    debprintf(2, "      i25[%c%02d+%x]",
-             (dcode25->direction) ? '<' : '>',
-             dcode25->character, dcode25->element);
- 
-@@ -223,15 +223,15 @@ zbar_symbol_type_t _zbar_decode_i25 (zba
-         return(ZBAR_PARTIAL);
- 
-     unsigned char c = i25_decode10(dcode, 1);
--    dprintf(2, " c=%x", c);
-+    debprintf(2, " c=%x", c);
-     if(c > 9) {
--        dprintf(2, " [aborted]\n");
-+        debprintf(2, " [aborted]\n");
-         goto reset;
-     }
- 
-     if((dcode25->character >= BUFFER_MIN) &&
-        size_buf(dcode, dcode25->character + 2)) {
--        dprintf(2, " [overflow]\n");
-+        debprintf(2, " [overflow]\n");
-         goto reset;
-     }
- 
-@@ -243,13 +243,13 @@ zbar_symbol_type_t _zbar_decode_i25 (zba
-     buf[dcode25->character++] = c + '0';
- 
-     c = i25_decode10(dcode, 0);
--    dprintf(2, " c=%x", c);
-+    debprintf(2, " c=%x", c);
-     if(c > 9) {
--        dprintf(2, " [aborted]\n");
-+        debprintf(2, " [aborted]\n");
-         goto reset;
-     }
-     else
--        dprintf(2, "\n");
-+        debprintf(2, "\n");
- 
-     buf[dcode25->character++] = c + '0';
-     dcode25->element = 10;
-diff --git a/zbar/decoder/pdf417.c b/zbar/decoder/pdf417.c
---- a/zbar/decoder/pdf417.c
-+++ b/zbar/decoder/pdf417.c
-@@ -41,7 +41,7 @@ static inline signed short pdf417_decode
-      * from similar edge measurements
-      */
-     unsigned s = dcode->pdf417.s8;
--    dprintf(2, " s=%d ", s);
-+    debprintf(2, " s=%d ", s);
-     if(s < 8)
-         return(-1);
- 
-@@ -55,19 +55,19 @@ static inline signed short pdf417_decode
-         else
-             e = decode_e(get_width(dcode, 7 - i) +
-                          get_width(dcode, 6 - i), s, 17);
--        dprintf(4, "%x", e);
-+        debprintf(4, "%x", e);
-         if(e < 0 || e > 8)
-             return(-1);
-         sig = (sig << 3) ^ e;
-     }
--    dprintf(2, " sig=%06lx", sig);
-+    debprintf(2, " sig=%06lx", sig);
- 
-     /* determine cluster number */
-     int clst = ((sig & 7) - ((sig >> 3) & 7) +
-                 ((sig >> 12) & 7) - ((sig >> 15) & 7));
-     if(clst < 0)
-         clst += 9;
--    dprintf(2, " k=%d", clst);
-+    debprintf(2, " k=%d", clst);
-     zassert(clst >= 0 && clst < 9, -1, "dir=%x sig=%lx k=%x %s\n",
-             dcode->pdf417.direction, sig, clst,
-             _zbar_decoder_buf_dump(dcode->buf, dcode->pdf417.character));
-@@ -89,7 +89,7 @@ static inline signed short pdf417_decode
-             _zbar_decoder_buf_dump(dcode->buf, dcode->pdf417.character));
- 
-     unsigned short c = (g[0] + g[1] + g[2]) & PDF417_HASH_MASK;
--    dprintf(2, " g0=%x g1=%x g2=%x c=%03d(%d)",
-+    debprintf(2, " g0=%x g1=%x g2=%x c=%03d(%d)",
-             g[0], g[1], g[2], c & 0x3ff, c >> 10);
-     return(c);
- }
-@@ -142,18 +142,18 @@ static inline signed char pdf417_decode_
-         ei = decode_e(get_width(dcode, 8) + get_width(dcode, 9), s, 17);
-     }
- 
--    dprintf(2, "      pdf417[%c]: s=%d",
-+    debprintf(2, "      pdf417[%c]: s=%d",
-             (get_color(dcode)) ? '<' : '>', s);
- 
-     /* check quiet zone */
-     if(ei >= 0 && ei < ex) {
--        dprintf(2, " [invalid quiet]\n");
-+        debprintf(2, " [invalid quiet]\n");
-         return(0);
-     }
- 
-     /* lock shared resources */
-     if(acquire_lock(dcode, ZBAR_PDF417)) {
--        dprintf(2, " [locked %d]\n", dcode->lock);
-+        debprintf(2, " [locked %d]\n", dcode->lock);
-         return(0);
-     }
- 
-@@ -162,7 +162,7 @@ static inline signed char pdf417_decode_
-     dcode417->element = 0;
-     dcode417->character = 0;
- 
--    dprintf(2, " [valid start]\n");
-+    debprintf(2, " [valid start]\n");
-     return(ZBAR_PARTIAL);
- }
- 
-@@ -176,7 +176,7 @@ zbar_symbol_type_t _zbar_decode_pdf417 (
- 
-     if(dcode417->character < 0) {
-         pdf417_decode_start(dcode);
--        dprintf(4, "\n");
-+        debprintf(4, "\n");
-         return(0);
-     }
- 
-@@ -185,7 +185,7 @@ zbar_symbol_type_t _zbar_decode_pdf417 (
-         return(0);
-     dcode417->element = 0;
- 
--    dprintf(2, "      pdf417[%c%02d]:",
-+    debprintf(2, "      pdf417[%c%02d]:",
-             (dcode417->direction) ? '<' : '>', dcode417->character);
- 
-     if(get_color(dcode) != dcode417->direction) {
-@@ -202,7 +202,7 @@ zbar_symbol_type_t _zbar_decode_pdf417 (
-     if((c < 0) ||
-        ((dcode417->character >= BUFFER_MIN) &&
-         size_buf(dcode, dcode417->character + 1))) {
--        dprintf(1, (c < 0) ? " [aborted]\n" : " [overflow]\n");
-+        debprintf(1, (c < 0) ? " [aborted]\n" : " [overflow]\n");
-         release_lock(dcode, ZBAR_PDF417);
-         dcode417->character = -1;
-         return(0);
-@@ -211,7 +211,7 @@ zbar_symbol_type_t _zbar_decode_pdf417 (
-     /* FIXME TBD infer dimensions, save codewords */
- 
-     if(c == PDF417_STOP) {
--        dprintf(1, " [valid stop]");
-+        debprintf(1, " [valid stop]");
-         /* FIXME check trailing bar and qz */
-         dcode->direction = 1 - 2 * dcode417->direction;
-         dcode->modifiers = 0;
-@@ -219,6 +219,6 @@ zbar_symbol_type_t _zbar_decode_pdf417 (
-         dcode417->character = -1;
-     }
- 
--    dprintf(2, "\n");
-+    debprintf(2, "\n");
-     return(0);
- }
-diff --git a/zbar/decoder/qr_finder.c b/zbar/decoder/qr_finder.c
---- a/zbar/decoder/qr_finder.c
-+++ b/zbar/decoder/qr_finder.c
-@@ -54,25 +54,25 @@ zbar_symbol_type_t _zbar_find_qr (zbar_d
-     if(get_color(dcode) != ZBAR_SPACE || s < 7)
-         return(0);
- 
--    dprintf(2, "    qrf: s=%d", s);
-+    debprintf(2, "    qrf: s=%d", s);
- 
-     ei = decode_e(pair_width(dcode, 1), s, 7);
--    dprintf(2, " %d", ei);
-+    debprintf(2, " %d", ei);
-     if(ei)
-         goto invalid;
- 
-     ei = decode_e(pair_width(dcode, 2), s, 7);
--    dprintf(2, "%d", ei);
-+    debprintf(2, "%d", ei);
-     if(ei != 2)
-         goto invalid;
- 
-     ei = decode_e(pair_width(dcode, 3), s, 7);
--    dprintf(2, "%d", ei);
-+    debprintf(2, "%d", ei);
-     if(ei != 2)
-         goto invalid;
- 
-     ei = decode_e(pair_width(dcode, 4), s, 7);
--    dprintf(2, "%d", ei);
-+    debprintf(2, "%d", ei);
-     if(ei)
-         goto invalid;
- 
-@@ -88,7 +88,7 @@ zbar_symbol_type_t _zbar_find_qr (zbar_d
-     w = get_width(dcode, 5);
-     qrf->line.boffs = qrf->line.pos[0] + get_width(dcode, 4) + (w + 1) / 2;
- 
--    dprintf(2, " boff=%d pos=%d len=%d eoff=%d [valid]\n",
-+    debprintf(2, " boff=%d pos=%d len=%d eoff=%d [valid]\n",
-             qrf->line.boffs, qrf->line.pos[0], qrf->line.len,
-             qrf->line.eoffs);
- 
-@@ -97,6 +97,6 @@ zbar_symbol_type_t _zbar_find_qr (zbar_d
-     return(ZBAR_QRCODE);
- 
- invalid:
--    dprintf(2, " [invalid]\n");
-+    debprintf(2, " [invalid]\n");
-     return(0);
- }
-diff --git a/zbar/scanner.c b/zbar/scanner.c
---- a/zbar/scanner.c
-+++ b/zbar/scanner.c
-@@ -129,7 +129,7 @@ static inline unsigned calc_thresh (zbar
-     unsigned dx, thresh = scn->y1_thresh;
-     unsigned long t;
-     if((thresh <= scn->y1_min_thresh) || !scn->width) {
--        dprintf(1, " tmin=%d", scn->y1_min_thresh);
-+        debprintf(1, " tmin=%d", scn->y1_min_thresh);
-         return(scn->y1_min_thresh);
-     }
-     /* slowly return threshold to min */
-@@ -137,7 +137,7 @@ static inline unsigned calc_thresh (zbar
-     t = thresh * dx;
-     t /= scn->width;
-     t /= ZBAR_SCANNER_THRESH_FADE;
--    dprintf(1, " thr=%d t=%ld x=%d last=%d.%d (%d)",
-+    debprintf(1, " thr=%d t=%ld x=%d last=%d.%d (%d)",
-             thresh, t, scn->x, scn->last_edge >> ZBAR_FIXED,
-             scn->last_edge & ((1 << ZBAR_FIXED) - 1), dx);
-     if(thresh > t) {
-@@ -158,7 +158,7 @@ static inline zbar_symbol_type_t process
-         scn->last_edge = scn->cur_edge;
- 
-     scn->width = scn->cur_edge - scn->last_edge;
--    dprintf(1, " sgn=%d cur=%d.%d w=%d (%s)\n",
-+    debprintf(1, " sgn=%d cur=%d.%d w=%d (%s)\n",
-             scn->y1_sign, scn->cur_edge >> ZBAR_FIXED,
-             scn->cur_edge & ((1 << ZBAR_FIXED) - 1), scn->width,
-             ((y1 > 0) ? "SPACE" : "BAR"));
-@@ -184,7 +184,7 @@ inline zbar_symbol_type_t zbar_scanner_f
- 
-     if(scn->cur_edge != x || scn->y1_sign > 0) {
-         zbar_symbol_type_t edge = process_edge(scn, -scn->y1_sign);
--        dprintf(1, "flush0:");
-+        debprintf(1, "flush0:");
-         scn->cur_edge = x;
-         scn->y1_sign = -scn->y1_sign;
-         return(edge);
-@@ -245,7 +245,7 @@ zbar_symbol_type_t zbar_scan_y (zbar_sca
-     y2_1 = y0_0 - (y0_1 * 2) + y0_2;
-     y2_2 = y0_1 - (y0_2 * 2) + y0_3;
- 
--    dprintf(1, "scan: x=%d y=%d y0=%d y1=%d y2=%d",
-+    debprintf(1, "scan: x=%d y=%d y0=%d y1=%d y2=%d",
-             x, y, y0_1, y1_1, y2_1);
- 
-     edge = ZBAR_NONE;
-@@ -267,7 +267,7 @@ zbar_symbol_type_t zbar_scan_y (zbar_sca
-             /* adaptive thresholding */
-             /* start at multiple of new min/max */
-             scn->y1_thresh = (abs(y1_1) * THRESH_INIT + ROUND) >> ZBAR_FIXED;
--            dprintf(1, "\tthr=%d", scn->y1_thresh);
-+            debprintf(1, "\tthr=%d", scn->y1_thresh);
-             if(scn->y1_thresh < scn->y1_min_thresh)
-                 scn->y1_thresh = scn->y1_min_thresh;
- 
-@@ -280,11 +280,11 @@ zbar_symbol_type_t zbar_scan_y (zbar_sca
-                 /* interpolate zero crossing */
-                 scn->cur_edge -= ((y2_1 << ZBAR_FIXED) + 1) / d;
-             scn->cur_edge += x << ZBAR_FIXED;
--            dprintf(1, "\n");
-+            debprintf(1, "\n");
-         }
-     }
-     else
--        dprintf(1, "\n");
-+        debprintf(1, "\n");
-     /* FIXME add fall-thru pass to decoder after heuristic "idle" period
-        (eg, 6-8 * last width) */
-     scn->x = x + 1;
-@@ -313,5 +313,5 @@ void zbar_scanner_get_state (const zbar_
-     /* NB not quite accurate (uses updated x) */
-     mut_scn = (zbar_scanner_t*)scn;
-     if(y1_thresh) *y1_thresh = calc_thresh(mut_scn);
--    dprintf(1, "\n");
-+    debprintf(1, "\n");
- }
-diff --git a/zbar/decoder/code93.c b/zbar/decoder/code93.c
---- a/zbar/decoder/code93.c
-+++ b/zbar/decoder/code93.c
-@@ -61,7 +61,7 @@ encode6 (zbar_decoder_t *dcode)
-     unsigned s = dcode->s6;
-     int sig = 0, i;
- 
--    dprintf(2, " s=%d ", s);
-+    debprintf(2, " s=%d ", s);
-     if(s < 9)
-         return(-1);
- 
-@@ -70,9 +70,9 @@ encode6 (zbar_decoder_t *dcode)
-         if(c > 3)
-             return(-1);
-         sig = (sig << 2) | c;
--        dprintf(2, "%d", c);
-+        debprintf(2, "%d", c);
-     }
--    dprintf(2, " sig=%03x", sig);
-+    debprintf(2, " sig=%03x", sig);
- 
-     return(sig);
- }
-@@ -81,14 +81,14 @@ static inline int
- validate_sig (int sig)
- {
-     int i, sum = 0, emin = 0, sig0 = 0, sig1 = 0;
--    dprintf(3, " sum=0");
-+    debprintf(3, " sum=0");
-     for(i = 3; --i >= 0; ) {
-         int e = sig & 3;
-         sig >>= 2;
-         sum = e - sum;
-         sig1 <<= 4;
-         sig1 += sum;
--        dprintf(3, "%d", sum);
-+        debprintf(3, "%d", sum);
-         if(!i)
-             break;
- 
-@@ -99,16 +99,16 @@ validate_sig (int sig)
-         if(emin > sum)
-             emin = sum;
-         sig0 += sum;
--        dprintf(3, "%d", sum);
-+        debprintf(3, "%d", sum);
-     }
- 
--    dprintf(3, " emin=%d sig=%03x/%03x", emin, sig1 & 0xfff, sig0 & 0xfff);
-+    debprintf(3, " emin=%d sig=%03x/%03x", emin, sig1 & 0xfff, sig0 & 0xfff);
- 
-     emin = emin + (emin << 4) + (emin << 8);
-     sig0 -= emin;
-     sig1 += emin;
- 
--    dprintf(3, "=%03x/%03x", sig1 & 0xfff, sig0 & 0xfff);
-+    debprintf(3, "=%03x/%03x", sig1 & 0xfff, sig0 & 0xfff);
-     return((sig0 | sig1) & 0x888);
- }
- 
-@@ -137,7 +137,7 @@ decode6 (zbar_decoder_t *dcode)
-             _zbar_decoder_buf_dump(dcode->buf, dcode->code93.character));
- 
-     c = (g0 + g1) & 0x3f;
--    dprintf(2, " g0=%x g1=%x c=%02x", g0, g1, c);
-+    debprintf(2, " g0=%x g1=%x c=%02x", g0, g1, c);
-     return(c);
- }
- 
-@@ -148,7 +148,7 @@ decode_start (zbar_decoder_t *dcode)
-     unsigned dir, qz, s = dcode->s6;
-     int c;
- 
--    dprintf(2, "      code93:");
-+    debprintf(2, "      code93:");
-     c = encode6(dcode);
-     if(c < 0 || (c != 0x00f && c != 0x0f0))
-         return(ZBAR_NONE);
-@@ -163,7 +163,7 @@ decode_start (zbar_decoder_t *dcode)
- 
-     qz = get_width(dcode, 7);
-     if(qz && qz < (s * 3) / 4) {
--        dprintf(2, " [invalid qz %d]", qz);
-+        debprintf(2, " [invalid qz %d]", qz);
-         return(ZBAR_NONE);
-     }
- 
-@@ -173,7 +173,7 @@ decode_start (zbar_decoder_t *dcode)
-     dcode93->character = 0;
-     dcode93->width = s;
- 
--    dprintf(2, " dir=%x [valid start]", dir);
-+    debprintf(2, " dir=%x [valid start]", dir);
-     return(ZBAR_PARTIAL);
- }
- 
-@@ -186,7 +186,7 @@ decode_abort (zbar_decoder_t *dcode,
-         release_lock(dcode, ZBAR_CODE93);
-     dcode93->character = -1;
-     if(reason)
--        dprintf(1, " [%s]\n", reason);
-+        debprintf(1, " [%s]\n", reason);
-     return(ZBAR_NONE);
- }
- 
-@@ -252,14 +252,14 @@ validate_checksums (zbar_decoder_t *dcod
-     }
- 
-     d = dcode->buf[(dcode93->direction) ? 1 : n - 2];
--    dprintf(2, " C=%02x?=%02x", d, sum_c);
-+    debprintf(2, " C=%02x?=%02x", d, sum_c);
-     if(d != sum_c)
-         return(1);
- 
-     acc_k = plusmod47(acc_k, sum_c);
-     sum_k = plusmod47(sum_k, acc_k);
-     d = dcode->buf[(dcode93->direction) ? 0 : n - 1];
--    dprintf(2, " K=%02x?=%02x", d, sum_k);
-+    debprintf(2, " K=%02x?=%02x", d, sum_k);
-     if(d != sum_k)
-         return(1);
- 
-@@ -276,11 +276,11 @@ postprocess (zbar_decoder_t *dcode)
-     static const unsigned char code93_s2[] =
-         "\x1b\x1c\x1d\x1e\x1f;<=>?[\\]^_{|}~\x7f\x00\x40`\x7f\x7f\x7f";
- 
--    dprintf(2, "\n    postproc len=%d", n);
-+    debprintf(2, "\n    postproc len=%d", n);
-     dcode->direction = 1 - 2 * dcode93->direction;
-     if(dcode93->direction) {
-         /* reverse buffer */
--        dprintf(2, " (rev)");
-+        debprintf(2, " (rev)");
-         for(i = 0; i < n / 2; i++) {
-             unsigned j = n - 1 - i;
-             unsigned char d = dcode->buf[i];
-@@ -335,7 +335,7 @@ _zbar_decode_code93 (zbar_decoder_t *dco
-         if(get_color(dcode) != ZBAR_BAR)
-             return(ZBAR_NONE);
-         sym = decode_start(dcode);
--        dprintf(2, "\n");
-+        debprintf(2, "\n");
-         return(sym);
-     }
- 
-@@ -347,7 +347,7 @@ _zbar_decode_code93 (zbar_decoder_t *dco
- 
-     dcode93->element = 0;
- 
--    dprintf(2, "      code93[%c%02d+%x]:",
-+    debprintf(2, "      code93[%c%02d+%x]:",
-             (dcode93->direction) ? '<' : '>',
-             dcode93->character, dcode93->element);
- 
-@@ -366,8 +366,8 @@ _zbar_decode_code93 (zbar_decoder_t *dco
-         if(postprocess(dcode))
-             return(decode_abort(dcode, "invalid encoding"));
- 
--        dprintf(2, " [valid end]\n");
--        dprintf(3, "    %s\n",
-+        debprintf(2, " [valid end]\n");
-+        debprintf(3, "    %s\n",
-                 _zbar_decoder_buf_dump(dcode->buf, dcode93->character));
- 
-         dcode93->character = -1;
-@@ -393,6 +393,6 @@ _zbar_decode_code93 (zbar_decoder_t *dco
-         dcode->buf[dcode93->character] = c;
-     dcode93->character++;
- 
--    dprintf(2, "\n");
-+    debprintf(2, "\n");
-     return(ZBAR_NONE);
- }
-diff --git a/zbar/decoder/databar.c b/zbar/decoder/databar.c
---- a/zbar/decoder/databar.c
-+++ b/zbar/decoder/databar.c
-@@ -126,7 +126,7 @@ decode10 (unsigned char *buf,
-         d = (d << 12) | (*(data++) & 0xfff); \
-         i += 12;                             \
-         len--;                               \
--        dprintf(2, " %03lx", d & 0xfff);     \
-+        debprintf(2, " %03lx", d & 0xfff);     \
-     }
- 
- #define PUSH_CHAR(c) \
-@@ -151,7 +151,7 @@ databar_postprocess_exp (zbar_decoder_t 
- 
-     /* grok encodation method */
-     d = *(data++);
--    dprintf(2, "\n    len=%d %03lx", len, d & 0xfff);
-+    debprintf(2, "\n    len=%d %03lx", len, d & 0xfff);
-     n = (d >> 4) & 0x7f;
-     if(n >= 0x40) {
-         i = 10;
-@@ -178,7 +178,7 @@ databar_postprocess_exp (zbar_decoder_t 
-         enc = 0;
-         buflen = VAR_MAX(len, 9 - 2) + 2;
-     }
--    dprintf(2, " buflen=%d enc=%d", buflen, enc);
-+    debprintf(2, " buflen=%d enc=%d", buflen, enc);
-     zassert(buflen > 2, -1, "buflen=%d\n", buflen);
- 
-     if(enc < 4) {
-@@ -191,7 +191,7 @@ databar_postprocess_exp (zbar_decoder_t 
-             return(-1);
-     }
-     len -= 2;
--    dprintf(2, " [%d+%d]", i, len);
-+    debprintf(2, " [%d+%d]", i, len);
- 
-     if(size_buf(dcode, buflen))
-         return(-1);
-@@ -263,7 +263,7 @@ databar_postprocess_exp (zbar_decoder_t 
-         FEED_BITS(15);
-         i -= 15;
-         n = (d >> i) & 0x7fff;
--        dprintf(2, " v=%d", n);
-+        debprintf(2, " v=%d", n);
-         PUSH_CHAR4('3', '2', '0', (n >= 10000) ? '3' : '2' );
-         if(n >= 10000)
-             n -= 10000;
-@@ -277,7 +277,7 @@ databar_postprocess_exp (zbar_decoder_t 
-         FEED_BITS(20);
-         i -= 20;
-         n = (d >> i) & 0xfffff;
--        dprintf(2, " [%d+%d] %d", i, len, n);
-+        debprintf(2, " [%d+%d] %d", i, len, n);
-         if(n >= 1000000)
-             return(-1);
-         decode10(buf, n, 6);
-@@ -313,7 +313,7 @@ databar_postprocess_exp (zbar_decoder_t 
-         int scheme = SCH_NUM;
-         while(i > 0 || len > 0) {
-             FEED_BITS(8);
--            dprintf(2, " [%d+%d]", i, len);
-+            debprintf(2, " [%d+%d]", i, len);
- 
-             if(scheme == SCH_NUM) {
-                 int n1;
-@@ -322,7 +322,7 @@ databar_postprocess_exp (zbar_decoder_t 
-                     break;
-                 if(!((d >> i) & 0xf)) {
-                     scheme = SCH_ALNUM;
--                    dprintf(2, ">A");
-+                    debprintf(2, ">A");
-                     continue;
-                 }
-                 if(!len && i < 3) {
-@@ -338,7 +338,7 @@ databar_postprocess_exp (zbar_decoder_t 
-                 n = ((d >> i) & 0x7f) - 8;
-                 n1 = n % 11;
-                 n = n / 11;
--                dprintf(2, "N%d%d", n, n1);
-+                debprintf(2, "N%d%d", n, n1);
-                 *(buf++) = (n < 10) ? '0' + n : GS;
-                 *(buf++) = (n1 < 10) ? '0' + n1 : GS;
-             }
-@@ -357,7 +357,7 @@ databar_postprocess_exp (zbar_decoder_t 
-                 n = (d >> i) & 0x1f;
-                 if(n == 0x04) {
-                     scheme ^= 0x3;
--                    dprintf(2, ">%d", scheme);
-+                    debprintf(2, ">%d", scheme);
-                 }
-                 else if(n == 0x0f)
-                     c = GS;
-@@ -394,7 +394,7 @@ databar_postprocess_exp (zbar_decoder_t 
-                     if(i < 0)
-                         return(-1);
-                     n = ((d >> i) & 0x1f);
--                    dprintf(2, "(%02x)", n);
-+                    debprintf(2, "(%02x)", n);
-                     if(n < 0xa)
-                         c = '!' + n - 8;
-                     else if(n < 0x15)
-@@ -412,7 +412,7 @@ databar_postprocess_exp (zbar_decoder_t 
-                     return(-1);
- 
-                 if(c) {
--                    dprintf(2, "%d%c", scheme, c);
-+                    debprintf(2, "%d%c", scheme, c);
-                     *(buf++) = c;
-                 }
-             }
-@@ -428,7 +428,7 @@ databar_postprocess_exp (zbar_decoder_t 
-         dcode->buflen--;
-     }
- 
--    dprintf(2, "\n    %s", _zbar_decoder_buf_dump(dcode->buf, dcode->buflen));
-+    debprintf(2, "\n    %s", _zbar_decoder_buf_dump(dcode->buf, dcode->buflen));
-     return(0);
- }
- #undef FEED_BITS
-@@ -450,7 +450,7 @@ databar_postprocess (zbar_decoder_t *dco
-     *--buf = '\0';
-     *--buf = '\0';
- 
--    dprintf(2, "\n    d={%d,%d,%d,%d}", d[0], d[1], d[2], d[3]);
-+    debprintf(2, "\n    d={%d,%d,%d,%d}", d[0], d[1], d[2], d[3]);
-     unsigned long r = d[0] * 1597 + d[1];
-     d[1] = r / 10000;
-     r %= 10000;
-@@ -459,7 +459,7 @@ databar_postprocess (zbar_decoder_t *dco
-     r %= 10000;
-     r = r * 1597 + d[3];
-     d[3] = r / 10000;
--    dprintf(2, " r=%ld", r);
-+    debprintf(2, " r=%ld", r);
- 
-     for(i = 4; --i >= 0; ) {
-         c = r % 10;
-@@ -471,13 +471,13 @@ databar_postprocess (zbar_decoder_t *dco
-             r /= 10;
-     }
- 
--    dprintf(2, " d={%d,%d,%d}", d[1], d[2], d[3]);
-+    debprintf(2, " d={%d,%d,%d}", d[1], d[2], d[3]);
-     r = d[1] * 2841 + d[2];
-     d[2] = r / 10000;
-     r %= 10000;
-     r = r * 1597 + d[3];
-     d[3] = r / 10000;
--    dprintf(2, " r=%ld", r);
-+    debprintf(2, " r=%ld", r);
- 
-     for(i = 4; --i >= 0; ) {
-         c = r % 10;
-@@ -490,7 +490,7 @@ databar_postprocess (zbar_decoder_t *dco
-     }
- 
-     r = d[2] * 1597 + d[3];
--    dprintf(2, " d={%d,%d} r=%ld", d[2], d[3], r);
-+    debprintf(2, " d={%d,%d} r=%ld", d[2], d[3], r);
- 
-     for(i = 5; --i >= 0; ) {
-         c = r % 10;
-@@ -513,7 +513,7 @@ databar_postprocess (zbar_decoder_t *dco
-     else
-         dcode->buflen = buf - dcode->buf + 13;
- 
--    dprintf(2, "\n    %s", _zbar_decoder_buf_dump(dcode->buf, 16));
-+    debprintf(2, "\n    %s", _zbar_decoder_buf_dump(dcode->buf, 16));
- }
- 
- static inline int
-@@ -547,7 +547,7 @@ merge_segment (databar_decoder_t *db,
-             seg->partial &= s->partial;
-             seg->width = (3 * seg->width + s->width + 2) / 4;
-             s->finder = -1;
--            dprintf(2, " dup@%d(%d,%d)",
-+            debprintf(2, " dup@%d(%d,%d)",
-                     i, cnt, (db->epoch - seg->epoch) & 0xff);
-         }
-         else if(s->finder >= 0) {
-@@ -587,7 +587,7 @@ match_segment (zbar_decoder_t *dcode,
-                (s1->partial && s1->count < 4) ||
-                !check_width(seg->width, s1->width, 14))
-                 continue;
--            dprintf(2, "\n\t[%d,%d] f=%d(0%xx)/%d(%x%x%x)",
-+            debprintf(2, "\n\t[%d,%d] f=%d(0%xx)/%d(%x%x%x)",
-                     i0, i1, seg->finder, seg->color,
-                     s1->finder, s1->exp, s1->color, s1->side);
- 
-@@ -607,7 +607,7 @@ match_segment (zbar_decoder_t *dcode,
-             else
-                 chk = 79 + chkf - chks;
- 
--            dprintf(2, " chk=(%d,%d) => %d", chkf, chks, chk);
-+            debprintf(2, " chk=(%d,%d) => %d", chkf, chks, chk);
-             age1 = ((db->epoch - s0->epoch) & 0xff +
-                     (db->epoch - s1->epoch) & 0xff);
- 
-@@ -623,7 +623,7 @@ match_segment (zbar_decoder_t *dcode,
-                 age2 = (db->epoch - s2->epoch) & 0xff;
-                 age = age1 + age2;
-                 cnt = s0->count + s1->count + s2->count;
--                dprintf(2, " [%d] MATCH cnt=%d age=%d", i2, cnt, age);
-+                debprintf(2, " [%d] MATCH cnt=%d age=%d", i2, cnt, age);
-                 if(maxcnt < cnt ||
-                    (maxcnt == cnt && maxage > age)) {
-                     maxcnt = cnt;
-@@ -670,7 +670,7 @@ lookup_sequence (databar_segment_t *seg,
-     i = (n + 1) / 2 + 1;
-     n += 4;
-     i = (i * i) / 4;
--    dprintf(2, " {%d,%d:", i, n);
-+    debprintf(2, " {%d,%d:", i, n);
-     p = exp_sequences + i;
- 
-     fixed >>= 1;
-@@ -687,11 +687,11 @@ lookup_sequence (databar_segment_t *seg,
-         if(s == fixed)
-             fixed = -1;
-         s <<= 1;
--        dprintf(2, "%x", s);
-+        debprintf(2, "%x", s);
-         seq[i++] = s++;
-         seq[i++] = s;
-     }
--    dprintf(2, "}");
-+    debprintf(2, "}");
-     seq[n] = -1;
-     return(fixed < 1);
- }
-@@ -713,27 +713,27 @@ match_segment_exp (zbar_decoder_t *dcode
-     bestsegs[0] = segs[0] = seq[1] = -1;
-     seq[0] = 0;
- 
--    dprintf(2, "\n    fixed=%d@%d: ", fixed, ifixed);
-+    debprintf(2, "\n    fixed=%d@%d: ", fixed, ifixed);
-     for(i = csegs, seg = db->segs + csegs - 1; --i >= 0; seg--) {
-         if(seg->exp && seg->finder >= 0 &&
-            (!seg->partial || seg->count >= 4))
-             iseg[i] = IDX(seg);
-         else
-             iseg[i] = -1;
--        dprintf(2, " %d", iseg[i]);
-+        debprintf(2, " %d", iseg[i]);
-     }
- 
-     for(i = 0; ; i--) {
-         if(!i)
--            dprintf(2, "\n   ");
-+            debprintf(2, "\n   ");
-         for(; i >= 0 && seq[i] >= 0; i--) {
-             int j;
--            dprintf(2, " [%d]%d", i, seq[i]);
-+            debprintf(2, " [%d]%d", i, seq[i]);
- 
-             if(seq[i] == fixed) {
-                 seg = db->segs + ifixed;
-                 if(segs[i] < 0 && check_width(width, seg->width, 14)) {
--                    dprintf(2, "*");
-+                    debprintf(2, "*");
-                     j = ifixed;
-                 }
-                 else
-@@ -753,15 +753,15 @@ match_segment_exp (zbar_decoder_t *dcode
- 
-             if(!i) {
-                 if(!lookup_sequence(seg, fixed, seq)) {
--                    dprintf(2, "[nf]");
-+                    debprintf(2, "[nf]");
-                     continue;
-                 }
-                 width = seg->width;
--                dprintf(2, " A00@%d", j);
-+                debprintf(2, " A00@%d", j);
-             }
-             else {
-                 width = (width + seg->width) / 2;
--                dprintf(2, " %c%x%x@%d",
-+                debprintf(2, " %c%x%x@%d",
-                         'A' + seg->finder, seg->color, seg->side, j);
-             }
-             segs[i++] = j;
-@@ -783,15 +783,15 @@ match_segment_exp (zbar_decoder_t *dcode
-         unsigned chk0 = data0 % 211;
-         chk %= 211;
- 
--        dprintf(2, " chk=%d ?= %d", chk, chk0);
-+        debprintf(2, " chk=%d ?= %d", chk, chk0);
-         if(chk != chk0)
-             continue;
- 
--        dprintf(2, " cnt=%d age=%d", cnt, age);
-+        debprintf(2, " cnt=%d age=%d", cnt, age);
-         if(maxcnt > cnt || (maxcnt == cnt && maxage <= age))
-             continue;
- 
--        dprintf(2, " !");
-+        debprintf(2, " !");
-         maxcnt = cnt;
-         maxage = age;
-         for(i = 0; segs[i] >= 0; i++)
-@@ -844,7 +844,7 @@ calc_check (unsigned sig0,
-         if(!(i & 1))
-             chk %= mod;
-     }
--    dprintf(2, " chk=%d", chk);
-+    debprintf(2, " chk=%d", chk);
- 
-     if(side)
-         chk = (chk * (6561 % mod)) % mod;
-@@ -958,7 +958,7 @@ decode_char (zbar_decoder_t *dcode,
-         n = 16;
-     emin[1] = -n;
- 
--    dprintf(2, "\n        char[%c%d]: n=%d s=%d w=%d sig=",
-+    debprintf(2, "\n        char[%c%d]: n=%d s=%d w=%d sig=",
-             (dir < 0) ? '>' : '<', off, n, s, seg->width);
-     if(s < 13 || !check_width(seg->width, s, n))
-         return(ZBAR_NONE);
-@@ -967,7 +967,7 @@ decode_char (zbar_decoder_t *dcode,
-         int e = decode_e(pair_width(dcode, off), s, n);
-         if(e < 0)
-             return(ZBAR_NONE);
--        dprintf(2, "%d", e);
-+        debprintf(2, "%d", e);
-         sum = e - sum;
-         off += dir;
-         sig1 <<= 4;
-@@ -980,7 +980,7 @@ decode_char (zbar_decoder_t *dcode,
-         e = decode_e(pair_width(dcode, off), s, n);
-         if(e < 0)
-             return(ZBAR_NONE);
--        dprintf(2, "%d", e);
-+        debprintf(2, "%d", e);
-         sum = e - sum;
-         off += dir;
-         sig0 <<= 4;
-@@ -996,7 +996,7 @@ decode_char (zbar_decoder_t *dcode,
-     sig0 -= diff;
-     sig1 += diff;
- 
--    dprintf(2, " emin=%d,%d el=%04x/%04x", emin[0], emin[1], sig0, sig1);
-+    debprintf(2, " emin=%d,%d el=%04x/%04x", emin[0], emin[1], sig0, sig1);
- 
-     unsigned sum0 = sig0 + (sig0 >> 8);
-     unsigned sum1 = sig1 + (sig1 >> 8);
-@@ -1005,15 +1005,15 @@ decode_char (zbar_decoder_t *dcode,
-     sum0 &= 0xf;
-     sum1 &= 0xf;
- 
--    dprintf(2, " sum=%d/%d", sum0, sum1);
-+    debprintf(2, " sum=%d/%d", sum0, sum1);
- 
-     if(sum0 + sum1 + 8 != n) {
--        dprintf(2, " [SUM]");
-+        debprintf(2, " [SUM]");
-         return(ZBAR_NONE);
-     }
- 
-     if(((sum0 ^ (n >> 1)) | (sum1 ^ (n >> 1) ^ n)) & 1) {
--        dprintf(2, " [ODD]");
-+        debprintf(2, " [ODD]");
-         return(ZBAR_NONE);
-     }
- 
-@@ -1022,16 +1022,16 @@ decode_char (zbar_decoder_t *dcode,
-             "n=%d sum=%d/%d sig=%04x/%04x g=%d",
-             n, sum0, sum1, sig0, sig1, i);
-     struct group_s *g = groups + i;
--    dprintf(2, "\n            g=%d(%d,%d,%d/%d)",
-+    debprintf(2, "\n            g=%d(%d,%d,%d/%d)",
-             i, g->sum, g->wmax, g->todd, g->teven);
- 
-     int vodd = calc_value4(sig0 + 0x1111, sum0 + 4, g->wmax, ~n & 1);
--    dprintf(2, " v=%d", vodd);
-+    debprintf(2, " v=%d", vodd);
-     if(vodd < 0 || vodd > g->todd)
-         return(ZBAR_NONE);
- 
-     int veven = calc_value4(sig1 + 0x1111, sum1 + 4, 9 - g->wmax, n & 1);
--    dprintf(2, "/%d", veven);
-+    debprintf(2, "/%d", veven);
-     if(veven < 0 || veven > g->teven)
-         return(ZBAR_NONE);
- 
-@@ -1041,7 +1041,7 @@ decode_char (zbar_decoder_t *dcode,
-     else
-         v += veven + vodd * g->teven;
- 
--    dprintf(2, " f=%d(%x%x%x)", seg->finder, seg->exp, seg->color, seg->side);
-+    debprintf(2, " f=%d(%x%x%x)", seg->finder, seg->exp, seg->color, seg->side);
- 
-     unsigned chk = 0;
-     if(seg->exp) {
-@@ -1067,7 +1067,7 @@ decode_char (zbar_decoder_t *dcode,
-         if(seg->color)
-             chk = (chk * 16) % 79;
-     }
--    dprintf(2, " => %d val=%d", chk, v);
-+    debprintf(2, " => %d val=%d", chk, v);
- 
-     seg->check = chk;
-     seg->data = v;
-@@ -1090,13 +1090,13 @@ alloc_segment (databar_decoder_t *db)
-         databar_segment_t *seg = db->segs + i;
-         unsigned age;
-         if(seg->finder < 0) {
--            dprintf(2, " free@%d", i);
-+            debprintf(2, " free@%d", i);
-             return(i);
-         }
-         age = (db->epoch - seg->epoch) & 0xff;
-         if(age >= 128 && seg->count < 2) {
-             seg->finder = -1;
--            dprintf(2, " stale@%d (%d - %d = %d)",
-+            debprintf(2, " stale@%d (%d - %d = %d)",
-                     i, db->epoch, seg->epoch, age);
-             return(i);
-         }
-@@ -1110,12 +1110,12 @@ alloc_segment (databar_decoder_t *db)
-         if(maxage < age) {
-             maxage = age;
-             old = i;
--            dprintf(2, " old@%d(%u)", i, age);
-+            debprintf(2, " old@%d(%u)", i, age);
-         }
-     }
- 
-     if(csegs < DATABAR_MAX_SEGMENTS) {
--        dprintf(2, " new@%d", i);
-+        debprintf(2, " new@%d", i);
-         i = csegs;
-         csegs *= 2;
-         if(csegs > DATABAR_MAX_SEGMENTS)
-@@ -1153,7 +1153,7 @@ decode_finder (zbar_decoder_t *dcode)
-     unsigned e2 = pair_width(dcode, 3);
-     unsigned e1, e3, s, finder, dir;
-     int sig, iseg;
--    dprintf(2, "      databar: e0=%d e2=%d", e0, e2);
-+    debprintf(2, "      databar: e0=%d e2=%d", e0, e2);
-     if(e0 < e2) {
-         unsigned e = e2 * 4;
-         if(e < 15 * e0 || e > 34 * e0)
-@@ -1172,13 +1172,13 @@ decode_finder (zbar_decoder_t *dcode)
-     e1 = pair_width(dcode, 2);
- 
-     s = e1 + e3;
--    dprintf(2, " e1=%d e3=%d dir=%d s=%d", e1, e3, dir, s);
-+    debprintf(2, " e1=%d e3=%d dir=%d s=%d", e1, e3, dir, s);
-     if(s < 12)
-         return(ZBAR_NONE);
- 
-     sig = ((decode_e(e3, s, 14) << 8) | (decode_e(e2, s, 14) << 4) |
-            decode_e(e1, s, 14));
--    dprintf(2, " sig=%04x", sig & 0xfff);
-+    debprintf(2, " sig=%04x", sig & 0xfff);
-     if(sig < 0 ||
-        ((sig >> 4) & 0xf) < 8 ||
-        ((sig >> 4) & 0xf) > 10 ||
-@@ -1189,7 +1189,7 @@ decode_finder (zbar_decoder_t *dcode)
- 
-     finder = (finder_hash[(sig - (sig >> 5)) & 0x1f] +
-               finder_hash[(sig >> 1) & 0x1f]) & 0x1f;
--    dprintf(2, " finder=%d", finder);
-+    debprintf(2, " finder=%d", finder);
-     if(finder == 0x1f ||
-        !TEST_CFG((finder < 9) ? db->config : db->config_exp, ZBAR_CFG_ENABLE))
-         return(ZBAR_NONE);
-@@ -1232,7 +1232,7 @@ _zbar_decode_databar (zbar_decoder_t *dc
-     int iseg, i = dcode->idx & 0xf;
- 
-     sym = decode_finder(dcode);
--    dprintf(2, "\n");
-+    debprintf(2, "\n");
- 
-     iseg = db->chars[i];
-     if(iseg < 0)
-@@ -1240,7 +1240,7 @@ _zbar_decode_databar (zbar_decoder_t *dc
- 
-     db->chars[i] = -1;
-     seg = db->segs + iseg;
--    dprintf(2, "        databar: i=%d part=%d f=%d(%x%x%x)",
-+    debprintf(2, "        databar: i=%d part=%d f=%d(%x%x%x)",
-             iseg, seg->partial, seg->finder, seg->exp, seg->color, seg->side);
-     zassert(seg->finder >= 0, ZBAR_NONE, "i=%d f=%d(%x%x%x) part=%x\n",
-             iseg, seg->finder, seg->exp, seg->color, seg->side, seg->partial);
-@@ -1271,7 +1271,7 @@ _zbar_decode_databar (zbar_decoder_t *dc
-     }
-     else
-         db->epoch++;
--    dprintf(2, "\n");
-+    debprintf(2, "\n");
- 
-     return(sym);
- }

From 93afbf92fd50671a42d2b1eb5d1a303aec477bfc Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 5 Feb 2016 04:04:36 +0000
Subject: [PATCH 036/108] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild

---
 zbar.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zbar.spec b/zbar.spec
index 8b98173..67a97e6 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -3,7 +3,7 @@
 
 Name:           zbar
 Version:        0.10
-Release:        25%{?dist}
+Release:        26%{?dist}
 Summary:        Bar code reader
 
 Group:          User Interface/X Hardware Support
@@ -183,6 +183,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/zbar/QZBar*.h
 
 %changelog
+* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.10-26
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
 * Fri Aug 14 2015 Douglas Schilling Landgraf <dougsland@redhat.com> - 0.10-25
 - Add patch to include m4_pattern_allow([AM_PROG_AR])
 

From b84eafaaf25ee335240dcc093c43e71a2bcffdaa Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Tue, 19 Jul 2016 13:15:30 +0000
Subject: [PATCH 037/108] -
 https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages

---
 zbar.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zbar.spec b/zbar.spec
index 67a97e6..62d9519 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -3,7 +3,7 @@
 
 Name:           zbar
 Version:        0.10
-Release:        26%{?dist}
+Release:        27%{?dist}
 Summary:        Bar code reader
 
 Group:          User Interface/X Hardware Support
@@ -183,6 +183,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/zbar/QZBar*.h
 
 %changelog
+* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10-27
+- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
+
 * Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.10-26
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 

From 85885807112391cee7441d90624f91209a410317 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 11 Feb 2017 18:22:55 +0000
Subject: [PATCH 038/108] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild

---
 zbar.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zbar.spec b/zbar.spec
index 62d9519..4f7ff68 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -3,7 +3,7 @@
 
 Name:           zbar
 Version:        0.10
-Release:        27%{?dist}
+Release:        28%{?dist}
 Summary:        Bar code reader
 
 Group:          User Interface/X Hardware Support
@@ -183,6 +183,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/zbar/QZBar*.h
 
 %changelog
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.10-28
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
 * Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10-27
 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
 

From 7715ab8df28ecfcd49e2492519ed6e0240e7fd93 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Date: Sun, 26 Mar 2017 08:42:45 -0300
Subject: [PATCH 039/108] make zbar-qt to use Qt5

Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
---
 zbar.spec                      |   5 ++
 zbar_add_support_for_qt5.patch | 140 +++++++++++++++++++++++++++++++++
 2 files changed, 145 insertions(+)
 create mode 100644 zbar_add_support_for_qt5.patch

diff --git a/zbar.spec b/zbar.spec
index 4f7ff68..a15663e 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -15,6 +15,7 @@ Patch1:		zbar_use_libv4l.patch
 Patch2:		zbar_choose_supported_format_first.patch
 Patch3:		zbar_use_REQBUFS_properly.patch
 Patch4:		zbar_configure_ac_use_m4_pattern_allow.patch
+Patch5:		zbar_add_support_for_qt5.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
 BuildRequires:	autoconf automake libtool python-devel gettext-devel
@@ -90,6 +91,7 @@ scanning widget.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 autoreconf -vfi
@@ -183,6 +185,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/zbar/QZBar*.h
 
 %changelog
+* Sun Mar 26 2017 Mauro Carvalho Chehab <mchehab@s-opensource.com> - 0.10-29
+- Make zbar-qt to use Qt5
+
 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.10-28
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 
diff --git a/zbar_add_support_for_qt5.patch b/zbar_add_support_for_qt5.patch
new file mode 100644
index 0000000..519645f
--- /dev/null
+++ b/zbar_add_support_for_qt5.patch
@@ -0,0 +1,140 @@
+diff --git a/configure.ac b/configure.ac
+index dbd7153fb13b..7bcb18219853 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -476,18 +476,33 @@ AM_CONDITIONAL([HAVE_PYTHON], [test "x$with_python" = "xyes"])
+ dnl Qt
+ AC_ARG_WITH([qt],
+   [AS_HELP_STRING([--without-qt],
+-    [disable support for Qt4 widget])],
++    [disable support for Qt widget])],
+   [],
+   [with_qt="yes"])
+ 
++dnl Qt5
++AC_ARG_WITH([qt5],
++  [AS_HELP_STRING([--without-qt5],
++    [disable support for Qt5 widget. if --with-qt, it will seek only for Qt4])],
++  [],
++  [with_qt5="yes"])
++
+ AC_ARG_VAR([MOC], [full path to Qt moc program])
+ 
+ AS_IF([test "x$with_qt" != "xno"],
+-  [PKG_CHECK_MODULES([QT], [QtCore >= 4 QtGui >= 4])
+-   MOC=`$PKG_CONFIG QtGui --variable=moc_location`
+-   AC_MSG_NOTICE([using moc from $MOC])
+-   QT_VERSION=`$PKG_CONFIG QtGui --modversion`
+-   AC_MSG_NOTICE([using Qt version $QT_VERSION])])
++   AS_IF([test "x$with_qt5" != "xno"],
++     [PKG_CHECK_MODULES([QT], [Qt5Core >= 5 Qt5Gui >= 5 Qt5Widgets >= 5.0 Qt5X11Extras >= 5.0])
++     AC_CHECK_PROGS(MOC, [moc-qt5 moc])
++     AC_MSG_NOTICE([using moc from $MOC])
++     QT_VERSION=`$PKG_CONFIG Qt5Gui --modversion`
++     CPPFLAGS="$CPPFLAGS $QT_CPPFLAGS -fPIC"
++     AC_MSG_NOTICE([using Qt version $QT_VERSION])],
++
++     [PKG_CHECK_MODULES([QT], [QtCore >= 4 QtGui >= 4])
++     MOC=`$PKG_CONFIG QtGui --variable=moc_location`
++     AC_MSG_NOTICE([using moc from $MOC])
++     QT_VERSION=`$PKG_CONFIG QtGui --modversion`
++     AC_MSG_NOTICE([using Qt version $QT_VERSION])]))
+ 
+ AM_CONDITIONAL([HAVE_QT], [test "x$with_qt" = "xyes"])
+ 
+@@ -596,9 +611,9 @@ AS_IF([test "x$with_gtk" != "xyes"],
+   [echo "        => the GTK+ widget will *NOT* be built"],
+   [AS_IF([test "x$with_python" != "xyes"],
+      [echo "        => the PyGTK widget wrapper will *NOT* be built"])])
+-echo "Qt4               --with-qt=$with_qt"
++echo "Qt${QT_VERSION}           --with-qt=$with_qt"
+ AS_IF([test "x$with_qt" != "xyes"],
+-  [echo "        => the Qt4 widget will *NOT* be built"])
++  [echo "        => the Qt widget will *NOT* be built"])
+ echo "Java              --with-java=$with_java"
+ AS_IF([test "x$with_java" != "xyes"],
+   [echo "        => the Java interface will *NOT* be built"])
+diff --git a/include/zbar/QZBar.h b/include/zbar/QZBar.h
+index 104449928e2d..1a4716565047 100644
+--- a/include/zbar/QZBar.h
++++ b/include/zbar/QZBar.h
+@@ -26,7 +26,12 @@
+ /// @file
+ /// Barcode Reader Qt4 Widget
+ 
+-#include <qwidget.h>
++#include <QtGui>
++#if QT_VERSION >= 0x050000
++#  include <QtWidgets>
++#else
++#  include <qwidget.h>
++#endif
+ 
+ namespace zbar {
+ 
+diff --git a/include/zbar/QZBarImage.h b/include/zbar/QZBarImage.h
+index 1505177e07a9..b862c8085576 100644
+--- a/include/zbar/QZBarImage.h
++++ b/include/zbar/QZBarImage.h
+@@ -54,7 +54,11 @@ public:
+         unsigned height = qimg.height();
+         set_size(width, height);
+         set_format(zbar_fourcc('B','G','R','4'));
++#if QT_VERSION >= 0x050000
++        unsigned long datalen = qimg.byteCount();
++#else
+         unsigned long datalen = qimg.numBytes();
++#endif
+         set_data(qimg.bits(), datalen);
+ 
+         if((width * 4 != bpl) ||
+diff --git a/qt/QZBar.cpp b/qt/QZBar.cpp
+index e1001b09cff5..a5b956b342ad 100644
+--- a/qt/QZBar.cpp
++++ b/qt/QZBar.cpp
+@@ -23,7 +23,7 @@
+ 
+ #include <qevent.h>
+ #include <qurl.h>
+-#include <qx11info_x11.h>
++#include <QX11Info>
+ #include <zbar/QZBar.h>
+ #include "QZBarThread.h"
+ 
+@@ -49,7 +49,11 @@ QZBar::QZBar (QWidget *parent)
+ 
+     thread = new QZBarThread;
+     if(testAttribute(Qt::WA_WState_Created)) {
++#if QT_VERSION >= 0x050000
++        thread->window.attach(QX11Info::display(), winId());
++#else
+         thread->window.attach(x11Info().display(), winId());
++#endif
+         _attached = 1;
+     }
+     connect(thread, SIGNAL(videoOpened(bool)),
+@@ -204,7 +208,12 @@ void QZBar::changeEvent(QEvent *event)
+     try {
+         QMutexLocker locker(&thread->mutex);
+         if(event->type() == QEvent::ParentChange)
++#if QT_VERSION >= 0x050000
++            thread->window.attach(QX11Info::display(), winId());
++#else
+             thread->window.attach(x11Info().display(), winId());
++#endif
++
+     }
+     catch(Exception) { /* ignore (FIXME do something w/error) */ }
+ }
+@@ -215,7 +224,11 @@ void QZBar::attach ()
+         return;
+ 
+     try {
++#if QT_VERSION >= 0x050000
++        thread->window.attach(QX11Info::display(), winId());
++#else
+         thread->window.attach(x11Info().display(), winId());
++#endif
+         _attached = 1;
+ 
+         _videoEnabled = !_videoDevice.isEmpty();

From f637bc228003fd879c438158201430d46cf720cc Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Date: Sun, 26 Mar 2017 10:14:00 -0300
Subject: [PATCH 040/108] Generate qt and gtk zbarcam applications

Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
---
 zbar.spec                       |   9 +-
 zbar_generate_qt_gtk_apps.patch | 148 ++++++++++++++++++++++++++++++++
 2 files changed, 155 insertions(+), 2 deletions(-)
 create mode 100644 zbar_generate_qt_gtk_apps.patch

diff --git a/zbar.spec b/zbar.spec
index a15663e..fe85b4a 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -3,7 +3,7 @@
 
 Name:           zbar
 Version:        0.10
-Release:        28%{?dist}
+Release:        29%{?dist}
 Summary:        Bar code reader
 
 Group:          User Interface/X Hardware Support
@@ -16,6 +16,8 @@ Patch2:		zbar_choose_supported_format_first.patch
 Patch3:		zbar_use_REQBUFS_properly.patch
 Patch4:		zbar_configure_ac_use_m4_pattern_allow.patch
 Patch5:		zbar_add_support_for_qt5.patch
+Patch6:		zbar_generate_qt_gtk_apps.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
 BuildRequires:	autoconf automake libtool python-devel gettext-devel
@@ -92,6 +94,7 @@ scanning widget.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 autoreconf -vfi
@@ -162,6 +165,7 @@ rm -rf $RPM_BUILD_ROOT
 %files gtk
 %defattr(-,root,root,-)
 %{_libdir}/libzbargtk.so.*
+%{_bindir}/zbarcam-gtk
 
 %files gtk-devel
 %defattr(-,root,root,-)
@@ -177,6 +181,7 @@ rm -rf $RPM_BUILD_ROOT
 %files qt
 %defattr(-,root,root,-)
 %{_libdir}/libzbarqt.so.*
+%{_bindir}/zbarcam-qt
 
 %files qt-devel
 %defattr(-,root,root,-)
@@ -186,7 +191,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Sun Mar 26 2017 Mauro Carvalho Chehab <mchehab@s-opensource.com> - 0.10-29
-- Make zbar-qt to use Qt5
+- Make zbar-qt to use Qt5 and generate gtk and qt applications
 
 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.10-28
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
diff --git a/zbar_generate_qt_gtk_apps.patch b/zbar_generate_qt_gtk_apps.patch
new file mode 100644
index 0000000..17c6856
--- /dev/null
+++ b/zbar_generate_qt_gtk_apps.patch
@@ -0,0 +1,148 @@
+From 76a286fd34d5159b55de4d4f276dcbf69d1b263e Mon Sep 17 00:00:00 2001
+From: Mauro Carvalho Chehab <mchehab@s-opensource.com>
+Date: Sun, 26 Mar 2017 09:43:07 -0300
+Subject: [PATCH] zbarcam: add qt and gtk variants
+
+The original zbarcam use standard X11 libraries to display
+video. That provides an ugly interface, and could be
+slow on high resolutions.
+
+As Zbar has already test examples for qt and gtk, let's
+promote them to real applications. One advantage is that
+both qt and gtk libraries will be tested when building
+those.
+
+Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
+
+diff --git a/qt/Makefile.am.inc b/qt/Makefile.am.inc
+index dc1525e0d52a..5f860bfa31bc 100644
+--- a/qt/Makefile.am.inc
++++ b/qt/Makefile.am.inc
+@@ -7,6 +7,7 @@ qt_libzbarqt_la_SOURCES = qt/QZBar.cpp qt/QZBarThread.h qt/QZBarThread.cpp
+ nodist_qt_libzbarqt_la_SOURCES = qt/moc_QZBar.cpp qt/moc_QZBarThread.cpp
+ BUILT_SOURCES += $(nodist_qt_libzbarqt_la_SOURCES)
+ DISTCLEANFILES += $(nodist_qt_libzbarqt_la_SOURCES)
++CLEANFILES += qt/moc_%.cpp
+ 
+ qt/moc_%.cpp: qt/%.h
+ 	$(MOC) $(qt_libzbarqt_la_CPPFLAGS) $< -o $@
+diff --git a/test/Makefile.am.inc b/test/Makefile.am.inc
+index 7340a7f2f61f..8496eb30f3cc 100644
+--- a/test/Makefile.am.inc
++++ b/test/Makefile.am.inc
+@@ -45,26 +45,6 @@ test_dbg_scan_CPPFLAGS = $(MAGICK_CFLAGS) $(AM_CPPFLAGS)
+ test_dbg_scan_LDADD = $(MAGICK_LIBS) -lMagick++ zbar/libzbar.la $(AM_LDADD)
+ endif
+ 
+-if HAVE_GTK
+-check_PROGRAMS += test/test_gtk
+-test_test_gtk_SOURCES = test/test_gtk.c test/scan_video.c
+-test_test_gtk_CPPFLAGS = $(GTK_CFLAGS) $(AM_CPPFLAGS)
+-test_test_gtk_LDADD = $(GTK_LIBS) gtk/libzbargtk.la $(AM_LDADD)
+-endif
+-
+-if HAVE_QT
+-check_PROGRAMS += test/test_qt
+-test_test_qt_SOURCES = test/test_qt.cpp test/scan_video.c
+-nodist_test_test_qt_SOURCES = test/moc_test_qt.h
+-test_test_qt_CPPFLAGS = -Itest $(QT_CFLAGS) $(AM_CPPFLAGS)
+-test_test_qt_LDADD = $(QT_LIBS) qt/libzbarqt.la $(AM_LDADD)
+-BUILT_SOURCES += $(nodist_test_test_qt_SOURCES)
+-DISTCLEANFILES += $(nodist_test_test_qt_SOURCES)
+-
+-test/moc_%.h: test/%.cpp
+-	$(MOC) -i $(test_test_qt_CPPFLAGS) $< -o $@
+-endif
+-
+ EXTRA_DIST += test/test_pygtk.py test/test_perl.pl
+ 
+ # automake bug in "monolithic mode"?
+diff --git a/zbarcam/Makefile.am.inc b/zbarcam/Makefile.am.inc
+index ea869bcd2e11..5aa788a23da5 100644
+--- a/zbarcam/Makefile.am.inc
++++ b/zbarcam/Makefile.am.inc
+@@ -2,7 +2,32 @@ bin_PROGRAMS += zbarcam/zbarcam
+ zbarcam_zbarcam_SOURCES = zbarcam/zbarcam.c
+ zbarcam_zbarcam_LDADD = zbar/libzbar.la
+ # automake bug in "monolithic mode"?
+-CLEANFILES += zbarcam/.libs/zbarcam
++CLEANFILES += zbarcam/.libs/zbarcam zbarcam/moc_zbarcam_qt.h
++
++if HAVE_GTK
++bin_PROGRAMS += zbarcam/zbarcam-gtk
++check_PROGRAMS += zbarcam/zbarcam-gtk
++zbarcam_zbarcam_gtk_SOURCES = zbarcam/zbarcam-gtk.c zbarcam/scan_video.c
++zbarcam_zbarcam_gtk_CPPFLAGS = $(GTK_CFLAGS) $(AM_CPPFLAGS)
++zbarcam_zbarcam_gtk_LDADD = $(GTK_LIBS) gtk/libzbargtk.la $(AM_LDADD)
++endif
++
++if HAVE_QT
++bin_PROGRAMS += zbarcam/zbarcam-qt
++check_PROGRAMS += zbarcam/zbarcam-qt
++
++zbarcam_zbarcam_qt_SOURCES = zbarcam/zbarcam-qt.cpp zbarcam/scan_video.c
++nodist_zbarcam_zbarcam_qt_SOURCES = zbarcam/moc_zbarcam_qt.h
++zbarcam_zbarcam_qt_CPPFLAGS = -Izbarcam $(QT_CFLAGS) $(AM_CPPFLAGS)
++zbarcam_zbarcam_qt_LDADD = $(QT_LIBS) qt/libzbarqt.la $(AM_LDADD)
++BUILT_SOURCES += $(nodist_zbarcam_zbarcam_qt_SOURCES)
++DISTCLEANFILES += $(nodist_zbarcam_zbarcam_qt_SOURCES) zbarcam/moc_zbarcam_qt.h
++
++
++zbarcam/moc_zbarcam_qt.h: zbarcam/zbarcam-qt.cpp
++	$(MOC) -i $(zbarcam_zbarcam_qt_CPPFLAGS) $< -o $@
++endif
++
+ 
+ if WIN32
+ zbarcam_zbarcam_SOURCES += zbarcam/zbarcam.rc
+diff --git a/test/scan_video.c b/zbarcam/scan_video.c
+similarity index 100%
+rename from test/scan_video.c
+rename to zbarcam/scan_video.c
+diff --git a/test/test_gtk.c b/zbarcam/zbarcam-gtk.c
+similarity index 100%
+rename from test/test_gtk.c
+rename to zbarcam/zbarcam-gtk.c
+diff --git a/test/test_qt.cpp b/zbarcam/zbarcam-qt.cpp
+similarity index 97%
+rename from test/test_qt.cpp
+rename to zbarcam/zbarcam-qt.cpp
+index 96d2f9541453..3a39a338b59d 100644
+--- a/test/test_qt.cpp
++++ b/zbarcam/zbarcam-qt.cpp
+@@ -40,7 +40,7 @@ int scan_video(void *add_device,
+                const char *default_device);
+ }
+ 
+-class TestQZBar : public QWidget
++class ZbarcamQZBar : public QWidget
+ {
+     Q_OBJECT
+ 
+@@ -52,7 +52,7 @@ protected:
+     }
+ 
+ public:
+-    TestQZBar (const char *default_device)
++    ZbarcamQZBar (const char *default_device)
+     {
+         // drop-down list of video devices
+         QComboBox *videoList = new QComboBox;
+@@ -142,7 +142,7 @@ private:
+     zbar::QZBar *zbar;
+ };
+ 
+-#include "moc_test_qt.h"
++#include "moc_zbarcam_qt.h"
+ 
+ int main (int argc, char *argv[])
+ {
+@@ -152,7 +152,7 @@ int main (int argc, char *argv[])
+     if(argc > 1)
+         dev = argv[1];
+ 
+-    TestQZBar window(dev);
++    ZbarcamQZBar window(dev);
+     window.show();
+     return(app.exec());
+ }

From 8793112f3495587aa3cfba32ab350e723d94fd86 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Date: Mon, 3 Apr 2017 17:50:50 -0300
Subject: [PATCH 041/108] Fix qt5 dependencies

Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
---
 zbar.spec | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/zbar.spec b/zbar.spec
index fe85b4a..f1d49fb 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -21,7 +21,8 @@ Patch6:		zbar_generate_qt_gtk_apps.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
 BuildRequires:	autoconf automake libtool python-devel gettext-devel
-BuildRequires:	qt4-devel gtk2-devel pygtk2-devel GraphicsMagick-c++-devel
+BuildRequires:	qt5-qtbase-devel qt5-qtx11extras
+BuildRequires:	gtk2-devel pygtk2-devel GraphicsMagick-c++-devel
 BuildRequires:	libv4l-devel libXv-devel xmlto
 
 %description

From ff06c02600926afd3777261a7a7f149648b0d198 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Date: Mon, 3 Apr 2017 21:09:18 -0300
Subject: [PATCH 042/108] zbar.spec: add qt5-qtx11extras-devel dependency

Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
---
 zbar.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zbar.spec b/zbar.spec
index f1d49fb..4df8ab7 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -21,7 +21,7 @@ Patch6:		zbar_generate_qt_gtk_apps.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
 BuildRequires:	autoconf automake libtool python-devel gettext-devel
-BuildRequires:	qt5-qtbase-devel qt5-qtx11extras
+BuildRequires:	qt5-qtbase-devel qt5-qtx11extras-devel
 BuildRequires:	gtk2-devel pygtk2-devel GraphicsMagick-c++-devel
 BuildRequires:	libv4l-devel libXv-devel xmlto
 

From 658da811302fec4ca44f10f01e647a28d003520f Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Date: Tue, 11 Apr 2017 14:03:39 -0300
Subject: [PATCH 043/108] Bump to version 0.20

Point to the new place where we're storing zbar tarballs
and bump it to version 0.20.

Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
---
 .gitignore |  1 +
 sources    |  2 +-
 zbar.spec  | 27 ++++++++-------------------
 3 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/.gitignore b/.gitignore
index f0c8280..4776e5c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 zbar-0.10.tar.bz2
 /zbar-0.10.tar.bz2
+/zbar-0.20.tar.bz2
diff --git a/sources b/sources
index e58d80a..b19f94e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d8b9dddcf28d6603d8b066816941a9d2  zbar-0.10.tar.bz2
+SHA512 (zbar-0.20.tar.bz2) = 776c75c1b43197645b0daa2e490dbe7ccf7fe0117a6bf96325357904c8974880a313a55dc1c5c8c8dc5bc7a94ce2dd762cdd203fdf1e0bce6b30d5ce9dc1bc29
diff --git a/zbar.spec b/zbar.spec
index 4df8ab7..9958342 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -2,21 +2,14 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           zbar
-Version:        0.10
-Release:        29%{?dist}
+Version:        0.20
+Release:        1%{?dist}
 Summary:        Bar code reader
 
 Group:          User Interface/X Hardware Support
 License:        LGPLv2+
 URL:            http://zbar.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
-Patch0:		zbar_update_to_hg.patch
-Patch1:		zbar_use_libv4l.patch
-Patch2:		zbar_choose_supported_format_first.patch
-Patch3:		zbar_use_REQBUFS_properly.patch
-Patch4:		zbar_configure_ac_use_m4_pattern_allow.patch
-Patch5:		zbar_add_support_for_qt5.patch
-Patch6:		zbar_generate_qt_gtk_apps.patch
+Source0:        https://linuxtv.org/downloads/%{name}/%{name}-%{version}.tar.bz2
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
@@ -89,17 +82,10 @@ scanning widget.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
 
 %build
 autoreconf -vfi
-%configure --with-graphicsmagick --docdir=%{_docdir}/%{name}-%{version}
+%configure --without-java --with-graphicsmagick --docdir=%{_docdir}/%{name}-%{version}
 
 # rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -115,7 +101,7 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 find ${RPM_BUILD_ROOT} -name '*.la' -or -name '*.a' | xargs rm -f
 
 # Remove installed doc
-rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-0.10/
+rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -191,6 +177,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/zbar/QZBar*.h
 
 %changelog
+* Tue Apr 11 2017 Mauro Carvalho Chehab <mchehab@s-opensource.com> - 0.20-1
+- Update it to version 0.20 with brings V4L2 controls to zbarcam-qt
+
 * Sun Mar 26 2017 Mauro Carvalho Chehab <mchehab@s-opensource.com> - 0.10-29
 - Make zbar-qt to use Qt5 and generate gtk and qt applications
 

From befb62003058ee16d3809a77bbfd88a7cb5b31a3 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Date: Tue, 11 Apr 2017 14:53:45 -0300
Subject: [PATCH 044/108] Use the right source file

There was a problem with the older tarball upstream, causing it
to increment version number on a wrong way. This was fixed, but
the new tarball need to be used.

Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
---
 sources   | 2 +-
 zbar.spec | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sources b/sources
index b19f94e..4148b2d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (zbar-0.20.tar.bz2) = 776c75c1b43197645b0daa2e490dbe7ccf7fe0117a6bf96325357904c8974880a313a55dc1c5c8c8dc5bc7a94ce2dd762cdd203fdf1e0bce6b30d5ce9dc1bc29
+SHA512 (zbar-0.20.tar.bz2) = d967b250d2bf021aa02583751dc62ffc3f8d220224df1a3644f52eee6d0ec5bd5c5cceb36c3d765a85afafd7a0ba182ed9d8263ef1be1852456687b687de5375
diff --git a/zbar.spec b/zbar.spec
index 9958342..20f9f73 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -3,7 +3,7 @@
 
 Name:           zbar
 Version:        0.20
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Bar code reader
 
 Group:          User Interface/X Hardware Support

From 9dc8307e57aad0ae8a05761551d7f6a22c870fe9 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Date: Tue, 11 Apr 2017 15:03:36 -0300
Subject: [PATCH 045/108] Make rpmlint happy

- Remove weird white spaces;
- don't mix tabs with white spaces;
- Use "bar code" instead of: "barcode".
- Use "e. g." instead of "eg".

Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
---
 zbar.spec | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/zbar.spec b/zbar.spec
index 20f9f73..a1591ce 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -1,28 +1,28 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-Name:           zbar
-Version:        0.20
-Release:        2%{?dist}
-Summary:        Bar code reader
-
-Group:          User Interface/X Hardware Support
-License:        LGPLv2+
-URL:            http://zbar.sourceforge.net/
-Source0:        https://linuxtv.org/downloads/%{name}/%{name}-%{version}.tar.bz2
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
- 
+Name:		zbar
+Version:	0.20
+Release:	2%{?dist}
+Summary:	Bar code reader
+
+Group:		User Interface/X Hardware Support
+License:	LGPLv2+
+URL:		http://zbar.sourceforge.net/
+Source0:	https://linuxtv.org/downloads/%{name}/%{name}-%{version}.tar.bz2
+
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 BuildRequires:	autoconf automake libtool python-devel gettext-devel
 BuildRequires:	qt5-qtbase-devel qt5-qtx11extras-devel
 BuildRequires:	gtk2-devel pygtk2-devel GraphicsMagick-c++-devel
 BuildRequires:	libv4l-devel libXv-devel xmlto
 
 %description
-A layered barcode scanning and decoding library. Supports EAN, UPC, Code 128,
+A layered bar code scanning and decoding library. Supports EAN, UPC, Code 128,
 Code 39 and Interleaved 2 of 5.
-Includes applications for decoding captured barcode images and using a video 
-device (eg, webcam) as a barcode scanner.
+Includes applications for decoding captured bar code images and using a video
+device (e. g., webcam) as a bar code scanner.
 
 %package devel
 Group: Development/Libraries
@@ -282,7 +282,7 @@ rm -rf $RPM_BUILD_ROOT
 - Removed ldconfig calls to devel subpackages
 - Fixed directory ownership issue -pygtk
 - Added %%{name} to URL
-- Added comment to rpath 
+- Added comment to rpath
 - Improved comment for removing .la and .a files
 
 * Mon Jul 27 2009 Douglas Schilling Landgraf <dougsland@redhat.com> - 0.8-4
@@ -292,7 +292,7 @@ rm -rf $RPM_BUILD_ROOT
 - Removed Provides for not included static libs
 - Removed redundant requires to subpackages -qt and -gtk
 - Removed redundant {name} = %%{version}-%%{release} from -pygtk
-- Replaced macros from % to %% in changelog 
+- Replaced macros from % to %% in changelog
 - Fixed ownership issue
 - Added ldconfig call to devel, qt-devel and gtk-devel
 
@@ -319,8 +319,8 @@ rm -rf $RPM_BUILD_ROOT
 - Fixed rpath error
 
 * Thu Jul 16 2009 Douglas Schilling Landgraf <dougsland@redhat.com> - 0.8-2
-- Added pkgconfig to devel package 
-- Fixed syntax to ldconfig 
+- Added pkgconfig to devel package
+- Fixed syntax to ldconfig
 - Fixed warnings from rpmlint
 - Fixed static path to docs
 

From 2896e095139818cd875e69107f75787aea775045 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 27 Jul 2017 22:41:07 +0000
Subject: [PATCH 046/108] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild

---
 zbar.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zbar.spec b/zbar.spec
index a1591ce..d1d9fe5 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -3,7 +3,7 @@
 
 Name:		zbar
 Version:	0.20
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Bar code reader
 
 Group:		User Interface/X Hardware Support
@@ -177,6 +177,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/zbar/QZBar*.h
 
 %changelog
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.20-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
 * Tue Apr 11 2017 Mauro Carvalho Chehab <mchehab@s-opensource.com> - 0.20-1
 - Update it to version 0.20 with brings V4L2 controls to zbarcam-qt
 

From 7877cf2706e0ce8168ee99b58ac79535fc6caf7f Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 3 Aug 2017 11:09:35 +0000
Subject: [PATCH 047/108] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild

---
 zbar.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zbar.spec b/zbar.spec
index d1d9fe5..adeb201 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -3,7 +3,7 @@
 
 Name:		zbar
 Version:	0.20
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Bar code reader
 
 Group:		User Interface/X Hardware Support
@@ -177,6 +177,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/zbar/QZBar*.h
 
 %changelog
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.20-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
 * Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.20-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 

From b2260ef693bfad80695e4719240d6a1483bd4b77 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 9 Feb 2018 22:25:11 +0000
Subject: [PATCH 048/108] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 zbar.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zbar.spec b/zbar.spec
index adeb201..3e8ee19 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -3,7 +3,7 @@
 
 Name:		zbar
 Version:	0.20
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Bar code reader
 
 Group:		User Interface/X Hardware Support
@@ -177,6 +177,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/zbar/QZBar*.h
 
 %changelog
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.20-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
 * Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.20-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
 

From 08e8c3cb2fa98c9276eb9b4ee53c0f6ad26979c9 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Wed, 14 Feb 2018 00:52:35 +0100
Subject: [PATCH 049/108] Remove BuildRoot definition

None of currently supported distributions need that.
It was needed last for EL5 which is EOL now

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---
 zbar.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/zbar.spec b/zbar.spec
index 3e8ee19..4e5f0fc 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -11,7 +11,6 @@ License:	LGPLv2+
 URL:		http://zbar.sourceforge.net/
 Source0:	https://linuxtv.org/downloads/%{name}/%{name}-%{version}.tar.bz2
 
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	autoconf automake libtool python-devel gettext-devel
 BuildRequires:	qt5-qtbase-devel qt5-qtx11extras-devel

From 9e080c57c021dd55f2fd2d3f5acc4d0b23a3d7c0 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Wed, 14 Feb 2018 09:02:50 +0100
Subject: [PATCH 050/108] Remove %clean section

None of currently supported distributions need that.
Last one was EL5 which is EOL for a while.

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---
 zbar.spec | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/zbar.spec b/zbar.spec
index 4e5f0fc..2d4f2a4 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -102,9 +102,6 @@ find ${RPM_BUILD_ROOT} -name '*.la' -or -name '*.a' | xargs rm -f
 # Remove installed doc
 rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post -p /sbin/ldconfig
 
 %post devel -p /sbin/ldconfig

From 564f3745618e23f54b8ed0ef3b125470985c4ee2 Mon Sep 17 00:00:00 2001
From: Iryna Shcherbina <shcherbina.iryna@gmail.com>
Date: Wed, 14 Feb 2018 17:28:07 +0100
Subject: [PATCH 051/108] Update Python 2 dependency declarations to new
 packaging standards

---
 zbar.spec | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/zbar.spec b/zbar.spec
index 2d4f2a4..c9d1041 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -3,7 +3,7 @@
 
 Name:		zbar
 Version:	0.20
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Bar code reader
 
 Group:		User Interface/X Hardware Support
@@ -12,7 +12,7 @@ URL:		http://zbar.sourceforge.net/
 Source0:	https://linuxtv.org/downloads/%{name}/%{name}-%{version}.tar.bz2
 
 
-BuildRequires:	autoconf automake libtool python-devel gettext-devel
+BuildRequires:	autoconf automake libtool python2-devel gettext-devel
 BuildRequires:	qt5-qtbase-devel qt5-qtx11extras-devel
 BuildRequires:	gtk2-devel pygtk2-devel GraphicsMagick-c++-devel
 BuildRequires:	libv4l-devel libXv-devel xmlto
@@ -173,6 +173,10 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 %{_includedir}/zbar/QZBar*.h
 
 %changelog
+* Wed Feb 14 2018 Iryna Shcherbina <ishcherb@redhat.com> - 0.20-6
+- Update Python 2 dependency declarations to new packaging standards
+  (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
+
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.20-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 

From cc5b455a3183c37f96f7b8369391f1fead490dff Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Thu, 24 May 2018 12:50:53 -0400
Subject: [PATCH 052/108] Only build pygtk support on Fedora

---
 zbar.spec | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/zbar.spec b/zbar.spec
index c9d1041..f8a548e 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -12,10 +12,15 @@ URL:		http://zbar.sourceforge.net/
 Source0:	https://linuxtv.org/downloads/%{name}/%{name}-%{version}.tar.bz2
 
 
-BuildRequires:	autoconf automake libtool python2-devel gettext-devel
+BuildRequires:	autoconf automake libtool gettext-devel
 BuildRequires:	qt5-qtbase-devel qt5-qtx11extras-devel
-BuildRequires:	gtk2-devel pygtk2-devel GraphicsMagick-c++-devel
+BuildRequires:	gtk2-devel GraphicsMagick-c++-devel
 BuildRequires:	libv4l-devel libXv-devel xmlto
+%if 0%{?fedora}
+BuildRequires:  python2-devel pygtk2-devel
+%else
+%global without_python --without-python
+%endif
 
 %description
 A layered bar code scanning and decoding library. Supports EAN, UPC, Code 128,
@@ -51,6 +56,7 @@ This package contains header files and additional libraries used for
 developing GUI applications based on GTK+-2.0 that include a bar code
 scanning widget.
 
+%if 0%{?fedora}
 %package pygtk
 Group: Development/Libraries
 Summary: Bar code reader PyGTK widget
@@ -59,6 +65,7 @@ Requires: pygtk2, %{name}-gtk = %{version}-%{release}
 %description pygtk
 This package contains a bar code scanning widget for use in GUI
 applications based on PyGTK.
+%endif
 
 %package qt
 Group: Development/Libraries
@@ -84,7 +91,7 @@ scanning widget.
 
 %build
 autoreconf -vfi
-%configure --without-java --with-graphicsmagick --docdir=%{_docdir}/%{name}-%{version}
+%configure --without-java --with-graphicsmagick --docdir=%{_docdir}/%{name}-%{version} %{?without_python}
 
 # rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -156,10 +163,12 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 %{_libdir}/pkgconfig/zbar-gtk.pc
 %{_includedir}/zbar/zbargtk.h
 
+%if 0%{?fedora}
 %files pygtk
 %defattr(-,root,root,-)
 %{python_sitearch}/zbarpygtk.so
 %{python_sitearch}/zbar.so
+%endif
 
 %files qt
 %defattr(-,root,root,-)

From 1b7ace63bed41d82e87598015091eb754c7226d0 Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs@math.uh.edu>
Date: Mon, 9 Jul 2018 23:14:27 -0500
Subject: [PATCH 053/108] Remove needless use of %defattr

---
 zbar.spec | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/zbar.spec b/zbar.spec
index f8a548e..2bd8366 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -126,7 +126,6 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 %postun qt -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root,-)
 %doc COPYING LICENSE NEWS
 
 %{_bindir}/zbarimg
@@ -135,7 +134,6 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 %{_mandir}/man1/*
 
 %files devel
-%defattr(-,root,root,-)
 %doc HACKING TODO
 
 %{_libdir}/libzbar.so
@@ -153,30 +151,25 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 %{_includedir}/zbar/Processor.h
 
 %files gtk
-%defattr(-,root,root,-)
 %{_libdir}/libzbargtk.so.*
 %{_bindir}/zbarcam-gtk
 
 %files gtk-devel
-%defattr(-,root,root,-)
 %{_libdir}/libzbargtk.so
 %{_libdir}/pkgconfig/zbar-gtk.pc
 %{_includedir}/zbar/zbargtk.h
 
 %if 0%{?fedora}
 %files pygtk
-%defattr(-,root,root,-)
 %{python_sitearch}/zbarpygtk.so
 %{python_sitearch}/zbar.so
 %endif
 
 %files qt
-%defattr(-,root,root,-)
 %{_libdir}/libzbarqt.so.*
 %{_bindir}/zbarcam-qt
 
 %files qt-devel
-%defattr(-,root,root,-)
 %{_libdir}/libzbarqt.so
 %{_libdir}/pkgconfig/zbar-qt.pc
 %{_includedir}/zbar/QZBar*.h

From 8f63028ae5eb5d8bebb78bd3b9d400260ed24bd1 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 14 Jul 2018 09:48:35 +0000
Subject: [PATCH 054/108] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 zbar.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zbar.spec b/zbar.spec
index 2bd8366..abccde1 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -3,7 +3,7 @@
 
 Name:		zbar
 Version:	0.20
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Bar code reader
 
 Group:		User Interface/X Hardware Support
@@ -175,6 +175,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 %{_includedir}/zbar/QZBar*.h
 
 %changelog
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.20-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Wed Feb 14 2018 Iryna Shcherbina <ishcherb@redhat.com> - 0.20-6
 - Update Python 2 dependency declarations to new packaging standards
   (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)

From 53f2cbce7a3ade2737acb2c0f9f0b3d4cbf30a7f Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Mon, 30 Jul 2018 00:22:29 +0200
Subject: [PATCH 055/108] =?UTF-8?q?%{python=5Fsitearch}=20=E2=86=92=20%{py?=
 =?UTF-8?q?thon2=5Fsitearch}?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---
 zbar.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zbar.spec b/zbar.spec
index abccde1..05496b6 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -161,8 +161,8 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 
 %if 0%{?fedora}
 %files pygtk
-%{python_sitearch}/zbarpygtk.so
-%{python_sitearch}/zbar.so
+%{python2_sitearch}/zbarpygtk.so
+%{python2_sitearch}/zbar.so
 %endif
 
 %files qt

From 9c48b8c57a70c082af8df707f2797e0a14b450f4 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Date: Tue, 7 Aug 2018 15:06:35 -0300
Subject: [PATCH 056/108] Set python via env

Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
---
 zbar.spec                     |  2 ++
 zbar_set_python_via_env.patch | 50 +++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+)
 create mode 100644 zbar_set_python_via_env.patch

diff --git a/zbar.spec b/zbar.spec
index 05496b6..9521cc4 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -10,6 +10,7 @@ Group:		User Interface/X Hardware Support
 License:	LGPLv2+
 URL:		http://zbar.sourceforge.net/
 Source0:	https://linuxtv.org/downloads/%{name}/%{name}-%{version}.tar.bz2
+Patch0:		zbar_set_python_via_env.patch
 
 
 BuildRequires:	autoconf automake libtool gettext-devel
@@ -88,6 +89,7 @@ scanning widget.
 
 %prep
 %setup -q
+%patch0
 
 %build
 autoreconf -vfi
diff --git a/zbar_set_python_via_env.patch b/zbar_set_python_via_env.patch
new file mode 100644
index 0000000..1809460
--- /dev/null
+++ b/zbar_set_python_via_env.patch
@@ -0,0 +1,50 @@
+From c750417b3e7c1dc55f2a50fb83fb3713e2f2dde4 Mon Sep 17 00:00:00 2001
+From: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
+Date: Tue, 7 Aug 2018 15:02:11 -0300
+Subject: [PATCH] python: use env to get python's location
+
+Instead of hardcoding python at /usr/bin, use env to get its
+path.
+
+Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
+
+diff --git a/python/examples/processor.py b/python/examples/processor.py
+index 52996d16cf0d..1114c0bf4a3c 100644
+--- a/python/examples/processor.py
++++ b/python/examples/processor.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/env python
+ from sys import argv
+ import zbar
+ 
+diff --git a/python/examples/read_one.py b/python/examples/read_one.py
+index 426b9994155e..3e41c438984c 100644
+--- a/python/examples/read_one.py
++++ b/python/examples/read_one.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/env python
+ from sys import argv
+ import zbar
+ 
+diff --git a/python/examples/scan_image.py b/python/examples/scan_image.py
+index 2a80759da7b5..8c288631e1fc 100644
+--- a/python/examples/scan_image.py
++++ b/python/examples/scan_image.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/env python
+ from sys import argv
+ import zbar
+ import Image
+diff --git a/python/test/test_zbar.py b/python/test/test_zbar.py
+index dbe180324378..78d4f041ed9f 100755
+--- a/python/test/test_zbar.py
++++ b/python/test/test_zbar.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/env python
+ import sys, os, re
+ import unittest as ut
+ import zbar

From b61f85891f38c4991ddb44b508fc7f4fb793e6f4 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Date: Tue, 7 Aug 2018 16:27:14 -0300
Subject: [PATCH 057/108] Get rid of old patches that aren't needed anymore

None of those patches are needed, as they got merged at the
zbar 0.20 version.

Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
---
 zbar_add_support_for_qt5.patch               |   140 -
 zbar_choose_supported_format_first.patch     |   128 -
 zbar_configure_ac_use_m4_pattern_allow.patch |    11 -
 zbar_generate_qt_gtk_apps.patch              |   148 -
 zbar_update_to_hg.patch                      | 35551 -----------------
 zbar_use_REQBUFS_properly.patch              |   124 -
 zbar_use_libv4l.patch                        |   305 -
 7 files changed, 36407 deletions(-)
 delete mode 100644 zbar_add_support_for_qt5.patch
 delete mode 100644 zbar_choose_supported_format_first.patch
 delete mode 100644 zbar_configure_ac_use_m4_pattern_allow.patch
 delete mode 100644 zbar_generate_qt_gtk_apps.patch
 delete mode 100644 zbar_update_to_hg.patch
 delete mode 100644 zbar_use_REQBUFS_properly.patch
 delete mode 100644 zbar_use_libv4l.patch

diff --git a/zbar_add_support_for_qt5.patch b/zbar_add_support_for_qt5.patch
deleted file mode 100644
index 519645f..0000000
--- a/zbar_add_support_for_qt5.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index dbd7153fb13b..7bcb18219853 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -476,18 +476,33 @@ AM_CONDITIONAL([HAVE_PYTHON], [test "x$with_python" = "xyes"])
- dnl Qt
- AC_ARG_WITH([qt],
-   [AS_HELP_STRING([--without-qt],
--    [disable support for Qt4 widget])],
-+    [disable support for Qt widget])],
-   [],
-   [with_qt="yes"])
- 
-+dnl Qt5
-+AC_ARG_WITH([qt5],
-+  [AS_HELP_STRING([--without-qt5],
-+    [disable support for Qt5 widget. if --with-qt, it will seek only for Qt4])],
-+  [],
-+  [with_qt5="yes"])
-+
- AC_ARG_VAR([MOC], [full path to Qt moc program])
- 
- AS_IF([test "x$with_qt" != "xno"],
--  [PKG_CHECK_MODULES([QT], [QtCore >= 4 QtGui >= 4])
--   MOC=`$PKG_CONFIG QtGui --variable=moc_location`
--   AC_MSG_NOTICE([using moc from $MOC])
--   QT_VERSION=`$PKG_CONFIG QtGui --modversion`
--   AC_MSG_NOTICE([using Qt version $QT_VERSION])])
-+   AS_IF([test "x$with_qt5" != "xno"],
-+     [PKG_CHECK_MODULES([QT], [Qt5Core >= 5 Qt5Gui >= 5 Qt5Widgets >= 5.0 Qt5X11Extras >= 5.0])
-+     AC_CHECK_PROGS(MOC, [moc-qt5 moc])
-+     AC_MSG_NOTICE([using moc from $MOC])
-+     QT_VERSION=`$PKG_CONFIG Qt5Gui --modversion`
-+     CPPFLAGS="$CPPFLAGS $QT_CPPFLAGS -fPIC"
-+     AC_MSG_NOTICE([using Qt version $QT_VERSION])],
-+
-+     [PKG_CHECK_MODULES([QT], [QtCore >= 4 QtGui >= 4])
-+     MOC=`$PKG_CONFIG QtGui --variable=moc_location`
-+     AC_MSG_NOTICE([using moc from $MOC])
-+     QT_VERSION=`$PKG_CONFIG QtGui --modversion`
-+     AC_MSG_NOTICE([using Qt version $QT_VERSION])]))
- 
- AM_CONDITIONAL([HAVE_QT], [test "x$with_qt" = "xyes"])
- 
-@@ -596,9 +611,9 @@ AS_IF([test "x$with_gtk" != "xyes"],
-   [echo "        => the GTK+ widget will *NOT* be built"],
-   [AS_IF([test "x$with_python" != "xyes"],
-      [echo "        => the PyGTK widget wrapper will *NOT* be built"])])
--echo "Qt4               --with-qt=$with_qt"
-+echo "Qt${QT_VERSION}           --with-qt=$with_qt"
- AS_IF([test "x$with_qt" != "xyes"],
--  [echo "        => the Qt4 widget will *NOT* be built"])
-+  [echo "        => the Qt widget will *NOT* be built"])
- echo "Java              --with-java=$with_java"
- AS_IF([test "x$with_java" != "xyes"],
-   [echo "        => the Java interface will *NOT* be built"])
-diff --git a/include/zbar/QZBar.h b/include/zbar/QZBar.h
-index 104449928e2d..1a4716565047 100644
---- a/include/zbar/QZBar.h
-+++ b/include/zbar/QZBar.h
-@@ -26,7 +26,12 @@
- /// @file
- /// Barcode Reader Qt4 Widget
- 
--#include <qwidget.h>
-+#include <QtGui>
-+#if QT_VERSION >= 0x050000
-+#  include <QtWidgets>
-+#else
-+#  include <qwidget.h>
-+#endif
- 
- namespace zbar {
- 
-diff --git a/include/zbar/QZBarImage.h b/include/zbar/QZBarImage.h
-index 1505177e07a9..b862c8085576 100644
---- a/include/zbar/QZBarImage.h
-+++ b/include/zbar/QZBarImage.h
-@@ -54,7 +54,11 @@ public:
-         unsigned height = qimg.height();
-         set_size(width, height);
-         set_format(zbar_fourcc('B','G','R','4'));
-+#if QT_VERSION >= 0x050000
-+        unsigned long datalen = qimg.byteCount();
-+#else
-         unsigned long datalen = qimg.numBytes();
-+#endif
-         set_data(qimg.bits(), datalen);
- 
-         if((width * 4 != bpl) ||
-diff --git a/qt/QZBar.cpp b/qt/QZBar.cpp
-index e1001b09cff5..a5b956b342ad 100644
---- a/qt/QZBar.cpp
-+++ b/qt/QZBar.cpp
-@@ -23,7 +23,7 @@
- 
- #include <qevent.h>
- #include <qurl.h>
--#include <qx11info_x11.h>
-+#include <QX11Info>
- #include <zbar/QZBar.h>
- #include "QZBarThread.h"
- 
-@@ -49,7 +49,11 @@ QZBar::QZBar (QWidget *parent)
- 
-     thread = new QZBarThread;
-     if(testAttribute(Qt::WA_WState_Created)) {
-+#if QT_VERSION >= 0x050000
-+        thread->window.attach(QX11Info::display(), winId());
-+#else
-         thread->window.attach(x11Info().display(), winId());
-+#endif
-         _attached = 1;
-     }
-     connect(thread, SIGNAL(videoOpened(bool)),
-@@ -204,7 +208,12 @@ void QZBar::changeEvent(QEvent *event)
-     try {
-         QMutexLocker locker(&thread->mutex);
-         if(event->type() == QEvent::ParentChange)
-+#if QT_VERSION >= 0x050000
-+            thread->window.attach(QX11Info::display(), winId());
-+#else
-             thread->window.attach(x11Info().display(), winId());
-+#endif
-+
-     }
-     catch(Exception) { /* ignore (FIXME do something w/error) */ }
- }
-@@ -215,7 +224,11 @@ void QZBar::attach ()
-         return;
- 
-     try {
-+#if QT_VERSION >= 0x050000
-+        thread->window.attach(QX11Info::display(), winId());
-+#else
-         thread->window.attach(x11Info().display(), winId());
-+#endif
-         _attached = 1;
- 
-         _videoEnabled = !_videoDevice.isEmpty();
diff --git a/zbar_choose_supported_format_first.patch b/zbar_choose_supported_format_first.patch
deleted file mode 100644
index 5289d25..0000000
--- a/zbar_choose_supported_format_first.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-diff -r 60f92d860a1f zbar/convert.c
---- a/zbar/convert.c	Sat Dec 25 08:29:33 2010 -0200
-+++ b/zbar/convert.c	Sat Dec 25 14:36:04 2010 -0200
-@@ -1157,6 +1157,42 @@
-                 break;
-         }
-     }
-+    if(!min_fmt && vdo->emu_formats) {
-+        /* As vdo->formats aren't compatible, just free them */
-+        free(vdo->formats);
-+        vdo->formats = vdo->emu_formats;
-+        vdo->emu_formats = NULL;
-+
-+        /*
-+        * Use the same cost algorithm to select emulated formats.
-+        * This might select a sub-optimal conversion, but, in practice,
-+        * it will select a conversion to YUV at libv4l, and a YUY->Y8
-+        * in zbar, with it is OK. Yet, it is better to not select the
-+        * most performatic conversion than to not support the webcam.
-+        */
-+        for(fmt = _zbar_formats; *fmt; fmt++) {
-+            /* only consider formats supported by video device */
-+            uint32_t win_fmt = 0;
-+            int cost;
-+            if(!has_format(*fmt, srcs))
-+                continue;
-+            cost = _zbar_best_format(*fmt, &win_fmt, dsts);
-+            if(cost < 0) {
-+                zprintf(4, "%.4s(%08" PRIx32 ") -> ? (unsupported)\n",
-+                        (char*)fmt, *fmt);
-+                continue;
-+            }
-+            zprintf(4, "%.4s(%08" PRIx32 ") -> %.4s(%08" PRIx32 ") (%d)\n",
-+                    (char*)fmt, *fmt, (char*)&win_fmt, win_fmt, cost);
-+            if(min_cost > cost) {
-+                min_cost = cost;
-+                min_fmt = *fmt;
-+                if(!cost)
-+                    break;
-+            }
-+        }
-+    }
-+
-     if(win)
-         (void)window_unlock(win);
- 
-diff -r 60f92d860a1f zbar/video.c
---- a/zbar/video.c	Sat Dec 25 08:29:33 2010 -0200
-+++ b/zbar/video.c	Sat Dec 25 14:36:04 2010 -0200
-@@ -111,6 +111,9 @@
-         free(vdo->buf);
-     if(vdo->formats)
-         free(vdo->formats);
-+    if(vdo->emu_formats)
-+        free(vdo->emu_formats);
-+
-     err_cleanup(&vdo->err);
-     _zbar_mutex_destroy(&vdo->qlock);
- 
-diff -r 60f92d860a1f zbar/video.h
---- a/zbar/video.h	Sat Dec 25 08:29:33 2010 -0200
-+++ b/zbar/video.h	Sat Dec 25 14:36:04 2010 -0200
-@@ -69,6 +69,7 @@
-     uint32_t format;            /* selected fourcc */
-     unsigned palette;           /* v4l1 format index corresponding to format */
-     uint32_t *formats;          /* 0 terminated list of supported formats */
-+    uint32_t *emu_formats;      /* 0 terminated list of emulated formats */
- 
-     unsigned long datalen;      /* size of image data for selected format */
-     unsigned long buflen;       /* total size of image data buffer */
-diff -r 60f92d860a1f zbar/video/v4l2.c
---- a/zbar/video/v4l2.c	Sat Dec 25 08:29:33 2010 -0200
-+++ b/zbar/video/v4l2.c	Sat Dec 25 14:36:04 2010 -0200
-@@ -347,6 +347,8 @@
- 
- static inline int v4l2_probe_formats (zbar_video_t *vdo)
- {
-+    int n_formats = 0, n_emu_formats = 0;
-+
-     zprintf(2, "enumerating supported formats:\n");
-     struct v4l2_fmtdesc desc;
-     memset(&desc, 0, sizeof(desc));
-@@ -354,17 +356,39 @@
-     for(desc.index = 0; desc.index < V4L2_FORMATS_MAX; desc.index++) {
-         if(v4l2_ioctl(vdo->fd, VIDIOC_ENUM_FMT, &desc) < 0)
-             break;
--        zprintf(2, "    [%d] %.4s : %s%s\n",
-+        zprintf(2, "    [%d] %.4s : %s%s%s\n",
-                 desc.index, (char*)&desc.pixelformat, desc.description,
--                (desc.flags & V4L2_FMT_FLAG_COMPRESSED) ? " COMPRESSED" : "");
--        vdo->formats = realloc(vdo->formats,
--                               (desc.index + 2) * sizeof(uint32_t));
--        vdo->formats[desc.index] = desc.pixelformat;
-+                (desc.flags & V4L2_FMT_FLAG_COMPRESSED) ? " COMPRESSED" : "",
-+                (desc.flags & V4L2_FMT_FLAG_EMULATED) ? " EMULATED" : "");
-+        if (desc.flags & V4L2_FMT_FLAG_EMULATED) {
-+            vdo->emu_formats = realloc(vdo->emu_formats,
-+                                   (n_emu_formats + 2) * sizeof(uint32_t));
-+            vdo->emu_formats[n_emu_formats++] = desc.pixelformat;
-+        } else {
-+            vdo->formats = realloc(vdo->formats,
-+                                   (n_formats + 2) * sizeof(uint32_t));
-+            vdo->formats[n_formats++] = desc.pixelformat;
-+        }
-     }
-     if(!desc.index)
-         return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
-                            "enumerating video formats (VIDIOC_ENUM_FMT)"));
--    vdo->formats[desc.index] = 0;
-+    if(vdo->formats)
-+       vdo->formats[n_formats] = 0;
-+    if(vdo->emu_formats)
-+       vdo->emu_formats[n_emu_formats] = 0;
-+    if(!vdo->formats && vdo->emu_formats) {
-+       /*
-+        * If only emu formats are available, just move them to vdo->formats.
-+        * This happens when libv4l detects that the only available fourcc
-+        * formats are webcam proprietary formats or bayer formats.
-+        */
-+       vdo->formats = vdo->emu_formats;
-+       vdo->emu_formats = NULL;
-+    }
-+
-+    zprintf(2, "Found %d formats and %d emulated formats.\n",
-+            n_formats, n_emu_formats);
- 
-     struct v4l2_format fmt;
-     struct v4l2_pix_format *pix = &fmt.fmt.pix;
diff --git a/zbar_configure_ac_use_m4_pattern_allow.patch b/zbar_configure_ac_use_m4_pattern_allow.patch
deleted file mode 100644
index 38b39ec..0000000
--- a/zbar_configure_ac_use_m4_pattern_allow.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac	2015-08-14 16:26:09.661856984 -0300
-+++ b/configure.ac	2015-08-14 16:26:20.209851076 -0300
-@@ -4,7 +4,7 @@
- AC_CONFIG_AUX_DIR(config)
- AC_CONFIG_MACRO_DIR(config)
- AM_INIT_AUTOMAKE([1.10 -Werror foreign subdir-objects std-options dist-bzip2])
--AM_PROG_AR
-+m4_pattern_allow([AM_PROG_AR])
- AC_CONFIG_HEADERS([include/config.h])
- AC_CONFIG_SRCDIR(zbar/scanner.c)
- LT_PREREQ([2.2])
diff --git a/zbar_generate_qt_gtk_apps.patch b/zbar_generate_qt_gtk_apps.patch
deleted file mode 100644
index 17c6856..0000000
--- a/zbar_generate_qt_gtk_apps.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-From 76a286fd34d5159b55de4d4f276dcbf69d1b263e Mon Sep 17 00:00:00 2001
-From: Mauro Carvalho Chehab <mchehab@s-opensource.com>
-Date: Sun, 26 Mar 2017 09:43:07 -0300
-Subject: [PATCH] zbarcam: add qt and gtk variants
-
-The original zbarcam use standard X11 libraries to display
-video. That provides an ugly interface, and could be
-slow on high resolutions.
-
-As Zbar has already test examples for qt and gtk, let's
-promote them to real applications. One advantage is that
-both qt and gtk libraries will be tested when building
-those.
-
-Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
-
-diff --git a/qt/Makefile.am.inc b/qt/Makefile.am.inc
-index dc1525e0d52a..5f860bfa31bc 100644
---- a/qt/Makefile.am.inc
-+++ b/qt/Makefile.am.inc
-@@ -7,6 +7,7 @@ qt_libzbarqt_la_SOURCES = qt/QZBar.cpp qt/QZBarThread.h qt/QZBarThread.cpp
- nodist_qt_libzbarqt_la_SOURCES = qt/moc_QZBar.cpp qt/moc_QZBarThread.cpp
- BUILT_SOURCES += $(nodist_qt_libzbarqt_la_SOURCES)
- DISTCLEANFILES += $(nodist_qt_libzbarqt_la_SOURCES)
-+CLEANFILES += qt/moc_%.cpp
- 
- qt/moc_%.cpp: qt/%.h
- 	$(MOC) $(qt_libzbarqt_la_CPPFLAGS) $< -o $@
-diff --git a/test/Makefile.am.inc b/test/Makefile.am.inc
-index 7340a7f2f61f..8496eb30f3cc 100644
---- a/test/Makefile.am.inc
-+++ b/test/Makefile.am.inc
-@@ -45,26 +45,6 @@ test_dbg_scan_CPPFLAGS = $(MAGICK_CFLAGS) $(AM_CPPFLAGS)
- test_dbg_scan_LDADD = $(MAGICK_LIBS) -lMagick++ zbar/libzbar.la $(AM_LDADD)
- endif
- 
--if HAVE_GTK
--check_PROGRAMS += test/test_gtk
--test_test_gtk_SOURCES = test/test_gtk.c test/scan_video.c
--test_test_gtk_CPPFLAGS = $(GTK_CFLAGS) $(AM_CPPFLAGS)
--test_test_gtk_LDADD = $(GTK_LIBS) gtk/libzbargtk.la $(AM_LDADD)
--endif
--
--if HAVE_QT
--check_PROGRAMS += test/test_qt
--test_test_qt_SOURCES = test/test_qt.cpp test/scan_video.c
--nodist_test_test_qt_SOURCES = test/moc_test_qt.h
--test_test_qt_CPPFLAGS = -Itest $(QT_CFLAGS) $(AM_CPPFLAGS)
--test_test_qt_LDADD = $(QT_LIBS) qt/libzbarqt.la $(AM_LDADD)
--BUILT_SOURCES += $(nodist_test_test_qt_SOURCES)
--DISTCLEANFILES += $(nodist_test_test_qt_SOURCES)
--
--test/moc_%.h: test/%.cpp
--	$(MOC) -i $(test_test_qt_CPPFLAGS) $< -o $@
--endif
--
- EXTRA_DIST += test/test_pygtk.py test/test_perl.pl
- 
- # automake bug in "monolithic mode"?
-diff --git a/zbarcam/Makefile.am.inc b/zbarcam/Makefile.am.inc
-index ea869bcd2e11..5aa788a23da5 100644
---- a/zbarcam/Makefile.am.inc
-+++ b/zbarcam/Makefile.am.inc
-@@ -2,7 +2,32 @@ bin_PROGRAMS += zbarcam/zbarcam
- zbarcam_zbarcam_SOURCES = zbarcam/zbarcam.c
- zbarcam_zbarcam_LDADD = zbar/libzbar.la
- # automake bug in "monolithic mode"?
--CLEANFILES += zbarcam/.libs/zbarcam
-+CLEANFILES += zbarcam/.libs/zbarcam zbarcam/moc_zbarcam_qt.h
-+
-+if HAVE_GTK
-+bin_PROGRAMS += zbarcam/zbarcam-gtk
-+check_PROGRAMS += zbarcam/zbarcam-gtk
-+zbarcam_zbarcam_gtk_SOURCES = zbarcam/zbarcam-gtk.c zbarcam/scan_video.c
-+zbarcam_zbarcam_gtk_CPPFLAGS = $(GTK_CFLAGS) $(AM_CPPFLAGS)
-+zbarcam_zbarcam_gtk_LDADD = $(GTK_LIBS) gtk/libzbargtk.la $(AM_LDADD)
-+endif
-+
-+if HAVE_QT
-+bin_PROGRAMS += zbarcam/zbarcam-qt
-+check_PROGRAMS += zbarcam/zbarcam-qt
-+
-+zbarcam_zbarcam_qt_SOURCES = zbarcam/zbarcam-qt.cpp zbarcam/scan_video.c
-+nodist_zbarcam_zbarcam_qt_SOURCES = zbarcam/moc_zbarcam_qt.h
-+zbarcam_zbarcam_qt_CPPFLAGS = -Izbarcam $(QT_CFLAGS) $(AM_CPPFLAGS)
-+zbarcam_zbarcam_qt_LDADD = $(QT_LIBS) qt/libzbarqt.la $(AM_LDADD)
-+BUILT_SOURCES += $(nodist_zbarcam_zbarcam_qt_SOURCES)
-+DISTCLEANFILES += $(nodist_zbarcam_zbarcam_qt_SOURCES) zbarcam/moc_zbarcam_qt.h
-+
-+
-+zbarcam/moc_zbarcam_qt.h: zbarcam/zbarcam-qt.cpp
-+	$(MOC) -i $(zbarcam_zbarcam_qt_CPPFLAGS) $< -o $@
-+endif
-+
- 
- if WIN32
- zbarcam_zbarcam_SOURCES += zbarcam/zbarcam.rc
-diff --git a/test/scan_video.c b/zbarcam/scan_video.c
-similarity index 100%
-rename from test/scan_video.c
-rename to zbarcam/scan_video.c
-diff --git a/test/test_gtk.c b/zbarcam/zbarcam-gtk.c
-similarity index 100%
-rename from test/test_gtk.c
-rename to zbarcam/zbarcam-gtk.c
-diff --git a/test/test_qt.cpp b/zbarcam/zbarcam-qt.cpp
-similarity index 97%
-rename from test/test_qt.cpp
-rename to zbarcam/zbarcam-qt.cpp
-index 96d2f9541453..3a39a338b59d 100644
---- a/test/test_qt.cpp
-+++ b/zbarcam/zbarcam-qt.cpp
-@@ -40,7 +40,7 @@ int scan_video(void *add_device,
-                const char *default_device);
- }
- 
--class TestQZBar : public QWidget
-+class ZbarcamQZBar : public QWidget
- {
-     Q_OBJECT
- 
-@@ -52,7 +52,7 @@ protected:
-     }
- 
- public:
--    TestQZBar (const char *default_device)
-+    ZbarcamQZBar (const char *default_device)
-     {
-         // drop-down list of video devices
-         QComboBox *videoList = new QComboBox;
-@@ -142,7 +142,7 @@ private:
-     zbar::QZBar *zbar;
- };
- 
--#include "moc_test_qt.h"
-+#include "moc_zbarcam_qt.h"
- 
- int main (int argc, char *argv[])
- {
-@@ -152,7 +152,7 @@ int main (int argc, char *argv[])
-     if(argc > 1)
-         dev = argv[1];
- 
--    TestQZBar window(dev);
-+    ZbarcamQZBar window(dev);
-     window.show();
-     return(app.exec());
- }
diff --git a/zbar_update_to_hg.patch b/zbar_update_to_hg.patch
deleted file mode 100644
index bbe77fb..0000000
--- a/zbar_update_to_hg.patch
+++ /dev/null
@@ -1,35551 +0,0 @@
-diff -r 563557a923d0 .hgignore
---- a/.hgignore	Tue Oct 27 11:25:59 2009 -0400
-+++ b/.hgignore	Fri Feb 22 08:54:29 2013 -0300
-@@ -7,7 +7,7 @@
- configure
- config
- config.guess
--config.h
-+config/config.h
- config.h.in
- config.log
- config.status
-@@ -19,3 +19,18 @@
- ltmain.sh
- autom4te.cache
- missing
-+python/MANIFEST
-+build
-+*.xcodeproj/*.mode1v3
-+*.xcodeproj/*.pbxuser
-+xcuserdata
-+contents.xcworkspacedata
-+.DS_Store
-+android/obj
-+*.class
-+*.dex
-+android/libs
-+android/examples/*/libs
-+android/*.zip
-+android/local.properties
-+android/examples/*/local.properties
-diff -r 563557a923d0 .hgtags
---- a/.hgtags	Tue Oct 27 11:25:59 2009 -0400
-+++ b/.hgtags	Fri Feb 22 08:54:29 2013 -0300
-@@ -9,3 +9,21 @@
- 38265c7b4ad4dfafe7b5e9eae4bb0d43d68b4143 0.9
- 2dc2d73c468a032edc68a127e9ddbbfe5f520777 0.9
- f3670ba47f2e070f4c43e97f4de3200903720e73 0.10
-+f3670ba47f2e070f4c43e97f4de3200903720e73 0.10
-+563557a923d0e23e36c81878d660aefc1c0fe3e7 0.10
-+b21098d27ff88c4f1a529fe0762f1cb307e04399 iPhoneSDK-0.1
-+b0bda6247b2fe4ffb52db89a776f91244f25d897 iPhoneSDK-0.1.1
-+d1655a680c3df68b3466d3b2c714f30af7223ec6 iPhoneSDK-0.1.2
-+4556c996acaaa6fcd5e8e9879f410f8120746e2b iPhoneSDK-1.0
-+12de07e51dce0d1cfc3e9699bbf9d5c8774a5371 iPhoneSDK-1.0.1
-+12de07e51dce0d1cfc3e9699bbf9d5c8774a5371 iPhoneSDK-1.0.1
-+2541a66ae7d64fbd923168ae677abb156021e88d iPhoneSDK-1.0.1
-+5e5060b563a1878ea297af5a50261d14cf1cb449 iPhoneSDK-1.1
-+f9e46865dbcebd04683ca7592ab32aeda615e772 iPhoneSDK-1.1.1
-+801318a6195060c31259da1f076ecc9a609616cc iPhoneSDK-1.1.2
-+4bbb4e2bdba8c41a282df7e65a02797250f44daa iPhoneSDK-1.1.3
-+1ad84c3c03252c366a82552fa952674ec593c73f iPhoneSDK-1.2
-+9e7bad13ae6a4b65e0f0964512f96284d37f0dc8 iPhoneSDK-1.2.1
-+146b857ff41ae462cc52f8dddf46d867763433a1 iPhoneSDK-1.2.2
-+9b946a7ead73ac99e121de2e7f495213cda88e6f AndroidSDK-0.1
-+5eb3c8786845fe3ad2c74f6a660e70176b88347f iPhoneSDK-1.3.1
-diff -r 563557a923d0 COPYING
---- a/COPYING	Tue Oct 27 11:25:59 2009 -0400
-+++ b/COPYING	Fri Feb 22 08:54:29 2013 -0300
-@@ -1,4 +1,4 @@
--The ZBar Bar Code Reader is Copyright (C) 2007-2009 Jeff Brown
-+The ZBar Bar Code Reader is Copyright (C) 2007-2011 Jeff Brown
-  <spadix@users.sourceforge.net>
- The QR Code reader is Copyright (C) 1999-2009 Timothy B. Terriberry
-  <tterribe@xiph.org>
-diff -r 563557a923d0 ChangeLog
---- a/ChangeLog	Tue Oct 27 11:25:59 2009 -0400
-+++ b/ChangeLog	Fri Feb 22 08:54:29 2013 -0300
-@@ -1,3 +1,95 @@
-+current:
-+  * Codabar reliability enhancements
-+    - fix missing check
-+    - require minimum quality
-+    - bump default uncertainty
-+  * tweak Codabar bar/space ratio validation
-+  * finish Codabar support for python, perl, java and iPhone interfaces
-+    - reduce Codabar uncertainty to minimum
-+  * add core support for Codabar symbology
-+    - TBD: python, perl, java and iPhone interfaces
-+  * fix v4l config and build variations (bug #3348888)
-+    - thanks to jarekczek for reporting this!
-+    - NB v4l1 removed from kernel as of 2.6.38
-+  * fix missing python thread initialization (bug #3349199)
-+    - thanks to jarekczek for reporting this problem!
-+  * fix missing configure check for Python.h (bug #3092663)
-+    - thanks to Zoltan Kovacs for reporting this problem!
-+  * fix C++ wrapper missing Symbol.quality (bug #3076524)
-+    - thanks to Rudy Melli for pointing this out!
-+  * fix C++ wrapper bugs (bug #3396068)
-+    - thanks to anotheruser1 for reporting this!
-+    - add new C++ wrapper test
-+  * fix avoid compositing ISBN10 data
-+  * add support for GraphicsMagick as ImageMagick alternative
-+  * mention xmlto in HACKING (patch #3297039)
-+    - thanks to jarekczek for the patch!
-+  * disable addons by default until synchronization with main symbol is working
-+  * fix image scanner min quality filtering
-+  * fix i25 buffer overrun corner case
-+  * fix EAN addon enables
-+  * fix zbarimg to accept autodetected stdin (lone dash)
-+  * fix Qt 4.6.3 compilation error (patch #3178244)
-+    - thanks to hrhristov for the patch!
-+  * add Python Processor support for request_size interface
-+  * fix Python Processor support for GIL, allowing asynchronous scanning
-+  * fix jpeg decoder skip handling
-+    - thanks to jarekczek for the patch!
-+  * rename dprintf macro to avoid conflicts (patch #3128538)
-+    - thanks to maurochehab for the patch!
-+  * add support for EAN/UPC 2 and 5 digit add-on symbols
-+    - deprecate original, unfinished add-on APIs
-+    - add self-checking to test_decode
-+  * fix support for GS1 AIs
-+    - thanks to jockusch for a patch!
-+    - add decoder/symbol "modifier" flags and config read access
-+    - set flags or emit GS appropriately for Code 128 FNC1
-+    - add iphone, java, perl, python bindings for modifiers and configs
-+  * add support for Code 93 symbology
-+  * add video size request to (Py)GTK widget (req #3034522)
-+    - thanks to Jerome Charaoui for the patch!
-+  * add support for GS1 DataBar Expanded (RSS Expanded) symbology
-+  * add language bindings for DataBar
-+  * add preliminary support for GS1 DataBar (RSS-14) symbology
-+  * enhance decoder reliability (EAN, Code 39, Code 128)
-+    - enhance decoder test
-+  * fix documentation of command exit codes (bug #3017322)
-+  * fix C++ video callback bug
-+    - add C and C++ processor examples
-+  * add per-symbology cache consistency
-+    - reliable symbologies decode immediately by default
-+    - no more need to disable cache with video
-+    - also fix crop bugs w/video scanning
-+  * add support for scanning partial images (cropping)
-+    - update c++, python, perl, java bindings and tests
-+  * fix couple of leaks
-+  * remove doc hints about GFDL (bug #3004411)
-+    - apply LGPL to API docs
-+  * relax Code 39 width ratio checks
-+  * core library portability improvements
-+    - remove some unnecessary C99 syntax
-+    - add configure checks for errno
-+    - enhance C++ Symbol interface
-+  * adjust Python module README (add examples and note DLL in path)
-+  * fix QR Code missing from man pages (bug #2969857)
-+  * cleanup decoder assertions and locking (bug #2966916)
-+  * add Java interface to library via JNI
-+    - add Java tools and JNI build tests to configure
-+    - fix compiler warnings from binary output changes
-+  * fix output of binary data in zbarimg and zbarcam
-+    - thanks to fukuchi for a patch!
-+    - add base64 format for binary xml output
-+  * add coarse symbol orientation information (patch #2913094)
-+    - thanks to Anssi for a patch!
-+    - add decode direction feedback to decoder
-+    - update C++, Python, Perl and ObjC wrappers
-+    - add orientation to test suites
-+  * fix inconsistent fourcc endian handling bugs (bug #2918994)
-+    - thanks to jdccdevel for a patch!
-+    - add fourcc conversion and parse interfaces to zbar.h
-+  * report QR immediately for video (no inter-frame consistency check)
-+  * add python distutils build infrastructure
-+
- version 0.10:
-   * hotfix add MinGW import lib to Windows installer
-   * attempt fix for Qt4 < 4.4
-diff -r 563557a923d0 HACKING
---- a/HACKING	Tue Oct 27 11:25:59 2009 -0400
-+++ b/HACKING	Fri Feb 22 08:54:29 2013 -0300
-@@ -13,6 +13,12 @@
-     GNU autoconf 2.61
-     GNU automake 1.10.1
-     GNU libtool 2.2.6
-+    GNU gettext 0.18.1.1
-+    GNU pkg-config 0.25
-+    xmlto 0.0.20-5 (for docs building)
-+all above mentioned tools (except xmlto) must be installed in the same
-+prefix. mixing prefixes (i.g. /usr/bin and /usr/local/bin) may lead to
-+errors in configuration stages
- 
- when you're done hacking and want to make your patch, run:
- 
-diff -r 563557a923d0 Makefile.am
---- a/Makefile.am	Tue Oct 27 11:25:59 2009 -0400
-+++ b/Makefile.am	Fri Feb 22 08:54:29 2013 -0300
-@@ -1,6 +1,3 @@
--AM_CPPFLAGS = -I$(srcdir)/include
--AM_CFLAGS = -Wall -Wno-parentheses
--AM_CXXFLAGS = $(AM_CFLAGS)
- ACLOCAL_AMFLAGS = -I config
- bin_PROGRAMS =
- check_PROGRAMS =
-@@ -9,8 +6,10 @@
- pyexec_LTLIBRARIES =
- CLEANFILES =
- DISTCLEANFILES =
-+MAINTAINERCLEANFILES =
- BUILT_SOURCES =
- EXTRA_DIST =
-+SUBDIRS = .
- 
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = zbar.pc
-@@ -39,6 +38,9 @@
- include $(srcdir)/qt/Makefile.am.inc
- pkgconfig_DATA += zbar-qt.pc
- endif
-+if HAVE_JAVA
-+SUBDIRS += java
-+endif
- if HAVE_NPAPI
- include $(srcdir)/plugin/Makefile.am.inc
- endif
-@@ -47,11 +49,8 @@
- 
- EXTRA_DIST += zbar.ico zbar.nsi
- 
--EXTRA_DIST += examples/upcrpc.pl examples/upcrpc.py examples/paginate.pl \
--    examples/barcode.png examples/processor.pl examples/processor.py \
--    examples/read_one.py examples/read_one.pl \
--    examples/scan_image.c examples/scan_image.cpp examples/scan_image.pl \
--    examples/scan_image.py examples/scan_image.vcproj
-+EXTRA_DIST += examples/barcode.png examples/upcrpc.py examples/upcrpc.pl \
-+    examples/scan_image.c examples/scan_image.cpp examples/scan_image.vcproj
- 
- EXTRA_DIST += perl/MANIFEST perl/README perl/Changes perl/COPYING.LIB \
-     perl/Makefile.PL perl/typemap perl/ZBar.xs perl/ppport.h \
-diff -r 563557a923d0 README
---- a/README	Tue Oct 27 11:25:59 2009 -0400
-+++ b/README	Fri Feb 22 08:54:29 2013 -0300
-@@ -4,9 +4,9 @@
- 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, Code 128,
--Code 39, Interleaved 2 of 5 and QR Code.  Included with the library
--are basic applications for decoding captured bar code images and using
--a video device (eg, webcam) as a bar code scanner.  For application
-+Code 39, Codabar, Interleaved 2 of 5 and QR Code.  Included with the
-+library are basic applications for decoding captured bar code images and
-+using a video device (eg, webcam) as a bar code scanner.  For application
- developers, language bindings are included for C, C++, Python and Perl
- as well as GUI widgets for Qt, GTK and PyGTK.
- 
-diff -r 563557a923d0 README.windows
---- a/README.windows	Tue Oct 27 11:25:59 2009 -0400
-+++ b/README.windows	Fri Feb 22 08:54:29 2013 -0300
-@@ -3,8 +3,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, Code 128, Code 39,
--Interleaved 2 of 5 and QR Code.  Included with the library are basic
-+sensors. It supports EAN-13/UPC-A, UPC-E, EAN-8, Code 128, Code 93, Code 39,
-+Codabar, Interleaved 2 of 5 and QR Code.  Included with the library are basic
- applications for decoding captured bar code images and using a video device
- (eg, webcam) as a bar code scanner.  For application developers, language
- bindings are included for C, C++, Python and Perl as well as GUI widgets for
-diff -r 563557a923d0 TODO
---- a/TODO	Tue Oct 27 11:25:59 2009 -0400
-+++ b/TODO	Fri Feb 22 08:54:29 2013 -0300
-@@ -25,7 +25,6 @@
-   * Code 39, i25 optional features (check digit and ASCII escapes)
-   * handle Code 128 function characters (FNC1-4)
-   * Code 128 trailing quiet zone checks
--  * finish addon decoding
- 
- decoder:
-   * start/stop/abort and location detail APIs (PDF417, OMR)
-diff -r 563557a923d0 android/AndroidManifest.xml
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/android/AndroidManifest.xml	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-+      package="net.sourceforge.zbar.android"
-+      android:versionCode="1"
-+      android:versionName="1.0">
-+    <application android:label="@string/app_name" >
-+        <activity android:name="ACTIVITY_ENTRY_NAME"
-+                  android:label="@string/app_name">
-+            <intent-filter>
-+                <action android:name="android.intent.action.MAIN" />
-+                <category android:name="android.intent.category.LAUNCHER" />
-+            </intent-filter>
-+        </activity>
-+    </application>
-+</manifest> 
-diff -r 563557a923d0 android/ChangeLog
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/android/ChangeLog	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,2 @@
-+version 0.1:
-+  * Add initial support for Android platform
-diff -r 563557a923d0 android/README
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/android/README	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,112 @@
-+ZBar Android SDK
-+================
-+
-+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, Code 128,
-+Code 93, Code 39, Codabar, Interleaved 2 of 5, QR Code and
-+DataBar. These are the JNI wrappers for developing the library on
-+Android platform.
-+
-+Check the ZBar home page for the latest release, mailing lists, etc.
-+    http://zbar.sourceforge.net/
-+
-+Copyright and License
-+---------------------
-+Licensed under the GNU Lesser General Public License, version 2.1.
-+http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
-+
-+Copyright 2008-2012 � Jeff Brown <spadix@users.sourceforge.net> et al
-+
-+The Android distribution also includes pre-compiled binaries of
-+supporting libaries, for which copyright, license and source code
-+locations are as follows:
-+  * The GNU libiconv character set conversion library
-+    Copyright (C) 1999-2011 Free Software Foundation, Inc.
-+    This distribution includes GNU libiconv version 1.14, licensed under
-+    the LGPL version 2.  The source code is available from
-+        http://www.gnu.org/software/libiconv
-+
-+See included files COPYING and LICENSE for details.
-+
-+
-+Installation
-+------------
-+
-+After downloading the ZBar-Android-Lib-<version>.zip file, you need to
-+unzip the file and add it to your Android project. Unzip the file
-+using your favorite method (ie: command-line, finder, windows
-+explorer...)
-+
-+Follow one of the two options.
-+Option 1 - via command line
-+  cd <android project>
-+  cp -r ZBar-Android-SDK-<version>/libs .
-+
-+Option 2 - via Eclipse
-+  Right click on Android Project
-+  Select "Import" -> "File System"
-+  Select "Browse" (next to "From directory File" and select the
-+    ZBar-Android-SDK-<verion>/libs directory and click "Open".
-+  Click the check box next to "libs" and the "Options" "Create top-level folder"
-+  check box (below).
-+  Then click "Finish".
-+      
-+  You should then see a "libs" folder under your project.
-+
-+Building
-+--------
-+
-+Via Eclipse
-+You have to add the zbar.jar file to your build path
-+  1) select zbar.jar under libs
-+  2) right-click, select "Build Path" -> "Add to Build Path"
-+  
-+Via command-line
-+You are all set; ant will automatcially find jar files under the "libs"
-+subdirectory.
-+
-+Documentation
-+-------------
-+   TDB
-+
-+Examples
-+--------
-+
-+You should be able to open and build the examples directly from the
-+unzipped directory. You will need to run the android tools to setup
-+the local.properties file which sets sdk.dir.
-+  1) cd <unzip dir>/examples/CameraTest
-+  2) android update project --path .
-+  3) ant debug install
-+
-+If you have problems with this, please create a new Android project
-+and copy the necessary files from the examples.
-+
-+examples/CameraTest is a simple demonstration of how to integrate the
-+ZBar image scanner with the camera.
-+
-+Manually building ZBar JNI library
-+----------------------------------
-+First download and unzip the iconv library source from 
-+  http://www.gnu.org/software/libiconv/
-+
-+Then kick off the build from the ZBar android directory. You will
-+need to run the android tools to setup the local.properties file which
-+setups sdk.dir.
-+
-+  1) cd <zbar project>/android
-+  2) android update project --path . 
-+  3) ant -Dndk.dir=<NDK path> -Diconv.src=<iconv library src> zbar-all
-+
-+This will rebuild all source files, create zbar.jar and
-+ZBarAndroidSDK.zip file (which bundles the jar and shared
-+libraries). From here, you can follow the steps for "Integrating ZBar
-+JNI library in Android project".
-+
-+To clean run:
-+  ant -Dndk.dir=<NDK path> zbar-clean
-+
-+See build-ndk.xml for additional target options.
-+
-+
-diff -r 563557a923d0 android/ant.properties
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/android/ant.properties	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,17 @@
-+# This file is used to override default values used by the Ant build system.
-+#
-+# This file must be checked in Version Control Systems, as it is
-+# integral to the build system of your project.
-+
-+# This file is only used by the Ant script.
-+
-+# You can use this to override default values such as
-+#  'source.dir' for the location of your java source folder and
-+#  'out.dir' for the location of your output folder.
-+
-+# You can also use it define how the release builds are signed by declaring
-+# the following properties:
-+#  'key.store' for the location of your keystore and
-+#  'key.alias' for the name of the key to use.
-+# The password will be asked during the build when you use the 'release' target.
-+
-diff -r 563557a923d0 android/build-ndk.xml
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/android/build-ndk.xml	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,66 @@
-+<!-- 
-+Ant build file to compile the ZBar JNI files using Android NDK tool
-+targets:
-+  zbar-clean     - removes build generated files, build dir, jar and zip files
-+  zbar-ndk-build - builds the zbarjni and iconv shared libraries
-+  zbar-compile   - builds the zbar java files
-+  zbar-jar       - builds and jars the zbar java files
-+  zbar-zip       - Creates ZBarAndroidSDK-x.y.zip of jar, .so, etc
-+  zbar-all       - performs all the above :)
-+-->
-+<project name="zbar">
-+  <property name="project.name" value="zbar" />
-+  <property name="project.sdk.name" value="ZBarAndroidSDK" />
-+
-+  <target name="zbar-clean">
-+      <delete dir="../java/build"/>
-+      <delete file="libs/${project.name}.jar"/>
-+      <delete file="${ant.project.name}.zip"/>
-+      <exec executable="${ndk.dir}/ndk-build" failonerror="true">
-+          <arg value="clean"/>
-+      </exec>
-+  </target>
-+
-+  <target name="zbar-ndk-build">
-+      <exec executable="${ndk.dir}/ndk-build" failonerror="true">
-+          <arg value="ICONV_SRC=${iconv.src}" />
-+      </exec>
-+  </target>
-+
-+  <target name="zbar-compile" depends="zbar-ndk-build">
-+      <mkdir dir="../java/build" />
-+      <javac srcdir="../java/net" destdir="../java/build" />
-+  </target>
-+
-+  <target name="zbar-jar" depends="zbar-compile">
-+      <jar destfile="libs/${project.name}.jar" basedir="../java/build">
-+      </jar>
-+  </target>
-+
-+  <target name="zbar-zip">
-+      <if><condition><not><isset property="version"/></not></condition><then>
-+         <property name="version" value="0.2" />
-+      </then></if>
-+      <zip destfile="${project.sdk.name}-${version}.zip" >
-+          <zipfileset dir="../" prefix="${project.sdk.name}-${version}" includes="COPYING, LICENSE"/>
-+          <zipfileset dir="." prefix="${project.sdk.name}-${version}" includes="README"/>
-+          <zipfileset dir="libs" prefix="${project.sdk.name}-${version}/libs"/>
-+          <zipfileset dir="examples" prefix="${project.sdk.name}-${version}/examples"/>
-+          <zipfileset dir="libs" prefix="${project.sdk.name}-${version}/examples/CameraTest/libs"/>
-+      </zip>
-+  </target>
-+
-+  <target name="zbar-all" depends="zbar-jar">
-+      <if><condition><not><isset property="version"/></not></condition><then>
-+         <property name="version" value="0.2" />
-+      </then></if>
-+      <zip destfile="${project.sdk.name}-${version}.zip" >
-+          <zipfileset dir="../" prefix="${project.sdk.name}-${version}" includes="COPYING, LICENSE"/>
-+          <zipfileset dir="." prefix="${project.sdk.name}-${version}" includes="README"/>
-+          <zipfileset dir="libs" prefix="${project.sdk.name}-${version}/libs"/>
-+          <zipfileset dir="examples" prefix="${project.sdk.name}-${version}/examples"/>
-+          <zipfileset dir="libs" prefix="${project.sdk.name}-${version}/examples/CameraTest/libs"/>
-+      </zip>
-+  </target>
-+</project>
-+
-diff -r 563557a923d0 android/build.xml
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/android/build.xml	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,86 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<project name="ZBarAndroidSDK" default="help">
-+
-+    <!-- The local.properties file is created and updated by the 'android' tool.
-+         It contains the path to the SDK. It should *NOT* be checked into
-+         Version Control Systems. -->
-+    <property file="local.properties" />
-+
-+    <!-- The ant.properties file can be created by you. It is only edited by the
-+         'android' tool to add properties to it.
-+         This is the place to change some Ant specific build properties.
-+         Here are some properties you may want to change/update:
-+
-+         source.dir
-+             The name of the source directory. Default is 'src'.
-+         out.dir
-+             The name of the output directory. Default is 'bin'.
-+
-+         For other overridable properties, look at the beginning of the rules
-+         files in the SDK, at tools/ant/build.xml
-+
-+         Properties related to the SDK location or the project target should
-+         be updated using the 'android' tool with the 'update' action.
-+
-+         This file is an integral part of the build system for your
-+         application and should be checked into Version Control Systems.
-+
-+         -->
-+    <property file="ant.properties" />
-+
-+    <!-- The project.properties file is created and updated by the 'android'
-+         tool, as well as ADT.
-+
-+         This contains project specific properties such as project target, and library
-+         dependencies. Lower level build properties are stored in ant.properties
-+         (or in .classpath for Eclipse projects).
-+
-+         This file is an integral part of the build system for your
-+         application and should be checked into Version Control Systems. -->
-+    <loadproperties srcFile="project.properties" />
-+
-+    <!-- quick check on sdk.dir -->
-+    <fail
-+            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through an env var"
-+            unless="sdk.dir"
-+    />
-+
-+
-+<!-- extension targets. Uncomment the ones where you want to do custom work
-+     in between standard targets -->
-+<!--
-+    <target name="-pre-build">
-+    </target>
-+    <target name="-pre-compile">
-+    </target>
-+
-+    /* This is typically used for code obfuscation.
-+       Compiled code location: ${out.classes.absolute.dir}
-+       If this is not done in place, override ${out.dex.input.absolute.dir} */
-+    <target name="-post-compile">
-+      <copy file="${out.absolute.dir}/classes.jar" tofile="${jar.libs.dir}/zbar_android.jar" />
-+    </target>
-+-->
-+
-+    <!-- Import the actual build file.
-+
-+         To customize existing targets, there are two options:
-+         - Customize only one target:
-+             - copy/paste the target into this file, *before* the
-+               <import> task.
-+             - customize it to your needs.
-+         - Customize the whole content of build.xml
-+             - copy/paste the content of the rules files (minus the top node)
-+               into this file, replacing the <import> task.
-+             - customize to your needs.
-+
-+         ***********************
-+         ****** IMPORTANT ******
-+         ***********************
-+         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
-+         in order to avoid having your file be overridden by tools such as "android update project"
-+    -->
-+    <!-- version-tag: 1 -->
-+    <import file="build-ndk.xml" />
-+    <import file="${sdk.dir}/tools/ant/build.xml" />
-+</project>
-diff -r 563557a923d0 android/examples/CameraTest/AndroidManifest.xml
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/android/examples/CameraTest/AndroidManifest.xml	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,19 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-+      package="net.sourceforge.zbar.android.CameraTest"
-+      android:versionCode="1"
-+      android:versionName="1.0">
-+    <uses-sdk android:minSdkVersion="8" />
-+    <uses-permission android:name="android.permission.CAMERA" />
-+    <uses-feature android:name="android.hardware.camera" />
-+    <uses-feature android:name="android.hardware.camera.autofocus" />
-+    <application android:label="@string/app_name" >
-+        <activity android:name="CameraTestActivity"
-+                  android:label="@string/app_name">
-+            <intent-filter>
-+                <action android:name="android.intent.action.MAIN" />
-+                <category android:name="android.intent.category.LAUNCHER" />
-+            </intent-filter>
-+        </activity>
-+    </application>
-+</manifest> 
-diff -r 563557a923d0 android/examples/CameraTest/ant.properties
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/android/examples/CameraTest/ant.properties	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,17 @@
-+# This file is used to override default values used by the Ant build system.
-+#
-+# This file must be checked in Version Control Systems, as it is
-+# integral to the build system of your project.
-+
-+# This file is only used by the Ant script.
-+
-+# You can use this to override default values such as
-+#  'source.dir' for the location of your java source folder and
-+#  'out.dir' for the location of your output folder.
-+
-+# You can also use it define how the release builds are signed by declaring
-+# the following properties:
-+#  'key.store' for the location of your keystore and
-+#  'key.alias' for the name of the key to use.
-+# The password will be asked during the build when you use the 'release' target.
-+
-diff -r 563557a923d0 android/examples/CameraTest/build.xml
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/android/examples/CameraTest/build.xml	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,85 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<project name="CameraTest" default="help">
-+
-+    <!-- The local.properties file is created and updated by the 'android' tool.
-+         It contains the path to the SDK. It should *NOT* be checked into
-+         Version Control Systems. -->
-+    <property file="local.properties" />
-+
-+    <!-- The ant.properties file can be created by you. It is only edited by the
-+         'android' tool to add properties to it.
-+         This is the place to change some Ant specific build properties.
-+         Here are some properties you may want to change/update:
-+
-+         source.dir
-+             The name of the source directory. Default is 'src'.
-+         out.dir
-+             The name of the output directory. Default is 'bin'.
-+
-+         For other overridable properties, look at the beginning of the rules
-+         files in the SDK, at tools/ant/build.xml
-+
-+         Properties related to the SDK location or the project target should
-+         be updated using the 'android' tool with the 'update' action.
-+
-+         This file is an integral part of the build system for your
-+         application and should be checked into Version Control Systems.
-+
-+         -->
-+    <property file="ant.properties" />
-+
-+    <!-- The project.properties file is created and updated by the 'android'
-+         tool, as well as ADT.
-+
-+         This contains project specific properties such as project target, and library
-+         dependencies. Lower level build properties are stored in ant.properties
-+         (or in .classpath for Eclipse projects).
-+
-+         This file is an integral part of the build system for your
-+         application and should be checked into Version Control Systems. -->
-+    <loadproperties srcFile="project.properties" />
-+
-+    <!-- quick check on sdk.dir -->
-+    <fail
-+            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through an env var"
-+            unless="sdk.dir"
-+    />
-+
-+
-+<!-- extension targets. Uncomment the ones where you want to do custom work
-+     in between standard targets -->
-+<!--
-+    <target name="-pre-build">
-+    </target>
-+    <target name="-pre-compile">
-+    </target>
-+
-+    /* This is typically used for code obfuscation.
-+       Compiled code location: ${out.classes.absolute.dir}
-+       If this is not done in place, override ${out.dex.input.absolute.dir} */
-+    <target name="-post-compile">
-+    </target>
-+-->
-+
-+    <!-- Import the actual build file.
-+
-+         To customize existing targets, there are two options:
-+         - Customize only one target:
-+             - copy/paste the target into this file, *before* the
-+               <import> task.
-+             - customize it to your needs.
-+         - Customize the whole content of build.xml
-+             - copy/paste the content of the rules files (minus the top node)
-+               into this file, replacing the <import> task.
-+             - customize to your needs.
-+
-+         ***********************
-+         ****** IMPORTANT ******
-+         ***********************
-+         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
-+         in order to avoid having your file be overridden by tools such as "android update project"
-+    -->
-+    <!-- version-tag: 1 -->
-+    <import file="${sdk.dir}/tools/ant/build.xml" />
-+
-+</project>
-diff -r 563557a923d0 android/examples/CameraTest/proguard.cfg
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/android/examples/CameraTest/proguard.cfg	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,40 @@
-+-optimizationpasses 5
-+-dontusemixedcaseclassnames
-+-dontskipnonpubliclibraryclasses
-+-dontpreverify
-+-verbose
-+-optimizations !code/simplification/arithmetic,!field/*,!class/merging/*
-+
-+-keep public class * extends android.app.Activity
-+-keep public class * extends android.app.Application
-+-keep public class * extends android.app.Service
-+-keep public class * extends android.content.BroadcastReceiver
-+-keep public class * extends android.content.ContentProvider
-+-keep public class * extends android.app.backup.BackupAgentHelper
-+-keep public class * extends android.preference.Preference
-+-keep public class com.android.vending.licensing.ILicensingService
-+
-+-keepclasseswithmembernames class * {
-+    native <methods>;
-+}
-+
-+-keepclasseswithmembers class * {
-+    public <init>(android.content.Context, android.util.AttributeSet);
-+}
-+
-+-keepclasseswithmembers class * {
-+    public <init>(android.content.Context, android.util.AttributeSet, int);
-+}
-+
-+-keepclassmembers class * extends android.app.Activity {
-+   public void *(android.view.View);
-+}
-+
-+-keepclassmembers enum * {
-+    public static **[] values();
-+    public static ** valueOf(java.lang.String);
-+}
-+
-+-keep class * implements android.os.Parcelable {
-+  public static final android.os.Parcelable$Creator *;
-+}
-diff -r 563557a923d0 android/examples/CameraTest/project.properties
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/android/examples/CameraTest/project.properties	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,11 @@
-+# This file is automatically generated by Android Tools.
-+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-+#
-+# This file must be checked in Version Control Systems.
-+#
-+# To customize properties used by the Ant build system use,
-+# "ant.properties", and override values to adapt the script to your
-+# project structure.
-+
-+# Project target.
-+target=android-15
-diff -r 563557a923d0 android/examples/CameraTest/res/layout/main.xml
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/android/examples/CameraTest/res/layout/main.xml	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,28 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<LinearLayout
-+  xmlns:android="http://schemas.android.com/apk/res/android"
-+  android:orientation="vertical"
-+  android:layout_width="match_parent"
-+  android:layout_height="match_parent">
-+
-+  <FrameLayout
-+    android:id="@+id/cameraPreview"
-+    android:layout_width="match_parent"
-+    android:layout_height="match_parent"
-+    android:layout_weight="1"
-+  />
-+
-+  <TextView
-+    android:id="@+id/scanText"
-+    android:text="Scanning..."
-+    android:layout_height="wrap_content" 
-+    android:layout_width="match_parent">
-+  </TextView>
-+  <Button
-+    android:id="@+id/ScanButton"
-+    android:text="Scan"
-+    android:layout_width="wrap_content"
-+    android:layout_height="wrap_content"
-+    android:layout_gravity="center"
-+  />
-+</LinearLayout>
-diff -r 563557a923d0 android/examples/CameraTest/res/values/strings.xml
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/android/examples/CameraTest/res/values/strings.xml	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,4 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<resources>
-+    <string name="app_name">ZBar CameraTest</string>
-+</resources>
-diff -r 563557a923d0 android/examples/CameraTest/src/net/sourceforge/zbar/android/CameraTest/CameraPreview.java
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/android/examples/CameraTest/src/net/sourceforge/zbar/android/CameraTest/CameraPreview.java	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,108 @@
-+/*
-+ * Barebones implementation of displaying camera preview.
-+ * 
-+ * Created by lisah0 on 2012-02-24
-+ */
-+package net.sourceforge.zbar.android.CameraTest;
-+
-+import java.io.IOException;
-+
-+import android.app.Activity;
-+import android.os.Bundle;
-+
-+import android.util.Log;
-+
-+import android.view.View;
-+import android.view.Surface;
-+import android.view.SurfaceView;
-+import android.view.SurfaceHolder;
-+
-+import android.content.Context;
-+
-+import android.hardware.Camera;
-+import android.hardware.Camera.PreviewCallback;
-+import android.hardware.Camera.AutoFocusCallback;
-+import android.hardware.Camera.Parameters;
-+
-+/** A basic Camera preview class */
-+public class CameraPreview extends SurfaceView implements SurfaceHolder.Callback {
-+    private SurfaceHolder mHolder;
-+    private Camera mCamera;
-+    private PreviewCallback previewCallback;
-+    private AutoFocusCallback autoFocusCallback;
-+
-+    public CameraPreview(Context context, Camera camera,
-+                         PreviewCallback previewCb,
-+                         AutoFocusCallback autoFocusCb) {
-+        super(context);
-+        mCamera = camera;
-+        previewCallback = previewCb;
-+        autoFocusCallback = autoFocusCb;
-+
-+        /* 
-+         * Set camera to continuous focus if supported, otherwise use
-+         * software auto-focus. Only works for API level >=9.
-+         */
-+        /*
-+        Camera.Parameters parameters = camera.getParameters();
-+        for (String f : parameters.getSupportedFocusModes()) {
-+            if (f == Parameters.FOCUS_MODE_CONTINUOUS_PICTURE) {
-+                mCamera.setFocusMode(Parameters.FOCUS_MODE_CONTINUOUS_PICTURE);
-+                autoFocusCallback = null;
-+                break;
-+            }
-+        }
-+        */
-+
-+        // Install a SurfaceHolder.Callback so we get notified when the
-+        // underlying surface is created and destroyed.
-+        mHolder = getHolder();
-+        mHolder.addCallback(this);
-+
-+        // deprecated setting, but required on Android versions prior to 3.0
-+        mHolder.setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS);
-+    }
-+
-+    public void surfaceCreated(SurfaceHolder holder) {
-+        // The Surface has been created, now tell the camera where to draw the preview.
-+        try {
-+            mCamera.setPreviewDisplay(holder);
-+        } catch (IOException e) {
-+            Log.d("DBG", "Error setting camera preview: " + e.getMessage());
-+        }
-+    }
-+
-+    public void surfaceDestroyed(SurfaceHolder holder) {
-+        // Camera preview released in activity
-+    }
-+
-+    public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
-+        /*
-+         * If your preview can change or rotate, take care of those events here.
-+         * Make sure to stop the preview before resizing or reformatting it.
-+         */
-+        if (mHolder.getSurface() == null){
-+          // preview surface does not exist
-+          return;
-+        }
-+
-+        // stop preview before making changes
-+        try {
-+            mCamera.stopPreview();
-+        } catch (Exception e){
-+          // ignore: tried to stop a non-existent preview
-+        }
-+
-+        try {
-+            // Hard code camera surface rotation 90 degs to match Activity view in portrait
-+            mCamera.setDisplayOrientation(90);
-+
-+            mCamera.setPreviewDisplay(mHolder);
-+            mCamera.setPreviewCallback(previewCallback);
-+            mCamera.startPreview();
-+            mCamera.autoFocus(autoFocusCallback);
-+        } catch (Exception e){
-+            Log.d("DBG", "Error starting camera preview: " + e.getMessage());
-+        }
-+    }
-+}
-diff -r 563557a923d0 android/examples/CameraTest/src/net/sourceforge/zbar/android/CameraTest/CameraTestActivity.java
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/android/examples/CameraTest/src/net/sourceforge/zbar/android/CameraTest/CameraTestActivity.java	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,155 @@
-+/*
-+ * Basic no frills app which integrates the ZBar barcode scanner with
-+ * the camera.
-+ * 
-+ * Created by lisah0 on 2012-02-24
-+ */
-+package net.sourceforge.zbar.android.CameraTest;
-+
-+import net.sourceforge.zbar.android.CameraTest.CameraPreview;
-+
-+import android.app.Activity;
-+import android.content.pm.ActivityInfo;
-+import android.os.Bundle;
-+import android.os.Handler;
-+import android.util.Log;
-+
-+import android.view.View;
-+import android.view.View.OnClickListener;
-+import android.view.Window;
-+import android.widget.FrameLayout;
-+import android.widget.Button;
-+
-+import android.hardware.Camera;
-+import android.hardware.Camera.PreviewCallback;
-+import android.hardware.Camera.AutoFocusCallback;
-+import android.hardware.Camera.Parameters;
-+import android.hardware.Camera.Size;
-+
-+import android.widget.TextView;
-+import android.graphics.ImageFormat;
-+
-+/* Import ZBar Class files */
-+import net.sourceforge.zbar.ImageScanner;
-+import net.sourceforge.zbar.Image;
-+import net.sourceforge.zbar.Symbol;
-+import net.sourceforge.zbar.SymbolSet;
-+import net.sourceforge.zbar.Config;
-+
-+public class CameraTestActivity extends Activity
-+{
-+    private Camera mCamera;
-+    private CameraPreview mPreview;
-+    private Handler autoFocusHandler;
-+
-+    TextView scanText;
-+    Button scanButton;
-+
-+    ImageScanner scanner;
-+
-+    private boolean barcodeScanned = false;
-+    private boolean previewing = true;
-+
-+    static {
-+        System.loadLibrary("iconv");
-+    } 
-+
-+    public void onCreate(Bundle savedInstanceState) {
-+        super.onCreate(savedInstanceState);
-+
-+        setContentView(R.layout.main);
-+
-+        setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
-+
-+        autoFocusHandler = new Handler();
-+        mCamera = getCameraInstance();
-+
-+        /* Instance barcode scanner */
-+        scanner = new ImageScanner();
-+        scanner.setConfig(0, Config.X_DENSITY, 3);
-+        scanner.setConfig(0, Config.Y_DENSITY, 3);
-+
-+        mPreview = new CameraPreview(this, mCamera, previewCb, autoFocusCB);
-+        FrameLayout preview = (FrameLayout)findViewById(R.id.cameraPreview);
-+        preview.addView(mPreview);
-+
-+        scanText = (TextView)findViewById(R.id.scanText);
-+
-+        scanButton = (Button)findViewById(R.id.ScanButton);
-+
-+        scanButton.setOnClickListener(new OnClickListener() {
-+                public void onClick(View v) {
-+                    if (barcodeScanned) {
-+                        barcodeScanned = false;
-+                        scanText.setText("Scanning...");
-+                        mCamera.setPreviewCallback(previewCb);
-+                        mCamera.startPreview();
-+                        previewing = true;
-+                        mCamera.autoFocus(autoFocusCB);
-+                    }
-+                }
-+            });
-+    }
-+
-+    public void onPause() {
-+        super.onPause();
-+        releaseCamera();
-+    }
-+
-+    /** A safe way to get an instance of the Camera object. */
-+    public static Camera getCameraInstance(){
-+        Camera c = null;
-+        try {
-+            c = Camera.open();
-+        } catch (Exception e){
-+        }
-+        return c;
-+    }
-+
-+    private void releaseCamera() {
-+        if (mCamera != null) {
-+            previewing = false;
-+            mCamera.setPreviewCallback(null);
-+            mCamera.release();
-+            mCamera = null;
-+        }
-+    }
-+
-+    private Runnable doAutoFocus = new Runnable() {
-+            public void run() {
-+                if (previewing)
-+                    mCamera.autoFocus(autoFocusCB);
-+            }
-+        };
-+
-+    PreviewCallback previewCb = new PreviewCallback() {
-+            public void onPreviewFrame(byte[] data, Camera camera) {
-+                Camera.Parameters parameters = camera.getParameters();
-+                Size size = parameters.getPreviewSize();
-+
-+                Image barcode = new Image(size.width, size.height, "Y800");
-+                barcode.setData(data);
-+
-+                int result = scanner.scanImage(barcode);
-+                
-+                if (result != 0) {
-+                    previewing = false;
-+                    mCamera.setPreviewCallback(null);
-+                    mCamera.stopPreview();
-+                    
-+                    SymbolSet syms = scanner.getResults();
-+                    for (Symbol sym : syms) {
-+                        scanText.setText("barcode result " + sym.getData());
-+                        barcodeScanned = true;
-+                    }
-+                }
-+            }
-+        };
-+
-+    // Mimic continuous auto-focusing
-+    AutoFocusCallback autoFocusCB = new AutoFocusCallback() {
-+            public void onAutoFocus(boolean success, Camera camera) {
-+                autoFocusHandler.postDelayed(doAutoFocus, 1000);
-+            }
-+        };
-+}
-diff -r 563557a923d0 android/jni/Android.mk
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/android/jni/Android.mk	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,76 @@
-+#
-+# Android NDK makefile 
-+#
-+# build - <ndk path>/ndk-build ICONV_SRC=<iconv library src> 
-+# clean -  <ndk path>/ndk-build clean
-+#
-+MY_LOCAL_PATH := $(call my-dir)
-+
-+# libiconv
-+include $(CLEAR_VARS)
-+LOCAL_PATH := $(ICONV_SRC)
-+
-+LOCAL_MODULE := libiconv
-+
-+LOCAL_CFLAGS := \
-+    -Wno-multichar \
-+    -D_ANDROID \
-+    -DLIBDIR="c" \
-+    -DBUILDING_LIBICONV \
-+    -DBUILDING_LIBCHARSET \
-+    -DIN_LIBRARY
-+
-+LOCAL_SRC_FILES := \
-+	lib/iconv.c \
-+	libcharset/lib/localcharset.c \
-+	lib/relocatable.c
-+
-+LOCAL_C_INCLUDES := \
-+	$(ICONV_SRC)/include \
-+	$(ICONV_SRC)/libcharset \
-+	$(ICONV_SRC)/libcharset/include
-+
-+include $(BUILD_SHARED_LIBRARY)
-+
-+LOCAL_LDLIBS := -llog -lcharset
-+
-+# libzbarjni
-+include $(CLEAR_VARS)
-+
-+LOCAL_PATH := $(MY_LOCAL_PATH)
-+LOCAL_MODULE := zbarjni
-+LOCAL_SRC_FILES := ../../java/zbarjni.c \
-+		   ../../zbar/img_scanner.c \
-+		   ../../zbar/decoder.c \
-+		   ../../zbar/image.c \
-+		   ../../zbar/symbol.c \
-+		   ../../zbar/convert.c \
-+		   ../../zbar/config.c \
-+		   ../../zbar/scanner.c \
-+		   ../../zbar/error.c \
-+		   ../../zbar/refcnt.c \
-+		   ../../zbar/video.c \
-+		   ../../zbar/video/null.c \
-+		   ../../zbar/decoder/code128.c \
-+		   ../../zbar/decoder/code39.c \
-+		   ../../zbar/decoder/code93.c \
-+		   ../../zbar/decoder/codabar.c \
-+		   ../../zbar/decoder/databar.c \
-+		   ../../zbar/decoder/ean.c \
-+		   ../../zbar/decoder/i25.c \
-+		   ../../zbar/decoder/qr_finder.c \
-+		   ../../zbar/qrcode/bch15_5.c \
-+		   ../../zbar/qrcode/binarize.c \
-+		   ../../zbar/qrcode/isaac.c \
-+		   ../../zbar/qrcode/qrdec.c \
-+		   ../../zbar/qrcode/qrdectxt.c \
-+		   ../../zbar/qrcode/rs.c \
-+		   ../../zbar/qrcode/util.c
-+
-+LOCAL_C_INCLUDES := ../include \
-+		    ../zbar \
-+		    $(ICONV_SRC)/include 
-+
-+LOCAL_SHARED_LIBRARIES := libiconv
-+
-+include $(BUILD_SHARED_LIBRARY)
-\ No newline at end of file
-diff -r 563557a923d0 android/jni/Application.mk
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/android/jni/Application.mk	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,1 @@
-+APP_ABI := armeabi armeabi-v7a x86
-diff -r 563557a923d0 android/jni/config.h
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/android/jni/config.h	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,236 @@
-+/* manually customized for iPhone platform */
-+
-+#define HAVE_LANGINFO_CODESET 0
-+
-+/* whether to build support for Code 128 symbology */
-+#define ENABLE_CODE128 1
-+
-+/* whether to build support for Code 93 symbology */
-+#define ENABLE_CODE93 1
-+
-+/* whether to build support for Code 39 symbology */
-+#define ENABLE_CODE39 1
-+
-+/* whether to build support for Codabar symbology */
-+#define ENABLE_CODABAR 1
-+
-+/* whether to build support for DataBar symbology */
-+#define ENABLE_DATABAR 1
-+
-+/* whether to build support for EAN symbologies */
-+#define ENABLE_EAN 1
-+
-+/* whether to build support for Interleaved 2 of 5 symbology */
-+#define ENABLE_I25 1
-+
-+/* whether to build support for PDF417 symbology */
-+#undef ENABLE_PDF417
-+
-+/* whether to build support for QR Code */
-+#define ENABLE_QRCODE 1
-+
-+/* Define to 1 if you have the `atexit' function. */
-+#undef HAVE_ATEXIT
-+
-+/* Define to 1 if you have the <dlfcn.h> header file. */
-+#undef HAVE_DLFCN_H
-+
-+/* Define to 1 if you have the <fcntl.h> header file. */
-+#undef HAVE_FCNTL_H
-+
-+/* Define to 1 if you have the <features.h> header file. */
-+#undef HAVE_FEATURES_H
-+
-+/* Define to 1 if you have the `getpagesize' function. */
-+#undef HAVE_GETPAGESIZE
-+
-+/* Define if you have the iconv() function and it works. */
-+#undef HAVE_ICONV
-+
-+/* Define to 1 if you have the <inttypes.h> header file. */
-+#define HAVE_INTTYPES_H 1
-+
-+/* Define to 1 if you have the <jpeglib.h> header file. */
-+#undef HAVE_JPEGLIB_H
-+
-+/* Define to 1 if you have the `jpeg' library (-ljpeg). */
-+#undef HAVE_LIBJPEG
-+
-+/* Define to 1 if you have the `pthread' library (-lpthread). */
-+#undef HAVE_LIBPTHREAD
-+
-+/* Define to 1 if you have the <linux/videodev2.h> header file. */
-+#undef HAVE_LINUX_VIDEODEV2_H
-+
-+/* Define to 1 if you have the <linux/videodev.h> header file. */
-+#undef HAVE_LINUX_VIDEODEV_H
-+
-+/* Define to 1 if you have the <memory.h> header file. */
-+#undef HAVE_MEMORY_H
-+
-+/* Define to 1 if you have the `memset' function. */
-+#define HAVE_MEMSET 1
-+
-+/* Define to 1 if you have a working `mmap' system call. */
-+#undef HAVE_MMAP
-+
-+/* Define to 1 if you have the <poll.h> header file. */
-+#undef HAVE_POLL_H
-+
-+/* Define to 1 if you have the <pthread.h> header file. */
-+#undef HAVE_PTHREAD_H
-+
-+/* Define to 1 if you have the `setenv' function. */
-+#undef HAVE_SETENV
-+
-+/* Define to 1 if you have the <stdint.h> header file. */
-+#define HAVE_STDINT_H 1
-+
-+/* Define to 1 if you have the <stdlib.h> header file. */
-+#define HAVE_STDLIB_H 1
-+
-+/* Define to 1 if you have the <strings.h> header file. */
-+#define HAVE_STRINGS_H 1
-+
-+/* Define to 1 if you have the <string.h> header file. */
-+#define HAVE_STRING_H 1
-+
-+/* Define to 1 if you have the <sys/ioctl.h> header file. */
-+#undef HAVE_SYS_IOCTL_H
-+
-+/* Define to 1 if you have the <sys/ipc.h> header file. */
-+#undef HAVE_SYS_IPC_H
-+
-+/* Define to 1 if you have the <sys/mman.h> header file. */
-+#undef HAVE_SYS_MMAN_H
-+
-+/* Define to 1 if you have the <sys/shm.h> header file. */
-+#undef HAVE_SYS_SHM_H
-+
-+/* Define to 1 if you have the <sys/stat.h> header file. */
-+#define HAVE_SYS_STAT_H 1
-+
-+/* Define to 1 if you have the <sys/times.h> header file. */
-+#define HAVE_SYS_TIMES_H 1
-+
-+/* Define to 1 if you have the <sys/time.h> header file. */
-+#define HAVE_SYS_TIME_H 1
-+
-+/* Define to 1 if you have the <sys/types.h> header file. */
-+#define HAVE_SYS_TYPES_H 1
-+
-+/* Define to 1 if the system has the type `uintptr_t'. */
-+#define HAVE_UINTPTR_T 1
-+
-+/* Define to 1 if you have the <unistd.h> header file. */
-+#define HAVE_UNISTD_H 1
-+
-+/* Define to 1 if you have the <vfw.h> header file. */
-+#undef HAVE_VFW_H
-+
-+/* Define to 1 if you have the <X11/extensions/XShm.h> header file. */
-+#undef HAVE_X11_EXTENSIONS_XSHM_H
-+
-+/* Define to 1 if you have the <X11/extensions/Xvlib.h> header file. */
-+#undef HAVE_X11_EXTENSIONS_XVLIB_H
-+
-+/* Define as const if the declaration of iconv() needs const. */
-+#undef ICONV_CONST
-+
-+/* Library major version */
-+#define LIB_VERSION_MAJOR 0
-+
-+/* Library minor version */
-+#define LIB_VERSION_MINOR 2
-+
-+/* Library revision */
-+#define LIB_VERSION_REVISION 0
-+
-+/* Define to the sub-directory in which libtool stores uninstalled libraries.
-+   */
-+#undef LT_OBJDIR
-+
-+/* Define to 1 if assertions should be disabled. */
-+//#undef NDEBUG
-+
-+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-+#undef NO_MINUS_C_MINUS_O
-+
-+/* Name of package */
-+#define PACKAGE "zbar"
-+
-+/* Define to the address where bug reports for this package should be sent. */
-+#define PACKAGE_BUGREPORT "spadix@users.sourceforge.net"
-+
-+/* Define to the full name of this package. */
-+#define PACKAGE_NAME "zbar"
-+
-+/* Define to the full name and version of this package. */
-+#define PACKAGE_STRING "zbar 0.10"
-+
-+/* Define to the one symbol short name of this package. */
-+#define PACKAGE_TARNAME "zbar"
-+
-+/* Define to the version of this package. */
-+#define PACKAGE_VERSION "0.10"
-+
-+/* Define to 1 if you have the ANSI C header files. */
-+#define STDC_HEADERS 1
-+
-+/* Version number of package */
-+#define VERSION "0.10"
-+
-+/* Define to 1 if the X Window System is missing or not being used. */
-+#define X_DISPLAY_MISSING 1
-+
-+/* Program major version (before the '.') as a number */
-+#define ZBAR_VERSION_MAJOR 0
-+
-+/* Program minor version (after '.') as a number */
-+#define ZBAR_VERSION_MINOR 10
-+
-+/* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
-+   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
-+   #define below would cause a syntax error. */
-+#undef _UINT32_T
-+
-+/* Define for Solaris 2.5.1 so the uint8_t typedef from <sys/synch.h>,
-+   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
-+   #define below would cause a syntax error. */
-+#undef _UINT8_T
-+
-+/* Minimum Windows API version */
-+#undef _WIN32_WINNT
-+
-+/* used only for pthread debug attributes */
-+#undef __USE_UNIX98
-+
-+/* Define to empty if `const' does not conform to ANSI C. */
-+#undef const
-+
-+/* Define to `__inline__' or `__inline' if that's what the C compiler
-+   calls it, or to nothing if 'inline' is not supported under any name.  */
-+#ifndef __cplusplus
-+#undef inline
-+#endif
-+
-+/* Define to the type of a signed integer type of width exactly 32 bits if
-+   such a type exists and the standard includes do not define it. */
-+#undef int32_t
-+
-+/* Define to the type of an unsigned integer type of width exactly 32 bits if
-+   such a type exists and the standard includes do not define it. */
-+#undef uint32_t
-+
-+/* Define to the type of an unsigned integer type of width exactly 8 bits if
-+   such a type exists and the standard includes do not define it. */
-+#undef uint8_t
-+
-+/* Define to the type of an unsigned integer type wide enough to hold a
-+   pointer, if such a type exists, and if the system does not define it. */
-+#undef uintptr_t
-+
-+#ifndef X_DISPLAY_MISSING
-+# define HAVE_X
-+#endif
-+
-diff -r 563557a923d0 android/proguard.cfg
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/android/proguard.cfg	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,40 @@
-+-optimizationpasses 5
-+-dontusemixedcaseclassnames
-+-dontskipnonpubliclibraryclasses
-+-dontpreverify
-+-verbose
-+-optimizations !code/simplification/arithmetic,!field/*,!class/merging/*
-+
-+-keep public class * extends android.app.Activity
-+-keep public class * extends android.app.Application
-+-keep public class * extends android.app.Service
-+-keep public class * extends android.content.BroadcastReceiver
-+-keep public class * extends android.content.ContentProvider
-+-keep public class * extends android.app.backup.BackupAgentHelper
-+-keep public class * extends android.preference.Preference
-+-keep public class com.android.vending.licensing.ILicensingService
-+
-+-keepclasseswithmembernames class * {
-+    native <methods>;
-+}
-+
-+-keepclasseswithmembers class * {
-+    public <init>(android.content.Context, android.util.AttributeSet);
-+}
-+
-+-keepclasseswithmembers class * {
-+    public <init>(android.content.Context, android.util.AttributeSet, int);
-+}
-+
-+-keepclassmembers class * extends android.app.Activity {
-+   public void *(android.view.View);
-+}
-+
-+-keepclassmembers enum * {
-+    public static **[] values();
-+    public static ** valueOf(java.lang.String);
-+}
-+
-+-keep class * implements android.os.Parcelable {
-+  public static final android.os.Parcelable$Creator *;
-+}
-diff -r 563557a923d0 android/project.properties
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/android/project.properties	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,12 @@
-+# This file is automatically generated by Android Tools.
-+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-+#
-+# This file must be checked in Version Control Systems.
-+#
-+# To customize properties used by the Ant build system use,
-+# "ant.properties", and override values to adapt the script to your
-+# project structure.
-+
-+android.library=true
-+# Project target.
-+target=android-8
-diff -r 563557a923d0 android/res/layout/main.xml
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/android/res/layout/main.xml	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,13 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-+    android:orientation="vertical"
-+    android:layout_width="fill_parent"
-+    android:layout_height="fill_parent"
-+    >
-+<TextView  
-+    android:layout_width="fill_parent" 
-+    android:layout_height="wrap_content" 
-+    android:text="Hello World, ACTIVITY_ENTRY_NAME"
-+    />
-+</LinearLayout>
-+
-diff -r 563557a923d0 android/res/values/strings.xml
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/android/res/values/strings.xml	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,4 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<resources>
-+    <string name="app_name">ACTIVITY_ENTRY_NAME</string>
-+</resources>
-diff -r 563557a923d0 configure.ac
---- a/configure.ac	Tue Oct 27 11:25:59 2009 -0400
-+++ b/configure.ac	Fri Feb 22 08:54:29 2013 -0300
-@@ -46,6 +46,13 @@
-   [[`echo "$LIB_VERSION" | sed -e 's/^[^:]*:\([^:]*\):.*$/\1/'`]],
-   [Library revision])
- 
-+AM_CPPFLAGS="-I$srcdir/include"
-+AM_CFLAGS="-Wall -Wno-parentheses -Werror"
-+AM_CXXFLAGS="$AM_CFLAGS"
-+AC_SUBST([AM_CPPFLAGS])
-+AC_SUBST([AM_CFLAGS])
-+AC_SUBST([AM_CXXFLAGS])
-+
- dnl windows build
- 
- AC_CANONICAL_HOST
-@@ -73,13 +80,36 @@
- AC_ARG_VAR([XMLTOFLAGS], [additional arguments for xmlto])
- AC_CHECK_PROGS([XMLTO], [xmlto], [:])
- 
-+have_java="maybe"
-+AC_ARG_VAR([JAVA_HOME], [root location of JDK])
-+AS_IF([test "x$JAVA_HOME" = "x"],
-+  [JAVA_PATH="$PATH"],
-+  [JAVA_PATH="$JAVA_HOME/bin$PATH_SEPARATOR$PATH"])
-+
-+AC_ARG_VAR([JAVAC], [location of Java language compiler])
-+AC_PATH_PROGS([JAVAC], [javac jikes ecj gcj], [:], [$JAVA_PATH])
-+AS_IF([test "x$JAVAC" = "x:"], [have_java="no"])
-+
-+AC_ARG_VAR([JAVAH], [location of Java header generator])
-+AC_PATH_PROGS([JAVAH], [javah], [/bin/false], [$JAVA_PATH])
-+
-+AC_ARG_VAR([JAR], [location of Java archive tool])
-+AC_PATH_PROGS([JAR], [jar], [:], [$JAVA_PATH])
-+AS_IF([test "x$JAR" = "x:"], [have_java="no"])
-+
-+AC_ARG_VAR([JAVA], [location of Java application launcher])
-+AC_PATH_PROGS([JAVA], [java], [/bin/false], [$JAVA_PATH])
-+
-+AC_ARG_VAR([CLASSPATH], [Java class path (include JUnit to run java tests)])
-+AS_IF([test "x$CLASSPATH" = "x"], [CLASSPATH="."])
-+
- dnl symbologies
- 
- AC_ARG_ENABLE([codes],
-   [AS_HELP_STRING([--enable-codes=SYMS],
--    [select symbologies to compile [default=ean,i25,code39,code128,qrcode]])],
-+    [select symbologies to compile [default=ean,databar,code128,code93,code39,codabar,i25,qrcode]])],
-   [],
--  [enable_codes="ean,code39,code128,i25,qrcode"]) dnl pdf417
-+  [enable_codes="ean,databar,code128,code93,code39,codabar,i25,qrcode"])
- 
- AC_DEFUN([ZBAR_CHK_CODE], [
-   AC_MSG_CHECKING([whether to build $2])
-@@ -97,11 +127,14 @@
- ])dnl
- 
- ZBAR_CHK_CODE([ean], [EAN symbologies])
-+ZBAR_CHK_CODE([databar], [DataBar symbology])
- ZBAR_CHK_CODE([code128], [Code 128 symbology])
-+ZBAR_CHK_CODE([code93], [Code 93 symbology])
- ZBAR_CHK_CODE([code39], [Code 39 symbology])
--ZBAR_CHK_CODE([pdf417], [PDF417 symbology])
-+ZBAR_CHK_CODE([codabar], [Codabar symbology])
- ZBAR_CHK_CODE([i25], [Interleaved 2 of 5 symbology])
- ZBAR_CHK_CODE([qrcode], [QR Code])
-+ZBAR_CHK_CODE([pdf417], [PDF417 symbology])
- 
- dnl libraries
- 
-@@ -144,23 +177,26 @@
-   [],
-   [enable_video="yes"])
- 
--with_video="no"
--AS_IF([test "x$enable_video" != "xno"],
--  [AS_IF([test "x$win32" = "xno"],
--    [AC_CHECK_HEADERS([linux/videodev.h], [with_video="v4l1"],
--      [AC_MSG_FAILURE([test for video support failed!
-+have_v4l1="no"
-+have_v4l2="no"
-+AS_IF([test "x$enable_video" = "xno"],
-+  [],
-+  [test "x$win32" = "xno"],
-+  [AC_CHECK_HEADERS([linux/videodev.h], [have_v4l1="yes"])
-+   AC_CHECK_HEADERS([linux/videodev2.h], [have_v4l2="yes"])
-+   AS_IF([test "x$have_v4l2" = "xno" && test "x$have_v4l1" = "xno"],
-+     [AC_MSG_FAILURE([test for video support failed!
- rebuild your kernel to include video4linux support or
--configure --disable-video to skip building video support.])])
--       AC_CHECK_HEADERS([linux/videodev2.h], [with_video="v4l2"],
--         [AC_MSG_WARN([v4l2 API not detected, upgrade your kernel!])])],
--    [AC_CHECK_HEADERS([vfw.h], [with_video="vfw"],
--      [AC_MSG_FAILURE([test for VfW video support failed!
--configure --disable-video to skip building vidoe support.])])])
--])
-+configure --disable-video to skip building video support.])],
-+     [test "x$have_v4l2" = "xno"],
-+     [AC_MSG_WARN([v4l2 API not detected, upgrade your kernel!])])],
-+  [AC_CHECK_HEADERS([vfw.h], [with_video="vfw"],
-+    [AC_MSG_FAILURE([test for VfW video support failed!
-+configure --disable-video to skip building video support.])])])
-+
- AM_CONDITIONAL([HAVE_VIDEO], [test "x$enable_video" != "xno"])
--AM_CONDITIONAL([HAVE_V4L1],
--  [test "x$with_video" = "xv4l1" || test "x$with_video" = "xv4l2"])
--AM_CONDITIONAL([HAVE_V4L2], [test "x$with_video" = "xv4l2"])
-+AM_CONDITIONAL([HAVE_V4L1], [test "x$have_v4l1" != "xno"])
-+AM_CONDITIONAL([HAVE_V4L2], [test "x$have_v4l2" != "xno"])
- 
- dnl X
- AC_ARG_VAR([XSHM_LIBS], [linker flags for X shared memory extension])
-@@ -252,51 +288,105 @@
- ])
- AM_CONDITIONAL([HAVE_JPEG], [test "x$with_jpeg" = "xyes"])
- 
--dnl ImageMagick
-+dnl ImageMagick or GraphicsMagick
-+dnl disable both if IM is explicitly disabled to preserve old behavior
-+
- AC_ARG_WITH([imagemagick],
-   [AS_HELP_STRING([--without-imagemagick],
--    [disable support for scanning images using ImageMagick])],
-+    [disable support for scanning images with ImageMagick])],
-   [],
--  [with_imagemagick="yes"])
-+  [with_imagemagick="check"])
- 
--AS_IF([test "x$with_imagemagick" != "xno"],
--  [PKG_CHECK_MODULES([MAGICK], [MagickWand >= 6.2.6], [],
--     [dnl Wand is deprecated in favor of MagickWand,
--      dnl but the latter doesn't exist in older verisons (bug #2848437)
-+AC_ARG_WITH([graphicsmagick],
-+  [AS_HELP_STRING([--with-graphicsmagick],
-+    [use GraphicsMagick alternative to ImageMagick])],
-+  [],
-+  [with_graphicsmagick="check"])
-+
-+magick="UnknownMagick"
-+have_IM="maybe"
-+AS_IF([test "x$with_imagemagick" = "xno"], [],
-+      [test "x$with_imagemagick" = "xyes" || \
-+       test "x$with_graphicsmagick" != "xyes"],
-+  [looked_for="ImageMagick >= 6.2.6"
-+   PKG_CHECK_MODULES([MAGICK], [MagickWand >= 6.2.6],
-+     [MAGICK_VERSION=`$PKG_CONFIG MagickWand --modversion`],
-+     [dnl
-+dnl Wand is deprecated in favor of MagickWand,
-+dnl but the latter doesn't exist in older verisons (bug #2848437)
-       saved_error=$MAGICK_PKG_ERRORS
--      PKG_CHECK_MODULES([MAGICK], [Wand >= 6.2.6], [],
--        [AC_MSG_FAILURE([dnl
--Unable to find ImageMagick >= 6.2.6:
-+      PKG_CHECK_MODULES([MAGICK], [Wand >= 6.2.6],
-+        [MAGICK_VERSION=`$PKG_CONFIG Wand --modversion`],
-+        [have_IM="no"])])
-+   AS_IF([test "x$have_IM" != "xno"],
-+     [magick="ImageMagick"
-+      AC_MSG_NOTICE([trying ImageMagick version $MAGICK_VERSION])
-+dnl double check ImageMagick install (bug #2582232)
-+      CPPFLAGS_save="$CPPFLAGS"
-+      CPPFLAGS="$CPPFLAGS $MAGICK_CFLAGS"
-+      AC_CHECK_HEADER([wand/MagickWand.h],
-+        [have_IM="yes"],
-+        [have_IM="broken"])
-+      CPPFLAGS="$CPPFLAGS_save"])])
-+
-+have_GM="maybe"
-+AS_IF([test "x$have_IM" = "xyes"], [],
-+      [test "x$with_graphicsmagick" = "xno"], [],
-+      [test "x$with_graphicsmagick" = "xyes" || \
-+       test "x$with_imagemagick" = "xcheck"],
-+  [AS_IF([test "x$looked_for" = "x"],
-+     [looked_for="GraphicsMagick"],
-+     [looked_for="$looked_for or GraphicsMagick"])
-+   PKG_CHECK_MODULES([MAGICK], [GraphicsMagickWand],
-+     [have_GM="yes"
-+      magick="GraphicsMagick"
-+      MAGICK_VERSION=`$PKG_CONFIG GraphicsMagickWand --modversion`],
-+     [have_GM="no"
-+      AS_IF([test "x$saved_error" = "x"],
-+        [saved_error=$MAGICK_PKG_ERRORS])])])
-+
-+dnl now that we have collected all the info abt what Magick is available
-+dnl let the user know what we will or can't do
-+AS_IF([test "x$have_IM" = "xbroken" && test "x$have_GM" = "xyes"],
-+  [AC_MSG_WARN([Your ImageMagick install is broken, using GraphicsMagick instead])])
-+
-+AS_IF([test "x$have_IM" = "xyes" || test "x$have_GM" = "xyes"],
-+  [AC_MSG_NOTICE([using $magick version $MAGICK_VERSION])],
-+  [test "x$with_imagemagick" = "xno" && \
-+   test "x$with_graphicsmagick" != "xyes"],
-+  [AC_MSG_NOTICE([image scanning disabled -- zbarimg will *not* be built])],
-+  [test "x$have_IM" = "xbroken"],
-+  [AC_MSG_FAILURE([$magick package found but wand/MagickWand.h not installed?!
-+this is a problem with your $magick install, please try again after
-+resolving the inconsistency or installing GraphicsMagick alternative...])],
-+  [AC_MSG_FAILURE([dnl
-+Unable to find $looked_for:
- 
- $saved_error
- 
--* Ensure that you installed any "development" packages for ImageMagick.
-+* Ensure that you installed any "development" packages for ImageMagick or
-+  GraphicsMagick.
- * Consider adjusting the PKG_CONFIG_PATH environment variable if you
-   installed software in a non-standard prefix.
- * You may set the environment variables MAGICK_CFLAGS and MAGICK_LIBS
-   to avoid the need to call pkg-config.
-   See the pkg-config man page for more details.
--* To avoid using ImageMagick altogether you may add the --without-imagemagick
--  flag to the configure command; the zbarimg program will not be built.
--])])])
--   MAGICK_VERSION=`$PKG_CONFIG MagickWand --modversion`
--   AC_MSG_NOTICE([using ImageMagick version $MAGICK_VERSION])
-+* To avoid using ImageMagick or GraphicsMagick altogether you may add the
-+  --without-imagemagick flag to the configure command; the zbarimg program
-+  will *not* be built.
-+])])
- 
--dnl double check ImageMagick install (bug #2582232)
--   CPPFLAGS_save="$CPPFLAGS"
--   CPPFLAGS="$CPPFLAGS $MAGICK_CFLAGS"
--   AC_CHECK_HEADER([wand/MagickWand.h], [],
--     [AC_MSG_FAILURE([ImageMagick package found but wand/MagickWand.h not installed?!
--this is a problem with your ImageMagick install,
--please resolve the inconsistency and try again...])])
--   CPPFLAGS="$CPPFLAGS_save"])
--
--AM_CONDITIONAL([HAVE_MAGICK], [test "x$with_imagemagick" = "xyes"])
-+AS_IF([test "x$have_IM" = "xyes"],
-+  [AC_DEFINE([HAVE_IMAGEMAGICK], [1], [Define to 1 to use ImageMagick])],
-+  [test "x$have_GM" = "xyes"],
-+  [AC_DEFINE([HAVE_GRAPHICSMAGICK], [1], [Define to 1 to use GraphicsMagick])])
-+AM_CONDITIONAL([HAVE_MAGICK],
-+  [test "x$have_IM" = "xyes" || test "x$have_GM" = "xyes"])
- 
- dnl Mozilla NPAPI
- AC_ARG_WITH([npapi],
-   [AS_HELP_STRING([--with-npapi],
--    [enable support for Firefox/Mozilla/OpenOffice NPAPI plugin])],
-+    [enable support for Firefox/Mozilla/OpenOffice plugin])],
-   [],
-   [with_npapi="no"])
- 
-@@ -350,7 +440,16 @@
-      [test -x "$PYTHON-config"],
-      [PYTHON_CFLAGS=`$PYTHON-config --cflags`],
-      [PYTHON_CFLAGS=`$PYTHON -c 'import distutils.sysconfig as s; print " ".join(s.get_config_vars("CFLAGS")) + " -I"+s.get_python_inc() + " -I"+s.get_python_inc(plat_specific=True)'`])
--dnl FIXME now should check that #include <Python.h> compiles
-+
-+dnl check that #include <Python.h> compiles (bug #3092663)
-+   CPPFLAGS_save="$CPPFLAGS"
-+   CPPFLAGS="$CPPFLAGS $PYTHON_CFLAGS"
-+   AC_CHECK_HEADER([Python.h], [], [AC_MSG_ERROR([dnl
-+Python module enabled, but unable to compile Python.h.
-+Install the development package for python-$am_cv_python_version, or configure
-+--without-python to disable the python bindings.dnl
-+])])
-+   CPPFLAGS="$CPPFLAGS_save"
- 
-    AS_IF([test "x$with_gtk" = "xyes"],
-      [PKG_CHECK_MODULES([PYGTK], [pygtk-2.0])
-@@ -383,13 +482,39 @@
- 
- AM_CONDITIONAL([HAVE_QT], [test "x$with_qt" = "xyes"])
- 
-+dnl Java
-+AC_ARG_WITH([java],
-+  [AS_HELP_STRING([--without-java],
-+    [disable support for Java interface])],
-+  [],
-+  [with_java="check"])
-+
-+AC_ARG_VAR([JAVA_CFLAGS], [compiler flags for building JNI extensions])
-+AS_IF([test "x$JAVA_CFLAGS" = "x" && test "x$JAVA_HOME" != "x"],
-+  [JAVA_CFLAGS="-I$JAVA_HOME/include"])
-+
-+AS_IF([test "x$with_java" != "xno"],
-+  [CPPFLAGS_save="$CPPFLAGS"
-+   CPPFLAGS="$CPPFLAGS $JAVA_CFLAGS"
-+   AC_CHECK_HEADER([jni.h], [], [have_java="no"])
-+   CPPFLAGS="$CPPFLAGS_save"
-+   AS_IF([test "x$have_java" != "xno"],
-+     [with_java="yes"],
-+     [test "x$with_java" = "xyes"],
-+     [AC_MSG_FAILURE([unable to find Java JNI! ensure CFLAGS are set
-+appropriately or configure --without-java])],
-+     [with_java="no"])
-+])
-+AM_CONDITIONAL([HAVE_JAVA], [test "x$with_java" = "xyes"])
-+
- 
- dnl header files
- 
- dnl FIXME switches for shm, mmap
- AC_HEADER_ASSERT
--AC_CHECK_HEADERS([fcntl.h features.h inttypes.h stdlib.h string.h unistd.h \
--  sys/ioctl.h sys/time.h sys/times.h sys/ipc.h sys/shm.h sys/mman.h])
-+AC_CHECK_HEADERS([errno.h fcntl.h features.h inttypes.h stdlib.h string.h \
-+  unistd.h sys/types.h sys/stat.h sys/ioctl.h sys/time.h sys/times.h \
-+  sys/ipc.h sys/shm.h sys/mman.h])
- 
- dnl types
- 
-@@ -428,6 +553,7 @@
- 
- AC_CONFIG_FILES([
- Makefile
-+java/Makefile
- zbar.pc
- zbar-gtk.pc
- zbar-qt.pc
-@@ -448,8 +574,10 @@
- echo "jpeg              --with-jpeg=$with_jpeg"
- AS_IF([test "x$with_jpeg" != "xyes"],
-   [echo "        => JPEG image conversions will *NOT* be supported"])
--echo "Magick++          --with-imagemagick=$with_imagemagick"
--AS_IF([test "x$with_imagemagick" != "xyes"],
-+AS_IF([test "x$have_GM" = "xyes"],
-+  [echo "GraphicsMagick    --with-graphicsmagick=yes"],
-+  [echo "ImageMagick       --with-imagemagick=$with_imagemagick"])
-+AS_IF([test "x$have_IM" != "xyes" && test "x$have_GM" != "xyes"],
-   [echo "        => the zbarimg file scanner will *NOT* be built"])
- echo "Python            --with-python=$with_python"
- echo "GTK+              --with-gtk=$with_gtk"
-@@ -460,6 +588,9 @@
- echo "Qt4               --with-qt=$with_qt"
- AS_IF([test "x$with_qt" != "xyes"],
-   [echo "        => the Qt4 widget will *NOT* be built"])
-+echo "Java              --with-java=$with_java"
-+AS_IF([test "x$with_java" != "xyes"],
-+  [echo "        => the Java interface will *NOT* be built"])
- #echo "NPAPI Plugin     --with-npapi=$with_npapi"
- #AS_IF([test "x$with_mozilla" != "xyes"],
- #  [echo "       => the Mozilla/Firefox/OpenOffice plugin will *NOT* be built"])
-diff -r 563557a923d0 doc/Makefile.am.inc
---- a/doc/Makefile.am.inc	Tue Oct 27 11:25:59 2009 -0400
-+++ b/doc/Makefile.am.inc	Fri Feb 22 08:54:29 2013 -0300
-@@ -2,6 +2,7 @@
- DOCSOURCES = doc/manual.xml doc/version.xml doc/reldate.xml \
-     doc/ref/zbarimg.xml doc/ref/zbarcam.xml doc/ref/commonoptions.xml
- 
-+MAINTAINERCLEANFILES += doc/man/man.stamp doc/version.xml doc/reldate.xml
- 
- # man page targets to distribute and install
- dist_man_MANS =
-diff -r 563557a923d0 doc/api/footer.html
---- a/doc/api/footer.html	Tue Oct 27 11:25:59 2009 -0400
-+++ b/doc/api/footer.html	Fri Feb 22 08:54:29 2013 -0300
-@@ -9,9 +9,12 @@
- 
- <address><a href="mailto:spadix@users.sourceforge.net">spadix@users.sourceforge.net</a></address>
- 
--<p>Copyright 2008-2009 (c) Jeff Brown - All Rights Reserved.</p>
--<p>Verbatim copying and distribution of this entire article are
--  permitted worldwide, without royalty, in any medium, provided this
--  notice, and the copyright notice, are preserved.</p>
-+<p>Copyright 2008-2010 (c) Jeff Brown</p>
-+<p>This documentation is part of the ZBar Barcode Reader; you can
-+redistribute it and/or modify it under the terms of the
-+<a href="http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html">GNU
-+Lesser General Public License</a> as published by the Free Software
-+Foundation; either version 2.1 of the License, or (at your option) any
-+later version.</p>
- 
- </body></html>
-diff -r 563557a923d0 doc/manual.xml
---- a/doc/manual.xml	Tue Oct 27 11:25:59 2009 -0400
-+++ b/doc/manual.xml	Fri Feb 22 08:54:29 2013 -0300
-@@ -29,10 +29,10 @@
-       <year>2007</year>
-       <year>2008</year>
-       <year>2009</year>
-+      <year>2010</year>
-       <holder>Jeff Brown</holder>
-     </copyright>
-     <legalnotice><para>All Rights Reserved</para></legalnotice>
--    <!-- <legalnotice><para>insert GNU FDL header?</para></legalnotice> -->
-   </bookinfo>
- 
-   <chapter id="intro">
-@@ -47,7 +47,4 @@
-     &refzbarimg;
- 
-   </reference>
--
--  <!-- insert GNU FDL? -->
--
- </book>
-diff -r 563557a923d0 doc/ref/commonoptions.xml
---- a/doc/ref/commonoptions.xml	Tue Oct 27 11:25:59 2009 -0400
-+++ b/doc/ref/commonoptions.xml	Fri Feb 22 08:54:29 2013 -0300
-@@ -47,8 +47,9 @@
-       <option>ean13</option>, <option>ean8</option>,
-       <option>upca</option>, <option>upce</option>,
-       <option>isbn13</option>, <option>isbn10</option>,
--      <option>i25</option>, <option>code39</option>,
--      <option>code128</option> or the special value <option>*</option>.
-+      <option>i25</option>, <option>codabar</option>, <option>code39</option>,
-+      <option>code93</option>, <option>code128</option>,
-+      <option>qrcode</option> or the special value <option>*</option>.
-       If <replaceable class="parameter">symbology</replaceable> is
-       omitted or <option>*</option>, the <replaceable
-       class="parameter">config</replaceable> will be set for all
-@@ -128,11 +129,12 @@
-           If a decode result is outside the configured min/max range
-           (inclusive), it will not be reported.  Set to 0 to disable the
-           corresponding check.  This setting applies to variable-length
--          symbologies: <option>i25</option>, <option>code39</option>,
--          <option>code128</option> and <option>pdf417</option>.
--          <option>min-length</option> defaults to 6 for <option>i25</option>
--          and 1 for <option>code39</option> (per Code 39 autodiscrimination
--          recommendation); all others default to 0</simpara>
-+          symbologies: <option>i25</option>, <option>codabar</option>,
-+          <option>code39</option>, <option>code128</option> and
-+          <option>pdf417</option>. <option>min-length</option> defaults to 6
-+          for <option>i25</option> and 1 for <option>code39</option> (per Code
-+          39 autodiscrimination recommendation); all others default to
-+          0</simpara>
-         </listitem>
-       </varlistentry>
- 
-diff -r 563557a923d0 doc/ref/zbarcam.xml
---- a/doc/ref/zbarcam.xml	Tue Oct 27 11:25:59 2009 -0400
-+++ b/doc/ref/zbarcam.xml	Fri Feb 22 08:54:29 2013 -0300
-@@ -60,9 +60,10 @@
-     <filename>/dev/video0</filename></para>
- 
-     <para>The underlying library currently supports EAN-13 (including
--    UPC and ISBN subsets), EAN-8, Code 128, Code 39, and Interleaved
--    2 of 5 symbologies.  The specific type of each detected symbol is
--    printed with the decoded data.</para>
-+    UPC and ISBN subsets), EAN-8, DataBar, DataBar Expanded, Code 128,
-+    Code 93, Code 39, Codabar, Interleaved 2 of 5 and QR Code symbologies.
-+    The specific type of each detected symbol is printed with the decoded
-+    data.</para>
- 
-   </refsection>
- 
-@@ -160,6 +161,37 @@
-   </refsection>
- 
-   <refsection>
-+    <title>Exit Status</title>
-+
-+    <para><command>zbarcam</command> returns an exit code to indicate the
-+    status of the program execution. Current exit codes are:</para>
-+
-+    <variablelist>
-+      <varlistentry>
-+        <term>0</term>
-+        <listitem>
-+          <para>Successful program completion.</para>
-+        </listitem>
-+      </varlistentry>
-+
-+      <varlistentry>
-+        <term>1</term>
-+        <listitem>
-+          <para>An error occurred.  This includes bad arguments and I/O
-+          errors.</para>
-+        </listitem>
-+      </varlistentry>
-+
-+      <varlistentry>
-+        <term>2</term>
-+        <listitem>
-+          <para>A fatal error occurred.</para>
-+        </listitem>
-+      </varlistentry>
-+    </variablelist>
-+  </refsection>
-+
-+  <refsection>
-     <title>See Also</title>
-     <para><xref linkend="zbarimg"/></para>
-     <para><link xlink:href="http://zbar.sf.net/"/></para>
-diff -r 563557a923d0 doc/ref/zbarimg.xml
---- a/doc/ref/zbarimg.xml	Tue Oct 27 11:25:59 2009 -0400
-+++ b/doc/ref/zbarimg.xml	Fri Feb 22 08:54:29 2013 -0300
-@@ -59,9 +59,10 @@
-     displayed to the screen.</para>
- 
-     <para>The underlying library currently supports EAN-13 (including
--    UPC and ISBN subsets), EAN-8, Code 128, Code 39, and Interleaved
--    2 of 5 symbologies.  The specific type of each detected symbol is
--    printed with the decoded data.</para>
-+    UPC and ISBN subsets), EAN-8, DataBar, DataBar Expanded, Code 128,
-+    Code 93, Code 39, Codabar, Interleaved 2 of 5 and QR Code symbologies.
-+    The specific type of each detected symbol is printed with the decoded
-+    data.</para>
- 
-     <para>Note that "<filename><replaceable>image</replaceable></filename>"
- 
-@@ -166,6 +167,56 @@
-   </refsection>
- 
-   <refsection>
-+    <title>Exit Status</title>
-+
-+    <para><command>zbarimg</command> returns an exit code to indicate the
-+    status of the program execution. Current exit codes are:</para>
-+
-+    <variablelist>
-+      <varlistentry>
-+        <term>0</term>
-+        <listitem>
-+          <para>Barcodes successfully detected in all images. Warnings may
-+          have been generated, but no errors.</para>
-+        </listitem>
-+      </varlistentry>
-+
-+      <varlistentry>
-+        <term>1</term>
-+        <listitem>
-+          <para>An error occurred while processing some image(s).  This
-+          includes bad arguments, I/O errors and image handling errors from
-+          ImageMagick.</para>
-+        </listitem>
-+      </varlistentry>
-+
-+      <varlistentry>
-+        <term>2</term>
-+        <listitem>
-+          <para>ImageMagick fatal error.</para>
-+        </listitem>
-+      </varlistentry>
-+
-+      <varlistentry>
-+        <term>3</term>
-+        <listitem>
-+          <para>The user quit the program before all images were scanned.
-+          Only applies when running in interactive mode
-+          (with <option>--display</option>)</para>
-+        </listitem>
-+      </varlistentry>
-+
-+      <varlistentry>
-+        <term>4</term>
-+        <listitem>
-+          <para>No barcode was detected in one or more of the images.  No
-+          other errors occurred.</para>
-+        </listitem>
-+      </varlistentry>
-+    </variablelist>
-+  </refsection>
-+
-+  <refsection>
-     <title>See Also</title>
-     <para><xref linkend="zbarcam"/></para>
-     <para><link xlink:href="http://zbar.sf.net/"/></para>
-diff -r 563557a923d0 examples/paginate.pl
---- a/examples/paginate.pl	Tue Oct 27 11:25:59 2009 -0400
-+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
-@@ -1,71 +0,0 @@
--#!/usr/bin/perl
--#------------------------------------------------------------------------
--#  Copyright 2009 (c) Jeff Brown <spadix@users.sourceforge.net>
--#
--#  This file is part of the ZBar Bar Code Reader.
--#
--#  The ZBar Bar Code Reader is free software; you can redistribute it
--#  and/or modify it under the terms of the GNU Lesser Public License as
--#  published by the Free Software Foundation; either version 2.1 of
--#  the License, or (at your option) any later version.
--#
--#  The ZBar Bar Code Reader is distributed in the hope that it will be
--#  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
--#  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--#  GNU Lesser Public License for more details.
--#
--#  You should have received a copy of the GNU Lesser Public License
--#  along with the ZBar Bar Code Reader; if not, write to the Free
--#  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
--#  Boston, MA  02110-1301  USA
--#
--#  http://sourceforge.net/projects/zbar
--#------------------------------------------------------------------------
--use warnings;
--use strict;
--
--use Barcode::ZBar;
--use Image::Magick;
--
--warn("no input files specified?\n") if(!@ARGV);
--
--# running output document
--my $out = undef;
--
--# barcode scanner
--my $scanner = Barcode::ZBar::ImageScanner->new();
--
--foreach my $file (@ARGV) {
--    print "scanning from \"$file\"\n";
--    my $imseq = Image::Magick->new();
--    my $err = $imseq->Read($file);
--    warn($err) if($err);
--
--    foreach my $page (@$imseq) {
--        # convert ImageMagick page to ZBar image
--        my $zimg = Barcode::ZBar::Image->new();
--        $zimg->set_format('Y800');
--        $zimg->set_size($page->Get(qw(columns rows)));
--        $zimg->set_data($page->Clone()->ImageToBlob(magick => 'GRAY', depth => 8));
--
--        # scan for barcodes
--        if($scanner->scan_image($zimg)) {
--            # write out previous document
--            $out->write() if($out);
--
--            # use first symbol found to name next image (FIXME sanitize)
--            my $data = ($zimg->get_symbols())[0]->get_data();
--            my $idx = $page->Get('scene') + 1;
--            print "splitting $data from page $idx\n";
--
--            # create new output document
--            $out = Image::Magick->new(filename => $data);
--        }
--
--        # append this page to current output
--        push(@$out, $page) if($out);
--    }
--
--    # write out final document
--    $out->write() if($out);
--}
-diff -r 563557a923d0 examples/processor.c
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/examples/processor.c	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,47 @@
-+#include <stdio.h>
-+#include <zbar.h>
-+
-+static void my_handler (zbar_image_t *image,
-+                        const void *userdata)
-+{
-+    /* extract results */
-+    const zbar_symbol_t *symbol = zbar_image_first_symbol(image);
-+    for(; symbol; symbol = zbar_symbol_next(symbol)) {
-+        /* do something useful with results */
-+        zbar_symbol_type_t typ = zbar_symbol_get_type(symbol);
-+        const char *data = zbar_symbol_get_data(symbol);
-+        printf("decoded %s symbol \"%s\"\n",
-+               zbar_get_symbol_name(typ), data);
-+    }
-+}
-+
-+int main (int argc, char **argv)
-+{
-+    const char *device = "/dev/video0";
-+
-+    /* create a Processor */
-+    zbar_processor_t *proc = zbar_processor_create(1);
-+
-+    /* configure the Processor */
-+    zbar_processor_set_config(proc, 0, ZBAR_CFG_ENABLE, 1);
-+
-+    /* initialize the Processor */
-+    if(argc > 1)
-+        device = argv[1];
-+    zbar_processor_init(proc, device, 1);
-+
-+    /* setup a callback */
-+    zbar_processor_set_data_handler(proc, my_handler, NULL);
-+
-+    /* enable the preview window */
-+    zbar_processor_set_visible(proc, 1);
-+    zbar_processor_set_active(proc, 1);
-+
-+    /* keep scanning until user provides key/mouse input */
-+    zbar_processor_user_wait(proc, -1);
-+
-+    /* clean up */
-+    zbar_processor_destroy(proc);
-+
-+    return(0);
-+}
-diff -r 563557a923d0 examples/processor.cpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/examples/processor.cpp	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,45 @@
-+#include <iostream>
-+#include <zbar.h>
-+
-+using namespace std;
-+using namespace zbar;
-+
-+class MyHandler : public Image::Handler
-+{
-+    void image_callback (Image &image)
-+    {
-+        for(SymbolIterator symbol = image.symbol_begin();
-+            symbol != image.symbol_end();
-+            ++symbol)
-+            cout << "decoded " << symbol->get_type_name() << " symbol "
-+                 << "\"" << symbol->get_data() << "\"" << endl;
-+    }
-+};
-+
-+int main (int argc, char **argv)
-+{
-+    // create and initialize a Processor
-+    const char *device = "/dev/video0";
-+    if(argc > 1)
-+        device = argv[1];
-+    Processor proc(true, device);
-+
-+    // configure the Processor
-+    proc.set_config(ZBAR_NONE, ZBAR_CFG_ENABLE, 1);
-+
-+    // setup a callback
-+    MyHandler my_handler;
-+    proc.set_handler(my_handler);
-+
-+    // enable the preview window
-+    proc.set_visible();
-+    proc.set_active();
-+
-+    try {
-+        // keep scanning until user provides key/mouse input
-+        proc.user_wait();
-+    }
-+    catch(ClosedError &e) {
-+    }
-+    return(0);
-+}
-diff -r 563557a923d0 examples/processor.pl
---- a/examples/processor.pl	Tue Oct 27 11:25:59 2009 -0400
-+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
-@@ -1,35 +0,0 @@
--#!/usr/bin/env perl
--use warnings;
--use strict;
--require Barcode::ZBar;
--
--# create a Processor
--my $proc = Barcode::ZBar::Processor->new();
--
--# configure the Processor
--$proc->parse_config("enable");
--
--# initialize the Processor
--$proc->init($ARGV[0] || '/dev/video0');
--
--# setup a callback
--sub my_handler {
--    my ($proc, $image, $closure) = @_;
--
--    # extract results
--    foreach my $symbol ($proc->get_results()) {
--        # do something useful with results
--        print('decoded ' . $symbol->get_type() .
--              ' symbol "' . $symbol->get_data() . "\"\n");
--    }
--}
--$proc->set_data_handler(\&my_handler);
--
--# enable the preview window
--$proc->set_visible();
--
--# initiate scanning
--$proc->set_active();
--
--# keep scanning until user provides key/mouse input
--$proc->user_wait();
-diff -r 563557a923d0 examples/processor.py
---- a/examples/processor.py	Tue Oct 27 11:25:59 2009 -0400
-+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
-@@ -1,35 +0,0 @@
--#!/usr/bin/python
--from sys import argv
--import zbar
--
--# create a Processor
--proc = zbar.Processor()
--
--# configure the Processor
--proc.parse_config('enable')
--
--# initialize the Processor
--device = '/dev/video0'
--if len(argv) > 1:
--    device = argv[1]
--proc.init(device)
--
--# setup a callback
--def my_handler(proc, image, closure):
--    # extract results
--    for symbol in image.symbols:
--        # do something useful with results
--        print 'decoded', symbol.type, 'symbol', '"%s"' % symbol.data
--
--proc.set_data_handler(my_handler)
--
--# enable the preview window
--proc.visible = True
--
--# initiate scanning
--proc.active = True
--try:
--    # keep scanning until user provides key/mouse input
--    proc.user_wait()
--except zbar.WindowClosed, e:
--    pass
-diff -r 563557a923d0 examples/read_one.pl
---- a/examples/read_one.pl	Tue Oct 27 11:25:59 2009 -0400
-+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
-@@ -1,29 +0,0 @@
--#!/usr/bin/env perl
--use warnings;
--use strict;
--require Barcode::ZBar;
--
--# create a Processor
--my $proc = Barcode::ZBar::Processor->new();
--
--# configure the Processor
--$proc->parse_config("enable");
--
--# initialize the Processor
--$proc->init($ARGV[0] || '/dev/video0');
--
--# enable the preview window
--$proc->set_visible();
--
--# read at least one barcode (or until window closed)
--$proc->process_one();
--
--# hide the preview window
--$proc->set_visible(0);
--
--# extract results
--foreach my $symbol ($proc->get_results()) {
--  # do something useful with results
--  print('decoded ' . $symbol->get_type() .
--        ' symbol "' . $symbol->get_data() . "\"\n");
--}
-diff -r 563557a923d0 examples/read_one.py
---- a/examples/read_one.py	Tue Oct 27 11:25:59 2009 -0400
-+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
-@@ -1,29 +0,0 @@
--#!/usr/bin/python
--from sys import argv
--import zbar
--
--# create a Processor
--proc = zbar.Processor()
--
--# configure the Processor
--proc.parse_config('enable')
--
--# initialize the Processor
--device = '/dev/video0'
--if len(argv) > 1:
--    device = argv[1]
--proc.init(device)
--
--# enable the preview window
--proc.visible = True
--
--# read at least one barcode (or until window closed)
--proc.process_one()
--
--# hide the preview window
--proc.visible = False
--
--# extract results
--for symbol in proc.results:
--    # do something useful with results
--    print 'decoded', symbol.type, 'symbol', '"%s"' % symbol.data
-diff -r 563557a923d0 examples/scan_image.c
---- a/examples/scan_image.c	Tue Oct 27 11:25:59 2009 -0400
-+++ b/examples/scan_image.c	Fri Feb 22 08:54:29 2013 -0300
-@@ -3,6 +3,20 @@
- #include <png.h>
- #include <zbar.h>
- 
-+#if !defined(PNG_LIBPNG_VER) || \
-+    PNG_LIBPNG_VER < 10018 ||   \
-+    (PNG_LIBPNG_VER > 10200 &&  \
-+     PNG_LIBPNG_VER < 10209)
-+  /* Changes to Libpng from version 1.2.42 to 1.4.0 (January 4, 2010)
-+   * ...
-+   * 2. m. The function png_set_gray_1_2_4_to_8() was removed. It has been
-+   *       deprecated since libpng-1.0.18 and 1.2.9, when it was replaced with
-+   *       png_set_expand_gray_1_2_4_to_8() because the former function also
-+   *       expanded palette images.
-+   */
-+# define png_set_expand_gray_1_2_4_to_8 png_set_gray_1_2_4_to_8
-+#endif
-+
- zbar_image_scanner_t *scanner = NULL;
- 
- /* to complete a runnable example, this abbreviated implementation of
-@@ -30,7 +44,7 @@
-     if(color & PNG_COLOR_TYPE_PALETTE)
-         png_set_palette_to_rgb(png);
-     if(color == PNG_COLOR_TYPE_GRAY && bits < 8)
--        png_set_gray_1_2_4_to_8(png);
-+        png_set_expand_gray_1_2_4_to_8(png);
-     if(bits == 16)
-         png_set_strip_16(png);
-     if(color & PNG_COLOR_MASK_ALPHA)
-@@ -65,7 +79,7 @@
- 
-     /* wrap image data */
-     zbar_image_t *image = zbar_image_create();
--    zbar_image_set_format(image, *(int*)"Y800");
-+    zbar_image_set_format(image, zbar_fourcc('Y','8','0','0'));
-     zbar_image_set_size(image, width, height);
-     zbar_image_set_data(image, raw, width * height, zbar_image_free_data);
- 
-diff -r 563557a923d0 examples/scan_image.pl
---- a/examples/scan_image.pl	Tue Oct 27 11:25:59 2009 -0400
-+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
-@@ -1,37 +0,0 @@
--#!/usr/bin/perl
--use warnings;
--use strict;
--require Image::Magick;
--require Barcode::ZBar;
--
--$ARGV[0] || die;
--
--# create a reader
--my $scanner = Barcode::ZBar::ImageScanner->new();
--
--# configure the reader
--$scanner->parse_config("enable");
--
--# obtain image data
--my $magick = Image::Magick->new();
--$magick->Read($ARGV[0]) && die;
--my $raw = $magick->ImageToBlob(magick => 'GRAY', depth => 8);
--
--# wrap image data
--my $image = Barcode::ZBar::Image->new();
--$image->set_format('Y800');
--$image->set_size($magick->Get(qw(columns rows)));
--$image->set_data($raw);
--
--# scan the image for barcodes
--my $n = $scanner->scan_image($image);
--
--# extract results
--foreach my $symbol ($image->get_symbols()) {
--    # do something useful with results
--    print('decoded ' . $symbol->get_type() .
--          ' symbol "' . $symbol->get_data() . "\"\n");
--}
--
--# clean up
--undef($image);
-diff -r 563557a923d0 examples/scan_image.py
---- a/examples/scan_image.py	Tue Oct 27 11:25:59 2009 -0400
-+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
-@@ -1,31 +0,0 @@
--#!/usr/bin/python
--from sys import argv
--import zbar
--import Image
--
--if len(argv) < 2: exit(1)
--
--# create a reader
--scanner = zbar.ImageScanner()
--
--# configure the reader
--scanner.parse_config('enable')
--
--# obtain image data
--pil = Image.open(argv[1]).convert('L')
--width, height = pil.size
--raw = pil.tostring()
--
--# wrap image data
--image = zbar.Image(width, height, 'Y800', raw)
--
--# scan the image for barcodes
--scanner.scan(image)
--
--# extract results
--for symbol in image:
--    # do something useful with results
--    print 'decoded', symbol.type, 'symbol', '"%s"' % symbol.data
--
--# clean up
--del(image)
-diff -r 563557a923d0 examples/upcrpc.pl
---- a/examples/upcrpc.pl	Tue Oct 27 11:25:59 2009 -0400
-+++ b/examples/upcrpc.pl	Fri Feb 22 08:54:29 2013 -0300
-@@ -3,7 +3,7 @@
- use strict;
- use Frontier::Client;
- use Data::Dumper;
--my $s = Frontier::Client->new('url' => 'http://dev.upcdatabase.com/rpc');
-+my $s = Frontier::Client->new('url' => 'http://www.upcdatabase.com/rpc');
- 
- $| = 1; # autoflush
- 
-diff -r 563557a923d0 examples/upcrpc.py
---- a/examples/upcrpc.py	Tue Oct 27 11:25:59 2009 -0400
-+++ b/examples/upcrpc.py	Fri Feb 22 08:54:29 2013 -0300
-@@ -2,7 +2,7 @@
- from xmlrpclib import ServerProxy
- import sys, re
- 
--server = ServerProxy("http://dev.upcdatabase.com/rpc")
-+server = ServerProxy("http://www.upcdatabase.com/rpc")
- ean_re = re.compile(r'^(UPC-A:|EAN-13:)?(\d{11,13})$', re.M)
- 
- def lookup(decode):
-diff -r 563557a923d0 gtk/zbargtk.c
---- a/gtk/zbargtk.c	Tue Oct 27 11:25:59 2009 -0400
-+++ b/gtk/zbargtk.c	Fri Feb 22 08:54:29 2013 -0300
-@@ -1,5 +1,5 @@
- /*------------------------------------------------------------------------
-- *  Copyright 2008-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+ *  Copyright 2008-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-  *
-  *  This file is part of the ZBar Bar Code Reader.
-  *
-@@ -35,11 +35,6 @@
- #define DEFAULT_WIDTH 640
- #define DEFAULT_HEIGHT 480
- 
--/* adapted from v4l2 spec */
--#define fourcc(a, b, c, d)                      \
--    ((long)(a) | ((long)(b) << 8) |             \
--     ((long)(c) << 16) | ((long)(d) << 24))
--
- enum {
-     DECODED,
-     DECODED_TEXT,
-@@ -88,15 +83,15 @@
- 
-     /* these are all guesses... */
-     if(nchannels == 3 && bps == 8)
--        type = fourcc('R','G','B','3');
-+        type = zbar_fourcc('R','G','B','3');
-     else if(nchannels == 4 && bps == 8)
--        type = fourcc('B','G','R','4'); /* FIXME alpha flipped?! */
-+        type = zbar_fourcc('B','G','R','4'); /* FIXME alpha flipped?! */
-     else if(nchannels == 1 && bps == 8)
--        type = fourcc('Y','8','0','0');
-+        type = zbar_fourcc('Y','8','0','0');
-     else if(nchannels == 3 && bps == 5)
--        type = fourcc('R','G','B','R');
-+        type = zbar_fourcc('R','G','B','R');
-     else if(nchannels == 3 && bps == 4)
--        type = fourcc('R','4','4','4'); /* FIXME maybe? */
-+        type = zbar_fourcc('R','4','4','4'); /* FIXME maybe? */
-     else {
-         g_warning("unsupported combination: nchannels=%d bps=%d\n",
-                   nchannels, bps);
-@@ -142,10 +137,6 @@
- 
-     gdk_threads_enter();
- 
--    zbar->req_width = DEFAULT_WIDTH;
--    zbar->req_height = DEFAULT_HEIGHT;
--    gtk_widget_queue_resize(GTK_WIDGET(self));
--
-     zbar->video_opened = FALSE;
-     if(zbar->thread)
-         g_object_notify(G_OBJECT(self), "video-opened");
-@@ -184,6 +175,10 @@
-          */
-         gdk_threads_enter();
- 
-+        if(zbar->video_width && zbar->video_height)
-+            zbar_video_request_size(zbar->video,
-+                                    zbar->video_width, zbar->video_height);
-+
-         video_opened = !zbar_negotiate_format(zbar->video, zbar->window);
- 
-         if(video_opened) {
-@@ -209,7 +204,7 @@
-     if(!image)
-         return(-1);
- 
--    zbar_image_t *tmp = zbar_image_convert(image, fourcc('Y','8','0','0'));
-+    zbar_image_t *tmp = zbar_image_convert(image, zbar_fourcc('Y','8','0','0'));
-     if(!tmp)
-         return(-1);
- 
-@@ -236,7 +231,6 @@
- 
-                 /* FIXME skip this when unconnected? */
-                 gchar *text = g_strconcat(zbar_get_symbol_name(type),
--                                          zbar_get_addon_name(type),
-                                           ":",
-                                           data,
-                                           NULL);
-@@ -560,6 +554,19 @@
-     return(zbar->video_opened);
- }
- 
-+void zbar_gtk_request_video_size (ZBarGtk *self,
-+                                  int width,
-+                                  int height)
-+{
-+    if(!self->_private || width < 0 || height < 0)
-+        return;
-+    ZBarGtkPrivate *zbar = ZBAR_GTK_PRIVATE(self->_private);
-+
-+    zbar->req_width = zbar->video_width = width;
-+    zbar->req_height = zbar->video_height = height;
-+    gtk_widget_queue_resize(GTK_WIDGET(self));
-+}
-+
- static void zbar_gtk_set_property (GObject *object,
-                                    guint prop_id,
-                                    const GValue *value,
-@@ -613,8 +620,8 @@
-     zbar->window = zbar_window_create();
-     g_assert(zbar->window);
- 
--    zbar->req_width = DEFAULT_WIDTH;
--    zbar->req_height = DEFAULT_HEIGHT;
-+    zbar->req_width = zbar->video_width = DEFAULT_WIDTH;
-+    zbar->req_height = zbar->video_width = DEFAULT_HEIGHT;
- 
-     /* spawn a thread to handle decoding and video */
-     zbar->queue = g_async_queue_new();
-diff -r 563557a923d0 gtk/zbargtkprivate.h
---- a/gtk/zbargtkprivate.h	Tue Oct 27 11:25:59 2009 -0400
-+++ b/gtk/zbargtkprivate.h	Fri Feb 22 08:54:29 2013 -0300
-@@ -71,6 +71,7 @@
-      * protected by main gui lock
-      */
-     unsigned req_width, req_height;
-+    unsigned video_width, video_height;
-     gboolean video_opened;
- 
-     /* window is shared: owned by main gui thread.
-diff -r 563557a923d0 include/zbar.h
---- a/include/zbar.h	Tue Oct 27 11:25:59 2009 -0400
-+++ b/include/zbar.h	Fri Feb 22 08:54:29 2013 -0300
-@@ -1,5 +1,5 @@
- /*------------------------------------------------------------------------
-- *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-  *
-  *  This file is part of the ZBar Bar Code Reader.
-  *
-@@ -86,23 +86,58 @@
- typedef enum zbar_symbol_type_e {
-     ZBAR_NONE        =      0,  /**< no symbol decoded */
-     ZBAR_PARTIAL     =      1,  /**< intermediate status */
-+    ZBAR_EAN2        =      2,  /**< GS1 2-digit add-on */
-+    ZBAR_EAN5        =      5,  /**< GS1 5-digit add-on */
-     ZBAR_EAN8        =      8,  /**< EAN-8 */
-     ZBAR_UPCE        =      9,  /**< UPC-E */
-     ZBAR_ISBN10      =     10,  /**< ISBN-10 (from EAN-13). @since 0.4 */
-     ZBAR_UPCA        =     12,  /**< UPC-A */
-     ZBAR_EAN13       =     13,  /**< EAN-13 */
-     ZBAR_ISBN13      =     14,  /**< ISBN-13 (from EAN-13). @since 0.4 */
-+    ZBAR_COMPOSITE   =     15,  /**< EAN/UPC composite */
-     ZBAR_I25         =     25,  /**< Interleaved 2 of 5. @since 0.4 */
-+    ZBAR_DATABAR     =     34,  /**< GS1 DataBar (RSS). @since 0.11 */
-+    ZBAR_DATABAR_EXP =     35,  /**< GS1 DataBar Expanded. @since 0.11 */
-+    ZBAR_CODABAR     =     38,  /**< Codabar. @since 0.11 */
-     ZBAR_CODE39      =     39,  /**< Code 39. @since 0.4 */
-     ZBAR_PDF417      =     57,  /**< PDF417. @since 0.6 */
-     ZBAR_QRCODE      =     64,  /**< QR Code. @since 0.10 */
-+    ZBAR_CODE93      =     93,  /**< Code 93. @since 0.11 */
-     ZBAR_CODE128     =    128,  /**< Code 128 */
--    ZBAR_SYMBOL      = 0x00ff,  /**< mask for base symbol type */
--    ZBAR_ADDON2      = 0x0200,  /**< 2-digit add-on flag */
--    ZBAR_ADDON5      = 0x0500,  /**< 5-digit add-on flag */
--    ZBAR_ADDON       = 0x0700,  /**< add-on flag mask */
-+
-+    /** mask for base symbol type.
-+     * @deprecated in 0.11, remove this from existing code
-+     */
-+    ZBAR_SYMBOL      = 0x00ff,
-+    /** 2-digit add-on flag.
-+     * @deprecated in 0.11, a ::ZBAR_EAN2 component is used for
-+     * 2-digit GS1 add-ons
-+     */
-+    ZBAR_ADDON2      = 0x0200,
-+    /** 5-digit add-on flag.
-+     * @deprecated in 0.11, a ::ZBAR_EAN5 component is used for
-+     * 5-digit GS1 add-ons
-+     */
-+    ZBAR_ADDON5      = 0x0500,
-+    /** add-on flag mask.
-+     * @deprecated in 0.11, GS1 add-ons are represented using composite
-+     * symbols of type ::ZBAR_COMPOSITE; add-on components use ::ZBAR_EAN2
-+     * or ::ZBAR_EAN5
-+     */
-+    ZBAR_ADDON       = 0x0700,
- } zbar_symbol_type_t;
- 
-+/** decoded symbol coarse orientation.
-+ * @since 0.11
-+ */
-+typedef enum zbar_orientation_e {
-+    ZBAR_ORIENT_UNKNOWN = -1,   /**< unable to determine orientation */
-+    ZBAR_ORIENT_UP,             /**< upright, read left to right */
-+    ZBAR_ORIENT_RIGHT,          /**< sideways, read top to bottom */
-+    ZBAR_ORIENT_DOWN,           /**< upside-down, read right to left */
-+    ZBAR_ORIENT_LEFT,           /**< sideways, read bottom to top */
-+} zbar_orientation_t;
-+
- /** error codes. */
- typedef enum zbar_error_e {
-     ZBAR_OK = 0,                /**< no error */
-@@ -133,12 +168,33 @@
-     ZBAR_CFG_MIN_LEN = 0x20,    /**< minimum data length for valid decode */
-     ZBAR_CFG_MAX_LEN,           /**< maximum data length for valid decode */
- 
-+    ZBAR_CFG_UNCERTAINTY = 0x40,/**< required video consistency frames */
-+
-     ZBAR_CFG_POSITION = 0x80,   /**< enable scanner to collect position data */
- 
-     ZBAR_CFG_X_DENSITY = 0x100, /**< image scanner vertical scan density */
-     ZBAR_CFG_Y_DENSITY,         /**< image scanner horizontal scan density */
- } zbar_config_t;
- 
-+/** decoder symbology modifier flags.
-+ * @since 0.11
-+ */
-+typedef enum zbar_modifier_e {
-+    /** barcode tagged as GS1 (EAN.UCC) reserved
-+     * (eg, FNC1 before first data character).
-+     * data may be parsed as a sequence of GS1 AIs
-+     */
-+    ZBAR_MOD_GS1 = 0,
-+
-+    /** barcode tagged as AIM reserved
-+     * (eg, FNC1 after first character or digit pair)
-+     */
-+    ZBAR_MOD_AIM,
-+
-+    /** number of modifiers */
-+    ZBAR_MOD_NUM,
-+} zbar_modifier_t;
-+
- /** retrieve runtime library version information.
-  * @param major set to the running major version (unless NULL)
-  * @param minor set to the running minor version (unless NULL)
-@@ -168,9 +224,32 @@
-  * @param sym symbol type encoding
-  * @returns static string name for any addon, or the empty string
-  * if no addons were decoded
-+ * @deprecated in 0.11
-  */
- extern const char *zbar_get_addon_name(zbar_symbol_type_t sym);
- 
-+/** retrieve string name for configuration setting.
-+ * @param config setting to name
-+ * @returns static string name for config,
-+ * or the empty string if value is not a known config
-+ */
-+extern const char *zbar_get_config_name(zbar_config_t config);
-+
-+/** retrieve string name for modifier.
-+ * @param modifier flag to name
-+ * @returns static string name for modifier,
-+ * or the empty string if the value is not a known flag
-+ */
-+extern const char *zbar_get_modifier_name(zbar_modifier_t modifier);
-+
-+/** retrieve string name for orientation.
-+ * @param orientation orientation encoding
-+ * @returns the static string name for the specified orientation,
-+ * or "UNKNOWN" if the orientation is not recognized
-+ * @since 0.11
-+ */
-+extern const char *zbar_get_orientation_name(zbar_orientation_t orientation);
-+
- /** parse a configuration string of the form "[symbology.]config[=value]".
-  * the config must match one of the recognized names.
-  * the symbology, if present, must match one of the recognized names.
-@@ -184,6 +263,30 @@
-                              zbar_config_t *config,
-                              int *value);
- 
-+/** consistently compute fourcc values across architectures
-+ * (adapted from v4l2 specification)
-+ * @since 0.11
-+ */
-+#define zbar_fourcc(a, b, c, d)                 \
-+        ((unsigned long)(a) |                   \
-+         ((unsigned long)(b) << 8) |            \
-+         ((unsigned long)(c) << 16) |           \
-+         ((unsigned long)(d) << 24))
-+
-+/** parse a fourcc string into its encoded integer value.
-+ * @since 0.11
-+ */
-+static inline unsigned long zbar_fourcc_parse (const char *format)
-+{
-+    unsigned long fourcc = 0;
-+    if(format) {
-+        int i;
-+        for(i = 0; i < 4 && format[i]; i++)
-+            fourcc |= ((unsigned long)format[i]) << (i * 8);
-+    }
-+    return(fourcc);
-+}
-+
- /** @internal type unsafe error API (don't use) */
- extern int _zbar_error_spew(const void *object,
-                             int verbosity);
-@@ -229,6 +332,20 @@
-  */
- extern zbar_symbol_type_t zbar_symbol_get_type(const zbar_symbol_t *symbol);
- 
-+/** retrieve symbology boolean config settings.
-+ * @returns a bitmask indicating which configs were set for the detected
-+ * symbology during decoding.
-+ * @since 0.11
-+ */
-+extern unsigned int zbar_symbol_get_configs(const zbar_symbol_t *symbol);
-+
-+/** retrieve symbology modifier flag settings.
-+ * @returns a bitmask indicating which characteristics were detected
-+ * during decoding.
-+ * @since 0.11
-+ */
-+extern unsigned int zbar_symbol_get_modifiers(const zbar_symbol_t *symbol);
-+
- /** retrieve data decoded from symbol.
-  * @returns the data string
-  */
-@@ -284,6 +401,14 @@
- extern int zbar_symbol_get_loc_y(const zbar_symbol_t *symbol,
-                                  unsigned index);
- 
-+/** retrieve general orientation of decoded symbol.
-+ * @returns a coarse, axis-aligned indication of symbol orientation or
-+ * ::ZBAR_ORIENT_UNKNOWN if unknown
-+ * @since 0.11
-+ */
-+extern zbar_orientation_t
-+zbar_symbol_get_orientation(const zbar_symbol_t *symbol);
-+
- /** iterate the set to which this symbol belongs (there can be only one).
-  * @returns the next symbol in the set, or
-  * @returns NULL when no more results are available
-@@ -357,6 +482,14 @@
- extern const zbar_symbol_t*
- zbar_symbol_set_first_symbol(const zbar_symbol_set_t *symbols);
- 
-+/** raw result iterator.
-+ * @returns the first decoded symbol result in a set, *before* filtering
-+ * @returns NULL if the set is empty
-+ * @since 0.11
-+ */
-+extern const zbar_symbol_t*
-+zbar_symbol_set_first_unfiltered(const zbar_symbol_set_t *symbols);
-+
- /*@}*/
- 
- /*------------------------------------------------------------*/
-@@ -456,6 +589,25 @@
-  */
- extern unsigned zbar_image_get_height(const zbar_image_t *image);
- 
-+/** retrieve both dimensions of the image.
-+ * fills in the width and height in samples
-+ */
-+extern void zbar_image_get_size(const zbar_image_t *image,
-+                                unsigned *width,
-+                                unsigned *height);
-+
-+/** retrieve the crop rectangle.
-+ * fills in the image coordinates of the upper left corner and size
-+ * of an axis-aligned rectangular area of the image that will be scanned.
-+ * defaults to the full image
-+ * @since 0.11
-+ */
-+extern void zbar_image_get_crop(const zbar_image_t *image,
-+                                unsigned *x,
-+                                unsigned *y,
-+                                unsigned *width,
-+                                unsigned *height);
-+
- /** return the image sample data.  the returned data buffer is only
-  * valid until zbar_image_destroy() is called
-  */
-@@ -505,12 +657,24 @@
-                                     unsigned sequence_num);
- 
- /** specify the pixel size of the image.
-+ * @note this also resets the crop rectangle to the full image
-+ * (0, 0, width, height)
-  * @note this does not affect the data!
-  */
- extern void zbar_image_set_size(zbar_image_t *image,
-                                 unsigned width,
-                                 unsigned height);
- 
-+/** specify a rectangular region of the image to scan.
-+ * the rectangle will be clipped to the image boundaries.
-+ * defaults to the full image specified by zbar_image_set_size()
-+ */
-+extern void zbar_image_set_crop(zbar_image_t *image,
-+                                unsigned x,
-+                                unsigned y,
-+                                unsigned width,
-+                                unsigned height);
-+
- /** specify image sample data.  when image data is no longer needed by
-  * the library the specific data cleanup handler will be called
-  * (unless NULL)
-@@ -1148,6 +1312,14 @@
-            zbar_decoder_set_config(decoder, sym, cfg, val));
- }
- 
-+/** retrieve symbology boolean config settings.
-+ * @returns a bitmask indicating which configs are currently set for the
-+ * specified symbology.
-+ * @since 0.11
-+ */
-+extern unsigned int zbar_decoder_get_configs(const zbar_decoder_t *decoder,
-+                                             zbar_symbol_type_t symbology);
-+
- /** clear all decoder state.
-  * any partial symbols are flushed
-  */
-@@ -1195,6 +1367,20 @@
- extern zbar_symbol_type_t
- zbar_decoder_get_type(const zbar_decoder_t *decoder);
- 
-+/** retrieve modifier flags for the last decoded symbol.
-+ * @returns a bitmask indicating which characteristics were detected
-+ * during decoding.
-+ * @since 0.11
-+ */
-+extern unsigned int zbar_decoder_get_modifiers(const zbar_decoder_t *decoder);
-+
-+/** retrieve last decode direction.
-+ * @returns 1 for forward and -1 for reverse
-+ * @returns 0 if the decode direction is unknown or does not apply
-+ * @since 0.11
-+ */
-+extern int zbar_decoder_get_direction(const zbar_decoder_t *decoder);
-+
- /** setup data handler callback.
-  * the registered function will be called by the decoder
-  * just before zbar_decode_width() returns a non-zero value.
-diff -r 563557a923d0 include/zbar/Decoder.h
---- a/include/zbar/Decoder.h	Tue Oct 27 11:25:59 2009 -0400
-+++ b/include/zbar/Decoder.h	Fri Feb 22 08:54:29 2013 -0300
-@@ -1,5 +1,5 @@
- //------------------------------------------------------------------------
--//  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+//  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
- //
- //  This file is part of the ZBar Bar Code Reader.
- //
-@@ -115,6 +115,7 @@
- 
-     /// retrieve string name for last decode addon.
-     /// see zbar_get_addon_name()
-+    /// @deprecated in 0.11
-     const char *get_addon_name () const
-     {
-         return(zbar_get_addon_name(zbar_decoder_get_type(_decoder)));
-@@ -149,6 +150,14 @@
-         return(zbar_decoder_get_data_length(_decoder));
-     }
- 
-+    /// retrieve last decode direction.
-+    /// see zbar_decoder_get_direction()
-+    /// @since 0.11
-+    int get_direction() const
-+    {
-+        return(zbar_decoder_get_direction(_decoder));
-+    }
-+
-     /// setup callback to handle result data.
-     void set_handler (Handler &handler)
-     {
-diff -r 563557a923d0 include/zbar/Image.h
---- a/include/zbar/Image.h	Tue Oct 27 11:25:59 2009 -0400
-+++ b/include/zbar/Image.h	Fri Feb 22 08:54:29 2013 -0300
-@@ -1,5 +1,5 @@
- //------------------------------------------------------------------------
--//  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+//  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
- //
- //  This file is part of the ZBar Bar Code Reader.
- //
-@@ -67,7 +67,12 @@
-         {
-             if(userdata) {
-                 Image *image = (Image*)zbar_image_get_userdata(zimg);
--                ((Handler*)userdata)->image_callback(*image);
-+                if(image)
-+                    ((Handler*)userdata)->image_callback(*image);
-+                else {
-+                    Image tmp(zimg, 1);
-+                    ((Handler*)userdata)->image_callback(tmp);
-+                }
-             }
-         }
-     };
-@@ -110,6 +115,8 @@
- 
-     ~Image ()
-     {
-+        if(zbar_image_get_userdata(_img) == this)
-+            zbar_image_set_userdata(_img, NULL);
-         zbar_image_ref(_img, -1);
-     }
- 
-@@ -143,12 +150,7 @@
-     /// see zbar_image_set_format()
-     void set_format (const std::string& format)
-     {
--        if(format.length() != 4)
--            throw FormatError();
--        unsigned long fourcc = ((format[0] & 0xff) |
--                                ((format[1] & 0xff) << 8) |
--                                ((format[2] & 0xff) << 16) |
--                                ((format[3] & 0xff) << 24));
-+        unsigned long fourcc = zbar_fourcc_parse(format.c_str());
-         zbar_image_set_format(_img, fourcc);
-     }
- 
-@@ -183,6 +185,15 @@
-         return(zbar_image_get_height(_img));
-     }
- 
-+    /// retrieve both dimensions of the image.
-+    /// see zbar_image_get_size()
-+    /// @since 0.11
-+    void get_size (unsigned &width,
-+                   unsigned &height) const
-+    {
-+        zbar_image_get_size(_img, &width, &height);
-+    }
-+
-     /// specify the pixel size of the image.
-     /// see zbar_image_set_size()
-     void set_size (unsigned width,
-@@ -191,6 +202,26 @@
-         zbar_image_set_size(_img, width, height);
-     }
- 
-+    /// retrieve the scan crop rectangle.
-+    /// see zbar_image_get_crop()
-+    void get_crop (unsigned &x,
-+                   unsigned &y,
-+                   unsigned &width,
-+                   unsigned &height) const
-+    {
-+        zbar_image_get_crop(_img, &x, &y, &width, &height);
-+    }
-+
-+    /// set the scan crop rectangle.
-+    /// see zbar_image_set_crop()
-+    void set_crop (unsigned x,
-+                   unsigned y,
-+                   unsigned width,
-+                   unsigned height)
-+    {
-+        zbar_image_set_crop(_img, x, y, width, height);
-+    }
-+
-     /// return the image sample data.
-     /// see zbar_image_get_data()
-     const void *get_data () const
-@@ -224,6 +255,15 @@
-         throw FormatError();
-     }
- 
-+    /// image format conversion.
-+    /// see zbar_image_convert()
-+    /// @since 0.11
-+    Image convert (std::string format) const
-+    {
-+        unsigned long fourcc = zbar_fourcc_parse(format.c_str());
-+        return(convert(fourcc));
-+    }
-+
-     /// image format conversion with crop/pad.
-     /// see zbar_image_convert_resize()
-     /// @since 0.4
-@@ -278,7 +318,6 @@
-     {
-         // by default nothing is cleaned
-         assert(img);
--        assert(zbar_image_get_userdata(img));
-     }
- 
- private:
-diff -r 563557a923d0 include/zbar/Processor.h
---- a/include/zbar/Processor.h	Tue Oct 27 11:25:59 2009 -0400
-+++ b/include/zbar/Processor.h	Fri Feb 22 08:54:29 2013 -0300
-@@ -1,5 +1,5 @@
- //------------------------------------------------------------------------
--//  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+//  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
- //
- //  This file is part of the ZBar Bar Code Reader.
- //
-@@ -183,8 +183,8 @@
-     void force_format (std::string& input_format,
-                        std::string& output_format)
-     {
--        unsigned long ifourcc = *(unsigned long*)input_format.c_str();
--        unsigned long ofourcc = *(unsigned long*)output_format.c_str();
-+        unsigned long ifourcc = zbar_fourcc_parse(input_format.c_str());
-+        unsigned long ofourcc = zbar_fourcc_parse(output_format.c_str());
-         if(zbar_processor_force_format(_processor, ifourcc, ofourcc))
-             throw_exception(_processor);
-     }
-diff -r 563557a923d0 include/zbar/QZBarImage.h
---- a/include/zbar/QZBarImage.h	Tue Oct 27 11:25:59 2009 -0400
-+++ b/include/zbar/QZBarImage.h	Fri Feb 22 08:54:29 2013 -0300
-@@ -1,5 +1,5 @@
- //------------------------------------------------------------------------
--//  Copyright 2008-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+//  Copyright 2008-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
- //
- //  This file is part of the ZBar Bar Code Reader.
- //
-@@ -53,7 +53,7 @@
-         unsigned width = bpl / 4;
-         unsigned height = qimg.height();
-         set_size(width, height);
--        set_format('B' | ('G' << 8) | ('R' << 16) | ('4' << 24));
-+        set_format(zbar_fourcc('B','G','R','4'));
-         unsigned long datalen = qimg.numBytes();
-         set_data(qimg.bits(), datalen);
- 
-diff -r 563557a923d0 include/zbar/Symbol.h
---- a/include/zbar/Symbol.h	Tue Oct 27 11:25:59 2009 -0400
-+++ b/include/zbar/Symbol.h	Fri Feb 22 08:54:29 2013 -0300
-@@ -1,5 +1,5 @@
- //------------------------------------------------------------------------
--//  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+//  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
- //
- //  This file is part of the ZBar Bar Code Reader.
- //
-@@ -64,6 +64,21 @@
-         ref(-1);
-     }
- 
-+    /// assignment.
-+    SymbolSet& operator= (const SymbolSet& syms)
-+    {
-+        syms.ref();
-+        ref(-1);
-+        _syms = syms._syms;
-+        return(*this);
-+    }
-+
-+    /// truth testing.
-+    bool operator! () const
-+    {
-+        return(!_syms || !get_size());
-+    }
-+
-     /// manipulate reference count.
-     void ref (int delta = 1) const
-     {
-@@ -77,7 +92,7 @@
-         return(_syms);
-     }
- 
--    int get_size ()
-+    int get_size () const
-     {
-         return((_syms) ? zbar_symbol_set_get_size(_syms) : 0);
-     }
-@@ -112,9 +127,16 @@
- 
-         /// copy constructor.
-         Point (const Point& pt)
-+            : x(pt.x),
-+              y(pt.y)
-+        { }
-+
-+        /// assignment.
-+        Point& operator= (const Point& pt)
-         {
-             x = pt.x;
-             y = pt.y;
-+            return(*this);
-         }
-     };
- 
-@@ -129,31 +151,52 @@
-             : _sym(sym),
-               _index(index)
-         {
--            sym->ref(1);
-+            if(sym)
-+                sym->ref(1);
-             if(!sym ||
-                (unsigned)_index >= zbar_symbol_get_loc_size(*_sym))
-                 _index = -1;
-         }
- 
--        /// constructor.
-+        /// copy constructor.
-         PointIterator (const PointIterator& iter)
-             : _sym(iter._sym),
-               _index(iter._index)
-         {
--            _sym->ref();
-+            if(_sym)
-+                _sym->ref();
-         }
- 
-         /// destructor.
-         ~PointIterator ()
-         {
--            _sym->ref(-1);
-+            if(_sym)
-+                _sym->ref(-1);
-+        }
-+
-+        /// assignment.
-+        PointIterator& operator= (const PointIterator& iter)
-+        {
-+            if(iter._sym)
-+                iter._sym->ref();
-+            if(_sym)
-+                _sym->ref(-1);
-+            _sym = iter._sym;
-+            _index = iter._index;
-+            return(*this);
-+        }
-+
-+        /// truth testing.
-+        bool operator! () const
-+        {
-+            return(!_sym || _index < 0);
-         }
- 
-         /// advance iterator to next Point.
-         PointIterator& operator++ ()
-         {
-             unsigned int i = ++_index;
--            if(i >= zbar_symbol_get_loc_size(*_sym))
-+            if(!_sym || i >= zbar_symbol_get_loc_size(*_sym))
-                 _index = -1;
-             return(*this);
-         }
-@@ -161,7 +204,9 @@
-         /// retrieve currently referenced Point.
-         const Point operator* () const
-         {
--            assert(_index >= 0);
-+            assert(!!*this);
-+            if(!*this)
-+                return(Point());
-             return(Point(zbar_symbol_get_loc_x(*_sym, _index),
-                          zbar_symbol_get_loc_y(*_sym, _index)));
-         }
-@@ -213,6 +258,32 @@
-         ref(-1);
-     }
- 
-+    /// assignment.
-+    Symbol& operator= (const Symbol& sym)
-+    {
-+        sym.ref(1);
-+        ref(-1);
-+        _sym = sym._sym;
-+        _type = sym._type;
-+        _data = sym._data;
-+        return(*this);
-+    }
-+
-+    Symbol& operator= (const zbar_symbol_t *sym)
-+    {
-+        if(sym)
-+            zbar_symbol_ref(sym, 1);
-+        ref(-1);
-+        init(sym);
-+        return(*this);
-+    }
-+
-+    /// truth testing.
-+    bool operator! () const
-+    {
-+        return(!_sym);
-+    }
-+
-     void ref (int delta = 1) const
-     {
-         if(_sym)
-@@ -250,6 +321,7 @@
-     }
- 
-     /// retrieve the string name for any addon.
-+    /// @deprecated in 0.11
-     const std::string get_addon_name () const
-     {
-         return(zbar_get_addon_name(_type));
-@@ -269,12 +341,20 @@
- 
-     /// retrieve inter-frame coherency count.
-     /// see zbar_symbol_get_count()
--    /// @since 1.5
-+    /// @since 0.5
-     int get_count () const
-     {
-         return((_sym) ? zbar_symbol_get_count(_sym) : -1);
-     }
- 
-+    /// retrieve loosely defined relative quality metric.
-+    /// see zbar_symbol_get_quality()
-+    /// @since 0.11
-+    int get_quality () const
-+    {
-+        return((_sym) ? zbar_symbol_get_quality(_sym) : 0);
-+    }
-+
-     SymbolSet get_components () const
-     {
-         return(SymbolSet((_sym) ? zbar_symbol_get_components(_sym) : NULL));
-@@ -311,6 +391,13 @@
-         return((_sym) ? zbar_symbol_get_loc_y(_sym, index) : -1);
-     }
- 
-+    /// see zbar_symbol_get_orientation().
-+    /// @since 0.11
-+    int get_orientation () const
-+    {
-+        return(zbar_symbol_get_orientation(_sym));
-+    }
-+
-     /// see zbar_symbol_xml().
-     const std::string xml () const
-     {
-@@ -320,9 +407,6 @@
-     }
- 
- protected:
--
--    friend class SymbolIterator;
--
-     /// (re)initialize Symbol from C symbol object.
-     void init (const zbar_symbol_t *sym = NULL)
-     {
-@@ -361,7 +445,7 @@
-     {
-         const zbar_symbol_set_t *zsyms = _syms;
-         if(zsyms)
--            _sym.init(zbar_symbol_set_first_symbol(zsyms));
-+            _sym = zbar_symbol_set_first_symbol(zsyms);
-     }
- 
-     /// copy constructor.
-@@ -370,25 +454,33 @@
-     {
-         const zbar_symbol_set_t *zsyms = _syms;
-         if(zsyms)
--            _sym.init(zbar_symbol_set_first_symbol(zsyms));
-+            _sym = zbar_symbol_set_first_symbol(zsyms);
-     }
- 
-     ~SymbolIterator ()
-     {
--        _sym.init();
-+    }
-+
-+    /// assignment.
-+    SymbolIterator& operator= (const SymbolIterator& iter)
-+    {
-+        _syms = iter._syms;
-+        _sym = iter._sym;
-+        return(*this);
-+    }
-+
-+    bool operator! () const
-+    {
-+        return(!_syms || !_sym);
-     }
- 
-     /// advance iterator to next Symbol.
-     SymbolIterator& operator++ ()
-     {
--        const zbar_symbol_t *zsym = _sym;
--        if(zsym)
--            _sym.init(zbar_symbol_next(zsym));
--        else {
--            const zbar_symbol_set_t *zsyms = _syms;
--            if(zsyms)
--                _sym.init(zbar_symbol_set_first_symbol(zsyms));
--        }
-+        if(!!_sym)
-+            _sym = zbar_symbol_next(_sym);
-+        else if(!!_syms)
-+            _sym = zbar_symbol_set_first_symbol(_syms);
-         return(*this);
-     }
- 
-@@ -440,9 +532,7 @@
- static inline std::ostream& operator<< (std::ostream& out,
-                                         const Symbol& sym)
- {
--    out << sym.get_type_name()
--        << sym.get_addon_name()
--        << ":" << sym.get_data();
-+    out << sym.get_type_name() << ":" << sym.get_data();
-     return(out);
- }
- 
-diff -r 563557a923d0 include/zbar/Video.h
---- a/include/zbar/Video.h	Tue Oct 27 11:25:59 2009 -0400
-+++ b/include/zbar/Video.h	Fri Feb 22 08:54:29 2013 -0300
-@@ -1,5 +1,5 @@
- //------------------------------------------------------------------------
--//  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+//  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
- //
- //  This file is part of the ZBar Bar Code Reader.
- //
-@@ -92,7 +92,7 @@
-     /// see zbar_video_init()
-     void init (std::string& format)
-     {
--        unsigned int fourcc = *(unsigned int*)format.c_str();
-+        unsigned int fourcc = zbar_fourcc_parse(format.c_str());
-         if(zbar_video_init(_video, fourcc))
-             throw_exception(_video);
-     }
-diff -r 563557a923d0 include/zbar/zbargtk.h
---- a/include/zbar/zbargtk.h	Tue Oct 27 11:25:59 2009 -0400
-+++ b/include/zbar/zbargtk.h	Fri Feb 22 08:54:29 2013 -0300
-@@ -136,7 +136,7 @@
- 
- GType zbar_gtk_get_type(void) G_GNUC_CONST;
- 
--/** 
-+/**
-  * zbar_gtk_new:
-  * create a new barcode reader widget instance.
-  * initially has no associated video device or image.
-@@ -189,7 +189,17 @@
-  */
- gboolean zbar_gtk_get_video_opened(ZBarGtk *zbar);
- 
--/** 
-+/** set video camera resolution.
-+ * @width: width in pixels
-+ * @height: height in pixels
-+ *
-+ * @note this call must be made before video is initialized
-+ */
-+void zbar_gtk_request_video_size(ZBarGtk *zbar,
-+                                 int width,
-+                                 int height);
-+
-+/**
-  * utility function to populate a zbar_image_t from a GdkPixbuf.
-  * @image: the zbar library image destination to populate
-  * @pixbuf: the GdkPixbuf source
-diff -r 563557a923d0 iphone/ChangeLog
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/ChangeLog	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,138 @@
-+version 1.3.1:
-+  * fix examples
-+    - fix EmbedReader initial iPad orientation
-+    - fix TabReader shouldn't show controls
-+  * add retry workaround when device lock fails
-+    - add iPhone 5 launch image to examples
-+    - doc updates
-+  * Lion and Xcode updates
-+    - fix new warnings/errors
-+    - find missing buddy
-+    - fix SDK bg image: force resoution to 72dpi
-+  * Fix EmbedReader example rotation interaction
-+
-+version 1.2.2:
-+  * reduce controller present and dismiss latency
-+    - add simple shutter to mask video start
-+
-+version 1.2.1:
-+  * fix overlay resizing bug
-+
-+version 1.2:
-+  * release updates
-+
-+version 1.1.3:
-+  * fix UITabViewController rotation interaction
-+
-+version 1.1.2:
-+  * add maxZoom for increasing zoom range
-+    - workaround camera preview initial location/size bug
-+  * add emulation for UI videoQuality to adjust camera resolution
-+  * fix several simulator-related bugs
-+    - fix device property missing from simulated ZBarReaderView
-+    - fix AVCaptureDevice referenced from ZBarReaderViewController
-+    - fix simulated camera gesture multiple recognition
-+
-+version 1.1.1:
-+  * fix ReaderSample project path to ZBarSDK
-+  * README document new examples
-+    - make ReaderSample scheme public
-+  * documentation updates
-+  * add emulation for UI camera device and flash mode properties
-+  * workaround orientation bugs in parent controllers
-+    - enable orientation and iPad support for all examples
-+  * add orientation detection fall back
-+  * fix captureReader not exposed to simulator
-+  * fix camera preview stale rotation corner
-+    - fix ZBarReaderViewController toolbar layout accomodation
-+    - switch pre-release samples to use debug library
-+  * update docs to note possible link order dependency
-+  * add missing references to new samples
-+  * add IB support to ZBarReaderViewController
-+    - add tabbed reader sample
-+  * add embedded reader sample
-+    - factor out camera simulation logic
-+  * fix readertest max quality result filtering
-+    - thanks to John Boydon for finding this!
-+  * improve support for resizing, rotating and embedding the reader
-+  * add readertest fixed zoom stops
-+  * add manual frame capture
-+    - readertest save as PNG
-+  * enhance readertest to support default/demo pre-config and distribution
-+  * updates for Xcode 4
-+  * expose tracking box color
-+
-+version 1.1:
-+  * fix doc typo (bug #3139087)
-+    - add modifier bit docs
-+
-+version 1.0.1:
-+  * hotfix broken ZBarHelpController back button
-+  * 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
-+  * workaround iOS 4.2 hang
-+    - update to use latest SDK
-+  * add support for Code 93 symbology
-+
-+version 1.0:
-+  * update to SDK 4.1, clean out LLVM warnings
-+  * fix camera simulation gesture
-+
-+version 0.1.2:
-+  * fix missing header dependency
-+  * doc enhancements
-+  * force controls to front when showsZBarControls is enabled
-+  * fix initial zoom crop (performance bug)
-+  * workaround iPhone quartz access past image data
-+
-+version 0.1.1:
-+  * migrate to binary iPhone SDK distribution (NB backward incompatibilities!)
-+    - restructure headers
-+
-+version 0.1:
-+  * workaround for iPhone simulator builds
-+    - refactor ZBarReaderView for capture/simulator specific implementations
-+    - fix tracking calculations
-+    - fix captured video frame color conversion
-+  * fix for poor iPhone 4 performance
-+  * enable torch for iPhone 4
-+  * fix iPhone circular ref bug
-+  * add iPhone cache flush, change new libs to weak refs
-+  * fix iPhone async ref bug
-+  * enhance iPhone readertest w/more options
-+  * add iPhone zoom support, integrate with crop
-+  * add iPhone OS 4.0 video capture support
-+    - replacement view controller for new camera reader
-+    - separate view for use without controller
-+    - separate capture delegate for use standalone
-+    - add continuous autofocus
-+  * cleanup and expose iphone help display API
-+  * fixes to new iphone help display
-+  * migrate iphone help display to integrated web page (NB resource updates!)
-+    - allows easier customization
-+    - local links open directly, external links confirm and jump out to Safari
-+    - JavaScript hook for help context customization
-+    - also enhanced default help (note this changes the required resources)
-+    - fix to disable scanning during help overlay
-+    - thanks to iafanasyev and others for detailed suggestions
-+  * fix iphone custom overlay response (bug #2959617)
-+    - thanks to an anonymous user for the patch!
-+  * iphone widget performance tuning enhancements
-+    - fix crop calculation bug in ZBarImage
-+    - add properties to control pre-scan image cropping and scaling
-+    - add property for scanner cache control
-+    - enable some scanner density control (FIXME should be property)
-+    - fix ifdef for quality control (FIXME should be property)
-+    - add "sequence" mode test (not actually so useful)
-+  * realtime scanning for iphone widget
-+    - uses UIGetScreenImage() (NB private)
-+    - ZBarImage from CGImage (instead of UIImage)
-+    - add crop to scaling step
-+    - expose symbol set unfiltered results
-+  * iphone widget back compat updates, add basic test app
-+  * add Obj-C wrapper
-+  * first pass working iPhone "widget"
-diff -r 563557a923d0 iphone/README
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/README	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,66 @@
-+ZBar iOS SDK
-+============
-+
-+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 93, Code 39, Codabar, Interleaved 2 of 5 and QR Code.
-+These are the Objective C wrappers and integrated widget for developing
-+with the library on the iOS platform.
-+
-+Check the ZBar project home page for the latest release, forums, etc.
-+
-+* http://zbar.sourceforge.net/iphone
-+
-+Installation
-+------------
-+
-+If you are migrating from a pre-SDK source version of the library,
-+first make sure you remove all of the old references to zbar.xcodeproj
-+and libzbar.a and revert any related build settings.
-+
-+To add the SDK to an Xcode project:
-+
-+   1. Drag ZBarSDK into your Xcode project.
-+   3. Add these system frameworks to your project:
-+      * AVFoundation.framework (weak)
-+      * CoreMedia.framework (weak)
-+      * CoreVideo.framework (weak)
-+      * QuartzCore.framework
-+      * libiconv.dylib
-+
-+Documentation
-+-------------
-+
-+See Documentation.html for complete SDK documentation.
-+
-+Examples
-+--------
-+
-+You should be able to open and build the examples directly from the
-+disk image (ignore warnings about the read-only volume).  If you have
-+problems with this, please copy the examples to your local drive
-+instead and build from there.
-+
-+A tutorial that walks through installing and using the SDK is
-+available in the documentation.  The SDK disk image also contains the
-+resulting Xcode project at Examples/ReaderSample.
-+
-+Examples/readertest demonstrates most of the configuration options
-+available for the reader.
-+
-+Examples/TabReader shows how you can use Interface Builder to add the
-+reader as a tab in a UITabBarController.
-+
-+Examples/EmbedReader shows how a ZBarReaderView may be embedded
-+directly in the application view hierarchy.
-+
-+Copyright and License
-+---------------------
-+
-+Licensed under the GNU Lesser General Public License, version 2.1.
-+http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
-+
-+Copyright 2008-2011 � Jeff Brown <spadix@users.sourceforge.net> et al
-+
-+See the included files COPYING and LICENSE for details
-diff -r 563557a923d0 iphone/ZBarCVImage.h
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/ZBarCVImage.h	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,43 @@
-+//------------------------------------------------------------------------
-+//  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-+//
-+//  This file is part of the ZBar Bar Code Reader.
-+//
-+//  The ZBar Bar Code Reader is free software; you can redistribute it
-+//  and/or modify it under the terms of the GNU Lesser Public License as
-+//  published by the Free Software Foundation; either version 2.1 of
-+//  the License, or (at your option) any later version.
-+//
-+//  The ZBar Bar Code Reader is distributed in the hope that it will be
-+//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-+//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+//  GNU Lesser Public License for more details.
-+//
-+//  You should have received a copy of the GNU Lesser Public License
-+//  along with the ZBar Bar Code Reader; if not, write to the Free
-+//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-+//  Boston, MA  02110-1301  USA
-+//
-+//  http://sourceforge.net/projects/zbar
-+//------------------------------------------------------------------------
-+
-+#import <ZBarSDK/ZBarImage.h>
-+#import <CoreVideo/CoreVideo.h>
-+
-+// ZBarImage referring to a CVPixelBuffer.  used internally to handle
-+// asynchronous conversion to UIImage
-+
-+@interface ZBarCVImage
-+    : ZBarImage
-+{
-+    CVPixelBufferRef pixelBuffer;
-+    void *rgbBuffer;
-+    NSInvocationOperation *conversion;
-+}
-+
-+- (void) waitUntilConverted;
-+
-+@property (nonatomic) CVPixelBufferRef pixelBuffer;
-+@property (nonatomic, readonly) void *rgbBuffer;
-+
-+@end
-diff -r 563557a923d0 iphone/ZBarCVImage.m
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/ZBarCVImage.m	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,195 @@
-+//------------------------------------------------------------------------
-+//  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-+//
-+//  This file is part of the ZBar Bar Code Reader.
-+//
-+//  The ZBar Bar Code Reader is free software; you can redistribute it
-+//  and/or modify it under the terms of the GNU Lesser Public License as
-+//  published by the Free Software Foundation; either version 2.1 of
-+//  the License, or (at your option) any later version.
-+//
-+//  The ZBar Bar Code Reader is distributed in the hope that it will be
-+//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-+//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+//  GNU Lesser Public License for more details.
-+//
-+//  You should have received a copy of the GNU Lesser Public License
-+//  along with the ZBar Bar Code Reader; if not, write to the Free
-+//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-+//  Boston, MA  02110-1301  USA
-+//
-+//  http://sourceforge.net/projects/zbar
-+//------------------------------------------------------------------------
-+
-+#import "ZBarCVImage.h"
-+#define MODULE ZBarCVImage
-+#import "debug.h"
-+
-+static NSOperationQueue *conversionQueue;
-+
-+static const void*
-+asyncProvider_getBytePointer (void *info)
-+{
-+    // block until data is available
-+    ZBarCVImage *image = info;
-+    assert(image);
-+    [image waitUntilConverted];
-+    void *buf = image.rgbBuffer;
-+    assert(buf);
-+    return(buf);
-+}
-+
-+static const CGDataProviderDirectCallbacks asyncProvider = {
-+    .version = 0,
-+    .getBytePointer = asyncProvider_getBytePointer,
-+    .releaseBytePointer = NULL,
-+    .getBytesAtPosition = NULL,
-+    .releaseInfo = (void*)CFRelease,
-+};
-+
-+@implementation ZBarCVImage
-+
-+@synthesize pixelBuffer, rgbBuffer;
-+
-+- (void) dealloc
-+{
-+    self.pixelBuffer = NULL;
-+    if(rgbBuffer) {
-+        free(rgbBuffer);
-+        rgbBuffer = NULL;
-+    }
-+    [conversion release];
-+    conversion = nil;
-+    [super dealloc];
-+}
-+
-+- (void) setPixelBuffer: (CVPixelBufferRef) newbuf
-+{
-+    CVPixelBufferRef oldbuf = pixelBuffer;
-+    if(newbuf)
-+        CVPixelBufferRetain(newbuf);
-+    pixelBuffer = newbuf;
-+    if(oldbuf)
-+        CVPixelBufferRelease(oldbuf);
-+}
-+
-+- (void) waitUntilConverted
-+{
-+    // operation will at least have been queued already
-+    NSOperation *op = [conversion retain];
-+    if(!op)
-+        return;
-+    [op waitUntilFinished];
-+    [op release];
-+}
-+
-+- (UIImage*) UIImageWithOrientation: (UIImageOrientation) orient
-+{
-+    if(!conversion && !rgbBuffer) {
-+        // start format conversion in separate thread
-+        NSOperationQueue *queue = conversionQueue;
-+        if(!queue) {
-+            queue = conversionQueue = [NSOperationQueue new];
-+            queue.maxConcurrentOperationCount = 1;
-+        }
-+        else
-+            [queue waitUntilAllOperationsAreFinished];
-+
-+        conversion = [[NSInvocationOperation alloc]
-+                         initWithTarget: self
-+                         selector: @selector(convertCVtoRGB)
-+                         object: nil];
-+        [queue addOperation: conversion];
-+        [conversion release];
-+    }
-+
-+    // create UIImage before converted data is available
-+    CGSize size = self.size;
-+    int w = size.width;
-+    int h = size.height;
-+
-+    CGDataProviderRef datasrc =
-+        CGDataProviderCreateDirect([self retain], 3 * w * h, &asyncProvider);
-+    CGColorSpaceRef cs = CGColorSpaceCreateDeviceRGB();
-+    CGImageRef cgimg =
-+        CGImageCreate(w, h, 8, 24, 3 * w, cs,
-+                      kCGBitmapByteOrderDefault, datasrc,
-+                      NULL, YES, kCGRenderingIntentDefault);
-+    CGColorSpaceRelease(cs);
-+    CGDataProviderRelease(datasrc);
-+
-+    UIImage *uiimg =
-+        [UIImage imageWithCGImage: cgimg
-+                 scale: 1
-+                 orientation: orient];
-+    CGImageRelease(cgimg);
-+
-+    return(uiimg);
-+}
-+
-+// convert video frame to a CGImage compatible RGB format
-+// FIXME this is temporary until we can find the native way...
-+- (void) convertCVtoRGB
-+{
-+    timer_start;
-+    unsigned long format = self.format;
-+    assert(format == zbar_fourcc('C','V','2','P'));
-+    if(format != zbar_fourcc('C','V','2','P'))
-+        return;
-+
-+    CVPixelBufferLockBaseAddress(pixelBuffer, kCVPixelBufferLock_ReadOnly);
-+    int w = CVPixelBufferGetWidth(pixelBuffer);
-+    int h = CVPixelBufferGetHeight(pixelBuffer);
-+    int dy = CVPixelBufferGetBytesPerRowOfPlane(pixelBuffer, 0);
-+    int duv = CVPixelBufferGetBytesPerRowOfPlane(pixelBuffer, 1);
-+    uint8_t *py = CVPixelBufferGetBaseAddressOfPlane(pixelBuffer, 0);
-+    uint8_t *puv = CVPixelBufferGetBaseAddressOfPlane(pixelBuffer, 1);
-+    if(!py || !puv || dy < w || duv < w)
-+        goto error;
-+
-+    int datalen = 3 * w * h;
-+    // Quartz accesses some undocumented amount past allocated data?
-+    // ...allocate extra to compensate
-+    uint8_t *pdst = rgbBuffer = malloc(datalen + 3 * w);
-+    if(!pdst)
-+        goto error;
-+    [self setData: rgbBuffer
-+          withLength: datalen];
-+
-+    for(int y = 0; y < h; y++) {
-+        const uint8_t *qy = py;
-+        const uint8_t *quv = puv;
-+        for(int x = 0; x < w; x++) {
-+            int Y1 = *(qy++) - 16;
-+            int Cb = *(quv) - 128;
-+            int Cr = *(quv + 1) - 128;
-+            Y1 *= 4769;
-+            quv += (x & 1) << 1;
-+            int r = (Y1 + 6537 * Cr + 2048) / 4096;
-+            int g = (Y1 - 1604 * Cb - 3329 * Cr + 2048) / 4096;
-+            int b = (Y1 + 8263 * Cb + 2048) / 4096;
-+
-+            r = (r | -!!(r >> 8)) & -((r >> 8) >= 0);
-+            g = (g | -!!(g >> 8)) & -((g >> 8) >= 0);
-+            b = (b | -!!(b >> 8)) & -((b >> 8) >= 0);
-+
-+            *(pdst++) = r;
-+            *(pdst++) = g;
-+            *(pdst++) = b;
-+        }
-+        py += dy;
-+        if(y & 1)
-+            puv += duv;
-+    }
-+
-+error:
-+    CVPixelBufferUnlockBaseAddress(pixelBuffer, kCVPixelBufferLock_ReadOnly);
-+    zlog(@"convert time %gs", timer_elapsed(t_start, timer_now()));
-+
-+    // release buffer as soon as conversion is complete
-+    self.pixelBuffer = NULL;
-+
-+    conversion = nil;
-+}
-+
-+@end
-diff -r 563557a923d0 iphone/ZBarCameraSimulator.m
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/ZBarCameraSimulator.m	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,120 @@
-+//------------------------------------------------------------------------
-+//  Copyright 2010-2011 (c) Jeff Brown <spadix@users.sourceforge.net>
-+//
-+//  This file is part of the ZBar Bar Code Reader.
-+//
-+//  The ZBar Bar Code Reader is free software; you can redistribute it
-+//  and/or modify it under the terms of the GNU Lesser Public License as
-+//  published by the Free Software Foundation; either version 2.1 of
-+//  the License, or (at your option) any later version.
-+//
-+//  The ZBar Bar Code Reader is distributed in the hope that it will be
-+//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-+//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+//  GNU Lesser Public License for more details.
-+//
-+//  You should have received a copy of the GNU Lesser Public License
-+//  along with the ZBar Bar Code Reader; if not, write to the Free
-+//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-+//  Boston, MA  02110-1301  USA
-+//
-+//  http://sourceforge.net/projects/zbar
-+//------------------------------------------------------------------------
-+
-+#import <ZBarSDK/ZBarCameraSimulator.h>
-+#import <ZBarSDK/ZBarReaderView.h>
-+
-+// hack around missing simulator support for AVCapture interfaces
-+
-+@implementation ZBarCameraSimulator
-+
-+@synthesize readerView;
-+
-+- (id) initWithViewController: (UIViewController*) vc
-+{
-+    if(!TARGET_IPHONE_SIMULATOR) {
-+        [self release];
-+        return(nil);
-+    }
-+    self = [super init];
-+    if(!self)
-+        return(nil);
-+
-+    viewController = vc;
-+
-+    return(self);
-+}
-+
-+- (void) dealloc
-+{
-+    viewController = nil;
-+    readerView = nil;
-+    [picker release];
-+    picker = nil;
-+    [pickerPopover release];
-+    pickerPopover = nil;
-+    [super dealloc];
-+}
-+
-+- (void) setReaderView: (ZBarReaderView*) view
-+{
-+    ZBarReaderView *oldView = readerView;
-+    readerView = [view retain];
-+    [oldView release];
-+
-+    UILongPressGestureRecognizer *gesture =
-+        [[UILongPressGestureRecognizer alloc]
-+            initWithTarget: self
-+            action: @selector(didLongPress:)];
-+    gesture.numberOfTouchesRequired = 2;
-+    [view addGestureRecognizer: gesture];
-+    [gesture release];
-+}
-+
-+- (void) didLongPress: (UILongPressGestureRecognizer*) gesture
-+{
-+    if(gesture.state == UIGestureRecognizerStateBegan)
-+        [self takePicture];
-+}
-+
-+- (void) takePicture
-+{
-+    if(!picker) {
-+        picker = [UIImagePickerController new];
-+        picker.delegate = self;
-+    }
-+    if(UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
-+        if(!pickerPopover)
-+            pickerPopover = [[UIPopoverController alloc]
-+                                initWithContentViewController: picker];
-+        [pickerPopover presentPopoverFromRect: CGRectZero
-+                       inView: readerView
-+                       permittedArrowDirections: UIPopoverArrowDirectionAny
-+                       animated: YES];
-+    }
-+    else
-+        [viewController presentModalViewController: picker
-+                        animated: YES];
-+}
-+
-+- (void)  imagePickerController: (UIImagePickerController*) _picker
-+  didFinishPickingMediaWithInfo: (NSDictionary*) info
-+{
-+    UIImage *image = [info objectForKey: UIImagePickerControllerOriginalImage];
-+
-+    if(UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad)
-+        [pickerPopover dismissPopoverAnimated: YES];
-+    else
-+        [_picker dismissModalViewControllerAnimated: YES];
-+
-+    [readerView performSelector: @selector(scanImage:)
-+                withObject: image
-+                afterDelay: .1];
-+}
-+
-+- (void) imagePickerControllerDidCancel: (UIImagePickerController*) _picker
-+{
-+    [_picker dismissModalViewControllerAnimated: YES];
-+}
-+
-+@end
-diff -r 563557a923d0 iphone/ZBarCaptureReader.m
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/ZBarCaptureReader.m	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,370 @@
-+//------------------------------------------------------------------------
-+//  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-+//
-+//  This file is part of the ZBar Bar Code Reader.
-+//
-+//  The ZBar Bar Code Reader is free software; you can redistribute it
-+//  and/or modify it under the terms of the GNU Lesser Public License as
-+//  published by the Free Software Foundation; either version 2.1 of
-+//  the License, or (at your option) any later version.
-+//
-+//  The ZBar Bar Code Reader is distributed in the hope that it will be
-+//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-+//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+//  GNU Lesser Public License for more details.
-+//
-+//  You should have received a copy of the GNU Lesser Public License
-+//  along with the ZBar Bar Code Reader; if not, write to the Free
-+//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-+//  Boston, MA  02110-1301  USA
-+//
-+//  http://sourceforge.net/projects/zbar
-+//------------------------------------------------------------------------
-+
-+#import <libkern/OSAtomic.h>
-+#import <AVFoundation/AVFoundation.h>
-+#import <CoreMedia/CoreMedia.h>
-+#import <CoreVideo/CoreVideo.h>
-+#import <ZBarSDK/ZBarCaptureReader.h>
-+#import <ZBarSDK/ZBarImageScanner.h>
-+#import "ZBarCVImage.h"
-+
-+#define MODULE ZBarCaptureReader
-+#import "debug.h"
-+
-+enum {
-+    STOPPED = 0,
-+    RUNNING = 1,
-+    PAUSED = 2,
-+    CAPTURE = 4,
-+};
-+
-+@implementation ZBarCaptureReader
-+
-+@synthesize captureOutput, captureDelegate, scanner, scanCrop, size,
-+    framesPerSecond, enableCache;
-+@dynamic enableReader;
-+
-+- (void) initResult
-+{
-+    [result release];
-+    result = [ZBarCVImage new];
-+    result.format = [ZBarImage fourcc: @"CV2P"];
-+}
-+
-+- (id) initWithImageScanner: (ZBarImageScanner*) _scanner
-+{
-+    self = [super init];
-+    if(!self)
-+        return(nil);
-+
-+    t_fps = t_frame = timer_now();
-+    enableCache = YES;
-+
-+    scanner = [_scanner retain];
-+    scanCrop = CGRectMake(0, 0, 1, 1);
-+    image = [ZBarImage new];
-+    image.format = [ZBarImage fourcc: @"Y800"];
-+    [self initResult];
-+
-+    captureOutput = [AVCaptureVideoDataOutput new];
-+    captureOutput.alwaysDiscardsLateVideoFrames = YES;
-+
-+#ifdef FIXED_8697526
-+    /* iOS 4.2 introduced a bug that causes [session startRunning] to
-+     * hang if the session has a preview layer and this property is
-+     * specified at the output.  As this happens to be the default
-+     * setting for the currently supported devices, it can be omitted
-+     * without causing a functional problem (for now...).  Of course,
-+     * we still have no idea what the real problem is, or how robust
-+     * this is as a workaround...
-+     */
-+    captureOutput.videoSettings = 
-+        [NSDictionary
-+            dictionaryWithObject:
-+                [NSNumber numberWithInt:
-+                    kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange]
-+            forKey: (NSString*)kCVPixelBufferPixelFormatTypeKey];
-+#endif
-+
-+    queue = dispatch_queue_create("ZBarCaptureReader", NULL);
-+    [captureOutput setSampleBufferDelegate:
-+                       (id<AVCaptureVideoDataOutputSampleBufferDelegate>)self
-+                   queue: queue];
-+
-+    return(self);
-+}
-+
-+- (id) init
-+{
-+    self = [self initWithImageScanner:
-+               [[ZBarImageScanner new]
-+                   autorelease]];
-+    if(!self)
-+        return(nil);
-+
-+    [scanner setSymbology: 0
-+             config: ZBAR_CFG_X_DENSITY
-+             to: 3];
-+    [scanner setSymbology: 0
-+             config: ZBAR_CFG_Y_DENSITY
-+             to: 3];
-+    return(self);
-+}
-+
-+- (void) dealloc
-+{
-+    captureDelegate = nil;
-+
-+    // queue continues to run after stopping (NB even after DidStopRunning!);
-+    // ensure released delegate is not called. (also NB that the queue
-+    // may not be null, even in this case...)
-+    [captureOutput setSampleBufferDelegate: nil
-+                   queue: queue];
-+    [captureOutput release];
-+    captureOutput = nil;
-+    dispatch_release(queue);
-+
-+    [image release];
-+    image = nil;
-+    [result release];
-+    result = nil;
-+    [scanner release];
-+    scanner = nil;
-+    [super dealloc];
-+}
-+
-+- (BOOL) enableReader
-+{
-+    return(OSAtomicOr32Barrier(0, &state) & RUNNING);
-+}
-+
-+- (void) setEnableReader: (BOOL) enable
-+{
-+    if(!enable)
-+        OSAtomicAnd32Barrier(STOPPED, &state);
-+    else if(!(OSAtomicOr32OrigBarrier(RUNNING, &state) & RUNNING)) {
-+        OSAtomicAnd32Barrier(~PAUSED, &state);
-+        @synchronized(scanner) {
-+            scanner.enableCache = enableCache;
-+        }
-+    }
-+}
-+
-+- (void) willStartRunning
-+{
-+    self.enableReader = YES;
-+}
-+
-+- (void) willStopRunning
-+{
-+    self.enableReader = NO;
-+}
-+
-+- (void) flushCache
-+{
-+    @synchronized(scanner) {
-+        scanner.enableCache = enableCache;
-+    }
-+}
-+
-+- (void) captureFrame
-+{
-+    OSAtomicOr32(CAPTURE, &state);
-+}
-+
-+- (void) setCaptureDelegate: (id<ZBarCaptureDelegate>) delegate
-+{
-+    @synchronized(scanner) {
-+        captureDelegate = delegate;
-+    }
-+}
-+
-+- (void) cropUpdate
-+{
-+    @synchronized(scanner) {
-+        image.crop = CGRectMake(scanCrop.origin.x * width,
-+                                scanCrop.origin.y * height,
-+                                scanCrop.size.width * width,
-+                                scanCrop.size.height * height);
-+    }
-+}
-+
-+- (void) setScanCrop: (CGRect) crop
-+{
-+    if(CGRectEqualToRect(scanCrop, crop))
-+        return;
-+    scanCrop = crop;
-+    [self cropUpdate];
-+}
-+
-+- (void) didTrackSymbols: (ZBarSymbolSet*) syms
-+{
-+    [captureDelegate
-+        captureReader: self
-+        didTrackSymbols: syms];
-+}
-+
-+- (void) didReadNewSymbolsFromImage: (ZBarImage*) img
-+{
-+    timer_start;
-+    [captureDelegate
-+        captureReader: self
-+        didReadNewSymbolsFromImage: img];
-+    OSAtomicAnd32Barrier(~PAUSED, &state);
-+    zlog(@"latency: delegate=%gs total=%gs",
-+         timer_elapsed(t_start, timer_now()),
-+         timer_elapsed(t_scan, timer_now()));
-+}
-+
-+- (void) setFramesPerSecond: (CGFloat) fps
-+{
-+    framesPerSecond = fps;
-+}
-+
-+- (void) updateFPS: (NSNumber*) val
-+{
-+    [self setFramesPerSecond: val.doubleValue];
-+}
-+
-+- (void) setSize: (CGSize) _size
-+{
-+    size = _size;
-+}
-+
-+- (void) updateSize: (CFDictionaryRef) val
-+{
-+    CGSize _size;
-+    if(CGSizeMakeWithDictionaryRepresentation(val, &_size))
-+        [self setSize: _size];
-+}
-+
-+- (void)  captureOutput: (AVCaptureOutput*) output
-+  didOutputSampleBuffer: (CMSampleBufferRef) samp
-+         fromConnection: (AVCaptureConnection*) conn
-+{
-+    // queue is apparently not flushed when stopping;
-+    // only process when running
-+    uint32_t _state = OSAtomicOr32Barrier(0, &state);
-+    if((_state & (PAUSED | RUNNING)) != RUNNING)
-+        return;
-+
-+    NSAutoreleasePool *pool = [NSAutoreleasePool new];
-+    image.sequence = framecnt++;
-+
-+    uint64_t now = timer_now();
-+    double dt = timer_elapsed(t_frame, now);
-+    t_frame = now;
-+    if(dt > 2) {
-+        t_fps = now;
-+        dt_frame = 0;
-+    }
-+    else if(!dt_frame)
-+        dt_frame = dt;
-+    dt_frame = (dt_frame + dt) / 2;
-+    if(timer_elapsed(t_fps, now) >= 1) {
-+        [self performSelectorOnMainThread: @selector(updateFPS:)
-+              withObject: [NSNumber numberWithDouble: 1 / dt_frame]
-+              waitUntilDone: NO];
-+        t_fps = now;
-+    }
-+
-+    CVImageBufferRef buf = CMSampleBufferGetImageBuffer(samp);
-+    if(CMSampleBufferGetNumSamples(samp) != 1 ||
-+       !CMSampleBufferIsValid(samp) ||
-+       !CMSampleBufferDataIsReady(samp) ||
-+       !buf) {
-+        zlog(@"ERROR: invalid sample");
-+        goto error;
-+    }
-+
-+    OSType format = CVPixelBufferGetPixelFormatType(buf);
-+    int planes = CVPixelBufferGetPlaneCount(buf);
-+
-+    if(format != kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange ||
-+       !planes) {
-+        zlog(@"ERROR: invalid buffer format");
-+        goto error;
-+    }
-+
-+    int w = CVPixelBufferGetBytesPerRowOfPlane(buf, 0);
-+    int h = CVPixelBufferGetHeightOfPlane(buf, 0);
-+    CVReturn rc =
-+        CVPixelBufferLockBaseAddress(buf, kCVPixelBufferLock_ReadOnly);
-+    if(!w || !h || rc) {
-+        zlog(@"ERROR: invalid buffer data");
-+        goto error;
-+    }
-+
-+    void *data = CVPixelBufferGetBaseAddressOfPlane(buf, 0);
-+    if(data) {
-+        [image setData: data
-+               withLength: w * h];
-+
-+        BOOL doTrack = NO;
-+        int ngood = 0;
-+        ZBarSymbolSet *syms = nil;
-+        @synchronized(scanner) {
-+            if(width != w || height != h) {
-+                width = w;
-+                height = h;
-+                CGSize _size = CGSizeMake(w, h);
-+                CFDictionaryRef sized =
-+                    CGSizeCreateDictionaryRepresentation(_size);
-+                if(sized) {
-+                    [self performSelectorOnMainThread: @selector(updateSize:)
-+                          withObject: (id)sized
-+                          waitUntilDone: NO];
-+                    CFRelease(sized);
-+                }
-+                image.size = _size;
-+                [self cropUpdate];
-+            }
-+
-+            ngood = [scanner scanImage: image];
-+            syms = scanner.results;
-+            doTrack = [captureDelegate respondsToSelector:
-+                          @selector(captureReader:didTrackSymbols:)];
-+        }
-+        now = timer_now();
-+
-+        if(ngood >= 0) {
-+            // return unfiltered results for tracking feedback
-+            syms.filterSymbols = NO;
-+            int nraw = syms.count;
-+            if(nraw > 0 || (_state & CAPTURE))
-+                zlog(@"scan image: %dx%d crop=%@ ngood=%d nraw=%d st=%d",
-+                     w, h, NSStringFromCGRect(image.crop), ngood, nraw, _state);
-+
-+            if(ngood || (_state & CAPTURE)) {
-+                // copy image data so we can release the buffer
-+                result.size = CGSizeMake(w, h);
-+                result.pixelBuffer = buf;
-+                result.symbols = syms;
-+                t_scan = now;
-+                OSAtomicXor32Barrier((_state & CAPTURE) | PAUSED, &state);
-+                [self performSelectorOnMainThread:
-+                          @selector(didReadNewSymbolsFromImage:)
-+                      withObject: result
-+                      waitUntilDone: NO];
-+                [self initResult];
-+            }
-+
-+            if(nraw && doTrack)
-+                [self performSelectorOnMainThread:
-+                          @selector(didTrackSymbols:)
-+                      withObject: syms
-+                      waitUntilDone: NO];
-+        }
-+        [image setData: NULL
-+               withLength: 0];
-+    }
-+    else
-+        zlog(@"ERROR: invalid data");
-+    CVPixelBufferUnlockBaseAddress(buf, kCVPixelBufferLock_ReadOnly);
-+
-+ error:
-+    [pool release];
-+}
-+
-+@end
-diff -r 563557a923d0 iphone/ZBarHelpController.m
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/ZBarHelpController.m	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,267 @@
-+//------------------------------------------------------------------------
-+//  Copyright 2009-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-+//
-+//  This file is part of the ZBar Bar Code Reader.
-+//
-+//  The ZBar Bar Code Reader is free software; you can redistribute it
-+//  and/or modify it under the terms of the GNU Lesser Public License as
-+//  published by the Free Software Foundation; either version 2.1 of
-+//  the License, or (at your option) any later version.
-+//
-+//  The ZBar Bar Code Reader is distributed in the hope that it will be
-+//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-+//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+//  GNU Lesser Public License for more details.
-+//
-+//  You should have received a copy of the GNU Lesser Public License
-+//  along with the ZBar Bar Code Reader; if not, write to the Free
-+//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-+//  Boston, MA  02110-1301  USA
-+//
-+//  http://sourceforge.net/projects/zbar
-+//------------------------------------------------------------------------
-+
-+#import <ZBarSDK/ZBarHelpController.h>
-+
-+#define MODULE ZBarHelpController
-+#import "debug.h"
-+
-+@implementation ZBarHelpController
-+
-+@synthesize delegate;
-+
-+- (id) initWithReason: (NSString*) _reason
-+{
-+    self = [super init];
-+    if(!self)
-+        return(nil);
-+
-+    if(!_reason)
-+        _reason = @"INFO";
-+    reason = [_reason retain];
-+    return(self);
-+}
-+
-+- (id) init
-+{
-+    return([self initWithReason: nil]);
-+}
-+
-+- (void) cleanup
-+{
-+    [toolbar release];
-+    toolbar = nil;
-+    [webView release];
-+    webView = nil;
-+    [doneBtn release];
-+    doneBtn = nil;
-+    [backBtn release];
-+    backBtn = nil;
-+    [space release];
-+    space = nil;
-+}
-+
-+- (void) dealloc
-+{
-+    [self cleanup];
-+    [reason release];
-+    reason = nil;
-+    [linkURL release];
-+    linkURL = nil;
-+    [super dealloc];
-+}
-+
-+- (void) viewDidLoad
-+{
-+    [super viewDidLoad];
-+
-+    UIView *view = self.view;
-+    CGRect bounds = self.view.bounds;
-+    if(!bounds.size.width || !bounds.size.height)
-+        view.frame = bounds = CGRectMake(0, 0, 320, 480);
-+    view.backgroundColor = [UIColor colorWithWhite: .125f
-+                                    alpha: 1];
-+    view.autoresizingMask = (UIViewAutoresizingFlexibleWidth |
-+                             UIViewAutoresizingFlexibleHeight);
-+
-+    webView = [[UIWebView alloc]
-+                  initWithFrame: CGRectMake(0, 0,
-+                                            bounds.size.width,
-+                                            bounds.size.height - 44)];
-+    webView.delegate = self;
-+    webView.backgroundColor = [UIColor colorWithWhite: .125f
-+                                       alpha: 1];
-+    webView.autoresizingMask = (UIViewAutoresizingFlexibleWidth |
-+                                UIViewAutoresizingFlexibleHeight |
-+                                UIViewAutoresizingFlexibleBottomMargin);
-+    webView.hidden = YES;
-+    [view addSubview: webView];
-+
-+    toolbar = [[UIToolbar alloc]
-+                  initWithFrame: CGRectMake(0, bounds.size.height - 44,
-+                                            bounds.size.width, 44)];
-+    toolbar.barStyle = UIBarStyleBlackOpaque;
-+    toolbar.autoresizingMask = (UIViewAutoresizingFlexibleWidth |
-+                                UIViewAutoresizingFlexibleHeight |
-+                                UIViewAutoresizingFlexibleTopMargin);
-+
-+    doneBtn = [[UIBarButtonItem alloc]
-+                  initWithBarButtonSystemItem: UIBarButtonSystemItemDone
-+                  target: self
-+                  action: @selector(dismiss)];
-+
-+    backBtn = [[UIBarButtonItem alloc]
-+                  initWithImage: [UIImage imageNamed: @"zbar-back.png"]
-+                  style: UIBarButtonItemStylePlain
-+                  target: webView
-+                  action: @selector(goBack)];
-+
-+    space = [[UIBarButtonItem alloc]
-+                initWithBarButtonSystemItem:
-+                    UIBarButtonSystemItemFlexibleSpace
-+                target: nil
-+                action: nil];
-+
-+    toolbar.items = [NSArray arrayWithObjects: space, doneBtn, nil];
-+
-+    [view addSubview: toolbar];
-+
-+    NSString *path = [[NSBundle mainBundle]
-+                         pathForResource: @"zbar-help"
-+                         ofType: @"html"];
-+
-+    NSURLRequest *req = nil;
-+    if(path) {
-+        NSURL *url = [NSURL fileURLWithPath: path
-+                            isDirectory: NO];
-+        if(url)
-+            req = [NSURLRequest requestWithURL: url];
-+    }
-+    if(req)
-+        [webView loadRequest: req];
-+    else
-+        NSLog(@"ERROR: unable to load zbar-help.html from bundle");
-+}
-+
-+- (void) viewDidUnload
-+{
-+    [self cleanup];
-+    [super viewDidUnload];
-+}
-+
-+- (void) viewWillAppear: (BOOL) animated
-+{
-+    assert(webView);
-+    if(webView.loading)
-+        webView.hidden = YES;
-+    webView.delegate = self;
-+    [super viewWillAppear: animated];
-+}
-+
-+- (void) viewWillDisappear: (BOOL) animated
-+{
-+    [webView stopLoading];
-+    webView.delegate = nil;
-+    [super viewWillDisappear: animated];
-+}
-+
-+- (BOOL) shouldAutorotateToInterfaceOrientation: (UIInterfaceOrientation) orient
-+{
-+    return([self isInterfaceOrientationSupported: orient]);
-+}
-+
-+- (void) willAnimateRotationToInterfaceOrientation: (UIInterfaceOrientation) orient
-+                                          duration: (NSTimeInterval) duration
-+{
-+    [webView reload];
-+}
-+
-+- (void) didRotateFromInterfaceOrientation: (UIInterfaceOrientation) orient
-+{
-+    zlog(@"frame=%@ webView.frame=%@ toolbar.frame=%@",
-+         NSStringFromCGRect(self.view.frame),
-+         NSStringFromCGRect(webView.frame),
-+         NSStringFromCGRect(toolbar.frame));
-+}
-+
-+- (BOOL) isInterfaceOrientationSupported: (UIInterfaceOrientation) orient
-+{
-+    UIViewController *parent = self.parentViewController;
-+    if(parent && !orientations)
-+        return([parent shouldAutorotateToInterfaceOrientation: orient]);
-+    return((orientations >> orient) & 1);
-+}
-+
-+- (void) setInterfaceOrientation: (UIInterfaceOrientation) orient
-+                       supported: (BOOL) supported
-+{
-+    NSUInteger mask = 1 << orient;
-+    if(supported)
-+        orientations |= mask;
-+    else
-+        orientations &= ~mask;
-+}
-+
-+- (void) dismiss
-+{
-+    if([delegate respondsToSelector: @selector(helpControllerDidFinish:)])
-+        [delegate helpControllerDidFinish: self];
-+    else
-+        [self dismissModalViewControllerAnimated: YES];
-+}
-+
-+- (void) webViewDidFinishLoad: (UIWebView*) view
-+{
-+    if(view.hidden) {
-+        [view stringByEvaluatingJavaScriptFromString:
-+            [NSString stringWithFormat:
-+                @"onZBarHelp({reason:\"%@\"});", reason]];
-+        [UIView beginAnimations: @"ZBarHelp"
-+                context: nil];
-+        view.hidden = NO;
-+        [UIView commitAnimations];
-+    }
-+
-+    BOOL canGoBack = [view canGoBack];
-+    NSArray *items = toolbar.items;
-+    if(canGoBack != ([items objectAtIndex: 0] == backBtn)) {
-+        if(canGoBack)
-+            items = [NSArray arrayWithObjects: backBtn, space, doneBtn, nil];
-+        else
-+            items = [NSArray arrayWithObjects: space, doneBtn, nil];
-+        [toolbar setItems: items
-+                 animated: YES];
-+    }
-+}
-+
-+- (BOOL)             webView: (UIWebView*) view
-+  shouldStartLoadWithRequest: (NSURLRequest*) req
-+              navigationType: (UIWebViewNavigationType) nav
-+{
-+    NSURL *url = [req URL];
-+    if([url isFileURL])
-+        return(YES);
-+
-+    linkURL = [url retain];
-+    UIAlertView *alert =
-+        [[UIAlertView alloc]
-+            initWithTitle: @"Open External Link"
-+            message: @"Close this application and open link in Safari?"
-+            delegate: nil
-+            cancelButtonTitle: @"Cancel"
-+            otherButtonTitles: @"OK", nil];
-+    alert.delegate = self;
-+    [alert show];
-+    [alert release];
-+    return(NO);
-+}
-+
-+- (void)     alertView: (UIAlertView*) view
-+  clickedButtonAtIndex: (NSInteger) idx
-+{
-+    if(idx)
-+        [[UIApplication sharedApplication]
-+            openURL: linkURL];
-+}
-+
-+@end
-diff -r 563557a923d0 iphone/ZBarImage.m
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/ZBarImage.m	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,306 @@
-+//------------------------------------------------------------------------
-+//  Copyright 2009-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-+//
-+//  This file is part of the ZBar Bar Code Reader.
-+//
-+//  The ZBar Bar Code Reader is free software; you can redistribute it
-+//  and/or modify it under the terms of the GNU Lesser Public License as
-+//  published by the Free Software Foundation; either version 2.1 of
-+//  the License, or (at your option) any later version.
-+//
-+//  The ZBar Bar Code Reader is distributed in the hope that it will be
-+//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-+//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+//  GNU Lesser Public License for more details.
-+//
-+//  You should have received a copy of the GNU Lesser Public License
-+//  along with the ZBar Bar Code Reader; if not, write to the Free
-+//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-+//  Boston, MA  02110-1301  USA
-+//
-+//  http://sourceforge.net/projects/zbar
-+//------------------------------------------------------------------------
-+
-+#import <UIKit/UIKit.h>
-+#import <ZBarSDK/ZBarImage.h>
-+#import "debug.h"
-+
-+static void image_cleanup(zbar_image_t *zimg)
-+{
-+    ZBarImage *image = zbar_image_get_userdata(zimg);
-+    [image cleanup];
-+}
-+
-+@implementation ZBarImage
-+
-+@dynamic format, sequence, size, crop, data, dataLength, symbols, zbarImage,
-+    UIImage;
-+
-++ (unsigned long) fourcc: (NSString*) format
-+{
-+    return(zbar_fourcc_parse([format UTF8String]));
-+}
-+
-+- (id) initWithImage: (zbar_image_t*) image
-+{
-+    if(!image) {
-+        [self release];
-+        return(nil);
-+    }
-+    if(self = [super init]) {
-+        zimg = image;
-+        zbar_image_ref(image, 1);
-+        zbar_image_set_userdata(zimg, self);
-+    }
-+    return(self);
-+}
-+
-+- (id) init
-+{
-+    zbar_image_t *image = zbar_image_create();
-+    self = [self initWithImage: image];
-+    zbar_image_ref(image, -1);
-+    return(self);
-+}
-+
-+- (void) dealloc
-+{
-+    if(zimg) {
-+        zbar_image_ref(zimg, -1);
-+        zimg = NULL;
-+    }
-+    [super dealloc];
-+}
-+
-+- (id) initWithCGImage: (CGImageRef) image
-+                  crop: (CGRect) crop
-+                  size: (CGSize) size
-+{
-+    if(!(self = [self init]))
-+        return(nil);
-+    uint64_t t_start = timer_now();
-+
-+    unsigned int w = size.width + 0.5;
-+    unsigned int h = size.height + 0.5;
-+
-+    unsigned long datalen = w * h;
-+    uint8_t *raw = malloc(datalen);
-+    if(!raw) {
-+        [self release];
-+        return(nil);
-+    }
-+
-+    zbar_image_set_data(zimg, raw, datalen, zbar_image_free_data);
-+    zbar_image_set_format(zimg, zbar_fourcc('Y','8','0','0'));
-+    zbar_image_set_size(zimg, w, h);
-+
-+    // scale and crop simultaneously
-+    CGFloat scale = size.width / crop.size.width;
-+    crop.origin.x *= -scale;
-+    crop.size.width = scale * (CGFloat)CGImageGetWidth(image);
-+    scale = size.height / crop.size.height;
-+    CGFloat height = CGImageGetHeight(image);
-+    // compensate for wacky origin
-+    crop.origin.y = height - crop.origin.y - crop.size.height;
-+    crop.origin.y *= -scale;
-+    crop.size.height = scale * height;
-+
-+    // generate grayscale image data
-+    CGColorSpaceRef cs = CGColorSpaceCreateDeviceGray();
-+    CGContextRef ctx =
-+        CGBitmapContextCreate(raw, w, h, 8, w, cs, kCGImageAlphaNone);
-+    CGColorSpaceRelease(cs);
-+    CGContextSetAllowsAntialiasing(ctx, 0);
-+
-+    CGContextDrawImage(ctx, crop, image);
-+
-+#if 0
-+    zlog(@"convert image %dx%d: crop %g,%g %gx%g size %gx%g (%dx%d)",
-+         CGImageGetWidth(image), CGImageGetHeight(image),
-+         crop.origin.x, crop.origin.y, crop.size.width, crop.size.height,
-+         size.width, size.height, w, h);
-+    CGImageRef cgdump = CGBitmapContextCreateImage(ctx);
-+    UIImage *uidump = [[UIImage alloc]
-+                          initWithCGImage: cgdump];
-+    CGImageRelease(cgdump);
-+    UIImageWriteToSavedPhotosAlbum(uidump, nil, nil, NULL);
-+    [uidump release];
-+#endif
-+
-+    CGContextRelease(ctx);
-+
-+    t_convert = timer_elapsed(t_start, timer_now());
-+    return(self);
-+}
-+
-+- (id) initWithCGImage: (CGImageRef) image
-+                  size: (CGSize) size
-+{
-+    CGRect crop = CGRectMake(0, 0,
-+                             CGImageGetWidth(image),
-+                             CGImageGetHeight(image));
-+    return([self initWithCGImage: image
-+                 crop: crop
-+                 size: size]);
-+}
-+
-+- (id) initWithCGImage: (CGImageRef) image
-+{
-+    CGRect crop = CGRectMake(0, 0,
-+                             CGImageGetWidth(image),
-+                             CGImageGetHeight(image));
-+    return([self initWithCGImage: image
-+                 crop: crop
-+                 size: crop.size]);
-+}
-+
-+- (zbar_image_t*) image
-+{
-+    return(zimg);
-+}
-+
-+- (unsigned long) format
-+{
-+    return(zbar_image_get_format(zimg));
-+}
-+
-+- (void) setFormat: (unsigned long) format
-+{
-+    zbar_image_set_format(zimg, format);
-+}
-+
-+- (unsigned) sequence
-+{
-+    return(zbar_image_get_sequence(zimg));
-+}
-+
-+- (void) setSequence: (unsigned) seq
-+{
-+    zbar_image_set_sequence(zimg, seq);
-+}
-+
-+- (CGSize) size
-+{
-+    unsigned w, h;
-+    zbar_image_get_size(zimg, &w, &h);
-+    return(CGSizeMake(w, h));
-+}
-+
-+- (void) setSize: (CGSize) size
-+{
-+    zbar_image_set_size(zimg, size.width + .5, size.height + .5);
-+}
-+
-+- (CGRect) crop
-+{
-+    unsigned x, y, w, h;
-+    zbar_image_get_crop(zimg, &x, &y, &w, &h);
-+    return(CGRectMake(x, y, w, h));
-+}
-+
-+- (void) setCrop: (CGRect) crop
-+{
-+    zbar_image_set_crop(zimg, crop.origin.x + .5, crop.origin.y + .5,
-+                        crop.size.width + .5, crop.size.height + .5);
-+}
-+
-+- (ZBarSymbolSet*) symbols
-+{
-+    return([[[ZBarSymbolSet alloc]
-+                initWithSymbolSet: zbar_image_get_symbols(zimg)]
-+               autorelease]);
-+}
-+
-+- (void) setSymbols: (ZBarSymbolSet*) symbols
-+{
-+    zbar_image_set_symbols(zimg, [symbols zbarSymbolSet]);
-+}
-+
-+- (const void*) data
-+{
-+    return(zbar_image_get_data(zimg));
-+}
-+
-+- (unsigned long) dataLength
-+{
-+    return(zbar_image_get_data_length(zimg));
-+}
-+
-+- (void) setData: (const void*) data
-+      withLength: (unsigned long) length
-+{
-+    zbar_image_set_data(zimg, data, length, image_cleanup);
-+}
-+
-+- (zbar_image_t*) zbarImage
-+{
-+    return(zimg);
-+}
-+
-+- (UIImage*) UIImageWithOrientation: (UIImageOrientation) orient
-+{
-+    unsigned long format = self.format;
-+    size_t bpc, bpp;
-+    switch(format)
-+    {
-+    case zbar_fourcc('R','G','B','3'):
-+        bpc = 8;
-+        bpp = 24;
-+        break;
-+    case zbar_fourcc('R','G','B','4'):
-+        bpc = 8;
-+        bpp = 32;
-+        break;
-+    case zbar_fourcc('R','G','B','Q'):
-+        bpc = 5;
-+        bpp = 16;
-+        break;
-+    default:
-+        NSLog(@"ERROR: format %.4s(%08lx) is unsupported",
-+              (char*)&format, format);
-+        assert(0);
-+        return(nil);
-+    };
-+
-+    unsigned w = zbar_image_get_width(zimg);
-+    unsigned h = zbar_image_get_height(zimg);
-+    const void *data = zbar_image_get_data(zimg);
-+    size_t datalen = zbar_image_get_data_length(zimg);
-+    CGDataProviderRef datasrc =
-+        CGDataProviderCreateWithData(self, data, datalen, (void*)CFRelease);
-+    CGColorSpaceRef cs = CGColorSpaceCreateDeviceRGB();
-+    CGImageRef cgimg =
-+        CGImageCreate(w, h, bpc, bpp, ((bpp + 7) >> 3) * w, cs,
-+                      kCGBitmapByteOrderDefault |
-+                      kCGImageAlphaNoneSkipFirst,
-+                      datasrc, NULL, YES, kCGRenderingIntentDefault);
-+    CGColorSpaceRelease(cs);
-+    CGDataProviderRelease(datasrc);
-+
-+    UIImage *uiimg =
-+        [UIImage imageWithCGImage: cgimg
-+                 scale: 1
-+                 orientation: orient];
-+    CGImageRelease(cgimg);
-+    return(uiimg);
-+}
-+
-+- (UIImage*) UIImage
-+{
-+    return([self UIImageWithOrientation: UIImageOrientationUp]);
-+}
-+
-+- (void) cleanup
-+{
-+}
-+
-+#if 0
-+- (ZBarImage*) convertToFormat: (unsigned long) format
-+{
-+    zbar_image_t *zdst = zbar_image_convert(zimg, format);
-+    ZBarImage *image = ;
-+    return([[[ZBarImage alloc] initWithImage: zdst] autorelease]);
-+}
-+#endif
-+
-+@end
-diff -r 563557a923d0 iphone/ZBarImageScanner.m
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/ZBarImageScanner.m	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,85 @@
-+//------------------------------------------------------------------------
-+//  Copyright 2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+//
-+//  This file is part of the ZBar Bar Code Reader.
-+//
-+//  The ZBar Bar Code Reader is free software; you can redistribute it
-+//  and/or modify it under the terms of the GNU Lesser Public License as
-+//  published by the Free Software Foundation; either version 2.1 of
-+//  the License, or (at your option) any later version.
-+//
-+//  The ZBar Bar Code Reader is distributed in the hope that it will be
-+//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-+//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+//  GNU Lesser Public License for more details.
-+//
-+//  You should have received a copy of the GNU Lesser Public License
-+//  along with the ZBar Bar Code Reader; if not, write to the Free
-+//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-+//  Boston, MA  02110-1301  USA
-+//
-+//  http://sourceforge.net/projects/zbar
-+//------------------------------------------------------------------------
-+
-+#import <ZBarSDK/ZBarImageScanner.h>
-+#import "debug.h"
-+
-+@implementation ZBarImageScanner
-+
-+@dynamic enableCache, results;
-+
-+- (id) init
-+{
-+    if(self = [super init]) {
-+        scanner = zbar_image_scanner_create();
-+    }
-+    return(self);
-+}
-+
-+- (void) dealloc
-+{
-+    if(scanner) {
-+        zbar_image_scanner_destroy(scanner);
-+        scanner = NULL;
-+    }
-+    [super dealloc];
-+}
-+
-+- (BOOL) enableCache
-+{
-+    assert(0); // FIXME
-+    return(NO);
-+}
-+
-+- (void) setEnableCache: (BOOL) enable
-+{
-+    zbar_image_scanner_enable_cache(scanner, enable);
-+}
-+
-+- (ZBarSymbolSet*) results
-+{
-+    const zbar_symbol_set_t *set = zbar_image_scanner_get_results(scanner);
-+    return([[[ZBarSymbolSet alloc] initWithSymbolSet: set] autorelease]);
-+}
-+
-+// image scanner config wrappers
-+- (void) parseConfig: (NSString*) cfg
-+{
-+    zbar_image_scanner_parse_config(scanner, [cfg UTF8String]);
-+    // FIXME throw errors
-+}
-+
-+- (void) setSymbology: (zbar_symbol_type_t) sym
-+               config: (zbar_config_t) cfg
-+                   to: (int) val
-+{
-+    zbar_image_scanner_set_config(scanner, sym, cfg, val);
-+    // FIXME throw errors
-+}
-+
-+- (NSInteger) scanImage: (ZBarImage*) image
-+{
-+    return(zbar_scan_image(scanner, image.zbarImage));
-+}
-+
-+@end
-diff -r 563557a923d0 iphone/ZBarReaderController.m
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/ZBarReaderController.m	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,747 @@
-+//------------------------------------------------------------------------
-+//  Copyright 2009-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-+//
-+//  This file is part of the ZBar Bar Code Reader.
-+//
-+//  The ZBar Bar Code Reader is free software; you can redistribute it
-+//  and/or modify it under the terms of the GNU Lesser Public License as
-+//  published by the Free Software Foundation; either version 2.1 of
-+//  the License, or (at your option) any later version.
-+//
-+//  The ZBar Bar Code Reader is distributed in the hope that it will be
-+//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-+//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+//  GNU Lesser Public License for more details.
-+//
-+//  You should have received a copy of the GNU Lesser Public License
-+//  along with the ZBar Bar Code Reader; if not, write to the Free
-+//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-+//  Boston, MA  02110-1301  USA
-+//
-+//  http://sourceforge.net/projects/zbar
-+//------------------------------------------------------------------------
-+
-+#import <ZBarSDK/ZBarReaderController.h>
-+#import <ZBarSDK/ZBarHelpController.h>
-+#import "debug.h"
-+
-+/* the use of UIGetScreenImage() may no longer be sanctioned, even
-+ * though it was previously "allowed".  define this to 0 to rip it out
-+ * and fall back to cameraMode=Default (manual capture)
-+ */
-+#ifndef USE_PRIVATE_APIS
-+# define USE_PRIVATE_APIS 0
-+#endif
-+
-+#ifndef MIN_QUALITY
-+# define MIN_QUALITY 10
-+#endif
-+
-+NSString* const ZBarReaderControllerResults = @"ZBarReaderControllerResults";
-+
-+#if USE_PRIVATE_APIS
-+// expose undocumented API
-+CF_RETURNS_RETAINED
-+CGImageRef UIGetScreenImage(void);
-+#endif
-+
-+@implementation ZBarReaderController
-+
-+@synthesize scanner, readerDelegate, cameraMode, scanCrop, maxScanDimension,
-+    showsHelpOnFail, takesPicture, enableCache, tracksSymbols;
-+@dynamic showsZBarControls;
-+
-+- (id) init
-+{
-+    if(self = [super init]) {
-+        showsHelpOnFail = YES;
-+        hasOverlay = showsZBarControls =
-+            [self respondsToSelector: @selector(cameraOverlayView)];
-+        enableCache = tracksSymbols = YES;
-+        scanCrop = CGRectMake(0, 0, 1, 1);
-+        maxScanDimension = 640;
-+
-+        scanner = [ZBarImageScanner new];
-+        [scanner setSymbology: 0
-+                 config: ZBAR_CFG_X_DENSITY
-+                 to: 2];
-+        [scanner setSymbology: 0
-+                 config: ZBAR_CFG_Y_DENSITY
-+                 to: 2];
-+
-+        if([UIImagePickerController
-+               isSourceTypeAvailable: UIImagePickerControllerSourceTypeCamera])
-+            self.sourceType = UIImagePickerControllerSourceTypeCamera;
-+
-+#if USE_PRIVATE_APIS
-+        cameraMode = ZBarReaderControllerCameraModeSampling;
-+#else
-+        cameraMode = ZBarReaderControllerCameraModeDefault;
-+#endif
-+    }
-+    return(self);
-+}
-+
-+- (void) initOverlay
-+{
-+    CGRect bounds = self.view.bounds;
-+    overlay = [[UIView alloc] initWithFrame: bounds];
-+    overlay.backgroundColor = [UIColor clearColor];
-+
-+    CGRect r = bounds;
-+    r.size.height -= 54;
-+    boxView = [[UIView alloc] initWithFrame: r];
-+
-+    boxLayer = [CALayer new];
-+    boxLayer.frame = r;
-+    boxLayer.borderWidth = 1;
-+    boxLayer.borderColor = [UIColor greenColor].CGColor;
-+    [boxView.layer addSublayer: boxLayer];
-+
-+    toolbar = [UIToolbar new];
-+    toolbar.barStyle = UIBarStyleBlackOpaque;
-+    r.origin.y = r.size.height;
-+    r.size.height = 54;
-+    toolbar.frame = r;
-+
-+    cancelBtn = [[UIBarButtonItem alloc]
-+                    initWithBarButtonSystemItem: UIBarButtonSystemItemCancel
-+                    target: self
-+                    action: @selector(cancel)];
-+    cancelBtn.width = r.size.width / 4 - 16;
-+
-+    scanBtn = [[UIBarButtonItem alloc]
-+                  initWithTitle: @"Scan!"
-+                  style: UIBarButtonItemStyleDone
-+                  target: self
-+                  action: @selector(scan)];
-+    scanBtn.width = r.size.width / 2 - 16;
-+
-+    for(int i = 0; i < 2; i++)
-+        space[i] = [[UIBarButtonItem alloc]
-+                       initWithBarButtonSystemItem:
-+                           UIBarButtonSystemItemFlexibleSpace
-+                       target: nil
-+                       action: nil];
-+
-+    space[2] = [[UIBarButtonItem alloc]
-+                    initWithBarButtonSystemItem:
-+                        UIBarButtonSystemItemFixedSpace
-+                    target: nil
-+                    action: nil];
-+    space[2].width = r.size.width / 4 - 16;
-+
-+    infoBtn = [[UIButton buttonWithType: UIButtonTypeInfoLight] retain];
-+    r.origin.x = r.size.width - 54;
-+    r.size.width = 54;
-+    infoBtn.frame = r;
-+    [infoBtn addTarget: self
-+             action: @selector(info)
-+             forControlEvents: UIControlEventTouchUpInside];
-+}
-+
-+- (void) viewDidLoad
-+{
-+    [super viewDidLoad];
-+    [super setDelegate: self];
-+    if(hasOverlay)
-+        [self initOverlay];
-+}
-+
-+- (void) cleanup
-+{
-+    [overlay release];
-+    overlay = nil;
-+    [boxView release];
-+    boxView = nil;
-+    [boxLayer release];
-+    boxLayer = nil;
-+    [toolbar release];
-+    toolbar = nil;
-+    [cancelBtn release];
-+    cancelBtn = nil;
-+    [scanBtn release];
-+    scanBtn = nil;
-+    for(int i = 0; i < 3; i++) {
-+        [space[i] release];
-+        space[i] = nil;
-+    }
-+    [infoBtn release];
-+    infoBtn = nil;
-+    [help release];
-+    help = nil;
-+}
-+
-+- (void) viewDidUnload
-+{
-+    [self cleanup];
-+    [super viewDidUnload];
-+}
-+
-+- (void) dealloc
-+{
-+    [self cleanup];
-+    [scanner release];
-+    scanner = nil;
-+    [super dealloc];
-+}
-+
-+- (void) scan
-+{
-+    scanBtn.enabled = NO;
-+    self.view.userInteractionEnabled = NO;
-+    [self takePicture];
-+}
-+
-+- (void) cancel
-+{
-+    [self performSelector: @selector(imagePickerControllerDidCancel:)
-+          withObject: self
-+          afterDelay: 0.1];
-+}
-+
-+- (void) reenable
-+{
-+    scanBtn.enabled = YES;
-+    self.view.userInteractionEnabled = YES;
-+}
-+
-+- (void) initScanning
-+{
-+    if(hasOverlay &&
-+       self.sourceType == UIImagePickerControllerSourceTypeCamera) {
-+        if(showsZBarControls || ![self cameraOverlayView])
-+            [self setCameraOverlayView: overlay];
-+
-+        UIView *activeOverlay = [self cameraOverlayView];
-+
-+        if(showsZBarControls) {
-+            if(!toolbar.superview) {
-+                [overlay addSubview: toolbar];
-+                [overlay addSubview: infoBtn];
-+            }
-+            [self setShowsCameraControls: NO];
-+        }
-+        else {
-+            [toolbar removeFromSuperview];
-+            [infoBtn removeFromSuperview];
-+            if(activeOverlay == overlay)
-+                [self setShowsCameraControls: YES];
-+        }
-+
-+        self.view.userInteractionEnabled = YES;
-+
-+        sampling = (cameraMode == ZBarReaderControllerCameraModeSampling ||
-+                    cameraMode == ZBarReaderControllerCameraModeSequence);
-+
-+        if(sampling) {
-+            toolbar.items = [NSArray arrayWithObjects:
-+                                cancelBtn, space[0], nil];
-+
-+            t_frame = timer_now();
-+            dt_frame = 0;
-+            boxLayer.opacity = 0;
-+            if(boxView.superview != activeOverlay)
-+                [boxView removeFromSuperview];
-+            if(!boxView.superview)
-+                [activeOverlay insertSubview: boxView atIndex:0];
-+            scanner.enableCache = enableCache;
-+
-+            SEL meth = nil;
-+            if(cameraMode == ZBarReaderControllerCameraModeSampling) {
-+                // ensure crop rect does not include controls
-+                if(scanCrop.origin.x + scanCrop.size.width > .8875)
-+                    scanCrop.size.width = .8875 - scanCrop.origin.x;
-+
-+                meth = @selector(scanScreen);
-+            }
-+            else
-+                meth = @selector(takePicture);
-+
-+            [self performSelector: meth
-+                  withObject: nil
-+                  afterDelay: 2];
-+#ifdef DEBUG_OBJC
-+            [self performSelector: @selector(dumpFPS)
-+                  withObject: nil
-+                  afterDelay: 4];
-+#endif
-+        }
-+        else {
-+            scanBtn.enabled = NO;
-+            toolbar.items = [NSArray arrayWithObjects:
-+                        cancelBtn, space[0], scanBtn, space[1], space[2], nil];
-+
-+            [self performSelector: @selector(reenable)
-+                  withObject: nil
-+                  afterDelay: .5];
-+
-+            [boxView removeFromSuperview];
-+        }
-+    }
-+}
-+
-+- (void) viewWillAppear: (BOOL) animated
-+{
-+    [self initScanning];
-+    [super viewWillAppear: animated];
-+}
-+
-+- (void) viewWillDisappear: (BOOL) animated
-+{
-+    sampling = NO;
-+    scanner.enableCache = NO;
-+    [super viewWillDisappear: animated];
-+}
-+
-+- (BOOL) showsZBarControls
-+{
-+    return(showsZBarControls);
-+}
-+
-+- (void) setCameraMode: (ZBarReaderControllerCameraMode) mode
-+{
-+#if !USE_PRIVATE_APIS
-+    if(mode == ZBarReaderControllerCameraModeSampling)
-+        [NSException raise: NSInvalidArgumentException
-+            format: @"ZBarReaderController cannot set cameraMode=Sampling"
-+                    @" when USE_PRIVATE_APIS=0"];
-+#endif
-+    cameraMode = mode;
-+}
-+
-+- (void) setShowsZBarControls: (BOOL) show
-+{
-+    if(show && !hasOverlay)
-+        [NSException raise: NSInvalidArgumentException
-+            format: @"ZBarReaderController cannot set showsZBarControls=YES for OS<3.1"];
-+
-+    showsZBarControls = show;
-+}
-+
-+// intercept delegate as readerDelegate
-+
-+- (void) setDelegate: (id <UINavigationControllerDelegate,
-+                           UIImagePickerControllerDelegate>) delegate
-+{
-+    self.readerDelegate = (id <ZBarReaderDelegate>)delegate;
-+}
-+
-+
-+#ifdef DEBUG_OBJC
-+- (void) dumpFPS
-+{
-+    if(!sampling)
-+        return;
-+    [self performSelector: @selector(dumpFPS)
-+          withObject: nil
-+          afterDelay: 2];
-+    zlog(@"fps=%g", 1 / dt_frame);
-+}
-+#endif
-+
-+- (NSInteger) scanImage: (CGImageRef) image
-+            withScaling: (CGFloat) scale
-+{
-+    uint64_t now = timer_now();
-+    if(dt_frame)
-+        dt_frame = (dt_frame + timer_elapsed(t_frame, now)) / 2;
-+    else
-+        dt_frame = timer_elapsed(t_frame, now);
-+    t_frame = now;
-+
-+    int w = CGImageGetWidth(image);
-+    int h = CGImageGetHeight(image);
-+    CGRect crop;
-+    if(w >= h)
-+        crop = CGRectMake(scanCrop.origin.x * w, scanCrop.origin.y * h,
-+                          scanCrop.size.width * w, scanCrop.size.height * h);
-+    else
-+        crop = CGRectMake(scanCrop.origin.y * w, scanCrop.origin.x * h,
-+                          scanCrop.size.height * w, scanCrop.size.width * h);
-+
-+    CGSize size;
-+    if(crop.size.width >= crop.size.height &&
-+       crop.size.width > maxScanDimension)
-+        size = CGSizeMake(maxScanDimension,
-+                          crop.size.height * maxScanDimension / crop.size.width);
-+    else if(crop.size.height > maxScanDimension)
-+        size = CGSizeMake(crop.size.width * maxScanDimension / crop.size.height,
-+                          maxScanDimension);
-+    else
-+        size = crop.size;
-+
-+    if(scale) {
-+        size.width *= scale;
-+        size.height *= scale;
-+    }
-+
-+    if(self.sourceType != UIImagePickerControllerSourceTypeCamera ||
-+       cameraMode == ZBarReaderControllerCameraModeDefault) {
-+        // limit the maximum number of scan passes
-+        int density;
-+        if(size.width > 720)
-+            density = (size.width / 240 + 1) / 2;
-+        else
-+            density = 1;
-+        [scanner setSymbology: 0
-+                 config: ZBAR_CFG_X_DENSITY
-+                 to: density];
-+
-+        if(size.height > 720)
-+            density = (size.height / 240 + 1) / 2;
-+        else
-+            density = 1;
-+        [scanner setSymbology: 0
-+                 config: ZBAR_CFG_Y_DENSITY
-+                 to: density];
-+    }
-+
-+    ZBarImage *zimg = [[ZBarImage alloc]
-+                          initWithCGImage: image
-+                          crop: crop
-+                          size: size];
-+    int nsyms = [scanner scanImage: zimg];
-+    [zimg release];
-+
-+    return(nsyms);
-+}
-+
-+- (ZBarSymbol*) extractBestResult: (BOOL) filter
-+{
-+    ZBarSymbol *sym = nil;
-+    ZBarSymbolSet *results = scanner.results;
-+    results.filterSymbols = filter;
-+    for(ZBarSymbol *s in results)
-+        if(!sym || sym.quality < s.quality)
-+            sym = s;
-+    return(sym);
-+}
-+
-+- (void) updateBox: (ZBarSymbol*) sym
-+         imageSize: (CGSize) size
-+{
-+    [CATransaction begin];
-+    [CATransaction setAnimationDuration: .3];
-+    [CATransaction setAnimationTimingFunction:
-+        [CAMediaTimingFunction functionWithName:
-+            kCAMediaTimingFunctionLinear]];
-+
-+    CGFloat alpha = boxLayer.opacity;
-+    if(sym) {
-+        CGRect r = sym.bounds;
-+        if(r.size.width > 16 && r.size.height > 16) {
-+            r.origin.x += scanCrop.origin.y * size.width;
-+            r.origin.y += scanCrop.origin.x * size.height;
-+            r = CGRectInset(r, -16, -16);
-+            if(alpha > .25) {
-+                CGRect frame = boxLayer.frame;
-+                r.origin.x = (r.origin.x * 3 + frame.origin.x) / 4;
-+                r.origin.y = (r.origin.y * 3 + frame.origin.y) / 4;
-+                r.size.width = (r.size.width * 3 + frame.size.width) / 4;
-+                r.size.height = (r.size.height * 3 + frame.size.height) / 4;
-+            }
-+            boxLayer.frame = r;
-+            boxLayer.opacity = 1;
-+        }
-+    }
-+    else {
-+        if(alpha > .1)
-+            boxLayer.opacity = alpha / 2;
-+        else if(alpha)
-+            boxLayer.opacity = 0;
-+    }
-+    [CATransaction commit];
-+}
-+
-+#if USE_PRIVATE_APIS
-+
-+- (void) scanScreen
-+{
-+    if(!sampling)
-+        return;
-+
-+    // FIXME ugly hack: use private API to sample screen
-+    CGImageRef image = UIGetScreenImage();
-+
-+    [self scanImage: image
-+          withScaling: 0];
-+    CGSize size = CGSizeMake(CGImageGetWidth(image), CGImageGetHeight(image));
-+    CGImageRelease(image);
-+
-+    ZBarSymbol *sym = [self extractBestResult: NO];
-+
-+    if(sym && !sym.count) {
-+        SEL cb = @selector(imagePickerController:didFinishPickingMediaWithInfo:);
-+        if(takesPicture) {
-+            symbol = [sym retain];
-+            [self takePicture];
-+        }
-+        else if([readerDelegate respondsToSelector: cb]) {
-+            symbol = [sym retain];
-+
-+            [CATransaction begin];
-+            [CATransaction setDisableActions: YES];
-+            boxLayer.opacity = 0;
-+            [CATransaction commit];
-+
-+            // capture preview image and send to delegate
-+            // after box has been hidden
-+            [self performSelector: @selector(captureScreen)
-+                  withObject: nil
-+                  afterDelay: 0.001];
-+            return;
-+        }
-+    }
-+
-+    // reschedule
-+    [self performSelector: @selector(scanScreen)
-+          withObject: nil
-+          afterDelay: 0.001];
-+
-+    if(tracksSymbols)
-+        [self updateBox: sym
-+              imageSize: size];
-+}
-+
-+- (void) captureScreen
-+{
-+    CGImageRef screen = UIGetScreenImage();
-+
-+    CGRect r = CGRectMake(0, 0,
-+                          CGImageGetWidth(screen), CGImageGetHeight(screen));
-+    if(r.size.width > r.size.height)
-+        r.size.width -= 54;
-+    else
-+        r.size.height -= 54;
-+    CGImageRef preview = CGImageCreateWithImageInRect(screen, r);
-+    CGImageRelease(screen);
-+
-+    UIImage *image = [UIImage imageWithCGImage: preview];
-+    CGImageRelease(preview);
-+
-+    [readerDelegate
-+        imagePickerController: self
-+        didFinishPickingMediaWithInfo:
-+            [NSDictionary dictionaryWithObjectsAndKeys:
-+                image, UIImagePickerControllerOriginalImage,
-+                [NSArray arrayWithObject: symbol],
-+                    ZBarReaderControllerResults,
-+                nil]];
-+    [symbol release];
-+    symbol = nil;
-+
-+    // continue scanning until dismissed
-+    [self performSelector: @selector(scanScreen)
-+          withObject: nil
-+          afterDelay: 0.001];
-+}
-+
-+#endif /* USE_PRIVATE_APIS */
-+
-+- (void) scanSequence: (UIImage*) image
-+{
-+    if(!sampling) {
-+        [image release];
-+        return;
-+    }
-+
-+    int nsyms = [self scanImage: image.CGImage
-+                      withScaling: 0];
-+
-+    ZBarSymbol *sym = nil;
-+    if(nsyms)
-+        [self extractBestResult: NO];
-+
-+    SEL cb = @selector(imagePickerController:didFinishPickingMediaWithInfo:);
-+    if(sym && !sym.count &&
-+       [readerDelegate respondsToSelector: cb])
-+        [readerDelegate
-+            imagePickerController: self
-+            didFinishPickingMediaWithInfo:
-+                [NSDictionary dictionaryWithObjectsAndKeys:
-+                    image, UIImagePickerControllerOriginalImage,
-+                    [NSArray arrayWithObject: sym],
-+                        ZBarReaderControllerResults,
-+                    nil]];
-+    CGSize size = image.size;
-+    [image release];
-+
-+    // reschedule
-+    [self performSelector: @selector(takePicture)
-+          withObject: nil
-+          afterDelay: 0.001];
-+
-+    if(tracksSymbols)
-+        [self updateBox: sym
-+              imageSize: size];
-+}
-+
-+- (void) showHelpWithReason: (NSString*) reason
-+{
-+    if(help) {
-+        [help.view removeFromSuperview];
-+        [help release];
-+    }
-+    help = [[ZBarHelpController alloc]
-+               initWithReason: reason];
-+    help.delegate = (id<ZBarHelpDelegate>)self;
-+
-+    if(self.sourceType != UIImagePickerControllerSourceTypeCamera) {
-+        [self presentModalViewController: help
-+              animated: YES];
-+        return;
-+    }
-+
-+    // show help as overlay view to workaround controller bugs
-+    sampling = NO;
-+    scanner.enableCache = NO;
-+    help.wantsFullScreenLayout = YES;
-+    help.view.alpha = 0;
-+
-+    UIView *activeOverlay = [self cameraOverlayView];
-+    help.view.frame = [activeOverlay
-+                          convertRect: CGRectMake(0, 0, 320, 480)
-+                          fromView: nil];
-+    [activeOverlay addSubview: help.view];
-+    [UIView beginAnimations: @"ZBarHelp"
-+            context: nil];
-+    help.view.alpha = 1;
-+    [UIView commitAnimations];
-+}
-+
-+- (void) info
-+{
-+    [self showHelpWithReason: @"INFO"];
-+}
-+
-+- (void)  imagePickerController: (UIImagePickerController*) picker
-+  didFinishPickingMediaWithInfo: (NSDictionary*) info
-+{
-+    UIImage *img = [info objectForKey: UIImagePickerControllerOriginalImage];
-+
-+    id results = nil;
-+    if(self.sourceType == UIImagePickerControllerSourceTypeCamera &&
-+       cameraMode == ZBarReaderControllerCameraModeSequence) {
-+        if(sampling)
-+            [self performSelector: @selector(scanSequence:)
-+                  withObject: [img retain]
-+                  afterDelay: 0.001];
-+        return;
-+    }
-+    else if(!sampling)
-+        results = [self scanImage: img.CGImage];
-+    else {
-+        results = [NSArray arrayWithObject: symbol];
-+        [symbol release];
-+        symbol = nil;
-+    }
-+
-+    [self performSelector: @selector(reenable)
-+         withObject: nil
-+         afterDelay: .25];
-+
-+    if(results) {
-+        NSMutableDictionary *newinfo = [info mutableCopy];
-+        [newinfo setObject: results
-+                 forKey: ZBarReaderControllerResults];
-+        SEL cb = @selector(imagePickerController:didFinishPickingMediaWithInfo:);
-+        if([readerDelegate respondsToSelector: cb])
-+            [readerDelegate imagePickerController: self
-+                            didFinishPickingMediaWithInfo: newinfo];
-+        else
-+            [self dismissModalViewControllerAnimated: YES];
-+        [newinfo release];
-+        return;
-+    }
-+
-+    BOOL camera = (self.sourceType == UIImagePickerControllerSourceTypeCamera);
-+    BOOL retry = !camera || (hasOverlay && ![self showsCameraControls]);
-+    if(showsHelpOnFail && retry)
-+        [self showHelpWithReason: @"FAIL"];
-+
-+    SEL cb = @selector(readerControllerDidFailToRead:withRetry:);
-+    if([readerDelegate respondsToSelector: cb])
-+        // assume delegate dismisses controller if necessary
-+        [readerDelegate readerControllerDidFailToRead: self
-+                        withRetry: retry];
-+    else if(!retry)
-+        // must dismiss stock controller
-+        [self dismissModalViewControllerAnimated: YES];
-+}
-+
-+- (void) imagePickerControllerDidCancel: (UIImagePickerController*) picker
-+{
-+    SEL cb = @selector(imagePickerControllerDidCancel:);
-+    if([readerDelegate respondsToSelector: cb])
-+        [readerDelegate imagePickerControllerDidCancel: self];
-+    else
-+        [self dismissModalViewControllerAnimated: YES];
-+}
-+
-+// ZBarHelpDelegate
-+
-+- (void) helpControllerDidFinish: (ZBarHelpController*) hlp
-+{
-+    if(self.sourceType == UIImagePickerControllerSourceTypeCamera) {
-+        [UIView beginAnimations: @"ZBarHelp"
-+                context: nil];
-+        hlp.view.alpha = 0;
-+        [UIView commitAnimations];
-+        [self initScanning];
-+    }
-+    else
-+        [hlp dismissModalViewControllerAnimated: YES];
-+}
-+
-+- (id <NSFastEnumeration>) scanImage: (CGImageRef) image
-+{
-+    timer_start;
-+
-+    int nsyms = [self scanImage: image
-+                      withScaling: 0];
-+
-+    if(!nsyms &&
-+       CGImageGetWidth(image) >= 640 &&
-+       CGImageGetHeight(image) >= 640)
-+        // make one more attempt for close up, grainy images
-+        nsyms = [self scanImage: image
-+                      withScaling: .5];
-+
-+    NSMutableArray *syms = nil;
-+    if(nsyms) {
-+        // quality/type filtering
-+        int max_quality = MIN_QUALITY;
-+        for(ZBarSymbol *sym in scanner.results) {
-+            zbar_symbol_type_t type = sym.type;
-+            int quality;
-+            if(type == ZBAR_QRCODE)
-+                quality = INT_MAX;
-+            else
-+                quality = sym.quality;
-+
-+            if(quality < max_quality) {
-+                zlog(@"    type=%d quality=%d < %d\n",
-+                     type, quality, max_quality);
-+                continue;
-+            }
-+
-+            if(max_quality < quality) {
-+                max_quality = quality;
-+                if(syms)
-+                    [syms removeAllObjects];
-+            }
-+            zlog(@"    type=%d quality=%d\n", type, quality);
-+            if(!syms)
-+                syms = [NSMutableArray arrayWithCapacity: 1];
-+
-+            [syms addObject: sym];
-+        }
-+    }
-+
-+    zlog(@"read %d filtered symbols in %gs total\n",
-+          (!syms) ? 0 : [syms count], timer_elapsed(t_start, timer_now()));
-+    return(syms);
-+}
-+
-+@end
-diff -r 563557a923d0 iphone/ZBarReaderView.m
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/ZBarReaderView.m	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,596 @@
-+//------------------------------------------------------------------------
-+//  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-+//
-+//  This file is part of the ZBar Bar Code Reader.
-+//
-+//  The ZBar Bar Code Reader is free software; you can redistribute it
-+//  and/or modify it under the terms of the GNU Lesser Public License as
-+//  published by the Free Software Foundation; either version 2.1 of
-+//  the License, or (at your option) any later version.
-+//
-+//  The ZBar Bar Code Reader is distributed in the hope that it will be
-+//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-+//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+//  GNU Lesser Public License for more details.
-+//
-+//  You should have received a copy of the GNU Lesser Public License
-+//  along with the ZBar Bar Code Reader; if not, write to the Free
-+//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-+//  Boston, MA  02110-1301  USA
-+//
-+//  http://sourceforge.net/projects/zbar
-+//------------------------------------------------------------------------
-+
-+#import <ZBarSDK/ZBarReaderView.h>
-+
-+#define MODULE ZBarReaderView
-+#import "debug.h"
-+
-+// silence warning
-+@interface ZBarReaderViewImpl : NSObject
-+@end
-+
-+@implementation ZBarReaderView
-+
-+@synthesize readerDelegate, tracksSymbols, trackingColor, torchMode, showsFPS,
-+    zoom, maxZoom, scanCrop, previewTransform, captureReader;
-+@dynamic scanner, allowsPinchZoom, enableCache, device, session;
-+
-++ (id) alloc
-+{
-+    if(self == [ZBarReaderView class]) {
-+        // this is an abstract wrapper for implementation selected
-+        // at compile time.  replace with concrete subclass.
-+        return((id)[ZBarReaderViewImpl alloc]);
-+    }
-+    return([super alloc]);
-+}
-+
-+- (void) initSubviews
-+{
-+    assert(preview);
-+
-+    overlay = [CALayer new];
-+    overlay.backgroundColor = [UIColor clearColor].CGColor;
-+    [preview addSublayer: overlay];
-+
-+#ifndef NDEBUG
-+    overlay.borderWidth = 2;
-+    overlay.borderColor = [UIColor colorWithRed: 1
-+                                   green: 0
-+                                   blue: 0
-+                                   alpha: .5].CGColor;
-+    cropLayer = [CALayer new];
-+    cropLayer.backgroundColor = [UIColor clearColor].CGColor;
-+    cropLayer.borderWidth = 2;
-+    cropLayer.borderColor = [UIColor colorWithRed: 0
-+                                     green: 0
-+                                     blue: 1
-+                                     alpha: .5].CGColor;
-+    [overlay addSublayer: cropLayer];
-+#endif
-+
-+    tracking = [CALayer new];
-+    tracking.opacity = 0;
-+    tracking.borderWidth = 1;
-+    tracking.backgroundColor = [UIColor clearColor].CGColor;
-+    [overlay addSublayer: tracking];
-+
-+    trackingColor = [[UIColor greenColor]
-+                        retain];
-+    tracking.borderColor = trackingColor.CGColor;
-+
-+    fpsView = [UIView new];
-+    fpsView.backgroundColor = [UIColor colorWithWhite: 0
-+                                       alpha: .333];
-+    fpsView.layer.cornerRadius = 12;
-+    fpsView.hidden = YES;
-+    [self addSubview: fpsView];
-+
-+    fpsLabel = [[UILabel alloc]
-+                   initWithFrame: CGRectMake(0, 0, 80, 32)];
-+    fpsLabel.backgroundColor = [UIColor clearColor];
-+    fpsLabel.textColor = [UIColor colorWithRed: .333
-+                                  green: .666
-+                                  blue: 1
-+                                  alpha: 1];
-+    fpsLabel.font = [UIFont systemFontOfSize: 18];
-+    fpsLabel.textAlignment = UITextAlignmentRight;
-+    [fpsView addSubview: fpsLabel];
-+
-+    self.zoom = 1.25;
-+}
-+
-+- (void) _initWithImageScanner: (ZBarImageScanner*) scanner
-+{
-+    assert(scanner);
-+
-+    tracksSymbols = YES;
-+    interfaceOrientation = UIInterfaceOrientationPortrait;
-+    torchMode = 2; // AVCaptureTorchModeAuto
-+    scanCrop = effectiveCrop = CGRectMake(0, 0, 1, 1);
-+    imageScale = 1;
-+    previewTransform = CGAffineTransformIdentity;
-+    maxZoom = 2;
-+
-+    pinch = [[UIPinchGestureRecognizer alloc]
-+                initWithTarget: self
-+                action: @selector(handlePinch)];
-+    [self addGestureRecognizer: pinch];
-+}
-+
-+- (id) initWithImageScanner: (ZBarImageScanner*) scanner
-+{
-+    self = [super initWithFrame: CGRectMake(0, 0, 320, 426)];
-+    if(!self)
-+        return(nil);
-+
-+    self.backgroundColor = [UIColor blackColor];
-+    self.contentMode = UIViewContentModeScaleAspectFill;
-+    self.clipsToBounds = YES;
-+    self.autoresizingMask =
-+        UIViewAutoresizingFlexibleWidth |
-+        UIViewAutoresizingFlexibleHeight;
-+
-+    [self _initWithImageScanner: scanner];
-+    return(self);
-+}
-+
-+- (id) init
-+{
-+    ZBarImageScanner *scanner =
-+        [[ZBarImageScanner new]
-+            autorelease];
-+    self = [self initWithImageScanner: scanner];
-+    if(!self)
-+        return(nil);
-+
-+    [scanner setSymbology: 0
-+             config: ZBAR_CFG_X_DENSITY
-+             to: 3];
-+    [scanner setSymbology: 0
-+             config: ZBAR_CFG_Y_DENSITY
-+             to: 3];
-+    return(self);
-+}
-+
-+- (id) initWithCoder: (NSCoder*) decoder
-+{
-+    self = [super initWithCoder: decoder];
-+    if(!self)
-+        return(nil);
-+    ZBarImageScanner *scanner =
-+        [[ZBarImageScanner new]
-+            autorelease];
-+    [self _initWithImageScanner: scanner];
-+
-+    [scanner setSymbology: 0
-+             config: ZBAR_CFG_X_DENSITY
-+             to: 3];
-+    [scanner setSymbology: 0
-+             config: ZBAR_CFG_Y_DENSITY
-+             to: 3];
-+    return(self);
-+}
-+
-+- (void) dealloc
-+{
-+    [preview removeFromSuperlayer];
-+    [preview release];
-+    preview = nil;
-+    [overlay release];
-+    overlay = nil;
-+    [cropLayer release];
-+    cropLayer = nil;
-+    [tracking release];
-+    tracking = nil;
-+    [trackingColor release];
-+    trackingColor = nil;
-+    [fpsLabel release];
-+    fpsLabel = nil;
-+    [fpsView release];
-+    fpsView = nil;
-+    [pinch release];
-+    pinch = nil;
-+    [super dealloc];
-+}
-+
-+- (void) resetTracking
-+{
-+    [tracking removeAllAnimations];
-+    [CATransaction begin];
-+    [CATransaction setDisableActions: YES];
-+    CGSize size = overlay.bounds.size;
-+    CGRect crop = effectiveCrop;
-+    tracking.frame = CGRectMake(crop.origin.x * size.width,
-+                                crop.origin.y * size.height,
-+                                crop.size.width * size.width,
-+                                crop.size.height * size.height);
-+    tracking.opacity = 0;
-+    [CATransaction commit];
-+}
-+
-+- (void) updateCrop
-+{
-+}
-+
-+static inline CGFloat rotationForInterfaceOrientation (int orient)
-+{
-+    // resolve camera/device image orientation to view/interface orientation
-+    switch(orient)
-+    {
-+    case UIInterfaceOrientationLandscapeLeft:
-+        return(M_PI_2);
-+    case UIInterfaceOrientationPortraitUpsideDown:
-+        return(M_PI);
-+    case UIInterfaceOrientationLandscapeRight:
-+        return(3 * M_PI_2);
-+    case UIInterfaceOrientationPortrait:
-+        return(2 * M_PI);
-+    }
-+    return(0);
-+}
-+
-+- (void) layoutSubviews
-+{
-+    CGRect bounds = self.bounds;
-+    if(!bounds.size.width || !bounds.size.height)
-+        return;
-+
-+    [CATransaction begin];
-+    if(animationDuration) {
-+        [CATransaction setAnimationDuration: animationDuration];
-+        [CATransaction setAnimationTimingFunction:
-+            [CAMediaTimingFunction functionWithName:
-+                kCAMediaTimingFunctionEaseInEaseOut]];
-+    }
-+    else
-+        [CATransaction setDisableActions: YES];
-+
-+    [super layoutSubviews];
-+    fpsView.frame = CGRectMake(bounds.size.width - 80, bounds.size.height - 32,
-+                               80 + 12, 32 + 12);
-+
-+    // orient view bounds to match camera image
-+    CGSize psize;
-+    if(UIInterfaceOrientationIsPortrait(interfaceOrientation))
-+        psize = CGSizeMake(bounds.size.height, bounds.size.width);
-+    else
-+        psize = bounds.size;
-+
-+    // calculate scale from view coordinates to image coordinates
-+    // FIXME assumes AVLayerVideoGravityResizeAspectFill
-+    CGFloat scalex = imageSize.width / psize.width;
-+    CGFloat scaley = imageSize.height / psize.height;
-+    imageScale = (scalex < scaley) ? scalex : scaley;
-+    if(!imageScale)
-+        imageScale = 1;
-+    // apply zoom
-+    imageScale /= zoom;
-+
-+    // scale crop by zoom factor
-+    CGFloat z = 1 / zoom;
-+    CGFloat t = (1 - z) / 2;
-+    CGRect zoomCrop =
-+        CGRectMake(scanCrop.origin.x * z + t,
-+                   scanCrop.origin.y * z + t,
-+                   scanCrop.size.width * z,
-+                   scanCrop.size.height * z);
-+
-+    // convert effective preview area to normalized image coordinates
-+    CGRect previewCrop;
-+    if(scalex < scaley && imageSize.height)
-+        previewCrop.size =
-+            CGSizeMake(z, psize.height * imageScale / imageSize.height);
-+    else if(imageSize.width)
-+        previewCrop.size =
-+            CGSizeMake(psize.width * imageScale / imageSize.width, z);
-+    else
-+        previewCrop.size = CGSizeMake(1, 1);
-+    previewCrop.origin = CGPointMake((1 - previewCrop.size.width) / 2,
-+                                     (1 - previewCrop.size.height) / 2);
-+
-+    // clip crop to visible preview area
-+    effectiveCrop = CGRectIntersection(zoomCrop, previewCrop);
-+    if(CGRectIsNull(effectiveCrop))
-+        effectiveCrop = zoomCrop;
-+
-+    // size preview to match image in view coordinates
-+    CGFloat viewScale = 1 / imageScale;
-+    if(imageSize.width && imageSize.height)
-+        psize = CGSizeMake(imageSize.width * viewScale,
-+                           imageSize.height * viewScale);
-+
-+    preview.bounds = CGRectMake(0, 0, psize.height, psize.width);
-+    // center preview in view
-+    preview.position = CGPointMake(bounds.size.width / 2,
-+                                   bounds.size.height / 2);
-+
-+    CGFloat angle = rotationForInterfaceOrientation(interfaceOrientation);
-+    CATransform3D xform =
-+        CATransform3DMakeAffineTransform(previewTransform);
-+    preview.transform = CATransform3DRotate(xform, angle, 0, 0, 1);
-+
-+    // scale overlay to match actual image
-+    if(imageSize.width && imageSize.height)
-+        overlay.bounds = CGRectMake(0, 0, imageSize.width, imageSize.height);
-+    else
-+        overlay.bounds = CGRectMake(0, 0, psize.width, psize.height);
-+    // center overlay in preview
-+    overlay.position = CGPointMake(psize.height / 2, psize.width / 2);
-+
-+    // image coordinates rotated from preview
-+    xform = CATransform3DMakeRotation(M_PI_2, 0, 0, 1);
-+    overlay.transform = CATransform3DScale(xform, viewScale, viewScale, 1);
-+    tracking.borderWidth = imageScale;
-+
-+#ifndef NDEBUG
-+    preview.backgroundColor = [UIColor yellowColor].CGColor;
-+    overlay.borderWidth = 2 * imageScale;
-+    cropLayer.borderWidth = 2 * imageScale;
-+    cropLayer.frame = CGRectMake(effectiveCrop.origin.x * imageSize.width,
-+                                 effectiveCrop.origin.y * imageSize.height,
-+                                 effectiveCrop.size.width * imageSize.width,
-+                                 effectiveCrop.size.height * imageSize.height);
-+    zlog(@"layoutSubviews: bounds=%@ orient=%d image=%@ crop=%@ zoom=%g\n"
-+         @"=> preview=%@ crop=(z%@ p%@ %@ i%@) scale=%g %c %g = 1/%g",
-+         NSStringFromCGSize(bounds.size), interfaceOrientation,
-+         NSStringFromCGSize(imageSize), NSStringFromCGRect(scanCrop), zoom,
-+         NSStringFromCGSize(psize), NSStringFromCGRect(zoomCrop),
-+         NSStringFromCGRect(previewCrop), NSStringFromCGRect(effectiveCrop),
-+         NSStringFromCGRect(cropLayer.frame),
-+         scalex, (scalex > scaley) ? '>' : '<', scaley, viewScale);
-+#endif
-+
-+    [self resetTracking];
-+    [self updateCrop];
-+
-+    [CATransaction commit];
-+    animationDuration = 0;
-+}
-+
-+- (void) setImageSize: (CGSize) size
-+{
-+    zlog(@"imageSize=%@", NSStringFromCGSize(size));
-+    imageSize = size;
-+
-+    // FIXME bug in AVCaptureVideoPreviewLayer fails to update preview location
-+    preview.bounds = CGRectMake(0, 0, size.width, size.height);
-+
-+    [self setNeedsLayout];
-+}
-+
-+- (void) willRotateToInterfaceOrientation: (UIInterfaceOrientation) orient
-+                                 duration: (NSTimeInterval) duration
-+{
-+    if(interfaceOrientation != orient) {
-+        zlog(@"orient=%d #%g", orient, duration);
-+        interfaceOrientation = orient;
-+        animationDuration = duration;
-+    }
-+}
-+
-+- (void) setScanCrop: (CGRect) r
-+{
-+    if(CGRectEqualToRect(scanCrop, r))
-+        return;
-+    scanCrop = r;
-+    [self setNeedsLayout];
-+}
-+
-+- (void) setTracksSymbols: (BOOL) track
-+{
-+    if(track == tracksSymbols)
-+        return;
-+    tracksSymbols = track;
-+    [self resetTracking];
-+}
-+
-+- (BOOL) allowsPinchZoom
-+{
-+    return(pinch.enabled);
-+}
-+
-+- (void) setAllowsPinchZoom: (BOOL) enabled
-+{
-+    pinch.enabled = enabled;
-+}
-+
-+- (void) setTrackingColor: (UIColor*) color
-+{
-+    if(!color)
-+        return;
-+    [color retain];
-+    [trackingColor release];
-+    trackingColor = color;
-+    tracking.borderColor = color.CGColor;
-+}
-+
-+- (void) setShowsFPS: (BOOL) show
-+{
-+    if(show == showsFPS)
-+        return;
-+    fpsView.hidden = !show;
-+}
-+
-+- (void) setZoom: (CGFloat) z
-+{
-+    if(z < 1.0)
-+        z = 1.0;
-+    if(z > maxZoom)
-+        z = maxZoom;
-+    if(z == zoom)
-+        return;
-+    zoom = z;
-+
-+    [self setNeedsLayout];
-+}
-+
-+- (void) setZoom: (CGFloat) z
-+        animated: (BOOL) animated
-+{
-+    [CATransaction begin];
-+    if(animated) {
-+        [CATransaction setAnimationDuration: .1];
-+        [CATransaction setAnimationTimingFunction:
-+            [CAMediaTimingFunction functionWithName:
-+                kCAMediaTimingFunctionLinear]];
-+    }
-+    else
-+        [CATransaction setDisableActions: YES];
-+    // FIXME animate from current value
-+    self.zoom = z;
-+    [self layoutIfNeeded];
-+    [CATransaction commit];
-+}
-+
-+- (void) setPreviewTransform: (CGAffineTransform) xfrm
-+{
-+    previewTransform = xfrm;
-+    [self setNeedsLayout];
-+}
-+
-+- (void) start
-+{
-+    if(started)
-+        return;
-+    started = YES;
-+
-+    [self resetTracking];
-+    fpsLabel.text = @"--- fps ";
-+
-+    [[UIDevice currentDevice]
-+        beginGeneratingDeviceOrientationNotifications];
-+}
-+
-+- (void) stop
-+{
-+    if(!started)
-+        return;
-+    started = NO;
-+
-+    [[UIDevice currentDevice]
-+        endGeneratingDeviceOrientationNotifications];
-+}
-+
-+- (void) flushCache
-+{
-+}
-+
-+// UIGestureRecognizer callback
-+
-+- (void) handlePinch
-+{
-+    if(pinch.state == UIGestureRecognizerStateBegan)
-+        zoom0 = zoom;
-+    CGFloat z = zoom0 * pinch.scale;
-+    [self setZoom: z
-+          animated: YES];
-+
-+    if((zoom < 1.5) != (z < 1.5)) {
-+        int d = (z < 1.5) ? 3 : 2;
-+        ZBarImageScanner *scanner = self.scanner;
-+        @synchronized(scanner) {
-+            [scanner setSymbology: 0
-+                     config: ZBAR_CFG_X_DENSITY
-+                     to: d];
-+            [scanner setSymbology: 0
-+                     config: ZBAR_CFG_Y_DENSITY
-+                     to: d];
-+        }
-+    }
-+}
-+
-+- (void) updateTracking: (CALayer*) trk
-+             withSymbol: (ZBarSymbol*) sym
-+{
-+    if(!sym)
-+        return;
-+
-+    CGRect r = sym.bounds;
-+    if(r.size.width <= 32 && r.size.height <= 32)
-+        return;
-+    r = CGRectInset(r, -24, -24);
-+
-+    CALayer *current = trk.presentationLayer;
-+    CGPoint cp = current.position;
-+    CGPoint p = CGPointMake(CGRectGetMidX(r), CGRectGetMidY(r));
-+    p = CGPointMake((p.x * 3 + cp.x) / 4, (p.y * 3 + cp.y) / 4);
-+
-+    CGRect cr = current.bounds;
-+    r.origin = cr.origin;
-+    r.size.width = (r.size.width * 3 + cr.size.width) / 4;
-+    r.size.height = (r.size.height * 3 + cr.size.height) / 4;
-+
-+    CAMediaTimingFunction *linear =
-+        [CAMediaTimingFunction functionWithName: kCAMediaTimingFunctionLinear];
-+
-+    CABasicAnimation *resize =
-+        [CABasicAnimation animationWithKeyPath: @"bounds"];
-+    resize.fromValue = [NSValue valueWithCGRect: cr];
-+    resize.toValue = [NSValue valueWithCGRect: r];
-+    resize.duration = .2;
-+    resize.timingFunction = linear;
-+    resize.fillMode = kCAFillModeForwards;
-+    resize.removedOnCompletion = NO;
-+
-+    CABasicAnimation *move =
-+        [CABasicAnimation animationWithKeyPath: @"position"];
-+    move.fromValue = [NSValue valueWithCGPoint: cp];
-+    move.toValue = [NSValue valueWithCGPoint: p];
-+    move.duration = .2;
-+    move.timingFunction = linear;
-+    move.fillMode = kCAFillModeForwards;
-+    move.removedOnCompletion = NO;
-+
-+    CABasicAnimation *on =
-+        [CABasicAnimation animationWithKeyPath: @"opacity"];
-+    on.fromValue = [NSNumber numberWithDouble: current.opacity];
-+    on.toValue = [NSNumber numberWithDouble: 1];
-+    on.duration = .2;
-+    on.timingFunction = linear;
-+    on.fillMode = kCAFillModeForwards;
-+    on.removedOnCompletion = NO;
-+
-+    CABasicAnimation *off = nil;
-+    if(!TARGET_IPHONE_SIMULATOR) {
-+        off = [CABasicAnimation animationWithKeyPath: @"opacity"];
-+        off.fromValue = [NSNumber numberWithDouble: 1];
-+        off.toValue = [NSNumber numberWithDouble: 0];
-+        off.beginTime = .5;
-+        off.duration = .5;
-+        off.timingFunction = linear;
-+    }
-+
-+    CAAnimationGroup *group = [CAAnimationGroup animation];
-+    group.animations = [NSArray arrayWithObjects: resize, move, on, off, nil];
-+    group.duration = 1;
-+    group.fillMode = kCAFillModeForwards;
-+    group.removedOnCompletion = !TARGET_IPHONE_SIMULATOR;
-+    [trk addAnimation: group
-+         forKey: @"tracking"];
-+}
-+
-+- (void) didTrackSymbols: (ZBarSymbolSet*) syms
-+{
-+    if(!tracksSymbols)
-+        return;
-+
-+    int n = syms.count;
-+    assert(n);
-+    if(!n)
-+        return;
-+
-+    ZBarSymbol *sym = nil;
-+    for(ZBarSymbol *s in syms)
-+        if(!sym || s.type == ZBAR_QRCODE || s.quality > sym.quality)
-+            sym = s;
-+    assert(sym);
-+    if(!sym)
-+        return;
-+
-+    [self updateTracking: tracking
-+          withSymbol: sym];
-+}
-+
-+@end
-diff -r 563557a923d0 iphone/ZBarReaderViewController.m
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/ZBarReaderViewController.m	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,699 @@
-+//------------------------------------------------------------------------
-+//  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-+//
-+//  This file is part of the ZBar Bar Code Reader.
-+//
-+//  The ZBar Bar Code Reader is free software; you can redistribute it
-+//  and/or modify it under the terms of the GNU Lesser Public License as
-+//  published by the Free Software Foundation; either version 2.1 of
-+//  the License, or (at your option) any later version.
-+//
-+//  The ZBar Bar Code Reader is distributed in the hope that it will be
-+//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-+//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+//  GNU Lesser Public License for more details.
-+//
-+//  You should have received a copy of the GNU Lesser Public License
-+//  along with the ZBar Bar Code Reader; if not, write to the Free
-+//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-+//  Boston, MA  02110-1301  USA
-+//
-+//  http://sourceforge.net/projects/zbar
-+//------------------------------------------------------------------------
-+
-+#import <ZBarSDK/ZBarReaderViewController.h>
-+#import <ZBarSDK/ZBarReaderView.h>
-+#import <ZBarSDK/ZBarCaptureReader.h>
-+#import <ZBarSDK/ZBarHelpController.h>
-+#import <ZBarSDK/ZBarCameraSimulator.h>
-+
-+#define MODULE ZBarReaderViewController
-+#import "debug.h"
-+
-+static inline AVCaptureDevicePosition
-+AVPositionForUICamera (UIImagePickerControllerCameraDevice camera)
-+{
-+    switch(camera) {
-+    case UIImagePickerControllerCameraDeviceRear:
-+        return(AVCaptureDevicePositionBack);
-+    case UIImagePickerControllerCameraDeviceFront:
-+        return(AVCaptureDevicePositionFront);
-+    }
-+    return(-1);
-+}
-+
-+static inline UIImagePickerControllerCameraDevice
-+UICameraForAVPosition (AVCaptureDevicePosition position)
-+{
-+    switch(position)
-+    {
-+    case AVCaptureDevicePositionBack:
-+        return(UIImagePickerControllerCameraDeviceRear);
-+    case AVCaptureDevicePositionFront:
-+        return(UIImagePickerControllerCameraDeviceFront);
-+    }
-+    return(-1);
-+}
-+
-+static inline AVCaptureDevice*
-+AVDeviceForUICamera (UIImagePickerControllerCameraDevice camera)
-+{
-+    AVCaptureDevicePosition position = AVPositionForUICamera(camera);
-+    if(position < 0)
-+        return(nil);
-+
-+#if !TARGET_IPHONE_SIMULATOR
-+    NSArray *allDevices =
-+        [AVCaptureDevice devicesWithMediaType: AVMediaTypeVideo];
-+    for(AVCaptureDevice *device in allDevices)
-+        // FIXME how to quantify "best" of several (theoretical) possibilities
-+        if(device.position == position)
-+            return(device);
-+#endif
-+    return(nil);
-+}
-+
-+static inline AVCaptureTorchMode
-+AVTorchModeForUIFlashMode (UIImagePickerControllerCameraFlashMode mode)
-+{
-+    switch(mode)
-+    {
-+    case UIImagePickerControllerCameraFlashModeAuto:
-+        return(AVCaptureTorchModeAuto);
-+    case UIImagePickerControllerCameraFlashModeOn:
-+        return(AVCaptureTorchModeOn);
-+    case UIImagePickerControllerCameraFlashModeOff:
-+        break;
-+    }
-+    return(AVCaptureTorchModeOff);
-+}
-+
-+static inline NSString*
-+AVSessionPresetForUIVideoQuality (UIImagePickerControllerQualityType quality)
-+{
-+#if !TARGET_IPHONE_SIMULATOR
-+    switch(quality)
-+    {
-+    case UIImagePickerControllerQualityTypeHigh:
-+        return(AVCaptureSessionPresetHigh);
-+    case UIImagePickerControllerQualityType640x480:
-+        return(AVCaptureSessionPreset640x480);
-+    case UIImagePickerControllerQualityTypeMedium:
-+        return(AVCaptureSessionPresetMedium);
-+    case UIImagePickerControllerQualityTypeLow:
-+        return(AVCaptureSessionPresetLow);
-+    case UIImagePickerControllerQualityTypeIFrame1280x720:
-+        return(AVCaptureSessionPresetiFrame1280x720);
-+    case UIImagePickerControllerQualityTypeIFrame960x540:
-+        return(AVCaptureSessionPresetiFrame960x540);
-+    }
-+#endif
-+    return(nil);
-+}
-+
-+
-+@implementation ZBarReaderViewController
-+
-+@synthesize scanner, readerDelegate, showsZBarControls,
-+    supportedOrientationsMask, tracksSymbols, enableCache, cameraOverlayView,
-+    cameraViewTransform, cameraDevice, cameraFlashMode, videoQuality,
-+    readerView, scanCrop;
-+@dynamic sourceType, allowsEditing, allowsImageEditing, showsCameraControls,
-+    showsHelpOnFail, cameraMode, takesPicture, maxScanDimension;
-+
-++ (BOOL) isSourceTypeAvailable: (UIImagePickerControllerSourceType) sourceType
-+{
-+    if(sourceType != UIImagePickerControllerSourceTypeCamera)
-+        return(NO);
-+    return(TARGET_IPHONE_SIMULATOR ||
-+           [UIImagePickerController isSourceTypeAvailable: sourceType]);
-+}
-+
-++ (BOOL) isCameraDeviceAvailable: (UIImagePickerControllerCameraDevice) camera
-+{
-+    return(TARGET_IPHONE_SIMULATOR ||
-+           [UIImagePickerController isCameraDeviceAvailable: camera]);
-+}
-+
-++ (BOOL) isFlashAvailableForCameraDevice: (UIImagePickerControllerCameraDevice) camera
-+{
-+    return(TARGET_IPHONE_SIMULATOR ||
-+           [UIImagePickerController isFlashAvailableForCameraDevice: camera]);
-+}
-+
-++ (NSArray*) availableCaptureModesForCameraDevice: (UIImagePickerControllerCameraDevice) camera
-+{
-+    if(![self isCameraDeviceAvailable: camera])
-+        return([NSArray array]);
-+
-+    // current reader only supports automatic detection
-+    return([NSArray arrayWithObject:
-+               [NSNumber numberWithInteger:
-+                   UIImagePickerControllerCameraCaptureModeVideo]]);
-+}
-+
-+- (void) _init
-+{
-+    supportedOrientationsMask =
-+        ZBarOrientationMask(UIInterfaceOrientationPortrait);
-+    showsZBarControls = tracksSymbols = enableCache = YES;
-+    scanCrop = CGRectMake(0, 0, 1, 1);
-+    cameraViewTransform = CGAffineTransformIdentity;
-+
-+    cameraFlashMode = UIImagePickerControllerCameraFlashModeAuto;
-+    videoQuality = UIImagePickerControllerQualityType640x480;
-+    AVCaptureDevice *device = nil;
-+#if !TARGET_IPHONE_SIMULATOR
-+    device = [AVCaptureDevice defaultDeviceWithMediaType: AVMediaTypeVideo];
-+#endif
-+    if(device)
-+        cameraDevice = UICameraForAVPosition(device.position);
-+    else
-+        cameraDevice = UIImagePickerControllerCameraDeviceRear;
-+
-+    // create our own scanner to store configuration,
-+    // independent of whether view is loaded
-+    scanner = [ZBarImageScanner new];
-+    [scanner setSymbology: 0
-+             config: ZBAR_CFG_X_DENSITY
-+             to: 3];
-+    [scanner setSymbology: 0
-+             config: ZBAR_CFG_Y_DENSITY
-+             to: 3];
-+}
-+
-+- (id) init
-+{
-+    if(!TARGET_IPHONE_SIMULATOR &&
-+       !NSClassFromString(@"AVCaptureSession")) {
-+        // fallback to old interface
-+        zlog(@"Falling back to ZBarReaderController");
-+        [self release];
-+        return((id)[ZBarReaderController new]);
-+    }
-+
-+    self = [super init];
-+    if(!self)
-+        return(nil);
-+
-+    self.wantsFullScreenLayout = YES;
-+    [self _init];
-+    return(self);
-+}
-+
-+- (id) initWithCoder: (NSCoder*) decoder
-+{
-+    self = [super initWithCoder: decoder];
-+    if(!self)
-+        return(nil);
-+
-+    [self _init];
-+    return(self);
-+}
-+
-+- (void) cleanup
-+{
-+    [cameraOverlayView removeFromSuperview];
-+    cameraSim.readerView = nil;
-+    [cameraSim release];
-+    cameraSim = nil;
-+    readerView.readerDelegate = nil;
-+    [readerView release];
-+    readerView = nil;
-+    [controls release];
-+    controls = nil;
-+    [shutter release];
-+    shutter = nil;
-+}
-+
-+- (void) dealloc
-+{
-+    [self cleanup];
-+    [cameraOverlayView release];
-+    cameraOverlayView = nil;
-+    [scanner release];
-+    scanner = nil;
-+    [super dealloc];
-+}
-+
-+- (void) initControls
-+{
-+    if(!showsZBarControls && controls) {
-+        [controls removeFromSuperview];
-+        [controls release];
-+        controls = nil;
-+    }
-+    if(!showsZBarControls)
-+        return;
-+
-+    UIView *view = self.view;
-+    if(controls) {
-+        assert(controls.superview == view);
-+        [view bringSubviewToFront: controls];
-+        return;
-+    }
-+
-+    CGRect r = view.bounds;
-+    r.origin.y = r.size.height - 54;
-+    r.size.height = 54;
-+    controls = [[UIView alloc]
-+                   initWithFrame: r];
-+    controls.autoresizingMask =
-+        UIViewAutoresizingFlexibleWidth |
-+        UIViewAutoresizingFlexibleHeight |
-+        UIViewAutoresizingFlexibleTopMargin;
-+    controls.backgroundColor = [UIColor blackColor];
-+
-+    UIToolbar *toolbar =
-+        [UIToolbar new];
-+    r.origin.y = 0;
-+    toolbar.frame = r;
-+    toolbar.barStyle = UIBarStyleBlackOpaque;
-+    toolbar.autoresizingMask =
-+        UIViewAutoresizingFlexibleWidth |
-+        UIViewAutoresizingFlexibleHeight;
-+
-+    UIButton *info =
-+        [UIButton buttonWithType: UIButtonTypeInfoLight];
-+    [info addTarget: self
-+          action: @selector(info)
-+          forControlEvents: UIControlEventTouchUpInside];
-+
-+    toolbar.items =
-+        [NSArray arrayWithObjects:
-+            [[[UIBarButtonItem alloc]
-+                 initWithBarButtonSystemItem: UIBarButtonSystemItemCancel
-+                 target: self
-+                 action: @selector(cancel)]
-+                autorelease],
-+            [[[UIBarButtonItem alloc]
-+                 initWithBarButtonSystemItem: UIBarButtonSystemItemFlexibleSpace
-+                 target: nil
-+                 action: nil]
-+                autorelease],
-+            [[[UIBarButtonItem alloc]
-+                 initWithCustomView: info]
-+                autorelease],
-+            nil];
-+    [controls addSubview: toolbar];
-+    [toolbar release];
-+
-+    [view addSubview: controls];
-+}
-+
-+- (void) initVideoQuality
-+{
-+    if(!readerView) {
-+        assert(0);
-+        return;
-+    }
-+
-+    AVCaptureSession *session = readerView.session;
-+    NSString *preset = AVSessionPresetForUIVideoQuality(videoQuality);
-+    if(session && preset && [session canSetSessionPreset: preset]) {
-+        zlog(@"set session preset=%@", preset);
-+        session.sessionPreset = preset;
-+    }
-+    else
-+        zlog(@"unable to set session preset=%@", preset);
-+}
-+
-+- (void) loadView
-+{
-+    self.view = [[UIView alloc]
-+                    initWithFrame: CGRectMake(0, 0, 320, 480)];
-+}
-+
-+- (void) viewDidLoad
-+{
-+    [super viewDidLoad];
-+    UIView *view = self.view;
-+    view.backgroundColor = [UIColor blackColor];
-+    view.autoresizingMask =
-+        UIViewAutoresizingFlexibleWidth |
-+        UIViewAutoresizingFlexibleHeight;
-+
-+    readerView = [[ZBarReaderView alloc]
-+                     initWithImageScanner: scanner];
-+    CGRect bounds = view.bounds;
-+    CGRect r = bounds;
-+    NSUInteger autoresize =
-+        UIViewAutoresizingFlexibleWidth |
-+        UIViewAutoresizingFlexibleHeight;
-+
-+    if(showsZBarControls ||
-+       self.parentViewController.modalViewController == self)
-+    {
-+        autoresize |= UIViewAutoresizingFlexibleBottomMargin;
-+        r.size.height -= 54;
-+    }
-+    readerView.frame = r;
-+    readerView.autoresizingMask = autoresize;
-+    AVCaptureDevice *device = AVDeviceForUICamera(cameraDevice);
-+    if(device && device != readerView.device)
-+        readerView.device = device;
-+    readerView.torchMode = AVTorchModeForUIFlashMode(cameraFlashMode);
-+    [self initVideoQuality];
-+
-+    readerView.readerDelegate = (id<ZBarReaderViewDelegate>)self;
-+    readerView.scanCrop = scanCrop;
-+    readerView.previewTransform = cameraViewTransform;
-+    readerView.tracksSymbols = tracksSymbols;
-+    readerView.enableCache = enableCache;
-+    [view addSubview: readerView];
-+
-+    shutter = [[UIView alloc]
-+                  initWithFrame: r];
-+    shutter.backgroundColor = [UIColor blackColor];
-+    shutter.opaque = NO;
-+    shutter.autoresizingMask =
-+        UIViewAutoresizingFlexibleWidth |
-+        UIViewAutoresizingFlexibleHeight;
-+    [view addSubview: shutter];
-+
-+    if(cameraOverlayView) {
-+        assert(!cameraOverlayView.superview);
-+        [cameraOverlayView removeFromSuperview];
-+        [view addSubview: cameraOverlayView];
-+    }
-+
-+    [self initControls];
-+
-+    if(TARGET_IPHONE_SIMULATOR) {
-+        cameraSim = [[ZBarCameraSimulator alloc]
-+                        initWithViewController: self];
-+        cameraSim.readerView = readerView;
-+    }
-+}
-+
-+- (void) viewDidUnload
-+{
-+    [cameraOverlayView removeFromSuperview];
-+    [self cleanup];
-+    [super viewDidUnload];
-+}
-+
-+- (void) viewWillAppear: (BOOL) animated
-+{
-+    zlog(@"willAppear: anim=%d orient=%d",
-+         animated, self.interfaceOrientation);
-+    [self initControls];
-+    [super viewWillAppear: animated];
-+
-+    [readerView willRotateToInterfaceOrientation: self.interfaceOrientation
-+                duration: 0];
-+    [readerView performSelector: @selector(start)
-+                withObject: nil
-+                afterDelay: .001];
-+    shutter.alpha = 1;
-+    shutter.hidden = NO;
-+
-+    UIApplication *app = [UIApplication sharedApplication];
-+    BOOL willHideStatusBar =
-+        !didHideStatusBar && self.wantsFullScreenLayout && !app.statusBarHidden;
-+    if(willHideStatusBar)
-+        [app setStatusBarHidden: YES
-+             withAnimation: UIStatusBarAnimationFade];
-+    didHideStatusBar = didHideStatusBar || willHideStatusBar;
-+}
-+
-+- (void) dismissModalViewControllerAnimated: (BOOL) animated
-+{
-+    if(didHideStatusBar) {
-+        [[UIApplication sharedApplication]
-+            setStatusBarHidden: NO
-+            withAnimation: UIStatusBarAnimationFade];
-+        didHideStatusBar = NO;
-+    }
-+    [super dismissModalViewControllerAnimated: animated];
-+}
-+
-+- (void) viewWillDisappear: (BOOL) animated
-+{
-+    readerView.captureReader.enableReader = NO;
-+
-+    if(didHideStatusBar) {
-+        [[UIApplication sharedApplication]
-+            setStatusBarHidden: NO
-+            withAnimation: UIStatusBarAnimationFade];
-+        didHideStatusBar = NO;
-+    }
-+
-+    [super viewWillDisappear: animated];
-+}
-+
-+- (void) viewDidDisappear: (BOOL) animated
-+{
-+    // stopRunning can take a really long time (>1s observed),
-+    // so defer until the view transitions are complete
-+    [readerView stop];
-+}
-+
-+- (BOOL) shouldAutorotateToInterfaceOrientation: (UIInterfaceOrientation) orient
-+{
-+    return((supportedOrientationsMask >> orient) & 1);
-+}
-+
-+- (void) willRotateToInterfaceOrientation: (UIInterfaceOrientation) orient
-+                                 duration: (NSTimeInterval) duration
-+{
-+    zlog(@"willRotate: orient=%d #%g", orient, duration);
-+    rotating = YES;
-+    if(readerView)
-+        [readerView willRotateToInterfaceOrientation: orient
-+                    duration: duration];
-+}
-+
-+- (void) willAnimateRotationToInterfaceOrientation: (UIInterfaceOrientation) orient
-+                                          duration: (NSTimeInterval) duration
-+{
-+    zlog(@"willAnimateRotation: orient=%d #%g", orient, duration);
-+    if(helpController)
-+        [helpController willAnimateRotationToInterfaceOrientation: orient
-+                        duration: duration];
-+    if(readerView)
-+        [readerView setNeedsLayout];
-+}
-+
-+- (void) didRotateFromInterfaceOrientation: (UIInterfaceOrientation) orient
-+{
-+    zlog(@"didRotate(%d): orient=%d", rotating, orient);
-+    if(!rotating && readerView) {
-+        // work around UITabBarController bug: willRotate is not called
-+        // for non-portrait initial interface orientation
-+        [readerView willRotateToInterfaceOrientation: self.interfaceOrientation
-+                    duration: 0];
-+        [readerView setNeedsLayout];
-+    }
-+    rotating = NO;
-+}
-+
-+- (ZBarReaderView*) readerView
-+{
-+    // force view to load
-+    (void)self.view;
-+    assert(readerView);
-+    return(readerView);
-+}
-+
-+- (void) setTracksSymbols: (BOOL) track
-+{
-+    tracksSymbols = track;
-+    if(readerView)
-+        readerView.tracksSymbols = track;
-+}
-+
-+- (void) setEnableCache: (BOOL) enable
-+{
-+    enableCache = enable;
-+    if(readerView)
-+        readerView.enableCache = enable;
-+}
-+
-+- (void) setScanCrop: (CGRect) r
-+{
-+    scanCrop = r;
-+    if(readerView)
-+        readerView.scanCrop = r;
-+}
-+
-+- (void) setCameraOverlayView: (UIView*) newview
-+{
-+    UIView *oldview = cameraOverlayView;
-+    [oldview removeFromSuperview];
-+
-+    cameraOverlayView = [newview retain];
-+    if([self isViewLoaded] && newview)
-+        [self.view addSubview: newview];
-+
-+    [oldview release];
-+}
-+
-+- (void) setCameraViewTransform: (CGAffineTransform) xfrm
-+{
-+    cameraViewTransform = xfrm;
-+    if(readerView)
-+        readerView.previewTransform = xfrm;
-+}
-+
-+- (void) cancel
-+{
-+    if(!readerDelegate)
-+        return;
-+    SEL cb = @selector(imagePickerControllerDidCancel:);
-+    if([readerDelegate respondsToSelector: cb])
-+        [readerDelegate
-+            imagePickerControllerDidCancel: (UIImagePickerController*)self];
-+    else
-+        [self dismissModalViewControllerAnimated: YES];
-+}
-+
-+- (void) info
-+{
-+    [self showHelpWithReason: @"INFO"];
-+}
-+
-+- (void) showHelpWithReason: (NSString*) reason
-+{
-+    if(helpController)
-+        return;
-+    helpController = [[ZBarHelpController alloc]
-+                         initWithReason: reason];
-+    helpController.delegate = (id<ZBarHelpDelegate>)self;
-+    helpController.wantsFullScreenLayout = YES;
-+    UIView *helpView = helpController.view;
-+    helpView.alpha = 0;
-+    helpView.frame = self.view.bounds;
-+    [helpController viewWillAppear: YES];
-+    [self.view addSubview: helpView];
-+    [UIView beginAnimations: @"ZBarHelp"
-+            context: nil];
-+    helpController.view.alpha = 1;
-+    [UIView commitAnimations];
-+}
-+
-+- (void) takePicture
-+{
-+    if(TARGET_IPHONE_SIMULATOR) {
-+        [cameraSim takePicture];
-+        // FIXME return selected image
-+    }
-+    else if(readerView)
-+        [readerView.captureReader captureFrame];
-+}
-+
-+- (void) setCameraDevice: (UIImagePickerControllerCameraDevice) camera
-+{
-+    cameraDevice = camera;
-+    if(readerView) {
-+        AVCaptureDevice *device = AVDeviceForUICamera(camera);
-+        if(device)
-+            readerView.device = device;
-+    }
-+}
-+
-+- (void) setCameraFlashMode: (UIImagePickerControllerCameraFlashMode) mode
-+{
-+    cameraFlashMode = mode;
-+    if(readerView)
-+        readerView.torchMode = AVTorchModeForUIFlashMode(mode);
-+}
-+
-+- (UIImagePickerControllerCameraCaptureMode) cameraCaptureMode
-+{
-+    return(UIImagePickerControllerCameraCaptureModeVideo);
-+}
-+
-+- (void) setCameraCaptureMode: (UIImagePickerControllerCameraCaptureMode) mode
-+{
-+    NSAssert2(mode == UIImagePickerControllerCameraCaptureModeVideo,
-+              @"attempt to set unsupported value (%d)"
-+              @" for %@ property", mode, @"cameraCaptureMode");
-+}
-+
-+- (void) setVideoQuality: (UIImagePickerControllerQualityType) quality
-+{
-+    videoQuality = quality;
-+    if(readerView)
-+        [self initVideoQuality];
-+}
-+
-+
-+// ZBarHelpDelegate
-+
-+- (void) helpControllerDidFinish: (ZBarHelpController*) help
-+{
-+    assert(help == helpController);
-+    [help viewWillDisappear: YES];
-+    [UIView beginAnimations: @"ZBarHelp"
-+            context: NULL];
-+    [UIView setAnimationDelegate: self];
-+    [UIView setAnimationDidStopSelector: @selector(removeHelp:done:context:)];
-+    help.view.alpha = 0;
-+    [UIView commitAnimations];
-+}
-+
-+- (void) removeHelp: (NSString*) tag
-+               done: (NSNumber*) done
-+            context: (void*) ctx
-+{
-+    if([tag isEqualToString: @"ZBarHelp"] && helpController) {
-+        [helpController.view removeFromSuperview];
-+        [helpController release];
-+        helpController = nil;
-+    }
-+}
-+
-+
-+// ZBarReaderViewDelegate
-+
-+- (void) readerView: (ZBarReaderView*) readerView
-+     didReadSymbols: (ZBarSymbolSet*) syms
-+          fromImage: (UIImage*) image
-+{
-+    [readerDelegate
-+        imagePickerController: (UIImagePickerController*)self
-+        didFinishPickingMediaWithInfo:
-+            [NSDictionary dictionaryWithObjectsAndKeys:
-+                image, UIImagePickerControllerOriginalImage,
-+                syms, ZBarReaderControllerResults,
-+                nil]];
-+}
-+
-+- (void) readerViewDidStart: (ZBarReaderView*) readerView
-+{
-+    if(!shutter.hidden)
-+        [UIView animateWithDuration: .25
-+                animations: ^{
-+                    shutter.alpha = 0;
-+                }
-+                completion: ^(BOOL finished) {
-+                    shutter.hidden = YES;
-+                }];
-+}
-+
-+
-+// "deprecated" properties
-+
-+#define DEPRECATED_PROPERTY(getter, setter, type, val, ignore) \
-+    - (type) getter                                    \
-+    {                                                  \
-+        return(val);                                   \
-+    }                                                  \
-+    - (void) setter: (type) v                          \
-+    {                                                  \
-+        NSAssert2(ignore || v == val,                  \
-+                  @"attempt to set unsupported value (%d)" \
-+                  @" for %@ property", val, @#getter); \
-+    }
-+
-+DEPRECATED_PROPERTY(sourceType, setSourceType, UIImagePickerControllerSourceType, UIImagePickerControllerSourceTypeCamera, NO)
-+DEPRECATED_PROPERTY(allowsEditing, setAllowsEditing, BOOL, NO, NO)
-+DEPRECATED_PROPERTY(allowsImageEditing, setAllowsImageEditing, BOOL, NO, NO)
-+DEPRECATED_PROPERTY(showsCameraControls, setShowsCameraControls, BOOL, NO, NO)
-+DEPRECATED_PROPERTY(showsHelpOnFail, setShowsHelpOnFail, BOOL, NO, YES)
-+DEPRECATED_PROPERTY(cameraMode, setCameraMode, ZBarReaderControllerCameraMode, ZBarReaderControllerCameraModeSampling, NO)
-+DEPRECATED_PROPERTY(takesPicture, setTakesPicture, BOOL, NO, NO)
-+DEPRECATED_PROPERTY(maxScanDimension, setMaxScanDimension, NSInteger, 640, YES)
-+
-+@end
-diff -r 563557a923d0 iphone/ZBarReaderViewImpl_Capture.m
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/ZBarReaderViewImpl_Capture.m	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,402 @@
-+//------------------------------------------------------------------------
-+//  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-+//
-+//  This file is part of the ZBar Bar Code Reader.
-+//
-+//  The ZBar Bar Code Reader is free software; you can redistribute it
-+//  and/or modify it under the terms of the GNU Lesser Public License as
-+//  published by the Free Software Foundation; either version 2.1 of
-+//  the License, or (at your option) any later version.
-+//
-+//  The ZBar Bar Code Reader is distributed in the hope that it will be
-+//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-+//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+//  GNU Lesser Public License for more details.
-+//
-+//  You should have received a copy of the GNU Lesser Public License
-+//  along with the ZBar Bar Code Reader; if not, write to the Free
-+//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-+//  Boston, MA  02110-1301  USA
-+//
-+//  http://sourceforge.net/projects/zbar
-+//------------------------------------------------------------------------
-+
-+#import <AVFoundation/AVFoundation.h>
-+#import <CoreMedia/CoreMedia.h>
-+#import <CoreVideo/CoreVideo.h>
-+#import <ZBarSDK/ZBarReaderView.h>
-+#import <ZBarSDK/ZBarCaptureReader.h>
-+
-+#define MODULE ZBarReaderView
-+#import "debug.h"
-+
-+// protected APIs
-+@interface ZBarReaderView()
-+- (void) _initWithImageScanner: (ZBarImageScanner*) _scanner;
-+- (void) initSubviews;
-+- (void) updateCrop;
-+- (void) setImageSize: (CGSize) size;
-+- (void) didTrackSymbols: (ZBarSymbolSet*) syms;
-+@end
-+
-+@interface ZBarReaderViewImpl
-+    : ZBarReaderView
-+{
-+    AVCaptureSession *session;
-+    AVCaptureDevice *device;
-+    AVCaptureInput *input;
-+}
-+
-+@end
-+
-+@implementation ZBarReaderViewImpl
-+
-+@synthesize device, session;
-+
-+- (void) _initWithImageScanner: (ZBarImageScanner*) scanner
-+{
-+    [super _initWithImageScanner: scanner];
-+
-+    session = [AVCaptureSession new];
-+    NSNotificationCenter *notify =
-+        [NSNotificationCenter defaultCenter];
-+    [notify addObserver: self
-+            selector: @selector(onVideoError:)
-+            name: AVCaptureSessionRuntimeErrorNotification
-+            object: session];
-+    [notify addObserver: self
-+            selector: @selector(onVideoStart:)
-+            name: AVCaptureSessionDidStartRunningNotification
-+            object: session];
-+    [notify addObserver: self
-+            selector: @selector(onVideoStop:)
-+            name: AVCaptureSessionDidStopRunningNotification
-+            object: session];
-+    [notify addObserver: self
-+            selector: @selector(onVideoStop:)
-+            name: AVCaptureSessionWasInterruptedNotification
-+            object: session];
-+    [notify addObserver: self
-+            selector: @selector(onVideoStart:)
-+            name: AVCaptureSessionInterruptionEndedNotification
-+            object: session];
-+
-+    self.device = [AVCaptureDevice
-+                      defaultDeviceWithMediaType: AVMediaTypeVideo];
-+
-+    captureReader = [[ZBarCaptureReader alloc]
-+                        initWithImageScanner: scanner];
-+    captureReader.captureDelegate = (id<ZBarCaptureDelegate>)self;
-+    [session addOutput: captureReader.captureOutput];
-+
-+    if([session canSetSessionPreset: AVCaptureSessionPreset640x480])
-+        session.sessionPreset = AVCaptureSessionPreset640x480;
-+
-+    [captureReader addObserver: self
-+                   forKeyPath: @"size"
-+                   options: 0
-+                   context: NULL];
-+
-+    [self initSubviews];
-+}
-+
-+- (void) initSubviews
-+{
-+    AVCaptureVideoPreviewLayer *videoPreview =
-+        [[AVCaptureVideoPreviewLayer
-+             layerWithSession: session]
-+            retain];
-+    preview = videoPreview;
-+    CGRect bounds = self.bounds;
-+    bounds.origin = CGPointZero;
-+    preview.bounds = bounds;
-+    preview.position = CGPointMake(bounds.size.width / 2,
-+                                   bounds.size.height / 2);
-+    videoPreview.videoGravity = AVLayerVideoGravityResizeAspectFill;
-+    [self.layer addSublayer: preview];
-+
-+    [super initSubviews];
-+}
-+
-+- (void) dealloc
-+{
-+    [[NSNotificationCenter defaultCenter]
-+        removeObserver: self];
-+    if(showsFPS) {
-+        @try {
-+            [captureReader removeObserver: self
-+                           forKeyPath: @"framesPerSecond"];
-+        }
-+        @catch(...) { }
-+    }
-+    @try {
-+        [captureReader removeObserver: self
-+                       forKeyPath: @"size"];
-+    }
-+    @catch(...) { }
-+    captureReader.captureDelegate = nil;
-+    [captureReader release];
-+    captureReader = nil;
-+    [device release];
-+    device = nil;
-+    [input release];
-+    input = nil;
-+    [session release];
-+    session = nil;
-+    [super dealloc];
-+}
-+
-+- (void) updateCrop
-+{
-+    [super updateCrop];
-+    captureReader.scanCrop = effectiveCrop;
-+}
-+
-+- (ZBarImageScanner*) scanner
-+{
-+    return(captureReader.scanner);
-+}
-+
-+- (void) setDevice: (AVCaptureDevice*) newdev
-+{
-+    id olddev = device;
-+    AVCaptureInput *oldinput = input;
-+    assert(!olddev == !oldinput);
-+
-+    NSError *error = nil;
-+    device = [newdev retain];
-+    if(device) {
-+        assert([device hasMediaType: AVMediaTypeVideo]);
-+        input = [[AVCaptureDeviceInput alloc]
-+                    initWithDevice: newdev
-+                    error: &error];
-+        assert(input);
-+    }
-+    else
-+        input = nil;
-+
-+    [session beginConfiguration];
-+    if(oldinput)
-+        [session removeInput: oldinput];
-+    if(input)
-+        [session addInput: input];
-+    [session commitConfiguration];
-+
-+    [olddev release];
-+    [oldinput release];
-+}
-+
-+- (BOOL) enableCache
-+{
-+    return(captureReader.enableCache);
-+}
-+
-+- (void) setEnableCache: (BOOL) enable
-+{
-+    captureReader.enableCache = enable;
-+}
-+
-+- (void) setTorchMode: (NSInteger) mode
-+{
-+    [super setTorchMode: mode];
-+    if(running && [device isTorchModeSupported: mode])
-+        @try {
-+            device.torchMode = mode;
-+        }
-+        @catch(...) { }
-+}
-+
-+- (void) setShowsFPS: (BOOL) show
-+{
-+    [super setShowsFPS: show];
-+    @try {
-+        if(show)
-+            [captureReader addObserver: self
-+                           forKeyPath: @"framesPerSecond"
-+                           options: 0
-+                           context: NULL];
-+        else
-+            [captureReader removeObserver: self
-+                           forKeyPath: @"framesPerSecond"];
-+    }
-+    @catch(...) { }
-+}
-+
-+- (void) start
-+{
-+    if(started)
-+        return;
-+    [super start];
-+
-+    [session startRunning];
-+    captureReader.enableReader = YES;
-+}
-+
-+- (void) stop
-+{
-+    if(!started)
-+        return;
-+    [super stop];
-+
-+    captureReader.enableReader = NO;
-+    [session stopRunning];
-+}
-+
-+- (void) flushCache
-+{
-+    [captureReader flushCache];
-+}
-+
-+- (void) configureDevice
-+{
-+    if([device isFocusModeSupported: AVCaptureFocusModeContinuousAutoFocus])
-+        device.focusMode = AVCaptureFocusModeContinuousAutoFocus;
-+    if([device isTorchModeSupported: torchMode])
-+        device.torchMode = torchMode;
-+}
-+
-+- (void) lockDevice
-+{
-+    if(!running || locked) {
-+        assert(0);
-+        return;
-+    }
-+
-+    // lock device and set focus mode
-+    NSError *error = nil;
-+    if([device lockForConfiguration: &error]) {
-+        locked = YES;
-+        [self configureDevice];
-+    }
-+    else {
-+        zlog(@"failed to lock device: %@", error);
-+        // just keep trying
-+        [self performSelector: @selector(lockDevice)
-+              withObject: nil
-+              afterDelay: .5];
-+    }
-+}
-+
-+
-+// AVCaptureSession notifications
-+
-+- (void) onVideoStart: (NSNotification*) note
-+{
-+    zlog(@"onVideoStart: running=%d %@", running, note);
-+    if(running)
-+        return;
-+    running = YES;
-+    locked = NO;
-+
-+    [self lockDevice];
-+
-+    if([readerDelegate respondsToSelector: @selector(readerViewDidStart:)])
-+        [readerDelegate readerViewDidStart: self];
-+}
-+
-+- (void) onVideoStop: (NSNotification*) note
-+{
-+    zlog(@"onVideoStop: %@", note);
-+    if(!running)
-+        return;
-+    running = NO;
-+
-+    if(locked)
-+        [device unlockForConfiguration];
-+    else
-+        [NSObject cancelPreviousPerformRequestsWithTarget: self
-+                  selector: @selector(lockDevice)
-+                  object: nil];
-+    locked = NO;
-+
-+    if([readerDelegate respondsToSelector:
-+                           @selector(readerView:didStopWithError:)])
-+        [readerDelegate readerView: self
-+                        didStopWithError: nil];
-+}
-+
-+- (void) onVideoError: (NSNotification*) note
-+{
-+    zlog(@"onVideoError: %@", note);
-+    if(running) {
-+        // FIXME does session always stop on error?
-+        running = started = NO;
-+        [device unlockForConfiguration];
-+    }
-+    NSError *err =
-+        [note.userInfo objectForKey: AVCaptureSessionErrorKey];
-+
-+    if([readerDelegate respondsToSelector:
-+                           @selector(readerView:didStopWithError:)])
-+        [readerDelegate readerView: self
-+                        didStopWithError: err];
-+    else
-+        NSLog(@"ZBarReaderView: ERROR during capture: %@: %@",
-+              [err localizedDescription],
-+              [err localizedFailureReason]);
-+}
-+
-+// NSKeyValueObserving
-+
-+- (void) observeValueForKeyPath: (NSString*) path
-+                       ofObject: (id) obj
-+                         change: (NSDictionary*) info
-+                        context: (void*) ctx
-+{
-+    if(obj == captureReader &&
-+       [path isEqualToString: @"size"])
-+        // adjust preview to match image size
-+        [self setImageSize: captureReader.size];
-+    else if(obj == captureReader &&
-+       [path isEqualToString: @"framesPerSecond"])
-+        fpsLabel.text = [NSString stringWithFormat: @"%.2ffps ",
-+                                  captureReader.framesPerSecond];
-+}
-+
-+// ZBarCaptureDelegate
-+
-+- (void) captureReader: (ZBarCaptureReader*) reader
-+       didTrackSymbols: (ZBarSymbolSet*) syms
-+{
-+    [self didTrackSymbols: syms];
-+}
-+
-+- (void)       captureReader: (ZBarCaptureReader*) reader
-+  didReadNewSymbolsFromImage: (ZBarImage*) zimg
-+{
-+    zlog(@"scanned %d symbols: %@", zimg.symbols.count, zimg);
-+    if(!readerDelegate)
-+        return;
-+
-+    UIImageOrientation orient = [UIDevice currentDevice].orientation;
-+    if(!UIDeviceOrientationIsValidInterfaceOrientation(orient)) {
-+        orient = interfaceOrientation;
-+        if(orient == UIInterfaceOrientationLandscapeLeft)
-+            orient = UIDeviceOrientationLandscapeLeft;
-+        else if(orient == UIInterfaceOrientationLandscapeRight)
-+            orient = UIDeviceOrientationLandscapeRight;
-+    }
-+    switch(orient)
-+    {
-+    case UIDeviceOrientationPortraitUpsideDown:
-+        orient = UIImageOrientationLeft;
-+        break;
-+    case UIDeviceOrientationLandscapeLeft:
-+        orient = UIImageOrientationUp;
-+        break;
-+    case UIDeviceOrientationLandscapeRight:
-+        orient = UIImageOrientationDown;
-+        break;
-+    default:
-+        orient = UIImageOrientationRight;
-+        break;
-+    }
-+
-+    UIImage *uiimg = [zimg UIImageWithOrientation: orient];
-+    [readerDelegate
-+        readerView: self
-+        didReadSymbols: zimg.symbols
-+        fromImage: uiimg];
-+}
-+
-+@end
-diff -r 563557a923d0 iphone/ZBarReaderViewImpl_Simulator.m
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/ZBarReaderViewImpl_Simulator.m	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,219 @@
-+//------------------------------------------------------------------------
-+//  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-+//
-+//  This file is part of the ZBar Bar Code Reader.
-+//
-+//  The ZBar Bar Code Reader is free software; you can redistribute it
-+//  and/or modify it under the terms of the GNU Lesser Public License as
-+//  published by the Free Software Foundation; either version 2.1 of
-+//  the License, or (at your option) any later version.
-+//
-+//  The ZBar Bar Code Reader is distributed in the hope that it will be
-+//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-+//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+//  GNU Lesser Public License for more details.
-+//
-+//  You should have received a copy of the GNU Lesser Public License
-+//  along with the ZBar Bar Code Reader; if not, write to the Free
-+//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-+//  Boston, MA  02110-1301  USA
-+//
-+//  http://sourceforge.net/projects/zbar
-+//------------------------------------------------------------------------
-+
-+#import <ZBarSDK/ZBarReaderView.h>
-+#import <ZBarSDK/ZBarReaderViewController.h>
-+
-+#define MODULE ZBarReaderView
-+#import "debug.h"
-+
-+// hack around missing simulator support for AVCapture interfaces
-+
-+// protected APIs
-+@interface ZBarReaderView()
-+- (void) _initWithImageScanner: (ZBarImageScanner*) _scanner;
-+- (void) initSubviews;
-+- (void) setImageSize: (CGSize) size;
-+- (void) didTrackSymbols: (ZBarSymbolSet*) syms;
-+@end
-+
-+@interface ZBarReaderViewImpl
-+    : ZBarReaderView
-+{
-+    ZBarImageScanner *scanner;
-+    UILabel *simLabel;
-+    UIImage *scanImage;
-+    CALayer *previewImage;
-+    BOOL enableCache;
-+}
-+@end
-+
-+@implementation ZBarReaderViewImpl
-+
-+@synthesize scanner, enableCache;
-+
-+- (void) _initWithImageScanner: (ZBarImageScanner*) _scanner
-+{
-+    [super _initWithImageScanner: _scanner];
-+    scanner = [_scanner retain];
-+
-+    [self initSubviews];
-+}
-+
-+- (void) initSubviews
-+{
-+    simLabel = [UILabel new];
-+    simLabel.backgroundColor = [UIColor clearColor];
-+    simLabel.textColor = [UIColor whiteColor];
-+    simLabel.font = [UIFont boldSystemFontOfSize: 20];
-+    simLabel.numberOfLines = 4;
-+    simLabel.textAlignment = UITextAlignmentCenter;
-+    simLabel.text = @"Camera Simulation\n\n"
-+        @"Tap and hold with two \"fingers\" to select image";
-+    simLabel.autoresizingMask =
-+        UIViewAutoresizingFlexibleWidth |
-+        UIViewAutoresizingFlexibleHeight;
-+    [self addSubview: simLabel];
-+
-+    preview = [CALayer new];
-+    [self.layer addSublayer: preview];
-+
-+    previewImage = [CALayer new];
-+    [preview addSublayer: previewImage];
-+
-+    [super initSubviews];
-+}
-+
-+- (void) dealloc
-+{
-+    [scanner release];
-+    scanner = nil;
-+    [simLabel release];
-+    simLabel = nil;
-+    [previewImage release];
-+    previewImage = nil;
-+    [super dealloc];
-+}
-+
-+- (AVCaptureDevice*) device
-+{
-+    return(nil);
-+}
-+
-+- (void) setDevice: (AVCaptureDevice*) device
-+{
-+    // simulated camera does nothing with this
-+}
-+
-+- (AVCaptureSession*) session
-+{
-+    return(nil);
-+}
-+
-+- (void) updateCrop
-+{
-+    previewImage.frame = preview.bounds;
-+    CGRect bounds = self.bounds;
-+    simLabel.frame = CGRectInset(bounds,
-+                                 bounds.size.width * .05,
-+                                 bounds.size.height * .05);
-+}
-+
-+- (void) start
-+{
-+    if(started)
-+        return;
-+    [super start];
-+    running = YES;
-+
-+    [self performSelector: @selector(onVideoStart)
-+          withObject: nil
-+          afterDelay: 0.5];
-+}
-+
-+- (void) stop
-+{
-+    if(!started)
-+        return;
-+    [super stop];
-+    running = NO;
-+
-+    [self performSelector: @selector(onVideoStop)
-+          withObject: nil
-+          afterDelay: 0.5];
-+}
-+
-+- (void) scanImage: (UIImage*) image
-+{
-+    // strip EXIF info
-+    CGImageRef cgimage = image.CGImage;
-+    image = [[UIImage alloc]
-+                initWithCGImage: cgimage
-+                scale: 1.0
-+                orientation: UIImageOrientationUp];
-+
-+    [self setImageSize: image.size];
-+    [self layoutIfNeeded];
-+
-+    [CATransaction begin];
-+    [CATransaction setDisableActions: YES];
-+    previewImage.contentsGravity = kCAGravityResizeAspectFill;
-+    previewImage.transform = CATransform3DMakeRotation(M_PI_2, 0, 0, 1);
-+    previewImage.contents = (id)cgimage;
-+    [CATransaction commit];
-+
-+    ZBarImage *zimg =
-+        [[ZBarImage alloc]
-+            initWithCGImage: cgimage];
-+
-+    CGSize size = zimg.size;
-+    zimg.crop = CGRectMake(effectiveCrop.origin.x * size.width,
-+                           effectiveCrop.origin.y * size.height,
-+                           effectiveCrop.size.width * size.width,
-+                           effectiveCrop.size.height * size.height);
-+
-+    int nsyms = [scanner scanImage: zimg];
-+    zlog(@"scan image: %@ crop=%@ nsyms=%d",
-+         NSStringFromCGSize(size), NSStringFromCGRect(zimg.crop), nsyms);
-+    [zimg release];
-+
-+    if(nsyms > 0) {
-+        scanImage = [image retain];
-+        ZBarSymbolSet *syms = scanner.results;
-+        [self performSelector: @selector(didReadSymbols:)
-+              withObject: syms
-+              afterDelay: .4];
-+        [self performSelector: @selector(didTrackSymbols:)
-+              withObject: syms
-+              afterDelay: .001];
-+    }
-+    [image release];
-+}
-+
-+- (void) didReadSymbols: (ZBarSymbolSet*) syms
-+{
-+    [readerDelegate
-+        readerView: self
-+        didReadSymbols: syms
-+        fromImage: scanImage];
-+    [scanImage release];
-+    scanImage = nil;
-+}
-+
-+- (void) onVideoStart
-+{
-+    if(running &&
-+       [readerDelegate respondsToSelector: @selector(readerViewDidStart:)])
-+        [readerDelegate readerViewDidStart: self];
-+}
-+
-+- (void) onVideoStop
-+{
-+    if(!running &&
-+       [readerDelegate respondsToSelector:
-+                           @selector(readerView:didStopWithError:)])
-+        [readerDelegate readerView: self
-+                        didStopWithError: nil];
-+}
-+
-+@end
-diff -r 563557a923d0 iphone/ZBarSymbol.m
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/ZBarSymbol.m	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,197 @@
-+//------------------------------------------------------------------------
-+//  Copyright 2009-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-+//
-+//  This file is part of the ZBar Bar Code Reader.
-+//
-+//  The ZBar Bar Code Reader is free software; you can redistribute it
-+//  and/or modify it under the terms of the GNU Lesser Public License as
-+//  published by the Free Software Foundation; either version 2.1 of
-+//  the License, or (at your option) any later version.
-+//
-+//  The ZBar Bar Code Reader is distributed in the hope that it will be
-+//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-+//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+//  GNU Lesser Public License for more details.
-+//
-+//  You should have received a copy of the GNU Lesser Public License
-+//  along with the ZBar Bar Code Reader; if not, write to the Free
-+//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-+//  Boston, MA  02110-1301  USA
-+//
-+//  http://sourceforge.net/projects/zbar
-+//------------------------------------------------------------------------
-+
-+#import <ZBarSDK/ZBarSymbol.h>
-+
-+@implementation ZBarSymbol
-+
-+@dynamic type, typeName, configMask, modifierMask, data, quality, count,
-+    zbarSymbol;
-+
-++ (NSString*) nameForType: (zbar_symbol_type_t) type
-+{
-+    return([NSString stringWithUTF8String: zbar_get_symbol_name(type)]);
-+}
-+
-+- (id) initWithSymbol: (const zbar_symbol_t*) sym
-+{
-+    if(self = [super init]) {
-+        symbol = sym;
-+        zbar_symbol_ref(sym, 1);
-+    }
-+    return(self);
-+}
-+
-+- (void) dealloc
-+{
-+    if(symbol) {
-+        zbar_symbol_ref(symbol, -1);
-+        symbol = NULL;
-+    }
-+    [super dealloc];
-+}
-+
-+- (zbar_symbol_type_t) type
-+{
-+    return(zbar_symbol_get_type(symbol));
-+}
-+
-+- (NSString*) typeName
-+{
-+    return([[self class] nameForType: zbar_symbol_get_type(symbol)]);
-+}
-+
-+- (NSUInteger) configMask
-+{
-+    return(zbar_symbol_get_configs(symbol));
-+}
-+
-+- (NSUInteger) modifierMask
-+{
-+    return(zbar_symbol_get_modifiers(symbol));
-+}
-+
-+- (NSString*) data
-+{
-+    return([NSString stringWithUTF8String: zbar_symbol_get_data(symbol)]);
-+}
-+
-+- (int) quality
-+{
-+    return(zbar_symbol_get_quality(symbol));
-+}
-+
-+- (int) count
-+{
-+    return(zbar_symbol_get_count(symbol));
-+}
-+
-+- (zbar_orientation_t) orientation
-+{
-+    return(zbar_symbol_get_orientation(symbol));
-+}
-+
-+- (const zbar_symbol_t*) zbarSymbol
-+{
-+    return(symbol);
-+}
-+
-+- (ZBarSymbolSet*) components
-+{
-+    return([[[ZBarSymbolSet alloc]
-+                initWithSymbolSet: zbar_symbol_get_components(symbol)]
-+               autorelease]);
-+}
-+
-+- (CGRect) bounds
-+{
-+    int n = zbar_symbol_get_loc_size(symbol);
-+    if(!n)
-+        return(CGRectNull);
-+
-+    int xmin = INT_MAX, xmax = INT_MIN;
-+    int ymin = INT_MAX, ymax = INT_MIN;
-+
-+    for(int i = 0; i < n; i++) {
-+        int t = zbar_symbol_get_loc_x(symbol, i);
-+        if(xmin > t) xmin = t;
-+        if(xmax < t) xmax = t;
-+        t = zbar_symbol_get_loc_y(symbol, i);
-+        if(ymin > t) ymin = t;
-+        if(ymax < t) ymax = t;
-+    }
-+    return(CGRectMake(xmin, ymin, xmax - xmin, ymax - ymin));
-+}
-+
-+@end
-+
-+
-+@implementation ZBarSymbolSet
-+
-+@dynamic count, zbarSymbolSet;
-+@synthesize filterSymbols;
-+
-+- (id) initWithSymbolSet: (const zbar_symbol_set_t*) s
-+{
-+    if(!s) {
-+        [self release];
-+        return(nil);
-+    }
-+    if(self = [super init]) {
-+        set = s;
-+        zbar_symbol_set_ref(s, 1);
-+        filterSymbols = YES;
-+    }
-+    return(self);
-+}
-+
-+- (void) dealloc
-+{
-+    if(set) {
-+        zbar_symbol_set_ref(set, -1);
-+        set = NULL;
-+    }
-+    [super dealloc];
-+}
-+
-+- (int) count
-+{
-+    if(filterSymbols)
-+        return(zbar_symbol_set_get_size(set));
-+
-+    int n = 0;
-+    const zbar_symbol_t *sym = zbar_symbol_set_first_unfiltered(set);
-+    for(; sym; sym = zbar_symbol_next(sym))
-+        n++;
-+    return(n);
-+}
-+
-+- (const zbar_symbol_set_t*) zbarSymbolSet
-+{
-+    return(set);
-+}
-+
-+- (NSUInteger) countByEnumeratingWithState: (NSFastEnumerationState*) state
-+                                   objects: (id*) stackbuf
-+                                     count: (NSUInteger) len
-+{
-+    const zbar_symbol_t *sym = (void*)state->state; // FIXME
-+    if(sym)
-+        sym = zbar_symbol_next(sym);
-+    else if(set && filterSymbols)
-+        sym = zbar_symbol_set_first_symbol(set);
-+    else if(set)
-+        sym = zbar_symbol_set_first_unfiltered(set);
-+
-+    if(sym)
-+        *stackbuf = [[[ZBarSymbol alloc]
-+                         initWithSymbol: sym]
-+                        autorelease];
-+
-+    state->state = (unsigned long)sym; // FIXME
-+    state->itemsPtr = stackbuf;
-+    state->mutationsPtr = (void*)self;
-+    return((sym) ? 1 : 0);
-+}
-+
-+@end
-diff -r 563557a923d0 iphone/bin/BuildUniversal.sh
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/bin/BuildUniversal.sh	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,23 @@
-+#!/bin/sh
-+set -ux
-+SUBTARGET=${1:?}
-+OUTDIR=${2:-$TARGET_BUILD_DIR}
-+
-+# build library for device and simulator
-+xcodebuild -target $SUBTARGET -configuration $CONFIGURATION -sdk iphoneos BUILD_DIR=$BUILD_DIR BUILD_ROOT=$BUILD_ROOT\
-+    || exit 1
-+xcodebuild -target $SUBTARGET -configuration $CONFIGURATION -sdk iphonesimulator BUILD_DIR=$BUILD_DIR BUILD_ROOT=$BUILD_ROOT\
-+    || exit 1
-+
-+mkdir -p $OUTDIR
-+
-+# combine device and simulator libs into single fat lib.
-+# others have indicated that this approach is "wrong", but for us
-+# the ease of including the universal lib in a project without complicated
-+# changes to build settings outweighs any lack of purity in the approach
-+# ...we can always fix things later, if necessary
-+lipo -create \
-+    $BUILD_ROOT/$CONFIGURATION-iphoneos/$SUBTARGET.a \
-+    $BUILD_ROOT/$CONFIGURATION-iphonesimulator/$SUBTARGET.a \
-+    -output $OUTDIR/$SUBTARGET.a \
-+    || exit 1
-diff -r 563557a923d0 iphone/bin/CreateDMG.sh
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/bin/CreateDMG.sh	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,44 @@
-+#!/bin/sh
-+set -ux
-+VOLNAME=${1:?}
-+shift
-+RES=$SOURCE_ROOT/res
-+BUDDY=/usr/libexec/PlistBuddy
-+if [ ! -x "$BUDDY" ]; then
-+    BUDDY=$(xcrun -find PlistBuddy) \
-+        || exit 1
-+fi
-+VERSION=$($BUDDY -c 'Print :CFBundleVersion' $RES/$VOLNAME-Info.plist) \
-+    || exit 1
-+DMG=$VOLNAME-$VERSION
-+
-+mkdir -p $TARGET_BUILD_DIR/.background \
-+    || exit 1
-+cp -af $RES/$VOLNAME.DS_Store $TARGET_BUILD_DIR/.DS_Store
-+cp -af $RES/$VOLNAME-bg.png $TARGET_BUILD_DIR/.background/
-+
-+# copy remaining arguments to image directly
-+for content
-+do
-+    cp -af $content $TARGET_BUILD_DIR/ \
-+        || exit 1
-+done
-+
-+# prepare examples for distribution
-+for example in $(find $TARGET_BUILD_DIR/Examples -depth 1 -not -name '.*')
-+do
-+    rm -rf $example/{build,*.xcodeproj/{*.{mode1v3,pbxuser},project.xcworkspace,xcuserdata},ZBarSDK}
-+    cp -af $BUILT_PRODUCTS_DIR/ZBarSDK $example/
-+done
-+
-+# override subdir .DS_Stores
-+for dir in $(find $TARGET_BUILD_DIR -type d -depth 1)
-+do
-+    cp -af $RES/Columns.DS_Store $dir/.DS_Store
-+done
-+
-+hdiutil create -ov -fs HFS+ -format UDZO -imagekey zlib-level=9 \
-+    -volname $VOLNAME \
-+    -srcdir $TARGET_BUILD_DIR \
-+    $BUILT_PRODUCTS_DIR/$DMG.dmg \
-+    || exit 1
-diff -r 563557a923d0 iphone/bin/CreateDSStore.pl
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/bin/CreateDSStore.pl	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,72 @@
-+#!/usr/bin/perl
-+
-+# Quick hack script to generate the .DS_Store for the DMG, which
-+#   * allows us to precisely position the window and icons
-+#   * is more usefully versioned
-+#   * avoids references to my local HD(!?)
-+
-+use warnings;
-+use strict;
-+
-+BEGIN {
-+  use File::Spec::Functions qw(rel2abs splitpath);
-+  use lib (splitpath(rel2abs($0)))[1];
-+}
-+
-+use Data::Plist::BinaryWriter;
-+use Mac::Finder::DSStore qw(writeDSDBEntries makeEntries);
-+use Mac::Finder::AliasRecord;
-+
-+$Mac::Finder::DSStore::Entry::types{bwsp} = 'blob';
-+$Mac::Finder::DSStore::Entry::types{icvp} = 'blob';
-+
-+writeDSDBEntries($ARGV[0] || "DS_Store",
-+    makeEntries(".",
-+        bwsp => Data::Plist::BinaryWriter->new(serialize => 0)->write([
-+            dict => {
-+                WindowBounds => [
-+                    string => sprintf('{{%d, %d}, {%d, %d}}',
-+                                      512, 128, 512, 608 + 22)
-+                ],
-+                SidebarWidth => [integer => 0],
-+                ShowToolbar => [false => 0],
-+                ShowSidebar => [false => 0],
-+                ShowPathbar => [false => 0],
-+                ShowStatusBar => [false => 0],
-+            }
-+        ]),
-+        icvp => Data::Plist::BinaryWriter->new(serialize => 0)->write([
-+            dict => {
-+                viewOptionsVersion => [integer => 0],
-+                arrangeBy => [string => "none"],
-+                iconSize => [real => 64],
-+                textSize => [real => 12],
-+                labelOnBottom => [true => 1],
-+                gridSpacing => [real => 100],
-+                gridOffsetX => [real => 0],
-+                gridOffsetY => [real => 0],
-+                showItemInfo => [false => 0],
-+                showIconPreview => [false => 0],
-+                backgroundType => [integer => 2],
-+                backgroundColorRed => [real => 0],
-+                backgroundColorGreen => [real => 0],
-+                backgroundColorBlue => [real => .5],
-+                backgroundImageAlias => [
-+                    data => Mac::Finder::AliasRecord->new(
-+                        path => 'ZBarSDK:.background:ZBarSDK-bg.png',
-+                        volumeFS => 'HFS+')->write()
-+                ],
-+            },
-+        ]),
-+        vstl => "icnv",
-+    ),
-+    makeEntries("README",       Iloc_xy => [ 4.5 * 32,  2.5  * 32 ]),
-+    makeEntries("ZBarSDK",      Iloc_xy => [ 4.5 * 32,  7.5  * 32 ]),
-+    makeEntries("ChangeLog",    Iloc_xy => [  4  * 32, 12.5  * 32 ]),
-+    makeEntries("Documentation.html",
-+                                Iloc_xy => [  8  * 32, 12.5  * 32 ]),
-+    makeEntries("Examples",     Iloc_xy => [ 12  * 32, 12.5  * 32 ]),
-+    makeEntries("COPYING",      Iloc_xy => [  4  * 32,  16   * 32 ]),
-+    makeEntries("LICENSE",      Iloc_xy => [  8  * 32,  16   * 32 ]),
-+    makeEntries("Documentation",Iloc_xy => [ 12  * 32,  16   * 32 ]),
-+);
-diff -r 563557a923d0 iphone/bin/Mac/Finder/AliasRecord.pm
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/bin/Mac/Finder/AliasRecord.pm	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,169 @@
-+package Mac::Finder::AliasRecord;
-+
-+# Generate(/Parse) a Mac "alias record" binary string/file.
-+#
-+# Currently just enough is implemented to satisfy immediate requirements
-+# (ie, write backgroundImageAlias to .DS_Store for DMG)
-+#
-+# based on these documents:
-+# http://www.geocities.com/xhelmboyx/quicktime/formats/alias-layout.txt
-+# http://sebastien.kirche.free.fr/python_stuff/MacOS-aliases.txt
-+#
-+# FIXME interface is very poor...
-+
-+use warnings;
-+use strict;
-+use DateTime;
-+use File::Spec;
-+use File::Spec::Mac;
-+use Encode qw(encode);
-+require Exporter;
-+
-+our $VERSION = '0.1';
-+our @ISA = qw(Exporter);
-+
-+my %FSEncodings = (
-+  MacFS   => ['RW', ''],
-+  MFS     => ['RW', ''],
-+  HFS     => ['BD', ''],
-+  'HFS+'  => ['H+', ''],
-+
-+  AudioCD => ['', 'JH'],
-+  ISO9660 => ['', 'AG'],
-+  FAT     => ['', 'IS'],
-+  Joliet  => ['', 'Jo'],
-+  'ISO9660+Joliet' => ['', 'Jo'],
-+);
-+
-+my %DiskEncodings = (
-+  HD          => 0,
-+  FixedHD     => 0,
-+  Network     => 1,
-+  NetworkDisk => 1,
-+  Floppy      => 4,
-+  Floppy1440  => 4,
-+  Other       => 5,
-+  OtherDisk   => 5,
-+);
-+
-+my %RecordEncodings = (
-+  parentDir     => 0x00,
-+  absolutePath  => 0x02,
-+  unicodeFile   => 0x0e,
-+  unicodeVolume => 0x0f,
-+  volumePath    => 0x12,
-+);
-+
-+sub new {
-+  my $class = shift || __PACKAGE__;
-+  my $self = {
-+    aliasCreator => '',
-+    aliasVersion => 2,
-+    aliasType => 'file',
-+    volume => '',
-+    volumeCreated => 0,
-+    volumeFS => 'HFS',
-+    volumeDisk => undef,
-+    volumeAttrs => 0,
-+    directoryID => 0,
-+    file => '',
-+    fileID => 0,
-+    fileCreated => 0,
-+    fileType => '',
-+    fileCreator => '',
-+    nlvlFrom => -1,
-+    nlvlTo => -1,
-+    records => { },
-+    @_
-+  };
-+  if(exists($self->{path})) {
-+    my $path = $self->{path};
-+    my ($vol, $dir, $file) = File::Spec::Mac->splitpath($path);
-+    $vol =~ s/:$//;
-+    my @dir = File::Spec::Mac->splitdir($dir);
-+    while(@dir && !$dir[0]) {
-+      shift(@dir);
-+    }
-+    while(@dir && !$dir[-1]) {
-+      pop(@dir);
-+    }
-+    $self->{volume} ||= $vol;
-+    $self->{records}{unicodeVolume} ||=
-+      pack('na*', length($vol), encode('utf-16be', $vol));
-+
-+    $self->{file} ||= $file;
-+    $self->{records}{parentDir} ||= $dir[-1]
-+      if(@dir);
-+    $self->{records}{absolutePath} ||= $path;
-+    $self->{records}{volumePath} ||= File::Spec->catfile('', @dir, $file);
-+    $self->{records}{unicodeFile} ||=
-+      pack('na*', length($file), encode('utf-16be', $file));
-+  }
-+  return(bless($self, ref($class) || $class));
-+}
-+
-+sub toFSTime {
-+  my $val = shift;
-+  if(ref($val) && $val->isa("DateTime")) {
-+    $val = $val->epoch - DateTime->new(year => 1904)->epoch();
-+  }
-+  return($val);
-+}
-+
-+sub write {
-+  my ($self, $out) = @_;
-+
-+  my $aliasType = $self->{aliasType};
-+  $aliasType = (($aliasType =~ /^d(ir(ectory)?)?$/i && 1) ||
-+                ($aliasType !~ /^f(ile)?$/ && $aliasType) || 0);
-+
-+  my $volumeCreated = toFSTime($self->{volumeCreated});
-+  my $volumeFS = $self->{volumeFS};
-+  if(ref($volumeFS) ne 'ARRAY') {
-+    $volumeFS = $FSEncodings{$volumeFS} || ['', ''];
-+  }
-+
-+  my $volumeDisk = $self->{volumeDisk};
-+  if(!defined($volumeDisk)) {
-+    if($volumeFS->[0] eq 'H+') {
-+      $volumeDisk = 'Floppy';
-+    }
-+    elsif($volumeFS->[0]) {
-+      $volumeDisk = 'HD';
-+    }
-+    else {
-+      $volumeDisk = 'Other';
-+    }
-+  }
-+  $volumeDisk = (exists($DiskEncodings{$volumeDisk})
-+                 ? $DiskEncodings{$volumeDisk}
-+                 : $volumeDisk);
-+
-+  my $fileCreated = toFSTime($self->{fileCreated});
-+
-+  my $buf =
-+    pack('nn (C/a @28)Na2n N(C/a @64)NNa4a4 n!n!Na2 x10 (n!n/ax!2)*',
-+         $self->{aliasVersion}, $aliasType,
-+         $self->{volume}, $volumeCreated, $volumeFS->[0], $volumeDisk,
-+         $self->{directoryID}, $self->{file}, $self->{fileID}, $fileCreated,
-+         $self->{fileType}, $self->{fileCreator}, $self->{nlvlFrom},
-+         $self->{nlvlTo}, $self->{volumeAttrs}, $volumeFS->[1],
-+         map(((exists($RecordEncodings{$_}) ? $RecordEncodings{$_} : $_)
-+              => $self->{records}{$_}),
-+             keys(%{$self->{records}})),
-+         (-1, ''));
-+  $buf = pack('a4n', $self->{aliasCreator}, length($buf) + 6) . $buf;
-+
-+  if(!$out) {
-+    return($buf);
-+  }
-+  elsif(ref($out) eq 'GLOB') {
-+    print $out $buf;
-+  }
-+  else {
-+    open(my $outfh, '>', $out) || die;
-+    print $outfh $buf;
-+  }
-+}
-+
-+1;
-diff -r 563557a923d0 iphone/debug.h
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/debug.h	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,53 @@
-+//------------------------------------------------------------------------
-+//  Copyright 2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+//
-+//  This file is part of the ZBar Bar Code Reader.
-+//
-+//  The ZBar Bar Code Reader is free software; you can redistribute it
-+//  and/or modify it under the terms of the GNU Lesser Public License as
-+//  published by the Free Software Foundation; either version 2.1 of
-+//  the License, or (at your option) any later version.
-+//
-+//  The ZBar Bar Code Reader is distributed in the hope that it will be
-+//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-+//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+//  GNU Lesser Public License for more details.
-+//
-+//  You should have received a copy of the GNU Lesser Public License
-+//  along with the ZBar Bar Code Reader; if not, write to the Free
-+//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-+//  Boston, MA  02110-1301  USA
-+//
-+//  http://sourceforge.net/projects/zbar
-+//------------------------------------------------------------------------
-+
-+#include <mach/mach_time.h>
-+#define xNSSTR(s) @#s
-+#define NSSTR(s) xNSSTR(s)
-+
-+#ifdef DEBUG_OBJC
-+# ifndef MODULE
-+#  define MODULE ZBarReaderController
-+# endif
-+# define zlog(fmt, ...) \
-+    NSLog(NSSTR(MODULE) @": " fmt , ##__VA_ARGS__)
-+
-+#define timer_start \
-+    uint64_t t_start = timer_now();
-+
-+#else
-+# define zlog(...) while(0)
-+# define timer_start
-+#endif
-+
-+static inline uint64_t timer_now ()
-+{
-+    return(mach_absolute_time());
-+}
-+
-+static inline double timer_elapsed (uint64_t start, uint64_t end)
-+{
-+    mach_timebase_info_data_t info;
-+    mach_timebase_info(&info);
-+    return((double)(end - start) * info.numer / (info.denom * 1000000000.));
-+}
-diff -r 563557a923d0 iphone/doc/Documentation.html
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/doc/Documentation.html	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,11 @@
-+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-+<html xmlns="http://www.w3.org/1999/xhtml">
-+<head>
-+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-+<meta http-equiv="Refresh" content="0; url=Documentation/index.html"/>
-+</head>
-+<body>
-+<p>redirecting to <a href="Documentation/index.html">Documentation/index.html</a></p>
-+</body>
-+</html>
-diff -r 563557a923d0 iphone/doc/ReaderSample.png
-Binary file iphone/doc/ReaderSample.png has changed
-diff -r 563557a923d0 iphone/doc/ZBarImage.rst
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/doc/ZBarImage.rst	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,150 @@
-+ZBarImage Class Reference
-+=========================
-+
-+.. class:: ZBarImage
-+
-+   :Inherits from: :class:`NSObject`
-+
-+   A :class:`ZBarImage` is a wrapper for images passed to the barcode reader.
-+   It encapsulates raw image data with the format and size metadata necessary
-+   to interpret it.
-+
-+   An image must be wrapped in a :class:`ZBarImage` in order to be scanned by
-+   the library.  At least the format, size and data must be set.  There are
-+   also initialization methods for automatically extracting the data and
-+   format from a `CGImage`.
-+
-+   This class is a wrapper around a :type:`zbar_image_t` C object (q.v.)
-+
-+
-+Properties
-+----------
-+
-+   .. member:: unsigned long format
-+
-+      The image format four-charcter code (fourcc) as a 4-byte integer.  Use
-+      :ref:`fourcc:<fourcc:>` to create a fourcc value from a string.
-+
-+   .. member:: unsigned sequence
-+
-+      A "sequence number" associated with the image.  This reference value is
-+      unused by the library.
-+
-+   .. member:: CGSize size
-+
-+      The size of the image in pixels.
-+
-+      .. note::
-+
-+         There is no separate "bytesPerLine" property, the width must match
-+         the image data (which is not always the logical image width).
-+
-+   .. member:: CGRect crop
-+
-+      Optionally limit the scan region to this rectangle without having to
-+      generate a cropped image.
-+
-+   .. member:: const void *data
-+
-+      Obtain a pointer to the raw image data.  This property is read-only, use
-+      :ref:`setData:withLength:<setData:withLength:>` to set the image data.
-+
-+   .. member:: unsigned long dataLength
-+
-+      Byte length of the raw image data.  This property is read-only, use 
-+      :ref:`setData:withLength:<setData:withLength:>` to set the image data.
-+
-+   .. member:: ZBarSymbolSet *symbols
-+
-+      Barcode results from the last scan.
-+
-+   .. member:: zbar_image_t *zbarImage
-+
-+      Retrieve the underlying C object instance. (read-only)
-+
-+   .. member:: UIImage *UIImage
-+
-+      Convert the image to a UIImage.  Only certain image formats are
-+      supported for conversion (read-only)
-+
-+      :See also: :ref:`UIImageWithOrientation:<UIImageWithOrientation:>`
-+
-+
-+Class Methods
-+-------------
-+
-+   .. _`fourcc:`:
-+   .. describe:: + (unsigned long) fourcc:(NSString*)format
-+
-+      Parse the integer four-character code from a string.  Alternatively use
-+      the :func:`zbar_fourcc` macro to create a constant expression.
-+
-+      :format: A four character string representing an image format.
-+      :Returns: The corresponding 4-byte integer format code.
-+
-+
-+Instance Methods
-+----------------
-+
-+   .. _`initWithImage:`:
-+   .. describe:: - (id) initWithImage:(zbar_image_t*)image
-+
-+      Initialize an image wrapper, given the C object to wrap.
-+
-+      :image: The C object to wrap.
-+      :Returns: The initialized :class:`ZBarImage`.
-+
-+   .. _`initWithCGImage:`:
-+   .. describe:: - (id) initWithCGImage:(CGImageRef)image
-+
-+      Initialize a :class:`ZBarImage` from the data and metadata extracted
-+      from a `CGImage`.  The image is converted to `Y800` (grayscale) format.
-+
-+      :image: A `CGImage` to source the data and metadata.
-+      :Returns: The initialized :class:`ZBarImage`.
-+      :See also: :ref:`initWithCGImage:size:<initWithCGImage:size:>`
-+
-+   .. _`initWithCGImage:size:`:
-+   .. describe:: - (id) initWithCGImage:(CGImageRef)image size:(CGSize)size
-+
-+      Initialize a :class:`ZBarImage` from the data and metadata extracted
-+      from a `CGImage`.  The image is converted to `Y800` (grayscale) format
-+      and scaled to the specified size.
-+
-+      :image: A `CGImage` to source the data and metadata.
-+      :size: The pixel size of the resulting ZBarImage.
-+      :Returns: The initialized :class:`ZBarImage`.
-+      :See also: :ref:`initWithCGImage:crop:size:<initWithCGImage:crop:size:>`
-+
-+   .. _`initWithCGImage:crop:size:`:
-+   .. describe:: - (id) initWithCGImage:(CGImageRef)image crop:(CGRect)crop size:(CGSize)size
-+
-+      Initialize a :class:`ZBarImage` from the data and metadata extracted
-+      from a `CGImage`.  The image is simultaneously converted to `Y800`
-+      (grayscale) format, cropped and scaled to the specified size.
-+
-+      :image: A `CGImage` to source the data and metadata.
-+      :crop: The region to convert, in image coordinates.
-+      :size: The pixel size of the resulting ZBarImage.
-+      :Returns: The initialized :class:`ZBarImage`.
-+
-+   .. _`setData:withLength:`:
-+   .. describe:: - (void) setData:(const void*)data withLength:(unsigned long)length
-+
-+      Specify a pointer to the raw image data, for the image format and size.
-+      The length of the data must also be provided.  Note that the data must
-+      remain valid as long as the image has a reference to it.  Set data to
-+      ``NULL`` to clear a previous reference.
-+
-+      :data: A pointer to a raw image data buffer.
-+      :length: The size of the image data buffer.
-+
-+   .. _`UIImageWithOrientation:`:
-+   .. describe:: - (UIImage*) UIImageWithOrientation:(UIImageOrientation)orient
-+
-+      Convert the image to a UIImage with the specified orientation.  Only
-+      certain image formats are supported for conversion.  (currently
-+      ``RGB3``, ``RGB4``, ``RGBQ``)
-+
-+      :orient: Desired orientation of the image.
-+      :Returns: A new :class:`UIImage`, or ``nil`` in case of error.
-diff -r 563557a923d0 iphone/doc/ZBarImageScanner.rst
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/doc/ZBarImageScanner.rst	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,99 @@
-+ZBarImageScanner Class Reference
-+================================
-+
-+.. class:: ZBarImageScanner
-+
-+   :Inherits from: :class:`NSObject`
-+
-+   This is a low-level interface for programmatically scanning images without
-+   a user interface.  If you want to scan images manually selected by the user
-+   (from the photo library or using the camera), you may prefer to use a
-+   :class:`ZBarReaderController` instead.
-+
-+   This class is a wrapper around a :type:`zbar_image_scanner_t` C object
-+   (q.v.)
-+
-+
-+Properties
-+----------
-+
-+   .. member:: BOOL enableCache
-+
-+      Enable the inter-frame consistency cache.  Set to ``YES`` for scanning
-+      video or ``NO`` for scanning images.
-+
-+   .. member:: ZBarSymbolSet results
-+
-+      Decoded symbols resulting from the last scan.
-+
-+
-+Instance Methods
-+----------------
-+
-+   .. _`parseConfig:`:
-+   .. describe:: - (void) parseConfig:(NSString*)config
-+
-+      Apply scanner/decoder configuration parsed from a string.
-+
-+      :config: A configuration setting of the form: `symbology.config[=value]`.
-+
-+   .. _`setSymbology:config:to:`:
-+   .. describe:: - (void) setSymbology:(zbar_symbol_type_t)symbology config:(zbar_config_t)config to:(int)value
-+
-+      Apply generic scanner/decoder configuration.
-+
-+      :symbology: The symbology to effect, or 0 for all.
-+      :config: The configuration setting to adjust.
-+      :value: The value to set for the specific configuration/symbology.
-+
-+   .. _`scanImage:`:
-+   .. describe:: - (NSInteger) scanImage:(ZBarImage*)image
-+
-+      Scan an image for barcodes using the current configuration.  The image
-+      must be in ``Y800`` format (8-bpp graysale).
-+
-+      :image: The :class:`ZBarImage` to scan.
-+      :Returns: The number of barcode symbols decoded in the image.
-+
-+
-+Constants
-+---------
-+
-+.. type:: zbar_config_t
-+
-+   ZBAR_CFG_ENABLE
-+      Control whether specific symbologies will be recognized.  Disabling
-+      unused symbologies improves performance and prevents bad scans.
-+
-+   ZBAR_CFG_EMIT_CHECK
-+      Whether to include the check digit in the result data string.  This
-+      value may be set individually for symbologies where it makes sense.
-+
-+   ZBAR_CFG_MIN_LEN
-+      The minimum data length for a symbol to be valid, set to 0 to disable.
-+      Use with eg, I2/5 to avoid short scans.  This value may be set
-+      individually for variable-length symbologies.
-+
-+   ZBAR_CFG_MAX_LEN
-+      The maximum data length for which a symbol is valid, set to 0 to
-+      disable.  Use with eg, I2/5 to enforce a specific range of data lengths.
-+      This value may be set individually for variable-length symbologies.
-+
-+   ZBAR_CFG_UNCERTAINTY
-+      Number of "nearby" frames that must contain a symbol before it will be
-+      considered valid.  This value may be set for individual symbologies.
-+
-+   ZBAR_CFG_POSITION
-+      Whether to track position information.  
-+
-+   ZBAR_CFG_X_DENSITY
-+      The stride to use for scanning vertical columns of the image.  This many
-+      pixel columns will be skipped between vertical scan passes.  Useful for
-+      trading off between resolution and performance.  This is a scanner
-+      setting (use 0 for the symbology).
-+
-+   ZBAR_CFG_Y_DENSITY
-+      The stride to use for scanning horizontal columns of the image.  This
-+      many pixel rows will be skipped between horizontal scan passes.  Useful
-+      for trading off between resolution and performance.  This is a scanner
-+      setting (use 0 for the symbology).
-diff -r 563557a923d0 iphone/doc/ZBarReaderController.rst
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/doc/ZBarReaderController.rst	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,156 @@
-+ZBarReaderController Class Reference
-+====================================
-+
-+.. class:: ZBarReaderController
-+
-+   :Inherits from: :class:`UIImagePickerController`
-+
-+   This is the controller to use for scanning images selected by a
-+   :class:`UIImagePickerController` either captured manually using the camera,
-+   or selected from the Photo Library.  For more information, see
-+   :doc:`picker`.
-+
-+   It can support automatic capture from the camera only if the library is
-+   re-built to use private APIs (see :doc:`compat`).
-+
-+
-+Properties
-+----------
-+
-+   .. member:: ZBarImageScanner *scanner
-+
-+      Access to the image scanner for configuration. (read-only)
-+
-+   .. member:: id<ZBarReaderDelegate> readerDelegate
-+
-+      The delegate that will be notified when new barcode results are
-+      available.
-+
-+   .. member:: BOOL showsZBarControls
-+
-+      Whether to display a default control set consisting of cancel, scan and
-+      info buttons.  Disable these if you provide your own controls using the
-+      :member:`cameraOverlayView`.  Enabling this automatically disables the
-+      system controls :member:`showsCameraControls`.  (Default ``YES``).
-+
-+   .. member:: BOOL showsHelpOnFail
-+
-+      Whether to automatically display the integrated help viewer when an
-+      image fails to decode.  Even if this is disabled, the integrated help
-+      may still be presented manually using ``showHelpWithReason:``.
-+      (Default ``YES``)
-+
-+   .. member:: ZBarReaderControllerCameraMode cameraMode
-+
-+      Scanning mode to use with the camera.  It is generally appropriate to
-+      leave this at the default.
-+
-+   .. member:: BOOL tracksSymbols
-+
-+      Whether to display the tracking rectangle around detected barcodes.
-+
-+   .. member:: BOOL takesPicture
-+
-+      Whether to take a full picture (with ``takePicture``) when a barcode
-+      is detected with ``ZBarReaderControllerCameraModeSampling``.  The
-+      resulting image will be delayed from the actual decode.
-+
-+   .. member:: BOOL enableCache
-+
-+      This property is deprecated and should not be modified.
-+
-+   .. member:: CGRect scanCrop
-+
-+      Crop images before scanning.  The original image will be cropped to this
-+      rectangle, which should be in normalized image coordinates, x-axis
-+      major.  Defaults to the full image ``{{0, 0}, {1, 1}}``.
-+
-+   .. member:: NSInteger maxScanDimension
-+
-+      Scale image to scan.  After cropping, the image will be scaled if
-+      necessary, such that neither of its dimensions exceed this value.
-+      Defaults to 640.
-+
-+   .. note::
-+
-+      The remaining properties are inherited from
-+      :class:`UIImagePickerController`.
-+
-+   .. member:: UIImagePickerControllerSourceType sourceType
-+
-+      Image source.  Use to select between the camera and photo library.
-+
-+   .. member:: BOOL showsCameraControls
-+
-+      Whether to display the system camera controls.  Overridden to ``NO``
-+      when :member:`showsZBarControls` is ``YES``.
-+
-+   .. member:: UIView *cameraOverlayView
-+
-+      A custom view to display over the camera preview.  The tracking layer
-+      and default controls will be added to this view if they are enabled.
-+
-+   .. member:: CGAffineTransform cameraViewTransform
-+
-+      A transform to apply to the camera preview.  Ignored by the reader.
-+      Possibly useful for eg, a digital zoom effect.
-+
-+   .. member:: BOOL allowsEditing
-+
-+      Whether to enable the system image editing dialog after a picture is
-+      taken.  Possibly useful to improve reader results in some cases using
-+      manual intervention.
-+
-+
-+Instance Methods
-+----------------
-+
-+   .. _`showHelpWithReason:`:
-+   .. describe:: - (void) showHelpWithReason:(NSString*)reason
-+
-+      Display the integrated help browser.  Use this with custom overlays if
-+      you don't also want to create your own help view.  Should only be called
-+      when the reader is displayed.  The ``reason`` argument will be passed to
-+      the :func:`onZBarHelp` javascript function.
-+
-+      :reason: A string parameter passed to javascript.
-+
-+   .. _`scanImage:`:
-+   .. describe:: - (id <NSFastEnumeration>) scanImage:(CGImageRef)image
-+
-+      Scan an image for barcodes.  This is a wrapper around
-+      ``scanner.scanImage`` that applies scanCrop and maxScanDimension.  Some
-+      additional result filtering is also performed.
-+
-+      :image: A :class:`CGImage` to scan.
-+      :Returns: The result set containing :class:`ZBarSymbol` objects.
-+
-+
-+Constants
-+---------
-+
-+.. type:: ZBarReaderControllerCameraMode
-+
-+   The scanning mode to use with the camera.
-+
-+   ZBarReaderControllerCameraModeDefault
-+      The standard mode provided by UIImagePickerController - the user
-+      manually captures an image by tapping a control.  This is the default
-+      unless private APIs are enabled.
-+
-+   ZBarReaderControllerCameraModeSampling
-+      Automatically capture by taking screenshots with
-+      :func:`UIGetScreenImage`.  Resolution is limited to the screen
-+      resolution, so this mode is inappropriate for longer codes.  Only
-+      available when private APIs are enabled, and becomes the default mode in
-+      that case.
-+
-+   ZBarReaderControllerCameraModeSequence
-+      Experimental mode that automatically scans by "rapidly" scanning
-+      pictures captured with ``takePicture``.  Not recommended for serious
-+      use.
-+
-+.. c:var:: NSString *ZBarReaderControllerResults
-+
-+   The info dictionary key used to return decode results to
-+   ``imagePickerController:didFinishPickingMediaWithInfo:``
-diff -r 563557a923d0 iphone/doc/ZBarReaderDelegate.rst
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/doc/ZBarReaderDelegate.rst	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,70 @@
-+ZBarReaderDelegate Protocol Reference
-+=====================================
-+
-+.. class:: ZBarReaderDelegate
-+
-+   :Inherits from: :class:`UIImagePickerControllerDelegate`
-+
-+   This protocol must be implemented by the
-+   :member:`~ZBarReaderViewController::readerDelegate` provided to a
-+   :class:`ZBarReaderViewController` or :class:`ZBarReaderController`.  It is
-+   used to notify the delegate of new decode results, when an image fails to
-+   decode, or when the user dismisses the reader with the built-in controls.
-+
-+
-+Instance Methods
-+----------------
-+
-+   .. describe:: - (void) imagePickerController:(UIImagePickerController*)picker didFinishPickingMediaWithInfo:(NSDictionary*)info
-+
-+      This inherited delegate method is called when a barcode is successfully
-+      decoded.  The decoded symbols are available from the dictionary as a
-+      :class:`ZBarSymbolSet` using the :c:data:`ZBarReaderControllerResults`
-+      key.  The image from which the barcodes were scanned is available using
-+      the :c:data:`UIImagePickerControllerOriginalImage` key.  No other keys
-+      are guaranteed to be valid.
-+
-+      .. note::
-+
-+         The ``picker`` parameter will be the reader controller instance that
-+         read the barcodes - not necessarily a
-+         :class:`UIImagePickerController` instance.  You should cast it to the
-+         correct type for anything other than basic view controller access.
-+
-+      :picker: The reader controller that scanned the barcode(s).
-+      :info: A dictionary containing the image and decode results.
-+
-+   .. describe:: - (void) imagePickerControllerDidCancel:(UIImagePickerController*)picker
-+
-+      Called when the user taps the "Cancel" button provided by the built-in
-+      controls (when :member:`showsZBarControls`\ ``=YES``).  The default
-+      implementation dismisses the reader.  If this method is implemented, it
-+      should do the same.
-+
-+      .. note::
-+
-+         The ``picker`` parameter will be the reader controller instance that
-+         read the barcodes - not necessarily a
-+         :class:`UIImagePickerController` instance.  You should cast it to the
-+         correct type for anything other than basic view controller access.
-+
-+      :picker: The reader controller that scanned the barcode(s).
-+
-+   .. describe:: - (void) readerControllerDidFailToRead:(ZBarReaderController*)reader withRetry:(BOOL)retry
-+
-+      Called when an image, manually captured or selected from the photo
-+      library, is scanned and no barcodes were detected.
-+
-+      If the ``retry`` parameter is ``NO``, the controller must be dismissed
-+      before this method returns.  Otherwise, another scan may be attempted
-+      without re-presenting the controller.
-+
-+      If the :member:`~ZBarReaderController::showsHelpOnFail` is ``YES`` *and*
-+      ``retry`` is ``YES``, the integrated help viewer will already be
-+      presenting.
-+
-+      If this method is not implemented, the controller will be dismissed iff
-+      ``retry`` is ``NO``.
-+
-+      :reader: The :class:`ZBarReaderController` that scanned the barcode(s).
-+      :retry: Whether another scan may be attempted.
-diff -r 563557a923d0 iphone/doc/ZBarReaderView.rst
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/doc/ZBarReaderView.rst	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,126 @@
-+ZBarReaderView Class Reference
-+==============================
-+
-+.. class:: ZBarReaderView
-+
-+   :Inherits from: :class:`UIView`
-+
-+   This is a barcode reader encapsulted in a UIView.  It manages an
-+   :class:`AVCaptureSession` with a camera device and a
-+   :class:`ZBarCaptureReader`, presents the video preview and optionally
-+   tracks detected barcode symbols.  A delegate will usually be assigned for
-+   notification of new decode results.
-+
-+
-+Properties
-+----------
-+
-+   .. member:: id<ZBarReaderViewDelegate> readerDelegate
-+
-+      The delegate that will be notified of new decode results.
-+
-+   .. member:: ZBarImageScanner *scanner
-+
-+      Access to the image scanner is provided for configuration. (read-only)
-+
-+   .. member:: BOOL tracksSymbols
-+
-+      Whether to display the tracking annotation (default ``YES``).
-+
-+   .. member:: UIColor *trackingColor
-+
-+      The color of the tracking annotation (default green).
-+
-+   .. member:: BOOL allowsPinchZoom
-+
-+      Enable pinch gesture recognition for manually zooming the preview/decode
-+      (default ``YES``).
-+
-+   .. member:: NSInteger torchMode
-+
-+      An :type:`AVCaptureTorchMode` value that will be applied if/when
-+      appropriate.  (default Auto)
-+
-+   .. member:: BOOL showsFPS
-+
-+      Overlay the decode frame rate on the preview to help with performance
-+      optimization.  This is for *debug only* and should not be set for
-+      production.  (default ``NO``)
-+
-+   .. member:: CGFloat zoom
-+
-+      Zoom scale factor applied to the video preview *and* scanCrop.  This
-+      value is also updated by the pinch-zoom gesture.  Valid values are in
-+      the range [1,maxZoom].  (default 1.25)
-+
-+   .. member:: CGFloat maxZoom
-+
-+      Maximum settable zoom level.  The zoom property will be clipped to this
-+      value.
-+
-+   .. member:: CGRect scanCrop
-+
-+      The region of the video image that will be scanned, in normalized image
-+      coordinates.  Note that the video image is in landscape mode (default
-+      {{0, 0}, {1, 1}})
-+
-+   .. member:: CGAffineTransform previewTransform
-+
-+      Additional transform that will be applied to the video preview.  Note
-+      that this transform is *not* applied to scanCrop.
-+
-+   .. member:: AVCaptureDevice *device
-+
-+      The capture device may be manipulated or replaced.
-+
-+   .. member:: AVCaptureSession *session
-+
-+      Direct access to the capture session.  Warranty void if opened.
-+      (read-only)
-+
-+   .. member:: ZBarCaptureReader *captureReader
-+
-+      Direct access to the capture reader.  Warranty void if opened.
-+      (read-only)
-+
-+   .. member:: BOOL enableCache
-+
-+      :Deprecated:
-+
-+      Whether to use the inter-frame consistency cache.  This should always be
-+      set to ``YES``.
-+
-+
-+Instance Methods
-+----------------
-+
-+   .. describe:: - (id) initWithImageScanner:(ZBarImageScanner*)imageScanner
-+
-+      :imageScanner: A pre-configured :class:`ZBarImageScanner` to use for scanning
-+      :Returns: The initialized :class:`ZBarReaderView`
-+
-+   .. describe:: - (void) start
-+
-+      Begin/resume scanning after a call to ``stop``.
-+
-+   .. describe:: - (void) stop
-+
-+      Stop scanning and pause the video feed.
-+
-+   .. describe:: - (void) flushCache
-+
-+      Flush the inter-frame consistency cache.  Any barcodes in the frame will
-+      be re-recognized in subsequent frames.
-+
-+   .. _`setZoom:animated:`:
-+   .. describe:: - (void) setZoom:(CGFloat)zoom animated:(BOOL)animated
-+
-+      Set the zoom property with optional animation.
-+
-+   .. _`willRotateTointerfaceOrientation:duration:`:
-+   .. describe:: - (void) willRotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation duration:(NSTimeInterval)duration
-+
-+      Compensate for device / camera / interface orientation.  Must be called
-+      by containing view controller that supports any non-portrait orientation
-+      to restore the camera preview to the correct orientation.  Call from
-+      view controller method of the same name for correct animation.
-diff -r 563557a923d0 iphone/doc/ZBarReaderViewController.rst
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/doc/ZBarReaderViewController.rst	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,190 @@
-+ZBarReaderViewController Class Reference
-+========================================
-+
-+.. class:: ZBarReaderViewController
-+
-+   :Inherits from: :class:`UIViewController`
-+
-+   This is the controller to use for live scanning from the camera feed with
-+   automatic capture.  For scanning from image files or with manual capture,
-+   see :class:`ZBarReaderController`.
-+
-+
-+Properties
-+----------
-+
-+   .. member:: ZBarImageScanner *scanner
-+
-+      Access to the image scanner for configuration. (read-only)
-+
-+   .. member:: id <ZBarReaderDelegate> readerDelegate
-+
-+      The delegate that will be notified when new barcode results are
-+      available.
-+
-+   .. member:: BOOL showsZBarControls
-+
-+      Whether to display a default control set consisting of cancel, scan and
-+      info buttons.  Disable these if you provide your own controls using the
-+      :member:`cameraOverlayView`.  (Default ``YES``).
-+
-+   .. member:: BOOL tracksSymbols
-+
-+      Whether to display the tracking rectangle around detected barcodes.
-+
-+   .. member:: NSUInteger supportedOrientationsMask
-+
-+      Set of interface orientations that the controller should support.  Use
-+      :func:`ZBarOrientationMask` or ``ZBarOrientationMaskAll`` to
-+      generate the mask.
-+
-+   .. member:: CGRect scanCrop
-+
-+      Crop images before scanning.  The original image will be cropped to this
-+      rectangle, which should be in normalized image coordinates (NB the
-+      camera image x-axis is *vertical* on the screen).  Defaults to the full
-+      image ``{{0, 0}, {1, 1}}``.
-+
-+   .. member:: UIView *cameraOverlayView
-+
-+      A custom view to display over the camera preview.
-+
-+   .. member:: CGAffineTransform cameraViewTransform
-+
-+      A transform to apply to the camera preview.  Ignored by the reader.
-+
-+   .. member:: UIImagePickerControllerCameraDevice cameraDevice
-+
-+      The camera device to use for scanning.  Defaults to the system default
-+      camera.
-+
-+   .. member:: UIImagePickerControllerCameraFlashMode cameraFlashMode
-+
-+      The "flash" (aka torch) mode to use while scanning.  Defaults to
-+      UIImagePickerControllerCameraFlashModeAuto.
-+
-+   .. member:: UIImagePickerControllerQualityType videoQuality
-+
-+      The resolution to use while scanning.  Defaults to
-+      UIImagePickerControllerQuality640x480.
-+
-+   .. member:: ZBarReaderView *readerView
-+
-+      View that presents the camera preview and performs the scanning.  This
-+      view has other properties you may use to control the appearance and
-+      behavior of the reader.
-+
-+      Note that this view may be released when it is not displayed (eg, under
-+      low memory conditions).  You should apply any configuration just before
-+      you present the reader.
-+
-+   .. member:: BOOL enableCache
-+
-+      This property is deprecated and should not be modified.
-+
-+   .. warning::
-+
-+      The remaining properties are deprecated, they are only present for
-+      backward compatibility with :class:`ZBarReaderController` and will raise
-+      an exception if inappropriate/unsupported values are set.
-+
-+   .. member:: UIImagePickerControllerSourceType sourceType
-+
-+      Raises an exception if anything other than
-+      ``UIImagePickerControllerSourceTypeCamera`` is set.  If you want to scan
-+      images, use a :class:`ZBarReaderController` instead of this class.
-+
-+   .. member:: UIImagePickerControllerCameraCaptureMode cameraCaptureMode
-+
-+      Raises an exception if anything other than
-+      ``UIImagePickerControllerCameraCaptureModeVideo`` is set.
-+
-+   .. member:: BOOL allowsEditing
-+
-+      Raises an exception if anything other than ``NO`` is set.
-+
-+   .. member:: BOOL showsCameraControls
-+
-+      Raises an exception if anything other than ``NO`` is set.  Use
-+      :member:`showsZBarControls` to disable the buit-in overlay.
-+
-+   .. member:: BOOL showsHelpOnFail
-+
-+      Any value set to this property is ignored.  It is only useful for
-+      scanning images, for which you should use :class:`ZBarReaderController`.
-+
-+   .. member:: ZBarReaderControllerCameraMode cameraMode
-+
-+      This reader only supports scanning from the camera feed.  If you want to
-+      scan manually captured images, use a :class:`ZBarReaderController`
-+      instead of this class.
-+
-+   .. member:: BOOL takesPicture
-+
-+      Raises an exception if anything other than ``NO`` is set.  This
-+      controller automatically returns the scanned camera frame and does not
-+      support capturing a separate image.
-+
-+   .. member:: NSInteger maxScanDimension
-+
-+      Any value set to this property is ignored.  It is only useful for
-+      scanning images, for which you should use :class:`ZBarReaderController`.
-+
-+
-+Class Methods
-+-------------
-+
-+   .. describe:: + (BOOL) isSourceTypeAvailable:(UIImagePickerControllerSourceType)source
-+
-+      Returns ``YES`` only if ``source`` is ``Camera`` and the
-+      :class:`UImagePickerController` method of the same name also returns
-+      ``YES``.
-+
-+   .. describe:: + (BOOL) isCameraDeviceAvailable:(UIImagePickerControllerCameraDevice)cameraDevice
-+
-+      See the :class:`UImagePickerController` method of the same name.
-+
-+   .. describe:: + (BOOL) isFlashAvailableForCameraDevice:(UIImagePickerControllerCameraDevice)cameraDevice
-+
-+      See the :class:`UImagePickerController` method of the same name.
-+
-+   .. describe:: + (NSArray*) availableCaptureModesForCameraDevice:(UIImagePickerControllerCameraDevice)cameraDevice
-+
-+      Returns an array with the single element
-+      ``UIImagePickerControllerCameraCaptureModeVideo`` if the device is
-+      avilable, otherwise returns an empty array.
-+
-+
-+Instance Methods
-+----------------
-+
-+   .. _`showHelpWithReason:`:
-+   .. describe:: - (void) showHelpWithReason:(NSString*)reason
-+
-+      Display the integrated help browser.  Use this with custom overlays if
-+      you don't also want to create your own help view.  Should only be called
-+      when the reader is displayed.  The ``reason`` argument will be passed to
-+      the :func:`onZBarHelp` javascript function.
-+
-+      :reason: A string parameter passed to javascript.
-+
-+   .. _`takePicture`:
-+   .. describe:: - (void) takePicture
-+
-+      Capture the next available frame and send it over the usual delegate
-+      path.
-+
-+
-+Macros
-+------
-+
-+   .. function:: ZBarOrientationMask(interfaceOrientation)
-+
-+      Generate a bit-mask for the specified interface orientation, suitable
-+      for setting :member:`supportedOrientationsMask`.
-+
-+   .. describe:: ZBarOrientationMaskAll
-+
-+      Combination of :func:`ZBarOrientationMask` for all interface
-+      orientations (Portrait, PortraitUpsideDown, LandscapeLeft and
-+      LandscapeRight)
-diff -r 563557a923d0 iphone/doc/ZBarReaderViewDelegate.rst
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/doc/ZBarReaderViewDelegate.rst	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,26 @@
-+ZBarReaderViewDelegate Protocol Reference
-+=========================================
-+
-+.. class:: ZBarReaderViewDelegate
-+
-+   :Inherits from: :class:`NSObject`
-+
-+   This protocol, which must be implemented by the `readerDelegate` provided
-+   to a :class:`ZBarReaderView`, is used to notify the delegate of new decode
-+   results.
-+
-+
-+Instance Methods
-+----------------
-+
-+   .. describe:: - (void) readerView:(ZBarReaderView*)readerView didReadSymbols:(ZBarSymbolSet*)symbols fromImage:(UIImage*)image
-+
-+      Called to notify the delegate of new decode results.
-+
-+      Note that the referenced image is a proxy for a video buffer that is
-+      asynchronously being converted to a :class:`UIImage`, attempting to
-+      access the data will block until the conversion is complete.
-+
-+      :readerView: :class:`ZBarReaderView` that scanned the barcode(s).
-+      :symbols: :class:`ZBarSymbolSet` containing the decode results.
-+      :image: :class:`UIImage` from which the barcode(s) were scanned.
-diff -r 563557a923d0 iphone/doc/ZBarSymbol.rst
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/doc/ZBarSymbol.rst	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,186 @@
-+ZBarSymbol Class Reference
-+==========================
-+
-+.. class:: ZBarSymbol
-+
-+   :Inherits from: :class:`NSObject`
-+
-+   A symbol wraps all of the information the library has about a decoded
-+   barcode.  Use the available properties to retrieve the barcode data, the
-+   symbology (type of barcode), location and more.
-+
-+   This class is a simple wrapper around a :type:`zbar_symbol_t` C object
-+   (q.v.)
-+
-+
-+Properties
-+----------
-+
-+   .. member:: zbar_symbol_type_t type
-+
-+      The type of symbology that was decoded. (read-only)
-+
-+   .. member:: NSString *typeName
-+
-+      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.  See
-+      :type:`zbar_modifier_t` for the currently defined modifier bits.
-+
-+   .. member:: NSString *data
-+
-+      The raw decoded barcode data. (read-only)
-+
-+   .. member:: int quality
-+
-+      A relative metric indicating rough confidence in the decoded value.
-+      Larger values are better than smaller values. (read-only)
-+
-+   .. member:: zbar_orientation_t orientation
-+
-+      The general, axis-aligned orientation of the symbol, or
-+      ZBAR_ORIENT_UNKNOWN if unknown. (read-only)
-+
-+   .. member:: ZBarSymbolSet *components
-+
-+      The components of a composite symbol. (read-only)
-+
-+   .. member:: const zbar_symbol_t *zbarSymbol
-+
-+      Retrieve the underlying C object instance. (read-only)
-+
-+   .. member:: CGRect bounds
-+
-+      Calculate a rough bounding box for the symbol. (read-only)
-+
-+      .. note::
-+
-+         Coordinates are relative to the image *data*, which may not match a
-+         displayed UIImage.  Make sure to account for the UIImage orientation
-+         when using these values.
-+
-+
-+Class Methods
-+-------------
-+
-+   .. _`nameForType:`:
-+   .. describe:: + (NSString*) nameForType:(zbar_symbol_type_t)type
-+
-+      Retrieve the canonical name for a symbology used by the library, given
-+      its enumerated value.
-+
-+      :type: The :type:`zbar_symbol_type_t` enumerated symbology value.
-+      :Returns: A short string name for the symbology.
-+
-+
-+Instance Methods
-+----------------
-+
-+   .. _`initWithSymbol:`:
-+   .. describe:: - (id) initWithSymbol:(const zbar_symbol_t*)symbol
-+
-+      Initialize a symbol wrapper, given the C object to wrap.
-+
-+      :symbol: The C object to wrap.
-+      :Returns: The initialized symbol, or nil if an error occurred.
-+
-+
-+Constants
-+---------
-+
-+.. type:: zbar_symbol_type_t
-+
-+   Symbology identifiers.
-+
-+   ZBAR_NONE
-+      No symbol was decoded.
-+
-+   ZBAR_PARTIAL
-+      Intermediate status.
-+
-+   ZBAR_EAN8
-+      EAN-8
-+
-+   ZBAR_UPCE
-+      UPC-E
-+
-+   ZBAR_ISBN10
-+      ISBN-10, converted from EAN-13
-+
-+   ZBAR_UPCA
-+      UPC-A
-+
-+   ZBAR_EAN13
-+      EAN-13
-+
-+   ZBAR_ISBN13
-+      ISBN-13, converted from EAN-13
-+
-+   ZBAR_I25
-+      Interleaved 2 of 5
-+
-+   ZBAR_DATABAR
-+      GS1 DataBar (RSS)
-+
-+   ZBAR_DATABAR_EXP
-+      GS1 DataBar Expanded
-+
-+   ZBAR_CODABAR
-+      Codabar
-+
-+   ZBAR_CODE39
-+      Code 39 (3 of 9)
-+
-+   ZBAR_QRCODE
-+      QR Code
-+
-+   ZBAR_CODE128
-+      Code 128
-+
-+.. type:: zbar_orientation_t
-+
-+   The coarse orientation of a symbol.
-+
-+   .. note::
-+
-+      Orientation is relative to the image *data*, which may not match a
-+      displayed UIImage.  Make sure to account for the UIImage orientation
-+      when using these values.
-+
-+   ZBAR_ORIENT_UNKNOWN
-+      Unable to determine orientation.
-+
-+   ZBAR_ORIENT_UP
-+      Upright, read left to right
-+
-+   ZBAR_ORIENT_RIGHT
-+      Sideways, read top to bottom
-+
-+   ZBAR_ORIENT_DOWN
-+      Upside-down, read right to left
-+
-+   ZBAR_ORIENT_LEFT
-+      Sideways, read bottom to top
-+
-+.. type:: zbar_modifier_t
-+
-+   Decoder symbology modifier flags.
-+
-+   .. note::
-+
-+      These are bit indices, use eg, (1 << ZBAR_MOD_GS1) to test the
-+      modifierMask property.
-+
-+   ZBAR_MOD_GS1
-+      Barcode tagged as GS1 (EAN.UCC) reserved (eg, FNC1 before first data
-+      character).  Data may be parsed as a sequence of GS1 AIs.
-+
-+   ZBAR_MOD_AIM
-+      Barcode tagged as AIM reserved.
-diff -r 563557a923d0 iphone/doc/ZBarSymbolSet.rst
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/doc/ZBarSymbolSet.rst	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,43 @@
-+ZBarSymbolSet Class Reference
-+=============================
-+
-+.. class:: ZBarSymbolSet
-+
-+   :Inherits from: :class:`NSObject`
-+   :Conforms to: :class:`NSFastEnumeration`
-+
-+   A symbol set is a simple container for the symbols scanned from an image.
-+   It supports :class:`NSFastEnumeration`, and not much else...  Use it to
-+   iterate through the :class:`ZBarSymbol` objects in a decode result set::
-+
-+      ZBarSymbolSet *symbols = image.symbols;
-+      for(ZBarSymbol *symbol in symbols) {
-+          // process result
-+      }
-+
-+   This class is a simple wrapper around a :type:`zbar_symbol_set_t` C object
-+   (q.v.)
-+
-+
-+Properties
-+----------
-+
-+   .. member:: int count
-+
-+      The number of symbols in the set. (read-only)
-+
-+   .. member:: const zbar_symbol_set_t *zbarSymbolSet
-+
-+      Retrieve the underlying C object instance. (read-only)
-+
-+
-+Instance Methods
-+----------------
-+
-+   .. _`initWithSymbolSet:`:
-+   .. describe:: - (id) initWithSymbolSet:(const zbar_symbol_set_t*)set
-+
-+      Initialize a symbol set wrapper, given the C object to wrap.
-+
-+      :set: The C object to wrap.
-+      :Returns: The initialized symbol set, or nil if an error occurred.
-diff -r 563557a923d0 iphone/doc/apiref.rst
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/doc/apiref.rst	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,16 @@
-+*******************
-+   API Reference
-+*******************
-+
-+.. toctree::
-+   :maxdepth: 1
-+
-+   ZBarImage
-+   ZBarImageScanner
-+   ZBarReaderController
-+   ZBarReaderDelegate
-+   ZBarReaderView
-+   ZBarReaderViewController
-+   ZBarReaderViewDelegate
-+   ZBarSymbol
-+   ZBarSymbolSet
-diff -r 563557a923d0 iphone/doc/camera.rst
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/doc/camera.rst	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,130 @@
-+Scanning From the Camera Feed
-+=============================
-+
-+Many iOS developers want their application to support automatic recognition of
-+barcodes from the camera feed in real-time.  ZBar makes this easy!
-+
-+There are three levels that you may choose to integrate at, from least complex
-+(recommended) to most complex these are:
-+
-+* Use the fully integrated view controller - this is very easy to implement
-+  and is the recommended approach.
-+* Use the reader view with your own controller - this more advanced approach
-+  allows you to embed the view directly in your view hierarchy.
-+* Use the capture component with your own AVCapture session - this is not
-+  supported and only provided for advanced developers with special needs who
-+  are already familiar with AVCapture.
-+
-+
-+Using a ZBarReaderViewController
-+--------------------------------
-+
-+This is the fastest, easiest and recommend way to get the barcode reader into
-+your application.  The procedure is the same as using a
-+UIImagePickerController to take a picture with the camera, so it will help if
-+you are familiar with that.  Basically you:
-+
-+1. Create the reader.
-+
-+   This is as simple as creating a new :class:`ZBarReaderViewController`::
-+
-+      ZBarReaderViewController *reader = [[ZBarReaderViewController alloc] init];
-+
-+2. Setup a delegate to receive the results.
-+
-+   The delegate should implement the :class:`ZBarReaderDelegate` protocol,
-+   which inherits from :class:`UIImagePickerControllerDelegate`::
-+
-+      reader.readerDelegate = self;
-+
-+3. Configure the reader.
-+
-+   Aside from the properties of the reader itself, you can configure the
-+   decoder via the :member:`~ZBarReaderViewController::scanner` property and
-+   further customize the view via the
-+   :member:`~ZBarReaderViewController::readerView` property::
-+
-+      // disable QR Code
-+      [reader.scanner setSymbology: ZBAR_QRCODE
-+                      config: ZBAR_CFG_ENABLE
-+                      to: 0];
-+      reader.readerView.zoom = 1.0;
-+
-+   See :doc:`custom` and :doc:`optimizing` for more details.
-+
-+4. Present the reader to the user.
-+
-+   Typically the controller is presented modally::
-+
-+      [self presentModalViewController: reader
-+            animated: YES];
-+
-+   Alternatively, it may be added to a container controller.
-+
-+5. Process the results.
-+
-+   The controller will call the
-+   ``imagePickerController:didFinishPickingMediaWithInfo:`` method of
-+   your delegate every time new results become available.  The barcode data
-+   can be obtained using the :c:data:`ZBarReaderControllerResults` key of the
-+   info dictionary.  This key will return "something enumerable"; keep in mind
-+   that there may be multiple results.  You may also retrieve the
-+   corresponding image with :c:data:`UIImagePickerControllerOriginalImage` as
-+   usual::
-+
-+      - (void) imagePickerController: (UIImagePickerController*) reader
-+       didFinishPickingMediaWithInfo: (NSDictionary*) info
-+      {
-+          id<NSFastEnumeration> results =
-+              [info objectForKey: ZBarReaderControllerResults];
-+          UIImage *image =
-+              [info objectForKey: UIImagePickerControllerOriginalImage];
-+          ...
-+
-+   The ``reader`` parameter will be the actual type of the reader (not
-+   necessarily a :class:`UIImagePickerController`).
-+
-+   .. note::
-+
-+      The delegate method should queue the interface response and return as
-+      soon as possible; any processing of the results should be deferred until
-+      later, otherwise the user will experience unacceptable latency between
-+      the actual scan completion and the visual interface feedback.
-+
-+6. Dismiss the reader (or not).
-+
-+   Once you have the results you may dismiss the reader::
-+
-+      [reader dismissModalViewControllerAnimated: YES];
-+
-+   .. warning::
-+
-+      It is very important to dismiss from the *reader* (not the presenting
-+      controller) to avoid corrupting the interface.
-+
-+   Alternatively, you may choose to continue scanning and provide visual
-+   feedback another way (eg, maybe by updating your custom overlay with the
-+   results).  The "continuous" mode of the readertest example does this.
-+
-+
-+Using a ZBarReaderView
-+----------------------
-+
-+:class:`ZBarReaderViewController` is a relatively thin wrapper around a
-+:class:`ZBarReaderView`; it is possible to use the view directly, even from
-+Interface Builder.  You lose only some of the simulator and rotation hooks.
-+The documentation is also less complete, so you need to be able to UTSL.  See
-+the :file:`EmbedReader` sample for a working example.
-+
-+
-+Using the ZBarCaptureReader
-+---------------------------
-+
-+If you have special requirements for the capture session or just want to use
-+your own preview, you can add your own :class:`ZBarCaptureReader` to your
-+session.  You must have a solid understanding of the AVCapture infrastructure
-+if you plan to use this approach.
-+
-+.. admonition:: TBD
-+
-+   sorry, you're on your own here - UTSL  :)
-diff -r 563557a923d0 iphone/doc/compat.rst
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/doc/compat.rst	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,190 @@
-+Backward Compatibility
-+======================
-+
-+Generally speaking, we take great care to ensure that each release of the
-+library is backward compatible with previous versions - upgrading the library
-+should not require any changes to your code and will continue to provide
-+equivalent functionality.  The notable exception to this is the iOS 4 upgrade
-+and associated "deprecation" of the former automatic capture method by our
-+vendor.
-+
-+
-+.. warning::
-+
-+   Versions before iOS 4 are no longer supported by the library.  We are no
-+   longer able to test anything in this section, so you're on your own if you
-+   try to make use of it.
-+
-+
-+The Private API
-+---------------
-+
-+The API that we use for automatic capture with iOS 3.x (namely
-+:func:`UIGetScreenImage`) has an interesting history.  It has changed status
-+several times, starting with "Private, unless we like you" moving to
-+"reluctantly Public but undocumeted" by popular demand and reverting to
-+"strictly Private" as of iOS 4.  The current story: if you want to distribute
-+on the App Store, you had better not be using it - IOW, no automatic capture
-+for you with iOS 3.x.
-+
-+Since App Store distribution is the most common use for the library, the
-+default configuration, and thus the binary SDK, does *not* use any private
-+APIs.
-+
-+Users targeting ad-hoc or enterprise distribution may not care about the
-+status of the API and may prefer to continue supporting automatic capture for
-+iOS 3.x.  To do this you will need to rebuild the library with the following
-+define set for all configurations:
-+
-+.. sourcecode:: sh
-+
-+   USE_PRIVATE_APIS=1
-+
-+For reference, you can check whether your app refers to the offensive function
-+with this command:
-+
-+.. sourcecode:: sh
-+
-+   $ otool -vI MyApp.app/MyApp | grep UIGetScreenImage
-+
-+If there is any output, then the executable includes the private API and is
-+bound to be rejected if submitted for review.  Otherwise it is "clean" as far
-+as this library is concerned.
-+
-+
-+Upgrading to iOS 4
-+------------------
-+
-+If you were using the reader before iOS 4 was introduced, you will want to
-+upgrade to the new reader controller.  The performance has improved quite a
-+bit, and you can continue to support automatic capture on the App Store.
-+
-+.. note::
-+
-+   This discussion only applies to automatic capture from the camera.  If you
-+   are only scanning image files, or prefer/need to use manual capture, you
-+   should not change anything.
-+
-+Basically just replace your old :class:`ZBarReaderController` with a new
-+:class:`ZBarReaderViewController` and you're done!  See the reference and the
-+next section for compatibility between the two classes.
-+
-+Also see the :doc:`install` instructions for details about upgrading the
-+header references to use the SDK.
-+
-+
-+Supporting iOS 3.x
-+------------------
-+
-+The new :class:`ZBarReaderViewController` is intentionally designed to be
-+compatible with the old :class:`ZBarReaderController` in most aspects that
-+relate to reading barcodes.  When a :class:`ZBarReaderViewController` is
-+initialized under iOS 3.x, it will *replace* itself with a
-+:class:`ZBarReaderController`.  You can leverage the compatibility of these
-+controllers to continue supporting iOS 3.x.
-+
-+The following properties and methods should be equivalent across
-+implementations.  You may use them without regard for the actual instance
-+type.
-+
-+========================================================  ====
-+Equivalent Members
-+========================================================  ====
-+:member:`~ZBarReaderViewController::cameraOverlayView`
-+:member:`~ZBarReaderViewController::cameraViewTransform`
-+:member:`~ZBarReaderViewController::enableCache`
-+:member:`~ZBarReaderViewController::scanner`
-+:member:`~ZBarReaderViewController::readerDelegate`
-+:member:`~ZBarReaderViewController::scanCrop`
-+``showHelpWithReason:``
-+:member:`~ZBarReaderViewController::showsZBarControls`
-+:member:`~ZBarReaderViewController::tracksSymbols`
-+========================================================  ====
-+
-+Some properties are available with :class:`ZBarReaderViewController` only for
-+backward compatibility.  If these are configured, they must be set as
-+indicated; attempts to set another value will raise an exception.
-+
-+====================================================  =======================================
-+:class:`ZBarReaderController` Property                :class:`ZBarReaderViewController` Value
-+====================================================  =======================================
-+:member:`~ZBarReaderController::allowsEditing`        ``NO``
-+:member:`~ZBarReaderController::cameraMode`           ``Sampling``
-+:member:`~ZBarReaderController::maxScanDimension`     (ignored)
-+:member:`~ZBarReaderController::showsCameraControls`  ``NO``
-+:member:`~ZBarReaderController::showsHelpOnFail`      (ignored)
-+:member:`~ZBarReaderController::sourceType`           ``Camera``
-+:member:`~ZBarReaderController::takesPicture`         ``NO``
-+====================================================  =======================================
-+
-+Also, the ``isSourceTypeAvailable:`` class method of
-+:class:`ZBarReaderViewController` will return ``YES`` only for the ``Camera``
-+source.
-+
-+All other members of :class:`ZBarReaderController`, including those inherited
-+from :class:`UIImagePickerController` are not supported by
-+:class:`ZBarReaderViewController`.  This includes ``takePicture`` and
-+``scanImage:``, among others.
-+
-+Remaining members of :class:`ZBarReaderViewController`: are only available
-+with the new implementation.  At the moment this is only
-+:member:`~ZBarReaderViewController::readerView`, but any new properties or
-+methods not listed here will also fall in this category.
-+
-+To access settings that may not be available in a potential fallback
-+environment, you must verify that they exist and may be set as desired - eg,
-+by testing the specific reader subtype.
-+
-+Weak Linking
-+^^^^^^^^^^^^
-+
-+When leveraging fallbacks to iOS 3.x, it is important that features introduced
-+in iOS 4 are referenced using *weak* links.  You must configure your project
-+correctly to support this:
-+
-+* Make sure the iOS 4 frameworks are set to *Weak*.  Specifically, these are
-+  AVCapture, CoreMedia and CoreVideo.
-+
-+* Build with the latest SDK - do *not* use the "Base SDK" setting to target
-+  earlier devices.
-+
-+* Set the correct iOS 3.x version for the "iPhone OS Deployment Target"
-+  build setting.
-+
-+
-+Example: Fallback to Manual Capture
-+-----------------------------------
-+
-+This code example will configure the reader for automatic capture from the
-+camera for iOS 4 and fall back to manual or automatic capture for iOS 3.x,
-+depending on whether the library was compiled to use private APIs::
-+
-+   if(![ZBarReaderController isSourceTypeAvailable:
-+                                 UIImagePickerControllerSourceTypeCamera]) {
-+       // camera unavailable: display warning and abort
-+       // or resort to keypad entry, etc...
-+       return;
-+   }
-+   
-+   ZBarReaderViewController *reader = [ZBarReaderViewController new];
-+   // reader will be a ZBarReaderController for iOS 3.x
-+   // or a ZBarReaderViewController for iOS 4
-+   
-+   reader.readerDelegate = self;
-+   reader.sourceType = UIImagePickerControllerSourceTypeCamera;
-+   reader.showsZBarControls = YES;
-+   
-+   if(reader.cameraMode == ZBarReaderControllerCameraModeSampling) {
-+       // additional automatic capture configuration here
-+   }
-+   else {
-+       // additional manual capture configuration here
-+   }
-+   
-+   [self presentModalViewController: reader
-+         animated: YES];
-+
-+If you are using a custom control set
-+(:member:`~ZBarReaderViewController::showsZBarControls`\ ``=NO``), you will
-+want to provide a button attached to ``takePicture`` for the manual capture
-+case.  The built-in controls do this automatically.
-diff -r 563557a923d0 iphone/doc/conf.py
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/doc/conf.py	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,77 @@
-+import sys, os
-+from plistlib import readPlist
-+
-+# General configuration
-+
-+extensions = []
-+templates_path = ['ext']
-+source_suffix = '.rst'
-+master_doc = 'index'
-+exclude_patterns = ['.#*']
-+
-+project = u'ZBar iPhone SDK'
-+copyright = u'2010-2012, Jeff Brown et al'
-+
-+today_fmt = '%Y-%m-%d'
-+info = readPlist('../res/ZBarSDK-Info.plist')
-+version = 'X.Y'
-+if info:
-+    version = info['CFBundleVersion']
-+release = version
-+
-+#add_module_names = False
-+
-+pygments_style = 'sphinx'
-+highlight_language = 'objc'
-+primary_domain = 'cpp'
-+
-+# Options for HTML output
-+
-+html_theme = 'default'
-+html_theme_options = {
-+    'bgcolor': 'white',
-+    'textcolor': 'black',
-+    'linkcolor': '#247',
-+    'headbgcolor': '#edeff0',
-+    'headtextcolor': '#247',
-+    'headlinkcolor': '#c11',
-+    'sidebarbgcolor': '#247',
-+    'sidebartextcolor': 'white',
-+    'sidebarlinkcolor': '#cde',
-+    'relbarbgcolor': '#247',
-+    'relbartextcolor': '#ccc',
-+    'relbarlinkcolor': 'white',
-+    'footerbgcolor': 'white',
-+    'footertextcolor': 'black',
-+    'codebgcolor': '#dfe',
-+    'codetextcolor': 'black',
-+}
-+
-+html_short_title = 'ZBarSDK ' + version
-+html_title = 'ZBar iPhone SDK Documentation'
-+html_static_path = ['static']
-+html_favicon = '../../zbar.ico'
-+html_style = 'style.css'
-+html_use_modindex = False
-+html_use_index = False
-+html_copy_source = False
-+html_show_sourcelink = False
-+htmlhelp_basename = 'doc'
-+
-+# Options for LaTeX output
-+
-+latex_paper_size = 'letter'
-+latex_font_size = '10pt'
-+
-+# Grouping the document tree into LaTeX files. List of tuples
-+# (source start file, target name, title, author, documentclass [howto/manual])
-+latex_documents = [
-+  ('index', 'ZBarSDK.tex', u'ZBar iPhone SDK Documentation',
-+   u'Jeff Brown', 'manual'),
-+]
-+
-+#latex_logo = ''
-+#latex_use_parts = False
-+#latex_preamble = ''
-+#latex_appendices = []
-+#latex_use_modindex = False
-diff -r 563557a923d0 iphone/doc/custom.rst
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/doc/custom.rst	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,70 @@
-+Customizing the Interface
-+=========================
-+
-+The reader supports customization of the camera overlay and the integrated
-+help that is displayed.
-+
-+
-+Customizing the Overlay
-+-----------------------
-+
-+If you are scanning with the camera, whether using a
-+:class:`ZBarReaderViewController` for automatic capture or manually with
-+:class:`ZBarReaderController`, you may want to customize the appearance of the
-+reader.  You do this mainly by setting a
-+:member:`~ZBarReaderViewController::cameraOverlayView`.
-+
-+Note that if you are scanning images from the photo library, there is no
-+customization - you are limited to the system picker interface provided by the
-+:class:`UIImagePickerController`.
-+
-+If you are using a :class:`ZBarReaderViewController` and just want to add to
-+the existing controls, you can simply set your overlay to include the
-+additional view hierarchy::
-+
-+   reader.cameraOverlayView = myLogoImageView;
-+
-+Otherwise, if you are using a :class:`ZBarReaderController` or prefer to
-+completely replace the default controls, you should disable those first.  Note
-+that you will need to provide your own controls, which should at least include
-+a way to dismiss the reader::
-+
-+   reader.showsCameraControls = NO;  // for UIImagePickerController
-+   reader.showsZBarControls = NO;
-+   reader.cameraOverlayView = myControlView;
-+
-+For manual capture with :class:`ZBarReaderController`, you should also include
-+a control connected to :member:`~ZBarReaderController::takePicture`.
-+
-+In either case, the overlay view may be loaded from a NIB, or simply created
-+programmatically.
-+
-+You can also disable the tracking rectangle that highlights barcodes with
-+:member:`~ZBarReaderViewController::tracksSymbols`.
-+
-+
-+Presenting Help
-+---------------
-+
-+If you have set ``showsZBarControls = NO`` and replaced the default controls,
-+you may still present the built-in help viewer.  Just hook your custom control
-+to the ``showsHelpWithReason:`` method of the controller.  You should only
-+call this method when the reader is actually presented.
-+
-+The default reader controls invoke ``showsHelpWithReason:`` with a reason
-+parameter of ``"INFO"`` when the info button is tapped.
-+
-+
-+Customizing the Help Content
-+----------------------------
-+
-+Whether you use the default controls or provide your own, you can still
-+customize the content of the help that is displayed.  The integrated viewer
-+uses a UIWebView to display the contents of :file:`zbar-help.html` that we
-+copied into your Resources.  You should hack this up as you see fit to give
-+your users the best help experience.
-+
-+To allow for runtime customization based on the reason for presenting help,
-+the javascript function ``onZBarHelp`` will be called just before the page is
-+displayed, with the ``reason`` argument set as provided to
-+``showsHelpWithReason:``.
-diff -r 563557a923d0 iphone/doc/devguide.rst
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/doc/devguide.rst	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,13 @@
-+***********************
-+   Developer's Guide
-+***********************
-+
-+.. toctree::
-+   :maxdepth: 2
-+
-+   camera
-+   picker
-+   custom
-+   optimizing
-+   compat
-+   licensing
-diff -r 563557a923d0 iphone/doc/faq.rst
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/doc/faq.rst	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,101 @@
-+Frequently Asked Questions (FAQ)
-+================================
-+
-+This is the ever-growing list of answers to commonly asked questions.  Please
-+feel free to post you question in our `iPhone Developers forum`_ if you do not
-+find the information you need in this documentation.
-+
-+.. _`iPhone Developers Forum`:
-+   http://sourceforge.net/projects/zbar/forums/forum/1072195
-+
-+
-+General
-+-------
-+
-+This looks great...  Where can I get it?
-+   You can download the latest version of the SDK from
-+   http://zbar.sf.net/iphone
-+
-+
-+Compatibility
-+-------------
-+
-+Which iPhone devices does this library support?
-+   The library works *only* with iOS devices that have an auto-focus camera.
-+   Currently, the iPhone 3GS, iPhone 4 and newer devices.  The iPad 2 and iPad
-+   3 will also work in many cases, *iff* the barcode is printed large enough
-+   to achieve good focus.
-+
-+Will you make it work with the iPhone 3G?
-+   *No* - the 3G it is not supported and is unlikely to ever be supported.
-+
-+   To be fair, you *can* use the 3G to scan image files, as long as they're in
-+   focus (ie, *not* images taken by the built-in fixed-focus camera).  There
-+   is at least one application that found a use for this...
-+
-+What target iOS versions does this library work with?
-+   iOS 4, 5 and 6 are fully supported, including the latest video streaming
-+   interfaces.  Since Apple has dropped support for earlier versions of iOS on
-+   the App Store, we recommend that you target only iOS 4 and later for reading
-+   barcodes.
-+
-+   Note that iOS 3.1 is no longer supported; if you really think you need
-+   that, you should still be able to get it working...  See :doc:`compat` for
-+   details about iOS version fallbacks.
-+
-+   In all cases you should use the latest SDK to build.
-+
-+Are any private APIs in use?
-+   No - the binary release of the SDK does not use any private APIs.
-+
-+Does this support "automatic" barcode capture?
-+   Yes - with recent iOS versions, the default configuration will capture
-+   barcodes automatically from the video stream.
-+
-+
-+Building
-+--------
-+
-+I get "Undefined symbols" errors when I try to build?
-+   Most likely you did not add all of the necessary framework dependencies.
-+   See :doc:`tutorial` or :doc:`install` for the list of frameworks you need
-+   to link against.
-+
-+
-+Licensing
-+---------
-+
-+Please refer to :doc:`licensing` for questions about licensing.
-+
-+
-+Barcodes
-+--------
-+
-+Why do my UPC barcodes have an extra 0 at the front?
-+   The UPC-A_ symbology is the subset of EAN-13_ that starts with a leading 0.
-+   The ZBar decoder enables only EAN-13_ by default, so GTIN-13_ product codes
-+   are consistently reported.  You can choose to receive the 12-digit results
-+   instead by explicitly enabling UPC-A_.
-+
-+   The :member:`~ZBarSymbol::type` property of the symbol can be used to see
-+   which type of barcode is reported.
-+
-+   See EAN-13_ and UPC-A_ for more information.
-+
-+Why does my UPC-E (short version) barcode data look completely wrong?
-+   UPC-E_ is a "zero compressed" version of UPC-A_; certain of the zeros are
-+   removed from the UPC-A_ data to generate the UPC-E_ barcode.  The ZBar
-+   decoder *expands* this compression by default, again to consistently report
-+   GTIN-13_ product codes.  You can choose to receive the compressed 8-digit
-+   results instead by explicitly enabling UPC-E_.
-+
-+   The :member:`~ZBarSymbol::type` property of the symbol can be used to see
-+   which type of barcode is reported.
-+
-+   See UPC-E_ for more information.
-+
-+.. _GTIN-13:
-+.. _GTIN: http://wikipedia.org/wiki/GTIN
-+.. _EAN-13: http://wikipedia.org/wiki/EAN-13
-+.. _UPC-A: http://wikipedia.org/wiki/UPC-A
-+.. _UPC-E: http://wikipedia.org/wiki/UPC-E#UPC-E
-diff -r 563557a923d0 iphone/doc/getstarted.rst
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/doc/getstarted.rst	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,12 @@
-+*********************
-+   Getting Started
-+*********************
-+
-+.. toctree::
-+   :maxdepth: 2
-+   :numbered:
-+
-+   install
-+   tutorial
-+   faq
-+   support
-diff -r 563557a923d0 iphone/doc/index.rst
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/doc/index.rst	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,20 @@
-+################
-+  ZBar iOS SDK
-+################
-+
-+Welcome to the ZBar SDK for iOS!
-+
-+This documentation covers all aspects of developing with the SDK: from adding
-+the SDK to your project, to writing code that uses it, even licensing the
-+library with your app.
-+
-+Please let us know if you find anything inaccurate or lacking (even better,
-+send doc patches!)
-+
-+.. toctree::
-+   :maxdepth: 2
-+   :numbered:
-+
-+   getstarted
-+   devguide
-+   apiref
-diff -r 563557a923d0 iphone/doc/install.rst
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/doc/install.rst	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,141 @@
-+Installing the SDK
-+==================
-+
-+These are the basic instructions for obtaining the SDK and adding it to an
-+Xcode project.
-+
-+You may want to try things out with the :doc:`tutorial` before hacking at your
-+own project.
-+
-+
-+Requirements
-+------------
-+
-+You will need *all* of the following to develop iPhone applications
-+using this SDK:
-+
-+* Mac OS X >= 10.6.x (Snow Leopard)
-+* Xcode >= 4.5.1
-+* iPhone SDK >= 4.0
-+* An iPhone 3GS, iPhone 4 or newer iOS device with an auto-focus camera
-+* iOS >= 4.0 running on the device
-+
-+.. warning::
-+
-+   *Only* the iPhone 3GS, iPhone 4 and newer models are supported, as they
-+   have a camera with auto-focus.  The iPad 2 and iPad 3 will also work, *iff*
-+   the barcode is printed large enough to achieve good focus.  The ZBar
-+   library does not support the iPhone 3G and is unlikely to ever support it.
-+
-+
-+Downloading
-+-----------
-+
-+Download the latest binary release of the ZBar SDK from
-+
-+http://zbar.sourceforge.net/iphone
-+
-+
-+Integration
-+-----------
-+
-+The recommended installation method is to simply copy the SDK into your
-+Xcode project:
-+
-+1. Open ZBarSDK-|version|.dmg in the Finder.
-+
-+2. Drag the :file:`ZBarSDK` folder into your Xcode project.  In the dialog
-+   that appears, you should choose to **copy** the SDK into your project by
-+   checking the box.  The target that you want to link with the library should
-+   also be selected in the target list.
-+
-+3. Link the following additional frameworks to any targets that link with the
-+   ZBarSDK.  You should set the first three to use weak references and
-+   configure an appropriate deployment target if you still need to support
-+   iOS 3:
-+
-+   * :file:`AVFoundation.framework` (weak)
-+   * :file:`CoreMedia.framework` (weak)
-+   * :file:`CoreVideo.framework` (weak)
-+   * :file:`QuartzCore.framework`
-+   * :file:`libiconv.dylib`
-+
-+   If you check "Link Binary With Libraries" for the target(s), you should see
-+   all of these frameworks followed by :file:`libzbar.a`.
-+
-+   .. note::
-+
-+      Link order may be important for some versions of Xcode; the referenced
-+      libraries should be listed *before* :file:`libzbar.a` in the link order.
-+
-+4. Import the SDK header from your prefix header to make the barcode reader
-+   APIs available::
-+
-+      #import "ZBarSDK.h"
-+
-+Proceed to :doc:`camera` or :doc:`picker` to learn about using the reader APIs
-+to scan barcodes.  Use the :doc:`apiref` for specific interface details.
-+
-+
-+Upgrading from an Older Version
-+-------------------------------
-+
-+If you are using an older version of the *SDK* (NB, skip to the next section
-+if you are currently using Mercurial), upgrading is straightforward:
-+
-+1. Delete the current ZBarSDK group from your project.  You should choose
-+   to delete the files if you copied them into your project.
-+2. Drag the new ZBarSDK from the DMG into your project.
-+
-+Clean out and rebuild your project with the new version.
-+
-+
-+Upgrading a Pre-SDK Integration
-+-------------------------------
-+
-+If your project was using the library directly from the Mercurial repository,
-+before the SDK was introduced, there are a few incompatibilities that you must
-+resolve in order to upgrade.  Don't worry - all of your source stays the same,
-+you just need to update how the library is included in the project and how the
-+headers are imported.
-+
-+Switching to the Binary Distribution
-+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-+
-+This approach is recommended - the binary releases provide you with a stable
-+development platform, isolating you from temporary instability and transient
-+problems that may occur at the bleeding edge.
-+
-+The first task is to reverse the previous ZBar integration:
-+
-+1. Remove the reference to zbar.xcodeproj from your project.
-+2. Remove any :file:`zbar-*` files from your Resources.
-+3. In the target build settings, remove any "Header Search Paths" that
-+   reference zbar.
-+4. Remove any references to zbar headers in your :file:`prefix.pch` or source
-+   files.
-+
-+Now just continue with the `integration`_ instructions above and you should be
-+back up and running!
-+
-+Continuing with Mercurial
-+^^^^^^^^^^^^^^^^^^^^^^^^^
-+
-+Alternatively, you may still prefer to select Mercurial revisions.  You have a
-+few choices for this:
-+
-+* You may build your own ZBarSDK and copy/link it into your project.  This is
-+  the same as `Switching to the Binary Distribution`_, except that you use
-+  your own version of the SDK.  In this case you need to manually rebuild the
-+  SDK when you update it.
-+* You may leave zbar.xcodeproj as a project dependency and pull the SDK into
-+  your project.  This is not well tested, so ymmv.
-+* You may leave zbar.xcodeproj as a project dependency and just link libzbar.a
-+  into your project, as before.  You will need to update the target dependency
-+  (the library target changed names to libzbar) and add the
-+  :file:`iphone/include/ZBarSDK` directory to "Header Search Paths"
-+
-+In any case, you should remove the references to the zbar headers from
-+:file:`prefix.pch` (or your source files) and replace them with::
-+
-+   #import "ZBarSDK.h"
-diff -r 563557a923d0 iphone/doc/licensing.rst
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/doc/licensing.rst	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,187 @@
-+Licensing the Library
-+=====================
-+
-+First of all, the big disclaimer:
-+
-+.. warning::
-+
-+   We are *not* lawyers; we cannot help you decide if you should use the
-+   library or how to apply the license, only your lawyer can advise you
-+   concerning legal matters.
-+
-+That said, it should also be noted that we have neither the resources (time,
-+cash, etc) nor the patience to enforce the license (at all); the reality is
-+that all of this is left to your discretion.
-+
-+If you prefer to leave the lawyers out of it, the rest of this section will
-+help you apply the license to your application.
-+
-+
-+Licensing FAQ
-+-------------
-+
-+Can I use this library with my proprietary (closed source) application?
-+   Yes, that is our intent and we do not believe there is any problem
-+   regarding the license.
-+
-+Will I need to open source my entire app?
-+    No, it is not required by the license.
-+
-+Will I need to distribute all of my "object files" on the App Store?
-+    No, this is also not required by the license, although you should offer to
-+    provide them upon request.  See below for more detail.
-+
-+But I read somewhere that "iPhone apps may not use LGPL code"?
-+   That statement is an over-generalization that does not apply in this case.
-+   Most likely your source is either:
-+
-+   * referring to the GPL, which is significantly different from the
-+     *L*\ GPL
-+   * referring to a different version of the LGPL; we intentionally use
-+     version 2.1, which has specific static linking exceptions.
-+   * not a lawyer either and too lazy to read the whole license
-+
-+   Basically, if you leverage the appropriate sections of the license, it
-+   should be fully compatible with the App Store restrictions and
-+   requirements.
-+
-+This is too complicated, can I just pay for an easier license?
-+   No, it is not possible.  There are multiple problems with this approach,
-+   some brief highlights:
-+
-+   * Most open source projects (including this one) do not have a single
-+     author.  Tracking down every contributor and getting their approval could
-+     be quite a challenge.
-+   * The license is meant to protect users' rights to the software.  Giving
-+     you special treatment bypasses the protection we offered them,
-+     effectively revoking their rights.  This would be a violation of their
-+     trust and completely defeats the purpose of the license.
-+
-+   You may think of this as the "price" you pay for using our open source
-+   library.  If you want to make your life easier, you should be petitioning
-+   Apple for shared library support...
-+
-+What if you add a clause that lets me do whatever I want?
-+   No, also not possible.  In addition to the problems mentioned above, there
-+   are even more problems with this:
-+
-+   * Sourceforge requires an OSI approved license for hosting our project;
-+     an altered license would no longer be approved.
-+   * Again we are not lawyers and therefore not qualified to change the
-+     license, we would have to pay one of those slimy buggers to do it.
-+
-+Do I need to add an "about" dialog to display your copyright/license?
-+   No, not as such.  We won't discourage you from plugging the library if you
-+   like, but it is not a requirement.  You should think of our license as a
-+   supplement to your own software license, therefore it is appropriate to
-+   display it where (and only where) you display your own:
-+
-+   * If you follow Apple's recommendation, the App Store is the only place
-+     that the user accesses your license, so it should also be the only place
-+     where the library supplement is available.
-+   * If your app already has some kind of "about" view that displays your
-+     copyright/license information, it is also appropriate to display the same
-+     information for the library.
-+
-+Do I need to include the entire library in my application bundle?
-+   No, it is not necessary:
-+
-+   * If you have not modified the library, it is sufficient to provide a link
-+     to the project and the version information.
-+   * If you are using a modified version, you may provide a link to download
-+     that instead of including it in the bundle.
-+
-+
-+Modifications
-+-------------
-+
-+What is a "modification"?  Again, we leave it to your discretion with this
-+guidance:
-+
-+* If you use the distributed binary SDK you have certainly not modified the
-+  library.
-+* If you are working from Mercurial, *any* change you have made to the
-+  "source code" of the library is a modification, it does not matter how
-+  trivial.  You can see what changes have been made by running
-+  ``hg status -mard``; if this command outputs anything, you have modified
-+  the library.
-+
-+If you find that you have made changes to the library, you should carefully
-+consider how far you want to proceed down that path.  Once you publish your
-+changes you have created a "fork" of the project which you now need to
-+maintain.  Are you prepared to merge every time the library is updated?
-+
-+If your change adds a useful feature to the library, we absolutely encourage
-+you to submit patches.  Assuming you can get your patch into the project, then
-+you will no longer need to use a modified version!  When submitting patches,
-+ensure that your changes are appropriate for all of our users.  Specifically,
-+we are not interested in patches that simply hack up the library to work the
-+way you want.  Compare a patch that changes the default behavior to your
-+preference (probably not acceptable), to a patch that adds a new configuration
-+to support the feature you have added (probably fine).
-+
-+
-+Object File Distribution
-+------------------------
-+
-+Section 6 of the LGPL v2.1 specifically permits static linking with the
-+library.  If your project is not open source, this section does require that
-+you make your object files available to your users.  The intent, as indicated
-+in the license, is that a user who has obtained your software may exercise
-+their right to modify the library and then re-link their modified version into
-+your application.
-+
-+We recommend that you apply Subsection 6c, which only requires that you make a
-+written offer to provide the object files.  Now...if you consider the actual
-+utility of this mechanism - that it is only applicable to developers, and only
-+those with in depth knowledge of the tools, the time required for development
-+- all to have a new barcode reader in a specific version of your application
-+that only they can use, the reality is that no one is going to request this.
-+You probably should not even waste time preparing for it until a request is
-+made.
-+
-+Additionally, to avoid "casual requests" from nefarious types that just want
-+to inconvenience you, also consider charging a fee for the distribution of
-+this material (as permitted by the license); just add up the cost of burning
-+and shipping a disk.  If this cost is "large" compared to the price of your
-+app, the likelyhood of a request is reduced even further.
-+
-+
-+Using the Unmodified Library
-+----------------------------
-+
-+Applying the license in this case is somewhat simpler.  These are the basic
-+steps you can follow:
-+
-+1. Verify that the rest of your software license is compatible with the LGPL.
-+   You cannot use the library if they are incompatible.
-+
-+   For those using the default App Store license, we have reviewed this and
-+   believe it is compatible with the LGPL.
-+
-+2. At the end of your license text, in an annex or supplement, start by
-+   declaring your use of the library and offering a link to the project.
-+   Something like this:
-+
-+      This software uses the open source ZBar Barcode Reader library, version
-+      |version|, which is available from http://zbar.sourceforge.net/iphone
-+
-+   If you built your own version of the library, replace the version callout
-+   with eg, "cloned from Mercurial revision xxxxxxxx"
-+
-+3. Then append the contents of the text file COPYING, included with the
-+   library.  This is all of the copyright information for the library.
-+
-+4. Then append the contents of the text file LICENSE, also included with the
-+   library.  This is just the LGPL version 2.1 which you may also obtain from
-+   http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html
-+
-+5. You may choose to make the written offer for the object files explicit.
-+   Provide some text and whatever link or email address is appropriate.
-+
-+
-+Using a Modified Library
-+------------------------
-+
-+We intentionally leave this option vague and force you to refer to the license
-+as an underhanded way of encouraging you to contribute back to the project ;)
-diff -r 563557a923d0 iphone/doc/optimizing.rst
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/doc/optimizing.rst	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,435 @@
-+Optimizing the Reader
-+=====================
-+
-+As good as the iPhone performance is for a mobile device, the reality from an
-+image processing perspective is that it represents a lower performance target.
-+While the default configuration of the iPhone reader has been carefully tuned
-+for the general case, you can often obtain much better results if you optimize
-+for your specific application.
-+
-+.. note::
-+
-+   Performance is a complex topic.  The only way to tune performance is by
-+   changing settings and comparing measured results.  If you are not
-+   comfortable with the concepts presented here, it is recommended that you
-+   leave the settings at the defaults and avoid compromising reliability.
-+
-+Performance of the barcode reader is generally evaluated by two factors:
-+
-+* The **latency** - how quickly it "recognizes" a barcode.  Specifically this
-+  is the time from when the user puts a barcode in the frame or selects an
-+  image until a response is indicated back to the them.
-+
-+* The **reliability** - it does not matter how quickly an image is scanned if
-+  an incorrect result is returned.  That may seem obvious, but bad decodes
-+  *are* possible and you need to keep this in mind when changing settings that
-+  affect the reliability of the reader.
-+
-+Basically our goal is to optimize the latency without sacrificing reliability.
-+There are several factors that contribue to latency:
-+
-+* The **quality** of the barcode image.  Quality includes the available
-+  resolution, focus, lighting, noise, etc.  We have more control over some of
-+  these than others.
-+
-+* The **camera**.  When scanning from the camera, the time for the
-+  autoexposure and autofocus to converge on an image that can be decoded is a
-+  significant contribution to the overall latency.
-+
-+* The **frame rate** of the reader - this translates to the time it takes the
-+  scanner to process an image.
-+
-+* The **effort level** of the reader - some of the available settings control
-+  "how hard" the reader tries to find barcodes in each frame.
-+
-+* The **delegate latency** - the time spent in your application after a
-+  barcode has been detected until the user is notified.
-+
-+Most of these factors are interrelated.  We will discuss those we can control
-+in detail, as well the settings you use to affect them.  Then we will provide
-+a few specific case examples.
-+
-+
-+Measuring Performance
-+---------------------
-+
-+Subjective response times are a good place to start (does it "feel" responsive
-+to you?), and possibly the only way to evaluate the overall experience, but to
-+compare incremental changes to interrelated settings and have meaningful
-+performance discussions with others, we need a more quantitative approach.
-+
-+The :func:`mach_absolute_time` function is a good tool for accurately
-+measuring small delays.  Research this function and learn how to apply it.  As
-+when measuring any real-world value, keep in mind that some variance is to be
-+expected - even if you perform exactly the same operation multiple times, you
-+will not see exactly the same measurement.  You should collect several
-+samples, discard any obvious outliers, and average the remaining measurements.
-+
-+One way that the overall reader latency may be evaluated is by manually
-+marking the time when the barcode is presented to the reader.  Add a control
-+to your overlay that captures the start time when tapped and compare this to
-+the end time, just before your delegate returns.
-+
-+The reader continually monitors the frame rate at which it is running.  The
-+measured value may be displayed for debugging purposes by enabling the
-+:member:`~ZBarReaderView::showsFPS` property.  The readertest example does
-+this and also provides control over many of the available settings, so you can
-+quickly test how each setting affects the frame rate.  You should target your
-+optimization efforts to achieve a frame rate of at least 8-10fps, although
-+12-15fps is preferable.
-+
-+You can measure the latency of your delegate using :func:`mach_absolute_time`.
-+The measured value should be less than about 100ms, the smaller the better, to
-+avoid noticeable lag.
-+
-+The readertest is a good tool for testing the performance of the reader.  You
-+can tune the settings appropriately for your application and evaluate the
-+effect each change has on the performance.
-+
-+
-+Delegate Latency
-+----------------
-+
-+This latency contributor is the easiest for you to effect (and sometimes the
-+easiest to overlook).  Your delegate method should update the interface -
-+dismiss the controller or update your overlay to indicate success - and
-+*nothing* else.  All other processing should be deferred until after the
-+animations have started.
-+
-+
-+Image Quality
-+-------------
-+
-+Resolution
-+^^^^^^^^^^
-+
-+One might think that "more is better" in terms of resolution, but this is not
-+necessarily the case.  Given average image quality, the ideal resolution for
-+scanning is right around three pixels per barcode "module" (the width of the
-+smallest bar or space).  Note that this measure is not an absolute image size
-+or even a measure of the physical dimensions represented by a pixel sample, it
-+*only* describes the sampled size of the barcode in the image.
-+
-+As the resolution decreases below about two pixels per module, edge fidelity
-+is lost and the bars and spaces start to merge together, making it impossible
-+(for this library) to scan.  This affects the density (feature size) and
-+maximum size (data capacity) of the barcodes that can be detected.
-+Conversely, as the resolution increases above about 4 pixels per module, noise
-+can interfere with the edge detection and images will take longer to process.
-+
-+Other quality factors, such as poor focus, bad lighting or even excessive
-+noise, can increase (or decrease) the resolution requirement.
-+
-+When scanning from the camera, the reader defaults to 640x480, which is good
-+for most applications.  On newer devices, you can increase this using a capture
-+:member:`~ZBarReaderView::session` preset.  Some older devices do not have a
-+higher resolution option available.
-+
-+For scanning images, you can use
-+:member:`~ZBarReaderController::maxScanDimension` to control the scaled size
-+of the converted image, or resort to converting them yourself.
-+
-+If you want to read long linear barcodes or dense 2-D symbols, you will
-+probably want to increase the resolution by adjusting these settings.
-+
-+Keep in mind that more pixels will take longer to scan, refer to the `frame
-+rate`_ discussion for ways to compensate.
-+
-+Focus
-+^^^^^
-+
-+Ideally we would fix the focus at a calculated optimum distance and optimize
-+the aperture selection to maximize the depth of field.  Unfortunately the APIs
-+do not currently give us control over any of these settings, the best we can
-+do (as of iOS 4) is continuous auto-focus mode - this mode is configured by
-+the reader automatically.  It can still take the device as long as 1-2 seconds
-+to find the appropriate macro focus setting, but again, there is currently no
-+way to reduce this delay.
-+
-+Lighting and Exposure
-+^^^^^^^^^^^^^^^^^^^^^
-+
-+An image that is too bright or overexposed can completely wash out any
-+barcodes.  An image that is too dark or underexposed will not provide
-+sufficient contrast for the scanner.  Low light levels also tend to produce
-+noisier images, possibly because the driver uses a faster "ISO" setting to
-+compensate for the lighting.
-+
-+The camera defaults to continuous automatic exposure and white balance.  Since
-+there are no other useful values, the reader leaves these unchanged from their
-+default setting.
-+
-+For some devices, the "torch" can be enabled to provide additional
-+illumination for the camera in low-light conditions.  The reader sets the
-+torch to automatic by default, so it should turn on only when needeed...
-+There have been some reports that the torch turns on inappropriately, washing
-+out the image.  If you find that this occurs, you should instead set the
-+:member:`~ZBarReaderView::torchMode` property of the :class:`ZBarReaderView`
-+to ``Off``.
-+
-+For scanning images from another source, you are again stuck with the
-+available image quality.  If you have any control over the image source, you
-+should do what you can to fix quality problems there.
-+
-+Noise
-+^^^^^
-+
-+Some level of noise is filtered by the reader, but excessive noise levels
-+create additional edges in the image which corrupt barcodes and increase
-+scanning time (decreasing the frame rate).
-+
-+As mentioned with `lighting and exposure`_, noise mostly becomes a problem
-+when the light-level is too low, but high-resolution images may also increase
-+exposure to sensor noise.
-+
-+We compensate for noise by *reducing* the `resolution`_ from the sensor
-+maximum.  Scaling the image down has the effect of averaging several pixels
-+into one value, filtering out the high-frequency noise component.
-+
-+
-+Frame Rate
-+----------
-+
-+The time it takes to scan and decode an image/frame is roughly proportional to
-+the number of pixels that are processed.  The number and type of enabled
-+symbologies and image noise can also affect the processing time.
-+
-+We have several knobs available that affect the frame rate.  Most of these are
-+geared toward reducing the number of image pixels that are scanned.
-+
-+Decrease the Resolution
-+^^^^^^^^^^^^^^^^^^^^^^^
-+
-+Adjusting the resolution of the image is an easy way to quickly reduce the
-+number of pixels.  Smaller images also mean there is less data to carry
-+around, which helps performance in other ways.  For example, reducing each
-+image dimension by 30% (eg, from 640x480 to 448x336) will about double the
-+speed of the reader (to a point).  [FIXME verify!]
-+
-+Adjusting the resolution is `described above <resolution>`_.  As mentioned
-+there, reducing the resolution will negatively impact the minimum feature size
-+and maximum barcode size that can be scanned, but it will help filter noise.
-+
-+Crop the Scan Region
-+^^^^^^^^^^^^^^^^^^^^
-+
-+It may not always be necessary for an application to scan all the way to the
-+edges of the image.  By cropping the scan area, you can get most of the
-+benefits of reduced resolution without sacrificing the minimum feature size.
-+Cropping will also not affect image noise, but similar to decreasing the
-+resolution, it does affect the maximum size barcode that can be scanned.
-+
-+For all cases you set the crop rectangle
-+:class:`~ZBarReaderViewController::scanCrop` property.  Note that the
-+rectangle provided to the controller is *normalized* across image size and
-+rotation.  This means that the coordinates range from 0 to 1 and the axes will
-+be arranged such that the x-axis of the crop rectangle corresponds to the
-+major (longer) image axis.
-+
-+Your interface will typically need to indicate the cropped scan area to the
-+user with visual queues.  Use the
-+:class:`~ZBarReaderViewController::cameraOverlayView` to provide this.
-+
-+By default, the :class:`ZBarReaderView` recognizes a pinch gesture to
-+digitally zoom the preview around the center of the image.  This zoom does not
-+affect the resolution of the image, but it does crop the scan region to the
-+visible area.  You can also disable the pinch gesture and set the
-+:class:`~ZBarReaderView::zoom` programmatically.
-+
-+Limit the Scan Density
-+^^^^^^^^^^^^^^^^^^^^^^
-+
-+The scanner works by making scan passes across the pixel rows and colums of
-+the image.  The density of the passes is configured at the scanner as a pixel
-+stride for each axis.  ``ZBAR_CFG_Y_DENSITY`` (``ZBAR_CFG_X_DENSITY``)
-+controls the number of pixel rows (columns) that are skipped between
-+successive horizontal (vertical) scan passes.  (Note that "density" is really
-+not a good name for the configuation settings... "stride" might be more
-+appropriate.)
-+
-+Decreasing the scan density (by increasing the stride setting) is a great way
-+to limit the processing (increasing the frame rate) without sacrificing scan
-+resolution - each scan pass is still made at full image resolution, there are
-+just fewer passes (less redundancy).
-+
-+Setting the stride value to 0 completely disables scanning in that direction.
-+This is very useful when reading linear codes with a visual alignment guide -
-+scanning parallel to the bars is a waste of cycles which may be better applied
-+to support higher resolution or increased density of scans across the symbol.
-+Note that some 2-D symbologies (QR Code) require scans in both directions.
-+
-+Setting the stride to a very large value will generate a single scan pass
-+through the center of the image.  Note that some symbologies will not be
-+detected without multiple successful passes; it is usually better to combine
-+this setting with cropping to generate a number of closely clustered scan
-+passes in the target area.
-+
-+Note that the density also affects the aspect ratio and rotation that can be
-+tolerated.  If you set it too large, some barcodes will become more difficult
-+to read.
-+
-+In general, 2 to 4 is a good target for the stride setting, unless you have
-+very high or low resolution images.
-+
-+Disable unused symbologies
-+^^^^^^^^^^^^^^^^^^^^^^^^^^
-+
-+Limiting the symbologies to the set of interest should provide a small
-+performance boost.  It also improves decode reliability - it is impossible to
-+receive an incorrect or unexpected decode result from a symbology that is
-+disabled.
-+
-+The reader does support full auto-discrimination among the supported
-+symbologies, but with all of them enabled you may need to compensate elsewhere
-+to get a good frame rate.
-+
-+For example, if you are only interested in QR codes, disable the others.  The
-+robust way to do this is by disabling *all* symbologies and then reenabling
-+only those you want.  This helps isolate you from encountering new symbologies
-+that may be added in future versions of the library until you are ready to
-+handle them::
-+
-+   [scanner setSymbology: 0
-+            config: ZBAR_CFG_ENABLE
-+            to: 0];
-+   [scanner setSymbology: ZBAR_QRCODE
-+            config: ZBAR_CFG_ENABLE
-+            to: 1];
-+
-+Even if you would like your application to support multiple symbologies, you
-+may consider if there is a way to limit the enabled subset based on the
-+scanning context, etc...
-+
-+
-+Examples
-+--------
-+
-+These examples demonstrate several scenarios for scanning from the camera with
-+automatic capture.  You can try them yourself using the readertest.  For each
-+example, start with the default settings (by tapping the
-+``ZBarReaderViewController`` class), then enable continuous mode and the
-+custom overlay (by disabling
-+:member:`~ZBarReaderViewController::showsZBarControls`).  You should also use
-+a release build and avoid running in the debugger.
-+
-+Frame rates are approximate, measured on an iPhone 3GS running iOS 4.0.1 in a
-+well lit room.  Two measurements are taken for each sample: the rate with the
-+camera pointed at a blank white page such that it fills the frame, and the
-+rate while continuously decoding the provided example.  For best results, it
-+is recommended that you print the examples rather than scanning them from the
-+screen.
-+
-+For reference, the base frame rates with default settings are 12fps for a
-+blank white page, 7.5fps for this `basic EAN symbol`_ and 2.2fps for this
-+`basic QR symbol`_.
-+
-+.. _`basic EAN symbol`:
-+   http://zbar.sf.net/test/ean13/9876543210128.png
-+.. _`basic QR symbol`:
-+   http://chart.apis.google.com/chart?cht=qr&chs=512x512&chl=http://zbar.sf.net/iphone
-+
-+Long Linear Symbols
-+^^^^^^^^^^^^^^^^^^^
-+
-+For this example, we will use a relatively `long Code 128 barcode`_.
-+
-+.. _`long Code 128 barcode`:
-+   http://zbar.sf.net/test/code128/ALPHA.png
-+
-+While it should be possible to read this symbol with the default settings, you
-+may notice that it is not very reliable.  You will have to stretch the symbol
-+across the entire screen, and even then the default settings will only give
-+you about 1.6 pixels per module, well below the ideal target of 3.  To improve
-+these results, we want to maximize scanning resolution for the long image
-+axis.
-+
-+1. Disable the default zoom/crop - zoom all the way out by hitting "Scan" and
-+   pinching the preview; the frame rate immediately drops to 8fps / 4.8fps.
-+
-+We should compensate for this reduction in the frame rate:
-+
-+2. Crop the image to a long, skinny rectangle - set the
-+   :member:`~ZBarReaderViewController::scanCrop` setting to
-+   ``{{0, 0.3}, {1, 0.4}}``;  The frame rate jumps up to 18fps / 8.7fps.
-+
-+3. Disable scans across the short image axis - set the ``CFG_X_DENSITY``
-+   setting to 0.  The frame rate goes all the way to 30fps / 13fps.
-+
-+Since we have plenty of margin with the frame rate, we can minimize the total
-+decode latency by performing more scan passes through the symbol:
-+
-+4. Increase the scan density - set the ``CFG_Y_DENSITY`` setting to 1 (13.5fps
-+   / 5fps) or 2 (24fps / 9fps).
-+
-+You should now be able to quickly and reliably decode long linear symbols.
-+
-+If have a newer device, you may also try increasing the resolution to support
-+even longer symbols.  You may have to compensate elsewhere to bring the frame
-+rate back to a reasonable level.
-+
-+High Density QR Symbols
-+^^^^^^^^^^^^^^^^^^^^^^^
-+
-+For this example we will use a `version 29 QR Code symbol`_.
-+
-+.. _`version 29 QR Code symbol`:
-+   http://www.qrcomic.com/images/5.png
-+
-+In this case we still want to maximize the resolution, but we also need to
-+increase the scan density to reliably pick up the small finder patterns:
-+
-+1. Maximize scan density in both directions - set the ``CFG_X_DENSITY`` and
-+   ``CFG_Y_DENSITY`` settings both to 1.  You should be able to scan the symbol
-+   now, although the frame rate drops to 4.5fps / 1fps
-+
-+2. Disable the default zoom/crop - zoom all the way out by hitting "Scan" and
-+   pinching the preview; the frame rate drops further to 3fps / 0.7fps
-+
-+We can compensate somewhat for the reduced frame rate:
-+
-+3. Crop the image to a square - set ``scanCrop`` to ``{{0.125, 0}, {.75, 1}}``.
-+   This boosts the frame rate slightly to 3.7fps / 0.75fps.
-+
-+4. Disable linear symbologies - set the symbologies such that only QR Code is
-+   enabled (4fps / 1fps)
-+
-+Even though the frame rate is still pretty bad, the QR recognition latency
-+should be acceptable.
-+
-+If have an iPhone 4, you may also try increasing the resolution to support
-+even denser QR symbols. You may have to compensate elsewhere to bring the
-+frame rate back to a reasonable level.
-+
-+Small DataBar Symbols
-+^^^^^^^^^^^^^^^^^^^^^
-+
-+For this example we will use a `DataBar symbol`_ printed with a small feature
-+size, typical of the stickers used to tag produce.  Scale it when printing
-+such that the printed dimensions are about 1cm square.  This symbol should
-+scan with the default settings, but we will attempt to optimize the scan
-+latency for this case.
-+
-+.. _`DataBar symbol`:
-+   http://zbar.sf.net/test/databar/0109876543210128-so.png
-+
-+As well as high barcode resolution, we also want high density passes in both
-+directions to minimize sensitivity to rotation:
-+
-+1. Maximize scan density in both directions - set the ``CFG_X_DENSITY`` and
-+   ``CFG_Y_DENSITY`` settings both to 1.  The frame rate drops to 4.5fps /
-+   3fps.
-+
-+Compensate for the reduction in frame rate by zooming in on the small symbol,
-+which crops the scanned image.  Zooming also helps the user see the small
-+barcode:
-+
-+2. Zoom all the way in - hit "Scan" and un-pinch the preview.  The frame rate
-+   recovers to 11fps / 6.2fps.
-+
-+3. Crop the image to a square - set ``scanCrop`` to ``{{0.125, 0}, {0.75, 1}}``
-+   (14fps / 7.5fps)
-+
-+4. Disable all symbologies except DataBar and DataBar Expanded (14.5fps / 9fps)
-+
-+The reader should now be very sensitive to DataBar, even when scanned at an
-+angle.
-diff -r 563557a923d0 iphone/doc/picker.rst
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/doc/picker.rst	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,104 @@
-+Scanning a User-Selected Image
-+==============================
-+
-+Some applications may need the full resolution offered by camera snapshots, or
-+need to scan an image or document from the user's photo library.  In these
-+cases you use a :class:`ZBarReaderController`.  This reader is a *subclass* of
-+:class:`UIImagePickerController`, and you use it the same way.  See the
-+documentation for :class:`UIImagePickerController` for more detais.
-+
-+1. Create the reader.
-+
-+   This is as simple as creating a new :class:`ZBarReaderController`::
-+
-+      ZBarReaderController *reader = [[ZBarReaderController alloc] init];
-+
-+2. Setup a delegate to receive the results.
-+
-+   The delegate should implement the :class:`ZBarReaderDelegate` protocol,
-+   which inherits from :class:`UIImagePickerControllerDelegate`::
-+
-+      reader.readerDelegate = self;
-+
-+3. Configure the reader.
-+
-+   You will need to set the :member:`~ZBarReaderController::sourceType`
-+   appropriately.  Aside from the properties of the reader itself, you can
-+   configure the decoder via the :member:`~ZBarReaderController::scanner`
-+   property::
-+
-+      if([ZBarReaderController isSourceTypeAvailable:
-+                                   UIImagePickerControllerSourceTypeCamera])
-+          reader.sourceType = UIImagePickerControllerSourceTypeCamera;
-+      [reader.scanner setSymbology: ZBAR_I25
-+                      config: ZBAR_CFG_ENABLE
-+                      to: 0];
-+
-+   See :doc:`custom` and :doc:`optimizing` for more details.
-+
-+4. Present the reader to the user.
-+
-+   As the reader is a UIImagePickerController, it must be presented modally::
-+
-+      [self presentModalViewController: reader
-+            animated: YES];
-+
-+5. Process the results.
-+
-+   The controller will call the
-+   ``imagePickerController:didFinishPickingMediaWithInfo:`` method of
-+   your delegate for a successful decode (NB *not* every time the user takes a
-+   picture or selects an image).  The barcode data can be obtained using the
-+   :c:data:`ZBarReaderControllerResults` key of the info dictionary.  This key
-+   will return "something enumerable"; keep in mind that there may be multiple
-+   results.  You may also retrieve the corresponding image with
-+   :c:data:`UIImagePickerControllerOriginalImage` as usual::
-+
-+      - (void) imagePickerController: (UIImagePickerController*) reader
-+       didFinishPickingMediaWithInfo: (NSDictionary*) info
-+      {
-+          id<NSFastEnumeration> results =
-+              [info objectForKey: ZBarReaderControllerResults];
-+          UIImage *image =
-+              [info objectForKey: UIImagePickerControllerOriginalImage];
-+          ...
-+
-+   The ``reader`` parameter will be the actual :class:`ZBarReaderController`
-+   (again, a subclass :class:`UIImagePickerController`).
-+
-+   .. note::
-+
-+      The delegate method should dismiss the reader and return as soon as
-+      possible; any processing of the results should be deferred until later,
-+      otherwise the user will experience unacceptable latency between the
-+      actual scan completion and the visual interface feedback.
-+
-+6. Dismiss the reader.
-+
-+   Once you have the results you should dismiss the reader::
-+
-+      [reader dismissModalViewControllerAnimated: YES];
-+
-+   .. warning::
-+
-+      It is very important to dismiss from the *reader* (not the presenting
-+      controller) to avoid corrupting the interface.
-+
-+
-+Handling Failure
-+----------------
-+
-+It is always possible the user selects/takes an image that does not contain
-+barcodes, or that the image quality is not sufficient for the ZBar library to
-+scan successfully.
-+
-+In this case, and if :member:`~ZBarReaderController::showsHelpOnFail` is
-+``YES``, the integrated help controller will automatically be displayed with
-+reason set to ``"FAIL"``.
-+
-+Your delegate may also choose to implement the optional
-+``readerControllerDidFailToRead:withRetry:`` method to explicitly handle
-+failures.  If the ``retry`` parameter is ``NO``, you *must* dismiss the reader
-+before returning, otherwise you may continue and allow the user to retry the
-+operation.  Note that, if it is enabled, the integrated help will be displayed
-+when this delegate method is invoked.
-diff -r 563557a923d0 iphone/doc/static/style.css
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/doc/static/style.css	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,36 @@
-+@import url("default.css");
-+
-+h1, h2, h3, h4, h5, h6 {
-+    clear: both;
-+}
-+
-+img.logo {
-+    vertical-align: middle;
-+}
-+
-+img.floatright {
-+    float: right;
-+    clear: both;
-+    margin-left: 2em;
-+    margin-right: 2em;
-+}
-+
-+dl.docutils dt {
-+    font-weight: bold;
-+}
-+dl.docutils dd {
-+    margin-top: 1em;
-+    margin-bottom: 1em;
-+}
-+
-+table.docutils {
-+    margin-left: auto;
-+    margin-right: auto;
-+}
-+table.docutils th, table.docutils td {
-+    padding: .25em .5em;
-+}
-+
-+table.docutils.field-list {
-+    margin-left: 0;
-+}
-diff -r 563557a923d0 iphone/doc/support.rst
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/doc/support.rst	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,19 @@
-+Obtaining Support
-+=================
-+
-+If this documentation does not address your question/problem and you need
-+support, please feel free to post in our `iPhone Developers Forum`_.
-+
-+.. _`iPhone Developers Forum`:
-+   http://sourceforge.net/projects/zbar/forums/forum/1072195
-+
-+When posting, please:
-+
-+* Check the :doc:`faq` and the rest of this documentation first.
-+* Start a new thread for a new question - do not "hijack" an unrelated thread.
-+* Post complete details of your problem - complete error messages as well as
-+  relevant source code and images.
-+* Log-in to receive email, or check back within a day or so - you will almost
-+  always get a response.
-+
-+For the latest support information, please see http://zbar.sf.net/iphone
-diff -r 563557a923d0 iphone/doc/tutorial.rst
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/doc/tutorial.rst	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,228 @@
-+ZBar SDK Integration Tutorial
-+=============================
-+
-+.. image:: ReaderSample.png
-+   :alt: Screenshot of the ReaderSample app
-+   :width: 414
-+   :height: 770
-+   :scale: 40
-+   :class: floatright
-+
-+This tutorial will quickly get you up and running with the ZBar iPhone SDK.
-+
-+We will develop a very simple app that presents a button the user can tap to
-+invoke the barcode reader and then displays the results.  Interface Builder
-+will be used to create the interface.
-+
-+The completed project is also available with the distributed SDK under
-+:file:`Examples/ReaderSample`.
-+
-+
-+Create the App
-+--------------
-+
-+1. Open Xcode; you must have version 4.5.1 or later.
-+
-+2. Create a new project using the "View-based Application" template.  Name the
-+   project "ReaderSample".  Save it wherever you like.
-+
-+3. Open :file:`ReaderSampleViewController.xib`
-+
-+4. Drag a Round Rect Button onto the view and title it "Scan".  Customize the
-+   placement and appearance as you like.
-+
-+5. Drag an Image View onto the view.  Size it to fill about half of the
-+   remaining space.  Change the view mode to Aspect Fit.
-+
-+6. Drag a Text View onto the view and size it to fill the remaining space.
-+   Change the default text to "No barcode scanned" or something.  De-select
-+   "Editable"
-+
-+7. Add connections to the interface elements in the code; open
-+   :file:`ReaderSampleViewController.h` and change the interface to::
-+
-+      @interface ReaderSampleViewController : UIViewController
-+      {
-+          UIImageView *resultImage;
-+          UITextView *resultText;
-+      }
-+      @property (nonatomic, retain) IBOutlet UIImageView *resultImage;
-+      @property (nonatomic, retain) IBOutlet UITextView *resultText;
-+      - (IBAction) scanButtonTapped;
-+      @end
-+
-+8. Now we can finish the interface connections - open
-+   :file:`ReaderSampleViewController.xib` and make these connections:
-+
-+   * Connect ReaderSampleViewController ``resultImage`` outlet to the
-+     ImageView.
-+   * Connect ReaderSampleViewController ``resultText`` outlet to the TextView.
-+   * Connect ReaderSampleViewController ``scanButtonTapped`` action to the
-+     RoundedRectButton(Scan) event ``TouchUpInside``.
-+
-+   Consult the Xcode documentation if you need help making these connections.
-+   Make sure you save the XIB once they are finished.
-+
-+9. Finish the implementation in :file:`ReaderSampleViewController.m`::
-+
-+      @synthesize resultImage, resultText;
-+      
-+      - (IBAction) scanButtonTapped
-+      {
-+          NSLog(@"TBD: scan barcode here...");
-+      }
-+      
-+      - (void) dealloc
-+      {
-+          self.resultImage = nil;
-+          self.resultText = nil;
-+          [super dealloc];
-+      }
-+      
-+      - (BOOL) shouldAutorotateToInterfaceOrientation: (UIInterfaceOrientation) interfaceOrientation
-+      {
-+          return(YES);
-+      }
-+
-+   This stub for scanButtonTapped is temporary, we'll fix it in a minute...
-+
-+Although it doesn't do much yet, you should now have a working skeleton app
-+that you can build and run.
-+
-+
-+Integrate the Reader
-+--------------------
-+
-+Now for the exciting part - let's add a barcode reader!
-+
-+1. If you have not done so already, download the latest SDK from
-+   http://zbar.sourceforge.net/iphone
-+
-+2. Double-click the disk image, ZBarSDK-|version|.dmg in the Finder to open it.
-+
-+3. Drag the :file:`ZBarSDK` folder into your Xcode project.  Make sure that
-+   the "Copy Items into destination group's folder" checkbox is checked.
-+
-+4. Open the target build settings and find ``Link Binary With Libraries``.
-+   Click the ``+`` and add each of these (NB hold down command for multiple
-+   selection):
-+
-+   * AVFoundation.framework
-+   * CoreMedia.framework
-+   * CoreVideo.framework
-+   * QuartzCore.framework
-+   * libiconv.dylib
-+
-+   .. warning::
-+
-+      Link order may be important for some versions of Xcode; the libraries
-+      referenced above should be listed *before* :file:`libzbar.a` in the
-+      link order.
-+
-+5. Import the SDK header.  You will usually want to prefix it, so add it to
-+   :file:`ReaderSample-prefix.pch`::
-+
-+      // ADD: import barcode reader APIs
-+      #import "ZBarSDK.h"
-+
-+6. Declare support for the delegate protocol in
-+   :file:`ReaderSampleViewController.h`::
-+
-+      @interface ReaderSampleViewController : UIViewController
-+          // ADD: delegate protocol
-+          < ZBarReaderDelegate >
-+      {
-+      ...
-+
-+7. Re-implement scanButtonTapped to present a barcode reader when the user
-+   taps the Scan button.  In :file:`ReaderSampleViewController.m`::
-+
-+      - (IBAction) scanButtonTapped
-+      {
-+          // ADD: present a barcode reader that scans from the camera feed
-+          ZBarReaderViewController *reader = [[ZBarReaderViewController alloc] init];
-+          reader.readerDelegate = self;
-+          reader.supportedOrientationsMask = ZBarOrientationMaskAll;
-+      
-+          ZBarImageScanner *scanner = reader.scanner;
-+          // TODO: (optional) additional reader configuration here
-+      
-+          // EXAMPLE: disable rarely used I2/5 to improve performance
-+          [scanner setSymbology: ZBAR_I25
-+                   config: ZBAR_CFG_ENABLE
-+                   to: 0];
-+      
-+          // present and release the controller
-+          [self presentModalViewController: reader
-+                animated: YES];
-+          [reader release];
-+      }
-+
-+8. Finally, implement the delegate method to do something useful with the
-+   results.  Still in :file:`ReaderSampleViewController.m`::
-+
-+      - (void) imagePickerController: (UIImagePickerController*) reader
-+       didFinishPickingMediaWithInfo: (NSDictionary*) info
-+      {
-+          // ADD: get the decode results
-+          id<NSFastEnumeration> results =
-+              [info objectForKey: ZBarReaderControllerResults];
-+          ZBarSymbol *symbol = nil;
-+          for(symbol in results)
-+              // EXAMPLE: just grab the first barcode
-+              break;
-+      
-+          // EXAMPLE: do something useful with the barcode data
-+          resultText.text = symbol.data;
-+      
-+          // EXAMPLE: do something useful with the barcode image
-+          resultImage.image =
-+              [info objectForKey: UIImagePickerControllerOriginalImage];
-+      
-+          // ADD: dismiss the controller (NB dismiss from the *reader*!)
-+          [reader dismissModalViewControllerAnimated: YES];
-+      }
-+
-+And that's it!
-+
-+
-+Testing
-+-------
-+
-+1. Save everything (don't forget to save MyAppViewController.xib).
-+
-+2. Build and Run the project.
-+
-+3. Tap the Scan button.
-+
-+4. Aim at barcode.
-+
-+5. Enjoy the sweet fruits of your minimal labor
-+
-+
-+Where to go from here
-+---------------------
-+
-+You can learn more about using the reader APIs to scan barcodes from
-+:doc:`camera` or :doc:`picker`.  Use the :doc:`apiref` to find details about a
-+particular interface.
-+
-+
-+Troubleshooting
-+---------------
-+
-+We take great care to ensure this tutorial is working as described.  However,
-+if you do have a problem
-+
-+1. Make sure you followed the instructions exactly - every detail is
-+   important.
-+2. Start from scratch with a new project and follow the instructions
-+   *exactly*.
-+3. Try the ReaderSample distributed with the SDK and compare your work with
-+   that.
-+4. If you are unable to get things working, you may post your frustrations in
-+   the project `iPhone Developers Forum`_.  Please be very specific about your
-+   problem, post the complete text of any errors, etc.
-+
-+.. _`iPhone Developers Forum`:
-+   http://sourceforge.net/projects/zbar/forums/forum/1072195
-diff -r 563557a923d0 iphone/examples/EmbedReader/Default-568h@2x.png
-Binary file iphone/examples/EmbedReader/Default-568h@2x.png has changed
-diff -r 563557a923d0 iphone/examples/EmbedReader/EmbedReader.xcodeproj/project.pbxproj
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/examples/EmbedReader/EmbedReader.xcodeproj/project.pbxproj	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,416 @@
-+// !$*UTF8*$!
-+{
-+	archiveVersion = 1;
-+	classes = {
-+	};
-+	objectVersion = 46;
-+	objects = {
-+
-+/* Begin PBXBuildFile section */
-+		DC824612162B5E140010B2E6 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DC824611162B5E140010B2E6 /* Default-568h@2x.png */; };
-+		DCFB4494136F7202004B3EE0 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCFB4493136F7202004B3EE0 /* UIKit.framework */; };
-+		DCFB4496136F7202004B3EE0 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCFB4495136F7202004B3EE0 /* Foundation.framework */; };
-+		DCFB4498136F7202004B3EE0 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCFB4497136F7202004B3EE0 /* CoreGraphics.framework */; };
-+		DCFB449E136F7203004B3EE0 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = DCFB449C136F7203004B3EE0 /* InfoPlist.strings */; };
-+		DCFB44A1136F7203004B3EE0 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = DCFB44A0136F7203004B3EE0 /* main.m */; };
-+		DCFB44A4136F7203004B3EE0 /* EmbedReaderAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = DCFB44A3136F7203004B3EE0 /* EmbedReaderAppDelegate.m */; };
-+		DCFB44A7136F7203004B3EE0 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = DCFB44A5136F7203004B3EE0 /* MainWindow.xib */; };
-+		DCFB44AA136F7203004B3EE0 /* EmbedReaderViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DCFB44A9136F7203004B3EE0 /* EmbedReaderViewController.m */; };
-+		DCFB44AD136F7203004B3EE0 /* EmbedReaderViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = DCFB44AB136F7203004B3EE0 /* EmbedReaderViewController.xib */; };
-+		DCFB44D0136F722A004B3EE0 /* libzbar.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCFB44CA136F722A004B3EE0 /* libzbar.a */; };
-+		DCFB44D1136F722A004B3EE0 /* zbar-back.png in Resources */ = {isa = PBXBuildFile; fileRef = DCFB44CC136F722A004B3EE0 /* zbar-back.png */; };
-+		DCFB44D2136F722A004B3EE0 /* zbar-help.html in Resources */ = {isa = PBXBuildFile; fileRef = DCFB44CD136F722A004B3EE0 /* zbar-help.html */; };
-+		DCFB44D3136F722A004B3EE0 /* zbar-helpicons.png in Resources */ = {isa = PBXBuildFile; fileRef = DCFB44CE136F722A004B3EE0 /* zbar-helpicons.png */; };
-+		DCFB44D4136F722A004B3EE0 /* zbar-samples.png in Resources */ = {isa = PBXBuildFile; fileRef = DCFB44CF136F722A004B3EE0 /* zbar-samples.png */; };
-+		DCFB44DA136F72D3004B3EE0 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCFB44D5136F72D3004B3EE0 /* AVFoundation.framework */; };
-+		DCFB44DB136F72D3004B3EE0 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCFB44D6136F72D3004B3EE0 /* CoreMedia.framework */; };
-+		DCFB44DC136F72D3004B3EE0 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCFB44D7136F72D3004B3EE0 /* CoreVideo.framework */; };
-+		DCFB44DD136F72D3004B3EE0 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DCFB44D8136F72D3004B3EE0 /* libiconv.dylib */; };
-+		DCFB44DE136F72D3004B3EE0 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCFB44D9136F72D3004B3EE0 /* QuartzCore.framework */; };
-+/* End PBXBuildFile section */
-+
-+/* Begin PBXFileReference section */
-+		DC824611162B5E140010B2E6 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = SOURCE_ROOT; };
-+		DCFB448F136F7202004B3EE0 /* EmbedReader.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = EmbedReader.app; sourceTree = BUILT_PRODUCTS_DIR; };
-+		DCFB4493136F7202004B3EE0 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
-+		DCFB4495136F7202004B3EE0 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
-+		DCFB4497136F7202004B3EE0 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
-+		DCFB449B136F7202004B3EE0 /* EmbedReader-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "EmbedReader-Info.plist"; sourceTree = "<group>"; };
-+		DCFB449D136F7203004B3EE0 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-+		DCFB449F136F7203004B3EE0 /* EmbedReader-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "EmbedReader-Prefix.pch"; sourceTree = "<group>"; };
-+		DCFB44A0136F7203004B3EE0 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
-+		DCFB44A2136F7203004B3EE0 /* EmbedReaderAppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EmbedReaderAppDelegate.h; sourceTree = "<group>"; };
-+		DCFB44A3136F7203004B3EE0 /* EmbedReaderAppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = EmbedReaderAppDelegate.m; sourceTree = "<group>"; };
-+		DCFB44A6136F7203004B3EE0 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/MainWindow.xib; sourceTree = "<group>"; };
-+		DCFB44A8136F7203004B3EE0 /* EmbedReaderViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EmbedReaderViewController.h; sourceTree = "<group>"; };
-+		DCFB44A9136F7203004B3EE0 /* EmbedReaderViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = EmbedReaderViewController.m; sourceTree = "<group>"; };
-+		DCFB44AC136F7203004B3EE0 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/EmbedReaderViewController.xib; sourceTree = "<group>"; };
-+		DCFB44B7136F722A004B3EE0 /* Decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Decoder.h; sourceTree = "<group>"; };
-+		DCFB44B8136F722A004B3EE0 /* Exception.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Exception.h; sourceTree = "<group>"; };
-+		DCFB44B9136F722A004B3EE0 /* Image.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Image.h; sourceTree = "<group>"; };
-+		DCFB44BA136F722A004B3EE0 /* ImageScanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImageScanner.h; sourceTree = "<group>"; };
-+		DCFB44BB136F722A004B3EE0 /* Processor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Processor.h; sourceTree = "<group>"; };
-+		DCFB44BC136F722A004B3EE0 /* Scanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Scanner.h; sourceTree = "<group>"; };
-+		DCFB44BD136F722A004B3EE0 /* Symbol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Symbol.h; sourceTree = "<group>"; };
-+		DCFB44BE136F722A004B3EE0 /* Video.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Video.h; sourceTree = "<group>"; };
-+		DCFB44BF136F722A004B3EE0 /* Window.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Window.h; sourceTree = "<group>"; };
-+		DCFB44C0136F722A004B3EE0 /* zbar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zbar.h; sourceTree = "<group>"; };
-+		DCFB44C1136F722A004B3EE0 /* ZBarCaptureReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarCaptureReader.h; sourceTree = "<group>"; };
-+		DCFB44C2136F722A004B3EE0 /* ZBarHelpController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarHelpController.h; sourceTree = "<group>"; };
-+		DCFB44C3136F722A004B3EE0 /* ZBarImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarImage.h; sourceTree = "<group>"; };
-+		DCFB44C4136F722A004B3EE0 /* ZBarImageScanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarImageScanner.h; sourceTree = "<group>"; };
-+		DCFB44C5136F722A004B3EE0 /* ZBarReaderController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarReaderController.h; sourceTree = "<group>"; };
-+		DCFB44C6136F722A004B3EE0 /* ZBarReaderView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarReaderView.h; sourceTree = "<group>"; };
-+		DCFB44C7136F722A004B3EE0 /* ZBarReaderViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarReaderViewController.h; sourceTree = "<group>"; };
-+		DCFB44C8136F722A004B3EE0 /* ZBarSDK.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarSDK.h; sourceTree = "<group>"; };
-+		DCFB44C9136F722A004B3EE0 /* ZBarSymbol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarSymbol.h; sourceTree = "<group>"; };
-+		DCFB44CA136F722A004B3EE0 /* libzbar.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libzbar.a; sourceTree = "<group>"; };
-+		DCFB44CC136F722A004B3EE0 /* zbar-back.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "zbar-back.png"; sourceTree = "<group>"; };
-+		DCFB44CD136F722A004B3EE0 /* zbar-help.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "zbar-help.html"; sourceTree = "<group>"; };
-+		DCFB44CE136F722A004B3EE0 /* zbar-helpicons.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "zbar-helpicons.png"; sourceTree = "<group>"; };
-+		DCFB44CF136F722A004B3EE0 /* zbar-samples.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "zbar-samples.png"; sourceTree = "<group>"; };
-+		DCFB44D5136F72D3004B3EE0 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
-+		DCFB44D6136F72D3004B3EE0 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; };
-+		DCFB44D7136F72D3004B3EE0 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; };
-+		DCFB44D8136F72D3004B3EE0 /* libiconv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libiconv.dylib; path = usr/lib/libiconv.dylib; sourceTree = SDKROOT; };
-+		DCFB44D9136F72D3004B3EE0 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
-+/* End PBXFileReference section */
-+
-+/* Begin PBXFrameworksBuildPhase section */
-+		DCFB448C136F7202004B3EE0 /* Frameworks */ = {
-+			isa = PBXFrameworksBuildPhase;
-+			buildActionMask = 2147483647;
-+			files = (
-+				DCFB4494136F7202004B3EE0 /* UIKit.framework in Frameworks */,
-+				DCFB4496136F7202004B3EE0 /* Foundation.framework in Frameworks */,
-+				DCFB4498136F7202004B3EE0 /* CoreGraphics.framework in Frameworks */,
-+				DCFB44DE136F72D3004B3EE0 /* QuartzCore.framework in Frameworks */,
-+				DCFB44DB136F72D3004B3EE0 /* CoreMedia.framework in Frameworks */,
-+				DCFB44DC136F72D3004B3EE0 /* CoreVideo.framework in Frameworks */,
-+				DCFB44DA136F72D3004B3EE0 /* AVFoundation.framework in Frameworks */,
-+				DCFB44DD136F72D3004B3EE0 /* libiconv.dylib in Frameworks */,
-+				DCFB44D0136F722A004B3EE0 /* libzbar.a in Frameworks */,
-+			);
-+			runOnlyForDeploymentPostprocessing = 0;
-+		};
-+/* End PBXFrameworksBuildPhase section */
-+
-+/* Begin PBXGroup section */
-+		DCFB4484136F7202004B3EE0 = {
-+			isa = PBXGroup;
-+			children = (
-+				DCFB4499136F7202004B3EE0 /* EmbedReader */,
-+				DCFB44B3136F722A004B3EE0 /* ZBarSDK */,
-+				DCFB4492136F7202004B3EE0 /* Frameworks */,
-+				DCFB4490136F7202004B3EE0 /* Products */,
-+			);
-+			sourceTree = "<group>";
-+		};
-+		DCFB4490136F7202004B3EE0 /* Products */ = {
-+			isa = PBXGroup;
-+			children = (
-+				DCFB448F136F7202004B3EE0 /* EmbedReader.app */,
-+			);
-+			name = Products;
-+			sourceTree = "<group>";
-+		};
-+		DCFB4492136F7202004B3EE0 /* Frameworks */ = {
-+			isa = PBXGroup;
-+			children = (
-+				DCFB4493136F7202004B3EE0 /* UIKit.framework */,
-+				DCFB4495136F7202004B3EE0 /* Foundation.framework */,
-+				DCFB4497136F7202004B3EE0 /* CoreGraphics.framework */,
-+				DCFB44D9136F72D3004B3EE0 /* QuartzCore.framework */,
-+				DCFB44D6136F72D3004B3EE0 /* CoreMedia.framework */,
-+				DCFB44D7136F72D3004B3EE0 /* CoreVideo.framework */,
-+				DCFB44D5136F72D3004B3EE0 /* AVFoundation.framework */,
-+				DCFB44D8136F72D3004B3EE0 /* libiconv.dylib */,
-+			);
-+			name = Frameworks;
-+			sourceTree = "<group>";
-+		};
-+		DCFB4499136F7202004B3EE0 /* EmbedReader */ = {
-+			isa = PBXGroup;
-+			children = (
-+				DCFB44A2136F7203004B3EE0 /* EmbedReaderAppDelegate.h */,
-+				DCFB44A3136F7203004B3EE0 /* EmbedReaderAppDelegate.m */,
-+				DCFB44A5136F7203004B3EE0 /* MainWindow.xib */,
-+				DCFB44A8136F7203004B3EE0 /* EmbedReaderViewController.h */,
-+				DCFB44A9136F7203004B3EE0 /* EmbedReaderViewController.m */,
-+				DCFB44AB136F7203004B3EE0 /* EmbedReaderViewController.xib */,
-+				DCFB449A136F7202004B3EE0 /* Supporting Files */,
-+			);
-+			path = EmbedReader;
-+			sourceTree = "<group>";
-+		};
-+		DCFB449A136F7202004B3EE0 /* Supporting Files */ = {
-+			isa = PBXGroup;
-+			children = (
-+				DCFB449B136F7202004B3EE0 /* EmbedReader-Info.plist */,
-+				DCFB449C136F7203004B3EE0 /* InfoPlist.strings */,
-+				DC824611162B5E140010B2E6 /* Default-568h@2x.png */,
-+				DCFB449F136F7203004B3EE0 /* EmbedReader-Prefix.pch */,
-+				DCFB44A0136F7203004B3EE0 /* main.m */,
-+			);
-+			name = "Supporting Files";
-+			sourceTree = "<group>";
-+		};
-+		DCFB44B3136F722A004B3EE0 /* ZBarSDK */ = {
-+			isa = PBXGroup;
-+			children = (
-+				DCFB44B4136F722A004B3EE0 /* Headers */,
-+				DCFB44CA136F722A004B3EE0 /* libzbar.a */,
-+				DCFB44CB136F722A004B3EE0 /* Resources */,
-+			);
-+			path = ZBarSDK;
-+			sourceTree = "<group>";
-+		};
-+		DCFB44B4136F722A004B3EE0 /* Headers */ = {
-+			isa = PBXGroup;
-+			children = (
-+				DCFB44B5136F722A004B3EE0 /* ZBarSDK */,
-+			);
-+			path = Headers;
-+			sourceTree = "<group>";
-+		};
-+		DCFB44B5136F722A004B3EE0 /* ZBarSDK */ = {
-+			isa = PBXGroup;
-+			children = (
-+				DCFB44B6136F722A004B3EE0 /* zbar */,
-+				DCFB44C0136F722A004B3EE0 /* zbar.h */,
-+				DCFB44C1136F722A004B3EE0 /* ZBarCaptureReader.h */,
-+				DCFB44C2136F722A004B3EE0 /* ZBarHelpController.h */,
-+				DCFB44C3136F722A004B3EE0 /* ZBarImage.h */,
-+				DCFB44C4136F722A004B3EE0 /* ZBarImageScanner.h */,
-+				DCFB44C5136F722A004B3EE0 /* ZBarReaderController.h */,
-+				DCFB44C6136F722A004B3EE0 /* ZBarReaderView.h */,
-+				DCFB44C7136F722A004B3EE0 /* ZBarReaderViewController.h */,
-+				DCFB44C8136F722A004B3EE0 /* ZBarSDK.h */,
-+				DCFB44C9136F722A004B3EE0 /* ZBarSymbol.h */,
-+			);
-+			path = ZBarSDK;
-+			sourceTree = "<group>";
-+		};
-+		DCFB44B6136F722A004B3EE0 /* zbar */ = {
-+			isa = PBXGroup;
-+			children = (
-+				DCFB44B7136F722A004B3EE0 /* Decoder.h */,
-+				DCFB44B8136F722A004B3EE0 /* Exception.h */,
-+				DCFB44B9136F722A004B3EE0 /* Image.h */,
-+				DCFB44BA136F722A004B3EE0 /* ImageScanner.h */,
-+				DCFB44BB136F722A004B3EE0 /* Processor.h */,
-+				DCFB44BC136F722A004B3EE0 /* Scanner.h */,
-+				DCFB44BD136F722A004B3EE0 /* Symbol.h */,
-+				DCFB44BE136F722A004B3EE0 /* Video.h */,
-+				DCFB44BF136F722A004B3EE0 /* Window.h */,
-+			);
-+			path = zbar;
-+			sourceTree = "<group>";
-+		};
-+		DCFB44CB136F722A004B3EE0 /* Resources */ = {
-+			isa = PBXGroup;
-+			children = (
-+				DCFB44CC136F722A004B3EE0 /* zbar-back.png */,
-+				DCFB44CD136F722A004B3EE0 /* zbar-help.html */,
-+				DCFB44CE136F722A004B3EE0 /* zbar-helpicons.png */,
-+				DCFB44CF136F722A004B3EE0 /* zbar-samples.png */,
-+			);
-+			path = Resources;
-+			sourceTree = "<group>";
-+		};
-+/* End PBXGroup section */
-+
-+/* Begin PBXNativeTarget section */
-+		DCFB448E136F7202004B3EE0 /* EmbedReader */ = {
-+			isa = PBXNativeTarget;
-+			buildConfigurationList = DCFB44B0136F7203004B3EE0 /* Build configuration list for PBXNativeTarget "EmbedReader" */;
-+			buildPhases = (
-+				DCFB448B136F7202004B3EE0 /* Sources */,
-+				DCFB448C136F7202004B3EE0 /* Frameworks */,
-+				DCFB448D136F7202004B3EE0 /* Resources */,
-+			);
-+			buildRules = (
-+			);
-+			dependencies = (
-+			);
-+			name = EmbedReader;
-+			productName = EmbedReader;
-+			productReference = DCFB448F136F7202004B3EE0 /* EmbedReader.app */;
-+			productType = "com.apple.product-type.application";
-+		};
-+/* End PBXNativeTarget section */
-+
-+/* Begin PBXProject section */
-+		DCFB4486136F7202004B3EE0 /* Project object */ = {
-+			isa = PBXProject;
-+			buildConfigurationList = DCFB4489136F7202004B3EE0 /* Build configuration list for PBXProject "EmbedReader" */;
-+			compatibilityVersion = "Xcode 3.2";
-+			developmentRegion = English;
-+			hasScannedForEncodings = 0;
-+			knownRegions = (
-+				en,
-+			);
-+			mainGroup = DCFB4484136F7202004B3EE0;
-+			productRefGroup = DCFB4490136F7202004B3EE0 /* Products */;
-+			projectDirPath = "";
-+			projectRoot = "";
-+			targets = (
-+				DCFB448E136F7202004B3EE0 /* EmbedReader */,
-+			);
-+		};
-+/* End PBXProject section */
-+
-+/* Begin PBXResourcesBuildPhase section */
-+		DCFB448D136F7202004B3EE0 /* Resources */ = {
-+			isa = PBXResourcesBuildPhase;
-+			buildActionMask = 2147483647;
-+			files = (
-+				DCFB449E136F7203004B3EE0 /* InfoPlist.strings in Resources */,
-+				DCFB44A7136F7203004B3EE0 /* MainWindow.xib in Resources */,
-+				DCFB44AD136F7203004B3EE0 /* EmbedReaderViewController.xib in Resources */,
-+				DCFB44D1136F722A004B3EE0 /* zbar-back.png in Resources */,
-+				DCFB44D2136F722A004B3EE0 /* zbar-help.html in Resources */,
-+				DCFB44D3136F722A004B3EE0 /* zbar-helpicons.png in Resources */,
-+				DCFB44D4136F722A004B3EE0 /* zbar-samples.png in Resources */,
-+				DC824612162B5E140010B2E6 /* Default-568h@2x.png in Resources */,
-+			);
-+			runOnlyForDeploymentPostprocessing = 0;
-+		};
-+/* End PBXResourcesBuildPhase section */
-+
-+/* Begin PBXSourcesBuildPhase section */
-+		DCFB448B136F7202004B3EE0 /* Sources */ = {
-+			isa = PBXSourcesBuildPhase;
-+			buildActionMask = 2147483647;
-+			files = (
-+				DCFB44A1136F7203004B3EE0 /* main.m in Sources */,
-+				DCFB44A4136F7203004B3EE0 /* EmbedReaderAppDelegate.m in Sources */,
-+				DCFB44AA136F7203004B3EE0 /* EmbedReaderViewController.m in Sources */,
-+			);
-+			runOnlyForDeploymentPostprocessing = 0;
-+		};
-+/* End PBXSourcesBuildPhase section */
-+
-+/* Begin PBXVariantGroup section */
-+		DCFB449C136F7203004B3EE0 /* InfoPlist.strings */ = {
-+			isa = PBXVariantGroup;
-+			children = (
-+				DCFB449D136F7203004B3EE0 /* en */,
-+			);
-+			name = InfoPlist.strings;
-+			sourceTree = "<group>";
-+		};
-+		DCFB44A5136F7203004B3EE0 /* MainWindow.xib */ = {
-+			isa = PBXVariantGroup;
-+			children = (
-+				DCFB44A6136F7203004B3EE0 /* en */,
-+			);
-+			name = MainWindow.xib;
-+			sourceTree = "<group>";
-+		};
-+		DCFB44AB136F7203004B3EE0 /* EmbedReaderViewController.xib */ = {
-+			isa = PBXVariantGroup;
-+			children = (
-+				DCFB44AC136F7203004B3EE0 /* en */,
-+			);
-+			name = EmbedReaderViewController.xib;
-+			sourceTree = "<group>";
-+		};
-+/* End PBXVariantGroup section */
-+
-+/* Begin XCBuildConfiguration section */
-+		DCFB44AE136F7203004B3EE0 /* Debug */ = {
-+			isa = XCBuildConfiguration;
-+			buildSettings = {
-+				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
-+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-+				GCC_C_LANGUAGE_STANDARD = gnu99;
-+				GCC_OPTIMIZATION_LEVEL = 0;
-+				GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
-+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-+				GCC_VERSION = com.apple.compilers.llvmgcc42;
-+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-+				GCC_WARN_UNUSED_VARIABLE = YES;
-+				IPHONEOS_DEPLOYMENT_TARGET = 4.0;
-+				SDKROOT = iphoneos;
-+			};
-+			name = Debug;
-+		};
-+		DCFB44AF136F7203004B3EE0 /* Release */ = {
-+			isa = XCBuildConfiguration;
-+			buildSettings = {
-+				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
-+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-+				GCC_C_LANGUAGE_STANDARD = gnu99;
-+				GCC_VERSION = com.apple.compilers.llvmgcc42;
-+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-+				GCC_WARN_UNUSED_VARIABLE = YES;
-+				IPHONEOS_DEPLOYMENT_TARGET = 4.0;
-+				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
-+				SDKROOT = iphoneos;
-+			};
-+			name = Release;
-+		};
-+		DCFB44B1136F7203004B3EE0 /* Debug */ = {
-+			isa = XCBuildConfiguration;
-+			buildSettings = {
-+				ALWAYS_SEARCH_USER_PATHS = NO;
-+				COPY_PHASE_STRIP = NO;
-+				GCC_DYNAMIC_NO_PIC = NO;
-+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-+				GCC_PREFIX_HEADER = "EmbedReader/EmbedReader-Prefix.pch";
-+				INFOPLIST_FILE = "EmbedReader/EmbedReader-Info.plist";
-+				LIBRARY_SEARCH_PATHS = (
-+					"$(inherited)",
-+					"\"$(SRCROOT)/ZBarSDK\"",
-+				);
-+				PRODUCT_NAME = "$(TARGET_NAME)";
-+				TARGETED_DEVICE_FAMILY = "1,2";
-+				WRAPPER_EXTENSION = app;
-+			};
-+			name = Debug;
-+		};
-+		DCFB44B2136F7203004B3EE0 /* Release */ = {
-+			isa = XCBuildConfiguration;
-+			buildSettings = {
-+				ALWAYS_SEARCH_USER_PATHS = NO;
-+				COPY_PHASE_STRIP = YES;
-+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-+				GCC_PREFIX_HEADER = "EmbedReader/EmbedReader-Prefix.pch";
-+				INFOPLIST_FILE = "EmbedReader/EmbedReader-Info.plist";
-+				LIBRARY_SEARCH_PATHS = (
-+					"$(inherited)",
-+					"\"$(SRCROOT)/ZBarSDK\"",
-+				);
-+				PRODUCT_NAME = "$(TARGET_NAME)";
-+				TARGETED_DEVICE_FAMILY = "1,2";
-+				VALIDATE_PRODUCT = YES;
-+				WRAPPER_EXTENSION = app;
-+			};
-+			name = Release;
-+		};
-+/* End XCBuildConfiguration section */
-+
-+/* Begin XCConfigurationList section */
-+		DCFB4489136F7202004B3EE0 /* Build configuration list for PBXProject "EmbedReader" */ = {
-+			isa = XCConfigurationList;
-+			buildConfigurations = (
-+				DCFB44AE136F7203004B3EE0 /* Debug */,
-+				DCFB44AF136F7203004B3EE0 /* Release */,
-+			);
-+			defaultConfigurationIsVisible = 0;
-+			defaultConfigurationName = Release;
-+		};
-+		DCFB44B0136F7203004B3EE0 /* Build configuration list for PBXNativeTarget "EmbedReader" */ = {
-+			isa = XCConfigurationList;
-+			buildConfigurations = (
-+				DCFB44B1136F7203004B3EE0 /* Debug */,
-+				DCFB44B2136F7203004B3EE0 /* Release */,
-+			);
-+			defaultConfigurationIsVisible = 0;
-+			defaultConfigurationName = Release;
-+		};
-+/* End XCConfigurationList section */
-+	};
-+	rootObject = DCFB4486136F7202004B3EE0 /* Project object */;
-+}
-diff -r 563557a923d0 iphone/examples/EmbedReader/EmbedReader.xcodeproj/xcshareddata/xcschemes/EmbedReader.xcscheme
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/examples/EmbedReader/EmbedReader.xcodeproj/xcshareddata/xcschemes/EmbedReader.xcscheme	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,76 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<Scheme
-+   version = "1.3">
-+   <BuildAction
-+      parallelizeBuildables = "YES"
-+      buildImplicitDependencies = "YES">
-+      <BuildActionEntries>
-+         <BuildActionEntry
-+            buildForTesting = "YES"
-+            buildForRunning = "YES"
-+            buildForProfiling = "YES"
-+            buildForArchiving = "YES"
-+            buildForAnalyzing = "YES">
-+            <BuildableReference
-+               BuildableIdentifier = "primary"
-+               BlueprintIdentifier = "DCFB448E136F7202004B3EE0"
-+               BuildableName = "EmbedReader.app"
-+               BlueprintName = "EmbedReader"
-+               ReferencedContainer = "container:EmbedReader.xcodeproj">
-+            </BuildableReference>
-+         </BuildActionEntry>
-+      </BuildActionEntries>
-+   </BuildAction>
-+   <TestAction
-+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
-+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
-+      shouldUseLaunchSchemeArgsEnv = "YES"
-+      buildConfiguration = "Debug">
-+      <Testables>
-+      </Testables>
-+   </TestAction>
-+   <LaunchAction
-+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
-+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
-+      displayScaleIsEnabled = "NO"
-+      displayScale = "1.00"
-+      launchStyle = "0"
-+      useCustomWorkingDirectory = "NO"
-+      buildConfiguration = "Debug">
-+      <BuildableProductRunnable>
-+         <BuildableReference
-+            BuildableIdentifier = "primary"
-+            BlueprintIdentifier = "DCFB448E136F7202004B3EE0"
-+            BuildableName = "EmbedReader.app"
-+            BlueprintName = "EmbedReader"
-+            ReferencedContainer = "container:EmbedReader.xcodeproj">
-+         </BuildableReference>
-+      </BuildableProductRunnable>
-+      <AdditionalOptions>
-+      </AdditionalOptions>
-+   </LaunchAction>
-+   <ProfileAction
-+      displayScaleIsEnabled = "NO"
-+      displayScale = "1.00"
-+      shouldUseLaunchSchemeArgsEnv = "YES"
-+      savedToolIdentifier = ""
-+      useCustomWorkingDirectory = "NO"
-+      buildConfiguration = "Release">
-+      <BuildableProductRunnable>
-+         <BuildableReference
-+            BuildableIdentifier = "primary"
-+            BlueprintIdentifier = "DCFB448E136F7202004B3EE0"
-+            BuildableName = "EmbedReader.app"
-+            BlueprintName = "EmbedReader"
-+            ReferencedContainer = "container:EmbedReader.xcodeproj">
-+         </BuildableReference>
-+      </BuildableProductRunnable>
-+   </ProfileAction>
-+   <AnalyzeAction
-+      buildConfiguration = "Debug">
-+   </AnalyzeAction>
-+   <ArchiveAction
-+      buildConfiguration = "Release"
-+      revealArchiveInOrganizer = "YES">
-+   </ArchiveAction>
-+</Scheme>
-diff -r 563557a923d0 iphone/examples/EmbedReader/EmbedReader/EmbedReader-Info.plist
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/examples/EmbedReader/EmbedReader/EmbedReader-Info.plist	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,39 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-+<plist version="1.0">
-+<dict>
-+	<key>CFBundleDevelopmentRegion</key>
-+	<string>en</string>
-+	<key>CFBundleDisplayName</key>
-+	<string>${PRODUCT_NAME}</string>
-+	<key>CFBundleExecutable</key>
-+	<string>${EXECUTABLE_NAME}</string>
-+	<key>CFBundleIconFile</key>
-+	<string></string>
-+	<key>CFBundleIdentifier</key>
-+	<string>net.sourceforge.zbar.${PRODUCT_NAME:rfc1034identifier}</string>
-+	<key>CFBundleInfoDictionaryVersion</key>
-+	<string>6.0</string>
-+	<key>CFBundleName</key>
-+	<string>${PRODUCT_NAME}</string>
-+	<key>CFBundlePackageType</key>
-+	<string>APPL</string>
-+	<key>CFBundleShortVersionString</key>
-+	<string>1.0</string>
-+	<key>CFBundleSignature</key>
-+	<string>????</string>
-+	<key>CFBundleVersion</key>
-+	<string>1.0</string>
-+	<key>LSRequiresIPhoneOS</key>
-+	<true/>
-+	<key>NSMainNibFile</key>
-+	<string>MainWindow</string>
-+	<key>UISupportedInterfaceOrientations</key>
-+	<array>
-+		<string>UIInterfaceOrientationPortrait</string>
-+		<string>UIInterfaceOrientationLandscapeLeft</string>
-+		<string>UIInterfaceOrientationLandscapeRight</string>
-+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-+	</array>
-+</dict>
-+</plist>
-diff -r 563557a923d0 iphone/examples/EmbedReader/EmbedReader/EmbedReader-Prefix.pch
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/examples/EmbedReader/EmbedReader/EmbedReader-Prefix.pch	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,11 @@
-+#import <Availability.h>
-+
-+#ifndef __IPHONE_3_0
-+#warning "This project uses features only available in iPhone SDK 3.0 and later."
-+#endif
-+
-+#ifdef __OBJC__
-+# import <UIKit/UIKit.h>
-+# import <Foundation/Foundation.h>
-+# import "ZBarSDK.h"
-+#endif
-diff -r 563557a923d0 iphone/examples/EmbedReader/EmbedReader/EmbedReaderAppDelegate.h
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/examples/EmbedReader/EmbedReader/EmbedReaderAppDelegate.h	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,21 @@
-+//
-+//  EmbedReaderAppDelegate.h
-+//  EmbedReader
-+//
-+//  Created by spadix on 5/2/11.
-+//
-+
-+#import <UIKit/UIKit.h>
-+
-+@class EmbedReaderViewController;
-+
-+@interface EmbedReaderAppDelegate
-+    : NSObject
-+    < UIApplicationDelegate >
-+{
-+}
-+
-+@property (nonatomic, retain) IBOutlet UIWindow *window;
-+@property (nonatomic, retain) IBOutlet EmbedReaderViewController *viewController;
-+
-+@end
-diff -r 563557a923d0 iphone/examples/EmbedReader/EmbedReader/EmbedReaderAppDelegate.m
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/examples/EmbedReader/EmbedReader/EmbedReaderAppDelegate.m	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,34 @@
-+//
-+//  EmbedReaderAppDelegate.m
-+//  EmbedReader
-+//
-+//  Created by spadix on 5/2/11.
-+//
-+
-+#import "EmbedReaderAppDelegate.h"
-+#import "EmbedReaderViewController.h"
-+
-+@implementation EmbedReaderAppDelegate
-+@synthesize window=_window;
-+@synthesize viewController=_viewController;
-+
-+- (BOOL)            application: (UIApplication*) application
-+  didFinishLaunchingWithOptions: (NSDictionary*) launchOptions
-+{
-+    self.window.rootViewController = self.viewController;
-+    [self.window makeKeyAndVisible];
-+
-+    // force view class to load so it may be referenced directly from NIB
-+    [ZBarReaderView class];
-+
-+    return(YES);
-+}
-+
-+- (void) dealloc
-+{
-+    [_window release];
-+    [_viewController release];
-+    [super dealloc];
-+}
-+
-+@end
-diff -r 563557a923d0 iphone/examples/EmbedReader/EmbedReader/EmbedReaderViewController.h
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/examples/EmbedReader/EmbedReader/EmbedReaderViewController.h	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,22 @@
-+//
-+//  EmbedReaderViewController.h
-+//  EmbedReader
-+//
-+//  Created by spadix on 5/2/11.
-+//
-+
-+#import <UIKit/UIKit.h>
-+
-+@interface EmbedReaderViewController
-+    : UIViewController
-+    < ZBarReaderViewDelegate >
-+{
-+    ZBarReaderView *readerView;
-+    UITextView *resultText;
-+    ZBarCameraSimulator *cameraSim;
-+}
-+
-+@property (nonatomic, retain) IBOutlet ZBarReaderView *readerView;
-+@property (nonatomic, retain) IBOutlet UITextView *resultText;
-+
-+@end
-diff -r 563557a923d0 iphone/examples/EmbedReader/EmbedReader/EmbedReaderViewController.m
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/examples/EmbedReader/EmbedReader/EmbedReaderViewController.m	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,101 @@
-+//
-+//  EmbedReaderViewController.m
-+//  EmbedReader
-+//
-+//  Created by spadix on 5/2/11.
-+//
-+
-+#import "EmbedReaderViewController.h"
-+
-+@implementation EmbedReaderViewController
-+
-+@synthesize readerView, resultText;
-+
-+- (void) cleanup
-+{
-+    [cameraSim release];
-+    cameraSim = nil;
-+    readerView.readerDelegate = nil;
-+    [readerView release];
-+    readerView = nil;
-+    [resultText release];
-+    resultText = nil;
-+}
-+
-+- (void) dealloc
-+{
-+    [self cleanup];
-+    [super dealloc];
-+}
-+
-+- (void) viewDidLoad
-+{
-+    [super viewDidLoad];
-+
-+    // the delegate receives decode results
-+    readerView.readerDelegate = self;
-+
-+    // ensure initial camera orientation is correctly set
-+    UIApplication *app = [UIApplication sharedApplication];
-+    [readerView willRotateToInterfaceOrientation: app.statusBarOrientation
-+                                        duration: 0];
-+
-+    // you can use this to support the simulator
-+    if(TARGET_IPHONE_SIMULATOR) {
-+        cameraSim = [[ZBarCameraSimulator alloc]
-+                        initWithViewController: self];
-+        cameraSim.readerView = readerView;
-+    }
-+}
-+
-+- (void) viewDidUnload
-+{
-+    [self cleanup];
-+    [super viewDidUnload];
-+}
-+
-+- (BOOL) shouldAutorotateToInterfaceOrientation: (UIInterfaceOrientation) orient
-+{
-+    // auto-rotation is supported
-+    return(YES);
-+}
-+
-+- (void) willRotateToInterfaceOrientation: (UIInterfaceOrientation) orient
-+                                 duration: (NSTimeInterval) duration
-+{
-+    // compensate for view rotation so camera preview is not rotated
-+    [readerView willRotateToInterfaceOrientation: orient
-+                                        duration: duration];
-+}
-+
-+- (void) willAnimateRotationToInterfaceOrientation: (UIInterfaceOrientation) orient
-+                                          duration: (NSTimeInterval) duration
-+{
-+    // perform rotation in animation loop so camera preview does not move
-+    // wrt device orientation
-+    [readerView setNeedsLayout];
-+}
-+
-+- (void) viewDidAppear: (BOOL) animated
-+{
-+    // run the reader when the view is visible
-+    [readerView start];
-+}
-+
-+- (void) viewWillDisappear: (BOOL) animated
-+{
-+    [readerView stop];
-+}
-+
-+- (void) readerView: (ZBarReaderView*) view
-+     didReadSymbols: (ZBarSymbolSet*) syms
-+          fromImage: (UIImage*) img
-+{
-+    // do something useful with results
-+    for(ZBarSymbol *sym in syms) {
-+        resultText.text = sym.data;
-+        break;
-+    }
-+}
-+
-+@end
-diff -r 563557a923d0 iphone/examples/EmbedReader/EmbedReader/en.lproj/EmbedReaderViewController.xib
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/examples/EmbedReader/EmbedReader/en.lproj/EmbedReaderViewController.xib	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,336 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
-+	<data>
-+		<int key="IBDocument.SystemTarget">1056</int>
-+		<string key="IBDocument.SystemVersion">10J869</string>
-+		<string key="IBDocument.InterfaceBuilderVersion">1306</string>
-+		<string key="IBDocument.AppKitVersion">1038.35</string>
-+		<string key="IBDocument.HIToolboxVersion">461.00</string>
-+		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-+			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-+			<string key="NS.object.0">301</string>
-+		</object>
-+		<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
-+			<bool key="EncodedWithXMLCoder">YES</bool>
-+			<string>IBUINavigationItem</string>
-+			<string>IBUIToolbar</string>
-+			<string>IBUITextView</string>
-+			<string>IBUIView</string>
-+			<string>IBUINavigationBar</string>
-+			<string>IBProxyObject</string>
-+		</object>
-+		<object class="NSArray" key="IBDocument.PluginDependencies">
-+			<bool key="EncodedWithXMLCoder">YES</bool>
-+			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-+		</object>
-+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-+			<bool key="EncodedWithXMLCoder">YES</bool>
-+			<object class="NSArray" key="dict.sortedKeys" id="0">
-+				<bool key="EncodedWithXMLCoder">YES</bool>
-+			</object>
-+			<reference key="dict.values" ref="0"/>
-+		</object>
-+		<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
-+			<bool key="EncodedWithXMLCoder">YES</bool>
-+			<object class="IBProxyObject" id="372490531">
-+				<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
-+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-+			</object>
-+			<object class="IBProxyObject" id="843779117">
-+				<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
-+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-+			</object>
-+			<object class="IBUIView" id="774585933">
-+				<reference key="NSNextResponder"/>
-+				<int key="NSvFlags">274</int>
-+				<object class="NSMutableArray" key="NSSubviews">
-+					<bool key="EncodedWithXMLCoder">YES</bool>
-+					<object class="IBUIView" id="461611788">
-+						<reference key="NSNextResponder" ref="774585933"/>
-+						<int key="NSvFlags">306</int>
-+						<string key="NSFrame">{{8, 52}, {304, 228}}</string>
-+						<reference key="NSSuperview" ref="774585933"/>
-+						<reference key="NSWindow"/>
-+						<reference key="NSNextKeyView" ref="971445553"/>
-+						<object class="NSColor" key="IBUIBackgroundColor">
-+							<int key="NSColorSpace">3</int>
-+							<bytes key="NSWhite">MAA</bytes>
-+						</object>
-+						<bool key="IBUIClipsSubviews">YES</bool>
-+						<bool key="IBUIMultipleTouchEnabled">YES</bool>
-+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-+					</object>
-+					<object class="IBUINavigationBar" id="583656854">
-+						<reference key="NSNextResponder" ref="774585933"/>
-+						<int key="NSvFlags">290</int>
-+						<string key="NSFrameSize">{320, 44}</string>
-+						<reference key="NSSuperview" ref="774585933"/>
-+						<reference key="NSWindow"/>
-+						<reference key="NSNextKeyView" ref="461611788"/>
-+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-+						<object class="NSArray" key="IBUIItems">
-+							<bool key="EncodedWithXMLCoder">YES</bool>
-+							<object class="IBUINavigationItem" id="889758731">
-+								<reference key="IBUINavigationBar" ref="583656854"/>
-+								<string key="IBUITitle">EmbedReader</string>
-+								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-+							</object>
-+						</object>
-+					</object>
-+					<object class="IBUIToolbar" id="89745263">
-+						<reference key="NSNextResponder" ref="774585933"/>
-+						<int key="NSvFlags">266</int>
-+						<string key="NSFrame">{{0, 416}, {320, 44}}</string>
-+						<reference key="NSSuperview" ref="774585933"/>
-+						<reference key="NSWindow"/>
-+						<reference key="NSNextKeyView"/>
-+						<bool key="IBUIOpaque">NO</bool>
-+						<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
-+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-+						<object class="NSMutableArray" key="IBUIItems">
-+							<bool key="EncodedWithXMLCoder">YES</bool>
-+						</object>
-+					</object>
-+					<object class="IBUITextView" id="971445553">
-+						<reference key="NSNextResponder" ref="774585933"/>
-+						<int key="NSvFlags">314</int>
-+						<string key="NSFrame">{{8, 300}, {304, 94}}</string>
-+						<reference key="NSSuperview" ref="774585933"/>
-+						<reference key="NSWindow"/>
-+						<reference key="NSNextKeyView" ref="89745263"/>
-+						<object class="NSColor" key="IBUIBackgroundColor">
-+							<int key="NSColorSpace">3</int>
-+							<bytes key="NSWhite">MCAwAA</bytes>
-+						</object>
-+						<bool key="IBUIClipsSubviews">YES</bool>
-+						<bool key="IBUIMultipleTouchEnabled">YES</bool>
-+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-+						<bool key="IBUIEditable">NO</bool>
-+						<string key="IBUIText">No barcode scanned...</string>
-+						<object class="NSFont" key="IBUIFont">
-+							<string key="NSName">Helvetica</string>
-+							<double key="NSSize">17</double>
-+							<int key="NSfFlags">16</int>
-+						</object>
-+						<object class="IBUITextInputTraits" key="IBUITextInputTraits">
-+							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-+						</object>
-+					</object>
-+				</object>
-+				<string key="NSFrame">{{0, 20}, {320, 460}}</string>
-+				<reference key="NSSuperview"/>
-+				<reference key="NSWindow"/>
-+				<reference key="NSNextKeyView" ref="583656854"/>
-+				<object class="NSColor" key="IBUIBackgroundColor">
-+					<int key="NSColorSpace">3</int>
-+					<bytes key="NSWhite">MC43NQA</bytes>
-+					<object class="NSColorSpace" key="NSCustomColorSpace">
-+						<int key="NSID">2</int>
-+					</object>
-+				</object>
-+				<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
-+				<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
-+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-+			</object>
-+		</object>
-+		<object class="IBObjectContainer" key="IBDocument.Objects">
-+			<object class="NSMutableArray" key="connectionRecords">
-+				<bool key="EncodedWithXMLCoder">YES</bool>
-+				<object class="IBConnectionRecord">
-+					<object class="IBCocoaTouchOutletConnection" key="connection">
-+						<string key="label">view</string>
-+						<reference key="source" ref="372490531"/>
-+						<reference key="destination" ref="774585933"/>
-+					</object>
-+					<int key="connectionID">7</int>
-+				</object>
-+				<object class="IBConnectionRecord">
-+					<object class="IBCocoaTouchOutletConnection" key="connection">
-+						<string key="label">readerView</string>
-+						<reference key="source" ref="372490531"/>
-+						<reference key="destination" ref="461611788"/>
-+					</object>
-+					<int key="connectionID">16</int>
-+				</object>
-+				<object class="IBConnectionRecord">
-+					<object class="IBCocoaTouchOutletConnection" key="connection">
-+						<string key="label">resultText</string>
-+						<reference key="source" ref="372490531"/>
-+						<reference key="destination" ref="971445553"/>
-+					</object>
-+					<int key="connectionID">17</int>
-+				</object>
-+			</object>
-+			<object class="IBMutableOrderedSet" key="objectRecords">
-+				<object class="NSArray" key="orderedObjects">
-+					<bool key="EncodedWithXMLCoder">YES</bool>
-+					<object class="IBObjectRecord">
-+						<int key="objectID">0</int>
-+						<reference key="object" ref="0"/>
-+						<reference key="children" ref="1000"/>
-+						<nil key="parent"/>
-+					</object>
-+					<object class="IBObjectRecord">
-+						<int key="objectID">-1</int>
-+						<reference key="object" ref="372490531"/>
-+						<reference key="parent" ref="0"/>
-+						<string key="objectName">File's Owner</string>
-+					</object>
-+					<object class="IBObjectRecord">
-+						<int key="objectID">-2</int>
-+						<reference key="object" ref="843779117"/>
-+						<reference key="parent" ref="0"/>
-+					</object>
-+					<object class="IBObjectRecord">
-+						<int key="objectID">6</int>
-+						<reference key="object" ref="774585933"/>
-+						<object class="NSMutableArray" key="children">
-+							<bool key="EncodedWithXMLCoder">YES</bool>
-+							<reference ref="583656854"/>
-+							<reference ref="89745263"/>
-+							<reference ref="971445553"/>
-+							<reference ref="461611788"/>
-+						</object>
-+						<reference key="parent" ref="0"/>
-+					</object>
-+					<object class="IBObjectRecord">
-+						<int key="objectID">8</int>
-+						<reference key="object" ref="461611788"/>
-+						<reference key="parent" ref="774585933"/>
-+					</object>
-+					<object class="IBObjectRecord">
-+						<int key="objectID">11</int>
-+						<reference key="object" ref="583656854"/>
-+						<object class="NSMutableArray" key="children">
-+							<bool key="EncodedWithXMLCoder">YES</bool>
-+							<reference ref="889758731"/>
-+						</object>
-+						<reference key="parent" ref="774585933"/>
-+					</object>
-+					<object class="IBObjectRecord">
-+						<int key="objectID">12</int>
-+						<reference key="object" ref="889758731"/>
-+						<reference key="parent" ref="583656854"/>
-+					</object>
-+					<object class="IBObjectRecord">
-+						<int key="objectID">13</int>
-+						<reference key="object" ref="89745263"/>
-+						<object class="NSMutableArray" key="children">
-+							<bool key="EncodedWithXMLCoder">YES</bool>
-+						</object>
-+						<reference key="parent" ref="774585933"/>
-+					</object>
-+					<object class="IBObjectRecord">
-+						<int key="objectID">15</int>
-+						<reference key="object" ref="971445553"/>
-+						<reference key="parent" ref="774585933"/>
-+					</object>
-+				</object>
-+			</object>
-+			<object class="NSMutableDictionary" key="flattenedProperties">
-+				<bool key="EncodedWithXMLCoder">YES</bool>
-+				<object class="NSArray" key="dict.sortedKeys">
-+					<bool key="EncodedWithXMLCoder">YES</bool>
-+					<string>-1.CustomClassName</string>
-+					<string>-2.CustomClassName</string>
-+					<string>11.IBPluginDependency</string>
-+					<string>12.IBPluginDependency</string>
-+					<string>13.IBPluginDependency</string>
-+					<string>15.IBPluginDependency</string>
-+					<string>6.IBEditorWindowLastContentRect</string>
-+					<string>6.IBPluginDependency</string>
-+					<string>8.CustomClassName</string>
-+					<string>8.IBPluginDependency</string>
-+				</object>
-+				<object class="NSMutableArray" key="dict.values">
-+					<bool key="EncodedWithXMLCoder">YES</bool>
-+					<string>EmbedReaderViewController</string>
-+					<string>UIResponder</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>
-+					<string>{{239, 654}, {320, 480}}</string>
-+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-+					<string>ZBarReaderView</string>
-+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-+				</object>
-+			</object>
-+			<object class="NSMutableDictionary" key="unlocalizedProperties">
-+				<bool key="EncodedWithXMLCoder">YES</bool>
-+				<reference key="dict.sortedKeys" ref="0"/>
-+				<reference key="dict.values" ref="0"/>
-+			</object>
-+			<nil key="activeLocalization"/>
-+			<object class="NSMutableDictionary" key="localizations">
-+				<bool key="EncodedWithXMLCoder">YES</bool>
-+				<reference key="dict.sortedKeys" ref="0"/>
-+				<reference key="dict.values" ref="0"/>
-+			</object>
-+			<nil key="sourceID"/>
-+			<int key="maxID">18</int>
-+		</object>
-+		<object class="IBClassDescriber" key="IBDocument.Classes">
-+			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
-+				<bool key="EncodedWithXMLCoder">YES</bool>
-+				<object class="IBPartialClassDescription">
-+					<string key="className">EmbedReaderViewController</string>
-+					<string key="superclassName">UIViewController</string>
-+					<object class="NSMutableDictionary" key="outlets">
-+						<bool key="EncodedWithXMLCoder">YES</bool>
-+						<object class="NSArray" key="dict.sortedKeys">
-+							<bool key="EncodedWithXMLCoder">YES</bool>
-+							<string>readerView</string>
-+							<string>resultText</string>
-+						</object>
-+						<object class="NSMutableArray" key="dict.values">
-+							<bool key="EncodedWithXMLCoder">YES</bool>
-+							<string>ZBarReaderView</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>readerView</string>
-+							<string>resultText</string>
-+						</object>
-+						<object class="NSMutableArray" key="dict.values">
-+							<bool key="EncodedWithXMLCoder">YES</bool>
-+							<object class="IBToOneOutletInfo">
-+								<string key="name">readerView</string>
-+								<string key="candidateClassName">ZBarReaderView</string>
-+							</object>
-+							<object class="IBToOneOutletInfo">
-+								<string key="name">resultText</string>
-+								<string key="candidateClassName">UITextView</string>
-+							</object>
-+						</object>
-+					</object>
-+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-+						<string key="majorKey">IBProjectSource</string>
-+						<string key="minorKey">./Classes/EmbedReaderViewController.h</string>
-+					</object>
-+				</object>
-+				<object class="IBPartialClassDescription">
-+					<string key="className">ZBarReaderView</string>
-+					<string key="superclassName">UIView</string>
-+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-+						<string key="majorKey">IBProjectSource</string>
-+						<string key="minorKey">./Classes/ZBarReaderView.h</string>
-+					</object>
-+				</object>
-+			</object>
-+		</object>
-+		<int key="IBDocument.localizationMode">0</int>
-+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
-+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
-+			<integer value="3100" key="NS.object.0"/>
-+		</object>
-+		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-+		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-+		<string key="IBCocoaTouchPluginVersion">301</string>
-+	</data>
-+</archive>
-diff -r 563557a923d0 iphone/examples/EmbedReader/EmbedReader/en.lproj/InfoPlist.strings
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/examples/EmbedReader/EmbedReader/en.lproj/InfoPlist.strings	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,2 @@
-+/* Localized versions of Info.plist keys */
-+
-diff -r 563557a923d0 iphone/examples/EmbedReader/EmbedReader/en.lproj/MainWindow.xib
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/examples/EmbedReader/EmbedReader/en.lproj/MainWindow.xib	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,444 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
-+	<data>
-+		<int key="IBDocument.SystemTarget">1024</int>
-+		<string key="IBDocument.SystemVersion">10D571</string>
-+		<string key="IBDocument.InterfaceBuilderVersion">786</string>
-+		<string key="IBDocument.AppKitVersion">1038.29</string>
-+		<string key="IBDocument.HIToolboxVersion">460.00</string>
-+		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-+			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-+			<string key="NS.object.0">112</string>
-+		</object>
-+		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
-+			<bool key="EncodedWithXMLCoder">YES</bool>
-+			<integer value="10"/>
-+		</object>
-+		<object class="NSArray" key="IBDocument.PluginDependencies">
-+			<bool key="EncodedWithXMLCoder">YES</bool>
-+			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-+		</object>
-+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-+			<bool key="EncodedWithXMLCoder">YES</bool>
-+			<object class="NSArray" key="dict.sortedKeys" id="0">
-+				<bool key="EncodedWithXMLCoder">YES</bool>
-+			</object>
-+			<object class="NSMutableArray" key="dict.values">
-+				<bool key="EncodedWithXMLCoder">YES</bool>
-+			</object>
-+		</object>
-+		<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
-+			<bool key="EncodedWithXMLCoder">YES</bool>
-+			<object class="IBProxyObject" id="841351856">
-+				<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
-+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-+			</object>
-+			<object class="IBProxyObject" id="427554174">
-+				<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
-+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-+			</object>
-+			<object class="IBUICustomObject" id="664661524">
-+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-+			</object>
-+			<object class="IBUIViewController" id="943309135">
-+				<string key="IBUINibName">EmbedReaderViewController</string>
-+				<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
-+				<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
-+					<int key="interfaceOrientation">1</int>
-+				</object>
-+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-+				<bool key="IBUIHorizontal">NO</bool>
-+			</object>
-+			<object class="IBUIWindow" id="117978783">
-+				<nil key="NSNextResponder"/>
-+				<int key="NSvFlags">292</int>
-+				<string key="NSFrameSize">{320, 480}</string>
-+				<object class="NSColor" key="IBUIBackgroundColor">
-+					<int key="NSColorSpace">1</int>
-+					<bytes key="NSRGB">MSAxIDEAA</bytes>
-+				</object>
-+				<bool key="IBUIOpaque">NO</bool>
-+				<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
-+				<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
-+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-+				<bool key="IBUIResizesToFullScreen">YES</bool>
-+			</object>
-+		</object>
-+		<object class="IBObjectContainer" key="IBDocument.Objects">
-+			<object class="NSMutableArray" key="connectionRecords">
-+				<bool key="EncodedWithXMLCoder">YES</bool>
-+				<object class="IBConnectionRecord">
-+					<object class="IBCocoaTouchOutletConnection" key="connection">
-+						<string key="label">delegate</string>
-+						<reference key="source" ref="841351856"/>
-+						<reference key="destination" ref="664661524"/>
-+					</object>
-+					<int key="connectionID">4</int>
-+				</object>
-+				<object class="IBConnectionRecord">
-+					<object class="IBCocoaTouchOutletConnection" key="connection">
-+						<string key="label">viewController</string>
-+						<reference key="source" ref="664661524"/>
-+						<reference key="destination" ref="943309135"/>
-+					</object>
-+					<int key="connectionID">11</int>
-+				</object>
-+				<object class="IBConnectionRecord">
-+					<object class="IBCocoaTouchOutletConnection" key="connection">
-+						<string key="label">window</string>
-+						<reference key="source" ref="664661524"/>
-+						<reference key="destination" ref="117978783"/>
-+					</object>
-+					<int key="connectionID">14</int>
-+				</object>
-+			</object>
-+			<object class="IBMutableOrderedSet" key="objectRecords">
-+				<object class="NSArray" key="orderedObjects">
-+					<bool key="EncodedWithXMLCoder">YES</bool>
-+					<object class="IBObjectRecord">
-+						<int key="objectID">0</int>
-+						<reference key="object" ref="0"/>
-+						<reference key="children" ref="1000"/>
-+						<nil key="parent"/>
-+					</object>
-+					<object class="IBObjectRecord">
-+						<int key="objectID">-1</int>
-+						<reference key="object" ref="841351856"/>
-+						<reference key="parent" ref="0"/>
-+						<string key="objectName">File's Owner</string>
-+					</object>
-+					<object class="IBObjectRecord">
-+						<int key="objectID">3</int>
-+						<reference key="object" ref="664661524"/>
-+						<reference key="parent" ref="0"/>
-+						<string key="objectName">EmbedReader App Delegate</string>
-+					</object>
-+					<object class="IBObjectRecord">
-+						<int key="objectID">-2</int>
-+						<reference key="object" ref="427554174"/>
-+						<reference key="parent" ref="0"/>
-+					</object>
-+					<object class="IBObjectRecord">
-+						<int key="objectID">10</int>
-+						<reference key="object" ref="943309135"/>
-+						<reference key="parent" ref="0"/>
-+					</object>
-+					<object class="IBObjectRecord">
-+						<int key="objectID">12</int>
-+						<reference key="object" ref="117978783"/>
-+						<reference key="parent" ref="0"/>
-+					</object>
-+				</object>
-+			</object>
-+			<object class="NSMutableDictionary" key="flattenedProperties">
-+				<bool key="EncodedWithXMLCoder">YES</bool>
-+				<object class="NSArray" key="dict.sortedKeys">
-+					<bool key="EncodedWithXMLCoder">YES</bool>
-+					<string>-1.CustomClassName</string>
-+					<string>-2.CustomClassName</string>
-+					<string>10.CustomClassName</string>
-+					<string>10.IBEditorWindowLastContentRect</string>
-+					<string>10.IBPluginDependency</string>
-+					<string>12.IBEditorWindowLastContentRect</string>
-+					<string>12.IBPluginDependency</string>
-+					<string>3.CustomClassName</string>
-+					<string>3.IBPluginDependency</string>
-+				</object>
-+				<object class="NSMutableArray" key="dict.values">
-+					<bool key="EncodedWithXMLCoder">YES</bool>
-+					<string>UIApplication</string>
-+					<string>UIResponder</string>
-+					<string>EmbedReaderViewController</string>
-+					<string>{{234, 376}, {320, 480}}</string>
-+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-+					<string>{{525, 346}, {320, 480}}</string>
-+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-+					<string>EmbedReaderAppDelegate</string>
-+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-+				</object>
-+			</object>
-+			<object class="NSMutableDictionary" key="unlocalizedProperties">
-+				<bool key="EncodedWithXMLCoder">YES</bool>
-+				<reference key="dict.sortedKeys" ref="0"/>
-+				<object class="NSMutableArray" key="dict.values">
-+					<bool key="EncodedWithXMLCoder">YES</bool>
-+				</object>
-+			</object>
-+			<nil key="activeLocalization"/>
-+			<object class="NSMutableDictionary" key="localizations">
-+				<bool key="EncodedWithXMLCoder">YES</bool>
-+				<reference key="dict.sortedKeys" ref="0"/>
-+				<object class="NSMutableArray" key="dict.values">
-+					<bool key="EncodedWithXMLCoder">YES</bool>
-+				</object>
-+			</object>
-+			<nil key="sourceID"/>
-+			<int key="maxID">15</int>
-+		</object>
-+		<object class="IBClassDescriber" key="IBDocument.Classes">
-+			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
-+				<bool key="EncodedWithXMLCoder">YES</bool>
-+				<object class="IBPartialClassDescription">
-+					<string key="className">UIWindow</string>
-+					<string key="superclassName">UIView</string>
-+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-+						<string key="majorKey">IBUserSource</string>
-+						<string key="minorKey"/>
-+					</object>
-+				</object>
-+				<object class="IBPartialClassDescription">
-+					<string key="className">EmbedReaderAppDelegate</string>
-+					<string key="superclassName">NSObject</string>
-+					<object class="NSMutableDictionary" key="outlets">
-+						<bool key="EncodedWithXMLCoder">YES</bool>
-+						<object class="NSArray" key="dict.sortedKeys">
-+							<bool key="EncodedWithXMLCoder">YES</bool>
-+							<string>viewController</string>
-+							<string>window</string>
-+						</object>
-+						<object class="NSMutableArray" key="dict.values">
-+							<bool key="EncodedWithXMLCoder">YES</bool>
-+							<string>EmbedReaderViewController</string>
-+							<string>UIWindow</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>viewController</string>
-+							<string>window</string>
-+						</object>
-+						<object class="NSMutableArray" key="dict.values">
-+							<bool key="EncodedWithXMLCoder">YES</bool>
-+							<object class="IBToOneOutletInfo">
-+								<string key="name">viewController</string>
-+								<string key="candidateClassName">EmbedReaderViewController</string>
-+							</object>
-+							<object class="IBToOneOutletInfo">
-+								<string key="name">window</string>
-+								<string key="candidateClassName">UIWindow</string>
-+							</object>
-+						</object>
-+					</object>
-+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-+						<string key="majorKey">IBProjectSource</string>
-+						<string key="minorKey">EmbedReaderAppDelegate.h</string>
-+					</object>
-+				</object>
-+				<object class="IBPartialClassDescription">
-+					<string key="className">EmbedReaderAppDelegate</string>
-+					<string key="superclassName">NSObject</string>
-+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-+						<string key="majorKey">IBUserSource</string>
-+						<string key="minorKey"/>
-+					</object>
-+				</object>
-+				<object class="IBPartialClassDescription">
-+					<string key="className">EmbedReaderViewController</string>
-+					<string key="superclassName">UIViewController</string>
-+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-+						<string key="majorKey">IBProjectSource</string>
-+						<string key="minorKey">EmbedReaderViewController.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="356479594">
-+						<string key="majorKey">IBFrameworkSource</string>
-+						<string key="minorKey">UIKit.framework/Headers/UIResponder.h</string>
-+					</object>
-+				</object>
-+				<object class="IBPartialClassDescription">
-+					<string key="className">UIApplication</string>
-+					<string key="superclassName">UIResponder</string>
-+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-+						<string key="majorKey">IBFrameworkSource</string>
-+						<string key="minorKey">UIKit.framework/Headers/UIApplication.h</string>
-+					</object>
-+				</object>
-+				<object class="IBPartialClassDescription">
-+					<string key="className">UIResponder</string>
-+					<string key="superclassName">NSObject</string>
-+					<reference key="sourceIdentifier" ref="356479594"/>
-+				</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">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 class="IBPartialClassDescription">
-+					<string key="className">UIWindow</string>
-+					<string key="superclassName">UIView</string>
-+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-+						<string key="majorKey">IBFrameworkSource</string>
-+						<string key="minorKey">UIKit.framework/Headers/UIWindow.h</string>
-+					</object>
-+				</object>
-+			</object>
-+		</object>
-+		<int key="IBDocument.localizationMode">0</int>
-+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-+			<integer value="1024" key="NS.object.0"/>
-+		</object>
-+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
-+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
-+			<integer value="3100" key="NS.object.0"/>
-+		</object>
-+		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-+		<string key="IBDocument.LastKnownRelativeProjectPath">EmbedReader.xcodeproj</string>
-+		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-+		<string key="IBCocoaTouchPluginVersion">112</string>
-+	</data>
-+</archive>
-diff -r 563557a923d0 iphone/examples/EmbedReader/EmbedReader/main.m
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/examples/EmbedReader/EmbedReader/main.m	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,16 @@
-+//
-+//  main.m
-+//  EmbedReader
-+//
-+//  Created by spadix on 5/2/11.
-+//
-+
-+#import <UIKit/UIKit.h>
-+
-+int main(int argc, char *argv[])
-+{
-+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-+    int retVal = UIApplicationMain(argc, argv, nil, nil);
-+    [pool release];
-+    return retVal;
-+}
-diff -r 563557a923d0 iphone/examples/EmbedReader/ZBarSDK
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/examples/EmbedReader/ZBarSDK	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,1 @@
-+../../build/Debug-iphoneos/ZBarSDK
-\ No newline at end of file
-diff -r 563557a923d0 iphone/examples/EmbedReader/build
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/examples/EmbedReader/build	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,1 @@
-+/tmp/EmbedReader.build
-\ No newline at end of file
-diff -r 563557a923d0 iphone/examples/ReaderSample/Default-568h@2x.png
-Binary file iphone/examples/ReaderSample/Default-568h@2x.png has changed
-diff -r 563557a923d0 iphone/examples/ReaderSample/ReaderSample.xcodeproj/project.pbxproj
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/examples/ReaderSample/ReaderSample.xcodeproj/project.pbxproj	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,419 @@
-+// !$*UTF8*$!
-+{
-+	archiveVersion = 1;
-+	classes = {
-+	};
-+	objectVersion = 46;
-+	objects = {
-+
-+/* Begin PBXBuildFile section */
-+		DC8245F5162B549F0010B2E6 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DC8245F4162B549F0010B2E6 /* Default-568h@2x.png */; };
-+		DC8F289413579EFF005B8862 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8F289313579EFF005B8862 /* UIKit.framework */; };
-+		DC8F289613579EFF005B8862 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8F289513579EFF005B8862 /* Foundation.framework */; };
-+		DC8F289813579EFF005B8862 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8F289713579EFF005B8862 /* CoreGraphics.framework */; };
-+		DC8F289E13579EFF005B8862 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = DC8F289C13579EFF005B8862 /* InfoPlist.strings */; };
-+		DC8F28A113579EFF005B8862 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = DC8F28A013579EFF005B8862 /* main.m */; };
-+		DC8F28A413579EFF005B8862 /* ReaderSampleAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = DC8F28A313579EFF005B8862 /* ReaderSampleAppDelegate.m */; };
-+		DC8F28A713579EFF005B8862 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = DC8F28A513579EFF005B8862 /* MainWindow.xib */; };
-+		DC8F28AA13579EFF005B8862 /* ReaderSampleViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DC8F28A913579EFF005B8862 /* ReaderSampleViewController.m */; };
-+		DC8F28AD13579F00005B8862 /* ReaderSampleViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = DC8F28AB13579EFF005B8862 /* ReaderSampleViewController.xib */; };
-+		DC8F28D01357A29D005B8862 /* libzbar.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8F28CA1357A29D005B8862 /* libzbar.a */; };
-+		DC8F28D11357A29D005B8862 /* zbar-back.png in Resources */ = {isa = PBXBuildFile; fileRef = DC8F28CC1357A29D005B8862 /* zbar-back.png */; };
-+		DC8F28D21357A29D005B8862 /* zbar-help.html in Resources */ = {isa = PBXBuildFile; fileRef = DC8F28CD1357A29D005B8862 /* zbar-help.html */; };
-+		DC8F28D31357A29D005B8862 /* zbar-helpicons.png in Resources */ = {isa = PBXBuildFile; fileRef = DC8F28CE1357A29D005B8862 /* zbar-helpicons.png */; };
-+		DC8F28D41357A29D005B8862 /* zbar-samples.png in Resources */ = {isa = PBXBuildFile; fileRef = DC8F28CF1357A29D005B8862 /* zbar-samples.png */; };
-+		DC8F28DA1357A42E005B8862 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8F28D51357A42E005B8862 /* AVFoundation.framework */; };
-+		DC8F28DB1357A42E005B8862 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8F28D61357A42E005B8862 /* CoreMedia.framework */; };
-+		DC8F28DC1357A42E005B8862 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8F28D71357A42E005B8862 /* CoreVideo.framework */; };
-+		DC8F28DD1357A42E005B8862 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8F28D81357A42E005B8862 /* libiconv.dylib */; };
-+		DC8F28DE1357A42E005B8862 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8F28D91357A42E005B8862 /* QuartzCore.framework */; };
-+/* End PBXBuildFile section */
-+
-+/* Begin PBXFileReference section */
-+		DC8245F4162B549F0010B2E6 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = SOURCE_ROOT; };
-+		DC8F288F13579EFF005B8862 /* ReaderSample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ReaderSample.app; sourceTree = BUILT_PRODUCTS_DIR; };
-+		DC8F289313579EFF005B8862 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
-+		DC8F289513579EFF005B8862 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
-+		DC8F289713579EFF005B8862 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
-+		DC8F289B13579EFF005B8862 /* ReaderSample-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "ReaderSample-Info.plist"; sourceTree = "<group>"; };
-+		DC8F289D13579EFF005B8862 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-+		DC8F289F13579EFF005B8862 /* ReaderSample-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "ReaderSample-Prefix.pch"; sourceTree = "<group>"; };
-+		DC8F28A013579EFF005B8862 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
-+		DC8F28A213579EFF005B8862 /* ReaderSampleAppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ReaderSampleAppDelegate.h; sourceTree = "<group>"; };
-+		DC8F28A313579EFF005B8862 /* ReaderSampleAppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ReaderSampleAppDelegate.m; sourceTree = "<group>"; };
-+		DC8F28A613579EFF005B8862 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/MainWindow.xib; sourceTree = "<group>"; };
-+		DC8F28A813579EFF005B8862 /* ReaderSampleViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ReaderSampleViewController.h; sourceTree = "<group>"; };
-+		DC8F28A913579EFF005B8862 /* ReaderSampleViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ReaderSampleViewController.m; sourceTree = "<group>"; };
-+		DC8F28AC13579F00005B8862 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/ReaderSampleViewController.xib; sourceTree = "<group>"; };
-+		DC8F28B71357A29D005B8862 /* Decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Decoder.h; sourceTree = "<group>"; };
-+		DC8F28B81357A29D005B8862 /* Exception.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Exception.h; sourceTree = "<group>"; };
-+		DC8F28B91357A29D005B8862 /* Image.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Image.h; sourceTree = "<group>"; };
-+		DC8F28BA1357A29D005B8862 /* ImageScanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImageScanner.h; sourceTree = "<group>"; };
-+		DC8F28BB1357A29D005B8862 /* Processor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Processor.h; sourceTree = "<group>"; };
-+		DC8F28BC1357A29D005B8862 /* Scanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Scanner.h; sourceTree = "<group>"; };
-+		DC8F28BD1357A29D005B8862 /* Symbol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Symbol.h; sourceTree = "<group>"; };
-+		DC8F28BE1357A29D005B8862 /* Video.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Video.h; sourceTree = "<group>"; };
-+		DC8F28BF1357A29D005B8862 /* Window.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Window.h; sourceTree = "<group>"; };
-+		DC8F28C01357A29D005B8862 /* zbar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zbar.h; sourceTree = "<group>"; };
-+		DC8F28C11357A29D005B8862 /* ZBarCaptureReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarCaptureReader.h; sourceTree = "<group>"; };
-+		DC8F28C21357A29D005B8862 /* ZBarHelpController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarHelpController.h; sourceTree = "<group>"; };
-+		DC8F28C31357A29D005B8862 /* ZBarImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarImage.h; sourceTree = "<group>"; };
-+		DC8F28C41357A29D005B8862 /* ZBarImageScanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarImageScanner.h; sourceTree = "<group>"; };
-+		DC8F28C51357A29D005B8862 /* ZBarReaderController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarReaderController.h; sourceTree = "<group>"; };
-+		DC8F28C61357A29D005B8862 /* ZBarReaderView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarReaderView.h; sourceTree = "<group>"; };
-+		DC8F28C71357A29D005B8862 /* ZBarReaderViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarReaderViewController.h; sourceTree = "<group>"; };
-+		DC8F28C81357A29D005B8862 /* ZBarSDK.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarSDK.h; sourceTree = "<group>"; };
-+		DC8F28C91357A29D005B8862 /* ZBarSymbol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarSymbol.h; sourceTree = "<group>"; };
-+		DC8F28CA1357A29D005B8862 /* libzbar.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libzbar.a; sourceTree = "<group>"; };
-+		DC8F28CC1357A29D005B8862 /* zbar-back.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "zbar-back.png"; sourceTree = "<group>"; };
-+		DC8F28CD1357A29D005B8862 /* zbar-help.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "zbar-help.html"; sourceTree = "<group>"; };
-+		DC8F28CE1357A29D005B8862 /* zbar-helpicons.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "zbar-helpicons.png"; sourceTree = "<group>"; };
-+		DC8F28CF1357A29D005B8862 /* zbar-samples.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "zbar-samples.png"; sourceTree = "<group>"; };
-+		DC8F28D51357A42E005B8862 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
-+		DC8F28D61357A42E005B8862 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; };
-+		DC8F28D71357A42E005B8862 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; };
-+		DC8F28D81357A42E005B8862 /* libiconv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libiconv.dylib; path = usr/lib/libiconv.dylib; sourceTree = SDKROOT; };
-+		DC8F28D91357A42E005B8862 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
-+/* End PBXFileReference section */
-+
-+/* Begin PBXFrameworksBuildPhase section */
-+		DC8F288C13579EFF005B8862 /* Frameworks */ = {
-+			isa = PBXFrameworksBuildPhase;
-+			buildActionMask = 2147483647;
-+			files = (
-+				DC8F28DA1357A42E005B8862 /* AVFoundation.framework in Frameworks */,
-+				DC8F28DB1357A42E005B8862 /* CoreMedia.framework in Frameworks */,
-+				DC8F28DC1357A42E005B8862 /* CoreVideo.framework in Frameworks */,
-+				DC8F28DD1357A42E005B8862 /* libiconv.dylib in Frameworks */,
-+				DC8F28DE1357A42E005B8862 /* QuartzCore.framework in Frameworks */,
-+				DC8F289413579EFF005B8862 /* UIKit.framework in Frameworks */,
-+				DC8F289613579EFF005B8862 /* Foundation.framework in Frameworks */,
-+				DC8F289813579EFF005B8862 /* CoreGraphics.framework in Frameworks */,
-+				DC8F28D01357A29D005B8862 /* libzbar.a in Frameworks */,
-+			);
-+			runOnlyForDeploymentPostprocessing = 0;
-+		};
-+/* End PBXFrameworksBuildPhase section */
-+
-+/* Begin PBXGroup section */
-+		DC8F288413579EFF005B8862 = {
-+			isa = PBXGroup;
-+			children = (
-+				DC8F289913579EFF005B8862 /* ReaderSample */,
-+				DC8F28B31357A29D005B8862 /* ZBarSDK */,
-+				DC8F289213579EFF005B8862 /* Frameworks */,
-+				DC8F289013579EFF005B8862 /* Products */,
-+			);
-+			sourceTree = "<group>";
-+		};
-+		DC8F289013579EFF005B8862 /* Products */ = {
-+			isa = PBXGroup;
-+			children = (
-+				DC8F288F13579EFF005B8862 /* ReaderSample.app */,
-+			);
-+			name = Products;
-+			sourceTree = "<group>";
-+		};
-+		DC8F289213579EFF005B8862 /* Frameworks */ = {
-+			isa = PBXGroup;
-+			children = (
-+				DC8F289313579EFF005B8862 /* UIKit.framework */,
-+				DC8F289513579EFF005B8862 /* Foundation.framework */,
-+				DC8F289713579EFF005B8862 /* CoreGraphics.framework */,
-+				DC8F28D91357A42E005B8862 /* QuartzCore.framework */,
-+				DC8F28D61357A42E005B8862 /* CoreMedia.framework */,
-+				DC8F28D71357A42E005B8862 /* CoreVideo.framework */,
-+				DC8F28D51357A42E005B8862 /* AVFoundation.framework */,
-+				DC8F28D81357A42E005B8862 /* libiconv.dylib */,
-+			);
-+			name = Frameworks;
-+			sourceTree = "<group>";
-+		};
-+		DC8F289913579EFF005B8862 /* ReaderSample */ = {
-+			isa = PBXGroup;
-+			children = (
-+				DC8F28A213579EFF005B8862 /* ReaderSampleAppDelegate.h */,
-+				DC8F28A313579EFF005B8862 /* ReaderSampleAppDelegate.m */,
-+				DC8F28A513579EFF005B8862 /* MainWindow.xib */,
-+				DC8F28A813579EFF005B8862 /* ReaderSampleViewController.h */,
-+				DC8F28A913579EFF005B8862 /* ReaderSampleViewController.m */,
-+				DC8F28AB13579EFF005B8862 /* ReaderSampleViewController.xib */,
-+				DC8F289A13579EFF005B8862 /* Supporting Files */,
-+			);
-+			path = ReaderSample;
-+			sourceTree = "<group>";
-+		};
-+		DC8F289A13579EFF005B8862 /* Supporting Files */ = {
-+			isa = PBXGroup;
-+			children = (
-+				DC8F289B13579EFF005B8862 /* ReaderSample-Info.plist */,
-+				DC8F289C13579EFF005B8862 /* InfoPlist.strings */,
-+				DC8245F4162B549F0010B2E6 /* Default-568h@2x.png */,
-+				DC8F289F13579EFF005B8862 /* ReaderSample-Prefix.pch */,
-+				DC8F28A013579EFF005B8862 /* main.m */,
-+			);
-+			name = "Supporting Files";
-+			sourceTree = "<group>";
-+		};
-+		DC8F28B31357A29D005B8862 /* ZBarSDK */ = {
-+			isa = PBXGroup;
-+			children = (
-+				DC8F28B41357A29D005B8862 /* Headers */,
-+				DC8F28CA1357A29D005B8862 /* libzbar.a */,
-+				DC8F28CB1357A29D005B8862 /* Resources */,
-+			);
-+			path = ZBarSDK;
-+			sourceTree = "<group>";
-+		};
-+		DC8F28B41357A29D005B8862 /* Headers */ = {
-+			isa = PBXGroup;
-+			children = (
-+				DC8F28B51357A29D005B8862 /* ZBarSDK */,
-+			);
-+			path = Headers;
-+			sourceTree = "<group>";
-+		};
-+		DC8F28B51357A29D005B8862 /* ZBarSDK */ = {
-+			isa = PBXGroup;
-+			children = (
-+				DC8F28B61357A29D005B8862 /* zbar */,
-+				DC8F28C01357A29D005B8862 /* zbar.h */,
-+				DC8F28C11357A29D005B8862 /* ZBarCaptureReader.h */,
-+				DC8F28C21357A29D005B8862 /* ZBarHelpController.h */,
-+				DC8F28C31357A29D005B8862 /* ZBarImage.h */,
-+				DC8F28C41357A29D005B8862 /* ZBarImageScanner.h */,
-+				DC8F28C51357A29D005B8862 /* ZBarReaderController.h */,
-+				DC8F28C61357A29D005B8862 /* ZBarReaderView.h */,
-+				DC8F28C71357A29D005B8862 /* ZBarReaderViewController.h */,
-+				DC8F28C81357A29D005B8862 /* ZBarSDK.h */,
-+				DC8F28C91357A29D005B8862 /* ZBarSymbol.h */,
-+			);
-+			path = ZBarSDK;
-+			sourceTree = "<group>";
-+		};
-+		DC8F28B61357A29D005B8862 /* zbar */ = {
-+			isa = PBXGroup;
-+			children = (
-+				DC8F28B71357A29D005B8862 /* Decoder.h */,
-+				DC8F28B81357A29D005B8862 /* Exception.h */,
-+				DC8F28B91357A29D005B8862 /* Image.h */,
-+				DC8F28BA1357A29D005B8862 /* ImageScanner.h */,
-+				DC8F28BB1357A29D005B8862 /* Processor.h */,
-+				DC8F28BC1357A29D005B8862 /* Scanner.h */,
-+				DC8F28BD1357A29D005B8862 /* Symbol.h */,
-+				DC8F28BE1357A29D005B8862 /* Video.h */,
-+				DC8F28BF1357A29D005B8862 /* Window.h */,
-+			);
-+			path = zbar;
-+			sourceTree = "<group>";
-+		};
-+		DC8F28CB1357A29D005B8862 /* Resources */ = {
-+			isa = PBXGroup;
-+			children = (
-+				DC8F28CC1357A29D005B8862 /* zbar-back.png */,
-+				DC8F28CD1357A29D005B8862 /* zbar-help.html */,
-+				DC8F28CE1357A29D005B8862 /* zbar-helpicons.png */,
-+				DC8F28CF1357A29D005B8862 /* zbar-samples.png */,
-+			);
-+			path = Resources;
-+			sourceTree = "<group>";
-+		};
-+/* End PBXGroup section */
-+
-+/* Begin PBXNativeTarget section */
-+		DC8F288E13579EFF005B8862 /* ReaderSample */ = {
-+			isa = PBXNativeTarget;
-+			buildConfigurationList = DC8F28B013579F00005B8862 /* Build configuration list for PBXNativeTarget "ReaderSample" */;
-+			buildPhases = (
-+				DC8F288B13579EFF005B8862 /* Sources */,
-+				DC8F288C13579EFF005B8862 /* Frameworks */,
-+				DC8F288D13579EFF005B8862 /* Resources */,
-+			);
-+			buildRules = (
-+			);
-+			dependencies = (
-+			);
-+			name = ReaderSample;
-+			productName = ReaderSample;
-+			productReference = DC8F288F13579EFF005B8862 /* ReaderSample.app */;
-+			productType = "com.apple.product-type.application";
-+		};
-+/* End PBXNativeTarget section */
-+
-+/* Begin PBXProject section */
-+		DC8F288613579EFF005B8862 /* Project object */ = {
-+			isa = PBXProject;
-+			attributes = {
-+				ORGANIZATIONNAME = "ZBar Consulting Services";
-+			};
-+			buildConfigurationList = DC8F288913579EFF005B8862 /* Build configuration list for PBXProject "ReaderSample" */;
-+			compatibilityVersion = "Xcode 3.2";
-+			developmentRegion = English;
-+			hasScannedForEncodings = 0;
-+			knownRegions = (
-+				en,
-+			);
-+			mainGroup = DC8F288413579EFF005B8862;
-+			productRefGroup = DC8F289013579EFF005B8862 /* Products */;
-+			projectDirPath = "";
-+			projectRoot = "";
-+			targets = (
-+				DC8F288E13579EFF005B8862 /* ReaderSample */,
-+			);
-+		};
-+/* End PBXProject section */
-+
-+/* Begin PBXResourcesBuildPhase section */
-+		DC8F288D13579EFF005B8862 /* Resources */ = {
-+			isa = PBXResourcesBuildPhase;
-+			buildActionMask = 2147483647;
-+			files = (
-+				DC8F289E13579EFF005B8862 /* InfoPlist.strings in Resources */,
-+				DC8F28A713579EFF005B8862 /* MainWindow.xib in Resources */,
-+				DC8F28AD13579F00005B8862 /* ReaderSampleViewController.xib in Resources */,
-+				DC8F28D11357A29D005B8862 /* zbar-back.png in Resources */,
-+				DC8F28D21357A29D005B8862 /* zbar-help.html in Resources */,
-+				DC8F28D31357A29D005B8862 /* zbar-helpicons.png in Resources */,
-+				DC8F28D41357A29D005B8862 /* zbar-samples.png in Resources */,
-+				DC8245F5162B549F0010B2E6 /* Default-568h@2x.png in Resources */,
-+			);
-+			runOnlyForDeploymentPostprocessing = 0;
-+		};
-+/* End PBXResourcesBuildPhase section */
-+
-+/* Begin PBXSourcesBuildPhase section */
-+		DC8F288B13579EFF005B8862 /* Sources */ = {
-+			isa = PBXSourcesBuildPhase;
-+			buildActionMask = 2147483647;
-+			files = (
-+				DC8F28A113579EFF005B8862 /* main.m in Sources */,
-+				DC8F28A413579EFF005B8862 /* ReaderSampleAppDelegate.m in Sources */,
-+				DC8F28AA13579EFF005B8862 /* ReaderSampleViewController.m in Sources */,
-+			);
-+			runOnlyForDeploymentPostprocessing = 0;
-+		};
-+/* End PBXSourcesBuildPhase section */
-+
-+/* Begin PBXVariantGroup section */
-+		DC8F289C13579EFF005B8862 /* InfoPlist.strings */ = {
-+			isa = PBXVariantGroup;
-+			children = (
-+				DC8F289D13579EFF005B8862 /* en */,
-+			);
-+			name = InfoPlist.strings;
-+			sourceTree = "<group>";
-+		};
-+		DC8F28A513579EFF005B8862 /* MainWindow.xib */ = {
-+			isa = PBXVariantGroup;
-+			children = (
-+				DC8F28A613579EFF005B8862 /* en */,
-+			);
-+			name = MainWindow.xib;
-+			sourceTree = "<group>";
-+		};
-+		DC8F28AB13579EFF005B8862 /* ReaderSampleViewController.xib */ = {
-+			isa = PBXVariantGroup;
-+			children = (
-+				DC8F28AC13579F00005B8862 /* en */,
-+			);
-+			name = ReaderSampleViewController.xib;
-+			sourceTree = "<group>";
-+		};
-+/* End PBXVariantGroup section */
-+
-+/* Begin XCBuildConfiguration section */
-+		DC8F28AE13579F00005B8862 /* Debug */ = {
-+			isa = XCBuildConfiguration;
-+			buildSettings = {
-+				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
-+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-+				GCC_C_LANGUAGE_STANDARD = gnu99;
-+				GCC_OPTIMIZATION_LEVEL = 0;
-+				GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
-+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-+				GCC_VERSION = com.apple.compilers.llvmgcc42;
-+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-+				GCC_WARN_UNUSED_VARIABLE = YES;
-+				IPHONEOS_DEPLOYMENT_TARGET = 4.0;
-+				SDKROOT = iphoneos;
-+			};
-+			name = Debug;
-+		};
-+		DC8F28AF13579F00005B8862 /* Release */ = {
-+			isa = XCBuildConfiguration;
-+			buildSettings = {
-+				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
-+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-+				GCC_C_LANGUAGE_STANDARD = gnu99;
-+				GCC_VERSION = com.apple.compilers.llvmgcc42;
-+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-+				GCC_WARN_UNUSED_VARIABLE = YES;
-+				IPHONEOS_DEPLOYMENT_TARGET = 4.0;
-+				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
-+				SDKROOT = iphoneos;
-+			};
-+			name = Release;
-+		};
-+		DC8F28B113579F00005B8862 /* Debug */ = {
-+			isa = XCBuildConfiguration;
-+			buildSettings = {
-+				ALWAYS_SEARCH_USER_PATHS = NO;
-+				COPY_PHASE_STRIP = NO;
-+				GCC_DYNAMIC_NO_PIC = NO;
-+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-+				GCC_PREFIX_HEADER = "ReaderSample/ReaderSample-Prefix.pch";
-+				INFOPLIST_FILE = "ReaderSample/ReaderSample-Info.plist";
-+				LIBRARY_SEARCH_PATHS = (
-+					"$(inherited)",
-+					"\"$(SRCROOT)/ZBarSDK\"",
-+				);
-+				PRODUCT_NAME = "$(TARGET_NAME)";
-+				TARGETED_DEVICE_FAMILY = "1,2";
-+				WRAPPER_EXTENSION = app;
-+			};
-+			name = Debug;
-+		};
-+		DC8F28B213579F00005B8862 /* Release */ = {
-+			isa = XCBuildConfiguration;
-+			buildSettings = {
-+				ALWAYS_SEARCH_USER_PATHS = NO;
-+				COPY_PHASE_STRIP = YES;
-+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-+				GCC_PREFIX_HEADER = "ReaderSample/ReaderSample-Prefix.pch";
-+				INFOPLIST_FILE = "ReaderSample/ReaderSample-Info.plist";
-+				LIBRARY_SEARCH_PATHS = (
-+					"$(inherited)",
-+					"\"$(SRCROOT)/ZBarSDK\"",
-+				);
-+				PRODUCT_NAME = "$(TARGET_NAME)";
-+				TARGETED_DEVICE_FAMILY = "1,2";
-+				VALIDATE_PRODUCT = YES;
-+				WRAPPER_EXTENSION = app;
-+			};
-+			name = Release;
-+		};
-+/* End XCBuildConfiguration section */
-+
-+/* Begin XCConfigurationList section */
-+		DC8F288913579EFF005B8862 /* Build configuration list for PBXProject "ReaderSample" */ = {
-+			isa = XCConfigurationList;
-+			buildConfigurations = (
-+				DC8F28AE13579F00005B8862 /* Debug */,
-+				DC8F28AF13579F00005B8862 /* Release */,
-+			);
-+			defaultConfigurationIsVisible = 0;
-+			defaultConfigurationName = Release;
-+		};
-+		DC8F28B013579F00005B8862 /* Build configuration list for PBXNativeTarget "ReaderSample" */ = {
-+			isa = XCConfigurationList;
-+			buildConfigurations = (
-+				DC8F28B113579F00005B8862 /* Debug */,
-+				DC8F28B213579F00005B8862 /* Release */,
-+			);
-+			defaultConfigurationIsVisible = 0;
-+			defaultConfigurationName = Release;
-+		};
-+/* End XCConfigurationList section */
-+	};
-+	rootObject = DC8F288613579EFF005B8862 /* Project object */;
-+}
-diff -r 563557a923d0 iphone/examples/ReaderSample/ReaderSample.xcodeproj/xcshareddata/xcschemes/ReaderSample.xcscheme
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/examples/ReaderSample/ReaderSample.xcodeproj/xcshareddata/xcschemes/ReaderSample.xcscheme	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,76 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<Scheme
-+   version = "1.3">
-+   <BuildAction
-+      parallelizeBuildables = "YES"
-+      buildImplicitDependencies = "YES">
-+      <BuildActionEntries>
-+         <BuildActionEntry
-+            buildForTesting = "YES"
-+            buildForRunning = "YES"
-+            buildForProfiling = "YES"
-+            buildForArchiving = "YES"
-+            buildForAnalyzing = "YES">
-+            <BuildableReference
-+               BuildableIdentifier = "primary"
-+               BlueprintIdentifier = "DC8F288E13579EFF005B8862"
-+               BuildableName = "ReaderSample.app"
-+               BlueprintName = "ReaderSample"
-+               ReferencedContainer = "container:ReaderSample.xcodeproj">
-+            </BuildableReference>
-+         </BuildActionEntry>
-+      </BuildActionEntries>
-+   </BuildAction>
-+   <TestAction
-+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
-+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
-+      shouldUseLaunchSchemeArgsEnv = "YES"
-+      buildConfiguration = "Debug">
-+      <Testables>
-+      </Testables>
-+   </TestAction>
-+   <LaunchAction
-+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
-+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
-+      displayScaleIsEnabled = "NO"
-+      displayScale = "1.00"
-+      launchStyle = "0"
-+      useCustomWorkingDirectory = "NO"
-+      buildConfiguration = "Debug">
-+      <BuildableProductRunnable>
-+         <BuildableReference
-+            BuildableIdentifier = "primary"
-+            BlueprintIdentifier = "DC8F288E13579EFF005B8862"
-+            BuildableName = "ReaderSample.app"
-+            BlueprintName = "ReaderSample"
-+            ReferencedContainer = "container:ReaderSample.xcodeproj">
-+         </BuildableReference>
-+      </BuildableProductRunnable>
-+      <AdditionalOptions>
-+      </AdditionalOptions>
-+   </LaunchAction>
-+   <ProfileAction
-+      displayScaleIsEnabled = "NO"
-+      displayScale = "1.00"
-+      shouldUseLaunchSchemeArgsEnv = "YES"
-+      savedToolIdentifier = ""
-+      useCustomWorkingDirectory = "NO"
-+      buildConfiguration = "Release">
-+      <BuildableProductRunnable>
-+         <BuildableReference
-+            BuildableIdentifier = "primary"
-+            BlueprintIdentifier = "DC8F288E13579EFF005B8862"
-+            BuildableName = "ReaderSample.app"
-+            BlueprintName = "ReaderSample"
-+            ReferencedContainer = "container:ReaderSample.xcodeproj">
-+         </BuildableReference>
-+      </BuildableProductRunnable>
-+   </ProfileAction>
-+   <AnalyzeAction
-+      buildConfiguration = "Debug">
-+   </AnalyzeAction>
-+   <ArchiveAction
-+      buildConfiguration = "Release"
-+      revealArchiveInOrganizer = "YES">
-+   </ArchiveAction>
-+</Scheme>
-diff -r 563557a923d0 iphone/examples/ReaderSample/ReaderSample/ReaderSample-Info.plist
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/examples/ReaderSample/ReaderSample/ReaderSample-Info.plist	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,38 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-+<plist version="1.0">
-+<dict>
-+	<key>CFBundleDevelopmentRegion</key>
-+	<string>en</string>
-+	<key>CFBundleDisplayName</key>
-+	<string>${PRODUCT_NAME}</string>
-+	<key>CFBundleExecutable</key>
-+	<string>${EXECUTABLE_NAME}</string>
-+	<key>CFBundleIconFile</key>
-+	<string></string>
-+	<key>CFBundleIdentifier</key>
-+	<string>com.yourcompany.${PRODUCT_NAME:rfc1034identifier}</string>
-+	<key>CFBundleInfoDictionaryVersion</key>
-+	<string>6.0</string>
-+	<key>CFBundleName</key>
-+	<string>${PRODUCT_NAME}</string>
-+	<key>CFBundlePackageType</key>
-+	<string>APPL</string>
-+	<key>CFBundleShortVersionString</key>
-+	<string>1.0</string>
-+	<key>CFBundleSignature</key>
-+	<string>????</string>
-+	<key>CFBundleVersion</key>
-+	<string>1.0</string>
-+	<key>LSRequiresIPhoneOS</key>
-+	<true/>
-+	<key>NSMainNibFile</key>
-+	<string>MainWindow</string>
-+	<key>UISupportedInterfaceOrientations</key>
-+	<array>
-+		<string>UIInterfaceOrientationPortrait</string>
-+		<string>UIInterfaceOrientationLandscapeLeft</string>
-+		<string>UIInterfaceOrientationLandscapeRight</string>
-+	</array>
-+</dict>
-+</plist>
-diff -r 563557a923d0 iphone/examples/ReaderSample/ReaderSample/ReaderSample-Prefix.pch
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/examples/ReaderSample/ReaderSample/ReaderSample-Prefix.pch	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,16 @@
-+//
-+// Prefix header for all source files of the 'ReaderSample' target in the 'ReaderSample' project
-+//
-+
-+#import <Availability.h>
-+
-+#ifndef __IPHONE_3_0
-+#warning "This project uses features only available in iPhone SDK 3.0 and later."
-+#endif
-+
-+#ifdef __OBJC__
-+    #import <UIKit/UIKit.h>
-+    #import <Foundation/Foundation.h>
-+    // ADD: import barcode reader APIs
-+    #import "ZBarSDK.h"
-+#endif
-diff -r 563557a923d0 iphone/examples/ReaderSample/ReaderSample/ReaderSampleAppDelegate.h
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/examples/ReaderSample/ReaderSample/ReaderSampleAppDelegate.h	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,20 @@
-+//
-+//  ReaderSampleAppDelegate.h
-+//  ReaderSample
-+//
-+//  Created by spadix on 4/14/11.
-+//
-+
-+#import <UIKit/UIKit.h>
-+
-+@class ReaderSampleViewController;
-+
-+@interface ReaderSampleAppDelegate : NSObject <UIApplicationDelegate> {
-+
-+}
-+
-+@property (nonatomic, retain) IBOutlet UIWindow *window;
-+
-+@property (nonatomic, retain) IBOutlet ReaderSampleViewController *viewController;
-+
-+@end
-diff -r 563557a923d0 iphone/examples/ReaderSample/ReaderSample/ReaderSampleAppDelegate.m
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/examples/ReaderSample/ReaderSample/ReaderSampleAppDelegate.m	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,67 @@
-+//
-+//  ReaderSampleAppDelegate.m
-+//  ReaderSample
-+//
-+//  Created by spadix on 4/14/11.
-+//
-+
-+#import "ReaderSampleAppDelegate.h"
-+
-+#import "ReaderSampleViewController.h"
-+
-+@implementation ReaderSampleAppDelegate
-+
-+
-+@synthesize window=_window;
-+
-+@synthesize viewController=_viewController;
-+
-+- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
-+{
-+    // Override point for customization after application launch.
-+     
-+    self.window.rootViewController = self.viewController;
-+    [self.window makeKeyAndVisible];
-+    return YES;
-+}
-+
-+- (void)applicationWillResignActive:(UIApplication *)application
-+{
-+    /*
-+     Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
-+     Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
-+     */
-+}
-+
-+- (void)applicationDidEnterBackground:(UIApplication *)application
-+{
-+    /*
-+     Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. 
-+     If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
-+     */
-+}
-+
-+- (void)applicationWillEnterForeground:(UIApplication *)application
-+{
-+    /*
-+     Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
-+     */
-+}
-+
-+- (void)applicationDidBecomeActive:(UIApplication *)application
-+{
-+    /*
-+     Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
-+     */
-+}
-+
-+- (void)applicationWillTerminate:(UIApplication *)application
-+{
-+    /*
-+     Called when the application is about to terminate.
-+     Save data if appropriate.
-+     See also applicationDidEnterBackground:.
-+     */
-+}
-+
-+@end
-diff -r 563557a923d0 iphone/examples/ReaderSample/ReaderSample/ReaderSampleViewController.h
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/examples/ReaderSample/ReaderSample/ReaderSampleViewController.h	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,21 @@
-+//
-+//  ReaderSampleViewController.h
-+//  ReaderSample
-+//
-+//  Created by spadix on 4/14/11.
-+//
-+
-+#import <UIKit/UIKit.h>
-+
-+@interface ReaderSampleViewController
-+    : UIViewController
-+    // ADD: delegate protocol
-+    < ZBarReaderDelegate >
-+{
-+    UIImageView *resultImage;
-+    UITextView *resultText;
-+}
-+@property (nonatomic, retain) IBOutlet UIImageView *resultImage;
-+@property (nonatomic, retain) IBOutlet UITextView *resultText;
-+- (IBAction) scanButtonTapped;
-+@end
-diff -r 563557a923d0 iphone/examples/ReaderSample/ReaderSample/ReaderSampleViewController.m
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/examples/ReaderSample/ReaderSample/ReaderSampleViewController.m	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,68 @@
-+//
-+//  ReaderSampleViewController.m
-+//  ReaderSample
-+//
-+//  Created by spadix on 4/14/11.
-+//
-+
-+#import "ReaderSampleViewController.h"
-+
-+@implementation ReaderSampleViewController
-+
-+@synthesize resultImage, resultText;
-+
-+- (IBAction) scanButtonTapped
-+{
-+    // ADD: present a barcode reader that scans from the camera feed
-+    ZBarReaderViewController *reader = [[ZBarReaderViewController alloc] init];
-+    reader.readerDelegate = self;
-+    reader.supportedOrientationsMask = ZBarOrientationMaskAll;
-+
-+    ZBarImageScanner *scanner = reader.scanner;
-+    // TODO: (optional) additional reader configuration here
-+
-+    // EXAMPLE: disable rarely used I2/5 to improve performance
-+    [scanner setSymbology: ZBAR_I25
-+                   config: ZBAR_CFG_ENABLE
-+                       to: 0];
-+
-+    // present and release the controller
-+    [self presentModalViewController: reader
-+                            animated: YES];
-+    [reader release];
-+}
-+
-+- (void) imagePickerController: (UIImagePickerController*) reader
-+ didFinishPickingMediaWithInfo: (NSDictionary*) info
-+{
-+    // ADD: get the decode results
-+    id<NSFastEnumeration> results =
-+    [info objectForKey: ZBarReaderControllerResults];
-+    ZBarSymbol *symbol = nil;
-+    for(symbol in results)
-+        // EXAMPLE: just grab the first barcode
-+        break;
-+
-+    // EXAMPLE: do something useful with the barcode data
-+    resultText.text = symbol.data;
-+
-+    // EXAMPLE: do something useful with the barcode image
-+    resultImage.image =
-+    [info objectForKey: UIImagePickerControllerOriginalImage];
-+
-+    // ADD: dismiss the controller (NB dismiss from the *reader*!)
-+    [reader dismissModalViewControllerAnimated: YES];
-+}
-+
-+- (BOOL) shouldAutorotateToInterfaceOrientation: (UIInterfaceOrientation) orient
-+{
-+    return(YES);
-+}
-+
-+- (void) dealloc {
-+    self.resultImage = nil;
-+    self.resultText = nil;
-+    [super dealloc];
-+}
-+
-+@end
-diff -r 563557a923d0 iphone/examples/ReaderSample/ReaderSample/en.lproj/InfoPlist.strings
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/examples/ReaderSample/ReaderSample/en.lproj/InfoPlist.strings	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,2 @@
-+/* Localized versions of Info.plist keys */
-+
-diff -r 563557a923d0 iphone/examples/ReaderSample/ReaderSample/en.lproj/MainWindow.xib
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/examples/ReaderSample/ReaderSample/en.lproj/MainWindow.xib	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,444 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
-+	<data>
-+		<int key="IBDocument.SystemTarget">1024</int>
-+		<string key="IBDocument.SystemVersion">10D571</string>
-+		<string key="IBDocument.InterfaceBuilderVersion">786</string>
-+		<string key="IBDocument.AppKitVersion">1038.29</string>
-+		<string key="IBDocument.HIToolboxVersion">460.00</string>
-+		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-+			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-+			<string key="NS.object.0">112</string>
-+		</object>
-+		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
-+			<bool key="EncodedWithXMLCoder">YES</bool>
-+			<integer value="10"/>
-+		</object>
-+		<object class="NSArray" key="IBDocument.PluginDependencies">
-+			<bool key="EncodedWithXMLCoder">YES</bool>
-+			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-+		</object>
-+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-+			<bool key="EncodedWithXMLCoder">YES</bool>
-+			<object class="NSArray" key="dict.sortedKeys" id="0">
-+				<bool key="EncodedWithXMLCoder">YES</bool>
-+			</object>
-+			<object class="NSMutableArray" key="dict.values">
-+				<bool key="EncodedWithXMLCoder">YES</bool>
-+			</object>
-+		</object>
-+		<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
-+			<bool key="EncodedWithXMLCoder">YES</bool>
-+			<object class="IBProxyObject" id="841351856">
-+				<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
-+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-+			</object>
-+			<object class="IBProxyObject" id="427554174">
-+				<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
-+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-+			</object>
-+			<object class="IBUICustomObject" id="664661524">
-+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-+			</object>
-+			<object class="IBUIViewController" id="943309135">
-+				<string key="IBUINibName">ReaderSampleViewController</string>
-+				<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
-+				<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
-+					<int key="interfaceOrientation">1</int>
-+				</object>
-+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-+				<bool key="IBUIHorizontal">NO</bool>
-+			</object>
-+			<object class="IBUIWindow" id="117978783">
-+				<nil key="NSNextResponder"/>
-+				<int key="NSvFlags">292</int>
-+				<string key="NSFrameSize">{320, 480}</string>
-+				<object class="NSColor" key="IBUIBackgroundColor">
-+					<int key="NSColorSpace">1</int>
-+					<bytes key="NSRGB">MSAxIDEAA</bytes>
-+				</object>
-+				<bool key="IBUIOpaque">NO</bool>
-+				<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
-+				<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
-+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-+				<bool key="IBUIResizesToFullScreen">YES</bool>
-+			</object>
-+		</object>
-+		<object class="IBObjectContainer" key="IBDocument.Objects">
-+			<object class="NSMutableArray" key="connectionRecords">
-+				<bool key="EncodedWithXMLCoder">YES</bool>
-+				<object class="IBConnectionRecord">
-+					<object class="IBCocoaTouchOutletConnection" key="connection">
-+						<string key="label">delegate</string>
-+						<reference key="source" ref="841351856"/>
-+						<reference key="destination" ref="664661524"/>
-+					</object>
-+					<int key="connectionID">4</int>
-+				</object>
-+				<object class="IBConnectionRecord">
-+					<object class="IBCocoaTouchOutletConnection" key="connection">
-+						<string key="label">viewController</string>
-+						<reference key="source" ref="664661524"/>
-+						<reference key="destination" ref="943309135"/>
-+					</object>
-+					<int key="connectionID">11</int>
-+				</object>
-+				<object class="IBConnectionRecord">
-+					<object class="IBCocoaTouchOutletConnection" key="connection">
-+						<string key="label">window</string>
-+						<reference key="source" ref="664661524"/>
-+						<reference key="destination" ref="117978783"/>
-+					</object>
-+					<int key="connectionID">14</int>
-+				</object>
-+			</object>
-+			<object class="IBMutableOrderedSet" key="objectRecords">
-+				<object class="NSArray" key="orderedObjects">
-+					<bool key="EncodedWithXMLCoder">YES</bool>
-+					<object class="IBObjectRecord">
-+						<int key="objectID">0</int>
-+						<reference key="object" ref="0"/>
-+						<reference key="children" ref="1000"/>
-+						<nil key="parent"/>
-+					</object>
-+					<object class="IBObjectRecord">
-+						<int key="objectID">-1</int>
-+						<reference key="object" ref="841351856"/>
-+						<reference key="parent" ref="0"/>
-+						<string key="objectName">File's Owner</string>
-+					</object>
-+					<object class="IBObjectRecord">
-+						<int key="objectID">3</int>
-+						<reference key="object" ref="664661524"/>
-+						<reference key="parent" ref="0"/>
-+						<string key="objectName">ReaderSample App Delegate</string>
-+					</object>
-+					<object class="IBObjectRecord">
-+						<int key="objectID">-2</int>
-+						<reference key="object" ref="427554174"/>
-+						<reference key="parent" ref="0"/>
-+					</object>
-+					<object class="IBObjectRecord">
-+						<int key="objectID">10</int>
-+						<reference key="object" ref="943309135"/>
-+						<reference key="parent" ref="0"/>
-+					</object>
-+					<object class="IBObjectRecord">
-+						<int key="objectID">12</int>
-+						<reference key="object" ref="117978783"/>
-+						<reference key="parent" ref="0"/>
-+					</object>
-+				</object>
-+			</object>
-+			<object class="NSMutableDictionary" key="flattenedProperties">
-+				<bool key="EncodedWithXMLCoder">YES</bool>
-+				<object class="NSArray" key="dict.sortedKeys">
-+					<bool key="EncodedWithXMLCoder">YES</bool>
-+					<string>-1.CustomClassName</string>
-+					<string>-2.CustomClassName</string>
-+					<string>10.CustomClassName</string>
-+					<string>10.IBEditorWindowLastContentRect</string>
-+					<string>10.IBPluginDependency</string>
-+					<string>12.IBEditorWindowLastContentRect</string>
-+					<string>12.IBPluginDependency</string>
-+					<string>3.CustomClassName</string>
-+					<string>3.IBPluginDependency</string>
-+				</object>
-+				<object class="NSMutableArray" key="dict.values">
-+					<bool key="EncodedWithXMLCoder">YES</bool>
-+					<string>UIApplication</string>
-+					<string>UIResponder</string>
-+					<string>ReaderSampleViewController</string>
-+					<string>{{234, 376}, {320, 480}}</string>
-+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-+					<string>{{525, 346}, {320, 480}}</string>
-+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-+					<string>ReaderSampleAppDelegate</string>
-+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-+				</object>
-+			</object>
-+			<object class="NSMutableDictionary" key="unlocalizedProperties">
-+				<bool key="EncodedWithXMLCoder">YES</bool>
-+				<reference key="dict.sortedKeys" ref="0"/>
-+				<object class="NSMutableArray" key="dict.values">
-+					<bool key="EncodedWithXMLCoder">YES</bool>
-+				</object>
-+			</object>
-+			<nil key="activeLocalization"/>
-+			<object class="NSMutableDictionary" key="localizations">
-+				<bool key="EncodedWithXMLCoder">YES</bool>
-+				<reference key="dict.sortedKeys" ref="0"/>
-+				<object class="NSMutableArray" key="dict.values">
-+					<bool key="EncodedWithXMLCoder">YES</bool>
-+				</object>
-+			</object>
-+			<nil key="sourceID"/>
-+			<int key="maxID">15</int>
-+		</object>
-+		<object class="IBClassDescriber" key="IBDocument.Classes">
-+			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
-+				<bool key="EncodedWithXMLCoder">YES</bool>
-+				<object class="IBPartialClassDescription">
-+					<string key="className">UIWindow</string>
-+					<string key="superclassName">UIView</string>
-+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-+						<string key="majorKey">IBUserSource</string>
-+						<string key="minorKey"/>
-+					</object>
-+				</object>
-+				<object class="IBPartialClassDescription">
-+					<string key="className">ReaderSampleAppDelegate</string>
-+					<string key="superclassName">NSObject</string>
-+					<object class="NSMutableDictionary" key="outlets">
-+						<bool key="EncodedWithXMLCoder">YES</bool>
-+						<object class="NSArray" key="dict.sortedKeys">
-+							<bool key="EncodedWithXMLCoder">YES</bool>
-+							<string>viewController</string>
-+							<string>window</string>
-+						</object>
-+						<object class="NSMutableArray" key="dict.values">
-+							<bool key="EncodedWithXMLCoder">YES</bool>
-+							<string>ReaderSampleViewController</string>
-+							<string>UIWindow</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>viewController</string>
-+							<string>window</string>
-+						</object>
-+						<object class="NSMutableArray" key="dict.values">
-+							<bool key="EncodedWithXMLCoder">YES</bool>
-+							<object class="IBToOneOutletInfo">
-+								<string key="name">viewController</string>
-+								<string key="candidateClassName">ReaderSampleViewController</string>
-+							</object>
-+							<object class="IBToOneOutletInfo">
-+								<string key="name">window</string>
-+								<string key="candidateClassName">UIWindow</string>
-+							</object>
-+						</object>
-+					</object>
-+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-+						<string key="majorKey">IBProjectSource</string>
-+						<string key="minorKey">ReaderSampleAppDelegate.h</string>
-+					</object>
-+				</object>
-+				<object class="IBPartialClassDescription">
-+					<string key="className">ReaderSampleAppDelegate</string>
-+					<string key="superclassName">NSObject</string>
-+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-+						<string key="majorKey">IBUserSource</string>
-+						<string key="minorKey"/>
-+					</object>
-+				</object>
-+				<object class="IBPartialClassDescription">
-+					<string key="className">ReaderSampleViewController</string>
-+					<string key="superclassName">UIViewController</string>
-+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-+						<string key="majorKey">IBProjectSource</string>
-+						<string key="minorKey">ReaderSampleViewController.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="356479594">
-+						<string key="majorKey">IBFrameworkSource</string>
-+						<string key="minorKey">UIKit.framework/Headers/UIResponder.h</string>
-+					</object>
-+				</object>
-+				<object class="IBPartialClassDescription">
-+					<string key="className">UIApplication</string>
-+					<string key="superclassName">UIResponder</string>
-+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-+						<string key="majorKey">IBFrameworkSource</string>
-+						<string key="minorKey">UIKit.framework/Headers/UIApplication.h</string>
-+					</object>
-+				</object>
-+				<object class="IBPartialClassDescription">
-+					<string key="className">UIResponder</string>
-+					<string key="superclassName">NSObject</string>
-+					<reference key="sourceIdentifier" ref="356479594"/>
-+				</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">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 class="IBPartialClassDescription">
-+					<string key="className">UIWindow</string>
-+					<string key="superclassName">UIView</string>
-+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-+						<string key="majorKey">IBFrameworkSource</string>
-+						<string key="minorKey">UIKit.framework/Headers/UIWindow.h</string>
-+					</object>
-+				</object>
-+			</object>
-+		</object>
-+		<int key="IBDocument.localizationMode">0</int>
-+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-+			<integer value="1024" key="NS.object.0"/>
-+		</object>
-+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
-+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
-+			<integer value="3100" key="NS.object.0"/>
-+		</object>
-+		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-+		<string key="IBDocument.LastKnownRelativeProjectPath">ReaderSample.xcodeproj</string>
-+		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-+		<string key="IBCocoaTouchPluginVersion">112</string>
-+	</data>
-+</archive>
-diff -r 563557a923d0 iphone/examples/ReaderSample/ReaderSample/en.lproj/ReaderSampleViewController.xib
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/examples/ReaderSample/ReaderSample/en.lproj/ReaderSampleViewController.xib	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,319 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
-+	<data>
-+		<int key="IBDocument.SystemTarget">1056</int>
-+		<string key="IBDocument.SystemVersion">10J869</string>
-+		<string key="IBDocument.InterfaceBuilderVersion">1306</string>
-+		<string key="IBDocument.AppKitVersion">1038.35</string>
-+		<string key="IBDocument.HIToolboxVersion">461.00</string>
-+		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-+			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-+			<string key="NS.object.0">301</string>
-+		</object>
-+		<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
-+			<bool key="EncodedWithXMLCoder">YES</bool>
-+			<string>IBUITextView</string>
-+			<string>IBUIButton</string>
-+			<string>IBUIImageView</string>
-+			<string>IBUIView</string>
-+			<string>IBProxyObject</string>
-+		</object>
-+		<object class="NSArray" key="IBDocument.PluginDependencies">
-+			<bool key="EncodedWithXMLCoder">YES</bool>
-+			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-+		</object>
-+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-+			<bool key="EncodedWithXMLCoder">YES</bool>
-+			<object class="NSArray" key="dict.sortedKeys" id="0">
-+				<bool key="EncodedWithXMLCoder">YES</bool>
-+			</object>
-+			<reference key="dict.values" ref="0"/>
-+		</object>
-+		<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
-+			<bool key="EncodedWithXMLCoder">YES</bool>
-+			<object class="IBProxyObject" id="372490531">
-+				<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
-+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-+			</object>
-+			<object class="IBProxyObject" id="843779117">
-+				<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
-+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-+			</object>
-+			<object class="IBUIView" id="774585933">
-+				<reference key="NSNextResponder"/>
-+				<int key="NSvFlags">274</int>
-+				<object class="NSMutableArray" key="NSSubviews">
-+					<bool key="EncodedWithXMLCoder">YES</bool>
-+					<object class="IBUIButton" id="973537804">
-+						<reference key="NSNextResponder" ref="774585933"/>
-+						<int key="NSvFlags">282</int>
-+						<string key="NSFrame">{{20, 396}, {280, 44}}</string>
-+						<reference key="NSSuperview" ref="774585933"/>
-+						<reference key="NSWindow"/>
-+						<bool key="IBUIOpaque">NO</bool>
-+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-+						<int key="IBUIContentHorizontalAlignment">0</int>
-+						<int key="IBUIContentVerticalAlignment">0</int>
-+						<object class="NSFont" key="IBUIFont">
-+							<string key="NSName">Helvetica-Bold</string>
-+							<double key="NSSize">19</double>
-+							<int key="NSfFlags">16</int>
-+						</object>
-+						<int key="IBUIButtonType">1</int>
-+						<string key="IBUINormalTitle">Scan</string>
-+						<object class="NSColor" key="IBUIHighlightedTitleColor">
-+							<int key="NSColorSpace">3</int>
-+							<bytes key="NSWhite">MQA</bytes>
-+						</object>
-+						<object class="NSColor" key="IBUINormalTitleColor">
-+							<int key="NSColorSpace">1</int>
-+							<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
-+						</object>
-+						<object class="NSColor" key="IBUINormalTitleShadowColor">
-+							<int key="NSColorSpace">3</int>
-+							<bytes key="NSWhite">MC41AA</bytes>
-+						</object>
-+					</object>
-+					<object class="IBUIImageView" id="409141881">
-+						<reference key="NSNextResponder" ref="774585933"/>
-+						<int key="NSvFlags">311</int>
-+						<string key="NSFrame">{{20, 20}, {280, 210}}</string>
-+						<reference key="NSSuperview" ref="774585933"/>
-+						<reference key="NSWindow"/>
-+						<reference key="NSNextKeyView" ref="790976943"/>
-+						<int key="IBUIContentMode">1</int>
-+						<bool key="IBUIUserInteractionEnabled">NO</bool>
-+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-+					</object>
-+					<object class="IBUITextView" id="790976943">
-+						<reference key="NSNextResponder" ref="774585933"/>
-+						<int key="NSvFlags">282</int>
-+						<string key="NSFrame">{{20, 238}, {280, 150}}</string>
-+						<reference key="NSSuperview" ref="774585933"/>
-+						<reference key="NSWindow"/>
-+						<reference key="NSNextKeyView" ref="973537804"/>
-+						<object class="NSColor" key="IBUIBackgroundColor">
-+							<int key="NSColorSpace">3</int>
-+							<bytes key="NSWhite">MCAwAA</bytes>
-+						</object>
-+						<bool key="IBUIClipsSubviews">YES</bool>
-+						<bool key="IBUIMultipleTouchEnabled">YES</bool>
-+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-+						<bool key="IBUIEditable">NO</bool>
-+						<string key="IBUIText">No barcode scanned...</string>
-+						<object class="NSFont" key="IBUIFont">
-+							<string key="NSName">Helvetica</string>
-+							<double key="NSSize">17</double>
-+							<int key="NSfFlags">16</int>
-+						</object>
-+						<object class="IBUITextInputTraits" key="IBUITextInputTraits">
-+							<int key="IBUIAutocapitalizationType">2</int>
-+							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-+						</object>
-+					</object>
-+				</object>
-+				<string key="NSFrame">{{0, 20}, {320, 460}}</string>
-+				<reference key="NSSuperview"/>
-+				<reference key="NSWindow"/>
-+				<reference key="NSNextKeyView" ref="409141881"/>
-+				<object class="NSColor" key="IBUIBackgroundColor">
-+					<int key="NSColorSpace">3</int>
-+					<bytes key="NSWhite">MC43NQA</bytes>
-+					<object class="NSColorSpace" key="NSCustomColorSpace">
-+						<int key="NSID">2</int>
-+					</object>
-+				</object>
-+				<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
-+				<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
-+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-+			</object>
-+		</object>
-+		<object class="IBObjectContainer" key="IBDocument.Objects">
-+			<object class="NSMutableArray" key="connectionRecords">
-+				<bool key="EncodedWithXMLCoder">YES</bool>
-+				<object class="IBConnectionRecord">
-+					<object class="IBCocoaTouchOutletConnection" key="connection">
-+						<string key="label">view</string>
-+						<reference key="source" ref="372490531"/>
-+						<reference key="destination" ref="774585933"/>
-+					</object>
-+					<int key="connectionID">7</int>
-+				</object>
-+				<object class="IBConnectionRecord">
-+					<object class="IBCocoaTouchOutletConnection" key="connection">
-+						<string key="label">resultImage</string>
-+						<reference key="source" ref="372490531"/>
-+						<reference key="destination" ref="409141881"/>
-+					</object>
-+					<int key="connectionID">11</int>
-+				</object>
-+				<object class="IBConnectionRecord">
-+					<object class="IBCocoaTouchOutletConnection" key="connection">
-+						<string key="label">resultText</string>
-+						<reference key="source" ref="372490531"/>
-+						<reference key="destination" ref="790976943"/>
-+					</object>
-+					<int key="connectionID">12</int>
-+				</object>
-+				<object class="IBConnectionRecord">
-+					<object class="IBCocoaTouchEventConnection" key="connection">
-+						<string key="label">scanButtonTapped</string>
-+						<reference key="source" ref="973537804"/>
-+						<reference key="destination" ref="372490531"/>
-+						<int key="IBEventType">7</int>
-+					</object>
-+					<int key="connectionID">13</int>
-+				</object>
-+			</object>
-+			<object class="IBMutableOrderedSet" key="objectRecords">
-+				<object class="NSArray" key="orderedObjects">
-+					<bool key="EncodedWithXMLCoder">YES</bool>
-+					<object class="IBObjectRecord">
-+						<int key="objectID">0</int>
-+						<reference key="object" ref="0"/>
-+						<reference key="children" ref="1000"/>
-+						<nil key="parent"/>
-+					</object>
-+					<object class="IBObjectRecord">
-+						<int key="objectID">-1</int>
-+						<reference key="object" ref="372490531"/>
-+						<reference key="parent" ref="0"/>
-+						<string key="objectName">File's Owner</string>
-+					</object>
-+					<object class="IBObjectRecord">
-+						<int key="objectID">-2</int>
-+						<reference key="object" ref="843779117"/>
-+						<reference key="parent" ref="0"/>
-+					</object>
-+					<object class="IBObjectRecord">
-+						<int key="objectID">6</int>
-+						<reference key="object" ref="774585933"/>
-+						<object class="NSMutableArray" key="children">
-+							<bool key="EncodedWithXMLCoder">YES</bool>
-+							<reference ref="973537804"/>
-+							<reference ref="409141881"/>
-+							<reference ref="790976943"/>
-+						</object>
-+						<reference key="parent" ref="0"/>
-+					</object>
-+					<object class="IBObjectRecord">
-+						<int key="objectID">8</int>
-+						<reference key="object" ref="973537804"/>
-+						<reference key="parent" ref="774585933"/>
-+					</object>
-+					<object class="IBObjectRecord">
-+						<int key="objectID">9</int>
-+						<reference key="object" ref="409141881"/>
-+						<reference key="parent" ref="774585933"/>
-+					</object>
-+					<object class="IBObjectRecord">
-+						<int key="objectID">10</int>
-+						<reference key="object" ref="790976943"/>
-+						<reference key="parent" ref="774585933"/>
-+					</object>
-+				</object>
-+			</object>
-+			<object class="NSMutableDictionary" key="flattenedProperties">
-+				<bool key="EncodedWithXMLCoder">YES</bool>
-+				<object class="NSArray" key="dict.sortedKeys">
-+					<bool key="EncodedWithXMLCoder">YES</bool>
-+					<string>-1.CustomClassName</string>
-+					<string>-2.CustomClassName</string>
-+					<string>10.IBPluginDependency</string>
-+					<string>6.IBEditorWindowLastContentRect</string>
-+					<string>6.IBPluginDependency</string>
-+					<string>8.IBPluginDependency</string>
-+					<string>9.IBPluginDependency</string>
-+				</object>
-+				<object class="NSMutableArray" key="dict.values">
-+					<bool key="EncodedWithXMLCoder">YES</bool>
-+					<string>ReaderSampleViewController</string>
-+					<string>UIResponder</string>
-+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-+					<string>{{239, 654}, {320, 480}}</string>
-+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-+				</object>
-+			</object>
-+			<object class="NSMutableDictionary" key="unlocalizedProperties">
-+				<bool key="EncodedWithXMLCoder">YES</bool>
-+				<reference key="dict.sortedKeys" ref="0"/>
-+				<reference key="dict.values" ref="0"/>
-+			</object>
-+			<nil key="activeLocalization"/>
-+			<object class="NSMutableDictionary" key="localizations">
-+				<bool key="EncodedWithXMLCoder">YES</bool>
-+				<reference key="dict.sortedKeys" ref="0"/>
-+				<reference key="dict.values" ref="0"/>
-+			</object>
-+			<nil key="sourceID"/>
-+			<int key="maxID">13</int>
-+		</object>
-+		<object class="IBClassDescriber" key="IBDocument.Classes">
-+			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
-+				<bool key="EncodedWithXMLCoder">YES</bool>
-+				<object class="IBPartialClassDescription">
-+					<string key="className">ReaderSampleViewController</string>
-+					<string key="superclassName">UIViewController</string>
-+					<object class="NSMutableDictionary" key="actions">
-+						<string key="NS.key.0">scanButtonTapped</string>
-+						<string key="NS.object.0">id</string>
-+					</object>
-+					<object class="NSMutableDictionary" key="actionInfosByName">
-+						<string key="NS.key.0">scanButtonTapped</string>
-+						<object class="IBActionInfo" key="NS.object.0">
-+							<string key="name">scanButtonTapped</string>
-+							<string key="candidateClassName">id</string>
-+						</object>
-+					</object>
-+					<object class="NSMutableDictionary" key="outlets">
-+						<bool key="EncodedWithXMLCoder">YES</bool>
-+						<object class="NSArray" key="dict.sortedKeys">
-+							<bool key="EncodedWithXMLCoder">YES</bool>
-+							<string>resultImage</string>
-+							<string>resultText</string>
-+						</object>
-+						<object class="NSMutableArray" key="dict.values">
-+							<bool key="EncodedWithXMLCoder">YES</bool>
-+							<string>UIImageView</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>resultImage</string>
-+							<string>resultText</string>
-+						</object>
-+						<object class="NSMutableArray" key="dict.values">
-+							<bool key="EncodedWithXMLCoder">YES</bool>
-+							<object class="IBToOneOutletInfo">
-+								<string key="name">resultImage</string>
-+								<string key="candidateClassName">UIImageView</string>
-+							</object>
-+							<object class="IBToOneOutletInfo">
-+								<string key="name">resultText</string>
-+								<string key="candidateClassName">UITextView</string>
-+							</object>
-+						</object>
-+					</object>
-+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-+						<string key="majorKey">IBProjectSource</string>
-+						<string key="minorKey">./Classes/ReaderSampleViewController.h</string>
-+					</object>
-+				</object>
-+			</object>
-+		</object>
-+		<int key="IBDocument.localizationMode">0</int>
-+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
-+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
-+			<integer value="3100" key="NS.object.0"/>
-+		</object>
-+		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-+		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-+		<string key="IBCocoaTouchPluginVersion">301</string>
-+	</data>
-+</archive>
-diff -r 563557a923d0 iphone/examples/ReaderSample/ReaderSample/main.m
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/examples/ReaderSample/ReaderSample/main.m	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,16 @@
-+//
-+//  main.m
-+//  ReaderSample
-+//
-+//  Created by spadix on 4/14/11.
-+//
-+
-+#import <UIKit/UIKit.h>
-+
-+int main(int argc, char *argv[])
-+{
-+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-+    int retVal = UIApplicationMain(argc, argv, nil, nil);
-+    [pool release];
-+    return retVal;
-+}
-diff -r 563557a923d0 iphone/examples/ReaderSample/ZBarSDK
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/examples/ReaderSample/ZBarSDK	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,1 @@
-+../../build/Debug-iphoneos/ZBarSDK
-\ No newline at end of file
-diff -r 563557a923d0 iphone/examples/ReaderSample/build
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/examples/ReaderSample/build	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,1 @@
-+/tmp/ReaderSample.build
-\ No newline at end of file
-diff -r 563557a923d0 iphone/examples/TabReader/Default-568h@2x.png
-Binary file iphone/examples/TabReader/Default-568h@2x.png has changed
-diff -r 563557a923d0 iphone/examples/TabReader/TabReader.xcodeproj/project.pbxproj
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/examples/TabReader/TabReader.xcodeproj/project.pbxproj	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,420 @@
-+// !$*UTF8*$!
-+{
-+	archiveVersion = 1;
-+	classes = {
-+	};
-+	objectVersion = 46;
-+	objects = {
-+
-+/* Begin PBXBuildFile section */
-+		DC52DED31370F5340048DADA /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52DECE1370F5340048DADA /* AVFoundation.framework */; };
-+		DC52DED41370F5340048DADA /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52DECF1370F5340048DADA /* CoreMedia.framework */; };
-+		DC52DED51370F5340048DADA /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52DED01370F5340048DADA /* CoreVideo.framework */; };
-+		DC52DED61370F5340048DADA /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52DED11370F5340048DADA /* libiconv.dylib */; };
-+		DC52DED71370F5340048DADA /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52DED21370F5340048DADA /* QuartzCore.framework */; };
-+		DC5D76D71370EE8F0069AEF5 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC5D76D61370EE8F0069AEF5 /* UIKit.framework */; };
-+		DC5D76D91370EE8F0069AEF5 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC5D76D81370EE8F0069AEF5 /* Foundation.framework */; };
-+		DC5D76DB1370EE8F0069AEF5 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC5D76DA1370EE8F0069AEF5 /* CoreGraphics.framework */; };
-+		DC5D76E11370EE8F0069AEF5 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = DC5D76DF1370EE8F0069AEF5 /* InfoPlist.strings */; };
-+		DC5D76E41370EE8F0069AEF5 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = DC5D76E31370EE8F0069AEF5 /* main.m */; };
-+		DC5D76E71370EE8F0069AEF5 /* TabReaderAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = DC5D76E61370EE8F0069AEF5 /* TabReaderAppDelegate.m */; };
-+		DC5D76EA1370EE8F0069AEF5 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = DC5D76E81370EE8F0069AEF5 /* MainWindow.xib */; };
-+		DC5D76F01370EE8F0069AEF5 /* ResultsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DC5D76EF1370EE8F0069AEF5 /* ResultsViewController.m */; };
-+		DC5D76F61370EE8F0069AEF5 /* ResultsView.xib in Resources */ = {isa = PBXBuildFile; fileRef = DC5D76F41370EE8F0069AEF5 /* ResultsView.xib */; };
-+		DC5D771A1370F0E30069AEF5 /* libzbar.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC5D77141370F0E30069AEF5 /* libzbar.a */; };
-+		DC5D771B1370F0E30069AEF5 /* zbar-back.png in Resources */ = {isa = PBXBuildFile; fileRef = DC5D77161370F0E30069AEF5 /* zbar-back.png */; };
-+		DC5D771C1370F0E30069AEF5 /* zbar-help.html in Resources */ = {isa = PBXBuildFile; fileRef = DC5D77171370F0E30069AEF5 /* zbar-help.html */; };
-+		DC5D771D1370F0E30069AEF5 /* zbar-helpicons.png in Resources */ = {isa = PBXBuildFile; fileRef = DC5D77181370F0E30069AEF5 /* zbar-helpicons.png */; };
-+		DC5D771E1370F0E30069AEF5 /* zbar-samples.png in Resources */ = {isa = PBXBuildFile; fileRef = DC5D77191370F0E30069AEF5 /* zbar-samples.png */; };
-+		DC82460B162B5A1D0010B2E6 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DC82460A162B5A1D0010B2E6 /* Default-568h@2x.png */; };
-+/* End PBXBuildFile section */
-+
-+/* Begin PBXFileReference section */
-+		DC52DECE1370F5340048DADA /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
-+		DC52DECF1370F5340048DADA /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; };
-+		DC52DED01370F5340048DADA /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; };
-+		DC52DED11370F5340048DADA /* libiconv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libiconv.dylib; path = usr/lib/libiconv.dylib; sourceTree = SDKROOT; };
-+		DC52DED21370F5340048DADA /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
-+		DC5D76D21370EE8F0069AEF5 /* TabReader.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TabReader.app; sourceTree = BUILT_PRODUCTS_DIR; };
-+		DC5D76D61370EE8F0069AEF5 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
-+		DC5D76D81370EE8F0069AEF5 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
-+		DC5D76DA1370EE8F0069AEF5 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
-+		DC5D76DE1370EE8F0069AEF5 /* TabReader-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "TabReader-Info.plist"; sourceTree = "<group>"; };
-+		DC5D76E01370EE8F0069AEF5 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-+		DC5D76E21370EE8F0069AEF5 /* TabReader-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "TabReader-Prefix.pch"; sourceTree = "<group>"; };
-+		DC5D76E31370EE8F0069AEF5 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
-+		DC5D76E51370EE8F0069AEF5 /* TabReaderAppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TabReaderAppDelegate.h; sourceTree = "<group>"; };
-+		DC5D76E61370EE8F0069AEF5 /* TabReaderAppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TabReaderAppDelegate.m; sourceTree = "<group>"; };
-+		DC5D76E91370EE8F0069AEF5 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/MainWindow.xib; sourceTree = "<group>"; };
-+		DC5D76EE1370EE8F0069AEF5 /* ResultsViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ResultsViewController.h; sourceTree = "<group>"; };
-+		DC5D76EF1370EE8F0069AEF5 /* ResultsViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ResultsViewController.m; sourceTree = "<group>"; };
-+		DC5D76F51370EE8F0069AEF5 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/ResultsView.xib; sourceTree = "<group>"; };
-+		DC5D77001370F0E30069AEF5 /* Decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Decoder.h; sourceTree = "<group>"; };
-+		DC5D77011370F0E30069AEF5 /* Exception.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Exception.h; sourceTree = "<group>"; };
-+		DC5D77021370F0E30069AEF5 /* Image.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Image.h; sourceTree = "<group>"; };
-+		DC5D77031370F0E30069AEF5 /* ImageScanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImageScanner.h; sourceTree = "<group>"; };
-+		DC5D77041370F0E30069AEF5 /* Processor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Processor.h; sourceTree = "<group>"; };
-+		DC5D77051370F0E30069AEF5 /* Scanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Scanner.h; sourceTree = "<group>"; };
-+		DC5D77061370F0E30069AEF5 /* Symbol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Symbol.h; sourceTree = "<group>"; };
-+		DC5D77071370F0E30069AEF5 /* Video.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Video.h; sourceTree = "<group>"; };
-+		DC5D77081370F0E30069AEF5 /* Window.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Window.h; sourceTree = "<group>"; };
-+		DC5D77091370F0E30069AEF5 /* zbar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zbar.h; sourceTree = "<group>"; };
-+		DC5D770A1370F0E30069AEF5 /* ZBarCameraSimulator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarCameraSimulator.h; sourceTree = "<group>"; };
-+		DC5D770B1370F0E30069AEF5 /* ZBarCaptureReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarCaptureReader.h; sourceTree = "<group>"; };
-+		DC5D770C1370F0E30069AEF5 /* ZBarHelpController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarHelpController.h; sourceTree = "<group>"; };
-+		DC5D770D1370F0E30069AEF5 /* ZBarImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarImage.h; sourceTree = "<group>"; };
-+		DC5D770E1370F0E30069AEF5 /* ZBarImageScanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarImageScanner.h; sourceTree = "<group>"; };
-+		DC5D770F1370F0E30069AEF5 /* ZBarReaderController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarReaderController.h; sourceTree = "<group>"; };
-+		DC5D77101370F0E30069AEF5 /* ZBarReaderView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarReaderView.h; sourceTree = "<group>"; };
-+		DC5D77111370F0E30069AEF5 /* ZBarReaderViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarReaderViewController.h; sourceTree = "<group>"; };
-+		DC5D77121370F0E30069AEF5 /* ZBarSDK.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarSDK.h; sourceTree = "<group>"; };
-+		DC5D77131370F0E30069AEF5 /* ZBarSymbol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarSymbol.h; sourceTree = "<group>"; };
-+		DC5D77141370F0E30069AEF5 /* libzbar.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libzbar.a; sourceTree = "<group>"; };
-+		DC5D77161370F0E30069AEF5 /* zbar-back.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "zbar-back.png"; sourceTree = "<group>"; };
-+		DC5D77171370F0E30069AEF5 /* zbar-help.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "zbar-help.html"; sourceTree = "<group>"; };
-+		DC5D77181370F0E30069AEF5 /* zbar-helpicons.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "zbar-helpicons.png"; sourceTree = "<group>"; };
-+		DC5D77191370F0E30069AEF5 /* zbar-samples.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "zbar-samples.png"; sourceTree = "<group>"; };
-+		DC82460A162B5A1D0010B2E6 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = SOURCE_ROOT; };
-+/* End PBXFileReference section */
-+
-+/* Begin PBXFrameworksBuildPhase section */
-+		DC5D76CF1370EE8F0069AEF5 /* Frameworks */ = {
-+			isa = PBXFrameworksBuildPhase;
-+			buildActionMask = 2147483647;
-+			files = (
-+				DC52DED31370F5340048DADA /* AVFoundation.framework in Frameworks */,
-+				DC52DED41370F5340048DADA /* CoreMedia.framework in Frameworks */,
-+				DC52DED51370F5340048DADA /* CoreVideo.framework in Frameworks */,
-+				DC52DED61370F5340048DADA /* libiconv.dylib in Frameworks */,
-+				DC52DED71370F5340048DADA /* QuartzCore.framework in Frameworks */,
-+				DC5D76D71370EE8F0069AEF5 /* UIKit.framework in Frameworks */,
-+				DC5D76D91370EE8F0069AEF5 /* Foundation.framework in Frameworks */,
-+				DC5D76DB1370EE8F0069AEF5 /* CoreGraphics.framework in Frameworks */,
-+				DC5D771A1370F0E30069AEF5 /* libzbar.a in Frameworks */,
-+			);
-+			runOnlyForDeploymentPostprocessing = 0;
-+		};
-+/* End PBXFrameworksBuildPhase section */
-+
-+/* Begin PBXGroup section */
-+		DC5D76C71370EE8D0069AEF5 = {
-+			isa = PBXGroup;
-+			children = (
-+				DC5D76DC1370EE8F0069AEF5 /* TabReader */,
-+				DC5D76FC1370F0E30069AEF5 /* ZBarSDK */,
-+				DC5D76D51370EE8F0069AEF5 /* Frameworks */,
-+				DC5D76D31370EE8F0069AEF5 /* Products */,
-+			);
-+			sourceTree = "<group>";
-+		};
-+		DC5D76D31370EE8F0069AEF5 /* Products */ = {
-+			isa = PBXGroup;
-+			children = (
-+				DC5D76D21370EE8F0069AEF5 /* TabReader.app */,
-+			);
-+			name = Products;
-+			sourceTree = "<group>";
-+		};
-+		DC5D76D51370EE8F0069AEF5 /* Frameworks */ = {
-+			isa = PBXGroup;
-+			children = (
-+				DC5D76D61370EE8F0069AEF5 /* UIKit.framework */,
-+				DC5D76D81370EE8F0069AEF5 /* Foundation.framework */,
-+				DC5D76DA1370EE8F0069AEF5 /* CoreGraphics.framework */,
-+				DC52DECE1370F5340048DADA /* AVFoundation.framework */,
-+				DC52DECF1370F5340048DADA /* CoreMedia.framework */,
-+				DC52DED01370F5340048DADA /* CoreVideo.framework */,
-+				DC52DED11370F5340048DADA /* libiconv.dylib */,
-+				DC52DED21370F5340048DADA /* QuartzCore.framework */,
-+			);
-+			name = Frameworks;
-+			sourceTree = "<group>";
-+		};
-+		DC5D76DC1370EE8F0069AEF5 /* TabReader */ = {
-+			isa = PBXGroup;
-+			children = (
-+				DC5D76E51370EE8F0069AEF5 /* TabReaderAppDelegate.h */,
-+				DC5D76E61370EE8F0069AEF5 /* TabReaderAppDelegate.m */,
-+				DC5D76E81370EE8F0069AEF5 /* MainWindow.xib */,
-+				DC5D76EE1370EE8F0069AEF5 /* ResultsViewController.h */,
-+				DC5D76EF1370EE8F0069AEF5 /* ResultsViewController.m */,
-+				DC5D76F41370EE8F0069AEF5 /* ResultsView.xib */,
-+				DC5D76DD1370EE8F0069AEF5 /* Supporting Files */,
-+			);
-+			path = TabReader;
-+			sourceTree = "<group>";
-+		};
-+		DC5D76DD1370EE8F0069AEF5 /* Supporting Files */ = {
-+			isa = PBXGroup;
-+			children = (
-+				DC5D76DE1370EE8F0069AEF5 /* TabReader-Info.plist */,
-+				DC5D76DF1370EE8F0069AEF5 /* InfoPlist.strings */,
-+				DC82460A162B5A1D0010B2E6 /* Default-568h@2x.png */,
-+				DC5D76E21370EE8F0069AEF5 /* TabReader-Prefix.pch */,
-+				DC5D76E31370EE8F0069AEF5 /* main.m */,
-+			);
-+			name = "Supporting Files";
-+			sourceTree = "<group>";
-+		};
-+		DC5D76FC1370F0E30069AEF5 /* ZBarSDK */ = {
-+			isa = PBXGroup;
-+			children = (
-+				DC5D76FD1370F0E30069AEF5 /* Headers */,
-+				DC5D77141370F0E30069AEF5 /* libzbar.a */,
-+				DC5D77151370F0E30069AEF5 /* Resources */,
-+			);
-+			path = ZBarSDK;
-+			sourceTree = "<group>";
-+		};
-+		DC5D76FD1370F0E30069AEF5 /* Headers */ = {
-+			isa = PBXGroup;
-+			children = (
-+				DC5D76FE1370F0E30069AEF5 /* ZBarSDK */,
-+			);
-+			path = Headers;
-+			sourceTree = "<group>";
-+		};
-+		DC5D76FE1370F0E30069AEF5 /* ZBarSDK */ = {
-+			isa = PBXGroup;
-+			children = (
-+				DC5D76FF1370F0E30069AEF5 /* zbar */,
-+				DC5D77091370F0E30069AEF5 /* zbar.h */,
-+				DC5D770A1370F0E30069AEF5 /* ZBarCameraSimulator.h */,
-+				DC5D770B1370F0E30069AEF5 /* ZBarCaptureReader.h */,
-+				DC5D770C1370F0E30069AEF5 /* ZBarHelpController.h */,
-+				DC5D770D1370F0E30069AEF5 /* ZBarImage.h */,
-+				DC5D770E1370F0E30069AEF5 /* ZBarImageScanner.h */,
-+				DC5D770F1370F0E30069AEF5 /* ZBarReaderController.h */,
-+				DC5D77101370F0E30069AEF5 /* ZBarReaderView.h */,
-+				DC5D77111370F0E30069AEF5 /* ZBarReaderViewController.h */,
-+				DC5D77121370F0E30069AEF5 /* ZBarSDK.h */,
-+				DC5D77131370F0E30069AEF5 /* ZBarSymbol.h */,
-+			);
-+			path = ZBarSDK;
-+			sourceTree = "<group>";
-+		};
-+		DC5D76FF1370F0E30069AEF5 /* zbar */ = {
-+			isa = PBXGroup;
-+			children = (
-+				DC5D77001370F0E30069AEF5 /* Decoder.h */,
-+				DC5D77011370F0E30069AEF5 /* Exception.h */,
-+				DC5D77021370F0E30069AEF5 /* Image.h */,
-+				DC5D77031370F0E30069AEF5 /* ImageScanner.h */,
-+				DC5D77041370F0E30069AEF5 /* Processor.h */,
-+				DC5D77051370F0E30069AEF5 /* Scanner.h */,
-+				DC5D77061370F0E30069AEF5 /* Symbol.h */,
-+				DC5D77071370F0E30069AEF5 /* Video.h */,
-+				DC5D77081370F0E30069AEF5 /* Window.h */,
-+			);
-+			path = zbar;
-+			sourceTree = "<group>";
-+		};
-+		DC5D77151370F0E30069AEF5 /* Resources */ = {
-+			isa = PBXGroup;
-+			children = (
-+				DC5D77161370F0E30069AEF5 /* zbar-back.png */,
-+				DC5D77171370F0E30069AEF5 /* zbar-help.html */,
-+				DC5D77181370F0E30069AEF5 /* zbar-helpicons.png */,
-+				DC5D77191370F0E30069AEF5 /* zbar-samples.png */,
-+			);
-+			path = Resources;
-+			sourceTree = "<group>";
-+		};
-+/* End PBXGroup section */
-+
-+/* Begin PBXNativeTarget section */
-+		DC5D76D11370EE8F0069AEF5 /* TabReader */ = {
-+			isa = PBXNativeTarget;
-+			buildConfigurationList = DC5D76F91370EE900069AEF5 /* Build configuration list for PBXNativeTarget "TabReader" */;
-+			buildPhases = (
-+				DC5D76CE1370EE8F0069AEF5 /* Sources */,
-+				DC5D76CF1370EE8F0069AEF5 /* Frameworks */,
-+				DC5D76D01370EE8F0069AEF5 /* Resources */,
-+			);
-+			buildRules = (
-+			);
-+			dependencies = (
-+			);
-+			name = TabReader;
-+			productName = TabReader;
-+			productReference = DC5D76D21370EE8F0069AEF5 /* TabReader.app */;
-+			productType = "com.apple.product-type.application";
-+		};
-+/* End PBXNativeTarget section */
-+
-+/* Begin PBXProject section */
-+		DC5D76C91370EE8D0069AEF5 /* Project object */ = {
-+			isa = PBXProject;
-+			buildConfigurationList = DC5D76CC1370EE8D0069AEF5 /* Build configuration list for PBXProject "TabReader" */;
-+			compatibilityVersion = "Xcode 3.2";
-+			developmentRegion = English;
-+			hasScannedForEncodings = 0;
-+			knownRegions = (
-+				en,
-+			);
-+			mainGroup = DC5D76C71370EE8D0069AEF5;
-+			productRefGroup = DC5D76D31370EE8F0069AEF5 /* Products */;
-+			projectDirPath = "";
-+			projectRoot = "";
-+			targets = (
-+				DC5D76D11370EE8F0069AEF5 /* TabReader */,
-+			);
-+		};
-+/* End PBXProject section */
-+
-+/* Begin PBXResourcesBuildPhase section */
-+		DC5D76D01370EE8F0069AEF5 /* Resources */ = {
-+			isa = PBXResourcesBuildPhase;
-+			buildActionMask = 2147483647;
-+			files = (
-+				DC5D76E11370EE8F0069AEF5 /* InfoPlist.strings in Resources */,
-+				DC5D76EA1370EE8F0069AEF5 /* MainWindow.xib in Resources */,
-+				DC5D76F61370EE8F0069AEF5 /* ResultsView.xib in Resources */,
-+				DC5D771B1370F0E30069AEF5 /* zbar-back.png in Resources */,
-+				DC5D771C1370F0E30069AEF5 /* zbar-help.html in Resources */,
-+				DC5D771D1370F0E30069AEF5 /* zbar-helpicons.png in Resources */,
-+				DC5D771E1370F0E30069AEF5 /* zbar-samples.png in Resources */,
-+				DC82460B162B5A1D0010B2E6 /* Default-568h@2x.png in Resources */,
-+			);
-+			runOnlyForDeploymentPostprocessing = 0;
-+		};
-+/* End PBXResourcesBuildPhase section */
-+
-+/* Begin PBXSourcesBuildPhase section */
-+		DC5D76CE1370EE8F0069AEF5 /* Sources */ = {
-+			isa = PBXSourcesBuildPhase;
-+			buildActionMask = 2147483647;
-+			files = (
-+				DC5D76E41370EE8F0069AEF5 /* main.m in Sources */,
-+				DC5D76E71370EE8F0069AEF5 /* TabReaderAppDelegate.m in Sources */,
-+				DC5D76F01370EE8F0069AEF5 /* ResultsViewController.m in Sources */,
-+			);
-+			runOnlyForDeploymentPostprocessing = 0;
-+		};
-+/* End PBXSourcesBuildPhase section */
-+
-+/* Begin PBXVariantGroup section */
-+		DC5D76DF1370EE8F0069AEF5 /* InfoPlist.strings */ = {
-+			isa = PBXVariantGroup;
-+			children = (
-+				DC5D76E01370EE8F0069AEF5 /* en */,
-+			);
-+			name = InfoPlist.strings;
-+			sourceTree = "<group>";
-+		};
-+		DC5D76E81370EE8F0069AEF5 /* MainWindow.xib */ = {
-+			isa = PBXVariantGroup;
-+			children = (
-+				DC5D76E91370EE8F0069AEF5 /* en */,
-+			);
-+			name = MainWindow.xib;
-+			sourceTree = "<group>";
-+		};
-+		DC5D76F41370EE8F0069AEF5 /* ResultsView.xib */ = {
-+			isa = PBXVariantGroup;
-+			children = (
-+				DC5D76F51370EE8F0069AEF5 /* en */,
-+			);
-+			name = ResultsView.xib;
-+			sourceTree = "<group>";
-+		};
-+/* End PBXVariantGroup section */
-+
-+/* Begin XCBuildConfiguration section */
-+		DC5D76F71370EE900069AEF5 /* Debug */ = {
-+			isa = XCBuildConfiguration;
-+			buildSettings = {
-+				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
-+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-+				GCC_C_LANGUAGE_STANDARD = gnu99;
-+				GCC_OPTIMIZATION_LEVEL = 0;
-+				GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
-+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-+				GCC_VERSION = com.apple.compilers.llvmgcc42;
-+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-+				GCC_WARN_UNUSED_VARIABLE = YES;
-+				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
-+				SDKROOT = iphoneos;
-+			};
-+			name = Debug;
-+		};
-+		DC5D76F81370EE900069AEF5 /* Release */ = {
-+			isa = XCBuildConfiguration;
-+			buildSettings = {
-+				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
-+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-+				GCC_C_LANGUAGE_STANDARD = gnu99;
-+				GCC_VERSION = com.apple.compilers.llvmgcc42;
-+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-+				GCC_WARN_UNUSED_VARIABLE = YES;
-+				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
-+				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
-+				SDKROOT = iphoneos;
-+			};
-+			name = Release;
-+		};
-+		DC5D76FA1370EE900069AEF5 /* Debug */ = {
-+			isa = XCBuildConfiguration;
-+			buildSettings = {
-+				ALWAYS_SEARCH_USER_PATHS = NO;
-+				COPY_PHASE_STRIP = NO;
-+				GCC_DYNAMIC_NO_PIC = NO;
-+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-+				GCC_PREFIX_HEADER = "TabReader/TabReader-Prefix.pch";
-+				INFOPLIST_FILE = "TabReader/TabReader-Info.plist";
-+				IPHONEOS_DEPLOYMENT_TARGET = 4.0;
-+				LIBRARY_SEARCH_PATHS = (
-+					"$(inherited)",
-+					"\"$(SRCROOT)/ZBarSDK\"",
-+				);
-+				PRODUCT_NAME = "$(TARGET_NAME)";
-+				TARGETED_DEVICE_FAMILY = "1,2";
-+				WRAPPER_EXTENSION = app;
-+			};
-+			name = Debug;
-+		};
-+		DC5D76FB1370EE900069AEF5 /* Release */ = {
-+			isa = XCBuildConfiguration;
-+			buildSettings = {
-+				ALWAYS_SEARCH_USER_PATHS = NO;
-+				COPY_PHASE_STRIP = YES;
-+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-+				GCC_PREFIX_HEADER = "TabReader/TabReader-Prefix.pch";
-+				INFOPLIST_FILE = "TabReader/TabReader-Info.plist";
-+				IPHONEOS_DEPLOYMENT_TARGET = 4.0;
-+				LIBRARY_SEARCH_PATHS = (
-+					"$(inherited)",
-+					"\"$(SRCROOT)/ZBarSDK\"",
-+				);
-+				PRODUCT_NAME = "$(TARGET_NAME)";
-+				TARGETED_DEVICE_FAMILY = "1,2";
-+				VALIDATE_PRODUCT = YES;
-+				WRAPPER_EXTENSION = app;
-+			};
-+			name = Release;
-+		};
-+/* End XCBuildConfiguration section */
-+
-+/* Begin XCConfigurationList section */
-+		DC5D76CC1370EE8D0069AEF5 /* Build configuration list for PBXProject "TabReader" */ = {
-+			isa = XCConfigurationList;
-+			buildConfigurations = (
-+				DC5D76F71370EE900069AEF5 /* Debug */,
-+				DC5D76F81370EE900069AEF5 /* Release */,
-+			);
-+			defaultConfigurationIsVisible = 0;
-+			defaultConfigurationName = Release;
-+		};
-+		DC5D76F91370EE900069AEF5 /* Build configuration list for PBXNativeTarget "TabReader" */ = {
-+			isa = XCConfigurationList;
-+			buildConfigurations = (
-+				DC5D76FA1370EE900069AEF5 /* Debug */,
-+				DC5D76FB1370EE900069AEF5 /* Release */,
-+			);
-+			defaultConfigurationIsVisible = 0;
-+			defaultConfigurationName = Release;
-+		};
-+/* End XCConfigurationList section */
-+	};
-+	rootObject = DC5D76C91370EE8D0069AEF5 /* Project object */;
-+}
-diff -r 563557a923d0 iphone/examples/TabReader/TabReader.xcodeproj/xcshareddata/xcschemes/TabReader.xcscheme
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/examples/TabReader/TabReader.xcodeproj/xcshareddata/xcschemes/TabReader.xcscheme	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,80 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<Scheme
-+   version = "1.8">
-+   <BuildAction
-+      parallelizeBuildables = "YES"
-+      buildImplicitDependencies = "YES">
-+      <BuildActionEntries>
-+         <BuildActionEntry
-+            buildForTesting = "YES"
-+            buildForRunning = "YES"
-+            buildForProfiling = "YES"
-+            buildForArchiving = "YES"
-+            buildForAnalyzing = "YES">
-+            <BuildableReference
-+               BuildableIdentifier = "primary"
-+               BlueprintIdentifier = "DC5D76D11370EE8F0069AEF5"
-+               BuildableName = "TabReader.app"
-+               BlueprintName = "TabReader"
-+               ReferencedContainer = "container:TabReader.xcodeproj">
-+            </BuildableReference>
-+         </BuildActionEntry>
-+      </BuildActionEntries>
-+   </BuildAction>
-+   <TestAction
-+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
-+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
-+      shouldUseLaunchSchemeArgsEnv = "YES"
-+      buildConfiguration = "Debug">
-+      <Testables>
-+      </Testables>
-+   </TestAction>
-+   <LaunchAction
-+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
-+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
-+      displayScaleIsEnabled = "NO"
-+      displayScale = "1.00"
-+      launchStyle = "0"
-+      useCustomWorkingDirectory = "NO"
-+      buildConfiguration = "Debug"
-+      ignoresPersistentStateOnLaunch = "NO"
-+      debugDocumentVersioning = "YES"
-+      allowLocationSimulation = "YES">
-+      <BuildableProductRunnable>
-+         <BuildableReference
-+            BuildableIdentifier = "primary"
-+            BlueprintIdentifier = "DC5D76D11370EE8F0069AEF5"
-+            BuildableName = "TabReader.app"
-+            BlueprintName = "TabReader"
-+            ReferencedContainer = "container:TabReader.xcodeproj">
-+         </BuildableReference>
-+      </BuildableProductRunnable>
-+      <AdditionalOptions>
-+      </AdditionalOptions>
-+   </LaunchAction>
-+   <ProfileAction
-+      displayScaleIsEnabled = "NO"
-+      displayScale = "1.00"
-+      shouldUseLaunchSchemeArgsEnv = "YES"
-+      savedToolIdentifier = ""
-+      useCustomWorkingDirectory = "NO"
-+      buildConfiguration = "Release"
-+      debugDocumentVersioning = "YES">
-+      <BuildableProductRunnable>
-+         <BuildableReference
-+            BuildableIdentifier = "primary"
-+            BlueprintIdentifier = "DC5D76D11370EE8F0069AEF5"
-+            BuildableName = "TabReader.app"
-+            BlueprintName = "TabReader"
-+            ReferencedContainer = "container:TabReader.xcodeproj">
-+         </BuildableReference>
-+      </BuildableProductRunnable>
-+   </ProfileAction>
-+   <AnalyzeAction
-+      buildConfiguration = "Debug">
-+   </AnalyzeAction>
-+   <ArchiveAction
-+      buildConfiguration = "Release"
-+      revealArchiveInOrganizer = "YES">
-+   </ArchiveAction>
-+</Scheme>
-diff -r 563557a923d0 iphone/examples/TabReader/TabReader/ResultsViewController.h
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/examples/TabReader/TabReader/ResultsViewController.h	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,18 @@
-+//
-+//  SecondViewController.h
-+//  TabReader
-+//
-+//  Created by spadix on 5/3/11.
-+//
-+
-+#import <UIKit/UIKit.h>
-+
-+@interface ResultsViewController
-+    : UIViewController
-+{
-+}
-+
-+@property (nonatomic, retain) IBOutlet UIImageView *resultImage;
-+@property (nonatomic, retain) IBOutlet UITextView *resultText;
-+
-+@end
-diff -r 563557a923d0 iphone/examples/TabReader/TabReader/ResultsViewController.m
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/examples/TabReader/TabReader/ResultsViewController.m	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,20 @@
-+//
-+//  SecondViewController.m
-+//  TabReader
-+//
-+//  Created by spadix on 5/3/11.
-+//
-+
-+#import "ResultsViewController.h"
-+
-+
-+@implementation ResultsViewController
-+
-+@synthesize resultImage, resultText;
-+
-+- (BOOL) shouldAutorotateToInterfaceOrientation: (UIInterfaceOrientation) orient
-+{
-+    return(YES);
-+}
-+
-+@end
-diff -r 563557a923d0 iphone/examples/TabReader/TabReader/TabReader-Info.plist
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/examples/TabReader/TabReader/TabReader-Info.plist	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,38 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-+<plist version="1.0">
-+<dict>
-+	<key>CFBundleDevelopmentRegion</key>
-+	<string>en</string>
-+	<key>CFBundleDisplayName</key>
-+	<string>${PRODUCT_NAME}</string>
-+	<key>CFBundleExecutable</key>
-+	<string>${EXECUTABLE_NAME}</string>
-+	<key>CFBundleIconFile</key>
-+	<string></string>
-+	<key>CFBundleIdentifier</key>
-+	<string>net.sourceforge.zbar.${PRODUCT_NAME:rfc1034identifier}</string>
-+	<key>CFBundleInfoDictionaryVersion</key>
-+	<string>6.0</string>
-+	<key>CFBundleName</key>
-+	<string>${PRODUCT_NAME}</string>
-+	<key>CFBundlePackageType</key>
-+	<string>APPL</string>
-+	<key>CFBundleShortVersionString</key>
-+	<string>1.0</string>
-+	<key>CFBundleSignature</key>
-+	<string>????</string>
-+	<key>CFBundleVersion</key>
-+	<string>1.0</string>
-+	<key>LSRequiresIPhoneOS</key>
-+	<true/>
-+	<key>NSMainNibFile</key>
-+	<string>MainWindow</string>
-+	<key>UISupportedInterfaceOrientations</key>
-+	<array>
-+		<string>UIInterfaceOrientationPortrait</string>
-+		<string>UIInterfaceOrientationLandscapeLeft</string>
-+		<string>UIInterfaceOrientationLandscapeRight</string>
-+	</array>
-+</dict>
-+</plist>
-diff -r 563557a923d0 iphone/examples/TabReader/TabReader/TabReader-Prefix.pch
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/examples/TabReader/TabReader/TabReader-Prefix.pch	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,15 @@
-+//
-+// Prefix header for all source files of the 'TabReader' target in the 'TabReader' project
-+//
-+
-+#import <Availability.h>
-+
-+#ifndef __IPHONE_3_0
-+#warning "This project uses features only available in iPhone SDK 3.0 and later."
-+#endif
-+
-+#ifdef __OBJC__
-+# import <UIKit/UIKit.h>
-+# import <Foundation/Foundation.h>
-+# import "ZBarSDK.h"
-+#endif
-diff -r 563557a923d0 iphone/examples/TabReader/TabReader/TabReaderAppDelegate.h
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/examples/TabReader/TabReader/TabReaderAppDelegate.h	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,21 @@
-+//
-+//  TabReaderAppDelegate.h
-+//  TabReader
-+//
-+//  Created by spadix on 5/3/11.
-+//
-+
-+#import <UIKit/UIKit.h>
-+
-+@interface TabReaderAppDelegate
-+    : NSObject
-+    < UIApplicationDelegate,
-+      UITabBarControllerDelegate,
-+      ZBarReaderDelegate >
-+{
-+}
-+
-+@property (nonatomic, retain) IBOutlet UIWindow *window;
-+@property (nonatomic, retain) IBOutlet UITabBarController *tabBarController;
-+
-+@end
-diff -r 563557a923d0 iphone/examples/TabReader/TabReader/TabReaderAppDelegate.m
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/examples/TabReader/TabReader/TabReaderAppDelegate.m	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,62 @@
-+//
-+//  TabReaderAppDelegate.m
-+//  TabReader
-+//
-+//  Created by spadix on 5/3/11.
-+//
-+
-+#import "TabReaderAppDelegate.h"
-+#import "ResultsViewController.h"
-+
-+@implementation TabReaderAppDelegate
-+
-+@synthesize window=_window;
-+@synthesize tabBarController=_tabBarController;
-+
-+- (BOOL)            application: (UIApplication*) application
-+  didFinishLaunchingWithOptions: (NSDictionary*) options
-+{
-+    // force class to load so it may be referenced directly from nib
-+    [ZBarReaderViewController class];
-+
-+    ZBarReaderViewController *reader =
-+        [self.tabBarController.viewControllers objectAtIndex: 0];
-+    reader.readerDelegate = self;
-+    reader.showsZBarControls = NO;
-+    reader.supportedOrientationsMask = ZBarOrientationMaskAll;
-+
-+    self.window.rootViewController = self.tabBarController;
-+    [self.window makeKeyAndVisible];
-+
-+    return(YES);
-+}
-+
-+- (void) dealloc
-+{
-+    [_window release];
-+    [_tabBarController release];
-+    [super dealloc];
-+}
-+
-+
-+// ZBarReaderDelegate
-+
-+- (void)  imagePickerController: (UIImagePickerController*) picker
-+  didFinishPickingMediaWithInfo: (NSDictionary*) info
-+{
-+    // do something useful with results
-+    UITabBarController *tabs = self.tabBarController;
-+    tabs.selectedIndex = 1;
-+    ResultsViewController *results = [tabs.viewControllers objectAtIndex: 1];
-+    UIImage *image = [info objectForKey: UIImagePickerControllerOriginalImage];
-+    results.resultImage.image = image;
-+
-+    id <NSFastEnumeration> syms =
-+    [info objectForKey: ZBarReaderControllerResults];
-+    for(ZBarSymbol *sym in syms) {
-+        results.resultText.text = sym.data;
-+        break;
-+    }
-+}
-+
-+@end
-diff -r 563557a923d0 iphone/examples/TabReader/TabReader/en.lproj/InfoPlist.strings
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/examples/TabReader/TabReader/en.lproj/InfoPlist.strings	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,2 @@
-+/* Localized versions of Info.plist keys */
-+
-diff -r 563557a923d0 iphone/examples/TabReader/TabReader/en.lproj/MainWindow.xib
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/examples/TabReader/TabReader/en.lproj/MainWindow.xib	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,411 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
-+	<data>
-+		<int key="IBDocument.SystemTarget">1024</int>
-+		<string key="IBDocument.SystemVersion">10J869</string>
-+		<string key="IBDocument.InterfaceBuilderVersion">1306</string>
-+		<string key="IBDocument.AppKitVersion">1038.35</string>
-+		<string key="IBDocument.HIToolboxVersion">461.00</string>
-+		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-+			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-+			<string key="NS.object.0">301</string>
-+		</object>
-+		<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
-+			<bool key="EncodedWithXMLCoder">YES</bool>
-+			<string>IBProxyObject</string>
-+			<string>IBUITabBarItem</string>
-+			<string>IBUIViewController</string>
-+			<string>IBUICustomObject</string>
-+			<string>IBUITabBarController</string>
-+			<string>IBUIWindow</string>
-+			<string>IBUITabBar</string>
-+		</object>
-+		<object class="NSArray" key="IBDocument.PluginDependencies">
-+			<bool key="EncodedWithXMLCoder">YES</bool>
-+			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-+		</object>
-+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-+			<bool key="EncodedWithXMLCoder">YES</bool>
-+			<object class="NSArray" key="dict.sortedKeys" id="0">
-+				<bool key="EncodedWithXMLCoder">YES</bool>
-+			</object>
-+			<reference key="dict.values" ref="0"/>
-+		</object>
-+		<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
-+			<bool key="EncodedWithXMLCoder">YES</bool>
-+			<object class="IBProxyObject" id="841351856">
-+				<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
-+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-+			</object>
-+			<object class="IBProxyObject" id="532797962">
-+				<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
-+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-+			</object>
-+			<object class="IBUICustomObject" id="664661524">
-+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-+			</object>
-+			<object class="IBUIWindow" id="380026005">
-+				<reference key="NSNextResponder"/>
-+				<int key="NSvFlags">1316</int>
-+				<object class="NSPSMatrix" key="NSFrameMatrix"/>
-+				<string key="NSFrameSize">{320, 480}</string>
-+				<reference key="NSSuperview"/>
-+				<reference key="NSWindow"/>
-+				<object class="NSColor" key="IBUIBackgroundColor">
-+					<int key="NSColorSpace">1</int>
-+					<bytes key="NSRGB">MSAxIDEAA</bytes>
-+				</object>
-+				<bool key="IBUIOpaque">NO</bool>
-+				<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
-+				<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
-+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-+				<bool key="IBUIResizesToFullScreen">YES</bool>
-+			</object>
-+			<object class="IBUITabBarController" id="1034742383">
-+				<object class="IBUISimulatedTabBarMetrics" key="IBUISimulatedBottomBarMetrics"/>
-+				<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
-+				<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
-+					<int key="IBUIInterfaceOrientation">1</int>
-+					<int key="interfaceOrientation">1</int>
-+				</object>
-+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-+				<bool key="IBUIHorizontal">NO</bool>
-+				<object class="IBUIViewController" key="IBUISelectedViewController" id="538989659">
-+					<object class="IBUITabBarItem" key="IBUITabBarItem" id="896756232">
-+						<string key="IBUITitle">Scan</string>
-+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-+						<reference key="IBUITabBar" ref="795333663"/>
-+					</object>
-+					<reference key="IBUIParentViewController" ref="1034742383"/>
-+					<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
-+					<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
-+						<int key="IBUIInterfaceOrientation">1</int>
-+						<int key="interfaceOrientation">1</int>
-+					</object>
-+					<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-+					<bool key="IBUIHorizontal">NO</bool>
-+				</object>
-+				<object class="NSMutableArray" key="IBUIViewControllers">
-+					<bool key="EncodedWithXMLCoder">YES</bool>
-+					<reference ref="538989659"/>
-+					<object class="IBUIViewController" id="268481961">
-+						<object class="IBUITabBarItem" key="IBUITabBarItem" id="807309489">
-+							<string key="IBUITitle">Results</string>
-+							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-+							<reference key="IBUITabBar" ref="795333663"/>
-+						</object>
-+						<reference key="IBUIParentViewController" ref="1034742383"/>
-+						<string key="IBUINibName">ResultsView</string>
-+						<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
-+							<int key="IBUIInterfaceOrientation">1</int>
-+							<int key="interfaceOrientation">1</int>
-+						</object>
-+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-+						<bool key="IBUIHorizontal">NO</bool>
-+					</object>
-+				</object>
-+				<object class="IBUITabBar" key="IBUITabBar" id="795333663">
-+					<reference key="NSNextResponder"/>
-+					<int key="NSvFlags">266</int>
-+					<string key="NSFrame">{{0, 431}, {320, 49}}</string>
-+					<reference key="NSSuperview"/>
-+					<reference key="NSWindow"/>
-+					<object class="NSColor" key="IBUIBackgroundColor">
-+						<int key="NSColorSpace">3</int>
-+						<bytes key="NSWhite">MCAwAA</bytes>
-+					</object>
-+					<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
-+					<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-+					<object class="NSMutableArray" key="IBUIItems">
-+						<bool key="EncodedWithXMLCoder">YES</bool>
-+						<reference ref="896756232"/>
-+						<reference ref="807309489"/>
-+					</object>
-+					<reference key="IBUISelectedItem" ref="896756232"/>
-+				</object>
-+			</object>
-+		</object>
-+		<object class="IBObjectContainer" key="IBDocument.Objects">
-+			<object class="NSMutableArray" key="connectionRecords">
-+				<bool key="EncodedWithXMLCoder">YES</bool>
-+				<object class="IBConnectionRecord">
-+					<object class="IBCocoaTouchOutletConnection" key="connection">
-+						<string key="label">window</string>
-+						<reference key="source" ref="664661524"/>
-+						<reference key="destination" ref="380026005"/>
-+					</object>
-+					<int key="connectionID">9</int>
-+				</object>
-+				<object class="IBConnectionRecord">
-+					<object class="IBCocoaTouchOutletConnection" key="connection">
-+						<string key="label">delegate</string>
-+						<reference key="source" ref="841351856"/>
-+						<reference key="destination" ref="664661524"/>
-+					</object>
-+					<int key="connectionID">99</int>
-+				</object>
-+				<object class="IBConnectionRecord">
-+					<object class="IBCocoaTouchOutletConnection" key="connection">
-+						<string key="label">tabBarController</string>
-+						<reference key="source" ref="664661524"/>
-+						<reference key="destination" ref="1034742383"/>
-+					</object>
-+					<int key="connectionID">113</int>
-+				</object>
-+				<object class="IBConnectionRecord">
-+					<object class="IBCocoaTouchOutletConnection" key="connection">
-+						<string key="label">delegate</string>
-+						<reference key="source" ref="1034742383"/>
-+						<reference key="destination" ref="664661524"/>
-+					</object>
-+					<int key="connectionID">127</int>
-+				</object>
-+			</object>
-+			<object class="IBMutableOrderedSet" key="objectRecords">
-+				<object class="NSArray" key="orderedObjects">
-+					<bool key="EncodedWithXMLCoder">YES</bool>
-+					<object class="IBObjectRecord">
-+						<int key="objectID">0</int>
-+						<reference key="object" ref="0"/>
-+						<reference key="children" ref="1000"/>
-+						<nil key="parent"/>
-+					</object>
-+					<object class="IBObjectRecord">
-+						<int key="objectID">2</int>
-+						<reference key="object" ref="380026005"/>
-+						<object class="NSMutableArray" key="children">
-+							<bool key="EncodedWithXMLCoder">YES</bool>
-+						</object>
-+						<reference key="parent" ref="0"/>
-+					</object>
-+					<object class="IBObjectRecord">
-+						<int key="objectID">-1</int>
-+						<reference key="object" ref="841351856"/>
-+						<reference key="parent" ref="0"/>
-+						<string key="objectName">File's Owner</string>
-+					</object>
-+					<object class="IBObjectRecord">
-+						<int key="objectID">3</int>
-+						<reference key="object" ref="664661524"/>
-+						<reference key="parent" ref="0"/>
-+					</object>
-+					<object class="IBObjectRecord">
-+						<int key="objectID">106</int>
-+						<reference key="object" ref="1034742383"/>
-+						<object class="NSMutableArray" key="children">
-+							<bool key="EncodedWithXMLCoder">YES</bool>
-+							<reference ref="795333663"/>
-+							<reference ref="538989659"/>
-+							<reference ref="268481961"/>
-+						</object>
-+						<reference key="parent" ref="0"/>
-+					</object>
-+					<object class="IBObjectRecord">
-+						<int key="objectID">107</int>
-+						<reference key="object" ref="795333663"/>
-+						<reference key="parent" ref="1034742383"/>
-+					</object>
-+					<object class="IBObjectRecord">
-+						<int key="objectID">-2</int>
-+						<reference key="object" ref="532797962"/>
-+						<reference key="parent" ref="0"/>
-+					</object>
-+					<object class="IBObjectRecord">
-+						<int key="objectID">125</int>
-+						<reference key="object" ref="538989659"/>
-+						<object class="NSMutableArray" key="children">
-+							<bool key="EncodedWithXMLCoder">YES</bool>
-+							<reference ref="896756232"/>
-+						</object>
-+						<reference key="parent" ref="1034742383"/>
-+						<string key="objectName">Barcode Reader Controller</string>
-+					</object>
-+					<object class="IBObjectRecord">
-+						<int key="objectID">126</int>
-+						<reference key="object" ref="896756232"/>
-+						<reference key="parent" ref="538989659"/>
-+					</object>
-+					<object class="IBObjectRecord">
-+						<int key="objectID">109</int>
-+						<reference key="object" ref="268481961"/>
-+						<object class="NSMutableArray" key="children">
-+							<bool key="EncodedWithXMLCoder">YES</bool>
-+							<reference ref="807309489"/>
-+						</object>
-+						<reference key="parent" ref="1034742383"/>
-+						<string key="objectName">Barcode Results Controller</string>
-+					</object>
-+					<object class="IBObjectRecord">
-+						<int key="objectID">110</int>
-+						<reference key="object" ref="807309489"/>
-+						<reference key="parent" ref="268481961"/>
-+					</object>
-+				</object>
-+			</object>
-+			<object class="NSMutableDictionary" key="flattenedProperties">
-+				<bool key="EncodedWithXMLCoder">YES</bool>
-+				<object class="NSArray" key="dict.sortedKeys">
-+					<bool key="EncodedWithXMLCoder">YES</bool>
-+					<string>-1.CustomClassName</string>
-+					<string>-2.CustomClassName</string>
-+					<string>106.IBEditorWindowLastContentRect</string>
-+					<string>106.IBPluginDependency</string>
-+					<string>107.IBPluginDependency</string>
-+					<string>109.CustomClassName</string>
-+					<string>109.IBPluginDependency</string>
-+					<string>110.IBPluginDependency</string>
-+					<string>125.CustomClassName</string>
-+					<string>125.IBPluginDependency</string>
-+					<string>126.IBPluginDependency</string>
-+					<string>2.IBAttributePlaceholdersKey</string>
-+					<string>2.IBEditorWindowLastContentRect</string>
-+					<string>2.IBPluginDependency</string>
-+					<string>3.CustomClassName</string>
-+					<string>3.IBPluginDependency</string>
-+				</object>
-+				<object class="NSMutableArray" key="dict.values">
-+					<bool key="EncodedWithXMLCoder">YES</bool>
-+					<string>UIApplication</string>
-+					<string>UIResponder</string>
-+					<string>{{1323, 676}, {320, 480}}</string>
-+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-+					<string>ResultsViewController</string>
-+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-+					<string>ZBarReaderViewController</string>
-+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-+					<object class="NSMutableDictionary">
-+						<bool key="EncodedWithXMLCoder">YES</bool>
-+						<reference key="dict.sortedKeys" ref="0"/>
-+						<reference key="dict.values" ref="0"/>
-+					</object>
-+					<string>{{229, 373}, {320, 480}}</string>
-+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-+					<string>TabReaderAppDelegate</string>
-+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-+				</object>
-+			</object>
-+			<object class="NSMutableDictionary" key="unlocalizedProperties">
-+				<bool key="EncodedWithXMLCoder">YES</bool>
-+				<reference key="dict.sortedKeys" ref="0"/>
-+				<reference key="dict.values" ref="0"/>
-+			</object>
-+			<nil key="activeLocalization"/>
-+			<object class="NSMutableDictionary" key="localizations">
-+				<bool key="EncodedWithXMLCoder">YES</bool>
-+				<reference key="dict.sortedKeys" ref="0"/>
-+				<reference key="dict.values" ref="0"/>
-+			</object>
-+			<nil key="sourceID"/>
-+			<int key="maxID">127</int>
-+		</object>
-+		<object class="IBClassDescriber" key="IBDocument.Classes">
-+			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
-+				<bool key="EncodedWithXMLCoder">YES</bool>
-+				<object class="IBPartialClassDescription">
-+					<string key="className">ResultsViewController</string>
-+					<string key="superclassName">UIViewController</string>
-+					<object class="NSMutableDictionary" key="outlets">
-+						<bool key="EncodedWithXMLCoder">YES</bool>
-+						<object class="NSArray" key="dict.sortedKeys">
-+							<bool key="EncodedWithXMLCoder">YES</bool>
-+							<string>resultImage</string>
-+							<string>resultText</string>
-+						</object>
-+						<object class="NSMutableArray" key="dict.values">
-+							<bool key="EncodedWithXMLCoder">YES</bool>
-+							<string>UIImageView</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>resultImage</string>
-+							<string>resultText</string>
-+						</object>
-+						<object class="NSMutableArray" key="dict.values">
-+							<bool key="EncodedWithXMLCoder">YES</bool>
-+							<object class="IBToOneOutletInfo">
-+								<string key="name">resultImage</string>
-+								<string key="candidateClassName">UIImageView</string>
-+							</object>
-+							<object class="IBToOneOutletInfo">
-+								<string key="name">resultText</string>
-+								<string key="candidateClassName">UITextView</string>
-+							</object>
-+						</object>
-+					</object>
-+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-+						<string key="majorKey">IBProjectSource</string>
-+						<string key="minorKey">./Classes/ResultsViewController.h</string>
-+					</object>
-+				</object>
-+				<object class="IBPartialClassDescription">
-+					<string key="className">TabReaderAppDelegate</string>
-+					<string key="superclassName">NSObject</string>
-+					<object class="NSMutableDictionary" key="outlets">
-+						<bool key="EncodedWithXMLCoder">YES</bool>
-+						<object class="NSArray" key="dict.sortedKeys">
-+							<bool key="EncodedWithXMLCoder">YES</bool>
-+							<string>tabBarController</string>
-+							<string>window</string>
-+						</object>
-+						<object class="NSMutableArray" key="dict.values">
-+							<bool key="EncodedWithXMLCoder">YES</bool>
-+							<string>UITabBarController</string>
-+							<string>UIWindow</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>tabBarController</string>
-+							<string>window</string>
-+						</object>
-+						<object class="NSMutableArray" key="dict.values">
-+							<bool key="EncodedWithXMLCoder">YES</bool>
-+							<object class="IBToOneOutletInfo">
-+								<string key="name">tabBarController</string>
-+								<string key="candidateClassName">UITabBarController</string>
-+							</object>
-+							<object class="IBToOneOutletInfo">
-+								<string key="name">window</string>
-+								<string key="candidateClassName">UIWindow</string>
-+							</object>
-+						</object>
-+					</object>
-+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-+						<string key="majorKey">IBProjectSource</string>
-+						<string key="minorKey">./Classes/TabReaderAppDelegate.h</string>
-+					</object>
-+				</object>
-+				<object class="IBPartialClassDescription">
-+					<string key="className">ZBarReaderViewController</string>
-+					<string key="superclassName">UIViewController</string>
-+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-+						<string key="majorKey">IBProjectSource</string>
-+						<string key="minorKey">./Classes/ZBarReaderViewController.h</string>
-+					</object>
-+				</object>
-+			</object>
-+		</object>
-+		<int key="IBDocument.localizationMode">0</int>
-+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-+			<integer value="1024" key="NS.object.0"/>
-+		</object>
-+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
-+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
-+			<integer value="3100" key="NS.object.0"/>
-+		</object>
-+		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-+		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-+		<string key="IBCocoaTouchPluginVersion">301</string>
-+	</data>
-+</archive>
-diff -r 563557a923d0 iphone/examples/TabReader/TabReader/en.lproj/ResultsView.xib
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/examples/TabReader/TabReader/en.lproj/ResultsView.xib	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,303 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
-+	<data>
-+		<int key="IBDocument.SystemTarget">1024</int>
-+		<string key="IBDocument.SystemVersion">10J869</string>
-+		<string key="IBDocument.InterfaceBuilderVersion">1306</string>
-+		<string key="IBDocument.AppKitVersion">1038.35</string>
-+		<string key="IBDocument.HIToolboxVersion">461.00</string>
-+		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-+			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-+			<string key="NS.object.0">301</string>
-+		</object>
-+		<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
-+			<bool key="EncodedWithXMLCoder">YES</bool>
-+			<string>IBUITextView</string>
-+			<string>IBUIImageView</string>
-+			<string>IBUIView</string>
-+			<string>IBUILabel</string>
-+			<string>IBProxyObject</string>
-+		</object>
-+		<object class="NSArray" key="IBDocument.PluginDependencies">
-+			<bool key="EncodedWithXMLCoder">YES</bool>
-+			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-+		</object>
-+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-+			<bool key="EncodedWithXMLCoder">YES</bool>
-+			<object class="NSArray" key="dict.sortedKeys" id="0">
-+				<bool key="EncodedWithXMLCoder">YES</bool>
-+			</object>
-+			<reference key="dict.values" ref="0"/>
-+		</object>
-+		<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
-+			<bool key="EncodedWithXMLCoder">YES</bool>
-+			<object class="IBProxyObject" id="372490531">
-+				<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
-+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-+			</object>
-+			<object class="IBProxyObject" id="263589821">
-+				<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
-+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-+			</object>
-+			<object class="IBUIView" id="191373211">
-+				<reference key="NSNextResponder"/>
-+				<int key="NSvFlags">274</int>
-+				<object class="NSMutableArray" key="NSSubviews">
-+					<bool key="EncodedWithXMLCoder">YES</bool>
-+					<object class="IBUILabel" id="483052203">
-+						<reference key="NSNextResponder" ref="191373211"/>
-+						<int key="NSvFlags">306</int>
-+						<string key="NSFrame">{{20, 20}, {280, 28}}</string>
-+						<reference key="NSSuperview" ref="191373211"/>
-+						<reference key="NSWindow"/>
-+						<reference key="NSNextKeyView" ref="255779567"/>
-+						<object class="NSColor" key="IBUIBackgroundColor">
-+							<int key="NSColorSpace">3</int>
-+							<bytes key="NSWhite">MQA</bytes>
-+							<object class="NSColorSpace" key="NSCustomColorSpace">
-+								<int key="NSID">2</int>
-+							</object>
-+						</object>
-+						<bool key="IBUIOpaque">NO</bool>
-+						<bool key="IBUIClipsSubviews">YES</bool>
-+						<bool key="IBUIUserInteractionEnabled">NO</bool>
-+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-+						<string key="IBUIText">Results Tab</string>
-+						<object class="NSFont" key="IBUIFont">
-+							<string key="NSName">Helvetica</string>
-+							<double key="NSSize">24</double>
-+							<int key="NSfFlags">16</int>
-+						</object>
-+						<object class="NSColor" key="IBUITextColor">
-+							<int key="NSColorSpace">1</int>
-+							<bytes key="NSRGB">MCAwIDAAA</bytes>
-+						</object>
-+						<nil key="IBUIHighlightedColor"/>
-+						<int key="IBUIBaselineAdjustment">1</int>
-+						<float key="IBUIMinimumFontSize">10</float>
-+						<int key="IBUITextAlignment">1</int>
-+					</object>
-+					<object class="IBUITextView" id="255779567">
-+						<reference key="NSNextResponder" ref="191373211"/>
-+						<int key="NSvFlags">282</int>
-+						<string key="NSFrame">{{20, 274}, {280, 117}}</string>
-+						<reference key="NSSuperview" ref="191373211"/>
-+						<reference key="NSWindow"/>
-+						<bool key="IBUIOpaque">NO</bool>
-+						<bool key="IBUIClipsSubviews">YES</bool>
-+						<bool key="IBUIMultipleTouchEnabled">YES</bool>
-+						<bool key="IBUIUserInteractionEnabled">NO</bool>
-+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-+						<bool key="IBUIShowsHorizontalScrollIndicator">NO</bool>
-+						<bool key="IBUIDelaysContentTouches">NO</bool>
-+						<bool key="IBUICanCancelContentTouches">NO</bool>
-+						<float key="IBUIMinimumZoomScale">0.0</float>
-+						<float key="IBUIMaximumZoomScale">0.0</float>
-+						<bool key="IBUIBouncesZoom">NO</bool>
-+						<bool key="IBUIEditable">NO</bool>
-+						<string key="IBUIText">No barcode scanned.</string>
-+						<object class="IBUITextInputTraits" key="IBUITextInputTraits">
-+							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-+						</object>
-+					</object>
-+					<object class="IBUIImageView" id="809997790">
-+						<reference key="NSNextResponder" ref="191373211"/>
-+						<int key="NSvFlags">306</int>
-+						<string key="NSFrame">{{20, 56}, {280, 210}}</string>
-+						<reference key="NSSuperview" ref="191373211"/>
-+						<reference key="NSWindow"/>
-+						<int key="IBUIContentMode">1</int>
-+						<bool key="IBUIUserInteractionEnabled">NO</bool>
-+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-+					</object>
-+				</object>
-+				<string key="NSFrame">{{0, 20}, {320, 411}}</string>
-+				<reference key="NSSuperview"/>
-+				<reference key="NSWindow"/>
-+				<reference key="NSNextKeyView" ref="483052203"/>
-+				<object class="NSColor" key="IBUIBackgroundColor">
-+					<int key="NSColorSpace">3</int>
-+					<bytes key="NSWhite">MQA</bytes>
-+				</object>
-+				<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
-+				<object class="IBUISimulatedTabBarMetrics" key="IBUISimulatedBottomBarMetrics"/>
-+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-+			</object>
-+		</object>
-+		<object class="IBObjectContainer" key="IBDocument.Objects">
-+			<object class="NSMutableArray" key="connectionRecords">
-+				<bool key="EncodedWithXMLCoder">YES</bool>
-+				<object class="IBConnectionRecord">
-+					<object class="IBCocoaTouchOutletConnection" key="connection">
-+						<string key="label">view</string>
-+						<reference key="source" ref="372490531"/>
-+						<reference key="destination" ref="191373211"/>
-+					</object>
-+					<int key="connectionID">3</int>
-+				</object>
-+				<object class="IBConnectionRecord">
-+					<object class="IBCocoaTouchOutletConnection" key="connection">
-+						<string key="label">resultImage</string>
-+						<reference key="source" ref="372490531"/>
-+						<reference key="destination" ref="809997790"/>
-+					</object>
-+					<int key="connectionID">9</int>
-+				</object>
-+				<object class="IBConnectionRecord">
-+					<object class="IBCocoaTouchOutletConnection" key="connection">
-+						<string key="label">resultText</string>
-+						<reference key="source" ref="372490531"/>
-+						<reference key="destination" ref="255779567"/>
-+					</object>
-+					<int key="connectionID">10</int>
-+				</object>
-+			</object>
-+			<object class="IBMutableOrderedSet" key="objectRecords">
-+				<object class="NSArray" key="orderedObjects">
-+					<bool key="EncodedWithXMLCoder">YES</bool>
-+					<object class="IBObjectRecord">
-+						<int key="objectID">0</int>
-+						<reference key="object" ref="0"/>
-+						<reference key="children" ref="1000"/>
-+						<nil key="parent"/>
-+					</object>
-+					<object class="IBObjectRecord">
-+						<int key="objectID">1</int>
-+						<reference key="object" ref="191373211"/>
-+						<object class="NSMutableArray" key="children">
-+							<bool key="EncodedWithXMLCoder">YES</bool>
-+							<reference ref="255779567"/>
-+							<reference ref="483052203"/>
-+							<reference ref="809997790"/>
-+						</object>
-+						<reference key="parent" ref="0"/>
-+					</object>
-+					<object class="IBObjectRecord">
-+						<int key="objectID">-1</int>
-+						<reference key="object" ref="372490531"/>
-+						<reference key="parent" ref="0"/>
-+						<string key="objectName">File's Owner</string>
-+					</object>
-+					<object class="IBObjectRecord">
-+						<int key="objectID">-2</int>
-+						<reference key="object" ref="263589821"/>
-+						<reference key="parent" ref="0"/>
-+					</object>
-+					<object class="IBObjectRecord">
-+						<int key="objectID">5</int>
-+						<reference key="object" ref="483052203"/>
-+						<reference key="parent" ref="191373211"/>
-+					</object>
-+					<object class="IBObjectRecord">
-+						<int key="objectID">7</int>
-+						<reference key="object" ref="255779567"/>
-+						<reference key="parent" ref="191373211"/>
-+					</object>
-+					<object class="IBObjectRecord">
-+						<int key="objectID">8</int>
-+						<reference key="object" ref="809997790"/>
-+						<reference key="parent" ref="191373211"/>
-+					</object>
-+				</object>
-+			</object>
-+			<object class="NSMutableDictionary" key="flattenedProperties">
-+				<bool key="EncodedWithXMLCoder">YES</bool>
-+				<object class="NSArray" key="dict.sortedKeys">
-+					<bool key="EncodedWithXMLCoder">YES</bool>
-+					<string>-1.CustomClassName</string>
-+					<string>-2.CustomClassName</string>
-+					<string>1.IBEditorWindowLastContentRect</string>
-+					<string>1.IBPluginDependency</string>
-+					<string>5.IBPluginDependency</string>
-+					<string>7.IBPluginDependency</string>
-+					<string>7.IBViewBoundsToFrameTransform</string>
-+					<string>8.IBPluginDependency</string>
-+				</object>
-+				<object class="NSMutableArray" key="dict.values">
-+					<bool key="EncodedWithXMLCoder">YES</bool>
-+					<string>ResultsViewController</string>
-+					<string>UIResponder</string>
-+					<string>{{187, 376}, {320, 480}}</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+AAABA4AAAw7GAAA</bytes>
-+					</object>
-+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-+				</object>
-+			</object>
-+			<object class="NSMutableDictionary" key="unlocalizedProperties">
-+				<bool key="EncodedWithXMLCoder">YES</bool>
-+				<reference key="dict.sortedKeys" ref="0"/>
-+				<reference key="dict.values" ref="0"/>
-+			</object>
-+			<nil key="activeLocalization"/>
-+			<object class="NSMutableDictionary" key="localizations">
-+				<bool key="EncodedWithXMLCoder">YES</bool>
-+				<reference key="dict.sortedKeys" ref="0"/>
-+				<reference key="dict.values" ref="0"/>
-+			</object>
-+			<nil key="sourceID"/>
-+			<int key="maxID">10</int>
-+		</object>
-+		<object class="IBClassDescriber" key="IBDocument.Classes">
-+			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
-+				<bool key="EncodedWithXMLCoder">YES</bool>
-+				<object class="IBPartialClassDescription">
-+					<string key="className">ResultsViewController</string>
-+					<string key="superclassName">UIViewController</string>
-+					<object class="NSMutableDictionary" key="outlets">
-+						<bool key="EncodedWithXMLCoder">YES</bool>
-+						<object class="NSArray" key="dict.sortedKeys">
-+							<bool key="EncodedWithXMLCoder">YES</bool>
-+							<string>resultImage</string>
-+							<string>resultText</string>
-+						</object>
-+						<object class="NSMutableArray" key="dict.values">
-+							<bool key="EncodedWithXMLCoder">YES</bool>
-+							<string>UIImageView</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>resultImage</string>
-+							<string>resultText</string>
-+						</object>
-+						<object class="NSMutableArray" key="dict.values">
-+							<bool key="EncodedWithXMLCoder">YES</bool>
-+							<object class="IBToOneOutletInfo">
-+								<string key="name">resultImage</string>
-+								<string key="candidateClassName">UIImageView</string>
-+							</object>
-+							<object class="IBToOneOutletInfo">
-+								<string key="name">resultText</string>
-+								<string key="candidateClassName">UITextView</string>
-+							</object>
-+						</object>
-+					</object>
-+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-+						<string key="majorKey">IBProjectSource</string>
-+						<string key="minorKey">./Classes/ResultsViewController.h</string>
-+					</object>
-+				</object>
-+			</object>
-+		</object>
-+		<int key="IBDocument.localizationMode">0</int>
-+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-+			<integer value="1024" key="NS.object.0"/>
-+		</object>
-+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
-+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
-+			<integer value="3100" key="NS.object.0"/>
-+		</object>
-+		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-+		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-+		<string key="IBCocoaTouchPluginVersion">301</string>
-+	</data>
-+</archive>
-diff -r 563557a923d0 iphone/examples/TabReader/TabReader/main.m
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/examples/TabReader/TabReader/main.m	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,16 @@
-+//
-+//  main.m
-+//  TabReader
-+//
-+//  Created by spadix on 5/3/11.
-+//
-+
-+#import <UIKit/UIKit.h>
-+
-+int main(int argc, char *argv[])
-+{
-+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-+    int retVal = UIApplicationMain(argc, argv, nil, nil);
-+    [pool release];
-+    return retVal;
-+}
-diff -r 563557a923d0 iphone/examples/TabReader/ZBarSDK
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/examples/TabReader/ZBarSDK	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,1 @@
-+../../build/Debug-iphoneos/ZBarSDK
-\ No newline at end of file
-diff -r 563557a923d0 iphone/examples/TabReader/build
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/examples/TabReader/build	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,1 @@
-+/tmp/TabReader.build
-\ No newline at end of file
-diff -r 563557a923d0 iphone/examples/readertest/Default-568h@2x.png
-Binary file iphone/examples/readertest/Default-568h@2x.png has changed
-diff -r 563557a923d0 iphone/examples/readertest/ZBarSDK
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/examples/readertest/ZBarSDK	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,1 @@
-+../../build/Debug-iphoneos/ZBarSDK
-\ No newline at end of file
-diff -r 563557a923d0 iphone/examples/readertest/build
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/examples/readertest/build	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,1 @@
-+/tmp/readertest.build
-\ No newline at end of file
-diff -r 563557a923d0 iphone/examples/readertest/entitlements.plist
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/examples/readertest/entitlements.plist	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,8 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-+<plist version="1.0">
-+<dict>
-+	<key>get-task-allow</key>
-+	<false/>
-+</dict>
-+</plist>
-diff -r 563557a923d0 iphone/examples/readertest/prefix.pch
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/examples/readertest/prefix.pch	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,11 @@
-+#ifdef __OBJC__
-+# import <Foundation/Foundation.h>
-+# import <CoreFoundation/CoreFoundation.h>
-+# import <CoreGraphics/CoreGraphics.h>
-+# import <UIKit/UIKit.h>
-+# import <QuartzCore/QuartzCore.h>
-+# import <AVFoundation/AVFoundation.h>
-+# import <CoreMedia/CoreMedia.h>
-+# import <CoreVideo/CoreVideo.h>
-+# import "ZBarSDK.h"
-+#endif
-diff -r 563557a923d0 iphone/examples/readertest/readertest.m
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/examples/readertest/readertest.m	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,991 @@
-+enum {
-+    CLASS_SECTION = 0,
-+    SOURCE_SECTION,
-+    CAMODE_SECTION,
-+    DEVICE_SECTION,
-+    FLASH_SECTION,
-+    QUALITY_SECTION,
-+    CONFIG_SECTION,
-+    CUSTOM_SECTION,
-+    SYMBOL_SECTION,
-+    RESULT_SECTION,
-+    NUM_SECTIONS
-+};
-+
-+static NSString* const section_titles[] = {
-+    @"Classes",
-+    @"SourceType",
-+    @"CameraMode",
-+    @"CaptureDevice",
-+    @"CameraFlashMode",
-+    @"VideoQuality",
-+    @"Reader Configuration",
-+    nil,
-+    @"Enabled Symbologies",
-+    @"Decode Results",
-+};
-+
-+static const CGRect const crop_choices[] = {
-+    { { 0, 0 }, { 1, 1 } },
-+    { { .125, 0 }, { .75, 1 } },
-+    { { 0, .3 }, { 1, .4 } },
-+    { { 0, 0 }, { 0, 0 } }
-+};
-+
-+static const NSInteger const density_choices[] = {
-+    3, 2, 1, 0, 4, -1
-+};
-+
-+static const CGFloat const zoom_choices[] = {
-+    1, 10/9., 10/8., 8/6., 10/7., 9/6., 10/6., 7/4., 2, 0, -1
-+};
-+
-+@interface AppDelegate
-+    : UITableViewController
-+    < UIApplicationDelegate,
-+      UINavigationControllerDelegate,
-+      UITableViewDelegate,
-+      UITableViewDataSource,
-+      UIActionSheetDelegate,
-+      ZBarReaderDelegate >
-+{
-+    UIWindow *window;
-+    UINavigationController *nav;
-+
-+    NSSet *defaultSymbologies;
-+    CGFloat zoom;
-+
-+    NSMutableArray *sections, *symbolEnables;
-+    NSInteger xDensity, yDensity;
-+
-+    BOOL found, paused, continuous;
-+    NSInteger dataHeight;
-+    UILabel *typeLabel, *dataLabel;
-+    UIImageView *imageView;
-+
-+    ZBarReaderViewController *reader;
-+    UIView *overlay;
-+    UIBarButtonItem *manualBtn;
-+    UILabel *typeOvl, *dataOvl;
-+    NSArray *masks;
-+}
-+
-+@end
-+
-+
-+@implementation AppDelegate
-+
-+- (id) init
-+{
-+    return([super initWithStyle: UITableViewStyleGrouped]);
-+}
-+
-+- (void) initReader: (NSString*) clsName
-+{
-+    [reader release];
-+    Class cls = [[NSBundle mainBundle]
-+                    classNamed: clsName];
-+    assert(cls);
-+    reader = [cls new];
-+    assert(reader);
-+    reader.readerDelegate = self;
-+    xDensity = yDensity = 3;
-+
-+#if 0
-+    // apply defaults for demo
-+    ZBarImageScanner *scanner = reader.scanner;
-+    continuous = NO;
-+    zoom = 1;
-+    reader.showsZBarControls = NO;
-+    reader.scanCrop = CGRectMake(0, .35, 1, .3);
-+
-+    [defaultSymbologies release];
-+    defaultSymbologies =
-+        [[NSSet alloc]
-+            initWithObjects:
-+                [NSNumber numberWithInteger: ZBAR_CODE128],
-+                nil];
-+    [scanner setSymbology: 0
-+             config: ZBAR_CFG_ENABLE
-+             to: 0];
-+    for(NSNumber *sym in defaultSymbologies)
-+        [scanner setSymbology: sym.integerValue
-+                 config: ZBAR_CFG_ENABLE
-+                 to: 1];
-+
-+    [scanner setSymbology: 0
-+             config: ZBAR_CFG_X_DENSITY
-+             to: (xDensity = 0)];
-+    [scanner setSymbology: 0
-+             config: ZBAR_CFG_Y_DENSITY
-+             to: (yDensity = 1)];
-+#endif
-+}
-+
-+- (void) initOverlay
-+{
-+    overlay = [[UIView alloc]
-+                  initWithFrame: CGRectMake(0, 426, 320, 54)];
-+    overlay.backgroundColor = [UIColor clearColor];
-+
-+    masks = [[NSArray alloc]
-+                initWithObjects:
-+                    [[[UIView alloc]
-+                         initWithFrame: CGRectMake(0, -426, 320, 0)]
-+                        autorelease],
-+                    [[[UIView alloc]
-+                         initWithFrame: CGRectMake(0, -426, 0, 426)]
-+                        autorelease],
-+                    [[[UIView alloc]
-+                         initWithFrame: CGRectMake(0, 0, 320, 0)]
-+                        autorelease],
-+                    [[[UIView alloc]
-+                         initWithFrame: CGRectMake(320, -426, 0, 426)]
-+                        autorelease],
-+                nil];
-+    for(UIView *mask in masks) {
-+        mask.backgroundColor = [UIColor colorWithWhite: 0
-+                                        alpha: .5];
-+        [overlay addSubview: mask];
-+    }
-+
-+    UILabel *label =
-+        [[UILabel alloc]
-+            initWithFrame: CGRectMake(0, -426, 320, 48)];
-+    label.backgroundColor = [UIColor clearColor];
-+    label.textColor = [UIColor whiteColor];
-+    label.font = [UIFont boldSystemFontOfSize: 24];
-+    label.text = @"Custom Overlay";
-+    [overlay addSubview: label];
-+    [label release];
-+
-+    typeOvl = [[UILabel alloc]
-+                  initWithFrame: CGRectMake(0, -378, 80, 24)];
-+    typeOvl.backgroundColor = [UIColor clearColor];
-+    typeOvl.textColor = [UIColor whiteColor];
-+    typeOvl.font = [UIFont systemFontOfSize: 16];
-+    typeOvl.textAlignment = UITextAlignmentCenter;
-+    [overlay addSubview: typeOvl];
-+
-+    dataOvl = [[UILabel alloc]
-+                  initWithFrame: CGRectMake(96, -378, 224, 24)];
-+    dataOvl.backgroundColor = [UIColor clearColor];
-+    dataOvl.textColor = [UIColor whiteColor];
-+    dataOvl.font = [UIFont systemFontOfSize: 16];
-+    [overlay addSubview: dataOvl];
-+
-+    UIToolbar *toolbar =
-+        [[UIToolbar alloc]
-+            initWithFrame: CGRectMake(0, 0, 320, 54)];
-+    toolbar.tintColor = [UIColor colorWithRed: .5
-+                                     green: 0
-+                                     blue: 0
-+                                     alpha: 1];
-+    [manualBtn release];
-+    manualBtn = [[UIBarButtonItem alloc]
-+                    initWithBarButtonSystemItem: UIBarButtonSystemItemCamera
-+                    target: self
-+                    action: @selector(manualCapture)];
-+
-+
-+    UIButton *info =
-+        [UIButton buttonWithType: UIButtonTypeInfoLight];
-+    [info addTarget: self
-+          action: @selector(info)
-+          forControlEvents: UIControlEventTouchUpInside];
-+
-+    toolbar.items =
-+        [NSArray arrayWithObjects:
-+            [[[UIBarButtonItem alloc]
-+                 initWithTitle: @"X"
-+                 style: UIBarButtonItemStylePlain
-+                 target: self
-+                 action: @selector(imagePickerControllerDidCancel:)]
-+                autorelease],
-+            [[[UIBarButtonItem alloc]
-+                 initWithBarButtonSystemItem: UIBarButtonSystemItemFlexibleSpace
-+                 target: nil
-+                 action: nil]
-+                autorelease],
-+            manualBtn,
-+            [[[UIBarButtonItem alloc]
-+                 initWithBarButtonSystemItem: UIBarButtonSystemItemFlexibleSpace
-+                 target: nil
-+                 action: nil]
-+                autorelease],
-+            [[[UIBarButtonItem alloc]
-+                 initWithBarButtonSystemItem: UIBarButtonSystemItemPause
-+                 target: self
-+                 action: @selector(pause)]
-+                autorelease],
-+            [[[UIBarButtonItem alloc]
-+                 initWithBarButtonSystemItem: UIBarButtonSystemItemFlexibleSpace
-+                 target: nil
-+                 action: nil]
-+                autorelease],
-+            [[[UIBarButtonItem alloc]
-+                 initWithCustomView: info]
-+                autorelease],
-+            nil];
-+    [overlay addSubview: toolbar];
-+    [toolbar release];
-+}
-+
-+- (void) updateCropMask
-+{
-+    CGRect r = reader.scanCrop;
-+    r.origin.x *= 426;
-+    r.origin.y *= 320;
-+    r.size.width *= 426;
-+    r.size.height *= 320;
-+    UIView *mask = [masks objectAtIndex: 0];
-+    mask.frame = CGRectMake(0, -426, 320, r.origin.x);
-+    mask = [masks objectAtIndex: 1];
-+    mask.frame = CGRectMake(0, r.origin.x - 426, r.origin.y, r.size.width);
-+
-+    r.origin.y += r.size.height;
-+    mask = [masks objectAtIndex: 2];
-+    mask.frame = CGRectMake(r.origin.y, r.origin.x - 426,
-+                            320 - r.origin.y, r.size.width);
-+
-+    r.origin.x += r.size.width;
-+    mask = [masks objectAtIndex: 3];
-+    mask.frame = CGRectMake(0, r.origin.x - 426, 320, 426 - r.origin.x);
-+}
-+
-+- (void) setCheck: (BOOL) state
-+          forCell: (UITableViewCell*) cell
-+{
-+    cell.accessoryType =
-+        ((state)
-+         ? UITableViewCellAccessoryCheckmark
-+         : UITableViewCellAccessoryNone);
-+}
-+
-+- (void) setCheckForTag: (int) tag
-+              inSection: (int) section
-+{
-+    for(UITableViewCell *cell in [sections objectAtIndex: section])
-+        [self setCheck: (cell.tag == tag)
-+              forCell: cell];
-+}
-+
-+- (void) setCheckForName: (NSString*) name
-+               inSection: (int) section
-+{
-+    for(UITableViewCell *cell in [sections objectAtIndex: section])
-+        [self setCheck: [name isEqualToString: cell.textLabel.text]
-+              forCell: cell];
-+}
-+
-+- (void) applicationDidFinishLaunching: (UIApplication*) application
-+{
-+    self.title = @"ZBar Reader Test";
-+
-+    nav = [[UINavigationController alloc]
-+              initWithRootViewController: self];
-+    nav.delegate = self;
-+
-+    window = [[UIWindow alloc] initWithFrame: [[UIScreen mainScreen] bounds]];
-+    [window addSubview: nav.view];
-+    [window makeKeyAndVisible];
-+
-+    [self initReader: @"ZBarReaderViewController"];
-+}
-+
-+- (UITableViewCell*) cellWithTitle: (NSString*) title
-+                               tag: (NSInteger) tag
-+                           checked: (BOOL) checked
-+{
-+    UITableViewCell *cell = [UITableViewCell new];
-+    cell.textLabel.text = title;
-+    cell.tag = tag;
-+    [self setCheck: checked
-+          forCell: cell];
-+    return([cell autorelease]);
-+}
-+
-+- (void) initControlCells
-+{
-+    // NB don't need SourceTypeSavedPhotosAlbum
-+    static NSString* const sourceNames[] = {
-+        @"Library", @"Camera", @"Album", nil
-+    };
-+    NSMutableArray *sources = [NSMutableArray array];
-+    for(int i = 0; sourceNames[i]; i++)
-+        if([[reader class] isSourceTypeAvailable: i])
-+            [sources addObject:
-+                [self cellWithTitle: sourceNames[i]
-+                      tag: i
-+                      checked: (reader.sourceType == i)]];
-+    [sections replaceObjectAtIndex: SOURCE_SECTION
-+              withObject: sources];
-+
-+    static NSString* const modeNames[] = {
-+        @"Default", @"Sampling", @"Sequence", nil
-+    };
-+    NSMutableArray *modes = [NSMutableArray array];
-+    for(int i = 0; modeNames[i]; i++)
-+        [modes addObject:
-+            [self cellWithTitle: modeNames[i]
-+                  tag: i
-+                  checked: (reader.cameraMode == i)]];
-+    [sections replaceObjectAtIndex: CAMODE_SECTION
-+              withObject: modes];
-+
-+    static NSString *const deviceNames[] = {
-+        @"Rear", @"Front", nil
-+    };
-+    NSMutableArray *devices = [NSMutableArray array];
-+    for(int i = 0; deviceNames[i]; i++)
-+        if([[reader class]
-+               isCameraDeviceAvailable: i])
-+            [devices addObject:
-+                [self cellWithTitle: deviceNames[i]
-+                      tag: i
-+                      checked: (reader.cameraDevice == i)]];
-+    assert(devices.count);
-+    [sections replaceObjectAtIndex: DEVICE_SECTION
-+              withObject: devices];
-+
-+    static NSString *const flashNames[] = {
-+        @"Off", @"Auto", @"On", nil
-+    };
-+    NSMutableArray *flashModes = [NSMutableArray array];
-+    for(int i = 0; flashNames[i]; i++)
-+        [flashModes addObject:
-+            [self cellWithTitle: flashNames[i]
-+                  tag: i - 1
-+                  checked: (reader.cameraFlashMode == i - 1)]];
-+    [sections replaceObjectAtIndex: FLASH_SECTION
-+              withObject: flashModes];
-+
-+    static NSString *const qualityNames[] = {
-+        @"High", @"Medium", @"Low", @"640x480", nil
-+    };
-+    NSMutableArray *qualities = [NSMutableArray array];
-+    for(int i = 0; qualityNames[i]; i++)
-+        [qualities addObject:
-+            [self cellWithTitle: qualityNames[i]
-+                  tag: i
-+                  checked: (reader.videoQuality == i)]];
-+    [sections replaceObjectAtIndex: QUALITY_SECTION
-+              withObject: qualities];
-+
-+    static NSString* const configNames[] = {
-+        @"showsCameraControls", @"showsZBarControls", @"tracksSymbols",
-+        @"enableCache", @"showsHelpOnFail", @"takesPicture",
-+        nil
-+    };
-+    NSMutableArray *configs = [NSMutableArray array];
-+    for(int i = 0; configNames[i]; i++)
-+        @try {
-+            BOOL checked = [[reader valueForKey: configNames[i]] boolValue];
-+            [configs addObject:
-+                [self cellWithTitle: configNames[i]
-+                      tag: i
-+                      checked: checked]];
-+        }
-+        @catch(...) { }
-+    [sections replaceObjectAtIndex: CONFIG_SECTION
-+              withObject: configs];
-+
-+    UITableViewCell *xDensityCell =
-+        [[[UITableViewCell alloc]
-+             initWithStyle: UITableViewCellStyleValue1
-+             reuseIdentifier: nil]
-+            autorelease];
-+    xDensityCell.textLabel.text = @"CFG_X_DENSITY";
-+    xDensityCell.detailTextLabel.tag = ZBAR_CFG_X_DENSITY;
-+    xDensityCell.detailTextLabel.text =
-+        [NSString stringWithFormat: @"%d", xDensity];
-+
-+    UITableViewCell *yDensityCell =
-+        [[[UITableViewCell alloc]
-+             initWithStyle: UITableViewCellStyleValue1
-+             reuseIdentifier: nil]
-+            autorelease];
-+    yDensityCell.textLabel.text = @"CFG_Y_DENSITY";
-+    yDensityCell.detailTextLabel.tag = ZBAR_CFG_Y_DENSITY;
-+    yDensityCell.detailTextLabel.text =
-+        [NSString stringWithFormat: @"%d", yDensity];
-+
-+    UITableViewCell *cropCell =
-+        [[[UITableViewCell alloc]
-+             initWithStyle: UITableViewCellStyleValue1
-+             reuseIdentifier: nil]
-+            autorelease];
-+    cropCell.textLabel.text = @"scanCrop";
-+    cropCell.detailTextLabel.text = NSStringFromCGRect(reader.scanCrop);
-+
-+    UITableViewCell *zoomCell =
-+        [[[UITableViewCell alloc]
-+             initWithStyle: UITableViewCellStyleValue1
-+             reuseIdentifier: nil]
-+            autorelease];
-+    zoomCell.textLabel.text = @"zoom";
-+    zoomCell.detailTextLabel.text =
-+        [NSString stringWithFormat: @"%g", zoom];
-+
-+    [sections replaceObjectAtIndex: CUSTOM_SECTION
-+              withObject: [NSArray arrayWithObjects:
-+                              xDensityCell,
-+                              yDensityCell,
-+                              cropCell,
-+                              zoomCell,
-+                              [self cellWithTitle: @"continuous"
-+                                    tag: 1
-+                                    checked: continuous],
-+                              nil]];
-+
-+    static const zbar_symbol_type_t allSymbologies[] = {
-+        ZBAR_QRCODE, ZBAR_CODE128, ZBAR_CODE93, ZBAR_CODE39, ZBAR_CODABAR,
-+        ZBAR_I25, ZBAR_DATABAR, ZBAR_DATABAR_EXP,
-+        ZBAR_EAN13, ZBAR_EAN8, 
-+        ZBAR_EAN2, ZBAR_EAN5, ZBAR_COMPOSITE,
-+        ZBAR_UPCA, ZBAR_UPCE,
-+        ZBAR_ISBN13, ZBAR_ISBN10,
-+        0
-+    };
-+    NSMutableArray *symbols = [NSMutableArray array];
-+    [symbolEnables release];
-+    symbolEnables = [NSMutableArray new];
-+    BOOL en = YES;
-+    for(int i = 0; allSymbologies[i]; i++) {
-+        zbar_symbol_type_t sym = allSymbologies[i];
-+        if(defaultSymbologies)
-+            en = !![defaultSymbologies member:
-+                       [NSNumber numberWithInteger: sym]];
-+        else
-+            /* symbologies after ZBAR_EAN5 are disabled by default */
-+            en = en && (sym != ZBAR_EAN2);
-+        [symbols addObject:
-+            [self cellWithTitle: [ZBarSymbol nameForType: sym]
-+                  tag: sym
-+                  checked: en]];
-+        [symbolEnables addObject: [NSNumber numberWithBool: en]];
-+    }
-+    [sections replaceObjectAtIndex: SYMBOL_SECTION
-+              withObject: symbols];
-+
-+    [self.tableView reloadData];
-+}
-+
-+- (void) viewDidLoad
-+{
-+    [super viewDidLoad];
-+
-+    UITableView *view = self.tableView;
-+    view.delegate = self;
-+    view.dataSource = self;
-+
-+    [self initOverlay];
-+    [self updateCropMask];
-+
-+    sections = [[NSMutableArray alloc]
-+                   initWithCapacity: NUM_SECTIONS];
-+    for(int i = 0; i < NUM_SECTIONS; i++)
-+        [sections addObject: [NSNull null]];
-+
-+    NSArray *classes =
-+        [NSArray arrayWithObjects:
-+            [self cellWithTitle: @"ZBarReaderViewController"
-+                  tag: 0
-+                  checked: YES],
-+            [self cellWithTitle: @"ZBarReaderController"
-+                  tag: 1
-+                  checked: NO],
-+            nil];
-+    [sections replaceObjectAtIndex: CLASS_SECTION
-+              withObject: classes];
-+
-+    UITableViewCell *typeCell = [UITableViewCell new];
-+    typeLabel = [typeCell.textLabel retain];
-+    UITableViewCell *dataCell = [UITableViewCell new];
-+    dataLabel = [dataCell.textLabel retain];
-+    dataLabel.numberOfLines = 0;
-+    dataLabel.lineBreakMode = UILineBreakModeCharacterWrap;
-+    UITableViewCell *imageCell = [UITableViewCell new];
-+    imageView = [UIImageView new];
-+    imageView.contentMode = UIViewContentModeScaleAspectFit;
-+    imageView.autoresizingMask = (UIViewAutoresizingFlexibleWidth |
-+                                  UIViewAutoresizingFlexibleHeight);
-+    UIView *content = imageCell.contentView;
-+    imageView.frame = content.bounds;
-+    [content addSubview: imageView];
-+    [imageView release];
-+    NSArray *results =
-+        [NSArray arrayWithObjects: typeCell, dataCell, imageCell, nil];
-+    [sections replaceObjectAtIndex: RESULT_SECTION
-+              withObject: results];
-+
-+    [self initControlCells];
-+}
-+
-+- (void) viewDidUnload
-+{
-+    [sections release];
-+    sections = nil;
-+    [symbolEnables release];
-+    symbolEnables = nil;
-+    [manualBtn release];
-+    manualBtn = nil;
-+    [typeLabel release];
-+    typeLabel = nil;
-+    [dataLabel release];
-+    dataLabel = nil;
-+    [imageView release];
-+    imageView = nil;
-+    [typeOvl release];
-+    typeOvl = nil;
-+    [dataOvl release];
-+    dataOvl = nil;
-+    [overlay release];
-+    overlay = nil;
-+    [masks release];
-+    masks = nil;
-+    [super viewDidUnload];
-+}
-+
-+- (void) dealloc
-+{
-+    [reader release];
-+    reader = nil;
-+    [nav release];
-+    nav = nil;
-+    [window release];
-+    window = nil;
-+    [super dealloc];
-+}
-+
-+- (BOOL) shouldAutorotateToInterfaceOrientation: (UIInterfaceOrientation) orient
-+{
-+    return(YES);
-+}
-+
-+- (void) scan
-+{
-+    found = paused = NO;
-+    imageView.image = nil;
-+    typeLabel.text = nil;
-+    dataLabel.text = nil;
-+    typeOvl.text = nil;
-+    dataOvl.text = nil;
-+    [self.tableView reloadData];
-+    if(reader.sourceType == UIImagePickerControllerSourceTypeCamera)
-+        reader.cameraOverlayView = (reader.showsZBarControls) ? nil : overlay;
-+    if([reader respondsToSelector: @selector(readerView)]) {
-+        reader.readerView.showsFPS = YES;
-+        if(zoom)
-+            reader.readerView.zoom = zoom;
-+        reader.supportedOrientationsMask = (reader.showsZBarControls)
-+            ? ZBarOrientationMaskAll
-+            : ZBarOrientationMask(UIInterfaceOrientationPortrait); // tmp disable
-+    }
-+    manualBtn.enabled = TARGET_IPHONE_SIMULATOR ||
-+        (reader.cameraMode == ZBarReaderControllerCameraModeDefault) ||
-+        [reader isKindOfClass: [ZBarReaderViewController class]];
-+    [self presentModalViewController: reader
-+          animated: YES];
-+}
-+
-+- (void) help
-+{
-+    ZBarHelpController *help =
-+        [[ZBarHelpController alloc]
-+            initWithReason: @"TEST"];
-+    [self presentModalViewController: help
-+          animated: YES];
-+    [help release];
-+}
-+
-+- (void) info
-+{
-+    [reader showHelpWithReason: @"INFO"];
-+}
-+
-+- (void) pause
-+{
-+    if(![reader respondsToSelector: @selector(readerView)])
-+        return;
-+    paused = !paused;
-+    if(paused)
-+        [reader.readerView stop];
-+    else
-+        [reader.readerView start];
-+}
-+
-+- (void) manualCapture
-+{
-+    [(UIImagePickerController*)reader takePicture];
-+}
-+
-+// UINavigationControllerDelegate
-+
-+- (void) navigationController: (UINavigationController*) _nav
-+       willShowViewController: (UIViewController*) vc
-+                     animated: (BOOL) animated
-+{
-+    self.navigationItem.leftBarButtonItem =
-+        [[[UIBarButtonItem alloc]
-+             initWithTitle: @"Help"
-+             style: UIBarButtonItemStyleDone
-+             target: self
-+             action: @selector(help)]
-+            autorelease];
-+    self.navigationItem.rightBarButtonItem =
-+        [[[UIBarButtonItem alloc]
-+             initWithTitle: @"Scan!"
-+             style: UIBarButtonItemStyleDone
-+             target: self
-+             action: @selector(scan)]
-+            autorelease];
-+}
-+
-+// UITableViewDataSource
-+
-+- (NSInteger) numberOfSectionsInTableView: (UITableView*) view
-+{
-+    return(sections.count - !found);
-+}
-+
-+- (NSInteger) tableView: (UITableView*) view
-+  numberOfRowsInSection: (NSInteger) idx
-+{
-+    NSArray *section = [sections objectAtIndex: idx];
-+    return(section.count);
-+}
-+
-+- (UITableViewCell*) tableView: (UITableView*) view
-+         cellForRowAtIndexPath: (NSIndexPath*) path
-+{
-+    return([[sections objectAtIndex: path.section]
-+               objectAtIndex: path.row]);
-+}
-+
-+- (NSString*)  tableView: (UITableView*) view
-+ titleForHeaderInSection: (NSInteger) idx
-+{
-+    assert(idx < NUM_SECTIONS);
-+    return(section_titles[idx]);
-+}
-+
-+// UITableViewDelegate
-+
-+- (NSIndexPath*) tableView: (UITableView*) view
-+  willSelectRowAtIndexPath: (NSIndexPath*) path
-+{
-+    if(path.section == RESULT_SECTION && path.row != 2)
-+        return(nil);
-+    return(path);
-+}
-+
-+- (void) alertUnsupported
-+{
-+    UIAlertView *alert =
-+        [[UIAlertView alloc]
-+            initWithTitle: @"Unsupported"
-+            message: @"Setting not available for this reader"
-+            @" (or with this OS on this device)"
-+            delegate: nil
-+            cancelButtonTitle: @"Cancel"
-+            otherButtonTitles: nil];
-+    [alert show];
-+    [alert release];
-+}
-+
-+- (void) advanceCrop: (UILabel*) label
-+{
-+    CGRect r = CGRectFromString(label.text);
-+    int i;
-+    for(i = 0; crop_choices[i].size.width;)
-+        if(CGRectEqualToRect(r, crop_choices[i++]))
-+            break;
-+    if(!crop_choices[i].size.width)
-+        i = 0;
-+    r = crop_choices[i];
-+    reader.scanCrop = r;
-+    label.text = NSStringFromCGRect(r);
-+
-+    [self updateCropMask];
-+}
-+
-+- (void) advanceZoom: (UILabel*) label
-+{
-+    int i;
-+    for(i = 0; zoom_choices[i] >= 0;)
-+        if(zoom == zoom_choices[i++])
-+            break;
-+    if(zoom_choices[i] < 0)
-+        i = 0;
-+    zoom = zoom_choices[i];
-+    assert(zoom >= 0);
-+    label.text = [NSString stringWithFormat: @"%g", zoom];
-+}
-+
-+- (void) advanceDensity: (UILabel*) label
-+                  value: (NSInteger*) value
-+{
-+    NSInteger d = *value;
-+    int i;
-+    for(i = 0; density_choices[i] >= 0;)
-+        if(d == density_choices[i++])
-+            break;
-+    if(density_choices[i] < 0)
-+        i = 0;
-+    *value = d = density_choices[i];
-+    assert(d >= 0);
-+    [reader.scanner setSymbology: 0
-+           config: label.tag
-+           to: d];
-+    label.text = [NSString stringWithFormat: @"%d", d];
-+}
-+
-+- (void)       tableView: (UITableView*) view
-+ didSelectRowAtIndexPath: (NSIndexPath*) path
-+{
-+    [view deselectRowAtIndexPath: path
-+          animated: YES];
-+
-+    UITableViewCell *cell = [view cellForRowAtIndexPath: path];
-+
-+    switch(path.section)
-+    {
-+    case CLASS_SECTION: {
-+        NSString *name = cell.textLabel.text;
-+        [self initReader: name];
-+        [self updateCropMask];
-+        [self initControlCells];
-+        [self setCheckForName: name
-+              inSection: CLASS_SECTION];
-+        break;
-+    }
-+
-+    case SOURCE_SECTION:
-+        [self setCheckForTag: reader.sourceType = cell.tag
-+              inSection: SOURCE_SECTION];
-+        break;
-+
-+    case CAMODE_SECTION:
-+        @try {
-+            reader.cameraMode = cell.tag;
-+        }
-+        @catch (...) {
-+            [self alertUnsupported];
-+        }
-+        [self setCheckForTag: reader.cameraMode
-+              inSection: CAMODE_SECTION];
-+        break;
-+
-+    case DEVICE_SECTION:
-+        reader.cameraDevice = cell.tag;
-+        [self setCheckForTag: reader.cameraDevice
-+              inSection: DEVICE_SECTION];
-+        break;
-+
-+    case FLASH_SECTION:
-+        reader.cameraFlashMode = cell.tag;
-+        [self setCheckForTag: reader.cameraFlashMode
-+              inSection: FLASH_SECTION];
-+        break;
-+
-+    case QUALITY_SECTION:
-+        reader.videoQuality = cell.tag;
-+        [self setCheckForTag: reader.videoQuality
-+              inSection: QUALITY_SECTION];
-+        break;
-+
-+    case CONFIG_SECTION: {
-+        BOOL state;
-+        NSString *key = cell.textLabel.text;
-+        state = ![[reader valueForKey: key] boolValue];
-+        @try {
-+            [reader setValue: [NSNumber numberWithBool: state]
-+                    forKey: key];
-+        }
-+        @catch (...) {
-+            [self alertUnsupported];
-+        }
-+
-+        // read back and update current state
-+        state = [[reader valueForKey: key] boolValue];
-+        [self setCheck: state
-+              forCell: cell];
-+        break;
-+    }
-+
-+    case CUSTOM_SECTION:
-+        switch(path.row)
-+        {
-+        case 0:
-+            [self advanceDensity: cell.detailTextLabel
-+                  value: &xDensity];
-+            break;
-+        case 1:
-+            [self advanceDensity: cell.detailTextLabel
-+                  value: &yDensity];
-+            break;
-+        case 2:
-+            [self advanceCrop: cell.detailTextLabel];
-+            break;
-+        case 3:
-+            [self advanceZoom: cell.detailTextLabel];
-+            break;
-+        case 4:
-+            [self setCheck: continuous = !continuous
-+                  forCell: cell];
-+            break;
-+        default:
-+            assert(0);
-+        }
-+        break;
-+
-+    case SYMBOL_SECTION: {
-+        BOOL state = ![[symbolEnables objectAtIndex: path.row] boolValue];
-+        [symbolEnables replaceObjectAtIndex: path.row
-+                       withObject: [NSNumber numberWithBool: state]];
-+        [reader.scanner setSymbology: cell.tag
-+               config: ZBAR_CFG_ENABLE
-+               to: state];
-+        [self setCheck: state
-+              forCell: cell];
-+        break;
-+    }
-+    case RESULT_SECTION:
-+        if(path.row == 2)
-+            [[[[UIActionSheet alloc]
-+                  initWithTitle: nil
-+                  delegate: self
-+                  cancelButtonTitle: @"Cancel"
-+                  destructiveButtonTitle: nil
-+                  otherButtonTitles: @"Save Image", nil]
-+                 autorelease]
-+                showInView: self.view];
-+        break;
-+    default:
-+        assert(0);
-+    }
-+}
-+
-+- (CGFloat)    tableView: (UITableView*) view
-+ heightForRowAtIndexPath: (NSIndexPath*) path
-+{
-+    if(path.section < RESULT_SECTION)
-+        return(44);
-+
-+    switch(path.row) {
-+    case 0: return(44);
-+    case 1: return(dataHeight);
-+    case 2: return(300);
-+    default: assert(0);
-+    }
-+    return(44);
-+}
-+
-+// UIActionSheetDelegate
-+
-+- (void)  actionSheet: (UIActionSheet*) sheet
-+ clickedButtonAtIndex: (NSInteger) idx
-+{
-+    if(idx == sheet.cancelButtonIndex)
-+        return;
-+    idx -= sheet.firstOtherButtonIndex;
-+    if(!idx) {
-+        UIImage *img =
-+            [UIImage imageWithData:
-+                         UIImagePNGRepresentation(imageView.image)];
-+        UIImageWriteToSavedPhotosAlbum(img, nil, NULL, NULL);
-+    }
-+}
-+
-+// ZBarReaderDelegate
-+
-+- (void)  imagePickerController: (UIImagePickerController*) picker
-+  didFinishPickingMediaWithInfo: (NSDictionary*) info
-+{
-+    id <NSFastEnumeration> results =
-+        [info objectForKey: ZBarReaderControllerResults];
-+    assert(results);
-+
-+    UIImage *image = [info objectForKey: UIImagePickerControllerOriginalImage];
-+    assert(image);
-+    if(image)
-+        imageView.image = image;
-+
-+    int quality = 0;
-+    ZBarSymbol *bestResult = nil;
-+    for(ZBarSymbol *sym in results) {
-+        int q = sym.quality;
-+        if(quality < q) {
-+            quality = q;
-+            bestResult = sym;
-+        }
-+    }
-+
-+    [self performSelector: @selector(presentResult:)
-+          withObject: bestResult
-+          afterDelay: .001];
-+    if(!continuous)
-+        [picker dismissModalViewControllerAnimated: YES];
-+}
-+
-+- (void) presentResult: (ZBarSymbol*) sym
-+{
-+    found = sym || imageView.image;
-+    NSString *typeName = @"NONE";
-+    NSString *data = @"";
-+    if(sym) {
-+        typeName = sym.typeName;
-+        data = sym.data;
-+    }
-+    typeLabel.text = typeName;
-+    dataLabel.text = data;
-+
-+    if(continuous) {
-+        typeOvl.text = typeName;
-+        dataOvl.text = data;
-+    }
-+
-+    NSLog(@"imagePickerController:didFinishPickingMediaWithInfo:\n");
-+    NSLog(@"    type=%@ data=%@\n", typeName, data);
-+
-+    CGSize size = [data sizeWithFont: [UIFont systemFontOfSize: 17]
-+                        constrainedToSize: CGSizeMake(288, 2000)
-+                        lineBreakMode: UILineBreakModeCharacterWrap];
-+    dataHeight = size.height + 26;
-+    if(dataHeight > 2000)
-+        dataHeight = 2000;
-+
-+    [self.tableView reloadData];
-+    [self.tableView scrollToRowAtIndexPath:
-+             [NSIndexPath indexPathForRow: 0
-+                          inSection: RESULT_SECTION]
-+         atScrollPosition:UITableViewScrollPositionTop
-+         animated: NO];
-+}
-+
-+- (void) imagePickerControllerDidCancel: (UIImagePickerController*) picker
-+{
-+    NSLog(@"imagePickerControllerDidCancel:\n");
-+    [reader dismissModalViewControllerAnimated: YES];
-+}
-+
-+- (void) readerControllerDidFailToRead: (ZBarReaderController*) _reader
-+                             withRetry: (BOOL) retry
-+{
-+    NSLog(@"readerControllerDidFailToRead: retry=%s\n",
-+          (retry) ? "YES" : "NO");
-+    if(!retry)
-+        [_reader dismissModalViewControllerAnimated: YES];
-+}
-+
-+@end
-+
-+
-+int main (int argc, char *argv[])
-+{
-+    NSAutoreleasePool *pool = [NSAutoreleasePool new];
-+    int rc = UIApplicationMain(argc, argv, nil, @"AppDelegate");
-+    [pool release];
-+    return(rc);
-+}
-diff -r 563557a923d0 iphone/examples/readertest/readertest.plist
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/examples/readertest/readertest.plist	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,28 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-+<plist version="1.0">
-+<dict>
-+	<key>CFBundleDevelopmentRegion</key>
-+	<string>English</string>
-+	<key>CFBundleDisplayName</key>
-+	<string>${PRODUCT_NAME}</string>
-+	<key>CFBundleExecutable</key>
-+	<string>${EXECUTABLE_NAME}</string>
-+	<key>CFBundleIconFile</key>
-+	<string></string>
-+	<key>CFBundleIdentifier</key>
-+	<string>net.sourceforge.zbar.test.readertest</string>
-+	<key>CFBundleInfoDictionaryVersion</key>
-+	<string>6.0</string>
-+	<key>CFBundleName</key>
-+	<string>${PRODUCT_NAME}</string>
-+	<key>CFBundlePackageType</key>
-+	<string>APPL</string>
-+	<key>CFBundleSignature</key>
-+	<string>????</string>
-+	<key>CFBundleVersion</key>
-+	<string>1.0</string>
-+	<key>LSRequiresIPhoneOS</key>
-+	<true/>
-+</dict>
-+</plist>
-diff -r 563557a923d0 iphone/examples/readertest/readertest.xcodeproj/project.pbxproj
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/examples/readertest/readertest.xcodeproj/project.pbxproj	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,351 @@
-+// !$*UTF8*$!
-+{
-+	archiveVersion = 1;
-+	classes = {
-+	};
-+	objectVersion = 45;
-+	objects = {
-+
-+/* Begin PBXBuildFile section */
-+		1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; };
-+		1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; };
-+		288765FD0DF74451002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765FC0DF74451002DB57D /* CoreGraphics.framework */; };
-+		DC48C4D61219E5F70047193B /* libzbar.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC48C4D01219E5F70047193B /* libzbar.a */; };
-+		DC48C4D71219E5F70047193B /* zbar-back.png in Resources */ = {isa = PBXBuildFile; fileRef = DC48C4D21219E5F70047193B /* zbar-back.png */; };
-+		DC48C4D81219E5F70047193B /* zbar-help.html in Resources */ = {isa = PBXBuildFile; fileRef = DC48C4D31219E5F70047193B /* zbar-help.html */; };
-+		DC48C4D91219E5F70047193B /* zbar-helpicons.png in Resources */ = {isa = PBXBuildFile; fileRef = DC48C4D41219E5F70047193B /* zbar-helpicons.png */; };
-+		DC48C4DA1219E5F70047193B /* zbar-samples.png in Resources */ = {isa = PBXBuildFile; fileRef = DC48C4D51219E5F70047193B /* zbar-samples.png */; };
-+		DC824600162B568A0010B2E6 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DC8245FF162B568A0010B2E6 /* Default-568h@2x.png */; };
-+		DCB9118510BC5DA200B907F0 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCB9118410BC5DA200B907F0 /* QuartzCore.framework */; };
-+		DCB9118810BC5DB500B907F0 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DCD6E13B10B0AFD4002005CD /* libiconv.dylib */; };
-+		DCD6E0D010B0AD41002005CD /* readertest.m in Sources */ = {isa = PBXBuildFile; fileRef = DCD6E0CF10B0AD41002005CD /* readertest.m */; };
-+		DCDC6D9B11ACA23000021380 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCDC6D9A11ACA23000021380 /* CoreVideo.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
-+		DCDC6D9F11ACA23900021380 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCDC6D9E11ACA23900021380 /* CoreMedia.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
-+		DCDC6DEC11ACA5B400021380 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCDC6DEB11ACA5B400021380 /* AVFoundation.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
-+/* End PBXBuildFile section */
-+
-+/* Begin PBXFileReference section */
-+		1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
-+		1D6058910D05DD3D006BFB54 /* readertest.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = readertest.app; sourceTree = BUILT_PRODUCTS_DIR; };
-+		1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
-+		288765FC0DF74451002DB57D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
-+		DC48C4BE1219E5F70047193B /* Decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Decoder.h; sourceTree = "<group>"; };
-+		DC48C4BF1219E5F70047193B /* Exception.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Exception.h; sourceTree = "<group>"; };
-+		DC48C4C01219E5F70047193B /* Image.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Image.h; sourceTree = "<group>"; };
-+		DC48C4C11219E5F70047193B /* ImageScanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImageScanner.h; sourceTree = "<group>"; };
-+		DC48C4C21219E5F70047193B /* Processor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Processor.h; sourceTree = "<group>"; };
-+		DC48C4C31219E5F70047193B /* Scanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Scanner.h; sourceTree = "<group>"; };
-+		DC48C4C41219E5F70047193B /* Symbol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Symbol.h; sourceTree = "<group>"; };
-+		DC48C4C51219E5F70047193B /* Video.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Video.h; sourceTree = "<group>"; };
-+		DC48C4C61219E5F70047193B /* Window.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Window.h; sourceTree = "<group>"; };
-+		DC48C4C71219E5F70047193B /* zbar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zbar.h; sourceTree = "<group>"; };
-+		DC48C4C81219E5F70047193B /* ZBarCaptureReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarCaptureReader.h; sourceTree = "<group>"; };
-+		DC48C4C91219E5F70047193B /* ZBarImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarImage.h; sourceTree = "<group>"; };
-+		DC48C4CA1219E5F70047193B /* ZBarImageScanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarImageScanner.h; sourceTree = "<group>"; };
-+		DC48C4CB1219E5F70047193B /* ZBarReaderController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarReaderController.h; sourceTree = "<group>"; };
-+		DC48C4CC1219E5F70047193B /* ZBarReaderView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarReaderView.h; sourceTree = "<group>"; };
-+		DC48C4CD1219E5F70047193B /* ZBarReaderViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarReaderViewController.h; sourceTree = "<group>"; };
-+		DC48C4CE1219E5F70047193B /* ZBarSDK.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarSDK.h; sourceTree = "<group>"; };
-+		DC48C4CF1219E5F70047193B /* ZBarSymbol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarSymbol.h; sourceTree = "<group>"; };
-+		DC48C4D01219E5F70047193B /* libzbar.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libzbar.a; sourceTree = "<group>"; };
-+		DC48C4D21219E5F70047193B /* zbar-back.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "zbar-back.png"; sourceTree = "<group>"; };
-+		DC48C4D31219E5F70047193B /* zbar-help.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "zbar-help.html"; sourceTree = "<group>"; };
-+		DC48C4D41219E5F70047193B /* zbar-helpicons.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "zbar-helpicons.png"; sourceTree = "<group>"; };
-+		DC48C4D51219E5F70047193B /* zbar-samples.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "zbar-samples.png"; sourceTree = "<group>"; };
-+		DC8245FF162B568A0010B2E6 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
-+		DCB9118410BC5DA200B907F0 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
-+		DCD6E0CE10B0AD41002005CD /* prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = prefix.pch; sourceTree = "<group>"; };
-+		DCD6E0CF10B0AD41002005CD /* readertest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = readertest.m; sourceTree = "<group>"; };
-+		DCD6E0D810B0AD55002005CD /* readertest.plist */ = {isa = PBXFileReference; explicitFileType = text.plist.info; fileEncoding = 4; path = readertest.plist; sourceTree = "<group>"; };
-+		DCD6E13B10B0AFD4002005CD /* libiconv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libiconv.dylib; path = usr/lib/libiconv.dylib; sourceTree = SDKROOT; };
-+		DCDC6D9A11ACA23000021380 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; };
-+		DCDC6D9E11ACA23900021380 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; };
-+		DCDC6DEB11ACA5B400021380 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
-+/* End PBXFileReference section */
-+
-+/* Begin PBXFrameworksBuildPhase section */
-+		1D60588F0D05DD3D006BFB54 /* Frameworks */ = {
-+			isa = PBXFrameworksBuildPhase;
-+			buildActionMask = 2147483647;
-+			files = (
-+				1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */,
-+				288765FD0DF74451002DB57D /* CoreGraphics.framework in Frameworks */,
-+				1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */,
-+				DCB9118510BC5DA200B907F0 /* QuartzCore.framework in Frameworks */,
-+				DCDC6DEC11ACA5B400021380 /* AVFoundation.framework in Frameworks */,
-+				DCDC6D9F11ACA23900021380 /* CoreMedia.framework in Frameworks */,
-+				DCDC6D9B11ACA23000021380 /* CoreVideo.framework in Frameworks */,
-+				DCB9118810BC5DB500B907F0 /* libiconv.dylib in Frameworks */,
-+				DC48C4D61219E5F70047193B /* libzbar.a in Frameworks */,
-+			);
-+			runOnlyForDeploymentPostprocessing = 0;
-+		};
-+/* End PBXFrameworksBuildPhase section */
-+
-+/* Begin PBXGroup section */
-+		19C28FACFE9D520D11CA2CBB /* Products */ = {
-+			isa = PBXGroup;
-+			children = (
-+				1D6058910D05DD3D006BFB54 /* readertest.app */,
-+			);
-+			name = Products;
-+			sourceTree = "<group>";
-+		};
-+		29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
-+			isa = PBXGroup;
-+			children = (
-+				DCD6E0CE10B0AD41002005CD /* prefix.pch */,
-+				DCD6E0CF10B0AD41002005CD /* readertest.m */,
-+				DC48C4BA1219E5F70047193B /* ZBarSDK */,
-+				DC3CEAC61209C07400D7A786 /* Resources */,
-+				29B97323FDCFA39411CA2CEA /* Frameworks */,
-+				19C28FACFE9D520D11CA2CBB /* Products */,
-+			);
-+			name = CustomTemplate;
-+			sourceTree = "<group>";
-+		};
-+		29B97323FDCFA39411CA2CEA /* Frameworks */ = {
-+			isa = PBXGroup;
-+			children = (
-+				1D30AB110D05D00D00671497 /* Foundation.framework */,
-+				288765FC0DF74451002DB57D /* CoreGraphics.framework */,
-+				1DF5F4DF0D08C38300B7A737 /* UIKit.framework */,
-+				DCB9118410BC5DA200B907F0 /* QuartzCore.framework */,
-+				DCDC6DEB11ACA5B400021380 /* AVFoundation.framework */,
-+				DCDC6D9A11ACA23000021380 /* CoreVideo.framework */,
-+				DCDC6D9E11ACA23900021380 /* CoreMedia.framework */,
-+				DCD6E13B10B0AFD4002005CD /* libiconv.dylib */,
-+			);
-+			name = Frameworks;
-+			sourceTree = "<group>";
-+		};
-+		DC3CEAC61209C07400D7A786 /* Resources */ = {
-+			isa = PBXGroup;
-+			children = (
-+				DCD6E0D810B0AD55002005CD /* readertest.plist */,
-+				DC8245FF162B568A0010B2E6 /* Default-568h@2x.png */,
-+			);
-+			name = Resources;
-+			sourceTree = "<group>";
-+		};
-+		DC48C4BA1219E5F70047193B /* ZBarSDK */ = {
-+			isa = PBXGroup;
-+			children = (
-+				DC48C4BB1219E5F70047193B /* Headers */,
-+				DC48C4D01219E5F70047193B /* libzbar.a */,
-+				DC48C4D11219E5F70047193B /* Resources */,
-+			);
-+			path = ZBarSDK;
-+			sourceTree = "<group>";
-+		};
-+		DC48C4BB1219E5F70047193B /* Headers */ = {
-+			isa = PBXGroup;
-+			children = (
-+				DC48C4BC1219E5F70047193B /* ZBarSDK */,
-+			);
-+			path = Headers;
-+			sourceTree = "<group>";
-+		};
-+		DC48C4BC1219E5F70047193B /* ZBarSDK */ = {
-+			isa = PBXGroup;
-+			children = (
-+				DC48C4BD1219E5F70047193B /* zbar */,
-+				DC48C4C71219E5F70047193B /* zbar.h */,
-+				DC48C4C81219E5F70047193B /* ZBarCaptureReader.h */,
-+				DC48C4C91219E5F70047193B /* ZBarImage.h */,
-+				DC48C4CA1219E5F70047193B /* ZBarImageScanner.h */,
-+				DC48C4CB1219E5F70047193B /* ZBarReaderController.h */,
-+				DC48C4CC1219E5F70047193B /* ZBarReaderView.h */,
-+				DC48C4CD1219E5F70047193B /* ZBarReaderViewController.h */,
-+				DC48C4CE1219E5F70047193B /* ZBarSDK.h */,
-+				DC48C4CF1219E5F70047193B /* ZBarSymbol.h */,
-+			);
-+			path = ZBarSDK;
-+			sourceTree = "<group>";
-+		};
-+		DC48C4BD1219E5F70047193B /* zbar */ = {
-+			isa = PBXGroup;
-+			children = (
-+				DC48C4BE1219E5F70047193B /* Decoder.h */,
-+				DC48C4BF1219E5F70047193B /* Exception.h */,
-+				DC48C4C01219E5F70047193B /* Image.h */,
-+				DC48C4C11219E5F70047193B /* ImageScanner.h */,
-+				DC48C4C21219E5F70047193B /* Processor.h */,
-+				DC48C4C31219E5F70047193B /* Scanner.h */,
-+				DC48C4C41219E5F70047193B /* Symbol.h */,
-+				DC48C4C51219E5F70047193B /* Video.h */,
-+				DC48C4C61219E5F70047193B /* Window.h */,
-+			);
-+			path = zbar;
-+			sourceTree = "<group>";
-+		};
-+		DC48C4D11219E5F70047193B /* Resources */ = {
-+			isa = PBXGroup;
-+			children = (
-+				DC48C4D21219E5F70047193B /* zbar-back.png */,
-+				DC48C4D31219E5F70047193B /* zbar-help.html */,
-+				DC48C4D41219E5F70047193B /* zbar-helpicons.png */,
-+				DC48C4D51219E5F70047193B /* zbar-samples.png */,
-+			);
-+			path = Resources;
-+			sourceTree = "<group>";
-+		};
-+/* End PBXGroup section */
-+
-+/* Begin PBXNativeTarget section */
-+		1D6058900D05DD3D006BFB54 /* readertest */ = {
-+			isa = PBXNativeTarget;
-+			buildConfigurationList = 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "readertest" */;
-+			buildPhases = (
-+				1D60588D0D05DD3D006BFB54 /* Resources */,
-+				1D60588E0D05DD3D006BFB54 /* Sources */,
-+				1D60588F0D05DD3D006BFB54 /* Frameworks */,
-+			);
-+			buildRules = (
-+			);
-+			dependencies = (
-+			);
-+			name = readertest;
-+			productName = readertest;
-+			productReference = 1D6058910D05DD3D006BFB54 /* readertest.app */;
-+			productType = "com.apple.product-type.application";
-+		};
-+/* End PBXNativeTarget section */
-+
-+/* Begin PBXProject section */
-+		29B97313FDCFA39411CA2CEA /* Project object */ = {
-+			isa = PBXProject;
-+			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "readertest" */;
-+			compatibilityVersion = "Xcode 3.1";
-+			developmentRegion = English;
-+			hasScannedForEncodings = 1;
-+			knownRegions = (
-+				English,
-+				Japanese,
-+				French,
-+				German,
-+			);
-+			mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */;
-+			projectDirPath = "";
-+			projectRoot = "";
-+			targets = (
-+				1D6058900D05DD3D006BFB54 /* readertest */,
-+			);
-+		};
-+/* End PBXProject section */
-+
-+/* Begin PBXResourcesBuildPhase section */
-+		1D60588D0D05DD3D006BFB54 /* Resources */ = {
-+			isa = PBXResourcesBuildPhase;
-+			buildActionMask = 2147483647;
-+			files = (
-+				DC48C4D71219E5F70047193B /* zbar-back.png in Resources */,
-+				DC48C4D81219E5F70047193B /* zbar-help.html in Resources */,
-+				DC48C4D91219E5F70047193B /* zbar-helpicons.png in Resources */,
-+				DC48C4DA1219E5F70047193B /* zbar-samples.png in Resources */,
-+				DC824600162B568A0010B2E6 /* Default-568h@2x.png in Resources */,
-+			);
-+			runOnlyForDeploymentPostprocessing = 0;
-+		};
-+/* End PBXResourcesBuildPhase section */
-+
-+/* Begin PBXSourcesBuildPhase section */
-+		1D60588E0D05DD3D006BFB54 /* Sources */ = {
-+			isa = PBXSourcesBuildPhase;
-+			buildActionMask = 2147483647;
-+			files = (
-+				DCD6E0D010B0AD41002005CD /* readertest.m in Sources */,
-+			);
-+			runOnlyForDeploymentPostprocessing = 0;
-+		};
-+/* End PBXSourcesBuildPhase section */
-+
-+/* Begin XCBuildConfiguration section */
-+		1D6058940D05DD3E006BFB54 /* Debug */ = {
-+			isa = XCBuildConfiguration;
-+			buildSettings = {
-+				COPY_PHASE_STRIP = NO;
-+				GCC_OPTIMIZATION_LEVEL = 0;
-+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-+				GCC_PREFIX_HEADER = prefix.pch;
-+				INFOPLIST_FILE = readertest.plist;
-+				LIBRARY_SEARCH_PATHS = (
-+					"$(inherited)",
-+					"\"$(SRCROOT)/ZBarSDK\"",
-+				);
-+				PRODUCT_NAME = readertest;
-+			};
-+			name = Debug;
-+		};
-+		1D6058950D05DD3E006BFB54 /* Release */ = {
-+			isa = XCBuildConfiguration;
-+			buildSettings = {
-+				COPY_PHASE_STRIP = YES;
-+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-+				GCC_PREFIX_HEADER = prefix.pch;
-+				INFOPLIST_FILE = readertest.plist;
-+				LIBRARY_SEARCH_PATHS = (
-+					"$(inherited)",
-+					"\"$(SRCROOT)/ZBarSDK\"",
-+				);
-+				PRODUCT_NAME = readertest;
-+			};
-+			name = Release;
-+		};
-+		C01FCF4F08A954540054247B /* Debug */ = {
-+			isa = XCBuildConfiguration;
-+			buildSettings = {
-+				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
-+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-+				GCC_C_LANGUAGE_STANDARD = c99;
-+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-+				GCC_WARN_UNUSED_VARIABLE = YES;
-+				IPHONEOS_DEPLOYMENT_TARGET = 3.1;
-+				OTHER_LDFLAGS = "-all_load";
-+				PREBINDING = NO;
-+				SDKROOT = iphoneos;
-+				SYMROOT = /tmp/readertest.build;
-+			};
-+			name = Debug;
-+		};
-+		C01FCF5008A954540054247B /* Release */ = {
-+			isa = XCBuildConfiguration;
-+			buildSettings = {
-+				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
-+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-+				GCC_C_LANGUAGE_STANDARD = c99;
-+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-+				GCC_WARN_UNUSED_VARIABLE = YES;
-+				IPHONEOS_DEPLOYMENT_TARGET = 3.1;
-+				OTHER_LDFLAGS = "-all_load";
-+				PREBINDING = NO;
-+				SDKROOT = iphoneos;
-+				SYMROOT = /tmp/readertest.build;
-+			};
-+			name = Release;
-+		};
-+/* End XCBuildConfiguration section */
-+
-+/* Begin XCConfigurationList section */
-+		1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "readertest" */ = {
-+			isa = XCConfigurationList;
-+			buildConfigurations = (
-+				1D6058940D05DD3E006BFB54 /* Debug */,
-+				1D6058950D05DD3E006BFB54 /* Release */,
-+			);
-+			defaultConfigurationIsVisible = 0;
-+			defaultConfigurationName = Release;
-+		};
-+		C01FCF4E08A954540054247B /* Build configuration list for PBXProject "readertest" */ = {
-+			isa = XCConfigurationList;
-+			buildConfigurations = (
-+				C01FCF4F08A954540054247B /* Debug */,
-+				C01FCF5008A954540054247B /* Release */,
-+			);
-+			defaultConfigurationIsVisible = 0;
-+			defaultConfigurationName = Release;
-+		};
-+/* End XCConfigurationList section */
-+	};
-+	rootObject = 29B97313FDCFA39411CA2CEA /* Project object */;
-+}
-diff -r 563557a923d0 iphone/examples/readertest/readertest.xcodeproj/xcshareddata/xcschemes/readertest.xcscheme
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/examples/readertest/readertest.xcodeproj/xcshareddata/xcschemes/readertest.xcscheme	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,76 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<Scheme
-+   version = "1.3">
-+   <BuildAction
-+      parallelizeBuildables = "YES"
-+      buildImplicitDependencies = "YES">
-+      <BuildActionEntries>
-+         <BuildActionEntry
-+            buildForTesting = "YES"
-+            buildForRunning = "YES"
-+            buildForProfiling = "YES"
-+            buildForArchiving = "YES"
-+            buildForAnalyzing = "YES">
-+            <BuildableReference
-+               BuildableIdentifier = "primary"
-+               BlueprintIdentifier = "1D6058900D05DD3D006BFB54"
-+               BuildableName = "readertest.app"
-+               BlueprintName = "readertest"
-+               ReferencedContainer = "container:readertest.xcodeproj">
-+            </BuildableReference>
-+         </BuildActionEntry>
-+      </BuildActionEntries>
-+   </BuildAction>
-+   <TestAction
-+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
-+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
-+      shouldUseLaunchSchemeArgsEnv = "YES"
-+      buildConfiguration = "Debug">
-+      <Testables>
-+      </Testables>
-+   </TestAction>
-+   <LaunchAction
-+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
-+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
-+      displayScaleIsEnabled = "NO"
-+      displayScale = "1.00"
-+      launchStyle = "0"
-+      useCustomWorkingDirectory = "NO"
-+      buildConfiguration = "Debug">
-+      <BuildableProductRunnable>
-+         <BuildableReference
-+            BuildableIdentifier = "primary"
-+            BlueprintIdentifier = "1D6058900D05DD3D006BFB54"
-+            BuildableName = "readertest.app"
-+            BlueprintName = "readertest"
-+            ReferencedContainer = "container:readertest.xcodeproj">
-+         </BuildableReference>
-+      </BuildableProductRunnable>
-+      <AdditionalOptions>
-+      </AdditionalOptions>
-+   </LaunchAction>
-+   <ProfileAction
-+      displayScaleIsEnabled = "NO"
-+      displayScale = "1.00"
-+      shouldUseLaunchSchemeArgsEnv = "YES"
-+      savedToolIdentifier = ""
-+      useCustomWorkingDirectory = "NO"
-+      buildConfiguration = "Release">
-+      <BuildableProductRunnable>
-+         <BuildableReference
-+            BuildableIdentifier = "primary"
-+            BlueprintIdentifier = "1D6058900D05DD3D006BFB54"
-+            BuildableName = "readertest.app"
-+            BlueprintName = "readertest"
-+            ReferencedContainer = "container:readertest.xcodeproj">
-+         </BuildableReference>
-+      </BuildableProductRunnable>
-+   </ProfileAction>
-+   <AnalyzeAction
-+      buildConfiguration = "Debug">
-+   </AnalyzeAction>
-+   <ArchiveAction
-+      buildConfiguration = "Release"
-+      revealArchiveInOrganizer = "YES">
-+   </ArchiveAction>
-+</Scheme>
-diff -r 563557a923d0 iphone/include/ZBarSDK/ZBarCameraSimulator.h
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/include/ZBarSDK/ZBarCameraSimulator.h	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,45 @@
-+//------------------------------------------------------------------------
-+//  Copyright 2010-2011 (c) Jeff Brown <spadix@users.sourceforge.net>
-+//
-+//  This file is part of the ZBar Bar Code Reader.
-+//
-+//  The ZBar Bar Code Reader is free software; you can redistribute it
-+//  and/or modify it under the terms of the GNU Lesser Public License as
-+//  published by the Free Software Foundation; either version 2.1 of
-+//  the License, or (at your option) any later version.
-+//
-+//  The ZBar Bar Code Reader is distributed in the hope that it will be
-+//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-+//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+//  GNU Lesser Public License for more details.
-+//
-+//  You should have received a copy of the GNU Lesser Public License
-+//  along with the ZBar Bar Code Reader; if not, write to the Free
-+//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-+//  Boston, MA  02110-1301  USA
-+//
-+//  http://sourceforge.net/projects/zbar
-+//------------------------------------------------------------------------
-+
-+@class ZBarReaderView;
-+
-+// hack around missing simulator support for AVCapture interfaces
-+
-+@interface ZBarCameraSimulator
-+    : NSObject
-+    < UINavigationControllerDelegate,
-+      UIImagePickerControllerDelegate,
-+      UIPopoverControllerDelegate >
-+{
-+    UIViewController *viewController;
-+    ZBarReaderView *readerView;
-+    UIImagePickerController *picker;
-+    UIPopoverController *pickerPopover;
-+}
-+
-+- (id) initWithViewController: (UIViewController*) viewController;
-+- (void) takePicture;
-+
-+@property (nonatomic, assign) ZBarReaderView *readerView;
-+
-+@end
-diff -r 563557a923d0 iphone/include/ZBarSDK/ZBarCaptureReader.h
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/include/ZBarSDK/ZBarCaptureReader.h	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,111 @@
-+//------------------------------------------------------------------------
-+//  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-+//
-+//  This file is part of the ZBar Bar Code Reader.
-+//
-+//  The ZBar Bar Code Reader is free software; you can redistribute it
-+//  and/or modify it under the terms of the GNU Lesser Public License as
-+//  published by the Free Software Foundation; either version 2.1 of
-+//  the License, or (at your option) any later version.
-+//
-+//  The ZBar Bar Code Reader is distributed in the hope that it will be
-+//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-+//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+//  GNU Lesser Public License for more details.
-+//
-+//  You should have received a copy of the GNU Lesser Public License
-+//  along with the ZBar Bar Code Reader; if not, write to the Free
-+//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-+//  Boston, MA  02110-1301  USA
-+//
-+//  http://sourceforge.net/projects/zbar
-+//------------------------------------------------------------------------
-+
-+#import <CoreGraphics/CoreGraphics.h>
-+#import "ZBarImageScanner.h"
-+
-+@class AVCaptureVideoDataOutput, AVCaptureOutput;
-+@class ZBarCaptureReader, ZBarCVImage;
-+
-+@protocol ZBarCaptureDelegate <NSObject>
-+
-+// called when a new barcode is detected.  the image refers to the
-+// video buffer and must not be retained for long
-+- (void)       captureReader: (ZBarCaptureReader*) captureReader
-+  didReadNewSymbolsFromImage: (ZBarImage*) image;
-+
-+@optional
-+// called when a potential/uncertain barcode is detected.  will also
-+// be called *after* captureReader:didReadNewSymbolsFromImage:
-+// when good barcodes are detected
-+- (void) captureReader: (ZBarCaptureReader*) captureReader
-+       didTrackSymbols: (ZBarSymbolSet*) symbols;
-+
-+@end
-+
-+@interface ZBarCaptureReader
-+    : NSObject
-+{
-+#if !TARGET_IPHONE_SIMULATOR
-+    AVCaptureVideoDataOutput *captureOutput;
-+    id<ZBarCaptureDelegate> captureDelegate;
-+    ZBarImageScanner *scanner;
-+    CGRect scanCrop;
-+    CGSize size;
-+    CGFloat framesPerSecond;
-+    BOOL enableCache;
-+
-+    dispatch_queue_t queue;
-+    ZBarImage *image;
-+    ZBarCVImage *result;
-+    volatile uint32_t state;
-+    int framecnt;
-+    unsigned width, height;
-+    uint64_t t_frame, t_fps, t_scan;
-+    CGFloat dt_frame;
-+#endif
-+}
-+
-+// supply a pre-configured image scanner
-+- (id) initWithImageScanner: (ZBarImageScanner*) imageScanner;
-+
-+// this must be called before the session is started
-+- (void) willStartRunning;
-+
-+// this must be called *before* the session is stopped
-+- (void) willStopRunning;
-+
-+// clear the internal result cache
-+- (void) flushCache;
-+
-+// capture the next frame after processing.  the captured image will
-+// follow the same delegate path as an image with decoded symbols.
-+- (void) captureFrame;
-+
-+// the capture output.  add this to an instance of AVCaptureSession
-+@property (nonatomic, readonly) AVCaptureOutput *captureOutput;
-+
-+// delegate is notified of decode results and symbol tracking.
-+@property (nonatomic, assign) id<ZBarCaptureDelegate> captureDelegate;
-+
-+// access to image scanner for configuration.
-+@property (nonatomic, readonly) ZBarImageScanner *scanner;
-+
-+// region of image to scan in normalized coordinates.
-+// NB horizontal crop currently ignored...
-+@property (nonatomic, assign) CGRect scanCrop;
-+
-+// size of video frames.
-+@property (nonatomic, readonly) CGSize size;
-+
-+// (quickly) gate the reader function without interrupting the video
-+// stream.  also flushes the cache when enabled.  defaults to *NO*
-+@property (nonatomic) BOOL enableReader;
-+
-+// current frame rate (for debug/optimization).
-+// only valid when running
-+@property (nonatomic, readonly) CGFloat framesPerSecond;
-+
-+@property (nonatomic) BOOL enableCache;
-+
-+@end
-diff -r 563557a923d0 iphone/include/ZBarSDK/ZBarHelpController.h
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/include/ZBarSDK/ZBarHelpController.h	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,60 @@
-+//------------------------------------------------------------------------
-+//  Copyright 2009-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-+//
-+//  This file is part of the ZBar Bar Code Reader.
-+//
-+//  The ZBar Bar Code Reader is free software; you can redistribute it
-+//  and/or modify it under the terms of the GNU Lesser Public License as
-+//  published by the Free Software Foundation; either version 2.1 of
-+//  the License, or (at your option) any later version.
-+//
-+//  The ZBar Bar Code Reader is distributed in the hope that it will be
-+//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-+//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+//  GNU Lesser Public License for more details.
-+//
-+//  You should have received a copy of the GNU Lesser Public License
-+//  along with the ZBar Bar Code Reader; if not, write to the Free
-+//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-+//  Boston, MA  02110-1301  USA
-+//
-+//  http://sourceforge.net/projects/zbar
-+//------------------------------------------------------------------------
-+
-+#import <UIKit/UIKit.h>
-+
-+@class ZBarHelpController;
-+
-+@protocol ZBarHelpDelegate
-+@optional
-+
-+- (void) helpControllerDidFinish: (ZBarHelpController*) help;
-+
-+@end
-+
-+
-+// failure dialog w/a few useful tips
-+
-+@interface ZBarHelpController : UIViewController
-+                              < UIWebViewDelegate,
-+                                UIAlertViewDelegate >
-+{
-+    NSString *reason;
-+    id delegate;
-+    UIWebView *webView;
-+    UIToolbar *toolbar;
-+    UIBarButtonItem *doneBtn, *backBtn, *space;
-+    NSURL *linkURL;
-+    NSUInteger orientations;
-+}
-+
-+@property (nonatomic, assign) id<ZBarHelpDelegate> delegate;
-+
-+// designated initializer
-+- (id) initWithReason: (NSString*) reason;
-+
-+- (BOOL) isInterfaceOrientationSupported: (UIInterfaceOrientation) orientation;
-+- (void) setInterfaceOrientation: (UIInterfaceOrientation) orientation
-+                       supported: (BOOL) supported;
-+
-+@end
-diff -r 563557a923d0 iphone/include/ZBarSDK/ZBarImage.h
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/include/ZBarSDK/ZBarImage.h	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,69 @@
-+//------------------------------------------------------------------------
-+//  Copyright 2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+//
-+//  This file is part of the ZBar Bar Code Reader.
-+//
-+//  The ZBar Bar Code Reader is free software; you can redistribute it
-+//  and/or modify it under the terms of the GNU Lesser Public License as
-+//  published by the Free Software Foundation; either version 2.1 of
-+//  the License, or (at your option) any later version.
-+//
-+//  The ZBar Bar Code Reader is distributed in the hope that it will be
-+//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-+//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+//  GNU Lesser Public License for more details.
-+//
-+//  You should have received a copy of the GNU Lesser Public License
-+//  along with the ZBar Bar Code Reader; if not, write to the Free
-+//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-+//  Boston, MA  02110-1301  USA
-+//
-+//  http://sourceforge.net/projects/zbar
-+//------------------------------------------------------------------------
-+
-+#import <UIKit/UIKit.h>
-+#import "zbar.h"
-+#import "ZBarSymbol.h"
-+
-+#ifdef __cplusplus
-+using namespace zbar;
-+#endif
-+
-+// Obj-C wrapper for ZBar image
-+
-+@interface ZBarImage : NSObject
-+{
-+    zbar_image_t *zimg;
-+    double t_convert;
-+}
-+
-+@property (nonatomic) unsigned long format;
-+@property (nonatomic) unsigned sequence;
-+@property (nonatomic) CGSize size;
-+@property (nonatomic) CGRect crop;
-+@property (readonly, nonatomic) const void *data;
-+@property (readonly, nonatomic) unsigned long dataLength;
-+@property (copy, nonatomic) ZBarSymbolSet *symbols;
-+@property (readonly, nonatomic) zbar_image_t *zbarImage;
-+@property (readonly, nonatomic) UIImage *UIImage;
-+
-+- (id) initWithImage: (zbar_image_t*) image;
-+- (id) initWithCGImage: (CGImageRef) image;
-+- (id) initWithCGImage: (CGImageRef) image
-+                  size: (CGSize) size;
-+- (id) initWithCGImage: (CGImageRef) image
-+                  crop: (CGRect) crop
-+                  size: (CGSize) size;
-+
-+- (void) setData: (const void*) data
-+      withLength: (unsigned long) length;
-+- (UIImage*) UIImageWithOrientation: (UIImageOrientation) imageOrientation;
-+- (void) cleanup;
-+
-++ (unsigned long) fourcc: (NSString*) format;
-+
-+#if 0
-+- convertToFormat: (unsigned long) format;
-+#endif
-+
-+@end
-diff -r 563557a923d0 iphone/include/ZBarSDK/ZBarImageScanner.h
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/include/ZBarSDK/ZBarImageScanner.h	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,51 @@
-+//------------------------------------------------------------------------
-+//  Copyright 2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+//
-+//  This file is part of the ZBar Bar Code Reader.
-+//
-+//  The ZBar Bar Code Reader is free software; you can redistribute it
-+//  and/or modify it under the terms of the GNU Lesser Public License as
-+//  published by the Free Software Foundation; either version 2.1 of
-+//  the License, or (at your option) any later version.
-+//
-+//  The ZBar Bar Code Reader is distributed in the hope that it will be
-+//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-+//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+//  GNU Lesser Public License for more details.
-+//
-+//  You should have received a copy of the GNU Lesser Public License
-+//  along with the ZBar Bar Code Reader; if not, write to the Free
-+//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-+//  Boston, MA  02110-1301  USA
-+//
-+//  http://sourceforge.net/projects/zbar
-+//------------------------------------------------------------------------
-+
-+#import <Foundation/Foundation.h>
-+#import "zbar.h"
-+#import "ZBarImage.h"
-+
-+#ifdef __cplusplus
-+using namespace zbar;
-+#endif
-+
-+// Obj-C wrapper for ZBar image scanner
-+
-+@interface ZBarImageScanner : NSObject
-+{
-+    zbar_image_scanner_t *scanner;
-+}
-+
-+@property (nonatomic) BOOL enableCache;
-+@property (readonly, nonatomic) ZBarSymbolSet *results;
-+
-+// decoder configuration
-+- (void) parseConfig: (NSString*) configStr;
-+- (void) setSymbology: (zbar_symbol_type_t) symbology
-+               config: (zbar_config_t) config
-+                   to: (int) value;
-+
-+// image scanning interface
-+- (NSInteger) scanImage: (ZBarImage*) image;
-+
-+@end
-diff -r 563557a923d0 iphone/include/ZBarSDK/ZBarReaderController.h
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/include/ZBarSDK/ZBarReaderController.h	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,142 @@
-+//------------------------------------------------------------------------
-+//  Copyright 2009-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-+//
-+//  This file is part of the ZBar Bar Code Reader.
-+//
-+//  The ZBar Bar Code Reader is free software; you can redistribute it
-+//  and/or modify it under the terms of the GNU Lesser Public License as
-+//  published by the Free Software Foundation; either version 2.1 of
-+//  the License, or (at your option) any later version.
-+//
-+//  The ZBar Bar Code Reader is distributed in the hope that it will be
-+//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-+//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+//  GNU Lesser Public License for more details.
-+//
-+//  You should have received a copy of the GNU Lesser Public License
-+//  along with the ZBar Bar Code Reader; if not, write to the Free
-+//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-+//  Boston, MA  02110-1301  USA
-+//
-+//  http://sourceforge.net/projects/zbar
-+//------------------------------------------------------------------------
-+
-+#import <UIKit/UIKit.h>
-+#import "ZBarImageScanner.h"
-+
-+#ifdef __cplusplus
-+using namespace zbar;
-+#endif
-+
-+typedef enum {
-+    // default interface provided by UIImagePickerController - user manually
-+    // captures an image by pressing a button
-+    ZBarReaderControllerCameraModeDefault = 0,
-+
-+    // automatically scan by taking screenshots with UIGetScreenImage().
-+    // resolution is limited by the screen, so this is inappropriate for
-+    // longer codes
-+    ZBarReaderControllerCameraModeSampling,
-+
-+    // automatically scan by rapidly taking pictures with takePicture.
-+    // tradeoff resolution with frame rate by adjusting the crop, and size
-+    // properties of the reader along with the density configs of the image
-+    // scanner
-+    ZBarReaderControllerCameraModeSequence,
-+
-+} ZBarReaderControllerCameraMode;
-+
-+
-+@class ZBarReaderController, ZBarHelpController;
-+
-+@protocol ZBarReaderDelegate <UIImagePickerControllerDelegate>
-+@optional
-+
-+// called when no barcode is found in an image selected by the user.
-+// if retry is NO, the delegate *must* dismiss the controller
-+- (void) readerControllerDidFailToRead: (ZBarReaderController*) reader
-+                             withRetry: (BOOL) retry;
-+
-+@end
-+
-+
-+@interface ZBarReaderController
-+    : UIImagePickerController
-+    < UINavigationControllerDelegate,
-+      UIImagePickerControllerDelegate >
-+{
-+    ZBarImageScanner *scanner;
-+    ZBarHelpController *help;
-+    UIView *overlay, *boxView;
-+    CALayer *boxLayer;
-+
-+    UIToolbar *toolbar;
-+    UIBarButtonItem *cancelBtn, *scanBtn, *space[3];
-+    UIButton *infoBtn;
-+
-+    id <ZBarReaderDelegate> readerDelegate;
-+    BOOL showsZBarControls, showsHelpOnFail, takesPicture, enableCache;
-+    ZBarReaderControllerCameraMode cameraMode;
-+    CGRect scanCrop;
-+    NSInteger maxScanDimension;
-+
-+    BOOL hasOverlay, sampling;
-+    uint64_t t_frame;
-+    double dt_frame;
-+
-+    ZBarSymbol *symbol;
-+}
-+
-+// access to configure image scanner
-+@property (readonly, nonatomic) ZBarImageScanner *scanner;
-+
-+// barcode result recipient (NB don't use delegate)
-+@property (nonatomic, assign) id <ZBarReaderDelegate> readerDelegate;
-+
-+// whether to use alternate control set
-+@property (nonatomic) BOOL showsZBarControls;
-+
-+// whether to display helpful information when decoding fails
-+@property (nonatomic) BOOL showsHelpOnFail;
-+
-+// how to use the camera (when sourceType == Camera)
-+@property (nonatomic) ZBarReaderControllerCameraMode cameraMode;
-+
-+// whether to outline symbols with the green tracking box.
-+@property (nonatomic) BOOL tracksSymbols;
-+
-+// whether to automatically take a full picture when a barcode is detected
-+// (when cameraMode == Sampling)
-+@property (nonatomic) BOOL takesPicture;
-+
-+// whether to use the "cache" for realtime modes (default YES).  this can be
-+// used to safely disable the inter-frame consistency and duplicate checks,
-+// speeding up recognition, iff:
-+//     1. the controller is dismissed when a barcode is read and
-+//     2. unreliable symbologies are disabled (all EAN/UPC variants and I2/5)
-+@property (nonatomic) BOOL enableCache;
-+
-+// crop images for scanning.  the original image will be cropped to this
-+// rectangle before scanning.  the rectangle is normalized to the image size
-+// and aspect ratio; useful values will place the rectangle between 0 and 1
-+// on each axis, where the x-axis corresponds to the image major axis.
-+// defaults to the full image (0, 0, 1, 1).
-+@property (nonatomic) CGRect scanCrop;
-+
-+// scale image to scan.  after cropping, the image will be scaled if
-+// necessary, such that neither of its dimensions exceed this value.
-+// defaults to 640.
-+@property (nonatomic) NSInteger maxScanDimension;
-+
-+// display the built-in help browser.  for use with custom overlays if
-+// you don't also want to create your own help view.  only send this
-+// message when the reader is displayed.  the argument will be passed
-+// to the onZBarHelp() javascript function.
-+- (void) showHelpWithReason: (NSString*) reason;
-+
-+// direct scanner interface - scan UIImage and return something enumerable
-+- (id <NSFastEnumeration>) scanImage: (CGImageRef) image;
-+
-+@end
-+
-+extern NSString* const ZBarReaderControllerResults;
-diff -r 563557a923d0 iphone/include/ZBarSDK/ZBarReaderView.h
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/include/ZBarSDK/ZBarReaderView.h	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,140 @@
-+//------------------------------------------------------------------------
-+//  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-+//
-+//  This file is part of the ZBar Bar Code Reader.
-+//
-+//  The ZBar Bar Code Reader is free software; you can redistribute it
-+//  and/or modify it under the terms of the GNU Lesser Public License as
-+//  published by the Free Software Foundation; either version 2.1 of
-+//  the License, or (at your option) any later version.
-+//
-+//  The ZBar Bar Code Reader is distributed in the hope that it will be
-+//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-+//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+//  GNU Lesser Public License for more details.
-+//
-+//  You should have received a copy of the GNU Lesser Public License
-+//  along with the ZBar Bar Code Reader; if not, write to the Free
-+//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-+//  Boston, MA  02110-1301  USA
-+//
-+//  http://sourceforge.net/projects/zbar
-+//------------------------------------------------------------------------
-+
-+#import <UIKit/UIKit.h>
-+#import "ZBarImageScanner.h"
-+
-+@class AVCaptureSession, AVCaptureDevice;
-+@class CALayer;
-+@class ZBarImageScanner, ZBarCaptureReader, ZBarReaderView;
-+
-+// delegate is notified of decode results.
-+
-+@protocol ZBarReaderViewDelegate < NSObject >
-+
-+- (void) readerView: (ZBarReaderView*) readerView
-+     didReadSymbols: (ZBarSymbolSet*) symbols
-+          fromImage: (UIImage*) image;
-+
-+@optional
-+- (void) readerViewDidStart: (ZBarReaderView*) readerView;
-+- (void) readerView: (ZBarReaderView*) readerView
-+   didStopWithError: (NSError*) error;
-+
-+@end
-+
-+// read barcodes from the displayed video preview.  the view maintains
-+// a complete video capture session feeding a ZBarCaptureReader and
-+// presents the associated preview with symbol tracking annotations.
-+
-+@interface ZBarReaderView
-+    : UIView
-+{
-+    id<ZBarReaderViewDelegate> readerDelegate;
-+    ZBarCaptureReader *captureReader;
-+    CGRect scanCrop, effectiveCrop;
-+    CGAffineTransform previewTransform;
-+    CGFloat zoom, zoom0, maxZoom;
-+    UIColor *trackingColor;
-+    BOOL tracksSymbols, showsFPS;
-+    NSInteger torchMode;
-+    UIInterfaceOrientation interfaceOrientation;
-+    NSTimeInterval animationDuration;
-+
-+    CALayer *preview, *overlay, *tracking, *cropLayer;
-+    UIView *fpsView;
-+    UILabel *fpsLabel;
-+    UIPinchGestureRecognizer *pinch;
-+    CGFloat imageScale;
-+    CGSize imageSize;
-+    BOOL started, running, locked;
-+}
-+
-+// supply a pre-configured image scanner.
-+- (id) initWithImageScanner: (ZBarImageScanner*) imageScanner;
-+
-+// start the video stream and barcode reader.
-+- (void) start;
-+
-+// stop the video stream and barcode reader.
-+- (void) stop;
-+
-+// clear the internal result cache
-+- (void) flushCache;
-+
-+// compensate for device/camera/interface orientation
-+- (void) willRotateToInterfaceOrientation: (UIInterfaceOrientation) orient
-+                                 duration: (NSTimeInterval) duration;
-+
-+// delegate is notified of decode results.
-+@property (nonatomic, assign) id<ZBarReaderViewDelegate> readerDelegate;
-+
-+// access to image scanner for configuration.
-+@property (nonatomic, readonly) ZBarImageScanner *scanner;
-+
-+// whether to display the tracking annotation for uncertain barcodes
-+// (default YES).
-+@property (nonatomic) BOOL tracksSymbols;
-+
-+// color of the tracking box (default green)
-+@property (nonatomic, retain) UIColor *trackingColor;
-+
-+// enable pinch gesture recognition for zooming the preview/decode
-+// (default YES).
-+@property (nonatomic) BOOL allowsPinchZoom;
-+
-+// torch mode to set automatically (default Auto).
-+@property (nonatomic) NSInteger torchMode;
-+
-+// whether to display the frame rate for debug/configuration
-+// (default NO).
-+@property (nonatomic) BOOL showsFPS;
-+
-+// zoom scale factor applied to video preview *and* scanCrop.
-+// also updated by pinch-zoom gesture.  clipped to range [1,maxZoom],
-+// defaults to 1.25
-+@property (nonatomic) CGFloat zoom;
-+- (void) setZoom: (CGFloat) zoom
-+        animated: (BOOL) animated;
-+
-+// maximum settable zoom factor.
-+@property (nonatomic) CGFloat maxZoom;
-+
-+// the region of the image that will be scanned.  normalized coordinates.
-+@property (nonatomic) CGRect scanCrop;
-+
-+// additional transform applied to video preview.
-+// (NB *not* applied to scan crop)
-+@property (nonatomic) CGAffineTransform previewTransform;
-+
-+// specify an alternate capture device.
-+@property (nonatomic, retain) AVCaptureDevice *device;
-+
-+// direct access to the capture session.  warranty void if opened...
-+@property (nonatomic, readonly) AVCaptureSession *session;
-+@property (nonatomic, readonly) ZBarCaptureReader *captureReader;
-+
-+// this flag still works, but its use is deprecated
-+@property (nonatomic) BOOL enableCache;
-+
-+@end
-diff -r 563557a923d0 iphone/include/ZBarSDK/ZBarReaderViewController.h
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/include/ZBarSDK/ZBarReaderViewController.h	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,130 @@
-+//------------------------------------------------------------------------
-+//  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-+//
-+//  This file is part of the ZBar Bar Code Reader.
-+//
-+//  The ZBar Bar Code Reader is free software; you can redistribute it
-+//  and/or modify it under the terms of the GNU Lesser Public License as
-+//  published by the Free Software Foundation; either version 2.1 of
-+//  the License, or (at your option) any later version.
-+//
-+//  The ZBar Bar Code Reader is distributed in the hope that it will be
-+//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-+//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+//  GNU Lesser Public License for more details.
-+//
-+//  You should have received a copy of the GNU Lesser Public License
-+//  along with the ZBar Bar Code Reader; if not, write to the Free
-+//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-+//  Boston, MA  02110-1301  USA
-+//
-+//  http://sourceforge.net/projects/zbar
-+//------------------------------------------------------------------------
-+
-+#import <UIKit/UIKit.h>
-+#import "ZBarReaderController.h"
-+
-+// orientation set support
-+#define ZBarOrientationMask(orient) (1 << orient)
-+#define ZBarOrientationMaskAll \
-+    (ZBarOrientationMask(UIInterfaceOrientationPortrait) | \
-+     ZBarOrientationMask(UIInterfaceOrientationPortraitUpsideDown) | \
-+     ZBarOrientationMask(UIInterfaceOrientationLandscapeLeft) | \
-+     ZBarOrientationMask(UIInterfaceOrientationLandscapeRight))
-+
-+@class ZBarReaderView, ZBarCameraSimulator;
-+
-+// drop in video scanning replacement for ZBarReaderController.
-+// this is a thin controller around a ZBarReaderView that adds the UI
-+// controls and select functionality offered by ZBarReaderController.
-+// Automatically falls back to a ZBarReaderController if video APIs
-+// are unavailable (eg for OS < 4.0)
-+
-+@interface ZBarReaderViewController
-+    : UIViewController
-+{
-+    ZBarImageScanner *scanner;
-+    id <ZBarReaderDelegate> readerDelegate;
-+    ZBarReaderView *readerView;
-+    UIView *cameraOverlayView;
-+    CGAffineTransform cameraViewTransform;
-+    CGRect scanCrop;
-+    NSUInteger supportedOrientationsMask;
-+    UIImagePickerControllerCameraDevice cameraDevice;
-+    UIImagePickerControllerCameraFlashMode cameraFlashMode;
-+    UIImagePickerControllerQualityType videoQuality;
-+    BOOL showsZBarControls, tracksSymbols, enableCache;
-+
-+    ZBarHelpController *helpController;
-+    UIView *controls, *shutter;
-+    BOOL didHideStatusBar, rotating;
-+    ZBarCameraSimulator *cameraSim;
-+}
-+
-+// access to configure image scanner
-+@property (nonatomic, readonly) ZBarImageScanner *scanner;
-+
-+// barcode result recipient
-+@property (nonatomic, assign) id <ZBarReaderDelegate> readerDelegate;
-+
-+// whether to use alternate control set
-+@property (nonatomic) BOOL showsZBarControls;
-+
-+// whether to show the green tracking box.  note that, even when
-+// enabled, the box will only be visible when scanning EAN and I2/5.
-+@property (nonatomic) BOOL tracksSymbols;
-+
-+// interface orientation support.  bit-mask of accepted orientations.
-+// see eg ZBarOrientationMask() and ZBarOrientationMaskAll
-+@property (nonatomic) NSUInteger supportedOrientationsMask;
-+
-+// crop images for scanning.  the image will be cropped to this
-+// rectangle before scanning.  the rectangle is normalized to the
-+// image size and aspect ratio; useful values will place the rectangle
-+// between 0 and 1 on each axis, where the x-axis corresponds to the
-+// image major axis.  defaults to the full image (0, 0, 1, 1).
-+@property (nonatomic) CGRect scanCrop;
-+
-+// provide a custom overlay.  note that this can be used with
-+// showsZBarControls enabled (but not if you want backward compatibility)
-+@property (nonatomic, retain) UIView *cameraOverlayView;
-+
-+// transform applied to the preview image.
-+@property (nonatomic) CGAffineTransform cameraViewTransform;
-+
-+// display the built-in help browser.  the argument will be passed to
-+// the onZBarHelp() javascript function.
-+- (void) showHelpWithReason: (NSString*) reason;
-+
-+// capture the next frame and send it over the usual delegate path.
-+- (void) takePicture;
-+
-+// these attempt to emulate UIImagePickerController
-++ (BOOL) isCameraDeviceAvailable: (UIImagePickerControllerCameraDevice) cameraDevice;
-++ (BOOL) isFlashAvailableForCameraDevice: (UIImagePickerControllerCameraDevice) cameraDevice;
-++ (NSArray*) availableCaptureModesForCameraDevice: (UIImagePickerControllerCameraDevice) cameraDevice;
-+@property(nonatomic) UIImagePickerControllerCameraDevice cameraDevice;
-+@property(nonatomic) UIImagePickerControllerCameraFlashMode cameraFlashMode;
-+@property(nonatomic) UIImagePickerControllerCameraCaptureMode cameraCaptureMode;
-+@property(nonatomic) UIImagePickerControllerQualityType videoQuality;
-+
-+// direct access to the ZBarReaderView
-+@property (nonatomic, readonly) ZBarReaderView *readerView;
-+
-+// this flag still works, but its use is deprecated
-+@property (nonatomic) BOOL enableCache;
-+
-+// these are present only for backward compatibility.
-+// they will error if inappropriate/unsupported values are set
-+@property (nonatomic) UIImagePickerControllerSourceType sourceType; // Camera
-+@property (nonatomic) BOOL allowsEditing; // NO
-+@property (nonatomic) BOOL allowsImageEditing; // NO
-+@property (nonatomic) BOOL showsCameraControls; // NO
-+@property (nonatomic) BOOL showsHelpOnFail; // ignored
-+@property (nonatomic) ZBarReaderControllerCameraMode cameraMode; // Sampling
-+@property (nonatomic) BOOL takesPicture; // NO
-+@property (nonatomic) NSInteger maxScanDimension; // ignored
-+
-++ (BOOL) isSourceTypeAvailable: (UIImagePickerControllerSourceType) sourceType;
-+
-+@end
-diff -r 563557a923d0 iphone/include/ZBarSDK/ZBarSDK.h
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/include/ZBarSDK/ZBarSDK.h	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,34 @@
-+/*------------------------------------------------------------------------
-+ *  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-+ *
-+ *  This file is part of the ZBar Bar Code Reader.
-+ *
-+ *  The ZBar Bar Code Reader is free software; you can redistribute it
-+ *  and/or modify it under the terms of the GNU Lesser Public License as
-+ *  published by the Free Software Foundation; either version 2.1 of
-+ *  the License, or (at your option) any later version.
-+ *
-+ *  The ZBar Bar Code Reader is distributed in the hope that it will be
-+ *  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-+ *  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU Lesser Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser Public License
-+ *  along with the ZBar Bar Code Reader; if not, write to the Free
-+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-+ *  Boston, MA  02110-1301  USA
-+ *
-+ *  http://sourceforge.net/projects/zbar
-+ *------------------------------------------------------------------------*/
-+
-+#import "zbar.h"
-+
-+#import "ZBarSymbol.h"
-+#import "ZBarImage.h"
-+#import "ZBarImageScanner.h"
-+#import "ZBarReaderView.h"
-+#import "ZBarReaderViewController.h"
-+#import "ZBarReaderController.h"
-+#import "ZBarCaptureReader.h"
-+#import "ZBarHelpController.h"
-+#import "ZBarCameraSimulator.h"
-diff -r 563557a923d0 iphone/include/ZBarSDK/ZBarSymbol.h
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/include/ZBarSDK/ZBarSymbol.h	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,71 @@
-+//------------------------------------------------------------------------
-+//  Copyright 2009-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-+//
-+//  This file is part of the ZBar Bar Code Reader.
-+//
-+//  The ZBar Bar Code Reader is free software; you can redistribute it
-+//  and/or modify it under the terms of the GNU Lesser Public License as
-+//  published by the Free Software Foundation; either version 2.1 of
-+//  the License, or (at your option) any later version.
-+//
-+//  The ZBar Bar Code Reader is distributed in the hope that it will be
-+//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-+//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+//  GNU Lesser Public License for more details.
-+//
-+//  You should have received a copy of the GNU Lesser Public License
-+//  along with the ZBar Bar Code Reader; if not, write to the Free
-+//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-+//  Boston, MA  02110-1301  USA
-+//
-+//  http://sourceforge.net/projects/zbar
-+//------------------------------------------------------------------------
-+
-+#import <Foundation/Foundation.h>
-+#import <CoreGraphics/CoreGraphics.h>
-+#import "zbar.h"
-+
-+#ifdef __cplusplus
-+using namespace zbar;
-+#endif
-+
-+// Obj-C wrapper for ZBar result types
-+
-+@interface ZBarSymbolSet
-+    : NSObject <NSFastEnumeration>
-+{
-+    const zbar_symbol_set_t *set;
-+    BOOL filterSymbols;
-+}
-+
-+@property (readonly, nonatomic) int count;
-+@property (readonly, nonatomic) const zbar_symbol_set_t *zbarSymbolSet;
-+@property (nonatomic) BOOL filterSymbols;
-+
-+- (id) initWithSymbolSet: (const zbar_symbol_set_t*) set;
-+
-+@end
-+
-+
-+@interface ZBarSymbol : NSObject
-+{
-+    const zbar_symbol_t *symbol;
-+}
-+
-+@property (readonly, nonatomic) zbar_symbol_type_t type;
-+@property (readonly, nonatomic) NSString *typeName;
-+@property (readonly, nonatomic) NSUInteger configMask;
-+@property (readonly, nonatomic) NSUInteger modifierMask;
-+@property (readonly, nonatomic) NSString *data;
-+@property (readonly, nonatomic) int quality;
-+@property (readonly, nonatomic) int count;
-+@property (readonly, nonatomic) zbar_orientation_t orientation;
-+@property (readonly, nonatomic) ZBarSymbolSet *components;
-+@property (readonly, nonatomic) const zbar_symbol_t *zbarSymbol;
-+@property (readonly, nonatomic) CGRect bounds;
-+
-+- (id) initWithSymbol: (const zbar_symbol_t*) symbol;
-+
-++ (NSString*) nameForType: (zbar_symbol_type_t) type;
-+
-+@end
-diff -r 563557a923d0 iphone/include/config.h
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/include/config.h	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,234 @@
-+/* manually customized for iPhone platform */
-+
-+/* whether to build support for Code 128 symbology */
-+#define ENABLE_CODE128 1
-+
-+/* whether to build support for Code 93 symbology */
-+#define ENABLE_CODE93 1
-+
-+/* whether to build support for Code 39 symbology */
-+#define ENABLE_CODE39 1
-+
-+/* whether to build support for Codabar symbology */
-+#define ENABLE_CODABAR 1
-+
-+/* whether to build support for DataBar symbology */
-+#define ENABLE_DATABAR 1
-+
-+/* whether to build support for EAN symbologies */
-+#define ENABLE_EAN 1
-+
-+/* whether to build support for Interleaved 2 of 5 symbology */
-+#define ENABLE_I25 1
-+
-+/* whether to build support for PDF417 symbology */
-+#undef ENABLE_PDF417
-+
-+/* whether to build support for QR Code */
-+#define ENABLE_QRCODE 1
-+
-+/* Define to 1 if you have the `atexit' function. */
-+#undef HAVE_ATEXIT
-+
-+/* Define to 1 if you have the <dlfcn.h> header file. */
-+#undef HAVE_DLFCN_H
-+
-+/* Define to 1 if you have the <fcntl.h> header file. */
-+#undef HAVE_FCNTL_H
-+
-+/* Define to 1 if you have the <features.h> header file. */
-+#undef HAVE_FEATURES_H
-+
-+/* Define to 1 if you have the `getpagesize' function. */
-+#undef HAVE_GETPAGESIZE
-+
-+/* Define if you have the iconv() function and it works. */
-+#undef HAVE_ICONV
-+
-+/* Define to 1 if you have the <inttypes.h> header file. */
-+#define HAVE_INTTYPES_H 1
-+
-+/* Define to 1 if you have the <jpeglib.h> header file. */
-+#undef HAVE_JPEGLIB_H
-+
-+/* Define to 1 if you have the `jpeg' library (-ljpeg). */
-+#undef HAVE_LIBJPEG
-+
-+/* Define to 1 if you have the `pthread' library (-lpthread). */
-+#undef HAVE_LIBPTHREAD
-+
-+/* Define to 1 if you have the <linux/videodev2.h> header file. */
-+#undef HAVE_LINUX_VIDEODEV2_H
-+
-+/* Define to 1 if you have the <linux/videodev.h> header file. */
-+#undef HAVE_LINUX_VIDEODEV_H
-+
-+/* Define to 1 if you have the <memory.h> header file. */
-+#undef HAVE_MEMORY_H
-+
-+/* Define to 1 if you have the `memset' function. */
-+#define HAVE_MEMSET 1
-+
-+/* Define to 1 if you have a working `mmap' system call. */
-+#undef HAVE_MMAP
-+
-+/* Define to 1 if you have the <poll.h> header file. */
-+#undef HAVE_POLL_H
-+
-+/* Define to 1 if you have the <pthread.h> header file. */
-+#undef HAVE_PTHREAD_H
-+
-+/* Define to 1 if you have the `setenv' function. */
-+#undef HAVE_SETENV
-+
-+/* Define to 1 if you have the <stdint.h> header file. */
-+#define HAVE_STDINT_H 1
-+
-+/* Define to 1 if you have the <stdlib.h> header file. */
-+#define HAVE_STDLIB_H 1
-+
-+/* Define to 1 if you have the <strings.h> header file. */
-+#define HAVE_STRINGS_H 1
-+
-+/* Define to 1 if you have the <string.h> header file. */
-+#define HAVE_STRING_H 1
-+
-+/* Define to 1 if you have the <sys/ioctl.h> header file. */
-+#undef HAVE_SYS_IOCTL_H
-+
-+/* Define to 1 if you have the <sys/ipc.h> header file. */
-+#undef HAVE_SYS_IPC_H
-+
-+/* Define to 1 if you have the <sys/mman.h> header file. */
-+#undef HAVE_SYS_MMAN_H
-+
-+/* Define to 1 if you have the <sys/shm.h> header file. */
-+#undef HAVE_SYS_SHM_H
-+
-+/* Define to 1 if you have the <sys/stat.h> header file. */
-+#define HAVE_SYS_STAT_H 1
-+
-+/* Define to 1 if you have the <sys/times.h> header file. */
-+#define HAVE_SYS_TIMES_H 1
-+
-+/* Define to 1 if you have the <sys/time.h> header file. */
-+#define HAVE_SYS_TIME_H 1
-+
-+/* Define to 1 if you have the <sys/types.h> header file. */
-+#define HAVE_SYS_TYPES_H 1
-+
-+/* Define to 1 if the system has the type `uintptr_t'. */
-+#define HAVE_UINTPTR_T 1
-+
-+/* Define to 1 if you have the <unistd.h> header file. */
-+#define HAVE_UNISTD_H 1
-+
-+/* Define to 1 if you have the <vfw.h> header file. */
-+#undef HAVE_VFW_H
-+
-+/* Define to 1 if you have the <X11/extensions/XShm.h> header file. */
-+#undef HAVE_X11_EXTENSIONS_XSHM_H
-+
-+/* Define to 1 if you have the <X11/extensions/Xvlib.h> header file. */
-+#undef HAVE_X11_EXTENSIONS_XVLIB_H
-+
-+/* Define as const if the declaration of iconv() needs const. */
-+#undef ICONV_CONST
-+
-+/* Library major version */
-+#define LIB_VERSION_MAJOR 0
-+
-+/* Library minor version */
-+#define LIB_VERSION_MINOR 2
-+
-+/* Library revision */
-+#define LIB_VERSION_REVISION 0
-+
-+/* Define to the sub-directory in which libtool stores uninstalled libraries.
-+   */
-+#undef LT_OBJDIR
-+
-+/* Define to 1 if assertions should be disabled. */
-+//#undef NDEBUG
-+
-+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-+#undef NO_MINUS_C_MINUS_O
-+
-+/* Name of package */
-+#define PACKAGE "zbar"
-+
-+/* Define to the address where bug reports for this package should be sent. */
-+#define PACKAGE_BUGREPORT "spadix@users.sourceforge.net"
-+
-+/* Define to the full name of this package. */
-+#define PACKAGE_NAME "zbar"
-+
-+/* Define to the full name and version of this package. */
-+#define PACKAGE_STRING "zbar 0.10"
-+
-+/* Define to the one symbol short name of this package. */
-+#define PACKAGE_TARNAME "zbar"
-+
-+/* Define to the version of this package. */
-+#define PACKAGE_VERSION "0.10"
-+
-+/* Define to 1 if you have the ANSI C header files. */
-+#define STDC_HEADERS 1
-+
-+/* Version number of package */
-+#define VERSION "0.10"
-+
-+/* Define to 1 if the X Window System is missing or not being used. */
-+#define X_DISPLAY_MISSING 1
-+
-+/* Program major version (before the '.') as a number */
-+#define ZBAR_VERSION_MAJOR 0
-+
-+/* Program minor version (after '.') as a number */
-+#define ZBAR_VERSION_MINOR 10
-+
-+/* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
-+   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
-+   #define below would cause a syntax error. */
-+#undef _UINT32_T
-+
-+/* Define for Solaris 2.5.1 so the uint8_t typedef from <sys/synch.h>,
-+   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
-+   #define below would cause a syntax error. */
-+#undef _UINT8_T
-+
-+/* Minimum Windows API version */
-+#undef _WIN32_WINNT
-+
-+/* used only for pthread debug attributes */
-+#undef __USE_UNIX98
-+
-+/* Define to empty if `const' does not conform to ANSI C. */
-+#undef const
-+
-+/* Define to `__inline__' or `__inline' if that's what the C compiler
-+   calls it, or to nothing if 'inline' is not supported under any name.  */
-+#ifndef __cplusplus
-+#undef inline
-+#endif
-+
-+/* Define to the type of a signed integer type of width exactly 32 bits if
-+   such a type exists and the standard includes do not define it. */
-+#undef int32_t
-+
-+/* Define to the type of an unsigned integer type of width exactly 32 bits if
-+   such a type exists and the standard includes do not define it. */
-+#undef uint32_t
-+
-+/* Define to the type of an unsigned integer type of width exactly 8 bits if
-+   such a type exists and the standard includes do not define it. */
-+#undef uint8_t
-+
-+/* Define to the type of an unsigned integer type wide enough to hold a
-+   pointer, if such a type exists, and if the system does not define it. */
-+#undef uintptr_t
-+
-+#ifndef X_DISPLAY_MISSING
-+# define HAVE_X
-+#endif
-+
-diff -r 563557a923d0 iphone/include/prefix.pch
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/include/prefix.pch	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,10 @@
-+#ifdef __OBJC__
-+# import <Foundation/Foundation.h>
-+# import <CoreFoundation/CoreFoundation.h>
-+# import <CoreGraphics/CoreGraphics.h>
-+# import <UIKit/UIKit.h>
-+# import <QuartzCore/QuartzCore.h>
-+# import <AVFoundation/AVFoundation.h>
-+# import <CoreMedia/CoreMedia.h>
-+# import <CoreVideo/CoreVideo.h>
-+#endif
-diff -r 563557a923d0 iphone/res/Columns.DS_Store
-Binary file iphone/res/Columns.DS_Store has changed
-diff -r 563557a923d0 iphone/res/ZBarSDK-Info.plist
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/res/ZBarSDK-Info.plist	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-+<plist version="1.0">
-+<dict>
-+	<key>CFBundleDevelopmentRegion</key>
-+	<string>English</string>
-+	<key>CFBundleName</key>
-+	<string>ZBarSDK</string>
-+	<key>CFBundleVersion</key>
-+	<string>1.3.1</string>
-+	<key>CFBundleSignature</key>
-+	<string>????</string>
-+	<key>NSHumanReadableCopyright</key>
-+	<string>Copyright 2010 © Jeff Brown et al</string>
-+</dict>
-+</plist>
-diff -r 563557a923d0 iphone/res/ZBarSDK-bg.png
-Binary file iphone/res/ZBarSDK-bg.png has changed
-diff -r 563557a923d0 iphone/res/ZBarSDK-bg.svg
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/res/ZBarSDK-bg.svg	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,78 @@
-+<?xml version="1.0"?>
-+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
-+  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-+
-+<!--
-+   Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-+     All Rights Reserved
-+
-+   icon size = 64
-+   grid spacing = 32
-+
-+   $ java -Xmx2000m -jar batik-rasterizer.jar -w 4096 -h 4864 -d res/ZBarSDK-bg.8x.png res/ZBarSDK-bg.svg
-+   $ convert -resize 12.5% res/ZBarSDK-bg.8x.png res/ZBarSDK-bg.png
-+-->
-+
-+<svg version="1.1" id="top"
-+  width="512px" height="608px"
-+  viewBox="-1,-1 16,19" preserveAspectRatio="xMidYMid" overflow="visible"
-+  xmlns="http://www.w3.org/2000/svg"
-+  xmlns:xlink="http://www.w3.org/1999/xlink">
-+
-+  <title>ZBar iPhone SDK DMG Folder Background Image</title>
-+
-+  <defs>
-+    <style type="text/css"><![CDATA[
-+      path, line { fill: none; stroke-linejoin: round; stroke-linecap: round }
-+      #bg { fill: url(#bg-grad) }
-+      #grid { fill: none; stroke: white; stroke-opacity: .25 ; stroke-width: .05 }
-+      #icons { marker: url(#icon) }
-+      #icon *, .text { fill: none; stroke: red; stroke-width: .05 }
-+      .section { fill: white; stroke: black; stroke-width: .1 }
-+      #drag { stroke: none; fill: url(#drag-grad) }
-+      text { text-anchor: middle; font-family: sans-serif; font-size: .78125 }
-+      .small { font-size: 66% }
-+    ]]></style>
-+    <marker id="icon" overflow="visible"><rect x="-1" y="-1" width="2" height="2"/></marker>
-+    <linearGradient id="bg-grad" x2="0%" y1="5%" y2="100%">
-+      <stop offset="0%" stop-color="#36a"/>
-+      <stop offset="100%" stop-color="#112"/>
-+    </linearGradient>
-+    <linearGradient id="drag-grad" x1="100%" x2="0%">
-+      <stop offset="0%" stop-color="#4f8" stop-opacity="0.05"/>
-+      <stop offset="72%" stop-color="#4f8" stop-opacity=".9"/>
-+      <stop offset="100%" stop-color="#4f8" stop-opacity="1"/>
-+    </linearGradient>
-+  </defs>
-+
-+  <rect id="bg" x="-1" y="-1" width="16" height="19"/>
-+
-+  <rect class="section" x="1.5" y="-.25" width="11" height="4" rx=".5" ry=".5"/>
-+  <rect class="section" x="1.5" y="4.75" width="11" height="4" rx=".5" ry=".5"/>
-+  <rect class="section" x=".5" y="9.75" width="13" height="7.5" rx=".5" ry=".5"/>
-+
-+  <text y="1.75">
-+    <tspan x="8.75" dy=".2344">Read this first</tspan>
-+  </text>
-+  <text y="6.75">
-+    <tspan x="8.75" dy="-.75">Then drag this</tspan>
-+    <tspan x="8.75" dy="1">into your</tspan>
-+    <tspan x="8.75" dy="1">Xcode project</tspan>
-+  </text>
-+
-+  <path id="drag"
-+    d="M3.5,6.125 v1 h-2.75 v.3 l-1.1,-.8 l1.1,-.8 v.3z"/>
-+
-+<!--
-+  <g id="debug">
-+    <path id="grid"
-+      d="M0,0h14 M0,2h14 M0,4h14 M0,6h14 M0,8h14 M0,10h14 M0,12h14 M0,14h14 M0,16h14 M0,18h14
-+         M0,0v17 M2,0v17 M4,0v17 M6,0v17 M8,0v17 M10,0v17 M12,0v17 M14,0v17"/>
-+    <path id="icons" d="M3.5,1.5 M3.5,6.5
-+                        M3,11.5 M7,11.5 M11,11.5
-+                        M3,15 M7,15 M11,15"/>
-+    <rect class="text" x="5.5" y=".25" width="6.5" height="3"/>
-+    <rect class="text" x="5.5" y="5.25" width="6.5" height="3"/>
-+  </g>
-+-->
-+</svg>
-diff -r 563557a923d0 iphone/res/ZBarSDK.DS_Store
-Binary file iphone/res/ZBarSDK.DS_Store has changed
-diff -r 563557a923d0 iphone/res/buttondown.svg
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/res/buttondown.svg	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,57 @@
-+<?xml version="1.0"?>
-+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
-+  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-+
-+<!--
-+   Copyright 2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+     All Rights Reserved
-+-->
-+
-+<svg version="1.1" id="top"
-+  width="384px" height="384px"
-+  viewBox="0,0 1,1" preserveAspectRatio="xMidYMid" overflow="visible"
-+  xmlns="http://www.w3.org/2000/svg"
-+  xmlns:xlink="http://www.w3.org/1999/xlink">
-+
-+  <title>rounded button overlay</title>
-+
-+  <defs>
-+    <style type="text/css"><![CDATA[
-+      #bg { fill: #202020 }
-+      #test { fill: #d22 }
-+      #button { fill: black; stroke: none; filter: url(#emboss) }
-+    ]]></style>
-+
-+    <filter id="emboss" filterUnits="userSpaceOnUse"
-+      x="-1" y="-1" width="3" height="3">
-+      <feFlood flood-color="black"
-+        x=".05" y=".05" width=".9" height=".9"/>
-+      <feGaussianBlur result="grad" stdDeviation=".1"
-+        x="-1" y="-1" width="3" height="3"/>
-+
-+      <feComponentTransfer>
-+        <feFuncA type="linear" slope="-1" intercept="1"/>
-+      </feComponentTransfer>
-+
-+      <feSpecularLighting surfaceScale=".25" specularConstant=".75"
-+        specularExponent="16" lighting-color="#ccc">
-+        <fePointLight x="6" y="-10" z="2"/>
-+      </feSpecularLighting>
-+      <feGaussianBlur result="spec" stdDeviation="0.015"/>
-+
-+      <feColorMatrix in="grad" type="matrix" values="
-+0 0 0 0 0
-+0 0 0 0 0
-+0 0 0 0 0
-+0 0 0 .8 -.3
-+"/>
-+      <feComposite in2="spec" operator="over"/>
-+      <feComposite in2="SourceAlpha" operator="in"/>
-+    </filter>
-+  </defs>
-+<!--
-+  <rect id="bg" x="-.5" y="-.5" width="2" height="2"/>
-+  <rect id="test" width="1" height="1" rx=".2" ry=".2"/>
-+-->
-+  <rect id="button" width="1" height="1" rx=".25" ry=".25"/>
-+</svg>
-diff -r 563557a923d0 iphone/res/buttonmask.svg
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/res/buttonmask.svg	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,26 @@
-+<?xml version="1.0"?>
-+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
-+  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-+
-+<!--
-+   Copyright 2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+     All Rights Reserved
-+-->
-+
-+<svg version="1.1" id="top"
-+  width="384px" height="384px"
-+  viewBox="0,0 1,1" preserveAspectRatio="xMidYMid" overflow="visible"
-+  xmlns="http://www.w3.org/2000/svg"
-+  xmlns:xlink="http://www.w3.org/1999/xlink">
-+
-+  <title>mask for button overlays</title>
-+
-+  <defs>
-+    <style type="text/css"><![CDATA[
-+      #bg { fill: white; stroke: none }
-+      #mask { fill: black; stroke: none }
-+    ]]></style>
-+  </defs>
-+  <!--<rect id="bg" x="-1" y="-1" width="3" height="3"/>-->
-+  <rect id="mask" width="1" height="1" rx=".25" ry=".25"/>
-+</svg>
-diff -r 563557a923d0 iphone/res/buttonup.svg
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/res/buttonup.svg	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,57 @@
-+<?xml version="1.0"?>
-+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
-+  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-+
-+<!--
-+   Copyright 2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+     All Rights Reserved
-+-->
-+
-+<svg version="1.1" id="top"
-+  width="384px" height="384px"
-+  viewBox="0,0 1,1" preserveAspectRatio="xMidYMid" overflow="visible"
-+  xmlns="http://www.w3.org/2000/svg"
-+  xmlns:xlink="http://www.w3.org/1999/xlink">
-+
-+  <title>rounded button overlay</title>
-+
-+  <defs>
-+    <style type="text/css"><![CDATA[
-+      #bg { fill: #202020 }
-+      #test { fill: #d22 }
-+      #button { fill: black; stroke: none; filter: url(#emboss) }
-+    ]]></style>
-+
-+    <filter id="emboss" filterUnits="userSpaceOnUse"
-+      x="-1" y="-1" width="3" height="3">
-+      <feFlood flood-color="black"
-+        x=".05" y=".05" width=".9" height=".9"/>
-+      <feGaussianBlur result="grad" stdDeviation=".1"
-+        x="-1" y="-1" width="3" height="3"/>
-+
-+      <feSpecularLighting surfaceScale=".25" specularConstant="1"
-+        specularExponent="16" lighting-color="#ccc">
-+        <fePointLight x="6" y="-10" z="5"/>
-+      </feSpecularLighting>
-+      <feGaussianBlur result="spec" stdDeviation="0.015"/>
-+
-+      <feColorMatrix in="grad" type="matrix" values="
-+0 0 0 0 0
-+0 0 0 0 0
-+0 0 0 0 0
-+0 0 0 -1.05 1
-+"/>
-+      <feComposite in2="spec" operator="over"/>
-+      <feComposite in2="SourceAlpha" operator="in" result="result"/>
-+      <feFlood flood-color="black"/>
-+      <feComposite in2="SourceAlpha" operator="out"/>
-+      <feComposite in2="result" operator="over"/>
-+    </filter>
-+  </defs>
-+<!--
-+  <rect id="bg" x="-.5" y="-.5" width="2" height="2"/>
-+
-+  <rect id="test" width="1" height="1" rx=".2" ry=".2"/>
-+-->
-+  <rect id="button" width="1" height="1" rx=".25" ry=".25"/>
-+</svg>
-diff -r 563557a923d0 iphone/res/lightbulb.svg
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/res/lightbulb.svg	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,108 @@
-+<?xml version="1.0"?>
-+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
-+  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-+
-+<!--
-+   Copyright 2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+     All Rights Reserved
-+-->
-+
-+<svg version="1.1" id="top"
-+  width="512px" height="512px"
-+  viewBox="0,0 1,1" preserveAspectRatio="xMidYMid" overflow="visible"
-+  xmlns="http://www.w3.org/2000/svg"
-+  xmlns:xlink="http://www.w3.org/1999/xlink">
-+
-+  <title>lit light bulb icon</title>
-+
-+  <defs>
-+    <style type="text/css"><![CDATA[
-+      path, line { fill: none; stroke-linejoin: round; stroke-linecap: round }
-+      #bg { fill: #202020 }
-+      #bulb { fill: url(#bulb-on); stroke: #778; stroke-width: .06 }
-+      #support { stroke: #888; stroke-width: .03; stroke-opacity: .4 }
-+      #filament { stroke: #f80; stroke-width: .06; stroke-opacity: .5 }
-+      #rays line { stroke: #fff; stroke-width: .1 }
-+      #base { fill: #ccc; stroke: #777; stroke-width: .14 }
-+      #screw { stroke: #777; stroke-width: .25 }
-+      #nub { fill: #444; stroke: #444; stroke-width: .25 }
-+    ]]></style>
-+
-+    <radialGradient id="bulb-off" gradientUnits="userSpaceOnUse" cx="0" cy="0" r="1.2">
-+      <stop offset="0%" stop-color="#ccc"/>
-+      <stop offset="33%" stop-color="#ccc"/>
-+      <stop offset="100%" stop-color="#999"/>
-+    </radialGradient>
-+
-+    <radialGradient id="bulb-on" gradientUnits="userSpaceOnUse" cx="0" cy="0" r="1.2">
-+      <stop offset="0%" stop-color="#ffc"/>
-+      <stop offset="33%" stop-color="#ffb"/>
-+      <stop offset="100%" stop-color="#dda"/>
-+    </radialGradient>
-+  </defs>
-+
-+  <!--<rect id="bg" width="1" height="1"/>-->
-+
-+  <g transform="translate(.5,.28) scale(.27)">
-+    <path id="bulb" d="
-+M-.42,1.85
-+C-.42,1.4 -.42,1.22 -.866,.5
-+A1,1 0 1 1 .866,.5
-+C.42,1.22 .42,1.4 .42,1.85
-+z
-+"/>
-+    <path id="support" d="
-+M-.42,.1
-+C-.15,.9 -.15,1 -.15,1.86
-+M.42,.1
-+C.15,.9 .15,1 .15,1.86
-+"/>
-+    <path id="filament" d="
-+M-.42,.1
-+a.18,.15 0 1 1 .28,0
-+a.18,.15 0 1 1 .28,0
-+a.18,.15 0 1 1 .28,0
-+"/>
-+
-+    <g id="rays">
-+      <line x1="1.2" x2="1.8" transform="rotate(-30)"/>
-+      <line x1="1.2" x2="1.8"/>
-+      <line x1="1.2" x2="1.8" transform="rotate(30)"/>
-+      <line x1="-1.2" x2="-1.8" transform="rotate(-30)"/>
-+      <line x1="-1.2" x2="-1.8"/>
-+      <line x1="-1.2" x2="-1.8" transform="rotate(30)"/>
-+    </g>
-+  </g>
-+
-+  <g transform="translate(.5,.778) scale(.11)">
-+    <path id="base" d="
-+M-1,-.05
-+A2,.75 0 0 0 1,-.05
-+V1.2
-+L.55,1.6
-+H-.55
-+L-1,1.2
-+z
-+"/>
-+    <clipPath id="base-clip"><use xlink:href="#base"/></clipPath>
-+    <path id="screw" clip-path="url(#base-clip)" d="
-+M-1,.1
-+a2.2,1 0 0 0 2,-.14
-+M-1,.6
-+a2.2,1 0 0 0 2,-.14
-+M-1,1.1
-+a2.2,1 0 0 0 2,-.14
-+M-1,1.6
-+a2.2,1 0 0 0 2,-.14
-+"/>
-+  </g>
-+
-+  <path id="nub" transform="translate(.5,.954) scale(.06)" d="
-+M-1,-.05
-+A2,.333 0 0 0 1,-.05
-+L.5,.5
-+H-.5
-+z
-+"/>
-+
-+</svg>
-diff -r 563557a923d0 iphone/res/shakyhand.svg
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/res/shakyhand.svg	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,108 @@
-+<?xml version="1.0"?>
-+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
-+  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-+
-+<!--
-+   Copyright 2009-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-+     All Rights Reserved
-+-->
-+
-+<svg version="1.1" id="top"
-+  width="512px" height="512px"
-+  viewBox="0,0 1,1" preserveAspectRatio="xMidYMid" overflow="visible"
-+  xmlns="http://www.w3.org/2000/svg"
-+  xmlns:xlink="http://www.w3.org/1999/xlink">
-+
-+  <title>unstable hand icon</title>
-+
-+  <defs>
-+    <style type="text/css"><![CDATA[
-+      path, line, circle { fill: none; stroke-linejoin: round; stroke-linecap: round }
-+      #bg { fill: #202020 }
-+      #hand-outline { stroke: #a76; stroke-width: .75; stroke-opacity: 1 }
-+      #skin-base { fill: #db9 }
-+      #skin circle { fill: url(#skin-grad);/* stroke: red; stroke-width: .01*/ }
-+      #shakes { stroke: #d5f; stroke-width: .03125 } /* #f43 */
-+    ]]></style>
-+
-+    <clipPath id="hand-clip"><use xlink:href="#hand-outline"/></clipPath>
-+    <clipPath id="wrist-clip"><rect x="-20" y="3" width="40" height="42"/></clipPath>
-+
-+    <radialGradient id="skin-grad" r=".5" cx=".5" cy=".5">
-+      <stop offset="0%" stop-color="#edc"/>
-+      <stop offset="100%" stop-color="#edc" stop-opacity="0"/>
-+    </radialGradient>
-+  </defs>
-+
-+  <!--<rect id="bg" width="1" height="1"/>-->
-+
-+  <g id="hand" transform="translate(.5,-.025) scale(.0225)"
-+    clip-path="url(#wrist-clip)">
-+    <g id="skin" clip-path="url(#hand-clip)">
-+      <rect id="skin-base" x="-20" y="0" width="40" height="50"/>
-+
-+      <circle r="10" transform="translate(4,33) rotate(-50) scale(1,.75)"/>
-+      <circle r="4" transform="translate(-7,32) rotate(-8) scale(1,2)"/>
-+      <circle r="4" transform="translate(-1.5,23) rotate(-8) scale(2.4,.9)"/>
-+
-+      <g transform="rotate(-27.44 0,40)">
-+        <circle r="1.5" transform="translate(0,11.5) scale(.85,1.5)"/>
-+        <circle r="1.5" transform="translate(0,15.25) scale(.85,1.5)"/>
-+        <circle r="1.5" transform="translate(-.2,19) scale(.85,1.5)"/>
-+      </g>
-+      <g transform="rotate(-13.83 0,40) translate(0,.5)">
-+        <circle r="2" transform="translate(0,6.25) scale(.85,1.75)"/>
-+        <circle r="2" transform="translate(0,11.5) scale(.85,1.75)"/>
-+        <circle r="2" transform="translate(0,16.75) scale(.85,1.75)"/>
-+      </g>
-+      <g>
-+        <circle r="2" transform="translate(0,6.25) scale(.85,1.75)"/>
-+        <circle r="2" transform="translate(0,11.5) scale(.85,1.75)"/>
-+        <circle r="2" transform="translate(0,16.75) scale(.85,1.75)"/>
-+      </g>
-+      <g transform="rotate(13.83 0,40) translate(0,.5)">
-+        <circle r="2" transform="translate(0,6.25) scale(.85,1.75)"/>
-+        <circle r="2" transform="translate(0,11.5) scale(.85,1.75)"/>
-+        <circle r="2" transform="translate(0,16.75) scale(.85,1.75)"/>
-+      </g>
-+      <g transform="rotate(23.025 0,49.75)">
-+        <circle r="2.25" transform="translate(0,18) scale(.85,1.5)"/>
-+        <circle r="2.25" transform="translate(0,24) scale(.85,1.5)"/>
-+      </g>
-+    </g>
-+
-+    <path id="hand-outline" d="
-+M-8,45 V39
-+C-11,36 -11,32 -11,29
-+C-11,22 -11,22 -14.7,14.7
-+A1.4,1.4 0 0 1 -12.2,13.2
-+L-7.75,21.8
-+A.6,.6 0 0 0 -6.66,21.3
-+L-10,8
-+A2,2 0 0 1 -6,7
-+L-3,19.2
-+A.5,.5 0 0 0 -2,19
-+L-2,5.5
-+A2,2 0 0 1 2,5.5
-+L2,19
-+A.5,.5 0 0 0 3,19.2
-+L6,7
-+A2,2 0 0 1 10,8
-+C7,20 7,19 7,25.5
-+A.42,.42 0 0 0 7.75,25.75
-+L10.6,18.8
-+A2.25,2.25 0 0 1 14.8,20.6
-+C11.7,28 11.7,27.7 11,30
-+C10,34 7,39 3,40
-+L3,45
-+"/>
-+  </g>
-+
-+  <path id="shakes" transform="translate(.5,.5) rotate(22.5)" d="
-+M.484,0 A.484,.484 0 0 0 .342,-.342
-+M.39,0 A.39,.39 0 0 0 .276,-.276
-+M-.484,0 A.484,.484 0 0 0 -.342,.342
-+M-.39,0 A.39,.39 0 0 0 -.276,.276
-+"/>
-+
-+</svg>
-diff -r 563557a923d0 iphone/res/shakyphone.svg
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/res/shakyphone.svg	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,51 @@
-+<?xml version="1.0"?>
-+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
-+  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-+
-+<!--
-+   Copyright 2009-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-+     All Rights Reserved
-+-->
-+
-+<svg version="1.1" id="top"
-+  width="512px" height="512px"
-+  viewBox="0,0 1,1" preserveAspectRatio="xMidYMid" overflow="visible"
-+  xmlns="http://www.w3.org/2000/svg"
-+  xmlns:xlink="http://www.w3.org/1999/xlink">
-+
-+  <title>iPhone shake gesture icon</title>
-+
-+  <defs>
-+    <style type="text/css"><![CDATA[
-+      path, line, circle, rect { fill: none; stroke-linejoin: round; stroke-linecap: round }
-+      #bg { fill: black }
-+      #outline { fill: black; stroke: #4ef; stroke-width: .1 }
-+      #screen { fill: #045; stroke: none }
-+      #home { fill: #045; stroke: #4ef; stroke-width: .05 }
-+      #speaker { stroke: #4ef; stroke-width: .0625 }
-+    ]]></style>
-+  </defs>
-+
-+  <!--<rect id="bg" width="1" height="1"/>-->
-+
-+  <use transform="translate(.5,.5) scale(.2) rotate(-15)"
-+    style="opacity: .25"
-+    xlink:href="#phone"/>
-+
-+  <use transform="translate(.5,.5) scale(.2) rotate(-5)"
-+    style="opacity: .5"
-+    xlink:href="#phone"/>
-+
-+  <use transform="translate(.5,.5) scale(.2) rotate(5)"
-+    style="opacity: .75"
-+    xlink:href="#phone"/>
-+
-+  <g transform="translate(.5,.5) scale(.2) rotate(15)">
-+    <g id="phone">
-+      <rect id="outline" x="-1.1875" y="-2.21875" width="2.375" height="4.4375" rx=".25" ry=".25"/>
-+      <rect id="screen" x="-1" y="-1.5" width="2" height="3"/>
-+      <circle id="home" cy="1.84375" r=".21875"/>
-+      <line id="speaker" x1="-.25" x2=".25" y1="-1.84375" y2="-1.84375"/>
-+    </g>
-+  </g>
-+</svg>
-diff -r 563557a923d0 iphone/res/stopwatch.svg
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/res/stopwatch.svg	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,88 @@
-+<?xml version="1.0"?>
-+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
-+  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-+
-+<!--
-+   Copyright 2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+     All Rights Reserved
-+-->
-+
-+<svg version="1.1" id="top"
-+  width="512px" height="512px"
-+  viewBox="0,0 1,1" preserveAspectRatio="xMidYMid" overflow="visible"
-+  xmlns="http://www.w3.org/2000/svg"
-+  xmlns:xlink="http://www.w3.org/1999/xlink">
-+
-+  <title>stopwatch icon</title>
-+
-+  <defs>
-+    <style type="text/css"><![CDATA[
-+      path, line, circle, rect { fill: none; stroke-linejoin: round; stroke-linecap: round }
-+      #bg { fill: #202020 }
-+      #face { fill: url(#face-grad); stroke: none }
-+      #button * { stroke: #fd0 }
-+      #btn-top { stroke: url(#btn-grad); stroke-width: .45 }
-+      #btn-stem { stroke-width: .5 }
-+      #btn-base { fill: #fd0; stroke-width: .18 }
-+      #ticks { stroke: #444; stroke-width: .06 }
-+      #swoosh { fill: url(#swoosh-grad); stroke: none }
-+      #hand { stroke: black; stroke-width: .1 }
-+    ]]></style>
-+
-+    <radialGradient id="face-grad" gradientUnits="userSpaceOnUse" cx="0" cy="0" r="1">
-+      <stop offset="0%" stop-color="#fff"/>
-+      <stop offset="50%" stop-color="#eef"/>
-+      <stop offset="85%" stop-color="#ccd"/>
-+      <stop offset="85%" stop-color="#c93"/>
-+      <stop offset="91.25%" stop-color="#fd0"/>
-+      <stop offset="93.75%" stop-color="#fd0"/>
-+      <stop offset="100%" stop-color="#c93"/>
-+    </radialGradient>
-+
-+    <radialGradient id="btn-grad" gradientUnits="userSpaceOnUse"
-+      cx="0" cy="0" r="2" gradientTransform="scale(1,.2)">
-+      <stop offset="0%" stop-color="#fd0"/>
-+      <stop offset="10%" stop-color="#fd0"/>
-+      <stop offset="100%" stop-color="#c93"/>
-+    </radialGradient>
-+
-+    <linearGradient id="swoosh-grad" gradientUnits="userSpaceOnUse"
-+      x1="1" x2="0" gradientTransform="translate(.22) rotate(-18)"
-+      spreadMethod="pad">
-+      <stop offset="0%" stop-color="#45f"/>
-+      <stop offset="100%" stop-color="#45f" stop-opacity="0"/>
-+    </linearGradient>
-+  </defs>
-+
-+  <!--<rect id="bg" width="1" height="1"/>-->
-+
-+  <g transform="translate(.5,.56) scale(.4375)">
-+    <g id="button" transform="translate(0,-1.28) scale(.24) translate(0,.225)">
-+      <path id="btn-stem" d="M0,.1v1"/>
-+      <path id="btn-top" d="M-1,0h2"/>
-+      <rect id="btn-base" x="-1" y=".8" width="2" height=".5"/>
-+    </g>
-+
-+    <circle id="face" r="1"/>
-+
-+    <g id="ticks">
-+      <line y2="-.15" transform="translate(0,-.6)"/>
-+      <line y2="-.15" transform="rotate(36) translate(0,-.6)"/>
-+      <line y2="-.15" transform="rotate(72) translate(0,-.6)"/>
-+      <line y2="-.15" transform="rotate(108) translate(0,-.6)"/>
-+      <line y2="-.15" transform="rotate(144) translate(0,-.6)"/>
-+      <line y2="-.15" transform="rotate(180) translate(0,-.6)"/>
-+      <line y2="-.15" transform="rotate(216) translate(0,-.6)"/>
-+      <line y2="-.15" transform="rotate(252) translate(0,-.6)"/>
-+      <line y2="-.15" transform="rotate(288) translate(0,-.6)"/>
-+      <line y2="-.15" transform="rotate(324) translate(0,-.6)"/>
-+    </g>
-+
-+    <g transform="scale(.8)">
-+      <path id="swoosh"
-+        d="M0,0 v-1 a1,1 0 0 1 .951,.691z"/>
-+      <line id="hand" transform="scale(.975)" x2=".951" y2="-.309"/>
-+    </g>
-+  </g>
-+
-+</svg>
-diff -r 563557a923d0 iphone/res/zbar-back.png
-Binary file iphone/res/zbar-back.png has changed
-diff -r 563557a923d0 iphone/res/zbar-back.svg
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/res/zbar-back.svg	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,31 @@
-+<?xml version="1.0"?>
-+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
-+  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-+
-+<!--
-+   Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-+     All Rights Reserved
-+-->
-+
-+<svg version="1.1" id="top"
-+  width="29px" height="24px"
-+  viewBox="-.175,-.175 1.45,1.2" preserveAspectRatio="xMidYMid" overflow="visible"
-+  xmlns="http://www.w3.org/2000/svg"
-+  xmlns:xlink="http://www.w3.org/1999/xlink">
-+
-+  <title>left pointing arrow toolbar icon</title>
-+
-+  <defs>
-+    <style type="text/css"><![CDATA[
-+      path, line { fill: none; stroke-linejoin: round; stroke-linecap: round }
-+      #bg { fill: #78a }
-+      #arrow { fill: white;; stroke: white; stroke-width: .1 }
-+    ]]></style>
-+  </defs>
-+
-+  <!--<rect id="bg" x="-.5" y="-.5" width="2" height="2"/>-->
-+
-+  <g>
-+    <path id="arrow" d="M.1,.5 L.9,.1 .9,.9 z"/>
-+  </g>
-+</svg>
-diff -r 563557a923d0 iphone/res/zbar-help.html
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/res/zbar-help.html	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,89 @@
-+<?xml version="1.0"?>
-+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-+<!--
-+Copyright 2009-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-+All Rights Reserved
-+-->
-+<html>
-+<head>
-+<title>Barcode Reader Help</title>
-+<style type="text/css">
-+html, body { margin: 0; padding: 0; background: black; color: white; font-family: sans-serif; font-size: 16px }
-+h1 { margin: .5em 0; text-align: center; font-size: 28px }
-+h2 { font-size: 24px }
-+hr { margin: 1em 0; height: 0; border: none; border-top: solid 1px #666 }
-+.smaller { font-size: 85% }
-+p { margin: .5em }
-+a { color: #8af }
-+p.cen { text-align: center }
-+p.title { margin: 1em; clear: both; text-align: center }
-+div.col { width: 50% }
-+.clear { clear: both }
-+.iconlist { position: relative; clear: both; margin: 4px 0; padding: 1px 0 }
-+.icon { width: 64px; height: 64px; overflow: hidden; margin: 12px 16px; padding: 0; background: url("zbar-helpicons.png") no-repeat; font: bold 56px "Marker Felt"; text-align: center }
-+.sample { display: block; height: 96px; overflow: hidden; margin: 12px auto; padding: 0; background: url("zbar-samples.png") no-repeat; text-align: center}
-+.left { float: left }
-+.right { float: right }
-+.iconlist > p { margin: 10px }
-+.iconlist > h2 { margin: 10px }
-+</style>
-+</head>
-+<body>
-+<h1 id="title" style="color: #f88">Barcode Reader Help</h1>
-+<hr/>
-+<p class="title">Recognized barcodes should look like</p>
-+<div class="col left">
-+<a class="sample" style="width: 118px; background-position: -96px" href="http://wikipedia.org/wiki/EAN-13"></a>
-+<p class="cen"><a href="http://wikipedia.org/wiki/EAN-13">EAN/UPC<br/>Product Codes</a></p>
-+</div>
-+<div class="col right">
-+<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://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/Codabar">Codabar</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">
-+<div class="icon left"></div>
-+<p>Ensure there is plenty of</p>
-+<h2 style="color: #ff4">Light</h2>
-+</div>
-+<div class="iconlist">
-+<div class="icon left" style="background: none; color: #2d4">4"</div>
-+<h2 style="color: #4f6">Distance</h2>
-+<p>should be about 3 to 5 inches</p>
-+</div>
-+<div class="iconlist">
-+<div class="icon left" style="background-position: 0 -64px"></div>
-+<h2 style="color: #3ee">Shake</h2>
-+<p>to force the camera to focus</p>
-+</div>
-+<div class="iconlist">
-+<div class="icon left" style="background-position: 0 -128px"></div>
-+<h2 style="color: #59f">Wait</h2>
-+<p>for the autofocus to finish</p>
-+</div>
-+<div class="iconlist">
-+<div class="icon left" style="background-position: 0 -192px"></div>
-+<h2 style="color: #d5f">Hold Still</h2>
-+<p>while the barcode is scanned</p>
-+</div>
-+<script type="text/javascript">
-+function onZBarHelp(argv) {
-+var title;
-+switch(argv.reason) {
-+case "INFO": break;
-+case "FAIL": title = "No Barcode Detected"; break;
-+}
-+if(title) document.getElementById('title').textContent = title;
-+}
-+</script>
-+</body>
-+</html>
-diff -r 563557a923d0 iphone/res/zbar-helpicons.png
-Binary file iphone/res/zbar-helpicons.png has changed
-diff -r 563557a923d0 iphone/res/zbar-samples.png
-Binary file iphone/res/zbar-samples.png has changed
-diff -r 563557a923d0 iphone/zbar.xcodeproj/project.pbxproj
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/zbar.xcodeproj/project.pbxproj	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,1105 @@
-+// !$*UTF8*$!
-+{
-+	archiveVersion = 1;
-+	classes = {
-+	};
-+	objectVersion = 45;
-+	objects = {
-+
-+/* Begin PBXAggregateTarget section */
-+		DC1A4A4E11FF5D0500BCDA30 /* ZBarSDK.dmg */ = {
-+			isa = PBXAggregateTarget;
-+			buildConfigurationList = DC1A4A5311FF5D3D00BCDA30 /* Build configuration list for PBXAggregateTarget "ZBarSDK.dmg" */;
-+			buildPhases = (
-+				DC3CF2061218355900D7A786 /* Copy SDK */,
-+				DC48C585121AC7C20047193B /* Build Documentation */,
-+				DC3CF025121720B600D7A786 /* Copy Examples */,
-+				DC1A4A4D11FF5D0500BCDA30 /* Make Disk Image */,
-+			);
-+			dependencies = (
-+				DC3CF01F1216366200D7A786 /* PBXTargetDependency */,
-+			);
-+			name = ZBarSDK.dmg;
-+			productName = Package;
-+		};
-+		DC3CEE821215C7EF00D7A786 /* ZBarSDK */ = {
-+			isa = PBXAggregateTarget;
-+			buildConfigurationList = DC3CEE851215C83500D7A786 /* Build configuration list for PBXAggregateTarget "ZBarSDK" */;
-+			buildPhases = (
-+				DC3CEE891215C88000D7A786 /* Build Universal Library */,
-+				DC3CEE811215C7EF00D7A786 /* Copy Headers */,
-+				DC3CEE9E1215C9B800D7A786 /* Copy Headers */,
-+				DC3CEE9F1215C9B800D7A786 /* Copy Resources */,
-+			);
-+			dependencies = (
-+				DC3CEE871215C85400D7A786 /* PBXTargetDependency */,
-+			);
-+			name = ZBarSDK;
-+			productName = ZBarSDK;
-+		};
-+/* End PBXAggregateTarget section */
-+
-+/* Begin PBXBuildFile section */
-+		DC26004C118631C200FA987B /* ZBarCaptureReader.m in Sources */ = {isa = PBXBuildFile; fileRef = DC26004B118631C200FA987B /* ZBarCaptureReader.m */; };
-+		DC290E281351496400A9B857 /* codabar.c in Sources */ = {isa = PBXBuildFile; fileRef = DC290E261351496400A9B857 /* codabar.c */; };
-+		DC299A9D1208B5E8006A023C /* libzbar.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D2AAC07E0554694100DB518D /* libzbar.a */; };
-+		DC299AA01208B61C006A023C /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC50453D1203396B009FF359 /* AVFoundation.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
-+		DC299AA11208B61C006A023C /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC50453F1203396B009FF359 /* CoreMedia.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
-+		DC299AA21208B61C006A023C /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC5045411203396B009FF359 /* CoreVideo.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
-+		DC299AA31208B61C006A023C /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1A49C111FF537000BCDA30 /* QuartzCore.framework */; };
-+		DC299AA41208B61C006A023C /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DC5045431203396B009FF359 /* libiconv.dylib */; };
-+		DC299AA51208B63C006A023C /* zbar-help.html in Resources */ = {isa = PBXBuildFile; fileRef = DC1A49A211FF33B300BCDA30 /* zbar-help.html */; };
-+		DC299AA61208B63C006A023C /* zbar-helpicons.png in Resources */ = {isa = PBXBuildFile; fileRef = DC1A49A311FF33B300BCDA30 /* zbar-helpicons.png */; };
-+		DC299AA71208B63C006A023C /* zbar-samples.png in Resources */ = {isa = PBXBuildFile; fileRef = DC1A49A411FF33B300BCDA30 /* zbar-samples.png */; };
-+		DC299B061208FC11006A023C /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC299B051208FC11006A023C /* CoreGraphics.framework */; };
-+		DC299B311208FCA3006A023C /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC67C08210A079BE0033B702 /* UIKit.framework */; };
-+		DC299B841208FCAB006A023C /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AACBBE490F95108600F1A2B1 /* Foundation.framework */; };
-+		DC3AAB4F11B71A040021C7B1 /* ZBarCVImage.m in Sources */ = {isa = PBXBuildFile; fileRef = DC3AAB4D11B71A040021C7B1 /* ZBarCVImage.m */; };
-+		DC3CE47811FA1622008FAF88 /* ZBarReaderViewImpl_Capture.m in Sources */ = {isa = PBXBuildFile; fileRef = DC3CE47611FA1622008FAF88 /* ZBarReaderViewImpl_Capture.m */; };
-+		DC3CE47911FA1622008FAF88 /* ZBarReaderViewImpl_Simulator.m in Sources */ = {isa = PBXBuildFile; fileRef = DC3CE47711FA1622008FAF88 /* ZBarReaderViewImpl_Simulator.m */; };
-+		DC3CEE921215C93200D7A786 /* zbar.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = DC67C11710A07A810033B702 /* zbar.h */; };
-+		DC3CEE941215C97F00D7A786 /* Decoder.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = DC50463512034A4C009FF359 /* Decoder.h */; };
-+		DC3CEE951215C97F00D7A786 /* Exception.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = DC50463612034A4C009FF359 /* Exception.h */; };
-+		DC3CEE961215C97F00D7A786 /* Image.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = DC50463712034A4C009FF359 /* Image.h */; };
-+		DC3CEE971215C97F00D7A786 /* ImageScanner.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = DC50463812034A4C009FF359 /* ImageScanner.h */; };
-+		DC3CEE981215C97F00D7A786 /* Processor.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = DC50463912034A4C009FF359 /* Processor.h */; };
-+		DC3CEE991215C97F00D7A786 /* Scanner.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = DC50463A12034A4C009FF359 /* Scanner.h */; };
-+		DC3CEE9A1215C97F00D7A786 /* Symbol.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = DC50463B12034A4C009FF359 /* Symbol.h */; };
-+		DC3CEE9B1215C97F00D7A786 /* Video.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = DC50463C12034A4C009FF359 /* Video.h */; };
-+		DC3CEE9C1215C97F00D7A786 /* Window.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = DC50463D12034A4C009FF359 /* Window.h */; };
-+		DC3CEEA01215C9C000D7A786 /* zbar-help.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = DC1A49A211FF33B300BCDA30 /* zbar-help.html */; };
-+		DC3CEEA11215C9C000D7A786 /* zbar-helpicons.png in Copy Resources */ = {isa = PBXBuildFile; fileRef = DC1A49A311FF33B300BCDA30 /* zbar-helpicons.png */; };
-+		DC3CEEA21215C9C000D7A786 /* zbar-samples.png in Copy Resources */ = {isa = PBXBuildFile; fileRef = DC1A49A411FF33B300BCDA30 /* zbar-samples.png */; };
-+		DC3CEFB51216349700D7A786 /* ZBarCaptureReader.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = DC3CEFA51216347100D7A786 /* ZBarCaptureReader.h */; };
-+		DC3CEFB61216349700D7A786 /* ZBarImage.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = DC3CEFA61216347100D7A786 /* ZBarImage.h */; };
-+		DC3CEFB71216349700D7A786 /* ZBarImageScanner.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = DC3CEFA71216347100D7A786 /* ZBarImageScanner.h */; };
-+		DC3CEFB81216349700D7A786 /* ZBarReaderController.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = DC3CEFA81216347100D7A786 /* ZBarReaderController.h */; };
-+		DC3CEFB91216349700D7A786 /* ZBarReaderView.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = DC3CEFA91216347100D7A786 /* ZBarReaderView.h */; };
-+		DC3CEFBA1216349700D7A786 /* ZBarReaderViewController.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = DC3CEFAA1216347100D7A786 /* ZBarReaderViewController.h */; };
-+		DC3CEFBB1216349700D7A786 /* ZBarSDK.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = DC3CEFAB1216347100D7A786 /* ZBarSDK.h */; };
-+		DC3CEFBC1216349700D7A786 /* ZBarSymbol.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = DC3CEFAC1216347100D7A786 /* ZBarSymbol.h */; };
-+		DC3CF2021218353B00D7A786 /* README in Copy SDK */ = {isa = PBXBuildFile; fileRef = DC50467B12034D60009FF359 /* README */; };
-+		DC3CF2031218353B00D7A786 /* ChangeLog in Copy SDK */ = {isa = PBXBuildFile; fileRef = DC3CF141121721A100D7A786 /* ChangeLog */; };
-+		DC3CF2041218353B00D7A786 /* COPYING in Copy SDK */ = {isa = PBXBuildFile; fileRef = DC50467C12034D71009FF359 /* COPYING */; };
-+		DC3CF2051218353B00D7A786 /* LICENSE in Copy SDK */ = {isa = PBXBuildFile; fileRef = DC50467D12034D71009FF359 /* LICENSE */; };
-+		DC3CF29A1218359400D7A786 /* ReaderSample in Copy Examples */ = {isa = PBXBuildFile; fileRef = DC3CF2081218358C00D7A786 /* ReaderSample */; };
-+		DC3CF29B1218359400D7A786 /* readertest in Copy Examples */ = {isa = PBXBuildFile; fileRef = DC3CF2651218358C00D7A786 /* readertest */; };
-+		DC3CF2A312197A8C00D7A786 /* zbar-back.png in Copy Resources */ = {isa = PBXBuildFile; fileRef = DC3CF2A212197A7200D7A786 /* zbar-back.png */; };
-+		DC3EBB2D119DDB2100107EE9 /* ZBarReaderViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DC3EBB2C119DDB2100107EE9 /* ZBarReaderViewController.m */; };
-+		DC48C5341219FDDE0047193B /* zbar-back.png in Resources */ = {isa = PBXBuildFile; fileRef = DC3CF2A212197A7200D7A786 /* zbar-back.png */; };
-+		DC48C5411219FE550047193B /* readertest.m in Sources */ = {isa = PBXBuildFile; fileRef = DC48C5401219FE550047193B /* readertest.m */; };
-+		DC48C57D121A1F410047193B /* ZBarSDK in Copy SDK */ = {isa = PBXBuildFile; fileRef = DC48C55F121A1E7F0047193B /* ZBarSDK */; };
-+		DC48C5A8121B1F910047193B /* Documentation.html in Copy SDK */ = {isa = PBXBuildFile; fileRef = DC48C5A7121B1F840047193B /* Documentation.html */; };
-+		DC4920EE10A70475000E4D43 /* ZBarImage.m in Sources */ = {isa = PBXBuildFile; fileRef = DC4920EC10A70475000E4D43 /* ZBarImage.m */; };
-+		DC4920EF10A70475000E4D43 /* ZBarImageScanner.m in Sources */ = {isa = PBXBuildFile; fileRef = DC4920ED10A70475000E4D43 /* ZBarImageScanner.m */; };
-+		DC5D76C3136FA8C40069AEF5 /* ZBarCameraSimulator.m in Sources */ = {isa = PBXBuildFile; fileRef = DC5D76C2136FA8C40069AEF5 /* ZBarCameraSimulator.m */; };
-+		DC5D76C6136FA94B0069AEF5 /* ZBarCameraSimulator.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = DC5D76C5136FA8F20069AEF5 /* ZBarCameraSimulator.h */; };
-+		DC67C17110A07AD30033B702 /* config.c in Sources */ = {isa = PBXBuildFile; fileRef = DC67C11F10A07AD30033B702 /* config.c */; };
-+		DC67C17410A07AD30033B702 /* code128.c in Sources */ = {isa = PBXBuildFile; fileRef = DC67C12310A07AD30033B702 /* code128.c */; };
-+		DC67C17610A07AD30033B702 /* code39.c in Sources */ = {isa = PBXBuildFile; fileRef = DC67C12510A07AD30033B702 /* code39.c */; };
-+		DC67C17810A07AD30033B702 /* ean.c in Sources */ = {isa = PBXBuildFile; fileRef = DC67C12710A07AD30033B702 /* ean.c */; };
-+		DC67C17A10A07AD30033B702 /* i25.c in Sources */ = {isa = PBXBuildFile; fileRef = DC67C12910A07AD30033B702 /* i25.c */; };
-+		DC67C17F10A07AD30033B702 /* qr_finder.c in Sources */ = {isa = PBXBuildFile; fileRef = DC67C12E10A07AD30033B702 /* qr_finder.c */; };
-+		DC67C18110A07AD30033B702 /* decoder.c in Sources */ = {isa = PBXBuildFile; fileRef = DC67C13010A07AD30033B702 /* decoder.c */; };
-+		DC67C18310A07AD30033B702 /* error.c in Sources */ = {isa = PBXBuildFile; fileRef = DC67C13210A07AD30033B702 /* error.c */; };
-+		DC67C18610A07AD30033B702 /* image.c in Sources */ = {isa = PBXBuildFile; fileRef = DC67C13510A07AD30033B702 /* image.c */; };
-+		DC67C18810A07AD30033B702 /* img_scanner.c in Sources */ = {isa = PBXBuildFile; fileRef = DC67C13710A07AD30033B702 /* img_scanner.c */; };
-+		DC67C19510A07AD30033B702 /* bch15_5.c in Sources */ = {isa = PBXBuildFile; fileRef = DC67C14710A07AD30033B702 /* bch15_5.c */; };
-+		DC67C19710A07AD30033B702 /* binarize.c in Sources */ = {isa = PBXBuildFile; fileRef = DC67C14910A07AD30033B702 /* binarize.c */; };
-+		DC67C19910A07AD30033B702 /* isaac.c in Sources */ = {isa = PBXBuildFile; fileRef = DC67C14B10A07AD30033B702 /* isaac.c */; };
-+		DC67C19B10A07AD30033B702 /* qrdec.c in Sources */ = {isa = PBXBuildFile; fileRef = DC67C14D10A07AD30033B702 /* qrdec.c */; };
-+		DC67C19D10A07AD30033B702 /* qrdectxt.c in Sources */ = {isa = PBXBuildFile; fileRef = DC67C14F10A07AD30033B702 /* qrdectxt.c */; };
-+		DC67C19E10A07AD30033B702 /* rs.c in Sources */ = {isa = PBXBuildFile; fileRef = DC67C15010A07AD30033B702 /* rs.c */; };
-+		DC67C1A010A07AD30033B702 /* util.c in Sources */ = {isa = PBXBuildFile; fileRef = DC67C15210A07AD30033B702 /* util.c */; };
-+		DC67C1A310A07AD30033B702 /* refcnt.c in Sources */ = {isa = PBXBuildFile; fileRef = DC67C15510A07AD30033B702 /* refcnt.c */; };
-+		DC67C1A510A07AD30033B702 /* scanner.c in Sources */ = {isa = PBXBuildFile; fileRef = DC67C15710A07AD30033B702 /* scanner.c */; };
-+		DC67C1A810A07AD30033B702 /* symbol.c in Sources */ = {isa = PBXBuildFile; fileRef = DC67C15A10A07AD30033B702 /* symbol.c */; };
-+		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 */; };
-+		DC8245EF1629DC340010B2E6 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DC8245EE1629DC140010B2E6 /* Default-568h@2x.png */; };
-+		DCB3789B12A43CAC0059B07B /* ZBarHelpController.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = DCB3789A12A43C7E0059B07B /* ZBarHelpController.h */; };
-+		DCC93259137B50CB0040A82D /* EmbedReader in Copy Examples */ = {isa = PBXBuildFile; fileRef = DCC9324E137B509B0040A82D /* EmbedReader */; };
-+		DCC9325A137B50CB0040A82D /* TabReader in Copy Examples */ = {isa = PBXBuildFile; fileRef = DCC9324F137B509B0040A82D /* TabReader */; };
-+		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 */; };
-+/* End PBXBuildFile section */
-+
-+/* Begin PBXContainerItemProxy section */
-+		DC299A9E1208B5F1006A023C /* PBXContainerItemProxy */ = {
-+			isa = PBXContainerItemProxy;
-+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
-+			proxyType = 1;
-+			remoteGlobalIDString = D2AAC07D0554694100DB518D;
-+			remoteInfo = libzbar;
-+		};
-+		DC3CEE861215C85400D7A786 /* PBXContainerItemProxy */ = {
-+			isa = PBXContainerItemProxy;
-+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
-+			proxyType = 1;
-+			remoteGlobalIDString = D2AAC07D0554694100DB518D;
-+			remoteInfo = libzbar;
-+		};
-+		DC3CF01E1216366200D7A786 /* PBXContainerItemProxy */ = {
-+			isa = PBXContainerItemProxy;
-+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
-+			proxyType = 1;
-+			remoteGlobalIDString = DC3CEE821215C7EF00D7A786;
-+			remoteInfo = ZBarSDK;
-+		};
-+/* End PBXContainerItemProxy section */
-+
-+/* Begin PBXCopyFilesBuildPhase section */
-+		DC3CEE811215C7EF00D7A786 /* Copy Headers */ = {
-+			isa = PBXCopyFilesBuildPhase;
-+			buildActionMask = 2147483647;
-+			dstPath = Headers/ZBarSDK;
-+			dstSubfolderSpec = 1;
-+			files = (
-+				DC5D76C6136FA94B0069AEF5 /* ZBarCameraSimulator.h in Copy Headers */,
-+				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 */,
-+				DC3CEFB91216349700D7A786 /* ZBarReaderView.h in Copy Headers */,
-+				DC3CEFBA1216349700D7A786 /* ZBarReaderViewController.h in Copy Headers */,
-+				DC3CEFBB1216349700D7A786 /* ZBarSDK.h in Copy Headers */,
-+				DC3CEFBC1216349700D7A786 /* ZBarSymbol.h in Copy Headers */,
-+				DC3CEE921215C93200D7A786 /* zbar.h in Copy Headers */,
-+			);
-+			name = "Copy Headers";
-+			runOnlyForDeploymentPostprocessing = 0;
-+		};
-+		DC3CEE9E1215C9B800D7A786 /* Copy Headers */ = {
-+			isa = PBXCopyFilesBuildPhase;
-+			buildActionMask = 2147483647;
-+			dstPath = Headers/ZBarSDK/zbar;
-+			dstSubfolderSpec = 1;
-+			files = (
-+				DC3CEE941215C97F00D7A786 /* Decoder.h in Copy Headers */,
-+				DC3CEE951215C97F00D7A786 /* Exception.h in Copy Headers */,
-+				DC3CEE961215C97F00D7A786 /* Image.h in Copy Headers */,
-+				DC3CEE971215C97F00D7A786 /* ImageScanner.h in Copy Headers */,
-+				DC3CEE981215C97F00D7A786 /* Processor.h in Copy Headers */,
-+				DC3CEE991215C97F00D7A786 /* Scanner.h in Copy Headers */,
-+				DC3CEE9A1215C97F00D7A786 /* Symbol.h in Copy Headers */,
-+				DC3CEE9B1215C97F00D7A786 /* Video.h in Copy Headers */,
-+				DC3CEE9C1215C97F00D7A786 /* Window.h in Copy Headers */,
-+			);
-+			name = "Copy Headers";
-+			runOnlyForDeploymentPostprocessing = 0;
-+		};
-+		DC3CEE9F1215C9B800D7A786 /* Copy Resources */ = {
-+			isa = PBXCopyFilesBuildPhase;
-+			buildActionMask = 2147483647;
-+			dstPath = Resources;
-+			dstSubfolderSpec = 1;
-+			files = (
-+				DC3CF2A312197A8C00D7A786 /* zbar-back.png in Copy Resources */,
-+				DC3CEEA01215C9C000D7A786 /* zbar-help.html in Copy Resources */,
-+				DC3CEEA11215C9C000D7A786 /* zbar-helpicons.png in Copy Resources */,
-+				DC3CEEA21215C9C000D7A786 /* zbar-samples.png in Copy Resources */,
-+			);
-+			name = "Copy Resources";
-+			runOnlyForDeploymentPostprocessing = 0;
-+		};
-+		DC3CF025121720B600D7A786 /* Copy Examples */ = {
-+			isa = PBXCopyFilesBuildPhase;
-+			buildActionMask = 2147483647;
-+			dstPath = Examples;
-+			dstSubfolderSpec = 1;
-+			files = (
-+				DC3CF29A1218359400D7A786 /* ReaderSample in Copy Examples */,
-+				DC3CF29B1218359400D7A786 /* readertest in Copy Examples */,
-+				DCC93259137B50CB0040A82D /* EmbedReader in Copy Examples */,
-+				DCC9325A137B50CB0040A82D /* TabReader in Copy Examples */,
-+			);
-+			name = "Copy Examples";
-+			runOnlyForDeploymentPostprocessing = 0;
-+		};
-+		DC3CF2061218355900D7A786 /* Copy SDK */ = {
-+			isa = PBXCopyFilesBuildPhase;
-+			buildActionMask = 2147483647;
-+			dstPath = "";
-+			dstSubfolderSpec = 1;
-+			files = (
-+				DC48C57D121A1F410047193B /* ZBarSDK in Copy SDK */,
-+				DC3CF2021218353B00D7A786 /* README in Copy SDK */,
-+				DC3CF2031218353B00D7A786 /* ChangeLog in Copy SDK */,
-+				DC3CF2041218353B00D7A786 /* COPYING in Copy SDK */,
-+				DC3CF2051218353B00D7A786 /* LICENSE in Copy SDK */,
-+				DC48C5A8121B1F910047193B /* Documentation.html in Copy SDK */,
-+			);
-+			name = "Copy SDK";
-+			runOnlyForDeploymentPostprocessing = 0;
-+		};
-+/* End PBXCopyFilesBuildPhase section */
-+
-+/* Begin PBXFileReference section */
-+		AACBBE490F95108600F1A2B1 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
-+		D2AAC07E0554694100DB518D /* libzbar.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libzbar.a; sourceTree = BUILT_PRODUCTS_DIR; };
-+		DC1A49A211FF33B300BCDA30 /* zbar-help.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = "zbar-help.html"; path = "res/zbar-help.html"; sourceTree = "<group>"; };
-+		DC1A49A311FF33B300BCDA30 /* zbar-helpicons.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "zbar-helpicons.png"; path = "res/zbar-helpicons.png"; sourceTree = "<group>"; };
-+		DC1A49A411FF33B300BCDA30 /* zbar-samples.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "zbar-samples.png"; path = "res/zbar-samples.png"; sourceTree = "<group>"; };
-+		DC1A49C111FF537000BCDA30 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
-+		DC26004B118631C200FA987B /* ZBarCaptureReader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ZBarCaptureReader.m; sourceTree = "<group>"; usesTabs = 0; };
-+		DC290E261351496400A9B857 /* codabar.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = codabar.c; sourceTree = "<group>"; };
-+		DC290E271351496400A9B857 /* codabar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = codabar.h; sourceTree = "<group>"; };
-+		DC299AF51208B7BD006A023C /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = config.h; path = include/config.h; sourceTree = "<group>"; };
-+		DC299B051208FC11006A023C /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
-+		DC299BEC1208FE40006A023C /* prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = prefix.pch; path = include/prefix.pch; sourceTree = "<group>"; };
-+		DC3AAB4C11B71A040021C7B1 /* ZBarCVImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZBarCVImage.h; sourceTree = "<group>"; usesTabs = 0; };
-+		DC3AAB4D11B71A040021C7B1 /* ZBarCVImage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ZBarCVImage.m; sourceTree = "<group>"; usesTabs = 0; };
-+		DC3CE47611FA1622008FAF88 /* ZBarReaderViewImpl_Capture.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ZBarReaderViewImpl_Capture.m; sourceTree = "<group>"; usesTabs = 0; };
-+		DC3CE47711FA1622008FAF88 /* ZBarReaderViewImpl_Simulator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ZBarReaderViewImpl_Simulator.m; sourceTree = "<group>"; usesTabs = 0; };
-+		DC3CEF9D121633C500D7A786 /* readertest.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = readertest.app; sourceTree = BUILT_PRODUCTS_DIR; };
-+		DC3CEFA51216347100D7A786 /* ZBarCaptureReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ZBarCaptureReader.h; path = include/ZBarSDK/ZBarCaptureReader.h; sourceTree = "<group>"; };
-+		DC3CEFA61216347100D7A786 /* ZBarImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ZBarImage.h; path = include/ZBarSDK/ZBarImage.h; sourceTree = "<group>"; };
-+		DC3CEFA71216347100D7A786 /* ZBarImageScanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ZBarImageScanner.h; path = include/ZBarSDK/ZBarImageScanner.h; sourceTree = "<group>"; };
-+		DC3CEFA81216347100D7A786 /* ZBarReaderController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ZBarReaderController.h; path = include/ZBarSDK/ZBarReaderController.h; sourceTree = "<group>"; };
-+		DC3CEFA91216347100D7A786 /* ZBarReaderView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ZBarReaderView.h; path = include/ZBarSDK/ZBarReaderView.h; sourceTree = "<group>"; };
-+		DC3CEFAA1216347100D7A786 /* ZBarReaderViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ZBarReaderViewController.h; path = include/ZBarSDK/ZBarReaderViewController.h; sourceTree = "<group>"; };
-+		DC3CEFAB1216347100D7A786 /* ZBarSDK.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ZBarSDK.h; path = include/ZBarSDK/ZBarSDK.h; sourceTree = "<group>"; };
-+		DC3CEFAC1216347100D7A786 /* ZBarSymbol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ZBarSymbol.h; path = include/ZBarSDK/ZBarSymbol.h; sourceTree = "<group>"; };
-+		DC3CF141121721A100D7A786 /* ChangeLog */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ChangeLog; sourceTree = "<group>"; };
-+		DC3CF2081218358C00D7A786 /* ReaderSample */ = {isa = PBXFileReference; lastKnownFileType = folder; name = ReaderSample; path = examples/ReaderSample; sourceTree = "<group>"; };
-+		DC3CF2651218358C00D7A786 /* readertest */ = {isa = PBXFileReference; lastKnownFileType = folder; name = readertest; path = examples/readertest; sourceTree = "<group>"; };
-+		DC3CF2A212197A7200D7A786 /* zbar-back.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "zbar-back.png"; path = "res/zbar-back.png"; sourceTree = "<group>"; };
-+		DC3EBB2C119DDB2100107EE9 /* ZBarReaderViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ZBarReaderViewController.m; sourceTree = "<group>"; usesTabs = 0; };
-+		DC48C5401219FE550047193B /* readertest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = readertest.m; path = examples/readertest/readertest.m; sourceTree = "<group>"; };
-+		DC48C55F121A1E7F0047193B /* ZBarSDK */ = {isa = PBXFileReference; lastKnownFileType = folder; path = ZBarSDK; sourceTree = BUILT_PRODUCTS_DIR; };
-+		DC48C5A7121B1F840047193B /* Documentation.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = Documentation.html; path = doc/Documentation.html; sourceTree = "<group>"; };
-+		DC4920EC10A70475000E4D43 /* ZBarImage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ZBarImage.m; sourceTree = "<group>"; usesTabs = 0; };
-+		DC4920ED10A70475000E4D43 /* ZBarImageScanner.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ZBarImageScanner.m; sourceTree = "<group>"; usesTabs = 0; };
-+		DC50453D1203396B009FF359 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
-+		DC50453F1203396B009FF359 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; };
-+		DC5045411203396B009FF359 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; };
-+		DC5045431203396B009FF359 /* libiconv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libiconv.dylib; path = usr/lib/libiconv.dylib; sourceTree = SDKROOT; };
-+		DC50463512034A4C009FF359 /* Decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Decoder.h; path = ../include/zbar/Decoder.h; sourceTree = SOURCE_ROOT; };
-+		DC50463612034A4C009FF359 /* Exception.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Exception.h; path = ../include/zbar/Exception.h; sourceTree = SOURCE_ROOT; };
-+		DC50463712034A4C009FF359 /* Image.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Image.h; path = ../include/zbar/Image.h; sourceTree = SOURCE_ROOT; };
-+		DC50463812034A4C009FF359 /* ImageScanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ImageScanner.h; path = ../include/zbar/ImageScanner.h; sourceTree = SOURCE_ROOT; };
-+		DC50463912034A4C009FF359 /* Processor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Processor.h; path = ../include/zbar/Processor.h; sourceTree = SOURCE_ROOT; };
-+		DC50463A12034A4C009FF359 /* Scanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Scanner.h; path = ../include/zbar/Scanner.h; sourceTree = SOURCE_ROOT; };
-+		DC50463B12034A4C009FF359 /* Symbol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Symbol.h; path = ../include/zbar/Symbol.h; sourceTree = SOURCE_ROOT; };
-+		DC50463C12034A4C009FF359 /* Video.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Video.h; path = ../include/zbar/Video.h; sourceTree = SOURCE_ROOT; };
-+		DC50463D12034A4C009FF359 /* Window.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Window.h; path = ../include/zbar/Window.h; sourceTree = SOURCE_ROOT; };
-+		DC50467B12034D60009FF359 /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README; sourceTree = "<group>"; };
-+		DC50467C12034D71009FF359 /* COPYING */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = COPYING; path = ../COPYING; sourceTree = SOURCE_ROOT; };
-+		DC50467D12034D71009FF359 /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = SOURCE_ROOT; };
-+		DC5D76C2136FA8C40069AEF5 /* ZBarCameraSimulator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ZBarCameraSimulator.m; sourceTree = "<group>"; };
-+		DC5D76C5136FA8F20069AEF5 /* ZBarCameraSimulator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ZBarCameraSimulator.h; path = include/ZBarSDK/ZBarCameraSimulator.h; sourceTree = "<group>"; };
-+		DC67C08210A079BE0033B702 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
-+		DC67C11710A07A810033B702 /* zbar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = zbar.h; path = ../include/zbar.h; sourceTree = SOURCE_ROOT; usesTabs = 0; };
-+		DC67C11F10A07AD30033B702 /* config.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = config.c; sourceTree = "<group>"; usesTabs = 0; };
-+		DC67C12110A07AD30033B702 /* debug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = debug.h; sourceTree = "<group>"; usesTabs = 0; };
-+		DC67C12310A07AD30033B702 /* code128.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = code128.c; sourceTree = "<group>"; };
-+		DC67C12410A07AD30033B702 /* code128.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = code128.h; sourceTree = "<group>"; };
-+		DC67C12510A07AD30033B702 /* code39.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = code39.c; sourceTree = "<group>"; };
-+		DC67C12610A07AD30033B702 /* code39.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = code39.h; sourceTree = "<group>"; };
-+		DC67C12710A07AD30033B702 /* ean.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ean.c; sourceTree = "<group>"; };
-+		DC67C12810A07AD30033B702 /* ean.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ean.h; sourceTree = "<group>"; };
-+		DC67C12910A07AD30033B702 /* i25.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = i25.c; sourceTree = "<group>"; };
-+		DC67C12A10A07AD30033B702 /* i25.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = i25.h; sourceTree = "<group>"; };
-+		DC67C12E10A07AD30033B702 /* qr_finder.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = qr_finder.c; sourceTree = "<group>"; };
-+		DC67C12F10A07AD30033B702 /* qr_finder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = qr_finder.h; sourceTree = "<group>"; };
-+		DC67C13010A07AD30033B702 /* decoder.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = decoder.c; sourceTree = "<group>"; usesTabs = 0; };
-+		DC67C13110A07AD30033B702 /* decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = decoder.h; sourceTree = "<group>"; usesTabs = 0; };
-+		DC67C13210A07AD30033B702 /* error.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = error.c; sourceTree = "<group>"; usesTabs = 0; };
-+		DC67C13310A07AD30033B702 /* error.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = error.h; sourceTree = "<group>"; usesTabs = 0; };
-+		DC67C13510A07AD30033B702 /* image.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = image.c; sourceTree = "<group>"; usesTabs = 0; };
-+		DC67C13610A07AD30033B702 /* image.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = image.h; sourceTree = "<group>"; usesTabs = 0; };
-+		DC67C13710A07AD30033B702 /* img_scanner.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = img_scanner.c; sourceTree = "<group>"; usesTabs = 0; };
-+		DC67C13810A07AD30033B702 /* img_scanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = img_scanner.h; sourceTree = "<group>"; usesTabs = 0; };
-+		DC67C14710A07AD30033B702 /* bch15_5.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bch15_5.c; sourceTree = "<group>"; };
-+		DC67C14810A07AD30033B702 /* bch15_5.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bch15_5.h; sourceTree = "<group>"; };
-+		DC67C14910A07AD30033B702 /* binarize.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = binarize.c; sourceTree = "<group>"; };
-+		DC67C14A10A07AD30033B702 /* binarize.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = binarize.h; sourceTree = "<group>"; };
-+		DC67C14B10A07AD30033B702 /* isaac.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = isaac.c; sourceTree = "<group>"; };
-+		DC67C14C10A07AD30033B702 /* isaac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = isaac.h; sourceTree = "<group>"; };
-+		DC67C14D10A07AD30033B702 /* qrdec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = qrdec.c; sourceTree = "<group>"; };
-+		DC67C14E10A07AD30033B702 /* qrdec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = qrdec.h; sourceTree = "<group>"; };
-+		DC67C14F10A07AD30033B702 /* qrdectxt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = qrdectxt.c; sourceTree = "<group>"; };
-+		DC67C15010A07AD30033B702 /* rs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rs.c; sourceTree = "<group>"; };
-+		DC67C15110A07AD30033B702 /* rs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rs.h; sourceTree = "<group>"; };
-+		DC67C15210A07AD30033B702 /* util.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = util.c; sourceTree = "<group>"; };
-+		DC67C15310A07AD30033B702 /* util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = util.h; sourceTree = "<group>"; };
-+		DC67C15410A07AD30033B702 /* qrcode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = qrcode.h; sourceTree = "<group>"; usesTabs = 0; };
-+		DC67C15510A07AD30033B702 /* refcnt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = refcnt.c; sourceTree = "<group>"; usesTabs = 0; };
-+		DC67C15610A07AD30033B702 /* refcnt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = refcnt.h; sourceTree = "<group>"; usesTabs = 0; };
-+		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; };
-+		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; };
-+		DC8245EE1629DC140010B2E6 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-568h@2x.png"; path = "examples/readertest/Default-568h@2x.png"; sourceTree = "<group>"; };
-+		DCB3789A12A43C7E0059B07B /* ZBarHelpController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ZBarHelpController.h; path = include/ZBarSDK/ZBarHelpController.h; sourceTree = "<group>"; };
-+		DCC9324E137B509B0040A82D /* EmbedReader */ = {isa = PBXFileReference; lastKnownFileType = folder; name = EmbedReader; path = examples/EmbedReader; sourceTree = "<group>"; };
-+		DCC9324F137B509B0040A82D /* TabReader */ = {isa = PBXFileReference; lastKnownFileType = folder; name = TabReader; path = examples/TabReader; 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>"; };
-+		DCF5C9AB11EA3AD100E7DC21 /* databar.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = databar.c; sourceTree = "<group>"; };
-+		DCF5C9AC11EA3AD100E7DC21 /* databar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = databar.h; sourceTree = "<group>"; };
-+/* End PBXFileReference section */
-+
-+/* Begin PBXFrameworksBuildPhase section */
-+		DC299A931208B5D4006A023C /* Frameworks */ = {
-+			isa = PBXFrameworksBuildPhase;
-+			buildActionMask = 2147483647;
-+			files = (
-+				DC299B841208FCAB006A023C /* Foundation.framework in Frameworks */,
-+				DC299B061208FC11006A023C /* CoreGraphics.framework in Frameworks */,
-+				DC299B311208FCA3006A023C /* UIKit.framework in Frameworks */,
-+				DC299AA31208B61C006A023C /* QuartzCore.framework in Frameworks */,
-+				DC299AA01208B61C006A023C /* AVFoundation.framework in Frameworks */,
-+				DC299AA11208B61C006A023C /* CoreMedia.framework in Frameworks */,
-+				DC299AA21208B61C006A023C /* CoreVideo.framework in Frameworks */,
-+				DC299AA41208B61C006A023C /* libiconv.dylib in Frameworks */,
-+				DC299A9D1208B5E8006A023C /* libzbar.a in Frameworks */,
-+			);
-+			runOnlyForDeploymentPostprocessing = 0;
-+		};
-+/* End PBXFrameworksBuildPhase section */
-+
-+/* Begin PBXGroup section */
-+		034768DFFF38A50411DB9C8B /* Products */ = {
-+			isa = PBXGroup;
-+			children = (
-+				D2AAC07E0554694100DB518D /* libzbar.a */,
-+				DC3CEF9D121633C500D7A786 /* readertest.app */,
-+				DC48C55F121A1E7F0047193B /* ZBarSDK */,
-+			);
-+			name = Products;
-+			sourceTree = "<group>";
-+		};
-+		0867D691FE84028FC02AAC07 /* zbar */ = {
-+			isa = PBXGroup;
-+			children = (
-+				DC50467B12034D60009FF359 /* README */,
-+				DC3CF141121721A100D7A786 /* ChangeLog */,
-+				DC50467C12034D71009FF359 /* COPYING */,
-+				DC50467D12034D71009FF359 /* LICENSE */,
-+				DC48C5A7121B1F840047193B /* Documentation.html */,
-+				DC299BED1208FE49006A023C /* src */,
-+				DC1A49A111FF338B00BCDA30 /* Resources */,
-+				DC67C11610A07A670033B702 /* include */,
-+				DC3CF2071218356F00D7A786 /* Examples */,
-+				DC48C5361219FE2F0047193B /* readertest */,
-+				0867D69AFE84028FC02AAC07 /* Frameworks */,
-+				034768DFFF38A50411DB9C8B /* Products */,
-+			);
-+			name = zbar;
-+			sourceTree = "<group>";
-+		};
-+		0867D69AFE84028FC02AAC07 /* Frameworks */ = {
-+			isa = PBXGroup;
-+			children = (
-+				AACBBE490F95108600F1A2B1 /* Foundation.framework */,
-+				DC299B051208FC11006A023C /* CoreGraphics.framework */,
-+				DC67C08210A079BE0033B702 /* UIKit.framework */,
-+				DC1A49C111FF537000BCDA30 /* QuartzCore.framework */,
-+				DC50453D1203396B009FF359 /* AVFoundation.framework */,
-+				DC50453F1203396B009FF359 /* CoreMedia.framework */,
-+				DC5045411203396B009FF359 /* CoreVideo.framework */,
-+				DC5045431203396B009FF359 /* libiconv.dylib */,
-+			);
-+			name = Frameworks;
-+			sourceTree = "<group>";
-+		};
-+		DC1A49A111FF338B00BCDA30 /* Resources */ = {
-+			isa = PBXGroup;
-+			children = (
-+				DC3CF2A212197A7200D7A786 /* zbar-back.png */,
-+				DC1A49A211FF33B300BCDA30 /* zbar-help.html */,
-+				DC1A49A311FF33B300BCDA30 /* zbar-helpicons.png */,
-+				DC1A49A411FF33B300BCDA30 /* zbar-samples.png */,
-+			);
-+			name = Resources;
-+			sourceTree = "<group>";
-+			usesTabs = 0;
-+		};
-+		DC299BE41208FE09006A023C /* ZBarSDK */ = {
-+			isa = PBXGroup;
-+			children = (
-+				DC5D76C5136FA8F20069AEF5 /* ZBarCameraSimulator.h */,
-+				DC3CEFA51216347100D7A786 /* ZBarCaptureReader.h */,
-+				DCB3789A12A43C7E0059B07B /* ZBarHelpController.h */,
-+				DC3CEFA61216347100D7A786 /* ZBarImage.h */,
-+				DC3CEFA71216347100D7A786 /* ZBarImageScanner.h */,
-+				DC3CEFA81216347100D7A786 /* ZBarReaderController.h */,
-+				DC3CEFA91216347100D7A786 /* ZBarReaderView.h */,
-+				DC3CEFAA1216347100D7A786 /* ZBarReaderViewController.h */,
-+				DC3CEFAB1216347100D7A786 /* ZBarSDK.h */,
-+				DC3CEFAC1216347100D7A786 /* ZBarSymbol.h */,
-+				DC67C11710A07A810033B702 /* zbar.h */,
-+				DC50463412034A1E009FF359 /* zbar */,
-+			);
-+			name = ZBarSDK;
-+			sourceTree = "<group>";
-+		};
-+		DC299BED1208FE49006A023C /* src */ = {
-+			isa = PBXGroup;
-+			children = (
-+				DC67C1C010A07B6B0033B702 /* ZBarSymbol.m */,
-+				DC4920EC10A70475000E4D43 /* ZBarImage.m */,
-+				DC4920ED10A70475000E4D43 /* ZBarImageScanner.m */,
-+				DC3AAB4D11B71A040021C7B1 /* ZBarCVImage.m */,
-+				DC26004B118631C200FA987B /* ZBarCaptureReader.m */,
-+				DCDC6E2F11ADCA8E00021380 /* ZBarReaderView.m */,
-+				DC3CE47611FA1622008FAF88 /* ZBarReaderViewImpl_Capture.m */,
-+				DC3CE47711FA1622008FAF88 /* ZBarReaderViewImpl_Simulator.m */,
-+				DC5D76C2136FA8C40069AEF5 /* ZBarCameraSimulator.m */,
-+				DC67C1BE10A07B6B0033B702 /* ZBarHelpController.m */,
-+				DC3EBB2C119DDB2100107EE9 /* ZBarReaderViewController.m */,
-+				DC67C1BF10A07B6B0033B702 /* ZBarReaderController.m */,
-+				DC67C11E10A07AD30033B702 /* zbar */,
-+			);
-+			name = src;
-+			sourceTree = "<group>";
-+		};
-+		DC3CF2071218356F00D7A786 /* Examples */ = {
-+			isa = PBXGroup;
-+			children = (
-+				DC3CF2081218358C00D7A786 /* ReaderSample */,
-+				DC3CF2651218358C00D7A786 /* readertest */,
-+				DCC9324E137B509B0040A82D /* EmbedReader */,
-+				DCC9324F137B509B0040A82D /* TabReader */,
-+			);
-+			name = Examples;
-+			sourceTree = "<group>";
-+		};
-+		DC48C5361219FE2F0047193B /* readertest */ = {
-+			isa = PBXGroup;
-+			children = (
-+				DC8245EE1629DC140010B2E6 /* Default-568h@2x.png */,
-+				DC48C5401219FE550047193B /* readertest.m */,
-+			);
-+			name = readertest;
-+			sourceTree = "<group>";
-+		};
-+		DC50463412034A1E009FF359 /* zbar */ = {
-+			isa = PBXGroup;
-+			children = (
-+				DC50463512034A4C009FF359 /* Decoder.h */,
-+				DC50463612034A4C009FF359 /* Exception.h */,
-+				DC50463712034A4C009FF359 /* Image.h */,
-+				DC50463812034A4C009FF359 /* ImageScanner.h */,
-+				DC50463912034A4C009FF359 /* Processor.h */,
-+				DC50463A12034A4C009FF359 /* Scanner.h */,
-+				DC50463B12034A4C009FF359 /* Symbol.h */,
-+				DC50463C12034A4C009FF359 /* Video.h */,
-+				DC50463D12034A4C009FF359 /* Window.h */,
-+			);
-+			name = zbar;
-+			sourceTree = "<group>";
-+		};
-+		DC67C11610A07A670033B702 /* include */ = {
-+			isa = PBXGroup;
-+			children = (
-+				DC299BEC1208FE40006A023C /* prefix.pch */,
-+				DC299AF51208B7BD006A023C /* config.h */,
-+				DC3AAB4C11B71A040021C7B1 /* ZBarCVImage.h */,
-+				DC299BE41208FE09006A023C /* ZBarSDK */,
-+			);
-+			name = include;
-+			sourceTree = "<group>";
-+			usesTabs = 0;
-+		};
-+		DC67C11E10A07AD30033B702 /* zbar */ = {
-+			isa = PBXGroup;
-+			children = (
-+				DC67C11F10A07AD30033B702 /* config.c */,
-+				DC67C12110A07AD30033B702 /* debug.h */,
-+				DC67C12210A07AD30033B702 /* decoder */,
-+				DC67C13010A07AD30033B702 /* decoder.c */,
-+				DC67C13110A07AD30033B702 /* decoder.h */,
-+				DC67C13210A07AD30033B702 /* error.c */,
-+				DC67C13310A07AD30033B702 /* error.h */,
-+				DC67C13510A07AD30033B702 /* image.c */,
-+				DC67C13610A07AD30033B702 /* image.h */,
-+				DC67C13710A07AD30033B702 /* img_scanner.c */,
-+				DC67C13810A07AD30033B702 /* img_scanner.h */,
-+				DC67C14610A07AD30033B702 /* qrcode */,
-+				DC67C15410A07AD30033B702 /* qrcode.h */,
-+				DC67C15510A07AD30033B702 /* refcnt.c */,
-+				DC67C15610A07AD30033B702 /* refcnt.h */,
-+				DC67C15710A07AD30033B702 /* scanner.c */,
-+				DC67C1CB10A07BEE0033B702 /* svg.h */,
-+				DC67C15A10A07AD30033B702 /* symbol.c */,
-+				DC67C15B10A07AD30033B702 /* symbol.h */,
-+			);
-+			name = zbar;
-+			path = ../zbar;
-+			sourceTree = SOURCE_ROOT;
-+			usesTabs = 0;
-+		};
-+		DC67C12210A07AD30033B702 /* decoder */ = {
-+			isa = PBXGroup;
-+			children = (
-+				DCF5C9AB11EA3AD100E7DC21 /* databar.c */,
-+				DCF5C9AC11EA3AD100E7DC21 /* databar.h */,
-+				DC67C12310A07AD30033B702 /* code128.c */,
-+				DC67C12410A07AD30033B702 /* code128.h */,
-+				DCE9900B129719F100D2655C /* code93.c */,
-+				DCE9900C129719F100D2655C /* code93.h */,
-+				DC67C12510A07AD30033B702 /* code39.c */,
-+				DC67C12610A07AD30033B702 /* code39.h */,
-+				DC67C12710A07AD30033B702 /* ean.c */,
-+				DC67C12810A07AD30033B702 /* ean.h */,
-+				DC290E261351496400A9B857 /* codabar.c */,
-+				DC290E271351496400A9B857 /* codabar.h */,
-+				DC67C12910A07AD30033B702 /* i25.c */,
-+				DC67C12A10A07AD30033B702 /* i25.h */,
-+				DC67C12E10A07AD30033B702 /* qr_finder.c */,
-+				DC67C12F10A07AD30033B702 /* qr_finder.h */,
-+			);
-+			path = decoder;
-+			sourceTree = "<group>";
-+			usesTabs = 0;
-+		};
-+		DC67C14610A07AD30033B702 /* qrcode */ = {
-+			isa = PBXGroup;
-+			children = (
-+				DC67C14710A07AD30033B702 /* bch15_5.c */,
-+				DC67C14810A07AD30033B702 /* bch15_5.h */,
-+				DC67C14910A07AD30033B702 /* binarize.c */,
-+				DC67C14A10A07AD30033B702 /* binarize.h */,
-+				DC67C14B10A07AD30033B702 /* isaac.c */,
-+				DC67C14C10A07AD30033B702 /* isaac.h */,
-+				DC67C14D10A07AD30033B702 /* qrdec.c */,
-+				DC67C14E10A07AD30033B702 /* qrdec.h */,
-+				DC67C14F10A07AD30033B702 /* qrdectxt.c */,
-+				DC67C15010A07AD30033B702 /* rs.c */,
-+				DC67C15110A07AD30033B702 /* rs.h */,
-+				DC67C15210A07AD30033B702 /* util.c */,
-+				DC67C15310A07AD30033B702 /* util.h */,
-+			);
-+			path = qrcode;
-+			sourceTree = "<group>";
-+			usesTabs = 0;
-+		};
-+/* End PBXGroup section */
-+
-+/* Begin PBXNativeTarget section */
-+		D2AAC07D0554694100DB518D /* libzbar */ = {
-+			isa = PBXNativeTarget;
-+			buildConfigurationList = 1DEB921E08733DC00010E9CD /* Build configuration list for PBXNativeTarget "libzbar" */;
-+			buildPhases = (
-+				D2AAC07B0554694100DB518D /* Sources */,
-+			);
-+			buildRules = (
-+			);
-+			dependencies = (
-+			);
-+			name = libzbar;
-+			productName = zbar;
-+			productReference = D2AAC07E0554694100DB518D /* libzbar.a */;
-+			productType = "com.apple.product-type.library.static";
-+		};
-+		DC299A941208B5D4006A023C /* readertest */ = {
-+			isa = PBXNativeTarget;
-+			buildConfigurationList = DC299A9A1208B5D5006A023C /* Build configuration list for PBXNativeTarget "readertest" */;
-+			buildPhases = (
-+				DC299A911208B5D4006A023C /* Resources */,
-+				DC299A921208B5D4006A023C /* Sources */,
-+				DC299A931208B5D4006A023C /* Frameworks */,
-+			);
-+			buildRules = (
-+			);
-+			dependencies = (
-+				DC299A9F1208B5F1006A023C /* PBXTargetDependency */,
-+			);
-+			name = readertest;
-+			productName = readertest;
-+			productReference = DC3CEF9D121633C500D7A786 /* readertest.app */;
-+			productType = "com.apple.product-type.application";
-+		};
-+/* End PBXNativeTarget section */
-+
-+/* Begin PBXProject section */
-+		0867D690FE84028FC02AAC07 /* Project object */ = {
-+			isa = PBXProject;
-+			buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "zbar" */;
-+			compatibilityVersion = "Xcode 3.1";
-+			developmentRegion = English;
-+			hasScannedForEncodings = 1;
-+			knownRegions = (
-+				English,
-+				Japanese,
-+				French,
-+				German,
-+			);
-+			mainGroup = 0867D691FE84028FC02AAC07 /* zbar */;
-+			productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
-+			projectDirPath = "";
-+			projectRoot = "";
-+			targets = (
-+				D2AAC07D0554694100DB518D /* libzbar */,
-+				DC3CEE821215C7EF00D7A786 /* ZBarSDK */,
-+				DC1A4A4E11FF5D0500BCDA30 /* ZBarSDK.dmg */,
-+				DC299A941208B5D4006A023C /* readertest */,
-+			);
-+		};
-+/* End PBXProject section */
-+
-+/* Begin PBXResourcesBuildPhase section */
-+		DC299A911208B5D4006A023C /* Resources */ = {
-+			isa = PBXResourcesBuildPhase;
-+			buildActionMask = 2147483647;
-+			files = (
-+				DC299AA51208B63C006A023C /* zbar-help.html in Resources */,
-+				DC299AA61208B63C006A023C /* zbar-helpicons.png in Resources */,
-+				DC299AA71208B63C006A023C /* zbar-samples.png in Resources */,
-+				DC48C5341219FDDE0047193B /* zbar-back.png in Resources */,
-+				DC8245EF1629DC340010B2E6 /* Default-568h@2x.png in Resources */,
-+			);
-+			runOnlyForDeploymentPostprocessing = 0;
-+		};
-+/* End PBXResourcesBuildPhase section */
-+
-+/* Begin PBXShellScriptBuildPhase section */
-+		DC1A4A4D11FF5D0500BCDA30 /* Make Disk Image */ = {
-+			isa = PBXShellScriptBuildPhase;
-+			buildActionMask = 2147483647;
-+			files = (
-+			);
-+			inputPaths = (
-+			);
-+			name = "Make Disk Image";
-+			outputPaths = (
-+			);
-+			runOnlyForDeploymentPostprocessing = 0;
-+			shellPath = /bin/sh;
-+			shellScript = "exec $SOURCE_ROOT/bin/CreateDMG.sh ZBarSDK";
-+		};
-+		DC3CEE891215C88000D7A786 /* Build Universal Library */ = {
-+			isa = PBXShellScriptBuildPhase;
-+			buildActionMask = 2147483647;
-+			files = (
-+			);
-+			inputPaths = (
-+				"$(BUILD_DIR)/$(CONFIGURATION)-iphoneos/libzbar.a",
-+				"$(BUILD_DIR)/$(CONFIGURATION)-iphonesimulator/libzbar.a",
-+			);
-+			name = "Build Universal Library";
-+			outputPaths = (
-+				"$(TARGET_BUILD_DIR)/libzbar.a",
-+			);
-+			runOnlyForDeploymentPostprocessing = 0;
-+			shellPath = /bin/sh;
-+			shellScript = "exec $SOURCE_ROOT/bin/BuildUniversal.sh libzbar";
-+		};
-+		DC48C585121AC7C20047193B /* Build Documentation */ = {
-+			isa = PBXShellScriptBuildPhase;
-+			buildActionMask = 2147483647;
-+			files = (
-+			);
-+			inputPaths = (
-+			);
-+			name = "Build Documentation";
-+			outputPaths = (
-+			);
-+			runOnlyForDeploymentPostprocessing = 0;
-+			shellPath = /bin/sh;
-+			shellScript = "PATH=${PATH}:/usr/local/bin:/sw/bin\nsphinx-build -W -d $TEMP_DIR $SOURCE_ROOT/doc $TARGET_BUILD_DIR/Documentation";
-+		};
-+/* End PBXShellScriptBuildPhase section */
-+
-+/* Begin PBXSourcesBuildPhase section */
-+		D2AAC07B0554694100DB518D /* Sources */ = {
-+			isa = PBXSourcesBuildPhase;
-+			buildActionMask = 2147483647;
-+			files = (
-+				DC67C17110A07AD30033B702 /* config.c in Sources */,
-+				DC67C17410A07AD30033B702 /* code128.c in Sources */,
-+				DC67C17610A07AD30033B702 /* code39.c in Sources */,
-+				DC67C17810A07AD30033B702 /* ean.c in Sources */,
-+				DC67C17A10A07AD30033B702 /* i25.c in Sources */,
-+				DC67C17F10A07AD30033B702 /* qr_finder.c in Sources */,
-+				DC67C18110A07AD30033B702 /* decoder.c in Sources */,
-+				DC67C18310A07AD30033B702 /* error.c in Sources */,
-+				DC67C18610A07AD30033B702 /* image.c in Sources */,
-+				DC67C18810A07AD30033B702 /* img_scanner.c in Sources */,
-+				DC67C19510A07AD30033B702 /* bch15_5.c in Sources */,
-+				DC67C19710A07AD30033B702 /* binarize.c in Sources */,
-+				DC67C19910A07AD30033B702 /* isaac.c in Sources */,
-+				DC67C19B10A07AD30033B702 /* qrdec.c in Sources */,
-+				DC67C19D10A07AD30033B702 /* qrdectxt.c in Sources */,
-+				DC67C19E10A07AD30033B702 /* rs.c in Sources */,
-+				DC67C1A010A07AD30033B702 /* util.c in Sources */,
-+				DC67C1A310A07AD30033B702 /* refcnt.c in Sources */,
-+				DC67C1A510A07AD30033B702 /* scanner.c in Sources */,
-+				DC67C1A810A07AD30033B702 /* symbol.c in Sources */,
-+				DC67C1C210A07B6B0033B702 /* ZBarHelpController.m in Sources */,
-+				DC67C1C310A07B6B0033B702 /* ZBarReaderController.m in Sources */,
-+				DC67C1C410A07B6B0033B702 /* ZBarSymbol.m in Sources */,
-+				DC4920EE10A70475000E4D43 /* ZBarImage.m in Sources */,
-+				DC4920EF10A70475000E4D43 /* ZBarImageScanner.m in Sources */,
-+				DC26004C118631C200FA987B /* ZBarCaptureReader.m in Sources */,
-+				DC3EBB2D119DDB2100107EE9 /* ZBarReaderViewController.m in Sources */,
-+				DCDC6E3011ADCA8E00021380 /* ZBarReaderView.m in Sources */,
-+				DC3AAB4F11B71A040021C7B1 /* ZBarCVImage.m in Sources */,
-+				DCF5C9AD11EA3AD100E7DC21 /* databar.c in Sources */,
-+				DC3CE47811FA1622008FAF88 /* ZBarReaderViewImpl_Capture.m in Sources */,
-+				DC3CE47911FA1622008FAF88 /* ZBarReaderViewImpl_Simulator.m in Sources */,
-+				DCE9900D129719F100D2655C /* code93.c in Sources */,
-+				DC5D76C3136FA8C40069AEF5 /* ZBarCameraSimulator.m in Sources */,
-+				DC290E281351496400A9B857 /* codabar.c in Sources */,
-+			);
-+			runOnlyForDeploymentPostprocessing = 0;
-+		};
-+		DC299A921208B5D4006A023C /* Sources */ = {
-+			isa = PBXSourcesBuildPhase;
-+			buildActionMask = 2147483647;
-+			files = (
-+				DC48C5411219FE550047193B /* readertest.m in Sources */,
-+			);
-+			runOnlyForDeploymentPostprocessing = 0;
-+		};
-+/* End PBXSourcesBuildPhase section */
-+
-+/* Begin PBXTargetDependency section */
-+		DC299A9F1208B5F1006A023C /* PBXTargetDependency */ = {
-+			isa = PBXTargetDependency;
-+			target = D2AAC07D0554694100DB518D /* libzbar */;
-+			targetProxy = DC299A9E1208B5F1006A023C /* PBXContainerItemProxy */;
-+		};
-+		DC3CEE871215C85400D7A786 /* PBXTargetDependency */ = {
-+			isa = PBXTargetDependency;
-+			target = D2AAC07D0554694100DB518D /* libzbar */;
-+			targetProxy = DC3CEE861215C85400D7A786 /* PBXContainerItemProxy */;
-+		};
-+		DC3CF01F1216366200D7A786 /* PBXTargetDependency */ = {
-+			isa = PBXTargetDependency;
-+			target = DC3CEE821215C7EF00D7A786 /* ZBarSDK */;
-+			targetProxy = DC3CF01E1216366200D7A786 /* PBXContainerItemProxy */;
-+		};
-+/* End PBXTargetDependency section */
-+
-+/* Begin XCBuildConfiguration section */
-+		1DEB921F08733DC00010E9CD /* Debug */ = {
-+			isa = XCBuildConfiguration;
-+			buildSettings = {
-+				ALWAYS_SEARCH_USER_PATHS = NO;
-+				COPY_PHASE_STRIP = NO;
-+				GCC_DYNAMIC_NO_PIC = NO;
-+				GCC_ENABLE_FIX_AND_CONTINUE = YES;
-+				GCC_MODEL_TUNING = G5;
-+				GCC_OPTIMIZATION_LEVEL = 0;
-+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-+				GCC_PREFIX_HEADER = include/prefix.pch;
-+				HEADER_SEARCH_PATHS = (
-+					include,
-+					../include,
-+					../zbar,
-+				);
-+				OTHER_LDFLAGS = "";
-+				PRODUCT_NAME = zbar;
-+				SKIP_INSTALL = YES;
-+			};
-+			name = Debug;
-+		};
-+		1DEB922008733DC00010E9CD /* Release */ = {
-+			isa = XCBuildConfiguration;
-+			buildSettings = {
-+				ALWAYS_SEARCH_USER_PATHS = NO;
-+				GCC_MODEL_TUNING = G5;
-+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-+				GCC_PREFIX_HEADER = include/prefix.pch;
-+				HEADER_SEARCH_PATHS = (
-+					include,
-+					../include,
-+					../zbar,
-+				);
-+				OTHER_LDFLAGS = "";
-+				PRODUCT_NAME = zbar;
-+				SKIP_INSTALL = YES;
-+			};
-+			name = Release;
-+		};
-+		1DEB922308733DC00010E9CD /* Debug */ = {
-+			isa = XCBuildConfiguration;
-+			buildSettings = {
-+				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
-+				CODE_SIGN_IDENTITY = "iPhone Developer";
-+				EXCLUDED_SOURCE_FILE_NAMES = "";
-+				"EXCLUDED_SOURCE_FILE_NAMES[sdk=iphoneos*][arch=*]" = ZBarReaderViewImpl_Simulator.m;
-+				"EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*][arch=*]" = (
-+					ZBarReaderViewImpl_Capture.m,
-+					ZBarCaptureReader.m,
-+				);
-+				GCC_C_LANGUAGE_STANDARD = c99;
-+				GCC_OPTIMIZATION_LEVEL = 0;
-+				GCC_PREPROCESSOR_DEFINITIONS = "DEBUG_OBJC=1";
-+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-+				GCC_WARN_UNUSED_VARIABLE = YES;
-+				IPHONEOS_DEPLOYMENT_TARGET = 3.1;
-+				OTHER_LDFLAGS = "-all_load";
-+				PREBINDING = NO;
-+				PROVISIONING_PROFILE = "";
-+				RUN_CLANG_STATIC_ANALYZER = NO;
-+				SDKROOT = iphoneos;
-+				USE_HEADERMAP = NO;
-+			};
-+			name = Debug;
-+		};
-+		1DEB922408733DC00010E9CD /* Release */ = {
-+			isa = XCBuildConfiguration;
-+			buildSettings = {
-+				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
-+				CODE_SIGN_IDENTITY = "iPhone Developer";
-+				EXCLUDED_SOURCE_FILE_NAMES = "";
-+				"EXCLUDED_SOURCE_FILE_NAMES[sdk=iphoneos*][arch=*]" = ZBarReaderViewImpl_Simulator.m;
-+				"EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*][arch=*]" = (
-+					ZBarReaderViewImpl_Capture.m,
-+					ZBarCaptureReader.m,
-+				);
-+				GCC_C_LANGUAGE_STANDARD = c99;
-+				GCC_PREPROCESSOR_DEFINITIONS = "NDEBUG=1";
-+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-+				GCC_WARN_UNUSED_VARIABLE = YES;
-+				IPHONEOS_DEPLOYMENT_TARGET = 3.1;
-+				OTHER_LDFLAGS = "-all_load";
-+				PREBINDING = NO;
-+				PROVISIONING_PROFILE = "";
-+				RUN_CLANG_STATIC_ANALYZER = NO;
-+				SDKROOT = iphoneos;
-+				USE_HEADERMAP = NO;
-+			};
-+			name = Release;
-+		};
-+		DC1A4A4F11FF5D0500BCDA30 /* Debug */ = {
-+			isa = XCBuildConfiguration;
-+			buildSettings = {
-+				COPY_PHASE_STRIP = NO;
-+				PRODUCT_NAME = ZBarSDK.dmg;
-+				TARGET_BUILD_DIR = "$(TARGET_BUILD_DIR)/$(PRODUCT_NAME)";
-+			};
-+			name = Debug;
-+		};
-+		DC1A4A5011FF5D0500BCDA30 /* Release */ = {
-+			isa = XCBuildConfiguration;
-+			buildSettings = {
-+				COPY_PHASE_STRIP = NO;
-+				PRODUCT_NAME = ZBarSDK.dmg;
-+				TARGET_BUILD_DIR = "$(TARGET_BUILD_DIR)/$(PRODUCT_NAME)";
-+			};
-+			name = Release;
-+		};
-+		DC299A981208B5D5006A023C /* Debug */ = {
-+			isa = XCBuildConfiguration;
-+			buildSettings = {
-+				ALWAYS_SEARCH_USER_PATHS = NO;
-+				COPY_PHASE_STRIP = NO;
-+				GCC_DYNAMIC_NO_PIC = NO;
-+				GCC_OPTIMIZATION_LEVEL = 0;
-+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-+				GCC_PREFIX_HEADER = examples/readertest/prefix.pch;
-+				HEADER_SEARCH_PATHS = (
-+					include/ZBarSDK,
-+					../include,
-+				);
-+				INFOPLIST_FILE = examples/readertest/readertest.plist;
-+				INSTALL_PATH = "$(HOME)/Applications";
-+				IPHONEOS_DEPLOYMENT_TARGET = 4.0;
-+				PREBINDING = NO;
-+				PRODUCT_NAME = readertest;
-+				TARGETED_DEVICE_FAMILY = "1,2";
-+			};
-+			name = Debug;
-+		};
-+		DC299A991208B5D5006A023C /* Release */ = {
-+			isa = XCBuildConfiguration;
-+			buildSettings = {
-+				ALWAYS_SEARCH_USER_PATHS = NO;
-+				COPY_PHASE_STRIP = YES;
-+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-+				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-+				GCC_PREFIX_HEADER = examples/readertest/prefix.pch;
-+				HEADER_SEARCH_PATHS = (
-+					include/ZBarSDK,
-+					../include,
-+				);
-+				INFOPLIST_FILE = examples/readertest/readertest.plist;
-+				INSTALL_PATH = "$(HOME)/Applications";
-+				IPHONEOS_DEPLOYMENT_TARGET = 4.0;
-+				PREBINDING = NO;
-+				PRODUCT_NAME = readertest;
-+				TARGETED_DEVICE_FAMILY = "1,2";
-+				ZERO_LINK = NO;
-+			};
-+			name = Release;
-+		};
-+		DC3748D71357BC69004E69D6 /* Distribution */ = {
-+			isa = XCBuildConfiguration;
-+			buildSettings = {
-+				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
-+				CODE_SIGN_IDENTITY = "iPhone Distribution";
-+				EXCLUDED_SOURCE_FILE_NAMES = "";
-+				"EXCLUDED_SOURCE_FILE_NAMES[sdk=iphoneos*][arch=*]" = ZBarReaderViewImpl_Simulator.m;
-+				"EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*][arch=*]" = (
-+					ZBarReaderViewImpl_Capture.m,
-+					ZBarCaptureReader.m,
-+				);
-+				GCC_C_LANGUAGE_STANDARD = c99;
-+				GCC_PREPROCESSOR_DEFINITIONS = "NDEBUG=1";
-+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-+				GCC_WARN_UNUSED_VARIABLE = YES;
-+				IPHONEOS_DEPLOYMENT_TARGET = 3.1;
-+				OTHER_LDFLAGS = "-all_load";
-+				PREBINDING = NO;
-+				PROVISIONING_PROFILE = "";
-+				RUN_CLANG_STATIC_ANALYZER = NO;
-+				SDKROOT = iphoneos;
-+				USE_HEADERMAP = NO;
-+			};
-+			name = Distribution;
-+		};
-+		DC3748D81357BC69004E69D6 /* Distribution */ = {
-+			isa = XCBuildConfiguration;
-+			buildSettings = {
-+				ALWAYS_SEARCH_USER_PATHS = NO;
-+				GCC_MODEL_TUNING = G5;
-+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-+				GCC_PREFIX_HEADER = include/prefix.pch;
-+				HEADER_SEARCH_PATHS = (
-+					include,
-+					../include,
-+					../zbar,
-+				);
-+				OTHER_LDFLAGS = "";
-+				PRODUCT_NAME = zbar;
-+				SKIP_INSTALL = YES;
-+			};
-+			name = Distribution;
-+		};
-+		DC3748D91357BC69004E69D6 /* Distribution */ = {
-+			isa = XCBuildConfiguration;
-+			buildSettings = {
-+				COPY_PHASE_STRIP = YES;
-+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-+				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-+				PRODUCT_NAME = ZBarSDK;
-+				TARGET_BUILD_DIR = "$(TARGET_BUILD_DIR)/$(PRODUCT_NAME)";
-+				ZERO_LINK = NO;
-+			};
-+			name = Distribution;
-+		};
-+		DC3748DA1357BC69004E69D6 /* Distribution */ = {
-+			isa = XCBuildConfiguration;
-+			buildSettings = {
-+				COPY_PHASE_STRIP = NO;
-+				PRODUCT_NAME = ZBarSDK.dmg;
-+				TARGET_BUILD_DIR = "$(TARGET_BUILD_DIR)/$(PRODUCT_NAME)";
-+			};
-+			name = Distribution;
-+		};
-+		DC3748DB1357BC69004E69D6 /* Distribution */ = {
-+			isa = XCBuildConfiguration;
-+			buildSettings = {
-+				ALWAYS_SEARCH_USER_PATHS = NO;
-+				COPY_PHASE_STRIP = YES;
-+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-+				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-+				GCC_PREFIX_HEADER = examples/readertest/prefix.pch;
-+				HEADER_SEARCH_PATHS = (
-+					include/ZBarSDK,
-+					../include,
-+				);
-+				INFOPLIST_FILE = examples/readertest/readertest.plist;
-+				INSTALL_PATH = "$(HOME)/Applications";
-+				IPHONEOS_DEPLOYMENT_TARGET = 4.0;
-+				PREBINDING = NO;
-+				PRODUCT_NAME = readertest;
-+				TARGETED_DEVICE_FAMILY = "1,2";
-+				ZERO_LINK = NO;
-+			};
-+			name = Distribution;
-+		};
-+		DC3CEE831215C7EF00D7A786 /* Debug */ = {
-+			isa = XCBuildConfiguration;
-+			buildSettings = {
-+				COPY_PHASE_STRIP = NO;
-+				GCC_DYNAMIC_NO_PIC = NO;
-+				GCC_OPTIMIZATION_LEVEL = 0;
-+				PRODUCT_NAME = ZBarSDK;
-+				TARGET_BUILD_DIR = "$(TARGET_BUILD_DIR)/$(PRODUCT_NAME)";
-+			};
-+			name = Debug;
-+		};
-+		DC3CEE841215C7EF00D7A786 /* Release */ = {
-+			isa = XCBuildConfiguration;
-+			buildSettings = {
-+				COPY_PHASE_STRIP = YES;
-+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-+				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-+				PRODUCT_NAME = ZBarSDK;
-+				TARGET_BUILD_DIR = "$(TARGET_BUILD_DIR)/$(PRODUCT_NAME)";
-+				ZERO_LINK = NO;
-+			};
-+			name = Release;
-+		};
-+/* End XCBuildConfiguration section */
-+
-+/* Begin XCConfigurationList section */
-+		1DEB921E08733DC00010E9CD /* Build configuration list for PBXNativeTarget "libzbar" */ = {
-+			isa = XCConfigurationList;
-+			buildConfigurations = (
-+				1DEB921F08733DC00010E9CD /* Debug */,
-+				1DEB922008733DC00010E9CD /* Release */,
-+				DC3748D81357BC69004E69D6 /* Distribution */,
-+			);
-+			defaultConfigurationIsVisible = 0;
-+			defaultConfigurationName = Distribution;
-+		};
-+		1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "zbar" */ = {
-+			isa = XCConfigurationList;
-+			buildConfigurations = (
-+				1DEB922308733DC00010E9CD /* Debug */,
-+				1DEB922408733DC00010E9CD /* Release */,
-+				DC3748D71357BC69004E69D6 /* Distribution */,
-+			);
-+			defaultConfigurationIsVisible = 0;
-+			defaultConfigurationName = Distribution;
-+		};
-+		DC1A4A5311FF5D3D00BCDA30 /* Build configuration list for PBXAggregateTarget "ZBarSDK.dmg" */ = {
-+			isa = XCConfigurationList;
-+			buildConfigurations = (
-+				DC1A4A4F11FF5D0500BCDA30 /* Debug */,
-+				DC1A4A5011FF5D0500BCDA30 /* Release */,
-+				DC3748DA1357BC69004E69D6 /* Distribution */,
-+			);
-+			defaultConfigurationIsVisible = 0;
-+			defaultConfigurationName = Distribution;
-+		};
-+		DC299A9A1208B5D5006A023C /* Build configuration list for PBXNativeTarget "readertest" */ = {
-+			isa = XCConfigurationList;
-+			buildConfigurations = (
-+				DC299A981208B5D5006A023C /* Debug */,
-+				DC299A991208B5D5006A023C /* Release */,
-+				DC3748DB1357BC69004E69D6 /* Distribution */,
-+			);
-+			defaultConfigurationIsVisible = 0;
-+			defaultConfigurationName = Distribution;
-+		};
-+		DC3CEE851215C83500D7A786 /* Build configuration list for PBXAggregateTarget "ZBarSDK" */ = {
-+			isa = XCConfigurationList;
-+			buildConfigurations = (
-+				DC3CEE831215C7EF00D7A786 /* Debug */,
-+				DC3CEE841215C7EF00D7A786 /* Release */,
-+				DC3748D91357BC69004E69D6 /* Distribution */,
-+			);
-+			defaultConfigurationIsVisible = 0;
-+			defaultConfigurationName = Distribution;
-+		};
-+/* End XCConfigurationList section */
-+	};
-+	rootObject = 0867D690FE84028FC02AAC07 /* Project object */;
-+}
-diff -r 563557a923d0 iphone/zbar.xcodeproj/xcshareddata/xcschemes/ZBarSDK.dmg.xcscheme
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/zbar.xcodeproj/xcshareddata/xcschemes/ZBarSDK.dmg.xcscheme	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,62 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<Scheme
-+   version = "1.8">
-+   <BuildAction
-+      parallelizeBuildables = "YES"
-+      buildImplicitDependencies = "YES">
-+      <BuildActionEntries>
-+         <BuildActionEntry
-+            buildForTesting = "YES"
-+            buildForRunning = "YES"
-+            buildForProfiling = "YES"
-+            buildForArchiving = "YES"
-+            buildForAnalyzing = "YES">
-+            <BuildableReference
-+               BuildableIdentifier = "primary"
-+               BlueprintIdentifier = "DC1A4A4E11FF5D0500BCDA30"
-+               BuildableName = "ZBarSDK.dmg"
-+               BlueprintName = "ZBarSDK.dmg"
-+               ReferencedContainer = "container:zbar.xcodeproj">
-+            </BuildableReference>
-+         </BuildActionEntry>
-+      </BuildActionEntries>
-+   </BuildAction>
-+   <TestAction
-+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
-+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
-+      shouldUseLaunchSchemeArgsEnv = "YES"
-+      buildConfiguration = "Release">
-+      <Testables>
-+      </Testables>
-+   </TestAction>
-+   <LaunchAction
-+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
-+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
-+      displayScaleIsEnabled = "NO"
-+      displayScale = "1.00"
-+      launchStyle = "0"
-+      useCustomWorkingDirectory = "NO"
-+      buildConfiguration = "Release"
-+      ignoresPersistentStateOnLaunch = "NO"
-+      debugDocumentVersioning = "YES"
-+      allowLocationSimulation = "YES">
-+      <AdditionalOptions>
-+      </AdditionalOptions>
-+   </LaunchAction>
-+   <ProfileAction
-+      displayScaleIsEnabled = "NO"
-+      displayScale = "1.00"
-+      shouldUseLaunchSchemeArgsEnv = "YES"
-+      savedToolIdentifier = ""
-+      useCustomWorkingDirectory = "NO"
-+      buildConfiguration = "Release"
-+      debugDocumentVersioning = "YES">
-+   </ProfileAction>
-+   <AnalyzeAction
-+      buildConfiguration = "Release">
-+   </AnalyzeAction>
-+   <ArchiveAction
-+      buildConfiguration = "Release"
-+      revealArchiveInOrganizer = "YES">
-+   </ArchiveAction>
-+</Scheme>
-diff -r 563557a923d0 iphone/zbar.xcodeproj/xcshareddata/xcschemes/ZBarSDK.xcscheme
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/zbar.xcodeproj/xcshareddata/xcschemes/ZBarSDK.xcscheme	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,62 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<Scheme
-+   version = "1.8">
-+   <BuildAction
-+      parallelizeBuildables = "YES"
-+      buildImplicitDependencies = "YES">
-+      <BuildActionEntries>
-+         <BuildActionEntry
-+            buildForTesting = "YES"
-+            buildForRunning = "YES"
-+            buildForProfiling = "YES"
-+            buildForArchiving = "YES"
-+            buildForAnalyzing = "YES">
-+            <BuildableReference
-+               BuildableIdentifier = "primary"
-+               BlueprintIdentifier = "DC3CEE821215C7EF00D7A786"
-+               BuildableName = "ZBarSDK"
-+               BlueprintName = "ZBarSDK"
-+               ReferencedContainer = "container:zbar.xcodeproj">
-+            </BuildableReference>
-+         </BuildActionEntry>
-+      </BuildActionEntries>
-+   </BuildAction>
-+   <TestAction
-+      selectedDebuggerIdentifier = ""
-+      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
-+      shouldUseLaunchSchemeArgsEnv = "YES"
-+      buildConfiguration = "Release">
-+      <Testables>
-+      </Testables>
-+   </TestAction>
-+   <LaunchAction
-+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
-+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
-+      displayScaleIsEnabled = "NO"
-+      displayScale = "1.00"
-+      launchStyle = "0"
-+      useCustomWorkingDirectory = "NO"
-+      buildConfiguration = "Debug"
-+      ignoresPersistentStateOnLaunch = "NO"
-+      debugDocumentVersioning = "YES"
-+      allowLocationSimulation = "YES">
-+      <AdditionalOptions>
-+      </AdditionalOptions>
-+   </LaunchAction>
-+   <ProfileAction
-+      displayScaleIsEnabled = "NO"
-+      displayScale = "1.00"
-+      shouldUseLaunchSchemeArgsEnv = "YES"
-+      savedToolIdentifier = ""
-+      useCustomWorkingDirectory = "NO"
-+      buildConfiguration = "Release"
-+      debugDocumentVersioning = "YES">
-+   </ProfileAction>
-+   <AnalyzeAction
-+      buildConfiguration = "Release">
-+   </AnalyzeAction>
-+   <ArchiveAction
-+      buildConfiguration = "Release"
-+      revealArchiveInOrganizer = "YES">
-+   </ArchiveAction>
-+</Scheme>
-diff -r 563557a923d0 iphone/zbar.xcodeproj/xcshareddata/xcschemes/libzbar.xcscheme
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/zbar.xcodeproj/xcshareddata/xcschemes/libzbar.xcscheme	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,58 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<Scheme
-+   version = "1.3">
-+   <BuildAction
-+      parallelizeBuildables = "YES"
-+      buildImplicitDependencies = "YES">
-+      <BuildActionEntries>
-+         <BuildActionEntry
-+            buildForTesting = "YES"
-+            buildForRunning = "YES"
-+            buildForProfiling = "YES"
-+            buildForArchiving = "YES"
-+            buildForAnalyzing = "YES">
-+            <BuildableReference
-+               BuildableIdentifier = "primary"
-+               BlueprintIdentifier = "D2AAC07D0554694100DB518D"
-+               BuildableName = "libzbar.a"
-+               BlueprintName = "libzbar"
-+               ReferencedContainer = "container:zbar.xcodeproj">
-+            </BuildableReference>
-+         </BuildActionEntry>
-+      </BuildActionEntries>
-+   </BuildAction>
-+   <TestAction
-+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
-+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
-+      shouldUseLaunchSchemeArgsEnv = "YES"
-+      buildConfiguration = "Debug">
-+      <Testables>
-+      </Testables>
-+   </TestAction>
-+   <LaunchAction
-+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
-+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
-+      displayScaleIsEnabled = "NO"
-+      displayScale = "1.00"
-+      launchStyle = "0"
-+      useCustomWorkingDirectory = "NO"
-+      buildConfiguration = "Debug">
-+      <AdditionalOptions>
-+      </AdditionalOptions>
-+   </LaunchAction>
-+   <ProfileAction
-+      displayScaleIsEnabled = "NO"
-+      displayScale = "1.00"
-+      shouldUseLaunchSchemeArgsEnv = "YES"
-+      savedToolIdentifier = ""
-+      useCustomWorkingDirectory = "NO"
-+      buildConfiguration = "Release">
-+   </ProfileAction>
-+   <AnalyzeAction
-+      buildConfiguration = "Debug">
-+   </AnalyzeAction>
-+   <ArchiveAction
-+      buildConfiguration = "Release"
-+      revealArchiveInOrganizer = "YES">
-+   </ArchiveAction>
-+</Scheme>
-diff -r 563557a923d0 iphone/zbar.xcodeproj/xcshareddata/xcschemes/readertest.xcscheme
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/iphone/zbar.xcodeproj/xcshareddata/xcschemes/readertest.xcscheme	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,83 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<Scheme
-+   version = "1.3">
-+   <BuildAction
-+      parallelizeBuildables = "YES"
-+      buildImplicitDependencies = "YES">
-+      <BuildActionEntries>
-+         <BuildActionEntry
-+            buildForTesting = "YES"
-+            buildForRunning = "YES"
-+            buildForProfiling = "YES"
-+            buildForArchiving = "YES"
-+            buildForAnalyzing = "YES">
-+            <BuildableReference
-+               BuildableIdentifier = "primary"
-+               BlueprintIdentifier = "DC299A941208B5D4006A023C"
-+               BuildableName = "readertest.app"
-+               BlueprintName = "readertest"
-+               ReferencedContainer = "container:zbar.xcodeproj">
-+            </BuildableReference>
-+         </BuildActionEntry>
-+      </BuildActionEntries>
-+   </BuildAction>
-+   <TestAction
-+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
-+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
-+      shouldUseLaunchSchemeArgsEnv = "YES"
-+      buildConfiguration = "Debug">
-+      <Testables>
-+      </Testables>
-+   </TestAction>
-+   <LaunchAction
-+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
-+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
-+      displayScaleIsEnabled = "NO"
-+      displayScale = "1.00"
-+      launchStyle = "0"
-+      useCustomWorkingDirectory = "NO"
-+      buildConfiguration = "Debug">
-+      <BuildableProductRunnable>
-+         <BuildableReference
-+            BuildableIdentifier = "primary"
-+            BlueprintIdentifier = "DC299A941208B5D4006A023C"
-+            BuildableName = "readertest.app"
-+            BlueprintName = "readertest"
-+            ReferencedContainer = "container:zbar.xcodeproj">
-+         </BuildableReference>
-+      </BuildableProductRunnable>
-+      <EnvironmentVariables>
-+         <EnvironmentVariable
-+            key = "NSZombieEnabled"
-+            value = "YES"
-+            isEnabled = "YES">
-+         </EnvironmentVariable>
-+      </EnvironmentVariables>
-+      <AdditionalOptions>
-+      </AdditionalOptions>
-+   </LaunchAction>
-+   <ProfileAction
-+      displayScaleIsEnabled = "NO"
-+      displayScale = "1.00"
-+      shouldUseLaunchSchemeArgsEnv = "YES"
-+      savedToolIdentifier = ""
-+      useCustomWorkingDirectory = "NO"
-+      buildConfiguration = "Release">
-+      <BuildableProductRunnable>
-+         <BuildableReference
-+            BuildableIdentifier = "primary"
-+            BlueprintIdentifier = "DC299A941208B5D4006A023C"
-+            BuildableName = "readertest.app"
-+            BlueprintName = "readertest"
-+            ReferencedContainer = "container:zbar.xcodeproj">
-+         </BuildableReference>
-+      </BuildableProductRunnable>
-+   </ProfileAction>
-+   <AnalyzeAction
-+      buildConfiguration = "Debug">
-+   </AnalyzeAction>
-+   <ArchiveAction
-+      buildConfiguration = "Distribution"
-+      revealArchiveInOrganizer = "YES">
-+   </ArchiveAction>
-+</Scheme>
-diff -r 563557a923d0 java/Makefile.am
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/java/Makefile.am	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,39 @@
-+javadir = $(pkgdatadir)/lib
-+
-+PKG = net/sourceforge/zbar
-+java_DATA = zbar.jar
-+
-+java_LTLIBRARIES = libzbarjni.la
-+libzbarjni_la_CPPFLAGS = $(JAVA_CFLAGS) $(AM_CPPFLAGS)
-+libzbarjni_la_LIBADD = $(abs_top_builddir)/zbar/libzbar.la
-+
-+libzbarjni_la_SOURCES = zbarjni.c zbarjni.h
-+BUILT_SOURCES = zbarjni.h
-+MAINTAINERCLEANFILES = zbarjni.h
-+
-+zbar_jar_SRCS = \
-+    $(PKG)/Config.java $(PKG)/Modifier.java $(PKG)/Orientation.java \
-+    $(PKG)/Symbol.java $(PKG)/SymbolIterator.java $(PKG)/SymbolSet.java \
-+    $(PKG)/Image.java $(PKG)/ImageScanner.java
-+
-+zbar_jar_CLASSES = $(zbar_jar_SRCS:.java=.class)
-+
-+test_SRCS = test/TestImage.java test/TestImageScanner.java \
-+    test/TestScanImage.java
-+test_CLASSES = TestImage TestImageScanner TestScanImage
-+
-+CLEANFILES = zbar.jar $(zbar_jar_CLASSES) $(test_CLASSES:=.class)
-+
-+zbarjni.h: $(zbar_jar_SRCS)
-+	$(MAKE) $(AM_MAKEFLAGS) zbar.jar
-+	classes=`echo $(zbar_jar_CLASSES:.class=) | tr / .` ; \
-+	    $(JAVAH) -o $@ $$classes
-+
-+zbar.jar: $(zbar_jar_SRCS)
-+	cd $(abs_srcdir); $(JAVAC) -d $(abs_builddir) $(zbar_jar_SRCS)
-+	$(JAR) cf $@ $(zbar_jar_CLASSES) || $(RM) $@
-+
-+check-local:
-+	echo "making check in java"
-+	cd $(abs_srcdir); $(JAVAC) -classpath $(abs_builddir)/zbar.jar:.:$(CLASSPATH) -d $(abs_builddir) $(test_SRCS)
-+	$(top_builddir)/libtool -dlopen $(top_builddir)/zbar/libzbar.la -dlopen libzbarjni.la --mode=execute $(JAVA) -Xcheck:jni -classpath zbar.jar:.:$(CLASSPATH) org.junit.runner.JUnitCore $(test_CLASSES)
-diff -r 563557a923d0 java/net/sourceforge/zbar/Config.java
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/java/net/sourceforge/zbar/Config.java	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,56 @@
-+/*------------------------------------------------------------------------
-+ *  Config
-+ *
-+ *  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-+ *
-+ *  This file is part of the ZBar Bar Code Reader.
-+ *
-+ *  The ZBar Bar Code Reader is free software; you can redistribute it
-+ *  and/or modify it under the terms of the GNU Lesser Public License as
-+ *  published by the Free Software Foundation; either version 2.1 of
-+ *  the License, or (at your option) any later version.
-+ *
-+ *  The ZBar Bar Code Reader is distributed in the hope that it will be
-+ *  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-+ *  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU Lesser Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser Public License
-+ *  along with the ZBar Bar Code Reader; if not, write to the Free
-+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-+ *  Boston, MA  02110-1301  USA
-+ *
-+ *  http://sourceforge.net/projects/zbar
-+ *------------------------------------------------------------------------*/
-+
-+package net.sourceforge.zbar;
-+
-+/** Decoder configuration options.
-+ */
-+public class Config
-+{
-+    /** Enable symbology/feature. */
-+    public static final int ENABLE = 0;
-+    /** Enable check digit when optional. */
-+    public static final int ADD_CHECK = 1;
-+    /** Return check digit when present. */
-+    public static final int EMIT_CHECK = 2;
-+    /** Enable full ASCII character set. */
-+    public static final int ASCII = 3;
-+
-+    /** Minimum data length for valid decode. */
-+    public static final int MIN_LEN = 0x20;
-+    /** Maximum data length for valid decode. */
-+    public static final int MAX_LEN = 0x21;
-+
-+    /** Required video consistency frames. */
-+    public static final int UNCERTAINTY = 0x40;
-+
-+    /** Enable scanner to collect position data. */
-+    public static final int POSITION = 0x80;
-+
-+    /** Image scanner vertical scan density. */
-+    public static final int X_DENSITY = 0x100;
-+    /** Image scanner horizontal scan density. */
-+    public static final int Y_DENSITY = 0x101;
-+}
-diff -r 563557a923d0 java/net/sourceforge/zbar/Image.java
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/java/net/sourceforge/zbar/Image.java	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,163 @@
-+/*------------------------------------------------------------------------
-+ *  Image
-+ *
-+ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-+ *
-+ *  This file is part of the ZBar Bar Code Reader.
-+ *
-+ *  The ZBar Bar Code Reader is free software; you can redistribute it
-+ *  and/or modify it under the terms of the GNU Lesser Public License as
-+ *  published by the Free Software Foundation; either version 2.1 of
-+ *  the License, or (at your option) any later version.
-+ *
-+ *  The ZBar Bar Code Reader is distributed in the hope that it will be
-+ *  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-+ *  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU Lesser Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser Public License
-+ *  along with the ZBar Bar Code Reader; if not, write to the Free
-+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-+ *  Boston, MA  02110-1301  USA
-+ *
-+ *  http://sourceforge.net/projects/zbar
-+ *------------------------------------------------------------------------*/
-+
-+package net.sourceforge.zbar;
-+
-+/** stores image data samples along with associated format and size
-+ * metadata.
-+ */
-+public class Image
-+{
-+    /** C pointer to a zbar_symbol_t. */
-+    private long peer;
-+    private Object data;
-+
-+    static
-+    {
-+        System.loadLibrary("zbarjni");
-+        init();
-+    }
-+    private static native void init();
-+
-+    public Image ()
-+    {
-+        peer = create();
-+    }
-+
-+    public Image (int width, int height)
-+    {
-+        this();
-+        setSize(width, height);
-+    }
-+
-+    public Image (int width, int height, String format)
-+    {
-+        this();
-+        setSize(width, height);
-+        setFormat(format);
-+    }
-+
-+    public Image (String format)
-+    {
-+        this();
-+        setFormat(format);
-+    }
-+
-+    Image (long peer)
-+    {
-+        this.peer = peer;
-+    }
-+
-+    /** Create an associated peer instance. */
-+    private native long create();
-+
-+    protected void finalize ()
-+    {
-+        destroy();
-+    }
-+
-+    /** Clean up native data associated with an instance. */
-+    public synchronized void destroy ()
-+    {
-+        if(peer != 0) {
-+            destroy(peer);
-+            peer = 0;
-+        }
-+    }
-+
-+    /** Destroy the associated peer instance.  */
-+    private native void destroy(long peer);
-+
-+    /** Image format conversion.
-+     * @returns a @em new image with the sample data from the original
-+     * image converted to the requested format fourcc.  the original
-+     * image is unaffected.
-+     */
-+    public Image convert (String format)
-+    {
-+        long newpeer = convert(peer, format);
-+        if(newpeer == 0)
-+            return(null);
-+        return(new Image(newpeer));
-+    }
-+
-+    private native long convert(long peer, String format);
-+
-+    /** Retrieve the image format fourcc. */
-+    public native String getFormat();
-+
-+    /** Specify the fourcc image format code for image sample data. */
-+    public native void setFormat(String format);
-+
-+    /** Retrieve a "sequence" (page/frame) number associated with this
-+     * image.
-+     */
-+    public native int getSequence();
-+
-+    /** Associate a "sequence" (page/frame) number with this image. */
-+    public native void setSequence(int seq);
-+
-+    /** Retrieve the width of the image. */
-+    public native int getWidth();
-+
-+    /** Retrieve the height of the image. */
-+    public native int getHeight();
-+
-+    /** Retrieve the size of the image. */
-+    public native int[] getSize();
-+
-+    /** Specify the pixel size of the image. */
-+    public native void setSize(int width, int height);
-+
-+    /** Specify the pixel size of the image. */
-+    public native void setSize(int[] size);
-+
-+    /** Retrieve the crop region of the image. */
-+    public native int[] getCrop();
-+
-+    /** Specify the crop region of the image. */
-+    public native void setCrop(int x, int y, int width, int height);
-+
-+    /** Specify the crop region of the image. */
-+    public native void setCrop(int[] crop);
-+
-+    /** Retrieve the image sample data. */
-+    public native byte[] getData();
-+
-+    /** Specify image sample data. */
-+    public native void setData(byte[] data);
-+
-+    /** Specify image sample data. */
-+    public native void setData(int[] data);
-+
-+    /** Retrieve the decoded results associated with this image. */
-+    public SymbolSet getSymbols ()
-+    {
-+        return(new SymbolSet(getSymbols(peer)));
-+    }
-+
-+    private native long getSymbols(long peer);
-+
-+}
-diff -r 563557a923d0 java/net/sourceforge/zbar/ImageScanner.java
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/java/net/sourceforge/zbar/ImageScanner.java	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,98 @@
-+/*------------------------------------------------------------------------
-+ *  ImageScanner
-+ *
-+ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-+ *
-+ *  This file is part of the ZBar Bar Code Reader.
-+ *
-+ *  The ZBar Bar Code Reader is free software; you can redistribute it
-+ *  and/or modify it under the terms of the GNU Lesser Public License as
-+ *  published by the Free Software Foundation; either version 2.1 of
-+ *  the License, or (at your option) any later version.
-+ *
-+ *  The ZBar Bar Code Reader is distributed in the hope that it will be
-+ *  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-+ *  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU Lesser Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser Public License
-+ *  along with the ZBar Bar Code Reader; if not, write to the Free
-+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-+ *  Boston, MA  02110-1301  USA
-+ *
-+ *  http://sourceforge.net/projects/zbar
-+ *------------------------------------------------------------------------*/
-+
-+package net.sourceforge.zbar;
-+
-+/** Read barcodes from 2-D images.
-+ */
-+public class ImageScanner
-+{
-+    /** C pointer to a zbar_image_scanner_t. */
-+    private long peer;
-+
-+    static
-+    {
-+        System.loadLibrary("zbarjni");
-+        init();
-+    }
-+    private static native void init();
-+
-+    public ImageScanner ()
-+    {
-+        peer = create();
-+    }
-+
-+    /** Create an associated peer instance. */
-+    private native long create();
-+
-+    protected void finalize ()
-+    {
-+        destroy();
-+    }
-+
-+    /** Clean up native data associated with an instance. */
-+    public synchronized void destroy ()
-+    {
-+        if(peer != 0) {
-+            destroy(peer);
-+            peer = 0;
-+        }
-+    }
-+
-+    /** Destroy the associated peer instance.  */
-+    private native void destroy(long peer);
-+
-+    /** Set config for indicated symbology (0 for all) to specified value.
-+     */
-+    public native void setConfig(int symbology, int config, int value)
-+        throws IllegalArgumentException;
-+
-+    /** Parse configuration string and apply to image scanner. */
-+    public native void parseConfig(String config);
-+
-+    /** Enable or disable the inter-image result cache (default disabled).
-+     * Mostly useful for scanning video frames, the cache filters duplicate
-+     * results from consecutive images, while adding some consistency
-+     * checking and hysteresis to the results.  Invoking this method also
-+     * clears the cache.
-+     */
-+    public native void enableCache(boolean enable);
-+
-+    /** Retrieve decode results for last scanned image.
-+     * @returns the SymbolSet result container
-+     */
-+    public SymbolSet getResults ()
-+    {
-+        return(new SymbolSet(getResults(peer)));
-+    }
-+
-+    private native long getResults(long peer);
-+
-+    /** Scan for symbols in provided Image.
-+     * The image format must currently be "Y800" or "GRAY".
-+     * @returns the number of symbols successfully decoded from the image.
-+     */
-+    public native int scanImage(Image image);
-+}
-diff -r 563557a923d0 java/net/sourceforge/zbar/Modifier.java
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/java/net/sourceforge/zbar/Modifier.java	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,42 @@
-+/*------------------------------------------------------------------------
-+ *  Modifier
-+ *
-+ *  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-+ *
-+ *  This file is part of the ZBar Bar Code Reader.
-+ *
-+ *  The ZBar Bar Code Reader is free software; you can redistribute it
-+ *  and/or modify it under the terms of the GNU Lesser Public License as
-+ *  published by the Free Software Foundation; either version 2.1 of
-+ *  the License, or (at your option) any later version.
-+ *
-+ *  The ZBar Bar Code Reader is distributed in the hope that it will be
-+ *  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-+ *  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU Lesser Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser Public License
-+ *  along with the ZBar Bar Code Reader; if not, write to the Free
-+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-+ *  Boston, MA  02110-1301  USA
-+ *
-+ *  http://sourceforge.net/projects/zbar
-+ *------------------------------------------------------------------------*/
-+
-+package net.sourceforge.zbar;
-+
-+/** Decoder symbology modifiers.
-+ */
-+public class Modifier
-+{
-+    /** barcode tagged as GS1 (EAN.UCC) reserved
-+     * (eg, FNC1 before first data character).
-+     * data may be parsed as a sequence of GS1 AIs
-+     */
-+    public static final int GS1 = 0;
-+
-+    /** barcode tagged as AIM reserved
-+     * (eg, FNC1 after first character or digit pair)
-+     */
-+    public static final int AIM = 1;
-+}
-diff -r 563557a923d0 java/net/sourceforge/zbar/Orientation.java
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/java/net/sourceforge/zbar/Orientation.java	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,42 @@
-+/*------------------------------------------------------------------------
-+ *  Orientation
-+ *
-+ *  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-+ *
-+ *  This file is part of the ZBar Bar Code Reader.
-+ *
-+ *  The ZBar Bar Code Reader is free software; you can redistribute it
-+ *  and/or modify it under the terms of the GNU Lesser Public License as
-+ *  published by the Free Software Foundation; either version 2.1 of
-+ *  the License, or (at your option) any later version.
-+ *
-+ *  The ZBar Bar Code Reader is distributed in the hope that it will be
-+ *  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-+ *  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU Lesser Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser Public License
-+ *  along with the ZBar Bar Code Reader; if not, write to the Free
-+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-+ *  Boston, MA  02110-1301  USA
-+ *
-+ *  http://sourceforge.net/projects/zbar
-+ *------------------------------------------------------------------------*/
-+
-+package net.sourceforge.zbar;
-+
-+/** Decoded symbol coarse orientation.
-+ */
-+public class Orientation
-+{
-+    /** Unable to determine orientation. */
-+    public static final int UNKNOWN = -1;
-+    /** Upright, read left to right. */
-+    public static final int UP = 0;
-+    /** sideways, read top to bottom */
-+    public static final int RIGHT = 1;
-+    /** upside-down, read right to left */
-+    public static final int DOWN = 2;
-+    /** sideways, read bottom to top */
-+    public static final int LEFT = 3;
-+}
-diff -r 563557a923d0 java/net/sourceforge/zbar/Symbol.java
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/java/net/sourceforge/zbar/Symbol.java	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,199 @@
-+/*------------------------------------------------------------------------
-+ *  Symbol
-+ *
-+ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-+ *
-+ *  This file is part of the ZBar Bar Code Reader.
-+ *
-+ *  The ZBar Bar Code Reader is free software; you can redistribute it
-+ *  and/or modify it under the terms of the GNU Lesser Public License as
-+ *  published by the Free Software Foundation; either version 2.1 of
-+ *  the License, or (at your option) any later version.
-+ *
-+ *  The ZBar Bar Code Reader is distributed in the hope that it will be
-+ *  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-+ *  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU Lesser Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser Public License
-+ *  along with the ZBar Bar Code Reader; if not, write to the Free
-+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-+ *  Boston, MA  02110-1301  USA
-+ *
-+ *  http://sourceforge.net/projects/zbar
-+ *------------------------------------------------------------------------*/
-+
-+package net.sourceforge.zbar;
-+
-+/** Immutable container for decoded result symbols associated with an image
-+ * or a composite symbol.
-+ */
-+public class Symbol
-+{
-+    /** No symbol decoded. */
-+    public static final int NONE = 0;
-+    /** Symbol detected but not decoded. */
-+    public static final int PARTIAL = 1;
-+
-+    /** EAN-8. */
-+    public static final int EAN8 = 8;
-+    /** UPC-E. */
-+    public static final int UPCE = 9;
-+    /** ISBN-10 (from EAN-13). */
-+    public static final int ISBN10 = 10;
-+    /** UPC-A. */
-+    public static final int UPCA = 12;
-+    /** EAN-13. */
-+    public static final int EAN13 = 13;
-+    /** ISBN-13 (from EAN-13). */
-+    public static final int ISBN13 = 14;
-+    /** Interleaved 2 of 5. */
-+    public static final int I25 = 25;
-+    /** DataBar (RSS-14). */
-+    public static final int DATABAR = 34;
-+    /** DataBar Expanded. */
-+    public static final int DATABAR_EXP = 35;
-+    /** Codabar. */
-+    public static final int CODABAR = 38;
-+    /** Code 39. */
-+    public static final int CODE39 = 39;
-+    /** PDF417. */
-+    public static final int PDF417 = 57;
-+    /** QR Code. */
-+    public static final int QRCODE = 64;
-+    /** Code 93. */
-+    public static final int CODE93 = 93;
-+    /** Code 128. */
-+    public static final int CODE128 = 128;
-+
-+    /** C pointer to a zbar_symbol_t. */
-+    private long peer;
-+
-+    /** Cached attributes. */
-+    private int type;
-+
-+    static
-+    {
-+        System.loadLibrary("zbarjni");
-+        init();
-+    }
-+    private static native void init();
-+
-+    /** Symbols are only created by other package methods. */
-+    Symbol (long peer)
-+    {
-+        this.peer = peer;
-+    }
-+
-+    protected void finalize ()
-+    {
-+        destroy();
-+    }
-+
-+    /** Clean up native data associated with an instance. */
-+    public synchronized void destroy ()
-+    {
-+        if(peer != 0) {
-+            destroy(peer);
-+            peer = 0;
-+        }
-+    }
-+
-+    /** Release the associated peer instance.  */
-+    private native void destroy(long peer);
-+
-+    /** Retrieve type of decoded symbol. */
-+    public int getType ()
-+    {
-+        if(type == 0)
-+            type = getType(peer);
-+        return(type);
-+    }
-+
-+    private native int getType(long peer);
-+
-+    /** Retrieve symbology boolean configs settings used during decode. */
-+    public native int getConfigMask();
-+
-+    /** Retrieve symbology characteristics detected during decode. */
-+    public native int getModifierMask();
-+
-+    /** Retrieve data decoded from symbol as a String. */
-+    public native String getData();
-+
-+    /** Retrieve raw data bytes decoded from symbol. */
-+    public native byte[] getDataBytes();
-+
-+    /** Retrieve a symbol confidence metric.  Quality is an unscaled,
-+     * relative quantity: larger values are better than smaller
-+     * values, where "large" and "small" are application dependent.
-+     */
-+    public native int getQuality();
-+
-+    /** Retrieve current cache count.  When the cache is enabled for
-+     * the image_scanner this provides inter-frame reliability and
-+     * redundancy information for video streams.
-+     * @returns < 0 if symbol is still uncertain
-+     * @returns 0 if symbol is newly verified
-+     * @returns > 0 for duplicate symbols
-+     */
-+    public native int getCount();
-+
-+    /** Retrieve an approximate, axis-aligned bounding box for the
-+     * symbol.
-+     */
-+    public int[] getBounds ()
-+    {
-+        int n = getLocationSize(peer);
-+        if(n <= 0)
-+            return(null);
-+
-+        int[] bounds = new int[4];
-+        int xmin = Integer.MAX_VALUE;
-+        int xmax = Integer.MIN_VALUE;
-+        int ymin = Integer.MAX_VALUE;
-+        int ymax = Integer.MIN_VALUE;
-+
-+        for(int i = 0; i < n; i++) {
-+            int x = getLocationX(peer, i);
-+            if(xmin > x) xmin = x;
-+            if(xmax < x) xmax = x;
-+
-+            int y = getLocationY(peer, i);
-+            if(ymin > y) ymin = y;
-+            if(ymax < y) ymax = y;
-+        }
-+        bounds[0] = xmin;
-+        bounds[1] = ymin;
-+        bounds[2] = xmax - xmin;
-+        bounds[3] = ymax - ymin;
-+        return(bounds);
-+    }
-+
-+    private native int getLocationSize(long peer);
-+    private native int getLocationX(long peer, int idx);
-+    private native int getLocationY(long peer, int idx);
-+
-+    public int[] getLocationPoint (int idx)
-+    {
-+        int[] p = new int[2];
-+        p[0] = getLocationX(peer, idx);
-+        p[1] = getLocationY(peer, idx);
-+        return(p);
-+    }
-+
-+    /** Retrieve general axis-aligned, orientation of decoded
-+     * symbol.
-+     */
-+    public native int getOrientation();
-+
-+    /** Retrieve components of a composite result. */
-+    public SymbolSet getComponents ()
-+    {
-+        return(new SymbolSet(getComponents(peer)));
-+    }
-+
-+    private native long getComponents(long peer);
-+
-+    native long next();
-+}
-diff -r 563557a923d0 java/net/sourceforge/zbar/SymbolIterator.java
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/java/net/sourceforge/zbar/SymbolIterator.java	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,70 @@
-+/*------------------------------------------------------------------------
-+ *  SymbolIterator
-+ *
-+ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-+ *
-+ *  This file is part of the ZBar Bar Code Reader.
-+ *
-+ *  The ZBar Bar Code Reader is free software; you can redistribute it
-+ *  and/or modify it under the terms of the GNU Lesser Public License as
-+ *  published by the Free Software Foundation; either version 2.1 of
-+ *  the License, or (at your option) any later version.
-+ *
-+ *  The ZBar Bar Code Reader is distributed in the hope that it will be
-+ *  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-+ *  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU Lesser Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser Public License
-+ *  along with the ZBar Bar Code Reader; if not, write to the Free
-+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-+ *  Boston, MA  02110-1301  USA
-+ *
-+ *  http://sourceforge.net/projects/zbar
-+ *------------------------------------------------------------------------*/
-+
-+package net.sourceforge.zbar;
-+
-+/** Iterator over a SymbolSet.
-+ */
-+public class SymbolIterator
-+    implements java.util.Iterator<Symbol>
-+{
-+    /** Next symbol to be returned by the iterator. */
-+    private Symbol current;
-+
-+    /** SymbolIterators are only created by internal interface methods. */
-+    SymbolIterator (Symbol first)
-+    {
-+        current = first;
-+    }
-+
-+    /** Returns true if the iteration has more elements. */
-+    public boolean hasNext ()
-+    {
-+        return(current != null);
-+    }
-+
-+    /** Retrieves the next element in the iteration. */
-+    public Symbol next ()
-+    {
-+        if(current == null)
-+            throw(new java.util.NoSuchElementException
-+                  ("access past end of SymbolIterator"));
-+
-+        Symbol result = current;
-+        long sym = current.next();
-+        if(sym != 0)
-+            current = new Symbol(sym);
-+        else
-+            current = null;
-+        return(result);
-+    }
-+
-+    /** Raises UnsupportedOperationException. */
-+    public void remove ()
-+    {
-+        throw(new UnsupportedOperationException
-+              ("SymbolIterator is immutable"));
-+    }
-+}
-diff -r 563557a923d0 java/net/sourceforge/zbar/SymbolSet.java
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/java/net/sourceforge/zbar/SymbolSet.java	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,82 @@
-+/*------------------------------------------------------------------------
-+ *  SymbolSet
-+ *
-+ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-+ *
-+ *  This file is part of the ZBar Bar Code Reader.
-+ *
-+ *  The ZBar Bar Code Reader is free software; you can redistribute it
-+ *  and/or modify it under the terms of the GNU Lesser Public License as
-+ *  published by the Free Software Foundation; either version 2.1 of
-+ *  the License, or (at your option) any later version.
-+ *
-+ *  The ZBar Bar Code Reader is distributed in the hope that it will be
-+ *  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-+ *  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU Lesser Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser Public License
-+ *  along with the ZBar Bar Code Reader; if not, write to the Free
-+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-+ *  Boston, MA  02110-1301  USA
-+ *
-+ *  http://sourceforge.net/projects/zbar
-+ *------------------------------------------------------------------------*/
-+
-+package net.sourceforge.zbar;
-+
-+/** Immutable container for decoded result symbols associated with an image
-+ * or a composite symbol.
-+ */
-+public class SymbolSet
-+    extends java.util.AbstractCollection<Symbol>
-+{
-+    /** C pointer to a zbar_symbol_set_t. */
-+    private long peer;
-+
-+    static
-+    {
-+        System.loadLibrary("zbarjni");
-+        init();
-+    }
-+    private static native void init();
-+
-+    /** SymbolSets are only created by other package methods. */
-+    SymbolSet (long peer)
-+    {
-+        this.peer = peer;
-+    }
-+
-+    protected void finalize ()
-+    {
-+        destroy();
-+    }
-+
-+    /** Clean up native data associated with an instance. */
-+    public synchronized void destroy ()
-+    {
-+        if(peer != 0) {
-+            destroy(peer);
-+            peer = 0;
-+        }
-+    }
-+
-+    /** Release the associated peer instance.  */
-+    private native void destroy(long peer);
-+
-+    /** Retrieve an iterator over the Symbol elements in this collection. */
-+    public java.util.Iterator<Symbol> iterator ()
-+    {
-+        long sym = firstSymbol(peer);
-+        if(sym == 0)
-+            return(new SymbolIterator(null));
-+
-+        return(new SymbolIterator(new Symbol(sym)));
-+    }
-+
-+    /** Retrieve the number of elements in the collection. */
-+    public native int size();
-+
-+    /** Retrieve C pointer to first symbol in the set. */
-+    private native long firstSymbol(long peer);
-+}
-diff -r 563557a923d0 java/test/TestImage.java
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/java/test/TestImage.java	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,175 @@
-+
-+import org.junit.Test;
-+import org.junit.Before;
-+import org.junit.After;
-+import static org.junit.Assert.*;
-+
-+import net.sourceforge.zbar.Image;
-+
-+public class TestImage
-+{
-+    protected Image image;
-+
-+    @Before public void setUp ()
-+    {
-+        image = new Image();
-+    }
-+
-+    @After public void tearDown ()
-+    {
-+        image.destroy();
-+        image = null;
-+    }
-+
-+
-+    @Test public void creation ()
-+    {
-+        Image img0 = new Image(123, 456);
-+        Image img1 = new Image("BGR3");
-+        Image img2 = new Image(987, 654, "UYVY");
-+
-+        assertEquals(123, img0.getWidth());
-+        assertEquals(456, img0.getHeight());
-+        assertEquals(null, img0.getFormat());
-+
-+        assertEquals(0, img1.getWidth());
-+        assertEquals(0, img1.getHeight());
-+        assertEquals("BGR3", img1.getFormat());
-+
-+        assertEquals(987, img2.getWidth());
-+        assertEquals(654, img2.getHeight());
-+        assertEquals("UYVY", img2.getFormat());
-+    }
-+
-+    @Test public void sequence ()
-+    {
-+        assertEquals(0, image.getSequence());
-+        image.setSequence(42);
-+        assertEquals(42, image.getSequence());
-+    }
-+
-+    @Test public void size ()
-+    {
-+        assertEquals(0, image.getWidth());
-+        assertEquals(0, image.getHeight());
-+
-+        image.setSize(640, 480);
-+        int[] size0 = { 640, 480 };
-+        assertArrayEquals(size0, image.getSize());
-+
-+        int[] size1 = { 320, 240 };
-+        image.setSize(size1);
-+        assertEquals(320, image.getWidth());
-+        assertEquals(240, image.getHeight());
-+    }
-+
-+    @Test public void crop ()
-+    {
-+        int[] zeros = { 0, 0, 0, 0 };
-+        assertArrayEquals(zeros, image.getCrop());
-+
-+        image.setSize(123, 456);
-+        int[] crop0 = { 0, 0, 123, 456 };
-+        assertArrayEquals(crop0, image.getCrop());
-+
-+        image.setCrop(1, 2, 34, 56);
-+        int[] crop1 = { 1, 2, 34, 56 };
-+        assertArrayEquals(crop1, image.getCrop());
-+
-+        image.setCrop(-20, -20, 200, 500);
-+        assertArrayEquals(crop0, image.getCrop());
-+
-+        int[] crop2 = { 7, 8, 90, 12};
-+        image.setCrop(crop2);
-+        assertArrayEquals(crop2, image.getCrop());
-+
-+        image.setSize(654, 321);
-+        int[] crop3 = { 0, 0, 654, 321 };
-+        assertArrayEquals(crop3, image.getCrop());
-+
-+        int[] crop4 = { -10, -10, 700, 400 };
-+        image.setCrop(crop4);
-+        assertArrayEquals(crop3, image.getCrop());
-+    }
-+
-+    @Test public void format ()
-+    {
-+        assertNull(image.getFormat());
-+        image.setFormat("Y800");
-+        assertEquals("Y800", image.getFormat());
-+        boolean gotException = false;
-+        try {
-+            image.setFormat("[]");
-+        }
-+        catch(IllegalArgumentException e) {
-+            // expected
-+            gotException = true;
-+        }
-+        assertTrue("Expected exception", gotException);
-+        assertEquals("Y800", image.getFormat());
-+    }
-+
-+    @Test(expected=IllegalArgumentException.class)
-+        public void setFormatInvalid0 ()
-+    {
-+        image.setFormat(null);
-+    }
-+
-+    @Test(expected=IllegalArgumentException.class)
-+        public void setFormatInvalid1 ()
-+    {
-+        image.setFormat("");
-+    }
-+
-+    @Test(expected=IllegalArgumentException.class)
-+        public void setFormatInvalid2 ()
-+    {
-+        image.setFormat("YOMAMA");
-+    }
-+
-+    @Test(expected=IllegalArgumentException.class)
-+        public void setFormatInvalid3 ()
-+    {
-+        image.setFormat("foo");
-+    }
-+
-+    @Test public void data ()
-+    {
-+        assertNull(image.getData());
-+
-+        int[] ints = new int[24];
-+        image.setData(ints);
-+        assertSame(ints, image.getData());
-+
-+        byte[] bytes = new byte[280];
-+        image.setData(bytes);
-+        assertSame(bytes, image.getData());
-+
-+        image.setData((byte[])null);
-+        assertNull(image.getData());
-+    }
-+
-+    @Test public void convert ()
-+    {
-+        image.setSize(4, 4);
-+        image.setFormat("RGB4");
-+        int[] rgb4 = new int[16];
-+        byte[] exp = new byte[16];
-+        for(int i = 0; i < 16; i++) {
-+            int c = i * 15;
-+            rgb4[i] = c | (c << 8) | (c << 16) | (c << 24);
-+            exp[i] = (byte)c;
-+        }
-+        image.setData(rgb4);
-+
-+        Image gray = image.convert("Y800");
-+        assertEquals(4, gray.getWidth());
-+        assertEquals(4, gray.getHeight());
-+        assertEquals("Y800", gray.getFormat());
-+
-+        byte[] y800 = gray.getData();
-+        assertEquals(16, y800.length);
-+
-+        assertArrayEquals(exp, y800);
-+    }
-+}
-diff -r 563557a923d0 java/test/TestImageScanner.java
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/java/test/TestImageScanner.java	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,53 @@
-+
-+import org.junit.Test;
-+import org.junit.Before;
-+import org.junit.After;
-+import org.junit.Assert.*;
-+
-+import net.sourceforge.zbar.ImageScanner;
-+import net.sourceforge.zbar.Config;
-+
-+public class TestImageScanner
-+{
-+    protected ImageScanner scanner;
-+
-+    @Before public void setUp ()
-+    {
-+        scanner = new ImageScanner();
-+    }
-+
-+    @After public void tearDown ()
-+    {
-+        scanner.destroy();
-+        scanner = null;
-+    }
-+
-+
-+    @Test public void creation ()
-+    {
-+        // create/destroy
-+    }
-+
-+    @Test public void callSetConfig ()
-+    {
-+        scanner.setConfig(0, Config.X_DENSITY, 2);
-+        scanner.setConfig(0, Config.Y_DENSITY, 4);
-+    }
-+
-+    @Test public void callParseConfig ()
-+    {
-+        scanner.parseConfig("disable");
-+    }
-+
-+    @Test(expected=IllegalArgumentException.class)
-+        public void callParseConfigInvalid ()
-+    {
-+        scanner.parseConfig("yomama");
-+    }
-+
-+    @Test public void callEnableCache ()
-+    {
-+        scanner.enableCache(true);
-+        scanner.enableCache(false);
-+    }
-+}
-diff -r 563557a923d0 java/test/TestScanImage.java
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/java/test/TestScanImage.java	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,183 @@
-+
-+import org.junit.Test;
-+import org.junit.Before;
-+import org.junit.After;
-+import static org.junit.Assert.*;
-+
-+import net.sourceforge.zbar.*;
-+
-+import java.text.CharacterIterator;
-+import java.text.StringCharacterIterator;
-+import java.util.Iterator;
-+
-+public class TestScanImage
-+{
-+    protected ImageScanner scanner;
-+    protected Image image;
-+
-+    @Before public void setUp ()
-+    {
-+        scanner = new ImageScanner();
-+        image = new Image();
-+    }
-+
-+    @After public void tearDown ()
-+    {
-+        image = null;
-+        scanner = null;
-+        System.gc();
-+    }
-+
-+    public static final String encoded_widths =
-+        "9 111 212241113121211311141132 11111 311213121312121332111132 111 9";
-+
-+    protected void generateY800 ()
-+    {
-+        int width = 114, height = 85;
-+        image.setSize(width, height);
-+        image.setFormat("Y800");
-+        int datalen = width * height;
-+        byte[] data = new byte[datalen];
-+
-+        int y = 0;
-+        int p = 0;
-+        for(; y < 10 && y < height; y++)
-+            for(int x = 0; x < width; x++)
-+                data[p++] = -1;
-+
-+        for(; y < height - 10; y++) {
-+            int x = 0;
-+            byte color = -1;
-+            CharacterIterator it = new StringCharacterIterator(encoded_widths);
-+            for(char c = it.first();
-+                c != CharacterIterator.DONE;
-+                c = it.next())
-+            {
-+                if(c == ' ')
-+                    continue;
-+                for(int dx = (int)c - 0x30; dx > 0; dx--) {
-+                    data[p++] = color;
-+                    x++;
-+                }
-+                color = (byte)~color;
-+            }
-+            for(; x < width; x++)
-+                data[p++] = (byte)~color;
-+        }
-+
-+        for(; y < height; y++)
-+            for(int x = 0; x < width; x++)
-+                data[p++] = -1;
-+        assert(p == datalen);
-+
-+        image.setData(data);
-+    }
-+
-+    protected void checkResults (SymbolSet syms)
-+    {
-+        assertNotNull(syms);
-+        assert(syms.size() == 1);
-+        Iterator<Symbol> it = syms.iterator();
-+        assertTrue(it.hasNext());
-+        Symbol sym = it.next();
-+        assertNotNull(sym);
-+        assertFalse(it.hasNext());
-+
-+        assertEquals(Symbol.EAN13, sym.getType());
-+        assertEquals(sym.EAN13, sym.getType()); // cached
-+
-+        assertTrue(sym.getQuality() > 1);
-+        assertEquals(0, sym.getCount());
-+
-+        SymbolSet comps = sym.getComponents();
-+        assertNotNull(comps);
-+        assertEquals(0, comps.size());
-+        it = comps.iterator();
-+        assertNotNull(it);
-+        assertFalse(it.hasNext());
-+
-+        String data = sym.getData();
-+        assertEquals("6268964977804", data);
-+
-+        byte[] bytes = sym.getDataBytes();
-+        byte[] exp = { '6','2','6','8','9','6','4','9','7','7','8','0','4' };
-+        assertArrayEquals(exp, bytes);
-+
-+        int[] r = sym.getBounds();
-+        assertTrue(r[0] > 6);
-+        assertTrue(r[1] > 6);
-+        assertTrue(r[2] < 102);
-+        assertTrue(r[3] < 73);
-+
-+        assertEquals(Orientation.UP, sym.getOrientation());
-+    }
-+
-+    @Test public void generated ()
-+    {
-+        generateY800();
-+        int n = scanner.scanImage(image);
-+        assertEquals(1, n);
-+
-+        checkResults(image.getSymbols());
-+        checkResults(scanner.getResults());
-+    }
-+
-+    @Test public void config ()
-+    {
-+        generateY800();
-+        scanner.setConfig(Symbol.EAN13, Config.ENABLE, 0);
-+        int n = scanner.scanImage(image);
-+        assertEquals(0, n);
-+    }
-+
-+    @Test public void cache ()
-+    {
-+        generateY800();
-+        scanner.enableCache(true);
-+
-+        int n = 0;
-+        for(int i = 0; i < 10; i++) {
-+            n = scanner.scanImage(image);
-+            if(n > 0) {
-+                assertTrue(i > 1);
-+                break;
-+            }
-+        }
-+
-+        assertEquals(1, n);
-+        checkResults(scanner.getResults());
-+    }
-+
-+    @Test public void orientation()
-+    {
-+        generateY800();
-+
-+        // flip the image
-+        int width = image.getWidth();
-+        int height = image.getHeight();
-+        byte[] data = image.getData();
-+        int p = 0;
-+        for(int y = 0; y < height; y++) {
-+            for(int x0 = 0; x0 < width / 2; x0++) {
-+                int x1 = width - x0 - 1;
-+                assert(x0 < x1);
-+                byte b = data[p + x0];
-+                data[p + x0] = data[p + x1];
-+                data[p + x1] = b;
-+            }
-+            p += width;
-+        }
-+        image.setData(data);
-+
-+        int n = scanner.scanImage(image);
-+        assertEquals(1, n);
-+
-+        SymbolSet syms = scanner.getResults();
-+        assert(syms.size() == 1);
-+        for(Symbol sym : syms) {
-+            assertEquals(Symbol.EAN13, sym.getType());
-+            assertEquals("6268964977804", sym.getData());
-+            assertEquals(Orientation.DOWN, sym.getOrientation());
-+        }
-+    }
-+}
-diff -r 563557a923d0 java/zbarjni.c
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/java/zbarjni.c	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,701 @@
-+/*------------------------------------------------------------------------
-+ *  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-+ *
-+ *  This file is part of the ZBar Bar Code Reader.
-+ *
-+ *  The ZBar Bar Code Reader is free software; you can redistribute it
-+ *  and/or modify it under the terms of the GNU Lesser Public License as
-+ *  published by the Free Software Foundation; either version 2.1 of
-+ *  the License, or (at your option) any later version.
-+ *
-+ *  The ZBar Bar Code Reader is distributed in the hope that it will be
-+ *  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-+ *  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU Lesser Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser Public License
-+ *  along with the ZBar Bar Code Reader; if not, write to the Free
-+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-+ *  Boston, MA  02110-1301  USA
-+ *
-+ *  http://sourceforge.net/projects/zbar
-+ *------------------------------------------------------------------------*/
-+#include <inttypes.h>
-+#include <assert.h>
-+#include <zbar.h>
-+#include <jni.h>
-+
-+static jfieldID SymbolSet_peer;
-+static jfieldID Symbol_peer;
-+static jfieldID Image_peer, Image_data;
-+static jfieldID ImageScanner_peer;
-+
-+static struct {
-+    int SymbolSet_create, SymbolSet_destroy;
-+    int Symbol_create, Symbol_destroy;
-+    int Image_create, Image_destroy;
-+    int ImageScanner_create, ImageScanner_destroy;
-+} stats;
-+
-+
-+#define PEER_CAST(l) \
-+    ((void*)(uintptr_t)(l))
-+
-+#define GET_PEER(c, o) \
-+    PEER_CAST((*env)->GetLongField(env, (o), c ## _peer))
-+
-+
-+static inline void
-+throw_exc(JNIEnv *env,
-+          const char *name,
-+          const char *msg)
-+{
-+    jclass cls = (*env)->FindClass(env, name);
-+    if(cls)
-+        (*env)->ThrowNew(env, cls, msg);
-+    (*env)->DeleteLocalRef(env, cls);
-+}
-+
-+static inline uint32_t
-+format_to_fourcc(JNIEnv *env,
-+                 jstring format)
-+{
-+    if(!format)
-+        goto invalid;
-+
-+    int n = (*env)->GetStringLength(env, format);
-+    if(0 >= n || n > 4)
-+        goto invalid;
-+
-+    char fmtstr[8];
-+    (*env)->GetStringUTFRegion(env, format, 0, n, fmtstr);
-+
-+    uint32_t fourcc = 0;
-+    int i;
-+    for(i = 0; i < n; i++) {
-+        if(fmtstr[i] < ' ' || 'Z' < fmtstr[i] ||
-+           ('9' < fmtstr[i] && fmtstr[i] < 'A') ||
-+           (' ' < fmtstr[i] && fmtstr[i] < '0'))
-+            goto invalid;
-+        fourcc |= ((uint32_t)fmtstr[i]) << (8 * i);
-+    }
-+    return(fourcc);
-+
-+invalid:
-+    throw_exc(env, "java/lang/IllegalArgumentException",
-+              "invalid format fourcc");
-+    return(0);
-+}
-+
-+static JavaVM *jvm = NULL;
-+
-+JNIEXPORT jint JNICALL
-+JNI_OnLoad (JavaVM *_jvm,
-+            void *reserved)
-+{
-+    jvm = _jvm;
-+    return(JNI_VERSION_1_2);
-+}
-+
-+JNIEXPORT void JNICALL
-+JNI_OnUnload (JavaVM *_jvm,
-+              void *reserved)
-+{
-+    assert(stats.SymbolSet_create == stats.SymbolSet_destroy);
-+    assert(stats.Symbol_create == stats.Symbol_destroy);
-+    assert(stats.Image_create == stats.Image_destroy);
-+    assert(stats.ImageScanner_create == stats.ImageScanner_destroy);
-+}
-+
-+
-+JNIEXPORT void JNICALL
-+Java_net_sourceforge_zbar_SymbolSet_init (JNIEnv *env,
-+                                          jclass cls)
-+{
-+    SymbolSet_peer = (*env)->GetFieldID(env, cls, "peer", "J");
-+}
-+
-+JNIEXPORT void JNICALL
-+Java_net_sourceforge_zbar_SymbolSet_destroy (JNIEnv *env,
-+                                             jobject obj,
-+                                             jlong peer)
-+{
-+    zbar_symbol_set_ref(PEER_CAST(peer), -1);
-+    stats.SymbolSet_destroy++;
-+}
-+
-+JNIEXPORT jint JNICALL
-+Java_net_sourceforge_zbar_SymbolSet_size (JNIEnv *env,
-+                                          jobject obj)
-+{
-+    zbar_symbol_set_t *zsyms = GET_PEER(SymbolSet, obj);
-+    if(!zsyms)
-+        return(0);
-+    return(zbar_symbol_set_get_size(zsyms));
-+}
-+
-+JNIEXPORT jlong JNICALL
-+Java_net_sourceforge_zbar_SymbolSet_firstSymbol (JNIEnv *env,
-+                                                 jobject obj,
-+                                                 jlong peer)
-+{
-+    if(!peer)
-+        return(0);
-+    const zbar_symbol_t *zsym = zbar_symbol_set_first_symbol(PEER_CAST(peer));
-+    if(zsym) {
-+        zbar_symbol_ref(zsym, 1);
-+        stats.Symbol_create++;
-+    }
-+    return((intptr_t)zsym);
-+}
-+
-+
-+
-+JNIEXPORT void JNICALL
-+Java_net_sourceforge_zbar_Symbol_init (JNIEnv *env,
-+                                       jclass cls)
-+{
-+    Symbol_peer = (*env)->GetFieldID(env, cls, "peer", "J");
-+}
-+
-+JNIEXPORT void JNICALL
-+Java_net_sourceforge_zbar_Symbol_destroy (JNIEnv *env,
-+                                          jobject obj,
-+                                          jlong peer)
-+{
-+    zbar_symbol_ref(PEER_CAST(peer), -1);
-+    stats.Symbol_destroy++;
-+}
-+
-+JNIEXPORT jint JNICALL
-+Java_net_sourceforge_zbar_Symbol_getType (JNIEnv *env,
-+                                          jobject obj,
-+                                          jlong peer)
-+{
-+    return(zbar_symbol_get_type(PEER_CAST(peer)));
-+}
-+
-+JNIEXPORT jint JNICALL
-+Java_net_sourceforge_zbar_Symbol_getConfigMask (JNIEnv *env,
-+                                                jobject obj)
-+{
-+    return(zbar_symbol_get_configs(GET_PEER(Symbol, obj)));
-+}
-+
-+JNIEXPORT jint JNICALL
-+Java_net_sourceforge_zbar_Symbol_getModifierMask (JNIEnv *env,
-+                                                  jobject obj)
-+{
-+    return(zbar_symbol_get_modifiers(GET_PEER(Symbol, obj)));
-+}
-+
-+JNIEXPORT jstring JNICALL
-+Java_net_sourceforge_zbar_Symbol_getData (JNIEnv *env,
-+                                          jobject obj)
-+{
-+    const char *data = zbar_symbol_get_data(GET_PEER(Symbol, obj));
-+    return((*env)->NewStringUTF(env, data));
-+}
-+
-+JNIEXPORT jstring JNICALL
-+Java_net_sourceforge_zbar_Symbol_getDataBytes (JNIEnv *env,
-+                                               jobject obj)
-+{
-+    const zbar_symbol_t *zsym = GET_PEER(Symbol, obj);
-+    const void *data = zbar_symbol_get_data(zsym);
-+    unsigned long datalen = zbar_symbol_get_data_length(zsym);
-+    if(!data || !datalen)
-+        return(NULL);
-+
-+    jbyteArray bytes = (*env)->NewByteArray(env, datalen);
-+    if(!bytes)
-+        return(NULL);
-+
-+    (*env)->SetByteArrayRegion(env, bytes, 0, datalen, data);
-+    return(bytes);
-+}
-+
-+JNIEXPORT jint JNICALL
-+Java_net_sourceforge_zbar_Symbol_getQuality (JNIEnv *env,
-+                                             jobject obj)
-+{
-+    return(zbar_symbol_get_quality(GET_PEER(Symbol, obj)));
-+}
-+
-+JNIEXPORT jint JNICALL
-+Java_net_sourceforge_zbar_Symbol_getCount (JNIEnv *env,
-+                                           jobject obj)
-+{
-+    return(zbar_symbol_get_count(GET_PEER(Symbol, obj)));
-+}
-+
-+JNIEXPORT jint JNICALL
-+Java_net_sourceforge_zbar_Symbol_getLocationSize (JNIEnv *env,
-+                                                  jobject obj,
-+                                                  jlong peer)
-+{
-+    return(zbar_symbol_get_loc_size(PEER_CAST(peer)));
-+}
-+
-+JNIEXPORT jint JNICALL
-+Java_net_sourceforge_zbar_Symbol_getLocationX (JNIEnv *env,
-+                                               jobject obj,
-+                                               jlong peer,
-+                                               jint idx)
-+{
-+    return(zbar_symbol_get_loc_x(PEER_CAST(peer), idx));
-+}
-+
-+JNIEXPORT jint JNICALL
-+Java_net_sourceforge_zbar_Symbol_getLocationY (JNIEnv *env,
-+                                               jobject obj,
-+                                               jlong peer,
-+                                               jint idx)
-+{
-+    return(zbar_symbol_get_loc_y(PEER_CAST(peer), idx));
-+}
-+
-+JNIEXPORT jint JNICALL
-+Java_net_sourceforge_zbar_Symbol_getOrientation (JNIEnv *env,
-+                                                 jobject obj)
-+{
-+    return(zbar_symbol_get_orientation(GET_PEER(Symbol, obj)));
-+}
-+
-+JNIEXPORT jlong JNICALL
-+Java_net_sourceforge_zbar_Symbol_getComponents (JNIEnv *env,
-+                                                jobject obj,
-+                                                jlong peer)
-+{
-+    const zbar_symbol_set_t *zsyms =
-+        zbar_symbol_get_components(PEER_CAST(peer));
-+    if(zsyms) {
-+        zbar_symbol_set_ref(zsyms, 1);
-+        stats.SymbolSet_create++;
-+    }
-+    return((intptr_t)zsyms);
-+}
-+
-+JNIEXPORT jlong JNICALL
-+Java_net_sourceforge_zbar_Symbol_next (JNIEnv *env,
-+                                       jobject obj)
-+{
-+    const zbar_symbol_t *zsym = zbar_symbol_next(GET_PEER(Symbol, obj));
-+    if(zsym) {
-+        zbar_symbol_ref(zsym, 1);
-+        stats.Symbol_create++;
-+    }
-+    return((intptr_t)zsym);
-+}
-+
-+
-+
-+static void
-+Image_cleanupByteArray (zbar_image_t *zimg)
-+{
-+    jobject data = zbar_image_get_userdata(zimg);
-+    assert(data);
-+
-+    JNIEnv *env = NULL;
-+    if((*jvm)->AttachCurrentThread(jvm, (void*)&env, NULL))
-+        return;
-+    assert(env);
-+    if(env && data) {
-+        void *raw = (void*)zbar_image_get_data(zimg);
-+        assert(raw);
-+        /* const image data is unchanged - abort copy back */
-+        (*env)->ReleaseByteArrayElements(env, data, raw, JNI_ABORT);
-+        (*env)->DeleteGlobalRef(env, data);
-+        zbar_image_set_userdata(zimg, NULL);
-+    }
-+}
-+
-+static void
-+Image_cleanupIntArray (zbar_image_t *zimg)
-+{
-+    jobject data = zbar_image_get_userdata(zimg);
-+    assert(data);
-+
-+    JNIEnv *env = NULL;
-+    if((*jvm)->AttachCurrentThread(jvm, (void*)&env, NULL))
-+        return;
-+    assert(env);
-+    if(env && data) {
-+        void *raw = (void*)zbar_image_get_data(zimg);
-+        assert(raw);
-+        /* const image data is unchanged - abort copy back */
-+        (*env)->ReleaseIntArrayElements(env, data, raw, JNI_ABORT);
-+        (*env)->DeleteGlobalRef(env, data);
-+        zbar_image_set_userdata(zimg, NULL);
-+    }
-+}
-+
-+
-+JNIEXPORT void JNICALL
-+Java_net_sourceforge_zbar_Image_init (JNIEnv *env,
-+                                      jclass cls)
-+{
-+    Image_peer = (*env)->GetFieldID(env, cls, "peer", "J");
-+    Image_data = (*env)->GetFieldID(env, cls, "data", "Ljava/lang/Object;");
-+}
-+
-+JNIEXPORT jlong JNICALL
-+Java_net_sourceforge_zbar_Image_create (JNIEnv *env,
-+                                        jobject obj)
-+{
-+    zbar_image_t *zimg = zbar_image_create();
-+    if(!zimg) {
-+        throw_exc(env, "java/lang/OutOfMemoryError", NULL);
-+        return(0);
-+    }
-+    stats.Image_create++;
-+    return((intptr_t)zimg);
-+}
-+
-+JNIEXPORT void JNICALL
-+Java_net_sourceforge_zbar_Image_destroy (JNIEnv *env,
-+                                         jobject obj,
-+                                         jlong peer)
-+{
-+    zbar_image_ref(PEER_CAST(peer), -1);
-+    stats.Image_destroy++;
-+}
-+
-+JNIEXPORT jlong JNICALL
-+Java_net_sourceforge_zbar_Image_convert (JNIEnv *env,
-+                                         jobject obj,
-+                                         jlong peer,
-+                                         jstring format)
-+{
-+    uint32_t fourcc = format_to_fourcc(env, format);
-+    if(!fourcc)
-+        return(0);
-+    zbar_image_t *zimg = zbar_image_convert(PEER_CAST(peer), fourcc);
-+    if(!zimg)
-+        throw_exc(env, "java/lang/UnsupportedOperationException",
-+                  "unsupported image format");
-+    else
-+        stats.Image_create++;
-+    return((intptr_t)zimg);
-+}
-+
-+JNIEXPORT jstring JNICALL
-+Java_net_sourceforge_zbar_Image_getFormat (JNIEnv *env,
-+                                           jobject obj)
-+{
-+    uint32_t fourcc = zbar_image_get_format(GET_PEER(Image, obj));
-+    if(!fourcc)
-+        return(NULL);
-+    char fmtstr[5] = { fourcc, fourcc >> 8, fourcc >> 16, fourcc >> 24, 0 };
-+    return((*env)->NewStringUTF(env, fmtstr));
-+}
-+
-+JNIEXPORT void JNICALL
-+Java_net_sourceforge_zbar_Image_setFormat (JNIEnv *env,
-+                                           jobject obj,
-+                                           jstring format)
-+{
-+    uint32_t fourcc = format_to_fourcc(env, format);
-+    if(!fourcc)
-+        return;
-+    zbar_image_set_format(GET_PEER(Image, obj), fourcc);
-+}
-+
-+JNIEXPORT jint JNICALL
-+Java_net_sourceforge_zbar_Image_getSequence (JNIEnv *env,
-+                                             jobject obj)
-+{
-+    return(zbar_image_get_sequence(GET_PEER(Image, obj)));
-+}
-+
-+JNIEXPORT void JNICALL
-+Java_net_sourceforge_zbar_Image_setSequence (JNIEnv *env,
-+                                             jobject obj,
-+                                             jint seq)
-+{
-+    zbar_image_set_sequence(GET_PEER(Image, obj), seq);
-+}
-+
-+JNIEXPORT jint JNICALL
-+Java_net_sourceforge_zbar_Image_getWidth (JNIEnv *env,
-+                                          jobject obj)
-+{
-+    return(zbar_image_get_width(GET_PEER(Image, obj)));
-+}
-+
-+JNIEXPORT jint JNICALL
-+Java_net_sourceforge_zbar_Image_getHeight (JNIEnv *env,
-+                                           jobject obj)
-+{
-+    return(zbar_image_get_height(GET_PEER(Image, obj)));
-+}
-+
-+JNIEXPORT jobject JNICALL
-+Java_net_sourceforge_zbar_Image_getSize (JNIEnv *env,
-+                                         jobject obj)
-+{
-+    jintArray size = (*env)->NewIntArray(env, 2);
-+    if(!size)
-+        return(NULL);
-+
-+    unsigned dims[2];
-+    zbar_image_get_size(GET_PEER(Image, obj), dims, dims + 1);
-+    jint jdims[2] = { dims[0], dims[1] };
-+    (*env)->SetIntArrayRegion(env, size, 0, 2, jdims);
-+    return(size);
-+}
-+
-+JNIEXPORT void JNICALL
-+Java_net_sourceforge_zbar_Image_setSize__II (JNIEnv *env,
-+                                             jobject obj,
-+                                             jint width,
-+                                             jint height)
-+{
-+    if(width < 0) width = 0;
-+    if(height < 0) height = 0;
-+    zbar_image_set_size(GET_PEER(Image, obj), width, height);
-+}
-+
-+JNIEXPORT void JNICALL
-+Java_net_sourceforge_zbar_Image_setSize___3I (JNIEnv *env,
-+                                              jobject obj,
-+                                              jintArray size)
-+{
-+    if((*env)->GetArrayLength(env, size) != 2)
-+        throw_exc(env, "java/lang/IllegalArgumentException",
-+                  "size must be an array of two ints");
-+    jint dims[2];
-+    (*env)->GetIntArrayRegion(env, size, 0, 2, dims);
-+    if(dims[0] < 0) dims[0] = 0;
-+    if(dims[1] < 0) dims[1] = 0;
-+    zbar_image_set_size(GET_PEER(Image, obj), dims[0], dims[1]);
-+}
-+
-+JNIEXPORT jobject JNICALL
-+Java_net_sourceforge_zbar_Image_getCrop (JNIEnv *env,
-+                                         jobject obj)
-+{
-+    jintArray crop = (*env)->NewIntArray(env, 4);
-+    if(!crop)
-+        return(NULL);
-+
-+    unsigned dims[4];
-+    zbar_image_get_crop(GET_PEER(Image, obj), dims, dims + 1,
-+                        dims + 2, dims + 3);
-+    jint jdims[4] = { dims[0], dims[1], dims[2], dims[3] };
-+    (*env)->SetIntArrayRegion(env, crop, 0, 4, jdims);
-+    return(crop);
-+}
-+
-+#define VALIDATE_CROP(u, m) \
-+    if((u) < 0) {           \
-+        (m) += (u);         \
-+        (u) = 0;            \
-+    }
-+
-+JNIEXPORT void JNICALL
-+Java_net_sourceforge_zbar_Image_setCrop__IIII (JNIEnv *env,
-+                                               jobject obj,
-+                                               jint x, jint y,
-+                                               jint w, jint h)
-+{
-+    VALIDATE_CROP(x, w);
-+    VALIDATE_CROP(y, h);
-+    zbar_image_set_crop(GET_PEER(Image, obj), x, y, w, h);
-+}
-+
-+JNIEXPORT void JNICALL
-+Java_net_sourceforge_zbar_Image_setCrop___3I (JNIEnv *env,
-+                                              jobject obj,
-+                                              jintArray crop)
-+{
-+    if((*env)->GetArrayLength(env, crop) != 4)
-+        throw_exc(env, "java/lang/IllegalArgumentException",
-+                  "crop must be an array of four ints");
-+    jint dims[4];
-+    (*env)->GetIntArrayRegion(env, crop, 0, 4, dims);
-+    VALIDATE_CROP(dims[0], dims[2]);
-+    VALIDATE_CROP(dims[1], dims[3]);
-+    zbar_image_set_crop(GET_PEER(Image, obj),
-+                        dims[0], dims[1], dims[2], dims[3]);
-+}
-+#undef VALIDATE_CROP
-+
-+JNIEXPORT jobject JNICALL
-+Java_net_sourceforge_zbar_Image_getData (JNIEnv *env,
-+                                         jobject obj)
-+{
-+    jobject data = (*env)->GetObjectField(env, obj, Image_data);
-+    if(data)
-+        return(data);
-+
-+    zbar_image_t *zimg = GET_PEER(Image, obj);
-+    data = zbar_image_get_userdata(zimg);
-+    if(data)
-+        return(data);
-+
-+    unsigned long rawlen = zbar_image_get_data_length(zimg);
-+    const void *raw = zbar_image_get_data(zimg);
-+    if(!rawlen || !raw)
-+        return(NULL);
-+
-+    data = (*env)->NewByteArray(env, rawlen);
-+    if(!data)
-+        return(NULL);
-+
-+    (*env)->SetByteArrayRegion(env, data, 0, rawlen, raw);
-+    (*env)->SetObjectField(env, obj, Image_data, data);
-+    return(data);
-+}
-+
-+static inline void
-+Image_setData (JNIEnv *env,
-+               jobject obj,
-+               jbyteArray data,
-+               void *raw,
-+               unsigned long rawlen,
-+               zbar_image_cleanup_handler_t *cleanup)
-+{
-+    if(!data)
-+        cleanup = NULL;
-+    (*env)->SetObjectField(env, obj, Image_data, data);
-+    zbar_image_t *zimg = GET_PEER(Image, obj);
-+    zbar_image_set_data(zimg, raw, rawlen, cleanup);
-+    zbar_image_set_userdata(zimg, (*env)->NewGlobalRef(env, data));
-+}
-+
-+JNIEXPORT void JNICALL
-+Java_net_sourceforge_zbar_Image_setData___3B (JNIEnv *env,
-+                                              jobject obj,
-+                                              jbyteArray data)
-+{
-+    jbyte *raw = NULL;
-+    unsigned long rawlen = 0;
-+    if(data) {
-+        raw = (*env)->GetByteArrayElements(env, data, NULL);
-+        if(!raw)
-+            return;
-+        rawlen = (*env)->GetArrayLength(env, data);
-+    }
-+    Image_setData(env, obj, data, raw, rawlen, Image_cleanupByteArray);
-+}
-+
-+JNIEXPORT void JNICALL
-+Java_net_sourceforge_zbar_Image_setData___3I (JNIEnv *env,
-+                                              jobject obj,
-+                                              jintArray data)
-+{
-+    jint *raw = NULL;
-+    unsigned long rawlen = 0;
-+    if(data) {
-+        raw = (*env)->GetIntArrayElements(env, data, NULL);
-+        if(!raw)
-+            return;
-+        rawlen = (*env)->GetArrayLength(env, data) * sizeof(*raw);
-+    }
-+    Image_setData(env, obj, data, raw, rawlen, Image_cleanupIntArray);
-+}
-+
-+JNIEXPORT jlong JNICALL
-+Java_net_sourceforge_zbar_Image_getSymbols (JNIEnv *env,
-+                                            jobject obj,
-+                                            jlong peer)
-+{
-+    const zbar_symbol_set_t *zsyms = zbar_image_get_symbols(PEER_CAST(peer));
-+    if(zsyms) {
-+        zbar_symbol_set_ref(zsyms, 1);
-+        stats.SymbolSet_create++;
-+    }
-+    return((intptr_t)zsyms);
-+}
-+
-+
-+JNIEXPORT void JNICALL
-+Java_net_sourceforge_zbar_ImageScanner_init (JNIEnv *env,
-+                                             jclass cls)
-+{
-+    ImageScanner_peer = (*env)->GetFieldID(env, cls, "peer", "J");
-+}
-+
-+JNIEXPORT jlong JNICALL
-+Java_net_sourceforge_zbar_ImageScanner_create (JNIEnv *env,
-+                                               jobject obj)
-+{
-+    zbar_image_scanner_t *zscn = zbar_image_scanner_create();
-+    if(!zscn) {
-+        throw_exc(env, "java/lang/OutOfMemoryError", NULL);
-+        return(0);
-+    }
-+    stats.ImageScanner_create++;
-+    return((intptr_t)zscn);
-+}
-+
-+JNIEXPORT void JNICALL
-+Java_net_sourceforge_zbar_ImageScanner_destroy (JNIEnv *env,
-+                                                jobject obj,
-+                                                jlong peer)
-+{
-+    zbar_image_scanner_destroy(PEER_CAST(peer));
-+    stats.ImageScanner_destroy++;
-+}
-+
-+JNIEXPORT void JNICALL
-+Java_net_sourceforge_zbar_ImageScanner_setConfig (JNIEnv *env,
-+                                                  jobject obj,
-+                                                  jint symbology,
-+                                                  jint config,
-+                                                  jint value)
-+{
-+    zbar_image_scanner_set_config(GET_PEER(ImageScanner, obj),
-+                                  symbology, config, value);
-+}
-+
-+JNIEXPORT void JNICALL
-+Java_net_sourceforge_zbar_ImageScanner_parseConfig (JNIEnv *env,
-+                                                    jobject obj,
-+                                                    jstring cfg)
-+{
-+    const char *cfgstr = (*env)->GetStringUTFChars(env, cfg, NULL);
-+    if(!cfgstr)
-+        return;
-+    if(zbar_image_scanner_parse_config(GET_PEER(ImageScanner, obj), cfgstr))
-+        throw_exc(env, "java/lang/IllegalArgumentException",
-+                  "unknown configuration");
-+}
-+
-+JNIEXPORT void JNICALL
-+Java_net_sourceforge_zbar_ImageScanner_enableCache (JNIEnv *env,
-+                                                    jobject obj,
-+                                                    jboolean enable)
-+{
-+    zbar_image_scanner_enable_cache(GET_PEER(ImageScanner, obj), enable);
-+}
-+
-+JNIEXPORT jlong JNICALL
-+Java_net_sourceforge_zbar_ImageScanner_getResults (JNIEnv *env,
-+                                                   jobject obj,
-+                                                   jlong peer)
-+{
-+    const zbar_symbol_set_t *zsyms =
-+        zbar_image_scanner_get_results(PEER_CAST(peer));
-+    if(zsyms) {
-+        zbar_symbol_set_ref(zsyms, 1);
-+        stats.SymbolSet_create++;
-+    }
-+    return((intptr_t)zsyms);
-+}
-+
-+JNIEXPORT jint JNICALL
-+Java_net_sourceforge_zbar_ImageScanner_scanImage (JNIEnv *env,
-+                                                  jobject obj,
-+                                                  jobject image)
-+{
-+    zbar_image_scanner_t *zscn = GET_PEER(ImageScanner, obj);
-+    zbar_image_t *zimg = GET_PEER(Image, image);
-+
-+    int n = zbar_scan_image(zscn, zimg);
-+    if(n < 0)
-+        throw_exc(env, "java/lang/UnsupportedOperationException",
-+                  "unsupported image format");
-+    return(n);
-+}
-diff -r 563557a923d0 perl/Changes
---- a/perl/Changes	Tue Oct 27 11:25:59 2009 -0400
-+++ b/perl/Changes	Fri Feb 22 08:54:29 2013 -0300
-@@ -1,5 +1,17 @@
- Revision history for Perl extension Barcode::ZBar.
- 
-+current spadix
-+	* add Symbol orientation and Decoder direction interfaces
-+
-+0.04  2009-10-23 spadix
-+	* add result query interfaces to ImageScanner and Processor
-+
-+0.03  2009-09-24 spadix
-+	* add support for binary symbol data
-+	* fix symbol leaks
-+	* add symbol quality metric
-+	* add support for QR Code
-+
- 0.02  2009-04-16 spadix
- 	* project name change: package becomes Barcode::ZBar
- 
-diff -r 563557a923d0 perl/README
---- a/perl/README	Tue Oct 27 11:25:59 2009 -0400
-+++ b/perl/README	Fri Feb 22 08:54:29 2013 -0300
-@@ -1,10 +1,11 @@
- Barcode::ZBar Perl module
- =========================
- 
--The ZBar Bar Code Reader is a library for scanning and decoding bar
--codes from various sources such as video streams, image files or raw
--intensity sensors.  It supports EAN, UPC, Code 128, Code 39 and
--Interleaved 2 of 5.  These are the Perl bindings for the library.
-+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, Code 128,
-+Code 93, Code 39, Codabar, Interleaved 2 of 5 and QR Code.  These are
-+the Perl bindings for the library.
- 
- Check the ZBar project home page for the latest release, mailing
- lists, etc.
-@@ -34,4 +35,4 @@
- Licensed under the GNU Lesser General Public License, version 2.1.
- http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
- 
--Copyright 2008-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+Copyright 2008-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-diff -r 563557a923d0 perl/ZBar.pm
---- a/perl/ZBar.pm	Tue Oct 27 11:25:59 2009 -0400
-+++ b/perl/ZBar.pm	Fri Feb 22 08:54:29 2013 -0300
-@@ -1,5 +1,5 @@
- #------------------------------------------------------------------------
--#  Copyright 2008-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+#  Copyright 2008-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
- #
- #  This file is part of the ZBar Bar Code Reader.
- #
-@@ -86,8 +86,8 @@
- 
- The ZBar Bar Code Reader is a library for scanning and decoding bar
- codes from various sources such as video streams, image files or raw
--intensity sensors.  It supports EAN, UPC, Code 128, Code 39 and
--Interleaved 2 of 5.
-+intensity sensors.  It supports EAN-13/UPC-A, UPC-E, EAN-8, Code 128,
-+Code 93, Code 39, Codabar, Interleaved 2 of 5 and QR Code.
- 
- These are the bindings for interacting directly with the library from
- Perl.
-@@ -137,6 +137,56 @@
- 
- =back
- 
-+Decoder configuration constants:
-+
-+=over 4
-+
-+=item Config::ENABLE
-+
-+=item Config::ADD_CHECK
-+
-+=item Config::EMIT_CHECK
-+
-+=item Config::ASCII
-+
-+=item Config::MIN_LEN
-+
-+=item Config::MAX_LEN
-+
-+=item Config::POSITION
-+
-+=item Config::X_DENSITY
-+
-+=item Config::Y_DENSITY
-+
-+=back
-+
-+Symbology modifier constants:
-+
-+=over 4
-+
-+=item Modifier::GS1
-+
-+=item Modifier::AIM
-+
-+=back
-+
-+Symbol orientation constants:
-+
-+=over 4
-+
-+=item Orient::UNKNOWN
-+
-+=item Orient::UP
-+
-+=item Orient::RIGHT
-+
-+=item Orient::DOWN
-+
-+=item Orient::LEFT
-+
-+=back
-+
- 
- =head1 SEE ALSO
- 
-@@ -156,7 +206,7 @@
- 
- =head1 COPYRIGHT AND LICENSE
- 
--Copyright 2008-2009 (c) Jeff Brown E<lt>spadix@users.sourceforge.netE<gt>
-+Copyright 2008-2010 (c) Jeff Brown E<lt>spadix@users.sourceforge.netE<gt>
- 
- The ZBar Bar Code Reader is free software; you can redistribute it
- and/or modify it under the terms of the GNU Lesser Public License as
-diff -r 563557a923d0 perl/ZBar.xs
---- a/perl/ZBar.xs	Tue Oct 27 11:25:59 2009 -0400
-+++ b/perl/ZBar.xs	Fri Feb 22 08:54:29 2013 -0300
-@@ -1,5 +1,5 @@
- //------------------------------------------------------------------------
--//  Copyright 2008-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+//  Copyright 2008-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
- //
- //  This file is part of the ZBar Bar Code Reader.
- //
-@@ -53,6 +53,8 @@
- static AV *LOOKUP_zbar_symbol_type_t = NULL;
- static AV *LOOKUP_zbar_error_t = NULL;
- static AV *LOOKUP_zbar_config_t = NULL;
-+static AV *LOOKUP_zbar_modifier_t = NULL;
-+static AV *LOOKUP_zbar_orientation_t = NULL;
- 
- #define CONSTANT(typ, prefix, sym, name)                \
-     do {                                                \
-@@ -93,6 +95,15 @@
-         }                                                               \
-     } while(0);
- 
-+#define PUSH_ENUM_MASK(typ, TYP, val)                         \
-+    do {                                                      \
-+        unsigned mask = (val);                                \
-+        int i;                                                \
-+        for(i = 0; i < ZBAR_ ## TYP ## _NUM; i++, mask >>= 1) \
-+            if(mask & 1)                                      \
-+                XPUSHs(LOOKUP_ENUM(typ, i));                  \
-+    } while(0);
-+
- static void image_cleanup_handler (zbar_image_t *image)
- {
-     SV *data = zbar_image_get_userdata(image);
-@@ -151,7 +162,7 @@
-     SAVETMPS;
- 
-     PUSHMARK(SP);
--    EXTEND(SP, 2);
-+    EXTEND(SP, 3);
-     PUSHs(sv_mortalcopy(wrap->instance));
-     if(param)
-         PUSHs(param);
-@@ -277,11 +288,37 @@
-         CONSTANT(config, CFG_, ASCII, "ascii");
-         CONSTANT(config, CFG_, MIN_LEN, "min-length");
-         CONSTANT(config, CFG_, MAX_LEN, "max-length");
-+        CONSTANT(config, CFG_, UNCERTAINTY, "uncertainty");
-         CONSTANT(config, CFG_, POSITION, "position");
-         CONSTANT(config, CFG_, X_DENSITY, "x-density");
-         CONSTANT(config, CFG_, Y_DENSITY, "y-density");
-     }
- 
-+MODULE = Barcode::ZBar  PACKAGE = Barcode::ZBar::Modifier  PREFIX = zbar_mod_
-+
-+BOOT:
-+    {
-+        HV *stash = gv_stashpv("Barcode::ZBar::Modifier", TRUE);
-+
-+        LOOKUP_zbar_modifier_t = newAV();
-+        CONSTANT(modifier, MOD_, GS1, "GS1");
-+        CONSTANT(modifier, MOD_, AIM, "AIM");
-+    }
-+
-+MODULE = Barcode::ZBar	PACKAGE = Barcode::ZBar::Orient	PREFIX = zbar_orientation_
-+
-+BOOT:
-+    {
-+        HV *stash = gv_stashpv("Barcode::ZBar::Orient", TRUE);
-+
-+        LOOKUP_zbar_orientation_t = newAV();
-+        CONSTANT(orientation, ORIENT_, UNKNOWN, "UNKNOWN");
-+        CONSTANT(orientation, ORIENT_, UP, "UP");
-+        CONSTANT(orientation, ORIENT_, RIGHT, "RIGHT");
-+        CONSTANT(orientation, ORIENT_, DOWN, "DOWN");
-+        CONSTANT(orientation, ORIENT_, LEFT, "LEFT");
-+    }
-+
- 
- MODULE = Barcode::ZBar	PACKAGE = Barcode::ZBar::Symbol	PREFIX = zbar_symbol_
- 
-@@ -298,10 +335,15 @@
-         CONSTANT(symbol_type, , UPCA, zbar_get_symbol_name(ZBAR_UPCA));
-         CONSTANT(symbol_type, , EAN13, zbar_get_symbol_name(ZBAR_EAN13));
-         CONSTANT(symbol_type, , ISBN13, zbar_get_symbol_name(ZBAR_ISBN13));
-+        CONSTANT(symbol_type, , DATABAR, zbar_get_symbol_name(ZBAR_DATABAR));
-+        CONSTANT(symbol_type, , DATABAR_EXP,
-+                 zbar_get_symbol_name(ZBAR_DATABAR_EXP));
-         CONSTANT(symbol_type, , I25, zbar_get_symbol_name(ZBAR_I25));
-+        CONSTANT(symbol_type, , CODABAR, zbar_get_symbol_name(ZBAR_CODABAR));
-         CONSTANT(symbol_type, , CODE39, zbar_get_symbol_name(ZBAR_CODE39));
-         CONSTANT(symbol_type, , PDF417, zbar_get_symbol_name(ZBAR_PDF417));
-         CONSTANT(symbol_type, , QRCODE, zbar_get_symbol_name(ZBAR_QRCODE));
-+        CONSTANT(symbol_type, , CODE93, zbar_get_symbol_name(ZBAR_CODE93));
-         CONSTANT(symbol_type, , CODE128, zbar_get_symbol_name(ZBAR_CODE128));
-     }
- 
-@@ -316,6 +358,18 @@
- 	Barcode::ZBar::Symbol symbol
- 
- SV *
-+zbar_symbol_get_configs(symbol)
-+	Barcode::ZBar::Symbol	symbol
-+    PPCODE:
-+        PUSH_ENUM_MASK(config, CFG, zbar_symbol_get_configs(symbol));
-+
-+SV *
-+zbar_symbol_get_modifiers(symbol)
-+	Barcode::ZBar::Symbol	symbol
-+    PPCODE:
-+        PUSH_ENUM_MASK(modifier, MOD, zbar_symbol_get_modifiers(symbol));
-+
-+SV *
- zbar_symbol_get_data(symbol)
- 	Barcode::ZBar::Symbol symbol
-     CODE:
-@@ -347,6 +401,10 @@
-             av_push(pt, newSVuv(zbar_symbol_get_loc_y(symbol, i)));
-         }
- 
-+zbar_orientation_t
-+zbar_symbol_get_orientation(symbol)
-+	Barcode::ZBar::Symbol symbol
-+
- SV *
- get_components(symbol)
-         Barcode::ZBar::Symbol	symbol
-@@ -398,6 +456,19 @@
-         mPUSHu(zbar_image_get_width(image));
-         mPUSHu(zbar_image_get_height(image));
- 
-+void
-+get_crop(image)
-+        Barcode::ZBar::Image	image
-+    PREINIT:
-+        unsigned x, y, w, h;
-+    PPCODE:
-+        zbar_image_get_crop(image, &x, &y, &w, &h);
-+        EXTEND(SP, 4);
-+        mPUSHu(x);
-+        mPUSHu(y);
-+        mPUSHu(w);
-+        mPUSHu(h);
-+
- SV *
- zbar_image_get_data(image)
-         Barcode::ZBar::Image	image
-@@ -426,8 +497,16 @@
- void
- zbar_image_set_size(image, width, height)
-         Barcode::ZBar::Image	image
--	unsigned	width
--	unsigned	height
-+        int	width + if(width < 0) width = 0;
-+        int	height + if(height < 0) height = 0;
-+
-+void
-+zbar_image_set_crop(image, x, y, width, height)
-+        Barcode::ZBar::Image	image
-+        int	x + if(x < 0) { width += x; x = 0; }
-+        int	y + if(y < 0) { height += y; y = 0; }
-+        int	width
-+        int	height
- 
- void
- zbar_image_set_data(image, data)
-@@ -712,6 +791,25 @@
- zbar_decoder_get_type(decoder)
- 	Barcode::ZBar::Decoder	decoder
- 
-+SV *
-+zbar_decoder_get_configs(decoder, symbology)
-+	Barcode::ZBar::Decoder	decoder
-+        zbar_symbol_type_t	symbology
-+    PPCODE:
-+        if(symbology == ZBAR_NONE)
-+            symbology = zbar_decoder_get_type(decoder);
-+        PUSH_ENUM_MASK(config, CFG, zbar_decoder_get_configs(decoder, symbology));
-+
-+SV *
-+zbar_decoder_get_modifiers(decoder)
-+	Barcode::ZBar::Decoder	decoder
-+    PPCODE:
-+        PUSH_ENUM_MASK(modifier, MOD, zbar_decoder_get_modifiers(decoder));
-+
-+int
-+zbar_decoder_get_direction(decoder)
-+	Barcode::ZBar::Decoder	decoder
-+
- void
- zbar_decoder_set_handler(decoder, handler = 0, closure = 0)
- 	Barcode::ZBar::Decoder	decoder
-diff -r 563557a923d0 perl/ZBar/Image.pod
---- a/perl/ZBar/Image.pod	Tue Oct 27 11:25:59 2009 -0400
-+++ b/perl/ZBar/Image.pod	Fri Feb 22 08:54:29 2013 -0300
-@@ -132,7 +132,7 @@
- 
- =head1 COPYRIGHT AND LICENSE
- 
--Copyright 2008-2009 (c) Jeff Brown E<lt>spadix@users.sourceforge.netE<gt>
-+Copyright 2008-2010 (c) Jeff Brown E<lt>spadix@users.sourceforge.netE<gt>
- 
- The ZBar Bar Code Reader is free software; you can redistribute it
- and/or modify it under the terms of the GNU Lesser Public License as
-diff -r 563557a923d0 perl/ZBar/ImageScanner.pod
---- a/perl/ZBar/ImageScanner.pod	Tue Oct 27 11:25:59 2009 -0400
-+++ b/perl/ZBar/ImageScanner.pod	Fri Feb 22 08:54:29 2013 -0300
-@@ -89,7 +89,7 @@
- 
- =head1 COPYRIGHT AND LICENSE
- 
--Copyright 2008-2009 (c) Jeff Brown E<lt>spadix@users.sourceforge.netE<gt>
-+Copyright 2008-2010 (c) Jeff Brown E<lt>spadix@users.sourceforge.netE<gt>
- 
- The ZBar Bar Code Reader is free software; you can redistribute it
- and/or modify it under the terms of the GNU Lesser Public License as
-diff -r 563557a923d0 perl/ZBar/Processor.pod
---- a/perl/ZBar/Processor.pod	Tue Oct 27 11:25:59 2009 -0400
-+++ b/perl/ZBar/Processor.pod	Fri Feb 22 08:54:29 2013 -0300
-@@ -137,7 +137,7 @@
- 
- =head1 COPYRIGHT AND LICENSE
- 
--Copyright 2008-2009 (c) Jeff Brown E<lt>spadix@users.sourceforge.netE<gt>
-+Copyright 2008-2010 (c) Jeff Brown E<lt>spadix@users.sourceforge.netE<gt>
- 
- The ZBar Bar Code Reader is free software; you can redistribute it
- and/or modify it under the terms of the GNU Lesser Public License as
-diff -r 563557a923d0 perl/ZBar/Symbol.pod
---- a/perl/ZBar/Symbol.pod	Tue Oct 27 11:25:59 2009 -0400
-+++ b/perl/ZBar/Symbol.pod	Fri Feb 22 08:54:29 2013 -0300
-@@ -1,5 +1,5 @@
- #------------------------------------------------------------------------
--#  Copyright 2008-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+#  Copyright 2008-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
- #
- #  This file is part of the ZBar Bar Code Reader.
- #
-@@ -72,6 +72,12 @@
- inter-scan reliability and redundancy information if enabled at the
- Barcode::ZBar::ImageScanner.
- 
-+=item get_orientation()
-+
-+General orientation of decoded symbol.  This returns one of the
-+Barcode::ZBar::Orient constants, which provide a coarse, axis-aligned
-+indication of symbol orientation.
-+
- =item get_components()
- 
- Components of a composite result.  This yields an array of physical
-@@ -120,8 +126,12 @@
- 
- =item I25
- 
-+=item CODABAR
-+
- =item CODE39
- 
-+=item CODE93
-+
- =item CODE128
- 
- =item QRCODE
-@@ -144,7 +154,7 @@
- 
- =head1 COPYRIGHT AND LICENSE
- 
--Copyright 2008-2009 (c) Jeff Brown E<lt>spadix@users.sourceforge.netE<gt>
-+Copyright 2008-2010 (c) Jeff Brown E<lt>spadix@users.sourceforge.netE<gt>
- 
- The ZBar Bar Code Reader is free software; you can redistribute it
- and/or modify it under the terms of the GNU Lesser Public License as
-diff -r 563557a923d0 perl/t/Decoder.t
---- a/perl/t/Decoder.t	Tue Oct 27 11:25:59 2009 -0400
-+++ b/perl/t/Decoder.t	Fri Feb 22 08:54:29 2013 -0300
-@@ -3,7 +3,7 @@
- 
- use warnings;
- use strict;
--use Test::More tests => 13;
-+use Test::More tests => 17;
- 
- #########################
- 
-@@ -19,7 +19,8 @@
- #########################
- 
- can_ok($decoder, qw(set_config parse_config reset new_scan decode_width
--                    get_color get_data get_type set_handler));
-+                    get_color get_configs get_direction get_data get_modifiers
-+                    get_type set_handler));
- 
- #########################
- 
-@@ -58,6 +59,10 @@
- 
- #########################
- 
-+is($decoder->get_direction(), 0, 'reset direction');
-+
-+#########################
-+
- $decoder->set_config(Barcode::ZBar::Symbol::QRCODE,
-                      Barcode::ZBar::Config::ENABLE, 0);
- 
-@@ -74,6 +79,17 @@
- 
- #########################
- 
-+is_deeply([$decoder->get_configs($sym)],
-+          [Barcode::ZBar::Config::ENABLE,
-+           Barcode::ZBar::Config::EMIT_CHECK],
-+          'read configs');
-+
-+#########################
-+
-+is_deeply([$decoder->get_modifiers()], [], 'read modifiers');
-+
-+#########################
-+
- is($decoder->get_data(), '6268964977804', 'EAN-13 data');
- 
- #########################
-@@ -82,6 +98,10 @@
- 
- #########################
- 
-+is($decoder->get_direction(), 1, 'decode direction');
-+
-+#########################
-+
- is($handler_type, Barcode::ZBar::Symbol::EAN13, 'handler type');
- 
- #########################
-diff -r 563557a923d0 perl/t/Image.t
---- a/perl/t/Image.t	Tue Oct 27 11:25:59 2009 -0400
-+++ b/perl/t/Image.t	Fri Feb 22 08:54:29 2013 -0300
-@@ -3,7 +3,7 @@
- 
- use warnings;
- use strict;
--use Test::More tests => 22;
-+use Test::More tests => 29;
- 
- #########################
- 
-@@ -48,6 +48,26 @@
- 
- #########################
- 
-+$image->set_crop(20, 20, 74, 40);
-+is_deeply([$image->get_crop()], [20, 20, 74, 40], 'crop accessors');
-+
-+#########################
-+
-+$image->set_crop(-57, -40, 228, 160);
-+is_deeply([$image->get_crop()], [0, 0, 114, 80], 'crop clipping');
-+
-+#########################
-+
-+$image->set_crop(10, 10, 94, 60);
-+is_deeply([$image->get_crop()], [10, 10, 94, 60], 'crop accessors');
-+
-+#########################
-+
-+$image->set_size(114, 80);
-+is_deeply([$image->get_crop()], [0, 0, 114, 80], 'crop reset');
-+
-+#########################
-+
- # FIXME avoid skipping these (eg embed image vs ImageMagick)
- SKIP: {
-     eval { require Image::Magick };
-@@ -94,7 +114,8 @@
- 
-     #########################
- 
--    can_ok($sym, qw(get_type get_data get_quality get_count get_loc));
-+    can_ok($sym, qw(get_type get_configs get_modifiers get_data get_quality
-+                    get_count get_loc get_orientation));
- 
-     #########################
- 
-@@ -102,6 +123,17 @@
- 
-     #########################
- 
-+    is_deeply([$sym->get_configs()],
-+              [Barcode::ZBar::Config::ENABLE,
-+               Barcode::ZBar::Config::EMIT_CHECK],
-+              'result configs');
-+
-+    #########################
-+
-+    is_deeply([$sym->get_modifiers()], [], 'result modifiers');
-+
-+    #########################
-+
-     is($sym->get_data(), '9876543210128', 'result data');
- 
-     #########################
-@@ -133,6 +165,10 @@
- 
-     #########################
- 
-+    is($sym->get_orientation(), Barcode::ZBar::Orient::UP, 'orientation');
-+
-+    #########################
-+
-     my @comps = $sym->get_components();
-     is(scalar(@comps), 0, 'components size');
- 
-diff -r 563557a923d0 perl/t/ZBar.t
---- a/perl/t/ZBar.t	Tue Oct 27 11:25:59 2009 -0400
-+++ b/perl/t/ZBar.t	Fri Feb 22 08:54:29 2013 -0300
-@@ -3,7 +3,7 @@
- 
- use warnings;
- use strict;
--use Test::More tests => 3;
-+use Test::More tests => 37;
- 
- #########################
- 
-@@ -20,3 +20,49 @@
- pass('verbosity');
- 
- #########################
-+
-+# performs (2 * n) tests
-+sub test_enum {
-+    my $name = shift;
-+    foreach my $test (@_) {
-+        my $enum = $test->[0];
-+
-+        is($enum, $test->[1], "$name enum/string compare");
-+
-+        #########################
-+
-+        ok($enum == $test->[2], "$name enum/numeric compare");
-+    }
-+}
-+
-+test_enum('config',
-+    [Barcode::ZBar::Config::ENABLE,      'enable',        0],
-+    [Barcode::ZBar::Config::ADD_CHECK,   'add-check',     1],
-+    [Barcode::ZBar::Config::EMIT_CHECK,  'emit-check',    2],
-+    [Barcode::ZBar::Config::ASCII,       'ascii',         3],
-+    [Barcode::ZBar::Config::MIN_LEN,     'min-length',   32],
-+    [Barcode::ZBar::Config::MAX_LEN,     'max-length',   33],
-+    [Barcode::ZBar::Config::UNCERTAINTY, 'uncertainty',  64],
-+    [Barcode::ZBar::Config::POSITION,    'position',    128],
-+    [Barcode::ZBar::Config::X_DENSITY,   'x-density',   256],
-+    [Barcode::ZBar::Config::Y_DENSITY,   'y-density',   257],
-+);
-+
-+#########################
-+
-+test_enum('modifier',
-+    [Barcode::ZBar::Modifier::GS1, 'GS1', 0],
-+    [Barcode::ZBar::Modifier::AIM, 'AIM', 1],
-+);
-+
-+#########################
-+
-+test_enum('orientation',
-+    [Barcode::ZBar::Orient::UNKNOWN, 'UNKNOWN', -1],
-+    [Barcode::ZBar::Orient::UP,      'UP',       0],
-+    [Barcode::ZBar::Orient::RIGHT,   'RIGHT',    1],
-+    [Barcode::ZBar::Orient::DOWN,    'DOWN',     2],
-+    [Barcode::ZBar::Orient::LEFT,    'LEFT',     3],
-+);
-+
-+#########################
-diff -r 563557a923d0 perl/typemap
---- a/perl/typemap	Tue Oct 27 11:25:59 2009 -0400
-+++ b/perl/typemap	Fri Feb 22 08:54:29 2013 -0300
-@@ -14,6 +14,8 @@
- zbar_error_t					T_ENUM
- zbar_symbol_type_t				T_ENUM
- zbar_config_t					T_ENUM
-+zbar_modifier_t                                 T_ENUM
-+zbar_orientation_t				T_ENUM
- 
- # special scalars
- fourcc_t					T_FOURCC
-@@ -30,14 +32,8 @@
- T_FOURCC
- 	{
-             if(SvPOK($arg)) {
--                STRLEN len;
--                char *str = SvPV($arg, len);
--                if(len != 4)
--                    croak(\"invalid fourcc: \%s\", str);
--                $var = ((unsigned long)str[0] |
--                        ((unsigned long)str[1] << 8) |
--                        ((unsigned long)str[2] << 16) |
--                        ((unsigned long)str[3] << 24));
-+                char *str = SvPV_nolen($arg);
-+                $var = zbar_fourcc_parse(str);
-             }
-             else
-                 $var = SvUV($arg);
-diff -r 563557a923d0 python/MANIFEST.in
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/python/MANIFEST.in	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,2 @@
-+include MANIFEST MANIFEST.in zbarmodule.h test/barcode.png
-+recursive-include examples *.py
-diff -r 563557a923d0 python/Makefile.am.inc
---- a/python/Makefile.am.inc	Tue Oct 27 11:25:59 2009 -0400
-+++ b/python/Makefile.am.inc	Fri Feb 22 08:54:29 2013 -0300
-@@ -9,4 +9,5 @@
-     python/symboliter.c python/image.c \
-     python/processor.c python/imagescanner.c python/decoder.c python/scanner.c
- 
--EXTRA_DIST += python/test/barcode.png python/test/test_zbar.py
-+EXTRA_DIST += python/test/barcode.png python/test/test_zbar.py \
-+    python/examples/processor.py python/examples/read_one.py
-diff -r 563557a923d0 python/README
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/python/README	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,60 @@
-+==========================================
-+zbar -- read barcodes from images or video
-+==========================================
-+
-+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, Code 128,
-+Code 93, Code 39, Codabar, Interleaved 2 of 5 and QR Code.  These are
-+the Python bindings for the library.
-+
-+Check the ZBar project home page for the latest release, mailing
-+lists, etc.
-+
-+* http://zbar.sourceforge.net/
-+
-+Installation
-+------------
-+
-+To install this module type the following::
-+
-+   python setup.py install
-+
-+Dependencies
-+------------
-+
-+This module requires the ZBar Bar Code Reader, which may be obtained
-+from:
-+
-+* http://zbar.sourceforge.net/
-+
-+Windows users please note: the module *will NOT load* unless the ZBar
-+library DLL (currently libzbar-0.dll) is available in your Windows system
-+PATH!
-+
-+Examples
-+--------
-+
-+To scan an image, wrap the raw image data in a ``zbar.Image`` and feed
-+it to a ``zbar.ImageScanner``::
-+
-+    import zbar
-+    scanner = zbar.ImageScanner()
-+    image = zbar.Image(width, height, 'Y800', raw_data)
-+    scanner.scan(image)
-+    for symbol in image:
-+        print 'decoded', symbol.type, 'symbol', '"%s"' % symbol.data
-+
-+Complete, runnable examples may be found in the source distribution,
-+under the ``examples/`` directory.  A couple of HOWTOs_ that cover
-+programming with the library may be found on the project wiki.
-+
-+.. _HOWTOs: http://sourceforge.net/apps/mediawiki/zbar/index.php?title=Category:HOWTOs
-+
-+Copyright and License
-+---------------------
-+
-+Licensed under the GNU Lesser General Public License, version 2.1.
-+http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
-+
-+Copyright 2008-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-diff -r 563557a923d0 python/decoder.c
---- a/python/decoder.c	Tue Oct 27 11:25:59 2009 -0400
-+++ b/python/decoder.c	Fri Feb 22 08:54:29 2013 -0300
-@@ -1,5 +1,5 @@
- /*------------------------------------------------------------------------
-- *  Copyright 2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+ *  Copyright 2009-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-  *
-  *  This file is part of the ZBar Bar Code Reader.
-  *
-@@ -104,6 +104,23 @@
- }
- 
- static PyObject*
-+decoder_get_configs (zbarDecoder *self,
-+                     void *closure)
-+{
-+    unsigned int sym = zbar_decoder_get_type(self->zdcode);
-+    unsigned int mask = zbar_decoder_get_configs(self->zdcode, sym);
-+    return(zbarEnum_SetFromMask(config_enum, mask));
-+}
-+
-+static PyObject*
-+decoder_get_modifiers (zbarDecoder *self,
-+                       void *closure)
-+{
-+    unsigned int mask = zbar_decoder_get_modifiers(self->zdcode);
-+    return(zbarEnum_SetFromMask(modifier_enum, mask));
-+}
-+
-+static PyObject*
- decoder_get_data (zbarDecoder *self,
-                   void *closure)
- {
-@@ -111,10 +128,20 @@
-                                       zbar_decoder_get_data_length(self->zdcode)));
- }
- 
-+static PyObject*
-+decoder_get_direction (zbarDecoder *self,
-+                       void *closure)
-+{
-+    return(PyInt_FromLong(zbar_decoder_get_direction(self->zdcode)));
-+}
-+
- static PyGetSetDef decoder_getset[] = {
--    { "color",    (getter)decoder_get_color, },
--    { "type",     (getter)decoder_get_type, },
--    { "data",     (getter)decoder_get_data, },
-+    { "color",     (getter)decoder_get_color, },
-+    { "type",      (getter)decoder_get_type, },
-+    { "configs",   (getter)decoder_get_configs, },
-+    { "modifiers", (getter)decoder_get_modifiers, },
-+    { "data",      (getter)decoder_get_data, },
-+    { "direction", (getter)decoder_get_direction },
-     { NULL, },
- };
- 
-@@ -139,6 +166,23 @@
- }
- 
- static PyObject*
-+decoder_get_configs_meth (zbarDecoder *self,
-+                          PyObject *args,
-+                          PyObject *kwds)
-+{
-+    zbar_symbol_type_t sym = ZBAR_NONE;
-+    static char *kwlist[] = { "symbology", NULL };
-+    if(!PyArg_ParseTupleAndKeywords(args, kwds, "|i", kwlist, &sym))
-+        return(NULL);
-+
-+    if(sym == ZBAR_NONE)
-+        sym = zbar_decoder_get_type(self->zdcode);
-+
-+    unsigned int mask = zbar_decoder_get_configs(self->zdcode, sym);
-+    return(zbarEnum_SetFromMask(config_enum, mask));
-+}
-+
-+static PyObject*
- decoder_parse_config (zbarDecoder *self,
-                       PyObject *args,
-                       PyObject *kwds)
-@@ -262,6 +306,8 @@
- static PyMethodDef decoder_methods[] = {
-     { "set_config",   (PyCFunction)decoder_set_config,
-       METH_VARARGS | METH_KEYWORDS, },
-+    { "get_configs",  (PyCFunction)decoder_get_configs_meth,
-+      METH_VARARGS | METH_KEYWORDS, },
-     { "parse_config", (PyCFunction)decoder_parse_config,
-       METH_VARARGS | METH_KEYWORDS, },
-     { "reset",        (PyCFunction)decoder_reset,
-diff -r 563557a923d0 python/enum.c
---- a/python/enum.c	Tue Oct 27 11:25:59 2009 -0400
-+++ b/python/enum.c	Fri Feb 22 08:54:29 2013 -0300
-@@ -1,5 +1,5 @@
- /*------------------------------------------------------------------------
-- *  Copyright 2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+ *  Copyright 2009-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-  *
-  *  This file is part of the ZBar Bar Code Reader.
-  *
-@@ -192,3 +192,31 @@
-         return(-1);
-     return(0);
- }
-+
-+zbarEnumItem*
-+zbarEnum_LookupValue (zbarEnum *self,
-+                      int val)
-+{
-+    PyObject *key = PyInt_FromLong(val);
-+    zbarEnumItem *e = (zbarEnumItem*)PyDict_GetItem(self->byvalue, key);
-+    if(!e)
-+        return((zbarEnumItem*)key);
-+    Py_INCREF((PyObject*)e);
-+    Py_DECREF(key);
-+    return(e);
-+}
-+
-+PyObject*
-+zbarEnum_SetFromMask (zbarEnum *self,
-+                      unsigned int mask)
-+{
-+    PyObject *result = PySet_New(NULL);
-+    PyObject *key, *item;
-+    Py_ssize_t i = 0;
-+    while(PyDict_Next(self->byvalue, &i, &key, &item)) {
-+        int val = PyInt_AsLong(item);
-+        if(val < sizeof(mask) * 8 && ((mask >> val) & 1))
-+            PySet_Add(result, item);
-+    }
-+    return(result);
-+}
-diff -r 563557a923d0 python/examples/processor.py
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/python/examples/processor.py	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,35 @@
-+#!/usr/bin/python
-+from sys import argv
-+import zbar
-+
-+# create a Processor
-+proc = zbar.Processor()
-+
-+# configure the Processor
-+proc.parse_config('enable')
-+
-+# initialize the Processor
-+device = '/dev/video0'
-+if len(argv) > 1:
-+    device = argv[1]
-+proc.init(device)
-+
-+# setup a callback
-+def my_handler(proc, image, closure):
-+    # extract results
-+    for symbol in image.symbols:
-+        # do something useful with results
-+        print 'decoded', symbol.type, 'symbol', '"%s"' % symbol.data
-+
-+proc.set_data_handler(my_handler)
-+
-+# enable the preview window
-+proc.visible = True
-+
-+# initiate scanning
-+proc.active = True
-+try:
-+    # keep scanning until user provides key/mouse input
-+    proc.user_wait()
-+except zbar.WindowClosed, e:
-+    pass
-diff -r 563557a923d0 python/examples/read_one.py
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/python/examples/read_one.py	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,29 @@
-+#!/usr/bin/python
-+from sys import argv
-+import zbar
-+
-+# create a Processor
-+proc = zbar.Processor()
-+
-+# configure the Processor
-+proc.parse_config('enable')
-+
-+# initialize the Processor
-+device = '/dev/video0'
-+if len(argv) > 1:
-+    device = argv[1]
-+proc.init(device)
-+
-+# enable the preview window
-+proc.visible = True
-+
-+# read at least one barcode (or until window closed)
-+proc.process_one()
-+
-+# hide the preview window
-+proc.visible = False
-+
-+# extract results
-+for symbol in proc.results:
-+    # do something useful with results
-+    print 'decoded', symbol.type, 'symbol', '"%s"' % symbol.data
-diff -r 563557a923d0 python/examples/scan_image.py
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/python/examples/scan_image.py	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,31 @@
-+#!/usr/bin/python
-+from sys import argv
-+import zbar
-+import Image
-+
-+if len(argv) < 2: exit(1)
-+
-+# create a reader
-+scanner = zbar.ImageScanner()
-+
-+# configure the reader
-+scanner.parse_config('enable')
-+
-+# obtain image data
-+pil = Image.open(argv[1]).convert('L')
-+width, height = pil.size
-+raw = pil.tostring()
-+
-+# wrap image data
-+image = zbar.Image(width, height, 'Y800', raw)
-+
-+# scan the image for barcodes
-+scanner.scan(image)
-+
-+# extract results
-+for symbol in image:
-+    # do something useful with results
-+    print 'decoded', symbol.type, 'symbol', '"%s"' % symbol.data
-+
-+# clean up
-+del(image)
-diff -r 563557a923d0 python/image.c
---- a/python/image.c	Tue Oct 27 11:25:59 2009 -0400
-+++ b/python/image.c	Fri Feb 22 08:54:29 2013 -0300
-@@ -1,5 +1,5 @@
- /*------------------------------------------------------------------------
-- *  Copyright 2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+ *  Copyright 2009-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-  *
-  *  This file is part of the ZBar Bar Code Reader.
-  *
-@@ -139,16 +139,18 @@
-         PyErr_SetString(PyExc_TypeError, "cannot delete format attribute");
-         return(-1);
-     }
--    char *format;
-+    char *format = NULL;
-     Py_ssize_t len;
-     if(PyString_AsStringAndSize(value, &format, &len) ||
-        !format || len != 4) {
-+        if(!format)
-+            format = "(nil)";
-         PyErr_Format(PyExc_ValueError,
-                      "format '%.50s' is not a valid four character code",
-                      format);
-         return(-1);
-     }
--    zbar_image_set_format(self->zimg,*((unsigned long*)format));
-+    zbar_image_set_format(self->zimg, zbar_fourcc_parse(format));
-     return(0);
- }
- 
-@@ -156,9 +158,9 @@
- image_get_size (zbarImage *self,
-                 void *closure)
- {
--    unsigned int width = zbar_image_get_width(self->zimg);
--    unsigned int height = zbar_image_get_height(self->zimg);
--    return(PyTuple_Pack(2, PyInt_FromLong(width), PyInt_FromLong(height)));
-+    unsigned int w, h;
-+    zbar_image_get_size(self->zimg, &w, &h);
-+    return(PyTuple_Pack(2, PyInt_FromLong(w), PyInt_FromLong(h)));
- }
- 
- static int
-@@ -170,34 +172,60 @@
-         PyErr_SetString(PyExc_TypeError, "cannot delete size attribute");
-         return(-1);
-     }
--    int rc = -1;
--    PyObject *wobj = NULL, *hobj = NULL;
--    if(!PySequence_Check(value) ||
--       PySequence_Size(value) != 2)
--        goto error;
--    wobj = PySequence_GetItem(value, 0);
--    hobj = PySequence_GetItem(value, 1);
--    if(!wobj || !hobj)
--        goto error;
- 
--    int width = PyInt_AsSsize_t(wobj);
--    if(width == -1 && PyErr_Occurred())
--        goto error;
-+    int dims[2];
-+    if(parse_dimensions(value, dims, 2) ||
-+       dims[0] < 0 || dims[1] < 0) {
-+        PyErr_SetString(PyExc_ValueError,
-+                        "size must be a sequence of two positive ints");
-+        return(-1);
-+    }
- 
--    int height = PyInt_AsSsize_t(hobj);
--    if(height == -1 && PyErr_Occurred())
--        goto error;
-+    zbar_image_set_size(self->zimg, dims[0], dims[1]);
-+    return(0);
-+}
- 
--    zbar_image_set_size(self->zimg, width, height);
--    rc = 0;
-+static PyObject*
-+image_get_crop (zbarImage *self,
-+                void *closure)
-+{
-+    unsigned int x, y, w, h;
-+    zbar_image_get_crop(self->zimg, &x, &y, &w, &h);
-+    return(PyTuple_Pack(4, PyInt_FromLong(x), PyInt_FromLong(y),
-+                        PyInt_FromLong(w), PyInt_FromLong(h)));
-+}
- 
--error:
--    Py_XDECREF(wobj);
--    Py_XDECREF(hobj);
--    if(rc)
-+static int
-+image_set_crop (zbarImage *self,
-+                PyObject *value,
-+                void *closure)
-+{
-+    unsigned w, h;
-+    zbar_image_get_size(self->zimg, &w, &h);
-+    if(!value) {
-+        zbar_image_set_crop(self->zimg, 0, 0, w, h);
-+        return(0);
-+    }
-+
-+    int dims[4];
-+    if(parse_dimensions(value, dims, 4) ||
-+       dims[2] < 0 || dims[3] < 0) {
-         PyErr_SetString(PyExc_ValueError,
--                        "size must be a sequence of two ints");
--    return(rc);
-+                        "crop must be a sequence of four positive ints");
-+        return(-1);
-+    }
-+
-+    if(dims[0] < 0) {
-+        dims[2] += dims[0];
-+        dims[0] = 0;
-+    }
-+    if(dims[1] < 0) {
-+        dims[3] += dims[1];
-+        dims[1] = 0;
-+    }
-+
-+    zbar_image_set_crop(self->zimg, dims[0], dims[1], dims[2], dims[3]);
-+    return(0);
- }
- 
- static PyObject*
-@@ -308,6 +336,7 @@
- static PyGetSetDef image_getset[] = {
-     { "format",   (getter)image_get_format, (setter)image_set_format, },
-     { "size",     (getter)image_get_size,   (setter)image_set_size, },
-+    { "crop",     (getter)image_get_crop,   (setter)image_set_crop, },
-     { "width",    (getter)image_get_int,    (setter)image_set_int,
-       NULL, (void*)0 },
-     { "height",   (getter)image_get_int,    (setter)image_set_int,
-@@ -359,6 +388,7 @@
-                      format);
-         return(NULL);
-     }
-+    unsigned long fourcc = zbar_fourcc_parse(format);
- 
-     zbarImage *img = PyObject_GC_New(zbarImage, &zbarImage_Type);
-     if(!img)
-@@ -366,11 +396,9 @@
-     img->data = NULL;
-     if(width > 0 && height > 0)
-         img->zimg =
--            zbar_image_convert_resize(self->zimg,
--                                       *((unsigned long*)format),
--                                       width, height);
-+            zbar_image_convert_resize(self->zimg, fourcc, width, height);
-     else
--        img->zimg = zbar_image_convert(self->zimg, *((unsigned long*)format));
-+        img->zimg = zbar_image_convert(self->zimg, fourcc);
- 
-     if(!img->zimg) {
-         /* FIXME propagate exception */
-diff -r 563557a923d0 python/processor.c
---- a/python/processor.c	Tue Oct 27 11:25:59 2009 -0400
-+++ b/python/processor.c	Fri Feb 22 08:54:29 2013 -0300
-@@ -36,15 +36,30 @@
-                PyObject *args,
-                PyObject *kwds)
- {
--    static char *kwlist[] = { NULL };
--    if(!PyArg_ParseTupleAndKeywords(args, kwds, "", kwlist))
-+    static char *kwlist[] = { "enable_threads", NULL };
-+    int threaded = -1;
-+    if(!PyArg_ParseTupleAndKeywords(args, kwds, "|O&", kwlist,
-+                                    object_to_bool, &threaded))
-         return(NULL);
- 
-+#ifdef WITH_THREAD
-+    /* the processor creates a thread that calls back into python,
-+     * so we must ensure that threads are initialized before attempting
-+     * to manipulate the GIL (bug #3349199)
-+     */
-+    PyEval_InitThreads();
-+#else
-+    if(threaded > 0 &&
-+       PyErr_WarnEx(NULL, "threading requested but not available", 1))
-+        return(NULL);
-+    threaded = 0;
-+#endif
-+
-     zbarProcessor *self = (zbarProcessor*)type->tp_alloc(type, 0);
-     if(!self)
-         return(NULL);
- 
--    self->zproc = zbar_processor_create(0/*FIXME*/);
-+    self->zproc = zbar_processor_create(threaded);
-     zbar_processor_set_userdata(self->zproc, self);
-     if(!self->zproc) {
-         Py_DECREF(self);
-@@ -138,12 +153,35 @@
-     return(zbarSymbolSet_FromSymbolSet(zsyms));
- }
- 
-+static int
-+processor_set_request_size (zbarProcessor *self,
-+                            PyObject *value,
-+                            void *closure)
-+{
-+    if(!value) {
-+        zbar_processor_request_size(self->zproc, 0, 0);
-+        return(0);
-+    }
-+
-+    int dims[2];
-+    if(parse_dimensions(value, dims, 2) ||
-+       dims[0] < 0 || dims[1] < 0) {
-+        PyErr_SetString(PyExc_ValueError,
-+                        "request_size must be a sequence of two positive ints");
-+        return(-1);
-+    }
-+
-+    zbar_processor_request_size(self->zproc, dims[0], dims[1]);
-+    return(0);
-+}
-+
- static PyGetSetDef processor_getset[] = {
-     { "visible",  (getter)processor_get_bool, (setter)processor_set_bool,
-       NULL, (void*)0 },
-     { "active",   NULL,                       (setter)processor_set_bool,
-       NULL, (void*)1 },
-     { "results",  (getter)processor_get_results, },
-+    { "request_size", NULL, (setter)processor_set_request_size, },
-     { NULL, },
- };
- 
-@@ -228,7 +266,11 @@
-                                     object_to_timeout, &timeout))
-         return(NULL);
- 
--    int rc = zbar_processor_user_wait(self->zproc, timeout);
-+    int rc = -1;
-+    Py_BEGIN_ALLOW_THREADS
-+    rc = zbar_processor_user_wait(self->zproc, timeout);
-+    Py_END_ALLOW_THREADS
-+
-     if(rc < 0)
-         return(zbarErr_Set((PyObject*)self));
-     return(PyInt_FromLong(rc));
-@@ -245,7 +287,11 @@
-                                     object_to_timeout, &timeout))
-         return(NULL);
- 
--    int rc = zbar_process_one(self->zproc, timeout);
-+    int rc = -1;
-+    Py_BEGIN_ALLOW_THREADS
-+    rc = zbar_process_one(self->zproc, timeout);
-+    Py_END_ALLOW_THREADS
-+
-     if(rc < 0)
-         return(zbarErr_Set((PyObject*)self));
-     return(PyInt_FromLong(rc));
-@@ -265,7 +311,11 @@
-     if(zbarImage_validate(img))
-         return(NULL);
- 
--    int n = zbar_process_image(self->zproc, img->zimg);
-+    int n = -1;
-+    Py_BEGIN_ALLOW_THREADS
-+    n = zbar_process_image(self->zproc, img->zimg);
-+    Py_END_ALLOW_THREADS
-+
-     if(n < 0)
-         return(zbarErr_Set((PyObject*)self));
-     return(PyInt_FromLong(n));
-@@ -275,6 +325,9 @@
- process_handler (zbar_image_t *zimg,
-                  const void *userdata)
- {
-+    PyGILState_STATE gstate;
-+    gstate = PyGILState_Ensure();
-+
-     zbarProcessor *self = (zbarProcessor*)userdata;
-     assert(self);
-     assert(self->handler);
-@@ -285,7 +338,7 @@
-         img = zbarImage_FromImage(zimg);
-         if(!img) {
-             PyErr_NoMemory();
--            return;
-+            goto done;
-         }
-     }
-     else
-@@ -299,8 +352,17 @@
-     PyTuple_SET_ITEM(args, 2, self->closure);
- 
-     PyObject *junk = PyObject_Call(self->handler, args, NULL);
--    Py_XDECREF(junk);
-+    if(junk)
-+        Py_DECREF(junk);
-+    else {
-+        PySys_WriteStderr("in ZBar Processor data_handler:\n");
-+        assert(PyErr_Occurred());
-+        PyErr_Print();
-+    }
-     Py_DECREF(args);
-+
-+done:
-+    PyGILState_Release(gstate);
- }
- 
- static PyObject*
-diff -r 563557a923d0 python/setup.py
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/python/setup.py	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,44 @@
-+#!/usr/bin/env python
-+from distutils.core import setup, Extension
-+
-+setup(
-+    name = 'zbar',
-+    version = '0.10',
-+    author = 'Jeff Brown',
-+    author_email = 'spadix@users.sourceforge.net',
-+    url = 'http://zbar.sourceforge.net',
-+    description = 'read barcodes from images or video',
-+    license = 'LGPL',
-+    long_description = open('README').read(),
-+    classifiers = [
-+        'License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)',
-+        'Development Status :: 4 - Beta',
-+        'Intended Audience :: Developers',
-+        'Environment :: Console',
-+        'Environment :: X11 Applications',
-+        'Environment :: Win32 (MS Windows)',
-+        'Operating System :: POSIX',
-+        'Operating System :: Unix',
-+        'Operating System :: Microsoft :: Windows',
-+        'Topic :: Communications',
-+        'Topic :: Multimedia :: Graphics',
-+        'Topic :: Software Development :: Libraries',
-+    ],
-+    ext_modules = [
-+        Extension('zbar', [
-+                'zbarmodule.c',
-+                'enum.c',
-+                'exception.c',
-+                'symbol.c',
-+                'symbolset.c',
-+                'symboliter.c',
-+                'image.c',
-+                'processor.c',
-+                'imagescanner.c',
-+                'decoder.c',
-+                'scanner.c',
-+                ],
-+            libraries = [ 'zbar' ],
-+        ),
-+    ],
-+)
-diff -r 563557a923d0 python/symbol.c
---- a/python/symbol.c	Tue Oct 27 11:25:59 2009 -0400
-+++ b/python/symbol.c	Fri Feb 22 08:54:29 2013 -0300
-@@ -1,5 +1,5 @@
- /*------------------------------------------------------------------------
-- *  Copyright 2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+ *  Copyright 2009-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-  *
-  *  This file is part of the ZBar Bar Code Reader.
-  *
-@@ -81,6 +81,22 @@
- }
- 
- static PyObject*
-+symbol_get_configs (zbarSymbol *self,
-+                    void *closure)
-+{
-+    unsigned int mask = zbar_symbol_get_configs(self->zsym);
-+    return(zbarEnum_SetFromMask(config_enum, mask));
-+}
-+
-+static PyObject*
-+symbol_get_modifiers (zbarSymbol *self,
-+                      void *closure)
-+{
-+    unsigned int mask = zbar_symbol_get_modifiers(self->zsym);
-+    return(zbarEnum_SetFromMask(modifier_enum, mask));
-+}
-+
-+static PyObject*
- symbol_get_long (zbarSymbol *self,
-                  void *closure)
- {
-@@ -128,12 +144,23 @@
-     return(self->loc);
- }
- 
-+static zbarEnumItem*
-+symbol_get_orientation (zbarSymbol *self,
-+                        void *closure)
-+{
-+    return(zbarEnum_LookupValue(orient_enum,
-+                                zbar_symbol_get_orientation(self->zsym)));
-+}
-+
- static PyGetSetDef symbol_getset[] = {
-     { "type",       (getter)symbol_get_type, },
-+    { "configs",    (getter)symbol_get_configs, },
-+    { "modifiers",  (getter)symbol_get_modifiers, },
-     { "quality",    (getter)symbol_get_long, NULL, NULL, (void*)0 },
-     { "count",      (getter)symbol_get_long, NULL, NULL, (void*)1 },
-     { "data",       (getter)symbol_get_data, },
-     { "location",   (getter)symbol_get_location, },
-+    { "orientation",(getter)symbol_get_orientation, },
-     { "components", (getter)symbol_get_components,  },
-     { NULL, },
- };
-diff -r 563557a923d0 python/test/test_zbar.py
---- a/python/test/test_zbar.py	Tue Oct 27 11:25:59 2009 -0400
-+++ b/python/test/test_zbar.py	Fri Feb 22 08:54:29 2013 -0300
-@@ -20,6 +20,9 @@
- encoded_widths = \
-     '9 111 212241113121211311141132 11111 311213121312121332111132 111 9'
- 
-+databar_widths = \
-+    '11 31111333 13911 31131231 11214222 11553 21231313 1'
-+
- VIDEO_DEVICE = None
- if 'VIDEO_DEVICE' in os.environ:
-     VIDEO_DEVICE = os.environ['VIDEO_DEVICE']
-@@ -59,6 +62,7 @@
-                     zbar.Config.ASCII,
-                     zbar.Config.MIN_LEN,
-                     zbar.Config.MAX_LEN,
-+                    zbar.Config.UNCERTAINTY,
-                     zbar.Config.POSITION,
-                     zbar.Config.X_DENSITY,
-                     zbar.Config.Y_DENSITY):
-@@ -66,6 +70,13 @@
-             self.assert_(int(cfg) >= 0)
-             self.assert_(is_identifier.match(str(cfg)))
- 
-+    def test_modifiers(self):
-+        for mod in (zbar.Modifier.GS1,
-+                    zbar.Modifier.AIM):
-+            self.assert_(isinstance(mod, zbar.EnumItem))
-+            self.assert_(int(mod) >= 0)
-+            self.assert_(is_identifier.match(str(mod)))
-+
-     def test_symbologies(self):
-         for sym in (zbar.Symbol.NONE,
-                     zbar.Symbol.PARTIAL,
-@@ -75,15 +86,29 @@
-                     zbar.Symbol.UPCA,
-                     zbar.Symbol.EAN13,
-                     zbar.Symbol.ISBN13,
-+                    zbar.Symbol.DATABAR,
-+                    zbar.Symbol.DATABAR_EXP,
-                     zbar.Symbol.I25,
-+                    zbar.Symbol.CODABAR,
-                     zbar.Symbol.CODE39,
-                     zbar.Symbol.PDF417,
-                     zbar.Symbol.QRCODE,
-+                    zbar.Symbol.CODE93,
-                     zbar.Symbol.CODE128):
-             self.assert_(isinstance(sym, zbar.EnumItem))
-             self.assert_(int(sym) >= 0)
-             self.assert_(is_identifier.match(str(sym)))
- 
-+    def test_orientations(self):
-+        for orient in (zbar.Orient.UNKNOWN,
-+                       zbar.Orient.UP,
-+                       zbar.Orient.RIGHT,
-+                       zbar.Orient.DOWN,
-+                       zbar.Orient.LEFT):
-+            self.assert_(isinstance(orient, zbar.EnumItem))
-+            self.assert_(-1 <= int(orient) <= 3)
-+            self.assert_(is_identifier.match(str(orient)))
-+
- class TestScanner(ut.TestCase):
-     def setUp(self):
-         self.scn = zbar.Scanner()
-@@ -135,6 +160,9 @@
-             self.dcode.data = data
-         self.assertRaises(AttributeError, set_data, 'yomama')
- 
-+        self.assertRaises(AttributeError,
-+                          self.dcode.__setattr__, 'direction', -1)
-+
-     def test_width(self):
-         sym = self.dcode.decode_width(5)
-         self.assert_(sym is zbar.Symbol.NONE)
-@@ -150,6 +178,7 @@
-         self.assert_(self.dcode.color is zbar.BAR)
-         self.dcode.reset()
-         self.assert_(self.dcode.color is zbar.SPACE)
-+        self.assertEqual(self.dcode.direction, 0)
- 
-     def test_decode(self):
-         inline_sym = [ -1 ]
-@@ -172,12 +201,33 @@
-             else:
-                 self.assert_(sym is zbar.Symbol.EAN13)
- 
-+        self.assertEqual(self.dcode.configs,
-+                         set((zbar.Config.ENABLE, zbar.Config.EMIT_CHECK)))
-+        self.assertEqual(self.dcode.modifiers, set())
-         self.assertEqual(self.dcode.data, '6268964977804')
-         self.assert_(self.dcode.color is zbar.BAR)
-+        self.assertEqual(self.dcode.direction, 1)
-         self.assert_(sym is zbar.Symbol.EAN13)
-         self.assert_(inline_sym[0] is zbar.Symbol.EAN13)
-         self.assertEqual(explicit_closure, [ 2 ])
- 
-+    def test_databar(self):
-+        self.dcode.set_config(zbar.Symbol.QRCODE, zbar.Config.ENABLE, 0)
-+        for (i, width) in enumerate(databar_widths):
-+            if width == ' ': continue
-+            sym = self.dcode.decode_width(int(width))
-+            if i < len(databar_widths) - 1:
-+                self.assert_(sym is zbar.Symbol.NONE or
-+                             sym is zbar.Symbol.PARTIAL)
-+
-+        self.assert_(sym is zbar.Symbol.DATABAR)
-+        self.assertEqual(self.dcode.get_configs(zbar.Symbol.EAN13),
-+                         set((zbar.Config.ENABLE, zbar.Config.EMIT_CHECK)))
-+        self.assertEqual(self.dcode.modifiers, set((zbar.Modifier.GS1,)))
-+        self.assertEqual(self.dcode.data, '0124012345678905')
-+        self.assert_(self.dcode.color is zbar.BAR)
-+        self.assertEqual(self.dcode.direction, 1)
-+
-     # FIXME test exception during callback
- 
- class TestImage(ut.TestCase):
-@@ -194,11 +244,13 @@
-     def test_new(self):
-         self.assertEqual(self.image.format, 'Y800')
-         self.assertEqual(self.image.size, (123, 456))
-+        self.assertEqual(self.image.crop, (0, 0, 123, 456))
- 
-         image = zbar.Image()
-         self.assert_(isinstance(image, zbar.Image))
-         self.assertEqual(image.format, '\0\0\0\0')
-         self.assertEqual(image.size, (0, 0))
-+        self.assertEqual(image.crop, (0, 0, 0, 0))
- 
-     def test_format(self):
-         def set_format(fmt):
-@@ -231,6 +283,23 @@
-         self.assertEqual(self.image.width, 81)
-         self.assertEqual(self.image.height, 64)
- 
-+    def test_crop(self):
-+        def set_crop(crp):
-+            self.image.crop = crp
-+        self.assertRaises(ValueError, set_crop, (1,))
-+        self.assertRaises(ValueError, set_crop, 1)
-+        self.image.crop = (1, 2, 100, 200)
-+        self.assertRaises(ValueError, set_crop, (1, 2, 3, 4, 5))
-+        self.assertEqual(self.image.crop, (1, 2, 100, 200))
-+        self.assertRaises(ValueError, set_crop, "foo")
-+        self.assertEqual(self.image.crop, (1, 2, 100, 200))
-+        self.image.crop = (-100, -100, 400, 700)
-+        self.assertEqual(self.image.crop, (0, 0, 123, 456))
-+        self.image.crop = (40, 50, 60, 70)
-+        self.assertEqual(self.image.crop, (40, 50, 60, 70))
-+        self.image.size = (82, 65)
-+        self.assertEqual(self.image.crop, (0, 0, 82, 65))
-+
- class TestImageScanner(ut.TestCase):
-     def setUp(self):
-         self.scn = zbar.ImageScanner()
-@@ -289,6 +358,20 @@
-             self.assert_(sym.type is zbar.Symbol.EAN13)
-             self.assert_(sym.type is sym.EAN13)
-             self.assertEqual(str(sym.type), 'EAN13')
-+
-+            cfgs = sym.configs
-+            self.assert_(isinstance(cfgs, set))
-+            for cfg in cfgs:
-+                self.assert_(isinstance(cfg, zbar.EnumItem))
-+            self.assertEqual(cfgs,
-+                             set((zbar.Config.ENABLE, zbar.Config.EMIT_CHECK)))
-+
-+            mods = sym.modifiers
-+            self.assert_(isinstance(mods, set))
-+            for mod in mods:
-+                self.assert_(isinstance(mod, zbar.EnumItem))
-+            self.assertEqual(mods, set())
-+
-             self.assert_(sym.quality > 0)
-             self.assertEqual(sym.count, 0)
- 
-@@ -310,6 +393,7 @@
-                 self.assertEqual(len(pt), 2)
-                 # FIXME test values (API currently in flux)
- 
-+            self.assert_(sym.orientation is zbar.Orient.UP)
-             self.assert_(data is sym.data)
-             self.assert_(loc is sym.location)
- 
-@@ -320,6 +404,21 @@
-         self.scn.recycle(self.image)
-         self.assertEqual(len(self.image.symbols), 0)
- 
-+    def test_scan_crop(self):
-+        self.image.crop = (0, 71, 114, 9)
-+        self.assertEqual(self.image.crop, (0, 71, 114, 9))
-+        n = self.scn.scan(self.image)
-+        self.assertEqual(n, 0)
-+
-+        self.image.crop = (12, 24, 90, 12)
-+        self.assertEqual(self.image.crop, (12, 24, 90, 12))
-+        n = self.scn.scan(self.image)
-+        self.assertEqual(n, 0)
-+
-+        self.image.crop = (9, 24, 96, 12)
-+        self.assertEqual(self.image.crop, (9, 24, 96, 12))
-+        self.test_scan()
-+
-     def test_scan_again(self):
-         self.test_scan()
- 
-@@ -351,6 +450,15 @@
-         self.assertRaises(ValueError, self.proc.set_config, -1)
-         self.proc.set_config()
- 
-+    def test_request_size(self):
-+        def set_size(sz):
-+            self.proc.request_size = sz
-+        self.assertRaises(ValueError, set_size, (1,))
-+        self.assertRaises(ValueError, set_size, 1)
-+        self.proc.request_size = (12, 6)
-+        self.assertRaises(ValueError, set_size, (1, 2, 3))
-+        self.assertRaises(ValueError, set_size, "foo")
-+
-     def test_processing(self):
-         self.proc.init(VIDEO_DEVICE)
-         self.assert_(self.proc.visible is False)
-@@ -370,13 +478,14 @@
-             symiter = iter(image)
-             self.assert_(isinstance(symiter, zbar.SymbolIter))
- 
--            symbols = tuple(image)
--            self.assertEqual(len(symbols), 1)
--            for symbol in symbols:
--                self.assert_(isinstance(symbol, zbar.Symbol))
--                self.assert_(symbol.type is zbar.Symbol.EAN13)
--                self.assertEqual(symbol.data, '9876543210128')
--                self.assert_(symbol.quality > 0)
-+            syms = tuple(image)
-+            self.assertEqual(len(syms), 1)
-+            for sym in syms:
-+                self.assert_(isinstance(sym, zbar.Symbol))
-+                self.assert_(sym.type is zbar.Symbol.EAN13)
-+                self.assertEqual(sym.data, '9876543210128')
-+                self.assert_(sym.quality > 0)
-+                self.assert_(sym.orientation is zbar.Orient.UP)
-             closure[0] += 1
- 
-         explicit_closure = [ 0 ]
-diff -r 563557a923d0 python/zbarmodule.c
---- a/python/zbarmodule.c	Tue Oct 27 11:25:59 2009 -0400
-+++ b/python/zbarmodule.c	Fri Feb 22 08:54:29 2013 -0300
-@@ -1,5 +1,5 @@
- /*------------------------------------------------------------------------
-- *  Copyright 2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+ *  Copyright 2009-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-  *
-  *  This file is part of the ZBar Bar Code Reader.
-  *
-@@ -23,6 +23,11 @@
- 
- #include "zbarmodule.h"
- 
-+typedef struct enumdef {
-+    const char *strval;
-+    int intval;
-+} enumdef;
-+
- static char *exc_names[] = {
-     "zbar.Exception",
-     NULL,
-@@ -38,6 +43,56 @@
-     "zbar.WinAPIError",
- };
- 
-+static const enumdef symbol_defs[] = {
-+    { "NONE",           ZBAR_NONE },
-+    { "PARTIAL",        ZBAR_PARTIAL },
-+    { "EAN8",           ZBAR_EAN8 },
-+    { "UPCE",           ZBAR_UPCE },
-+    { "ISBN10",         ZBAR_ISBN10 },
-+    { "UPCA",           ZBAR_UPCA },
-+    { "EAN13",          ZBAR_EAN13 },
-+    { "ISBN13",         ZBAR_ISBN13 },
-+    { "DATABAR",        ZBAR_DATABAR },
-+    { "DATABAR_EXP",    ZBAR_DATABAR_EXP },
-+    { "I25",            ZBAR_I25 },
-+    { "CODABAR",        ZBAR_CODABAR },
-+    { "CODE39",         ZBAR_CODE39 },
-+    { "PDF417",         ZBAR_PDF417 },
-+    { "QRCODE",         ZBAR_QRCODE },
-+    { "CODE93",         ZBAR_CODE93 },
-+    { "CODE128",        ZBAR_CODE128 },
-+    { NULL, }
-+};
-+
-+static const enumdef config_defs[] = {
-+    { "ENABLE",         ZBAR_CFG_ENABLE },
-+    { "ADD_CHECK",      ZBAR_CFG_ADD_CHECK },
-+    { "EMIT_CHECK",     ZBAR_CFG_EMIT_CHECK },
-+    { "ASCII",          ZBAR_CFG_ASCII },
-+    { "MIN_LEN",        ZBAR_CFG_MIN_LEN },
-+    { "MAX_LEN",        ZBAR_CFG_MAX_LEN },
-+    { "UNCERTAINTY",    ZBAR_CFG_UNCERTAINTY },
-+    { "POSITION",       ZBAR_CFG_POSITION },
-+    { "X_DENSITY",      ZBAR_CFG_X_DENSITY },
-+    { "Y_DENSITY",      ZBAR_CFG_Y_DENSITY },
-+    { NULL, }
-+};
-+
-+static const enumdef modifier_defs[] = {
-+    { "GS1",            ZBAR_MOD_GS1 },
-+    { "AIM",            ZBAR_MOD_AIM },
-+    { NULL, }
-+};
-+
-+static const enumdef orient_defs[] = {
-+    { "UNKNOWN",        ZBAR_ORIENT_UNKNOWN },
-+    { "UP",             ZBAR_ORIENT_UP },
-+    { "RIGHT",          ZBAR_ORIENT_RIGHT },
-+    { "DOWN",           ZBAR_ORIENT_DOWN },
-+    { "LEFT",           ZBAR_ORIENT_LEFT },
-+    { NULL, }
-+};
-+
- int
- object_to_bool (PyObject *obj,
-                 int *val)
-@@ -49,11 +104,35 @@
-     return(1);
- }
- 
-+int
-+parse_dimensions (PyObject *seq,
-+                  int *dims,
-+                  int n)
-+{
-+    if(!PySequence_Check(seq) ||
-+       PySequence_Size(seq) != n)
-+        return(-1);
-+
-+    int i;
-+    for(i = 0; i < n; i++, dims++) {
-+        PyObject *dim = PySequence_GetItem(seq, i);
-+        if(!dim)
-+            return(-1);
-+        *dims = PyInt_AsSsize_t(dim);
-+        Py_DECREF(dim);
-+        if(*dims == -1 && PyErr_Occurred())
-+            return(-1);
-+    }
-+    return(0);
-+}
-+
- PyObject *zbar_exc[ZBAR_ERR_NUM];
- zbarEnumItem *color_enum[2];
- zbarEnum *config_enum;
-+zbarEnum *modifier_enum;
- PyObject *symbol_enum;
- zbarEnumItem *symbol_NONE;
-+zbarEnum *orient_enum;
- 
- static PyObject*
- version (PyObject *self,
-@@ -105,12 +184,6 @@
- PyMODINIT_FUNC
- initzbar (void)
- {
--    /* initialize constant containers */
--    config_enum = zbarEnum_New();
--    symbol_enum = PyDict_New();
--    if(!config_enum || !symbol_enum)
--        return;
--
-     /* initialize types */
-     zbarEnumItem_Type.tp_base = &PyInt_Type;
-     zbarException_Type.tp_base = (PyTypeObject*)PyExc_Exception;
-@@ -128,6 +201,14 @@
-        PyType_Ready(&zbarScanner_Type) < 0)
-         return;
- 
-+    /* initialize constant containers */
-+    config_enum = zbarEnum_New();
-+    modifier_enum = zbarEnum_New();
-+    symbol_enum = PyDict_New();
-+    orient_enum = zbarEnum_New();
-+    if(!config_enum || !modifier_enum || !symbol_enum || !orient_enum)
-+        return;
-+
-     zbar_exc[0] = (PyObject*)&zbarException_Type;
-     zbar_exc[ZBAR_ERR_NOMEM] = NULL;
-     zbar_error_t ei;
-@@ -151,6 +232,8 @@
-     PyModule_AddObject(mod, "EnumItem", (PyObject*)&zbarEnumItem_Type);
-     PyModule_AddObject(mod, "Image", (PyObject*)&zbarImage_Type);
-     PyModule_AddObject(mod, "Config", (PyObject*)config_enum);
-+    PyModule_AddObject(mod, "Modifier", (PyObject*)modifier_enum);
-+    PyModule_AddObject(mod, "Orient", (PyObject*)orient_enum);
-     PyModule_AddObject(mod, "Symbol", (PyObject*)&zbarSymbol_Type);
-     PyModule_AddObject(mod, "SymbolSet", (PyObject*)&zbarSymbolSet_Type);
-     PyModule_AddObject(mod, "SymbolIter", (PyObject*)&zbarSymbolIter_Type);
-@@ -170,29 +253,16 @@
-     color_enum[ZBAR_BAR] =
-         zbarEnumItem_New(dict, NULL, ZBAR_BAR, "BAR");
- 
--    zbarEnum_Add(config_enum, ZBAR_CFG_ENABLE,     "ENABLE");
--    zbarEnum_Add(config_enum, ZBAR_CFG_ADD_CHECK,  "ADD_CHECK");
--    zbarEnum_Add(config_enum, ZBAR_CFG_EMIT_CHECK, "EMIT_CHECK");
--    zbarEnum_Add(config_enum, ZBAR_CFG_ASCII,      "ASCII");
--    zbarEnum_Add(config_enum, ZBAR_CFG_MIN_LEN,    "MIN_LEN");
--    zbarEnum_Add(config_enum, ZBAR_CFG_MAX_LEN,    "MAX_LEN");
--    zbarEnum_Add(config_enum, ZBAR_CFG_X_DENSITY,  "POSITION");
--    zbarEnum_Add(config_enum, ZBAR_CFG_X_DENSITY,  "X_DENSITY");
--    zbarEnum_Add(config_enum, ZBAR_CFG_Y_DENSITY,  "Y_DENSITY");
-+    const enumdef *item;
-+    for(item = config_defs; item->strval; item++)
-+        zbarEnum_Add(config_enum, item->intval, item->strval);
-+    for(item = modifier_defs; item->strval; item++)
-+        zbarEnum_Add(modifier_enum, item->intval, item->strval);
-+    for(item = orient_defs; item->strval; item++)
-+        zbarEnum_Add(orient_enum, item->intval, item->strval);
- 
-     PyObject *tp_dict = zbarSymbol_Type.tp_dict;
--    symbol_NONE =
--        zbarEnumItem_New(tp_dict, symbol_enum, ZBAR_NONE, "NONE");
--    zbarEnumItem_New(tp_dict, symbol_enum, ZBAR_PARTIAL, "PARTIAL");
--    zbarEnumItem_New(tp_dict, symbol_enum, ZBAR_EAN8,    "EAN8");
--    zbarEnumItem_New(tp_dict, symbol_enum, ZBAR_UPCE,    "UPCE");
--    zbarEnumItem_New(tp_dict, symbol_enum, ZBAR_ISBN10,  "ISBN10");
--    zbarEnumItem_New(tp_dict, symbol_enum, ZBAR_UPCA,    "UPCA");
--    zbarEnumItem_New(tp_dict, symbol_enum, ZBAR_EAN13,   "EAN13");
--    zbarEnumItem_New(tp_dict, symbol_enum, ZBAR_ISBN13,  "ISBN13");
--    zbarEnumItem_New(tp_dict, symbol_enum, ZBAR_I25,     "I25");
--    zbarEnumItem_New(tp_dict, symbol_enum, ZBAR_CODE39,  "CODE39");
--    zbarEnumItem_New(tp_dict, symbol_enum, ZBAR_PDF417,  "PDF417");
--    zbarEnumItem_New(tp_dict, symbol_enum, ZBAR_QRCODE,  "QRCODE");
--    zbarEnumItem_New(tp_dict, symbol_enum, ZBAR_CODE128, "CODE128");
-+    for(item = symbol_defs; item->strval; item++)
-+        zbarEnumItem_New(tp_dict, symbol_enum, item->intval, item->strval);
-+    symbol_NONE = zbarSymbol_LookupEnum(ZBAR_NONE);
- }
-diff -r 563557a923d0 python/zbarmodule.h
---- a/python/zbarmodule.h	Tue Oct 27 11:25:59 2009 -0400
-+++ b/python/zbarmodule.h	Fri Feb 22 08:54:29 2013 -0300
-@@ -1,5 +1,5 @@
- /*------------------------------------------------------------------------
-- *  Copyright 2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+ *  Copyright 2009-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-  *
-  *  This file is part of the ZBar Bar Code Reader.
-  *
-@@ -61,6 +61,10 @@
- extern int zbarEnum_Add(zbarEnum *self,
-                          int val,
-                          const char *name);
-+extern zbarEnumItem *zbarEnum_LookupValue(zbarEnum *self,
-+                                          int val);
-+extern PyObject *zbarEnum_SetFromMask(zbarEnum *self,
-+                                      unsigned int mask);
- 
- typedef struct {
-     PyObject_HEAD
-@@ -144,10 +148,15 @@
- 
- extern zbarEnumItem *color_enum[2];
- extern zbarEnum *config_enum;
-+extern zbarEnum *modifier_enum;
- extern PyObject *symbol_enum;
- extern zbarEnumItem *symbol_NONE;
-+extern zbarEnum *orient_enum;
- 
--int object_to_bool(PyObject *obj,
--                   int *val);
-+extern int object_to_bool(PyObject *obj,
-+                          int *val);
-+extern int parse_dimensions(PyObject *seq,
-+                            int *dims,
-+                            int n);
- 
- #endif
-diff -r 563557a923d0 qt/QZBarThread.cpp
---- a/qt/QZBarThread.cpp	Tue Oct 27 11:25:59 2009 -0400
-+++ b/qt/QZBarThread.cpp	Fri Feb 22 08:54:29 2013 -0300
-@@ -26,7 +26,7 @@
- 
- using namespace zbar;
- 
--static const QString textFormat("%1%2:%3");
-+static const QString textFormat("%1:%2");
- 
- QZBarThread::QZBarThread ()
-     : _videoOpened(false),
-@@ -52,7 +52,6 @@
- 
-             emit decodedText(textFormat.arg(
-                 QString::fromStdString(sym->get_type_name()),
--                QString::fromStdString(sym->get_addon_name()),
-                 data));
-         }
- }
-@@ -168,7 +167,7 @@
- 
- bool QZBarThread::event (QEvent *e)
- {
--    switch(e->type()) {
-+    switch((EventType)e->type()) {
-     case VideoDevice:
-         videoDeviceEvent((VideoDeviceEvent*)e);
-         break;
-diff -r 563557a923d0 test/Makefile.am.inc
---- a/test/Makefile.am.inc	Tue Oct 27 11:25:59 2009 -0400
-+++ b/test/Makefile.am.inc	Fri Feb 22 08:54:29 2013 -0300
-@@ -28,6 +28,10 @@
- test_test_cpp_SOURCES = test/test_cpp.cpp
- test_test_cpp_LDADD = zbar/libzbar.la $(AM_LDADD)
- 
-+check_PROGRAMS += test/test_cpp_img
-+test_test_cpp_img_SOURCES = test/test_cpp_img.cpp $(TEST_IMAGE_SOURCES)
-+test_test_cpp_img_LDADD = zbar/libzbar.la $(AM_LDADD)
-+
- if HAVE_JPEG
- check_PROGRAMS += test/test_jpeg
- test_test_jpeg_SOURCES = test/test_jpeg.c
-@@ -67,3 +71,17 @@
- CLEANFILES += test/.libs/test_decode test/.libs/test_proc \
-     test/.libs/test_convert test/.libs/test_window \
-     test/.libs/test_video test/.libs/dbg_scan test/.libs/test_gtk
-+
-+check-cpp: test/test_cpp_img
-+	test/test_cpp_img
-+
-+check-decoder: test/test_decode
-+	test/test_decode -q
-+
-+regress-decoder: test/test_decode
-+	test/test_decode -n 100000
-+
-+check-local: check-cpp check-decoder check-images
-+regress: regress-decoder regress-images
-+
-+.PHONY: check-cpp check-decoder check-images regress-decoder regress-images regress
-diff -r 563557a923d0 test/barcodetest.py
---- a/test/barcodetest.py	Tue Oct 27 11:25:59 2009 -0400
-+++ b/test/barcodetest.py	Fri Feb 22 08:54:29 2013 -0300
-@@ -66,7 +66,7 @@
-         import re
-         makefile = open('Makefile')
-         for line in makefile:
--            if re.match('^VPATH\s*=', line):
-+            if re.match(r'^VPATH\s*=', line):
-                 vpath = line.split('=', 1)[1].strip()
-                 if vpath and vpath != rundir:
-                     search.append(vpath)
-@@ -124,6 +124,8 @@
-     assert rc in (0, 4), \
-            'zbarimg returned error status (%d)\n' % rc + err
- 
-+    assert not err, err
-+
-     result = ET.XML(xml)
-     assert result.tag == ET.QName(BC, 'barcodes')
-     return result
-@@ -167,7 +169,8 @@
-             href = 'http://zbar.sf.net/test/barcode.png'
- 
-         self.source = src = ET.Element(ET.QName(BC, 'source'), href=href)
--        sym = ET.SubElement(src, ET.QName(BC, 'symbol'), type='EAN-13')
-+        sym = ET.SubElement(src, ET.QName(BC, 'symbol'), type='EAN-13',
-+                            orientation='UP')
-         data = ET.SubElement(sym, ET.QName(BC, 'data'))
-         data.text = '9876543210128'
- 
-@@ -258,8 +261,9 @@
- 
- 
- def compare_symbols(expect, actual):
--    pass
--
-+    orient = expect.get('orientation')
-+    if orient:
-+        assert actual.get('orientation') == orient
- 
- # override unittest.TestLoader to populate tests from xml description
- class TestLoader:
-@@ -348,7 +352,10 @@
-                 continue
-             if src.tag == ET.QName(BC, 'source'):
-                 test = TestCase()
--                src.set('href', urljoin(url, href))
-+                # convert file URLs to filesystem paths
-+                href = urljoin(url, href)
-+                href = re.sub(r'^file://', '', href)
-+                src.set('href', href)
-                 test.source = src
-                 suite.addTest(test)
-             elif src.tag == ET.QName(TS, 'index'):
-diff -r 563557a923d0 test/test_cpp_img.cpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/test/test_cpp_img.cpp	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,235 @@
-+//------------------------------------------------------------------------
-+//  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+//
-+//  This file is part of the ZBar Bar Code Reader.
-+//
-+//  The ZBar Bar Code Reader is free software; you can redistribute it
-+//  and/or modify it under the terms of the GNU Lesser Public License as
-+//  published by the Free Software Foundation; either version 2.1 of
-+//  the License, or (at your option) any later version.
-+//
-+//  The ZBar Bar Code Reader is distributed in the hope that it will be
-+//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-+//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+//  GNU Lesser Public License for more details.
-+//
-+//  You should have received a copy of the GNU Lesser Public License
-+//  along with the ZBar Bar Code Reader; if not, write to the Free
-+//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-+//  Boston, MA  02110-1301  USA
-+//
-+//  http://sourceforge.net/projects/zbar
-+//------------------------------------------------------------------------
-+
-+// NB do not put anything before this header
-+// it's here to check that we didn't omit any dependencies
-+#include <zbar.h>
-+
-+#include <iostream>
-+#include <sstream>
-+#include <iomanip>
-+#include "test_images.h"
-+
-+bool debug = false;
-+bool verbose = false;
-+int errors = 0;
-+zbar::zbar_symbol_type_t expect_type = zbar::ZBAR_NONE;
-+std::string expect_data;
-+
-+template <class T>
-+inline std::string to_string (const T& t)
-+{
-+    std::stringstream ss;
-+    ss << t;
-+    return ss.str();
-+}
-+
-+static inline int
-+error (const std::string &msg)
-+{
-+    errors++;
-+    std::cerr << "ERROR: " << msg << std::endl;
-+    if(debug)
-+        abort();
-+    return(-1);
-+}
-+
-+static inline int
-+check_loc (const zbar::Image &img,
-+           const zbar::Symbol &sym)
-+{
-+    int n = 0;
-+    int w = img.get_width();
-+    int h = img.get_height();
-+    for(zbar::Symbol::PointIterator p(sym.point_begin());
-+        p != sym.point_end();
-+        ++p, n++)
-+    {
-+        zbar::Symbol::Point q(*p);
-+        if(q.x < 0 || q.x >= w ||
-+           q.y < 0 || q.y >= h)
-+            error("location point out of range");
-+    }
-+    return(!n);
-+}
-+
-+static inline int
-+check_symbol (const zbar::Image &img,
-+              const zbar::Symbol &sym)
-+{
-+    zbar::zbar_symbol_type_t type(sym.get_type());
-+    std::string data(sym.get_data());
-+
-+    bool pass =
-+        expect_type &&
-+        type == expect_type &&
-+        data == expect_data &&
-+        sym.get_data_length() == expect_data.length() &&
-+        sym.get_quality() > 4;
-+    if(pass)
-+        pass = !check_loc(img, sym);
-+
-+    if(verbose || !pass)
-+        std::cerr << "decode Symbol: " << sym << std::endl;
-+
-+    if(!expect_type)
-+        error("unexpected");
-+    else if(!pass)
-+        error(std::string("expected: ") +
-+              zbar::zbar_get_symbol_name(expect_type) +
-+              " " + expect_data);
-+
-+    expect_type = zbar::ZBAR_NONE;
-+    expect_data = "";
-+    return(!pass);
-+}
-+
-+static inline int
-+check_image (const zbar::Image &img)
-+{
-+    zbar::SymbolSet syms(img.get_symbols());
-+    int setn = syms.get_size(), countn = 0;
-+
-+    int rc = 0;
-+    for(zbar::SymbolIterator sym(syms.symbol_begin());
-+        sym != syms.symbol_end();
-+        ++sym, ++countn)
-+        rc |= check_symbol(img, *sym);
-+
-+    if(countn != setn)
-+        rc |= error("SymbolSet size mismatch: exp=" + to_string(setn) +
-+                    " act=" + to_string(countn));
-+    return(rc);
-+}
-+
-+static inline void
-+expect (zbar::zbar_symbol_type_t type,
-+        std::string data)
-+{
-+    if(expect_type)
-+        error(std::string("missing: ") + zbar_get_symbol_name(expect_type) +
-+              " " + expect_data);
-+    expect_type = type;
-+    expect_data = data;
-+}
-+
-+class Handler : public zbar::Image::Handler {
-+    void image_callback(zbar::Image &img);
-+};
-+
-+void
-+Handler::image_callback (zbar::Image &img)
-+{
-+    bool unexpected = !expect_type;
-+    if(unexpected)
-+        error("unexpected image callback");
-+    check_image(img);
-+}
-+
-+static inline int
-+test_processor ()
-+{
-+    // create processor w/no video and no window
-+    zbar::Processor proc(debug, NULL);
-+    Handler handler;
-+    proc.set_handler(handler);
-+    if(debug) {
-+        proc.set_visible();
-+        proc.user_wait();
-+    }
-+
-+    // generate barcode test image
-+    zbar::Image rgb3(0, 0, "RGB3");
-+
-+    // test cast to C image
-+    if(test_image_ean13(rgb3))
-+        error("failed to generate image");
-+
-+    // test decode
-+    expect(zbar::ZBAR_EAN13, test_image_ean13_data);
-+    proc.process_image(rgb3);
-+    if(debug)
-+        proc.user_wait();
-+
-+    expect(zbar::ZBAR_EAN13, test_image_ean13_data);
-+    check_image(rgb3);
-+
-+    if(rgb3.get_format() != zbar_fourcc('R','G','B','3'))
-+        error("image format mismatch");
-+
-+    expect(zbar::ZBAR_NONE, "");
-+    proc.set_config(zbar::ZBAR_EAN13,
-+                    zbar::ZBAR_CFG_ENABLE,
-+                    false);
-+    proc.process_image(rgb3);
-+    check_image(rgb3);
-+    if(debug)
-+        proc.user_wait();
-+
-+    proc.set_config("ean13.en");
-+    expect(zbar::ZBAR_EAN13, test_image_ean13_data);
-+    proc << rgb3;
-+    expect(zbar::ZBAR_EAN13, test_image_ean13_data);
-+    check_image(rgb3);
-+    if(debug)
-+        proc.user_wait();
-+
-+    {
-+        zbar::Image grey(rgb3.convert(zbar_fourcc('G','R','E','Y')));
-+        expect(zbar::ZBAR_EAN13, test_image_ean13_data);
-+        proc << grey;
-+
-+        zbar::Image y800 = grey.convert("Y800");
-+        expect(zbar::ZBAR_EAN13, test_image_ean13_data);
-+        proc << y800;
-+    }
-+    if(debug)
-+        // check image data retention
-+        proc.user_wait();
-+
-+    expect(zbar::ZBAR_NONE, "");
-+    return(0);
-+}
-+
-+int main (int argc, char **argv)
-+{
-+    debug = (argc > 1 && std::string(argv[1]) == "-d");
-+    verbose = (debug || (argc > 1 && std::string(argv[1]) == "-v"));
-+
-+    if(test_processor()) {
-+        error("ERROR: Processor test FAILED");
-+        return(2);
-+    }
-+
-+    if(test_image_check_cleanup())
-+        error("cleanup failed");
-+
-+    if(errors) {
-+        std::cout << "FAIL" << std::endl;
-+        return(2);
-+    }
-+    else {
-+        std::cout << "OK" << std::endl;
-+        return(0);
-+    }
-+}
-diff -r 563557a923d0 test/test_decode.c
---- a/test/test_decode.c	Tue Oct 27 11:25:59 2009 -0400
-+++ b/test/test_decode.c	Fri Feb 22 08:54:29 2013 -0300
-@@ -22,33 +22,86 @@
-  *------------------------------------------------------------------------*/
- 
- #include <inttypes.h>
-+#include <limits.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-+#include <ctype.h>
-+#include <time.h>
- #include <assert.h>
- 
- #include <zbar.h>
- 
- zbar_decoder_t *decoder;
- 
-+zbar_symbol_type_t expect_sym;
-+char *expect_data = NULL;
-+
-+unsigned seed = 0;
-+int verbosity = 1;
-+int rnd_size = 9;  /* NB should be odd */
-+int iter = 0;      /* test iteration */
-+
-+#define zprintf(level, format, ...) do {                                \
-+        if(verbosity >= (level)) {                                      \
-+            fprintf(stderr, format , ##__VA_ARGS__); \
-+        }                                                               \
-+    } while(0)
-+
-+static inline void print_sep (int level)
-+{
-+    zprintf(level,
-+            "----------------------------------------------------------\n");
-+}
-+
- static void symbol_handler (zbar_decoder_t *decoder)
- {
-     zbar_symbol_type_t sym = zbar_decoder_get_type(decoder);
--    if(sym <= ZBAR_PARTIAL)
-+    if(sym <= ZBAR_PARTIAL || sym == ZBAR_QRCODE)
-         return;
--    printf("%s%s:%s\n",
--           zbar_get_symbol_name(sym),
--           zbar_get_addon_name(sym),
--           zbar_decoder_get_data(decoder));
--    /* FIXME add check! */
-+    const char *data = zbar_decoder_get_data(decoder);
-+
-+    int pass = (sym == expect_sym) && !strcmp(data, expect_data) &&
-+        zbar_decoder_get_data_length(decoder) == strlen(data);
-+    pass *= 3;
-+
-+    zprintf(pass, "decode %s:%s\n", zbar_get_symbol_name(sym), data);
-+
-+    if(!expect_sym)
-+        zprintf(0, "UNEXPECTED!\n");
-+    else
-+        zprintf(pass, "expect %s:%s\n", zbar_get_symbol_name(expect_sym),
-+                expect_data);
-+    if(!pass) {
-+        zprintf(0, "SEED=%d\n", seed);
-+        abort();
-+    }
-+
-+    expect_sym = ZBAR_NONE;
-+    free(expect_data);
-+    expect_data = NULL;
-+}
-+
-+static void expect (zbar_symbol_type_t sym,
-+                    const char *data)
-+{
-+    if(expect_sym) {
-+        zprintf(0, "MISSING %s:%s\n"
-+                "SEED=%d\n",
-+                zbar_get_symbol_name(expect_sym), expect_data, seed);
-+        abort();
-+    }
-+    expect_sym = sym;
-+    expect_data = (data) ? strdup(data) : NULL;
- }
- 
- static void encode_junk (int n)
- {
--    printf("encode random junk...\n");
-+    if(n > 1)
-+        zprintf(3, "encode random junk...\n");
-     int i;
-     for(i = 0; i < n; i++)
--        zbar_decode_width(decoder, 10. * (rand() / (RAND_MAX + 1.)));
-+        zbar_decode_width(decoder, 20. * (rand() / (RAND_MAX + 1.)) + 1);
- }
- 
- #define FWD 1
-@@ -57,8 +110,8 @@
- static void encode (uint64_t units,
-                     int fwd)
- {
--    printf(" raw=%x%x%c\n", (unsigned)(units >> 32),
--           (unsigned)(units & 0xffffffff), (fwd) ? '<' : '>');
-+    zprintf(3, " raw=%x%x%c\n", (unsigned)(units >> 32),
-+            (unsigned)(units & 0xffffffff), (fwd) ? '<' : '>');
-     if(!fwd)
-         while(units && !(units >> 0x3c))
-             units <<= 4;
-@@ -122,47 +175,188 @@
-     0x2331112a,                             /* STOP (6a) */
- };
- 
--static void encode_code128b (unsigned char *data)
-+static void encode_code128b (char *data)
- {
--    printf("------------------------------------------------------------\n"
--           "encode CODE-128(B): %s\n"
--           "    encode START_B: %02x", data, START_B);
-+    assert(zbar_decoder_get_color(decoder) == ZBAR_SPACE);
-+    print_sep(3);
-+    zprintf(2, "CODE-128(B): %s\n", data);
-+    zprintf(3, "    encode START_B: %02x", START_B);
-     encode(code128[START_B], 0);
-     int i, chk = START_B;
-     for(i = 0; data[i]; i++) {
--        printf("    encode '%c': %02x", data[i], data[i] - 0x20);
-+        zprintf(3, "    encode '%c': %02x", data[i], data[i] - 0x20);
-         encode(code128[data[i] - 0x20], 0);
-         chk += (i + 1) * (data[i] - 0x20);
-     }
-     chk %= 103;
--    printf("    encode checksum: %02x", chk);
-+    zprintf(3, "    encode checksum: %02x", chk);
-     encode(code128[chk], 0);
--    printf("    encode STOP: %02x", STOP);
-+    zprintf(3, "    encode STOP: %02x", STOP);
-     encode(code128[STOP], 0);
--    printf("------------------------------------------------------------\n");
-+    print_sep(3);
- }
- 
--static void encode_code128c (unsigned char *data)
-+static void encode_code128c (char *data)
- {
--    printf("------------------------------------------------------------\n"
--           "encode CODE-128(C): %s\n"
--           "    encode START_C: %02x", data, START_C);
-+    assert(zbar_decoder_get_color(decoder) == ZBAR_SPACE);
-+    print_sep(3);
-+    zprintf(2, "CODE-128(C): %s\n", data);
-+    zprintf(3, "    encode START_C: %02x", START_C);
-     encode(code128[START_C], 0);
-     int i, chk = START_C;
-     for(i = 0; data[i]; i += 2) {
-         assert(data[i] >= '0');
-         assert(data[i + 1] >= '0');
-         unsigned char c = (data[i] - '0') * 10 + (data[i + 1] - '0');
--        printf("    encode '%c%c': %02d", data[i], data[i + 1], c);
-+        zprintf(3, "    encode '%c%c': %02d", data[i], data[i + 1], c);
-         encode(code128[c], 0);
-         chk += (i / 2 + 1) * c;
-     }
-     chk %= 103;
--    printf("    encode checksum: %02x", chk);
-+    zprintf(3, "    encode checksum: %02x", chk);
-     encode(code128[chk], 0);
--    printf("    encode STOP: %02x", STOP);
-+    zprintf(3, "    encode STOP: %02x", STOP);
-     encode(code128[STOP], 0);
--    printf("------------------------------------------------------------\n");
-+    print_sep(3);
-+}
-+
-+/*------------------------------------------------------------*/
-+/* Code 93 encoding */
-+
-+#define CODE93_START_STOP 0x2f
-+
-+static const unsigned int code93[47 + 1] = {
-+    0x131112, 0x111213, 0x111312, 0x111411, /* 00 */
-+    0x121113, 0x121212, 0x121311, 0x111114,
-+    0x131211, 0x141111, 0x211113, 0x211212, /* 08 */
-+    0x211311, 0x221112, 0x221211, 0x231111,
-+    0x112113, 0x112212, 0x112311, 0x122112, /* 10 */
-+    0x132111, 0x111123, 0x111222, 0x111321,
-+    0x121122, 0x131121, 0x212112, 0x212211, /* 18 */
-+    0x211122, 0x211221, 0x221121, 0x222111,
-+    0x112122, 0x112221, 0x122121, 0x123111, /* 20 */
-+    0x121131, 0x311112, 0x311211, 0x321111,
-+    0x112131, 0x113121, 0x211131, 0x121221, /* 28 */
-+    0x312111, 0x311121, 0x122211,
-+    0x111141,                               /* START/STOP (2f) */
-+};
-+
-+#define S1 0x2b00|
-+#define S2 0x2c00|
-+#define S3 0x2d00|
-+#define S4 0x2e00|
-+
-+static const unsigned short code93_ext[0x80] = {
-+    S2'U', S1'A', S1'B', S1'C', S1'D', S1'E', S1'F', S1'G',
-+    S1'H', S1'I', S1'J', S1'K', S1'L', S1'M', S1'N', S1'O',
-+    S1'P', S1'Q', S1'R', S1'S', S1'T', S1'U', S1'V', S1'W',
-+    S1'X', S1'Y', S1'Z', S2'A', S2'B', S2'C', S2'D', S2'E',
-+    0x26,  S3'A', S3'B', S3'C', 0x27,  0x2a,  S3'F', S3'G',
-+    S3'H', S3'I', S3'J', 0x29,  S3'L', 0x24,  0x25,  0x28,
-+    0x00,  0x01,  0x02,  0x03,  0x04,  0x05,  0x06,  0x07,
-+    0x08,  0x09,  S3'Z', S2'F', S2'G', S2'H', S2'I', S2'J',
-+    S2'V', 0x0a,  0x0b,  0x0c,  0x0d,  0x0e,  0x0f,  0x10,
-+    0x11,  0x12,  0x13,  0x14,  0x15,  0x16,  0x17,  0x18,
-+    0x19,  0x1a,  0x1b,  0x1c,  0x1d,  0x1e,  0x1f,  0x20,
-+    0x21,  0x22,  0x23,  S2'K', S2'L', S2'M', S2'N', S2'O',
-+    S2'W', S4'A', S4'B', S4'C', S4'D', S4'E', S4'F', S4'G',
-+    S4'H', S4'I', S4'J', S4'K', S4'L', S4'M', S4'N', S4'O',
-+    S4'P', S4'Q', S4'R', S4'S', S4'T', S4'U', S4'V', S4'W',
-+    S4'X', S4'Y', S4'Z', S2'P', S2'Q', S2'R', S2'S', S2'T',
-+};
-+
-+#undef S1
-+#undef S2
-+#undef S3
-+#undef S4
-+
-+static void encode_char93 (unsigned char c,
-+                           int dir)
-+{
-+    unsigned ext = code93_ext[c];
-+    unsigned shift = ext >> 8;
-+    assert(shift < 0x30);
-+    c = ext & 0xff;
-+    if(shift) {
-+        assert(c < 0x80);
-+        c = code93_ext[c];
-+    }
-+    assert(c < 0x30);
-+
-+    if(shift) {
-+        encode(code93[(dir) ? shift : c], dir ^ 1);
-+        encode(code93[(dir) ? c : shift], dir ^ 1);
-+    }
-+    else
-+        encode(code93[c], dir ^ 1);
-+}
-+
-+static void encode_code93 (char *data,
-+                           int dir)
-+{
-+    assert(zbar_decoder_get_color(decoder) == ZBAR_SPACE);
-+    print_sep(3);
-+
-+    /* calculate checksums */
-+    int i, j, chk_c = 0, chk_k = 0, n = 0;
-+    for(i = 0; data[i]; i++, n++) {
-+        unsigned c = data[i], ext;
-+        assert(c < 0x80);
-+        ext = code93_ext[c];
-+        n += ext >> 13;
-+    }
-+
-+    for(i = 0, j = 0; data[i]; i++, j++) {
-+        unsigned ext = code93_ext[(unsigned)data[i]];
-+        unsigned shift = ext >> 8;
-+        unsigned c = ext & 0xff;
-+        if(shift) {
-+            chk_c += shift * (((n - 1 - j) % 20) + 1);
-+            chk_k += shift * (((n - j) % 15) + 1);
-+            j++;
-+            c = code93_ext[c];
-+        }
-+        chk_c += c * (((n - 1 - j) % 20) + 1);
-+        chk_k += c * (((n - j) % 15) + 1);
-+    }
-+    chk_c %= 47;
-+    chk_k += chk_c;
-+    chk_k %= 47;
-+
-+    zprintf(2, "CODE-93: %s (n=%x C=%02x K=%02x)\n", data, n, chk_c, chk_k);
-+    encode(0xa, 0);  /* leading quiet */
-+
-+    zprintf(3, "    encode %s:", (dir) ? "START" : "STOP");
-+    if(!dir)
-+        encode(0x1, REV);
-+    encode(code93[CODE93_START_STOP], dir ^ 1);
-+    if(!dir) {
-+        zprintf(3, "    encode checksum (K): %02x", chk_k);
-+        encode(code93[chk_k], REV ^ 1);
-+        zprintf(3, "    encode checksum (C): %02x", chk_c);
-+        encode(code93[chk_c], REV ^ 1);
-+    }
-+
-+    n = strlen(data);
-+    for(i = 0; i < n; i++) {
-+        unsigned char c = data[(dir) ? i : (n - i - 1)];
-+        zprintf(3, "    encode '%c':", c);
-+        encode_char93(c, dir);
-+    }
-+
-+    if(dir) {
-+        zprintf(3, "    encode checksum (C): %02x", chk_c);
-+        encode(code93[chk_c], FWD ^ 1);
-+        zprintf(3, "    encode checksum (K): %02x", chk_k);
-+        encode(code93[chk_k], FWD ^ 1);
-+    }
-+    zprintf(3, "    encode %s:", (dir) ? "STOP" : "START");
-+    encode(code93[CODE93_START_STOP], dir ^ 1);
-+    if(dir)
-+        encode(0x1, FWD);
-+
-+    encode(0xa, 0);  /* trailing quiet */
-+    print_sep(3);
- }
- 
- /*------------------------------------------------------------*/
-@@ -182,14 +376,29 @@
- /* FIXME configurable/randomized ratio, ics */
- /* FIXME check digit option, ASCII escapes */
- 
-+static void convert_code39 (char *data)
-+{
-+    char *src, *dst;
-+    for(src = data, dst = data; *src; src++) {
-+        char c = *src;
-+        if(c >= 'a' && c <= 'z')
-+            *(dst++) = c - ('a' - 'A');
-+        else if(c == ' ' ||
-+                c == '$' || c == '%' ||
-+                c == '+' || c == '-' ||
-+                (c >= '.' && c <= '9') ||
-+                (c >= 'A' && c <= 'Z'))
-+            *(dst++) = c;
-+        else
-+            /* skip (FIXME) */;
-+    }
-+    *dst = 0;
-+}
-+
- static void encode_char39 (unsigned char c,
-                            unsigned ics)
- {
--    if(c >= 'a' && c <= 'z')
--        c -= 'a' - 'A';
--    else if(c < 0x20 || c > 0x5a)
--        return; /* skip (FIXME) */
--
-+    assert(0x20 <= c && c <= 0x5a);
-     unsigned int raw = code39[c - 0x20];
-     if(!raw)
-         return; /* skip (FIXME) */
-@@ -201,15 +410,16 @@
-         raw <<= 1;
-     }
-     enc = (enc << 4) | ics;
--    printf("    encode '%c': %02x%08x: ", c,
--           (unsigned)(enc >> 32), (unsigned)(enc & 0xffffffff));
-+    zprintf(3, "    encode '%c': %02x%08x: ", c,
-+            (unsigned)(enc >> 32), (unsigned)(enc & 0xffffffff));
-     encode(enc, REV);
- }
- 
--static void encode_code39 (unsigned char *data)
-+static void encode_code39 (char *data)
- {
--    printf("------------------------------------------------------------\n"
--           "encode CODE-39: %s\n", data);
-+    assert(zbar_decoder_get_color(decoder) == ZBAR_SPACE);
-+    print_sep(3);
-+    zprintf(2, "CODE-39: %s\n", data);
-     encode(0xa, 0);  /* leading quiet */
-     encode_char39('*', 1);
-     int i;
-@@ -217,10 +427,10 @@
-         if(data[i] != '*') /* skip (FIXME) */
-             encode_char39(data[i], 1);
-     encode_char39('*', 0xa);  /* w/trailing quiet */
--    printf("------------------------------------------------------------\n");
-+    print_sep(3);
- }
- 
--
-+#if 0
- /*------------------------------------------------------------*/
- /* PDF417 encoding */
- 
-@@ -258,32 +468,33 @@
- {
-     int k = r % 3;
- 
--    printf("    [%d] encode %s:", r, (dir) ? "stop" : "start");
-+    zprintf(3, "    [%d] encode %s:", r, (dir) ? "stop" : "start");
-     encode((dir) ? PDF417_STOP : PDF417_START, dir);
- 
-     int cw = calc_ind417(k + !dir, r, cols);
--    printf("    [%d,%c] encode %03d(%d): ", r, (dir) ? 'R' : 'L', cw, k);
-+    zprintf(3, "    [%d,%c] encode %03d(%d): ", r, (dir) ? 'R' : 'L', cw, k);
-     encode(pdf417_encode[cw][k], dir);
- 
-     int c;
-     for(c = 0; c < cols; c++) {
-         cw = cws[c];
--        printf("    [%d,%d] encode %03d(%d): ", r, c, cw, k);
-+        zprintf(3, "    [%d,%d] encode %03d(%d): ", r, c, cw, k);
-         encode(pdf417_encode[cw][k], dir);
-     }
- 
-     cw = calc_ind417(k + dir, r, cols);
--    printf("    [%d,%c] encode %03d(%d): ", r, (dir) ? 'L' : 'R', cw, k);
-+    zprintf(3, "    [%d,%c] encode %03d(%d): ", r, (dir) ? 'L' : 'R', cw, k);
-     encode(pdf417_encode[cw][k], dir);
- 
--    printf("    [%d] encode %s:", r, (dir) ? "start" : "stop");
-+    zprintf(3, "    [%d] encode %s:", r, (dir) ? "start" : "stop");
-     encode((dir) ? PDF417_START : PDF417_STOP, dir);
- }
- 
--static void encode_pdf417 (unsigned char *data)
-+static void encode_pdf417 (char *data)
- {
--    printf("------------------------------------------------------------\n"
--           "encode PDF417: hello world\n");
-+    assert(zbar_decoder_get_color(decoder) == ZBAR_SPACE);
-+    print_sep(3);
-+    zprintf(2, "PDF417: hello world\n");
-     encode(0xa, 0);
- 
-     int r;
-@@ -292,9 +503,108 @@
-         encode(0xa, 0);
-     }
- 
--    printf("------------------------------------------------------------\n");
-+    print_sep(3);
-+}
-+#endif
-+
-+/*------------------------------------------------------------*/
-+/* Codabar encoding */
-+
-+static const unsigned int codabar[20] = {
-+    0x03, 0x06, 0x09, 0x60, 0x12, 0x42, 0x21, 0x24,
-+    0x30, 0x48, 0x0c, 0x18, 0x45, 0x51, 0x54, 0x15,
-+    0x1a, 0x29, 0x0b, 0x0e,
-+};
-+
-+static const char codabar_char[0x14] =
-+    "0123456789-$:/.+ABCD";
-+
-+/* FIXME configurable/randomized ratio, ics */
-+/* FIXME check digit option */
-+
-+static char *convert_codabar (char *src)
-+{
-+    unsigned len = strlen(src);
-+    char tmp[4] = { 0, };
-+    if(len < 2) {
-+        unsigned delim = rand() >> 8;
-+        tmp[0] = delim & 3;
-+        if(len)
-+            tmp[1] = src[0];
-+        tmp[len + 1] = (delim >> 2) & 3;
-+        len += 2;
-+        src = tmp;
-+    }
-+
-+    char *result = malloc(len + 1);
-+    char *dst = result;
-+    *(dst++) = ((*(src++) - 1) & 0x3) + 'A';
-+    for(len--; len > 1; len--) {
-+        char c = *(src++);
-+        if(c >= '0' && c <= '9')
-+            *(dst++) = c;
-+        else if(c == '-' || c == '$' || c == ':' || c == '/' ||
-+                c == '.' || c == '+')
-+            *(dst++) = c;
-+        else
-+            *(dst++) = codabar_char[c % 0x10];
-+    }
-+    *(dst++) = ((*(src++) - 1) & 0x3) + 'A';
-+    *dst = 0;
-+    return(result);
- }
- 
-+static void encode_codachar (unsigned char c,
-+                             unsigned ics,
-+                             int dir)
-+{
-+    unsigned int idx;
-+    if(c >= '0' && c <= '9')
-+        idx = c - '0';
-+    else if(c >= 'A' && c <= 'D')
-+        idx = c - 'A' + 0x10;
-+    else
-+        switch(c)
-+        {
-+        case '-': idx = 0xa; break;
-+        case '$': idx = 0xb; break;
-+        case ':': idx = 0xc; break;
-+        case '/': idx = 0xd; break;
-+        case '.': idx = 0xe; break;
-+        case '+': idx = 0xf; break;
-+        default:
-+            assert(0);
-+        }
-+
-+    assert(idx < 0x14);
-+    unsigned int raw = codabar[idx];
-+
-+    uint32_t enc = 0;
-+    int j;
-+    for(j = 0; j < 7; j++, raw <<= 1)
-+        enc = (enc << 4) | ((raw & 0x40) ? 3 : 1);
-+    zprintf(3, "    encode '%c': %07x: ", c, enc);
-+    if(dir)
-+        enc = (enc << 4) | ics;
-+    else
-+        enc |= ics << 28;
-+    encode(enc, 1 - dir);
-+}
-+
-+static void encode_codabar (char *data,
-+                            int dir)
-+{
-+    assert(zbar_decoder_get_color(decoder) == ZBAR_SPACE);
-+    print_sep(3);
-+    zprintf(2, "CODABAR: %s\n", data);
-+    encode(0xa, 0);  /* leading quiet */
-+    int i, n = strlen(data);
-+    for(i = 0; i < n; i++) {
-+        int j = (dir) ? i : n - i - 1;
-+        encode_codachar(data[j], (i < n - 1) ? 1 : 0xa, dir);
-+    }
-+    print_sep(3);
-+}
- 
- /*------------------------------------------------------------*/
- /* Interleaved 2 of 5 encoding */
-@@ -303,21 +613,22 @@
-     0x06, 0x11, 0x09, 0x18, 0x05, 0x14, 0x0c, 0x03, 0x12, 0x0a,
- };
- 
--static void encode_i25 (unsigned char *data,
-+static void encode_i25 (char *data,
-                         int dir)
- {
--    printf("------------------------------------------------------------\n"
--           "encode Interleaved 2 of 5: %s\n"
--           "    encode start:", data);
-+    assert(zbar_decoder_get_color(decoder) == ZBAR_SPACE);
-+    print_sep(3);
-+    zprintf(2, "Interleaved 2 of 5: %s\n", data);
-+    zprintf(3, "    encode start:");
-     encode((dir) ? 0xa1111 : 0xa112, 0);
- 
-     /* FIXME rev case data reversal */
-     int i;
--    for(i = (strlen((char*)data) & 1) ? -1 : 0; i < 0 || data[i]; i += 2) {
-+    for(i = (strlen(data) & 1) ? -1 : 0; i < 0 || data[i]; i += 2) {
-         /* encode 2 digits */
-         unsigned char c0 = (i < 0) ? 0 : data[i] - '0';
-         unsigned char c1 = data[i + 1] - '0';
--        printf("    encode '%d%d':", c0, c1);
-+        zprintf(3, "    encode '%d%d':", c0, c1);
-         assert(c0 < 10);
-         assert(c1 < 10);
- 
-@@ -337,12 +648,252 @@
-         encode(enc, dir);
-     }
- 
--    printf("    encode end:");
-+    zprintf(3, "    encode end:");
-     encode((dir) ? 0x211a : 0x1111a, 0);
--    printf("------------------------------------------------------------\n");
-+    print_sep(3);
- }
- 
- /*------------------------------------------------------------*/
-+/* DataBar encoding */
-+
-+
-+/* character encoder reference algorithm from ISO/IEC 24724:2009 */
-+
-+struct rss_group {
-+    int T_odd, T_even, n_odd, w_max;
-+};
-+
-+static const struct rss_group databar_groups_outside[] = {
-+    { 161,   1, 12, 8 },
-+    {  80,  10, 10, 6 },
-+    {  31,  34,  8, 4 },
-+    {  10,  70,  6, 3 },
-+    {   1, 126,  4, 1 },
-+    {   0, }
-+};
-+
-+static const struct rss_group databar_groups_inside[] = {
-+    {  4, 84,  5, 2 },
-+    { 20, 35,  7, 4 },
-+    { 48, 10,  9, 6 },
-+    { 81,  1, 11, 8 },
-+    {  0, }
-+};
-+
-+static const uint32_t databar_finders[9] = {
-+    0x38211, 0x35511, 0x33711, 0x31911, 0x27411,
-+    0x25611, 0x23811, 0x15711, 0x13911,
-+};
-+
-+int combins (int n,
-+             int r)
-+{
-+    int i, j;
-+    int maxDenom, minDenom;
-+    int val;
-+    if(n-r > r) {
-+        minDenom = r;
-+        maxDenom = n-r;
-+    }
-+    else {
-+        minDenom = n-r;
-+        maxDenom = r;
-+    }
-+    val = 1;
-+    j = 1;
-+    for(i = n; i > maxDenom; i--) {
-+        val *= i;
-+        if(j <= minDenom) {
-+            val /= j;
-+            j++;
-+        }
-+    }
-+    for(; j <= minDenom; j++)
-+        val /= j;
-+    return(val);
-+}
-+
-+void getRSSWidths (int val,
-+                   int n,
-+                   int elements,
-+                   int maxWidth,
-+                   int noNarrow,
-+                   int *widths)
-+{
-+    int narrowMask = 0;
-+    int bar;
-+    for(bar = 0; bar < elements - 1; bar++) {
-+        int elmWidth, subVal;
-+        for(elmWidth = 1, narrowMask |= (1<<bar);
-+            ;
-+            elmWidth++, narrowMask &= ~(1<<bar))
-+        {
-+            subVal = combins(n-elmWidth-1, elements-bar-2);
-+            if((!noNarrow) && !narrowMask &&
-+                (n-elmWidth-(elements-bar-1) >= elements-bar-1))
-+                subVal -= combins(n-elmWidth-(elements-bar), elements-bar-2);
-+            if(elements-bar-1 > 1) {
-+                int mxwElement, lessVal = 0;
-+                for (mxwElement = n-elmWidth-(elements-bar-2);
-+                     mxwElement > maxWidth;
-+                     mxwElement--)
-+                    lessVal += combins(n-elmWidth-mxwElement-1, elements-bar-3);
-+                subVal -= lessVal * (elements-1-bar);
-+            }
-+            else if (n-elmWidth > maxWidth)
-+                subVal--;
-+            val -= subVal;
-+            if(val < 0)
-+                break;
-+        }
-+        val += subVal;
-+        n -= elmWidth;
-+        widths[bar] = elmWidth;
-+    }
-+    widths[bar] = n;
-+}
-+
-+static uint64_t encode_databar_char (unsigned val,
-+                                     const struct rss_group *grp,
-+                                     int nmodules,
-+                                     int nelems,
-+                                     int dir)
-+{
-+    int G_sum = 0;
-+    while(1) {
-+        assert(grp->T_odd);
-+        int sum = G_sum + grp->T_odd * grp->T_even;
-+        if(val >= sum)
-+            G_sum = sum;
-+        else
-+            break;
-+        grp++;
-+    }
-+
-+    zprintf(3, "char=%d", val);
-+
-+    int V_grp = val - G_sum;
-+    int V_odd, V_even;
-+    if(!dir) {
-+        V_odd = V_grp / grp->T_even;
-+        V_even = V_grp % grp->T_even;
-+    }
-+    else {
-+        V_even = V_grp / grp->T_odd;
-+        V_odd = V_grp % grp->T_odd;
-+    }
-+
-+    zprintf(3, " G_sum=%d T_odd=%d T_even=%d n_odd=%d w_max=%d V_grp=%d\n",
-+            G_sum, grp->T_odd, grp->T_even, grp->n_odd, grp->w_max, V_grp);
-+
-+    int odd[16];
-+    getRSSWidths(V_odd, grp->n_odd, nelems, grp->w_max, !dir, odd);
-+    zprintf(3, "    V_odd=%d odd=%d%d%d%d",
-+            V_odd, odd[0], odd[1], odd[2], odd[3]);
-+
-+    int even[16];
-+    getRSSWidths(V_even, nmodules - grp->n_odd, nelems, 9 - grp->w_max,
-+                 dir, even);
-+    zprintf(3, " V_even=%d even=%d%d%d%d",
-+            V_even, even[0], even[1], even[2], even[3]);
-+
-+    uint64_t units = 0;
-+    int i;
-+    for(i = 0; i < nelems; i++)
-+        units = (units << 8) | (odd[i] << 4) | even[i];
-+
-+    zprintf(3, " raw=%"PRIx64"\n", units);
-+    return(units);
-+}
-+
-+#define SWAP(a, b) do { \
-+        uint32_t tmp = (a); \
-+        (a) = (b); \
-+        (b) = tmp; \
-+    } while(0);
-+
-+static void encode_databar (char *data,
-+                            int dir)
-+{
-+    assert(zbar_decoder_get_color(decoder) == ZBAR_SPACE);
-+
-+    print_sep(3);
-+    zprintf(2, "DataBar: %s\n", data);
-+
-+    uint32_t v[4] = { 0, };
-+    int i, j;
-+    for(i = 0; i < 14; i++) {
-+        for(j = 0; j < 4; j++)
-+            v[j] *= 10;
-+        assert(data[i]);
-+        v[0] += data[i] - '0';
-+        v[1] += v[0] / 1597;
-+        v[0] %= 1597;
-+        v[2] += v[1] / 2841;
-+        v[1] %= 2841;
-+        v[3] += v[2] / 1597;
-+        v[2] %= 1597;
-+        /*printf("    [%d] %c (%d,%d,%d,%d)\n",
-+               i, data[i], v[0], v[1], v[2], v[3]);*/
-+    }
-+    zprintf(3, "chars=(%d,%d,%d,%d)\n", v[3], v[2], v[1], v[0]);
-+
-+    uint32_t c[4] = {
-+        encode_databar_char(v[3], databar_groups_outside, 16, 4, 0),
-+        encode_databar_char(v[2], databar_groups_inside, 15, 4, 1),
-+        encode_databar_char(v[1], databar_groups_outside, 16, 4, 0),
-+        encode_databar_char(v[0], databar_groups_inside, 15, 4, 1),
-+    };
-+
-+    int chk = 0, w = 1;
-+    for(i = 0; i < 4; i++, chk %= 79, w %= 79)
-+        for(j = 0; j < 8; j++, w *= 3)
-+            chk += ((c[i] >> (28 - j * 4)) & 0xf) * w;
-+    zprintf(3, "chk=%d\n", chk);
-+
-+    if(chk >= 8) chk++;
-+    if(chk >= 72) chk++;
-+    int C_left = chk / 9;
-+    int C_right = chk % 9;
-+
-+    if(dir == REV) {
-+        SWAP(C_left, C_right);
-+        SWAP(c[0], c[2]);
-+        SWAP(c[1], c[3]);
-+        SWAP(v[0], v[2]);
-+        SWAP(v[1], v[3]);
-+    }
-+
-+    zprintf(3, "    encode start guard:");
-+    encode_junk(dir);
-+    encode(0x1, FWD);
-+
-+    zprintf(3, "encode char[0]=%d", v[3]);
-+    encode(c[0], REV);
-+
-+    zprintf(3, "encode left finder=%d", C_left);
-+    encode(databar_finders[C_left], REV);
-+
-+    zprintf(3, "encode char[1]=%d", v[2]);
-+    encode(c[1], FWD);
-+
-+    zprintf(3, "encode char[3]=%d", v[0]);
-+    encode(c[3], REV);
-+
-+    zprintf(3, "encode right finder=%d", C_right);
-+    encode(databar_finders[C_right], FWD);
-+
-+    zprintf(3, "encode char[2]=%d", v[1]);
-+    encode(c[2], FWD);
-+
-+    zprintf(3, "    encode end guard:");
-+    encode(0x1, FWD);
-+    encode_junk(!dir);
-+    print_sep(3);
-+}
-+
-+
-+/*------------------------------------------------------------*/
- /* EAN/UPC encoding */
- 
- static const unsigned int ean_digits[10] = {
-@@ -372,7 +923,20 @@
-     0x25,       /* ABBABA = 9 */
- };
- 
--static void calc_ean_parity (unsigned char *data,
-+static const unsigned char addon_parity_encode[] = {
-+    0x07,       /* BBAAA = 0 */
-+    0x0b,       /* BABAA = 1 */
-+    0x0d,       /* BAABA = 2 */
-+    0x0e,       /* BAAAB = 3 */
-+    0x13,       /* ABBAA = 4 */
-+    0x19,       /* AABBA = 5 */
-+    0x1c,       /* AAABB = 6 */
-+    0x15,       /* ABABA = 7 */
-+    0x16,       /* ABAAB = 8 */
-+    0x1a,       /* AABAB = 9 */
-+};
-+
-+static void calc_ean_parity (char *data,
-                              int n)
- {
-     int i, chk = 0;
-@@ -387,119 +951,372 @@
-     data[i] = 0;
- }
- 
--static void encode_ean13 (unsigned char *data)
-+static void encode_ean13 (char *data)
- {
-     int i;
-     unsigned char par = ean_parity_encode[data[0] - '0'];
-+    assert(zbar_decoder_get_color(decoder) == ZBAR_SPACE);
- 
--    printf("------------------------------------------------------------\n"
--           "encode EAN-13: %s (%02x)\n"
--           "    encode start guard:",
--           data, par);
-+    print_sep(3);
-+    zprintf(2, "EAN-13: %s (%02x)\n", data, par);
-+    zprintf(3, "    encode start guard:");
-     encode(ean_guard[3], FWD);
-     for(i = 1; i < 7; i++, par <<= 1) {
--        printf("    encode %x%c:", (par >> 5) & 1, data[i]);
--        encode(ean_digits[data[i] - '0'], REV ^ ((par >> 5) & 1));
-+        zprintf(3, "    encode %x%c:", (par >> 5) & 1, data[i]);
-+        encode(ean_digits[data[i] - '0'], (par >> 5) & 1);
-     }
--    printf("    encode center guard:");
-+    zprintf(3, "    encode center guard:");
-     encode(ean_guard[5], FWD);
-     for(; i < 13; i++) {
--        printf("    encode %x%c:", 0, data[i]);
-+        zprintf(3, "    encode %x%c:", 0, data[i]);
-         encode(ean_digits[data[i] - '0'], FWD);
-     }
--    printf("    encode end guard:");
-+    zprintf(3, "    encode end guard:");
-     encode(ean_guard[3], REV);
--    printf("------------------------------------------------------------\n");
-+    print_sep(3);
- }
- 
--static void encode_ean8 (unsigned char *data)
-+static void encode_ean8 (char *data)
- {
-     int i;
--    printf("------------------------------------------------------------\n"
--           "encode EAN-8: %s\n"
--           "    encode start guard:",
--           data);
-+    assert(zbar_decoder_get_color(decoder) == ZBAR_SPACE);
-+    print_sep(3);
-+    zprintf(2, "EAN-8: %s\n", data);
-+    zprintf(3, "    encode start guard:");
-     encode(ean_guard[3], FWD);
-     for(i = 0; i < 4; i++) {
--        printf("    encode %c:", data[i]);
-+        zprintf(3, "    encode %c:", data[i]);
-         encode(ean_digits[data[i] - '0'], FWD);
-     }
--    printf("    encode center guard:");
-+    zprintf(3, "    encode center guard:");
-     encode(ean_guard[5], FWD);
-     for(; i < 8; i++) {
--        printf("    encode %c:", data[i]);
-+        zprintf(3, "    encode %c:", data[i]);
-         encode(ean_digits[data[i] - '0'], FWD);
-     }
--    printf("    encode end guard:");
-+    zprintf(3, "    encode end guard:");
-     encode(ean_guard[3], REV);
--    printf("------------------------------------------------------------\n");
-+    print_sep(3);
-+}
-+
-+static void encode_addon (char *data,
-+                          unsigned par,
-+                          int n)
-+{
-+    int i;
-+    assert(zbar_decoder_get_color(decoder) == ZBAR_SPACE);
-+
-+    print_sep(3);
-+    zprintf(2, "EAN-%d: %s (par=%02x)\n", n, data, par);
-+    zprintf(3, "    encode start guard:");
-+    encode(ean_guard[4], FWD);
-+    for(i = 0; i < n; i++, par <<= 1) {
-+        zprintf(3, "    encode %x%c:", (par >> (n - 1)) & 1, data[i]);
-+        encode(ean_digits[data[i] - '0'], (par >> (n - 1)) & 1);
-+        if(i < n - 1) {
-+	    zprintf(3, "    encode delineator:");
-+            encode(ean_guard[2], FWD);
-+        }
-+    }
-+    zprintf(3, "    encode trailing qz:");
-+    encode(0x7, FWD);
-+    print_sep(3);
-+}
-+
-+static void encode_ean5 (char *data)
-+{
-+    unsigned chk = ((data[0] - '0' + data[2] - '0' + data[4] - '0') * 3 +
-+                    (data[1] - '0' + data[3] - '0') * 9) % 10;
-+    encode_addon(data, addon_parity_encode[chk], 5);
-+}
-+
-+static void encode_ean2 (char *data)
-+{
-+    unsigned par = (~(10 * (data[0] - '0') + data[1] - '0')) & 3;
-+    encode_addon(data, par, 2);
- }
- 
- 
- /*------------------------------------------------------------*/
- /* main test flow */
- 
--int main (int argc, char **argv)
-+int test_databar_F_1 ()
- {
--    int i;
--    int rnd_size = 9;           /* should be odd */
--    srand(0xbabeface);
-+    expect(ZBAR_DATABAR, "0124012345678905");
-+    assert(zbar_decoder_get_color(decoder) == ZBAR_SPACE);
-+    encode(0x11, 0);
-+    encode(0x31111333, 0);
-+    encode(0x13911, 0);
-+    encode(0x31131231, 0);
-+    encode(0x11214222, 0);
-+    encode(0x11553, 0);
-+    encode(0x21231313, 0);
-+    encode(0x1, 0);
-+    encode_junk(rnd_size);
-+    return(0);
-+}
- 
--    /* FIXME TBD:
--     *   - random module width (!= 1.0)
--     *   - simulate scan speed variance
--     *   - simulate dark "swelling" and light "blooming"
--     *   - inject parity errors
--     */
--    decoder = zbar_decoder_create();
--    zbar_decoder_set_handler(decoder, symbol_handler);
--    zbar_decoder_set_config(decoder, 0, ZBAR_CFG_MIN_LEN, 0);
-+int test_databar_F_3 ()
-+{
-+    expect(ZBAR_DATABAR_EXP, "1012A");
-+    assert(zbar_decoder_get_color(decoder) == ZBAR_SPACE);
-+    encode(0x11, 0);
-+    encode(0x11521151, 0);
-+    encode(0x18411, 0);
-+    encode(0x13171121, 0);
-+    encode(0x11521232, 0);
-+    encode(0x11481, 0);
-+    encode(0x23171111, 0);
-+    encode(0x1, 0);
-+    encode_junk(rnd_size);
-+    return(0);
-+}
- 
--    encode_junk(rnd_size + 1);
-+int test_orange ()
-+{
-+    char data[32] = "0100845963000052";
-+    expect(ZBAR_DATABAR, data);
-+    assert(zbar_decoder_get_color(decoder) == ZBAR_SPACE);
-+    encode(0x1, 0);
-+    encode(0x23212321, 0);   // data[0]
-+    encode(0x31911, 0);      // finder[?] = 3
-+    encode(0x21121215, 1);   // data[1]
-+    encode(0x41111133, 0);   // data[3]
-+    encode(0x23811, 1);      // finder[?] = 6
-+    encode(0x11215141, 1);   // data[2]
-+    encode(0x11, 0);
-+    encode_junk(rnd_size);
- 
--    unsigned char data[32] = { 0 };
--    for(i = 0; i < 12; i++)
--        data[i] = (rand() % 10) + '0';
-+    expect(ZBAR_DATABAR, data);
-+    data[1] = '0';
-+    encode_databar(data + 1, FWD);
-+    encode_junk(rnd_size);
-+    return(0);
-+}
- 
--    calc_ean_parity(data, 12);
--    encode_ean13(data);
-+int test_numeric (char *data)
-+{
-+    char tmp[32] = "01";
-+    strncpy(tmp + 2, data + 1, 13);
-+    calc_ean_parity(tmp + 2, 13);
-+    expect(ZBAR_DATABAR, tmp);
-+
-+    tmp[1] = data[0] & '1';
-+    encode_databar(tmp + 1, (rand() >> 8) & 1);
- 
-     encode_junk(rnd_size);
- 
--    data[i] = 0;
-+    data[strlen(data) & ~1] = 0;
-+    expect(ZBAR_CODE128, data);
-     encode_code128c(data);
- 
-     encode_junk(rnd_size);
- 
-+    expect(ZBAR_I25, data);
-     encode_i25(data, FWD);
- 
-     encode_junk(rnd_size);
--
-+#if 0 /* FIXME encoding broken */
-     encode_i25(data, REV);
- 
-     encode_junk(rnd_size);
-+#endif
- 
--    calc_ean_parity(data, 7);
--    encode_ean8(data);
-+    char *cdb = convert_codabar(data);
-+    expect(ZBAR_CODABAR, cdb);
-+    encode_codabar(cdb, FWD);
-+    encode_junk(rnd_size);
-+
-+    expect(ZBAR_CODABAR, cdb);
-+    encode_codabar(cdb, REV);
-+    encode_junk(rnd_size);
-+    free(cdb);
-+
-+    calc_ean_parity(data + 2, 12);
-+    expect(ZBAR_EAN13, data + 2);
-+    encode_ean13(data + 2);
-+    encode_junk(rnd_size);
-+
-+    calc_ean_parity(data + 7, 7);
-+    expect(ZBAR_EAN8, data + 7);
-+    encode_ean8(data + 7);
- 
-     encode_junk(rnd_size);
- 
-+    data[5] = 0;
-+    expect(ZBAR_EAN5, data);
-+    encode_ean5(data);
-+
-+    encode_junk(rnd_size);
-+
-+    data[2] = 0;
-+    expect(ZBAR_EAN2, data);
-+    encode_ean2(data);
-+    encode_junk(rnd_size);
-+
-+    expect(ZBAR_NONE, NULL);
-+    return(0);
-+}
-+
-+int test_alpha (char *data)
-+{
-+    expect(ZBAR_CODE128, data);
-+    encode_code128b(data);
-+
-+    encode_junk(rnd_size);
-+
-+    expect(ZBAR_CODE93, data);
-+    encode_code93(data, FWD);
-+
-+    encode_junk(rnd_size);
-+
-+    expect(ZBAR_CODE93, data);
-+    encode_code93(data, REV);
-+
-+    encode_junk(rnd_size);
-+
-+    char *cdb = convert_codabar(data);
-+    expect(ZBAR_CODABAR, cdb);
-+    encode_codabar(cdb, FWD);
-+    encode_junk(rnd_size);
-+
-+    expect(ZBAR_CODABAR, cdb);
-+    encode_codabar(cdb, REV);
-+    encode_junk(rnd_size);
-+    free(cdb);
-+
-+    convert_code39(data);
-+    expect(ZBAR_CODE39, data);
-+    encode_code39(data);
-+
-+    encode_junk(rnd_size);
-+
-+#if 0 /* FIXME decoder unfinished */
-+    encode_pdf417(data);
-+
-+    encode_junk(rnd_size);
-+#endif
-+
-+    expect(ZBAR_NONE, NULL);
-+    return(0);
-+}
-+
-+int test1 ()
-+{
-+    print_sep(2);
-+    if(!seed)
-+        seed = 0xbabeface;
-+    zprintf(1, "[%d] SEED=%d\n", iter++, seed);
-+    srand(seed);
-+    if(/* EAN-2 within DataBar (020596539169270)
-+        * (FIXME require COMPOSITE for addons)
-+        */
-+       seed == -862734747)
-+    {
-+        zprintf(2, "    FIXME known failure\n");
-+        return(2);
-+    }
-+
-+    int i;
-+    char data[32] = { 0, };
-+    for(i = 0; i < 14; i++)
-+        data[i] = (rand() % 10) + '0';
-+
-+    test_numeric(data);
-+
-     for(i = 0; i < 10; i++)
-         data[i] = (rand() % 0x5f) + 0x20;
-     data[i] = 0;
- 
--    encode_code128b(data);
-+    test_alpha(data);
-+    return(0);
-+}
- 
--    encode_junk(rnd_size);
-+/* FIXME TBD:
-+ *   - random module width (!= 1.0)
-+ *   - simulate scan speed variance
-+ *   - simulate dark "swelling" and light "blooming"
-+ *   - inject parity errors
-+ */
- 
--    /*encode_code39("0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ-. $/+%");*/
--    encode_code39(data);
-+int main (int argc, char **argv)
-+{
-+    int n, i, j;
-+    char *end;
- 
--    encode_junk(rnd_size);
-+    decoder = zbar_decoder_create();
-+    /* allow empty CODE39 symbologies */
-+    zbar_decoder_set_config(decoder, ZBAR_CODE39, ZBAR_CFG_MIN_LEN, 0);
-+    /* enable addons */
-+    zbar_decoder_set_config(decoder, ZBAR_EAN2, ZBAR_CFG_ENABLE, 1);
-+    zbar_decoder_set_config(decoder, ZBAR_EAN5, ZBAR_CFG_ENABLE, 1);
-+    zbar_decoder_set_handler(decoder, symbol_handler);
- 
--    encode_pdf417(data);
-+    encode_junk(rnd_size + 1);
- 
--    encode_junk(rnd_size);
-+    for(i = 1; i < argc; i++) {
-+        if(argv[i][0] != '-') {
-+            fprintf(stderr, "ERROR: unknown argument: %s\n", argv[i]);
-+            return(2);
-+        }
-+        for(j = 1; argv[i][j]; j++) {
-+            switch(argv[i][j])
-+            {
-+            case 'q': verbosity = 0; break;
-+            case 'v': verbosity++; break;
-+            case 'r':
-+                seed = time(NULL);
-+                srand(seed);
-+                seed = (rand() << 8) ^ rand();
-+                zprintf(0, "-r SEED=%d\n", seed);
-+                break;
-+
-+            case 's':
-+                if(!argv[i][++j] && !(j = 0) && ++i >= argc) {
-+                    fprintf(stderr, "ERROR: -s needs <seed> argument\n");
-+                    return(2);
-+                }
-+                long s = strtol(argv[i] + j, &end, 0);
-+                seed = s;
-+                if((!isdigit(argv[i][j]) && argv[i][j] != '-') ||
-+                   !s || s == LONG_MAX || s == LONG_MIN) {
-+                    fprintf(stderr, "ERROR: invalid <seed>: \"%s\"\n",
-+                            argv[i] + j);
-+                    return(2);
-+                }
-+                j = end - argv[i] - 1;
-+                break;
-+
-+            case 'n':
-+                if(!argv[i][++j] && !(j = 0) && ++i >= argc) {
-+                    fprintf(stderr, "ERROR: -n needs <num> argument\n");
-+                    return(2);
-+                }
-+                n = strtol(argv[i] + j, &end, 0);
-+                if(!isdigit(argv[i][j]) || !n) {
-+                    fprintf(stderr, "ERROR: invalid <num>: \"%s\"\n",
-+                            argv[i] + j);
-+                    return(2);
-+                }
-+                j = end - argv[i] - 1;
-+
-+                while(n--) {
-+                    test1();
-+                    seed = (rand() << 8) ^ rand();
-+                }
-+                break;
-+            }
-+        }
-+    }
-+
-+    if(!iter) {
-+        test_databar_F_1();
-+        test_databar_F_3();
-+        test_orange();
-+        test1();
-+    }
-+
-+    /* FIXME "Ran %d iterations in %gs\n\nOK\n" */
- 
-     zbar_decoder_destroy(decoder);
-     return(0);
-diff -r 563557a923d0 test/test_gtk.c
---- a/test/test_gtk.c	Tue Oct 27 11:25:59 2009 -0400
-+++ b/test/test_gtk.c	Fri Feb 22 08:54:29 2013 -0300
-@@ -45,7 +45,6 @@
-     GtkTextIter end;
-     gtk_text_buffer_get_end_iter(resultbuf, &end);
-     gtk_text_buffer_insert(resultbuf, &end, zbar_get_symbol_name(symbol), -1);
--    gtk_text_buffer_insert(resultbuf, &end, zbar_get_addon_name(symbol), -1);
-     gtk_text_buffer_insert(resultbuf, &end, ":", -1);
-     gtk_text_buffer_insert(resultbuf, &end, result, -1);
-     gtk_text_buffer_insert(resultbuf, &end, "\n", -1);
-diff -r 563557a923d0 test/test_images.c
---- a/test/test_images.c	Tue Oct 27 11:25:59 2009 -0400
-+++ b/test/test_images.c	Fri Feb 22 08:54:29 2013 -0300
-@@ -96,30 +96,74 @@
-     { 0 }
- };
- 
-+static const char *encoded_widths =
-+    "9 111 212241113121211311141132 11111 311213121312121332111132 111 9";
-+const char *test_image_ean13_data = "6268964977804";
-+
- static int allocated_images = 0;
- 
--int test_image_check_cleanup ()
-+int
-+test_image_check_cleanup ()
- {
-     if(allocated_images)
-         fprintf(stderr, "ERROR: %d image data buffers still allocated\n",
-                 allocated_images);
--    else
--        fprintf(stderr, "all image data buffers freed\n");
-+    /*else
-+        fprintf(stderr, "all image data buffers freed\n");*/
-     return(allocated_images);
- }
- 
--static void test_cleanup_handler (zbar_image_t *img)
-+static void
-+test_cleanup_handler (zbar_image_t *img)
- {
-     void *data = (void*)zbar_image_get_data(img);
--    fprintf(stderr, "cleanup image data @%p\n", data);
-+    /*fprintf(stderr, "cleanup image data @%p\n", data);*/
-     free(data);
-     allocated_images--;
- }
- 
-+static inline const format_def_t*
-+lookup_format (zbar_image_t *img)
-+{
-+    uint32_t ifmt = zbar_image_get_format(img);
-+    const format_def_t *fmt;
-+    for(fmt = formats; fmt->format; fmt++)
-+        if(fmt->format == ifmt)
-+            break;
-+    if(!fmt->format) {
-+        fprintf(stderr, "ERROR: no %.4s (%08"PRIx32") format\n",
-+                (char*)&ifmt, ifmt);
-+        return(NULL);
-+    }
-+    return(fmt);
-+}
-+
-+static inline const format_def_t*
-+alloc_data (zbar_image_t *img)
-+{
-+    allocated_images++;
-+    const format_def_t *fmt = lookup_format(img);
-+    if(!fmt)
-+        return(NULL);
-+
-+    unsigned w = zbar_image_get_width(img);
-+    unsigned h = zbar_image_get_height(img);
-+    unsigned long planelen = w * h;
-+    unsigned long datalen = planelen * fmt->bpp / 8;
-+    uint8_t *data = malloc(datalen);
-+
-+    zbar_image_set_data(img, data, datalen, test_cleanup_handler);
-+
-+    /*fprintf(stderr, "create %.4s(%08"PRIx32") image data %lx bytes @%p\n",
-+      (char*)&fmt->format, fmt->format, datalen, data);*/
-+    return(fmt);
-+}
-+
- /* write intensity plane */
--static inline uint8_t *fill_bars_y (uint8_t *p,
--                                    unsigned w,
--                                    unsigned h)
-+static inline uint8_t*
-+fill_bars_y (uint8_t *p,
-+             unsigned w,
-+             unsigned h)
- {
-     unsigned x, y, i;
-     unsigned y0 = (h + 31) / 30;
-@@ -145,10 +189,11 @@
- }
- 
- /* write Cb (U) or Cr (V) plane */
--static inline uint8_t *fill_bars_uv (uint8_t *p,
--                                     unsigned w,
--                                     unsigned h,
--                                     const uint8_t *C)
-+static inline uint8_t*
-+fill_bars_uv (uint8_t *p,
-+              unsigned w,
-+              unsigned h,
-+              const uint8_t *C)
- {
-     unsigned x, y, i;
-     unsigned y0 = (h + 31) / 30;
-@@ -174,10 +219,11 @@
- }
- 
- /* write packed CbCr plane */
--static inline uint8_t *fill_bars_nv (uint8_t *p,
--                                     unsigned w,
--                                     unsigned h,
--                                     format_type_t order)
-+static inline uint8_t*
-+fill_bars_nv (uint8_t *p,
-+              unsigned w,
-+              unsigned h,
-+              format_type_t order)
- {
-     unsigned x, y, i;
-     unsigned y0 = (h + 31) / 30;
-@@ -208,10 +254,11 @@
- }
- 
- /* write packed YCbCr plane */
--static inline uint8_t *fill_bars_yuv (uint8_t *p,
--                                      unsigned w,
--                                      unsigned h,
--                                      format_type_t order)
-+static inline uint8_t*
-+fill_bars_yuv (uint8_t *p,
-+               unsigned w,
-+               unsigned h,
-+               format_type_t order)
- {
-     unsigned x, y, i;
-     unsigned y0 = (h + 31) / 30;
-@@ -253,11 +300,12 @@
-     return((uint8_t*)q);
- }
- 
--static inline uint8_t *fill_bars_rgb (uint8_t *p,
--                                      unsigned w,
--                                      unsigned h,
--                                      format_type_t order,
--                                      int bpp)
-+static inline uint8_t*
-+fill_bars_rgb (uint8_t *p,
-+               unsigned w,
-+               unsigned h,
-+               format_type_t order,
-+               int bpp)
- {
-     unsigned x, y, i;
-     unsigned y0 = (h + 31) / 30;
-@@ -336,26 +384,17 @@
-     return(((uint8_t*)q) + headlen);
- }
- 
--int test_image_bars (zbar_image_t *img)
-+int
-+test_image_bars (zbar_image_t *img)
- {
--    allocated_images++;
-+    const format_def_t *fmt = alloc_data(img);
-+    if(!fmt)
-+        return(-1);
-+
-     unsigned w = zbar_image_get_width(img);
-     unsigned h = zbar_image_get_height(img);
--
--    const format_def_t *fmt;
--    for(fmt = formats; fmt->format; fmt++)
--        if(fmt->format == zbar_image_get_format(img))
--            break;
--    if(!fmt->format)
--        return(-1);
--
--    unsigned long planelen = w * h;
--    unsigned long datalen = planelen * fmt->bpp / 8;
--    uint8_t *data = malloc(datalen);
--    zbar_image_set_data(img, data, datalen, test_cleanup_handler);
--    fprintf(stderr, "create %.4s(%08" PRIx32 ") image data %lx bytes @%p\n",
--            (char*)&fmt->format, fmt->format, datalen, data);
--
-+    uint8_t *data = (void*)zbar_image_get_data(img);
-+    assert(data);
-     uint8_t *p = data;
-     switch(fmt->type) {
-     case GRAY:
-@@ -390,6 +429,88 @@
-         break;
-     }
- 
-+    assert(p == data + zbar_image_get_data_length(img));
-+    return(0);
-+}
-+
-+int
-+test_image_ean13 (zbar_image_t *img)
-+{
-+    unsigned w = 114, h = 85;
-+    zbar_image_set_size(img, w, h);
-+
-+    const format_def_t *fmt = alloc_data(img);
-+    if(!fmt)
-+        return(-1);
-+
-+    uint8_t *data = (void*)zbar_image_get_data(img);
-+    unsigned int datalen = zbar_image_get_data_length(img);
-+    assert(data && datalen);
-+
-+    uint8_t *p = data;
-+    /* FIXME randomize? */
-+    memset(data, 0x80, datalen);
-+
-+    int nrep = 1, nskip = 0;
-+    switch(fmt->type)
-+    {
-+    case YUVP: /* planar YUV */
-+    case YVUP:
-+    case GRAY:
-+        break;
-+
-+    case UYVY: /* packed YUV */
-+        p++;
-+    case YUYV:
-+    case YVYU:
-+        nskip = 1;
-+        break;
-+
-+    default: /* RGB */
-+        nrep = fmt->bpp / 8;
-+    }
-+
-+    int y = 0, x, i;
-+    for(; y < 10 && y < h; y++)
-+        for(x = 0; x < w; x++) {
-+            for(i = 0; i < nrep; i++)
-+                *p++ = 0xff;
-+            p += nskip;
-+        }
-+
-+    for(; y < h - 10; y++) {
-+        uint8_t color = 0xff;
-+        const char *c;
-+        for(x = 0, c = encoded_widths; *c; c++) {
-+            int dx;
-+            if(*c == ' ')
-+                continue;
-+            for(dx = *c - '0'; dx > 0; dx--) {
-+                for(i = 0; i < nrep; i++)
-+                    *p++ = color;
-+                p += nskip;
-+                x++;
-+            }
-+            color = ~color;
-+        }
-+        assert(!color);
-+        for(; x < w; x++) {
-+            for(i = 0; i < nrep; i++)
-+                *p++ = 0xff;
-+            p += nskip;
-+        }
-+        assert(x == w);
-+    }
-+
-+    for(; y < h; y++)
-+        for(x = 0; x < w; x++) {
-+            for(i = 0; i < nrep; i++)
-+                *p++ = 0xff;
-+            p += nskip;
-+        }
-+
-+    if(fmt->type == UYVY)
-+        p--;
-     assert(p == data + datalen);
-     return(0);
- }
-diff -r 563557a923d0 test/test_images.h
---- a/test/test_images.h	Tue Oct 27 11:25:59 2009 -0400
-+++ b/test/test_images.h	Fri Feb 22 08:54:29 2013 -0300
-@@ -1,5 +1,5 @@
- /*------------------------------------------------------------------------
-- *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-  *
-  *  This file is part of the ZBar Bar Code Reader.
-  *
-@@ -23,12 +23,24 @@
- #ifndef _TEST_IMAGES_H_
- #define _TEST_IMAGES_H_
- 
--/* adapted from v4l2 spec */
--#define fourcc(a, b, c, d)                      \
--    ((uint32_t)(a) | ((uint32_t)(b) << 8) |     \
--     ((uint32_t)(c) << 16) | ((uint32_t)(d) << 24))
-+#define fourcc zbar_fourcc
-+
-+#ifdef __cplusplus
-+
-+extern "C" {
-+    int test_image_check_cleanup(void);
-+    int test_image_bars(zbar::zbar_image_t*);
-+    int test_image_ean13(zbar::zbar_image_t*);
-+}
-+
-+#else
- 
- int test_image_check_cleanup(void);
- int test_image_bars(zbar_image_t*);
-+int test_image_ean13(zbar_image_t*);
- 
- #endif
-+
-+extern const char *test_image_ean13_data;
-+
-+#endif
-diff -r 563557a923d0 zbar.spec.in
---- a/zbar.spec.in	Tue Oct 27 11:25:59 2009 -0400
-+++ b/zbar.spec.in	Fri Feb 22 08:54:29 2013 -0300
-@@ -15,8 +15,8 @@
- %description
- The ZBar Bar Code Reader is a library for scanning and decoding bar
- codes from various sources such as video streams, image files or raw
--intensity sensors.  It supports EAN, UPC, Code 128, Code 39 and
--Interleaved 2 of 5. The flexible, layered architecture features a
-+intensity sensors.  It supports EAN, UPC, Code 128, Code 93, Code 39
-+and Interleaved 2 of 5. The flexible, layered architecture features a
- fast, streaming interface with a minimal memory footprint.
- 
- %package devel
-@@ -27,8 +27,8 @@
- %description devel
- The ZBar Bar Code Reader is a library for scanning and decoding bar
- codes from various sources such as video streams, image files or raw
--intensity sensors.  It supports EAN, UPC, Code 128, Code 39 and
--Interleaved 2 of 5. The flexible, layered architecture features a
-+intensity sensors.  It supports EAN, UPC, Code 128, Code 93, Code 39
-+and Interleaved 2 of 5. The flexible, layered architecture features a
- fast, streaming interface with a minimal memory footprint.
- 
- This package contains header files and additional libraries used for
-@@ -42,8 +42,8 @@
- %description gtk
- The ZBar Bar Code Reader is a library for scanning and decoding bar
- codes from various sources such as video streams, image files or raw
--intensity sensors.  It supports EAN, UPC, Code 128, Code 39 and
--Interleaved 2 of 5. The flexible, layered architecture features a
-+intensity sensors.  It supports EAN, UPC, Code 128, Code 93, Code 39
-+and Interleaved 2 of 5. The flexible, layered architecture features a
- fast, streaming interface with a minimal memory footprint.
- 
- This package contains a bar code scanning widget for use with GUI
-@@ -57,8 +57,8 @@
- %description gtk-devel
- The ZBar Bar Code Reader is a library for scanning and decoding bar
- codes from various sources such as video streams, image files or raw
--intensity sensors.  It supports EAN, UPC, Code 128, Code 39 and
--Interleaved 2 of 5. The flexible, layered architecture features a
-+intensity sensors.  It supports EAN, UPC, Code 128, Code 93, Code 39
-+and Interleaved 2 of 5. The flexible, layered architecture features a
- fast, streaming interface with a minimal memory footprint.
- 
- This package contains header files and additional libraries used for
-@@ -73,8 +73,8 @@
- %description pygtk
- The ZBar Bar Code Reader is a library for scanning and decoding bar
- codes from various sources such as video streams, image files or raw
--intensity sensors.  It supports EAN, UPC, Code 128, Code 39 and
--Interleaved 2 of 5. The flexible, layered architecture features a
-+intensity sensors.  It supports EAN, UPC, Code 128, Code 93, Code 39
-+and Interleaved 2 of 5. The flexible, layered architecture features a
- fast, streaming interface with a minimal memory footprint.
- 
- This package contains a bar code scanning widget for use in GUI
-@@ -88,8 +88,8 @@
- %description qt
- The ZBar Bar Code Reader is a library for scanning and decoding bar
- codes from various sources such as video streams, image files or raw
--intensity sensors.  It supports EAN, UPC, Code 128, Code 39 and
--Interleaved 2 of 5. The flexible, layered architecture features a
-+intensity sensors.  It supports EAN, UPC, Code 128, Code 93, Code 39
-+and Interleaved 2 of 5. The flexible, layered architecture features a
- fast, streaming interface with a minimal memory footprint.
- 
- This package contains a bar code scanning widget for use with GUI
-@@ -103,8 +103,8 @@
- %description qt-devel
- The ZBar Bar Code Reader is a library for scanning and decoding bar
- codes from various sources such as video streams, image files or raw
--intensity sensors.  It supports EAN, UPC, Code 128, Code 39 and
--Interleaved 2 of 5. The flexible, layered architecture features a
-+intensity sensors.  It supports EAN, UPC, Code 128, Code 93, Code 39
-+and Interleaved 2 of 5. The flexible, layered architecture features a
- fast, streaming interface with a minimal memory footprint.
- 
- This package contains header files and additional libraries used for
-diff -r 563557a923d0 zbar/Makefile.am.inc
---- a/zbar/Makefile.am.inc	Tue Oct 27 11:25:59 2009 -0400
-+++ b/zbar/Makefile.am.inc	Fri Feb 22 08:54:29 2013 -0300
-@@ -19,12 +19,21 @@
- if ENABLE_EAN
- zbar_libzbar_la_SOURCES += zbar/decoder/ean.h zbar/decoder/ean.c
- endif
-+if ENABLE_DATABAR
-+zbar_libzbar_la_SOURCES += zbar/decoder/databar.h zbar/decoder/databar.c
-+endif
- if ENABLE_CODE128
- zbar_libzbar_la_SOURCES += zbar/decoder/code128.h zbar/decoder/code128.c
- endif
-+if ENABLE_CODE93
-+zbar_libzbar_la_SOURCES += zbar/decoder/code93.h zbar/decoder/code93.c
-+endif
- if ENABLE_CODE39
- zbar_libzbar_la_SOURCES += zbar/decoder/code39.h zbar/decoder/code39.c
- endif
-+if ENABLE_CODABAR
-+zbar_libzbar_la_SOURCES += zbar/decoder/codabar.h zbar/decoder/codabar.c
-+endif
- if ENABLE_I25
- zbar_libzbar_la_SOURCES += zbar/decoder/i25.h zbar/decoder/i25.c
- endif
-@@ -53,11 +62,14 @@
- zbar_libzbar_la_SOURCES += zbar/processor/posix.h zbar/processor/posix.c
- endif
- 
-+if HAVE_V4L2
-+zbar_libzbar_la_SOURCES += zbar/video/v4l.c zbar/video/v4l2.c
-+endif
- if HAVE_V4L1
-+if !HAVE_V4L2
-+zbar_libzbar_la_SOURCES += zbar/video/v4l.c
-+endif
- zbar_libzbar_la_SOURCES += zbar/video/v4l1.c
--if HAVE_V4L2
--zbar_libzbar_la_SOURCES += zbar/video/v4l2.c
--endif
- endif
- if WIN32
- if HAVE_VIDEO
-diff -r 563557a923d0 zbar/config.c
---- a/zbar/config.c	Tue Oct 27 11:25:59 2009 -0400
-+++ b/zbar/config.c	Fri Feb 22 08:54:29 2013 -0300
-@@ -1,5 +1,5 @@
- /*------------------------------------------------------------------------
-- *  Copyright 2008-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+ *  Copyright 2008-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-  *
-  *  This file is part of the ZBar Bar Code Reader.
-  *
-@@ -24,20 +24,24 @@
- #include <config.h>
- #include <stdlib.h>     /* strtol */
- #include <string.h>     /* strchr, strncmp, strlen */
--#include <errno.h>
--#include <assert.h>
-+#ifdef HAVE_ERRNO_H
-+# include <errno.h>
-+#endif
- 
- #include <zbar.h>
- 
- int zbar_parse_config (const char *cfgstr,
--                        zbar_symbol_type_t *sym,
--                        zbar_config_t *cfg,
--                        int *val)
-+                       zbar_symbol_type_t *sym,
-+                       zbar_config_t *cfg,
-+                       int *val)
- {
-+    const char *dot, *eq;
-+    int len;
-+    char negate;
-     if(!cfgstr)
-         return(1);
- 
--    const char *dot = strchr(cfgstr, '.');
-+    dot = strchr(cfgstr, '.');
-     if(dot) {
-         int len = dot - cfgstr;
-         if(!len || (len == 1 && !strncmp(cfgstr, "*", len)))
-@@ -46,6 +50,8 @@
-             return(1);
-         else if(!strncmp(cfgstr, "qrcode", len))
-             *sym = ZBAR_QRCODE;
-+        else if(!strncmp(cfgstr, "db", len))
-+            *sym = ZBAR_DATABAR;
-         else if(len < 3)
-             return(1);
-         else if(!strncmp(cfgstr, "upca", len))
-@@ -56,6 +62,12 @@
-             *sym = ZBAR_EAN13;
-         else if(!strncmp(cfgstr, "ean8", len))
-             *sym = ZBAR_EAN8;
-+        else if(!strncmp(cfgstr, "ean5", len))
-+            *sym = ZBAR_EAN5;
-+        else if(!strncmp(cfgstr, "ean2", len))
-+            *sym = ZBAR_EAN2;
-+        else if(!strncmp(cfgstr, "composite", len))
-+            *sym = ZBAR_COMPOSITE;
-         else if(!strncmp(cfgstr, "i25", len))
-             *sym = ZBAR_I25;
-         else if(len < 4)
-@@ -66,15 +78,14 @@
-             *sym = ZBAR_ISBN13;
-         else if(!strncmp(cfgstr, "isbn10", len))
-             *sym = ZBAR_ISBN10;
--#if 0
--        /* FIXME addons are configured per-main symbol type */
--        else if(!strncmp(cfgstr, "addon2", len))
--            *sym = ZBAR_ADDON2;
--        else if(!strncmp(cfgstr, "addon5", len))
--            *sym = ZBAR_ADDON5;
--#endif
-+        else if(!strncmp(cfgstr, "db-exp", len))
-+            *sym = ZBAR_DATABAR_EXP;
-+        else if(!strncmp(cfgstr, "codabar", len))
-+            *sym = ZBAR_CODABAR;
-         else if(len < 6)
-             return(1);
-+        else if(!strncmp(cfgstr, "code93", len))
-+            *sym = ZBAR_CODE93;
-         else if(!strncmp(cfgstr, "code39", len))
-             *sym = ZBAR_CODE39;
-         else if(!strncmp(cfgstr, "pdf417", len))
-@@ -83,6 +94,10 @@
-             return(1);
-         else if(!strncmp(cfgstr, "code128", len))
-             *sym = ZBAR_CODE128;
-+        else if(!strncmp(cfgstr, "databar", len))
-+            *sym = ZBAR_DATABAR;
-+        else if(!strncmp(cfgstr, "databar-exp", len))
-+            *sym = ZBAR_DATABAR_EXP;
-         else
-             return(1);
-         cfgstr = dot + 1;
-@@ -90,13 +105,13 @@
-     else
-         *sym = 0;
- 
--    int len = strlen(cfgstr);
--    const char *eq = strchr(cfgstr, '=');
-+    len = strlen(cfgstr);
-+    eq = strchr(cfgstr, '=');
-     if(eq)
-         len = eq - cfgstr;
-     else
-         *val = 1;  /* handle this here so we can override later */
--    char negate = 0;
-+    negate = 0;
- 
-     if(len > 3 && !strncmp(cfgstr, "no-", 3)) {
-         negate = 1;
-@@ -130,16 +145,22 @@
-         *cfg = ZBAR_CFG_ADD_CHECK;
-     else if(!strncmp(cfgstr, "emit-check", len))
-         *cfg = ZBAR_CFG_EMIT_CHECK;
-+    else if(!strncmp(cfgstr, "uncertainty", len))
-+        *cfg = ZBAR_CFG_UNCERTAINTY;
-     else if(!strncmp(cfgstr, "position", len))
-         *cfg = ZBAR_CFG_POSITION;
-     else 
-         return(1);
- 
-     if(eq) {
-+#ifdef HAVE_ERRNO_H
-         errno = 0;
-+#endif
-         *val = strtol(eq + 1, NULL, 0);
-+#ifdef HAVE_ERRNO_H
-         if(errno)
-             return(1);
-+#endif
-     }
-     if(negate)
-         *val = !*val;
-diff -r 563557a923d0 zbar/convert.c
---- a/zbar/convert.c	Tue Oct 27 11:25:59 2009 -0400
-+++ b/zbar/convert.c	Fri Feb 22 08:54:29 2013 -0300
-@@ -1,5 +1,5 @@
- /*------------------------------------------------------------------------
-- *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-  *
-  *  This file is part of the ZBar Bar Code Reader.
-  *
-@@ -236,12 +236,13 @@
- static inline void uv_roundup (zbar_image_t *img,
-                                const zbar_format_def_t *fmt)
- {
-+    unsigned xmask, ymask;
-     if(fmt->group == ZBAR_FMT_GRAY)
-         return;
--    unsigned xmask = (1 << fmt->p.yuv.xsub2) - 1;
-+    xmask = (1 << fmt->p.yuv.xsub2) - 1;
-     if(img->width & xmask)
-         img->width = (img->width + xmask) & ~xmask;
--    unsigned ymask = (1 << fmt->p.yuv.ysub2) - 1;
-+    ymask = (1 << fmt->p.yuv.ysub2) - 1;
-     if(img->height & ymask)
-         img->height = (img->height + ymask) & ~ymask;
- }
-@@ -306,16 +307,18 @@
-                                      const zbar_format_def_t *srcfmt,
-                                      size_t n)
- {
-+    uint8_t *psrc, *pdst;
-+    unsigned width, height, xpad, y;
-+
-     if(dst->width == src->width && dst->height == src->height) {
-         memcpy((void*)dst->data, src->data, n);
-         return;
-     }
--    uint8_t *psrc = (void*)src->data;
--    uint8_t *pdst = (void*)dst->data;
--    unsigned width = (dst->width > src->width) ? src->width : dst->width;
--    unsigned xpad = (dst->width > src->width) ? dst->width - src->width : 0;
--    unsigned height = (dst->height > src->height) ? src->height : dst->height;
--    unsigned y;
-+    psrc = (void*)src->data;
-+    pdst = (void*)dst->data;
-+    width = (dst->width > src->width) ? src->width : dst->width;
-+    xpad = (dst->width > src->width) ? dst->width - src->width : 0;
-+    height = (dst->height > src->height) ? src->height : dst->height;
-     for(y = 0; y < height; y++) {
-         memcpy(pdst, psrc, width);
-         pdst += width;
-@@ -344,10 +347,10 @@
- {
-     if(src->width == dst->width &&
-        src->height == dst->height) {
-+        zbar_image_t *s = (zbar_image_t*)src;
-         dst->data = src->data;
-         dst->datalen = src->datalen;
-         dst->cleanup = cleanup_ref;
--        zbar_image_t *s = (zbar_image_t*)src;
-         dst->next = s;
-         _zbar_image_refcnt(s, 1);
-     }
-@@ -362,9 +365,10 @@
-                                 const zbar_image_t *src,
-                                 const zbar_format_def_t *srcfmt)
- {
-+    unsigned long n;
-     uv_roundup(dst, dstfmt);
-     dst->datalen = uvp_size(dst, dstfmt) * 2;
--    unsigned long n = dst->width * dst->height;
-+    n = dst->width * dst->height;
-     dst->datalen += n;
-     assert(src->datalen >= src->width * src->height);
-     zprintf(24, "dst=%dx%d (%lx) %lx src=%dx%d %lx\n",
-@@ -373,7 +377,7 @@
-     dst->data = malloc(dst->datalen);
-     if(!dst->data) return;
-     convert_y_resize(dst, dstfmt, src, srcfmt, n);
--    memset((void*)dst->data + n, 0x80, dst->datalen - n);
-+    memset((uint8_t*)dst->data + n, 0x80, dst->datalen - n);
- }
- 
- /* interleave YUV planes into packed YUV */
-@@ -382,32 +386,35 @@
-                               const zbar_image_t *src,
-                               const zbar_format_def_t *srcfmt)
- {
-+    unsigned long srcm, srcn;
-+    uint8_t flags, *srcy, *dstp;
-+    const uint8_t *srcu, *srcv;
-+    unsigned srcl, xmask, ymask, x, y;
-+    uint8_t y0 = 0, y1 = 0, u = 0x80, v = 0x80;
-+
-     uv_roundup(dst, dstfmt);
-     dst->datalen = dst->width * dst->height + uvp_size(dst, dstfmt) * 2;
-     dst->data = malloc(dst->datalen);
-     if(!dst->data) return;
--    uint8_t *dstp = (void*)dst->data;
-+    dstp = (void*)dst->data;
- 
--    unsigned long srcm = uvp_size(src, srcfmt);
--    unsigned long srcn = src->width * src->height;
-+    srcm = uvp_size(src, srcfmt);
-+    srcn = src->width * src->height;
-     assert(src->datalen >= srcn + 2 * srcn);
--    uint8_t flags = dstfmt->p.yuv.packorder ^ srcfmt->p.yuv.packorder;
--    uint8_t *srcy = (void*)src->data;
--    const uint8_t *srcu, *srcv;
-+    flags = dstfmt->p.yuv.packorder ^ srcfmt->p.yuv.packorder;
-+    srcy = (void*)src->data;
-     if(flags & 1) {
--        srcv = src->data + srcn;
-+        srcv = (uint8_t*)src->data + srcn;
-         srcu = srcv + srcm;
-     } else {
--        srcu = src->data + srcn;
-+        srcu = (uint8_t*)src->data + srcn;
-         srcv = srcu + srcm;
-     }
-     flags = dstfmt->p.yuv.packorder & 2;
- 
--    unsigned srcl = src->width >> srcfmt->p.yuv.xsub2;
--    unsigned xmask = (1 << srcfmt->p.yuv.xsub2) - 1;
--    unsigned ymask = (1 << srcfmt->p.yuv.ysub2) - 1;
--    unsigned x, y;
--    uint8_t y0 = 0, y1 = 0, u = 0x80, v = 0x80;
-+    srcl = src->width >> srcfmt->p.yuv.xsub2;
-+    xmask = (1 << srcfmt->p.yuv.xsub2) - 1;
-+    ymask = (1 << srcfmt->p.yuv.ysub2) - 1;
-     for(y = 0; y < dst->height; y++) {
-         if(y >= src->height) {
-             srcy -= src->width;
-@@ -448,25 +455,29 @@
-                                 const zbar_image_t *src,
-                                 const zbar_format_def_t *srcfmt)
- {
-+    unsigned long dstn, dstm2;
-+    uint8_t *dsty, flags;
-+    const uint8_t *srcp;
-+    unsigned srcl, x, y;
-+    uint8_t y0 = 0, y1 = 0;
-+
-     uv_roundup(dst, dstfmt);
--    unsigned long dstn = dst->width * dst->height;
--    unsigned long dstm2 = uvp_size(dst, dstfmt) * 2;
-+    dstn = dst->width * dst->height;
-+    dstm2 = uvp_size(dst, dstfmt) * 2;
-     dst->datalen = dstn + dstm2;
-     dst->data = malloc(dst->datalen);
-     if(!dst->data) return;
-     if(dstm2)
--        memset((void*)dst->data + dstn, 0x80, dstm2);
--    uint8_t *dsty = (void*)dst->data;
-+        memset((uint8_t*)dst->data + dstn, 0x80, dstm2);
-+    dsty = (uint8_t*)dst->data;
- 
--    uint8_t flags = srcfmt->p.yuv.packorder ^ dstfmt->p.yuv.packorder;
-+    flags = srcfmt->p.yuv.packorder ^ dstfmt->p.yuv.packorder;
-     flags &= 2;
--    const uint8_t *srcp = src->data;
-+    srcp = src->data;
-     if(flags)
-         srcp++;
- 
--    unsigned srcl = src->width + (src->width >> srcfmt->p.yuv.xsub2);
--    unsigned x, y;
--    uint8_t y0 = 0, y1 = 0;
-+    srcl = src->width + (src->width >> srcfmt->p.yuv.xsub2);
-     for(y = 0; y < dst->height; y++) {
-         if(y >= src->height)
-             srcp -= srcl;
-@@ -491,15 +502,16 @@
-                                   const zbar_image_t *src,
-                                   const zbar_format_def_t *srcfmt)
- {
-+    unsigned long dstn, dstm2;
-     uv_roundup(dst, dstfmt);
--    unsigned long dstn = dst->width * dst->height;
--    unsigned long dstm2 = uvp_size(dst, dstfmt) * 2;
-+    dstn = dst->width * dst->height;
-+    dstm2 = uvp_size(dst, dstfmt) * 2;
-     dst->datalen = dstn + dstm2;
-     dst->data = malloc(dst->datalen);
-     if(!dst->data) return;
-     convert_y_resize(dst, dstfmt, src, srcfmt, dstn);
-     if(dstm2)
--        memset((void*)dst->data + dstn, 0x80, dstm2);
-+        memset((uint8_t*)dst->data + dstn, 0x80, dstm2);
- }
- 
- /* rearrange interleaved UV componets */
-@@ -508,19 +520,23 @@
-                                  const zbar_image_t *src,
-                                  const zbar_format_def_t *srcfmt)
- {
-+    unsigned long dstn;
-+    uint8_t *dstp, flags;
-+    const uint8_t *srcp;
-+    unsigned srcl, x, y;
-+    uint8_t y0 = 0, y1 = 0, u = 0x80, v = 0x80;
-+
-     uv_roundup(dst, dstfmt);
--    unsigned long dstn = dst->width * dst->height;
-+    dstn = dst->width * dst->height;
-     dst->datalen = dstn + uvp_size(dst, dstfmt) * 2;
-     dst->data = malloc(dst->datalen);
-     if(!dst->data) return;
--    uint8_t *dstp = (void*)dst->data;
-+    dstp = (void*)dst->data;
- 
--    uint8_t flags = (srcfmt->p.yuv.packorder ^ dstfmt->p.yuv.packorder) & 1;
--    const uint8_t *srcp = src->data;
-+    flags = (srcfmt->p.yuv.packorder ^ dstfmt->p.yuv.packorder) & 1;
-+    srcp = src->data;
- 
--    unsigned srcl = src->width + (src->width >> srcfmt->p.yuv.xsub2);
--    unsigned x, y;
--    uint8_t y0 = 0, y1 = 0, u = 0x80, v = 0x80;
-+    srcl = src->width + (src->width >> srcfmt->p.yuv.xsub2);
-     for(y = 0; y < dst->height; y++) {
-         if(y >= src->height)
-             srcp -= srcl;
-@@ -560,25 +576,29 @@
-                                  const zbar_image_t *src,
-                                  const zbar_format_def_t *srcfmt)
- {
-+    uint8_t *dstp, *srcy;
-+    int drbits, drbit0, dgbits, dgbit0, dbbits, dbbit0;
-+    unsigned long srcm, srcn;
-+    unsigned x, y;
-+    uint32_t p = 0;
-+
-     dst->datalen = dst->width * dst->height * dstfmt->p.rgb.bpp;
-     dst->data = malloc(dst->datalen);
-     if(!dst->data) return;
--    uint8_t *dstp = (void*)dst->data;
-+    dstp = (void*)dst->data;
- 
--    int drbits = RGB_SIZE(dstfmt->p.rgb.red);
--    int drbit0 = RGB_OFFSET(dstfmt->p.rgb.red);
--    int dgbits = RGB_SIZE(dstfmt->p.rgb.green);
--    int dgbit0 = RGB_OFFSET(dstfmt->p.rgb.green);
--    int dbbits = RGB_SIZE(dstfmt->p.rgb.blue);
--    int dbbit0 = RGB_OFFSET(dstfmt->p.rgb.blue);
-+    drbits = RGB_SIZE(dstfmt->p.rgb.red);
-+    drbit0 = RGB_OFFSET(dstfmt->p.rgb.red);
-+    dgbits = RGB_SIZE(dstfmt->p.rgb.green);
-+    dgbit0 = RGB_OFFSET(dstfmt->p.rgb.green);
-+    dbbits = RGB_SIZE(dstfmt->p.rgb.blue);
-+    dbbit0 = RGB_OFFSET(dstfmt->p.rgb.blue);
- 
--    unsigned long srcm = uvp_size(src, srcfmt);
--    unsigned long srcn = src->width * src->height;
-+    srcm = uvp_size(src, srcfmt);
-+    srcn = src->width * src->height;
-     assert(src->datalen >= srcn + 2 * srcm);
--    uint8_t *srcy = (void*)src->data;
-+    srcy = (void*)src->data;
- 
--    unsigned x, y;
--    uint32_t p = 0;
-     for(y = 0; y < dst->height; y++) {
-         if(y >= src->height)
-             srcy -= src->width;
-@@ -606,29 +626,34 @@
-                                  const zbar_image_t *src,
-                                  const zbar_format_def_t *srcfmt)
- {
-+    unsigned long dstn, dstm2;
-+    uint8_t *dsty;
-+    const uint8_t *srcp;
-+    int rbits, rbit0, gbits, gbit0, bbits, bbit0;
-+    unsigned srcl, x, y;
-+    uint16_t y0 = 0;
-+
-     uv_roundup(dst, dstfmt);
--    unsigned long dstn = dst->width * dst->height;
--    unsigned long dstm2 = uvp_size(dst, dstfmt) * 2;
-+    dstn = dst->width * dst->height;
-+    dstm2 = uvp_size(dst, dstfmt) * 2;
-     dst->datalen = dstn + dstm2;
-     dst->data = malloc(dst->datalen);
-     if(!dst->data) return;
-     if(dstm2)
--        memset((void*)dst->data + dstn, 0x80, dstm2);
--    uint8_t *dsty = (void*)dst->data;
-+        memset((uint8_t*)dst->data + dstn, 0x80, dstm2);
-+    dsty = (void*)dst->data;
- 
-     assert(src->datalen >= (src->width * src->height * srcfmt->p.rgb.bpp));
--    const uint8_t *srcp = src->data;
-+    srcp = src->data;
- 
--    int rbits = RGB_SIZE(srcfmt->p.rgb.red);
--    int rbit0 = RGB_OFFSET(srcfmt->p.rgb.red);
--    int gbits = RGB_SIZE(srcfmt->p.rgb.green);
--    int gbit0 = RGB_OFFSET(srcfmt->p.rgb.green);
--    int bbits = RGB_SIZE(srcfmt->p.rgb.blue);
--    int bbit0 = RGB_OFFSET(srcfmt->p.rgb.blue);
-+    rbits = RGB_SIZE(srcfmt->p.rgb.red);
-+    rbit0 = RGB_OFFSET(srcfmt->p.rgb.red);
-+    gbits = RGB_SIZE(srcfmt->p.rgb.green);
-+    gbit0 = RGB_OFFSET(srcfmt->p.rgb.green);
-+    bbits = RGB_SIZE(srcfmt->p.rgb.blue);
-+    bbit0 = RGB_OFFSET(srcfmt->p.rgb.blue);
- 
--    unsigned srcl = src->width * srcfmt->p.rgb.bpp;
--    unsigned x, y;
--    uint16_t y0 = 0;
-+    srcl = src->width * srcfmt->p.rgb.bpp;
-     for(y = 0; y < dst->height; y++) {
-         if(y >= src->height)
-             srcp -= srcl;
-@@ -659,29 +684,33 @@
-                                 const zbar_image_t *src,
-                                 const zbar_format_def_t *srcfmt)
- {
-+    uint8_t *dstp;
-     unsigned long dstn = dst->width * dst->height;
-+    int drbits, drbit0, dgbits, dgbit0, dbbits, dbbit0;
-+    const uint8_t *srcp;
-+    unsigned srcl, x, y;
-+    uint32_t p = 0;
-+
-     dst->datalen = dstn * dstfmt->p.rgb.bpp;
-     dst->data = malloc(dst->datalen);
-     if(!dst->data) return;
--    uint8_t *dstp = (void*)dst->data;
-+    dstp = (void*)dst->data;
- 
--    int drbits = RGB_SIZE(dstfmt->p.rgb.red);
--    int drbit0 = RGB_OFFSET(dstfmt->p.rgb.red);
--    int dgbits = RGB_SIZE(dstfmt->p.rgb.green);
--    int dgbit0 = RGB_OFFSET(dstfmt->p.rgb.green);
--    int dbbits = RGB_SIZE(dstfmt->p.rgb.blue);
--    int dbbit0 = RGB_OFFSET(dstfmt->p.rgb.blue);
-+    drbits = RGB_SIZE(dstfmt->p.rgb.red);
-+    drbit0 = RGB_OFFSET(dstfmt->p.rgb.red);
-+    dgbits = RGB_SIZE(dstfmt->p.rgb.green);
-+    dgbit0 = RGB_OFFSET(dstfmt->p.rgb.green);
-+    dbbits = RGB_SIZE(dstfmt->p.rgb.blue);
-+    dbbit0 = RGB_OFFSET(dstfmt->p.rgb.blue);
- 
-     assert(src->datalen >= (src->width * src->height +
-                             uvp_size(src, srcfmt) * 2));
--    const uint8_t *srcp = src->data;
-+    srcp = src->data;
-     if(srcfmt->p.yuv.packorder & 2)
-         srcp++;
- 
-     assert(srcfmt->p.yuv.xsub2 == 1);
--    unsigned srcl = src->width + (src->width >> 1);
--    unsigned x, y;
--    uint32_t p = 0;
-+    srcl = src->width + (src->width >> 1);
-     for(y = 0; y < dst->height; y++) {
-         if(y >= src->height)
-             srcp -= srcl;
-@@ -717,26 +746,30 @@
-                                 const zbar_image_t *src,
-                                 const zbar_format_def_t *srcfmt)
- {
-+    uint8_t *dstp, flags;
-+    const uint8_t *srcp;
-+    int rbits, rbit0, gbits, gbit0, bbits, bbit0;
-+    unsigned srcl, x, y;
-+    uint16_t y0 = 0;
-+
-     uv_roundup(dst, dstfmt);
-     dst->datalen = dst->width * dst->height + uvp_size(dst, dstfmt) * 2;
-     dst->data = malloc(dst->datalen);
-     if(!dst->data) return;
--    uint8_t *dstp = (void*)dst->data;
--    uint8_t flags = dstfmt->p.yuv.packorder & 2;
-+    dstp = (void*)dst->data;
-+    flags = dstfmt->p.yuv.packorder & 2;
- 
-     assert(src->datalen >= (src->width * src->height * srcfmt->p.rgb.bpp));
--    const uint8_t *srcp = src->data;
-+    srcp = src->data;
- 
--    int rbits = RGB_SIZE(srcfmt->p.rgb.red);
--    int rbit0 = RGB_OFFSET(srcfmt->p.rgb.red);
--    int gbits = RGB_SIZE(srcfmt->p.rgb.green);
--    int gbit0 = RGB_OFFSET(srcfmt->p.rgb.green);
--    int bbits = RGB_SIZE(srcfmt->p.rgb.blue);
--    int bbit0 = RGB_OFFSET(srcfmt->p.rgb.blue);
-+    rbits = RGB_SIZE(srcfmt->p.rgb.red);
-+    rbit0 = RGB_OFFSET(srcfmt->p.rgb.red);
-+    gbits = RGB_SIZE(srcfmt->p.rgb.green);
-+    gbit0 = RGB_OFFSET(srcfmt->p.rgb.green);
-+    bbits = RGB_SIZE(srcfmt->p.rgb.blue);
-+    bbit0 = RGB_OFFSET(srcfmt->p.rgb.blue);
- 
--    unsigned srcl = src->width * srcfmt->p.rgb.bpp;
--    unsigned x, y;
--    uint16_t y0 = 0;
-+    srcl = src->width * srcfmt->p.rgb.bpp;
-     for(y = 0; y < dst->height; y++) {
-         if(y >= src->height)
-             srcp -= srcl;
-@@ -773,31 +806,36 @@
-                                   const zbar_format_def_t *srcfmt)
- {
-     unsigned long dstn = dst->width * dst->height;
-+    uint8_t *dstp;
-+    int drbits, drbit0, dgbits, dgbit0, dbbits, dbbit0;
-+    int srbits, srbit0, sgbits, sgbit0, sbbits, sbbit0;
-+    const uint8_t *srcp;
-+    unsigned srcl, x, y;
-+    uint32_t p = 0;
-+
-     dst->datalen = dstn * dstfmt->p.rgb.bpp;
-     dst->data = malloc(dst->datalen);
-     if(!dst->data) return;
--    uint8_t *dstp = (void*)dst->data;
-+    dstp = (void*)dst->data;
- 
--    int drbits = RGB_SIZE(dstfmt->p.rgb.red);
--    int drbit0 = RGB_OFFSET(dstfmt->p.rgb.red);
--    int dgbits = RGB_SIZE(dstfmt->p.rgb.green);
--    int dgbit0 = RGB_OFFSET(dstfmt->p.rgb.green);
--    int dbbits = RGB_SIZE(dstfmt->p.rgb.blue);
--    int dbbit0 = RGB_OFFSET(dstfmt->p.rgb.blue);
-+    drbits = RGB_SIZE(dstfmt->p.rgb.red);
-+    drbit0 = RGB_OFFSET(dstfmt->p.rgb.red);
-+    dgbits = RGB_SIZE(dstfmt->p.rgb.green);
-+    dgbit0 = RGB_OFFSET(dstfmt->p.rgb.green);
-+    dbbits = RGB_SIZE(dstfmt->p.rgb.blue);
-+    dbbit0 = RGB_OFFSET(dstfmt->p.rgb.blue);
- 
-     assert(src->datalen >= (src->width * src->height * srcfmt->p.rgb.bpp));
--    const uint8_t *srcp = src->data;
-+    srcp = src->data;
- 
--    int srbits = RGB_SIZE(srcfmt->p.rgb.red);
--    int srbit0 = RGB_OFFSET(srcfmt->p.rgb.red);
--    int sgbits = RGB_SIZE(srcfmt->p.rgb.green);
--    int sgbit0 = RGB_OFFSET(srcfmt->p.rgb.green);
--    int sbbits = RGB_SIZE(srcfmt->p.rgb.blue);
--    int sbbit0 = RGB_OFFSET(srcfmt->p.rgb.blue);
-+    srbits = RGB_SIZE(srcfmt->p.rgb.red);
-+    srbit0 = RGB_OFFSET(srcfmt->p.rgb.red);
-+    sgbits = RGB_SIZE(srcfmt->p.rgb.green);
-+    sgbit0 = RGB_OFFSET(srcfmt->p.rgb.green);
-+    sbbits = RGB_SIZE(srcfmt->p.rgb.blue);
-+    sbbit0 = RGB_OFFSET(srcfmt->p.rgb.blue);
- 
--    unsigned srcl = src->width * srcfmt->p.rgb.bpp;
--    unsigned x, y;
--    uint32_t p = 0;
-+    srcl = src->width * srcfmt->p.rgb.bpp;
-     for(y = 0; y < dst->height; y++) {
-         if(y >= src->height)
-             y -= srcl;
-@@ -928,14 +966,12 @@
-     if(!src->src) {
-         tmp = zbar_image_create();
-         tmp->format = fourcc('Y','8','0','0');
--        tmp->width = dst->width;
--        tmp->height = dst->height;
-+        _zbar_image_copy_size(tmp, dst);
-     }
-     else {
-         tmp = src->src->jpeg_img;
-         assert(tmp);
--        dst->width = tmp->width;
--        dst->height = tmp->height;
-+        _zbar_image_copy_size(dst, tmp);
-     }
- 
-     const zbar_format_def_t *tmpfmt = _zbar_format_lookup(tmp->format);
-@@ -945,8 +981,7 @@
-     _zbar_convert_jpeg_to_y(tmp, tmpfmt, src, srcfmt);
- 
-     /* now convert to dst */
--    dst->width = tmp->width;
--    dst->height = tmp->height;
-+    _zbar_image_copy_size(dst, tmp);
- 
-     conversion_handler_t *func =
-         conversions[tmpfmt->group][dstfmt->group].func;
-@@ -963,10 +998,14 @@
-                                          unsigned width,
-                                          unsigned height)
- {
-+    const zbar_format_def_t *srcfmt, *dstfmt;
-+    conversion_handler_t *func;
-     zbar_image_t *dst = zbar_image_create();
-     dst->format = fmt;
-     dst->width = width;
-     dst->height = height;
-+    zbar_image_set_crop(dst, src->crop_x, src->crop_y,
-+                        src->crop_w, src->crop_h);
-     if(src->format == fmt &&
-        src->width == width &&
-        src->height == height) {
-@@ -974,8 +1013,8 @@
-         return(dst);
-     }
- 
--    const zbar_format_def_t *srcfmt = _zbar_format_lookup(src->format);
--    const zbar_format_def_t *dstfmt = _zbar_format_lookup(dst->format);
-+    srcfmt = _zbar_format_lookup(src->format);
-+    dstfmt = _zbar_format_lookup(dst->format);
-     if(!srcfmt || !dstfmt)
-         /* FIXME free dst */
-         return(NULL);
-@@ -988,8 +1027,7 @@
-         return(dst);
-     }
- 
--    conversion_handler_t *func =
--        conversions[srcfmt->group][dstfmt->group].func;
-+    func = conversions[srcfmt->group][dstfmt->group].func;
- 
-     dst->cleanup = zbar_image_free_data;
-     func(dst, dstfmt, src, srcfmt);
-@@ -1021,6 +1059,9 @@
-                        uint32_t *dst,
-                        const uint32_t *dsts)
- {
-+    const zbar_format_def_t *srcfmt;
-+    unsigned min_cost = -1;
-+
-     if(dst)
-         *dst = 0;
-     if(!dsts)
-@@ -1031,17 +1072,16 @@
-             *dst = src;
-         return(0);
-     }
--    const zbar_format_def_t *srcfmt = _zbar_format_lookup(src);
-+    srcfmt = _zbar_format_lookup(src);
-     if(!srcfmt)
-         return(-1);
- 
-     zprintf(8, "from %.4s(%08" PRIx32 ") to", (char*)&src, src);
--    unsigned min_cost = -1;
-     for(; *dsts; dsts++) {
-         const zbar_format_def_t *dstfmt = _zbar_format_lookup(*dsts);
-+        int cost;
-         if(!dstfmt)
-             continue;
--        int cost;
-         if(srcfmt->group == dstfmt->group &&
-            srcfmt->p.cmp == dstfmt->p.cmp)
-             cost = 0;
-@@ -1065,13 +1105,20 @@
- int zbar_negotiate_format (zbar_video_t *vdo,
-                            zbar_window_t *win)
- {
-+    static const uint32_t y800[2] = { fourcc('Y','8','0','0'), 0 };
-+    errinfo_t *errdst;
-+    const uint32_t *srcs, *dsts;
-+    unsigned min_cost = -1;
-+    uint32_t min_fmt = 0;
-+    const uint32_t *fmt;
-+
-     if(!vdo && !win)
-         return(0);
- 
-     if(win)
-         (void)window_lock(win);
- 
--    errinfo_t *errdst = (vdo) ? &vdo->err : &win->err;
-+    errdst = (vdo) ? &vdo->err : &win->err;
-     if(verify_format_sort()) {
-         if(win)
-             (void)window_unlock(win);
-@@ -1086,19 +1133,16 @@
-                            "no input or output formats available"));
-     }
- 
--    static const uint32_t y800[2] = { fourcc('Y','8','0','0'), 0 };
--    const uint32_t *srcs = (vdo) ? vdo->formats : y800;
--    const uint32_t *dsts = (win) ? win->formats : y800;
-+    srcs = (vdo) ? vdo->formats : y800;
-+    dsts = (win) ? win->formats : y800;
- 
--    unsigned min_cost = -1;
--    uint32_t min_fmt = 0;
--    const uint32_t *fmt;
-     for(fmt = _zbar_formats; *fmt; fmt++) {
-         /* only consider formats supported by video device */
-+        uint32_t win_fmt = 0;
-+        int cost;
-         if(!has_format(*fmt, srcs))
-             continue;
--        uint32_t win_fmt = 0;
--        int cost = _zbar_best_format(*fmt, &win_fmt, dsts);
-+        cost = _zbar_best_format(*fmt, &win_fmt, dsts);
-         if(cost < 0) {
-             zprintf(4, "%.4s(%08" PRIx32 ") -> ? (unsupported)\n",
-                     (char*)fmt, *fmt);
-diff -r 563557a923d0 zbar/debug.h
---- a/zbar/debug.h	Tue Oct 27 11:25:59 2009 -0400
-+++ b/zbar/debug.h	Fri Feb 22 08:54:29 2013 -0300
-@@ -23,28 +23,30 @@
- 
- /* varargs variations on compile time debug spew */
- 
-+# include <stdio.h>
-+
- #ifndef DEBUG_LEVEL
- 
- # ifdef __GNUC__
-     /* older versions of gcc (< 2.95) require a named varargs parameter */
--#  define dprintf(args...)
-+#  define dbprintf(args...) while(0)
- # else
-     /* unfortunately named vararg parameter is a gcc-specific extension */
--#  define dprintf(...)
-+#  define dbprintf(...) while(0)
- # endif
- 
- #else
- 
--# include <stdio.h>
--
- # ifdef __GNUC__
--#  define dprintf(level, args...) \
--    if((level) <= DEBUG_LEVEL)    \
--        fprintf(stderr, args)
-+#  define dbprintf(level, args...) do { \
-+        if((level) <= DEBUG_LEVEL)      \
-+            fprintf(stderr, args);      \
-+    } while(0)
- # else
--#  define dprintf(level, ...)     \
--    if((level) <= DEBUG_LEVEL)    \
--        fprintf(stderr, __VA_ARGS__)
-+#  define dbprintf(level, ...) do {         \
-+        if((level) <= DEBUG_LEVEL)          \
-+            fprintf(stderr, __VA_ARGS__);   \
-+    } while(0)
- # endif
- 
- #endif /* DEBUG_LEVEL */
-diff -r 563557a923d0 zbar/decoder.c
---- a/zbar/decoder.c	Tue Oct 27 11:25:59 2009 -0400
-+++ b/zbar/decoder.c	Fri Feb 22 08:54:29 2013 -0300
-@@ -1,5 +1,5 @@
- /*------------------------------------------------------------------------
-- *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-  *
-  *  This file is part of the ZBar Bar Code Reader.
-  *
-@@ -27,15 +27,15 @@
- #include <string.h>     /* memset, strlen */
- 
- #include <zbar.h>
--#include "decoder.h"
- 
--#if defined(DEBUG_DECODER) || defined(DEBUG_EAN) ||             \
--    defined(DEBUG_CODE39) || defined(DEBUG_I25) ||              \
--    defined(DEBUG_CODE128) || defined(DEBUG_QR_FINDER) ||       \
--    (defined(DEBUG_PDF417) && (DEBUG_PDF417 >= 4))
-+#if defined(DEBUG_DECODER) || defined(DEBUG_EAN) || defined(DEBUG_CODE93) || \
-+    defined(DEBUG_CODE39) || defined(DEBUG_CODABAR) || defined(DEBUG_I25) || \
-+    defined(DEBUG_DATABAR) || defined(DEBUG_CODE128) || \
-+    defined(DEBUG_QR_FINDER) || (defined(DEBUG_PDF417) && (DEBUG_PDF417 >= 4))
- # define DEBUG_LEVEL 1
- #endif
- #include "debug.h"
-+#include "decoder.h"
- 
- zbar_decoder_t *zbar_decoder_create ()
- {
-@@ -54,15 +54,34 @@
-     dcode->ean.upce_config = 1 << ZBAR_CFG_EMIT_CHECK;
-     dcode->ean.isbn10_config = 1 << ZBAR_CFG_EMIT_CHECK;
-     dcode->ean.isbn13_config = 1 << ZBAR_CFG_EMIT_CHECK;
-+# ifdef FIXME_ADDON_SYNC
-+    dcode->ean.ean2_config = 1 << ZBAR_CFG_ENABLE;
-+    dcode->ean.ean5_config = 1 << ZBAR_CFG_ENABLE;
-+# endif
- #endif
- #ifdef ENABLE_I25
-     dcode->i25.config = 1 << ZBAR_CFG_ENABLE;
-     CFG(dcode->i25, ZBAR_CFG_MIN_LEN) = 6;
- #endif
-+#ifdef ENABLE_DATABAR
-+    dcode->databar.config = ((1 << ZBAR_CFG_ENABLE) |
-+                             (1 << ZBAR_CFG_EMIT_CHECK));
-+    dcode->databar.config_exp = ((1 << ZBAR_CFG_ENABLE) |
-+                                 (1 << ZBAR_CFG_EMIT_CHECK));
-+    dcode->databar.csegs = 4;
-+    dcode->databar.segs = calloc(4, sizeof(*dcode->databar.segs));
-+#endif
-+#ifdef ENABLE_CODABAR
-+    dcode->codabar.config = 1 << ZBAR_CFG_ENABLE;
-+    CFG(dcode->codabar, ZBAR_CFG_MIN_LEN) = 4;
-+#endif
- #ifdef ENABLE_CODE39
-     dcode->code39.config = 1 << ZBAR_CFG_ENABLE;
-     CFG(dcode->code39, ZBAR_CFG_MIN_LEN) = 1;
- #endif
-+#ifdef ENABLE_CODE93
-+    dcode->code93.config = 1 << ZBAR_CFG_ENABLE;
-+#endif
- #ifdef ENABLE_CODE128
-     dcode->code128.config = 1 << ZBAR_CFG_ENABLE;
- #endif
-@@ -79,6 +98,10 @@
- 
- void zbar_decoder_destroy (zbar_decoder_t *dcode)
- {
-+#ifdef ENABLE_DATABAR
-+    if(dcode->databar.segs)
-+        free(dcode->databar.segs);
-+#endif
-     if(dcode->buf)
-         free(dcode->buf);
-     free(dcode);
-@@ -93,9 +116,18 @@
- #ifdef ENABLE_I25
-     i25_reset(&dcode->i25);
- #endif
-+#ifdef ENABLE_DATABAR
-+    databar_reset(&dcode->databar);
-+#endif
-+#ifdef ENABLE_CODABAR
-+    codabar_reset(&dcode->codabar);
-+#endif
- #ifdef ENABLE_CODE39
-     code39_reset(&dcode->code39);
- #endif
-+#ifdef ENABLE_CODE93
-+    code93_reset(&dcode->code93);
-+#endif
- #ifdef ENABLE_CODE128
-     code128_reset(&dcode->code128);
- #endif
-@@ -113,15 +145,25 @@
-     memset(dcode->w, 0, sizeof(dcode->w));
-     dcode->lock = 0;
-     dcode->idx = 0;
-+    dcode->s6 = 0;
- #ifdef ENABLE_EAN
-     ean_new_scan(&dcode->ean);
- #endif
- #ifdef ENABLE_I25
-     i25_reset(&dcode->i25);
- #endif
-+#ifdef ENABLE_DATABAR
-+    databar_new_scan(&dcode->databar);
-+#endif
-+#ifdef ENABLE_CODABAR
-+    codabar_reset(&dcode->codabar);
-+#endif
- #ifdef ENABLE_CODE39
-     code39_reset(&dcode->code39);
- #endif
-+#ifdef ENABLE_CODE93
-+    code93_reset(&dcode->code93);
-+#endif
- #ifdef ENABLE_CODE128
-     code128_reset(&dcode->code128);
- #endif
-@@ -149,9 +191,14 @@
-     return(dcode->buflen);
- }
- 
-+int zbar_decoder_get_direction (const zbar_decoder_t *dcode)
-+{
-+    return(dcode->direction);
-+}
-+
- zbar_decoder_handler_t *
- zbar_decoder_set_handler (zbar_decoder_t *dcode,
--                          zbar_decoder_handler_t handler)
-+                          zbar_decoder_handler_t *handler)
- {
-     zbar_decoder_handler_t *result = dcode->handler;
-     dcode->handler = handler;
-@@ -174,68 +221,101 @@
-     return(dcode->type);
- }
- 
-+unsigned int zbar_decoder_get_modifiers (const zbar_decoder_t *dcode)
-+{
-+    return(dcode->modifiers);
-+}
-+
- zbar_symbol_type_t zbar_decode_width (zbar_decoder_t *dcode,
-                                       unsigned w)
- {
-+    zbar_symbol_type_t tmp, sym = ZBAR_NONE;
-+
-     dcode->w[dcode->idx & (DECODE_WINDOW - 1)] = w;
--    dprintf(1, "    decode[%x]: w=%d (%g)\n", dcode->idx, w, (w / 32.));
-+    dbprintf(1, "    decode[%x]: w=%d (%g)\n", dcode->idx, w, (w / 32.));
-+
-+    /* update shared character width */
-+    dcode->s6 -= get_width(dcode, 7);
-+    dcode->s6 += get_width(dcode, 1);
- 
-     /* each decoder processes width stream in parallel */
--    zbar_symbol_type_t sym = dcode->type = ZBAR_NONE;
--
-+#ifdef ENABLE_QRCODE
-+    if(TEST_CFG(dcode->qrf.config, ZBAR_CFG_ENABLE) &&
-+       (tmp = _zbar_find_qr(dcode)) > ZBAR_PARTIAL)
-+        sym = tmp;
-+#endif
- #ifdef ENABLE_EAN
-     if((dcode->ean.enable) &&
--       (sym = _zbar_decode_ean(dcode)))
--        dcode->type = sym;
-+       (tmp = _zbar_decode_ean(dcode)))
-+        sym = tmp;
- #endif
- #ifdef ENABLE_CODE39
-     if(TEST_CFG(dcode->code39.config, ZBAR_CFG_ENABLE) &&
--       (sym = _zbar_decode_code39(dcode)) > ZBAR_PARTIAL)
--        dcode->type = sym;
-+       (tmp = _zbar_decode_code39(dcode)) > ZBAR_PARTIAL)
-+        sym = tmp;
-+#endif
-+#ifdef ENABLE_CODE93
-+    if(TEST_CFG(dcode->code93.config, ZBAR_CFG_ENABLE) &&
-+       (tmp = _zbar_decode_code93(dcode)) > ZBAR_PARTIAL)
-+        sym = tmp;
- #endif
- #ifdef ENABLE_CODE128
-     if(TEST_CFG(dcode->code128.config, ZBAR_CFG_ENABLE) &&
--       (sym = _zbar_decode_code128(dcode)) > ZBAR_PARTIAL)
--        dcode->type = sym;
-+       (tmp = _zbar_decode_code128(dcode)) > ZBAR_PARTIAL)
-+        sym = tmp;
-+#endif
-+#ifdef ENABLE_DATABAR
-+    if(TEST_CFG(dcode->databar.config | dcode->databar.config_exp,
-+                ZBAR_CFG_ENABLE) &&
-+       (tmp = _zbar_decode_databar(dcode)) > ZBAR_PARTIAL)
-+        sym = tmp;
-+#endif
-+#ifdef ENABLE_CODABAR
-+    if(TEST_CFG(dcode->codabar.config, ZBAR_CFG_ENABLE) &&
-+       (tmp = _zbar_decode_codabar(dcode)) > ZBAR_PARTIAL)
-+        sym = tmp;
- #endif
- #ifdef ENABLE_I25
-     if(TEST_CFG(dcode->i25.config, ZBAR_CFG_ENABLE) &&
--       (sym = _zbar_decode_i25(dcode)) > ZBAR_PARTIAL)
--        dcode->type = sym;
-+       (tmp = _zbar_decode_i25(dcode)) > ZBAR_PARTIAL)
-+        sym = tmp;
- #endif
- #ifdef ENABLE_PDF417
-     if(TEST_CFG(dcode->pdf417.config, ZBAR_CFG_ENABLE) &&
--       (sym = _zbar_decode_pdf417(dcode)) > ZBAR_PARTIAL)
--        dcode->type = sym;
--#endif
--#ifdef ENABLE_QRCODE
--    if(TEST_CFG(dcode->qrf.config, ZBAR_CFG_ENABLE) &&
--       (sym = _zbar_find_qr(dcode)) > ZBAR_PARTIAL)
--        dcode->type = sym;
-+       (tmp = _zbar_decode_pdf417(dcode)) > ZBAR_PARTIAL)
-+        sym = tmp;
- #endif
- 
-     dcode->idx++;
--    if(dcode->type) {
-+    dcode->type = sym;
-+    if(sym) {
-+        if(dcode->lock && sym > ZBAR_PARTIAL && sym != ZBAR_QRCODE)
-+            release_lock(dcode, sym);
-         if(dcode->handler)
-             dcode->handler(dcode);
--        if(dcode->lock && dcode->type > ZBAR_PARTIAL)
--            dcode->lock = 0;
-     }
--    return(dcode->type);
-+    return(sym);
- }
- 
--static inline int decoder_set_config_bool (zbar_decoder_t *dcode,
--                                           zbar_symbol_type_t sym,
--                                           zbar_config_t cfg,
--                                           int val)
-+static inline const unsigned int*
-+decoder_get_configp (const zbar_decoder_t *dcode,
-+                     zbar_symbol_type_t sym)
- {
--    unsigned *config = NULL;
-+    const unsigned int *config;
-     switch(sym) {
- #ifdef ENABLE_EAN
-     case ZBAR_EAN13:
-         config = &dcode->ean.ean13_config;
-         break;
- 
-+    case ZBAR_EAN2:
-+        config = &dcode->ean.ean2_config;
-+        break;
-+
-+    case ZBAR_EAN5:
-+        config = &dcode->ean.ean5_config;
-+        break;
-+
-     case ZBAR_EAN8:
-         config = &dcode->ean.ean8_config;
-         break;
-@@ -263,12 +343,33 @@
-         break;
- #endif
- 
-+#ifdef ENABLE_DATABAR
-+    case ZBAR_DATABAR:
-+        config = &dcode->databar.config;
-+        break;
-+    case ZBAR_DATABAR_EXP:
-+        config = &dcode->databar.config_exp;
-+        break;
-+#endif
-+
-+#ifdef ENABLE_CODABAR
-+    case ZBAR_CODABAR:
-+        config = &dcode->codabar.config;
-+        break;
-+#endif
-+
- #ifdef ENABLE_CODE39
-     case ZBAR_CODE39:
-         config = &dcode->code39.config;
-         break;
- #endif
- 
-+#ifdef ENABLE_CODE93
-+    case ZBAR_CODE93:
-+        config = &dcode->code93.config;
-+        break;
-+#endif
-+
- #ifdef ENABLE_CODE128
-     case ZBAR_CODE128:
-         config = &dcode->code128.config;
-@@ -287,11 +388,27 @@
-         break;
- #endif
- 
--    /* FIXME handle addons */
-+    default:
-+        config = NULL;
-+    }
-+    return(config);
-+}
- 
--    default:
--        return(1);
--    }
-+unsigned int zbar_decoder_get_configs (const zbar_decoder_t *dcode,
-+                                       zbar_symbol_type_t sym)
-+{
-+    const unsigned *config = decoder_get_configp(dcode, sym);
-+    if(!config)
-+        return(0);
-+    return(*config);
-+}
-+
-+static inline int decoder_set_config_bool (zbar_decoder_t *dcode,
-+                                           zbar_symbol_type_t sym,
-+                                           zbar_config_t cfg,
-+                                           int val)
-+{
-+    unsigned *config = (void*)decoder_get_configp(dcode, sym);
-     if(!config || cfg >= ZBAR_CFG_NUM)
-         return(1);
- 
-@@ -304,6 +421,8 @@
- 
- #ifdef ENABLE_EAN
-     dcode->ean.enable = TEST_CFG(dcode->ean.ean13_config |
-+                                 dcode->ean.ean2_config |
-+                                 dcode->ean.ean5_config |
-                                  dcode->ean.ean8_config |
-                                  dcode->ean.upca_config |
-                                  dcode->ean.upce_config |
-@@ -327,11 +446,21 @@
-         CFG(dcode->i25, cfg) = val;
-         break;
- #endif
-+#ifdef ENABLE_CODABAR
-+    case ZBAR_CODABAR:
-+        CFG(dcode->codabar, cfg) = val;
-+        break;
-+#endif
- #ifdef ENABLE_CODE39
-     case ZBAR_CODE39:
-         CFG(dcode->code39, cfg) = val;
-         break;
- #endif
-+#ifdef ENABLE_CODE93
-+    case ZBAR_CODE93:
-+        CFG(dcode->code93, cfg) = val;
-+        break;
-+#endif
- #ifdef ENABLE_CODE128
-     case ZBAR_CODE128:
-         CFG(dcode->code128, cfg) = val;
-@@ -355,17 +484,16 @@
-                              int val)
- {
-     if(sym == ZBAR_NONE) {
--        zbar_decoder_set_config(dcode, ZBAR_EAN13, cfg, val);
--        zbar_decoder_set_config(dcode, ZBAR_EAN8, cfg, val);
--        zbar_decoder_set_config(dcode, ZBAR_UPCA, cfg, val);
--        zbar_decoder_set_config(dcode, ZBAR_UPCE, cfg, val);
--        zbar_decoder_set_config(dcode, ZBAR_ISBN10, cfg, val);
--        zbar_decoder_set_config(dcode, ZBAR_ISBN13, cfg, val);
--        zbar_decoder_set_config(dcode, ZBAR_I25, cfg, val);
--        zbar_decoder_set_config(dcode, ZBAR_CODE39, cfg, val);
--        zbar_decoder_set_config(dcode, ZBAR_CODE128, cfg, val);
--        zbar_decoder_set_config(dcode, ZBAR_PDF417, cfg, val);
--        zbar_decoder_set_config(dcode, ZBAR_QRCODE, cfg, val);
-+        static const zbar_symbol_type_t all[] = {
-+	    ZBAR_EAN13, ZBAR_EAN2, ZBAR_EAN5, ZBAR_EAN8,
-+            ZBAR_UPCA, ZBAR_UPCE, ZBAR_ISBN10, ZBAR_ISBN13,
-+            ZBAR_I25, ZBAR_DATABAR, ZBAR_DATABAR_EXP, ZBAR_CODABAR,
-+	    ZBAR_CODE39, ZBAR_CODE93, ZBAR_CODE128, ZBAR_QRCODE, 
-+	    ZBAR_PDF417, 0
-+        };
-+        const zbar_symbol_type_t *symp;
-+        for(symp = all; *symp; symp++)
-+            zbar_decoder_set_config(dcode, *symp, cfg, val);
-         return(0);
-     }
- 
-@@ -385,16 +513,18 @@
-                                     unsigned int buflen)
- {
-     int dumplen = (buflen * 3) + 12;
-+    char *p;
-+    int i;
-+
-     if(!decoder_dump || dumplen > decoder_dumplen) {
-         if(decoder_dump)
-             free(decoder_dump);
-         decoder_dump = malloc(dumplen);
-         decoder_dumplen = dumplen;
-     }
--    char *p = decoder_dump +
-+    p = decoder_dump +
-         snprintf(decoder_dump, 12, "buf[%04x]=",
-                  (buflen > 0xffff) ? 0xffff : buflen);
--    int i;
-     for(i = 0; i < buflen; i++)
-         p += snprintf(p, 4, "%s%02x", (i) ? " " : "",  buf[i]);
-     return(decoder_dump);
-diff -r 563557a923d0 zbar/decoder.h
---- a/zbar/decoder.h	Tue Oct 27 11:25:59 2009 -0400
-+++ b/zbar/decoder.h	Fri Feb 22 08:54:29 2013 -0300
-@@ -1,5 +1,5 @@
- /*------------------------------------------------------------------------
-- *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-  *
-  *  This file is part of the ZBar Bar Code Reader.
-  *
-@@ -25,9 +25,12 @@
- 
- #include <config.h>
- #include <stdlib.h>     /* realloc */
-+#include <limits.h>
- 
- #include <zbar.h>
- 
-+#include "debug.h"
-+
- #define NUM_CFGS (ZBAR_CFG_MAX_LEN - ZBAR_CFG_MIN_LEN + 1)
- 
- #ifdef ENABLE_EAN
-@@ -36,9 +39,18 @@
- #ifdef ENABLE_I25
- # include "decoder/i25.h"
- #endif
-+#ifdef ENABLE_DATABAR
-+# include "decoder/databar.h"
-+#endif
-+#ifdef ENABLE_CODABAR
-+# include "decoder/codabar.h"
-+#endif
- #ifdef ENABLE_CODE39
- # include "decoder/code39.h"
- #endif
-+#ifdef ENABLE_CODE93
-+# include "decoder/code93.h"
-+#endif
- #ifdef ENABLE_CODE128
- # include "decoder/code128.h"
- #endif
-@@ -73,6 +85,7 @@
- 
- #define CFG(dcode, cfg) ((dcode).configs[(cfg) - ZBAR_CFG_MIN_LEN])
- #define TEST_CFG(config, cfg) (((config) >> (cfg)) & 1)
-+#define MOD(mod) (1 << (mod))
- 
- /* symbology independent decoder state */
- struct zbar_decoder_s {
-@@ -80,6 +93,9 @@
-     unsigned w[DECODE_WINDOW];          /* window of last N bar widths */
-     zbar_symbol_type_t type;            /* type of last decoded data */
-     zbar_symbol_type_t lock;            /* buffer lock */
-+    unsigned modifiers;                 /* symbology modifier */
-+    int direction;                      /* direction of last decoded data */
-+    unsigned s6;                        /* 6-element character width */
- 
-     /* everything above here is automatically reset */
-     unsigned buf_alloc;                 /* dynamic buffer allocation */
-@@ -95,9 +111,18 @@
- #ifdef ENABLE_I25
-     i25_decoder_t i25;                  /* Interleaved 2 of 5 decode state */
- #endif
-+#ifdef ENABLE_DATABAR
-+    databar_decoder_t databar;          /* DataBar decode state */
-+#endif
-+#ifdef ENABLE_CODABAR
-+    codabar_decoder_t codabar;          /* Codabar decode state */
-+#endif
- #ifdef ENABLE_CODE39
-     code39_decoder_t code39;            /* Code 39 decode state */
- #endif
-+#ifdef ENABLE_CODE93
-+    code93_decoder_t code93;            /* Code 93 decode state */
-+#endif
- #ifdef ENABLE_CODE128
-     code128_decoder_t code128;          /* Code 128 decode state */
- #endif
-@@ -167,20 +192,86 @@
-     return((E >= n - 3) ? -1 : E);
- }
- 
-+/* sort three like-colored elements and return ordering
-+ */
-+static inline unsigned decode_sort3 (zbar_decoder_t *dcode,
-+                                     int i0)
-+{
-+    unsigned w0 = get_width(dcode, i0);
-+    unsigned w2 = get_width(dcode, i0 + 2);
-+    unsigned w4 = get_width(dcode, i0 + 4);
-+    if(w0 < w2) {
-+        if(w2 < w4)
-+            return((i0 << 8) | ((i0 + 2) << 4) | (i0 + 4));
-+        if(w0 < w4)
-+            return((i0 << 8) | ((i0 + 4) << 4) | (i0 + 2));
-+        return(((i0 + 4) << 8) | (i0 << 4) | (i0 + 2));
-+    }
-+    if(w4 < w2)
-+        return(((i0 + 4) << 8) | ((i0 + 2) << 4) | i0);
-+    if(w0 < w4)
-+        return(((i0 + 2) << 8) | (i0 << 4) | (i0 + 4));
-+    return(((i0 + 2) << 8) | ((i0 + 4) << 4) | i0);
-+}
-+
-+/* sort N like-colored elements and return ordering
-+ */
-+static inline unsigned decode_sortn (zbar_decoder_t *dcode,
-+                                     int n,
-+                                     int i0)
-+{
-+    unsigned mask = 0, sort = 0;
-+    int i;
-+    for(i = n - 1; i >= 0; i--) {
-+        unsigned wmin = UINT_MAX;
-+        int jmin = -1, j;
-+        for(j = n - 1; j >= 0; j--) {
-+            if((mask >> j) & 1)
-+                continue;
-+            unsigned w = get_width(dcode, i0 + j * 2);
-+            if(wmin >= w) {
-+                wmin = w;
-+                jmin = j;
-+            }
-+        }
-+        zassert(jmin >= 0, 0, "sortn(%d,%d) jmin=%d",
-+                n, i0, jmin);
-+        sort <<= 4;
-+        mask |= 1 << jmin;
-+        sort |= i0 + jmin * 2;
-+    }
-+    return(sort);
-+}
-+
- /* acquire shared state lock */
--static inline char get_lock (zbar_decoder_t *dcode,
--                             zbar_symbol_type_t req)
-+static inline char acquire_lock (zbar_decoder_t *dcode,
-+                                 zbar_symbol_type_t req)
- {
--    if(dcode->lock)
-+    if(dcode->lock) {
-+        dbprintf(2, " [locked %d]\n", dcode->lock);
-         return(1);
-+    }
-     dcode->lock = req;
-     return(0);
- }
- 
-+/* check and release shared state lock */
-+static inline char release_lock (zbar_decoder_t *dcode,
-+                                 zbar_symbol_type_t req)
-+{
-+    zassert(dcode->lock == req, 1, "lock=%d req=%d\n",
-+            dcode->lock, req);
-+    dcode->lock = 0;
-+    return(0);
-+}
-+
- /* ensure output buffer has sufficient allocation for request */
- static inline char size_buf (zbar_decoder_t *dcode,
-                              unsigned len)
- {
-+    unsigned char *buf;
-+    if(len <= BUFFER_MIN)
-+        return(0);
-     if(len < dcode->buf_alloc)
-         /* FIXME size reduction heuristic? */
-         return(0);
-@@ -191,7 +282,7 @@
-         if(len > BUFFER_MAX)
-             len = BUFFER_MAX;
-     }
--    unsigned char *buf = realloc(dcode->buf, len);
-+    buf = realloc(dcode->buf, len);
-     if(!buf)
-         return(1);
-     dcode->buf = buf;
-@@ -200,6 +291,6 @@
- }
- 
- extern const char *_zbar_decoder_buf_dump (unsigned char *buf,
--                                            unsigned int buflen);
-+                                           unsigned int buflen);
- 
- #endif
-diff -r 563557a923d0 zbar/decoder/codabar.c
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/zbar/decoder/codabar.c	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,437 @@
-+/*------------------------------------------------------------------------
-+ *  Copyright 2011 (c) Jeff Brown <spadix@users.sourceforge.net>
-+ *
-+ *  This file is part of the ZBar Bar Code Reader.
-+ *
-+ *  The ZBar Bar Code Reader is free software; you can redistribute it
-+ *  and/or modify it under the terms of the GNU Lesser Public License as
-+ *  published by the Free Software Foundation; either version 2.1 of
-+ *  the License, or (at your option) any later version.
-+ *
-+ *  The ZBar Bar Code Reader is distributed in the hope that it will be
-+ *  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-+ *  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU Lesser Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser Public License
-+ *  along with the ZBar Bar Code Reader; if not, write to the Free
-+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-+ *  Boston, MA  02110-1301  USA
-+ *
-+ *  http://sourceforge.net/projects/zbar
-+ *------------------------------------------------------------------------*/
-+
-+#include <config.h>
-+#include <string.h>     /* memmove */
-+
-+#include <zbar.h>
-+
-+#ifdef DEBUG_CODABAR
-+# define DEBUG_LEVEL (DEBUG_CODABAR)
-+#endif
-+#include "debug.h"
-+#include "decoder.h"
-+
-+#define NIBUF 6 /* initial scan buffer size */
-+
-+static const signed char codabar_lo[12] = {
-+    0x0, 0x1, 0x4, 0x5, 0x2, 0xa, 0xb, 0x9,
-+    0x6, 0x7, 0x8, 0x3
-+};
-+
-+static const unsigned char codabar_hi[8] = {
-+    0x1, 0x4, 0x7, 0x6, 0x2, 0x3, 0x0, 0x5
-+};
-+
-+static const unsigned char codabar_characters[20] =
-+    "0123456789-$:/.+ABCD";
-+
-+static inline int
-+check_width (unsigned ref,
-+             unsigned w)
-+{
-+    unsigned dref = ref;
-+    ref *= 4;
-+    w *= 4;
-+    return(ref - dref <= w && w <= ref + dref);
-+}
-+
-+static inline signed char
-+codabar_decode7 (zbar_decoder_t *dcode)
-+{
-+    codabar_decoder_t *codabar = &dcode->codabar;
-+    unsigned s = codabar->s7;
-+    dbprintf(2, " s=%d", s);
-+    if(s < 7)
-+        return(-1);
-+
-+    /* check width */
-+    if(!check_width(codabar->width, s)) {
-+        dbprintf(2, " [width]");
-+        return(-1);
-+    }
-+
-+    /* extract min/max bar */
-+    unsigned ibar = decode_sortn(dcode, 4, 1);
-+    dbprintf(2, " bar=%04x", ibar);
-+
-+    unsigned wbmax = get_width(dcode, ibar & 0xf);
-+    unsigned wbmin = get_width(dcode, ibar >> 12);
-+    if(8 * wbmin < wbmax ||
-+       3 * wbmin > 2 * wbmax)
-+    {
-+        dbprintf(2, " [bar outer ratio]");
-+        return(-1);
-+    }
-+
-+    unsigned wb1 = get_width(dcode, (ibar >> 8) & 0xf);
-+    unsigned wb2 = get_width(dcode, (ibar >> 4) & 0xf);
-+    unsigned long b0b3 = wbmin * wbmax;
-+    unsigned long b1b2 = wb1 * wb2;
-+    if(b1b2 + b1b2 / 8 < b0b3) {
-+        /* single wide bar combinations */
-+        if(8 * wbmin < 5 * wb1 ||
-+           8 * wb1 < 5 * wb2 ||
-+           4 * wb2 > 3 * wbmax ||
-+           wb2 * wb2 >= wb1 * wbmax)
-+        {
-+            dbprintf(2, " [1bar inner ratios]");
-+            return(-1);
-+        }
-+        ibar = (ibar >> 1) & 0x3;
-+    }
-+    else if(b1b2 > b0b3 + b0b3 / 8) {
-+        /* three wide bars, no wide spaces */
-+        if(4 * wbmin > 3 * wb1 ||
-+           8 * wb1 < 5 * wb2 ||
-+           8 * wb2 < 5 * wbmax ||
-+           wbmin * wb2 >= wb1 * wb1)
-+        {
-+            dbprintf(2, " [3bar inner ratios]");
-+            return(-1);
-+        }
-+        ibar = (ibar >> 13) + 4;
-+    }
-+    else {
-+        dbprintf(2, " [bar inner ratios]");
-+        return(-1);
-+    }
-+
-+    unsigned ispc = decode_sort3(dcode, 2);
-+    dbprintf(2, "(%x) spc=%03x", ibar, ispc);
-+
-+    unsigned wsmax = get_width(dcode, ispc & 0xf);
-+    unsigned wsmid = get_width(dcode, (ispc >> 4) & 0xf);
-+    unsigned wsmin = get_width(dcode, (ispc >> 8) & 0xf);
-+    if(ibar >> 2) {
-+        /* verify no wide spaces */
-+        if(8 * wsmin < wsmax ||
-+           8 * wsmin < 5 * wsmid ||
-+           8 * wsmid < 5 * wsmax)
-+        {
-+            dbprintf(2, " [0space inner ratios]");
-+            return(-1);
-+        }
-+        ibar &= 0x3;
-+        if(codabar->direction)
-+            ibar = 3 - ibar;
-+        int c = (0xfcde >> (ibar << 2)) & 0xf;
-+        dbprintf(2, " ex[%d]=%x", ibar, c);
-+        return(c);
-+    }
-+    else if(8 * wsmin < wsmax ||
-+            3 * wsmin > 2 * wsmax)
-+    {
-+        dbprintf(2, " [space outer ratio]");
-+        return(-1);
-+    }
-+
-+    unsigned long s0s2 = wsmin * wsmax;
-+    unsigned long s1s1 = wsmid * wsmid;
-+    if(s1s1 + s1s1 / 8 < s0s2) {
-+        /* single wide space */
-+        if(8 * wsmin < 5 * wsmid ||
-+           4 * wsmid > 3 * wsmax)
-+        {
-+            dbprintf(2, " [1space inner ratios]");
-+            return(-1);
-+        }
-+        ispc = ((ispc & 0xf) >> 1) - 1;
-+        unsigned ic = (ispc << 2) | ibar;
-+        if(codabar->direction)
-+            ic = 11 - ic;
-+        int c = codabar_lo[ic];
-+        dbprintf(2, "(%d) lo[%d]=%x", ispc, ic, c);
-+        return(c);
-+    }
-+    else if(s1s1 > s0s2 + s0s2 / 8) {
-+        /* two wide spaces, check start/stop */
-+        if(4 * wsmin > 3 * wsmid ||
-+           8 * wsmid < 5 * wsmax)
-+        {
-+            dbprintf(2, " [2space inner ratios]");
-+            return(-1);
-+        }
-+        if((ispc >> 8) == 4) {
-+            dbprintf(2, " [space comb]");
-+            return(-1);
-+        }
-+        ispc >>= 10;
-+        dbprintf(2, "(%d)", ispc);
-+        unsigned ic = ispc * 4 + ibar;
-+        zassert(ic < 8, -1, "ic=%d ispc=%d ibar=%d", ic, ispc, ibar);
-+        unsigned char c = codabar_hi[ic];
-+        if(c >> 2 != codabar->direction) {
-+            dbprintf(2, " [invalid stop]");
-+            return(-1);
-+        }
-+        c = (c & 0x3) | 0x10;
-+        dbprintf(2, " hi[%d]=%x", ic, c);
-+        return(c);
-+    }
-+    else {
-+        dbprintf(2, " [space inner ratios]");
-+        return(-1);
-+    }
-+}
-+
-+static inline signed char
-+codabar_decode_start (zbar_decoder_t *dcode)
-+{
-+    codabar_decoder_t *codabar = &dcode->codabar;
-+    unsigned s = codabar->s7;
-+    if(s < 8)
-+        return(ZBAR_NONE);
-+    dbprintf(2, "      codabar: s=%d", s);
-+
-+    /* check leading quiet zone - spec is 10x */
-+    unsigned qz = get_width(dcode, 8);
-+    if((qz && qz * 2 < s) ||
-+       4 * get_width(dcode, 0) > 3 * s)
-+    {
-+        dbprintf(2, " [invalid qz/ics]\n");
-+        return(ZBAR_NONE);
-+    }
-+
-+    /* check space ratios first */
-+    unsigned ispc = decode_sort3(dcode, 2);
-+    dbprintf(2, " spc=%03x", ispc);
-+    if((ispc >> 8) == 4) {
-+        dbprintf(2, " [space comb]\n");
-+        return(ZBAR_NONE);
-+    }
-+
-+    /* require 2 wide and 1 narrow spaces */
-+    unsigned wsmax = get_width(dcode, ispc & 0xf);
-+    unsigned wsmin = get_width(dcode, ispc >> 8);
-+    unsigned wsmid = get_width(dcode, (ispc >> 4) & 0xf);
-+    if(8 * wsmin < wsmax ||
-+       3 * wsmin > 2 * wsmax ||
-+       4 * wsmin > 3 * wsmid ||
-+       8 * wsmid < 5 * wsmax ||
-+       wsmid * wsmid <= wsmax * wsmin)
-+    {
-+        dbprintf(2, " [space ratio]\n");
-+        return(ZBAR_NONE);
-+    }
-+    ispc >>= 10;
-+    dbprintf(2, "(%d)", ispc);
-+
-+    /* check bar ratios */
-+    unsigned ibar = decode_sortn(dcode, 4, 1);
-+    dbprintf(2, " bar=%04x", ibar);
-+
-+    unsigned wbmax = get_width(dcode, ibar & 0xf);
-+    unsigned wbmin = get_width(dcode, ibar >> 12);
-+    if(8 * wbmin < wbmax ||
-+       3 * wbmin > 2 * wbmax)
-+    {
-+        dbprintf(2, " [bar outer ratio]\n");
-+        return(ZBAR_NONE);
-+    }
-+
-+    /* require 1 wide & 3 narrow bars */
-+    unsigned wb1 = get_width(dcode, (ibar >> 8) & 0xf);
-+    unsigned wb2 = get_width(dcode, (ibar >> 4) & 0xf);
-+    if(8 * wbmin < 5 * wb1 ||
-+       8 * wb1 < 5 * wb2 ||
-+       4 * wb2 > 3 * wbmax ||
-+       wb1 * wb2 >= wbmin * wbmax ||
-+       wb2 * wb2 >= wb1 * wbmax)
-+    {
-+        dbprintf(2, " [bar inner ratios]\n");
-+        return(ZBAR_NONE);
-+    }
-+    ibar = ((ibar & 0xf) - 1) >> 1;
-+    dbprintf(2, "(%d)", ibar);
-+
-+    /* decode combination */
-+    int ic = ispc * 4 + ibar;
-+    zassert(ic < 8, ZBAR_NONE, "ic=%d ispc=%d ibar=%d", ic, ispc, ibar);
-+    int c = codabar_hi[ic];
-+    codabar->buf[0] = (c & 0x3) | 0x10;
-+
-+    /* set character direction */
-+    codabar->direction = c >> 2;
-+
-+    codabar->element = 4;
-+    codabar->character = 1;
-+    codabar->width = codabar->s7;
-+    dbprintf(1, " start=%c dir=%x [valid start]\n",
-+             codabar->buf[0] + 0x31, codabar->direction);
-+    return(ZBAR_PARTIAL);
-+}
-+
-+static inline int
-+codabar_checksum (zbar_decoder_t *dcode,
-+                  unsigned n)
-+{
-+    unsigned chk = 0;
-+    unsigned char *buf = dcode->buf;
-+    while(n--)
-+        chk += *(buf++);
-+    return(!!(chk & 0xf));
-+}
-+
-+static inline zbar_symbol_type_t
-+codabar_postprocess (zbar_decoder_t *dcode)
-+{
-+    codabar_decoder_t *codabar = &dcode->codabar;
-+    int dir = codabar->direction;
-+    dcode->direction = 1 - 2 * dir;
-+    int i, n = codabar->character;
-+    for(i = 0; i < NIBUF; i++)
-+        dcode->buf[i] = codabar->buf[i];
-+    if(dir)
-+        /* reverse buffer */
-+        for(i = 0; i < n / 2; i++) {
-+            unsigned j = n - 1 - i;
-+            char code = dcode->buf[i];
-+            dcode->buf[i] = dcode->buf[j];
-+            dcode->buf[j] = code;
-+        }
-+
-+    if(TEST_CFG(codabar->config, ZBAR_CFG_ADD_CHECK)) {
-+        /* validate checksum */
-+        if(codabar_checksum(dcode, n))
-+            return(ZBAR_NONE);
-+        if(!TEST_CFG(codabar->config, ZBAR_CFG_EMIT_CHECK)) {
-+            dcode->buf[n - 2] = dcode->buf[n - 1];
-+            n--;
-+        }
-+    }
-+
-+    for(i = 0; i < n; i++) {
-+        unsigned c = dcode->buf[i];
-+        dcode->buf[i] = ((c < 0x14)
-+                         ? codabar_characters[c]
-+                         : '?');
-+    }
-+    dcode->buflen = i;
-+    dcode->buf[i] = '\0';
-+    dcode->modifiers = 0;
-+
-+    codabar->character = -1;
-+    return(ZBAR_CODABAR);
-+}
-+
-+zbar_symbol_type_t
-+_zbar_decode_codabar (zbar_decoder_t *dcode)
-+{
-+    codabar_decoder_t *codabar = &dcode->codabar;
-+
-+    /* update latest character width */
-+    codabar->s7 -= get_width(dcode, 8);
-+    codabar->s7 += get_width(dcode, 1);
-+
-+    if(get_color(dcode) != ZBAR_SPACE)
-+        return(ZBAR_NONE);
-+    if(codabar->character < 0)
-+        return(codabar_decode_start(dcode));
-+    if(codabar->character < 2 &&
-+       codabar_decode_start(dcode))
-+        return(ZBAR_PARTIAL);
-+    if(--codabar->element)
-+        return(ZBAR_NONE);
-+    codabar->element = 4;
-+
-+    dbprintf(1, "      codabar[%c%02d+%x]",
-+             (codabar->direction) ? '<' : '>',
-+             codabar->character, codabar->element);
-+
-+    signed char c = codabar_decode7(dcode);
-+    dbprintf(1, " %d", c);
-+    if(c < 0) {
-+        dbprintf(1, " [aborted]\n");
-+        goto reset;
-+    }
-+
-+    unsigned char *buf;
-+    if(codabar->character < NIBUF)
-+        buf = codabar->buf;
-+    else {
-+        if(codabar->character >= BUFFER_MIN &&
-+           size_buf(dcode, codabar->character + 1))
-+        {
-+            dbprintf(1, " [overflow]\n");
-+            goto reset;
-+        }
-+        buf = dcode->buf;
-+    }
-+    buf[codabar->character++] = c;
-+
-+    /* lock shared resources */
-+    if(codabar->character == NIBUF &&
-+       acquire_lock(dcode, ZBAR_CODABAR))
-+    {
-+        codabar->character = -1;
-+        return(ZBAR_PARTIAL);
-+    }
-+
-+    unsigned s = codabar->s7;
-+    if(c & 0x10) {
-+        unsigned qz = get_width(dcode, 0);
-+        if(qz && qz * 2 < s) {
-+            dbprintf(2, " [invalid qz]\n");
-+            goto reset;
-+        }
-+        unsigned n = codabar->character;
-+        if(n < CFG(*codabar, ZBAR_CFG_MIN_LEN) ||
-+           (CFG(*codabar, ZBAR_CFG_MAX_LEN) > 0 &&
-+            n > CFG(*codabar, ZBAR_CFG_MAX_LEN)))
-+        {
-+            dbprintf(2, " [invalid len]\n");
-+            goto reset;
-+        }
-+        if(codabar->character < NIBUF &&
-+           acquire_lock(dcode, ZBAR_CODABAR))
-+        {
-+            codabar->character = -1;
-+            return(ZBAR_PARTIAL);
-+        }
-+        dbprintf(2, " stop=%c", c + 0x31);
-+
-+        zbar_symbol_type_t sym = codabar_postprocess(dcode);
-+        if(sym > ZBAR_PARTIAL)
-+            dbprintf(2, " [valid stop]");
-+        else {
-+            release_lock(dcode, ZBAR_CODABAR);
-+            codabar->character = -1;
-+        }
-+        dbprintf(2, "\n");
-+        return(sym);
-+    }
-+    else if(4 * get_width(dcode, 0) > 3 * s) {
-+        dbprintf(2, " [ics]\n");
-+        goto reset;
-+    }
-+
-+    dbprintf(2, "\n");
-+    return(ZBAR_NONE);
-+
-+reset:
-+    if(codabar->character >= NIBUF)
-+        release_lock(dcode, ZBAR_CODABAR);
-+    codabar->character = -1;
-+    return(ZBAR_NONE);
-+}
-diff -r 563557a923d0 zbar/decoder/codabar.h
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/zbar/decoder/codabar.h	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,51 @@
-+/*------------------------------------------------------------------------
-+ *  Copyright 2011 (c) Jeff Brown <spadix@users.sourceforge.net>
-+ *
-+ *  This file is part of the ZBar Bar Code Reader.
-+ *
-+ *  The ZBar Bar Code Reader is free software; you can redistribute it
-+ *  and/or modify it under the terms of the GNU Lesser Public License as
-+ *  published by the Free Software Foundation; either version 2.1 of
-+ *  the License, or (at your option) any later version.
-+ *
-+ *  The ZBar Bar Code Reader is distributed in the hope that it will be
-+ *  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-+ *  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU Lesser Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser Public License
-+ *  along with the ZBar Bar Code Reader; if not, write to the Free
-+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-+ *  Boston, MA  02110-1301  USA
-+ *
-+ *  http://sourceforge.net/projects/zbar
-+ *------------------------------------------------------------------------*/
-+#ifndef _CODABAR_H_
-+#define _CODABAR_H_
-+
-+/* Codabar specific decode state */
-+typedef struct codabar_decoder_s {
-+    unsigned direction : 1;     /* scan direction: 0=fwd, 1=rev */
-+    unsigned element : 4;       /* element offset 0-7 */
-+    int character : 12;         /* character position in symbol */
-+    unsigned s7;                /* current character width */
-+    unsigned width;             /* last character width */
-+    unsigned char buf[6];       /* initial scan buffer */
-+
-+    unsigned config;
-+    int configs[NUM_CFGS];      /* int valued configurations */
-+} codabar_decoder_t;
-+
-+/* reset Codabar specific state */
-+static inline void codabar_reset (codabar_decoder_t *codabar)
-+{
-+    codabar->direction = 0;
-+    codabar->element = 0;
-+    codabar->character = -1;
-+    codabar->s7 = 0;
-+}
-+
-+/* decode Codabar symbols */
-+zbar_symbol_type_t _zbar_decode_codabar(zbar_decoder_t *dcode);
-+
-+#endif
-diff -r 563557a923d0 zbar/decoder/code128.c
---- a/zbar/decoder/code128.c	Tue Oct 27 11:25:59 2009 -0400
-+++ b/zbar/decoder/code128.c	Fri Feb 22 08:54:29 2013 -0300
-@@ -1,5 +1,5 @@
- /*------------------------------------------------------------------------
-- *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-  *
-  *  This file is part of the ZBar Bar Code Reader.
-  *
-@@ -25,12 +25,12 @@
- #include <string.h>     /* memmove */
- 
- #include <zbar.h>
--#include "decoder.h"
- 
- #ifdef DEBUG_CODE128
- # define DEBUG_LEVEL (DEBUG_CODE128)
- #endif
- #include "debug.h"
-+#include "decoder.h"
- 
- #define NUM_CHARS 108           /* total number of character codes */
- 
-@@ -120,6 +120,8 @@
-                             ((sig >> 5) & 0x18) |
-                             ((sig >> 7) & 0x60));
-     unsigned char idx = lo_offset[offset];
-+    unsigned char base, c;
-+
-     if(sig & 1)
-         idx &= 0xf;
-     else
-@@ -127,31 +129,31 @@
-     if(idx == 0xf)
-         return(-1);
- 
--    unsigned char base = (sig >> 11) | ((sig >> 9) & 1);
-+    base = (sig >> 11) | ((sig >> 9) & 1);
-     zassert(base < 8, -1, "sig=%x offset=%x idx=%x base=%x\n",
-             sig, offset, idx, base);
-     idx += lo_base[base];
- 
-     zassert(idx <= 0x50, -1, "sig=%x offset=%x base=%x idx=%x\n",
-             sig, offset, base, idx);
--    unsigned char c = characters[idx];
--    dprintf(2, " %02x(%x(%02x)/%x(%02x)) => %02x",
--            idx, base, lo_base[base], offset, lo_offset[offset],
--            (unsigned char)c);
-+    c = characters[idx];
-+    dbprintf(2, " %02x(%x(%02x)/%x(%02x)) => %02x",
-+             idx, base, lo_base[base], offset, lo_offset[offset],
-+             (unsigned char)c);
-     return(c);
- }
- 
- static inline signed char decode_hi (int sig)
- {
-     unsigned char rev = (sig & 0x4400) != 0;
-+    unsigned char idx, c;
-     if(rev)
-         sig = (((sig >> 12) & 0x000f) |
-                ((sig >>  4) & 0x00f0) |
-                ((sig <<  4) & 0x0f00) |
-                ((sig << 12) & 0xf000));
--    dprintf(2, " rev=%x", rev != 0);
-+    dbprintf(2, " rev=%x", rev != 0);
- 
--    unsigned char idx;
-     switch(sig) {
-     case 0x0014: idx = 0x0; break;
-     case 0x0025: idx = 0x1; break;
-@@ -171,8 +173,8 @@
-     }
-     if(rev)
-         idx += 0xe;
--    unsigned char c = characters[0x51 + idx];
--    dprintf(2, " %02x => %02x", idx, c);
-+    c = characters[0x51 + idx];
-+    dbprintf(2, " %02x => %02x", idx, c);
-     return(c);
- }
- 
-@@ -190,13 +192,18 @@
- 
- static inline signed char decode6 (zbar_decoder_t *dcode)
- {
-+    int sig;
-+    signed char c, chk;
-+    unsigned bars;
-+
-     /* build edge signature of character */
-     unsigned s = dcode->code128.s6;
--    dprintf(2, " s=%d", s);
-+
-+    dbprintf(2, " s=%d", s);
-     if(s < 5)
-         return(-1);
-     /* calculate similar edge measurements */
--    int sig = (get_color(dcode) == ZBAR_BAR)
-+    sig = (get_color(dcode) == ZBAR_BAR)
-         ? ((decode_e(get_width(dcode, 0) + get_width(dcode, 1), s, 11) << 12) |
-            (decode_e(get_width(dcode, 1) + get_width(dcode, 2), s, 11) << 8) |
-            (decode_e(get_width(dcode, 2) + get_width(dcode, 3), s, 11) << 4) |
-@@ -207,19 +214,19 @@
-            (decode_e(get_width(dcode, 2) + get_width(dcode, 1), s, 11)));
-     if(sig < 0)
-         return(-1);
--    dprintf(2, " sig=%04x", sig);
-+    dbprintf(2, " sig=%04x", sig);
-     /* lookup edge signature */
--    signed char c = (sig & 0x4444) ? decode_hi(sig) : decode_lo(sig);
-+    c = (sig & 0x4444) ? decode_hi(sig) : decode_lo(sig);
-     if(c == -1)
-         return(-1);
- 
-     /* character validation */
--    unsigned bars = (get_color(dcode) == ZBAR_BAR)
-+    bars = (get_color(dcode) == ZBAR_BAR)
-         ? (get_width(dcode, 0) + get_width(dcode, 2) + get_width(dcode, 4))
-         : (get_width(dcode, 1) + get_width(dcode, 3) + get_width(dcode, 5));
-     bars = bars * 11 * 4 / s;
--    unsigned char chk = calc_check(c);
--    dprintf(2, " bars=%d chk=%d", bars, chk);
-+    chk = calc_check(c);
-+    dbprintf(2, " bars=%d chk=%d", bars, chk);
-     if(chk - 7 > bars || bars > chk + 7)
-         return(-1);
- 
-@@ -228,18 +235,20 @@
- 
- static inline unsigned char validate_checksum (zbar_decoder_t *dcode)
- {
-+    unsigned idx, sum, i, acc = 0;
-+    unsigned char check, err;
-+
-     code128_decoder_t *dcode128 = &dcode->code128;
-     if(dcode128->character < 3)
-         return(1);
- 
-     /* add in irregularly weighted start character */
--    unsigned idx = (dcode128->direction) ? dcode128->character - 1 : 0;
--    unsigned sum = dcode->buf[idx];
-+    idx = (dcode128->direction) ? dcode128->character - 1 : 0;
-+    sum = dcode->buf[idx];
-     if(sum >= 103)
-         sum -= 103;
- 
-     /* calculate sum in reverse to avoid multiply operations */
--    unsigned i, acc = 0;
-     for(i = dcode128->character - 3; i; i--) {
-         zassert(sum < 103, -1, "dir=%x i=%x sum=%x acc=%x %s\n",
-                 dcode128->direction, i, sum, acc,
-@@ -258,11 +267,11 @@
- 
-     /* and compare to check character */
-     idx = (dcode128->direction) ? 1 : dcode128->character - 2;
--    unsigned char check = dcode->buf[idx];
--    dprintf(2, " chk=%02x(%02x)", sum, check);
--    unsigned char err = (sum != check);
-+    check = dcode->buf[idx];
-+    dbprintf(2, " chk=%02x(%02x)", sum, check);
-+    err = (sum != check);
-     if(err)
--        dprintf(1, " [checksum error]\n");
-+        dbprintf(1, " [checksum error]\n");
-     return(err);
- }
- 
-@@ -272,6 +281,8 @@
-                                       unsigned end,
-                                       unsigned dst)
- {
-+    unsigned i, j;
-+
-     /* expand buffer to accomodate 2x set C characters (2 digits per-char) */
-     unsigned delta = end - start;
-     unsigned newlen = dcode->code128.character + delta;
-@@ -282,7 +293,6 @@
-             dcode->code128.character - start);
-     dcode->code128.character = newlen;
- 
--    unsigned i, j;
-     for(i = 0, j = dst; i < delta; i++, j += 2) {
-         /* convert each set C character into two ASCII digits */
-         unsigned char code = dcode->buf[start + delta + i];
-@@ -317,13 +327,15 @@
- /* resolve scan direction and convert to ASCII */
- static inline unsigned char postprocess (zbar_decoder_t *dcode)
- {
-+    unsigned i, j, cexp;
-+    unsigned char code = 0, charset;
-     code128_decoder_t *dcode128 = &dcode->code128;
--    dprintf(2, "\n    postproc len=%d", dcode128->character);
--    unsigned i, j;
--    unsigned char code = 0;
-+    dbprintf(2, "\n    postproc len=%d", dcode128->character);
-+    dcode->modifiers = 0;
-+    dcode->direction = 1 - 2 * dcode128->direction;
-     if(dcode128->direction) {
-         /* reverse buffer */
--        dprintf(2, " (rev)");
-+        dbprintf(2, " (rev)");
-         for(i = 0; i < dcode128->character / 2; i++) {
-             unsigned j = dcode128->character - 1 - i;
-             code = dcode->buf[i];
-@@ -343,9 +355,9 @@
-     zassert(code >= START_A && code <= START_C, 1, "%s\n",
-             _zbar_decoder_buf_dump(dcode->buf, dcode->code128.character));
- 
--    unsigned char charset = code - START_A;
--    unsigned cexp = (code == START_C) ? 1 : 0;
--    dprintf(2, " start=%c", 'A' + charset);
-+    charset = code - START_A;
-+    cexp = (code == START_C) ? 1 : 0;
-+    dbprintf(2, " start=%c", 'A' + charset);
- 
-     for(i = 1, j = 0; i < dcode128->character - 2; i++) {
-         unsigned char code = dcode->buf[i];
-@@ -368,14 +380,15 @@
-                 charset &= 0x7f;
-         }
-         else {
--            dprintf(2, " %02x", code);
-+            dbprintf(2, " %02x", code);
-             if(charset & 0x2) {
-+                unsigned delta;
-                 /* expand character set C to ASCII */
-                 zassert(cexp, 1, "i=%x j=%x code=%02x charset=%x cexp=%x %s\n",
-                         i, j, code, charset, cexp,
-                         _zbar_decoder_buf_dump(dcode->buf,
-                                                 dcode->code128.character));
--                unsigned delta = postprocess_c(dcode, cexp, i, j);
-+                delta = postprocess_c(dcode, cexp, i, j);
-                 i += delta;
-                 j += delta * 2;
-                 cexp = 0;
-@@ -383,28 +396,39 @@
-             if(code < CODE_C) {
-                 if(code == SHIFT)
-                     charset |= 0x80;
--                else if(code == FNC2)
--                    /* FIXME FNC2 - message append */;
--                else if(code == FNC3)
--                    /* FIXME FNC3 - initialize */;
-+                else if(code == FNC2) {
-+                    /* FIXME FNC2 - message append */
-+                }
-+                else if(code == FNC3) {
-+                    /* FIXME FNC3 - initialize */
-+                }
-             }
--            else if(code == FNC1)
--                /* FIXME FNC1 - Code 128 subsets or ASCII 0x1d */;
-+            else if(code == FNC1) {
-+                /* FNC1 - Code 128 subsets or ASCII 0x1d */
-+                if(i == 1)
-+                    dcode->modifiers |= MOD(ZBAR_MOD_GS1);
-+                else if(i == 2)
-+                    dcode->modifiers |= MOD(ZBAR_MOD_AIM);
-+                else if(i < dcode->code128.character - 3)
-+                    dcode->buf[j++] = 0x1d;
-+                /*else drop trailing FNC1 */
-+            }
-             else if(code >= START_A) {
--                dprintf(1, " [truncated]\n");
-+                dbprintf(1, " [truncated]\n");
-                 return(1);
-             }
-             else {
-+                unsigned char newset = CODE_A - code;
-                 zassert(code >= CODE_C && code <= CODE_A, 1,
-                         "i=%x j=%x code=%02x charset=%x cexp=%x %s\n",
-                         i, j, code, charset, cexp,
-                         _zbar_decoder_buf_dump(dcode->buf,
-                                                 dcode->code128.character));
--                unsigned char newset = CODE_A - code;
-                 if(newset != charset)
-                     charset = newset;
--                else
--                    /* FIXME FNC4 - extended ASCII */;
-+                else {
-+                    /* FIXME FNC4 - extended ASCII */
-+                }
-             }
-             if(charset & 0x2)
-                 cexp = i + 1;
-@@ -417,6 +441,8 @@
-                                         dcode->code128.character));
-         j += postprocess_c(dcode, cexp, i, j) * 2;
-     }
-+    zassert(j < dcode->buf_alloc, 1, "j=%02x %s\n", j,
-+            _zbar_decoder_buf_dump(dcode->buf, dcode->code128.character));
-     dcode->buflen = j;
-     dcode->buf[j] = '\0';
-     dcode->code128.character = j;
-@@ -426,66 +452,90 @@
- zbar_symbol_type_t _zbar_decode_code128 (zbar_decoder_t *dcode)
- {
-     code128_decoder_t *dcode128 = &dcode->code128;
-+    signed char c;
- 
-     /* update latest character width */
-     dcode128->s6 -= get_width(dcode, 6);
-     dcode128->s6 += get_width(dcode, 0);
- 
--    if(/* process every 6th element of active symbol */
--       (dcode128->character >= 0 &&
--        (++dcode128->element) != 6) ||
--       /* decode color based on direction */
--       (get_color(dcode) != dcode128->direction))
-+    if((dcode128->character < 0)
-+       ? get_color(dcode) != ZBAR_SPACE
-+       : (/* process every 6th element of active symbol */
-+          ++dcode128->element != 6 ||
-+          /* decode color based on direction */
-+          get_color(dcode) != dcode128->direction))
-         return(0);
-     dcode128->element = 0;
- 
--    dprintf(2, "      code128[%c%02d+%x]:",
--            (dcode128->direction) ? '<' : '>',
--            dcode128->character, dcode128->element);
-+    dbprintf(2, "      code128[%c%02d+%x]:",
-+             (dcode128->direction) ? '<' : '>',
-+             dcode128->character, dcode128->element);
- 
--    signed char c = decode6(dcode);
-+    c = decode6(dcode);
-     if(dcode128->character < 0) {
--        dprintf(2, " c=%02x", c);
-+        unsigned qz;
-+        dbprintf(2, " c=%02x", c);
-         if(c < START_A || c > STOP_REV || c == STOP_FWD) {
--            dprintf(2, " [invalid]\n");
-+            dbprintf(2, " [invalid]\n");
-             return(0);
-         }
--        unsigned qz = get_width(dcode, 6);
--        if(qz && qz < (dcode->code128.s6 * 3) / 4) {
--            dprintf(2, " [invalid qz %d]\n", qz);
--            return(0);
--        }
--        /* lock shared resources */
--        if(get_lock(dcode, ZBAR_CODE128)) {
--            dprintf(2, " [locked %d]\n", dcode->lock);
--            dcode128->character = -1;
-+        qz = get_width(dcode, 6);
-+        if(qz && qz < (dcode128->s6 * 3) / 4) {
-+            dbprintf(2, " [invalid qz %d]\n", qz);
-             return(0);
-         }
-         /* decoded valid start/stop */
-         /* initialize state */
--        dcode128->character = 0;
-+        dcode128->character = 1;
-         if(c == STOP_REV) {
-             dcode128->direction = ZBAR_BAR;
-             dcode128->element = 7;
-         }
-         else
-             dcode128->direction = ZBAR_SPACE;
--        dprintf(2, " dir=%x [valid start]", dcode128->direction);
-+        dcode128->start = c;
-+        dcode128->width = dcode128->s6;
-+        dbprintf(2, " dir=%x [valid start]\n", dcode128->direction);
-+        return(0);
-     }
--    else if((c < 0) ||
--            ((dcode128->character >= BUFFER_MIN) &&
--             size_buf(dcode, dcode128->character + 1))) {
--        dprintf(1, (c < 0) ? " [aborted]\n" : " [overflow]\n");
--        dcode->lock = 0;
-+    else if(c < 0 || size_buf(dcode, dcode128->character + 1)) {
-+        dbprintf(1, (c < 0) ? " [aborted]\n" : " [overflow]\n");
-+        if(dcode128->character > 1)
-+            release_lock(dcode, ZBAR_CODE128);
-         dcode128->character = -1;
-         return(0);
-     }
-+    else {
-+        unsigned dw;
-+        if(dcode128->width > dcode128->s6)
-+            dw = dcode128->width - dcode128->s6;
-+        else
-+            dw = dcode128->s6 - dcode128->width;
-+        dw *= 4;
-+        if(dw > dcode128->width) {
-+            dbprintf(1, " [width var]\n");
-+            if(dcode128->character > 1)
-+                release_lock(dcode, ZBAR_CODE128);
-+            dcode128->character = -1;
-+            return(0);
-+        }
-+    }
-+    dcode128->width = dcode128->s6;
- 
-     zassert(dcode->buf_alloc > dcode128->character, 0,
-             "alloc=%x idx=%x c=%02x %s\n",
-             dcode->buf_alloc, dcode128->character, c,
-             _zbar_decoder_buf_dump(dcode->buf, dcode->buf_alloc));
- 
-+    if(dcode128->character == 1) {
-+        /* lock shared resources */
-+        if(acquire_lock(dcode, ZBAR_CODE128)) {
-+            dcode128->character = -1;
-+            return(0);
-+        }
-+        dcode->buf[0] = dcode128->start;
-+    }
-+
-     dcode->buf[dcode128->character++] = c;
- 
-     if(dcode128->character > 2 &&
-@@ -499,17 +549,17 @@
-         else if(dcode128->character < CFG(*dcode128, ZBAR_CFG_MIN_LEN) ||
-                 (CFG(*dcode128, ZBAR_CFG_MAX_LEN) > 0 &&
-                  dcode128->character > CFG(*dcode128, ZBAR_CFG_MAX_LEN))) {
--            dprintf(2, " [invalid len]\n");
-+            dbprintf(2, " [invalid len]\n");
-             sym = ZBAR_NONE;
-         }
-         else
--            dprintf(2, " [valid end]\n");
-+            dbprintf(2, " [valid end]\n");
-         dcode128->character = -1;
-         if(!sym)
--            dcode->lock = 0;
-+            release_lock(dcode, ZBAR_CODE128);
-         return(sym);
-     }
- 
--    dprintf(2, "\n");
-+    dbprintf(2, "\n");
-     return(0);
- }
-diff -r 563557a923d0 zbar/decoder/code128.h
---- a/zbar/decoder/code128.h	Tue Oct 27 11:25:59 2009 -0400
-+++ b/zbar/decoder/code128.h	Fri Feb 22 08:54:29 2013 -0300
-@@ -28,7 +28,9 @@
-     unsigned direction : 1;     /* scan direction: 0=fwd/space, 1=rev/bar */
-     unsigned element : 3;       /* element offset 0-5 */
-     int character : 12;         /* character position in symbol */
-+    unsigned char start;        /* start character */
-     unsigned s6;                /* character width */
-+    unsigned width;             /* last character width */
- 
-     unsigned config;
-     int configs[NUM_CFGS];      /* int valued configurations */
-diff -r 563557a923d0 zbar/decoder/code39.c
---- a/zbar/decoder/code39.c	Tue Oct 27 11:25:59 2009 -0400
-+++ b/zbar/decoder/code39.c	Fri Feb 22 08:54:29 2013 -0300
-@@ -1,5 +1,5 @@
- /*------------------------------------------------------------------------
-- *  Copyright 2008-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+ *  Copyright 2008-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-  *
-  *  This file is part of the ZBar Bar Code Reader.
-  *
-@@ -25,12 +25,12 @@
- #include <string.h>     /* memmove */
- 
- #include <zbar.h>
--#include "decoder.h"
- 
- #ifdef DEBUG_CODE39
- # define DEBUG_LEVEL (DEBUG_CODE39)
- #endif
- #include "debug.h"
-+#include "decoder.h"
- 
- #define NUM_CHARS (0x2c)
- 
-@@ -130,16 +130,16 @@
-                                             unsigned e,
-                                             unsigned s)
- {
--    unsigned char E = decode_e(e, s, 36);
--    if(E > 7)
-+    unsigned char E = decode_e(e, s, 72);
-+    if(E > 18)
-         return(0xff);
-     enc <<= 1;
--    if(E > 2) {
-+    if(E > 6) {
-         enc |= 1;
--        dprintf(2, "1");
-+        dbprintf(2, "1");
-     }
-     else
--        dprintf(2, "0");
-+        dbprintf(2, "0");
-     return(enc);
- }
- 
-@@ -147,7 +147,6 @@
- {
-     code39_decoder_t *dcode39 = &dcode->code39;
- 
--    dprintf(2, " s=%d ", dcode39->s9);
-     if(dcode39->s9 < 9)
-         return(-1);
- 
-@@ -181,7 +180,7 @@
-     zassert(idx < 0x2c, -1, " idx=%x enc=%x s9=%x\n", idx, enc, dcode39->s9);
- 
-     const char39_t *c = &code39_encodings[idx];
--    dprintf(2, " i=%02x chk=%02x c=%02x/%02x", idx, c->chk, c->fwd, c->rev);
-+    dbprintf(2, " i=%02x chk=%02x c=%02x/%02x", idx, c->chk, c->fwd, c->rev);
-     if(enc != c->chk)
-         return(-1);
- 
-@@ -192,35 +191,36 @@
- static inline signed char code39_decode_start (zbar_decoder_t *dcode)
- {
-     code39_decoder_t *dcode39 = &dcode->code39;
-+    dbprintf(2, " s=%d ", dcode39->s9);
- 
-     signed char c = code39_decode9(dcode);
--    if(c == 0x19)
--        dcode39->direction ^= 1;
--    else if(c != 0x2b) {
--        dprintf(2, "\n");
-+    if(c != 0x19 && c != 0x2b) {
-+        dbprintf(2, "\n");
-         return(ZBAR_NONE);
-     }
-+    dcode39->direction ^= (c == 0x19);
- 
-     /* check leading quiet zone - spec is 10x */
-     unsigned quiet = get_width(dcode, 9);
-     if(quiet && quiet < dcode39->s9 / 2) {
--        dprintf(2, " [invalid quiet]\n");
-+        dbprintf(2, " [invalid quiet]\n");
-         return(ZBAR_NONE);
-     }
- 
-     dcode39->element = 9;
-     dcode39->character = 0;
--    dprintf(1, " dir=%x [valid start]\n", dcode39->direction);
-+    dbprintf(1, " dir=%x [valid start]\n", dcode39->direction);
-     return(ZBAR_PARTIAL);
- }
- 
--static inline void code39_postprocess (zbar_decoder_t *dcode)
-+static inline int code39_postprocess (zbar_decoder_t *dcode)
- {
-     code39_decoder_t *dcode39 = &dcode->code39;
-+    dcode->direction = 1 - 2 * dcode39->direction;
-     int i;
-     if(dcode39->direction) {
-         /* reverse buffer */
--        dprintf(2, " (rev)");
-+        dbprintf(2, " (rev)");
-         for(i = 0; i < dcode39->character / 2; i++) {
-             unsigned j = dcode39->character - 1 - i;
-             char code = dcode->buf[i];
-@@ -232,8 +232,22 @@
-         dcode->buf[i] = ((dcode->buf[i] < 0x2b)
-                          ? code39_characters[(unsigned)dcode->buf[i]]
-                          : '?');
-+    zassert(i < dcode->buf_alloc, -1, "i=%02x %s\n", i,
-+            _zbar_decoder_buf_dump(dcode->buf, dcode39->character));
-     dcode->buflen = i;
-     dcode->buf[i] = '\0';
-+    dcode->modifiers = 0;
-+    return(0);
-+}
-+
-+static inline int
-+check_width (unsigned ref,
-+             unsigned w)
-+{
-+    unsigned dref = ref;
-+    ref *= 4;
-+    w *= 4;
-+    return(ref - dref <= w && w <= ref + dref);
- }
- 
- zbar_symbol_type_t _zbar_decode_code39 (zbar_decoder_t *dcode)
-@@ -247,16 +261,16 @@
-     if(dcode39->character < 0) {
-         if(get_color(dcode) != ZBAR_BAR)
-             return(ZBAR_NONE);
--        dprintf(2, "      code39:");
-+        dbprintf(2, "      code39:");
-         return(code39_decode_start(dcode));
-     }
- 
-     if(++dcode39->element < 9)
-         return(ZBAR_NONE);
- 
--    dprintf(2, "      code39[%c%02d+%x]",
--            (dcode39->direction) ? '<' : '>',
--            dcode39->character, dcode39->element);
-+    dbprintf(2, "      code39[%c%02d+%x]",
-+             (dcode39->direction) ? '<' : '>',
-+             dcode39->character, dcode39->element);
- 
-     if(dcode39->element == 10) {
-         unsigned space = get_width(dcode, 0);
-@@ -264,61 +278,64 @@
-            dcode->buf[dcode39->character - 1] == 0x2b) {  /* STOP */
-             /* trim STOP character */
-             dcode39->character--;
--            zbar_symbol_type_t sym = ZBAR_CODE39;
-+            zbar_symbol_type_t sym = ZBAR_NONE;
- 
-             /* trailing quiet zone check */
--            if(space && space < dcode39->width / 2) {
--                dprintf(2, " [invalid qz]\n");
--                sym = ZBAR_NONE;
--            }
-+            if(space && space < dcode39->width / 2)
-+                dbprintf(2, " [invalid qz]\n");
-             else if(dcode39->character < CFG(*dcode39, ZBAR_CFG_MIN_LEN) ||
-                     (CFG(*dcode39, ZBAR_CFG_MAX_LEN) > 0 &&
--                     dcode39->character > CFG(*dcode39, ZBAR_CFG_MAX_LEN))) {
--                dprintf(2, " [invalid len]\n");
--                sym = ZBAR_NONE;
--            }
--            else {
--                /* FIXME checksum (needs config enable) */
--                code39_postprocess(dcode);
--                dprintf(2, " [valid end]\n");
-+                     dcode39->character > CFG(*dcode39, ZBAR_CFG_MAX_LEN)))
-+                dbprintf(2, " [invalid len]\n");
-+            else if(!code39_postprocess(dcode)) {
-+                /* FIXME checksum */
-+                dbprintf(2, " [valid end]\n");
-+                sym = ZBAR_CODE39;
-             }
-             dcode39->character = -1;
-             if(!sym)
--                dcode->lock = 0;
-+                release_lock(dcode, ZBAR_CODE39);
-             return(sym);
-         }
-         if(space > dcode39->width / 2) {
-             /* inter-character space check failure */
--            dcode->lock = 0;
-+            dbprintf(2, " ics>%d [invalid ics]", dcode39->width);
-+            if(dcode39->character)
-+                release_lock(dcode, ZBAR_CODE39);
-             dcode39->character = -1;
--            dprintf(2, " ics>%d [invalid ics]", dcode39->width);
-         }
-         dcode39->element = 0;
--        dprintf(2, "\n");
-+        dbprintf(2, "\n");
-+        return(ZBAR_NONE);
-+    }
-+
-+    dbprintf(2, " s=%d ", dcode39->s9);
-+    if(!check_width(dcode39->width, dcode39->s9)) {
-+        dbprintf(2, " [width]\n");
-+        if(dcode39->character)
-+            release_lock(dcode, ZBAR_CODE39);
-+        dcode39->character = -1;
-         return(ZBAR_NONE);
-     }
- 
-     signed char c = code39_decode9(dcode);
--    dprintf(2, " c=%d", c);
-+    dbprintf(2, " c=%d", c);
- 
-     /* lock shared resources */
--    if(!dcode39->character && get_lock(dcode, ZBAR_CODE39)) {
-+    if(!dcode39->character && acquire_lock(dcode, ZBAR_CODE39)) {
-         dcode39->character = -1;
--        dprintf(1, " [locked %d]\n", dcode->lock);
-         return(ZBAR_PARTIAL);
-     }
- 
--    if(c < 0 ||
--       ((dcode39->character >= BUFFER_MIN) &&
--        size_buf(dcode, dcode39->character + 1))) {
--        dprintf(1, (c < 0) ? " [aborted]\n" : " [overflow]\n");
--        dcode->lock = 0;
-+    if(c < 0 || size_buf(dcode, dcode39->character + 1)) {
-+        dbprintf(1, (c < 0) ? " [aborted]\n" : " [overflow]\n");
-+        release_lock(dcode, ZBAR_CODE39);
-         dcode39->character = -1;
-         return(ZBAR_NONE);
-     }
-     else {
-         zassert(c < 0x2c, ZBAR_NONE, "c=%02x s9=%x\n", c, dcode39->s9);
--        dprintf(2, "\n");
-+        dbprintf(2, "\n");
-     }
- 
-     dcode->buf[dcode39->character++] = c;
-diff -r 563557a923d0 zbar/decoder/code93.c
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/zbar/decoder/code93.c	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,400 @@
-+/*------------------------------------------------------------------------
-+ *  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-+ *
-+ *  This file is part of the ZBar Bar Code Reader.
-+ *
-+ *  The ZBar Bar Code Reader is free software; you can redistribute it
-+ *  and/or modify it under the terms of the GNU Lesser Public License as
-+ *  published by the Free Software Foundation; either version 2.1 of
-+ *  the License, or (at your option) any later version.
-+ *
-+ *  The ZBar Bar Code Reader is distributed in the hope that it will be
-+ *  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-+ *  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU Lesser Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser Public License
-+ *  along with the ZBar Bar Code Reader; if not, write to the Free
-+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-+ *  Boston, MA  02110-1301  USA
-+ *
-+ *  http://sourceforge.net/projects/zbar
-+ *------------------------------------------------------------------------*/
-+
-+#include <config.h>
-+#include <zbar.h>
-+
-+#ifdef DEBUG_CODE93
-+# define DEBUG_LEVEL (DEBUG_CODE93)
-+#endif
-+#include "debug.h"
-+#include "decoder.h"
-+
-+static const signed char code93_hash[0x40] = {
-+    0x0f, 0x2b, 0x30, 0x38, 0x13, 0x1b, 0x11, 0x2a,
-+    0x0a,   -1, 0x2f, 0x0f, 0x38, 0x38, 0x2f, 0x37,
-+    0x24, 0x3a, 0x1b, 0x36, 0x18, 0x26, 0x02, 0x2c,
-+    0x2b, 0x05, 0x21, 0x3b, 0x04, 0x15, 0x12, 0x0c,
-+    0x00, 0x26, 0x23, 0x00,   -1, 0x2e, 0x3f, 0x13,
-+    0x2e, 0x36,   -1, 0x08, 0x09,   -1, 0x15, 0x14,
-+      -1, 0x00, 0x21, 0x3b,   -1, 0x33, 0x00,   -1,
-+    0x2d, 0x0c, 0x1b, 0x0a, 0x3f, 0x3f, 0x29, 0x1c,
-+};
-+
-+static inline int
-+check_width (unsigned cur,
-+             unsigned prev)
-+{
-+    unsigned dw;
-+    if(prev > cur)
-+        dw = prev - cur;
-+    else
-+        dw = cur - prev;
-+    dw *= 4;
-+    return(dw > prev);
-+}
-+
-+static inline int
-+encode6 (zbar_decoder_t *dcode)
-+{
-+    /* build edge signature of character */
-+    unsigned s = dcode->s6;
-+    int sig = 0, i;
-+
-+    dbprintf(2, " s=%d ", s);
-+    if(s < 9)
-+        return(-1);
-+
-+    for(i = 6; --i > 0; ) {
-+        unsigned c = decode_e(pair_width(dcode, i), s, 9);
-+        if(c > 3)
-+            return(-1);
-+        sig = (sig << 2) | c;
-+        dbprintf(2, "%d", c);
-+    }
-+    dbprintf(2, " sig=%03x", sig);
-+
-+    return(sig);
-+}
-+
-+static inline int
-+validate_sig (int sig)
-+{
-+    int i, sum = 0, emin = 0, sig0 = 0, sig1 = 0;
-+    dbprintf(3, " sum=0");
-+    for(i = 3; --i >= 0; ) {
-+        int e = sig & 3;
-+        sig >>= 2;
-+        sum = e - sum;
-+        sig1 <<= 4;
-+        sig1 += sum;
-+        dbprintf(3, "%d", sum);
-+        if(!i)
-+            break;
-+
-+        e = sig & 3;
-+        sig >>= 2;
-+        sum = e - sum;
-+        sig0 <<= 4;
-+        if(emin > sum)
-+            emin = sum;
-+        sig0 += sum;
-+        dbprintf(3, "%d", sum);
-+    }
-+
-+    dbprintf(3, " emin=%d sig=%03x/%03x", emin, sig1 & 0xfff, sig0 & 0xfff);
-+
-+    emin = emin + (emin << 4) + (emin << 8);
-+    sig0 -= emin;
-+    sig1 += emin;
-+
-+    dbprintf(3, "=%03x/%03x", sig1 & 0xfff, sig0 & 0xfff);
-+    return((sig0 | sig1) & 0x888);
-+}
-+
-+static inline int
-+decode6 (zbar_decoder_t *dcode)
-+{
-+    int sig = encode6(dcode);
-+    int g0, g1, c;
-+    if(sig < 0 ||
-+       (sig & 0x3) + ((sig >> 4) & 0x3) + ((sig >> 8) & 0x3) != 3 ||
-+       validate_sig(sig))
-+        return(-1);
-+
-+    if(dcode->code93.direction) {
-+        /* reverse signature */
-+        unsigned tmp = sig & 0x030;
-+        sig = ((sig & 0x3c0) >> 6) | ((sig & 0x00f) << 6);
-+        sig = ((sig & 0x30c) >> 2) | ((sig & 0x0c3) << 2) | tmp;
-+    }
-+
-+    g0 = code93_hash[(sig - (sig >> 4)) & 0x3f];
-+    g1 = code93_hash[((sig >> 2) - (sig >> 7)) & 0x3f];
-+    zassert(g0 >= 0 && g1 >= 0, -1,
-+            "dir=%x sig=%03x g0=%03x g1=%03x %s\n",
-+            dcode->code93.direction, sig, g0, g1,
-+            _zbar_decoder_buf_dump(dcode->buf, dcode->code93.character));
-+
-+    c = (g0 + g1) & 0x3f;
-+    dbprintf(2, " g0=%x g1=%x c=%02x", g0, g1, c);
-+    return(c);
-+}
-+
-+static inline zbar_symbol_type_t
-+decode_start (zbar_decoder_t *dcode)
-+{
-+    code93_decoder_t *dcode93 = &dcode->code93;
-+    unsigned dir, qz, s = dcode->s6;
-+    int c;
-+
-+    dbprintf(2, "      code93:");
-+    c = encode6(dcode);
-+    if(c < 0 || (c != 0x00f && c != 0x0f0))
-+        return(ZBAR_NONE);
-+
-+    dir = (c >> 7);
-+
-+    if(dir) {
-+        if(decode_e(pair_width(dcode, 0), s, 9))
-+            return(ZBAR_NONE);
-+        qz = get_width(dcode, 8);
-+    }
-+
-+    qz = get_width(dcode, 7);
-+    if(qz && qz < (s * 3) / 4) {
-+        dbprintf(2, " [invalid qz %d]", qz);
-+        return(ZBAR_NONE);
-+    }
-+
-+    /* decoded valid start/stop - initialize state */
-+    dcode93->direction = dir;
-+    dcode93->element = (!dir) ? 0 : 7;
-+    dcode93->character = 0;
-+    dcode93->width = s;
-+
-+    dbprintf(2, " dir=%x [valid start]", dir);
-+    return(ZBAR_PARTIAL);
-+}
-+
-+static inline zbar_symbol_type_t
-+decode_abort (zbar_decoder_t *dcode,
-+              const char *reason)
-+{
-+    code93_decoder_t *dcode93 = &dcode->code93;
-+    if(dcode93->character > 1)
-+        release_lock(dcode, ZBAR_CODE93);
-+    dcode93->character = -1;
-+    if(reason)
-+        dbprintf(1, " [%s]\n", reason);
-+    return(ZBAR_NONE);
-+}
-+
-+static inline zbar_symbol_type_t
-+check_stop (zbar_decoder_t *dcode)
-+{
-+    code93_decoder_t *dcode93 = &dcode->code93;
-+    unsigned n = dcode93->character, s = dcode->s6;
-+    int max_len = CFG(*dcode93, ZBAR_CFG_MAX_LEN);
-+    if(n < 2 ||
-+       n < CFG(*dcode93, ZBAR_CFG_MIN_LEN) ||
-+       (max_len && n > max_len))
-+        return(decode_abort(dcode, "invalid len"));
-+
-+    if(dcode93->direction) {
-+        unsigned qz = get_width(dcode, 0);
-+        if(qz && qz < (s * 3) / 4)
-+            return(decode_abort(dcode, "invalid qz"));
-+    }
-+    else if(decode_e(pair_width(dcode, 0), s, 9))
-+        /* FIXME forward-trailing QZ check */
-+        return(decode_abort(dcode, "invalid stop"));
-+
-+    return(ZBAR_CODE93);
-+}
-+
-+#define CHKMOD (47)
-+
-+static inline int
-+plusmod47 (int acc,
-+           int add)
-+{
-+    acc += add;
-+    if(acc >= CHKMOD)
-+        acc -= CHKMOD;
-+    return(acc);
-+}
-+
-+static inline int
-+validate_checksums (zbar_decoder_t *dcode)
-+{
-+    code93_decoder_t *dcode93 = &dcode->code93;
-+    unsigned d, i, n = dcode93->character;
-+    unsigned sum_c = 0, acc_c = 0, i_c = (n - 2) % 20;
-+    unsigned sum_k = 0, acc_k = 0, i_k = (n - 1) % 15;
-+
-+    for(i = 0; i < n - 2; i++) {
-+        d = dcode->buf[(dcode93->direction) ? n - 1 - i : i];
-+
-+        if(!i_c--) {
-+            acc_c = 0;
-+            i_c = 19;
-+        }
-+        acc_c = plusmod47(acc_c, d);
-+        sum_c = plusmod47(sum_c, acc_c);
-+
-+        if(!i_k--) {
-+            acc_k = 0;
-+            i_k = 14;
-+        }
-+        acc_k = plusmod47(acc_k, d);
-+        sum_k = plusmod47(sum_k, acc_k);
-+    }
-+
-+    d = dcode->buf[(dcode93->direction) ? 1 : n - 2];
-+    dbprintf(2, " C=%02x?=%02x", d, sum_c);
-+    if(d != sum_c)
-+        return(1);
-+
-+    acc_k = plusmod47(acc_k, sum_c);
-+    sum_k = plusmod47(sum_k, acc_k);
-+    d = dcode->buf[(dcode93->direction) ? 0 : n - 1];
-+    dbprintf(2, " K=%02x?=%02x", d, sum_k);
-+    if(d != sum_k)
-+        return(1);
-+
-+    return(0);
-+}
-+
-+/* resolve scan direction and convert to ASCII */
-+static inline int
-+postprocess (zbar_decoder_t *dcode)
-+{
-+    code93_decoder_t *dcode93 = &dcode->code93;
-+    unsigned i, j, n = dcode93->character;
-+    static const unsigned char code93_graph[] = "-. $/+%";
-+    static const unsigned char code93_s2[] =
-+        "\x1b\x1c\x1d\x1e\x1f;<=>?[\\]^_{|}~\x7f\x00\x40`\x7f\x7f\x7f";
-+
-+    dbprintf(2, "\n    postproc len=%d", n);
-+    dcode->direction = 1 - 2 * dcode93->direction;
-+    if(dcode93->direction) {
-+        /* reverse buffer */
-+        dbprintf(2, " (rev)");
-+        for(i = 0; i < n / 2; i++) {
-+            unsigned j = n - 1 - i;
-+            unsigned char d = dcode->buf[i];
-+            dcode->buf[i] = dcode->buf[j];
-+            dcode->buf[j] = d;
-+        }
-+    }
-+
-+    n -= 2;
-+    for(i = 0, j = 0; i < n; ) {
-+        unsigned char d = dcode->buf[i++];
-+        if(d < 0xa)
-+            d = '0' + d;
-+        else if(d < 0x24)
-+            d = 'A' + d - 0xa;
-+        else if(d < 0x2b)
-+            d = code93_graph[d - 0x24];
-+        else {
-+            unsigned shift = d;
-+            zassert(shift < 0x2f, -1, "%s\n",
-+                    _zbar_decoder_buf_dump(dcode->buf, dcode93->character));
-+            d = dcode->buf[i++];
-+            if(d < 0xa || d >= 0x24)
-+                return(1);
-+            d -= 0xa;
-+            switch(shift)
-+            {
-+            case 0x2b: d++; break;
-+            case 0x2c: d = code93_s2[d]; break;
-+            case 0x2d: d += 0x21; break;
-+            case 0x2e: d += 0x61; break;
-+            default: return(1);
-+            }
-+        }
-+        dcode->buf[j++] = d;
-+    }
-+
-+    zassert(j < dcode->buf_alloc, 1,
-+            "j=%02x %s\n", j,
-+            _zbar_decoder_buf_dump(dcode->buf, dcode->code93.character));
-+    dcode->buflen = j;
-+    dcode->buf[j] = '\0';
-+    dcode->modifiers = 0;
-+    return(0);
-+}
-+
-+zbar_symbol_type_t
-+_zbar_decode_code93 (zbar_decoder_t *dcode)
-+{
-+    code93_decoder_t *dcode93 = &dcode->code93;
-+    int c;
-+
-+    if(dcode93->character < 0) {
-+        zbar_symbol_type_t sym;
-+        if(get_color(dcode) != ZBAR_BAR)
-+            return(ZBAR_NONE);
-+        sym = decode_start(dcode);
-+        dbprintf(2, "\n");
-+        return(sym);
-+    }
-+
-+    if(/* process every 6th element of active symbol */
-+       ++dcode93->element != 6 ||
-+       /* decode color based on direction */
-+       get_color(dcode) == dcode93->direction)
-+        return(ZBAR_NONE);
-+
-+    dcode93->element = 0;
-+
-+    dbprintf(2, "      code93[%c%02d+%x]:",
-+             (dcode93->direction) ? '<' : '>',
-+             dcode93->character, dcode93->element);
-+
-+    if(check_width(dcode->s6, dcode93->width))
-+        return(decode_abort(dcode, "width var"));
-+
-+    c = decode6(dcode);
-+    if(c < 0)
-+        return(decode_abort(dcode, "aborted"));
-+
-+    if(c == 0x2f) {
-+        if(!check_stop(dcode))
-+            return(ZBAR_NONE);
-+        if(validate_checksums(dcode))
-+            return(decode_abort(dcode, "checksum error"));
-+        if(postprocess(dcode))
-+            return(decode_abort(dcode, "invalid encoding"));
-+
-+        dbprintf(2, " [valid end]\n");
-+        dbprintf(3, "    %s\n",
-+                 _zbar_decoder_buf_dump(dcode->buf, dcode93->character));
-+
-+        dcode93->character = -1;
-+        return(ZBAR_CODE93);
-+    }
-+
-+    if(size_buf(dcode, dcode93->character + 1))
-+        return(decode_abort(dcode, "overflow"));
-+
-+    dcode93->width = dcode->s6;
-+
-+    if(dcode93->character == 1) {
-+        /* lock shared resources */
-+        if(acquire_lock(dcode, ZBAR_CODE93))
-+            return(decode_abort(dcode, NULL));
-+        dcode->buf[0] = dcode93->buf;
-+    }
-+
-+    if(!dcode93->character)
-+        dcode93->buf = c;
-+    else 
-+        dcode->buf[dcode93->character] = c;
-+    dcode93->character++;
-+
-+    dbprintf(2, "\n");
-+    return(ZBAR_NONE);
-+}
-diff -r 563557a923d0 zbar/decoder/code93.h
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/zbar/decoder/code93.h	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,49 @@
-+/*------------------------------------------------------------------------
-+ *  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-+ *
-+ *  This file is part of the ZBar Bar Code Reader.
-+ *
-+ *  The ZBar Bar Code Reader is free software; you can redistribute it
-+ *  and/or modify it under the terms of the GNU Lesser Public License as
-+ *  published by the Free Software Foundation; either version 2.1 of
-+ *  the License, or (at your option) any later version.
-+ *
-+ *  The ZBar Bar Code Reader is distributed in the hope that it will be
-+ *  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-+ *  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU Lesser Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser Public License
-+ *  along with the ZBar Bar Code Reader; if not, write to the Free
-+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-+ *  Boston, MA  02110-1301  USA
-+ *
-+ *  http://sourceforge.net/projects/zbar
-+ *------------------------------------------------------------------------*/
-+#ifndef _CODE93_H_
-+#define _CODE93_H_
-+
-+/* Code 93 specific decode state */
-+typedef struct code93_decoder_s {
-+    unsigned direction : 1;     /* scan direction: 0=fwd/space, 1=rev/bar */
-+    unsigned element : 3;       /* element offset 0-5 */
-+    int character : 12;         /* character position in symbol */
-+    unsigned width;             /* last character width */
-+    unsigned char buf;          /* first character */
-+
-+    unsigned config;
-+    int configs[NUM_CFGS];      /* int valued configurations */
-+} code93_decoder_t;
-+
-+/* reset Code 93 specific state */
-+static inline void code93_reset (code93_decoder_t *dcode93)
-+{
-+    dcode93->direction = 0;
-+    dcode93->element = 0;
-+    dcode93->character = -1;
-+}
-+
-+/* decode Code 93 symbols */
-+zbar_symbol_type_t _zbar_decode_code93(zbar_decoder_t *dcode);
-+
-+#endif
-diff -r 563557a923d0 zbar/decoder/databar.c
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/zbar/decoder/databar.c	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,1280 @@
-+/*------------------------------------------------------------------------
-+ *  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-+ *
-+ *  This file is part of the ZBar Bar Code Reader.
-+ *
-+ *  The ZBar Bar Code Reader is free software; you can redistribute it
-+ *  and/or modify it under the terms of the GNU Lesser Public License as
-+ *  published by the Free Software Foundation; either version 2.1 of
-+ *  the License, or (at your option) any later version.
-+ *
-+ *  The ZBar Bar Code Reader is distributed in the hope that it will be
-+ *  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-+ *  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU Lesser Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser Public License
-+ *  along with the ZBar Bar Code Reader; if not, write to the Free
-+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-+ *  Boston, MA  02110-1301  USA
-+ *
-+ *  http://sourceforge.net/projects/zbar
-+ *------------------------------------------------------------------------*/
-+
-+#include <config.h>
-+#include <zbar.h>
-+
-+#ifdef DEBUG_DATABAR
-+# define DEBUG_LEVEL (DEBUG_DATABAR)
-+#endif
-+#include "debug.h"
-+#include "decoder.h"
-+
-+#define GS ('\035')
-+
-+enum { SCH_NUM, SCH_ALNUM, SCH_ISO646 };
-+
-+static const signed char finder_hash[0x20] = {
-+    0x16, 0x1f, 0x02, 0x00, 0x03, 0x00, 0x06, 0x0b,
-+    0x1f, 0x0e, 0x17, 0x0c, 0x0b, 0x14, 0x11, 0x0c,
-+    0x1f, 0x03, 0x13, 0x08, 0x00, 0x0a,   -1, 0x16,
-+    0x0c, 0x09,   -1, 0x1a, 0x1f, 0x1c, 0x00,   -1,
-+};
-+
-+/* DataBar character encoding groups */
-+struct group_s {
-+    unsigned short sum;
-+    unsigned char wmax;
-+    unsigned char todd;
-+    unsigned char teven;
-+} groups[] = {
-+    /* (17,4) DataBar Expanded character groups */
-+    {    0, 7,  87,   4 },
-+    {  348, 5,  52,  20 },
-+    { 1388, 4,  30,  52 },
-+    { 2948, 3,  10, 104 },
-+    { 3988, 1,   1, 204 },
-+
-+    /* (16,4) DataBar outer character groups */
-+    {    0, 8, 161,   1 },
-+    {  161, 6,  80,  10 },
-+    {  961, 4,  31,  34 },
-+    { 2015, 3,  10,  70 },
-+    { 2715, 1,   1, 126 },
-+
-+    /* (15,4) DataBar inner character groups */
-+    { 1516, 8,  81,   1 },
-+    { 1036, 6,  48,  10 },
-+    {  336, 4,  20,  35 },
-+    {    0, 2,   4,  84 },
-+};
-+
-+static const unsigned char exp_sequences[] = {
-+    /* sequence Group 1 */
-+    0x01,
-+    0x23,
-+    0x25, 0x07,
-+    0x29, 0x47,
-+    0x29, 0x67, 0x0b,
-+    0x29, 0x87, 0xab,
-+    /* sequence Group 2 */
-+    0x21, 0x43, 0x65, 0x07,
-+    0x21, 0x43, 0x65, 0x89,
-+    0x21, 0x43, 0x65, 0xa9, 0x0b,
-+    0x21, 0x43, 0x67, 0x89, 0xab
-+};
-+
-+/* DataBar expanded checksum multipliers */
-+static const unsigned char exp_checksums[] = {
-+    1, 189, 62, 113, 46, 43, 109, 134, 6, 79, 161, 45
-+};
-+
-+static inline void
-+append_check14 (unsigned char *buf)
-+{
-+    unsigned char chk = 0, d;
-+    int i;
-+    for(i = 13; --i >= 0; ) {
-+        d = *(buf++) - '0';
-+        chk += d;
-+        if(!(i & 1))
-+            chk += d << 1;
-+    }
-+    chk %= 10;
-+    if(chk)
-+        chk = 10 - chk;
-+    *buf = chk + '0';
-+}
-+
-+static inline void
-+decode10 (unsigned char *buf,
-+          unsigned long n,
-+          int i)
-+{
-+    buf += i;
-+    while(--i >= 0) {
-+        unsigned char d = n % 10;
-+        n /= 10;
-+        *--buf = '0' + d;
-+    }
-+}
-+
-+#define VAR_MAX(l, i) ((((l) * 12 + (i)) * 2 + 6) / 7)
-+
-+#define FEED_BITS(b)                         \
-+    while(i < (b) && len) {                  \
-+        d = (d << 12) | (*(data++) & 0xfff); \
-+        i += 12;                             \
-+        len--;                               \
-+        dbprintf(2, " %03lx", d & 0xfff);     \
-+    }
-+
-+#define PUSH_CHAR(c) \
-+    *(buf++) = (c)
-+
-+#define PUSH_CHAR4(c0, c1, c2, c3) do { \
-+        PUSH_CHAR(c0);                  \
-+        PUSH_CHAR(c1);                  \
-+        PUSH_CHAR(c2);                  \
-+        PUSH_CHAR(c3);                  \
-+    } while(0);
-+
-+static inline int
-+databar_postprocess_exp (zbar_decoder_t *dcode,
-+                         int *data)
-+{
-+    int i = 0, enc;
-+    unsigned n;
-+    unsigned char *buf;
-+    unsigned long d = *(data++);
-+    int len = d / 211 + 4, buflen;
-+
-+    /* grok encodation method */
-+    d = *(data++);
-+    dbprintf(2, "\n    len=%d %03lx", len, d & 0xfff);
-+    n = (d >> 4) & 0x7f;
-+    if(n >= 0x40) {
-+        i = 10;
-+        enc = 1;
-+        buflen = 2 + 14 + VAR_MAX(len, 10 - 2 - 44 + 6) + 2;
-+    }
-+    else if(n >= 0x38) {
-+        i = 4;
-+        enc = 6 + (n & 7);
-+        buflen = 2 + 14 + 4 + 6 + 2 + 6 + 2;
-+    }
-+    else if(n >= 0x30) {
-+        i = 6;
-+        enc = 2 + ((n >> 2) & 1);
-+        buflen = 2 + 14 + 4 + 3 + VAR_MAX(len, 6 - 2 - 44 - 2 - 10) + 2;
-+    }
-+    else if(n >= 0x20) {
-+        i = 7;
-+        enc = 4 + ((n >> 3) & 1);
-+        buflen = 2 + 14 + 4 + 6;
-+    }
-+    else {
-+        i = 9;
-+        enc = 0;
-+        buflen = VAR_MAX(len, 9 - 2) + 2;
-+    }
-+    dbprintf(2, " buflen=%d enc=%d", buflen, enc);
-+    zassert(buflen > 2, -1, "buflen=%d\n", buflen);
-+
-+    if(enc < 4) {
-+        /* grok variable length symbol bit field */
-+        if((len ^ (d >> (--i))) & 1)
-+            /* even/odd length mismatch */
-+            return(-1);
-+        if(((d >> (--i)) & 1) != (len > 14))
-+            /* size group mismatch */
-+            return(-1);
-+    }
-+    len -= 2;
-+    dbprintf(2, " [%d+%d]", i, len);
-+
-+    if(size_buf(dcode, buflen))
-+        return(-1);
-+    buf = dcode->buf;
-+
-+    /* handle compressed fields */
-+    if(enc) {
-+        PUSH_CHAR('0');
-+        PUSH_CHAR('1');
-+    }
-+
-+    if(enc == 1) {
-+        i -= 4;
-+        n = (d >> i) & 0xf;
-+        if(i >= 10)
-+            return(-1);
-+        PUSH_CHAR('0' + n);
-+    }
-+    else if(enc)
-+        PUSH_CHAR('9');
-+
-+    if(enc) {
-+        int j;
-+        for(j = 0; j < 4; j++) {
-+            FEED_BITS(10);
-+            i -= 10;
-+            n = (d >> i) & 0x3ff;
-+            if(n >= 1000)
-+                return(-1);
-+            decode10(buf, n, 3);
-+            buf += 3;
-+        }
-+        append_check14(buf - 13);
-+        buf++;
-+    }
-+
-+    switch(enc)
-+    {
-+    case 2: /* 01100: AI 392x */
-+        FEED_BITS(2);
-+        i -= 2;
-+        n = (d >> i) & 0x3;
-+        PUSH_CHAR4('3', '9', '2', '0' + n);
-+        break;
-+
-+    case 3: /* 01101: AI 393x */
-+        FEED_BITS(12);
-+        i -= 2;
-+        n = (d >> i) & 0x3;
-+        PUSH_CHAR4('3', '9', '3', '0' + n);
-+        i -= 10;
-+        n = (d >> i) & 0x3ff;
-+        if(n >= 1000)
-+            return(-1);
-+        decode10(buf, n, 3);
-+        buf += 3;
-+        break;
-+
-+    case 4: /* 0100: AI 3103 */
-+        FEED_BITS(15);
-+        i -= 15;
-+        n = (d >> i) & 0x7fff;
-+        PUSH_CHAR4('3', '1', '0', '3');
-+        decode10(buf, n, 6);
-+        buf += 6;
-+        break;
-+
-+    case 5: /* 0101: AI 3202/3203 */
-+        FEED_BITS(15);
-+        i -= 15;
-+        n = (d >> i) & 0x7fff;
-+        dbprintf(2, " v=%d", n);
-+        PUSH_CHAR4('3', '2', '0', (n >= 10000) ? '3' : '2' );
-+        if(n >= 10000)
-+            n -= 10000;
-+        decode10(buf, n, 6);
-+        buf += 6;
-+        break;
-+    }
-+    if(enc >= 6) {
-+        /* 0111000 - 0111111: AI 310x/320x + AI 11/13/15/17 */
-+        PUSH_CHAR4('3', '1' + (enc & 1), '0', 'x');
-+        FEED_BITS(20);
-+        i -= 20;
-+        n = (d >> i) & 0xfffff;
-+        dbprintf(2, " [%d+%d] %d", i, len, n);
-+        if(n >= 1000000)
-+            return(-1);
-+        decode10(buf, n, 6);
-+        *(buf - 1) = *buf;
-+        *buf = '0';
-+        buf += 6;
-+
-+        FEED_BITS(16);
-+        i -= 16;
-+        n = (d >> i) & 0xffff;
-+        if(n < 38400) {
-+            int dd, mm, yy;
-+            dd = n % 32;
-+            n /= 32;
-+            mm = n % 12 + 1;
-+            n /= 12;
-+            yy = n;
-+            PUSH_CHAR('1');
-+            PUSH_CHAR('0' + ((enc - 6) | 1));
-+            decode10(buf, yy, 2);
-+            buf += 2;
-+            decode10(buf, mm, 2);
-+            buf += 2;
-+            decode10(buf, dd, 2);
-+            buf += 2;
-+        }
-+        else if(n > 38400)
-+            return(-1);
-+    }
-+
-+    if(enc < 4) {
-+        /* remainder is general-purpose data compaction */
-+        int scheme = SCH_NUM;
-+        while(i > 0 || len > 0) {
-+            FEED_BITS(8);
-+            dbprintf(2, " [%d+%d]", i, len);
-+
-+            if(scheme == SCH_NUM) {
-+                int n1;
-+                i -= 4;
-+                if(i < 0)
-+                    break;
-+                if(!((d >> i) & 0xf)) {
-+                    scheme = SCH_ALNUM;
-+                    dbprintf(2, ">A");
-+                    continue;
-+                }
-+                if(!len && i < 3) {
-+                    /* special case last digit */
-+                    n = ((d >> i) & 0xf) - 1;
-+                    if(n > 9)
-+                        return(-1);
-+                    *(buf++) = '0' + n;
-+                    break;
-+                }
-+                i -= 3;
-+                zassert(i >= 0, -1, "\n");
-+                n = ((d >> i) & 0x7f) - 8;
-+                n1 = n % 11;
-+                n = n / 11;
-+                dbprintf(2, "N%d%d", n, n1);
-+                *(buf++) = (n < 10) ? '0' + n : GS;
-+                *(buf++) = (n1 < 10) ? '0' + n1 : GS;
-+            }
-+            else  {
-+                unsigned c = 0;
-+                i -= 3;
-+                if(i < 0)
-+                    break;
-+                if(!((d >> i) & 0x7)) {
-+                    scheme = SCH_NUM;
-+                    continue;
-+                }
-+                i -= 2;
-+                if(i < 0)
-+                    break;
-+                n = (d >> i) & 0x1f;
-+                if(n == 0x04) {
-+                    scheme ^= 0x3;
-+                    dbprintf(2, ">%d", scheme);
-+                }
-+                else if(n == 0x0f)
-+                    c = GS;
-+                else if(n < 0x0f)
-+                    c = 43 + n;
-+                else if(scheme == SCH_ALNUM) {
-+                    i--;
-+                    if(i < 0)
-+                        return(-1);
-+                    n = (d >> i) & 0x1f;
-+                    if(n < 0x1a)
-+                        c = 'A' + n;
-+                    else if(n == 0x1a)
-+                        c = '*';
-+                    else if(n < 0x1f)
-+                        c = ',' + n - 0x1b;
-+                    else
-+                        return(-1);
-+                }
-+                else if(scheme == SCH_ISO646 && n < 0x1d) {
-+                    i -= 2;
-+                    if(i < 0)
-+                        return(-1);
-+                    n = (d >> i) & 0x3f;
-+                    if(n < 0x1a)
-+                        c = 'A' + n;
-+                    else if(n < 0x34)
-+                        c = 'a' + n - 0x1a;
-+                    else
-+                        return(-1);
-+                }
-+                else if(scheme == SCH_ISO646) {
-+                    i -= 3;
-+                    if(i < 0)
-+                        return(-1);
-+                    n = ((d >> i) & 0x1f);
-+                    dbprintf(2, "(%02x)", n);
-+                    if(n < 0xa)
-+                        c = '!' + n - 8;
-+                    else if(n < 0x15)
-+                        c = '%' + n - 0xa;
-+                    else if(n < 0x1b)
-+                        c = ':' + n - 0x15;
-+                    else if(n == 0x1b)
-+                        c = '_';
-+                    else if(n == 0x1c)
-+                        c = ' ';
-+                    else
-+                        return(-1);
-+                }
-+                else
-+                    return(-1);
-+
-+                if(c) {
-+                    dbprintf(2, "%d%c", scheme, c);
-+                    *(buf++) = c;
-+                }
-+            }
-+        }
-+        /* FIXME check pad? */
-+    }
-+
-+    i = buf - dcode->buf;
-+    zassert(i < dcode->buf_alloc, -1, "i=%02x %s\n", i,
-+            _zbar_decoder_buf_dump(dcode->buf, i));
-+
-+    *buf = 0;
-+    dcode->buflen = i;
-+    if(i && *--buf == GS) {
-+        *buf = 0;
-+        dcode->buflen--;
-+    }
-+
-+    dbprintf(2, "\n    %s", _zbar_decoder_buf_dump(dcode->buf, dcode->buflen));
-+    return(0);
-+}
-+#undef FEED_BITS
-+
-+/* convert from heterogeneous base {1597,2841}
-+ * to base 10 character representation
-+ */
-+static inline void
-+databar_postprocess (zbar_decoder_t *dcode,
-+                     unsigned d[4])
-+{
-+    databar_decoder_t *db = &dcode->databar;
-+    int i;
-+    unsigned c, chk = 0;
-+    unsigned char *buf = dcode->buf;
-+    *(buf++) = '0';
-+    *(buf++) = '1';
-+    buf += 15;
-+    *--buf = '\0';
-+    *--buf = '\0';
-+
-+    dbprintf(2, "\n    d={%d,%d,%d,%d}", d[0], d[1], d[2], d[3]);
-+    unsigned long r = d[0] * 1597 + d[1];
-+    d[1] = r / 10000;
-+    r %= 10000;
-+    r = r * 2841 + d[2];
-+    d[2] = r / 10000;
-+    r %= 10000;
-+    r = r * 1597 + d[3];
-+    d[3] = r / 10000;
-+    dbprintf(2, " r=%ld", r);
-+
-+    for(i = 4; --i >= 0; ) {
-+        c = r % 10;
-+        chk += c;
-+        if(i & 1)
-+            chk += c << 1;
-+        *--buf = c + '0';
-+        if(i)
-+            r /= 10;
-+    }
-+
-+    dbprintf(2, " d={%d,%d,%d}", d[1], d[2], d[3]);
-+    r = d[1] * 2841 + d[2];
-+    d[2] = r / 10000;
-+    r %= 10000;
-+    r = r * 1597 + d[3];
-+    d[3] = r / 10000;
-+    dbprintf(2, " r=%ld", r);
-+
-+    for(i = 4; --i >= 0; ) {
-+        c = r % 10;
-+        chk += c;
-+        if(i & 1)
-+            chk += c << 1;
-+        *--buf = c + '0';
-+        if(i)
-+            r /= 10;
-+    }
-+
-+    r = d[2] * 1597 + d[3];
-+    dbprintf(2, " d={%d,%d} r=%ld", d[2], d[3], r);
-+
-+    for(i = 5; --i >= 0; ) {
-+        c = r % 10;
-+        chk += c;
-+        if(!(i & 1))
-+            chk += c << 1;
-+        *--buf = c + '0';
-+        if(i)
-+            r /= 10;
-+    }
-+
-+    /* NB linkage flag not supported */
-+    if(TEST_CFG(db->config, ZBAR_CFG_EMIT_CHECK)) {
-+        chk %= 10;
-+        if(chk)
-+            chk = 10 - chk;
-+        buf[13] = chk + '0';
-+        dcode->buflen = buf - dcode->buf + 14;
-+    }
-+    else
-+        dcode->buflen = buf - dcode->buf + 13;
-+
-+    dbprintf(2, "\n    %s", _zbar_decoder_buf_dump(dcode->buf, 16));
-+}
-+
-+static inline int
-+check_width (unsigned wf,
-+             unsigned wd,
-+             unsigned n)
-+{
-+    unsigned dwf = wf * 3;
-+    wd *= 14;
-+    wf *= n;
-+    return(wf - dwf <= wd && wd <= wf + dwf);
-+}
-+
-+static inline void
-+merge_segment (databar_decoder_t *db,
-+               databar_segment_t *seg)
-+{
-+    unsigned csegs = db->csegs;
-+    int i;
-+    for(i = 0; i < csegs; i++) {
-+        databar_segment_t *s = db->segs + i;
-+        if(s != seg && s->finder == seg->finder && s->exp == seg->exp &&
-+           s->color == seg->color && s->side == seg->side &&
-+           s->data == seg->data && s->check == seg->check &&
-+           check_width(seg->width, s->width, 14)) {
-+            /* merge with existing segment */
-+            unsigned cnt = s->count;
-+            if(cnt < 0x7f)
-+                cnt++;
-+            seg->count = cnt;
-+            seg->partial &= s->partial;
-+            seg->width = (3 * seg->width + s->width + 2) / 4;
-+            s->finder = -1;
-+            dbprintf(2, " dup@%d(%d,%d)",
-+                     i, cnt, (db->epoch - seg->epoch) & 0xff);
-+        }
-+        else if(s->finder >= 0) {
-+            unsigned age = (db->epoch - s->epoch) & 0xff;
-+            if(age >= 248 || (age >= 128 && s->count < 2))
-+                s->finder = -1;
-+        }
-+    }
-+}
-+
-+static inline zbar_symbol_type_t
-+match_segment (zbar_decoder_t *dcode,
-+               databar_segment_t *seg)
-+{
-+    databar_decoder_t *db = &dcode->databar;
-+    unsigned csegs = db->csegs, maxage = 0xfff;
-+    int i0, i1, i2, maxcnt = 0;
-+    databar_segment_t *smax[3] = { NULL, };
-+
-+    if(seg->partial && seg->count < 4)
-+        return(ZBAR_PARTIAL);
-+
-+    for(i0 = 0; i0 < csegs; i0++) {
-+        databar_segment_t *s0 = db->segs + i0;
-+        if(s0 == seg || s0->finder != seg->finder || s0->exp ||
-+           s0->color != seg->color || s0->side == seg->side ||
-+           (s0->partial && s0->count < 4) ||
-+           !check_width(seg->width, s0->width, 14))
-+            continue;
-+
-+        for(i1 = 0; i1 < csegs; i1++) {
-+            databar_segment_t *s1 = db->segs + i1;
-+            int chkf, chks, chk;
-+            unsigned age1;
-+            if(i1 == i0 || s1->finder < 0 || s1->exp ||
-+               s1->color == seg->color ||
-+               (s1->partial && s1->count < 4) ||
-+               !check_width(seg->width, s1->width, 14))
-+                continue;
-+            dbprintf(2, "\n\t[%d,%d] f=%d(0%xx)/%d(%x%x%x)",
-+                     i0, i1, seg->finder, seg->color,
-+                     s1->finder, s1->exp, s1->color, s1->side);
-+
-+            if(seg->color)
-+                chkf = seg->finder + s1->finder * 9;
-+            else
-+                chkf = s1->finder + seg->finder * 9;
-+            if(chkf > 72)
-+                chkf--;
-+            if(chkf > 8)
-+                chkf--;
-+
-+            chks = (seg->check + s0->check + s1->check) % 79;
-+
-+            if(chkf >= chks)
-+                chk = chkf - chks;
-+            else
-+                chk = 79 + chkf - chks;
-+
-+            dbprintf(2, " chk=(%d,%d) => %d", chkf, chks, chk);
-+            age1 = (((db->epoch - s0->epoch) & 0xff) +
-+                    ((db->epoch - s1->epoch) & 0xff));
-+
-+            for(i2 = i1 + 1; i2 < csegs; i2++) {
-+                databar_segment_t *s2 = db->segs + i2;
-+                unsigned cnt, age2, age;
-+                if(i2 == i0 || s2->finder != s1->finder || s2->exp ||
-+                   s2->color != s1->color || s2->side == s1->side ||
-+                   s2->check != chk ||
-+                   (s2->partial && s2->count < 4) ||
-+                   !check_width(seg->width, s2->width, 14))
-+                    continue;
-+                age2 = (db->epoch - s2->epoch) & 0xff;
-+                age = age1 + age2;
-+                cnt = s0->count + s1->count + s2->count;
-+                dbprintf(2, " [%d] MATCH cnt=%d age=%d", i2, cnt, age);
-+                if(maxcnt < cnt ||
-+                   (maxcnt == cnt && maxage > age)) {
-+                    maxcnt = cnt;
-+                    maxage = age;
-+                    smax[0] = s0;
-+                    smax[1] = s1;
-+                    smax[2] = s2;
-+                }
-+            }
-+        }
-+    }
-+
-+    if(!smax[0])
-+        return(ZBAR_PARTIAL);
-+
-+    unsigned d[4];
-+    d[(seg->color << 1) | seg->side] = seg->data;
-+    for(i0 = 0; i0 < 3; i0++) {
-+        d[(smax[i0]->color << 1) | smax[i0]->side] = smax[i0]->data;
-+        if(!--(smax[i0]->count))
-+            smax[i0]->finder = -1;
-+    }
-+    seg->finder = -1;
-+
-+    if(size_buf(dcode, 18))
-+        return(ZBAR_PARTIAL);
-+
-+    if(acquire_lock(dcode, ZBAR_DATABAR))
-+        return(ZBAR_PARTIAL);
-+
-+    databar_postprocess(dcode, d);
-+    dcode->modifiers = MOD(ZBAR_MOD_GS1);
-+    dcode->direction = 1 - 2 * (seg->side ^ seg->color ^ 1);
-+    return(ZBAR_DATABAR);
-+}
-+
-+static inline unsigned
-+lookup_sequence (databar_segment_t *seg,
-+                 int fixed,
-+                 int seq[22])
-+{
-+    unsigned n = seg->data / 211, i;
-+    const unsigned char *p;
-+    i = (n + 1) / 2 + 1;
-+    n += 4;
-+    i = (i * i) / 4;
-+    dbprintf(2, " {%d,%d:", i, n);
-+    p = exp_sequences + i;
-+
-+    fixed >>= 1;
-+    seq[0] = 0;
-+    seq[1] = 1;
-+    for(i = 2; i < n; ) {
-+        int s = *p;
-+        if(!(i & 2)) {
-+            p++;
-+            s >>= 4;
-+        }
-+        else
-+            s &= 0xf;
-+        if(s == fixed)
-+            fixed = -1;
-+        s <<= 1;
-+        dbprintf(2, "%x", s);
-+        seq[i++] = s++;
-+        seq[i++] = s;
-+    }
-+    dbprintf(2, "}");
-+    seq[n] = -1;
-+    return(fixed < 1);
-+}
-+
-+#define IDX(s) \
-+    (((s)->finder << 2) | ((s)->color << 1) | ((s)->color ^ (s)->side))
-+
-+static inline zbar_symbol_type_t
-+match_segment_exp (zbar_decoder_t *dcode,
-+                   databar_segment_t *seg,
-+                   int dir)
-+{
-+    databar_decoder_t *db = &dcode->databar;
-+    int bestsegs[22], i = 0, segs[22], seq[22];
-+    int ifixed = seg - db->segs, fixed = IDX(seg), maxcnt = 0;
-+    int iseg[DATABAR_MAX_SEGMENTS];
-+    unsigned csegs = db->csegs, width = seg->width, maxage = 0x7fff;
-+
-+    bestsegs[0] = segs[0] = seq[1] = -1;
-+    seq[0] = 0;
-+
-+    dbprintf(2, "\n    fixed=%d@%d: ", fixed, ifixed);
-+    for(i = csegs, seg = db->segs + csegs - 1; --i >= 0; seg--) {
-+        if(seg->exp && seg->finder >= 0 &&
-+           (!seg->partial || seg->count >= 4))
-+            iseg[i] = IDX(seg);
-+        else
-+            iseg[i] = -1;
-+        dbprintf(2, " %d", iseg[i]);
-+    }
-+
-+    for(i = 0; ; i--) {
-+        if(!i)
-+            dbprintf(2, "\n   ");
-+        for(; i >= 0 && seq[i] >= 0; i--) {
-+            int j;
-+            dbprintf(2, " [%d]%d", i, seq[i]);
-+
-+            if(seq[i] == fixed) {
-+                seg = db->segs + ifixed;
-+                if(segs[i] < 0 && check_width(width, seg->width, 14)) {
-+                    dbprintf(2, "*");
-+                    j = ifixed;
-+                }
-+                else
-+                    continue;
-+            }
-+            else {
-+                for(j = segs[i] + 1; j < csegs; j++) {
-+                    if(iseg[j] == seq[i] &&
-+                       (!i || check_width(width, db->segs[j].width, 14))) {
-+                        seg = db->segs + j;
-+                        break;
-+                    }
-+                }
-+                if(j == csegs)
-+                    continue;
-+            }
-+
-+            if(!i) {
-+                if(!lookup_sequence(seg, fixed, seq)) {
-+                    dbprintf(2, "[nf]");
-+                    continue;
-+                }
-+                width = seg->width;
-+                dbprintf(2, " A00@%d", j);
-+            }
-+            else {
-+                width = (width + seg->width) / 2;
-+                dbprintf(2, " %c%x%x@%d",
-+                         'A' + seg->finder, seg->color, seg->side, j);
-+            }
-+            segs[i++] = j;
-+            segs[i++] = -1;
-+        }
-+        if(i < 0)
-+            break;
-+
-+        seg = db->segs + segs[0];
-+        unsigned cnt = 0, chk = 0, age = (db->epoch - seg->epoch) & 0xff;
-+        for(i = 1; segs[i] >= 0; i++) {
-+            seg = db->segs + segs[i];
-+            chk += seg->check;
-+            cnt += seg->count;
-+            age += (db->epoch - seg->epoch) & 0xff;
-+        }
-+
-+        unsigned data0 = db->segs[segs[0]].data;
-+        unsigned chk0 = data0 % 211;
-+        chk %= 211;
-+
-+        dbprintf(2, " chk=%d ?= %d", chk, chk0);
-+        if(chk != chk0)
-+            continue;
-+
-+        dbprintf(2, " cnt=%d age=%d", cnt, age);
-+        if(maxcnt > cnt || (maxcnt == cnt && maxage <= age))
-+            continue;
-+
-+        dbprintf(2, " !");
-+        maxcnt = cnt;
-+        maxage = age;
-+        for(i = 0; segs[i] >= 0; i++)
-+            bestsegs[i] = segs[i];
-+        bestsegs[i] = -1;
-+    }
-+
-+    if(bestsegs[0] < 0)
-+        return(ZBAR_PARTIAL);
-+
-+    if(acquire_lock(dcode, ZBAR_DATABAR_EXP))
-+        return(ZBAR_PARTIAL);
-+
-+    for(i = 0; bestsegs[i] >= 0; i++)
-+        segs[i] = db->segs[bestsegs[i]].data;
-+
-+    if(databar_postprocess_exp(dcode, segs)) {
-+        release_lock(dcode, ZBAR_DATABAR_EXP);
-+        return(ZBAR_PARTIAL);
-+    }
-+
-+    for(i = 0; bestsegs[i] >= 0; i++)
-+        if(bestsegs[i] != ifixed) {
-+            seg = db->segs + bestsegs[i];
-+            if(!--seg->count)
-+                seg->finder = -1;
-+        }
-+
-+    /* FIXME stacked rows are frequently reversed,
-+     * so direction is impossible to determine at this level
-+     */
-+    dcode->direction = (1 - 2 * (seg->side ^ seg->color)) * dir;
-+    dcode->modifiers = MOD(ZBAR_MOD_GS1);
-+    return(ZBAR_DATABAR_EXP);
-+}
-+#undef IDX
-+
-+static inline unsigned
-+calc_check (unsigned sig0,
-+            unsigned sig1,
-+            unsigned side,
-+            unsigned mod)
-+{
-+    unsigned chk = 0;
-+    int i;
-+    for(i = 4; --i >= 0; ) {
-+        chk = (chk * 3 + (sig1 & 0xf) + 1) * 3 + (sig0 & 0xf) + 1;
-+        sig1 >>= 4;
-+        sig0 >>= 4;
-+        if(!(i & 1))
-+            chk %= mod;
-+    }
-+    dbprintf(2, " chk=%d", chk);
-+
-+    if(side)
-+        chk = (chk * (6561 % mod)) % mod;
-+    return(chk);
-+}
-+
-+static inline int
-+calc_value4 (unsigned sig,
-+             unsigned n,
-+             unsigned wmax,
-+             unsigned nonarrow)
-+{
-+    unsigned v = 0;
-+    n--;
-+
-+    unsigned w0 = (sig >> 12) & 0xf;
-+    if(w0 > 1) {
-+        if(w0 > wmax)
-+            return(-1);
-+        unsigned n0 = n - w0;
-+        unsigned sk20 = (n - 1) * n * (2 * n - 1);
-+        unsigned sk21 = n0 * (n0 + 1) * (2 * n0 + 1);
-+        v = sk20 - sk21 - 3 * (w0 - 1) * (2 * n - w0);
-+
-+        if(!nonarrow && w0 > 2 && n > 4) {
-+            unsigned k = (n - 2) * (n - 1) * (2 * n - 3) - sk21;
-+            k -= 3 * (w0 - 2) * (14 * n - 7 * w0 - 31);
-+            v -= k;
-+        }
-+
-+        if(n - 2 > wmax) {
-+            unsigned wm20 = 2 * wmax * (wmax + 1);
-+            unsigned wm21 = (2 * wmax + 1);
-+            unsigned k = sk20;
-+            if(n0 > wmax) {
-+                k -= sk21;
-+                k += 3 * (w0 - 1) * (wm20 - wm21 * (2 * n - w0));
-+            }
-+            else {
-+                k -= (wmax + 1) * (wmax + 2) * (2 * wmax + 3);
-+                k += 3 * (n - wmax - 2) * (wm20 - wm21 * (n + wmax + 1));
-+            }
-+            k *= 3;
-+            v -= k;
-+        }
-+        v /= 12;
-+    }
-+    else
-+        nonarrow = 1;
-+    n -= w0;
-+
-+    unsigned w1 = (sig >> 8) & 0xf;
-+    if(w1 > 1) {
-+        if(w1 > wmax)
-+            return(-1);
-+        v += (2 * n - w1) * (w1 - 1) / 2;
-+        if(!nonarrow && w1 > 2 && n > 3)
-+            v -= (2 * n - w1 - 5) * (w1 - 2) / 2;
-+        if(n - 1 > wmax) {
-+            if(n - w1 > wmax)
-+                v -= (w1 - 1) * (2 * n - w1 - 2 * wmax);
-+            else
-+                v -= (n - wmax) * (n - wmax - 1);
-+        }
-+    }
-+    else
-+        nonarrow = 1;
-+    n -= w1;
-+
-+    unsigned w2 = (sig >> 4) & 0xf;
-+    if(w2 > 1) {
-+        if(w2 > wmax)
-+            return(-1);
-+        v += w2 - 1;
-+        if(!nonarrow && w2 > 2 && n > 2)
-+            v -= n - 2;
-+        if(n > wmax)
-+            v -= n - wmax;
-+    }
-+    else
-+        nonarrow = 1;
-+
-+    unsigned w3 = sig & 0xf;
-+    if(w3 == 1)
-+        nonarrow = 1;
-+    else if(w3 > wmax)
-+        return(-1);
-+
-+    if(!nonarrow)
-+        return(-1);
-+
-+    return(v);
-+}
-+
-+static inline zbar_symbol_type_t
-+decode_char (zbar_decoder_t *dcode,
-+             databar_segment_t *seg,
-+             int off,
-+             int dir)
-+{
-+    databar_decoder_t *db = &dcode->databar;
-+    unsigned s = calc_s(dcode, (dir > 0) ? off : off - 6, 8);
-+    int n, i, emin[2] = { 0, }, sum = 0;
-+    unsigned sig0 = 0, sig1 = 0;
-+
-+    if(seg->exp)
-+        n = 17;
-+    else if(seg->side)
-+        n = 15;
-+    else
-+        n = 16;
-+    emin[1] = -n;
-+
-+    dbprintf(2, "\n        char[%c%d]: n=%d s=%d w=%d sig=",
-+             (dir < 0) ? '>' : '<', off, n, s, seg->width);
-+    if(s < 13 || !check_width(seg->width, s, n))
-+        return(ZBAR_NONE);
-+
-+    for(i = 4; --i >= 0; ) {
-+        int e = decode_e(pair_width(dcode, off), s, n);
-+        if(e < 0)
-+            return(ZBAR_NONE);
-+        dbprintf(2, "%d", e);
-+        sum = e - sum;
-+        off += dir;
-+        sig1 <<= 4;
-+        if(emin[1] < -sum)
-+            emin[1] = -sum;
-+        sig1 += sum;
-+        if(!i)
-+            break;
-+
-+        e = decode_e(pair_width(dcode, off), s, n);
-+        if(e < 0)
-+            return(ZBAR_NONE);
-+        dbprintf(2, "%d", e);
-+        sum = e - sum;
-+        off += dir;
-+        sig0 <<= 4;
-+        if(emin[0] > sum)
-+            emin[0] = sum;
-+        sig0 += sum;
-+    }
-+
-+    int diff = emin[~n & 1];
-+    diff = diff + (diff << 4);
-+    diff = diff + (diff << 8);
-+
-+    sig0 -= diff;
-+    sig1 += diff;
-+
-+    dbprintf(2, " emin=%d,%d el=%04x/%04x", emin[0], emin[1], sig0, sig1);
-+
-+    unsigned sum0 = sig0 + (sig0 >> 8);
-+    unsigned sum1 = sig1 + (sig1 >> 8);
-+    sum0 += sum0 >> 4;
-+    sum1 += sum1 >> 4;
-+    sum0 &= 0xf;
-+    sum1 &= 0xf;
-+
-+    dbprintf(2, " sum=%d/%d", sum0, sum1);
-+
-+    if(sum0 + sum1 + 8 != n) {
-+        dbprintf(2, " [SUM]");
-+        return(ZBAR_NONE);
-+    }
-+
-+    if(((sum0 ^ (n >> 1)) | (sum1 ^ (n >> 1) ^ n)) & 1) {
-+        dbprintf(2, " [ODD]");
-+        return(ZBAR_NONE);
-+    }
-+
-+    i = ((n & 0x3) ^ 1) * 5 + (sum1 >> 1);
-+    zassert(i < sizeof(groups) / sizeof(*groups), -1,
-+            "n=%d sum=%d/%d sig=%04x/%04x g=%d",
-+            n, sum0, sum1, sig0, sig1, i);
-+    struct group_s *g = groups + i;
-+    dbprintf(2, "\n            g=%d(%d,%d,%d/%d)",
-+             i, g->sum, g->wmax, g->todd, g->teven);
-+
-+    int vodd = calc_value4(sig0 + 0x1111, sum0 + 4, g->wmax, ~n & 1);
-+    dbprintf(2, " v=%d", vodd);
-+    if(vodd < 0 || vodd > g->todd)
-+        return(ZBAR_NONE);
-+
-+    int veven = calc_value4(sig1 + 0x1111, sum1 + 4, 9 - g->wmax, n & 1);
-+    dbprintf(2, "/%d", veven);
-+    if(veven < 0 || veven > g->teven)
-+        return(ZBAR_NONE);
-+
-+    int v = g->sum;
-+    if(n & 2)
-+        v += vodd + veven * g->todd;
-+    else
-+        v += veven + vodd * g->teven;
-+
-+    dbprintf(2, " f=%d(%x%x%x)", seg->finder, seg->exp, seg->color, seg->side);
-+
-+    unsigned chk = 0;
-+    if(seg->exp) {
-+        unsigned side = seg->color ^ seg->side ^ 1;
-+        if(v >= 4096)
-+            return(ZBAR_NONE);
-+        /* skip A1 left */
-+        chk = calc_check(sig0, sig1, side, 211);
-+        if(seg->finder || seg->color || seg->side) {
-+            i = (seg->finder << 1) - side + seg->color;
-+            zassert(i >= 0 && i < 12, ZBAR_NONE,
-+                    "f=%d(%x%x%x) side=%d i=%d\n",
-+                    seg->finder, seg->exp, seg->color, seg->side, side, i);
-+            chk = (chk * exp_checksums[i]) % 211;
-+        }
-+        else if(v >= 4009)
-+            return(ZBAR_NONE);
-+        else
-+            chk = 0;
-+    }
-+    else {
-+        chk = calc_check(sig0, sig1, seg->side, 79);
-+        if(seg->color)
-+            chk = (chk * 16) % 79;
-+    }
-+    dbprintf(2, " => %d val=%d", chk, v);
-+
-+    seg->check = chk;
-+    seg->data = v;
-+
-+    merge_segment(db, seg);
-+
-+    if(seg->exp)
-+        return(match_segment_exp(dcode, seg, dir));
-+    else if(dir > 0)
-+        return(match_segment(dcode, seg));
-+    return(ZBAR_PARTIAL);
-+}
-+
-+static inline int
-+alloc_segment (databar_decoder_t *db)
-+{
-+    unsigned maxage = 0, csegs = db->csegs;
-+    int i, old = -1;
-+    for(i = 0; i < csegs; i++) {
-+        databar_segment_t *seg = db->segs + i;
-+        unsigned age;
-+        if(seg->finder < 0) {
-+            dbprintf(2, " free@%d", i);
-+            return(i);
-+        }
-+        age = (db->epoch - seg->epoch) & 0xff;
-+        if(age >= 128 && seg->count < 2) {
-+            seg->finder = -1;
-+            dbprintf(2, " stale@%d (%d - %d = %d)",
-+                     i, db->epoch, seg->epoch, age);
-+            return(i);
-+        }
-+
-+        /* score based on both age and count */
-+        if(age > seg->count)
-+            age = age - seg->count + 1;
-+        else
-+            age = 1;
-+
-+        if(maxage < age) {
-+            maxage = age;
-+            old = i;
-+            dbprintf(2, " old@%d(%u)", i, age);
-+        }
-+    }
-+
-+    if(csegs < DATABAR_MAX_SEGMENTS) {
-+        dbprintf(2, " new@%d", i);
-+        i = csegs;
-+        csegs *= 2;
-+        if(csegs > DATABAR_MAX_SEGMENTS)
-+            csegs = DATABAR_MAX_SEGMENTS;
-+        if(csegs != db->csegs) {
-+            databar_segment_t *seg;
-+            db->segs = realloc(db->segs, csegs * sizeof(*db->segs));
-+            db->csegs = csegs;
-+            seg = db->segs + csegs;
-+            while(--seg, --csegs >= i) {
-+                seg->finder = -1;
-+                seg->exp = 0;
-+                seg->color = 0;
-+                seg->side = 0;
-+                seg->partial = 0;
-+                seg->count = 0;
-+                seg->epoch = 0;
-+                seg->check = 0;
-+            }
-+            return(i);
-+        }
-+    }
-+    zassert(old >= 0, -1, "\n");
-+
-+    db->segs[old].finder = -1;
-+    return(old);
-+}
-+
-+static inline zbar_symbol_type_t
-+decode_finder (zbar_decoder_t *dcode)
-+{
-+    databar_decoder_t *db = &dcode->databar;
-+    databar_segment_t *seg;
-+    unsigned e0 = pair_width(dcode, 1);
-+    unsigned e2 = pair_width(dcode, 3);
-+    unsigned e1, e3, s, finder, dir;
-+    int sig, iseg;
-+    dbprintf(2, "      databar: e0=%d e2=%d", e0, e2);
-+    if(e0 < e2) {
-+        unsigned e = e2 * 4;
-+        if(e < 15 * e0 || e > 34 * e0)
-+            return(ZBAR_NONE);
-+        dir = 0;
-+        e3 = pair_width(dcode, 4);
-+    }
-+    else {
-+        unsigned e = e0 * 4;
-+        if(e < 15 * e2 || e > 34 * e2)
-+            return(ZBAR_NONE);
-+        dir = 1;
-+        e2 = e0;
-+        e3 = pair_width(dcode, 0);
-+    }
-+    e1 = pair_width(dcode, 2);
-+
-+    s = e1 + e3;
-+    dbprintf(2, " e1=%d e3=%d dir=%d s=%d", e1, e3, dir, s);
-+    if(s < 12)
-+        return(ZBAR_NONE);
-+
-+    sig = ((decode_e(e3, s, 14) << 8) | (decode_e(e2, s, 14) << 4) |
-+           decode_e(e1, s, 14));
-+    dbprintf(2, " sig=%04x", sig & 0xfff);
-+    if(sig < 0 ||
-+       ((sig >> 4) & 0xf) < 8 ||
-+       ((sig >> 4) & 0xf) > 10 ||
-+       (sig & 0xf) >= 10 ||
-+       ((sig >> 8) & 0xf) >= 10 ||
-+       (((sig >> 8) + sig) & 0xf) != 10)
-+        return(ZBAR_NONE);
-+
-+    finder = (finder_hash[(sig - (sig >> 5)) & 0x1f] +
-+              finder_hash[(sig >> 1) & 0x1f]) & 0x1f;
-+    dbprintf(2, " finder=%d", finder);
-+    if(finder == 0x1f ||
-+       !TEST_CFG((finder < 9) ? db->config : db->config_exp, ZBAR_CFG_ENABLE))
-+        return(ZBAR_NONE);
-+
-+    zassert(finder >= 0, ZBAR_NONE, "dir=%d sig=%04x f=%d\n",
-+            dir, sig & 0xfff, finder);
-+
-+    iseg = alloc_segment(db);
-+    if(iseg < 0)
-+        return(ZBAR_NONE);
-+
-+    seg = db->segs + iseg;
-+    seg->finder = (finder >= 9) ? finder - 9 : finder;
-+    seg->exp = (finder >= 9);
-+    seg->color = get_color(dcode) ^ dir ^ 1;
-+    seg->side = dir;
-+    seg->partial = 0;
-+    seg->count = 1;
-+    seg->width = s;
-+    seg->epoch = db->epoch;
-+
-+    int rc = decode_char(dcode, seg, 12 - dir, -1);
-+    if(!rc)
-+        seg->partial = 1;
-+    else
-+        db->epoch++;
-+
-+    int i = (dcode->idx + 8 + dir) & 0xf;
-+    zassert(db->chars[i] == -1, ZBAR_NONE, "\n");
-+    db->chars[i] = iseg;
-+    return(rc);
-+}
-+
-+zbar_symbol_type_t
-+_zbar_decode_databar (zbar_decoder_t *dcode)
-+{
-+    databar_decoder_t *db = &dcode->databar;
-+    databar_segment_t *seg, *pair;
-+    zbar_symbol_type_t sym;
-+    int iseg, i = dcode->idx & 0xf;
-+
-+    sym = decode_finder(dcode);
-+    dbprintf(2, "\n");
-+
-+    iseg = db->chars[i];
-+    if(iseg < 0)
-+        return(sym);
-+
-+    db->chars[i] = -1;
-+    seg = db->segs + iseg;
-+    dbprintf(2, "        databar: i=%d part=%d f=%d(%x%x%x)",
-+             iseg, seg->partial, seg->finder, seg->exp, seg->color, seg->side);
-+    zassert(seg->finder >= 0, ZBAR_NONE, "i=%d f=%d(%x%x%x) part=%x\n",
-+            iseg, seg->finder, seg->exp, seg->color, seg->side, seg->partial);
-+
-+    if(seg->partial) {
-+        pair = NULL;
-+        seg->side = !seg->side;
-+    }
-+    else {
-+        int jseg = alloc_segment(db);
-+        pair = db->segs + iseg;
-+        seg = db->segs + jseg;
-+        seg->finder = pair->finder;
-+        seg->exp = pair->exp;
-+        seg->color = pair->color;
-+        seg->side = !pair->side;
-+        seg->partial = 0;
-+        seg->count = 1;
-+        seg->width = pair->width;
-+        seg->epoch = db->epoch;
-+    }
-+
-+    sym = decode_char(dcode, seg, 1, 1);
-+    if(!sym) {
-+        seg->finder = -1;
-+        if(pair)
-+            pair->partial = 1;
-+    }
-+    else
-+        db->epoch++;
-+    dbprintf(2, "\n");
-+
-+    return(sym);
-+}
-diff -r 563557a923d0 zbar/decoder/databar.h
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/zbar/decoder/databar.h	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,80 @@
-+/*------------------------------------------------------------------------
-+ *  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-+ *
-+ *  This file is part of the ZBar Bar Code Reader.
-+ *
-+ *  The ZBar Bar Code Reader is free software; you can redistribute it
-+ *  and/or modify it under the terms of the GNU Lesser Public License as
-+ *  published by the Free Software Foundation; either version 2.1 of
-+ *  the License, or (at your option) any later version.
-+ *
-+ *  The ZBar Bar Code Reader is distributed in the hope that it will be
-+ *  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-+ *  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU Lesser Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser Public License
-+ *  along with the ZBar Bar Code Reader; if not, write to the Free
-+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-+ *  Boston, MA  02110-1301  USA
-+ *
-+ *  http://sourceforge.net/projects/zbar
-+ *------------------------------------------------------------------------*/
-+#ifndef _DATABAR_H_
-+#define _DATABAR_H_
-+
-+#define DATABAR_MAX_SEGMENTS 32
-+
-+/* active DataBar (partial) segment entry */
-+typedef struct databar_segment_s {
-+    signed finder : 5;          /* finder pattern */
-+    unsigned exp : 1;           /* DataBar expanded finder */
-+    unsigned color : 1;         /* finder coloring */
-+    unsigned side : 1;          /* data character side of finder */
-+
-+    unsigned partial : 1;       /* unpaired partial segment */
-+    unsigned count : 7;         /* times encountered */
-+    unsigned epoch : 8;         /* age, in characters scanned */
-+    unsigned check : 8;         /* bar checksum */
-+    signed short data;          /* decoded character data */
-+    unsigned short width;       /* measured width of finder (14 modules) */
-+} databar_segment_t;
-+
-+/* DataBar specific decode state */
-+typedef struct databar_decoder_s {
-+    unsigned config;            /* decoder configuration flags */
-+    unsigned config_exp;
-+
-+    unsigned csegs : 8;         /* allocated segments */
-+    unsigned epoch : 8;         /* current scan */
-+
-+    databar_segment_t *segs;    /* active segment list */
-+    signed char chars[16];      /* outstanding character indices */
-+} databar_decoder_t;
-+
-+/* reset DataBar segment decode state */
-+static inline void databar_new_scan (databar_decoder_t *db)
-+{
-+    int i;
-+    for(i = 0; i < 16; i++)
-+        if(db->chars[i] >= 0) {
-+            databar_segment_t *seg = db->segs + db->chars[i];
-+            if(seg->partial)
-+                seg->finder = -1;
-+            db->chars[i] = -1;
-+        }
-+}
-+
-+/* reset DataBar accumulated segments */
-+static inline void databar_reset (databar_decoder_t *db)
-+{
-+    int i, n = db->csegs;
-+    databar_new_scan(db);
-+    for(i = 0; i < n; i++)
-+        db->segs[i].finder = -1;
-+}
-+
-+/* decode DataBar symbols */
-+zbar_symbol_type_t _zbar_decode_databar(zbar_decoder_t *dcode);
-+
-+#endif
-diff -r 563557a923d0 zbar/decoder/ean.c
---- a/zbar/decoder/ean.c	Tue Oct 27 11:25:59 2009 -0400
-+++ b/zbar/decoder/ean.c	Fri Feb 22 08:54:29 2013 -0300
-@@ -1,5 +1,5 @@
- /*------------------------------------------------------------------------
-- *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-  *
-  *  This file is part of the ZBar Bar Code Reader.
-  *
-@@ -23,12 +23,12 @@
- 
- #include <config.h>
- #include <zbar.h>
--#include "decoder.h"
- 
- #ifdef DEBUG_EAN
- # define DEBUG_LEVEL (DEBUG_EAN)
- #endif
- #include "debug.h"
-+#include "decoder.h"
- 
- /* partial decode symbol location */
- typedef enum symbol_partial_e {
-@@ -109,35 +109,45 @@
- }
- #endif
- 
-+static inline int check_width (unsigned w0,
-+                               unsigned w1)
-+{
-+    unsigned dw0 = w0;
-+    w0 *= 8;
-+    w1 *= 8;
-+    return(w0 - dw0 <= w1 && w1 <= w0 + dw0);
-+}
-+
- /* evaluate previous N (>= 2) widths as auxiliary pattern,
-  * using preceding 4 as character width
-  */
- static inline signed char aux_end (zbar_decoder_t *dcode,
-                                    unsigned char fwd)
- {
-+    signed char code, i;
-+
-     /* reference width from previous character */
-     unsigned s = calc_s(dcode, 4 + fwd, 4);
- 
-     /* check quiet zone */
-     unsigned qz = get_width(dcode, 0);
--    if(!fwd && qz && qz < s * 3 / 4) {
--        dprintf(2, " [invalid quiet]");
-+    if(!fwd && qz && qz <= s * 3 / 4) {
-+        dbprintf(2, " [invalid quiet]");
-         return(-1);
-     }
- 
--    dprintf(2, " (");
--    signed char code = 0;
--    unsigned char i;
-+    dbprintf(2, " (");
-+    code = 0;
-     for(i = 1 - fwd; i < 3 + fwd; i++) {
-         unsigned e = get_width(dcode, i) + get_width(dcode, i + 1);
--        dprintf(2, " %d", e);
-+        dbprintf(2, " %d", e);
-         code = (code << 2) | decode_e(e, s, 7);
-         if(code < 0) {
--            dprintf(2, " [invalid end guard]");
-+            dbprintf(2, " [invalid end guard]");
-             return(-1);
-         }
-     }
--    dprintf(2, ") s=%d aux=%x", s, code);
-+    dbprintf(2, ") s=%d aux=%x", s, code);
-     return(code);
- }
- 
-@@ -147,60 +157,79 @@
- static inline signed char aux_start (zbar_decoder_t *dcode)
- {
-     /* FIXME NB add-on has no guard in reverse */
--    unsigned e2 = get_width(dcode, 5) + get_width(dcode, 6);
-+    unsigned e1, e2 = get_width(dcode, 5) + get_width(dcode, 6);
-+    unsigned char E1;
-+    if(dcode->ean.s4 < 6)
-+        return(-1);
-+
-     if(decode_e(e2, dcode->ean.s4, 7)) {
--        dprintf(2, " [invalid any]");
--        return(/*FIXME (get_color(dcode) == ZBAR_SPACE) ? STATE_ADDON : */-1);
-+        dbprintf(2, " [invalid any]");
-+        return(-1);
-     }
- 
--    unsigned e1 = get_width(dcode, 4) + get_width(dcode, 5);
--    unsigned char E1 = decode_e(e1, dcode->ean.s4, 7);
-+    e1 = get_width(dcode, 4) + get_width(dcode, 5);
-+    E1 = decode_e(e1, dcode->ean.s4, 7);
- 
-     if(get_color(dcode) == ZBAR_BAR) {
-         /* check for quiet-zone */
-         unsigned qz = get_width(dcode, 7);
--        if(!qz || qz >= dcode->ean.s4 * 3 / 4) {
-+        if(!qz || qz > dcode->ean.s4 * 3 / 4) {
-             if(!E1) {
--                dprintf(2, " [valid normal]");
-+                dbprintf(2, " [valid normal]");
-                 return(0); /* normal symbol start */
-             }
-             else if(E1 == 1) {
--                dprintf(2, " [valid add-on]");
-+                dbprintf(2, " [valid add-on]");
-                 return(STATE_ADDON); /* add-on symbol start */
-             }
-         }
--        dprintf(2, " [invalid start]");
-+        dbprintf(2, " [invalid start]");
-         return(-1);
-     }
- 
-     if(!E1) {
-         /* attempting decode from SPACE => validate center guard */
-         unsigned e3 = get_width(dcode, 6) + get_width(dcode, 7);
--        if(!decode_e(e3, dcode->ean.s4, 7)) {
--            dprintf(2, " [valid center]");
-+        unsigned e4 = get_width(dcode, 7) + get_width(dcode, 8);
-+        if(!decode_e(e3, dcode->ean.s4, 7) &&
-+           !decode_e(e4, dcode->ean.s4, 7)) {
-+            dbprintf(2, " [valid center]");
-             return(0); /* start after center guard */
-         }
-     }
--    dprintf(2, " [invalid center]");
--    return(/*STATE_ADDON*/-1);
-+    dbprintf(2, " [invalid center]");
-+    return(-1);
-+}
-+
-+/* check addon delimiter using current 4 as character
-+ */
-+static inline signed char aux_mid (zbar_decoder_t *dcode)
-+{
-+    unsigned e = get_width(dcode, 4) + get_width(dcode, 5);
-+    return(decode_e(e, dcode->ean.s4, 7));
- }
- 
- /* attempt to decode previous 4 widths (2 bars and 2 spaces) as a character */
- static inline signed char decode4 (zbar_decoder_t *dcode)
- {
-+    signed char code;
-+
-     /* calculate similar edge measurements */
-     unsigned e1 = ((get_color(dcode) == ZBAR_BAR)
-                    ? get_width(dcode, 0) + get_width(dcode, 1)
-                    : get_width(dcode, 2) + get_width(dcode, 3));
-     unsigned e2 = get_width(dcode, 1) + get_width(dcode, 2);
--    dprintf(2, "\n        e1=%d e2=%d", e1, e2);
-+    dbprintf(2, "\n        e1=%d e2=%d", e1, e2);
-+
-+    if(dcode->ean.s4 < 6)
-+        return(-1);
- 
-     /* create compacted encoding for direct lookup */
--    signed char code = ((decode_e(e1, dcode->ean.s4, 7) << 2) |
--                        decode_e(e2, dcode->ean.s4, 7));
-+    code = ((decode_e(e1, dcode->ean.s4, 7) << 2) |
-+             decode_e(e2, dcode->ean.s4, 7));
-     if(code < 0)
-         return(-1);
--    dprintf(2, " code=%x", code);
-+    dbprintf(2, " code=%x", code);
- 
-     /* 4 combinations require additional determinant (D2)
-        E1E2 == 34 (0110)
-@@ -209,25 +238,48 @@
-        E1E2 == 44 (1010)
-      */
-     if((1 << code) & 0x0660) {
-+        unsigned char mid, alt;
-         /* use sum of bar widths */
-         unsigned d2 = ((get_color(dcode) == ZBAR_BAR)
-                        ? get_width(dcode, 0) + get_width(dcode, 2)
-                        : get_width(dcode, 1) + get_width(dcode, 3));
-         d2 *= 7;
--        unsigned char mid = (((1 << code) & 0x0420)
-+        mid = (((1 << code) & 0x0420)
-                              ? 3     /* E1E2 in 33,44 */
-                              : 4);   /* E1E2 in 34,43 */
--        unsigned char alt = d2 > (mid * dcode->ean.s4);
-+        alt = d2 > (mid * dcode->ean.s4);
-         if(alt)
-             code = ((code >> 1) & 3) | 0x10; /* compress code space */
--        dprintf(2, " (d2=%d(%d) alt=%d)", d2, mid * dcode->ean.s4, alt);
-+        dbprintf(2, " (d2=%d(%d) alt=%d)", d2, mid * dcode->ean.s4, alt);
-     }
--    dprintf(2, " char=%02x", digits[(unsigned char)code]);
-+    dbprintf(2, " char=%02x", digits[(unsigned char)code]);
-     zassert(code < 0x14, -1, "code=%02x e1=%x e2=%x s4=%x color=%x\n",
-             code, e1, e2, dcode->ean.s4, get_color(dcode));
-     return(code);
- }
- 
-+static inline char ean_part_end2 (ean_decoder_t *ean,
-+                                  ean_pass_t *pass)
-+{
-+    if(!TEST_CFG(ean->ean2_config, ZBAR_CFG_ENABLE))
-+        return(ZBAR_NONE);
-+
-+    /* extract parity bits */
-+    unsigned char par = ((pass->raw[1] & 0x10) >> 3 |
-+                         (pass->raw[2] & 0x10) >> 4);
-+    /* calculate "checksum" */
-+    unsigned char chk = ~((pass->raw[1] & 0xf) * 10 +
-+                          (pass->raw[2] & 0xf)) & 0x3;
-+    dbprintf(2, " par=%x chk=%x", par, chk);
-+    if(par != chk)
-+        return(ZBAR_NONE);
-+
-+    dbprintf(2, "\n");
-+    dbprintf(1, "decode2=%x%x\n",
-+             pass->raw[1] & 0xf, pass->raw[2] & 0xf);
-+    return(ZBAR_EAN2);
-+}
-+
- static inline zbar_symbol_type_t ean_part_end4 (ean_pass_t *pass,
-                                                 unsigned char fwd)
- {
-@@ -237,7 +289,7 @@
-                          (pass->raw[3] & 0x10) >> 3 |
-                          (pass->raw[4] & 0x10) >> 4);
- 
--    dprintf(2, " par=%x", par);
-+    dbprintf(2, " par=%x", par);
-     if(par && par != 0xf)
-         /* invalid parity combination */
-         return(ZBAR_NONE);
-@@ -245,6 +297,7 @@
-     if(!par == fwd) {
-         /* reverse sampled digits */
-         unsigned char tmp = pass->raw[1];
-+        pass->state |= STATE_REV;
-         pass->raw[1] = pass->raw[4];
-         pass->raw[4] = tmp;
-         tmp = pass->raw[2];
-@@ -252,15 +305,51 @@
-         pass->raw[3] = tmp;
-     }
- 
--    dprintf(2, "\n");
--    dprintf(1, "decode4=%x%x%x%x\n",
--            pass->raw[1] & 0xf, pass->raw[2] & 0xf,
--            pass->raw[3] & 0xf, pass->raw[4] & 0xf);
-+    dbprintf(2, "\n");
-+    dbprintf(1, "decode4=%x%x%x%x\n",
-+             pass->raw[1] & 0xf, pass->raw[2] & 0xf,
-+             pass->raw[3] & 0xf, pass->raw[4] & 0xf);
-     if(!par)
-         return(ZBAR_EAN8 | EAN_RIGHT);
-     return(ZBAR_EAN8 | EAN_LEFT);
- }
- 
-+static inline char ean_part_end5 (ean_decoder_t *ean,
-+                                  ean_pass_t *pass)
-+{
-+    if(!TEST_CFG(ean->ean5_config, ZBAR_CFG_ENABLE))
-+        return(ZBAR_NONE);
-+
-+    /* extract parity bits */
-+    unsigned char par = ((pass->raw[1] & 0x10) |
-+                         (pass->raw[2] & 0x10) >> 1 |
-+                         (pass->raw[3] & 0x10) >> 2 |
-+                         (pass->raw[4] & 0x10) >> 3 |
-+                         (pass->raw[5] & 0x10) >> 4);
-+    /* calculate checksum */
-+    unsigned char chk = (((pass->raw[1] & 0x0f) +
-+                          (pass->raw[2] & 0x0f) * 3 +
-+                          (pass->raw[3] & 0x0f) +
-+                          (pass->raw[4] & 0x0f) * 3 +
-+                          (pass->raw[5] & 0x0f)) * 3) % 10;
-+
-+    unsigned char parchk = parity_decode[par >> 1];
-+    if(par & 1)
-+        parchk >>= 4;
-+    parchk &= 0xf;
-+    dbprintf(2, " par=%x(%d) chk=%d", par, parchk, chk);
-+    if(parchk != chk)
-+        return(ZBAR_NONE);
-+
-+    dbprintf(2, "\n");
-+    dbprintf(1, "decode5=%x%x%x%x%x\n",
-+             pass->raw[1] & 0xf, pass->raw[2] & 0xf,
-+             pass->raw[3] & 0xf, pass->raw[4] & 0xf,
-+             pass->raw[5] & 0xf);
-+
-+    return(ZBAR_EAN5);
-+}
-+
- static inline zbar_symbol_type_t ean_part_end7 (ean_decoder_t *ean,
-                                                 ean_pass_t *pass,
-                                                 unsigned char fwd)
-@@ -285,15 +374,16 @@
-     if(par & 1)
-         pass->raw[0] >>= 4;
-     pass->raw[0] &= 0xf;
--    dprintf(2, " par=%02x(%x)", par, pass->raw[0]);
-+    dbprintf(2, " par=%02x(%x)", par, pass->raw[0]);
- 
-     if(pass->raw[0] == 0xf)
-         /* invalid parity combination */
-         return(ZBAR_NONE);
- 
-     if(!par == fwd) {
-+        unsigned char i;
-+        pass->state |= STATE_REV;
-         /* reverse sampled digits */
--        unsigned char i;
-         for(i = 1; i < 4; i++) {
-             unsigned char tmp = pass->raw[i];
-             pass->raw[i] = pass->raw[7 - i];
-@@ -301,12 +391,12 @@
-         }
-     }
- 
--    dprintf(2, "\n");
--    dprintf(1, "decode=%x%x%x%x%x%x%x(%02x)\n",
--            pass->raw[0] & 0xf, pass->raw[1] & 0xf,
--            pass->raw[2] & 0xf, pass->raw[3] & 0xf,
--            pass->raw[4] & 0xf, pass->raw[5] & 0xf,
--            pass->raw[6] & 0xf, par);
-+    dbprintf(2, "\n");
-+    dbprintf(1, "decode=%x%x%x%x%x%x%x(%02x)\n",
-+             pass->raw[0] & 0xf, pass->raw[1] & 0xf,
-+             pass->raw[2] & 0xf, pass->raw[3] & 0xf,
-+             pass->raw[4] & 0xf, pass->raw[5] & 0xf,
-+             pass->raw[6] & 0xf, par);
- 
-     if(TEST_CFG(ean->ean13_config, ZBAR_CFG_ENABLE)) {
-         if(!par)
-@@ -324,54 +414,100 @@
- static inline zbar_symbol_type_t decode_pass (zbar_decoder_t *dcode,
-                                               ean_pass_t *pass)
- {
-+    unsigned char idx, fwd;
-     pass->state++;
--    unsigned char idx = pass->state & STATE_IDX;
--    unsigned char fwd = pass->state & 1;
-+    idx = pass->state & STATE_IDX;
-+    fwd = pass->state & 1;
- 
--    if(get_color(dcode) == ZBAR_SPACE &&
--       (idx == 0x10 || idx == 0x11) &&
--       TEST_CFG(dcode->ean.ean8_config, ZBAR_CFG_ENABLE) &&
--       !aux_end(dcode, fwd)) {
--        dprintf(2, " fwd=%x", fwd);
--        zbar_symbol_type_t part = ean_part_end4(pass, fwd);
--        pass->state = -1;
--        return(part);
-+    if(get_color(dcode) == ZBAR_SPACE) {
-+        if(pass->state & STATE_ADDON) {
-+            dbprintf(2, " i=%d", idx);
-+            if(idx == 0x09 || idx == 0x21) {
-+                unsigned qz = get_width(dcode, 0);
-+                unsigned s = calc_s(dcode, 1, 4);
-+                zbar_symbol_type_t part = !qz || (qz >= s * 3 / 4);
-+                if(part && idx == 0x09)
-+                    part = ean_part_end2(&dcode->ean, pass);
-+                else if(part)
-+                    part = ean_part_end5(&dcode->ean, pass);
-+
-+                if(part || idx == 0x21) {
-+                    dcode->ean.direction = 0;
-+                    pass->state = -1;
-+                    return(part);
-+                }
-+            }
-+            if((idx & 7) == 1) {
-+                dbprintf(2, " +");
-+                pass->state += 2;
-+                idx += 2;
-+            }
-+        }
-+        else if((idx == 0x10 || idx == 0x11) &&
-+                TEST_CFG(dcode->ean.ean8_config, ZBAR_CFG_ENABLE) &&
-+                !aux_end(dcode, fwd)) {
-+            dbprintf(2, " fwd=%x", fwd);
-+            zbar_symbol_type_t part = ean_part_end4(pass, fwd);
-+            if(part)
-+                dcode->ean.direction = (pass->state & STATE_REV) != 0;
-+            pass->state = -1;
-+            return(part);
-+        }
-+	else if((idx == 0x18 || idx == 0x19)) {
-+	  zbar_symbol_type_t part = ZBAR_NONE;
-+	  dbprintf(2, " fwd=%x", fwd);
-+	  if(!aux_end(dcode, fwd) && pass->raw[5] != 0xff)
-+	    part = ean_part_end7(&dcode->ean, pass, fwd);
-+	  if(part)
-+	    dcode->ean.direction = (pass->state & STATE_REV) != 0;
-+	  pass->state = -1;
-+	  return(part);
-+        }
-     }
- 
-+    if(pass->state & STATE_ADDON)
-+        idx >>= 1;
-+
-     if(!(idx & 0x03) && idx <= 0x14) {
-+        signed char code = -1;
-+        unsigned w = pass->width;
-         if(!dcode->ean.s4)
-             return(0);
-         /* validate guard bars before decoding first char of symbol */
-         if(!pass->state) {
-             pass->state = aux_start(dcode);
-+            pass->width = dcode->ean.s4;
-             if(pass->state < 0)
-                 return(0);
-             idx = pass->state & STATE_IDX;
-         }
--        signed char code = decode4(dcode);
--        if(code < 0)
-+        else {
-+            w = check_width(w, dcode->ean.s4);
-+            if(w)
-+                pass->width = (pass->width + dcode->ean.s4 * 3) / 4;
-+        }
-+
-+        if(w)
-+            code = decode4(dcode);
-+        else
-+            dbprintf(2, " [bad width]");
-+
-+        if((code < 0 && idx != 0x10) || 
-+           (idx > 0 && (pass->state & STATE_ADDON) && aux_mid(dcode)))
-             pass->state = -1;
-+        else if(code < 0)
-+            pass->raw[5] = 0xff;
-         else {
--            dprintf(2, "\n        raw[%x]=%02x =>", idx >> 2,
--                    digits[(unsigned char)code]);
-+            dbprintf(2, "\n        raw[%x]=%02x =>", idx >> 2,
-+                     digits[(unsigned char)code]);
-             pass->raw[(idx >> 2) + 1] = digits[(unsigned char)code];
--            dprintf(2, " raw=%d%d%d%d%d%d%d",
--                    pass->raw[0] & 0xf, pass->raw[1] & 0xf,
--                    pass->raw[2] & 0xf, pass->raw[3] & 0xf,
--                    pass->raw[4] & 0xf, pass->raw[5] & 0xf,
--                    pass->raw[6] & 0xf);
-+            dbprintf(2, " raw=%d%d%d%d%d%d%d",
-+                     pass->raw[0] & 0xf, pass->raw[1] & 0xf,
-+                     pass->raw[2] & 0xf, pass->raw[3] & 0xf,
-+                     pass->raw[4] & 0xf, pass->raw[5] & 0xf,
-+                     pass->raw[6] & 0xf);
-         }
-     }
--
--    if(get_color(dcode) == ZBAR_SPACE &&
--       (idx == 0x18 || idx == 0x19)) {
--        zbar_symbol_type_t part = ZBAR_NONE;
--        dprintf(2, " fwd=%x", fwd);
--        if(!aux_end(dcode, fwd))
--            part = ean_part_end7(&dcode->ean, pass, fwd);
--        pass->state = -1;
--        return(part);
--    }
-     return(0);
- }
- 
-@@ -379,7 +515,7 @@
-                                                int n)
- {
-     unsigned char chk = 0;
--    unsigned char i;
-+    unsigned char i, d;
-     for(i = 0; i < n; i++) {
-         unsigned char d = ean->buf[i];
-         zassert(d < 10, -1, "i=%x d=%x chk=%x %s\n", i, d, chk,
-@@ -397,12 +533,12 @@
-             _zbar_decoder_buf_dump((void*)ean->buf, 18));
-     if(chk)
-         chk = 10 - chk;
--    unsigned char d = ean->buf[n];
-+    d = ean->buf[n];
-     zassert(d < 10, -1, "n=%x d=%x chk=%x %s\n", n, d, chk,
-             _zbar_decoder_buf_dump((void*)ean->buf, 18));
-     if(chk != d) {
--        dprintf(1, "\nchecksum mismatch %d != %d (%s)\n",
--                chk, d, dsprintbuf(ean));
-+        dbprintf(1, "\nchecksum mismatch %d != %d (%s)\n",
-+                 chk, d, dsprintbuf(ean));
-         return(-1);
-     }
-     return(0);
-@@ -431,10 +567,11 @@
-                                     ean_pass_t *pass)
- {
-     int i = 0;
-+    unsigned char decode;
-     /* parity encoded digit is checksum */
-     ean->buf[12] = pass->raw[i++];
- 
--    unsigned char decode = pass->raw[6] & 0xf;
-+    decode = pass->raw[6] & 0xf;
-     ean->buf[0] = 0;
-     ean->buf[1] = 0;
-     ean->buf[2] = pass->raw[i++] & 0xf;
-@@ -446,7 +583,7 @@
-     ean->buf[8] = 0;
-     ean->buf[9] = (decode < 3) ? pass->raw[i++] & 0xf : 0;
-     ean->buf[10] = (decode < 4) ? pass->raw[i++] & 0xf : 0;
--    ean->buf[11] = (decode < 5) ? pass->raw[i++] & 0xf : decode;
-+    ean->buf[11] = (decode < 5) ? pass->raw[i] & 0xf : decode;
- }
- 
- static inline zbar_symbol_type_t integrate_partial (ean_decoder_t *ean,
-@@ -455,70 +592,75 @@
- {
-     /* copy raw data into holding buffer */
-     /* if same partial is not consistent, reset others */
--    dprintf(2, " integrate part=%x (%s)", part, dsprintbuf(ean));
-+    dbprintf(2, " integrate part=%x (%s)", part, dsprintbuf(ean));
-     signed char i, j;
--    if(part & ZBAR_ADDON) {
--        /* FIXME TBD */
--        for(i = (part == ZBAR_ADDON5) ? 4 : 1; i >= 0; i--) {
--            unsigned char digit = pass->raw[i] & 0xf;
--            if(ean->addon && ean->buf[i + 13] != digit) {
--                /* partial mismatch - reset collected parts */
--                ean->left = ean->right = ean->addon = ZBAR_NONE;
--            }
--            ean->buf[i + 13] = digit;
--        }
--        ean->addon = part;
--    }
--    else {
--        if((ean->left && ((part & ZBAR_SYMBOL) != ean->left)) ||
--           (ean->right && ((part & ZBAR_SYMBOL) != ean->right))) {
--            /* partial mismatch - reset collected parts */
--            dprintf(2, " rst(type %x %x)", ean->left, ean->right);
--            ean->left = ean->right = ean->addon = ZBAR_NONE;
--        }
- 
--        if(part & EAN_RIGHT) {
--            part &= ZBAR_SYMBOL;
--            j = (part == ZBAR_EAN13) ? 12 : 7;
--            for(i = (part == ZBAR_EAN13) ? 6 : 4; i; i--, j--) {
--                unsigned char digit = pass->raw[i] & 0xf;
--                if(ean->right && ean->buf[j] != digit) {
--                    /* partial mismatch - reset collected parts */
--                    dprintf(2, " rst(right)");
--                    ean->left = ean->right = ean->addon = ZBAR_NONE;
--                }
--                ean->buf[j] = digit;
--            }
--            ean->right = part;
--        }
--        else if(part != ZBAR_UPCE) /* EAN_LEFT */ {
--            j = (part == ZBAR_EAN13) ? 6 : 3;
--            for(i = (part == ZBAR_EAN13) ? 6 : 4; j >= 0; i--, j--) {
--                unsigned char digit = pass->raw[i] & 0xf;
--                if(ean->left && ean->buf[j] != digit) {
--                    /* partial mismatch - reset collected parts */
--                    dprintf(2, " rst(left)");
--                    ean->left = ean->right = ean->addon = ZBAR_NONE;
--                }
--                ean->buf[j] = digit;
--            }
--            ean->left = part;
--        }
--        else /* ZBAR_UPCE */
--            ean_expand_upce(ean, pass);
-+    if((ean->left && ((part & ZBAR_SYMBOL) != ean->left)) ||
-+       (ean->right && ((part & ZBAR_SYMBOL) != ean->right))) {
-+        /* partial mismatch - reset collected parts */
-+        dbprintf(2, " rst(type %x %x)", ean->left, ean->right);
-+        ean->left = ean->right = ZBAR_NONE;
-     }
- 
--    if((part & ZBAR_SYMBOL) != ZBAR_UPCE) {
--        part = (ean->left & ean->right);
--        if(!part)
--            part = ZBAR_PARTIAL;
-+    if((ean->left || ean->right) &&
-+       !check_width(ean->width, pass->width)) {
-+      dbprintf(2, " rst(width %d)", pass->width);
-+      ean->left = ean->right = ZBAR_NONE;
-     }
- 
-+
-+    if(part & EAN_RIGHT) {
-+        part &= ZBAR_SYMBOL;
-+        j = part - 1;
-+        for(i = part >> 1; i; i--, j--) {
-+            unsigned char digit = pass->raw[i] & 0xf;
-+            if(ean->right && ean->buf[j] != digit) {
-+                /* partial mismatch - reset collected parts */
-+                dbprintf(2, " rst(right)");
-+                ean->left = ean->right = ZBAR_NONE;
-+            }
-+            ean->buf[j] = digit;
-+        }
-+        ean->right = part;
-+        part &= ean->left;  /* FIXME!? */
-+    }
-+    else if(part == ZBAR_EAN13 || part == ZBAR_EAN8) /* EAN_LEFT */ {
-+        j = (part - 1) >> 1;
-+        for(i = part >> 1; j >= 0; i--, j--) {
-+            unsigned char digit = pass->raw[i] & 0xf;
-+            if(ean->left && ean->buf[j] != digit) {
-+                /* partial mismatch - reset collected parts */
-+                dbprintf(2, " rst(left)");
-+                ean->left = ean->right = ZBAR_NONE;
-+            }
-+            ean->buf[j] = digit;
-+        }
-+        ean->left = part;
-+        part &= ean->right;  /* FIXME!? */
-+    }
-+    else if(part != ZBAR_UPCE) /* add-ons */ {
-+        for(i = part; i > 0; i--)
-+            ean->buf[i - 1] = pass->raw[i] & 0xf;
-+        ean->left = part;
-+    }
-+    else
-+        ean_expand_upce(ean, pass);
-+
-+    ean->width = pass->width;
-+
-+    if(!part)
-+        part = ZBAR_PARTIAL;
-+
-     if(((part == ZBAR_EAN13 ||
-          part == ZBAR_UPCE) && ean_verify_checksum(ean, 12)) ||
--       (part == ZBAR_EAN8 && ean_verify_checksum(ean, 7)))
--        /* invalid parity */
-+       (part == ZBAR_EAN8 && ean_verify_checksum(ean, 7))) {
-+        /* invalid checksum */
-+        if(ean->right)
-+	  ean->left = ZBAR_NONE;
-+        else
-+	  ean->right = ZBAR_NONE;
-         part = ZBAR_NONE;
-+    }
- 
-     if(part == ZBAR_EAN13) {
-         /* special case EAN-13 subsets */
-@@ -553,10 +695,8 @@
-             part = ZBAR_NONE;
-     }
- 
--    if(part > ZBAR_PARTIAL)
--        part |= ean->addon;
--
--    dprintf(2, " %x/%x=%x", ean->left, ean->right, part);
-+    dbprintf(2, " dir=%d %x/%x=%x",
-+             ean->direction, ean->left, ean->right, part);
-     return(part);
- }
- 
-@@ -565,7 +705,7 @@
-                                 zbar_symbol_type_t sym)
- {
-     ean_decoder_t *ean = &dcode->ean;
--    zbar_symbol_type_t base = sym & ZBAR_SYMBOL;
-+    zbar_symbol_type_t base = sym;
-     int i = 0, j = 0;
-     if(base > ZBAR_PARTIAL) {
-         if(base == ZBAR_UPCA)
-@@ -580,22 +720,23 @@
-             i = 3;
- 
-         if(base == ZBAR_ISBN10 ||
--           !TEST_CFG(ean_get_config(ean, sym), ZBAR_CFG_EMIT_CHECK))
-+           (base > ZBAR_EAN5 &&
-+            !TEST_CFG(ean_get_config(ean, sym), ZBAR_CFG_EMIT_CHECK)))
-             base--;
- 
-         for(; j < base && ean->buf[i] >= 0; i++, j++)
-             dcode->buf[j] = ean->buf[i] + '0';
- 
--        if((sym & ZBAR_SYMBOL) == ZBAR_ISBN10 && j == 9 &&
-+        if(sym == ZBAR_ISBN10 && j == 9 &&
-            TEST_CFG(ean->isbn10_config, ZBAR_CFG_EMIT_CHECK))
-             /* recalculate ISBN-10 check digit */
-             dcode->buf[j++] = isbn10_calc_checksum(ean);
-     }
--    if(sym & ZBAR_ADDON)
--        for(i = 13; ean->buf[i] >= 0; i++, j++)
--            dcode->buf[j] = ean->buf[i] + '0';
-     dcode->buflen = j;
-     dcode->buf[j] = '\0';
-+    dcode->direction = 1 - 2 * ean->direction;
-+    dcode->modifiers = 0;
-+    dbprintf(2, " base=%d j=%d (%s)", base, j, dcode->buf);
- }
- 
- zbar_symbol_type_t _zbar_decode_ean (zbar_decoder_t *dcode)
-@@ -603,39 +744,40 @@
-     /* process upto 4 separate passes */
-     zbar_symbol_type_t sym = ZBAR_NONE;
-     unsigned char pass_idx = dcode->idx & 3;
-+    unsigned char i;
- 
-     /* update latest character width */
-     dcode->ean.s4 -= get_width(dcode, 4);
-     dcode->ean.s4 += get_width(dcode, 0);
- 
--    unsigned char i;
-     for(i = 0; i < 4; i++) {
-         ean_pass_t *pass = &dcode->ean.pass[i];
-         if(pass->state >= 0 ||
-            i == pass_idx)
-         {
--            dprintf(2, "      ean[%x/%x]: idx=%x st=%d s=%d",
--                    pass_idx, i, dcode->idx, pass->state, dcode->ean.s4);
--            zbar_symbol_type_t part = decode_pass(dcode, pass);
-+            zbar_symbol_type_t part;
-+            dbprintf(2, "      ean[%x/%x]: idx=%x st=%d s=%d",
-+                     i, pass_idx, dcode->idx, pass->state, dcode->ean.s4);
-+            part = decode_pass(dcode, pass);
-             if(part) {
-                 /* update accumulated data from new partial decode */
-                 sym = integrate_partial(&dcode->ean, pass, part);
-                 if(sym) {
-                     /* this pass valid => _reset_ all passes */
--                    dprintf(2, " sym=%x", sym);
-+                    dbprintf(2, " sym=%x", sym);
-                     dcode->ean.pass[0].state = dcode->ean.pass[1].state = -1;
-                     dcode->ean.pass[2].state = dcode->ean.pass[3].state = -1;
-                     if(sym > ZBAR_PARTIAL) {
--                        if(!get_lock(dcode, ZBAR_EAN13))
-+                        if(!acquire_lock(dcode, sym))
-                             postprocess(dcode, sym);
-                         else {
--                            dprintf(1, " [locked %d]", dcode->lock);
-+                            dbprintf(1, " [locked %d]", dcode->lock);
-                             sym = ZBAR_PARTIAL;
-                         }
-                     }
-                 }
-             }
--            dprintf(2, "\n");
-+            dbprintf(2, "\n");
-         }
-     }
-     return(sym);
-diff -r 563557a923d0 zbar/decoder/ean.h
---- a/zbar/decoder/ean.h	Tue Oct 27 11:25:59 2009 -0400
-+++ b/zbar/decoder/ean.h	Fri Feb 22 08:54:29 2013 -0300
-@@ -1,5 +1,5 @@
- /*------------------------------------------------------------------------
-- *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-  *
-  *  This file is part of the ZBar Bar Code Reader.
-  *
-@@ -26,18 +26,20 @@
- /* state of each parallel decode attempt */
- typedef struct ean_pass_s {
-     signed char state;          /* module position of w[idx] in symbol */
-+#define STATE_REV   0x80        /*   scan direction reversed */
- #define STATE_ADDON 0x40        /*   scanning add-on */
--#define STATE_IDX   0x1f        /*   element offset into symbol */
-+#define STATE_IDX   0x3f        /*   element offset into symbol */
-+    unsigned width;             /* width of last character */
-     unsigned char raw[7];       /* decode in process */
- } ean_pass_t;
- 
- /* EAN/UPC specific decode state */
- typedef struct ean_decoder_s {
-     ean_pass_t pass[4];         /* state of each parallel decode attempt */
--    zbar_symbol_type_t left;   /* current holding buffer contents */
-+    zbar_symbol_type_t left;    /* current holding buffer contents */
-     zbar_symbol_type_t right;
--    zbar_symbol_type_t addon;
--    unsigned s4;                /* character width */
-+    int direction;              /* scan direction */
-+    unsigned s4, width;         /* character width */
-     signed char buf[18];        /* holding buffer */
- 
-     signed char enable;
-@@ -47,6 +49,8 @@
-     unsigned upce_config;
-     unsigned isbn10_config;
-     unsigned isbn13_config;
-+    unsigned ean5_config;
-+    unsigned ean2_config;
- } ean_decoder_t;
- 
- /* reset EAN/UPC pass specific state */
-@@ -61,20 +65,22 @@
- static inline void ean_reset (ean_decoder_t *ean)
- {
-     ean_new_scan(ean);
--    ean->left = ean->right = ean->addon = ZBAR_NONE;
-+    ean->left = ean->right = ZBAR_NONE;
- }
- 
- static inline unsigned ean_get_config (ean_decoder_t *ean,
-                                        zbar_symbol_type_t sym)
- {
--    switch(sym & ZBAR_SYMBOL) {
--    case ZBAR_EAN13:  return(ean->ean13_config);
-+    switch(sym) {
-+    case ZBAR_EAN2:   return(ean->ean2_config);
-+    case ZBAR_EAN5:   return(ean->ean5_config);
-     case ZBAR_EAN8:   return(ean->ean8_config);
--    case ZBAR_UPCA:   return(ean->upca_config);
-     case ZBAR_UPCE:   return(ean->upce_config);
-     case ZBAR_ISBN10: return(ean->isbn10_config);
-+    case ZBAR_UPCA:   return(ean->upca_config);
-+    case ZBAR_EAN13:  return(ean->ean13_config);
-     case ZBAR_ISBN13: return(ean->isbn13_config);
--    default:           return(0);
-+    default:          return(0);
-     }
- }
- 
-diff -r 563557a923d0 zbar/decoder/i25.c
---- a/zbar/decoder/i25.c	Tue Oct 27 11:25:59 2009 -0400
-+++ b/zbar/decoder/i25.c	Fri Feb 22 08:54:29 2013 -0300
-@@ -1,5 +1,5 @@
- /*------------------------------------------------------------------------
-- *  Copyright 2008-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+ *  Copyright 2008-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-  *
-  *  This file is part of the ZBar Bar Code Reader.
-  *
-@@ -25,12 +25,12 @@
- #include <string.h>     /* memmove */
- 
- #include <zbar.h>
--#include "decoder.h"
- 
- #ifdef DEBUG_I25
- # define DEBUG_LEVEL (DEBUG_I25)
- #endif
- #include "debug.h"
-+#include "decoder.h"
- 
- static inline unsigned char i25_decode1 (unsigned char enc,
-                                          unsigned e,
-@@ -49,7 +49,7 @@
-                                           unsigned char offset)
- {
-     i25_decoder_t *dcode25 = &dcode->i25;
--    dprintf(2, " s=%d", dcode25->s10);
-+    dbprintf(2, " s=%d", dcode25->s10);
-     if(dcode25->s10 < 10)
-         return(0xff);
- 
-@@ -65,11 +65,11 @@
-             par++;
-     }
- 
--    dprintf(2, " enc=%02x par=%x", enc, par);
-+    dbprintf(2, " enc=%02x par=%x", enc, par);
- 
-     /* parity check */
-     if(par != 2) {
--        dprintf(2, " [bad parity]");
-+        dbprintf(2, " [bad parity]");
-         return(0xff);
-     }
- 
-@@ -79,12 +79,12 @@
-         if(enc == 12)
-             enc = 0;
-         else if(--enc > 9) {
--            dprintf(2, " [invalid encoding]");
-+            dbprintf(2, " [invalid encoding]");
-             return(0xff);
-         }
-     }
- 
--    dprintf(2, " => %x", enc);
-+    dbprintf(2, " => %x", enc);
-     return(enc);
- }
- 
-@@ -103,7 +103,7 @@
-     if((get_color(dcode) == ZBAR_BAR)
-        ? enc != 4
-        : (enc = i25_decode1(enc, get_width(dcode, i++), dcode25->s10))) {
--        dprintf(4, "      i25: s=%d enc=%x [invalid]\n", dcode25->s10, enc);
-+        dbprintf(4, "      i25: s=%d enc=%x [invalid]\n", dcode25->s10, enc);
-         return(ZBAR_NONE);
-     }
- 
-@@ -111,10 +111,10 @@
-      * we require 5.25n for w=2n to 6.75n for w=3n
-      * (FIXME should really factor in w:n ratio)
-      */
--    unsigned quiet = get_width(dcode, i++);
-+    unsigned quiet = get_width(dcode, i);
-     if(quiet && quiet < dcode25->s10 * 3 / 8) {
--        dprintf(3, "      i25: s=%d enc=%x q=%d [invalid qz]\n",
--                dcode25->s10, enc, quiet);
-+        dbprintf(3, "      i25: s=%d enc=%x q=%d [invalid qz]\n",
-+                 dcode25->s10, enc, quiet);
-         return(ZBAR_NONE);
-     }
- 
-@@ -124,6 +124,21 @@
-     return(ZBAR_PARTIAL);
- }
- 
-+static inline int i25_acquire_lock (zbar_decoder_t *dcode)
-+{
-+    int i;
-+    /* lock shared resources */
-+    if(acquire_lock(dcode, ZBAR_I25)) {
-+        dcode->i25.character = -1;
-+        return(1);
-+    }
-+
-+    /* copy holding buffer */
-+    for(i = 4; --i >= 0; )
-+        dcode->buf[i] = dcode->i25.buf[i];
-+    return(0);
-+}
-+
- static inline signed char i25_decode_end (zbar_decoder_t *dcode)
- {
-     i25_decoder_t *dcode25 = &dcode->i25;
-@@ -133,7 +148,8 @@
-     if((quiet && quiet < dcode25->width * 3 / 8) ||
-        decode_e(get_width(dcode, 1), dcode25->width, 45) > 2 ||
-        decode_e(get_width(dcode, 2), dcode25->width, 45) > 2) {
--        dprintf(3, " s=%d q=%d [invalid qz]\n", dcode25->width, quiet);
-+        dbprintf(3, "      i25: s=%d q=%d [invalid qz]\n",
-+                 dcode25->width, quiet);
-         return(ZBAR_NONE);
-     }
- 
-@@ -145,9 +161,14 @@
-           decode_e(get_width(dcode, 4), dcode25->width, 45) > 2))
-         return(ZBAR_NONE);
- 
-+    if(dcode25->character <= 4 &&
-+       i25_acquire_lock(dcode))
-+        return(ZBAR_PARTIAL);
-+
-+    dcode->direction = 1 - 2 * dcode25->direction;
-     if(dcode25->direction) {
-         /* reverse buffer */
--        dprintf(2, " (rev)");
-+        dbprintf(2, " (rev)");
-         int i;
-         for(i = 0; i < dcode25->character / 2; i++) {
-             unsigned j = dcode25->character - 1 - i;
-@@ -160,15 +181,19 @@
-     if(dcode25->character < CFG(*dcode25, ZBAR_CFG_MIN_LEN) ||
-        (CFG(*dcode25, ZBAR_CFG_MAX_LEN) > 0 &&
-         dcode25->character > CFG(*dcode25, ZBAR_CFG_MAX_LEN))) {
--        dprintf(2, " [invalid len]\n");
--        dcode->lock = 0;
-+        dbprintf(2, " [invalid len]\n");
-+        release_lock(dcode, ZBAR_I25);
-         dcode25->character = -1;
-         return(ZBAR_NONE);
-     }
- 
-+    zassert(dcode25->character < dcode->buf_alloc, ZBAR_NONE, "i=%02x %s\n",
-+            dcode25->character,
-+            _zbar_decoder_buf_dump(dcode->buf, dcode25->character));
-     dcode->buflen = dcode25->character;
-     dcode->buf[dcode25->character] = '\0';
--    dprintf(2, " [valid end]\n");
-+    dcode->modifiers = 0;
-+    dbprintf(2, " [valid end]\n");
-     dcode25->character = -1;
-     return(ZBAR_I25);
- }
-@@ -193,42 +218,48 @@
-     /* FIXME check current character width against previous */
-     dcode25->width = dcode25->s10;
- 
--    dprintf(2, "      i25[%c%02d+%x]",
--            (dcode25->direction) ? '<' : '>',
--            dcode25->character, dcode25->element);
-+    dbprintf(2, "      i25[%c%02d+%x]",
-+             (dcode25->direction) ? '<' : '>',
-+             dcode25->character, dcode25->element);
- 
--    /* lock shared resources */
--    if(!dcode25->character && get_lock(dcode, ZBAR_I25)) {
--        dcode25->character = -1;
--        dprintf(2, " [locked %d]\n", dcode->lock);
-+    if(dcode25->character == 4 && i25_acquire_lock(dcode))
-         return(ZBAR_PARTIAL);
-+
-+    unsigned char c = i25_decode10(dcode, 1);
-+    dbprintf(2, " c=%x", c);
-+    if(c > 9) {
-+        dbprintf(2, " [aborted]\n");
-+        goto reset;
-     }
- 
--    unsigned char c = i25_decode10(dcode, 1);
--    dprintf(2, " c=%x", c);
-+    if(size_buf(dcode, dcode25->character + 3)) {
-+        dbprintf(2, " [overflow]\n");
-+        goto reset;
-+    }
- 
--    if(c > 9 ||
--       ((dcode25->character >= BUFFER_MIN) &&
--        size_buf(dcode, dcode25->character + 2))) {
--        dprintf(2, (c > 9) ? " [aborted]\n" : " [overflow]\n");
--        dcode->lock = 0;
--        dcode25->character = -1;
--        return(ZBAR_NONE);
--    }
--    dcode->buf[dcode25->character++] = c + '0';
-+    unsigned char *buf;
-+    if(dcode25->character >= 4)
-+        buf = dcode->buf;
-+    else
-+        buf = dcode25->buf;
-+    buf[dcode25->character++] = c + '0';
- 
-     c = i25_decode10(dcode, 0);
--    dprintf(2, " c=%x", c);
-+    dbprintf(2, " c=%x", c);
-     if(c > 9) {
--        dprintf(2, " [aborted]\n");
--        dcode->lock = 0;
--        dcode25->character = -1;
--        return(ZBAR_NONE);
-+        dbprintf(2, " [aborted]\n");
-+        goto reset;
-     }
-     else
--        dprintf(2, "\n");
-+        dbprintf(2, "\n");
- 
--    dcode->buf[dcode25->character++] = c + '0';
-+    buf[dcode25->character++] = c + '0';
-     dcode25->element = 10;
-     return((dcode25->character == 2) ? ZBAR_PARTIAL : ZBAR_NONE);
-+
-+reset:
-+    if(dcode25->character >= 4)
-+        release_lock(dcode, ZBAR_I25);
-+    dcode25->character = -1;
-+    return(ZBAR_NONE);
- }
-diff -r 563557a923d0 zbar/decoder/i25.h
---- a/zbar/decoder/i25.h	Tue Oct 27 11:25:59 2009 -0400
-+++ b/zbar/decoder/i25.h	Fri Feb 22 08:54:29 2013 -0300
-@@ -30,6 +30,7 @@
-     int character : 12;         /* character position in symbol */
-     unsigned s10;               /* current character width */
-     unsigned width;             /* last character width */
-+    unsigned char buf[4];       /* initial scan buffer */
- 
-     unsigned config;
-     int configs[NUM_CFGS];      /* int valued configurations */
-diff -r 563557a923d0 zbar/decoder/pdf417.c
---- a/zbar/decoder/pdf417.c	Tue Oct 27 11:25:59 2009 -0400
-+++ b/zbar/decoder/pdf417.c	Fri Feb 22 08:54:29 2013 -0300
-@@ -1,5 +1,5 @@
- /*------------------------------------------------------------------------
-- *  Copyright 2008-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+ *  Copyright 2008-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-  *
-  *  This file is part of the ZBar Bar Code Reader.
-  *
-@@ -24,14 +24,14 @@
- #include <config.h>
- 
- #include <zbar.h>
--#include "decoder.h"
--
--#include "pdf417_hash.h"
- 
- #ifdef DEBUG_PDF417
- # define DEBUG_LEVEL (DEBUG_PDF417)
- #endif
- #include "debug.h"
-+#include "decoder.h"
-+
-+#include "pdf417_hash.h"
- 
- #define PDF417_STOP 0xbff
- 
-@@ -41,7 +41,7 @@
-      * from similar edge measurements
-      */
-     unsigned s = dcode->pdf417.s8;
--    dprintf(2, " s=%d ", s);
-+    dbprintf(2, " s=%d ", s);
-     if(s < 8)
-         return(-1);
- 
-@@ -55,19 +55,19 @@
-         else
-             e = decode_e(get_width(dcode, 7 - i) +
-                          get_width(dcode, 6 - i), s, 17);
--        dprintf(4, "%x", e);
-+        dbprintf(4, "%x", e);
-         if(e < 0 || e > 8)
-             return(-1);
-         sig = (sig << 3) ^ e;
-     }
--    dprintf(2, " sig=%06lx", sig);
-+    dbprintf(2, " sig=%06lx", sig);
- 
-     /* determine cluster number */
-     int clst = ((sig & 7) - ((sig >> 3) & 7) +
-                 ((sig >> 12) & 7) - ((sig >> 15) & 7));
-     if(clst < 0)
-         clst += 9;
--    dprintf(2, " k=%d", clst);
-+    dbprintf(2, " k=%d", clst);
-     zassert(clst >= 0 && clst < 9, -1, "dir=%x sig=%lx k=%x %s\n",
-             dcode->pdf417.direction, sig, clst,
-             _zbar_decoder_buf_dump(dcode->buf, dcode->pdf417.character));
-@@ -89,8 +89,8 @@
-             _zbar_decoder_buf_dump(dcode->buf, dcode->pdf417.character));
- 
-     unsigned short c = (g[0] + g[1] + g[2]) & PDF417_HASH_MASK;
--    dprintf(2, " g0=%x g1=%x g2=%x c=%03d(%d)",
--            g[0], g[1], g[2], c & 0x3ff, c >> 10);
-+    dbprintf(2, " g0=%x g1=%x g2=%x c=%03d(%d)",
-+             g[0], g[1], g[2], c & 0x3ff, c >> 10);
-     return(c);
- }
- 
-@@ -142,18 +142,18 @@
-         ei = decode_e(get_width(dcode, 8) + get_width(dcode, 9), s, 17);
-     }
- 
--    dprintf(2, "      pdf417[%c]: s=%d",
--            (get_color(dcode)) ? '<' : '>', s);
-+    dbprintf(2, "      pdf417[%c]: s=%d",
-+             (get_color(dcode)) ? '<' : '>', s);
- 
-     /* check quiet zone */
-     if(ei >= 0 && ei < ex) {
--        dprintf(2, " [invalid quiet]\n");
-+        dbprintf(2, " [invalid quiet]\n");
-         return(0);
-     }
- 
-     /* lock shared resources */
--    if(get_lock(dcode, ZBAR_PDF417)) {
--        dprintf(2, " [locked %d]\n", dcode->lock);
-+    if(acquire_lock(dcode, ZBAR_PDF417)) {
-+        dbprintf(2, " [locked %d]\n", dcode->lock);
-         return(0);
-     }
- 
-@@ -162,7 +162,7 @@
-     dcode417->element = 0;
-     dcode417->character = 0;
- 
--    dprintf(2, " [valid start]\n");
-+    dbprintf(2, " [valid start]\n");
-     return(ZBAR_PARTIAL);
- }
- 
-@@ -176,7 +176,7 @@
- 
-     if(dcode417->character < 0) {
-         pdf417_decode_start(dcode);
--        dprintf(4, "\n");
-+        dbprintf(4, "\n");
-         return(0);
-     }
- 
-@@ -185,12 +185,12 @@
-         return(0);
-     dcode417->element = 0;
- 
--    dprintf(2, "      pdf417[%c%02d]:",
--            (dcode417->direction) ? '<' : '>', dcode417->character);
-+    dbprintf(2, "      pdf417[%c%02d]:",
-+             (dcode417->direction) ? '<' : '>', dcode417->character);
- 
-     if(get_color(dcode) != dcode417->direction) {
-         int c = dcode417->character;
--        dcode->lock = 0;
-+        release_lock(dcode, ZBAR_PDF417);
-         dcode417->character = -1;
-         zassert(get_color(dcode) == dcode417->direction, ZBAR_NONE,
-                 "color=%x dir=%x char=%d elem=0 %s\n",
-@@ -199,11 +199,9 @@
-     }
- 
-     signed short c = pdf417_decode8(dcode);
--    if((c < 0) ||
--       ((dcode417->character >= BUFFER_MIN) &&
--        size_buf(dcode, dcode417->character + 1))) {
--        dprintf(1, (c < 0) ? " [aborted]\n" : " [overflow]\n");
--        dcode->lock = 0;
-+    if(c < 0 || size_buf(dcode, dcode417->character + 1)) {
-+        dbprintf(1, (c < 0) ? " [aborted]\n" : " [overflow]\n");
-+        release_lock(dcode, ZBAR_PDF417);
-         dcode417->character = -1;
-         return(0);
-     }
-@@ -211,12 +209,14 @@
-     /* FIXME TBD infer dimensions, save codewords */
- 
-     if(c == PDF417_STOP) {
--        dprintf(1, " [valid stop]");
-+        dbprintf(1, " [valid stop]");
-         /* FIXME check trailing bar and qz */
--        dcode->lock = 0;
-+        dcode->direction = 1 - 2 * dcode417->direction;
-+        dcode->modifiers = 0;
-+        release_lock(dcode, ZBAR_PDF417);
-         dcode417->character = -1;
-     }
- 
--    dprintf(2, "\n");
-+    dbprintf(2, "\n");
-     return(0);
- }
-diff -r 563557a923d0 zbar/decoder/qr_finder.c
---- a/zbar/decoder/qr_finder.c	Tue Oct 27 11:25:59 2009 -0400
-+++ b/zbar/decoder/qr_finder.c	Fri Feb 22 08:54:29 2013 -0300
-@@ -1,13 +1,36 @@
-+/*------------------------------------------------------------------------
-+ *  Copyright 2009-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-+ *
-+ *  This file is part of the ZBar Bar Code Reader.
-+ *
-+ *  The ZBar Bar Code Reader is free software; you can redistribute it
-+ *  and/or modify it under the terms of the GNU Lesser Public License as
-+ *  published by the Free Software Foundation; either version 2.1 of
-+ *  the License, or (at your option) any later version.
-+ *
-+ *  The ZBar Bar Code Reader is distributed in the hope that it will be
-+ *  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-+ *  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU Lesser Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser Public License
-+ *  along with the ZBar Bar Code Reader; if not, write to the Free
-+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-+ *  Boston, MA  02110-1301  USA
-+ *
-+ *  http://sourceforge.net/projects/zbar
-+ *------------------------------------------------------------------------*/
-+
- #include <config.h>
- #include <assert.h>
- 
- #include <zbar.h>
--#include "decoder.h"
- 
- #ifdef DEBUG_QR_FINDER
- # define DEBUG_LEVEL (DEBUG_QR_FINDER)
- #endif
- #include "debug.h"
-+#include "decoder.h"
- 
- /* at this point lengths are all decode unit offsets from the decode edge
-  * NB owned by finder
-@@ -20,42 +43,48 @@
- zbar_symbol_type_t _zbar_find_qr (zbar_decoder_t *dcode)
- {
-     qr_finder_t *qrf = &dcode->qrf;
-+    unsigned s, qz, w;
-+    int ei;
- 
-     /* update latest finder pattern width */
-     qrf->s5 -= get_width(dcode, 6);
-     qrf->s5 += get_width(dcode, 1);
--    unsigned s = qrf->s5;
-+    s = qrf->s5;
- 
-+    /*TODO: The 2005 standard allows reflectance-reversed codes (light on dark
-+       instead of dark on light).
-+      If we find finder patterns with the opposite polarity, we should invert
-+       the final binarized image and use them to search for QR codes in that.*/
-     if(get_color(dcode) != ZBAR_SPACE || s < 7)
-         return(0);
- 
--    dprintf(2, "    qrf: s=%d", s);
-+    dbprintf(2, "    qrf: s=%d", s);
- 
--    int ei = decode_e(pair_width(dcode, 1), s, 7);
--    dprintf(2, " %d", ei);
-+    ei = decode_e(pair_width(dcode, 1), s, 7);
-+    dbprintf(2, " %d", ei);
-     if(ei)
-         goto invalid;
- 
-     ei = decode_e(pair_width(dcode, 2), s, 7);
--    dprintf(2, "%d", ei);
-+    dbprintf(2, "%d", ei);
-     if(ei != 2)
-         goto invalid;
- 
-     ei = decode_e(pair_width(dcode, 3), s, 7);
--    dprintf(2, "%d", ei);
-+    dbprintf(2, "%d", ei);
-     if(ei != 2)
-         goto invalid;
- 
-     ei = decode_e(pair_width(dcode, 4), s, 7);
--    dprintf(2, "%d", ei);
-+    dbprintf(2, "%d", ei);
-     if(ei)
-         goto invalid;
- 
-     /* valid QR finder symbol
-      * mark positions needed by decoder
-      */
--    unsigned qz = get_width(dcode, 0);
--    unsigned w = get_width(dcode, 1);
-+    qz = get_width(dcode, 0);
-+    w = get_width(dcode, 1);
-     qrf->line.eoffs = qz + (w + 1) / 2;
-     qrf->line.len = qz + w + get_width(dcode, 2);
-     qrf->line.pos[0] = qrf->line.len + get_width(dcode, 3);
-@@ -63,13 +92,15 @@
-     w = get_width(dcode, 5);
-     qrf->line.boffs = qrf->line.pos[0] + get_width(dcode, 4) + (w + 1) / 2;
- 
--    dprintf(2, " boff=%d pos=%d len=%d eoff=%d [valid]\n",
--            qrf->line.boffs, qrf->line.pos[0], qrf->line.len,
--            qrf->line.eoffs);
-+    dbprintf(2, " boff=%d pos=%d len=%d eoff=%d [valid]\n",
-+             qrf->line.boffs, qrf->line.pos[0], qrf->line.len,
-+             qrf->line.eoffs);
- 
-+    dcode->direction = 0;
-+    dcode->buflen = 0;
-     return(ZBAR_QRCODE);
- 
- invalid:
--    dprintf(2, " [invalid]\n");
-+    dbprintf(2, " [invalid]\n");
-     return(0);
- }
-diff -r 563557a923d0 zbar/error.c
---- a/zbar/error.c	Tue Oct 27 11:25:59 2009 -0400
-+++ b/zbar/error.c	Fri Feb 22 08:54:29 2013 -0300
-@@ -1,5 +1,5 @@
- /*------------------------------------------------------------------------
-- *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-  *
-  *  This file is part of the ZBar Bar Code Reader.
-  *
-@@ -36,7 +36,7 @@
- };
- #define MOD_MAX (strlen(mod_str[ZBAR_MOD_IMAGE_SCANNER]))
- 
--static const char const * err_str[] = {
-+static const char * const err_str[] = {
-     "no error",                 /* OK */
-     "out of memory",            /* NOMEM */
-     "internal library error",   /* INTERNAL */
-@@ -99,32 +99,32 @@
- const char *_zbar_error_string (const void *container,
-                                 int verbosity)
- {
-+    static const char basefmt[] = "%s: zbar %s in %s():\n    %s: ";
-     errinfo_t *err = (errinfo_t*)container;
-+    const char *sev, *mod, *func, *type;
-+    int len;
-+
-     assert(err->magic == ERRINFO_MAGIC);
- 
--    const char *sev;
-     if(err->sev >= SEV_FATAL && err->sev <= SEV_NOTE)
-         sev = sev_str[err->sev + 2];
-     else
-         sev = sev_str[1];
- 
--    const char *mod;
-     if(err->module >= ZBAR_MOD_PROCESSOR &&
-        err->module < ZBAR_MOD_UNKNOWN)
-         mod = mod_str[err->module];
-     else
-         mod = mod_str[ZBAR_MOD_UNKNOWN];
- 
--    const char *func = (err->func) ? err->func : "<unknown>";
-+    func = (err->func) ? err->func : "<unknown>";
- 
--    const char *type;
-     if(err->type >= 0 && err->type < ZBAR_ERR_NUM)
-         type = err_str[err->type];
-     else
-         type = err_str[ZBAR_ERR_NUM];
- 
--    char basefmt[] = "%s: zbar %s in %s():\n    %s: ";
--    int len = SEV_MAX + MOD_MAX + ERR_MAX + strlen(func) + sizeof(basefmt);
-+    len = SEV_MAX + MOD_MAX + ERR_MAX + strlen(func) + sizeof(basefmt);
-     err->buf = realloc(err->buf, len);
-     len = sprintf(err->buf, basefmt, sev, mod, func, type);
-     if(len <= 0)
-@@ -150,12 +150,14 @@
-             return("<unknown>");
-     }
- 
-+#ifdef HAVE_ERRNO_H
-     if(err->type == ZBAR_ERR_SYSTEM) {
--        char sysfmt[] = ": %s (%d)\n";
-+        static const char sysfmt[] = ": %s (%d)\n";
-         const char *syserr = strerror(err->errnum);
-         err->buf = realloc(err->buf, len + strlen(sysfmt) + strlen(syserr));
-         len += sprintf(err->buf + len, sysfmt, syserr, err->errnum);
-     }
-+#endif
- #ifdef _WIN32
-     else if(err->type == ZBAR_ERR_WINAPI) {
-         char *syserr = NULL;
-diff -r 563557a923d0 zbar/error.h
---- a/zbar/error.h	Tue Oct 27 11:25:59 2009 -0400
-+++ b/zbar/error.h	Fri Feb 22 08:54:29 2013 -0300
-@@ -1,5 +1,5 @@
- /*------------------------------------------------------------------------
-- *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-  *
-  *  This file is part of the ZBar Bar Code Reader.
-  *
-@@ -30,7 +30,9 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
--#include <errno.h>
-+#ifdef HAVE_ERRNO_H
-+# include <errno.h>
-+#endif
- #include <assert.h>
- 
- #include <zbar.h>
-@@ -146,10 +148,12 @@
- {
-     errinfo_t *err = (errinfo_t*)container;
-     assert(err->magic == ERRINFO_MAGIC);
-+#ifdef HAVE_ERRNO_H
-     if(type == ZBAR_ERR_SYSTEM)
-         err->errnum = errno;
-+#endif
- #ifdef _WIN32
--    else if(type == ZBAR_ERR_WINAPI)
-+    if(type == ZBAR_ERR_WINAPI)
-         err->errnum = GetLastError();
- #endif
-     err->sev = sev;
-diff -r 563557a923d0 zbar/image.c
---- a/zbar/image.c	Tue Oct 27 11:25:59 2009 -0400
-+++ b/zbar/image.c	Fri Feb 22 08:54:29 2013 -0300
-@@ -1,5 +1,5 @@
- /*------------------------------------------------------------------------
-- *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-  *
-  *  This file is part of the ZBar Bar Code Reader.
-  *
-@@ -74,6 +74,26 @@
-     return(img->height);
- }
- 
-+void zbar_image_get_size (const zbar_image_t *img,
-+                          unsigned *w,
-+                          unsigned *h)
-+{
-+    if(w) *w = img->width;
-+    if(h) *h = img->height;
-+}
-+
-+void zbar_image_get_crop (const zbar_image_t *img,
-+                          unsigned *x,
-+                          unsigned *y,
-+                          unsigned *w,
-+                          unsigned *h)
-+{
-+    if(x) *x = img->crop_x;
-+    if(y) *y = img->crop_y;
-+    if(w) *w = img->crop_w;
-+    if(h) *h = img->crop_h;
-+}
-+
- const void *zbar_image_get_data (const zbar_image_t *img)
- {
-     return(img->data);
-@@ -100,8 +120,28 @@
-                           unsigned w,
-                           unsigned h)
- {
--    img->width = w;
--    img->height = h;
-+    img->crop_x = img->crop_y = 0;
-+    img->width = img->crop_w = w;
-+    img->height = img->crop_h = h;
-+}
-+
-+void zbar_image_set_crop (zbar_image_t *img,
-+                          unsigned x,
-+                          unsigned y,
-+                          unsigned w,
-+                          unsigned h)
-+{
-+    unsigned img_w = img->width;
-+    if(x > img_w) x = img_w;
-+    if(x + w > img_w) w = img_w - x;
-+    img->crop_x = x;
-+    img->crop_w = w;
-+
-+    unsigned img_h = img->height;
-+    if(y > img_h) y = img_h;
-+    if(y + h > img_h) h = img_h - y;
-+    img->crop_y = y;
-+    img->crop_h = h;
- }
- 
- inline void zbar_image_free_data (zbar_image_t *img)
-@@ -109,9 +149,10 @@
-     if(!img)
-         return;
-     if(img->src) {
-+        zbar_image_t *newimg;
-         /* replace video image w/new copy */
-         assert(img->refcnt); /* FIXME needs lock */
--        zbar_image_t *newimg = zbar_image_create();
-+        newimg = zbar_image_create();
-         memcpy(newimg, img, sizeof(zbar_image_t));
-         /* recycle video image */
-         newimg->cleanup(newimg);
-@@ -162,8 +203,7 @@
- {
-     zbar_image_t *dst = zbar_image_create();
-     dst->format = src->format;
--    dst->width = src->width;
--    dst->height = src->height;
-+    _zbar_image_copy_size(dst, src);
-     dst->datalen = src->datalen;
-     dst->data = malloc(src->datalen);
-     assert(dst->data);
-@@ -180,11 +220,11 @@
- void zbar_image_set_symbols (zbar_image_t *img,
-                              const zbar_symbol_set_t *syms)
- {
-+    if(syms)
-+        zbar_symbol_set_ref(syms, 1);
-     if(img->syms)
-         zbar_symbol_set_ref(img->syms, -1);
-     img->syms = (zbar_symbol_set_t*)syms;
--    if(syms)
--        zbar_symbol_set_ref(img->syms, 1);
- }
- 
- const zbar_symbol_t *zbar_image_first_symbol (const zbar_image_t *img)
-@@ -202,29 +242,34 @@
-                       const char *filebase)
- {
-     int len = strlen(filebase) + 16;
--    char filename[len];
-+    char *filename = malloc(len);
-+    int n = 0, rc = 0;
-+    FILE *f;
-+    zimg_hdr_t hdr;
-     strcpy(filename, filebase);
--    int n = 0;
--    if(*(char*)&img->format >= ' ')
-+    if((img->format & 0xff) >= ' ')
-         n = snprintf(filename, len, "%s.%.4s.zimg",
-                      filebase, (char*)&img->format);
-     else
-         n = snprintf(filename, len, "%s.%08" PRIx32 ".zimg",
-                      filebase, img->format);
--    assert(n < len);
--    filename[len] = '\0';
-+    assert(n < len - 1);
-+    filename[len - 1] = '\0';
- 
-     zprintf(1, "dumping %.4s(%08" PRIx32 ") image to %s\n",
-             (char*)&img->format, img->format, filename);
- 
--    FILE *f = fopen(filename, "w");
-+    f = fopen(filename, "w");
-     if(!f) {
--        int rc = errno;
-+#ifdef HAVE_ERRNO_H
-+        rc = errno;
-         zprintf(1, "ERROR opening %s: %s\n", filename, strerror(rc));
--        return(rc);
-+#else
-+        rc = 1;
-+#endif
-+        goto error;
-     }
- 
--    zimg_hdr_t hdr;
-     hdr.magic = 0x676d697a;
-     hdr.format = img->format;
-     hdr.width = img->width;
-@@ -233,12 +278,21 @@
- 
-     if(fwrite(&hdr, sizeof(hdr), 1, f) != 1 ||
-        fwrite(img->data, 1, img->datalen, f) != img->datalen) {
--        int rc = errno;
-+#ifdef HAVE_ERRNO_H
-+        rc = errno;
-         zprintf(1, "ERROR writing %s: %s\n", filename, strerror(rc));
-+#else
-+        rc = 1;
-+#endif
-         fclose(f);
--        return(rc);
-+        goto error;
-     }
--    return(fclose(f));
-+
-+    rc = fclose(f);
-+
-+error:
-+    free(filename);
-+    return(rc);
- }
- 
- #ifdef DEBUG_SVG
-diff -r 563557a923d0 zbar/image.h
---- a/zbar/image.h	Tue Oct 27 11:25:59 2009 -0400
-+++ b/zbar/image.h	Fri Feb 22 08:54:29 2013 -0300
-@@ -1,5 +1,5 @@
- /*------------------------------------------------------------------------
-- *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-  *
-  *  This file is part of the ZBar Bar Code Reader.
-  *
-@@ -35,10 +35,7 @@
- #include "symbol.h"
- #include "refcnt.h"
- 
--/* adapted from v4l2 spec */
--#define fourcc(a, b, c, d)                      \
--    ((uint32_t)(a) | ((uint32_t)(b) << 8) |     \
--     ((uint32_t)(c) << 16) | ((uint32_t)(d) << 24))
-+#define fourcc zbar_fourcc
- 
- /* unpack size/location of component */
- #define RGB_SIZE(c)   ((c) >> 5)
-@@ -65,6 +62,8 @@
-     unsigned width, height;     /* image size */
-     const void *data;           /* image sample data */
-     unsigned long datalen;      /* allocated/mapped size of data */
-+    unsigned crop_x, crop_y;    /* crop rectangle */
-+    unsigned crop_w, crop_h;
-     void *userdata;             /* user specified data associated w/image */
- 
-     /* cleanup handler */
-@@ -129,4 +128,15 @@
-     b->syms = tmp;
- }
- 
-+static inline void _zbar_image_copy_size (zbar_image_t *dst,
-+                                          const zbar_image_t *src)
-+{
-+    dst->width = src->width;
-+    dst->height = src->height;
-+    dst->crop_x = src->crop_x;
-+    dst->crop_y = src->crop_y;
-+    dst->crop_w = src->crop_w;
-+    dst->crop_h = src->crop_h;
-+}
-+
- #endif
-diff -r 563557a923d0 zbar/img_scanner.c
---- a/zbar/img_scanner.c	Tue Oct 27 11:25:59 2009 -0400
-+++ b/zbar/img_scanner.c	Fri Feb 22 08:54:29 2013 -0300
-@@ -1,5 +1,5 @@
- /*------------------------------------------------------------------------
-- *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-  *
-  *  This file is part of the ZBar Bar Code Reader.
-  *
-@@ -22,19 +22,20 @@
-  *------------------------------------------------------------------------*/
- 
- #include <config.h>
--#include <unistd.h>
-+#ifdef HAVE_UNISTD_H
-+# include <unistd.h>
-+#endif
- #ifdef HAVE_INTTYPES_H
- # include <inttypes.h>
- #endif
- #include <stdlib.h>     /* malloc, free */
--#include <time.h>       /* clock_gettime */
--#include <sys/time.h>   /* gettimeofday */
- #include <string.h>     /* memcmp, memset, memcpy */
- #include <assert.h>
- 
- #include <zbar.h>
- #include "error.h"
- #include "image.h"
-+#include "timer.h"
- #ifdef ENABLE_QRCODE
- # include "qrcode.h"
- #endif
-@@ -50,11 +51,6 @@
- 
- /* FIXME cache setting configurability */
- 
--/* number of times the same result must be detected
-- * in "nearby" images before being reported
-- */
--#define CACHE_CONSISTENCY    3 /* images */
--
- /* time interval for which two images are considered "nearby"
-  */
- #define CACHE_PROXIMITY   1000 /* ms */
-@@ -111,7 +107,9 @@
- 
-     /* configuration settings */
-     unsigned config;            /* config flags */
-+    unsigned ean_config;
-     int configs[NUM_SCN_CFGS];  /* int valued configurations */
-+    int sym_configs[1][NUM_SYMS]; /* per-symbology configurations */
- 
- #ifndef NO_STATS
-     int stat_syms_new;
-@@ -136,6 +134,8 @@
-             sym->next = NULL;
-         }
-         else {
-+            int i;
-+            recycle_bucket_t *bucket;
-             /* recycle unreferenced symbol */
-             if(!sym->data_alloc) {
-                 sym->data = NULL;
-@@ -149,7 +149,6 @@
-                 _zbar_symbol_set_free(sym->syms);
-                 sym->syms = NULL;
-             }
--            int i;
-             for(i = 0; i < RECYCLE_BUCKETS; i++)
-                 if(sym->data_alloc < 1 << (i * 2))
-                     break;
-@@ -160,7 +159,7 @@
-                 sym->data_alloc = 0;
-                 i = 0;
-             }
--            recycle_bucket_t *bucket = &iscn->recycle[i];
-+            bucket = &iscn->recycle[i];
-             /* FIXME cap bucket fill */
-             bucket->nsyms++;
-             sym->next = bucket->head;
-@@ -196,18 +195,14 @@
- 
-     syms = img->syms;
-     img->syms = NULL;
--    if(syms && recycle_syms(iscn, syms)) {
-+    if(syms && recycle_syms(iscn, syms))
-         STAT(img_syms_inuse);
--        syms = iscn->syms;
--    }
-     else if(syms) {
-         STAT(img_syms_recycle);
- 
-         /* select one set to resurrect, destroy the other */
--        if(iscn->syms) {
-+        if(iscn->syms)
-             _zbar_symbol_set_free(syms);
--            syms = iscn->syms;
--        }
-         else
-             iscn->syms = syms;
-     }
-@@ -219,12 +214,12 @@
-                                int datalen)
- {
-     /* recycle old or alloc new symbol */
-+    zbar_symbol_t *sym = NULL;
-     int i;
-     for(i = 0; i < RECYCLE_BUCKETS - 1; i++)
-         if(datalen <= 1 << (i * 2))
-             break;
- 
--    zbar_symbol_t *sym = NULL;
-     for(; i > 0; i--)
-         if((sym = iscn->recycle[i].head)) {
-             STAT(sym_recycle[i]);
-@@ -246,6 +241,7 @@
-     sym->type = type;
-     sym->quality = 1;
-     sym->npts = 0;
-+    sym->orient = ZBAR_ORIENT_UNKNOWN;
-     sym->cache_count = 0;
-     sym->time = iscn->time;
-     assert(!sym->syms);
-@@ -295,27 +291,33 @@
-                               zbar_symbol_t *sym)
- {
-     if(iscn->enable_cache) {
-+        uint32_t age, near_thresh, far_thresh, dup;
-         zbar_symbol_t *entry = cache_lookup(iscn, sym);
-         if(!entry) {
-             /* FIXME reuse sym */
-             entry = _zbar_image_scanner_alloc_sym(iscn, sym->type,
-                                                   sym->datalen + 1);
-+            entry->configs = sym->configs;
-+            entry->modifiers = sym->modifiers;
-             memcpy(entry->data, sym->data, sym->datalen);
-             entry->time = sym->time - CACHE_HYSTERESIS;
--            entry->cache_count = -CACHE_CONSISTENCY;
-+            entry->cache_count = 0;
-             /* add to cache */
-             entry->next = iscn->cache;
-             iscn->cache = entry;
-         }
- 
-         /* consistency check and hysteresis */
--        uint32_t age = sym->time - entry->time;
-+        age = sym->time - entry->time;
-         entry->time = sym->time;
--        int near_thresh = (age < CACHE_PROXIMITY);
--        int far_thresh = (age >= CACHE_HYSTERESIS);
--        int dup = (entry->cache_count >= 0);
--        if((!dup && !near_thresh) || far_thresh)
--            entry->cache_count = -CACHE_CONSISTENCY;
-+        near_thresh = (age < CACHE_PROXIMITY);
-+        far_thresh = (age >= CACHE_HYSTERESIS);
-+        dup = (entry->cache_count >= 0);
-+        if((!dup && !near_thresh) || far_thresh) {
-+            int type = sym->type;
-+            int h = _zbar_get_symbol_hash(type);
-+            entry->cache_count = -iscn->sym_configs[0][h];
-+        }
-         else if(dup || near_thresh)
-             entry->cache_count++;
- 
-@@ -328,9 +330,10 @@
- void _zbar_image_scanner_add_sym(zbar_image_scanner_t *iscn,
-                                  zbar_symbol_t *sym)
- {
-+    zbar_symbol_set_t *syms;
-     cache_sym(iscn, sym);
- 
--    zbar_symbol_set_t *syms = iscn->syms;
-+    syms = iscn->syms;
-     if(sym->cache_count || !syms->tail) {
-         sym->next = syms->head;
-         syms->head = sym;
-@@ -358,10 +361,12 @@
- 
- static inline void qr_handler (zbar_image_scanner_t *iscn)
- {
-+    unsigned u;
-+    int vert;
-     qr_finder_line *line = _zbar_decoder_get_qr_finder_line(iscn->dcode);
-     assert(line);
--    unsigned u = zbar_scanner_get_edge(iscn->scn, line->pos[0],
--                                       QR_FINDER_SUBPREC);
-+    u = zbar_scanner_get_edge(iscn->scn, line->pos[0],
-+                              QR_FINDER_SUBPREC);
-     line->boffs = u - zbar_scanner_get_edge(iscn->scn, line->boffs,
-                                             QR_FINDER_SUBPREC);
-     line->len = zbar_scanner_get_edge(iscn->scn, line->len,
-@@ -372,12 +377,12 @@
- 
-     u = QR_FIXED(iscn->umin, 0) + iscn->du * u;
-     if(iscn->du < 0) {
--        u -= line->len;
-         int tmp = line->boffs;
-         line->boffs = line->eoffs;
-         line->eoffs = tmp;
-+        u -= line->len;
-     }
--    int vert = !iscn->dx;
-+    vert = !iscn->dx;
-     line->pos[vert] = u;
-     line->pos[!vert] = QR_FIXED(iscn->v, 1);
- 
-@@ -389,10 +394,10 @@
- {
-     zbar_image_scanner_t *iscn = zbar_decoder_get_userdata(dcode);
-     zbar_symbol_type_t type = zbar_decoder_get_type(dcode);
--    /* FIXME assert(type == ZBAR_PARTIAL) */
--    /* FIXME debug flag to save/display all PARTIALs */
--    if(type <= ZBAR_PARTIAL)
--        return;
-+    int x = 0, y = 0, dir;
-+    const char *data;
-+    unsigned datalen;
-+    zbar_symbol_t *sym;
- 
- #ifdef ENABLE_QRCODE
-     if(type == ZBAR_QRCODE) {
-@@ -403,10 +408,6 @@
-     assert(type != ZBAR_QRCODE);
- #endif
- 
--    const char *data = zbar_decoder_get_data(dcode);
--    unsigned datalen = zbar_decoder_get_data_length(dcode);
--
--    int x = 0, y = 0;
-     if(TEST_CFG(iscn, ZBAR_CFG_POSITION)) {
-         /* tmp position fixup */
-         int w = zbar_scanner_get_width(iscn->scn);
-@@ -421,13 +422,23 @@
-         }
-     }
- 
-+    /* FIXME debug flag to save/display all PARTIALs */
-+    if(type <= ZBAR_PARTIAL) {
-+        zprintf(256, "partial symbol @(%d,%d)\n", x, y);
-+        return;
-+    }
-+
-+    data = zbar_decoder_get_data(dcode);
-+    datalen = zbar_decoder_get_data_length(dcode);
-+
-     /* FIXME need better symbol matching */
--    zbar_symbol_t *sym;
-     for(sym = iscn->syms->head; sym; sym = sym->next)
-         if(sym->type == type &&
-            sym->datalen == datalen &&
-            !memcmp(sym->data, data, datalen)) {
-             sym->quality++;
-+            zprintf(224, "dup symbol @(%d,%d): dup %s: %.20s\n",
-+                    x, y, zbar_get_symbol_name(type), data);
-             if(TEST_CFG(iscn, ZBAR_CFG_POSITION))
-                 /* add new point to existing set */
-                 /* FIXME should be polygon */
-@@ -436,12 +447,21 @@
-         }
- 
-     sym = _zbar_image_scanner_alloc_sym(iscn, type, datalen + 1);
-+    sym->configs = zbar_decoder_get_configs(dcode, type);
-+    sym->modifiers = zbar_decoder_get_modifiers(dcode);
-     /* FIXME grab decoder buffer */
-     memcpy(sym->data, data, datalen + 1);
- 
-     /* initialize first point */
--    if(TEST_CFG(iscn, ZBAR_CFG_POSITION))
-+    if(TEST_CFG(iscn, ZBAR_CFG_POSITION)) {
-+        zprintf(192, "new symbol @(%d,%d): %s: %.20s\n",
-+                x, y, zbar_get_symbol_name(type), data);
-         sym_add_point(sym, x, y);
-+    }
-+
-+    dir = zbar_decoder_get_direction(dcode);
-+    if(dir)
-+        sym->orient = (iscn->dy != 0) + ((iscn->du ^ dir) & 2);
- 
-     _zbar_image_scanner_add_sym(iscn, sym);
- }
-@@ -468,19 +488,26 @@
-     CFG(iscn, ZBAR_CFG_X_DENSITY) = 1;
-     CFG(iscn, ZBAR_CFG_Y_DENSITY) = 1;
-     zbar_image_scanner_set_config(iscn, 0, ZBAR_CFG_POSITION, 1);
-+    zbar_image_scanner_set_config(iscn, 0, ZBAR_CFG_UNCERTAINTY, 2);
-+    zbar_image_scanner_set_config(iscn, ZBAR_QRCODE, ZBAR_CFG_UNCERTAINTY, 0);
-+    zbar_image_scanner_set_config(iscn, ZBAR_CODE128, ZBAR_CFG_UNCERTAINTY, 0);
-+    zbar_image_scanner_set_config(iscn, ZBAR_CODE93, ZBAR_CFG_UNCERTAINTY, 0);
-+    zbar_image_scanner_set_config(iscn, ZBAR_CODE39, ZBAR_CFG_UNCERTAINTY, 0);
-+    zbar_image_scanner_set_config(iscn, ZBAR_CODABAR, ZBAR_CFG_UNCERTAINTY, 1);
-+    zbar_image_scanner_set_config(iscn, ZBAR_COMPOSITE, ZBAR_CFG_UNCERTAINTY, 0);
-     return(iscn);
- }
- 
- #ifndef NO_STATS
- static inline void dump_stats (const zbar_image_scanner_t *iscn)
- {
-+    int i;
-     zprintf(1, "symbol sets allocated   = %-4d\n", iscn->stat_syms_new);
-     zprintf(1, "    scanner syms in use = %-4d\trecycled  = %-4d\n",
-             iscn->stat_iscn_syms_inuse, iscn->stat_iscn_syms_recycle);
-     zprintf(1, "    image syms in use   = %-4d\trecycled  = %-4d\n",
-             iscn->stat_img_syms_inuse, iscn->stat_img_syms_recycle);
-     zprintf(1, "symbols allocated       = %-4d\n", iscn->stat_sym_new);
--    int i;
-     for(i = 0; i < RECYCLE_BUCKETS; i++)
-         zprintf(1, "     recycled[%d]        = %-4d\n",
-                 i, iscn->stat_sym_recycle[i]);
-@@ -489,6 +516,7 @@
- 
- void zbar_image_scanner_destroy (zbar_image_scanner_t *iscn)
- {
-+    int i;
-     dump_stats(iscn);
-     if(iscn->syms) {
-         if(iscn->syms->refcnt)
-@@ -503,7 +531,6 @@
-     if(iscn->dcode)
-         zbar_decoder_destroy(iscn->dcode);
-     iscn->dcode = NULL;
--    int i;
-     for(i = 0; i < RECYCLE_BUCKETS; i++) {
-         zbar_symbol_t *sym, *next;
-         for(sym = iscn->recycle[i].head; sym; sym = next) {
-@@ -536,14 +563,34 @@
-                                    zbar_config_t cfg,
-                                    int val)
- {
--    if(cfg < ZBAR_CFG_POSITION)
-+    if((sym == 0 || sym == ZBAR_COMPOSITE) && cfg == ZBAR_CFG_ENABLE) {
-+        iscn->ean_config = !!val;
-+        if(sym)
-+            return(0);
-+    }
-+
-+    if(cfg < ZBAR_CFG_UNCERTAINTY)
-         return(zbar_decoder_set_config(iscn->dcode, sym, cfg, val));
- 
-+    if(cfg < ZBAR_CFG_POSITION) {
-+        int c, i;
-+        if(cfg > ZBAR_CFG_UNCERTAINTY)
-+            return(1);
-+        c = cfg - ZBAR_CFG_UNCERTAINTY;
-+        if(sym > ZBAR_PARTIAL) {
-+            i = _zbar_get_symbol_hash(sym);
-+            iscn->sym_configs[c][i] = val;
-+        }
-+        else
-+            for(i = 0; i < NUM_SYMS; i++)
-+                iscn->sym_configs[c][i] = val;
-+        return(0);
-+    }
-+
-     if(sym > ZBAR_PARTIAL)
-         return(1);
- 
-     if(cfg >= ZBAR_CFG_X_DENSITY && cfg <= ZBAR_CFG_Y_DENSITY) {
--
-         CFG(iscn, cfg) = val;
-         return(0);
-     }
-@@ -591,30 +638,28 @@
- #define movedelta(dx, dy) do {                  \
-         x += (dx);                              \
-         y += (dy);                              \
--        p += (dx) + ((intptr_t)(dy) * w);       \
-+        p += (dx) + ((uintptr_t)(dy) * w);       \
-     } while(0);
- 
- int zbar_scan_image (zbar_image_scanner_t *iscn,
-                      zbar_image_t *img)
- {
-+    zbar_symbol_set_t *syms;
-+    const uint8_t *data;
-+    zbar_scanner_t *scn = iscn->scn;
-+    unsigned w, h, cx1, cy1;
-+    int density;
-+
-     /* timestamp image
-      * FIXME prefer video timestamp
-      */
--#if _POSIX_TIMERS > 0
--    struct timespec abstime;
--    clock_gettime(CLOCK_REALTIME, &abstime);
--    iscn->time = (abstime.tv_sec * 1000) + ((abstime.tv_nsec / 500000) + 1) / 2;
--#else
--    struct timeval abstime;
--    gettimeofday(&abstime, NULL);
--    iscn->time = (abstime.tv_sec * 1000) + ((abstime.tv_usec / 500) + 1) / 2;
--#endif
-+    iscn->time = _zbar_timer_now();
- 
- #ifdef ENABLE_QRCODE
-     _zbar_qr_reset(iscn->qr);
- #endif
- 
--    /* get grayscale image, convert if necessary */
-+    /* image must be in grayscale format */
-     if(img->format != fourcc('Y','8','0','0') &&
-        img->format != fourcc('G','R','E','Y'))
-         return(-1);
-@@ -622,7 +667,7 @@
- 
-     /* recycle previous scanner and image results */
-     zbar_image_scanner_recycle_image(iscn, img);
--    zbar_symbol_set_t *syms = iscn->syms;
-+    syms = iscn->syms;
-     if(!syms) {
-         syms = iscn->syms = _zbar_symbol_set_create();
-         STAT(syms_new);
-@@ -632,37 +677,43 @@
-         zbar_symbol_set_ref(syms, 2);
-     img->syms = syms;
- 
--    unsigned w = img->width;
--    unsigned h = img->height;
--    const uint8_t *data = img->data;
-+    w = img->width;
-+    h = img->height;
-+    cx1 = img->crop_x + img->crop_w;
-+    assert(cx1 <= w);
-+    cy1 = img->crop_y + img->crop_h;
-+    assert(cy1 <= h);
-+    data = img->data;
- 
-     zbar_image_write_png(img, "debug.png");
-     svg_open("debug.svg", 0, 0, w, h);
-     svg_image("debug.png", w, h);
- 
--    zbar_scanner_t *scn = iscn->scn;
-+    zbar_scanner_new_scan(scn);
- 
--    int density = CFG(iscn, ZBAR_CFG_Y_DENSITY);
-+    density = CFG(iscn, ZBAR_CFG_Y_DENSITY);
-     if(density > 0) {
--        svg_group_start("scanner", 0, 1, 1, 0, 0);
-         const uint8_t *p = data;
-         int x = 0, y = 0;
-+
-+        int border = (((img->crop_h - 1) % density) + 1) / 2;
-+        if(border > img->crop_h / 2)
-+            border = img->crop_h / 2;
-+        border += img->crop_y;
-+        assert(border <= h);
-+        svg_group_start("scanner", 0, 1, 1, 0, 0);
-         iscn->dy = 0;
- 
--        int border = (((h - 1) % density) + 1) / 2;
--        if(border > h / 2)
--            border = h / 2;
--        movedelta(0, border);
-+        movedelta(img->crop_x, border);
-         iscn->v = y;
- 
--        zbar_scanner_new_scan(scn);
--
--        while(y < h) {
-+        while(y < cy1) {
-+            int cx0 = img->crop_x;;
-             zprintf(128, "img_x+: %04d,%04d @%p\n", x, y, p);
-             svg_path_start("vedge", 1. / 32, 0, y + 0.5);
-             iscn->dx = iscn->du = 1;
--            iscn->umin = 0;
--            while(x < w) {
-+            iscn->umin = cx0;
-+            while(x < cx1) {
-                 uint8_t d = *p;
-                 movedelta(1, 0);
-                 zbar_scan_y(scn, d);
-@@ -673,14 +724,14 @@
- 
-             movedelta(-1, density);
-             iscn->v = y;
--            if(y >= h)
-+            if(y >= cy1)
-                 break;
- 
-             zprintf(128, "img_x-: %04d,%04d @%p\n", x, y, p);
-             svg_path_start("vedge", -1. / 32, w, y + 0.5);
-             iscn->dx = iscn->du = -1;
--            iscn->umin = w;
--            while(x >= 0) {
-+            iscn->umin = cx1;
-+            while(x >= cx0) {
-                 uint8_t d = *p;
-                 movedelta(-1, 0);
-                 zbar_scan_y(scn, d);
-@@ -698,22 +749,25 @@
- 
-     density = CFG(iscn, ZBAR_CFG_X_DENSITY);
-     if(density > 0) {
--        svg_group_start("scanner", 90, 1, -1, 0, 0);
-         const uint8_t *p = data;
-         int x = 0, y = 0;
- 
--        int border = (((w - 1) % density) + 1) / 2;
--        if(border > w / 2)
--            border = w / 2;
--        movedelta(border, 0);
-+        int border = (((img->crop_w - 1) % density) + 1) / 2;
-+        if(border > img->crop_w / 2)
-+            border = img->crop_w / 2;
-+        border += img->crop_x;
-+        assert(border <= w);
-+        svg_group_start("scanner", 90, 1, -1, 0, 0);
-+        movedelta(border, img->crop_y);
-         iscn->v = x;
- 
--        while(x < w) {
-+        while(x < cx1) {
-+            int cy0 = img->crop_y;
-             zprintf(128, "img_y+: %04d,%04d @%p\n", x, y, p);
-             svg_path_start("vedge", 1. / 32, 0, x + 0.5);
-             iscn->dy = iscn->du = 1;
--            iscn->umin = 0;
--            while(y < h) {
-+            iscn->umin = cy0;
-+            while(y < cy1) {
-                 uint8_t d = *p;
-                 movedelta(0, 1);
-                 zbar_scan_y(scn, d);
-@@ -724,14 +778,14 @@
- 
-             movedelta(density, -1);
-             iscn->v = x;
--            if(x >= w)
-+            if(x >= cx1)
-                 break;
- 
-             zprintf(128, "img_y-: %04d,%04d @%p\n", x, y, p);
-             svg_path_start("vedge", -1. / 32, h, x + 0.5);
-             iscn->dy = iscn->du = -1;
--            iscn->umin = h;
--            while(y >= 0) {
-+            iscn->umin = cy1;
-+            while(y >= cy0) {
-                 uint8_t d = *p;
-                 movedelta(0, -1);
-                 zbar_scan_y(scn, d);
-@@ -753,20 +807,82 @@
- #endif
- 
-     /* FIXME tmp hack to filter bad EAN results */
--    if(syms->nsyms && !iscn->enable_cache &&
--       (density == 1 || CFG(iscn, ZBAR_CFG_Y_DENSITY) == 1)) {
--        zbar_symbol_t **symp = &syms->head, *sym;
--        while((sym = *symp)) {
--            if(sym->type < ZBAR_I25 && sym->type > ZBAR_PARTIAL &&
--               sym->quality < 3) {
--                /* recycle */
--                *symp = sym->next;
--                syms->nsyms--;
--                sym->next = NULL;
--                _zbar_image_scanner_recycle_syms(iscn, sym);
-+    /* FIXME tmp hack to merge simple case EAN add-ons */
-+    char filter = (!iscn->enable_cache &&
-+                   (density == 1 || CFG(iscn, ZBAR_CFG_Y_DENSITY) == 1));
-+    int nean = 0, naddon = 0;
-+    if(syms->nsyms) {
-+        zbar_symbol_t **symp;
-+        for(symp = &syms->head; *symp; ) {
-+            zbar_symbol_t *sym = *symp;
-+            if(sym->cache_count <= 0 &&
-+               ((sym->type < ZBAR_COMPOSITE && sym->type > ZBAR_PARTIAL) ||
-+                sym->type == ZBAR_DATABAR ||
-+                sym->type == ZBAR_DATABAR_EXP ||
-+                sym->type == ZBAR_CODABAR))
-+            {
-+	        if((sym->type == ZBAR_CODABAR || filter) && sym->quality < 4) {
-+                    if(iscn->enable_cache) {
-+                        /* revert cache update */
-+                        zbar_symbol_t *entry = cache_lookup(iscn, sym);
-+                        if(entry)
-+                            entry->cache_count--;
-+                        else
-+                            assert(0);
-+                    }
-+
-+                    /* recycle */
-+                    *symp = sym->next;
-+                    syms->nsyms--;
-+                    sym->next = NULL;
-+                    _zbar_image_scanner_recycle_syms(iscn, sym);
-+                    continue;
-+                }
-+                else if(sym->type < ZBAR_COMPOSITE &&
-+                        sym->type != ZBAR_ISBN10)
-+                {
-+                    if(sym->type > ZBAR_EAN5)
-+                        nean++;
-+                    else
-+                        naddon++;
-+                }
-             }
--            else
--                symp = &sym->next;
-+            symp = &sym->next;
-+        }
-+
-+        if(nean == 1 && naddon == 1 && iscn->ean_config) {
-+            /* create container symbol for composite result */
-+            zbar_symbol_t *ean = NULL, *addon = NULL;
-+            for(symp = &syms->head; *symp; ) {
-+                zbar_symbol_t *sym = *symp;
-+                if(sym->type < ZBAR_COMPOSITE && sym->type > ZBAR_PARTIAL) {
-+                    /* move to composite */
-+                    *symp = sym->next;
-+                    syms->nsyms--;
-+                    sym->next = NULL;
-+                    if(sym->type <= ZBAR_EAN5)
-+                        addon = sym;
-+                    else
-+                        ean = sym;
-+                }
-+                else
-+                    symp = &sym->next;
-+            }
-+            assert(ean);
-+            assert(addon);
-+
-+            int datalen = ean->datalen + addon->datalen + 1;
-+            zbar_symbol_t *ean_sym =
-+                _zbar_image_scanner_alloc_sym(iscn, ZBAR_COMPOSITE, datalen);
-+            ean_sym->orient = ean->orient;
-+            ean_sym->syms = _zbar_symbol_set_create();
-+            memcpy(ean_sym->data, ean->data, ean->datalen);
-+            memcpy(ean_sym->data + ean->datalen,
-+                   addon->data, addon->datalen + 1);
-+            ean_sym->syms->head = ean;
-+            ean->next = addon;
-+            ean_sym->syms->nsyms = 2;
-+            _zbar_image_scanner_add_sym(iscn, ean_sym);
-         }
-     }
- 
-diff -r 563557a923d0 zbar/jpeg.c
---- a/zbar/jpeg.c	Tue Oct 27 11:25:59 2009 -0400
-+++ b/zbar/jpeg.c	Fri Feb 22 08:54:29 2013 -0300
-@@ -79,8 +79,15 @@
- void skip_input_data (j_decompress_ptr cinfo,
-                       long num_bytes)
- {
--    cinfo->src->next_input_byte = NULL;
--    cinfo->src->bytes_in_buffer = 0;
-+    if(num_bytes > 0) {
-+        if (num_bytes < cinfo->src->bytes_in_buffer) {
-+            cinfo->src->next_input_byte += num_bytes;
-+            cinfo->src->bytes_in_buffer -= num_bytes;
-+        }
-+        else {
-+            fill_input_buffer(cinfo);
-+        }
-+    }
- }
- 
- void term_source (j_decompress_ptr cinfo)
-@@ -195,10 +202,16 @@
-     jpeg_start_decompress(cinfo);
- 
-     /* adjust dst image parameters to match(?) decompressor */
--    if(dst->width < cinfo->output_width)
-+    if(dst->width < cinfo->output_width) {
-         dst->width = cinfo->output_width;
--    if(dst->height < cinfo->output_height)
-+        if(dst->crop_x + dst->crop_w > dst->width)
-+            dst->crop_w = dst->width - dst->crop_x;
-+    }
-+    if(dst->height < cinfo->output_height) {
-         dst->height = cinfo->output_height;
-+        if(dst->crop_y + dst->crop_h > dst->height)
-+            dst->crop_h = dst->height - dst->crop_y;
-+    }
-     unsigned long datalen = (cinfo->output_width *
-                              cinfo->output_height *
-                              cinfo->out_color_components);
-diff -r 563557a923d0 zbar/processor.c
---- a/zbar/processor.c	Tue Oct 27 11:25:59 2009 -0400
-+++ b/zbar/processor.c	Fri Feb 22 08:54:29 2013 -0300
-@@ -1,5 +1,5 @@
- /*------------------------------------------------------------------------
-- *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-  *
-  *  This file is part of the ZBar Bar Code Reader.
-  *
-@@ -95,11 +95,11 @@
-             while(sym) {
-                 zbar_symbol_type_t type = zbar_symbol_get_type(sym);
-                 int count = zbar_symbol_get_count(sym);
--                zprintf(8, "%s%s: %s (%d pts) (q=%d) (%s)\n",
-+                zprintf(8, "%s: %s (%d pts) (dir=%d) (q=%d) (%s)\n",
-                         zbar_get_symbol_name(type),
--                        zbar_get_addon_name(type),
-                         zbar_symbol_get_data(sym),
-                         zbar_symbol_get_loc_size(sym),
-+                        zbar_symbol_get_orientation(sym),
-                         zbar_symbol_get_quality(sym),
-                         (count < 0) ? "uncertain" :
-                         (count > 0) ? "duplicate" : "new");
-@@ -288,6 +288,10 @@
- {
-     zbar_processor_init(proc, NULL, 0);
- 
-+    if(proc->syms) {
-+        zbar_symbol_set_ref(proc->syms, -1);
-+        proc->syms = NULL;
-+    }
-     if(proc->scanner) {
-         zbar_image_scanner_destroy(proc->scanner);
-         proc->scanner = NULL;
-diff -r 563557a923d0 zbar/qrcode/qrdec.c
---- a/zbar/qrcode/qrdec.c	Tue Oct 27 11:25:59 2009 -0400
-+++ b/zbar/qrcode/qrdec.c	Fri Feb 22 08:54:29 2013 -0300
-@@ -3,6 +3,7 @@
-    GNU Lesser General Public License as published by the Free Software
-    Foundation; either version 2.1 of the License, or (at your option) any later
-    version.*/
-+#include <config.h>
- #include <stdlib.h>
- #include <limits.h>
- #include <string.h>
-@@ -629,40 +630,46 @@
-   int x0;
-   int y0;
-   int res;
-+  int ires;
- };
- 
- 
- static void qr_aff_init(qr_aff *_aff,
-  const qr_point _p0,const qr_point _p1,const qr_point _p2,int _res){
-   int det;
-+  int ires;
-   int dx1;
-   int dy1;
-   int dx2;
-   int dy2;
-   /*det is ensured to be positive by our caller.*/
--  det=qr_point_ccw(_p0,_p1,_p2);
-   dx1=_p1[0]-_p0[0];
-   dx2=_p2[0]-_p0[0];
-   dy1=_p1[1]-_p0[1];
-   dy2=_p2[1]-_p0[1];
-+  det=dx1*dy2-dy1*dx2;
-+  ires=QR_MAXI((qr_ilog(abs(det))>>1)-2,0);
-   _aff->fwd[0][0]=dx1;
-   _aff->fwd[0][1]=dx2;
-   _aff->fwd[1][0]=dy1;
-   _aff->fwd[1][1]=dy2;
--  _aff->inv[0][0]=QR_DIVROUND(dy2<<_res,det);
--  _aff->inv[0][1]=QR_DIVROUND(-dx2<<_res,det);
--  _aff->inv[1][0]=QR_DIVROUND(-dy1<<_res,det);
--  _aff->inv[1][1]=QR_DIVROUND(dx1<<_res,det);
-+  _aff->inv[0][0]=QR_DIVROUND(dy2<<_res,det>>ires);
-+  _aff->inv[0][1]=QR_DIVROUND(-dx2<<_res,det>>ires);
-+  _aff->inv[1][0]=QR_DIVROUND(-dy1<<_res,det>>ires);
-+  _aff->inv[1][1]=QR_DIVROUND(dx1<<_res,det>>ires);
-   _aff->x0=_p0[0];
-   _aff->y0=_p0[1];
-   _aff->res=_res;
-+  _aff->ires=ires;
- }
- 
- /*Map from the image (at subpel resolution) into the square domain.*/
- static void qr_aff_unproject(qr_point _q,const qr_aff *_aff,
-  int _x,int _y){
--  _q[0]=_aff->inv[0][0]*(_x-_aff->x0)+_aff->inv[0][1]*(_y-_aff->y0);
--  _q[1]=_aff->inv[1][0]*(_x-_aff->x0)+_aff->inv[1][1]*(_y-_aff->y0);
-+  _q[0]=_aff->inv[0][0]*(_x-_aff->x0)+_aff->inv[0][1]*(_y-_aff->y0)
-+   +(1<<_aff->ires>>1)>>_aff->ires;
-+  _q[1]=_aff->inv[1][0]*(_x-_aff->x0)+_aff->inv[1][1]*(_y-_aff->y0)
-+   +(1<<_aff->ires>>1)>>_aff->ires;
- }
- 
- /*Map from the square domain into the image (at subpel resolution).*/
-@@ -1893,10 +1900,10 @@
-   if(nc[0]){
-     dx=QR_DIVROUND(c[0][0],nc[0]);
-     dy=QR_DIVROUND(c[0][1],nc[0]);
--    /*But only if it doesn't make things worse.*/
-+    /*But only if it doesn't make things too much worse.*/
-     match=qr_alignment_pattern_fetch(p,bestx+dx,besty+dy,_img,_width,_height);
-     dist=qr_hamming_dist(match,0x1F8D63F,best_dist+1);
--    if(dist<=best_dist){
-+    if(dist<=best_dist+1){
-       bestx+=dx;
-       besty+=dy;
-     }
-@@ -2096,7 +2103,7 @@
-             rlastfit=nr;
-           }
-         }
--        else nrempty=0;
-+        nrempty=0;
-       }
-       else nrempty++;
-       ru+=dru;
-@@ -2217,11 +2224,11 @@
-      _p[2][0],_p[2][1],_p[3][0],_p[3][1]);
-     if(qr_alignment_pattern_search(p3,&cell,dim-7,dim-7,4,
-      _img,_width,_height)>=0){
--      int c21;
--      int dx21;
--      int dy21;
--      int mask;
--      int w;
-+      long long w;
-+      long long mask;
-+      int       c21;
-+      int       dx21;
-+      int       dy21;
-       /*There's no real need to update the bounding box corner, and in fact we
-          actively perform worse if we do.
-         Clearly it was good enough for us to find this alignment pattern, so
-@@ -2237,10 +2244,13 @@
-       c21=_p[2][0]*_p[1][1]-_p[2][1]*_p[1][0];
-       dx21=_p[2][0]-_p[1][0];
-       dy21=_p[2][1]-_p[1][1];
--      w=(dim-7)*c21
--       +(dim-13)*(_p[0][0]*dy21-_p[0][1]*dx21)+6*(p3[0]*dy21-p3[1]*dx21);
-+      w=QR_EXTMUL(dim-7,c21,
-+       QR_EXTMUL(dim-13,_p[0][0]*dy21-_p[0][1]*dx21,
-+       QR_EXTMUL(6,p3[0]*dy21-p3[1]*dx21,0)));
-+      /*The projection failed: invalid geometry.*/
-+      if(w==0)return -1;
-       mask=QR_SIGNMASK(w);
--      w=abs(w);
-+      w=w+mask^mask;
-       brx=(int)QR_DIVROUND(QR_EXTMUL((dim-7)*_p[0][0],p3[0]*dy21,
-        QR_EXTMUL((dim-13)*p3[0],c21-_p[0][1]*dx21,
-        QR_EXTMUL(6*_p[0][0],c21-p3[1]*dx21,0)))+mask^mask,w);
-@@ -2356,11 +2366,10 @@
-     w0+=dwi;
-   }
-   ret=bch18_6_correct(&v);
--  /*TODO: I'd certainly hope the order the version bits is accessed in is
--     well-defined, but I seem to have images for two different codes with the
--     same version using two different orders?
--    Maybe the other one is a model 1 code?
--    Even if I parse the version here, I can't decode the rest of the code.
-+  /*TODO: I seem to have an image with the version bits in a different order
-+     (the transpose of the standard order).
-+    Even if I change the order here so I can parse the version on this image,
-+     I can't decode the rest of the code.
-     If this is really needed, we should just re-order the bits.*/
- #if 0
-   if(ret<0){
-@@ -2478,16 +2487,9 @@
-     y+=dy;
-     w+=dw;
-   }
--  /*For the 8th bit we have 3 samples... use the majority value.
--    TODO: The DL bit appears to be wrong as much as right? Guess it's not
--     really a third copy after all, but doesn't appear to be used for data.
--  i=((lo[0]>>7&1)+(lo[1]>>7&1)+(hi[1]>>7&1)>>1)<<7;
--  lo[0]=lo[0]&~0x80|i;
--  lo[1]=lo[1]&~0x80|i;
--  hi[1]&=~0x80;*/
--  /*For the remaining bits we have two samples... try them in all
--     combinations and pick the most popular valid code, breaking ties using
--     the number of bit errors.*/
-+  /*For each group of bits we have two samples... try them in all combinations
-+     and pick the most popular valid code, breaking ties using the number of
-+     bit errors.*/
-   imax=2<<(hi[0]!=hi[1]);
-   di=1+(lo[0]==lo[1]);
-   nfmt_info=0;
-@@ -2577,8 +2579,8 @@
-                                  qr_point *p,
-                                  int n)
- {
-+    int i;
-     svg_path_start(cls, 1, 0, 0);
--    int i;
-     for(i = 0; i < n; i++, p++)
-         svg_path_moveto(SVG_ABS, p[0][0], p[0][1]);
-     svg_path_end();
-@@ -3184,6 +3186,7 @@
- static int qr_code_data_parse(qr_code_data *_qrdata,int _version,
-  const unsigned char *_data,int _ndata){
-   qr_pack_buf qpb;
-+  unsigned    self_parity;
-   int         centries;
-   int         len_bits_idx;
-   /*Entries are stored directly in the struct during parsing.
-@@ -3191,6 +3194,7 @@
-   _qrdata->entries=NULL;
-   _qrdata->nentries=0;
-   _qrdata->sa_size=0;
-+  self_parity=0;
-   centries=0;
-   /*The versions are divided into 3 ranges that each use a different number of
-      bits for length fields.*/
-@@ -3209,9 +3213,10 @@
-        centries*sizeof(*_qrdata->entries));
-     }
-     entry=_qrdata->entries+_qrdata->nentries++;
--    /*Set the mode to an invalid value until we allocate a buffer for it.
--      This ensures we don't try to free it on clean-up until then.*/
--    entry->mode=-1;
-+    entry->mode=mode;
-+    /*Set the buffer to NULL, because if parsing fails, we might try to free it
-+       on clean-up.*/
-+    entry->payload.data.buf=NULL;
-     switch(mode){
-       /*The number of bits used to encode the character count for each version
-          range and each data mode.*/
-@@ -3223,6 +3228,7 @@
-       case QR_MODE_NUM:{
-         unsigned char *buf;
-         unsigned       bits;
-+        unsigned       c;
-         int            len;
-         int            count;
-         int            rem;
-@@ -3233,35 +3239,47 @@
-         count=len/3;
-         rem=len%3;
-         if(qr_pack_buf_avail(&qpb)<10*count+7*(rem>>1&1)+4*(rem&1))return -1;
--        entry->mode=mode;
-         entry->payload.data.buf=buf=(unsigned char *)malloc(len*sizeof(*buf));
-         entry->payload.data.len=len;
-         /*Read groups of 3 digits encoded in 10 bits.*/
-         while(count-->0){
-           bits=qr_pack_buf_read(&qpb,10);
-           if(bits>=1000)return -1;
--          *buf++=(unsigned char)('0'+bits/100);
-+          c='0'+bits/100;
-+          self_parity^=c;
-+          *buf++=(unsigned char)c;
-           bits%=100;
--          *buf++=(unsigned char)('0'+bits/10);
--          *buf++=(unsigned char)('0'+bits%10);
-+          c='0'+bits/10;
-+          self_parity^=c;
-+          *buf++=(unsigned char)c;
-+          c='0'+bits%10;
-+          self_parity^=c;
-+          *buf++=(unsigned char)c;
-         }
-         /*Read the last two digits encoded in 7 bits.*/
-         if(rem>1){
-           bits=qr_pack_buf_read(&qpb,7);
-           if(bits>=100)return -1;
--          *buf++=(unsigned char)('0'+bits/10);
--          *buf++=(unsigned char)('0'+bits%10);
-+          c='0'+bits/10;
-+          self_parity^=c;
-+          *buf++=(unsigned char)c;
-+          c='0'+bits%10;
-+          self_parity^=c;
-+          *buf++=(unsigned char)c;
-         }
-         /*Or the last one digit encoded in 4 bits.*/
-         else if(rem){
-           bits=qr_pack_buf_read(&qpb,4);
-           if(bits>=10)return -1;
--          *buf++=(unsigned char)('0'+bits);
-+          c='0'+bits;
-+          self_parity^=c;
-+          *buf++=(unsigned char)c;
-         }
-       }break;
-       case QR_MODE_ALNUM:{
-         unsigned char *buf;
-         unsigned       bits;
-+        unsigned       c;
-         int            len;
-         int            count;
-         int            rem;
-@@ -3272,56 +3290,67 @@
-         count=len>>1;
-         rem=len&1;
-         if(qr_pack_buf_avail(&qpb)<11*count+6*rem)return -1;
--        entry->mode=mode;
-         entry->payload.data.buf=buf=(unsigned char *)malloc(len*sizeof(*buf));
-         entry->payload.data.len=len;
-         /*Read groups of two characters encoded in 11 bits.*/
-         while(count-->0){
-           bits=qr_pack_buf_read(&qpb,11);
-           if(bits>=2025)return -1;
--          *buf++=QR_ALNUM_TABLE[bits/45];
--          *buf++=QR_ALNUM_TABLE[bits%45];
-+          c=QR_ALNUM_TABLE[bits/45];
-+          self_parity^=c;
-+          *buf++=(unsigned char)c;
-+          c=QR_ALNUM_TABLE[bits%45];
-+          self_parity^=c;
-+          *buf++=(unsigned char)c;
-           len-=2;
-         }
-         /*Read the last character encoded in 6 bits.*/
-         if(rem){
-           bits=qr_pack_buf_read(&qpb,6);
-           if(bits>=45)return -1;
--          *buf++=QR_ALNUM_TABLE[bits];
-+          c=QR_ALNUM_TABLE[bits];
-+          self_parity^=c;
-+          *buf++=(unsigned char)c;
-         }
-       }break;
-       /*Structured-append header.*/
-       case QR_MODE_STRUCT:{
-         int bits;
--        entry->mode=mode;
-         bits=qr_pack_buf_read(&qpb,16);
-         if(bits<0)return -1;
--        /*We also save a copy of the data in _qrdata for easy reference when
-+        /*We save a copy of the data in _qrdata for easy reference when
-            grouping structured-append codes.
--          If for some reason the code has multiple S-A headers, last one wins
--           (TODO: should we return an error instead?).*/
--        _qrdata->sa_index=entry->payload.sa.sa_index=
--         (unsigned char)(bits>>12&0xF);
--        _qrdata->sa_size=entry->payload.sa.sa_size=
--         (unsigned char)((bits>>8&0xF)+1);
--        _qrdata->sa_parity=entry->payload.sa.sa_parity=
--         (unsigned char)(bits&0xFF);
-+          If for some reason the code has multiple S-A headers, first one wins,
-+           since it is supposed to come before everything else (TODO: should we
-+           return an error instead?).*/
-+        if(_qrdata->sa_size==0){
-+          _qrdata->sa_index=entry->payload.sa.sa_index=
-+           (unsigned char)(bits>>12&0xF);
-+          _qrdata->sa_size=entry->payload.sa.sa_size=
-+           (unsigned char)((bits>>8&0xF)+1);
-+          _qrdata->sa_parity=entry->payload.sa.sa_parity=
-+           (unsigned char)(bits&0xFF);
-+        }
-       }break;
-       case QR_MODE_BYTE:{
-         unsigned char *buf;
-+        unsigned       c;
-         int            len;
-         len=qr_pack_buf_read(&qpb,LEN_BITS[len_bits_idx][2]);
-         if(len<0)return -1;
-         /*Check to see if there are enough bits left now, so we don't have to
-            in the decode loop.*/
-         if(qr_pack_buf_avail(&qpb)<len<<3)return -1;
--        entry->mode=mode;
-         entry->payload.data.buf=buf=(unsigned char *)malloc(len*sizeof(*buf));
-         entry->payload.data.len=len;
--        while(len-->0)*buf++=(unsigned char)qr_pack_buf_read(&qpb,8);
-+        while(len-->0){
-+          c=qr_pack_buf_read(&qpb,8);
-+          self_parity^=c;
-+          *buf++=(unsigned char)c;
-+        }
-       }break;
-       /*FNC1 first position marker.*/
--      case QR_MODE_FNC1_1ST:entry->mode=mode;break;
-+      case QR_MODE_FNC1_1ST:break;
-       /*Extended Channel Interpretation data.*/
-       case QR_MODE_ECI:{
-         unsigned val;
-@@ -3349,7 +3378,6 @@
-         }
-         /*Invalid lead byte.*/
-         else return -1;
--        entry->mode=mode;
-         entry->payload.eci=val;
-       }break;
-       case QR_MODE_KANJI:{
-@@ -3361,7 +3389,6 @@
-         /*Check to see if there are enough bits left now, so we don't have to
-            in the decode loop.*/
-         if(qr_pack_buf_avail(&qpb)<13*len)return -1;
--        entry->mode=mode;
-         entry->payload.data.buf=buf=(unsigned char *)malloc(2*len*sizeof(*buf));
-         entry->payload.data.len=2*len;
-         /*Decode 2-byte SJIS characters encoded in 13 bits.*/
-@@ -3369,14 +3396,28 @@
-           bits=qr_pack_buf_read(&qpb,13);
-           bits=(bits/0xC0<<8|bits%0xC0)+0x8140;
-           if(bits>=0xA000)bits+=0x4000;
--          /*Are values 0xXX7F, 0xXXFD...0xXXFF always invalid?
-+          /*TODO: Are values 0xXX7F, 0xXXFD...0xXXFF always invalid?
-             Should we reject them here?*/
-+          self_parity^=bits;
-           *buf++=(unsigned char)(bits>>8);
-           *buf++=(unsigned char)(bits&0xFF);
-         }
-       }break;
-       /*FNC1 second position marker.*/
--      case QR_MODE_FNC1_2ND:entry->mode=mode;break;
-+      case QR_MODE_FNC1_2ND:{
-+        int bits;
-+        /*FNC1 in the 2nd position encodes an Application Indicator in one
-+           byte, which is either a letter (A...Z or a...z) or a 2-digit number.
-+          The letters are encoded with their ASCII value plus 100, the numbers
-+           are encoded directly with their numeric value.
-+          Values 100...164, 191...196, and 223...255 are invalid, so we reject
-+           them here.*/
-+        bits=qr_pack_buf_read(&qpb,8);
-+        if(!(bits>=0&&bits<100||bits>=165&&bits<191||bits>=197&&bits<223)){
-+          return -1;
-+        }
-+        entry->payload.ai=bits;
-+      }break;
-       /*Unknown mode number:*/
-       default:{
-         /*Unfortunately, because we have to understand the format of a mode to
-@@ -3386,9 +3427,11 @@
-       }break;
-     }
-   }
--  /*TODO: If there was a S-A header, we should compute the parity of this
--     code; how are non-data modes handled (ECI, FNC1)?*/
--  _qrdata->self_parity=0;
-+  /*Store the parity of the data from this code, for S-A.
-+    The final parity is the 8-bit XOR of all the decoded bytes of literal data.
-+    We don't combine the 2-byte kanji codes into one byte in the loops above,
-+     because we can just do it here instead.*/
-+  _qrdata->self_parity=((self_parity>>8)^self_parity)&0xFF;
-   /*Success.*/
-   _qrdata->entries=(qr_code_data_entry *)realloc(_qrdata->entries,
-    _qrdata->nentries*sizeof(*_qrdata->entries));
-@@ -3565,7 +3608,17 @@
-     int block_szi;
-     int ndatai;
-     block_szi=block_sz+(i>=nshort_blocks);
--    if(rs_correct(_gf,QR_M0,block_data+ncodewords,block_szi,npar,NULL,0)<0){
-+    ret=rs_correct(_gf,QR_M0,block_data+ncodewords,block_szi,npar,NULL,0);
-+    /*For version 1 symbols and version 2-L and 3-L symbols, we aren't allowed
-+       to use all the parity bytes for correction.
-+      They are instead used to improve detection.
-+      Version 1-L reserves 3 parity bytes for detection.
-+      Versions 1-M and 2-L reserve 2 parity bytes for detection.
-+      Versions 1-Q, 1-H, and 3-L reserve 1 parity byte for detection.
-+      We can ignore the version 3-L restriction because it has an odd number of
-+       parity bytes, and we don't support erasure detection.*/
-+    if(ret<0||_version==1&&ret>ecc_level+1<<1||
-+     _version==2&&ecc_level==0&&ret>4){
-       ret=-1;
-       break;
-     }
-@@ -3627,6 +3680,7 @@
-     qr_finder ul;
-     qr_finder ur;
-     qr_finder dl;
-+    qr_point  bbox[4];
-     int       res;
-     int       ur_version;
-     int       dl_version;
-@@ -3663,10 +3717,11 @@
- #endif
-     /*If we made it this far, upgrade the affine homography to a full
-        homography.*/
--    if(qr_hom_fit(&hom,&ul,&ur,&dl,_qrdata->bbox,&aff,
-+    if(qr_hom_fit(&hom,&ul,&ur,&dl,bbox,&aff,
-      &_reader->isaac,_img,_width,_height)<0){
-       continue;
-     }
-+    memcpy(_qrdata->bbox,bbox,sizeof(bbox));
-     qr_hom_unproject(ul.o,&hom,ul.c->pos[0],ul.c->pos[1]);
-     qr_hom_unproject(ur.o,&hom,ur.c->pos[0],ur.c->pos[1]);
-     qr_hom_unproject(dl.o,&hom,dl.c->pos[0],dl.c->pos[1]);
-@@ -3789,14 +3844,37 @@
-       continue;
-     }
-     fmt_info=qr_finder_fmt_info_decode(&ul,&ur,&dl,&hom,_img,_width,_height);
--    if(fmt_info<0)continue;
--    if(qr_code_decode(_qrdata,&_reader->gf,ul.c->pos,ur.c->pos,dl.c->pos,
-+    if(fmt_info<0||
-+     qr_code_decode(_qrdata,&_reader->gf,ul.c->pos,ur.c->pos,dl.c->pos,
-      ur_version,fmt_info,_img,_width,_height)<0){
--      /*TODO: Maybe somebody flipped the code?
--        We'd still get a valid version, and probably valid (but incorrect)
--         format info.
--        After we've come this far, it should be a simple matter to check.*/
--      continue;
-+      /*The code may be flipped.
-+        Try again, swapping the UR and DL centers.
-+        We should get a valid version either way, so it's relatively cheap to
-+         check this, as we've already filtered out a lot of invalid
-+         configurations.*/
-+      QR_SWAP2I(hom.inv[0][0],hom.inv[1][0]);
-+      QR_SWAP2I(hom.inv[0][1],hom.inv[1][1]);
-+      QR_SWAP2I(hom.fwd[0][0],hom.fwd[0][1]);
-+      QR_SWAP2I(hom.fwd[1][0],hom.fwd[1][1]);
-+      QR_SWAP2I(hom.fwd[2][0],hom.fwd[2][1]);
-+      QR_SWAP2I(ul.o[0],ul.o[1]);
-+      QR_SWAP2I(ul.size[0],ul.size[1]);
-+      QR_SWAP2I(ur.o[0],ur.o[1]);
-+      QR_SWAP2I(ur.size[0],ur.size[1]);
-+      QR_SWAP2I(dl.o[0],dl.o[1]);
-+      QR_SWAP2I(dl.size[0],dl.size[1]);
-+#if defined(QR_DEBUG)
-+      qr_finder_dump_hom_undistorted(&ul,&dl,&ur,&hom,_img,_width,_height);
-+#endif
-+      fmt_info=qr_finder_fmt_info_decode(&ul,&dl,&ur,&hom,_img,_width,_height);
-+      if(fmt_info<0)continue;
-+      QR_SWAP2I(bbox[1][0],bbox[2][0]);
-+      QR_SWAP2I(bbox[1][1],bbox[2][1]);
-+      memcpy(_qrdata->bbox,bbox,sizeof(bbox));
-+      if(qr_code_decode(_qrdata,&_reader->gf,ul.c->pos,dl.c->pos,ur.c->pos,
-+       ur_version,fmt_info,_img,_width,_height)<0){
-+        continue;
-+      }
-     }
-     return ur_version;
-   }
-@@ -3809,10 +3887,14 @@
-   /*The number of centers should be small, so an O(n^3) exhaustive search of
-      which ones go together should be reasonable.*/
-   unsigned char *mark;
-+  int            nfailures_max;
-+  int            nfailures;
-   int            i;
-   int            j;
-   int            k;
-   mark=(unsigned char *)calloc(_ncenters,sizeof(*mark));
-+  nfailures_max=QR_MAXI(8192,_width*_height>>9);
-+  nfailures=0;
-   for(i=0;i<_ncenters;i++){
-     /*TODO: We might be able to accelerate this step significantly by
-        considering the remaining finder centers in a more intelligent order,
-@@ -3865,6 +3947,13 @@
-           }
-           /*Mark _all_ such centers used: codes cannot partially overlap.*/
-           for(l=0;l<_ncenters;l++)if(mark[l]==2)mark[l]=1;
-+          nfailures=0;
-+        }
-+        else if(++nfailures>nfailures_max){
-+          /*Give up.
-+            We're unlikely to find a valid code in all this clutter, and we
-+             could spent quite a lot of time trying.*/
-+          i=j=k=_ncenters;
-         }
-       }
-     }
-@@ -3913,7 +4002,7 @@
-                      zbar_image_scanner_t *iscn,
-                      zbar_image_t *img)
- {
--    int nqrdata = 0;
-+    int nqrdata = 0, ncenters;
-     qr_finder_edge_pt *edge_pts = NULL;
-     qr_finder_center *centers = NULL;
- 
-@@ -3923,7 +4012,7 @@
- 
-     svg_group_start("finder", 0, 1. / (1 << QR_FINDER_SUBPREC), 0, 0, 0);
- 
--    int ncenters = qr_finder_centers_locate(&centers, &edge_pts, reader, 0, 0);
-+    ncenters = qr_finder_centers_locate(&centers, &edge_pts, reader, 0, 0);
- 
-     zprintf(14, "%dx%d finders, %d centers:\n",
-             reader->finder_lines[0].nlines,
-diff -r 563557a923d0 zbar/qrcode/qrdec.h
---- a/zbar/qrcode/qrdec.h	Tue Oct 27 11:25:59 2009 -0400
-+++ b/zbar/qrcode/qrdec.h	Fri Feb 22 08:54:29 2013 -0300
-@@ -85,7 +85,9 @@
-   QR_ECI_ISO8859_16,
-   /*ECI 000019 is reserved?*/
-   /*Shift-JIS.*/
--  QR_ECI_SJIS=20
-+  QR_ECI_SJIS=20,
-+  /*UTF-8.*/
-+  QR_ECI_UTF8=26
- }qr_eci_encoding;
- 
- 
-@@ -101,6 +103,8 @@
-     }data;
-     /*Decoded "Extended Channel Interpretation" data.*/
-     unsigned eci;
-+    /*Decoded "Application Indicator" for FNC1 in 2nd position.*/
-+    int      ai;
-     /*Structured-append header data.*/
-     struct{
-       unsigned char sa_index;
-diff -r 563557a923d0 zbar/qrcode/qrdectxt.c
---- a/zbar/qrcode/qrdectxt.c	Tue Oct 27 11:25:59 2009 -0400
-+++ b/zbar/qrcode/qrdectxt.c	Fri Feb 22 08:54:29 2013 -0300
-@@ -1,8 +1,9 @@
--/*Copyright (C) 2008-2009  Timothy B. Terriberry (tterribe@xiph.org)
-+/*Copyright (C) 2008-2010  Timothy B. Terriberry (tterribe@xiph.org)
-   You can redistribute this library and/or modify it under the terms of the
-    GNU Lesser General Public License as published by the Free Software
-    Foundation; either version 2.1 of the License, or (at your option) any later
-    version.*/
-+#include <config.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -11,6 +12,7 @@
- #include "qrdec.h"
- #include "util.h"
- #include "image.h"
-+#include "decoder.h"
- #include "error.h"
- #include "img_scanner.h"
- 
-@@ -50,12 +52,10 @@
-   const qr_code_data  *qrdata;
-   int                  nqrdata;
-   unsigned char       *mark;
--  char               **text;
-   int                  ntext;
-   int                  i;
-   qrdata=_qrlist->qrdata;
-   nqrdata=_qrlist->nqrdata;
--  text=(char **)malloc(nqrdata*sizeof(*text));
-   mark=(unsigned char *)calloc(nqrdata,sizeof(*mark));
-   ntext=0;
-   /*This is the encoding the standard says is the default.*/
-@@ -75,10 +75,16 @@
-     size_t                    sa_ntext;
-     size_t                    sa_ctext;
-     int                       fnc1;
-+    int                       fnc1_2ai;
-+    int                       has_kanji;
-     int                       eci;
-     int                       err;
-     int                       j;
-     int                       k;
-+    zbar_symbol_t *syms = NULL, **sym = &syms;
-+    qr_point dir;
-+    int horiz;
-+
-     /*Step 0: Collect the other QR codes belonging to this S-A group.*/
-     if(qrdata[i].sa_size){
-       unsigned sa_parity;
-@@ -103,6 +109,8 @@
- 
-     sa_ctext=0;
-     fnc1=0;
-+    fnc1_2ai=0;
-+    has_kanji=0;
-     /*Step 1: Detect FNC1 markers and estimate the required buffer size.*/
-     for(j=0;j<sa_size;j++)if(sa[j]>=0){
-       qrdataj=qrdata+sa[j];
-@@ -112,13 +120,20 @@
-         shift=0;
-         switch(entry->mode){
-           /*FNC1 applies to the entire code and ignores subsequent markers.*/
--          case QR_MODE_FNC1_1ST:
--          case QR_MODE_FNC1_2ND:fnc1=1;break;
--          /*2 SJIS bytes will be at most 4 UTF-8 bytes.*/
--          case QR_MODE_KANJI:shift++;
-+          case QR_MODE_FNC1_1ST:{
-+            if(!fnc1)fnc1=MOD(ZBAR_MOD_GS1);
-+          }break;
-+          case QR_MODE_FNC1_2ND:{
-+            if(!fnc1){
-+              fnc1=MOD(ZBAR_MOD_AIM);
-+              fnc1_2ai=entry->payload.ai;
-+              sa_ctext+=2;
-+            }
-+          }break;
-           /*We assume at most 4 UTF-8 bytes per input byte.
-             I believe this is true for all the encodings we actually use.*/
--          case QR_MODE_BYTE:shift++;
-+          case QR_MODE_KANJI:has_kanji=1;
-+          case QR_MODE_BYTE:shift=2;
-           default:{
-             /*The remaining two modes are already valid UTF-8.*/
-             if(QR_MODE_HAS_DATA(entry->mode)){
-@@ -132,13 +147,24 @@
-     /*Step 2: Convert the entries.*/
-     sa_text=(char *)malloc((sa_ctext+1)*sizeof(*sa_text));
-     sa_ntext=0;
-+    /*Add the encoded Application Indicator for FNC1 in the second position.*/
-+    if(fnc1==MOD(ZBAR_MOD_AIM)){
-+      if(fnc1_2ai<100){
-+        /*The Application Indicator is a 2-digit number.*/
-+        sa_text[sa_ntext++]='0'+fnc1_2ai/10;
-+        sa_text[sa_ntext++]='0'+fnc1_2ai%10;
-+      }
-+      /*The Application Indicator is a single letter.
-+        We already checked that it lies in one of the ranges A...Z, a...z
-+         when we decoded it.*/
-+      else sa_text[sa_ntext++]=(char)(fnc1_2ai-100);
-+    }
-     eci=-1;
-     enc_list[0]=sjis_cd;
-     enc_list[1]=latin1_cd;
-     enc_list[2]=utf8_cd;
-     eci_cd=(iconv_t)-1;
-     err=0;
--    zbar_symbol_t *syms = NULL, **sym = &syms;
-     for(j = 0; j < sa_size && !err; j++, sym = &(*sym)->next) {
-       *sym = _zbar_image_scanner_alloc_sym(iscn, ZBAR_QRCODE, 0);
-       (*sym)->datalen = sa_ntext;
-@@ -167,6 +193,14 @@
-       sym_add_point(*sym, qrdataj->bbox[3][0], qrdataj->bbox[3][1]);
-       sym_add_point(*sym, qrdataj->bbox[1][0], qrdataj->bbox[1][1]);
- 
-+      /* approx symbol "up" direction */
-+      dir[0] = (qrdataj->bbox[0][0] - qrdataj->bbox[2][0] +
-+                qrdataj->bbox[1][0] - qrdataj->bbox[3][0]);
-+      dir[1] = (qrdataj->bbox[2][1] - qrdataj->bbox[0][1] +
-+                qrdataj->bbox[3][1] - qrdataj->bbox[1][1]);
-+      horiz = abs(dir[0]) > abs(dir[1]);
-+      (*sym)->orient = horiz + 2 * (dir[1 - horiz] < 0);
-+
-       for(k=0;k<qrdataj->nentries&&!err;k++){
-         size_t              inleft;
-         size_t              outleft;
-@@ -220,7 +254,8 @@
-             Does such a thing occur?
-             Is it allowed?
-             It requires copying buffers around to handle correctly.*/
--          case QR_MODE_BYTE:{
-+          case QR_MODE_BYTE:
-+          case QR_MODE_KANJI:{
-             in=(char *)entry->payload.data.buf;
-             inleft=entry->payload.data.len;
-             out=sa_text+sa_ntext;
-@@ -228,8 +263,13 @@
-             /*If we have no specified encoding, attempt to auto-detect it.*/
-             if(eci<0){
-               int ei;
--              /*First check for the UTF-8 BOM.*/
--              if(inleft>=3&&
-+              /*If there was data encoded in kanji mode, assume it's SJIS.*/
-+              if(has_kanji)enc_list_mtf(enc_list,sjis_cd);
-+              /*Otherwise check for the UTF-8 BOM.
-+                UTF-8 is rarely specified with ECI, and few decoders
-+                 currently support doing so, so this is the best way for
-+                 encoders to reliably indicate it.*/
-+              else if(inleft>=3&&
-                in[0]==(char)0xEF&&in[1]==(char)0xBB&&in[2]==(char)0xBF){
-                 in+=3;
-                 inleft-=3;
-@@ -246,15 +286,17 @@
-                 out=sa_text+sa_ntext;
-                 outleft=sa_ctext-sa_ntext;
-               }
--              /*If the text is 8-bit clean, prefer UTF-8 over SJIS, since SJIS
--                 will corrupt the backslashes used for DoCoMo formats.*/
-+              /*If the text is 8-bit clean, prefer UTF-8 over SJIS, since
-+                 SJIS will corrupt the backslashes used for DoCoMo formats.*/
-               else if(text_is_ascii((unsigned char *)in,inleft)){
-                 enc_list_mtf(enc_list,utf8_cd);
-               }
-               /*Try our list of encodings.*/
-               for(ei=0;ei<3;ei++)if(enc_list[ei]!=(iconv_t)-1){
--                /*According to the standard, ISO/IEC 8859-1 (one hyphen) is
--                   supposed to be used, but reality is not always so.
-+                /*According to the 2005 version of the standard,
-+                   ISO/IEC 8859-1 (one hyphen) is supposed to be used, but
-+                   reality is not always so (and in the 2000 version of the
-+                   standard, it was JIS8/SJIS that was the default).
-                   It's got an invalid range that is used often with SJIS
-                    and UTF-8, though, which makes detection easier.
-                   However, iconv() does not properly reject characters in
-@@ -280,23 +322,16 @@
-                 outleft=sa_ctext-sa_ntext;
-               }
-             }
--            /*We were actually given a character set; use it.*/
-+            /*We were actually given a character set; use it.
-+              The spec says that in this case, data should be treated as if it
-+               came from the given character set even when encoded in kanji
-+               mode.*/
-             else{
-               err=eci_cd==(iconv_t)-1||
-                iconv(eci_cd,&in,&inleft,&out,&outleft)==(size_t)-1;
-               if(!err)sa_ntext=out-sa_text;
-             }
-           }break;
--          /*Kanji mode always uses SJIS.*/
--          case QR_MODE_KANJI:{
--            in=(char *)entry->payload.data.buf;
--            inleft=entry->payload.data.len;
--            out=sa_text+sa_ntext;
--            outleft=sa_ctext-sa_ntext;
--            err=sjis_cd==(iconv_t)-1||
--             iconv(sjis_cd,&in,&inleft,&out,&outleft)==(size_t)-1;
--            if(!err)sa_ntext=out-sa_text;
--          }break;
-           /*Check to see if a character set was specified.*/
-           case QR_MODE_ECI:{
-             const char *enc;
-@@ -313,6 +348,7 @@
-               else enc="CP437";
-             }
-             else if(cur_eci==QR_ECI_SJIS)enc="SJIS";
-+            else if(cur_eci==QR_ECI_UTF8)enc="UTF-8";
-             /*Don't know what this ECI code specifies, but not an encoding that
-                we recognize.*/
-             else continue;
-@@ -331,26 +367,27 @@
-     }
-     if(eci_cd!=(iconv_t)-1)iconv_close(eci_cd);
-     if(!err){
-+      zbar_symbol_t *sa_sym;
-       sa_text[sa_ntext++]='\0';
-       if(sa_ctext+1>sa_ntext){
-         sa_text=(char *)realloc(sa_text,sa_ntext*sizeof(*sa_text));
-       }
- 
--      zbar_symbol_t *sa_sym;
-       if(sa_size == 1)
-           sa_sym = syms;
-       else {
-+          /* cheap out w/axis aligned bbox for now */
-+          int xmin = img->width, xmax = -2;
-+          int ymin = img->height, ymax = -2;
-+
-           /* create "virtual" container symbol for composite result */
-           sa_sym = _zbar_image_scanner_alloc_sym(iscn, ZBAR_QRCODE, 0);
-           sa_sym->syms = _zbar_symbol_set_create();
-           sa_sym->syms->head = syms;
- 
--          /* cheap out w/axis aligned bbox for now */
--          int xmin = img->width, xmax = -2;
--          int ymin = img->height, ymax = -2;
--
-           /* fixup data references */
-           for(; syms; syms = syms->next) {
-+              int next;
-               _zbar_symbol_refcnt(syms, 1);
-               if(syms->type == ZBAR_PARTIAL)
-                   sa_sym->type = ZBAR_PARTIAL;
-@@ -364,7 +401,7 @@
-                       if(ymax <= u) ymax = u + 1;
-                   }
-               syms->data = sa_text + syms->datalen;
--              int next = (syms->next) ? syms->next->datalen : sa_ntext;
-+              next = (syms->next) ? syms->next->datalen : sa_ntext;
-               assert(next > syms->datalen);
-               syms->datalen = next - syms->datalen - 1;
-           }
-@@ -378,6 +415,7 @@
-       sa_sym->data = sa_text;
-       sa_sym->data_alloc = sa_ntext;
-       sa_sym->datalen = sa_ntext - 1;
-+      sa_sym->modifiers = fnc1;
- 
-       _zbar_image_scanner_add_sym(iscn, sa_sym);
-     }
-diff -r 563557a923d0 zbar/qrcode/util.h
---- a/zbar/qrcode/util.h	Tue Oct 27 11:25:59 2009 -0400
-+++ b/zbar/qrcode/util.h	Fri Feb 22 08:54:29 2013 -0300
-@@ -17,6 +17,14 @@
- #define QR_DIVROUND(_x,_y)  (((_x)+QR_FLIPSIGNI(_y>>1,_x))/(_y))
- #define QR_CLAMPI(_a,_b,_c) (QR_MAXI(_a,QR_MINI(_b,_c)))
- #define QR_CLAMP255(_x)     ((unsigned char)((((_x)<0)-1)&((_x)|-((_x)>255))))
-+#define QR_SWAP2I(_a,_b) \
-+  do{ \
-+    int t__; \
-+    t__=(_a); \
-+    (_a)=(_b); \
-+    (_b)=t__; \
-+  } \
-+  while(0)
- /*Swaps two integers _a and _b if _a>_b.*/
- #define QR_SORT2I(_a,_b) \
-   do{ \
-diff -r 563557a923d0 zbar/refcnt.c
---- a/zbar/refcnt.c	Tue Oct 27 11:25:59 2009 -0400
-+++ b/zbar/refcnt.c	Fri Feb 22 08:54:29 2013 -0300
-@@ -23,7 +23,7 @@
- 
- #include "refcnt.h"
- 
--#ifdef HAVE_LIBPTHREAD
-+#if !defined(_WIN32) && !defined(TARGET_OS_MAC) && defined(HAVE_LIBPTHREAD)
- 
- pthread_once_t initialized = PTHREAD_ONCE_INIT;
- pthread_mutex_t _zbar_reflock;
-diff -r 563557a923d0 zbar/refcnt.h
---- a/zbar/refcnt.h	Tue Oct 27 11:25:59 2009 -0400
-+++ b/zbar/refcnt.h	Fri Feb 22 08:54:29 2013 -0300
-@@ -1,5 +1,5 @@
- /*------------------------------------------------------------------------
-- *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-  *
-  *  This file is part of the ZBar Bar Code Reader.
-  *
-@@ -29,7 +29,7 @@
- #if defined(_WIN32)
- # include <windows.h>
- 
--typedef volatile LONG refcnt_t;  /* FIXME where did volatile come from? */
-+typedef LONG refcnt_t;
- 
- static inline int _zbar_refcnt (refcnt_t *cnt,
-                                 int delta)
-@@ -45,6 +45,18 @@
-     return(rc);
- }
- 
-+#elif defined(TARGET_OS_MAC)
-+# include <libkern/OSAtomic.h>
-+
-+typedef int32_t refcnt_t;
-+
-+static inline int _zbar_refcnt (refcnt_t *cnt,
-+                                int delta)
-+{
-+    int rc = OSAtomicAdd32Barrier(delta, cnt);
-+    assert(rc >= 0);
-+    return(rc);
-+}
- 
- #elif defined(HAVE_LIBPTHREAD)
- # include <pthread.h>
-diff -r 563557a923d0 zbar/scanner.c
---- a/zbar/scanner.c	Tue Oct 27 11:25:59 2009 -0400
-+++ b/zbar/scanner.c	Fri Feb 22 08:54:29 2013 -0300
-@@ -1,5 +1,5 @@
- /*------------------------------------------------------------------------
-- *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-  *
-  *  This file is part of the ZBar Bar Code Reader.
-  *
-@@ -23,6 +23,7 @@
- 
- #include <config.h>
- #include <stdlib.h>     /* malloc, free, abs */
-+#include <stddef.h>
- #include <string.h>     /* memset */
- 
- #include <zbar.h>
-@@ -91,7 +92,7 @@
- 
- zbar_symbol_type_t zbar_scanner_reset (zbar_scanner_t *scn)
- {
--    memset(&scn->x, 0, sizeof(zbar_scanner_t) + (void*)scn - (void*)&scn->x);
-+    memset(&scn->x, 0, sizeof(zbar_scanner_t) - offsetof(zbar_scanner_t, x));
-     scn->y1_thresh = scn->y1_min_thresh;
-     if(scn->decoder)
-         zbar_decoder_reset(scn->decoder);
-@@ -125,19 +126,20 @@
- static inline unsigned calc_thresh (zbar_scanner_t *scn)
- {
-     /* threshold 1st to improve noise rejection */
--    unsigned thresh = scn->y1_thresh;
-+    unsigned dx, thresh = scn->y1_thresh;
-+    unsigned long t;
-     if((thresh <= scn->y1_min_thresh) || !scn->width) {
--        dprintf(1, " tmin=%d", scn->y1_min_thresh);
-+        dbprintf(1, " tmin=%d", scn->y1_min_thresh);
-         return(scn->y1_min_thresh);
-     }
-     /* slowly return threshold to min */
--    unsigned dx = (scn->x << ZBAR_FIXED) - scn->last_edge;
--    unsigned long t = thresh * dx;
-+    dx = (scn->x << ZBAR_FIXED) - scn->last_edge;
-+    t = thresh * dx;
-     t /= scn->width;
-     t /= ZBAR_SCANNER_THRESH_FADE;
--    dprintf(1, " thr=%d t=%ld x=%d last=%d.%d (%d)",
--            thresh, t, scn->x, scn->last_edge >> ZBAR_FIXED,
--            scn->last_edge & ((1 << ZBAR_FIXED) - 1), dx);
-+    dbprintf(1, " thr=%d t=%ld x=%d last=%d.%d (%d)",
-+             thresh, t, scn->x, scn->last_edge >> ZBAR_FIXED,
-+             scn->last_edge & ((1 << ZBAR_FIXED) - 1), dx);
-     if(thresh > t) {
-         thresh -= t;
-         if(thresh > scn->y1_min_thresh)
-@@ -156,10 +158,10 @@
-         scn->last_edge = scn->cur_edge;
- 
-     scn->width = scn->cur_edge - scn->last_edge;
--    dprintf(1, " sgn=%d cur=%d.%d w=%d (%s)\n",
--            scn->y1_sign, scn->cur_edge >> ZBAR_FIXED,
--            scn->cur_edge & ((1 << ZBAR_FIXED) - 1), scn->width,
--            ((y1 > 0) ? "SPACE" : "BAR"));
-+    dbprintf(1, " sgn=%d cur=%d.%d w=%d (%s)\n",
-+             scn->y1_sign, scn->cur_edge >> ZBAR_FIXED,
-+             scn->cur_edge & ((1 << ZBAR_FIXED) - 1), scn->width,
-+             ((y1 > 0) ? "SPACE" : "BAR"));
-     scn->last_edge = scn->cur_edge;
- 
- #if DEBUG_SVG > 1
-@@ -174,14 +176,15 @@
- 
- inline zbar_symbol_type_t zbar_scanner_flush (zbar_scanner_t *scn)
- {
-+    unsigned x;
-     if(!scn->y1_sign)
-         return(ZBAR_NONE);
- 
--    unsigned x = (scn->x << ZBAR_FIXED) + ROUND;
-+    x = (scn->x << ZBAR_FIXED) + ROUND;
- 
-     if(scn->cur_edge != x || scn->y1_sign > 0) {
--        dprintf(1, "flush0:");
-         zbar_symbol_type_t edge = process_edge(scn, -scn->y1_sign);
-+        dbprintf(1, "flush0:");
-         scn->cur_edge = x;
-         scn->y1_sign = -scn->y1_sign;
-         return(edge);
-@@ -203,7 +206,7 @@
-     }
- 
-     /* reset scanner and associated decoder */
--    memset(&scn->x, 0, sizeof(zbar_scanner_t) + (void*)scn - (void*)&scn->x);
-+    memset(&scn->x, 0, sizeof(zbar_scanner_t) - offsetof(zbar_scanner_t, x));
-     scn->y1_thresh = scn->y1_min_thresh;
-     if(scn->decoder)
-         zbar_decoder_new_scan(scn->decoder);
-@@ -218,6 +221,8 @@
-     register int x = scn->x;
-     register int y0_1 = scn->y0[(x - 1) & 3];
-     register int y0_0 = y0_1;
-+    register int y0_2, y0_3, y1_1, y2_1, y2_2;
-+    zbar_symbol_type_t edge;
-     if(x) {
-         /* update weighted moving average */
-         y0_0 += ((int)((y - y0_1) * EWMA_WEIGHT)) >> ZBAR_FIXED;
-@@ -225,10 +230,10 @@
-     }
-     else
-         y0_0 = y0_1 = scn->y0[0] = scn->y0[1] = scn->y0[2] = scn->y0[3] = y;
--    register int y0_2 = scn->y0[(x - 2) & 3];
--    register int y0_3 = scn->y0[(x - 3) & 3];
-+    y0_2 = scn->y0[(x - 2) & 3];
-+    y0_3 = scn->y0[(x - 3) & 3];
-     /* 1st differential @ x-1 */
--    register int y1_1 = y0_1 - y0_2;
-+    y1_1 = y0_1 - y0_2;
-     {
-         register int y1_2 = y0_2 - y0_3;
-         if((abs(y1_1) < abs(y1_2)) &&
-@@ -237,13 +242,13 @@
-     }
- 
-     /* 2nd differentials @ x-1 & x-2 */
--    register int y2_1 = y0_0 - (y0_1 * 2) + y0_2;
--    register int y2_2 = y0_1 - (y0_2 * 2) + y0_3;
-+    y2_1 = y0_0 - (y0_1 * 2) + y0_2;
-+    y2_2 = y0_1 - (y0_2 * 2) + y0_3;
- 
--    dprintf(1, "scan: x=%d y=%d y0=%d y1=%d y2=%d",
--            x, y, y0_1, y1_1, y2_1);
-+    dbprintf(1, "scan: x=%d y=%d y0=%d y1=%d y2=%d",
-+             x, y, y0_1, y1_1, y2_1);
- 
--    zbar_symbol_type_t edge = ZBAR_NONE;
-+    edge = ZBAR_NONE;
-     /* 2nd zero-crossing is 1st local min/max - could be edge */
-     if((!y2_1 ||
-         ((y2_1 > 0) ? y2_2 < 0 : y2_2 > 0)) &&
-@@ -256,17 +261,18 @@
-             edge = process_edge(scn, y1_1);
- 
-         if(y1_rev || (abs(scn->y1_sign) < abs(y1_1))) {
-+            int d;
-             scn->y1_sign = y1_1;
- 
-             /* adaptive thresholding */
-             /* start at multiple of new min/max */
-             scn->y1_thresh = (abs(y1_1) * THRESH_INIT + ROUND) >> ZBAR_FIXED;
--            dprintf(1, "\tthr=%d", scn->y1_thresh);
-+            dbprintf(1, "\tthr=%d", scn->y1_thresh);
-             if(scn->y1_thresh < scn->y1_min_thresh)
-                 scn->y1_thresh = scn->y1_min_thresh;
- 
-             /* update current edge */
--            int d = y2_1 - y2_2;
-+            d = y2_1 - y2_2;
-             scn->cur_edge = 1 << ZBAR_FIXED;
-             if(!d)
-                 scn->cur_edge >>= 1;
-@@ -274,11 +280,11 @@
-                 /* interpolate zero crossing */
-                 scn->cur_edge -= ((y2_1 << ZBAR_FIXED) + 1) / d;
-             scn->cur_edge += x << ZBAR_FIXED;
--            dprintf(1, "\n");
-+            dbprintf(1, "\n");
-         }
-     }
-     else
--        dprintf(1, "\n");
-+        dbprintf(1, "\n");
-     /* FIXME add fall-thru pass to decoder after heuristic "idle" period
-        (eg, 6-8 * last width) */
-     scn->x = x + 1;
-@@ -298,14 +304,14 @@
-     register int y0_0 = scn->y0[(scn->x - 1) & 3];
-     register int y0_1 = scn->y0[(scn->x - 2) & 3];
-     register int y0_2 = scn->y0[(scn->x - 3) & 3];
-+    zbar_scanner_t *mut_scn;
-     if(x) *x = scn->x - 1;
--    if(cur_edge) *cur_edge = scn->cur_edge;
-     if(last_edge) *last_edge = scn->last_edge;
-     if(y0) *y0 = y0_1;
-     if(y1) *y1 = y0_1 - y0_2;
-     if(y2) *y2 = y0_0 - (y0_1 * 2) + y0_2;
-     /* NB not quite accurate (uses updated x) */
--    zbar_scanner_t *mut_scn = (zbar_scanner_t*)scn;
-+    mut_scn = (zbar_scanner_t*)scn;
-     if(y1_thresh) *y1_thresh = calc_thresh(mut_scn);
--    dprintf(1, "\n");
-+    dbprintf(1, "\n");
- }
-diff -r 563557a923d0 zbar/symbol.c
---- a/zbar/symbol.c	Tue Oct 27 11:25:59 2009 -0400
-+++ b/zbar/symbol.c	Fri Feb 22 08:54:29 2013 -0300
-@@ -1,5 +1,5 @@
- /*------------------------------------------------------------------------
-- *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-  *
-  *  This file is part of the ZBar Bar Code Reader.
-  *
-@@ -32,14 +32,21 @@
- const char *zbar_get_symbol_name (zbar_symbol_type_t sym)
- {
-     switch(sym & ZBAR_SYMBOL) {
-+    case ZBAR_EAN2: return("EAN-2");
-+    case ZBAR_EAN5: return("EAN-5");
-     case ZBAR_EAN8: return("EAN-8");
-     case ZBAR_UPCE: return("UPC-E");
-     case ZBAR_ISBN10: return("ISBN-10");
-     case ZBAR_UPCA: return("UPC-A");
-     case ZBAR_EAN13: return("EAN-13");
-     case ZBAR_ISBN13: return("ISBN-13");
-+    case ZBAR_COMPOSITE: return("COMPOSITE");
-     case ZBAR_I25: return("I2/5");
-+    case ZBAR_DATABAR: return("DataBar");
-+    case ZBAR_DATABAR_EXP: return("DataBar-Exp");
-+    case ZBAR_CODABAR: return("Codabar");
-     case ZBAR_CODE39: return("CODE-39");
-+    case ZBAR_CODE93: return("CODE-93");
-     case ZBAR_CODE128: return("CODE-128");
-     case ZBAR_PDF417: return("PDF417");
-     case ZBAR_QRCODE: return("QR-Code");
-@@ -49,13 +56,61 @@
- 
- const char *zbar_get_addon_name (zbar_symbol_type_t sym)
- {
--    switch(sym & ZBAR_ADDON) {
--    case ZBAR_ADDON2: return("+2");
--    case ZBAR_ADDON5: return("+5");
-+    return("");
-+}
-+
-+const char *zbar_get_config_name (zbar_config_t cfg)
-+{
-+    switch(cfg) {
-+    case ZBAR_CFG_ENABLE: return("ENABLE");
-+    case ZBAR_CFG_ADD_CHECK: return("ADD_CHECK");
-+    case ZBAR_CFG_EMIT_CHECK: return("EMIT_CHECK");
-+    case ZBAR_CFG_ASCII: return("ASCII");
-+    case ZBAR_CFG_MIN_LEN: return("MIN_LEN");
-+    case ZBAR_CFG_MAX_LEN: return("MAX_LEN");
-+    case ZBAR_CFG_UNCERTAINTY: return("UNCERTAINTY");
-+    case ZBAR_CFG_POSITION: return("POSITION");
-+    case ZBAR_CFG_X_DENSITY: return("X_DENSITY");
-+    case ZBAR_CFG_Y_DENSITY: return("Y_DENSITY");
-     default: return("");
-     }
- }
- 
-+const char *zbar_get_modifier_name (zbar_modifier_t mod)
-+{
-+    switch(mod) {
-+    case ZBAR_MOD_GS1: return("GS1");
-+    case ZBAR_MOD_AIM: return("AIM");
-+    default: return("");
-+    }
-+}
-+
-+const char *zbar_get_orientation_name (zbar_orientation_t orient)
-+{
-+    switch(orient) {
-+    case ZBAR_ORIENT_UP: return("UP");
-+    case ZBAR_ORIENT_RIGHT: return("RIGHT");
-+    case ZBAR_ORIENT_DOWN: return("DOWN");
-+    case ZBAR_ORIENT_LEFT: return("LEFT");
-+    default: return("UNKNOWN");
-+    }
-+}
-+
-+int _zbar_get_symbol_hash (zbar_symbol_type_t sym)
-+{
-+    static const signed char hash[0x20] = {
-+        0x00, 0x01, 0x10, 0x11,   -1, 0x11, 0x16, 0x0c,
-+	0x05, 0x06, 0x08,   -1, 0x04, 0x03, 0x07, 0x12,
-+	  -1,   -1,   -1,   -1,   -1,   -1,   -1, 0x02,
-+	  -1, 0x00, 0x12, 0x0c, 0x0b, 0x1d, 0x0a, 0x00,
-+     };
-+    int g0 = hash[sym & 0x1f];
-+    int g1 = hash[~(sym >> 4) & 0x1f];
-+    assert(g0 >= 0 && g1 >= 0);
-+    if(g0 < 0 || g1 < 0)
-+        return(0);
-+    return((g0 + g1) & 0x1f);
-+}
- 
- void _zbar_symbol_free (zbar_symbol_t *sym)
- {
-@@ -82,6 +137,16 @@
-     return(sym->type);
- }
- 
-+unsigned int zbar_symbol_get_configs (const zbar_symbol_t *sym)
-+{
-+    return(sym->configs);
-+}
-+
-+unsigned int zbar_symbol_get_modifiers (const zbar_symbol_t *sym)
-+{
-+    return(sym->modifiers);
-+}
-+
- const char *zbar_symbol_get_data (const zbar_symbol_t *sym)
- {
-     return(sym->data);
-@@ -125,6 +190,11 @@
-         return(-1);
- }
- 
-+zbar_orientation_t zbar_symbol_get_orientation (const zbar_symbol_t *sym)
-+{
-+    return(sym->orient);
-+}
-+
- const zbar_symbol_t *zbar_symbol_next (const zbar_symbol_t *sym)
- {
-     return((sym) ? sym->next : NULL);
-@@ -142,26 +212,100 @@
- }
- 
- 
--static const char *xmlfmt[] = {
--    "<symbol type='%s' quality='%d'",
--    " count='%d'",
--    "><data><![CDATA[",
--    "]]></data></symbol>",
-+unsigned base64_encode (char *dst,
-+                        const char *src,
-+                        unsigned srclen)
-+{
-+    static const char alphabet[] =
-+        "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-+    char *start = dst;
-+    int nline = 19;
-+    for(; srclen; srclen -= 3) {
-+        unsigned int buf = *(src++) << 16;
-+        if(srclen > 1) buf |= *(src++) << 8;
-+        if(srclen > 2) buf |= *(src++);
-+        *(dst++) = alphabet[(buf >> 18) & 0x3f];
-+        *(dst++) = alphabet[(buf >> 12) & 0x3f];
-+        *(dst++) = (srclen > 1) ? alphabet[(buf >> 6) & 0x3f] : '=';
-+        *(dst++) = (srclen > 2) ? alphabet[buf & 0x3f] : '=';
-+        if(srclen < 3) break;
-+        if(!--nline) { *(dst++) = '\n'; nline = 19; }
-+    }
-+    *(dst++) = '\n';
-+    *(dst++) = '\0';
-+    return(dst - start - 1);
-+}
-+
-+enum {
-+    TMPL_START,
-+    TMPL_MOD_START, TMPL_MOD_ITEM, TMPL_MOD_END,
-+    TMPL_COUNT,
-+    TMPL_DATA_START, TMPL_FORMAT, TMPL_CDATA,
-+    TMPL_NL,
-+    TMPL_END,
- };
- 
- /* FIXME suspect... */
-+#define MAX_STATIC 256
-+#define MAX_MOD (5 * ZBAR_MOD_NUM)
-+#define MAX_CFG (10 * ZBAR_CFG_NUM)
- #define MAX_INT_DIGITS 10
- 
-+#define TMPL_COPY(t) do {             \
-+        static const char *_st = (t); \
-+        i = strlen(_st);              \
-+        memcpy(*buf + n, _st, i + 1); \
-+        n += i;                       \
-+        assert(n <= maxlen);          \
-+    } while(0)
-+
-+#define TMPL_FMT(t, ...) do {                                 \
-+        static const char *_st = (t);                         \
-+        i = snprintf(*buf + n, maxlen - n, _st, __VA_ARGS__); \
-+        assert(i > 0);                                        \
-+        n += i;                                               \
-+        assert(n <= maxlen);                                  \
-+    } while(0)
-+
- char *zbar_symbol_xml (const zbar_symbol_t *sym,
-                        char **buf,
-                        unsigned *len)
- {
-+    unsigned int datalen, maxlen;
-+    int i, n = 0;
-+
-     const char *type = zbar_get_symbol_name(sym->type);
--    /* FIXME binary data */
--    unsigned datalen = strlen(sym->data);
--    unsigned maxlen = (strlen(xmlfmt[0]) + strlen(xmlfmt[1]) +
--                       strlen(xmlfmt[2]) + strlen(xmlfmt[3]) +
--                       strlen(type) + datalen + MAX_INT_DIGITS + 1);
-+    const char *orient = zbar_get_orientation_name(sym->orient);
-+
-+    /* check for binary data */
-+    unsigned char *data = (unsigned char*)sym->data;
-+    char binary = ((data[0] == 0xff && data[1] == 0xfe) ||
-+                   (data[0] == 0xfe && data[1] == 0xff) ||
-+                   !strncmp(sym->data, "<?xml", 5));
-+    for(i = 0; !binary && i < sym->datalen; i++) {
-+        unsigned char c = sym->data[i];
-+        binary = ((c < 0x20 && ((~0x00002600 >> c) & 1)) ||
-+                  (c >= 0x7f && c < 0xa0) ||
-+                  (c == ']' && i + 2 < sym->datalen &&
-+                   sym->data[i + 1] == ']' &&
-+                   sym->data[i + 2] == '>'));
-+    }
-+
-+    datalen = strlen(sym->data);
-+    if(binary)
-+        datalen = (sym->datalen + 2) / 3 * 4 + sym->datalen / 57 + 3;
-+
-+    maxlen = (MAX_STATIC + strlen(type) + strlen(orient) +
-+              datalen + MAX_INT_DIGITS + 1);
-+    unsigned int mods = sym->modifiers;
-+    if(mods)
-+        maxlen += MAX_MOD;
-+    unsigned int cfgs = sym->configs & ~(1 << ZBAR_CFG_ENABLE);
-+    if(cfgs)
-+        maxlen += MAX_CFG;
-+    if(binary)
-+        maxlen += MAX_INT_DIGITS;
-+
-     if(!*buf || (*len < maxlen)) {
-         if(*buf)
-             free(*buf);
-@@ -170,32 +314,50 @@
-         *len = maxlen;
-     }
- 
--    int n = snprintf(*buf, maxlen, xmlfmt[0], type, sym->quality);
--    assert(n > 0);
-+    TMPL_FMT("<symbol type='%s' quality='%d' orientation='%s'",
-+             type, sym->quality, orient);
-+
-+    if(mods) {
-+        int j;
-+        TMPL_COPY(" modifiers='");
-+        for(j = 0; mods && j < ZBAR_MOD_NUM; j++, mods >>= 1)
-+            if(mods & 1)
-+                TMPL_FMT("%s ", zbar_get_modifier_name(j));
-+        /* cleanup trailing space */
-+        n--;
-+        TMPL_COPY("'");
-+    }
-+
-+    if(cfgs) {
-+        int j;
-+        TMPL_COPY(" configs='");
-+        for(j = 0; cfgs && j < ZBAR_CFG_NUM; j++, cfgs >>= 1)
-+            if(cfgs & 1)
-+                TMPL_FMT("%s ", zbar_get_config_name(j));
-+        /* cleanup trailing space */
-+        n--;
-+        TMPL_COPY("'");
-+    }
-+
-+    if(sym->cache_count)
-+        TMPL_FMT(" count='%d'", sym->cache_count);
-+
-+    TMPL_COPY("><data");
-+    if(binary)
-+        TMPL_FMT(" format='base64' length='%d'", sym->datalen);
-+    TMPL_COPY("><![CDATA[");
-+
-+    if(!binary) {
-+        memcpy(*buf + n, sym->data, sym->datalen + 1);
-+        n += sym->datalen;
-+    }
-+    else {
-+        TMPL_COPY("\n");
-+        n += base64_encode(*buf + n, sym->data, sym->datalen);
-+    }
-     assert(n <= maxlen);
- 
--    if(sym->cache_count) {
--        int i = snprintf(*buf + n, maxlen - n, xmlfmt[1], sym->cache_count);
--        assert(i > 0);
--        n += i;
--        assert(n <= maxlen);
--    }
--
--    int i = strlen(xmlfmt[2]);
--    memcpy(*buf + n, xmlfmt[2], i + 1);
--    n += i;
--    assert(n <= maxlen);
--
--    /* FIXME binary data */
--    /* FIXME handle "]]>" */
--    strncpy(*buf + n, sym->data, datalen + 1);
--    n += datalen;
--    assert(n <= maxlen);
--
--    i = strlen(xmlfmt[3]);
--    memcpy(*buf + n, xmlfmt[3], i + 1);
--    n += i;
--    assert(n <= maxlen);
-+    TMPL_COPY("]]></data></symbol>");
- 
-     *len = n;
-     return(*buf);
-@@ -242,3 +404,9 @@
-         return(sym->next);
-     return(syms->head);
- }
-+
-+const zbar_symbol_t*
-+zbar_symbol_set_first_unfiltered (const zbar_symbol_set_t *syms)
-+{
-+    return(syms->head);
-+}
-diff -r 563557a923d0 zbar/symbol.h
---- a/zbar/symbol.h	Tue Oct 27 11:25:59 2009 -0400
-+++ b/zbar/symbol.h	Fri Feb 22 08:54:29 2013 -0300
-@@ -1,5 +1,5 @@
- /*------------------------------------------------------------------------
-- *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-  *
-  *  This file is part of the ZBar Bar Code Reader.
-  *
-@@ -27,6 +27,8 @@
- #include <zbar.h>
- #include "refcnt.h"
- 
-+#define NUM_SYMS  20
-+
- typedef struct point_s {
-     int x, y;
- } point_t;
-@@ -40,6 +42,8 @@
- 
- struct zbar_symbol_s {
-     zbar_symbol_type_t type;    /* symbol type */
-+    unsigned int configs;       /* symbology boolean config bitmask */
-+    unsigned int modifiers;     /* symbology modifier bitmask */
-     unsigned int data_alloc;    /* allocation size of data */
-     unsigned int datalen;       /* length of binary symbol data */
-     char *data;                 /* symbol data */
-@@ -47,6 +51,7 @@
-     unsigned pts_alloc;         /* allocation size of pts */
-     unsigned npts;              /* number of points in location polygon */
-     point_t *pts;               /* list of points in location polygon */
-+    zbar_orientation_t orient;  /* coarse orientation */
- 
-     refcnt_t refcnt;            /* reference count */
-     zbar_symbol_t *next;        /* linked list of results (or siblings) */
-@@ -56,6 +61,8 @@
-     int quality;                /* relative symbol reliability metric */
- };
- 
-+extern int _zbar_get_symbol_hash(zbar_symbol_type_t);
-+
- extern void _zbar_symbol_free(zbar_symbol_t*);
- 
- extern zbar_symbol_set_t *_zbar_symbol_set_create(void);
-diff -r 563557a923d0 zbar/timer.h
---- a/zbar/timer.h	Tue Oct 27 11:25:59 2009 -0400
-+++ b/zbar/timer.h	Fri Feb 22 08:54:29 2013 -0300
-@@ -1,5 +1,5 @@
- /*------------------------------------------------------------------------
-- *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-  *
-  *  This file is part of the ZBar Bar Code Reader.
-  *
-@@ -24,7 +24,9 @@
- #define _ZBAR_TIMER_H_
- 
- #include <time.h>
--#include <sys/time.h>   /* gettimeofday */
-+#ifdef HAVE_SYS_TIME_H
-+# include <sys/time.h>   /* gettimeofday */
-+#endif
- 
- /* platform timer abstraction
-  *
-@@ -41,6 +43,13 @@
- 
- typedef struct timespec zbar_timer_t;
- 
-+static inline int _zbar_timer_now ()
-+{
-+    struct timespec now;
-+    clock_gettime(CLOCK_REALTIME, &now);
-+    return(now.tv_sec * 1000 + now.tv_nsec / 1000000);
-+}
-+
- static inline zbar_timer_t *_zbar_timer_init (zbar_timer_t *timer,
-                                               int delay)
- {
-@@ -56,13 +65,14 @@
- 
- static inline int _zbar_timer_check (zbar_timer_t *timer)
- {
-+    struct timespec now;
-+    int delay;
-     if(!timer)
-         return(-1);
- 
--    struct timespec now;
-     clock_gettime(CLOCK_REALTIME, &now);
--    int delay = ((timer->tv_sec - now.tv_sec) * 1000 +
--                 (timer->tv_nsec - now.tv_nsec) / 1000000);
-+    delay = ((timer->tv_sec - now.tv_sec) * 1000 +
-+             (timer->tv_nsec - now.tv_nsec) / 1000000);
-     return((delay >= 0) ? delay : 0);
- }
- 
-@@ -73,6 +83,11 @@
- 
- typedef DWORD zbar_timer_t;
- 
-+static inline int _zbar_timer_now ()
-+{
-+    return(timeGetTime());
-+}
-+
- static inline zbar_timer_t *_zbar_timer_init (zbar_timer_t *timer,
-                                               int delay)
- {
-@@ -85,18 +100,26 @@
- 
- static inline int _zbar_timer_check (zbar_timer_t *timer)
- {
-+    int delay;
-     if(!timer)
-         return(INFINITE);
- 
--    int delay = *timer - timeGetTime();
-+    delay = *timer - timeGetTime();
-     return((delay >= 0) ? delay : 0);
- }
- 
- 
--#else
-+#elif defined(HAVE_SYS_TIME_H)
- 
- typedef struct timeval zbar_timer_t;
- 
-+static inline int _zbar_timer_now ()
-+{
-+    struct timeval now;
-+    gettimeofday(&now, NULL);
-+    return(now.tv_sec * 1000 + now.tv_usec / 1000);
-+}
-+
- static inline zbar_timer_t *_zbar_timer_init (zbar_timer_t *timer,
-                                               int delay)
- {
-@@ -112,15 +135,17 @@
- 
- static inline int _zbar_timer_check (zbar_timer_t *timer)
- {
-+    struct timeval now;
-     if(!timer)
-         return(-1);
- 
--    struct timeval now;
-     gettimeofday(&now, NULL);
-     return((timer->tv_sec - now.tv_sec) * 1000 +
-            (timer->tv_usec - now.tv_usec) / 1000);
- }
- 
-+#else
-+# error "unable to find a timer interface"
- #endif
- 
- #endif
-diff -r 563557a923d0 zbar/video.c
---- a/zbar/video.c	Tue Oct 27 11:25:59 2009 -0400
-+++ b/zbar/video.c	Fri Feb 22 08:54:29 2013 -0300
-@@ -1,5 +1,5 @@
- /*------------------------------------------------------------------------
-- *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-  *
-  *  This file is part of the ZBar Bar Code Reader.
-  *
-@@ -58,6 +58,7 @@
- zbar_video_t *zbar_video_create ()
- {
-     zbar_video_t *vdo = calloc(1, sizeof(zbar_video_t));
-+    int i;
-     if(!vdo)
-         return(NULL);
-     err_init(&vdo->err, ZBAR_MOD_VIDEO);
-@@ -73,7 +74,6 @@
-         return(NULL);
-     }
- 
--    int i;
-     for(i = 0; i < ZBAR_VIDEO_IMAGES_MAX; i++) {
-         zbar_image_t *img = vdo->images[i] = zbar_image_create();
-         if(!img) {
-@@ -97,7 +97,7 @@
-         int i;
-         for(i = 0; i < ZBAR_VIDEO_IMAGES_MAX; i++)
-             if(vdo->images[i])
--                free(vdo->images[i]);
-+                _zbar_image_free(vdo->images[i]);
-         free(vdo->images);
-     }
-     while(vdo->shadow_image) {
-@@ -130,6 +130,8 @@
- int zbar_video_open (zbar_video_t *vdo,
-                      const char *dev)
- {
-+    char *ldev = NULL;
-+    int rc;
-     zbar_video_enable(vdo, 0);
-     video_lock(vdo);
-     if(vdo->intf != VIDEO_INVALID) {
-@@ -145,7 +147,6 @@
-     if(!dev)
-         return(0);
- 
--    char *ldev = NULL;
-     if((unsigned char)dev[0] < 0x10) {
-         /* default linux device, overloaded for other platforms */
-         int id = dev[0];
-@@ -153,7 +154,7 @@
-         ldev[10] = '0' + id;
-     }
- 
--    int rc = _zbar_video_open(vdo, dev);
-+    rc = _zbar_video_open(vdo, dev);
- 
-     if(ldev)
-         free(ldev);
-@@ -227,12 +228,12 @@
- 
- static inline int video_init_images (zbar_video_t *vdo)
- {
--    
-+    int i;
-     assert(vdo->datalen);
-     if(vdo->iomode != VIDEO_MMAP) {
-         assert(!vdo->buf);
-         vdo->buflen = vdo->num_images * vdo->datalen;
--        vdo->buf = malloc(vdo->buflen);
-+        vdo->buf = calloc(1, vdo->buflen);
-         if(!vdo->buf)
-             return(err_capture(vdo, SEV_FATAL, ZBAR_ERR_NOMEM, __func__,
-                                "unable to allocate image buffers"));
-@@ -240,16 +241,14 @@
-                 (vdo->iomode == VIDEO_READWRITE) ? "READ" : "USERPTR",
-                 vdo->buflen);
-     }
--    int i;
-     for(i = 0; i < vdo->num_images; i++) {
-         zbar_image_t *img = vdo->images[i];
-         img->format = vdo->format;
--        img->width = vdo->width;
--        img->height = vdo->height;
-+        zbar_image_set_size(img, vdo->width, vdo->height);
-         if(vdo->iomode != VIDEO_MMAP) {
-+            unsigned long offset = i * vdo->datalen;
-             img->datalen = vdo->datalen;
--            unsigned long offset = i * vdo->datalen;
--            img->data = vdo->buf + offset;
-+            img->data = (uint8_t*)vdo->buf + offset;
-             zprintf(2, "    [%02d] @%08lx\n", i, offset);
-         }
-     }
-@@ -259,6 +258,9 @@
- int zbar_video_init (zbar_video_t *vdo,
-                      unsigned long fmt)
- {
-+#ifdef HAVE_LIBJPEG
-+    const zbar_format_def_t *vidfmt;
-+#endif
-     if(vdo->initialized)
-         /* FIXME re-init different format? */
-         return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_INVALID, __func__,
-@@ -270,8 +272,9 @@
-     if(video_init_images(vdo))
-         return(-1);
- #ifdef HAVE_LIBJPEG
--    const zbar_format_def_t *vidfmt = _zbar_format_lookup(fmt);
-+    vidfmt = _zbar_format_lookup(fmt);
-     if(vidfmt && vidfmt->group == ZBAR_FMT_JPEG) {
-+        zbar_image_t *img;
-         /* prepare for decoding */
-         if(!vdo->jpeg)
-             vdo->jpeg = _zbar_jpeg_decomp_create();
-@@ -279,10 +282,9 @@
-             zbar_image_destroy(vdo->jpeg_img);
- 
-         /* create intermediate image for decoder to use*/
--        zbar_image_t *img = vdo->jpeg_img = zbar_image_create();
-+        img = vdo->jpeg_img = zbar_image_create();
-         img->format = fourcc('Y','8','0','0');
--        img->width = vdo->width;
--        img->height = vdo->height;
-+        zbar_image_set_size(img, vdo->width, vdo->height);
-         img->datalen = vdo->width * vdo->height;
-     }
- #endif
-@@ -333,6 +335,9 @@
- 
- zbar_image_t *zbar_video_next_image (zbar_video_t *vdo)
- {
-+    unsigned frame;
-+    zbar_image_t *img;
-+
-     if(video_lock(vdo))
-         return(NULL);
-     if(!vdo->active) {
-@@ -340,8 +345,8 @@
-         return(NULL);
-     }
- 
--    unsigned frame = vdo->frame++;
--    zbar_image_t *img = vdo->dq(vdo);
-+    frame = vdo->frame++;
-+    img = vdo->dq(vdo);
-     if(img) {
-         img->seq = frame;
-         if(vdo->num_images < 2) {
-@@ -362,8 +367,7 @@
-                 /* recycle the shadow images */
- 
-                 img->format = vdo->format;
--                img->width = vdo->width;
--                img->height = vdo->height;
-+                zbar_image_set_size(img, vdo->width, vdo->height);
-                 img->datalen = vdo->datalen;
-                 img->data = malloc(vdo->datalen);
-             }
-diff -r 563557a923d0 zbar/video/v4l.c
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/zbar/video/v4l.c	Fri Feb 22 08:54:29 2013 -0300
-@@ -0,0 +1,67 @@
-+/*------------------------------------------------------------------------
-+ *  Copyright 2007-2011 (c) Jeff Brown <spadix@users.sourceforge.net>
-+ *
-+ *  This file is part of the ZBar Bar Code Reader.
-+ *
-+ *  The ZBar Bar Code Reader is free software; you can redistribute it
-+ *  and/or modify it under the terms of the GNU Lesser Public License as
-+ *  published by the Free Software Foundation; either version 2.1 of
-+ *  the License, or (at your option) any later version.
-+ *
-+ *  The ZBar Bar Code Reader is distributed in the hope that it will be
-+ *  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-+ *  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU Lesser Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser Public License
-+ *  along with the ZBar Bar Code Reader; if not, write to the Free
-+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-+ *  Boston, MA  02110-1301  USA
-+ *
-+ *  http://sourceforge.net/projects/zbar
-+ *------------------------------------------------------------------------*/
-+
-+#include <config.h>
-+#ifdef HAVE_SYS_TYPES_H
-+# include <sys/types.h>
-+#endif
-+#ifdef HAVE_SYS_STAT_H
-+# include <sys/stat.h>
-+#endif
-+#ifdef HAVE_FCNTL_H
-+# include <fcntl.h>
-+#endif
-+#ifdef HAVE_UNISTD_H
-+# include <unistd.h>
-+#endif
-+
-+#include "video.h"
-+
-+extern int _zbar_v4l1_probe(zbar_video_t*);
-+extern int _zbar_v4l2_probe(zbar_video_t*);
-+
-+int _zbar_video_open (zbar_video_t *vdo,
-+                      const char *dev)
-+{
-+    vdo->fd = open(dev, O_RDWR);
-+    if(vdo->fd < 0)
-+        return(err_capture_str(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
-+                               "opening video device '%s'", dev));
-+    zprintf(1, "opened camera device %s (fd=%d)\n", dev, vdo->fd);
-+
-+    int rc = -1;
-+#ifdef HAVE_LINUX_VIDEODEV2_H
-+    if(vdo->intf != VIDEO_V4L1)
-+        rc = _zbar_v4l2_probe(vdo);
-+#endif
-+#ifdef HAVE_LINUX_VIDEODEV_H
-+    if(rc && vdo->intf != VIDEO_V4L2)
-+        rc = _zbar_v4l1_probe(vdo);
-+#endif
-+
-+    if(rc && vdo->fd >= 0) {
-+        close(vdo->fd);
-+        vdo->fd = -1;
-+    }
-+    return(rc);
-+}
-diff -r 563557a923d0 zbar/video/v4l1.c
---- a/zbar/video/v4l1.c	Tue Oct 27 11:25:59 2009 -0400
-+++ b/zbar/video/v4l1.c	Fri Feb 22 08:54:29 2013 -0300
-@@ -1,5 +1,5 @@
- /*------------------------------------------------------------------------
-- *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+ *  Copyright 2007-2011 (c) Jeff Brown <spadix@users.sourceforge.net>
-  *
-  *  This file is part of the ZBar Bar Code Reader.
-  *
-@@ -46,8 +46,6 @@
- #include "video.h"
- #include "image.h"
- 
--extern int _zbar_v4l2_probe(zbar_video_t*);
--
- typedef struct v4l1_format_s {
-     uint32_t format;
-     uint8_t bpp;
-@@ -371,7 +369,7 @@
-     return(0);
- }
- 
--static int _zbar_v4l1_probe (zbar_video_t *vdo)
-+int _zbar_v4l1_probe (zbar_video_t *vdo)
- {
-     /* check capabilities */
-     struct video_capability vcap;
-@@ -407,29 +405,3 @@
-     vdo->dq = v4l1_dq;
-     return(0);
- }
--
--int _zbar_video_open (zbar_video_t *vdo,
--                      const char *dev)
--{
--    vdo->fd = open(dev, O_RDWR);
--    if(vdo->fd < 0)
--        return(err_capture_str(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
--                               "opening video device '%s'", dev));
--    zprintf(1, "opened camera device %s (fd=%d)\n", dev, vdo->fd);
--
--    int rc = -1;
--#ifdef HAVE_LINUX_VIDEODEV2_H
--    if(vdo->intf != VIDEO_V4L1)
--        rc = _zbar_v4l2_probe(vdo);
--    if(rc)
--#else
--    zprintf(1, "WARNING: not compiled with v4l2 support, trying v4l1\n");
--#endif
--        rc = _zbar_v4l1_probe(vdo);
--
--    if(rc && vdo->fd >= 0) {
--        close(vdo->fd);
--        vdo->fd = -1;
--    }
--    return(rc);
--}
-diff -r 563557a923d0 zbar/window.c
---- a/zbar/window.c	Tue Oct 27 11:25:59 2009 -0400
-+++ b/zbar/window.c	Fri Feb 22 08:54:29 2013 -0300
-@@ -1,5 +1,5 @@
- /*------------------------------------------------------------------------
-- *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-  *
-  *  This file is part of the ZBar Bar Code Reader.
-  *
-@@ -23,8 +23,11 @@
- 
- #include "window.h"
- #include "image.h"
-+#include "timer.h"
- #include <time.h>       /* clock_gettime */
--#include <sys/time.h>   /* gettimeofday */
-+#ifdef HAVE_SYS_TIME_H
-+# include <sys/time.h>   /* gettimeofday */
-+#endif
- 
- zbar_window_t *zbar_window_create ()
- {
-@@ -117,20 +120,11 @@
- 
-     if(w->overlay >= 2) {
-         /* calculate/display frame rate */
--        unsigned long time;
--#if _POSIX_TIMERS > 0
--        struct timespec abstime;
--        clock_gettime(CLOCK_REALTIME, &abstime);
--        time = (abstime.tv_sec * 1000) + ((abstime.tv_nsec / 500000) + 1) / 2;
--#else
--        struct timeval abstime;
--        gettimeofday(&abstime, NULL);
--        time = (abstime.tv_sec * 1000) + ((abstime.tv_usec / 500) + 1) / 2;
--#endif
--        point_t p = { -8, -1 };
--        char text[32];
-+        unsigned long time = _zbar_timer_now();
-         if(w->time) {
-             int avg = w->time_avg = (w->time_avg + time - w->time) / 2;
-+            point_t p = { -8, -1 };
-+            char text[32];
-             sprintf(text, "%d.%01d fps", 1000 / avg, (10000 / avg) % 10);
-             _zbar_window_draw_text(w, 3, p, text);
-         }
-@@ -141,6 +135,8 @@
- 
- inline int zbar_window_redraw (zbar_window_t *w)
- {
-+    int rc = 0;
-+    zbar_image_t *img;
-     if(window_lock(w))
-         return(-1);
-     if(!w->display || _zbar_window_begin(w)) {
-@@ -148,8 +144,7 @@
-         return(-1);
-     }
- 
--    int rc = 0;
--    zbar_image_t *img = w->image;
-+    img = w->image;
-     if(w->init && w->draw_image && img) {
-         int format_change = (w->src_format != img->format &&
-                              w->format != img->format);
-@@ -163,6 +158,7 @@
-         }
- 
-         if(!rc && (format_change || !w->scaled_size.x || !w->dst_width)) {
-+            point_t size = { w->width, w->height };
-             zprintf(24, "init: src=%.4s(%08x) %dx%d dst=%.4s(%08x) %dx%d\n",
-                     (char*)&w->src_format, w->src_format,
-                     w->src_width, w->src_height,
-@@ -173,7 +169,6 @@
-                 w->src_height = img->height;
-             }
- 
--            point_t size = { w->width, w->height };
-             if(size.x > w->max_width)
-                 size.x = w->max_width;
-             if(size.y > w->max_height)
-@@ -226,9 +221,10 @@
-         }
- 
-         if(!rc) {
-+            point_t org;
-             rc = w->draw_image(w, img);
- 
--            point_t org = w->scaled_offset;
-+            org = w->scaled_offset;
-             if(org.x > 0) {
-                 point_t p = { 0, org.y };
-                 point_t s = { org.x, w->scaled_size.y };
-@@ -300,9 +296,10 @@
- int zbar_window_get_overlay (const zbar_window_t *w)
- {
-     zbar_window_t *ncw = (zbar_window_t*)w;
-+    int lvl;
-     if(window_lock(ncw))
-         return(-1);
--    int lvl = w->overlay;
-+    lvl = w->overlay;
-     (void)window_unlock(ncw);
-     return(lvl);
- }
-diff -r 563557a923d0 zbarcam/zbarcam.c
---- a/zbarcam/zbarcam.c	Tue Oct 27 11:25:59 2009 -0400
-+++ b/zbarcam/zbarcam.c	Fri Feb 22 08:54:29 2013 -0300
-@@ -105,17 +105,27 @@
-         if(type == ZBAR_PARTIAL)
-             continue;
- 
--        if(!format)
--            printf("%s%s:%s\n",
--                   zbar_get_symbol_name(type), zbar_get_addon_name(type),
--                   zbar_symbol_get_data(sym));
--        else if(format == RAW)
--            printf("%s\n", zbar_symbol_get_data(sym));
-+        if(!format) {
-+            printf("%s:", zbar_get_symbol_name(type));
-+            if(fwrite(zbar_symbol_get_data(sym),
-+                      zbar_symbol_get_data_length(sym),
-+                      1, stdout) != 1)
-+                continue;
-+        }
-+        else if(format == RAW) {
-+            if(fwrite(zbar_symbol_get_data(sym),
-+                      zbar_symbol_get_data_length(sym),
-+                      1, stdout) != 1)
-+                continue;
-+        }
-         else if(format == XML) {
-             if(!n)
-                 printf("<index num='%u'>\n", zbar_image_get_sequence(img));
--            printf("%s\n", zbar_symbol_xml(sym, &xml_buf, &xml_len));
-+            zbar_symbol_xml(sym, &xml_buf, &xml_len);
-+            if(fwrite(xml_buf, xml_len, 1, stdout) != 1)
-+                continue;
-         }
-+        printf("\n");
-         n++;
-     }
- 
-diff -r 563557a923d0 zbarcam/zbarcam.rc
---- a/zbarcam/zbarcam.rc	Tue Oct 27 11:25:59 2009 -0400
-+++ b/zbarcam/zbarcam.rc	Fri Feb 22 08:54:29 2013 -0300
-@@ -19,7 +19,7 @@
- 
-             VALUE "FileDescription", "Scan bar codes from video devices"
- 
--            VALUE "LegalCopyright", "Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>"
-+            VALUE "LegalCopyright", "Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>"
-         }
-     }
-     BLOCK "VarFileInfo" {
-diff -r 563557a923d0 zbarimg/Makefile.am.inc
---- a/zbarimg/Makefile.am.inc	Tue Oct 27 11:25:59 2009 -0400
-+++ b/zbarimg/Makefile.am.inc	Fri Feb 22 08:54:29 2013 -0300
-@@ -12,10 +12,10 @@
- 
- EXTRA_DIST += test/barcodetest.py
- 
--check-local:
-+check-images: zbarimg/zbarimg
- 	$(PYTHON) $(srcdir)/test/barcodetest.py
- 
--regress:
-+regress-images: zbarimg/zbarimg
- 	suite='$(ZBAR_TESTS)'; \
- 	if test "x$$suite" = "x"; then suite='http://zbar.sf.net/test'; fi ; \
- 	$(PYTHON) $(srcdir)/test/barcodetest.py $$suite
-diff -r 563557a923d0 zbarimg/zbarimg.c
---- a/zbarimg/zbarimg.c	Tue Oct 27 11:25:59 2009 -0400
-+++ b/zbarimg/zbarimg.c	Fri Feb 22 08:54:29 2013 -0300
-@@ -1,5 +1,5 @@
- /*------------------------------------------------------------------------
-- *  Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
-+ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
-  *
-  *  This file is part of the ZBar Bar Code Reader.
-  *
-@@ -38,15 +38,29 @@
- #include <assert.h>
- 
- #include <zbar.h>
--#include <wand/MagickWand.h>
-+
-+#ifdef HAVE_GRAPHICSMAGICK
-+# include <wand/wand_api.h>
-+#endif
-+
-+#ifdef HAVE_IMAGEMAGICK
-+# include <wand/MagickWand.h>
-+
-+/* ImageMagick frequently changes API names - just use the original
-+ * (more stable?) names to match GraphicsMagick
-+ */
-+# define InitializeMagick(f) MagickWandGenesis()
-+# define DestroyMagick MagickWandTerminus
-+# define MagickSetImageIndex MagickSetIteratorIndex
- 
- /* in 6.4.5.4 MagickGetImagePixels changed to MagickExportImagePixels.
-  * (still not sure this check is quite right...
-  *  how does MagickGetAuthenticImagePixels fit in?)
-  * ref http://bugs.gentoo.org/247292
-  */
--#if MagickLibVersion < 0x645
--# define MagickExportImagePixels MagickGetImagePixels
-+# if MagickLibVersion > 0x645
-+#  define MagickGetImagePixels MagickExportImagePixels
-+# endif
- #endif
- 
- static const char *note_usage =
-@@ -76,8 +90,9 @@
-     "  things to check:\n"
-     "    - is the barcode type supported?"
-     "  currently supported symbologies are:\n"
--    "      EAN/UPC (EAN-13, EAN-8, UPC-A, UPC-E, ISBN-10, ISBN-13),\n"
--    "      Code 128, Code 39 and Interleaved 2 of 5\n"
-+    "      EAN/UPC (EAN-13, EAN-8, EAN-2, EAN-5, UPC-A, UPC-E,\n"
-+    "      ISBN-10, ISBN-13), Code 128, Code 93, Code 39, Codabar,\n"
-+    "      DataBar, DataBar Expanded, and Interleaved 2 of 5\n"
-     "    - is the barcode large enough in the image?\n"
-     "    - is the barcode mostly in focus?\n"
-     "    - is there sufficient contrast/illumination?\n"
-@@ -132,12 +147,12 @@
-         if(exit_code == 3)
-             return(-1);
- 
--        if(!MagickSetIteratorIndex(images, seq) && dump_error(images))
-+        if(!MagickSetImageIndex(images, seq) && dump_error(images))
-             return(-1);
- 
-         zbar_image_t *zimage = zbar_image_create();
-         assert(zimage);
--        zbar_image_set_format(zimage, *(unsigned long*)"Y800");
-+        zbar_image_set_format(zimage, zbar_fourcc('Y','8','0','0'));
- 
-         int width = MagickGetImageWidth(images);
-         int height = MagickGetImageHeight(images);
-@@ -150,8 +165,8 @@
-         unsigned char *blob = malloc(bloblen);
-         zbar_image_set_data(zimage, blob, bloblen, zbar_image_free_data);
- 
--        if(!MagickExportImagePixels(images, 0, 0, width, height,
--                                    "I", CharPixel, blob))
-+        if(!MagickGetImagePixels(images, 0, 0, width, height,
-+                                 "I", CharPixel, blob))
-             return(-1);
- 
-         if(xmllvl == 1) {
-@@ -165,23 +180,30 @@
-         const zbar_symbol_t *sym = zbar_image_first_symbol(zimage);
-         for(; sym; sym = zbar_symbol_next(sym)) {
-             zbar_symbol_type_t typ = zbar_symbol_get_type(sym);
-+            unsigned len = zbar_symbol_get_data_length(sym);
-             if(typ == ZBAR_PARTIAL)
-                 continue;
--            else if(!xmllvl)
--                printf("%s%s:%s\n",
--                       zbar_get_symbol_name(typ),
--                       zbar_get_addon_name(typ),
--                       zbar_symbol_get_data(sym));
--            else if(xmllvl < 0)
--                printf("%s\n", zbar_symbol_get_data(sym));
-+            else if(xmllvl <= 0) {
-+                if(!xmllvl)
-+                    printf("%s:", zbar_get_symbol_name(typ));
-+                if(len &&
-+                   fwrite(zbar_symbol_get_data(sym), len, 1, stdout) != 1) {
-+                    exit_code = 1;
-+                    return(-1);
-+                }
-+            }
-             else {
-                 if(xmllvl < 3) {
-                     xmllvl++;
-                     printf("<index num='%u'>\n", seq);
-                 }
-                 zbar_symbol_xml(sym, &xmlbuf, &xmlbuflen);
--                printf("%s\n", xmlbuf);
-+                if(fwrite(xmlbuf, xmlbuflen, 1, stdout) != 1) {
-+                    exit_code = 1;
-+                    return(-1);
-+                }
-             }
-+            printf("\n");
-             found++;
-             num_symbols++;
-         }
-@@ -247,7 +269,7 @@
-     int i, j;
-     for(i = 1; i < argc; i++) {
-         const char *arg = argv[i];
--        if(arg[0] != '-')
-+        if(arg[0] != '-' || !arg[1])
-             // first pass, skip images
-             num_images++;
-         else if(arg[1] != '-')
-@@ -304,7 +326,7 @@
-         return(usage(1, "ERROR: specify image file(s) to scan", NULL));
-     num_images = 0;
- 
--    MagickWandGenesis();
-+    InitializeMagick("zbarimg");
- 
-     processor = zbar_processor_create(0);
-     assert(processor);
-@@ -318,7 +340,7 @@
-         if(!arg)
-             continue;
- 
--        if(arg[0] != '-') {
-+        if(arg[0] != '-' || !arg[1]) {
-             if(scan_image(arg))
-                 return(exit_code);
-         }
-@@ -417,6 +439,6 @@
-         exit_code = 4;
- 
-     zbar_processor_destroy(processor);
--    MagickWandTerminus();
-+    DestroyMagick();
-     return(exit_code);
- }
-diff -r 563557a923d0 zbarimg/zbarimg.rc
---- a/zbarimg/zbarimg.rc	Tue Oct 27 11:25:59 2009 -0400
-+++ b/zbarimg/zbarimg.rc	Fri Feb 22 08:54:29 2013 -0300
-@@ -19,7 +19,7 @@
- 
-             VALUE "FileDescription", "Scan bar codes from image files"
- 
--            VALUE "LegalCopyright", "Copyright 2007-2009 (c) Jeff Brown <spadix@users.sourceforge.net>"
-+            VALUE "LegalCopyright", "Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>"
-         }
-     }
-     BLOCK "VarFileInfo" {
diff --git a/zbar_use_REQBUFS_properly.patch b/zbar_use_REQBUFS_properly.patch
deleted file mode 100644
index b1793d8..0000000
--- a/zbar_use_REQBUFS_properly.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From a8ed8c04c119e5a323a2c79fcd0d28b4d29fc28a Mon Sep 17 00:00:00 2001
-From: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
-Date: Thu, 23 Apr 2015 22:56:09 -0300
-Subject: [PATCH] v4l2: use REQBUFS properly
-
-There are two issues on this driver with regards to buffer
-request:
-
-1) it is not calling VIDIOC_REQBUFS for USERPTR;
-
-2) It is calling VIDIOC_REQBUFS at probe, to check the max
-   number of supported buffers, but it doesn't deallocate
-   the buffers at the end of the probe function.
-
-Fix those issues. Also, improve the error/warning messages
-associated with possible problems.
-
-This is based on the issues detected by the patch proposed
-to fix this bug:
-	https://bugs.archlinux.org/task/44091
-
-Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
-
-diff --git a/zbar/video/v4l2.c b/zbar/video/v4l2.c
-index aabd16643ddc..f6662d3707f9 100644
---- a/zbar/video/v4l2.c
-+++ b/zbar/video/v4l2.c
-@@ -201,21 +201,6 @@ static int v4l2_cleanup (zbar_video_t *vdo)
- 
- static int v4l2_mmap_buffers (zbar_video_t *vdo)
- {
--    struct v4l2_requestbuffers rb;
--    memset(&rb, 0, sizeof(rb));
--    rb.count = vdo->num_images;
--    rb.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
--    rb.memory = V4L2_MEMORY_MMAP;
--    if(v4l2_ioctl(vdo->fd, VIDIOC_REQBUFS, &rb) < 0)
--        return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
--                           "requesting video frame buffers (VIDIOC_REQBUFS)"));
--    zprintf(1, "mapping %u buffers (of %d requested)\n",
--            rb.count, vdo->num_images);
--    if(!rb.count)
--        return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_INVALID, __func__,
--                           "driver returned 0 buffers"));
--    if(vdo->num_images > rb.count)
--        vdo->num_images = rb.count;
- 
-     struct v4l2_buffer vbuf;
-     memset(&vbuf, 0, sizeof(vbuf));
-@@ -313,8 +298,32 @@ static int v4l2_set_format (zbar_video_t *vdo,
- static int v4l2_init (zbar_video_t *vdo,
-                       uint32_t fmt)
- {
-+    struct v4l2_requestbuffers rb;
-     if(v4l2_set_format(vdo, fmt))
-         return(-1);
-+
-+    memset(&rb, 0, sizeof(rb));
-+    rb.count = vdo->num_images;
-+    rb.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-+    if(vdo->iomode == VIDEO_MMAP)
-+        rb.memory = V4L2_MEMORY_MMAP;
-+    else
-+        rb.memory = V4L2_MEMORY_USERPTR;
-+
-+    if(v4l2_ioctl(vdo->fd, VIDIOC_REQBUFS, &rb) < 0)
-+        return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
-+                           "requesting video frame buffers (VIDIOC_REQBUFS)"));
-+
-+    if(!rb.count)
-+        return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_INVALID, __func__,
-+                           "driver returned 0 buffers"));
-+
-+    if(vdo->num_images > rb.count)
-+        vdo->num_images = rb.count;
-+
-+    zprintf(1, "using %u buffers (of %d requested)\n",
-+            rb.count, vdo->num_images);
-+
-     if(vdo->iomode == VIDEO_MMAP)
-         return(v4l2_mmap_buffers(vdo));
-     return(0);
-@@ -324,7 +333,7 @@ static int v4l2_probe_iomode (zbar_video_t *vdo)
- {
-     struct v4l2_requestbuffers rb;
-     memset(&rb, 0, sizeof(rb));
--    rb.count = vdo->num_images; /* FIXME workaround broken drivers */
-+    rb.count = vdo->num_images;
-     rb.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-     if(vdo->iomode == VIDEO_MMAP)
-         rb.memory = V4L2_MEMORY_MMAP;
-@@ -340,14 +349,31 @@ static int v4l2_probe_iomode (zbar_video_t *vdo)
-             return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
-                                "querying streaming mode (VIDIOC_REQBUFS)"));
- #ifdef HAVE_SYS_MMAN_H
-+	err_capture(vdo, SEV_WARNING, ZBAR_ERR_SYSTEM, __func__,
-+                               "USERPTR failed. Falling back to mmap");
-         vdo->iomode = VIDEO_MMAP;
-+#else
-+	return err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
-+                           "Userptr not supported, and zbar was compiled without mmap support"));
- #endif
-     }
-     else {
-         if(!vdo->iomode)
--            vdo->iomode = VIDEO_USERPTR;
-+            rb.memory = V4L2_MEMORY_USERPTR;
-+	/* Update the num_images with the max supported by the driver */
-         if(rb.count)
-             vdo->num_images = rb.count;
-+	else
-+            err_capture(vdo, SEV_WARNING, ZBAR_ERR_SYSTEM, __func__,
-+                        "Something is wrong: number of buffers returned by REQBUF is zero!");
-+
-+        /* requesting 0 buffers
-+         * This cleans up the buffers allocated previously on probe
-+         */
-+	rb.count = 0;
-+        if(v4l2_ioctl(vdo->fd, VIDIOC_REQBUFS, &rb) < 0)
-+            err_capture(vdo, SEV_WARNING, ZBAR_ERR_SYSTEM, __func__,
-+                        "releasing video frame buffers (VIDIOC_REQBUFS)");
-     }
-     return(0);
- }
diff --git a/zbar_use_libv4l.patch b/zbar_use_libv4l.patch
deleted file mode 100644
index 3552504..0000000
--- a/zbar_use_libv4l.patch
+++ /dev/null
@@ -1,305 +0,0 @@
-diff -r 38e78368283d configure.ac
---- a/configure.ac	Sun Oct 14 23:02:08 2012 -0700
-+++ b/configure.ac	Fri Feb 22 10:04:52 2013 -0300
-@@ -3,7 +3,8 @@
- AC_INIT([zbar], [0.10], [spadix@users.sourceforge.net])
- AC_CONFIG_AUX_DIR(config)
- AC_CONFIG_MACRO_DIR(config)
--AM_INIT_AUTOMAKE([1.10 -Wall -Werror foreign subdir-objects std-options dist-bzip2])
-+AM_INIT_AUTOMAKE([1.10 -Werror foreign subdir-objects std-options dist-bzip2])
-+AM_PROG_AR
- AC_CONFIG_HEADERS([include/config.h])
- AC_CONFIG_SRCDIR(zbar/scanner.c)
- LT_PREREQ([2.2])
-@@ -47,7 +48,7 @@
-   [Library revision])
- 
- AM_CPPFLAGS="-I$srcdir/include"
--AM_CFLAGS="-Wall -Wno-parentheses -Werror"
-+AM_CFLAGS="-Wall -Wno-parentheses"
- AM_CXXFLAGS="$AM_CFLAGS"
- AC_SUBST([AM_CPPFLAGS])
- AC_SUBST([AM_CFLAGS])
-@@ -179,11 +180,13 @@
- 
- have_v4l1="no"
- have_v4l2="no"
-+have_libv4l="no"
- AS_IF([test "x$enable_video" = "xno"],
-   [],
-   [test "x$win32" = "xno"],
-   [AC_CHECK_HEADERS([linux/videodev.h], [have_v4l1="yes"])
-    AC_CHECK_HEADERS([linux/videodev2.h], [have_v4l2="yes"])
-+   AC_CHECK_HEADERS([libv4l2.h], [have_libv4l="yes"])
-    AS_IF([test "x$have_v4l2" = "xno" && test "x$have_v4l1" = "xno"],
-      [AC_MSG_FAILURE([test for video support failed!
- rebuild your kernel to include video4linux support or
-@@ -194,9 +197,15 @@
-     [AC_MSG_FAILURE([test for VfW video support failed!
- configure --disable-video to skip building video support.])])])
- 
-+AS_IF([test "x$have_libv4l" = "xyes"],
-+   AC_CHECK_LIB([v4l2], [v4l2_open], [],
-+     [AC_MSG_FAILURE([unable to find libv4l.so])]),
-+  [AC_MSG_WARN([libv4l not detected. Install it to support more cameras!])])
-+
- AM_CONDITIONAL([HAVE_VIDEO], [test "x$enable_video" != "xno"])
- AM_CONDITIONAL([HAVE_V4L1], [test "x$have_v4l1" != "xno"])
- AM_CONDITIONAL([HAVE_V4L2], [test "x$have_v4l2" != "xno"])
-+AM_CONDITIONAL([HAVE_LIBV4L], [test "x$have_libv4l" != "xno"])
- 
- dnl X
- AC_ARG_VAR([XSHM_LIBS], [linker flags for X shared memory extension])
-@@ -571,6 +580,8 @@
- echo "v4l               --enable-video=$enable_video"
- AS_IF([test "x$enable_video" != "xyes"],
-   [echo "        => zbarcam video scanner will *NOT* be built"])
-+AS_IF([test "x$have_libv4l" != "xyes"],
-+  [echo "        => libv4l will *NOT* be used"])
- echo "jpeg              --with-jpeg=$with_jpeg"
- AS_IF([test "x$with_jpeg" != "xyes"],
-   [echo "        => JPEG image conversions will *NOT* be supported"])
-diff -r 38e78368283d zbar/video/v4l.c
---- a/zbar/video/v4l.c	Sun Oct 14 23:02:08 2012 -0700
-+++ b/zbar/video/v4l.c	Fri Feb 22 10:04:52 2013 -0300
-@@ -34,6 +34,13 @@
- #ifdef HAVE_UNISTD_H
- # include <unistd.h>
- #endif
-+#ifdef HAVE_LIBV4L2_H
-+# include <fcntl.h>
-+# include <libv4l2.h>
-+#else
-+# define v4l2_open open
-+# define v4l2_close close
-+#endif
- 
- #include "video.h"
- 
-@@ -43,7 +50,7 @@
- int _zbar_video_open (zbar_video_t *vdo,
-                       const char *dev)
- {
--    vdo->fd = open(dev, O_RDWR);
-+    vdo->fd = v4l2_open(dev, O_RDWR);
-     if(vdo->fd < 0)
-         return(err_capture_str(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
-                                "opening video device '%s'", dev));
-@@ -60,7 +67,7 @@
- #endif
- 
-     if(rc && vdo->fd >= 0) {
--        close(vdo->fd);
-+        v4l2_close(vdo->fd);
-         vdo->fd = -1;
-     }
-     return(rc);
-diff -r 38e78368283d zbar/video/v4l2.c
---- a/zbar/video/v4l2.c	Sun Oct 14 23:02:08 2012 -0700
-+++ b/zbar/video/v4l2.c	Fri Feb 22 10:04:52 2013 -0300
-@@ -38,6 +38,15 @@
- #ifdef HAVE_SYS_MMAN_H
- # include <sys/mman.h>
- #endif
-+#ifdef HAVE_LIBV4L2_H
-+# include <fcntl.h>
-+# include <libv4l2.h>
-+#else
-+# define v4l2_close close
-+# define v4l2_ioctl ioctl
-+# define v4l2_mmap mmap
-+# define v4l2_munmap munmap
-+#endif
- #include <linux/videodev2.h>
- 
- #include "video.h"
-@@ -67,7 +76,7 @@
-         vbuf.length = img->datalen;
-         vbuf.index = img->srcidx; /* FIXME workaround broken drivers */
-     }
--    if(ioctl(vdo->fd, VIDIOC_QBUF, &vbuf) < 0)
-+    if(v4l2_ioctl(vdo->fd, VIDIOC_QBUF, &vbuf) < 0)
-         return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
-                            "queuing video buffer (VIDIOC_QBUF)"));
-     return(0);
-@@ -91,7 +100,7 @@
-         else
-             vbuf.memory = V4L2_MEMORY_USERPTR;
- 
--        if(ioctl(fd, VIDIOC_DQBUF, &vbuf) < 0)
-+        if(v4l2_ioctl(fd, VIDIOC_DQBUF, &vbuf) < 0)
-             return(NULL);
- 
-         if(iomode == VIDEO_MMAP) {
-@@ -132,7 +141,7 @@
-         return(0);
- 
-     enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
--    if(ioctl(vdo->fd, VIDIOC_STREAMON, &type) < 0)
-+    if(v4l2_ioctl(vdo->fd, VIDIOC_STREAMON, &type) < 0)
-         return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
-                            "starting video stream (VIDIOC_STREAMON)"));
-     return(0);
-@@ -144,7 +153,7 @@
-         return(0);
- 
-     enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
--    if(ioctl(vdo->fd, VIDIOC_STREAMOFF, &type) < 0)
-+    if(v4l2_ioctl(vdo->fd, VIDIOC_STREAMOFF, &type) < 0)
-         return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
-                            "stopping video stream (VIDIOC_STREAMOFF)"));
-     return(0);
-@@ -164,7 +173,7 @@
-         for(i = 0; i < vdo->num_images; i++) {
-             zbar_image_t *img = vdo->images[i];
-             if(img->data &&
--               munmap((void*)img->data, img->datalen))
-+               v4l2_munmap((void*)img->data, img->datalen))
-                 err_capture(vdo, SEV_WARNING, ZBAR_ERR_SYSTEM, __func__,
-                             "unmapping video frame buffers");
-             img->data = NULL;
-@@ -177,14 +186,14 @@
-     /* requesting 0 buffers
-      * should implicitly disable streaming
-      */
--    if(ioctl(vdo->fd, VIDIOC_REQBUFS, &rb) < 0)
-+    if(v4l2_ioctl(vdo->fd, VIDIOC_REQBUFS, &rb) < 0)
-         err_capture(vdo, SEV_WARNING, ZBAR_ERR_SYSTEM, __func__,
-                     "releasing video frame buffers (VIDIOC_REQBUFS)");
- 
- 
--    /* close open device */
-+    /* v4l2_close v4l2_open device */
-     if(vdo->fd >= 0) {
--        close(vdo->fd);
-+        v4l2_close(vdo->fd);
-         vdo->fd = -1;
-     }
-     return(0);
-@@ -197,7 +206,7 @@
-     rb.count = vdo->num_images;
-     rb.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-     rb.memory = V4L2_MEMORY_MMAP;
--    if(ioctl(vdo->fd, VIDIOC_REQBUFS, &rb) < 0)
-+    if(v4l2_ioctl(vdo->fd, VIDIOC_REQBUFS, &rb) < 0)
-         return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
-                            "requesting video frame buffers (VIDIOC_REQBUFS)"));
-     zprintf(1, "mapping %u buffers (of %d requested)\n",
-@@ -216,7 +225,7 @@
-     int i;
-     for(i = 0; i < vdo->num_images; i++) {
-         vbuf.index = i;
--        if(ioctl(vdo->fd, VIDIOC_QUERYBUF, &vbuf) < 0)
-+        if(v4l2_ioctl(vdo->fd, VIDIOC_QUERYBUF, &vbuf) < 0)
-             /* FIXME cleanup */
-             return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
-                                "querying video buffer (VIDIOC_QUERYBUF)"));
-@@ -229,7 +238,7 @@
- 
-         zbar_image_t *img = vdo->images[i];
-         img->datalen = vbuf.length;
--        img->data = mmap(NULL, vbuf.length, PROT_READ | PROT_WRITE, MAP_SHARED,
-+        img->data = v4l2_mmap(NULL, vbuf.length, PROT_READ | PROT_WRITE, MAP_SHARED,
-                          vdo->fd, vbuf.m.offset);
-         if(img->data == MAP_FAILED)
-             /* FIXME cleanup */
-@@ -253,7 +262,7 @@
-     vpix->pixelformat = fmt;
-     vpix->field = V4L2_FIELD_NONE;
-     int rc = 0;
--    if((rc = ioctl(vdo->fd, VIDIOC_S_FMT, &vfmt)) < 0) {
-+    if((rc = v4l2_ioctl(vdo->fd, VIDIOC_S_FMT, &vfmt)) < 0) {
-         /* several broken drivers return an error if we request
-          * no interlacing (NB v4l2 spec violation)
-          * ...try again with an interlaced request
-@@ -264,7 +273,7 @@
-         /* FIXME this might be _ANY once we can de-interlace */
-         vpix->field = V4L2_FIELD_INTERLACED;
- 
--        if(ioctl(vdo->fd, VIDIOC_S_FMT, &vfmt) < 0)
-+        if(v4l2_ioctl(vdo->fd, VIDIOC_S_FMT, &vfmt) < 0)
-             return(err_capture_int(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
-                                    "setting format %x (VIDIOC_S_FMT)", fmt));
- 
-@@ -276,7 +285,7 @@
-     struct v4l2_pix_format *newpix = &newfmt.fmt.pix;
-     memset(&newfmt, 0, sizeof(newfmt));
-     newfmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
--    if(ioctl(vdo->fd, VIDIOC_G_FMT, &newfmt) < 0)
-+    if(v4l2_ioctl(vdo->fd, VIDIOC_G_FMT, &newfmt) < 0)
-         return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
-                            "querying format (VIDIOC_G_FMT)"));
- 
-@@ -322,7 +331,7 @@
-     else
-         rb.memory = V4L2_MEMORY_USERPTR;
- 
--    if(ioctl(vdo->fd, VIDIOC_REQBUFS, &rb) < 0) {
-+    if(v4l2_ioctl(vdo->fd, VIDIOC_REQBUFS, &rb) < 0) {
-         if(vdo->iomode)
-             return(err_capture_int(vdo, SEV_ERROR, ZBAR_ERR_INVALID, __func__,
-                                    "unsupported iomode requested (%d)",
-@@ -350,7 +359,7 @@
-     memset(&desc, 0, sizeof(desc));
-     desc.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-     for(desc.index = 0; desc.index < V4L2_FORMATS_MAX; desc.index++) {
--        if(ioctl(vdo->fd, VIDIOC_ENUM_FMT, &desc) < 0)
-+        if(v4l2_ioctl(vdo->fd, VIDIOC_ENUM_FMT, &desc) < 0)
-             break;
-         zprintf(2, "    [%d] %.4s : %s%s\n",
-                 desc.index, (char*)&desc.pixelformat, desc.description,
-@@ -368,7 +377,7 @@
-     struct v4l2_pix_format *pix = &fmt.fmt.pix;
-     memset(&fmt, 0, sizeof(fmt));
-     fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
--    if(ioctl(vdo->fd, VIDIOC_G_FMT, &fmt) < 0)
-+    if(v4l2_ioctl(vdo->fd, VIDIOC_G_FMT, &fmt) < 0)
-         return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
-                            "querying current video format (VIDIO_G_FMT)"));
- 
-@@ -390,15 +399,15 @@
-     maxpix->height = vdo->height;
- 
-     zprintf(1, "setting requested size: %d x %d\n", vdo->width, vdo->height);
--    if(ioctl(vdo->fd, VIDIOC_S_FMT, &maxfmt) < 0) {
-+    if(v4l2_ioctl(vdo->fd, VIDIOC_S_FMT, &maxfmt) < 0) {
-         zprintf(1, "set FAILED...trying to recover original format\n");
-         /* ignore errors (driver broken anyway) */
--        ioctl(vdo->fd, VIDIOC_S_FMT, &fmt);
-+        v4l2_ioctl(vdo->fd, VIDIOC_S_FMT, &fmt);
-     }
- 
-     memset(&fmt, 0, sizeof(fmt));
-     fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
--    if(ioctl(vdo->fd, VIDIOC_G_FMT, &fmt) < 0)
-+    if(v4l2_ioctl(vdo->fd, VIDIOC_G_FMT, &fmt) < 0)
-         return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
-                            "querying current video format (VIDIOC_G_FMT)"));
- 
-@@ -420,7 +429,7 @@
-     struct v4l2_cropcap ccap;
-     memset(&ccap, 0, sizeof(ccap));
-     ccap.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
--    if(ioctl(vdo->fd, VIDIOC_CROPCAP, &ccap) < 0)
-+    if(v4l2_ioctl(vdo->fd, VIDIOC_CROPCAP, &ccap) < 0)
-         return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
-                            "querying crop support (VIDIOC_CROPCAP)"));
- 
-@@ -442,7 +451,7 @@
-     memset(&crop, 0, sizeof(crop));
-     crop.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-     crop.c = ccap.defrect;
--    if(ioctl(vdo->fd, VIDIOC_S_CROP, &crop) < 0 && errno != EINVAL)
-+    if(v4l2_ioctl(vdo->fd, VIDIOC_S_CROP, &crop) < 0 && errno != EINVAL)
-         return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
-                            "setting default crop window (VIDIOC_S_CROP)"));
-     return(0);
-@@ -453,7 +462,7 @@
-     /* check capabilities */
-     struct v4l2_capability vcap;
-     memset(&vcap, 0, sizeof(vcap));
--    if(ioctl(vdo->fd, VIDIOC_QUERYCAP, &vcap) < 0)
-+    if(v4l2_ioctl(vdo->fd, VIDIOC_QUERYCAP, &vcap) < 0)
-         return(err_capture(vdo, SEV_WARNING, ZBAR_ERR_UNSUPPORTED, __func__,
-                            "video4linux version 2 not supported (VIDIOC_QUERYCAP)"));
- 

From c3e7934c3e82503a55bc43e89cf5e5ca59368633 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Date: Tue, 7 Aug 2018 17:14:41 -0300
Subject: [PATCH 058/108] zbar: fix build with Fedora 29

There is a bug at pygobject-codegen-2.0 related to its dependency
on having a working /usr/bin/python with prevents zbar to be built.

Add a hack to make it work.

While here, update it to reflect the latest changes at zbar
upstream.

Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
---
 sources                                      |   2 +-
 zbar.spec                                    |  12 +-
 zbar_fedora29_hack_for_codegen_to_work.patch |  94 ++++
 zbar_prefer_pygobject2_codegen.patch         |  25 +
 zbar_set_python_via_env.patch                | 485 ++++++++++++++++++-
 5 files changed, 599 insertions(+), 19 deletions(-)
 create mode 100644 zbar_fedora29_hack_for_codegen_to_work.patch
 create mode 100644 zbar_prefer_pygobject2_codegen.patch

diff --git a/sources b/sources
index 4148b2d..1934c0b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (zbar-0.20.tar.bz2) = d967b250d2bf021aa02583751dc62ffc3f8d220224df1a3644f52eee6d0ec5bd5c5cceb36c3d765a85afafd7a0ba182ed9d8263ef1be1852456687b687de5375
+SHA512 (zbar-0.20.tar.bz2) = a371a655c961e3aa6abb1f5a5c6a43987619a2a4d43e4011c7979c42d94287600dcd5babb5258cfa134fc90905d3fb3c0216b0b38e05de729db13fbf522af886
diff --git a/zbar.spec b/zbar.spec
index 9521cc4..b0ed3c6 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -3,7 +3,7 @@
 
 Name:		zbar
 Version:	0.20
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	Bar code reader
 
 Group:		User Interface/X Hardware Support
@@ -11,7 +11,8 @@ License:	LGPLv2+
 URL:		http://zbar.sourceforge.net/
 Source0:	https://linuxtv.org/downloads/%{name}/%{name}-%{version}.tar.bz2
 Patch0:		zbar_set_python_via_env.patch
-
+Patch1:		zbar_prefer_pygobject2_codegen.patch
+Patch2:		zbar_fedora29_hack_for_codegen_to_work.patch
 
 BuildRequires:	autoconf automake libtool gettext-devel
 BuildRequires:	qt5-qtbase-devel qt5-qtx11extras-devel
@@ -89,7 +90,9 @@ scanning widget.
 
 %prep
 %setup -q
-%patch0
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 autoreconf -vfi
@@ -177,6 +180,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 %{_includedir}/zbar/QZBar*.h
 
 %changelog
+* Tue Ago 07 2018 Mauro Carvalho Chehab <mchehab+samsung@kernel.org> - 0.20.8
+- Fix python 2 dependencies
+
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.20-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
diff --git a/zbar_fedora29_hack_for_codegen_to_work.patch b/zbar_fedora29_hack_for_codegen_to_work.patch
new file mode 100644
index 0000000..1f4d788
--- /dev/null
+++ b/zbar_fedora29_hack_for_codegen_to_work.patch
@@ -0,0 +1,94 @@
+diff --git a/examples/upcrpc.py b/examples/upcrpc.py
+index 2e2a66867c8c..bc0bc8b884c6 100755
+--- a/examples/upcrpc.py
++++ b/examples/upcrpc.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/ env python2
+ from xmlrpclib import ServerProxy
+ import sys, re
+ 
+diff --git a/pygtk/Makefile.am.inc b/pygtk/Makefile.am.inc
+index 433412c8bcb5..33c65ad8975b 100644
+--- a/pygtk/Makefile.am.inc
++++ b/pygtk/Makefile.am.inc
+@@ -18,6 +18,8 @@ pygtk/zbarpygtk.defs: include/zbar/zbargtk.h
+ 	$(SED) -e 's/Z_TYPE_BAR_/ZBAR_TYPE_/' > $@
+ 
+ pygtk/%.c: pygtk/%.defs $(srcdir)/pygtk/zbarpygtk.override
+-	$(PYGTK_CODEGEN) --prefix zbarpygtk \
++	env $(PYGTK_CODEGEN) |sed s,python,python2, > ./codegen.sh
++	chmod 755 ./codegen.sh
++	./codegen.sh --prefix zbarpygtk \
+             --register $(PYGTK_DEFS)/gdk-types.defs \
+ 	    --override $(srcdir)/pygtk/zbarpygtk.override $< > $@
+diff --git a/python/examples/processor.py b/python/examples/processor.py
+index b8f20f053dc6..e0ae92d30ceb 100644
+--- a/python/examples/processor.py
++++ b/python/examples/processor.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/ env python2
+ from sys import argv
+ import zbar
+ 
+diff --git a/python/examples/read_one.py b/python/examples/read_one.py
+index 7a18c9998c0f..3b881e5d133f 100644
+--- a/python/examples/read_one.py
++++ b/python/examples/read_one.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/ env python2
+ from sys import argv
+ import zbar
+ 
+diff --git a/python/examples/scan_image.py b/python/examples/scan_image.py
+index e26cb427064b..8b8bce0323d4 100644
+--- a/python/examples/scan_image.py
++++ b/python/examples/scan_image.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/ env python2
+ from sys import argv
+ import zbar
+ from PIL import Image
+diff --git a/python/setup.py b/python/setup.py
+index f7639c57bd9d..585baf0be43e 100644
+--- a/python/setup.py
++++ b/python/setup.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/ env python2
+ from distutils.core import setup, Extension
+ 
+ setup(
+diff --git a/python/test/test_zbar.py b/python/test/test_zbar.py
+index 5b63de47adb3..b5aad03ca51b 100755
+--- a/python/test/test_zbar.py
++++ b/python/test/test_zbar.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/ env python2
+ import sys, os, re
+ import unittest as ut
+ import zbar
+diff --git a/test/barcodetest.py b/test/barcodetest.py
+index e271f0681116..488df70db7c6 100755
+--- a/test/barcodetest.py
++++ b/test/barcodetest.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/ env python2
+ 
+ import sys, re, unittest as UT, xml.etree.ElementTree as ET
+ from os import path, getcwd
+diff --git a/test/test_pygtk.py b/test/test_pygtk.py
+index 902b8ff62266..ab413894e086 100755
+--- a/test/test_pygtk.py
++++ b/test/test_pygtk.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/ env python2
+ #------------------------------------------------------------------------
+ #  Copyright 2008-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
+ #
diff --git a/zbar_prefer_pygobject2_codegen.patch b/zbar_prefer_pygobject2_codegen.patch
new file mode 100644
index 0000000..bd665f7
--- /dev/null
+++ b/zbar_prefer_pygobject2_codegen.patch
@@ -0,0 +1,25 @@
+commit 4e88270fdf42bd6dcbfeb4130bc9b4edc850211f
+Author: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
+Date:   Tue Aug 7 16:51:23 2018 -0300
+
+    configure.ac: prefer using pygobject-codegen-2.0
+    
+    Get rid of this warning:
+            note: pygtk-codegen-2.0 is deprecated, use pygobject-codegen-2.0 instead
+    
+    Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
+
+diff --git a/configure.ac b/configure.ac
+index 141a3c2ab9f3..67148815097a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -465,7 +465,8 @@ Install the development package for python-$am_cv_python_version, or configure
+ 
+    AS_IF([test "x$with_gtk" = "xyes"],
+      [PKG_CHECK_MODULES([PYGTK], [pygtk-2.0])
+-      AC_CHECK_PROGS([PYGTK_CODEGEN], [pygtk-codegen-2.0 pygtk-codegen], [:])
++      AC_CHECK_PROGS([PYGTK_CODEGEN], [pygobject-codegen-2.0 pygtk-codegen-2.0 pygtk-codegen], [:])
++
+       AS_IF([test "x$PYGTK_H2DEF" = "x"],
+         [PYGTK_H2DEF=`$PKG_CONFIG pygtk-2.0 --variable=codegendir`/h2def.py
+          AS_IF([test -f "$PYGTK_H2DEF"], [], [PYGTK_H2DEF=":"])])
diff --git a/zbar_set_python_via_env.patch b/zbar_set_python_via_env.patch
index 1809460..3c38a89 100644
--- a/zbar_set_python_via_env.patch
+++ b/zbar_set_python_via_env.patch
@@ -1,15 +1,29 @@
-From c750417b3e7c1dc55f2a50fb83fb3713e2f2dde4 Mon Sep 17 00:00:00 2001
-From: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
-Date: Tue, 7 Aug 2018 15:02:11 -0300
-Subject: [PATCH] python: use env to get python's location
+commit c06e7e1940fd089749cebb0d3082ff5fae57c10b
+Author: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
+Date:   Tue Aug 7 15:02:11 2018 -0300
 
-Instead of hardcoding python at /usr/bin, use env to get its
-path.
-
-Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
+    python: Make it work with modern versions of python 2
+    
+    Some of the examples and test code don't work with python 2.7
+    and PIL. Modernize them by running 2to3 and fixing PIL manually.
+    
+    Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
 
+diff --git a/configure.ac b/configure.ac
+index 141a3c2ab9f3..c808dab7e7bd 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -444,7 +444,7 @@ AC_ARG_VAR([PYGTK_CODEGEN], [full path to pygtk-codegen program])
+ AC_ARG_VAR([PYGTK_DEFS], [directory where PyGTK definitions may be found])
+ 
+ AS_IF([test "x$with_python" != "xno"],
+-  [AM_PATH_PYTHON(2.3.5)
++  [AM_PATH_PYTHON(2.7.0)
+    AS_IF([test "x$PYTHON_CFLAGS" != "x"],
+      [],
+      [test "x$PYTHON_CONFIG" != "x" && test -x "$PYTHON_CONFIG"],
 diff --git a/python/examples/processor.py b/python/examples/processor.py
-index 52996d16cf0d..1114c0bf4a3c 100644
+index 52996d16cf0d..b8f20f053dc6 100644
 --- a/python/examples/processor.py
 +++ b/python/examples/processor.py
 @@ -1,4 +1,4 @@
@@ -18,8 +32,24 @@ index 52996d16cf0d..1114c0bf4a3c 100644
  from sys import argv
  import zbar
  
+@@ -19,7 +19,7 @@ def my_handler(proc, image, closure):
+     # extract results
+     for symbol in image.symbols:
+         # do something useful with results
+-        print 'decoded', symbol.type, 'symbol', '"%s"' % symbol.data
++        print('decoded', symbol.type, 'symbol', '"%s"' % symbol.data)
+ 
+ proc.set_data_handler(my_handler)
+ 
+@@ -31,5 +31,5 @@ proc.active = True
+ try:
+     # keep scanning until user provides key/mouse input
+     proc.user_wait()
+-except zbar.WindowClosed, e:
++except zbar.WindowClosed as e:
+     pass
 diff --git a/python/examples/read_one.py b/python/examples/read_one.py
-index 426b9994155e..3e41c438984c 100644
+index 426b9994155e..7a18c9998c0f 100644
 --- a/python/examples/read_one.py
 +++ b/python/examples/read_one.py
 @@ -1,4 +1,4 @@
@@ -28,23 +58,448 @@ index 426b9994155e..3e41c438984c 100644
  from sys import argv
  import zbar
  
+@@ -26,4 +26,4 @@ proc.visible = False
+ # extract results
+ for symbol in proc.results:
+     # do something useful with results
+-    print 'decoded', symbol.type, 'symbol', '"%s"' % symbol.data
++    print('decoded', symbol.type, 'symbol', '"%s"' % symbol.data)
 diff --git a/python/examples/scan_image.py b/python/examples/scan_image.py
-index 2a80759da7b5..8c288631e1fc 100644
+index 2a80759da7b5..e26cb427064b 100644
 --- a/python/examples/scan_image.py
 +++ b/python/examples/scan_image.py
-@@ -1,4 +1,4 @@
+@@ -1,7 +1,7 @@
 -#!/usr/bin/python
 +#!/usr/bin/env python
  from sys import argv
  import zbar
- import Image
+-import Image
++from PIL import Image
+ 
+ if len(argv) < 2: exit(1)
+ 
+@@ -14,7 +14,7 @@ scanner.parse_config('enable')
+ # obtain image data
+ pil = Image.open(argv[1]).convert('L')
+ width, height = pil.size
+-raw = pil.tostring()
++raw = pil.tobytes()
+ 
+ # wrap image data
+ image = zbar.Image(width, height, 'Y800', raw)
+@@ -25,7 +25,7 @@ scanner.scan(image)
+ # extract results
+ for symbol in image:
+     # do something useful with results
+-    print 'decoded', symbol.type, 'symbol', '"%s"' % symbol.data
++    print('decoded', symbol.type, 'symbol', '"%s"' % symbol.data)
+ 
+ # clean up
+ del(image)
 diff --git a/python/test/test_zbar.py b/python/test/test_zbar.py
-index dbe180324378..78d4f041ed9f 100755
+index dbe180324378..5b63de47adb3 100755
 --- a/python/test/test_zbar.py
 +++ b/python/test/test_zbar.py
-@@ -1,4 +1,4 @@
+@@ -1,18 +1,18 @@
 -#!/usr/bin/python
 +#!/usr/bin/env python
  import sys, os, re
  import unittest as ut
  import zbar
+ 
+ # FIXME this needs to be conditional
+ # would be even better to auto-select PIL or ImageMagick (or...)
+-import Image
++from PIL import Image
+ 
+ data = None
+ size = (0, 0)
+ 
+ def load_image():
+     image = Image.open(os.path.join(sys.path[0], "barcode.png")).convert('L')
+-    return(image.tostring(), image.size)
++    return(image.tobytes(), image.size)
+ 
+ # FIXME this could be integrated w/fixture creation
+ (data, size) = load_image()
+@@ -32,17 +32,17 @@ is_identifier = re.compile(r'^[A-Z][A-Z_0-9]*$')
+ class TestZBarFunctions(ut.TestCase):
+     def test_version(self):
+         ver = zbar.version()
+-        self.assert_(isinstance(ver, tuple))
++        self.assertTrue(isinstance(ver, tuple))
+         self.assertEqual(len(ver), 2)
+         for v in ver:
+-            self.assert_(isinstance(v, int))
++            self.assertTrue(isinstance(v, int))
+ 
+     def test_verbosity(self):
+         zbar.increase_verbosity()
+         zbar.set_verbosity(16)
+ 
+     def test_exceptions(self):
+-        self.assert_(isinstance(zbar.Exception, type))
++        self.assertTrue(isinstance(zbar.Exception, type))
+         for err in (zbar.InternalError,
+                     zbar.UnsupportedError,
+                     zbar.InvalidRequestError,
+@@ -53,7 +53,7 @@ class TestZBarFunctions(ut.TestCase):
+                     zbar.X11ProtocolError,
+                     zbar.WindowClosed,
+                     zbar.WinAPIError):
+-            self.assert_(issubclass(err, zbar.Exception))
++            self.assertTrue(issubclass(err, zbar.Exception))
+ 
+     def test_configs(self):
+         for cfg in (zbar.Config.ENABLE,
+@@ -66,16 +66,16 @@ class TestZBarFunctions(ut.TestCase):
+                     zbar.Config.POSITION,
+                     zbar.Config.X_DENSITY,
+                     zbar.Config.Y_DENSITY):
+-            self.assert_(isinstance(cfg, zbar.EnumItem))
+-            self.assert_(int(cfg) >= 0)
+-            self.assert_(is_identifier.match(str(cfg)))
++            self.assertTrue(isinstance(cfg, zbar.EnumItem))
++            self.assertTrue(int(cfg) >= 0)
++            self.assertTrue(is_identifier.match(str(cfg)))
+ 
+     def test_modifiers(self):
+         for mod in (zbar.Modifier.GS1,
+                     zbar.Modifier.AIM):
+-            self.assert_(isinstance(mod, zbar.EnumItem))
+-            self.assert_(int(mod) >= 0)
+-            self.assert_(is_identifier.match(str(mod)))
++            self.assertTrue(isinstance(mod, zbar.EnumItem))
++            self.assertTrue(int(mod) >= 0)
++            self.assertTrue(is_identifier.match(str(mod)))
+ 
+     def test_symbologies(self):
+         for sym in (zbar.Symbol.NONE,
+@@ -95,9 +95,9 @@ class TestZBarFunctions(ut.TestCase):
+                     zbar.Symbol.QRCODE,
+                     zbar.Symbol.CODE93,
+                     zbar.Symbol.CODE128):
+-            self.assert_(isinstance(sym, zbar.EnumItem))
+-            self.assert_(int(sym) >= 0)
+-            self.assert_(is_identifier.match(str(sym)))
++            self.assertTrue(isinstance(sym, zbar.EnumItem))
++            self.assertTrue(int(sym) >= 0)
++            self.assertTrue(is_identifier.match(str(sym)))
+ 
+     def test_orientations(self):
+         for orient in (zbar.Orient.UNKNOWN,
+@@ -105,9 +105,9 @@ class TestZBarFunctions(ut.TestCase):
+                        zbar.Orient.RIGHT,
+                        zbar.Orient.DOWN,
+                        zbar.Orient.LEFT):
+-            self.assert_(isinstance(orient, zbar.EnumItem))
+-            self.assert_(-1 <= int(orient) <= 3)
+-            self.assert_(is_identifier.match(str(orient)))
++            self.assertTrue(isinstance(orient, zbar.EnumItem))
++            self.assertTrue(-1 <= int(orient) <= 3)
++            self.assertTrue(is_identifier.match(str(orient)))
+ 
+ class TestScanner(ut.TestCase):
+     def setUp(self):
+@@ -117,10 +117,10 @@ class TestScanner(ut.TestCase):
+         del(self.scn)
+ 
+     def test_type(self):
+-        self.assert_(isinstance(self.scn, zbar.Scanner))
+-        self.assert_(callable(self.scn.reset))
+-        self.assert_(callable(self.scn.new_scan))
+-        self.assert_(callable(self.scn.scan_y))
++        self.assertTrue(isinstance(self.scn, zbar.Scanner))
++        self.assertTrue(callable(self.scn.reset))
++        self.assertTrue(callable(self.scn.new_scan))
++        self.assertTrue(callable(self.scn.scan_y))
+ 
+         def set_color(color):
+             self.scn.color = color
+@@ -140,13 +140,13 @@ class TestDecoder(ut.TestCase):
+         del(self.dcode)
+ 
+     def test_type(self):
+-        self.assert_(isinstance(self.dcode, zbar.Decoder))
+-        self.assert_(callable(self.dcode.set_config))
+-        self.assert_(callable(self.dcode.parse_config))
+-        self.assert_(callable(self.dcode.reset))
+-        self.assert_(callable(self.dcode.new_scan))
+-        self.assert_(callable(self.dcode.set_handler))
+-        self.assert_(callable(self.dcode.decode_width))
++        self.assertTrue(isinstance(self.dcode, zbar.Decoder))
++        self.assertTrue(callable(self.dcode.set_config))
++        self.assertTrue(callable(self.dcode.parse_config))
++        self.assertTrue(callable(self.dcode.reset))
++        self.assertTrue(callable(self.dcode.new_scan))
++        self.assertTrue(callable(self.dcode.set_handler))
++        self.assertTrue(callable(self.dcode.decode_width))
+ 
+         def set_type(typ):
+             self.dcode.type = typ
+@@ -165,25 +165,25 @@ class TestDecoder(ut.TestCase):
+ 
+     def test_width(self):
+         sym = self.dcode.decode_width(5)
+-        self.assert_(sym is zbar.Symbol.NONE)
+-        self.assert_(not sym)
++        self.assertTrue(sym is zbar.Symbol.NONE)
++        self.assertTrue(not sym)
+         self.assertEqual(str(sym), 'NONE')
+ 
+         typ = self.dcode.type
+-        self.assert_(sym is typ)
++        self.assertTrue(sym is typ)
+ 
+     def test_reset(self):
+-        self.assert_(self.dcode.color is zbar.SPACE)
++        self.assertTrue(self.dcode.color is zbar.SPACE)
+         sym = self.dcode.decode_width(1)
+-        self.assert_(self.dcode.color is zbar.BAR)
++        self.assertTrue(self.dcode.color is zbar.BAR)
+         self.dcode.reset()
+-        self.assert_(self.dcode.color is zbar.SPACE)
++        self.assertTrue(self.dcode.color is zbar.SPACE)
+         self.assertEqual(self.dcode.direction, 0)
+ 
+     def test_decode(self):
+         inline_sym = [ -1 ]
+         def handler(dcode, closure):
+-            self.assert_(dcode is self.dcode)
++            self.assertTrue(dcode is self.dcode)
+             if dcode.type > zbar.Symbol.PARTIAL:
+                 inline_sym[0] = dcode.type
+             closure[0] += 1
+@@ -196,19 +196,19 @@ class TestDecoder(ut.TestCase):
+             if width == ' ': continue
+             sym = self.dcode.decode_width(int(width))
+             if i < len(encoded_widths) - 1:
+-                self.assert_(sym is zbar.Symbol.NONE or
++                self.assertTrue(sym is zbar.Symbol.NONE or
+                              sym is zbar.Symbol.PARTIAL)
+             else:
+-                self.assert_(sym is zbar.Symbol.EAN13)
++                self.assertTrue(sym is zbar.Symbol.EAN13)
+ 
+         self.assertEqual(self.dcode.configs,
+                          set((zbar.Config.ENABLE, zbar.Config.EMIT_CHECK)))
+         self.assertEqual(self.dcode.modifiers, set())
+         self.assertEqual(self.dcode.data, '6268964977804')
+-        self.assert_(self.dcode.color is zbar.BAR)
++        self.assertTrue(self.dcode.color is zbar.BAR)
+         self.assertEqual(self.dcode.direction, 1)
+-        self.assert_(sym is zbar.Symbol.EAN13)
+-        self.assert_(inline_sym[0] is zbar.Symbol.EAN13)
++        self.assertTrue(sym is zbar.Symbol.EAN13)
++        self.assertTrue(inline_sym[0] is zbar.Symbol.EAN13)
+         self.assertEqual(explicit_closure, [ 2 ])
+ 
+     def test_databar(self):
+@@ -217,15 +217,15 @@ class TestDecoder(ut.TestCase):
+             if width == ' ': continue
+             sym = self.dcode.decode_width(int(width))
+             if i < len(databar_widths) - 1:
+-                self.assert_(sym is zbar.Symbol.NONE or
++                self.assertTrue(sym is zbar.Symbol.NONE or
+                              sym is zbar.Symbol.PARTIAL)
+ 
+-        self.assert_(sym is zbar.Symbol.DATABAR)
++        self.assertTrue(sym is zbar.Symbol.DATABAR)
+         self.assertEqual(self.dcode.get_configs(zbar.Symbol.EAN13),
+                          set((zbar.Config.ENABLE, zbar.Config.EMIT_CHECK)))
+         self.assertEqual(self.dcode.modifiers, set((zbar.Modifier.GS1,)))
+         self.assertEqual(self.dcode.data, '0124012345678905')
+-        self.assert_(self.dcode.color is zbar.BAR)
++        self.assertTrue(self.dcode.color is zbar.BAR)
+         self.assertEqual(self.dcode.direction, 1)
+ 
+     # FIXME test exception during callback
+@@ -238,8 +238,8 @@ class TestImage(ut.TestCase):
+         del(self.image)
+ 
+     def test_type(self):
+-        self.assert_(isinstance(self.image, zbar.Image))
+-        self.assert_(callable(self.image.convert))
++        self.assertTrue(isinstance(self.image, zbar.Image))
++        self.assertTrue(callable(self.image.convert))
+ 
+     def test_new(self):
+         self.assertEqual(self.image.format, 'Y800')
+@@ -247,7 +247,7 @@ class TestImage(ut.TestCase):
+         self.assertEqual(self.image.crop, (0, 0, 123, 456))
+ 
+         image = zbar.Image()
+-        self.assert_(isinstance(image, zbar.Image))
++        self.assertTrue(isinstance(image, zbar.Image))
+         self.assertEqual(image.format, '\0\0\0\0')
+         self.assertEqual(image.size, (0, 0))
+         self.assertEqual(image.crop, (0, 0, 0, 0))
+@@ -308,11 +308,11 @@ class TestImageScanner(ut.TestCase):
+         del(self.scn)
+ 
+     def test_type(self):
+-        self.assert_(isinstance(self.scn, zbar.ImageScanner))
+-        self.assert_(callable(self.scn.set_config))
+-        self.assert_(callable(self.scn.parse_config))
+-        self.assert_(callable(self.scn.enable_cache))
+-        self.assert_(callable(self.scn.scan))
++        self.assertTrue(isinstance(self.scn, zbar.ImageScanner))
++        self.assertTrue(callable(self.scn.set_config))
++        self.assertTrue(callable(self.scn.parse_config))
++        self.assertTrue(callable(self.scn.enable_cache))
++        self.assertTrue(callable(self.scn.scan))
+ 
+     def test_set_config(self):
+         self.scn.set_config()
+@@ -339,63 +339,63 @@ class TestImageScan(ut.TestCase):
+         self.assertEqual(n, 1)
+ 
+         syms = self.image.symbols
+-        self.assert_(isinstance(syms, zbar.SymbolSet))
++        self.assertTrue(isinstance(syms, zbar.SymbolSet))
+         self.assertEqual(len(syms), 1)
+ 
+         i = iter(self.image)
+         j = iter(syms)
+-        self.assert_(isinstance(i, zbar.SymbolIter))
+-        self.assert_(isinstance(j, zbar.SymbolIter))
+-        symi = i.next()
+-        symj = j.next()
+-        self.assertRaises(StopIteration, i.next)
+-        self.assertRaises(StopIteration, j.next)
++        self.assertTrue(isinstance(i, zbar.SymbolIter))
++        self.assertTrue(isinstance(j, zbar.SymbolIter))
++        symi = next(i)
++        symj = next(j)
++        self.assertRaises(StopIteration, i.__next__)
++        self.assertRaises(StopIteration, j.__next__)
+ 
+         # this is the only way to obtain a Symbol,
+         # so test Symbol here
+         for sym in (symi, symj):
+-            self.assert_(isinstance(sym, zbar.Symbol))
+-            self.assert_(sym.type is zbar.Symbol.EAN13)
+-            self.assert_(sym.type is sym.EAN13)
++            self.assertTrue(isinstance(sym, zbar.Symbol))
++            self.assertTrue(sym.type is zbar.Symbol.EAN13)
++            self.assertTrue(sym.type is sym.EAN13)
+             self.assertEqual(str(sym.type), 'EAN13')
+ 
+             cfgs = sym.configs
+-            self.assert_(isinstance(cfgs, set))
++            self.assertTrue(isinstance(cfgs, set))
+             for cfg in cfgs:
+-                self.assert_(isinstance(cfg, zbar.EnumItem))
++                self.assertTrue(isinstance(cfg, zbar.EnumItem))
+             self.assertEqual(cfgs,
+                              set((zbar.Config.ENABLE, zbar.Config.EMIT_CHECK)))
+ 
+             mods = sym.modifiers
+-            self.assert_(isinstance(mods, set))
++            self.assertTrue(isinstance(mods, set))
+             for mod in mods:
+-                self.assert_(isinstance(mod, zbar.EnumItem))
++                self.assertTrue(isinstance(mod, zbar.EnumItem))
+             self.assertEqual(mods, set())
+ 
+-            self.assert_(sym.quality > 0)
++            self.assertTrue(sym.quality > 0)
+             self.assertEqual(sym.count, 0)
+ 
+             # FIXME put a nice QR S-A in here
+             comps = sym.components
+-            self.assert_(isinstance(comps, zbar.SymbolSet))
++            self.assertTrue(isinstance(comps, zbar.SymbolSet))
+             self.assertEqual(len(comps), 0)
+-            self.assert_(not comps)
+-            self.assert_(tuple(comps) is ())
++            self.assertTrue(not comps)
++            self.assertTrue(tuple(comps) is ())
+ 
+             data = sym.data
+             self.assertEqual(data, '9876543210128')
+ 
+             loc = sym.location
+-            self.assert_(len(loc) >= 4) # FIXME
+-            self.assert_(isinstance(loc, tuple))
++            self.assertTrue(len(loc) >= 4) # FIXME
++            self.assertTrue(isinstance(loc, tuple))
+             for pt in loc:
+-                self.assert_(isinstance(pt, tuple))
++                self.assertTrue(isinstance(pt, tuple))
+                 self.assertEqual(len(pt), 2)
+                 # FIXME test values (API currently in flux)
+ 
+-            self.assert_(sym.orientation is zbar.Orient.UP)
+-            self.assert_(data is sym.data)
+-            self.assert_(loc is sym.location)
++            self.assertTrue(sym.orientation is zbar.Orient.UP)
++            self.assertTrue(data is sym.data)
++            self.assertTrue(loc is sym.location)
+ 
+         def set_symbols(syms):
+             self.image.symbols = syms
+@@ -430,14 +430,14 @@ class TestProcessor(ut.TestCase):
+         del(self.proc)
+ 
+     def test_type(self):
+-        self.assert_(isinstance(self.proc, zbar.Processor))
+-        self.assert_(callable(self.proc.init))
+-        self.assert_(callable(self.proc.set_config))
+-        self.assert_(callable(self.proc.parse_config))
+-        self.assert_(callable(self.proc.set_data_handler))
+-        self.assert_(callable(self.proc.user_wait))
+-        self.assert_(callable(self.proc.process_one))
+-        self.assert_(callable(self.proc.process_image))
++        self.assertTrue(isinstance(self.proc, zbar.Processor))
++        self.assertTrue(callable(self.proc.init))
++        self.assertTrue(callable(self.proc.set_config))
++        self.assertTrue(callable(self.proc.parse_config))
++        self.assertTrue(callable(self.proc.set_data_handler))
++        self.assertTrue(callable(self.proc.user_wait))
++        self.assertTrue(callable(self.proc.process_one))
++        self.assertTrue(callable(self.proc.process_image))
+ 
+     def test_set_config(self):
+         self.proc.set_config()
+@@ -461,31 +461,31 @@ class TestProcessor(ut.TestCase):
+ 
+     def test_processing(self):
+         self.proc.init(VIDEO_DEVICE)
+-        self.assert_(self.proc.visible is False)
++        self.assertTrue(self.proc.visible is False)
+         self.proc.visible = 1
+-        self.assert_(self.proc.visible is True)
++        self.assertTrue(self.proc.visible is True)
+         self.assertEqual(self.proc.user_wait(1.1), 0)
+ 
+         self.image = zbar.Image(size[0], size[1], 'Y800', data)
+ 
+         count = [ 0 ]
+         def data_handler(proc, image, closure):
+-            self.assert_(proc is self.proc)
+-            self.assert_(image is self.image)
++            self.assertTrue(proc is self.proc)
++            self.assertTrue(image is self.image)
+             self.assertEqual(count[0], 0)
+             count[0] += 1
+ 
+             symiter = iter(image)
+-            self.assert_(isinstance(symiter, zbar.SymbolIter))
++            self.assertTrue(isinstance(symiter, zbar.SymbolIter))
+ 
+             syms = tuple(image)
+             self.assertEqual(len(syms), 1)
+             for sym in syms:
+-                self.assert_(isinstance(sym, zbar.Symbol))
+-                self.assert_(sym.type is zbar.Symbol.EAN13)
++                self.assertTrue(isinstance(sym, zbar.Symbol))
++                self.assertTrue(sym.type is zbar.Symbol.EAN13)
+                 self.assertEqual(sym.data, '9876543210128')
+-                self.assert_(sym.quality > 0)
+-                self.assert_(sym.orientation is zbar.Orient.UP)
++                self.assertTrue(sym.quality > 0)
++                self.assertTrue(sym.orientation is zbar.Orient.UP)
+             closure[0] += 1
+ 
+         explicit_closure = [ 0 ]

From 1a52ec85241d149e0de1bbd72ab3f3a76c6c024b Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Date: Tue, 7 Aug 2018 17:20:57 -0300
Subject: [PATCH 059/108] Fix date to allow builds

Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
---
 zbar.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zbar.spec b/zbar.spec
index b0ed3c6..054eb58 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -180,7 +180,7 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 %{_includedir}/zbar/QZBar*.h
 
 %changelog
-* Tue Ago 07 2018 Mauro Carvalho Chehab <mchehab+samsung@kernel.org> - 0.20.8
+* Tue Aug 07 2018 Mauro Carvalho Chehab <mchehab+samsung@kernel.org> - 0.20.8
 - Fix python 2 dependencies
 
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.20-7

From 76f84ecfb5c58d3bbdcd9dc73a3637069b07a888 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Date: Tue, 7 Aug 2018 17:31:47 -0300
Subject: [PATCH 060/108] Fix calls to env at python scripts

Remove an extra space introduced by a bad sed expression.

Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
---
 zbar_fedora29_hack_for_codegen_to_work.patch | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/zbar_fedora29_hack_for_codegen_to_work.patch b/zbar_fedora29_hack_for_codegen_to_work.patch
index 1f4d788..cb2e961 100644
--- a/zbar_fedora29_hack_for_codegen_to_work.patch
+++ b/zbar_fedora29_hack_for_codegen_to_work.patch
@@ -4,7 +4,7 @@ index 2e2a66867c8c..bc0bc8b884c6 100755
 +++ b/examples/upcrpc.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
-+#!/usr/bin/ env python2
++#!/usr/bin/env python2
  from xmlrpclib import ServerProxy
  import sys, re
  
@@ -28,7 +28,7 @@ index b8f20f053dc6..e0ae92d30ceb 100644
 +++ b/python/examples/processor.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
-+#!/usr/bin/ env python2
++#!/usr/bin/env python2
  from sys import argv
  import zbar
  
@@ -38,7 +38,7 @@ index 7a18c9998c0f..3b881e5d133f 100644
 +++ b/python/examples/read_one.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
-+#!/usr/bin/ env python2
++#!/usr/bin/env python2
  from sys import argv
  import zbar
  
@@ -48,7 +48,7 @@ index e26cb427064b..8b8bce0323d4 100644
 +++ b/python/examples/scan_image.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
-+#!/usr/bin/ env python2
++#!/usr/bin/env python2
  from sys import argv
  import zbar
  from PIL import Image
@@ -58,7 +58,7 @@ index f7639c57bd9d..585baf0be43e 100644
 +++ b/python/setup.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
-+#!/usr/bin/ env python2
++#!/usr/bin/env python2
  from distutils.core import setup, Extension
  
  setup(
@@ -68,7 +68,7 @@ index 5b63de47adb3..b5aad03ca51b 100755
 +++ b/python/test/test_zbar.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
-+#!/usr/bin/ env python2
++#!/usr/bin/env python2
  import sys, os, re
  import unittest as ut
  import zbar
@@ -78,7 +78,7 @@ index e271f0681116..488df70db7c6 100755
 +++ b/test/barcodetest.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
-+#!/usr/bin/ env python2
++#!/usr/bin/env python2
  
  import sys, re, unittest as UT, xml.etree.ElementTree as ET
  from os import path, getcwd
@@ -88,7 +88,7 @@ index 902b8ff62266..ab413894e086 100755
 +++ b/test/test_pygtk.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
-+#!/usr/bin/ env python2
++#!/usr/bin/env python2
  #------------------------------------------------------------------------
  #  Copyright 2008-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
  #

From 3353f69d9d64f1d667385c00acc4bf3bf577443e Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Date: Wed, 8 Aug 2018 09:43:42 -0300
Subject: [PATCH 061/108] Bump to version 0.20.1

Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
---
 .gitignore                                   |   1 +
 sources                                      |   2 +-
 zbar.spec                                    |  15 +-
 zbar_fedora29_hack_for_codegen_to_work.patch |  80 ---
 zbar_prefer_pygobject2_codegen.patch         |  25 -
 zbar_set_python_via_env.patch                | 505 -------------------
 6 files changed, 9 insertions(+), 619 deletions(-)
 delete mode 100644 zbar_prefer_pygobject2_codegen.patch
 delete mode 100644 zbar_set_python_via_env.patch

diff --git a/.gitignore b/.gitignore
index 4776e5c..1e58f83 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 zbar-0.10.tar.bz2
 /zbar-0.10.tar.bz2
 /zbar-0.20.tar.bz2
+/zbar-0.20.1.tar.bz2
diff --git a/sources b/sources
index 1934c0b..254e387 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (zbar-0.20.tar.bz2) = a371a655c961e3aa6abb1f5a5c6a43987619a2a4d43e4011c7979c42d94287600dcd5babb5258cfa134fc90905d3fb3c0216b0b38e05de729db13fbf522af886
+SHA512 (zbar-0.20.1.tar.bz2) = 3b0949fe866eb9cb7a6ab66bfbc5ff2fc4193faf21a51c830d16e63453dcbd6e786e197fd5db40d62749af2487922e1775af860918717b0d51765d2b20dfd3f8
diff --git a/zbar.spec b/zbar.spec
index 054eb58..cf66f71 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -2,17 +2,15 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		zbar
-Version:	0.20
-Release:	8%{?dist}
+Version:	0.20.1
+Release:	1%{?dist}
 Summary:	Bar code reader
 
 Group:		User Interface/X Hardware Support
 License:	LGPLv2+
 URL:		http://zbar.sourceforge.net/
 Source0:	https://linuxtv.org/downloads/%{name}/%{name}-%{version}.tar.bz2
-Patch0:		zbar_set_python_via_env.patch
-Patch1:		zbar_prefer_pygobject2_codegen.patch
-Patch2:		zbar_fedora29_hack_for_codegen_to_work.patch
+Patch0:		zbar_fedora29_hack_for_codegen_to_work.patch
 
 BuildRequires:	autoconf automake libtool gettext-devel
 BuildRequires:	qt5-qtbase-devel qt5-qtx11extras-devel
@@ -91,8 +89,6 @@ scanning widget.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 autoreconf -vfi
@@ -180,7 +176,10 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 %{_includedir}/zbar/QZBar*.h
 
 %changelog
-* Tue Aug 07 2018 Mauro Carvalho Chehab <mchehab+samsung@kernel.org> - 0.20.8
+* Wed Aug 08 2018 Mauro Carvalho Chehab <mchehab+samsung@kernel.org> - 0.20.1-1
+- Bump version to 0.20.1
+
+* Tue Aug 07 2018 Mauro Carvalho Chehab <mchehab+samsung@kernel.org> - 0.20-8
 - Fix python 2 dependencies
 
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.20-7
diff --git a/zbar_fedora29_hack_for_codegen_to_work.patch b/zbar_fedora29_hack_for_codegen_to_work.patch
index cb2e961..d9d3fb9 100644
--- a/zbar_fedora29_hack_for_codegen_to_work.patch
+++ b/zbar_fedora29_hack_for_codegen_to_work.patch
@@ -1,13 +1,3 @@
-diff --git a/examples/upcrpc.py b/examples/upcrpc.py
-index 2e2a66867c8c..bc0bc8b884c6 100755
---- a/examples/upcrpc.py
-+++ b/examples/upcrpc.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- from xmlrpclib import ServerProxy
- import sys, re
- 
 diff --git a/pygtk/Makefile.am.inc b/pygtk/Makefile.am.inc
 index 433412c8bcb5..33c65ad8975b 100644
 --- a/pygtk/Makefile.am.inc
@@ -22,73 +12,3 @@ index 433412c8bcb5..33c65ad8975b 100644
 +	./codegen.sh --prefix zbarpygtk \
              --register $(PYGTK_DEFS)/gdk-types.defs \
  	    --override $(srcdir)/pygtk/zbarpygtk.override $< > $@
-diff --git a/python/examples/processor.py b/python/examples/processor.py
-index b8f20f053dc6..e0ae92d30ceb 100644
---- a/python/examples/processor.py
-+++ b/python/examples/processor.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- from sys import argv
- import zbar
- 
-diff --git a/python/examples/read_one.py b/python/examples/read_one.py
-index 7a18c9998c0f..3b881e5d133f 100644
---- a/python/examples/read_one.py
-+++ b/python/examples/read_one.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- from sys import argv
- import zbar
- 
-diff --git a/python/examples/scan_image.py b/python/examples/scan_image.py
-index e26cb427064b..8b8bce0323d4 100644
---- a/python/examples/scan_image.py
-+++ b/python/examples/scan_image.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- from sys import argv
- import zbar
- from PIL import Image
-diff --git a/python/setup.py b/python/setup.py
-index f7639c57bd9d..585baf0be43e 100644
---- a/python/setup.py
-+++ b/python/setup.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- from distutils.core import setup, Extension
- 
- setup(
-diff --git a/python/test/test_zbar.py b/python/test/test_zbar.py
-index 5b63de47adb3..b5aad03ca51b 100755
---- a/python/test/test_zbar.py
-+++ b/python/test/test_zbar.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- import sys, os, re
- import unittest as ut
- import zbar
-diff --git a/test/barcodetest.py b/test/barcodetest.py
-index e271f0681116..488df70db7c6 100755
---- a/test/barcodetest.py
-+++ b/test/barcodetest.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- import sys, re, unittest as UT, xml.etree.ElementTree as ET
- from os import path, getcwd
-diff --git a/test/test_pygtk.py b/test/test_pygtk.py
-index 902b8ff62266..ab413894e086 100755
---- a/test/test_pygtk.py
-+++ b/test/test_pygtk.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- #------------------------------------------------------------------------
- #  Copyright 2008-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
- #
diff --git a/zbar_prefer_pygobject2_codegen.patch b/zbar_prefer_pygobject2_codegen.patch
deleted file mode 100644
index bd665f7..0000000
--- a/zbar_prefer_pygobject2_codegen.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-commit 4e88270fdf42bd6dcbfeb4130bc9b4edc850211f
-Author: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
-Date:   Tue Aug 7 16:51:23 2018 -0300
-
-    configure.ac: prefer using pygobject-codegen-2.0
-    
-    Get rid of this warning:
-            note: pygtk-codegen-2.0 is deprecated, use pygobject-codegen-2.0 instead
-    
-    Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
-
-diff --git a/configure.ac b/configure.ac
-index 141a3c2ab9f3..67148815097a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -465,7 +465,8 @@ Install the development package for python-$am_cv_python_version, or configure
- 
-    AS_IF([test "x$with_gtk" = "xyes"],
-      [PKG_CHECK_MODULES([PYGTK], [pygtk-2.0])
--      AC_CHECK_PROGS([PYGTK_CODEGEN], [pygtk-codegen-2.0 pygtk-codegen], [:])
-+      AC_CHECK_PROGS([PYGTK_CODEGEN], [pygobject-codegen-2.0 pygtk-codegen-2.0 pygtk-codegen], [:])
-+
-       AS_IF([test "x$PYGTK_H2DEF" = "x"],
-         [PYGTK_H2DEF=`$PKG_CONFIG pygtk-2.0 --variable=codegendir`/h2def.py
-          AS_IF([test -f "$PYGTK_H2DEF"], [], [PYGTK_H2DEF=":"])])
diff --git a/zbar_set_python_via_env.patch b/zbar_set_python_via_env.patch
deleted file mode 100644
index 3c38a89..0000000
--- a/zbar_set_python_via_env.patch
+++ /dev/null
@@ -1,505 +0,0 @@
-commit c06e7e1940fd089749cebb0d3082ff5fae57c10b
-Author: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
-Date:   Tue Aug 7 15:02:11 2018 -0300
-
-    python: Make it work with modern versions of python 2
-    
-    Some of the examples and test code don't work with python 2.7
-    and PIL. Modernize them by running 2to3 and fixing PIL manually.
-    
-    Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
-
-diff --git a/configure.ac b/configure.ac
-index 141a3c2ab9f3..c808dab7e7bd 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -444,7 +444,7 @@ AC_ARG_VAR([PYGTK_CODEGEN], [full path to pygtk-codegen program])
- AC_ARG_VAR([PYGTK_DEFS], [directory where PyGTK definitions may be found])
- 
- AS_IF([test "x$with_python" != "xno"],
--  [AM_PATH_PYTHON(2.3.5)
-+  [AM_PATH_PYTHON(2.7.0)
-    AS_IF([test "x$PYTHON_CFLAGS" != "x"],
-      [],
-      [test "x$PYTHON_CONFIG" != "x" && test -x "$PYTHON_CONFIG"],
-diff --git a/python/examples/processor.py b/python/examples/processor.py
-index 52996d16cf0d..b8f20f053dc6 100644
---- a/python/examples/processor.py
-+++ b/python/examples/processor.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/env python
- from sys import argv
- import zbar
- 
-@@ -19,7 +19,7 @@ def my_handler(proc, image, closure):
-     # extract results
-     for symbol in image.symbols:
-         # do something useful with results
--        print 'decoded', symbol.type, 'symbol', '"%s"' % symbol.data
-+        print('decoded', symbol.type, 'symbol', '"%s"' % symbol.data)
- 
- proc.set_data_handler(my_handler)
- 
-@@ -31,5 +31,5 @@ proc.active = True
- try:
-     # keep scanning until user provides key/mouse input
-     proc.user_wait()
--except zbar.WindowClosed, e:
-+except zbar.WindowClosed as e:
-     pass
-diff --git a/python/examples/read_one.py b/python/examples/read_one.py
-index 426b9994155e..7a18c9998c0f 100644
---- a/python/examples/read_one.py
-+++ b/python/examples/read_one.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/env python
- from sys import argv
- import zbar
- 
-@@ -26,4 +26,4 @@ proc.visible = False
- # extract results
- for symbol in proc.results:
-     # do something useful with results
--    print 'decoded', symbol.type, 'symbol', '"%s"' % symbol.data
-+    print('decoded', symbol.type, 'symbol', '"%s"' % symbol.data)
-diff --git a/python/examples/scan_image.py b/python/examples/scan_image.py
-index 2a80759da7b5..e26cb427064b 100644
---- a/python/examples/scan_image.py
-+++ b/python/examples/scan_image.py
-@@ -1,7 +1,7 @@
--#!/usr/bin/python
-+#!/usr/bin/env python
- from sys import argv
- import zbar
--import Image
-+from PIL import Image
- 
- if len(argv) < 2: exit(1)
- 
-@@ -14,7 +14,7 @@ scanner.parse_config('enable')
- # obtain image data
- pil = Image.open(argv[1]).convert('L')
- width, height = pil.size
--raw = pil.tostring()
-+raw = pil.tobytes()
- 
- # wrap image data
- image = zbar.Image(width, height, 'Y800', raw)
-@@ -25,7 +25,7 @@ scanner.scan(image)
- # extract results
- for symbol in image:
-     # do something useful with results
--    print 'decoded', symbol.type, 'symbol', '"%s"' % symbol.data
-+    print('decoded', symbol.type, 'symbol', '"%s"' % symbol.data)
- 
- # clean up
- del(image)
-diff --git a/python/test/test_zbar.py b/python/test/test_zbar.py
-index dbe180324378..5b63de47adb3 100755
---- a/python/test/test_zbar.py
-+++ b/python/test/test_zbar.py
-@@ -1,18 +1,18 @@
--#!/usr/bin/python
-+#!/usr/bin/env python
- import sys, os, re
- import unittest as ut
- import zbar
- 
- # FIXME this needs to be conditional
- # would be even better to auto-select PIL or ImageMagick (or...)
--import Image
-+from PIL import Image
- 
- data = None
- size = (0, 0)
- 
- def load_image():
-     image = Image.open(os.path.join(sys.path[0], "barcode.png")).convert('L')
--    return(image.tostring(), image.size)
-+    return(image.tobytes(), image.size)
- 
- # FIXME this could be integrated w/fixture creation
- (data, size) = load_image()
-@@ -32,17 +32,17 @@ is_identifier = re.compile(r'^[A-Z][A-Z_0-9]*$')
- class TestZBarFunctions(ut.TestCase):
-     def test_version(self):
-         ver = zbar.version()
--        self.assert_(isinstance(ver, tuple))
-+        self.assertTrue(isinstance(ver, tuple))
-         self.assertEqual(len(ver), 2)
-         for v in ver:
--            self.assert_(isinstance(v, int))
-+            self.assertTrue(isinstance(v, int))
- 
-     def test_verbosity(self):
-         zbar.increase_verbosity()
-         zbar.set_verbosity(16)
- 
-     def test_exceptions(self):
--        self.assert_(isinstance(zbar.Exception, type))
-+        self.assertTrue(isinstance(zbar.Exception, type))
-         for err in (zbar.InternalError,
-                     zbar.UnsupportedError,
-                     zbar.InvalidRequestError,
-@@ -53,7 +53,7 @@ class TestZBarFunctions(ut.TestCase):
-                     zbar.X11ProtocolError,
-                     zbar.WindowClosed,
-                     zbar.WinAPIError):
--            self.assert_(issubclass(err, zbar.Exception))
-+            self.assertTrue(issubclass(err, zbar.Exception))
- 
-     def test_configs(self):
-         for cfg in (zbar.Config.ENABLE,
-@@ -66,16 +66,16 @@ class TestZBarFunctions(ut.TestCase):
-                     zbar.Config.POSITION,
-                     zbar.Config.X_DENSITY,
-                     zbar.Config.Y_DENSITY):
--            self.assert_(isinstance(cfg, zbar.EnumItem))
--            self.assert_(int(cfg) >= 0)
--            self.assert_(is_identifier.match(str(cfg)))
-+            self.assertTrue(isinstance(cfg, zbar.EnumItem))
-+            self.assertTrue(int(cfg) >= 0)
-+            self.assertTrue(is_identifier.match(str(cfg)))
- 
-     def test_modifiers(self):
-         for mod in (zbar.Modifier.GS1,
-                     zbar.Modifier.AIM):
--            self.assert_(isinstance(mod, zbar.EnumItem))
--            self.assert_(int(mod) >= 0)
--            self.assert_(is_identifier.match(str(mod)))
-+            self.assertTrue(isinstance(mod, zbar.EnumItem))
-+            self.assertTrue(int(mod) >= 0)
-+            self.assertTrue(is_identifier.match(str(mod)))
- 
-     def test_symbologies(self):
-         for sym in (zbar.Symbol.NONE,
-@@ -95,9 +95,9 @@ class TestZBarFunctions(ut.TestCase):
-                     zbar.Symbol.QRCODE,
-                     zbar.Symbol.CODE93,
-                     zbar.Symbol.CODE128):
--            self.assert_(isinstance(sym, zbar.EnumItem))
--            self.assert_(int(sym) >= 0)
--            self.assert_(is_identifier.match(str(sym)))
-+            self.assertTrue(isinstance(sym, zbar.EnumItem))
-+            self.assertTrue(int(sym) >= 0)
-+            self.assertTrue(is_identifier.match(str(sym)))
- 
-     def test_orientations(self):
-         for orient in (zbar.Orient.UNKNOWN,
-@@ -105,9 +105,9 @@ class TestZBarFunctions(ut.TestCase):
-                        zbar.Orient.RIGHT,
-                        zbar.Orient.DOWN,
-                        zbar.Orient.LEFT):
--            self.assert_(isinstance(orient, zbar.EnumItem))
--            self.assert_(-1 <= int(orient) <= 3)
--            self.assert_(is_identifier.match(str(orient)))
-+            self.assertTrue(isinstance(orient, zbar.EnumItem))
-+            self.assertTrue(-1 <= int(orient) <= 3)
-+            self.assertTrue(is_identifier.match(str(orient)))
- 
- class TestScanner(ut.TestCase):
-     def setUp(self):
-@@ -117,10 +117,10 @@ class TestScanner(ut.TestCase):
-         del(self.scn)
- 
-     def test_type(self):
--        self.assert_(isinstance(self.scn, zbar.Scanner))
--        self.assert_(callable(self.scn.reset))
--        self.assert_(callable(self.scn.new_scan))
--        self.assert_(callable(self.scn.scan_y))
-+        self.assertTrue(isinstance(self.scn, zbar.Scanner))
-+        self.assertTrue(callable(self.scn.reset))
-+        self.assertTrue(callable(self.scn.new_scan))
-+        self.assertTrue(callable(self.scn.scan_y))
- 
-         def set_color(color):
-             self.scn.color = color
-@@ -140,13 +140,13 @@ class TestDecoder(ut.TestCase):
-         del(self.dcode)
- 
-     def test_type(self):
--        self.assert_(isinstance(self.dcode, zbar.Decoder))
--        self.assert_(callable(self.dcode.set_config))
--        self.assert_(callable(self.dcode.parse_config))
--        self.assert_(callable(self.dcode.reset))
--        self.assert_(callable(self.dcode.new_scan))
--        self.assert_(callable(self.dcode.set_handler))
--        self.assert_(callable(self.dcode.decode_width))
-+        self.assertTrue(isinstance(self.dcode, zbar.Decoder))
-+        self.assertTrue(callable(self.dcode.set_config))
-+        self.assertTrue(callable(self.dcode.parse_config))
-+        self.assertTrue(callable(self.dcode.reset))
-+        self.assertTrue(callable(self.dcode.new_scan))
-+        self.assertTrue(callable(self.dcode.set_handler))
-+        self.assertTrue(callable(self.dcode.decode_width))
- 
-         def set_type(typ):
-             self.dcode.type = typ
-@@ -165,25 +165,25 @@ class TestDecoder(ut.TestCase):
- 
-     def test_width(self):
-         sym = self.dcode.decode_width(5)
--        self.assert_(sym is zbar.Symbol.NONE)
--        self.assert_(not sym)
-+        self.assertTrue(sym is zbar.Symbol.NONE)
-+        self.assertTrue(not sym)
-         self.assertEqual(str(sym), 'NONE')
- 
-         typ = self.dcode.type
--        self.assert_(sym is typ)
-+        self.assertTrue(sym is typ)
- 
-     def test_reset(self):
--        self.assert_(self.dcode.color is zbar.SPACE)
-+        self.assertTrue(self.dcode.color is zbar.SPACE)
-         sym = self.dcode.decode_width(1)
--        self.assert_(self.dcode.color is zbar.BAR)
-+        self.assertTrue(self.dcode.color is zbar.BAR)
-         self.dcode.reset()
--        self.assert_(self.dcode.color is zbar.SPACE)
-+        self.assertTrue(self.dcode.color is zbar.SPACE)
-         self.assertEqual(self.dcode.direction, 0)
- 
-     def test_decode(self):
-         inline_sym = [ -1 ]
-         def handler(dcode, closure):
--            self.assert_(dcode is self.dcode)
-+            self.assertTrue(dcode is self.dcode)
-             if dcode.type > zbar.Symbol.PARTIAL:
-                 inline_sym[0] = dcode.type
-             closure[0] += 1
-@@ -196,19 +196,19 @@ class TestDecoder(ut.TestCase):
-             if width == ' ': continue
-             sym = self.dcode.decode_width(int(width))
-             if i < len(encoded_widths) - 1:
--                self.assert_(sym is zbar.Symbol.NONE or
-+                self.assertTrue(sym is zbar.Symbol.NONE or
-                              sym is zbar.Symbol.PARTIAL)
-             else:
--                self.assert_(sym is zbar.Symbol.EAN13)
-+                self.assertTrue(sym is zbar.Symbol.EAN13)
- 
-         self.assertEqual(self.dcode.configs,
-                          set((zbar.Config.ENABLE, zbar.Config.EMIT_CHECK)))
-         self.assertEqual(self.dcode.modifiers, set())
-         self.assertEqual(self.dcode.data, '6268964977804')
--        self.assert_(self.dcode.color is zbar.BAR)
-+        self.assertTrue(self.dcode.color is zbar.BAR)
-         self.assertEqual(self.dcode.direction, 1)
--        self.assert_(sym is zbar.Symbol.EAN13)
--        self.assert_(inline_sym[0] is zbar.Symbol.EAN13)
-+        self.assertTrue(sym is zbar.Symbol.EAN13)
-+        self.assertTrue(inline_sym[0] is zbar.Symbol.EAN13)
-         self.assertEqual(explicit_closure, [ 2 ])
- 
-     def test_databar(self):
-@@ -217,15 +217,15 @@ class TestDecoder(ut.TestCase):
-             if width == ' ': continue
-             sym = self.dcode.decode_width(int(width))
-             if i < len(databar_widths) - 1:
--                self.assert_(sym is zbar.Symbol.NONE or
-+                self.assertTrue(sym is zbar.Symbol.NONE or
-                              sym is zbar.Symbol.PARTIAL)
- 
--        self.assert_(sym is zbar.Symbol.DATABAR)
-+        self.assertTrue(sym is zbar.Symbol.DATABAR)
-         self.assertEqual(self.dcode.get_configs(zbar.Symbol.EAN13),
-                          set((zbar.Config.ENABLE, zbar.Config.EMIT_CHECK)))
-         self.assertEqual(self.dcode.modifiers, set((zbar.Modifier.GS1,)))
-         self.assertEqual(self.dcode.data, '0124012345678905')
--        self.assert_(self.dcode.color is zbar.BAR)
-+        self.assertTrue(self.dcode.color is zbar.BAR)
-         self.assertEqual(self.dcode.direction, 1)
- 
-     # FIXME test exception during callback
-@@ -238,8 +238,8 @@ class TestImage(ut.TestCase):
-         del(self.image)
- 
-     def test_type(self):
--        self.assert_(isinstance(self.image, zbar.Image))
--        self.assert_(callable(self.image.convert))
-+        self.assertTrue(isinstance(self.image, zbar.Image))
-+        self.assertTrue(callable(self.image.convert))
- 
-     def test_new(self):
-         self.assertEqual(self.image.format, 'Y800')
-@@ -247,7 +247,7 @@ class TestImage(ut.TestCase):
-         self.assertEqual(self.image.crop, (0, 0, 123, 456))
- 
-         image = zbar.Image()
--        self.assert_(isinstance(image, zbar.Image))
-+        self.assertTrue(isinstance(image, zbar.Image))
-         self.assertEqual(image.format, '\0\0\0\0')
-         self.assertEqual(image.size, (0, 0))
-         self.assertEqual(image.crop, (0, 0, 0, 0))
-@@ -308,11 +308,11 @@ class TestImageScanner(ut.TestCase):
-         del(self.scn)
- 
-     def test_type(self):
--        self.assert_(isinstance(self.scn, zbar.ImageScanner))
--        self.assert_(callable(self.scn.set_config))
--        self.assert_(callable(self.scn.parse_config))
--        self.assert_(callable(self.scn.enable_cache))
--        self.assert_(callable(self.scn.scan))
-+        self.assertTrue(isinstance(self.scn, zbar.ImageScanner))
-+        self.assertTrue(callable(self.scn.set_config))
-+        self.assertTrue(callable(self.scn.parse_config))
-+        self.assertTrue(callable(self.scn.enable_cache))
-+        self.assertTrue(callable(self.scn.scan))
- 
-     def test_set_config(self):
-         self.scn.set_config()
-@@ -339,63 +339,63 @@ class TestImageScan(ut.TestCase):
-         self.assertEqual(n, 1)
- 
-         syms = self.image.symbols
--        self.assert_(isinstance(syms, zbar.SymbolSet))
-+        self.assertTrue(isinstance(syms, zbar.SymbolSet))
-         self.assertEqual(len(syms), 1)
- 
-         i = iter(self.image)
-         j = iter(syms)
--        self.assert_(isinstance(i, zbar.SymbolIter))
--        self.assert_(isinstance(j, zbar.SymbolIter))
--        symi = i.next()
--        symj = j.next()
--        self.assertRaises(StopIteration, i.next)
--        self.assertRaises(StopIteration, j.next)
-+        self.assertTrue(isinstance(i, zbar.SymbolIter))
-+        self.assertTrue(isinstance(j, zbar.SymbolIter))
-+        symi = next(i)
-+        symj = next(j)
-+        self.assertRaises(StopIteration, i.__next__)
-+        self.assertRaises(StopIteration, j.__next__)
- 
-         # this is the only way to obtain a Symbol,
-         # so test Symbol here
-         for sym in (symi, symj):
--            self.assert_(isinstance(sym, zbar.Symbol))
--            self.assert_(sym.type is zbar.Symbol.EAN13)
--            self.assert_(sym.type is sym.EAN13)
-+            self.assertTrue(isinstance(sym, zbar.Symbol))
-+            self.assertTrue(sym.type is zbar.Symbol.EAN13)
-+            self.assertTrue(sym.type is sym.EAN13)
-             self.assertEqual(str(sym.type), 'EAN13')
- 
-             cfgs = sym.configs
--            self.assert_(isinstance(cfgs, set))
-+            self.assertTrue(isinstance(cfgs, set))
-             for cfg in cfgs:
--                self.assert_(isinstance(cfg, zbar.EnumItem))
-+                self.assertTrue(isinstance(cfg, zbar.EnumItem))
-             self.assertEqual(cfgs,
-                              set((zbar.Config.ENABLE, zbar.Config.EMIT_CHECK)))
- 
-             mods = sym.modifiers
--            self.assert_(isinstance(mods, set))
-+            self.assertTrue(isinstance(mods, set))
-             for mod in mods:
--                self.assert_(isinstance(mod, zbar.EnumItem))
-+                self.assertTrue(isinstance(mod, zbar.EnumItem))
-             self.assertEqual(mods, set())
- 
--            self.assert_(sym.quality > 0)
-+            self.assertTrue(sym.quality > 0)
-             self.assertEqual(sym.count, 0)
- 
-             # FIXME put a nice QR S-A in here
-             comps = sym.components
--            self.assert_(isinstance(comps, zbar.SymbolSet))
-+            self.assertTrue(isinstance(comps, zbar.SymbolSet))
-             self.assertEqual(len(comps), 0)
--            self.assert_(not comps)
--            self.assert_(tuple(comps) is ())
-+            self.assertTrue(not comps)
-+            self.assertTrue(tuple(comps) is ())
- 
-             data = sym.data
-             self.assertEqual(data, '9876543210128')
- 
-             loc = sym.location
--            self.assert_(len(loc) >= 4) # FIXME
--            self.assert_(isinstance(loc, tuple))
-+            self.assertTrue(len(loc) >= 4) # FIXME
-+            self.assertTrue(isinstance(loc, tuple))
-             for pt in loc:
--                self.assert_(isinstance(pt, tuple))
-+                self.assertTrue(isinstance(pt, tuple))
-                 self.assertEqual(len(pt), 2)
-                 # FIXME test values (API currently in flux)
- 
--            self.assert_(sym.orientation is zbar.Orient.UP)
--            self.assert_(data is sym.data)
--            self.assert_(loc is sym.location)
-+            self.assertTrue(sym.orientation is zbar.Orient.UP)
-+            self.assertTrue(data is sym.data)
-+            self.assertTrue(loc is sym.location)
- 
-         def set_symbols(syms):
-             self.image.symbols = syms
-@@ -430,14 +430,14 @@ class TestProcessor(ut.TestCase):
-         del(self.proc)
- 
-     def test_type(self):
--        self.assert_(isinstance(self.proc, zbar.Processor))
--        self.assert_(callable(self.proc.init))
--        self.assert_(callable(self.proc.set_config))
--        self.assert_(callable(self.proc.parse_config))
--        self.assert_(callable(self.proc.set_data_handler))
--        self.assert_(callable(self.proc.user_wait))
--        self.assert_(callable(self.proc.process_one))
--        self.assert_(callable(self.proc.process_image))
-+        self.assertTrue(isinstance(self.proc, zbar.Processor))
-+        self.assertTrue(callable(self.proc.init))
-+        self.assertTrue(callable(self.proc.set_config))
-+        self.assertTrue(callable(self.proc.parse_config))
-+        self.assertTrue(callable(self.proc.set_data_handler))
-+        self.assertTrue(callable(self.proc.user_wait))
-+        self.assertTrue(callable(self.proc.process_one))
-+        self.assertTrue(callable(self.proc.process_image))
- 
-     def test_set_config(self):
-         self.proc.set_config()
-@@ -461,31 +461,31 @@ class TestProcessor(ut.TestCase):
- 
-     def test_processing(self):
-         self.proc.init(VIDEO_DEVICE)
--        self.assert_(self.proc.visible is False)
-+        self.assertTrue(self.proc.visible is False)
-         self.proc.visible = 1
--        self.assert_(self.proc.visible is True)
-+        self.assertTrue(self.proc.visible is True)
-         self.assertEqual(self.proc.user_wait(1.1), 0)
- 
-         self.image = zbar.Image(size[0], size[1], 'Y800', data)
- 
-         count = [ 0 ]
-         def data_handler(proc, image, closure):
--            self.assert_(proc is self.proc)
--            self.assert_(image is self.image)
-+            self.assertTrue(proc is self.proc)
-+            self.assertTrue(image is self.image)
-             self.assertEqual(count[0], 0)
-             count[0] += 1
- 
-             symiter = iter(image)
--            self.assert_(isinstance(symiter, zbar.SymbolIter))
-+            self.assertTrue(isinstance(symiter, zbar.SymbolIter))
- 
-             syms = tuple(image)
-             self.assertEqual(len(syms), 1)
-             for sym in syms:
--                self.assert_(isinstance(sym, zbar.Symbol))
--                self.assert_(sym.type is zbar.Symbol.EAN13)
-+                self.assertTrue(isinstance(sym, zbar.Symbol))
-+                self.assertTrue(sym.type is zbar.Symbol.EAN13)
-                 self.assertEqual(sym.data, '9876543210128')
--                self.assert_(sym.quality > 0)
--                self.assert_(sym.orientation is zbar.Orient.UP)
-+                self.assertTrue(sym.quality > 0)
-+                self.assertTrue(sym.orientation is zbar.Orient.UP)
-             closure[0] += 1
- 
-         explicit_closure = [ 0 ]

From 1c1368e0a4a6fbeb858d831b85bcaf4a2d885b1e Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Date: Wed, 8 Aug 2018 10:17:39 -0300
Subject: [PATCH 062/108] Add requirement for python2-pillow

Some of zbar's python scripts require python2-pillow, in order
to display images.

Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
---
 zbar.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zbar.spec b/zbar.spec
index cf66f71..5e86afe 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -60,7 +60,7 @@ scanning widget.
 %package pygtk
 Group: Development/Libraries
 Summary: Bar code reader PyGTK widget
-Requires: pygtk2, %{name}-gtk = %{version}-%{release}
+Requires: pygtk2, python2-pillow, %{name}-gtk = %{version}-%{release}
 
 %description pygtk
 This package contains a bar code scanning widget for use in GUI

From ff4c638d36c33ce842baec3ce7495c6c22402144 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Date: Wed, 8 Aug 2018 10:28:50 -0300
Subject: [PATCH 063/108] Re-enable python 2 bindings

Now that it builds with python2, re-enable its bindings.

Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
---
 zbar.spec | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/zbar.spec b/zbar.spec
index 5e86afe..7eaf7ac 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -3,7 +3,7 @@
 
 Name:		zbar
 Version:	0.20.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Bar code reader
 
 Group:		User Interface/X Hardware Support
@@ -16,11 +16,7 @@ BuildRequires:	autoconf automake libtool gettext-devel
 BuildRequires:	qt5-qtbase-devel qt5-qtx11extras-devel
 BuildRequires:	gtk2-devel GraphicsMagick-c++-devel
 BuildRequires:	libv4l-devel libXv-devel xmlto
-%if 0%{?fedora}
 BuildRequires:  python2-devel pygtk2-devel
-%else
-%global without_python --without-python
-%endif
 
 %description
 A layered bar code scanning and decoding library. Supports EAN, UPC, Code 128,
@@ -56,7 +52,6 @@ This package contains header files and additional libraries used for
 developing GUI applications based on GTK+-2.0 that include a bar code
 scanning widget.
 
-%if 0%{?fedora}
 %package pygtk
 Group: Development/Libraries
 Summary: Bar code reader PyGTK widget
@@ -65,7 +60,6 @@ Requires: pygtk2, python2-pillow, %{name}-gtk = %{version}-%{release}
 %description pygtk
 This package contains a bar code scanning widget for use in GUI
 applications based on PyGTK.
-%endif
 
 %package qt
 Group: Development/Libraries
@@ -92,7 +86,7 @@ scanning widget.
 
 %build
 autoreconf -vfi
-%configure --without-java --with-graphicsmagick --docdir=%{_docdir}/%{name}-%{version} %{?without_python}
+%configure --without-java --with-graphicsmagick --docdir=%{_docdir}/%{name}-%{version}
 
 # rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -160,11 +154,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 %{_libdir}/pkgconfig/zbar-gtk.pc
 %{_includedir}/zbar/zbargtk.h
 
-%if 0%{?fedora}
 %files pygtk
 %{python2_sitearch}/zbarpygtk.so
 %{python2_sitearch}/zbar.so
-%endif
 
 %files qt
 %{_libdir}/libzbarqt.so.*
@@ -176,6 +168,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 %{_includedir}/zbar/QZBar*.h
 
 %changelog
+* Wed Aug 08 2018 Mauro Carvalho Chehab <mchehab+samsung@kernel.org> - 0.20.1-2
+- Re-enable python2 bindings
+
 * Wed Aug 08 2018 Mauro Carvalho Chehab <mchehab+samsung@kernel.org> - 0.20.1-1
 - Bump version to 0.20.1
 

From 60e4c2b86f2258b21a62a68c19bcabebeef5b2a2 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Thu, 9 Aug 2018 13:12:38 +0200
Subject: [PATCH 064/108] Drop zbar_fedora29_hack_for_codegen_to_work.patch now
 that pygobject2 is   fixed (rhbz# 1606784) Use %ldconfig_scriptlets so that
 we don't unnecessarily run ldconfig on F28+

---
 zbar.spec                                    | 31 ++++++++------------
 zbar_fedora29_hack_for_codegen_to_work.patch | 14 ---------
 2 files changed, 12 insertions(+), 33 deletions(-)
 delete mode 100644 zbar_fedora29_hack_for_codegen_to_work.patch

diff --git a/zbar.spec b/zbar.spec
index 7eaf7ac..a68f6be 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -1,16 +1,12 @@
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-
 Name:		zbar
 Version:	0.20.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Bar code reader
 
 Group:		User Interface/X Hardware Support
 License:	LGPLv2+
 URL:		http://zbar.sourceforge.net/
 Source0:	https://linuxtv.org/downloads/%{name}/%{name}-%{version}.tar.bz2
-Patch0:		zbar_fedora29_hack_for_codegen_to_work.patch
 
 BuildRequires:	autoconf automake libtool gettext-devel
 BuildRequires:	qt5-qtbase-devel qt5-qtx11extras-devel
@@ -82,7 +78,6 @@ scanning widget.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 autoreconf -vfi
@@ -104,24 +99,17 @@ find ${RPM_BUILD_ROOT} -name '*.la' -or -name '*.a' | xargs rm -f
 # Remove installed doc
 rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 
-%post -p /sbin/ldconfig
-
-%post devel -p /sbin/ldconfig
-
-%post gtk -p /sbin/ldconfig
+%ldconfig_scriptlets
 
-%post qt -p /sbin/ldconfig
+%ldconfig_scriptlets devel
 
-%postun -p /sbin/ldconfig
+%ldconfig_scriptlets gtk
 
-%postun devel -p /sbin/ldconfig
-
-%postun gtk -p /sbin/ldconfig
-
-%postun qt -p /sbin/ldconfig
+%ldconfig_scriptlets qt
 
 %files
-%doc COPYING LICENSE NEWS
+%doc NEWS
+%license COPYING LICENSE
 
 %{_bindir}/zbarimg
 %{_bindir}/zbarcam
@@ -168,6 +156,11 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 %{_includedir}/zbar/QZBar*.h
 
 %changelog
+* Thu Aug  9 2018 Hans de Goede <hdegoede@redhat.com> - 0.20.1-3
+- Drop zbar_fedora29_hack_for_codegen_to_work.patch now that pygobject2 is
+  fixed (rhbz# 1606784)
+- Use %%ldconfig_scriptlets so that we don't unnecessarily run ldconfig on F28+
+
 * Wed Aug 08 2018 Mauro Carvalho Chehab <mchehab+samsung@kernel.org> - 0.20.1-2
 - Re-enable python2 bindings
 
diff --git a/zbar_fedora29_hack_for_codegen_to_work.patch b/zbar_fedora29_hack_for_codegen_to_work.patch
deleted file mode 100644
index d9d3fb9..0000000
--- a/zbar_fedora29_hack_for_codegen_to_work.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/pygtk/Makefile.am.inc b/pygtk/Makefile.am.inc
-index 433412c8bcb5..33c65ad8975b 100644
---- a/pygtk/Makefile.am.inc
-+++ b/pygtk/Makefile.am.inc
-@@ -18,6 +18,8 @@ pygtk/zbarpygtk.defs: include/zbar/zbargtk.h
- 	$(SED) -e 's/Z_TYPE_BAR_/ZBAR_TYPE_/' > $@
- 
- pygtk/%.c: pygtk/%.defs $(srcdir)/pygtk/zbarpygtk.override
--	$(PYGTK_CODEGEN) --prefix zbarpygtk \
-+	env $(PYGTK_CODEGEN) |sed s,python,python2, > ./codegen.sh
-+	chmod 755 ./codegen.sh
-+	./codegen.sh --prefix zbarpygtk \
-             --register $(PYGTK_DEFS)/gdk-types.defs \
- 	    --override $(srcdir)/pygtk/zbarpygtk.override $< > $@

From 97f8445ae5376bc37528a997aa222f8bda3d9417 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Date: Mon, 7 Jan 2019 11:31:42 -0200
Subject: [PATCH 065/108] Disable build for pygtk2 module

The pygtk2 module is orphaned and will be retired from Fedora.
Also, there is a binding for zbar that claims to support both
python2 and python3:
	https://github.com/zplab/zbar-py

Ok, this is currently not packaged on Fedora, but it should be
easy to install it via pip. So, it may not make much sense to
change zbar to have a pygtk3 binding.

Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
---
 zbar.spec | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/zbar.spec b/zbar.spec
index a68f6be..d4851e3 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -12,7 +12,6 @@ BuildRequires:	autoconf automake libtool gettext-devel
 BuildRequires:	qt5-qtbase-devel qt5-qtx11extras-devel
 BuildRequires:	gtk2-devel GraphicsMagick-c++-devel
 BuildRequires:	libv4l-devel libXv-devel xmlto
-BuildRequires:  python2-devel pygtk2-devel
 
 %description
 A layered bar code scanning and decoding library. Supports EAN, UPC, Code 128,
@@ -48,15 +47,6 @@ This package contains header files and additional libraries used for
 developing GUI applications based on GTK+-2.0 that include a bar code
 scanning widget.
 
-%package pygtk
-Group: Development/Libraries
-Summary: Bar code reader PyGTK widget
-Requires: pygtk2, python2-pillow, %{name}-gtk = %{version}-%{release}
-
-%description pygtk
-This package contains a bar code scanning widget for use in GUI
-applications based on PyGTK.
-
 %package qt
 Group: Development/Libraries
 Summary: Bar code reader Qt widget
@@ -81,7 +71,7 @@ scanning widget.
 
 %build
 autoreconf -vfi
-%configure --without-java --with-graphicsmagick --docdir=%{_docdir}/%{name}-%{version}
+%configure --without-java --with-graphicsmagick --without-python2 --docdir=%{_docdir}/%{name}-%{version}
 
 # rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -142,10 +132,6 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 %{_libdir}/pkgconfig/zbar-gtk.pc
 %{_includedir}/zbar/zbargtk.h
 
-%files pygtk
-%{python2_sitearch}/zbarpygtk.so
-%{python2_sitearch}/zbar.so
-
 %files qt
 %{_libdir}/libzbarqt.so.*
 %{_bindir}/zbarcam-qt

From b0a327b728310b1a46c7c6354bc19ad87889dd8b Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Date: Mon, 7 Jan 2019 12:12:15 -0200
Subject: [PATCH 066/108] Increase Fedora packaging number and add a change
 description

Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
---
 zbar.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zbar.spec b/zbar.spec
index d4851e3..3f1d919 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -1,6 +1,6 @@
 Name:		zbar
 Version:	0.20.1
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Bar code reader
 
 Group:		User Interface/X Hardware Support
@@ -142,6 +142,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 %{_includedir}/zbar/QZBar*.h
 
 %changelog
+* Mon Jan  7 2019 Mauro Carvalho Chehab <mchehab+samsung@kernel.org> - 0.20.1-4
+- Disable python2 bindings due to pygtk2 orphaned package
+
 * Thu Aug  9 2018 Hans de Goede <hdegoede@redhat.com> - 0.20.1-3
 - Drop zbar_fedora29_hack_for_codegen_to_work.patch now that pygobject2 is
   fixed (rhbz# 1606784)

From 5dbc4944f42dcb8c29297e017955d3d1cc6d5097 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Mon, 28 Jan 2019 20:18:32 +0100
Subject: [PATCH 067/108] Remove obsolete Group tag

References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
---
 zbar.spec | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/zbar.spec b/zbar.spec
index 3f1d919..0658dc8 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -3,7 +3,6 @@ Version:	0.20.1
 Release:	4%{?dist}
 Summary:	Bar code reader
 
-Group:		User Interface/X Hardware Support
 License:	LGPLv2+
 URL:		http://zbar.sourceforge.net/
 Source0:	https://linuxtv.org/downloads/%{name}/%{name}-%{version}.tar.bz2
@@ -20,7 +19,6 @@ Includes applications for decoding captured bar code images and using a video
 device (e. g., webcam) as a bar code scanner.
 
 %package devel
-Group: Development/Libraries
 Summary: Bar code library extra development files
 Requires: pkgconfig, %{name} = %{version}-%{release}
 
@@ -29,7 +27,6 @@ This package contains header files and additional libraries used for
 developing applications that read bar codes with this library.
 
 %package gtk
-Group: Development/Libraries
 Summary: Bar code reader GTK widget
 Requires: %{name} = %{version}-%{release}
 
@@ -38,7 +35,6 @@ This package contains a bar code scanning widget for use with GUI
 applications based on GTK+-2.0.
 
 %package gtk-devel
-Group: Development/Libraries
 Summary: Bar code reader GTK widget extra development files
 Requires: pkgconfig, %{name}-gtk = %{version}-%{release}, %{name}-devel = %{version}-%{release}
 
@@ -48,7 +44,6 @@ developing GUI applications based on GTK+-2.0 that include a bar code
 scanning widget.
 
 %package qt
-Group: Development/Libraries
 Summary: Bar code reader Qt widget
 Requires: %{name} = %{version}-%{release}
 
@@ -57,7 +52,6 @@ This package contains a bar code scanning widget for use with GUI
 applications based on Qt4.
 
 %package qt-devel
-Group: Development/Libraries
 Summary: Bar code reader Qt widget extra development files
 Requires: pkgconfig, %{name}-qt = %{version}-%{release}, %{name}-devel = %{version}-%{release}
 

From 9e88a5e49f3d66d4f0154a3e71b0dc938a4d8b56 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sun, 3 Feb 2019 13:08:39 +0000
Subject: [PATCH 068/108] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 zbar.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zbar.spec b/zbar.spec
index 0658dc8..6d9b21e 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -1,6 +1,6 @@
 Name:		zbar
 Version:	0.20.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Bar code reader
 
 License:	LGPLv2+
@@ -136,6 +136,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 %{_includedir}/zbar/QZBar*.h
 
 %changelog
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.20.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
 * Mon Jan  7 2019 Mauro Carvalho Chehab <mchehab+samsung@kernel.org> - 0.20.1-4
 - Disable python2 bindings due to pygtk2 orphaned package
 

From 6a7663d714a4580fc961fd985ea114eaca789183 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Date: Tue, 12 Feb 2019 12:20:05 -0200
Subject: [PATCH 069/108] Bump to version 0.21

  * zbarcam-qt: allow selecting codes via GUI interface
  * When both enabled, ISBN-13 has precedence over ISBN-10
  * ZBar is now using Travis CI for continuous integration tests
  * Convert INSTALL and README to markdown and update them
  * Improve ZBar testing code and make easier to run the tests
  * Fix build with Clang
  * Add simple dbus IPC API to zbarcam.
  * zbarimg: display only the compiled symbologies
  * v4l2: make ZBar build and run on Kernels < 3.16
  * configure.ac: The pdf417 code is incomplete. Warn about that
  * Add Debian packaging and Travis CI configuration
  * Add barcode examples for different supported symbologies
  * Several improvements at the building system
  * Add support for SQ code symbology
  * v4l2: add fallback for systems without v4l2_ext_controls which field
  * v4l2: use device_caps instead of capabilities
  * v4l2: make v4l2_request_buffers() more generic
  * release video buffers after probing and request them again when needed
  * Ignore ENOTTY errors when calling VIDIOC_S_CROP
  * doc/Makefile.am.inc: clean html generated files
  * Add --disable-doc configure option to disable building docs
  * Fix function protoype to be compatible with recent libjpeg
  * Wrap logical not operations into parentheses
  * INSTALL: warn that autoconf should be called before configure
  * code128: fix error logic
  * convert: ensure that it will not use a freed value
  * zbar: use g_thread_new() instead of g_tread_create()
  * zbargtk: add a missing break
  * gtk/zbargtk: add a missing check if zbar->window is not null

Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
---
 .gitignore |  1 +
 sources    |  2 +-
 zbar.spec  | 10 +++++++---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1e58f83..f42fdfe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ zbar-0.10.tar.bz2
 /zbar-0.10.tar.bz2
 /zbar-0.20.tar.bz2
 /zbar-0.20.1.tar.bz2
+/zbar-0.21.tar.bz2
diff --git a/sources b/sources
index 254e387..24d03e4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (zbar-0.20.1.tar.bz2) = 3b0949fe866eb9cb7a6ab66bfbc5ff2fc4193faf21a51c830d16e63453dcbd6e786e197fd5db40d62749af2487922e1775af860918717b0d51765d2b20dfd3f8
+SHA512 (zbar-0.21.tar.bz2) = 8c1095ec234b04839229dd6345b0758f0a133c715f28031ab64c2c7809a0c0fc4cbd7226fba1a6e3c40efcb8b2a334a7e461cdc34a77c21b537dbf8faf38c14c
diff --git a/zbar.spec b/zbar.spec
index 6d9b21e..163c982 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -1,6 +1,6 @@
 Name:		zbar
-Version:	0.20.1
-Release:	5%{?dist}
+Version:	0.21
+Release:	1%{?dist}
 Summary:	Bar code reader
 
 License:	LGPLv2+
@@ -92,13 +92,14 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 %ldconfig_scriptlets qt
 
 %files
-%doc NEWS
+%doc NEWS README.md INSTALL.md
 %license COPYING LICENSE
 
 %{_bindir}/zbarimg
 %{_bindir}/zbarcam
 %{_libdir}/libzbar.so.*
 %{_mandir}/man1/*
+%{_sysconfdir}/dbus-1/system.d/org.linuxtv.Zbar.conf
 
 %files devel
 %doc HACKING TODO
@@ -136,6 +137,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 %{_includedir}/zbar/QZBar*.h
 
 %changelog
+* Tue Feb 12 2019 Mauro Carvalho Chehab <mchehab+samsung@kernel.org> - 0.20.1-4
+- Bump to version 0.21: d-bus and SQ code support, improved zbarcam-qt
+
 * Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.20.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 

From a426834d7fb89828d64292738e7f41f2bca0efda Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Date: Tue, 12 Feb 2019 13:26:17 -0200
Subject: [PATCH 070/108] zbar.spec: add dbus-devel dependency

This is needed in order to build ZBar with d-bus support.

Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
---
 zbar.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zbar.spec b/zbar.spec
index 163c982..8e73d8e 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -10,7 +10,7 @@ Source0:	https://linuxtv.org/downloads/%{name}/%{name}-%{version}.tar.bz2
 BuildRequires:	autoconf automake libtool gettext-devel
 BuildRequires:	qt5-qtbase-devel qt5-qtx11extras-devel
 BuildRequires:	gtk2-devel GraphicsMagick-c++-devel
-BuildRequires:	libv4l-devel libXv-devel xmlto
+BuildRequires:	libv4l-devel libXv-devel xmlto dbus-devel
 
 %description
 A layered bar code scanning and decoding library. Supports EAN, UPC, Code 128,

From 1aa537a68e67f8ca4b1af353b4b9aa86238b5326 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Date: Wed, 20 Feb 2019 07:01:47 -0300
Subject: [PATCH 071/108] Bump to version 0.22

The main focus of this version is to make zbarcam-qt a
full-featured application, allowing to use all ZBar library
features with a GUI interface.

It also comes with an optional new feature to allow inverting
the colors when parsing images. That's specially useful for
QR codes, as it seems that several such barcodes come inverted.

There are also some bug fixes on it.

Sumary of changes:

  * zbarcam-qt: allow changing resolutions in real time
  * zbarcam-qt: better support ZBar options
  * zbarcam-qt: do several visual improvements
  * zbarcam-qt: make it remember the geometry
  * zbarcam-qt: allow show/hide control and options bars
  * zbarcam-qt: remember lastly used settings and camera controls
  * zbarcam-qt: allow changing ZBar decode options via GUI
  * Add API to allow get/set resolutions
  * img_scanner: add handler for color-inverted codes
  * img_scanner: fix get_config parameter validation
  * scan_video: improve logic to remove duplicated/invalid devnodes
  * symbol.c: fix symbol hash logic (prevents crash with QR options)
  * configure.ac: fix an error at libv4l2 package check
  * fix some typos
  * exit gracefully when decoding split QR codes

Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
---
 zbar.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/zbar.spec b/zbar.spec
index 8e73d8e..662070a 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -1,5 +1,5 @@
 Name:		zbar
-Version:	0.21
+Version:	0.22
 Release:	1%{?dist}
 Summary:	Bar code reader
 
@@ -137,7 +137,10 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 %{_includedir}/zbar/QZBar*.h
 
 %changelog
-* Tue Feb 12 2019 Mauro Carvalho Chehab <mchehab+samsung@kernel.org> - 0.20.1-4
+* Wed Feb 20 2019 Mauro Carvalho Chehab <mchehab+samsung@kernel.org> - 0.22-1
+- Bump to version 0.22: zbarcam-qt is now a full-featured application
+
+* Tue Feb 12 2019 Mauro Carvalho Chehab <mchehab+samsung@kernel.org> - 0.21-1
 - Bump to version 0.21: d-bus and SQ code support, improved zbarcam-qt
 
 * Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.20.1-5

From e0125b27b6e847d2c6da860f2664ba90d7c57fa8 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Date: Wed, 20 Feb 2019 07:14:39 -0300
Subject: [PATCH 072/108] Update ZBar sources

Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
---
 .gitignore | 1 +
 sources    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index f42fdfe..62dee54 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ zbar-0.10.tar.bz2
 /zbar-0.20.tar.bz2
 /zbar-0.20.1.tar.bz2
 /zbar-0.21.tar.bz2
+/zbar-0.22.tar.bz2
diff --git a/sources b/sources
index 24d03e4..cc952a4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (zbar-0.21.tar.bz2) = 8c1095ec234b04839229dd6345b0758f0a133c715f28031ab64c2c7809a0c0fc4cbd7226fba1a6e3c40efcb8b2a334a7e461cdc34a77c21b537dbf8faf38c14c
+SHA512 (zbar-0.22.tar.bz2) = 8e40df37ebbedfc2e1cf4c82c3cfbfb44f2da24603874646b446cef9bd63d02ef40f2fd8af433254dd078513df4030ef60cb663bf10c86a9f29df57450a5a99a

From 02a23e52f123efcd5df85d4646dd3d0f315f90fc Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Date: Mon, 29 Apr 2019 10:19:11 -0300
Subject: [PATCH 073/108] Update to version 0.22.2, with supports Java 11

The Java library require some different logic in order to build
with Java 11. While I'm not sure when Fedora will migrate to
it, it seems worth to be able to support it now that we added
support for it upstream, as openjdk maintainers can migrate
ZBar to Java 11 smoothless.

Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
---
 .gitignore | 1 +
 sources    | 2 +-
 zbar.spec  | 5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 62dee54..fc1a945 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ zbar-0.10.tar.bz2
 /zbar-0.20.1.tar.bz2
 /zbar-0.21.tar.bz2
 /zbar-0.22.tar.bz2
+/zbar-0.22.2.tar.gz
diff --git a/sources b/sources
index cc952a4..fb584ed 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (zbar-0.22.tar.bz2) = 8e40df37ebbedfc2e1cf4c82c3cfbfb44f2da24603874646b446cef9bd63d02ef40f2fd8af433254dd078513df4030ef60cb663bf10c86a9f29df57450a5a99a
+SHA512 (zbar-0.22.2.tar.gz) = c8c683c785366d6256523959552073e7dac741af4b8edc48d39a7da8b9f0f50616a8db2d5ed89864499f028b08d044ea1b94d4b2a6c95dd381650c684c979c38
diff --git a/zbar.spec b/zbar.spec
index 662070a..dd108e9 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -1,5 +1,5 @@
 Name:		zbar
-Version:	0.22
+Version:	0.22.2
 Release:	1%{?dist}
 Summary:	Bar code reader
 
@@ -137,6 +137,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 %{_includedir}/zbar/QZBar*.h
 
 %changelog
+* Mon Apr 29 2019 Mauro Carvalho Chehab <mchehab+samsung@kernel.org> - 0.22.2-1
+- Update to 0.22.2: added support for Java 11
+
 * Wed Feb 20 2019 Mauro Carvalho Chehab <mchehab+samsung@kernel.org> - 0.22-1
 - Bump to version 0.22: zbarcam-qt is now a full-featured application
 

From 3912a5c736ee59ed404e3cd9c880ff570849255c Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Date: Tue, 30 Apr 2019 08:42:49 -0300
Subject: [PATCH 074/108] Build a package with ZBar java JNI and jar library

Add an extra ZBar package with java libraries, just in case
someone wants to use it inside a Java application.

While here, change config to prefer using ImageMagick instead
of GraphicsMagick, as this is the recommended conversion library.

Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
---
 .gitignore |  1 +
 sources    |  2 +-
 zbar.spec  | 21 +++++++++++++++++++--
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index fc1a945..978eff8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ zbar-0.10.tar.bz2
 /zbar-0.21.tar.bz2
 /zbar-0.22.tar.bz2
 /zbar-0.22.2.tar.gz
+/zbar-0.22.2.tar.bz2
diff --git a/sources b/sources
index fb584ed..435d0c1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (zbar-0.22.2.tar.gz) = c8c683c785366d6256523959552073e7dac741af4b8edc48d39a7da8b9f0f50616a8db2d5ed89864499f028b08d044ea1b94d4b2a6c95dd381650c684c979c38
+SHA512 (zbar-0.22.2.tar.bz2) = 35d8a50323970b2fc6b59126bf3e8af44b1ced904b0044345517cb14ade7042560aa66812260c6ded0bd7eb8ac0b25eb986d402a967f20a47a4152e7369362b9
diff --git a/zbar.spec b/zbar.spec
index dd108e9..1489109 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -9,8 +9,9 @@ Source0:	https://linuxtv.org/downloads/%{name}/%{name}-%{version}.tar.bz2
 
 BuildRequires:	autoconf automake libtool gettext-devel
 BuildRequires:	qt5-qtbase-devel qt5-qtx11extras-devel
-BuildRequires:	gtk2-devel GraphicsMagick-c++-devel
+BuildRequires:	gtk2-devel ImageMagick-devel
 BuildRequires:	libv4l-devel libXv-devel xmlto dbus-devel
+BuildRequires:  java-11-openjdk-devel
 
 %description
 A layered bar code scanning and decoding library. Supports EAN, UPC, Code 128,
@@ -60,12 +61,21 @@ This package contains header files and additional libraries used for
 developing GUI applications based on Qt4 that include a bar code
 scanning widget.
 
+%package java
+Summary: Bar code reader Java library
+Requires: pkgconfig, %{name}-gtk = %{version}-%{release}, %{name}-devel = %{version}-%{release}
+
+%description java
+This package contains header files and additional libraries used for
+on Java Native Interface (JNI) applications using ZBar.
+
+
 %prep
 %setup -q
 
 %build
 autoreconf -vfi
-%configure --without-java --with-graphicsmagick --without-python2 --docdir=%{_docdir}/%{name}-%{version}
+%configure --without-python2 --docdir=%{_docdir}/%{name}-%{version}
 
 # rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -76,6 +86,9 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+install -d %{buildroot}%{_jnidir}
+mv %{buildroot}%{_datadir}/zbar/lib/zbar.jar %{buildroot}%{_jnidir}
+mv %{buildroot}%{_datadir}/zbar/lib/libzbarjni.so* %{buildroot}%{_libdir}
 
 #Remove .la and .a files
 find ${RPM_BUILD_ROOT} -name '*.la' -or -name '*.a' | xargs rm -f
@@ -136,6 +149,10 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 %{_libdir}/pkgconfig/zbar-qt.pc
 %{_includedir}/zbar/QZBar*.h
 
+%files java
+%{_jnidir}/zbar.jar
+%{_libdir}/libzbarjni.so*
+
 %changelog
 * Mon Apr 29 2019 Mauro Carvalho Chehab <mchehab+samsung@kernel.org> - 0.22.2-1
 - Update to 0.22.2: added support for Java 11

From 7adb3c8dcb37ab71f041b2a7075717c7c78eea8a Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Date: Tue, 30 Apr 2019 09:40:44 -0300
Subject: [PATCH 075/108] Make rpmlint happy

Use tab instead of spaces at the java dependency line
and use the 0.22.2 source that was uploaded to linuxtv.org,
instead of the previous version I used locally in order to
test if Java sources were being packaged with make dist
inside ZBar.

Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
---
 sources   | 2 +-
 zbar.spec | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sources b/sources
index 435d0c1..f262c23 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (zbar-0.22.2.tar.bz2) = 35d8a50323970b2fc6b59126bf3e8af44b1ced904b0044345517cb14ade7042560aa66812260c6ded0bd7eb8ac0b25eb986d402a967f20a47a4152e7369362b9
+SHA512 (zbar-0.22.2.tar.bz2) = 5b791f6674f6cbd34d8ee9e5f49c61c60584874be28768147e023664f487959e28fb75c02c6415eacece38c8e5be9ccbdb227871ce998267ae8c22b246b70122
diff --git a/zbar.spec b/zbar.spec
index 1489109..066937e 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -11,7 +11,7 @@ BuildRequires:	autoconf automake libtool gettext-devel
 BuildRequires:	qt5-qtbase-devel qt5-qtx11extras-devel
 BuildRequires:	gtk2-devel ImageMagick-devel
 BuildRequires:	libv4l-devel libXv-devel xmlto dbus-devel
-BuildRequires:  java-11-openjdk-devel
+BuildRequires:	java-11-openjdk-devel
 
 %description
 A layered bar code scanning and decoding library. Supports EAN, UPC, Code 128,

From c9fd939c014369ab08e27edd0bf21bc235b4eda0 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Date: Fri, 10 May 2019 21:58:45 -0300
Subject: [PATCH 076/108] Update to 0.23 release candidate package (0.22.90)

This Release Candidate brings support for Gtk3 and GIR.

Add support for it and create an extra package for GIR.

Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
---
 .gitignore |  1 +
 sources    |  2 +-
 zbar.spec  | 24 +++++++++++++++++++++---
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 978eff8..50ed0db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ zbar-0.10.tar.bz2
 /zbar-0.22.tar.bz2
 /zbar-0.22.2.tar.gz
 /zbar-0.22.2.tar.bz2
+/zbar-0.22.90.tar.bz2
diff --git a/sources b/sources
index f262c23..509c708 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (zbar-0.22.2.tar.bz2) = 5b791f6674f6cbd34d8ee9e5f49c61c60584874be28768147e023664f487959e28fb75c02c6415eacece38c8e5be9ccbdb227871ce998267ae8c22b246b70122
+SHA512 (zbar-0.22.90.tar.bz2) = fd21747dd7c40b2a3a0c958b18d0947905edb32424aa85efed7610aefb7167173b563656c4f201781f7f9b3bbb64d946a39b2089bac8aeccca823d4fb01e104d
diff --git a/zbar.spec b/zbar.spec
index 066937e..775d032 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -1,5 +1,5 @@
 Name:		zbar
-Version:	0.22.2
+Version:	0.22.90
 Release:	1%{?dist}
 Summary:	Bar code reader
 
@@ -9,7 +9,7 @@ Source0:	https://linuxtv.org/downloads/%{name}/%{name}-%{version}.tar.bz2
 
 BuildRequires:	autoconf automake libtool gettext-devel
 BuildRequires:	qt5-qtbase-devel qt5-qtx11extras-devel
-BuildRequires:	gtk2-devel ImageMagick-devel
+BuildRequires:	gtk3-devel ImageMagick-devel pygobject3-devel
 BuildRequires:	libv4l-devel libXv-devel xmlto dbus-devel
 BuildRequires:	java-11-openjdk-devel
 
@@ -35,6 +35,15 @@ Requires: %{name} = %{version}-%{release}
 This package contains a bar code scanning widget for use with GUI
 applications based on GTK+-2.0.
 
+%package gi
+Summary: Bar code reader GObject Introspection (GIR) Gtk bindings
+Requires: %{name}-gtk = %{version}-%{release}
+
+%description gi
+This package contains a bar code scanning GObject Introspection
+(GIR) Gtk bindings, with allow the usage of ZBar with GUI
+support on any application compatible with GIR, like python3.
+
 %package gtk-devel
 Summary: Bar code reader GTK widget extra development files
 Requires: pkgconfig, %{name}-gtk = %{version}-%{release}, %{name}-devel = %{version}-%{release}
@@ -75,7 +84,7 @@ on Java Native Interface (JNI) applications using ZBar.
 
 %build
 autoreconf -vfi
-%configure --without-python2 --docdir=%{_docdir}/%{name}-%{version}
+%configure --without-python --with-gtk=auto --docdir=%{_docdir}/%{name}-%{version}
 
 # rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -135,6 +144,12 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 %{_libdir}/libzbargtk.so.*
 %{_bindir}/zbarcam-gtk
 
+%files gi
+%dir %{_libdir}/girepository-1.0
+%dir %{_datadir}/gir-1.0
+%{_libdir}/girepository-1.0/ZBar-1.0.typelib
+%{_datadir}/gir-1.0/ZBar-1.0.gir
+
 %files gtk-devel
 %{_libdir}/libzbargtk.so
 %{_libdir}/pkgconfig/zbar-gtk.pc
@@ -154,6 +169,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 %{_libdir}/libzbarjni.so*
 
 %changelog
+* Fri May 10 2019 Mauro Carvalho Chehab <mchehab+samsung@kernel.org> - 0.22.90-1
+- Release candidate for 0.23. Support for Gtk3 and GObject Introspection (GIR)
+
 * Mon Apr 29 2019 Mauro Carvalho Chehab <mchehab+samsung@kernel.org> - 0.22.2-1
 - Update to 0.22.2: added support for Java 11
 

From 6deccd757c2f237c8e7bb7db440d522bb4e27dfd Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Date: Sat, 11 May 2019 13:52:52 -0300
Subject: [PATCH 077/108] Bump to 0.22.91

Has some build fixes. While here, enable python3 bindings build.

Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
---
 .gitignore |  1 +
 sources    |  2 +-
 zbar.spec  | 21 +++++++++++++++++++--
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 50ed0db..6a5fd49 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ zbar-0.10.tar.bz2
 /zbar-0.22.2.tar.gz
 /zbar-0.22.2.tar.bz2
 /zbar-0.22.90.tar.bz2
+/zbar-0.22.91.tar.bz2
diff --git a/sources b/sources
index 509c708..2aefe91 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (zbar-0.22.90.tar.bz2) = fd21747dd7c40b2a3a0c958b18d0947905edb32424aa85efed7610aefb7167173b563656c4f201781f7f9b3bbb64d946a39b2089bac8aeccca823d4fb01e104d
+SHA512 (zbar-0.22.91.tar.bz2) = c64a9d6b21e5da9dc583ed2f2098402093e6932ce2383e49ecb7a6db18418456f039381f9fda4e9276e59fea2b1e7cd1f01cf32977e4eb9c6a3391d36228c5ae
diff --git a/zbar.spec b/zbar.spec
index 775d032..950e9e1 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -1,17 +1,19 @@
 Name:		zbar
-Version:	0.22.90
+Version:	0.22.91
 Release:	1%{?dist}
 Summary:	Bar code reader
 
 License:	LGPLv2+
 URL:		http://zbar.sourceforge.net/
 Source0:	https://linuxtv.org/downloads/%{name}/%{name}-%{version}.tar.bz2
+Patch0:		use_python3_on_python_script.patch
 
 BuildRequires:	autoconf automake libtool gettext-devel
 BuildRequires:	qt5-qtbase-devel qt5-qtx11extras-devel
 BuildRequires:	gtk3-devel ImageMagick-devel pygobject3-devel
 BuildRequires:	libv4l-devel libXv-devel xmlto dbus-devel
 BuildRequires:	java-11-openjdk-devel
+BuildRequires:	python3-devel
 
 %description
 A layered bar code scanning and decoding library. Supports EAN, UPC, Code 128,
@@ -70,6 +72,15 @@ This package contains header files and additional libraries used for
 developing GUI applications based on Qt4 that include a bar code
 scanning widget.
 
+%package python3
+Group: Development/Libraries
+Summary: Bar code reader PyGTK widget
+Requires: python3-pillow, %{name} = %{version}-%{release}
+
+%description python3
+This package contains a bar code scanning widget for use on
+python applications that work with images.
+
 %package java
 Summary: Bar code reader Java library
 Requires: pkgconfig, %{name}-gtk = %{version}-%{release}, %{name}-devel = %{version}-%{release}
@@ -81,10 +92,11 @@ on Java Native Interface (JNI) applications using ZBar.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 autoreconf -vfi
-%configure --without-python --with-gtk=auto --docdir=%{_docdir}/%{name}-%{version}
+%configure --with-python=python3 --with-gtk=auto --docdir=%{_docdir}/%{name}-%{version}
 
 # rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -98,6 +110,7 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 install -d %{buildroot}%{_jnidir}
 mv %{buildroot}%{_datadir}/zbar/lib/zbar.jar %{buildroot}%{_jnidir}
 mv %{buildroot}%{_datadir}/zbar/lib/libzbarjni.so* %{buildroot}%{_libdir}
+cp test/test_python.py %{buildroot}%{_docdir}
 
 #Remove .la and .a files
 find ${RPM_BUILD_ROOT} -name '*.la' -or -name '*.a' | xargs rm -f
@@ -168,6 +181,10 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 %{_jnidir}/zbar.jar
 %{_libdir}/libzbarjni.so*
 
+%files python3
+%{python3_sitearch}/zbar.so
+%{_docdir}/test_python.py
+
 %changelog
 * Fri May 10 2019 Mauro Carvalho Chehab <mchehab+samsung@kernel.org> - 0.22.90-1
 - Release candidate for 0.23. Support for Gtk3 and GObject Introspection (GIR)

From 883b7ce61902a012b5ea2c25d410d6bf8f57bcab Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Date: Sat, 11 May 2019 17:23:59 -0300
Subject: [PATCH 078/108] Add missing script

Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
---
 use_python3_on_python_script.patch | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 use_python3_on_python_script.patch

diff --git a/use_python3_on_python_script.patch b/use_python3_on_python_script.patch
new file mode 100644
index 0000000..7161f1d
--- /dev/null
+++ b/use_python3_on_python_script.patch
@@ -0,0 +1,10 @@
+diff --git a/test/test_python.py b/test/test_python.py
+index 252c51a97256..8388d9a5aa36 100755
+--- a/test/test_python.py
++++ b/test/test_python.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ #------------------------------------------------------------------------
+ #  Copyright 2019 (c) Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
+ #

From f0cd33a9e450ef1613d0b43ea68df97d44b5361a Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Date: Tue, 14 May 2019 07:26:52 -0300
Subject: [PATCH 079/108] Bump to the third release candidate for 0.23

Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
---
 .gitignore |  1 +
 sources    |  2 +-
 zbar.spec  | 11 +++++++----
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6a5fd49..dd013dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ zbar-0.10.tar.bz2
 /zbar-0.22.2.tar.bz2
 /zbar-0.22.90.tar.bz2
 /zbar-0.22.91.tar.bz2
+/zbar-0.22.92.tar.bz2
diff --git a/sources b/sources
index 2aefe91..7c09094 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (zbar-0.22.91.tar.bz2) = c64a9d6b21e5da9dc583ed2f2098402093e6932ce2383e49ecb7a6db18418456f039381f9fda4e9276e59fea2b1e7cd1f01cf32977e4eb9c6a3391d36228c5ae
+SHA512 (zbar-0.22.92.tar.bz2) = 242fb7dc9ad3b25d2acd1fdbf39039fd376c40167f3b88dd63e4bd63c112c18560f42f186f78430167ce5b7c0a53fc7c7185367efa2a4985c9abc68a27500375
diff --git a/zbar.spec b/zbar.spec
index 950e9e1..b567141 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -1,5 +1,5 @@
 Name:		zbar
-Version:	0.22.91
+Version:	0.22.92
 Release:	1%{?dist}
 Summary:	Bar code reader
 
@@ -127,8 +127,8 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 %ldconfig_scriptlets qt
 
 %files
-%doc NEWS README.md INSTALL.md
-%license COPYING LICENSE
+%doc NEWS.md README.md INSTALL.md
+%license COPYING LICENSE.md
 
 %{_bindir}/zbarimg
 %{_bindir}/zbarcam
@@ -137,7 +137,7 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 %{_sysconfdir}/dbus-1/system.d/org.linuxtv.Zbar.conf
 
 %files devel
-%doc HACKING TODO
+%doc HACKING.md TODO.md
 
 %{_libdir}/libzbar.so
 %{_libdir}/pkgconfig/zbar.pc
@@ -186,6 +186,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 %{_docdir}/test_python.py
 
 %changelog
+* Tue May 14 2019 Mauro Carvalho Chehab <mchehab+samsung@kernel.org> - 0.22.92-1
+- Third release candidate for 0.23.
+
 * Fri May 10 2019 Mauro Carvalho Chehab <mchehab+samsung@kernel.org> - 0.22.90-1
 - Release candidate for 0.23. Support for Gtk3 and GObject Introspection (GIR)
 

From 665880f68be46d1403ef126e753cfc3e1bc87d1b Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Date: Thu, 23 May 2019 18:17:14 -0300
Subject: [PATCH 080/108] Bump to version 0.23

Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
---
 .gitignore | 1 +
 sources    | 2 +-
 zbar.spec  | 6 +++++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index dd013dc..d28ed8e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ zbar-0.10.tar.bz2
 /zbar-0.22.90.tar.bz2
 /zbar-0.22.91.tar.bz2
 /zbar-0.22.92.tar.bz2
+/zbar-0.23.tar.bz2
diff --git a/sources b/sources
index 7c09094..6707fd8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (zbar-0.22.92.tar.bz2) = 242fb7dc9ad3b25d2acd1fdbf39039fd376c40167f3b88dd63e4bd63c112c18560f42f186f78430167ce5b7c0a53fc7c7185367efa2a4985c9abc68a27500375
+SHA512 (zbar-0.23.tar.bz2) = 7eef2ee99760edd693ecc12a36e04b71a156b93b4c1977ca4f6da103a955284cf640b55adb185477e1d4cc65345bb01608ed9528f6518abb514ccbc58e5d350b
diff --git a/zbar.spec b/zbar.spec
index b567141..6081050 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -1,5 +1,5 @@
 Name:		zbar
-Version:	0.22.92
+Version:	0.23
 Release:	1%{?dist}
 Summary:	Bar code reader
 
@@ -186,6 +186,10 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 %{_docdir}/test_python.py
 
 %changelog
+* Thu May 23 2019 Mauro Carvalho Chehab <mchehab+samsung@kernel.org> - 0.23-1
+- Bump to release 0.23.
+
+
 * Tue May 14 2019 Mauro Carvalho Chehab <mchehab+samsung@kernel.org> - 0.22.92-1
 - Third release candidate for 0.23.
 

From 366530f9aeb0b4eedf0e85a4b5d011718f8ff409 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 27 Jul 2019 04:57:22 +0000
Subject: [PATCH 081/108] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 zbar.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zbar.spec b/zbar.spec
index 6081050..12f79b4 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -1,6 +1,6 @@
 Name:		zbar
 Version:	0.23
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Bar code reader
 
 License:	LGPLv2+
@@ -186,6 +186,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 %{_docdir}/test_python.py
 
 %changelog
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.23-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Thu May 23 2019 Mauro Carvalho Chehab <mchehab+samsung@kernel.org> - 0.23-1
 - Bump to release 0.23.
 

From 32cda90a06ff8ecb3c1cd72f9f132fd3cbd9e388 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Tue, 13 Aug 2019 12:27:57 +0200
Subject: [PATCH 082/108] Drop obsolete Group tag

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---
 zbar.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/zbar.spec b/zbar.spec
index 12f79b4..b81d818 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -73,7 +73,6 @@ developing GUI applications based on Qt4 that include a bar code
 scanning widget.
 
 %package python3
-Group: Development/Libraries
 Summary: Bar code reader PyGTK widget
 Requires: python3-pillow, %{name} = %{version}-%{release}
 

From f804e4f3cc266601fc72bdfc0ace5709c8460e08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Mon, 19 Aug 2019 11:10:07 +0200
Subject: [PATCH 083/108] Rebuilt for Python 3.8

---
 zbar.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zbar.spec b/zbar.spec
index b81d818..cc85df9 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -1,6 +1,6 @@
 Name:		zbar
 Version:	0.23
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Bar code reader
 
 License:	LGPLv2+
@@ -185,6 +185,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 %{_docdir}/test_python.py
 
 %changelog
+* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 0.23-3
+- Rebuilt for Python 3.8
+
 * Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.23-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 

From de7a7a2177b2bb566567040a97f0e67b4c6bea18 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 31 Jan 2020 05:15:54 +0000
Subject: [PATCH 084/108] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 zbar.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zbar.spec b/zbar.spec
index cc85df9..47611e0 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -1,6 +1,6 @@
 Name:		zbar
 Version:	0.23
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Bar code reader
 
 License:	LGPLv2+
@@ -185,6 +185,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 %{_docdir}/test_python.py
 
 %changelog
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.23-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
 * Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 0.23-3
 - Rebuilt for Python 3.8
 

From 1bd23d395d651f782b1c692a43bb78c93b5d1345 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Tue, 26 May 2020 03:55:45 +0200
Subject: [PATCH 085/108] Rebuilt for Python 3.9

---
 zbar.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zbar.spec b/zbar.spec
index 47611e0..12eb82b 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -1,6 +1,6 @@
 Name:		zbar
 Version:	0.23
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Bar code reader
 
 License:	LGPLv2+
@@ -185,6 +185,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 %{_docdir}/test_python.py
 
 %changelog
+* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 0.23-5
+- Rebuilt for Python 3.9
+
 * Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.23-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 

From 65b1326e59db4421b30ddc52b3886291d51b8076 Mon Sep 17 00:00:00 2001
From: Gwyn Ciesla <gwync@protonmail.com>
Date: Mon, 20 Jul 2020 13:05:26 -0500
Subject: [PATCH 086/108] Several fixes.

---
 zbar-tp_print.patch | 28 ++++++++++++++++++++++++++++
 zbar.spec           | 21 ++++++++++++++-------
 2 files changed, 42 insertions(+), 7 deletions(-)
 create mode 100644 zbar-tp_print.patch

diff --git a/zbar-tp_print.patch b/zbar-tp_print.patch
new file mode 100644
index 0000000..ac1391b
--- /dev/null
+++ b/zbar-tp_print.patch
@@ -0,0 +1,28 @@
+--- python/enum.c~	2019-05-22 06:00:30.000000000 -0500
++++ python/enum.c	2020-07-20 12:29:37.468767649 -0500
+@@ -76,6 +76,7 @@
+     return(self->name);
+ }
+ 
++#if PY_MAJOR_VERSION < 3
+ static int
+ enumitem_print (zbarEnumItem *self,
+                 FILE *fp,
+@@ -83,6 +84,7 @@
+ {
+     return(self->name->ob_type->tp_print(self->name, fp, flags));
+ }
++#endif
+ 
+ static PyObject*
+ enumitem_repr (zbarEnumItem *self)
+@@ -115,7 +117,9 @@
+     .tp_new         = (newfunc)enumitem_new,
+     .tp_dealloc     = (destructor)enumitem_dealloc,
+     .tp_str         = (reprfunc)enumitem_str,
++#if PY_MAJOR_VERSION < 3
+     .tp_print       = (printfunc)enumitem_print,
++#endif
+     .tp_repr        = (reprfunc)enumitem_repr,
+ };
+ 
diff --git a/zbar.spec b/zbar.spec
index 12eb82b..cfc26d2 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -1,25 +1,26 @@
 Name:		zbar
 Version:	0.23
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Bar code reader
 
 License:	LGPLv2+
 URL:		http://zbar.sourceforge.net/
 Source0:	https://linuxtv.org/downloads/%{name}/%{name}-%{version}.tar.bz2
 Patch0:		use_python3_on_python_script.patch
+Patch1:         zbar-tp_print.patch
 
 BuildRequires:	autoconf automake libtool gettext-devel
 BuildRequires:	qt5-qtbase-devel qt5-qtx11extras-devel
-BuildRequires:	gtk3-devel ImageMagick-devel pygobject3-devel
+BuildRequires:	gtk3-devel GraphicsMagick-devel pygobject3-devel
 BuildRequires:	libv4l-devel libXv-devel xmlto dbus-devel
 BuildRequires:	java-11-openjdk-devel
 BuildRequires:	python3-devel
 
 %description
-A layered bar code scanning and decoding library. Supports EAN, UPC, Code 128,
-Code 39 and Interleaved 2 of 5.
-Includes applications for decoding captured bar code images and using a video
-device (e. g., webcam) as a bar code scanner.
+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, Code 128,
+Code 93, Code 39, Codabar, Interleaved 2 of 5, QR Code and SQ Code.
 
 %package devel
 Summary: Bar code library extra development files
@@ -92,10 +93,11 @@ on Java Native Interface (JNI) applications using ZBar.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p0
 
 %build
 autoreconf -vfi
-%configure --with-python=python3 --with-gtk=auto --docdir=%{_docdir}/%{name}-%{version}
+%configure --with-python=python3 --with-gtk=auto --docdir=%{_docdir}/%{name}-%{version} --with-graphicsmagick
 
 # rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -185,6 +187,11 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 %{_docdir}/test_python.py
 
 %changelog
+* Mon Jul 20 2020 Gwyn Ciesla <gwync@protonmail.com> - 0.23-6
+- Update description.
+- Patch for Python 3.9.
+- Move back to GraphicsMagick.
+
 * Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 0.23-5
 - Rebuilt for Python 3.9
 

From 180f2787512832ca3d83513c2607817f64974a0c Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 29 Jul 2020 15:20:34 +0000
Subject: [PATCH 087/108] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 zbar.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zbar.spec b/zbar.spec
index cfc26d2..e00cb71 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -1,6 +1,6 @@
 Name:		zbar
 Version:	0.23
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Bar code reader
 
 License:	LGPLv2+
@@ -187,6 +187,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 %{_docdir}/test_python.py
 
 %changelog
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.23-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
 * Mon Jul 20 2020 Gwyn Ciesla <gwync@protonmail.com> - 0.23-6
 - Update description.
 - Patch for Python 3.9.

From 4271d8661976199e8f89419ecd0417659938bcd5 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar@redhat.com>
Date: Sat, 9 Jan 2021 01:51:07 +0000
Subject: [PATCH 088/108] Add BuildRequires: make

https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
---
 zbar.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/zbar.spec b/zbar.spec
index e00cb71..d73a216 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -9,6 +9,7 @@ Source0:	https://linuxtv.org/downloads/%{name}/%{name}-%{version}.tar.bz2
 Patch0:		use_python3_on_python_script.patch
 Patch1:         zbar-tp_print.patch
 
+BuildRequires: make
 BuildRequires:	autoconf automake libtool gettext-devel
 BuildRequires:	qt5-qtbase-devel qt5-qtx11extras-devel
 BuildRequires:	gtk3-devel GraphicsMagick-devel pygobject3-devel

From cbd438c1d3fa5041e3b7fe53e192f95d032cdea4 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 28 Jan 2021 00:39:37 +0000
Subject: [PATCH 089/108] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 zbar.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zbar.spec b/zbar.spec
index d73a216..a6160e6 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -1,6 +1,6 @@
 Name:		zbar
 Version:	0.23
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	Bar code reader
 
 License:	LGPLv2+
@@ -188,6 +188,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 %{_docdir}/test_python.py
 
 %changelog
+* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.23-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.23-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 

From 932f44b9f77a70ee660ad82daa2b66b9b2146845 Mon Sep 17 00:00:00 2001
From: Gwyn Ciesla <gwync@protonmail.com>
Date: Thu, 25 Mar 2021 14:25:48 -0500
Subject: [PATCH 090/108] Fix FTBFS.

---
 zbar.spec | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/zbar.spec b/zbar.spec
index a6160e6..dc358bb 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -1,6 +1,6 @@
 Name:		zbar
 Version:	0.23
-Release:	8%{?dist}
+Release:	9%{?dist}
 Summary:	Bar code reader
 
 License:	LGPLv2+
@@ -97,7 +97,6 @@ on Java Native Interface (JNI) applications using ZBar.
 %patch1 -p0
 
 %build
-autoreconf -vfi
 %configure --with-python=python3 --with-gtk=auto --docdir=%{_docdir}/%{name}-%{version} --with-graphicsmagick
 
 # rpath
@@ -188,6 +187,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 %{_docdir}/test_python.py
 
 %changelog
+* Thu Mar 25 2021 Gwyn Ciesla <gwync@protonmail.com> - 0.23-9
+Fix FTBFS for autoconf 2.71.
+
 * Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.23-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 

From 38751c3a39a178364bebe5de48e04c0be13b2384 Mon Sep 17 00:00:00 2001
From: Python Maint <python-maint@redhat.com>
Date: Fri, 4 Jun 2021 21:20:46 +0200
Subject: [PATCH 091/108] Rebuilt for Python 3.10

---
 zbar.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zbar.spec b/zbar.spec
index dc358bb..bbdb9e1 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -1,6 +1,6 @@
 Name:		zbar
 Version:	0.23
-Release:	9%{?dist}
+Release:	10%{?dist}
 Summary:	Bar code reader
 
 License:	LGPLv2+
@@ -187,6 +187,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 %{_docdir}/test_python.py
 
 %changelog
+* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 0.23-10
+- Rebuilt for Python 3.10
+
 * Thu Mar 25 2021 Gwyn Ciesla <gwync@protonmail.com> - 0.23-9
 Fix FTBFS for autoconf 2.71.
 

From cc085ac4be75e5138162bd8c26879336aaa4f34d Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 23 Jul 2021 22:15:15 +0000
Subject: [PATCH 092/108] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 zbar.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zbar.spec b/zbar.spec
index bbdb9e1..441568c 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -1,6 +1,6 @@
 Name:		zbar
 Version:	0.23
-Release:	10%{?dist}
+Release:	11%{?dist}
 Summary:	Bar code reader
 
 License:	LGPLv2+
@@ -187,6 +187,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 %{_docdir}/test_python.py
 
 %changelog
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.23-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
 * Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 0.23-10
 - Rebuilt for Python 3.10
 

From 8a571d93a862f0e9dd4459ba281df1578863751a Mon Sep 17 00:00:00 2001
From: Gwyn Ciesla <gwync@protonmail.com>
Date: Wed, 12 Jan 2022 11:08:15 -0600
Subject: [PATCH 093/108] Fix 3.11 FTBFS.

---
 py311.patch | 35 +++++++++++++++++++++++++++++++++++
 zbar.spec   |  7 ++++++-
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 py311.patch

diff --git a/py311.patch b/py311.patch
new file mode 100644
index 0000000..6977d95
--- /dev/null
+++ b/py311.patch
@@ -0,0 +1,35 @@
+--- python/enum.c~	2022-01-12 10:07:02.151116991 -0600
++++ python/enum.c	2022-01-12 10:14:04.093001534 -0600
+@@ -23,6 +23,12 @@
+ 
+ #include "zbarmodule.h"
+ 
++#if PY_VERSION_HEX < 0x030900A4 && !defined(Py_SET_SIZE)
++static inline void _Py_SET_SIZE(PyVarObject *ob, Py_ssize_t size)
++{ ob->ob_size = size; }
++#define Py_SET_SIZE(ob, size) _Py_SET_SIZE((PyVarObject*)(ob), size)
++#endif
++
+ static char enumitem_doc[] = PyDoc_STR(
+     "simple enumeration item.\n"
+     "\n"
+--- python/enum.c~	2022-01-12 10:16:29.670271662 -0600
++++ python/enum.c	2022-01-12 10:52:11.671258442 -0600
+@@ -58,7 +58,7 @@
+ 
+     /* we assume the "fast path" for a single-digit ints (see longobject.c) */
+     /* this also holds if we get a small_int preallocated long */
+-    Py_SIZE(&self->val) = Py_SIZE(longval);
++    Py_SET_SIZE(&self->val, longval);
+     self->val.ob_digit[0] = longval->ob_digit[0];
+     Py_DECREF(longval);
+ #else
+@@ -148,7 +148,7 @@
+ 
+     /* we assume the "fast path" for a single-digit ints (see longobject.c) */
+     /* this also holds if we get a small_int preallocated long */
+-    Py_SIZE(&self->val) = Py_SIZE(longval);
++    Py_SET_SIZE(&self->val, longval);
+     self->val.ob_digit[0] = longval->ob_digit[0];
+     Py_DECREF(longval);
+ 
diff --git a/zbar.spec b/zbar.spec
index 441568c..3b50674 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -1,6 +1,6 @@
 Name:		zbar
 Version:	0.23
-Release:	11%{?dist}
+Release:	12%{?dist}
 Summary:	Bar code reader
 
 License:	LGPLv2+
@@ -8,6 +8,7 @@ URL:		http://zbar.sourceforge.net/
 Source0:	https://linuxtv.org/downloads/%{name}/%{name}-%{version}.tar.bz2
 Patch0:		use_python3_on_python_script.patch
 Patch1:         zbar-tp_print.patch
+Patch2:         py311.patch
 
 BuildRequires: make
 BuildRequires:	autoconf automake libtool gettext-devel
@@ -95,6 +96,7 @@ on Java Native Interface (JNI) applications using ZBar.
 %setup -q
 %patch0 -p1
 %patch1 -p0
+%patch2 -p0
 
 %build
 %configure --with-python=python3 --with-gtk=auto --docdir=%{_docdir}/%{name}-%{version} --with-graphicsmagick
@@ -187,6 +189,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 %{_docdir}/test_python.py
 
 %changelog
+* Wed Jan 12 2022 Gwyn Ciesla <gwync@protonmail.com> - 0.23-12
+- Fix 3.11 FTBFS.
+
 * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.23-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 

From cf8c7c00208e48b63b61de243aa9d8b85cecbc65 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 22 Jan 2022 05:48:53 +0000
Subject: [PATCH 094/108] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 zbar.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zbar.spec b/zbar.spec
index 3b50674..562d86e 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -1,6 +1,6 @@
 Name:		zbar
 Version:	0.23
-Release:	12%{?dist}
+Release:	13%{?dist}
 Summary:	Bar code reader
 
 License:	LGPLv2+
@@ -189,6 +189,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 %{_docdir}/test_python.py
 
 %changelog
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.23-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
 * Wed Jan 12 2022 Gwyn Ciesla <gwync@protonmail.com> - 0.23-12
 - Fix 3.11 FTBFS.
 

From 5fad1e4a1630c1eba86013c420392a52beeea258 Mon Sep 17 00:00:00 2001
From: Jiri <jvanek@redhat.com>
Date: Sun, 6 Feb 2022 00:53:55 +0100
Subject: [PATCH 095/108] Rebuilt for java-17-openjdk as system jdk

https://fedoraproject.org/wiki/Changes/Java17
---
 zbar.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zbar.spec b/zbar.spec
index 562d86e..2e654f2 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -1,6 +1,6 @@
 Name:		zbar
 Version:	0.23
-Release:	13%{?dist}
+Release:	14%{?dist}
 Summary:	Bar code reader
 
 License:	LGPLv2+
@@ -189,6 +189,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 %{_docdir}/test_python.py
 
 %changelog
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 0.23-14
+- Rebuilt for java-17-openjdk as system jdk
+
 * Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.23-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 

From cd9eddb4188237d7a8c2e563b3ad729da12a0d6c Mon Sep 17 00:00:00 2001
From: Gwyn Ciesla <gwync@protonmail.com>
Date: Tue, 31 May 2022 14:28:55 -0500
Subject: [PATCH 096/108] 0.23.90, enable pdf417

---
 .gitignore          |  1 +
 sources             |  2 +-
 zbar-tp_print.patch | 28 ----------------------------
 zbar.spec           | 19 +++++++++++--------
 4 files changed, 13 insertions(+), 37 deletions(-)
 delete mode 100644 zbar-tp_print.patch

diff --git a/.gitignore b/.gitignore
index d28ed8e..153a457 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ zbar-0.10.tar.bz2
 /zbar-0.22.91.tar.bz2
 /zbar-0.22.92.tar.bz2
 /zbar-0.23.tar.bz2
+/zbar-0.23.90.tar.bz2
diff --git a/sources b/sources
index 6707fd8..6fa09be 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (zbar-0.23.tar.bz2) = 7eef2ee99760edd693ecc12a36e04b71a156b93b4c1977ca4f6da103a955284cf640b55adb185477e1d4cc65345bb01608ed9528f6518abb514ccbc58e5d350b
+SHA512 (zbar-0.23.90.tar.bz2) = c4ccac8526acab4e28c6145c5cdb95b6a6c5c81b6d2f883053435794f7c351edee20abdc9599cb0de96db546f584c9479896baa87b01ad409d5e75ea8b48118c
diff --git a/zbar-tp_print.patch b/zbar-tp_print.patch
deleted file mode 100644
index ac1391b..0000000
--- a/zbar-tp_print.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- python/enum.c~	2019-05-22 06:00:30.000000000 -0500
-+++ python/enum.c	2020-07-20 12:29:37.468767649 -0500
-@@ -76,6 +76,7 @@
-     return(self->name);
- }
- 
-+#if PY_MAJOR_VERSION < 3
- static int
- enumitem_print (zbarEnumItem *self,
-                 FILE *fp,
-@@ -83,6 +84,7 @@
- {
-     return(self->name->ob_type->tp_print(self->name, fp, flags));
- }
-+#endif
- 
- static PyObject*
- enumitem_repr (zbarEnumItem *self)
-@@ -115,7 +117,9 @@
-     .tp_new         = (newfunc)enumitem_new,
-     .tp_dealloc     = (destructor)enumitem_dealloc,
-     .tp_str         = (reprfunc)enumitem_str,
-+#if PY_MAJOR_VERSION < 3
-     .tp_print       = (printfunc)enumitem_print,
-+#endif
-     .tp_repr        = (reprfunc)enumitem_repr,
- };
- 
diff --git a/zbar.spec b/zbar.spec
index 2e654f2..5f0da77 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -1,20 +1,19 @@
 Name:		zbar
-Version:	0.23
-Release:	14%{?dist}
+Version:	0.23.90
+Release:	1%{?dist}
 Summary:	Bar code reader
 
 License:	LGPLv2+
 URL:		http://zbar.sourceforge.net/
 Source0:	https://linuxtv.org/downloads/%{name}/%{name}-%{version}.tar.bz2
 Patch0:		use_python3_on_python_script.patch
-Patch1:         zbar-tp_print.patch
-Patch2:         py311.patch
+Patch1:         py311.patch
 
 BuildRequires: make
 BuildRequires:	autoconf automake libtool gettext-devel
 BuildRequires:	qt5-qtbase-devel qt5-qtx11extras-devel
 BuildRequires:	gtk3-devel GraphicsMagick-devel pygobject3-devel
-BuildRequires:	libv4l-devel libXv-devel xmlto dbus-devel
+BuildRequires:	libv4l-devel libXv-devel xmlto dbus-devel libSM-devel
 BuildRequires:	java-11-openjdk-devel
 BuildRequires:	python3-devel
 
@@ -96,10 +95,9 @@ on Java Native Interface (JNI) applications using ZBar.
 %setup -q
 %patch0 -p1
 %patch1 -p0
-%patch2 -p0
 
 %build
-%configure --with-python=python3 --with-gtk=auto --docdir=%{_docdir}/%{name}-%{version} --with-graphicsmagick
+%configure --with-python=python3 --with-gtk=auto --docdir=%{_docdir}/%{name}-%{version} --with-graphicsmagick --without-xshm --without-xv --enable-codes=ean,databar,code128,code93,code39,codabar,i25,qrcode,sqcode,pdf417
 
 # rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -129,7 +127,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 
 %ldconfig_scriptlets qt
 
-%files
+%find_lang zbar
+
+%files -f zbar.lang
 %doc NEWS.md README.md INSTALL.md
 %license COPYING LICENSE.md
 
@@ -189,6 +189,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 %{_docdir}/test_python.py
 
 %changelog
+* Tue May 31 2022 Gwyn Ciesla <gwync@protonmail.com> - 0.23.90-1
+- 0.23.90
+
 * Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 0.23-14
 - Rebuilt for java-17-openjdk as system jdk
 

From 1ec754dc2ce00834d53511720f56ebc775754dc1 Mon Sep 17 00:00:00 2001
From: Python Maint <python-maint@redhat.com>
Date: Mon, 13 Jun 2022 21:00:09 +0200
Subject: [PATCH 097/108] Rebuilt for Python 3.11

---
 zbar.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zbar.spec b/zbar.spec
index 5f0da77..cd16f3f 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -1,6 +1,6 @@
 Name:		zbar
 Version:	0.23.90
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Bar code reader
 
 License:	LGPLv2+
@@ -189,6 +189,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 %{_docdir}/test_python.py
 
 %changelog
+* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 0.23.90-2
+- Rebuilt for Python 3.11
+
 * Tue May 31 2022 Gwyn Ciesla <gwync@protonmail.com> - 0.23.90-1
 - 0.23.90
 

From 9cdd221147f353730e62a262d33bc4cfaa480328 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 23 Jul 2022 13:52:13 +0000
Subject: [PATCH 098/108] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 zbar.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zbar.spec b/zbar.spec
index cd16f3f..855d498 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -1,6 +1,6 @@
 Name:		zbar
 Version:	0.23.90
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Bar code reader
 
 License:	LGPLv2+
@@ -189,6 +189,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 %{_docdir}/test_python.py
 
 %changelog
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.23.90-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 0.23.90-2
 - Rebuilt for Python 3.11
 

From 4da8028c1a6a8d64a3102584ec2e7cf69ac44d29 Mon Sep 17 00:00:00 2001
From: Gwyn Ciesla <gwync@protonmail.com>
Date: Mon, 1 Aug 2022 15:38:10 -0500
Subject: [PATCH 099/108] Only build java on supported platforms

---
 zbar.spec | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/zbar.spec b/zbar.spec
index 855d498..5ce5e79 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -1,3 +1,9 @@
+%ifarch %{java_arches}
+%global JAVA 1
+%else
+%global JAVA 0
+%endif
+
 Name:		zbar
 Version:	0.23.90
 Release:	3%{?dist}
@@ -14,7 +20,9 @@ BuildRequires:	autoconf automake libtool gettext-devel
 BuildRequires:	qt5-qtbase-devel qt5-qtx11extras-devel
 BuildRequires:	gtk3-devel GraphicsMagick-devel pygobject3-devel
 BuildRequires:	libv4l-devel libXv-devel xmlto dbus-devel libSM-devel
+%if %{JAVA}
 BuildRequires:	java-11-openjdk-devel
+%endif
 BuildRequires:	python3-devel
 
 %description
@@ -82,6 +90,7 @@ Requires: python3-pillow, %{name} = %{version}-%{release}
 This package contains a bar code scanning widget for use on
 python applications that work with images.
 
+%if %{JAVA}
 %package java
 Summary: Bar code reader Java library
 Requires: pkgconfig, %{name}-gtk = %{version}-%{release}, %{name}-devel = %{version}-%{release}
@@ -89,6 +98,7 @@ Requires: pkgconfig, %{name}-gtk = %{version}-%{release}, %{name}-devel = %{vers
 %description java
 This package contains header files and additional libraries used for
 on Java Native Interface (JNI) applications using ZBar.
+%endif
 
 
 %prep
@@ -108,9 +118,11 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+%if %{JAVA}
 install -d %{buildroot}%{_jnidir}
 mv %{buildroot}%{_datadir}/zbar/lib/zbar.jar %{buildroot}%{_jnidir}
 mv %{buildroot}%{_datadir}/zbar/lib/libzbarjni.so* %{buildroot}%{_libdir}
+%endif
 cp test/test_python.py %{buildroot}%{_docdir}
 
 #Remove .la and .a files
@@ -180,15 +192,20 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 %{_libdir}/pkgconfig/zbar-qt.pc
 %{_includedir}/zbar/QZBar*.h
 
+%if %{JAVA}
 %files java
 %{_jnidir}/zbar.jar
 %{_libdir}/libzbarjni.so*
+%endif
 
 %files python3
 %{python3_sitearch}/zbar.so
 %{_docdir}/test_python.py
 
 %changelog
+* Mon Aug 01 2022 Gwyn Ciesla <gwync@protonmail.com> - 0.23.90-4
+- Only build Java on supported platforms.
+
 * Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.23.90-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 

From 1eb32e16c53a9f4d06136c18ce5aa0749b7c3dd7 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Fri, 26 Aug 2022 15:43:36 +0200
Subject: [PATCH 100/108] Sort BuildRequires and Requires and split them out
 one per line

---
 zbar.spec | 43 ++++++++++++++++++++++++++++++++-----------
 1 file changed, 32 insertions(+), 11 deletions(-)

diff --git a/zbar.spec b/zbar.spec
index 5ce5e79..d52240b 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -6,7 +6,7 @@
 
 Name:		zbar
 Version:	0.23.90
-Release:	3%{?dist}
+Release:	5%{?dist}
 Summary:	Bar code reader
 
 License:	LGPLv2+
@@ -15,11 +15,21 @@ Source0:	https://linuxtv.org/downloads/%{name}/%{name}-%{version}.tar.bz2
 Patch0:		use_python3_on_python_script.patch
 Patch1:         py311.patch
 
-BuildRequires: make
-BuildRequires:	autoconf automake libtool gettext-devel
-BuildRequires:	qt5-qtbase-devel qt5-qtx11extras-devel
-BuildRequires:	gtk3-devel GraphicsMagick-devel pygobject3-devel
-BuildRequires:	libv4l-devel libXv-devel xmlto dbus-devel libSM-devel
+BuildRequires:	autoconf
+BuildRequires:	automake
+BuildRequires:	dbus-devel
+BuildRequires:	gettext-devel
+BuildRequires:	GraphicsMagick-devel
+BuildRequires:	gtk3-devel
+BuildRequires:	libSM-devel
+BuildRequires:	libtool
+BuildRequires:	libv4l-devel
+BuildRequires:	libXv-devel
+BuildRequires:	make
+BuildRequires:	pygobject3-devel
+BuildRequires:	qt5-qtbase-devel
+BuildRequires:	qt5-qtx11extras-devel
+BuildRequires:	xmlto
 %if %{JAVA}
 BuildRequires:	java-11-openjdk-devel
 %endif
@@ -33,7 +43,8 @@ Code 93, Code 39, Codabar, Interleaved 2 of 5, QR Code and SQ Code.
 
 %package devel
 Summary: Bar code library extra development files
-Requires: pkgconfig, %{name} = %{version}-%{release}
+Requires: pkgconfig
+Requires: %{name} = %{version}-%{release}
 
 %description devel
 This package contains header files and additional libraries used for
@@ -58,7 +69,9 @@ support on any application compatible with GIR, like python3.
 
 %package gtk-devel
 Summary: Bar code reader GTK widget extra development files
-Requires: pkgconfig, %{name}-gtk = %{version}-%{release}, %{name}-devel = %{version}-%{release}
+Requires: %{name}-devel = %{version}-%{release}
+Requires: %{name}-gtk = %{version}-%{release}
+Requires: pkgconfig
 
 %description gtk-devel
 This package contains header files and additional libraries used for
@@ -75,7 +88,9 @@ applications based on Qt4.
 
 %package qt-devel
 Summary: Bar code reader Qt widget extra development files
-Requires: pkgconfig, %{name}-qt = %{version}-%{release}, %{name}-devel = %{version}-%{release}
+Requires: %{name}-devel = %{version}-%{release}
+Requires: %{name}-qt = %{version}-%{release}
+Requires: pkgconfig
 
 %description qt-devel
 This package contains header files and additional libraries used for
@@ -84,7 +99,8 @@ scanning widget.
 
 %package python3
 Summary: Bar code reader PyGTK widget
-Requires: python3-pillow, %{name} = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
+Requires: python3-pillow
 
 %description python3
 This package contains a bar code scanning widget for use on
@@ -93,7 +109,9 @@ python applications that work with images.
 %if %{JAVA}
 %package java
 Summary: Bar code reader Java library
-Requires: pkgconfig, %{name}-gtk = %{version}-%{release}, %{name}-devel = %{version}-%{release}
+Requires: %{name}-devel = %{version}-%{release}
+Requires: %{name}-gtk = %{version}-%{release}
+Requires: pkgconfig
 
 %description java
 This package contains header files and additional libraries used for
@@ -203,6 +221,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 %{_docdir}/test_python.py
 
 %changelog
+* Fri Aug 26 2022 Kalev Lember <klember@redhat.com> - 0.23.90-5
+- Sort BuildRequires and Requires and split them out one per line
+
 * Mon Aug 01 2022 Gwyn Ciesla <gwync@protonmail.com> - 0.23.90-4
 - Only build Java on supported platforms.
 

From a8a6072c5de4ceb6b12dbbdd14c315c134b9c57b Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Fri, 26 Aug 2022 15:47:49 +0200
Subject: [PATCH 101/108] Move GObject Introspection bindings to -gtk and
 -gtk-devel subpackages

... so it's packaged the same way as we package all of GNOME libraries.
---
 zbar.spec | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/zbar.spec b/zbar.spec
index d52240b..7617543 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -53,20 +53,13 @@ developing applications that read bar codes with this library.
 %package gtk
 Summary: Bar code reader GTK widget
 Requires: %{name} = %{version}-%{release}
+# Obsoleted in F37
+Obsoletes: %{name}-gi < %{version}-%{release}
 
 %description gtk
 This package contains a bar code scanning widget for use with GUI
 applications based on GTK+-2.0.
 
-%package gi
-Summary: Bar code reader GObject Introspection (GIR) Gtk bindings
-Requires: %{name}-gtk = %{version}-%{release}
-
-%description gi
-This package contains a bar code scanning GObject Introspection
-(GIR) Gtk bindings, with allow the usage of ZBar with GUI
-support on any application compatible with GIR, like python3.
-
 %package gtk-devel
 Summary: Bar code reader GTK widget extra development files
 Requires: %{name}-devel = %{version}-%{release}
@@ -189,17 +182,15 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 %files gtk
 %{_libdir}/libzbargtk.so.*
 %{_bindir}/zbarcam-gtk
-
-%files gi
 %dir %{_libdir}/girepository-1.0
-%dir %{_datadir}/gir-1.0
 %{_libdir}/girepository-1.0/ZBar-1.0.typelib
-%{_datadir}/gir-1.0/ZBar-1.0.gir
 
 %files gtk-devel
 %{_libdir}/libzbargtk.so
 %{_libdir}/pkgconfig/zbar-gtk.pc
 %{_includedir}/zbar/zbargtk.h
+%dir %{_datadir}/gir-1.0
+%{_datadir}/gir-1.0/ZBar-1.0.gir
 
 %files qt
 %{_libdir}/libzbarqt.so.*
@@ -223,6 +214,7 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 %changelog
 * Fri Aug 26 2022 Kalev Lember <klember@redhat.com> - 0.23.90-5
 - Sort BuildRequires and Requires and split them out one per line
+- Move GObject Introspection bindings to -gtk and -gtk-devel subpackages
 
 * Mon Aug 01 2022 Gwyn Ciesla <gwync@protonmail.com> - 0.23.90-4
 - Only build Java on supported platforms.

From 5db803bc6fb9b7c3664237cc4854370f69a9db89 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Fri, 26 Aug 2022 15:57:15 +0200
Subject: [PATCH 102/108] Split libzbar out to zbar-libs subpackage

This allows other apps that link with libzbar, such as GNOME
authenticator to not have to pull in GraphicsMagick that
/usr/bin/zbarimg depends on.
---
 zbar.spec | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/zbar.spec b/zbar.spec
index 7617543..2c9fb56 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -44,15 +44,21 @@ Code 93, Code 39, Codabar, Interleaved 2 of 5, QR Code and SQ Code.
 %package devel
 Summary: Bar code library extra development files
 Requires: pkgconfig
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
 
 %description devel
 This package contains header files and additional libraries used for
 developing applications that read bar codes with this library.
 
+%package libs
+Summary: Bar code reader library
+
+%description libs
+This package contains the ZBar Bar Code Reader library.
+
 %package gtk
 Summary: Bar code reader GTK widget
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
 # Obsoleted in F37
 Obsoletes: %{name}-gi < %{version}-%{release}
 
@@ -73,7 +79,7 @@ scanning widget.
 
 %package qt
 Summary: Bar code reader Qt widget
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
 
 %description qt
 This package contains a bar code scanning widget for use with GUI
@@ -92,7 +98,7 @@ scanning widget.
 
 %package python3
 Summary: Bar code reader PyGTK widget
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
 Requires: python3-pillow
 
 %description python3
@@ -152,16 +158,17 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 
 %find_lang zbar
 
-%files -f zbar.lang
+%files
 %doc NEWS.md README.md INSTALL.md
-%license COPYING LICENSE.md
-
 %{_bindir}/zbarimg
 %{_bindir}/zbarcam
-%{_libdir}/libzbar.so.*
 %{_mandir}/man1/*
 %{_sysconfdir}/dbus-1/system.d/org.linuxtv.Zbar.conf
 
+%files libs -f zbar.lang
+%license COPYING LICENSE.md
+%{_libdir}/libzbar.so.0*
+
 %files devel
 %doc HACKING.md TODO.md
 
@@ -215,6 +222,7 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 * Fri Aug 26 2022 Kalev Lember <klember@redhat.com> - 0.23.90-5
 - Sort BuildRequires and Requires and split them out one per line
 - Move GObject Introspection bindings to -gtk and -gtk-devel subpackages
+- Split libzbar out to zbar-libs subpackage
 
 * Mon Aug 01 2022 Gwyn Ciesla <gwync@protonmail.com> - 0.23.90-4
 - Only build Java on supported platforms.

From ce06971a592172e670125487e1735edb8d9db504 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Fri, 26 Aug 2022 15:59:20 +0200
Subject: [PATCH 103/108] Tighten subpackage deps with %%{_isa}

---
 zbar.spec | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/zbar.spec b/zbar.spec
index 2c9fb56..628c5d1 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -44,7 +44,7 @@ Code 93, Code 39, Codabar, Interleaved 2 of 5, QR Code and SQ Code.
 %package devel
 Summary: Bar code library extra development files
 Requires: pkgconfig
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{_isa} = %{version}-%{release}
 
 %description devel
 This package contains header files and additional libraries used for
@@ -58,7 +58,7 @@ This package contains the ZBar Bar Code Reader library.
 
 %package gtk
 Summary: Bar code reader GTK widget
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{_isa} = %{version}-%{release}
 # Obsoleted in F37
 Obsoletes: %{name}-gi < %{version}-%{release}
 
@@ -68,8 +68,8 @@ applications based on GTK+-2.0.
 
 %package gtk-devel
 Summary: Bar code reader GTK widget extra development files
-Requires: %{name}-devel = %{version}-%{release}
-Requires: %{name}-gtk = %{version}-%{release}
+Requires: %{name}-devel%{_isa} = %{version}-%{release}
+Requires: %{name}-gtk%{_isa} = %{version}-%{release}
 Requires: pkgconfig
 
 %description gtk-devel
@@ -79,7 +79,7 @@ scanning widget.
 
 %package qt
 Summary: Bar code reader Qt widget
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{_isa} = %{version}-%{release}
 
 %description qt
 This package contains a bar code scanning widget for use with GUI
@@ -87,8 +87,8 @@ applications based on Qt4.
 
 %package qt-devel
 Summary: Bar code reader Qt widget extra development files
-Requires: %{name}-devel = %{version}-%{release}
-Requires: %{name}-qt = %{version}-%{release}
+Requires: %{name}-devel%{_isa} = %{version}-%{release}
+Requires: %{name}-qt%{_isa} = %{version}-%{release}
 Requires: pkgconfig
 
 %description qt-devel
@@ -98,7 +98,7 @@ scanning widget.
 
 %package python3
 Summary: Bar code reader PyGTK widget
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{_isa} = %{version}-%{release}
 Requires: python3-pillow
 
 %description python3
@@ -108,8 +108,8 @@ python applications that work with images.
 %if %{JAVA}
 %package java
 Summary: Bar code reader Java library
-Requires: %{name}-devel = %{version}-%{release}
-Requires: %{name}-gtk = %{version}-%{release}
+Requires: %{name}-devel%{_isa} = %{version}-%{release}
+Requires: %{name}-gtk%{_isa} = %{version}-%{release}
 Requires: pkgconfig
 
 %description java
@@ -223,6 +223,7 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 - Sort BuildRequires and Requires and split them out one per line
 - Move GObject Introspection bindings to -gtk and -gtk-devel subpackages
 - Split libzbar out to zbar-libs subpackage
+- Tighten subpackage deps with %%{_isa}
 
 * Mon Aug 01 2022 Gwyn Ciesla <gwync@protonmail.com> - 0.23.90-4
 - Only build Java on supported platforms.

From 888b226546ec078391e753f2099c0330862727fb Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Fri, 26 Aug 2022 16:00:11 +0200
Subject: [PATCH 104/108] Drop manual requires on pkgconfig and rely on rpm dep
 extractor

---
 zbar.spec | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/zbar.spec b/zbar.spec
index 628c5d1..ca57127 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -43,7 +43,6 @@ Code 93, Code 39, Codabar, Interleaved 2 of 5, QR Code and SQ Code.
 
 %package devel
 Summary: Bar code library extra development files
-Requires: pkgconfig
 Requires: %{name}-libs%{_isa} = %{version}-%{release}
 
 %description devel
@@ -70,7 +69,6 @@ applications based on GTK+-2.0.
 Summary: Bar code reader GTK widget extra development files
 Requires: %{name}-devel%{_isa} = %{version}-%{release}
 Requires: %{name}-gtk%{_isa} = %{version}-%{release}
-Requires: pkgconfig
 
 %description gtk-devel
 This package contains header files and additional libraries used for
@@ -89,7 +87,6 @@ applications based on Qt4.
 Summary: Bar code reader Qt widget extra development files
 Requires: %{name}-devel%{_isa} = %{version}-%{release}
 Requires: %{name}-qt%{_isa} = %{version}-%{release}
-Requires: pkgconfig
 
 %description qt-devel
 This package contains header files and additional libraries used for
@@ -110,7 +107,6 @@ python applications that work with images.
 Summary: Bar code reader Java library
 Requires: %{name}-devel%{_isa} = %{version}-%{release}
 Requires: %{name}-gtk%{_isa} = %{version}-%{release}
-Requires: pkgconfig
 
 %description java
 This package contains header files and additional libraries used for
@@ -224,6 +220,7 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 - Move GObject Introspection bindings to -gtk and -gtk-devel subpackages
 - Split libzbar out to zbar-libs subpackage
 - Tighten subpackage deps with %%{_isa}
+- Drop manual requires on pkgconfig and rely on rpm dep extractor
 
 * Mon Aug 01 2022 Gwyn Ciesla <gwync@protonmail.com> - 0.23.90-4
 - Only build Java on supported platforms.

From a7acfe6d3d1f15dedd91e54744dcd074e998e07b Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Fri, 26 Aug 2022 16:04:36 +0200
Subject: [PATCH 105/108] Rename zbar-python3 to python3-zbar as per latest
 Python guidelines

---
 zbar.spec | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/zbar.spec b/zbar.spec
index ca57127..55b1804 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -93,12 +93,14 @@ This package contains header files and additional libraries used for
 developing GUI applications based on Qt4 that include a bar code
 scanning widget.
 
-%package python3
+%package -n python3-zbar
 Summary: Bar code reader PyGTK widget
 Requires: %{name}-libs%{_isa} = %{version}-%{release}
 Requires: python3-pillow
+# Renamed in F37
+Obsoletes: %{name}-python3 < %{version}-%{release}
 
-%description python3
+%description -n python3-zbar
 This package contains a bar code scanning widget for use on
 python applications that work with images.
 
@@ -210,7 +212,7 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 %{_libdir}/libzbarjni.so*
 %endif
 
-%files python3
+%files -n python3-zbar
 %{python3_sitearch}/zbar.so
 %{_docdir}/test_python.py
 
@@ -221,6 +223,7 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 - Split libzbar out to zbar-libs subpackage
 - Tighten subpackage deps with %%{_isa}
 - Drop manual requires on pkgconfig and rely on rpm dep extractor
+- Rename zbar-python3 to python3-zbar as per latest Python guidelines
 
 * Mon Aug 01 2022 Gwyn Ciesla <gwync@protonmail.com> - 0.23.90-4
 - Only build Java on supported platforms.

From 3382cddf1b795a2f185a8ff2e7b2d3543209c6d2 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Fri, 26 Aug 2022 16:05:18 +0200
Subject: [PATCH 106/108] Use make_build and make_install macros

---
 zbar.spec | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/zbar.spec b/zbar.spec
index 55b1804..6dbf9f1 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -128,11 +128,11 @@ on Java Native Interface (JNI) applications using ZBar.
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
-make %{?_smp_mflags}
+%make_build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+%make_install
 %if %{JAVA}
 install -d %{buildroot}%{_jnidir}
 mv %{buildroot}%{_datadir}/zbar/lib/zbar.jar %{buildroot}%{_jnidir}
@@ -224,6 +224,7 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 - Tighten subpackage deps with %%{_isa}
 - Drop manual requires on pkgconfig and rely on rpm dep extractor
 - Rename zbar-python3 to python3-zbar as per latest Python guidelines
+- Use make_build and make_install macros
 
 * Mon Aug 01 2022 Gwyn Ciesla <gwync@protonmail.com> - 0.23.90-4
 - Only build Java on supported platforms.

From 1d27d2f2d2acfa674167adb5d3928d0eaa0c08c0 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Fri, 26 Aug 2022 16:06:53 +0200
Subject: [PATCH 107/108] Misc packaging cleanup

---
 zbar.spec | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/zbar.spec b/zbar.spec
index 6dbf9f1..1041c3d 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -42,7 +42,7 @@ intensity sensors. It supports EAN-13/UPC-A, UPC-E, EAN-8, Code 128,
 Code 93, Code 39, Codabar, Interleaved 2 of 5, QR Code and SQ Code.
 
 %package devel
-Summary: Bar code library extra development files
+Summary: Bar code reader library extra development files
 Requires: %{name}-libs%{_isa} = %{version}-%{release}
 
 %description devel
@@ -63,7 +63,7 @@ Obsoletes: %{name}-gi < %{version}-%{release}
 
 %description gtk
 This package contains a bar code scanning widget for use with GUI
-applications based on GTK+-2.0.
+applications based on GTK 3.
 
 %package gtk-devel
 Summary: Bar code reader GTK widget extra development files
@@ -72,7 +72,7 @@ Requires: %{name}-gtk%{_isa} = %{version}-%{release}
 
 %description gtk-devel
 This package contains header files and additional libraries used for
-developing GUI applications based on GTK+-2.0 that include a bar code
+developing GUI applications based on GTK 3 that include a bar code
 scanning widget.
 
 %package qt
@@ -90,7 +90,7 @@ Requires: %{name}-qt%{_isa} = %{version}-%{release}
 
 %description qt-devel
 This package contains header files and additional libraries used for
-developing GUI applications based on Qt4 that include a bar code
+developing GUI applications based on Qt5 that include a bar code
 scanning widget.
 
 %package -n python3-zbar
@@ -115,7 +115,6 @@ This package contains header files and additional libraries used for
 on Java Native Interface (JNI) applications using ZBar.
 %endif
 
-
 %prep
 %setup -q
 %patch0 -p1
@@ -131,7 +130,6 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 %make_build
 
 %install
-rm -rf $RPM_BUILD_ROOT
 %make_install
 %if %{JAVA}
 install -d %{buildroot}%{_jnidir}
@@ -169,7 +167,6 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 
 %files devel
 %doc HACKING.md TODO.md
-
 %{_libdir}/libzbar.so
 %{_libdir}/pkgconfig/zbar.pc
 %dir %{_includedir}/zbar
@@ -218,6 +215,7 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 
 %changelog
 * Fri Aug 26 2022 Kalev Lember <klember@redhat.com> - 0.23.90-5
+- Misc packaging cleanup
 - Sort BuildRequires and Requires and split them out one per line
 - Move GObject Introspection bindings to -gtk and -gtk-devel subpackages
 - Split libzbar out to zbar-libs subpackage

From 69eaa96861eb1f2f0dd16cfaf0fc6410dcc81467 Mon Sep 17 00:00:00 2001
From: MSVSphere Packaging Team <packager@msvsphere-os.ru>
Date: Tue, 31 Oct 2023 00:41:39 +0300
Subject: [PATCH 108/108] Remove unnecessary files

---
 sources | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 sources

diff --git a/sources b/sources
deleted file mode 100644
index 6fa09be..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (zbar-0.23.90.tar.bz2) = c4ccac8526acab4e28c6145c5cdb95b6a6c5c81b6d2f883053435794f7c351edee20abdc9599cb0de96db546f584c9479896baa87b01ad409d5e75ea8b48118c