debian/0000775000000000000000000000000012057462375007203 5ustar debian/patches/0000775000000000000000000000000011702161323010613 5ustar debian/patches/series0000664000000000000000000000024511702161343012033 0ustar 01_debian_compile_support.patch 02_fix_library_build.patch 03_fix_ftbfs_590342.patch 04_fix_ftbfs_618132.patch 05_fix_ftbfs_permissive.patch 06_fix_link_order.patch debian/patches/02_fix_library_build.patch0000775000000000000000000000120311634503716015637 0ustar diff --git a/src/libdecodeqr/Makefile.in b/src/libdecodeqr/Makefile.in index 9405ea5..c86a21b 100644 --- a/src/libdecodeqr/Makefile.in +++ b/src/libdecodeqr/Makefile.in @@ -31,9 +31,9 @@ AR=@AR@ ARFLAGS=rcs LD=@LD@ -LDFLAGS=@LDFLAGS@ -shared -soname $(SONAME) +LDFLAGS=@LDFLAGS@ -shared -Wl,-soname,$(SONAME) LIBCV=@LIBCV@ -LIBS=$(LIBCV) +LIBS=$(LIBCV) -lcxcore INSTALL=@INSTALL@ LDCONFIG=/sbin/ldconfig @@ -53,7 +53,7 @@ $(LIBNAME_A): $(objs) $(AR) $(ARFLAGS) $@ $(objs) $(LIBNAME_SO): $(objs) - $(LD) -o $@ $(objs) $(LDFLAGS) $(LIBS) + $(CXX) -o $@ $(objs) $(LDFLAGS) $(LIBS) install: $(dsts) mkdir -p $(DESTDIR)$(libdir) debian/patches/04_fix_ftbfs_618132.patch0000775000000000000000000000247211634503716014757 0ustar diff --git a/src/configure b/src/configure index 3a02f12..fa3faa4 100755 --- a/src/configure +++ b/src/configure @@ -2770,11 +2770,9 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif -char cvCreateImage (); int main () { -return cvCreateImage (); ; return 0; } @@ -2874,11 +2872,9 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif -char cvShowImage (); int main () { -return cvShowImage (); ; return 0; } diff --git a/src/sample/simple/Makefile.in b/src/sample/simple/Makefile.in index bcd34df..248e323 100644 --- a/src/sample/simple/Makefile.in +++ b/src/sample/simple/Makefile.in @@ -20,7 +20,7 @@ CPPFLAGS=@CPPFLAGS@ @CXXFLAGS@ -c -I$(LIBDECODEQR_DIR) LIBCV=@LIBCV@ LIBHIGHGUI=@LIBHIGHGUI@ -LIBS=$(LIBCV) $(LIBHIGHGUI) -ldecodeqr +LIBS=$(LIBHIGHGUI) -lcxcore -ldecodeqr $(LIBCV) LDFLAGS=@LDFLAGS@ -L$(LIBDECODEQR_DIR) diff --git a/src/sample/webcam/Makefile.in b/src/sample/webcam/Makefile.in index 226a210..584eaca 100644 --- a/src/sample/webcam/Makefile.in +++ b/src/sample/webcam/Makefile.in @@ -20,7 +20,7 @@ CPPFLAGS=@CPPFLAGS@ @CXXFLAGS@ -c -I$(LIBDECODEQR_DIR) LIBCV=@LIBCV@ LIBHIGHGUI=@LIBHIGHGUI@ -LIBS=$(LIBCV) $(LIBHIGHGUI) -ldecodeqr +LIBS=$(LIBHIGHGUI) -lcxcore -ldecodeqr $(LIBCV) LDFLAGS=@LDFLAGS@ -L$(LIBDECODEQR_DIR) -- 1.7.5.4 debian/patches/06_fix_link_order.patch0000664000000000000000000000176411702161253015151 0ustar Index: libdecodeqr-0.9.3/src/sample/simple/Makefile.in =================================================================== --- libdecodeqr-0.9.3.orig/src/sample/simple/Makefile.in 2012-01-08 00:09:37.000000000 +0000 +++ libdecodeqr-0.9.3/src/sample/simple/Makefile.in 2012-01-08 00:09:37.000000000 +0000 @@ -20,7 +20,7 @@ LIBCV=@LIBCV@ LIBHIGHGUI=@LIBHIGHGUI@ -LIBS=$(LIBHIGHGUI) -lcxcore -ldecodeqr $(LIBCV) +LIBS=-ldecodeqr $(LIBHIGHGUI) -lcxcore $(LIBCV) LDFLAGS=@LDFLAGS@ -L$(LIBDECODEQR_DIR) Index: libdecodeqr-0.9.3/src/sample/webcam/Makefile.in =================================================================== --- libdecodeqr-0.9.3.orig/src/sample/webcam/Makefile.in 2012-01-08 00:09:37.000000000 +0000 +++ libdecodeqr-0.9.3/src/sample/webcam/Makefile.in 2012-01-08 00:11:41.000000000 +0000 @@ -20,7 +20,7 @@ LIBCV=@LIBCV@ LIBHIGHGUI=@LIBHIGHGUI@ -LIBS=$(LIBHIGHGUI) -lcxcore -ldecodeqr $(LIBCV) +LIBS=-ldecodeqr $(LIBHIGHGUI) -lcxcore $(LIBCV) LDFLAGS=@LDFLAGS@ -L$(LIBDECODEQR_DIR) debian/patches/05_fix_ftbfs_permissive.patch0000775000000000000000000000502411634503716016376 0ustar diff --git a/src/libdecodeqr/galois.cpp b/src/libdecodeqr/galois.cpp index 78b6508..ba78cf6 100644 --- a/src/libdecodeqr/galois.cpp +++ b/src/libdecodeqr/galois.cpp @@ -392,11 +392,11 @@ namespace Galois{ buf->swap_col(j,i); for(i=j+1;iget(i,j)/(*l)); - buf->set(i,j,n); + Nomial n = (*buf->get(i,j)/(*l)); + buf->set(i,j,&n); for(int k=j+1;kget(i,k)-*buf->get(j,k)**n); - *buf->set(i,k,m); + Nomial m=((*buf->get(i,k)) -(*buf->get(j,k)) * n); + *buf->set(i,k,&m); } } } @@ -450,15 +450,17 @@ namespace Galois{ for(j=0;jcols;j++){ for(i=j+1;icols;i++){ - ret->set(i,&(*ret->get(i)-*ret->get(j)**lu->get(i,j))); + Nomial n = (*ret->get(i))-(*ret->get(j))*(*lu->get(i,j)); + ret->set(i,&n); } } for(j=lu->cols-1;j>=0;j--){ for(int i=j+1;icols;i++){ - ret->set(j,&(*ret->get(j)- - *lu->get(j,i)**ret->get(i))); + Nomial n = (*ret->get(j)) - (*lu->get(j,i)) * (*ret->get(i)); + ret->set(j,&n); } - ret->set(j,&(*ret->get(j)/(*lu->get(j,j)))); + Nomial m = (*ret->get(j)) / (*lu->get(j,j)); + ret->set(j,&m); } return(ret); } @@ -556,10 +558,11 @@ namespace Galois{ for(j=0,c=0;jrows;j++){ Galois::Nomial *sigma=err->get(0); for(i=1;iget(i)* - *this->_gf->exp2nomial(j*i)); + Galois::Nomial n = ((*sigma) + (*err->get(i)) * (*this->_gf->exp2nomial(j*i))); + sigma=&n; } - sigma=&(*sigma+*this->_gf->exp2nomial(j*i)); + Galois::Nomial n = (*sigma) + (*this->_gf->exp2nomial(j*i)); + sigma=&n ; if(sigma->is_zero()){ if(c_gf->zero(); for(int i=0;irows;i++){ - x=&(*x+*this->get(i)* - *this->_gf->exp2nomial(i*d)); + Galois::Nomial n = (*x) + (*this->get(i)) * (*this->_gf->exp2nomial(i*d)); + x=&n; } return(x->dup()); -- 1.7.5.4 debian/patches/03_fix_ftbfs_590342.patch0000775000000000000000000000047711634503716014763 0ustar diff --git a/src/libdecodeqr/imagereader.h b/src/libdecodeqr/imagereader.h index 956592d..521265d 100644 --- a/src/libdecodeqr/imagereader.h +++ b/src/libdecodeqr/imagereader.h @@ -19,6 +19,7 @@ #endif #include +#include #include #include "qrerror.h" #include "container.h" -- 1.7.5.4 debian/patches/01_debian_compile_support.patch0000775000000000000000000000570711634503716016710 0ustar diff --git a/src/Makefile.in b/src/Makefile.in index 617d14a..94e3e61 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -41,5 +41,8 @@ $(dirs): install: $(dirs) for x in $(dirs); do cd $$x && $(MAKE) install && cd ../;done +distclean: clean + clean: for x in $(dirs); do cd $$x && $(MAKE) clean && cd ../;done + rm -rf config.log config.status diff --git a/src/libdecodeqr/Makefile.in b/src/libdecodeqr/Makefile.in index 950c2fc..9405ea5 100644 --- a/src/libdecodeqr/Makefile.in +++ b/src/libdecodeqr/Makefile.in @@ -56,10 +56,12 @@ $(LIBNAME_SO): $(objs) $(LD) -o $@ $(objs) $(LDFLAGS) $(LIBS) install: $(dsts) - $(INSTALL) -m 0755 $(LIBNAME_A) $(LIBNAME_SO) $(libdir) - $(LDCONFIG) -n $(libdir) - $(LN) -sf $(libdir)/$(LIBNAME_SO) $(libdir)/$(BASENAME).so - $(INSTALL) -m 0644 decodeqr.h qrerror.h qrtypes.h $(includedir) + mkdir -p $(DESTDIR)$(libdir) + $(INSTALL) -m 0755 $(LIBNAME_A) $(LIBNAME_SO) $(DESTDIR)$(libdir) + $(LDCONFIG) -n $(DESTDIR)$(libdir) + $(LN) -sf $(libdir)/$(LIBNAME_SO) $(DESTDIR)$(libdir)/$(BASENAME).so + mkdir -p $(DESTDIR)$(includedir) + $(INSTALL) -m 0644 decodeqr.h qrerror.h qrtypes.h $(DESTDIR)$(includedir) clean: -rm *.a *.o *.so.* diff --git a/src/sample/Makefile.in b/src/sample/Makefile.in index 8245b66..0171758 100644 --- a/src/sample/Makefile.in +++ b/src/sample/Makefile.in @@ -28,7 +28,8 @@ all: $(dirs) $(dirs): cd $@ && $(MAKE) -install: $(dirs) +install: + for x in $(dirs); do cd $$x && $(MAKE) install && cd ../;done clean: for x in $(dirs); do cd $$x && $(MAKE) clean && cd ../;done diff --git a/src/sample/simple/Makefile.in b/src/sample/simple/Makefile.in index b1a4373..bcd34df 100644 --- a/src/sample/simple/Makefile.in +++ b/src/sample/simple/Makefile.in @@ -12,6 +12,9 @@ # LIBDECODEQR_DIR=../../libdecodeqr +prefix = @prefix@ +bindir = @bindir@ + CXX=@CXX@ CPPFLAGS=@CPPFLAGS@ @CXXFLAGS@ -c -I$(LIBDECODEQR_DIR) @@ -30,12 +33,16 @@ VPATH=./:$(LIBDECODEQR_DIR) sources:=$(wildcard *.cpp) objs:=$(patsubst %.cpp,%.o,$(wildcard *.cpp)) -dst:=simpletest +dst:=libdecodeqr-simpletest all: $(dst) $(dst): $(objs) libdecodeqr.a $(CXX) $(LDFLAGS) -o $@ $(objs) $(LIBS) +install: + install -d $(DESTDIR)$(bindir) + install -m 755 $(dst) $(DESTDIR)$(bindir) + clean: -rm *.o $(dst) diff --git a/src/sample/webcam/Makefile.in b/src/sample/webcam/Makefile.in index 886934a..226a210 100644 --- a/src/sample/webcam/Makefile.in +++ b/src/sample/webcam/Makefile.in @@ -12,6 +12,9 @@ # LIBDECODEQR_DIR=../../libdecodeqr +prefix = @prefix@ +bindir = @bindir@ + CXX=@CXX@ CPPFLAGS=@CPPFLAGS@ @CXXFLAGS@ -c -I$(LIBDECODEQR_DIR) @@ -30,12 +33,17 @@ VPATH=./:$(LIBDECODEQR_DIR) sources:=$(wildcard *.cpp) objs:=$(patsubst %.cpp,%.o,$(wildcard *.cpp)) -dst:=webcam +dst:=libdecodeqr-webcam + all: $(dst) $(dst): $(objs) libdecodeqr.a $(CXX) $(LDFLAGS) -o $@ $(objs) $(LIBS) +install: + install -d $(DESTDIR)$(bindir) + install -m 755 $(dst) $(DESTDIR)$(bindir) + clean: -rm *.o $(dst) -- 1.7.5.4 debian/compat0000664000000000000000000000000211634503716010374 0ustar 8 debian/libdecodeqr-examples.manpages0000664000000000000000000000007411634503716015005 0ustar debian/libdecodeqr-webcam.1 debian/libdecodeqr-simpletest.1 debian/source/0000775000000000000000000000000011633531364010475 5ustar debian/source/format0000664000000000000000000000001411634503716011704 0ustar 3.0 (quilt) debian/copyright0000664000000000000000000000166511634503716011141 0ustar This package was debianized by Nobuhiro Iwamatsu on Fri, 06 Jul 2007 21:02:43 +0900. It was downloaded from http://trac.koka-in.org/libdecodeqr Upstream Author: NISHI Takao Copyright: libdecodeqr library: Copyright (C) 2007 NISHI Takao Copyright (C) 2007 JMA (Japan Medical Association) Copyright (C) 2007 NaCl (Network Applied Communication Laboratory Ltd.) Sample QR image files: Copyright (C) 2007 Nobuhiro Iwamatsu License: libdecodeqr is a free software with ABSOLUTELY NO WARRANTY under the terms of the GNU Lesser General Public License. You can find the complete text of LGPL in /usr/share/common-licenses/LGPL on your Debian systems. The Debian packaging is (C) 2007, Nobuhiro Iwamatsu and is licensed under the GPL, see `/usr/share/common-licenses/GPL'. debian/README.Debian0000664000000000000000000000136111634503716011240 0ustar libdecodeqr for Debian ---------------------- This package is QR-code decoder library. This package has some sample program. - simple simple QR-code decode program. - webcam QR-code decode program that uses webcam. I checed by linux-uvc and ov51x-jpeg. If you use some webcam , you change source code. ex) If you want use 2nd webcam, --- webcam.cpp 2007-02-26 04:42:28.000000000 +0900 +++ webcam.cpp.change 2007-08-25 14:53:58.000000000 +0900 @@ -33,7 +33,7 @@ // // start camera // - CvCapture *capture=cvCaptureFromCAM(0); + CvCapture *capture=cvCaptureFromCAM(1); if(!capture) return(-1); -- Nobuhiro Iwamatsu Fri, 06 Jul 2007 21:02:43 +0900 debian/changelog0000664000000000000000000000546512057462345011064 0ustar libdecodeqr (0.9.3-6.2build1) raring; urgency=low * Rebuild for opencv 2.4 -- Fabrice Coutadeur Tue, 04 Dec 2012 22:02:29 +0100 libdecodeqr (0.9.3-6.2) unstable; urgency=low * Non-maintainer upload. * Add patch 06_fix_link_order.patch, again provided by peter green: reorder linking in Makefile.ins, otherwise the package FTBFS (without binutils-gold). Now hopefully really closes: #652854. -- gregor herrmann Sun, 08 Jan 2012 01:35:19 +0100 libdecodeqr (0.9.3-6.1) unstable; urgency=low * Fix "libdecodeqr FTBFS in unstable "configure: error: libcv.la not found."": apply patch from peter green that adjusts debian/{control,rules} to the restructured opencv libraries. Closes: #652854 -- gregor herrmann Wed, 04 Jan 2012 16:07:17 +0100 libdecodeqr (0.9.3-6) unstable; urgency=low * Fix FTBFS with ld --as-needed. (Closes: #641565) Update patches/04_fix_ftbfs_618132.patch. Thanks for Iain Lane. * Update debian/rules. Add -Wl,-z,defs -Wl,--as-needed to LDFLAGS. -- Nobuhiro Iwamatsu Fri, 16 Sep 2011 01:12:52 +0900 libdecodeqr (0.9.3-5) unstable; urgency=low * Change format to 3.0 (quilt). - Add source/format file. * Change build tools from CDBS to debhelper. * Update debian/rules. - Change to debhelper. * Update debian/control. - Bump up Standards-Version 3.9.2. - Update package description. * Dump debian/compat to 8. * Fix FTBFS with gold or ld --no-add-needed. (Closes: #618132). - Add patches/04_fix_ftbfs_618132.dpatch. * Fix FTBFS by -fpermissive of option. - Add patches/05_fix_ftbfs_permissive.dpatch. -- Nobuhiro Iwamatsu Tue, 13 Sep 2011 09:14:32 +0900 libdecodeqr (0.9.3-4) unstable; urgency=low * Update debian/control. - Bump up Standards-Version 3.9.0. - Add ${misc:Depends} to libdecodeqr-dev's depends. * Fix FTBFS in imagereader.cpp (Closes: #590342). patches/03_fix_ftbfs_590342.patch -- Nobuhiro Iwamatsu Mon, 26 Jul 2010 20:23:41 +0900 libdecodeqr (0.9.3-3) unstable; urgency=low * Change e-mail address. * Update Standards-Version. * Remove DM-Upload-Allowed field. * Add Homepage field of debian/control. * Add README.source file. * Change build-depends from libcv-dev to libhighgui-dev (Closes: #560577). -- Nobuhiro Iwamatsu Wed, 16 Dec 2009 14:31:14 +0900 libdecodeqr (0.9.3-2) unstable; urgency=low * Fix compile error (Closes: #477001) * Update debian/control Add "DM-Upload-Allowed: yes" -- Nobuhiro Iwamatsu Wed, 07 May 2008 23:36:48 +0900 libdecodeqr (0.9.3-1) unstable; urgency=low * Initial release (Closes: #432046) -- Nobuhiro Iwamatsu Fri, 06 Jul 2007 21:02:43 +0900 debian/libdecodeqr0.install0000664000000000000000000000003111634503716013115 0ustar usr/lib/libdecodeqr.so.* debian/libdecodeqr-dev.install0000664000000000000000000000017711634503716013624 0ustar usr/include/* usr/lib/libdecodeqr.a usr/lib/libdecodeqr.so #usr/lib/pkgconfig/* #usr/lib/libdecodeqr.la #usr/share/pkgconfig/* debian/TODO0000664000000000000000000000016711634503716007672 0ustar * write Hacking guide for English * write API manual for English 08/07/2007 Nobuhiro Iwamatsu debian/libdecodeqr-webcam.10000664000000000000000000000120111634503716012763 0ustar .TH libdecodeqr-webcam "1" "October 2007" .SH NAME libdecodeqr-webcam \- libdecodeqr library's simple test program .SH SYNOPSIS .B libdecodeqr-webcam .SH DESCRIPTION \fBlibdecodeqr-simpletest\fP is libdecodeqr's simple test program that use the web camera. . This sample program can recognize the image file of the QR code of JIS X 0510 and ISO/IEC18004. . The web camera corresponding to Video4Linux or Video4Linux2 is necessary to operate this program. . .SH USAGE .TP libdecodeqr-webcam .SH AUTHOR This manual page was written by Nobuhiro Iwamatsu , for the Debian GNU/Linux system (but may be used by others). debian/libdecodeqr-examples.install0000664000000000000000000000003111634503716014651 0ustar usr/bin/* usr/share/doc/ debian/libdecodeqr0.dirs0000664000000000000000000000001011634503716012405 0ustar usr/lib debian/control0000664000000000000000000000314511701064676010606 0ustar Source: libdecodeqr Priority: optional Maintainer: Nobuhiro Iwamatsu Build-Depends: debhelper (>= 8), libhighgui-dev, quilt, libcv-dev Standards-Version: 3.9.2 Section: libs Homepage: http://trac.koka-in.org/libdecodeqr Package: libdecodeqr-dev Section: libdevel Architecture: any Depends: ${misc:Depends}, libdecodeqr0 (=${binary:Version}), libhighgui-dev Description: C/C++ library for decoding QR code libdecodeqr is a C/C++ library for decoding QR code ased on JIS X 0510 and ISO/IEC18004. . This library is able to decode various image formats whether it's taken from a file, webcam, scanner, or any other image formats available. . This package contains development files. Package: libdecodeqr0 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: C/C++ library for decoding QR code libdecodeqr is a C/C++ library for decoding QR code ased on JIS X 0510 and ISO/IEC18004. . This library is able to decode various image formats whether it's taken from a file, webcam, scanner, or any other image formats available. . This package contains shared libraries. Package: libdecodeqr-examples Section: libs Architecture: any Depends: libdecodeqr0 (=${binary:Version}),${shlibs:Depends}, ${misc:Depends} Description: Sample program in C/C++ library for decoding QR code libdecodeqr is a C/C++ library for decoding QR code ased on JIS X 0510 and ISO/IEC18004. . This library is able to decode various image formats whether it's taken from a file, webcam, scanner, or any other image formats available. . This package contains an example program. debian/rules0000775000000000000000000000230611701064764010257 0ustar #!/usr/bin/make -f CPPFLAGS=$(shell dpkg-buildflags --get CPPFLAGS) LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS) CPPFLAGS+= -I/usr/include/opencv LDFLAGS+=-Wl,-z,defs -Wl,--as-needed export CPPFLAGS LDFLAGS EXAMPLEPKG = libdecodeqr-examples %: dh $@ --with quilt override_dh_clean: - $(MAKE) -C src distclean rm -rf src/Makefile src/libdecodeqr/Makefile src/sample/Makefile src/sample/simple/Makefile src/sample/webcam/Makefile src/test/Makefile rm -rf modules/python/src2/hdr_parser.pyc rm -f src/config.log dh_clean override_dh_auto_configure: dh_auto_configure --sourcedirectory=src -- --with-cv=opencv_core --with-highgui=opencv_highgui sed -i s/cxcore/opencv_imgproc/ src/libdecodeqr/Makefile sed -i s/cxcore/opencv_imgproc/ src/sample/simple/Makefile sed -i s/cxcore/opencv_imgproc/ src/sample/webcam/Makefile override_dh_auto_build: $(MAKE) -C src DESTDIR=$(CURDIR)/debian/tmp dh_auto_build override_dh_auto_install: dh_auto_install --sourcedirectory=src override_dh_install: # Install QR image files install -d $(CURDIR)/debian/tmp/usr/share/doc/$(EXAMPLEPKG)/img install -m 755 $(CURDIR)/img/* $(CURDIR)/debian/tmp/usr/share/doc/$(EXAMPLEPKG)/img dh_install --sourcedir=debian/tmp debian/README.source0000664000000000000000000000030211634503716011350 0ustar This package uses the dpatch system of patch handling. See /usr/share/doc/dpatch/README.source.gz for more details. -- Nobuhiro Iwamatsu Wed, 09 Sep 2009 20:21:35 +0900 debian/libdecodeqr0.shlibs0000664000000000000000000000005011634503716012734 0ustar libdecodeqr 0 libdecodeqr0 (>= 0.9.3-1) debian/libdecodeqr-simpletest.10000664000000000000000000000110711634503716013723 0ustar .TH libdecodeqr-simpletest "1" "October 2007" .SH NAME libdecodeqr-simpletest \- libdecodeqr library's simple test program .SH SYNOPSIS .B libdecodeqr-simpletest .SH DESCRIPTION \fBlibdecodeqr-simpletest\fP is libdecodeqr's simple test program. . This sample program can recognize the image file of the QR code of JIS X 0510 and ISO/IEC18004. . .SH USAGE .TP libdecodeqr-simpletest /usr/share/doc/libdecodeqr-examples/img/test.qr.jpg .SH AUTHOR This manual page was written by Nobuhiro Iwamatsu , for the Debian GNU/Linux system (but may be used by others). debian/libdecodeqr-dev.dirs0000664000000000000000000000002411634503716013106 0ustar usr/lib usr/include