[zbar-commits] push rev [164]: release updates
Status: Beta
Brought to you by:
spadix
Menu
▾
▴
[zbar-commits] push rev [164]: release updates
|
From: <sp...@us...> - 2009-10-22 19:18:38
|
changeset: 164:68686820cd69 user: sp...@us... date: Thu Oct 22 15:18:13 2009 -0400 details: http://zbar.hg.sourceforge.net:8000/hgroot/zbar/zbarzbar/rev/68686820cd69 description: release updates - fix perl Processor init without video diffs (truncated from 392 to 300 lines): diff -r a25c5b96c3ce -r 68686820cd69 ChangeLog --- a/ChangeLog Wed Oct 21 13:01:02 2009 -0400 +++ b/ChangeLog Thu Oct 22 15:18:13 2009 -0400 @@ -1,4 +1,6 @@ -current: +version 0.10: + * release updates + - fix perl Processor init without video * fix window closed notification during events - add read_one example, fix xs compiler warnings, update perl docs * add result query interfaces to image scanner and processor diff -r a25c5b96c3ce -r 68686820cd69 Makefile.am --- a/Makefile.am Wed Oct 21 13:01:02 2009 -0400 +++ b/Makefile.am Thu Oct 22 15:18:13 2009 -0400 @@ -49,6 +49,7 @@ 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 @@ -57,7 +58,7 @@ perl/ZBar.pm perl/inc/Devel/CheckLib.pm perl/ZBar/Image.pod \ perl/ZBar/ImageScanner.pod perl/ZBar/Processor.pod perl/ZBar/Symbol.pod \ perl/examples/paginate.pl perl/examples/processor.pl \ - perl/examples/scan_image.pl \ + perl/examples/read_one.pl perl/examples/scan_image.pl \ perl/t/barcode.png perl/t/ZBar.t perl/t/Decoder.t perl/t/Image.t \ perl/t/Processor.t perl/t/Scanner.t perl/t/pod.t perl/t/pod-coverage.t diff -r a25c5b96c3ce -r 68686820cd69 NEWS --- a/NEWS Wed Oct 21 13:01:02 2009 -0400 +++ b/NEWS Thu Oct 22 15:18:13 2009 -0400 @@ -1,5 +1,17 @@ ZBar Barcode Reader +version 0.10 (2009-10-23): + ZBar goes 2D! This release introduces support for QR Code, developed + by our new project member, Timothy Terriberry. Timothy is an image + processing master, providing this sophisticated functionality using + only integer arithmetic and maintaining an extremely small image + size. Feel free to drop in on #zbar over at freenode to welcome + Timothy (aka derf) to the project and congratulate him on his awesome + work. + + Several bugs fixes and enhancements are also found in this release; + existing users are encouraged to upgrade. + version 0.9 (2009-08-31): Introducing ZBar for Windows! So far we only have straight ports of the command line applications, but work on a cross-platform GUI has diff -r a25c5b96c3ce -r 68686820cd69 README --- a/README Wed Oct 21 13:01:02 2009 -0400 +++ b/README Thu Oct 22 15:18:13 2009 -0400 @@ -37,26 +37,29 @@ The zbarimg program uses ImageMagick to read image files in many different formats. You will need at least ImageMagick version 6.2.6 -and the Magick++ development interface to ImageMagick if you want to -scan image files. ImageMagick may be obtained from +if you want to scan image files. ImageMagick may be obtained from http://www.imagemagick.org/ The Qt widget requires Qt4. You will need Qt4 if you would like to -develop a Qt GUI application with an integrated bar code scanning -widget. Qt4 may be obtained from - http://www.qtsoftware.com/products +use or develop a Qt GUI application with an integrated bar code +scanning widget. Qt4 may be obtained from + http://qt.nokia.com/products The GTK+ widget requires GTK+-2.x. You will need GTK+ if you would -like to develop a GTK+ GUI application with an integrated bar code -scanning widget. GTK+ may be obtained from +like to use or develop a GTK+ GUI application with an integrated bar +code scanning widget. GTK+ may be obtained from http://www.gtk.org/ The PyGTK wrapper for the GTK+ widget requires Python and PyGTK. You -will need both if you would like to develop a PyGTK GUI application -with an integrated bar code scanning widget. Python and PyGTK may -respectively be obtained from +will need both if you would like to use or develop a PyGTK GUI +application with an integrated bar code scanning widget. PyGTK may be +obtained from + http://www.pygtk.org/ + +The Python bindings require Python (version?). You will need Python +if you would like to scan images or video directly using Python. +Python is available from http://python.org/ - http://www.pygtk.org/ The Perl bindings require Perl (version?). You will need Perl if you would like to scan images or video directly using Perl. Perl is diff -r a25c5b96c3ce -r 68686820cd69 configure.ac --- a/configure.ac Wed Oct 21 13:01:02 2009 -0400 +++ b/configure.ac Thu Oct 22 15:18:13 2009 -0400 @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.61]) -AC_INIT([zbar], [0.9], [sp...@us...]) +AC_INIT([zbar], [0.10], [sp...@us...]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_MACRO_DIR(config) AM_INIT_AUTOMAKE([1.10 -Wall -Werror foreign subdir-objects std-options dist-bzip2]) @@ -21,13 +21,13 @@ dnl then increment age. dnl - If any interfaces have been removed since the last public release, dnl then set age to 0. -AC_SUBST([LIB_VERSION], [1:0:1]) -AC_SUBST([RELDATE], [2009-08-31]) +AC_SUBST([LIB_VERSION], [2:0:2]) +AC_SUBST([RELDATE], [2009-10-23]) dnl widget libraries use their own versioning. dnl NB pygtk wrapper is *unversioned* -AC_SUBST([ZGTK_LIB_VERSION], [0:1:0]) -AC_SUBST([ZQT_LIB_VERSION], [0:1:0]) +AC_SUBST([ZGTK_LIB_VERSION], [0:2:0]) +AC_SUBST([ZQT_LIB_VERSION], [0:2:0]) AC_DEFINE_UNQUOTED([ZBAR_VERSION_MAJOR], [[`echo "$PACKAGE_VERSION" | sed -e 's/\..*$//'`]], diff -r a25c5b96c3ce -r 68686820cd69 examples/scan_image.pl --- a/examples/scan_image.pl Wed Oct 21 13:01:02 2009 -0400 +++ b/examples/scan_image.pl Thu Oct 22 15:18:13 2009 -0400 @@ -15,7 +15,7 @@ # obtain image data my $magick = Image::Magick->new(); $magick->Read($ARGV[0]) && die; -my $raw = $magick->ImageToBlob(magick => 'GRAY'); +my $raw = $magick->ImageToBlob(magick => 'GRAY', depth => 8); # wrap image data my $image = Barcode::ZBar::Image->new(); diff -r a25c5b96c3ce -r 68686820cd69 perl/MANIFEST --- a/perl/MANIFEST Wed Oct 21 13:01:02 2009 -0400 +++ b/perl/MANIFEST Thu Oct 22 15:18:13 2009 -0400 @@ -20,3 +20,7 @@ t/pod.t t/pod-coverage.t inc/Devel/CheckLib.pm +examples/paginate.pl +examples/processor.pl +examples/read_one.pl +examples/scan_image.pl diff -r a25c5b96c3ce -r 68686820cd69 perl/ZBar.pm --- a/perl/ZBar.pm Wed Oct 21 13:01:02 2009 -0400 +++ b/perl/ZBar.pm Thu Oct 22 15:18:13 2009 -0400 @@ -32,7 +32,7 @@ our @EXPORT_OK = qw(SPACE BAR version increase_verbosity set_verbosity); -our $VERSION = '0.03'; +our $VERSION = '0.04'; require XSLoader; XSLoader::load('Barcode::ZBar', $VERSION); diff -r a25c5b96c3ce -r 68686820cd69 perl/ZBar/ImageScanner.pod --- a/perl/ZBar/ImageScanner.pod Wed Oct 21 13:01:02 2009 -0400 +++ b/perl/ZBar/ImageScanner.pod Thu Oct 22 15:18:13 2009 -0400 @@ -57,7 +57,9 @@ =item scan_image([I<image>]) -Scan a Barcode::ZBar::Image for bar codes. +Scan a Barcode::ZBar::Image for bar codes. The image must be in the +"Y800" format. If necessary, use C<< I<$image>->convert("Y800") >> to +convert from other supported formats to Y800 before scanning. =item enable_cache([I<enable>]) diff -r a25c5b96c3ce -r 68686820cd69 perl/examples/processor.pl --- a/perl/examples/processor.pl Wed Oct 21 13:01:02 2009 -0400 +++ b/perl/examples/processor.pl Thu Oct 22 15:18:13 2009 -0400 @@ -17,11 +17,10 @@ my ($proc, $image, $closure) = @_; # extract results - foreach my $symbol ($image->get_symbols()) { + foreach my $symbol ($proc->get_results()) { # do something useful with results print('decoded ' . $symbol->get_type() . - ' symbol "' . $symbol->get_data() . "\"\n") - if(!$symbol->get_count()); + ' symbol "' . $symbol->get_data() . "\"\n"); } } $proc->set_data_handler(\&my_handler); @@ -31,4 +30,6 @@ # initiate scanning $proc->set_active(); + +# keep scanning until user provides key/mouse input $proc->user_wait(); diff -r a25c5b96c3ce -r 68686820cd69 perl/examples/read_one.pl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/perl/examples/read_one.pl Thu Oct 22 15:18:13 2009 -0400 @@ -0,0 +1,29 @@ +#!/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 a25c5b96c3ce -r 68686820cd69 perl/examples/scan_image.pl --- a/perl/examples/scan_image.pl Wed Oct 21 13:01:02 2009 -0400 +++ b/perl/examples/scan_image.pl Thu Oct 22 15:18:13 2009 -0400 @@ -15,7 +15,7 @@ # obtain image data my $magick = Image::Magick->new(); $magick->Read($ARGV[0]) && die; -my $raw = $magick->ImageToBlob(magick => 'GRAY'); +my $raw = $magick->ImageToBlob(magick => 'GRAY', depth => 8); # wrap image data my $image = Barcode::ZBar::Image->new(); diff -r a25c5b96c3ce -r 68686820cd69 perl/t/Processor.t --- a/perl/t/Processor.t Wed Oct 21 13:01:02 2009 -0400 +++ b/perl/t/Processor.t Thu Oct 22 15:18:13 2009 -0400 @@ -77,7 +77,7 @@ ######################### -$proc->init($ENV{VIDEO_DEVICE} || '/dev/video0'); +$proc->init($ENV{VIDEO_DEVICE}); ok(!$proc->is_visible(), 'initial visibility'); ######################### diff -r a25c5b96c3ce -r 68686820cd69 perl/t/pod.t --- a/perl/t/pod.t Wed Oct 21 13:01:02 2009 -0400 +++ b/perl/t/pod.t Thu Oct 22 15:18:13 2009 -0400 @@ -5,7 +5,7 @@ use strict; use Test::More; -eval { use Test::Pod 1.00 }; +eval "use Test::Pod 1.00"; plan skip_all => "Test::Pod 1.00 required for testing POD" if $@; diff -r a25c5b96c3ce -r 68686820cd69 perl/typemap --- a/perl/typemap Wed Oct 21 13:01:02 2009 -0400 +++ b/perl/typemap Thu Oct 22 15:18:13 2009 -0400 @@ -45,6 +45,8 @@ T_TIMEOUT if(($var = ($type)(SvNV($arg) * 1000.)) < 0) $var = -1; +T_PV + $var = SvOK($arg) ? SvPV_nolen($arg) : NULL; OUTPUT diff -r a25c5b96c3ce -r 68686820cd69 zbar.nsi --- a/zbar.nsi Wed Oct 21 13:01:02 2009 -0400 +++ b/zbar.nsi Thu Oct 22 15:18:13 2009 -0400 @@ -259,7 +259,8 @@ Delete $INSTDIR\README.windows Delete $INSTDIR\NEWS Delete $INSTDIR\TODO - Delete $INSTDIR\COPYING.LIB + Delete $INSTDIR\COPYING + Delete $INSTDIR\LICENSE Delete $INSTDIR\zbarvars.bat Delete $INSTDIR\uninstall.exe RMDir $INSTDIR diff -r a25c5b96c3ce -r 68686820cd69 zbar/window.h --- a/zbar/window.h Wed Oct 21 13:01:02 2009 -0400 +++ b/zbar/window.h Thu Oct 22 15:18:13 2009 -0400 @@ -134,12 +134,11 @@ extern int _zbar_window_clear(zbar_window_t*); extern int _zbar_window_begin(zbar_window_t*); extern int _zbar_window_end(zbar_window_t*); -extern int _zbar_window_draw_logo(zbar_window_t*); |
Thanks for helping keep SourceForge clean.
X