Permalink
Browse files

Merged from 3.1.0 branch.

  • Loading branch information...
1 parent 8670cd5 commit 8b61f0e9bd45232a7fd0ff268dcb780aae8668c8 fukuchi committed May 18, 2009
Showing with 29 additions and 14 deletions.
  1. +15 −2 ChangeLog
  2. +2 −2 Makefile.am
  3. +3 −2 autogen.sh
  4. +1 −0 configure.ac
  5. +8 −8 qrencode.h
View
@@ -1,9 +1,18 @@
+2009.05.18 Kentaro FUKUCHI <fukuchi@megaui.net>
+ * Merged from 3.1.0 branch.
+
+2009.05.16 Kentaro FUKUCHI <fukuchi@megaui.net>
+ * qrencode.h:
+ - Indenting improvement.
+ * Makefile.am:
+ - qrencode.spec has been added to EXTRA_DIST.
+
2009.05.14 Kentaro FUKUCHI <fukuchi@megaui.net>
* qrinput.c, qrencode.c, qrspe.c:
- More return value checks. Mainly for ENOMEM error.
* qrspe.[ch], qrencode.c, tests/test_qrspec.c:
- - QRspec_getEccSpec() now accepts an int array instead to return multiple
- values instead of returning dynamic allocated array.
+ - QRspec_getEccSpec() now accepts an int array instead to return
+ multiple values instead of returning dynamic allocated array.
* mask.c, rscode.c:
- More return value checks from malloc().
* configure.ac:
@@ -15,6 +24,10 @@
* qrencode.c:
- QRraw_new() and RSblock_init() have been improved.
- Eliminated unnecessary calls of init_rs().
+ * autogen.sh, configure.ac:
+ - Darwin workarounds.
+ * tests/common.h, tests/test_bitstream.c:
+ - New tests have been added.
2009.05.12 Kentaro FUKUCHI <fukuchi@megaui.net>
* bitstream.c:
View
@@ -25,8 +25,8 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libqrencode.pc
EXTRA_DIST = libqrencode.pc.in autogen.sh configure.ac acinclude.m4 \
- Makefile.am tests/Makefile.am qrencode.spec.in qrencode.1.in \
- Doxyfile tests/test_all.sh
+ Makefile.am tests/Makefile.am qrencode.spec.in qrencode.spec \
+ qrencode.1.in Doxyfile tests/test_all.sh
if BUILD_TOOLS
bin_PROGRAMS = qrencode
View
@@ -10,9 +10,10 @@ fi
if [ -d /usr/local/share/aclocal ]; then
ACLOCAL_DIR=/usr/local/share/aclocal
-else if [ -d /usr/share/aclocal ]; then
+elif [ -d /opt/local/share/aclocal ]; then
+ ACLOCAL_DIR=/opt/local/share/aclocal
+elif [ -d /usr/share/aclocal ]; then
ACLOCAL_DIR=/usr/share/aclocal
- fi
fi
if [ ! -d use ]; then
View
@@ -12,6 +12,7 @@ AC_SUBST(VERSION)
AC_CONFIG_SRCDIR([qrencode.c])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR(use)
+AC_CONFIG_MACRO_DIR([m4])
AC_CANONICAL_HOST
AC_CANONICAL_TARGET
View
@@ -107,12 +107,12 @@ extern "C" {
* Encoding mode.
*/
typedef enum {
- QR_MODE_NUL = -1, ///< Terminator (NUL character)
- QR_MODE_NUM = 0, ///< Numeric mode
- QR_MODE_AN, ///< Alphabet-numeric mode
- QR_MODE_8, ///< 8-bit data mode
- QR_MODE_KANJI, ///< Kanji (shift-jis) mode
- QR_MODE_STRUCTURE, ///< Internal use only
+ QR_MODE_NUL = -1, ///< Terminator (NUL character)
+ QR_MODE_NUM = 0, ///< Numeric mode
+ QR_MODE_AN, ///< Alphabet-numeric mode
+ QR_MODE_8, ///< 8-bit data mode
+ QR_MODE_KANJI, ///< Kanji (shift-jis) mode
+ QR_MODE_STRUCTURE, ///< Internal use only
} QRencodeMode;
/**
@@ -308,8 +308,8 @@ extern int QRinput_Struct_insertStructuredAppendHeaders(QRinput_Struct *s);
* </pre>
*/
typedef struct {
- int version; ///< version of the symbol
- int width; ///< width of the symbol
+ int version; ///< version of the symbol
+ int width; ///< width of the symbol
unsigned char *data; ///< symbol data
} QRcode;

0 comments on commit 8b61f0e

Please sign in to comment.