From c2e4639d2ebefbeb7f8b7e1826ae2391c6876a5a Mon Sep 17 00:00:00 2001
From: Leo Howell <leo@lwh.jp>
Date: Sat, 14 Nov 2009 20:24:57 +0900
Subject: Merge some files

---
 lpg/libqr/qr/bitstream.h | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 lpg/libqr/qr/code.h      | 10 ++++++++++
 lpg/libqr/qr/data.h      | 13 +++++++++++--
 lpg/libqr/qr/layout.h    | 14 ++++++++++++++
 4 files changed, 83 insertions(+), 2 deletions(-)
 create mode 100644 lpg/libqr/qr/bitstream.h
 create mode 100644 lpg/libqr/qr/layout.h

(limited to 'lpg/libqr/qr')

diff --git a/lpg/libqr/qr/bitstream.h b/lpg/libqr/qr/bitstream.h
new file mode 100644
index 0000000..cf20694
--- /dev/null
+++ b/lpg/libqr/qr/bitstream.h
@@ -0,0 +1,48 @@
+#ifndef QR_BITSTREAM_H
+#define QR_BITSTREAM_H
+
+#include <stddef.h>
+
+/**
+ * Note: when writing / reading multiple bits, the
+ * _most_ significant bits come first in the stream.
+ * (That is, the order you would naturally write the
+ * number in binary)
+ */
+
+struct qr_bitstream;
+
+struct qr_bitstream * qr_bitstream_create(void);
+int                qr_bitstream_resize(struct qr_bitstream *, size_t bits);
+void               qr_bitstream_destroy(struct qr_bitstream *);
+struct qr_bitstream * qr_bitstream_dup(const struct qr_bitstream *);
+
+void qr_bitstream_seek(struct qr_bitstream *, size_t pos);
+size_t qr_bitstream_tell(const struct qr_bitstream *);
+size_t qr_bitstream_remaining(const struct qr_bitstream *);
+size_t qr_bitstream_size(const struct qr_bitstream *);
+
+unsigned int qr_bitstream_read(struct qr_bitstream *, size_t bits);
+
+void qr_bitstream_unpack(struct qr_bitstream *,
+                      unsigned int * result,
+                      size_t         count,
+                      size_t         bitsize);
+
+int qr_bitstream_write(struct qr_bitstream *,
+                    unsigned int value,
+                    size_t       bits);
+
+int qr_bitstream_pack(struct qr_bitstream *,
+                   const unsigned int * values,
+                   size_t               count,
+                   size_t               bitsize);
+
+int qr_bitstream_cat(struct qr_bitstream *, const struct qr_bitstream * src);
+
+int qr_bitstream_copy(struct qr_bitstream * dest,
+                      struct qr_bitstream * src,
+                      size_t count);
+
+#endif
+
diff --git a/lpg/libqr/qr/code.h b/lpg/libqr/qr/code.h
index 3c14c1f..ac3c363 100644
--- a/lpg/libqr/qr/code.h
+++ b/lpg/libqr/qr/code.h
@@ -4,16 +4,26 @@
 #include <stddef.h>
 #include "types.h"
 
+struct qr_code {
+        int                version;
+        struct qr_bitmap * modules;
+};
+
 struct qr_code * qr_code_create(const struct qr_data * data);
 
 void qr_code_destroy(struct qr_code *);
 
 int qr_code_width(const struct qr_code *);
 
+size_t qr_code_total_capacity(int version);
+
 struct qr_code * qr_code_parse(const void * buffer,
                                size_t       line_bits,
                                size_t       line_stride,
                                size_t       line_count);
 
+struct qr_bitmap * qr_mask_apply(const struct qr_bitmap * orig,
+                                 unsigned int mask);
+
 #endif
 
diff --git a/lpg/libqr/qr/data.h b/lpg/libqr/qr/data.h
index 34b6968..a3bb309 100644
--- a/lpg/libqr/qr/data.h
+++ b/lpg/libqr/qr/data.h
@@ -22,6 +22,13 @@ enum qr_ec_level {
         QR_EC_LEVEL_H = 0x2
 };
 
+struct qr_data {
+        int                   version; /* 1 ~ 40 */
+        enum qr_ec_level      ec;
+        struct qr_bitstream * bits;
+        size_t                offset;
+};
+
 struct qr_data * qr_create_data(int               format, /* 1 ~ 40; 0=auto */
                                 enum qr_ec_level  ec,
                                 enum qr_data_type type,
@@ -30,9 +37,11 @@ struct qr_data * qr_create_data(int               format, /* 1 ~ 40; 0=auto */
 
 void qr_free_data(struct qr_data *);
 
-enum qr_data_type qr_get_data_type(const struct qr_data *);
+enum qr_data_type qr_data_type(const struct qr_data *);
 
-int qr_get_data_length(const struct qr_data *);
+size_t qr_data_length(const struct qr_data *);
+size_t qr_data_size_field_length(int version, enum qr_data_type);
+size_t qr_data_dpart_length(enum qr_data_type type, size_t nchars);
 
 enum qr_data_type qr_parse_data(const struct qr_data * input,
                                 char **                output,
diff --git a/lpg/libqr/qr/layout.h b/lpg/libqr/qr/layout.h
new file mode 100644
index 0000000..49bebf6
--- /dev/null
+++ b/lpg/libqr/qr/layout.h
@@ -0,0 +1,14 @@
+#ifndef QR_CODE_LAYOUT_H
+#define QR_CODE_LAYOUT_H
+
+struct qr_iterator;
+
+void qr_layout_init_mask(struct qr_code *);
+
+struct qr_iterator * qr_layout_begin(struct qr_code * code);
+unsigned int qr_layout_read(struct qr_iterator *);
+void qr_layout_write(struct qr_iterator *, unsigned int);
+void qr_layout_end(struct qr_iterator *);
+
+#endif
+
-- 
cgit v1.2.3-70-g09d2