Skip to content

Commit

Permalink
A bug-fix in the upstream
Browse files Browse the repository at this point in the history
Fix the issue #185 in the upstream: fukuchi/libqrencode#185
cf. the pull-request #186: fukuchi/libqrencode#186
  • Loading branch information
lemniscati committed Aug 3, 2021
1 parent 2a19ab8 commit b5de844
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 10 deletions.
35 changes: 35 additions & 0 deletions 4.1.1-fix-max_data_size.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
From ec7f4af217105a835a363ac52f3fa358cbd35a34 Mon Sep 17 00:00:00 2001
From: Lemures Lemniscati <lemures.lemniscati@gmail.com>
Date: Tue, 3 Aug 2021 07:42:28 +0900
Subject: [PATCH] Fix MAX_DATA_SIZE, in case 16 symbols are needed by
structured appending

Fix a bug introduced in the commit 3e629c7
---
qrenc.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/qrenc.c b/qrenc.c
index c09c4ab..6e589e8 100644
--- a/qrenc.c
+++ b/qrenc.c
@@ -32,6 +32,7 @@
#endif

#include "qrencode.h"
+#include "qrinput.h"

#define INCHES_PER_METER (100.0/2.54)

@@ -237,7 +238,7 @@ static int color_set(unsigned char color[4], const char *value)
return 0;
}

-#define MAX_DATA_SIZE (7090 * 2) /* timed by the safty factor 2 */
+#define MAX_DATA_SIZE (7089 * MAX_STRUCTURED_SYMBOLS + 1) /* an upper bound (cf. the specification) */
static unsigned char data_buffer[MAX_DATA_SIZE];
static unsigned char *readFile(FILE *fp, int *length)
{
--
2.32.0

17 changes: 7 additions & 10 deletions qrencode.cygport
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
NAME="qrencode"
VERSION=4.1.1
RELEASE=1
RELEASE=2
CATEGORY="Libs"
SUMMARY="QR Code symbol library"
DESCRIPTION="Libqrencode is a C library for encoding data in a QR Code
symbol, a kind of 2D symbology that can be scanned by handy terminals
such as a mobile phone with CCD. The capacity of QR Code is up to 7000
digits or 4000 characters, and is highly robust."
HOMEPAGE="https://fukuchi.org/works/qrencode/index.en.html"
HOMEPAGE="https://fukuchi.org/works/qrencode/index.html.en"
SRC_URI="https://fukuchi.org/works/qrencode/${NAME}-${VERSION}.tar.bz2"
PATCH_URI="3.1.1-no-undefined.patch"
PATCH_URI="
3.1.1-no-undefined.patch
4.1.1-fix-max_data_size.patch
"

DEPEND="pkgconfig(libpng)"

Expand All @@ -24,7 +27,7 @@ BUILD_REQUIRES="\
"

################################
## ABI for inkscape
## ABI
ABI=4

################################
Expand All @@ -41,8 +44,6 @@ printf -v "${THIS_VN}_CONTENTS" "%s" "\
usr/bin/*.exe \
usr/share/ \
"
printf -v "${THIS_VN}_REQUIRES" "%s" "\
"

################################
# Runtime
Expand All @@ -54,8 +55,6 @@ printf -v "${THIS_VN}_SUMMARY" "%s" "${SUMMARY% *} (runtime)"
printf -v "${THIS_VN}_CONTENTS" "%s" "\
usr/bin/*.dll \
"
printf -v "${THIS_VN}_REQUIRES" "%s" "\
"

###############################
# Devel
Expand All @@ -68,8 +67,6 @@ printf -v "${THIS_VN}_CONTENTS" "%s" "\
usr/include/ \
usr/lib/ \
"
printf -v "${THIS_VN}_REQUIRES" "%s" "\
"

###############################
CYGCONF_ARGS="--with-tests"
Expand Down

0 comments on commit b5de844

Please sign in to comment.