Commit 5eab87f5 authored by Boyuan Yang's avatar Boyuan Yang

Prepare new upload (0.22-1, unstable)

parent ff6c5924
Pipeline #37077 passed with stages
in 13 minutes and 45 seconds
zbar (0.22-1) unstable; urgency=medium
* QA upload.
* New upstream release (2019-02-20).
* debian/patches: Drop all patches, merged upstream.
* debian/control: Also mark libzbar-dev and libzbargtk-dev as
Multi-Arch: same.
-- Boyuan Yang <byang@debian.org> Wed, 20 Feb 2019 10:18:30 -0500
zbar (0.21-3) unstable; urgency=medium zbar (0.21-3) unstable; urgency=medium
* QA upload. * QA upload.
......
...@@ -44,6 +44,7 @@ Description: bar code scanner and decoder (Perl bindings) ...@@ -44,6 +44,7 @@ Description: bar code scanner and decoder (Perl bindings)
Package: libzbar-dev Package: libzbar-dev
Section: libdevel Section: libdevel
Architecture: any Architecture: any
Multi-Arch: same
Depends: Depends:
libmagick++-dev, libmagick++-dev,
libx11-dev, libx11-dev,
...@@ -74,6 +75,7 @@ Description: bar code scanner and decoder (library) ...@@ -74,6 +75,7 @@ Description: bar code scanner and decoder (library)
Package: libzbargtk-dev Package: libzbargtk-dev
Section: libdevel Section: libdevel
Architecture: any Architecture: any
Multi-Arch: same
Depends: Depends:
libgtk2.0-dev, libgtk2.0-dev,
libzbar-dev (= ${binary:Version}), libzbar-dev (= ${binary:Version}),
......
...@@ -7,6 +7,7 @@ libzbar.so.0 libzbar0 #MINVER# ...@@ -7,6 +7,7 @@ libzbar.so.0 libzbar0 #MINVER#
zbar_decoder_create@Base 0.10 zbar_decoder_create@Base 0.10
zbar_decoder_destroy@Base 0.10 zbar_decoder_destroy@Base 0.10
zbar_decoder_get_color@Base 0.10 zbar_decoder_get_color@Base 0.10
zbar_decoder_get_config@Base 0.22
zbar_decoder_get_configs@Base 0.21 zbar_decoder_get_configs@Base 0.21
zbar_decoder_get_data@Base 0.10 zbar_decoder_get_data@Base 0.10
zbar_decoder_get_data_length@Base 0.10 zbar_decoder_get_data_length@Base 0.10
...@@ -45,6 +46,7 @@ libzbar.so.0 libzbar0 #MINVER# ...@@ -45,6 +46,7 @@ libzbar.so.0 libzbar0 #MINVER#
zbar_image_scanner_create@Base 0.10 zbar_image_scanner_create@Base 0.10
zbar_image_scanner_destroy@Base 0.10 zbar_image_scanner_destroy@Base 0.10
zbar_image_scanner_enable_cache@Base 0.10 zbar_image_scanner_enable_cache@Base 0.10
zbar_image_scanner_get_config@Base 0.22
zbar_image_scanner_get_results@Base 0.10 zbar_image_scanner_get_results@Base 0.10
zbar_image_scanner_recycle_image@Base 0.10 zbar_image_scanner_recycle_image@Base 0.10
zbar_image_scanner_request_dbus@Base 0.21 zbar_image_scanner_request_dbus@Base 0.21
...@@ -124,6 +126,7 @@ libzbar.so.0 libzbar0 #MINVER# ...@@ -124,6 +126,7 @@ libzbar.so.0 libzbar0 #MINVER#
zbar_video_get_fd@Base 0.10 zbar_video_get_fd@Base 0.10
zbar_video_get_format@Base 0.10 zbar_video_get_format@Base 0.10
zbar_video_get_height@Base 0.10 zbar_video_get_height@Base 0.10
zbar_video_get_resolutions@Base 0.22
zbar_video_get_width@Base 0.10 zbar_video_get_width@Base 0.10
zbar_video_init@Base 0.10 zbar_video_init@Base 0.10
zbar_video_next_image@Base 0.10 zbar_video_next_image@Base 0.10
......
From: Javier Serrano Polo <javier@jasp.net>
Date: Wed, 13 Feb 2019 10:06:11 +0100
Subject: debian, zbar, zbarimg: exit gracefully when decoding split QR codes
Applied-Upstream: https://github.com/mchehab/zbar/commit/dc9f5d1377ac82deab63cdadb0c86b7ecccc3098
Structured QR codes are split in several barcodes. ZBar decodes them if they
are combined in one image; otherwise, it fails with an assert error. Thus,
handle this error gracefully and add a warning hint.
Closes Debian #719013.
Signed-off-by: Javier Serrano Polo <javier@jasp.net>
---
zbar/qrcode/qrdectxt.c | 8 ++++++--
zbarimg/zbarimg.c | 2 ++
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/zbar/qrcode/qrdectxt.c b/zbar/qrcode/qrdectxt.c
index b011dbb..2ab7b9b 100644
--- a/zbar/qrcode/qrdectxt.c
+++ b/zbar/qrcode/qrdectxt.c
@@ -454,8 +454,12 @@ int qr_code_data_list_extract_text(const qr_code_data_list *_qrlist,
}
syms->data = sa_text + syms->datalen;
next = (syms->next) ? syms->next->datalen : sa_ntext;
- assert(next > syms->datalen);
- syms->datalen = next - syms->datalen - 1;
+ if (next > syms->datalen)
+ syms->datalen = next - syms->datalen - 1;
+ else {
+ zprintf(1, "Assertion `next > syms->datalen' failed\n");
+ syms->datalen = 0;
+ }
}
if(xmax >= -1) {
sym_add_point(sa_sym, xmin, ymin);
diff --git a/zbarimg/zbarimg.c b/zbarimg/zbarimg.c
index bf09d0f..b354747 100644
--- a/zbarimg/zbarimg.c
+++ b/zbarimg/zbarimg.c
@@ -125,6 +125,8 @@ static const char *warning_not_found =
" - is the barcode large enough in the image?\n"
" - is the barcode mostly in focus?\n"
" - is there sufficient contrast/illumination?\n"
+ " - If the symbol is split in several barcodes, are they combined in one "
+ "image?\n"
" - Did you enable the barcode type?\n"
" some EAN/UPC codes are disabled by default. To enable all, use:\n"
" $ zbarimg -S*.enable <files>\n"
From: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Date: Thu, 14 Feb 2019 07:10:57 -0200
Subject: zbar: fix some typos
Applied-Upstream: https://github.com/mchehab/zbar/commit/d27ea213fc0ceb44fe1a244d27ee86dbd0a3881d
Use Linux Kernel's checkpatch.pl script to detect and fix
some typos:
../kernel/checkpatch.pl --test-only=misspelled --codespellfile ../kernel/scripts/spelling.txt $(find . -name *.h) $(find . -name *.c) $(find . -name *.cpp) --fix-inplace
Reported-by: Boyuan Yang
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
---
include/zbar.h | 4 ++--
include/zbar/Processor.h | 2 +-
zbar/decoder/code128.c | 2 +-
zbar/processor.h | 2 +-
zbar/qrcode/qrdec.c | 2 +-
zbarimg/zbarimg.c | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/include/zbar.h b/include/zbar.h
index de5dec6..5ef8fab 100644
--- a/include/zbar.h
+++ b/include/zbar.h
@@ -924,7 +924,7 @@ static inline int zbar_processor_parse_config (zbar_processor_t *processor,
zbar_processor_set_config(processor, sym, cfg, val));
}
-/** retrieve the current state of the ouput window.
+/** retrieve the current state of the output window.
* @returns 1 if the output window is currently displayed, 0 if not.
* @returns -1 if an error occurs
*/
@@ -987,7 +987,7 @@ extern int zbar_process_image(zbar_processor_t *processor,
zbar_image_t *image);
/** enable dbus IPC API.
- * @returns 0 succesful
+ * @returns 0 successful
*/
int zbar_processor_request_dbus(zbar_processor_t *proc,
int req_dbus_enabled);
diff --git a/include/zbar/Processor.h b/include/zbar/Processor.h
index 2622ee8..cb99adf 100644
--- a/include/zbar/Processor.h
+++ b/include/zbar/Processor.h
@@ -101,7 +101,7 @@ class Processor {
return(zbar_processor_parse_config(_processor, cfgstr.c_str()));
}
- /// retrieve the current state of the ouput window.
+ /// retrieve the current state of the output window.
/// see zbar_processor_is_visible()
bool is_visible ()
{
diff --git a/zbar/decoder/code128.c b/zbar/decoder/code128.c
index 9dd28e0..bd1ae12 100644
--- a/zbar/decoder/code128.c
+++ b/zbar/decoder/code128.c
@@ -283,7 +283,7 @@ static inline unsigned postprocess_c (zbar_decoder_t *dcode,
{
unsigned i, j;
- /* expand buffer to accomodate 2x set C characters (2 digits per-char) */
+ /* expand buffer to accommodate 2x set C characters (2 digits per-char) */
unsigned delta = end - start;
unsigned newlen = dcode->code128.character + delta;
if (size_buf(dcode, newlen)) {
diff --git a/zbar/processor.h b/zbar/processor.h
index e311d98..d5e9fef 100644
--- a/zbar/processor.h
+++ b/zbar/processor.h
@@ -56,7 +56,7 @@ typedef struct proc_waiter_s {
/* high-level API events */
#define EVENT_INPUT 0x01 /* user input */
#define EVENT_OUTPUT 0x02 /* decoded output data available */
-#define EVENT_CANCELED 0x80 /* cancelation flag */
+#define EVENT_CANCELED 0x80 /* cancellation flag */
#define EVENTS_PENDING (EVENT_INPUT | EVENT_OUTPUT)
struct zbar_processor_s {
diff --git a/zbar/qrcode/qrdec.c b/zbar/qrcode/qrdec.c
index 5d3d265..2bf7e07 100644
--- a/zbar/qrcode/qrdec.c
+++ b/zbar/qrcode/qrdec.c
@@ -531,7 +531,7 @@ static void qr_line_fit(qr_line _l,int _x0,int _y0,
v=-_sxy<<1;
w=qr_ihypot(u,v);
/*Computations in later stages can easily overflow with moderate sizes, so we
- compute a shift factor to scale things down into a managable range.
+ compute a shift factor to scale things down into a manageable range.
We ensure that the product of any two of _l[0] and _l[1] fits within _res
bits, which allows computation of line intersections without overflow.*/
dshift=QR_MAXI(0,QR_MAXI(qr_ilog(u),qr_ilog(abs(v)))+1-(_res+1>>1));
diff --git a/zbarimg/zbarimg.c b/zbarimg/zbarimg.c
index b354747..171c555 100644
--- a/zbarimg/zbarimg.c
+++ b/zbarimg/zbarimg.c
@@ -131,7 +131,7 @@ static const char *warning_not_found =
" some EAN/UPC codes are disabled by default. To enable all, use:\n"
" $ zbarimg -S*.enable <files>\n"
" Please also notice that some variants take precedence over others.\n"
- " Due to that, if you want, for example, ISBN-10, you shoud do:\n"
+ " Due to that, if you want, for example, ISBN-10, you should do:\n"
" $ zbarimg -Sisbn10.enable <files>\n"
"\n";
From: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Date: Fri, 15 Feb 2019 04:56:11 -0200
Subject: configure.ac: fix an error at libv4l2 package check
Writing m4 logic is hard, as it is required to properly
mark begin/end of each block.
In the case of the libv4l detection check, there's a missing
[] for PKG_CHECK_MODULES(). This causes it to produce a wrong
code, ending by having 2 errors when the script runs:
checking for libv4l2.h... yes
./configure: line 15166: V4L2_CFLAGS: command not found
./configure: line 15167: V4L2_LIBS: command not found
While here, better ident the blocks and fix the error message
when libv4l2.so is not found.
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
---
configure.ac | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
index da334e7..7e9cac6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -241,18 +241,19 @@ AS_IF([test "x$enable_video" = "xno"],
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!
+ [AC_MSG_FAILURE([test for video support failed!
rebuild your kernel to include video4linux support or
configure --disable-video to skip building video support.])],
- [test "x$have_v4l2" = "xno"],
- [AC_MSG_WARN([v4l2 API not detected, upgrade your kernel!])])],
+ [AS_IF([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.])])])
AS_IF([test "x$have_libv4l" = "xyes"],
- PKG_CHECK_MODULES([V4L2], [libv4l2], [],
- [AC_MSG_FAILURE([unable to find libv4l.so])]),
+ [PKG_CHECK_MODULES([V4L2], [libv4l2], [],
+ [AC_MSG_FAILURE([unable to find libv4l2.so])])],
[AC_MSG_WARN([libv4l not detected. Install it to support more cameras!])])
AM_CONDITIONAL([HAVE_VIDEO], [test "x$enable_video" != "xno"])
This diff is collapsed.
0001-debian-zbar-zbarimg-exit-gracefully-when-decoding-sp.patch
0002-zbar-fix-some-typos.patch
0003-configure.ac-fix-an-error-at-libv4l2-package-check.patch
0004-Fix-typos-found-by-codespell.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment