Auto-size

5 files changed, 63 insertions, 13 deletions

diff --git a/lpg/libqr/TODO b/lpg/libqr/TODO
index eb35da8..0511b22 100644
--- a/lpg/libqr/TODO
+++ b/lpg/libqr/TODO
@@ -1,4 +1,3 @@
-* Auto-sizing for data
 * Sample app
 * Merge some files
 * Fix XXX, TODO
diff --git a/lpg/libqr/data-common.h b/lpg/libqr/data-common.h
index 420b3b2..054d349 100644
--- a/lpg/libqr/data-common.h
+++ b/lpg/libqr/data-common.h
@@ -16,5 +16,7 @@ extern const enum qr_data_type QR_TYPE_CODES[16];
 
 size_t get_size_field_length(int version, enum qr_data_type);
 
+size_t qr_data_dpart_length(enum qr_data_type type, size_t nchars);
+
 #endif
 
diff --git a/lpg/libqr/data-create.c b/lpg/libqr/data-create.c
index 27c6d4b..37556c6 100644
--- a/lpg/libqr/data-create.c
+++ b/lpg/libqr/data-create.c
@@ -11,6 +11,8 @@
 #include "qr-bitstream.h"
 #include "data-common.h"
 
+extern const int QR_DATA_WORD_COUNT[40][4];
+
 static void write_type_and_length(struct qr_data *  data,
                                   enum qr_data_type type,
                                   size_t            length)
@@ -28,12 +30,7 @@ static struct qr_data * encode_numeric(struct qr_data * data,
         size_t bits;
 
         bits = 4 + get_size_field_length(data->version, QR_DATA_NUMERIC)
-                 + 10 * (length / 3);
-
-        if (length % 3 == 1)
-                bits += 4;
-        else if (length % 3 == 2)
-                bits += 7;
+                 + qr_data_dpart_length(QR_DATA_NUMERIC, length);
 
         stream = data->bits;
         if (qr_bitstream_resize(stream,
@@ -106,8 +103,7 @@ static struct qr_data * encode_alpha(struct qr_data * data,
         size_t bits;
 
         bits = 4 + get_size_field_length(data->version, QR_DATA_ALPHA)
-                 + 11 * (length / 2)
-                 + 6 * (length % 2);
+                 + qr_data_dpart_length(QR_DATA_ALPHA, length);
 
         stream = data->bits;
         if (qr_bitstream_resize(stream,
@@ -150,7 +146,7 @@ static struct qr_data * encode_8bit(struct qr_data * data,
         size_t bits;
 
         bits = 4 + get_size_field_length(data->version, QR_DATA_8BIT)
-                 + 8 * length;
+                 + qr_data_dpart_length(QR_DATA_8BIT, length);
 
         stream = data->bits;
         if (qr_bitstream_resize(stream,
@@ -172,6 +168,24 @@ static struct qr_data * encode_kanji(struct qr_data * data,
         return 0;
 }
 
+static int calc_min_version(enum qr_data_type type,
+                            enum qr_ec_level ec,
+                            size_t length)
+{
+        size_t dbits;
+        int version;
+
+        dbits = qr_data_dpart_length(type, length);
+
+        for (version = 1; version <= 40; ++version) {
+                if (4 + dbits + get_size_field_length(version, type)
+                    < 8 * QR_DATA_WORD_COUNT[version - 1][ec ^ 0x1])
+                        return version;
+        }
+
+        return -1;
+}
+
 struct qr_data * qr_create_data(int               version,
                                 enum qr_ec_level  ec,
                                 enum qr_data_type type,
@@ -179,8 +193,14 @@ struct qr_data * qr_create_data(int               version,
                                 size_t            length)
 {
         struct qr_data * data;
+        int minver;
 
-        if (version < 1 || version > 40)
+        minver = calc_min_version(type, ec, length);
+
+        if (version == 0)
+                version = minver;
+
+        if (minver < 0 || version < minver)
                 return 0;
 
         data = malloc(sizeof(*data));
@@ -222,3 +242,32 @@ struct qr_data * qr_create_data(int               version,
         }
 }
 
+size_t qr_data_dpart_length(enum qr_data_type type, size_t length)
+{
+        size_t bits;
+
+        switch (type) {
+        case QR_DATA_NUMERIC:
+                bits = 10 * (length / 3);
+                if (length % 3 == 1)
+                        bits += 4;
+                else if (length % 3 == 2)
+                        bits += 7;
+                break;
+        case QR_DATA_ALPHA:
+                bits = 11 * (length / 2)
+                        + 6 * (length % 2);
+                break;
+        case QR_DATA_8BIT:
+                bits = 8 * length;
+                break;
+        case QR_DATA_KANJI:
+                /* unsupported */
+        default:
+                /* unsupported; will be ignored */
+                bits = 0;
+        }
+
+        return bits;
+}
+
diff --git a/lpg/libqr/qr/data.h b/lpg/libqr/qr/data.h
index 39494f4..34b6968 100644
--- a/lpg/libqr/qr/data.h
+++ b/lpg/libqr/qr/data.h
@@ -22,7 +22,7 @@ enum qr_ec_level {
         QR_EC_LEVEL_H = 0x2
 };
 
-struct qr_data * qr_create_data(int               format, /* 1 ~ 40 */
+struct qr_data * qr_create_data(int               format, /* 1 ~ 40; 0=auto */
                                 enum qr_ec_level  ec,
                                 enum qr_data_type type,
                                 const char *      input,
diff --git a/lpg/libqr/qrgen.c b/lpg/libqr/qrgen.c
index d1aae68..cb6d33c 100644
--- a/lpg/libqr/qrgen.c
+++ b/lpg/libqr/qrgen.c
@@ -133,7 +133,7 @@ void show_help() {
 
 void set_default_config(struct config * conf)
 {
-        conf->version = 1;
+        conf->version = 0;
         conf->ec = QR_EC_LEVEL_M;
         conf->dtype = QR_DATA_NUMERIC;
         conf->ansi = 1;