Merge pull request #3 from Leonmmcoset/codex/style-autofix-24683759803-1

style: auto-format C/C++ sources with clang-format
This commit is contained in:
LeonMMcoset
2026-04-21 02:39:57 +08:00
committed by GitHub
6 changed files with 822 additions and 857 deletions

View File

@@ -18,4 +18,3 @@
#define sscanf dg_sscanf #define sscanf dg_sscanf
#endif #endif

View File

@@ -137,8 +137,12 @@ void DG_Init(void) {
g_scale = 4ULL; g_scale = 4ULL;
} }
g_dst_x = (g_fb_info.width > ((u64)DOOMGENERIC_RESX * g_scale)) ? ((g_fb_info.width - ((u64)DOOMGENERIC_RESX * g_scale)) / 2ULL) : 0ULL; g_dst_x = (g_fb_info.width > ((u64)DOOMGENERIC_RESX * g_scale))
g_dst_y = (g_fb_info.height > ((u64)DOOMGENERIC_RESY * g_scale)) ? ((g_fb_info.height - ((u64)DOOMGENERIC_RESY * g_scale)) / 2ULL) : 0ULL; ? ((g_fb_info.width - ((u64)DOOMGENERIC_RESX * g_scale)) / 2ULL)
: 0ULL;
g_dst_y = (g_fb_info.height > ((u64)DOOMGENERIC_RESY * g_scale))
? ((g_fb_info.height - ((u64)DOOMGENERIC_RESY * g_scale)) / 2ULL)
: 0ULL;
g_blit_req.pixels_ptr = 0ULL; g_blit_req.pixels_ptr = 0ULL;
g_blit_req.src_width = (u64)DOOMGENERIC_RESX; g_blit_req.src_width = (u64)DOOMGENERIC_RESX;
@@ -194,4 +198,3 @@ int cl_doom_run_main(int argc, char **argv) {
doomgeneric_Tick(); doomgeneric_Tick();
} }
} }

View File

@@ -7,12 +7,7 @@ int cl_doom_run_main(int argc, char **argv);
static const char *cl_doom_pick_default_wad(void) { static const char *cl_doom_pick_default_wad(void) {
static const char *candidates[] = { static const char *candidates[] = {
"/doom1.wad", "/doom1.wad", "/DOOM1.WAD", "/temp/doom1.wad", "/temp/DOOM1.WAD", "/shell/doom1.wad", "/shell/DOOM1.WAD",
"/DOOM1.WAD",
"/temp/doom1.wad",
"/temp/DOOM1.WAD",
"/shell/doom1.wad",
"/shell/DOOM1.WAD",
}; };
u64 i; u64 i;
@@ -84,4 +79,3 @@ int cleonos_app_main(int argc, char **argv, char **envp) {
(void)printf("doom: launching doomgeneric\n"); (void)printf("doom: launching doomgeneric\n");
return cl_doom_run_main(run_argc, run_argv); return cl_doom_run_main(run_argc, run_argv);
} }

View File

@@ -22,7 +22,7 @@
*/ */
#ifndef NDEBUG #ifndef NDEBUG
#define NDEBUG 1 #define NDEBUG 1
#endif #endif
#include <assert.h> #include <assert.h>
#include <limits.h> #include <limits.h>
@@ -31,12 +31,11 @@
#include "qrcodegen.h" #include "qrcodegen.h"
#ifndef QRCODEGEN_TEST #ifndef QRCODEGEN_TEST
#define testable static // Keep functions private #define testable static // Keep functions private
#else #else
#define testable // Expose private functions #define testable // Expose private functions
#endif #endif
/*---- Forward declarations for private functions ----*/ /*---- Forward declarations for private functions ----*/
// Regarding all public and private functions defined in this source file: // Regarding all public and private functions defined in this source file:
@@ -62,8 +61,8 @@ testable int getNumDataCodewords(int version, enum qrcodegen_Ecc ecl);
testable int getNumRawDataModules(int ver); testable int getNumRawDataModules(int ver);
testable void reedSolomonComputeDivisor(int degree, uint8_t result[]); testable void reedSolomonComputeDivisor(int degree, uint8_t result[]);
testable void reedSolomonComputeRemainder(const uint8_t data[], int dataLen, testable void reedSolomonComputeRemainder(const uint8_t data[], int dataLen, const uint8_t generator[], int degree,
const uint8_t generator[], int degree, uint8_t result[]); uint8_t result[]);
testable uint8_t reedSolomonMultiply(uint8_t x, uint8_t y); testable uint8_t reedSolomonMultiply(uint8_t x, uint8_t y);
testable void initializeFunctionModules(int version, uint8_t qrcode[]); testable void initializeFunctionModules(int version, uint8_t qrcode[]);
@@ -89,8 +88,6 @@ testable int calcSegmentBitLength(enum qrcodegen_Mode mode, size_t numChars);
testable int getTotalBits(const struct qrcodegen_Segment segs[], size_t len, int version); testable int getTotalBits(const struct qrcodegen_Segment segs[], size_t len, int version);
static int numCharCountBits(enum qrcodegen_Mode mode, int version); static int numCharCountBits(enum qrcodegen_Mode mode, int version);
/*---- Private tables of constants ----*/ /*---- Private tables of constants ----*/
// The set of all legal characters in alphanumeric mode, where each character // The set of all legal characters in alphanumeric mode, where each character
@@ -103,11 +100,16 @@ static const char *ALPHANUMERIC_CHARSET = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ
// For generating error correction codes. // For generating error correction codes.
testable const int8_t ECC_CODEWORDS_PER_BLOCK[4][41] = { testable const int8_t ECC_CODEWORDS_PER_BLOCK[4][41] = {
// Version: (note that index 0 is for padding, and is set to an illegal value) // Version: (note that index 0 is for padding, and is set to an illegal value)
//0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40 Error correction level // 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
{-1, 7, 10, 15, 20, 26, 18, 20, 24, 30, 18, 20, 24, 26, 30, 22, 24, 28, 30, 28, 28, 28, 28, 30, 30, 26, 28, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30}, // Low // 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40 Error correction level
{-1, 10, 16, 26, 18, 24, 16, 18, 22, 22, 26, 30, 22, 22, 24, 24, 28, 28, 26, 26, 26, 26, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28}, // Medium {-1, 7, 10, 15, 20, 26, 18, 20, 24, 30, 18, 20, 24, 26, 30, 22, 24, 28, 30, 28, 28,
{-1, 13, 22, 18, 26, 18, 24, 18, 22, 20, 24, 28, 26, 24, 20, 30, 24, 28, 28, 26, 30, 28, 30, 30, 30, 30, 28, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30}, // Quartile 28, 28, 30, 30, 26, 28, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30}, // Low
{-1, 17, 28, 22, 16, 22, 28, 26, 26, 24, 28, 24, 28, 22, 24, 24, 30, 28, 28, 26, 28, 30, 24, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30}, // High {-1, 10, 16, 26, 18, 24, 16, 18, 22, 22, 26, 30, 22, 22, 24, 24, 28, 28, 26, 26, 26,
26, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28}, // Medium
{-1, 13, 22, 18, 26, 18, 24, 18, 22, 20, 24, 28, 26, 24, 20, 30, 24, 28, 28, 26, 30,
28, 30, 30, 30, 30, 28, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30}, // Quartile
{-1, 17, 28, 22, 16, 22, 28, 26, 26, 24, 28, 24, 28, 22, 24, 24, 30, 28, 28, 26, 28,
30, 24, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30}, // High
}; };
#define qrcodegen_REED_SOLOMON_DEGREE_MAX 30 // Based on the table above #define qrcodegen_REED_SOLOMON_DEGREE_MAX 30 // Based on the table above
@@ -115,11 +117,16 @@ testable const int8_t ECC_CODEWORDS_PER_BLOCK[4][41] = {
// For generating error correction codes. // For generating error correction codes.
testable const int8_t NUM_ERROR_CORRECTION_BLOCKS[4][41] = { testable const int8_t NUM_ERROR_CORRECTION_BLOCKS[4][41] = {
// Version: (note that index 0 is for padding, and is set to an illegal value) // Version: (note that index 0 is for padding, and is set to an illegal value)
//0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40 Error correction level // 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
{-1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 4, 4, 4, 4, 4, 6, 6, 6, 6, 7, 8, 8, 9, 9, 10, 12, 12, 12, 13, 14, 15, 16, 17, 18, 19, 19, 20, 21, 22, 24, 25}, // Low // 31, 32, 33, 34, 35, 36, 37, 38, 39, 40 Error correction level
{-1, 1, 1, 1, 2, 2, 4, 4, 4, 5, 5, 5, 8, 9, 9, 10, 10, 11, 13, 14, 16, 17, 17, 18, 20, 21, 23, 25, 26, 28, 29, 31, 33, 35, 37, 38, 40, 43, 45, 47, 49}, // Medium {-1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 4, 4, 4, 4, 4, 6, 6, 6, 6, 7, 8,
{-1, 1, 1, 2, 2, 4, 4, 6, 6, 8, 8, 8, 10, 12, 16, 12, 17, 16, 18, 21, 20, 23, 23, 25, 27, 29, 34, 34, 35, 38, 40, 43, 45, 48, 51, 53, 56, 59, 62, 65, 68}, // Quartile 8, 9, 9, 10, 12, 12, 12, 13, 14, 15, 16, 17, 18, 19, 19, 20, 21, 22, 24, 25}, // Low
{-1, 1, 1, 2, 4, 4, 4, 5, 6, 8, 8, 11, 11, 16, 16, 18, 16, 19, 21, 25, 25, 25, 34, 30, 32, 35, 37, 40, 42, 45, 48, 51, 54, 57, 60, 63, 66, 70, 74, 77, 81}, // High {-1, 1, 1, 1, 2, 2, 4, 4, 4, 5, 5, 5, 8, 9, 9, 10, 10, 11, 13, 14, 16,
17, 17, 18, 20, 21, 23, 25, 26, 28, 29, 31, 33, 35, 37, 38, 40, 43, 45, 47, 49}, // Medium
{-1, 1, 1, 2, 2, 4, 4, 6, 6, 8, 8, 8, 10, 12, 16, 12, 17, 16, 18, 21, 20,
23, 23, 25, 27, 29, 34, 34, 35, 38, 40, 43, 45, 48, 51, 53, 56, 59, 62, 65, 68}, // Quartile
{-1, 1, 1, 2, 4, 4, 4, 5, 6, 8, 8, 11, 11, 16, 16, 18, 16, 19, 21, 25, 25,
25, 34, 30, 32, 35, 37, 40, 42, 45, 48, 51, 54, 57, 60, 63, 66, 70, 74, 77, 81}, // High
}; };
// For automatic mask pattern selection. // For automatic mask pattern selection.
@@ -128,17 +135,16 @@ static const int PENALTY_N2 = 3;
static const int PENALTY_N3 = 40; static const int PENALTY_N3 = 40;
static const int PENALTY_N4 = 10; static const int PENALTY_N4 = 10;
/*---- High-level QR Code encoding functions ----*/ /*---- High-level QR Code encoding functions ----*/
// Public function - see documentation comment in header file. // Public function - see documentation comment in header file.
bool qrcodegen_encodeText(const char *text, uint8_t tempBuffer[], uint8_t qrcode[], bool qrcodegen_encodeText(const char *text, uint8_t tempBuffer[], uint8_t qrcode[], enum qrcodegen_Ecc ecl,
enum qrcodegen_Ecc ecl, int minVersion, int maxVersion, enum qrcodegen_Mask mask, bool boostEcl) { int minVersion, int maxVersion, enum qrcodegen_Mask mask, bool boostEcl) {
size_t textLen = strlen(text); size_t textLen = strlen(text);
if (textLen == 0) if (textLen == 0)
return qrcodegen_encodeSegmentsAdvanced(NULL, 0, ecl, minVersion, maxVersion, mask, boostEcl, tempBuffer, qrcode); return qrcodegen_encodeSegmentsAdvanced(NULL, 0, ecl, minVersion, maxVersion, mask, boostEcl, tempBuffer,
qrcode);
size_t bufLen = (size_t)qrcodegen_BUFFER_LEN_FOR_VERSION(maxVersion); size_t bufLen = (size_t)qrcodegen_BUFFER_LEN_FOR_VERSION(maxVersion);
struct qrcodegen_Segment seg; struct qrcodegen_Segment seg;
@@ -169,10 +175,9 @@ fail:
return false; return false;
} }
// Public function - see documentation comment in header file. // Public function - see documentation comment in header file.
bool qrcodegen_encodeBinary(uint8_t dataAndTemp[], size_t dataLen, uint8_t qrcode[], bool qrcodegen_encodeBinary(uint8_t dataAndTemp[], size_t dataLen, uint8_t qrcode[], enum qrcodegen_Ecc ecl,
enum qrcodegen_Ecc ecl, int minVersion, int maxVersion, enum qrcodegen_Mask mask, bool boostEcl) { int minVersion, int maxVersion, enum qrcodegen_Mask mask, bool boostEcl) {
struct qrcodegen_Segment seg; struct qrcodegen_Segment seg;
seg.mode = qrcodegen_Mode_BYTE; seg.mode = qrcodegen_Mode_BYTE;
@@ -186,7 +191,6 @@ bool qrcodegen_encodeBinary(uint8_t dataAndTemp[], size_t dataLen, uint8_t qrcod
return qrcodegen_encodeSegmentsAdvanced(&seg, 1, ecl, minVersion, maxVersion, mask, boostEcl, dataAndTemp, qrcode); return qrcodegen_encodeSegmentsAdvanced(&seg, 1, ecl, minVersion, maxVersion, mask, boostEcl, dataAndTemp, qrcode);
} }
// Appends the given number of low-order bits of the given value to the given byte-based // Appends the given number of low-order bits of the given value to the given byte-based
// bit buffer, increasing the bit length. Requires 0 <= numBits <= 16 and val < 2^numBits. // bit buffer, increasing the bit length. Requires 0 <= numBits <= 16 and val < 2^numBits.
testable void appendBitsToBuffer(unsigned int val, int numBits, uint8_t buffer[], int *bitLen) { testable void appendBitsToBuffer(unsigned int val, int numBits, uint8_t buffer[], int *bitLen) {
@@ -195,28 +199,26 @@ testable void appendBitsToBuffer(unsigned int val, int numBits, uint8_t buffer[]
buffer[*bitLen >> 3] |= ((val >> i) & 1) << (7 - (*bitLen & 7)); buffer[*bitLen >> 3] |= ((val >> i) & 1) << (7 - (*bitLen & 7));
} }
/*---- Low-level QR Code encoding functions ----*/ /*---- Low-level QR Code encoding functions ----*/
// Public function - see documentation comment in header file. // Public function - see documentation comment in header file.
bool qrcodegen_encodeSegments(const struct qrcodegen_Segment segs[], size_t len, bool qrcodegen_encodeSegments(const struct qrcodegen_Segment segs[], size_t len, enum qrcodegen_Ecc ecl,
enum qrcodegen_Ecc ecl, uint8_t tempBuffer[], uint8_t qrcode[]) { uint8_t tempBuffer[], uint8_t qrcode[]) {
return qrcodegen_encodeSegmentsAdvanced(segs, len, ecl, return qrcodegen_encodeSegmentsAdvanced(segs, len, ecl, qrcodegen_VERSION_MIN, qrcodegen_VERSION_MAX,
qrcodegen_VERSION_MIN, qrcodegen_VERSION_MAX, qrcodegen_Mask_AUTO, true, tempBuffer, qrcode); qrcodegen_Mask_AUTO, true, tempBuffer, qrcode);
} }
// Public function - see documentation comment in header file. // Public function - see documentation comment in header file.
bool qrcodegen_encodeSegmentsAdvanced(const struct qrcodegen_Segment segs[], size_t len, enum qrcodegen_Ecc ecl, bool qrcodegen_encodeSegmentsAdvanced(const struct qrcodegen_Segment segs[], size_t len, enum qrcodegen_Ecc ecl,
int minVersion, int maxVersion, enum qrcodegen_Mask mask, bool boostEcl, uint8_t tempBuffer[], uint8_t qrcode[]) { int minVersion, int maxVersion, enum qrcodegen_Mask mask, bool boostEcl,
uint8_t tempBuffer[], uint8_t qrcode[]) {
assert(segs != NULL || len == 0); assert(segs != NULL || len == 0);
assert(qrcodegen_VERSION_MIN <= minVersion && minVersion <= maxVersion && maxVersion <= qrcodegen_VERSION_MAX); assert(qrcodegen_VERSION_MIN <= minVersion && minVersion <= maxVersion && maxVersion <= qrcodegen_VERSION_MAX);
assert(0 <= (int)ecl && (int)ecl <= 3 && -1 <= (int)mask && (int)mask <= 7); assert(0 <= (int)ecl && (int)ecl <= 3 && -1 <= (int)mask && (int)mask <= 7);
// Find the minimal version number to use // Find the minimal version number to use
int version, dataUsedBits; int version, dataUsedBits;
for (version = minVersion; ; version++) { for (version = minVersion;; version++) {
int dataCapacityBits = getNumDataCodewords(version, ecl) * 8; // Number of data bits available int dataCapacityBits = getNumDataCodewords(version, ecl) * 8; // Number of data bits available
dataUsedBits = getTotalBits(segs, len, version); dataUsedBits = getTotalBits(segs, len, version);
if (dataUsedBits != LENGTH_OVERFLOW && dataUsedBits <= dataCapacityBits) if (dataUsedBits != LENGTH_OVERFLOW && dataUsedBits <= dataCapacityBits)
@@ -290,8 +292,6 @@ bool qrcodegen_encodeSegmentsAdvanced(const struct qrcodegen_Segment segs[], siz
return true; return true;
} }
/*---- Error correction code generation functions ----*/ /*---- Error correction code generation functions ----*/
// Appends error correction bytes to each block of the given data array, then interleaves // Appends error correction bytes to each block of the given data array, then interleaves
@@ -302,7 +302,7 @@ testable void addEccAndInterleave(uint8_t data[], int version, enum qrcodegen_Ec
// Calculate parameter numbers // Calculate parameter numbers
assert(0 <= (int)ecl && (int)ecl < 4 && qrcodegen_VERSION_MIN <= version && version <= qrcodegen_VERSION_MAX); assert(0 <= (int)ecl && (int)ecl < 4 && qrcodegen_VERSION_MIN <= version && version <= qrcodegen_VERSION_MAX);
int numBlocks = NUM_ERROR_CORRECTION_BLOCKS[(int)ecl][version]; int numBlocks = NUM_ERROR_CORRECTION_BLOCKS[(int)ecl][version];
int blockEccLen = ECC_CODEWORDS_PER_BLOCK [(int)ecl][version]; int blockEccLen = ECC_CODEWORDS_PER_BLOCK[(int)ecl][version];
int rawCodewords = getNumRawDataModules(version) / 8; int rawCodewords = getNumRawDataModules(version) / 8;
int dataLen = getNumDataCodewords(version, ecl); int dataLen = getNumDataCodewords(version, ecl);
int numShortBlocks = numBlocks - rawCodewords % numBlocks; int numShortBlocks = numBlocks - rawCodewords % numBlocks;
@@ -328,18 +328,14 @@ testable void addEccAndInterleave(uint8_t data[], int version, enum qrcodegen_Ec
} }
} }
// Returns the number of 8-bit codewords that can be used for storing data (not ECC), // Returns the number of 8-bit codewords that can be used for storing data (not ECC),
// for the given version number and error correction level. The result is in the range [9, 2956]. // for the given version number and error correction level. The result is in the range [9, 2956].
testable int getNumDataCodewords(int version, enum qrcodegen_Ecc ecl) { testable int getNumDataCodewords(int version, enum qrcodegen_Ecc ecl) {
int v = version, e = (int)ecl; int v = version, e = (int)ecl;
assert(0 <= e && e < 4); assert(0 <= e && e < 4);
return getNumRawDataModules(v) / 8 return getNumRawDataModules(v) / 8 - ECC_CODEWORDS_PER_BLOCK[e][v] * NUM_ERROR_CORRECTION_BLOCKS[e][v];
- ECC_CODEWORDS_PER_BLOCK [e][v]
* NUM_ERROR_CORRECTION_BLOCKS[e][v];
} }
// Returns the number of data bits that can be stored in a QR Code of the given version number, after // Returns the number of data bits that can be stored in a QR Code of the given version number, after
// all function modules are excluded. This includes remainder bits, so it might not be a multiple of 8. // all function modules are excluded. This includes remainder bits, so it might not be a multiple of 8.
// The result is in the range [208, 29648]. This could be implemented as a 40-entry lookup table. // The result is in the range [208, 29648]. This could be implemented as a 40-entry lookup table.
@@ -356,8 +352,6 @@ testable int getNumRawDataModules(int ver) {
return result; return result;
} }
/*---- Reed-Solomon ECC generator functions ----*/ /*---- Reed-Solomon ECC generator functions ----*/
// Computes a Reed-Solomon ECC generator polynomial for the given degree, storing in result[0 : degree]. // Computes a Reed-Solomon ECC generator polynomial for the given degree, storing in result[0 : degree].
@@ -384,12 +378,11 @@ testable void reedSolomonComputeDivisor(int degree, uint8_t result[]) {
} }
} }
// Computes the Reed-Solomon error correction codeword for the given data and divisor polynomials. // Computes the Reed-Solomon error correction codeword for the given data and divisor polynomials.
// The remainder when data[0 : dataLen] is divided by divisor[0 : degree] is stored in result[0 : degree]. // The remainder when data[0 : dataLen] is divided by divisor[0 : degree] is stored in result[0 : degree].
// All polynomials are in big endian, and the generator has an implicit leading 1 term. // All polynomials are in big endian, and the generator has an implicit leading 1 term.
testable void reedSolomonComputeRemainder(const uint8_t data[], int dataLen, testable void reedSolomonComputeRemainder(const uint8_t data[], int dataLen, const uint8_t generator[], int degree,
const uint8_t generator[], int degree, uint8_t result[]) { uint8_t result[]) {
assert(1 <= degree && degree <= qrcodegen_REED_SOLOMON_DEGREE_MAX); assert(1 <= degree && degree <= qrcodegen_REED_SOLOMON_DEGREE_MAX);
memset(result, 0, (size_t)degree * sizeof(result[0])); memset(result, 0, (size_t)degree * sizeof(result[0]));
for (int i = 0; i < dataLen; i++) { // Polynomial division for (int i = 0; i < dataLen; i++) { // Polynomial division
@@ -403,7 +396,6 @@ testable void reedSolomonComputeRemainder(const uint8_t data[], int dataLen,
#undef qrcodegen_REED_SOLOMON_DEGREE_MAX #undef qrcodegen_REED_SOLOMON_DEGREE_MAX
// Returns the product of the two given field elements modulo GF(2^8/0x11D). // Returns the product of the two given field elements modulo GF(2^8/0x11D).
// All inputs are valid. This could be implemented as a 256*256 lookup table. // All inputs are valid. This could be implemented as a 256*256 lookup table.
testable uint8_t reedSolomonMultiply(uint8_t x, uint8_t y) { testable uint8_t reedSolomonMultiply(uint8_t x, uint8_t y) {
@@ -416,8 +408,6 @@ testable uint8_t reedSolomonMultiply(uint8_t x, uint8_t y) {
return z; return z;
} }
/*---- Drawing function modules ----*/ /*---- Drawing function modules ----*/
// Clears the given QR Code grid with light modules for the given // Clears the given QR Code grid with light modules for the given
@@ -455,7 +445,6 @@ testable void initializeFunctionModules(int version, uint8_t qrcode[]) {
} }
} }
// Draws light function modules and possibly some dark modules onto the given QR Code, without changing // Draws light function modules and possibly some dark modules onto the given QR Code, without changing
// non-function modules. This does not draw the format bits. This requires all function modules to be previously // non-function modules. This does not draw the format bits. This requires all function modules to be previously
// marked dark (namely by initializeFunctionModules()), because this may skip redrawing dark function modules. // marked dark (namely by initializeFunctionModules()), because this may skip redrawing dark function modules.
@@ -516,7 +505,6 @@ static void drawLightFunctionModules(uint8_t qrcode[], int version) {
} }
} }
// Draws two copies of the format bits (with its own error correction code) based // Draws two copies of the format bits (with its own error correction code) based
// on the given mask and error correction level. This always draws all modules of // on the given mask and error correction level. This always draws all modules of
// the format bits, unlike drawLightFunctionModules() which might skip dark modules. // the format bits, unlike drawLightFunctionModules() which might skip dark modules.
@@ -549,7 +537,6 @@ static void drawFormatBits(enum qrcodegen_Ecc ecl, enum qrcodegen_Mask mask, uin
setModuleBounded(qrcode, 8, qrsize - 8, true); // Always dark setModuleBounded(qrcode, 8, qrsize - 8, true); // Always dark
} }
// Calculates and stores an ascending list of positions of alignment patterns // Calculates and stores an ascending list of positions of alignment patterns
// for this version number, returning the length of the list (in the range [0,7]). // for this version number, returning the length of the list (in the range [0,7]).
// Each position is in the range [0,177), and are used on both the x and y axes. // Each position is in the range [0,177), and are used on both the x and y axes.
@@ -565,7 +552,6 @@ testable int getAlignmentPatternPositions(int version, uint8_t result[7]) {
return numAlign; return numAlign;
} }
// Sets every module in the range [left : left + width] * [top : top + height] to dark. // Sets every module in the range [left : left + width] * [top : top + height] to dark.
static void fillRectangle(int left, int top, int width, int height, uint8_t qrcode[]) { static void fillRectangle(int left, int top, int width, int height, uint8_t qrcode[]) {
for (int dy = 0; dy < height; dy++) { for (int dy = 0; dy < height; dy++) {
@@ -574,8 +560,6 @@ static void fillRectangle(int left, int top, int width, int height, uint8_t qrco
} }
} }
/*---- Drawing data modules and masking ----*/ /*---- Drawing data modules and masking ----*/
// Draws the raw codewords (including data and ECC) onto the given QR Code. This requires the initial state of // Draws the raw codewords (including data and ECC) onto the given QR Code. This requires the initial state of
@@ -605,7 +589,6 @@ static void drawCodewords(const uint8_t data[], int dataLen, uint8_t qrcode[]) {
assert(i == dataLen * 8); assert(i == dataLen * 8);
} }
// XORs the codeword modules in this QR Code with the given mask pattern // XORs the codeword modules in this QR Code with the given mask pattern
// and given pattern of function modules. The codeword bits must be drawn // and given pattern of function modules. The codeword bits must be drawn
// before masking. Due to the arithmetic of XOR, calling applyMask() with // before masking. Due to the arithmetic of XOR, calling applyMask() with
@@ -620,15 +603,33 @@ static void applyMask(const uint8_t functionModules[], uint8_t qrcode[], enum qr
continue; continue;
bool invert; bool invert;
switch ((int)mask) { switch ((int)mask) {
case 0: invert = (x + y) % 2 == 0; break; case 0:
case 1: invert = y % 2 == 0; break; invert = (x + y) % 2 == 0;
case 2: invert = x % 3 == 0; break; break;
case 3: invert = (x + y) % 3 == 0; break; case 1:
case 4: invert = (x / 3 + y / 2) % 2 == 0; break; invert = y % 2 == 0;
case 5: invert = x * y % 2 + x * y % 3 == 0; break; break;
case 6: invert = (x * y % 2 + x * y % 3) % 2 == 0; break; case 2:
case 7: invert = ((x + y) % 2 + x * y % 3) % 2 == 0; break; invert = x % 3 == 0;
default: assert(false); return; break;
case 3:
invert = (x + y) % 3 == 0;
break;
case 4:
invert = (x / 3 + y / 2) % 2 == 0;
break;
case 5:
invert = x * y % 2 + x * y % 3 == 0;
break;
case 6:
invert = (x * y % 2 + x * y % 3) % 2 == 0;
break;
case 7:
invert = ((x + y) % 2 + x * y % 3) % 2 == 0;
break;
default:
assert(false);
return;
} }
bool val = getModuleBounded(qrcode, x, y); bool val = getModuleBounded(qrcode, x, y);
setModuleBounded(qrcode, x, y, val ^ invert); setModuleBounded(qrcode, x, y, val ^ invert);
@@ -636,7 +637,6 @@ static void applyMask(const uint8_t functionModules[], uint8_t qrcode[], enum qr
} }
} }
// Calculates and returns the penalty score based on state of the given QR Code's current modules. // Calculates and returns the penalty score based on state of the given QR Code's current modules.
// This is used by the automatic mask choice algorithm to find the mask pattern that yields the lowest score. // This is used by the automatic mask choice algorithm to find the mask pattern that yields the lowest score.
static long getPenaltyScore(const uint8_t qrcode[]) { static long getPenaltyScore(const uint8_t qrcode[]) {
@@ -694,8 +694,7 @@ static long getPenaltyScore(const uint8_t qrcode[]) {
for (int y = 0; y < qrsize - 1; y++) { for (int y = 0; y < qrsize - 1; y++) {
for (int x = 0; x < qrsize - 1; x++) { for (int x = 0; x < qrsize - 1; x++) {
bool color = getModuleBounded(qrcode, x, y); bool color = getModuleBounded(qrcode, x, y);
if ( color == getModuleBounded(qrcode, x + 1, y) && if (color == getModuleBounded(qrcode, x + 1, y) && color == getModuleBounded(qrcode, x, y + 1) &&
color == getModuleBounded(qrcode, x, y + 1) &&
color == getModuleBounded(qrcode, x + 1, y + 1)) color == getModuleBounded(qrcode, x + 1, y + 1))
result += PENALTY_N2; result += PENALTY_N2;
} }
@@ -718,20 +717,19 @@ static long getPenaltyScore(const uint8_t qrcode[]) {
return result; return result;
} }
// Can only be called immediately after a light run is added, and // Can only be called immediately after a light run is added, and
// returns either 0, 1, or 2. A helper function for getPenaltyScore(). // returns either 0, 1, or 2. A helper function for getPenaltyScore().
static int finderPenaltyCountPatterns(const int runHistory[7], int qrsize) { static int finderPenaltyCountPatterns(const int runHistory[7], int qrsize) {
int n = runHistory[1]; int n = runHistory[1];
assert(n <= qrsize * 3); (void)qrsize; assert(n <= qrsize * 3);
(void)qrsize;
bool core = n > 0 && runHistory[2] == n && runHistory[3] == n * 3 && runHistory[4] == n && runHistory[5] == n; bool core = n > 0 && runHistory[2] == n && runHistory[3] == n * 3 && runHistory[4] == n && runHistory[5] == n;
// The maximum QR Code size is 177, hence the dark run length n <= 177. // The maximum QR Code size is 177, hence the dark run length n <= 177.
// Arithmetic is promoted to int, so n*4 will not overflow. // Arithmetic is promoted to int, so n*4 will not overflow.
return (core && runHistory[0] >= n * 4 && runHistory[6] >= n ? 1 : 0) return (core && runHistory[0] >= n * 4 && runHistory[6] >= n ? 1 : 0) +
+ (core && runHistory[6] >= n * 4 && runHistory[0] >= n ? 1 : 0); (core && runHistory[6] >= n * 4 && runHistory[0] >= n ? 1 : 0);
} }
// Must be called at the end of a line (row or column) of modules. A helper function for getPenaltyScore(). // Must be called at the end of a line (row or column) of modules. A helper function for getPenaltyScore().
static int finderPenaltyTerminateAndCount(bool currentRunColor, int currentRunLength, int runHistory[7], int qrsize) { static int finderPenaltyTerminateAndCount(bool currentRunColor, int currentRunLength, int runHistory[7], int qrsize) {
if (currentRunColor) { // Terminate dark run if (currentRunColor) { // Terminate dark run
@@ -743,7 +741,6 @@ static int finderPenaltyTerminateAndCount(bool currentRunColor, int currentRunLe
return finderPenaltyCountPatterns(runHistory, qrsize); return finderPenaltyCountPatterns(runHistory, qrsize);
} }
// Pushes the given value to the front and drops the last value. A helper function for getPenaltyScore(). // Pushes the given value to the front and drops the last value. A helper function for getPenaltyScore().
static void finderPenaltyAddHistory(int currentRunLength, int runHistory[7], int qrsize) { static void finderPenaltyAddHistory(int currentRunLength, int runHistory[7], int qrsize) {
if (runHistory[0] == 0) if (runHistory[0] == 0)
@@ -752,26 +749,21 @@ static void finderPenaltyAddHistory(int currentRunLength, int runHistory[7], int
runHistory[0] = currentRunLength; runHistory[0] = currentRunLength;
} }
static void zeroRunHistory(int runHistory[7]) { static void zeroRunHistory(int runHistory[7]) {
for (int i = 0; i < 7; i++) for (int i = 0; i < 7; i++)
runHistory[i] = 0; runHistory[i] = 0;
} }
/*---- Basic QR Code information ----*/ /*---- Basic QR Code information ----*/
// Public function - see documentation comment in header file. // Public function - see documentation comment in header file.
int qrcodegen_getSize(const uint8_t qrcode[]) { int qrcodegen_getSize(const uint8_t qrcode[]) {
assert(qrcode != NULL); assert(qrcode != NULL);
int result = qrcode[0]; int result = qrcode[0];
assert((qrcodegen_VERSION_MIN * 4 + 17) <= result assert((qrcodegen_VERSION_MIN * 4 + 17) <= result && result <= (qrcodegen_VERSION_MAX * 4 + 17));
&& result <= (qrcodegen_VERSION_MAX * 4 + 17));
return result; return result;
} }
// Public function - see documentation comment in header file. // Public function - see documentation comment in header file.
bool qrcodegen_getModule(const uint8_t qrcode[], int x, int y) { bool qrcodegen_getModule(const uint8_t qrcode[], int x, int y) {
assert(qrcode != NULL); assert(qrcode != NULL);
@@ -779,7 +771,6 @@ bool qrcodegen_getModule(const uint8_t qrcode[], int x, int y) {
return (0 <= x && x < qrsize && 0 <= y && y < qrsize) && getModuleBounded(qrcode, x, y); return (0 <= x && x < qrsize && 0 <= y && y < qrsize) && getModuleBounded(qrcode, x, y);
} }
// Returns the color of the module at the given coordinates, which must be in bounds. // Returns the color of the module at the given coordinates, which must be in bounds.
testable bool getModuleBounded(const uint8_t qrcode[], int x, int y) { testable bool getModuleBounded(const uint8_t qrcode[], int x, int y) {
int qrsize = qrcode[0]; int qrsize = qrcode[0];
@@ -788,7 +779,6 @@ testable bool getModuleBounded(const uint8_t qrcode[], int x, int y) {
return getBit(qrcode[(index >> 3) + 1], index & 7); return getBit(qrcode[(index >> 3) + 1], index & 7);
} }
// Sets the color of the module at the given coordinates, which must be in bounds. // Sets the color of the module at the given coordinates, which must be in bounds.
testable void setModuleBounded(uint8_t qrcode[], int x, int y, bool isDark) { testable void setModuleBounded(uint8_t qrcode[], int x, int y, bool isDark) {
int qrsize = qrcode[0]; int qrsize = qrcode[0];
@@ -802,7 +792,6 @@ testable void setModuleBounded(uint8_t qrcode[], int x, int y, bool isDark) {
qrcode[byteIndex] &= (1 << bitIndex) ^ 0xFF; qrcode[byteIndex] &= (1 << bitIndex) ^ 0xFF;
} }
// Sets the color of the module at the given coordinates, doing nothing if out of bounds. // Sets the color of the module at the given coordinates, doing nothing if out of bounds.
testable void setModuleUnbounded(uint8_t qrcode[], int x, int y, bool isDark) { testable void setModuleUnbounded(uint8_t qrcode[], int x, int y, bool isDark) {
int qrsize = qrcode[0]; int qrsize = qrcode[0];
@@ -810,14 +799,11 @@ testable void setModuleUnbounded(uint8_t qrcode[], int x, int y, bool isDark) {
setModuleBounded(qrcode, x, y, isDark); setModuleBounded(qrcode, x, y, isDark);
} }
// Returns true iff the i'th bit of x is set to 1. Requires x >= 0 and 0 <= i <= 14. // Returns true iff the i'th bit of x is set to 1. Requires x >= 0 and 0 <= i <= 14.
static bool getBit(int x, int i) { static bool getBit(int x, int i) {
return ((x >> i) & 1) != 0; return ((x >> i) & 1) != 0;
} }
/*---- Segment handling ----*/ /*---- Segment handling ----*/
// Public function - see documentation comment in header file. // Public function - see documentation comment in header file.
@@ -830,7 +816,6 @@ bool qrcodegen_isNumeric(const char *text) {
return true; return true;
} }
// Public function - see documentation comment in header file. // Public function - see documentation comment in header file.
bool qrcodegen_isAlphanumeric(const char *text) { bool qrcodegen_isAlphanumeric(const char *text) {
assert(text != NULL); assert(text != NULL);
@@ -841,7 +826,6 @@ bool qrcodegen_isAlphanumeric(const char *text) {
return true; return true;
} }
// Public function - see documentation comment in header file. // Public function - see documentation comment in header file.
size_t qrcodegen_calcSegmentBufferSize(enum qrcodegen_Mode mode, size_t numChars) { size_t qrcodegen_calcSegmentBufferSize(enum qrcodegen_Mode mode, size_t numChars) {
int temp = calcSegmentBitLength(mode, numChars); int temp = calcSegmentBitLength(mode, numChars);
@@ -851,7 +835,6 @@ size_t qrcodegen_calcSegmentBufferSize(enum qrcodegen_Mode mode, size_t numChars
return ((size_t)temp + 7) / 8; return ((size_t)temp + 7) / 8;
} }
// Returns the number of data bits needed to represent a segment // Returns the number of data bits needed to represent a segment
// containing the given number of characters using the given mode. Notes: // containing the given number of characters using the given mode. Notes:
// - Returns LENGTH_OVERFLOW on failure, i.e. numChars > INT16_MAX // - Returns LENGTH_OVERFLOW on failure, i.e. numChars > INT16_MAX
@@ -885,7 +868,6 @@ testable int calcSegmentBitLength(enum qrcodegen_Mode mode, size_t numChars) {
return (int)result; return (int)result;
} }
// Public function - see documentation comment in header file. // Public function - see documentation comment in header file.
struct qrcodegen_Segment qrcodegen_makeBytes(const uint8_t data[], size_t len, uint8_t buf[]) { struct qrcodegen_Segment qrcodegen_makeBytes(const uint8_t data[], size_t len, uint8_t buf[]) {
assert(data != NULL || len == 0); assert(data != NULL || len == 0);
@@ -900,7 +882,6 @@ struct qrcodegen_Segment qrcodegen_makeBytes(const uint8_t data[], size_t len, u
return result; return result;
} }
// Public function - see documentation comment in header file. // Public function - see documentation comment in header file.
struct qrcodegen_Segment qrcodegen_makeNumeric(const char *digits, uint8_t buf[]) { struct qrcodegen_Segment qrcodegen_makeNumeric(const char *digits, uint8_t buf[]) {
assert(digits != NULL); assert(digits != NULL);
@@ -934,7 +915,6 @@ struct qrcodegen_Segment qrcodegen_makeNumeric(const char *digits, uint8_t buf[]
return result; return result;
} }
// Public function - see documentation comment in header file. // Public function - see documentation comment in header file.
struct qrcodegen_Segment qrcodegen_makeAlphanumeric(const char *text, uint8_t buf[]) { struct qrcodegen_Segment qrcodegen_makeAlphanumeric(const char *text, uint8_t buf[]) {
assert(text != NULL); assert(text != NULL);
@@ -968,7 +948,6 @@ struct qrcodegen_Segment qrcodegen_makeAlphanumeric(const char *text, uint8_t bu
return result; return result;
} }
// Public function - see documentation comment in header file. // Public function - see documentation comment in header file.
struct qrcodegen_Segment qrcodegen_makeEci(long assignVal, uint8_t buf[]) { struct qrcodegen_Segment qrcodegen_makeEci(long assignVal, uint8_t buf[]) {
struct qrcodegen_Segment result; struct qrcodegen_Segment result;
@@ -995,7 +974,6 @@ struct qrcodegen_Segment qrcodegen_makeEci(long assignVal, uint8_t buf[]) {
return result; return result;
} }
// Calculates the number of bits needed to encode the given segments at the given version. // Calculates the number of bits needed to encode the given segments at the given version.
// Returns a non-negative number if successful. Otherwise returns LENGTH_OVERFLOW if a segment // Returns a non-negative number if successful. Otherwise returns LENGTH_OVERFLOW if a segment
// has too many characters to fit its length field, or the total bits exceeds INT16_MAX. // has too many characters to fit its length field, or the total bits exceeds INT16_MAX.
@@ -1019,21 +997,34 @@ testable int getTotalBits(const struct qrcodegen_Segment segs[], size_t len, int
return (int)result; return (int)result;
} }
// Returns the bit width of the character count field for a segment in the given mode // Returns the bit width of the character count field for a segment in the given mode
// in a QR Code at the given version number. The result is in the range [0, 16]. // in a QR Code at the given version number. The result is in the range [0, 16].
static int numCharCountBits(enum qrcodegen_Mode mode, int version) { static int numCharCountBits(enum qrcodegen_Mode mode, int version) {
assert(qrcodegen_VERSION_MIN <= version && version <= qrcodegen_VERSION_MAX); assert(qrcodegen_VERSION_MIN <= version && version <= qrcodegen_VERSION_MAX);
int i = (version + 7) / 17; int i = (version + 7) / 17;
switch (mode) { switch (mode) {
case qrcodegen_Mode_NUMERIC : { static const int temp[] = {10, 12, 14}; return temp[i]; } case qrcodegen_Mode_NUMERIC: {
case qrcodegen_Mode_ALPHANUMERIC: { static const int temp[] = { 9, 11, 13}; return temp[i]; } static const int temp[] = {10, 12, 14};
case qrcodegen_Mode_BYTE : { static const int temp[] = { 8, 16, 16}; return temp[i]; } return temp[i];
case qrcodegen_Mode_KANJI : { static const int temp[] = { 8, 10, 12}; return temp[i]; } }
case qrcodegen_Mode_ECI : return 0; case qrcodegen_Mode_ALPHANUMERIC: {
default: assert(false); return -1; // Dummy value static const int temp[] = {9, 11, 13};
return temp[i];
}
case qrcodegen_Mode_BYTE: {
static const int temp[] = {8, 16, 16};
return temp[i];
}
case qrcodegen_Mode_KANJI: {
static const int temp[] = {8, 10, 12};
return temp[i];
}
case qrcodegen_Mode_ECI:
return 0;
default:
assert(false);
return -1; // Dummy value
} }
} }
#undef LENGTH_OVERFLOW #undef LENGTH_OVERFLOW

View File

@@ -27,12 +27,10 @@
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/* /*
* This library creates QR Code symbols, which is a type of two-dimension barcode. * This library creates QR Code symbols, which is a type of two-dimension barcode.
* Invented by Denso Wave and described in the ISO/IEC 18004 standard. * Invented by Denso Wave and described in the ISO/IEC 18004 standard.
@@ -48,7 +46,6 @@ extern "C" {
* (Note that all ways require supplying the desired error correction level and various byte buffers.) * (Note that all ways require supplying the desired error correction level and various byte buffers.)
*/ */
/*---- Enum and struct types----*/ /*---- Enum and struct types----*/
/* /*
@@ -57,13 +54,12 @@ extern "C" {
enum qrcodegen_Ecc { enum qrcodegen_Ecc {
// Must be declared in ascending order of error protection // Must be declared in ascending order of error protection
// so that an internal qrcodegen function works properly // so that an internal qrcodegen function works properly
qrcodegen_Ecc_LOW = 0 , // The QR Code can tolerate about 7% erroneous codewords qrcodegen_Ecc_LOW = 0, // The QR Code can tolerate about 7% erroneous codewords
qrcodegen_Ecc_MEDIUM , // The QR Code can tolerate about 15% erroneous codewords qrcodegen_Ecc_MEDIUM, // The QR Code can tolerate about 15% erroneous codewords
qrcodegen_Ecc_QUARTILE, // The QR Code can tolerate about 25% erroneous codewords qrcodegen_Ecc_QUARTILE, // The QR Code can tolerate about 25% erroneous codewords
qrcodegen_Ecc_HIGH , // The QR Code can tolerate about 30% erroneous codewords qrcodegen_Ecc_HIGH, // The QR Code can tolerate about 30% erroneous codewords
}; };
/* /*
* The mask pattern used in a QR Code symbol. * The mask pattern used in a QR Code symbol.
*/ */
@@ -82,7 +78,6 @@ enum qrcodegen_Mask {
qrcodegen_Mask_7, qrcodegen_Mask_7,
}; };
/* /*
* Describes how a segment's data bits are interpreted. * Describes how a segment's data bits are interpreted.
*/ */
@@ -94,7 +89,6 @@ enum qrcodegen_Mode {
qrcodegen_Mode_ECI = 0x7, qrcodegen_Mode_ECI = 0x7,
}; };
/* /*
* A segment of character/binary/control data in a QR Code symbol. * A segment of character/binary/control data in a QR Code symbol.
* The mid-level way to create a segment is to take the payload data * The mid-level way to create a segment is to take the payload data
@@ -125,8 +119,6 @@ struct qrcodegen_Segment {
int bitLength; int bitLength;
}; };
/*---- Macro constants and functions ----*/ /*---- Macro constants and functions ----*/
#define qrcodegen_VERSION_MIN 1 // The minimum version number supported in the QR Code Model 2 standard #define qrcodegen_VERSION_MIN 1 // The minimum version number supported in the QR Code Model 2 standard
@@ -143,8 +135,6 @@ struct qrcodegen_Segment {
// Use this more convenient value to avoid calculating tighter memory bounds for buffers. // Use this more convenient value to avoid calculating tighter memory bounds for buffers.
#define qrcodegen_BUFFER_LEN_MAX qrcodegen_BUFFER_LEN_FOR_VERSION(qrcodegen_VERSION_MAX) #define qrcodegen_BUFFER_LEN_MAX qrcodegen_BUFFER_LEN_FOR_VERSION(qrcodegen_VERSION_MAX)
/*---- Functions (high level) to generate QR Codes ----*/ /*---- Functions (high level) to generate QR Codes ----*/
/* /*
@@ -184,9 +174,8 @@ struct qrcodegen_Segment {
* Please consult the QR Code specification for information on * Please consult the QR Code specification for information on
* data capacities per version, ECC level, and text encoding mode. * data capacities per version, ECC level, and text encoding mode.
*/ */
bool qrcodegen_encodeText(const char *text, uint8_t tempBuffer[], uint8_t qrcode[], bool qrcodegen_encodeText(const char *text, uint8_t tempBuffer[], uint8_t qrcode[], enum qrcodegen_Ecc ecl,
enum qrcodegen_Ecc ecl, int minVersion, int maxVersion, enum qrcodegen_Mask mask, bool boostEcl); int minVersion, int maxVersion, enum qrcodegen_Mask mask, bool boostEcl);
/* /*
* Encodes the given binary data to a QR Code, returning true if successful. * Encodes the given binary data to a QR Code, returning true if successful.
@@ -223,9 +212,8 @@ bool qrcodegen_encodeText(const char *text, uint8_t tempBuffer[], uint8_t qrcode
* Please consult the QR Code specification for information on * Please consult the QR Code specification for information on
* data capacities per version, ECC level, and text encoding mode. * data capacities per version, ECC level, and text encoding mode.
*/ */
bool qrcodegen_encodeBinary(uint8_t dataAndTemp[], size_t dataLen, uint8_t qrcode[], bool qrcodegen_encodeBinary(uint8_t dataAndTemp[], size_t dataLen, uint8_t qrcode[], enum qrcodegen_Ecc ecl,
enum qrcodegen_Ecc ecl, int minVersion, int maxVersion, enum qrcodegen_Mask mask, bool boostEcl); int minVersion, int maxVersion, enum qrcodegen_Mask mask, bool boostEcl);
/*---- Functions (low level) to generate QR Codes ----*/ /*---- Functions (low level) to generate QR Codes ----*/
@@ -260,9 +248,8 @@ bool qrcodegen_encodeBinary(uint8_t dataAndTemp[], size_t dataLen, uint8_t qrcod
* between modes (such as alphanumeric and byte) to encode text in less space. * between modes (such as alphanumeric and byte) to encode text in less space.
* This is a low-level API; the high-level API is qrcodegen_encodeText() and qrcodegen_encodeBinary(). * This is a low-level API; the high-level API is qrcodegen_encodeText() and qrcodegen_encodeBinary().
*/ */
bool qrcodegen_encodeSegments(const struct qrcodegen_Segment segs[], size_t len, bool qrcodegen_encodeSegments(const struct qrcodegen_Segment segs[], size_t len, enum qrcodegen_Ecc ecl,
enum qrcodegen_Ecc ecl, uint8_t tempBuffer[], uint8_t qrcode[]); uint8_t tempBuffer[], uint8_t qrcode[]);
/* /*
* Encodes the given segments to a QR Code, returning true if successful. * Encodes the given segments to a QR Code, returning true if successful.
@@ -300,8 +287,8 @@ bool qrcodegen_encodeSegments(const struct qrcodegen_Segment segs[], size_t len,
* This is a low-level API; the high-level API is qrcodegen_encodeText() and qrcodegen_encodeBinary(). * This is a low-level API; the high-level API is qrcodegen_encodeText() and qrcodegen_encodeBinary().
*/ */
bool qrcodegen_encodeSegmentsAdvanced(const struct qrcodegen_Segment segs[], size_t len, enum qrcodegen_Ecc ecl, bool qrcodegen_encodeSegmentsAdvanced(const struct qrcodegen_Segment segs[], size_t len, enum qrcodegen_Ecc ecl,
int minVersion, int maxVersion, enum qrcodegen_Mask mask, bool boostEcl, uint8_t tempBuffer[], uint8_t qrcode[]); int minVersion, int maxVersion, enum qrcodegen_Mask mask, bool boostEcl,
uint8_t tempBuffer[], uint8_t qrcode[]);
/* /*
* Tests whether the given string can be encoded as a segment in numeric mode. * Tests whether the given string can be encoded as a segment in numeric mode.
@@ -309,7 +296,6 @@ bool qrcodegen_encodeSegmentsAdvanced(const struct qrcodegen_Segment segs[], siz
*/ */
bool qrcodegen_isNumeric(const char *text); bool qrcodegen_isNumeric(const char *text);
/* /*
* Tests whether the given string can be encoded as a segment in alphanumeric mode. * Tests whether the given string can be encoded as a segment in alphanumeric mode.
* A string is encodable iff each character is in the following set: 0 to 9, A to Z * A string is encodable iff each character is in the following set: 0 to 9, A to Z
@@ -317,7 +303,6 @@ bool qrcodegen_isNumeric(const char *text);
*/ */
bool qrcodegen_isAlphanumeric(const char *text); bool qrcodegen_isAlphanumeric(const char *text);
/* /*
* Returns the number of bytes (uint8_t) needed for the data buffer of a segment * Returns the number of bytes (uint8_t) needed for the data buffer of a segment
* containing the given number of characters using the given mode. Notes: * containing the given number of characters using the given mode. Notes:
@@ -331,7 +316,6 @@ bool qrcodegen_isAlphanumeric(const char *text);
*/ */
size_t qrcodegen_calcSegmentBufferSize(enum qrcodegen_Mode mode, size_t numChars); size_t qrcodegen_calcSegmentBufferSize(enum qrcodegen_Mode mode, size_t numChars);
/* /*
* Returns a segment representing the given binary data encoded in * Returns a segment representing the given binary data encoded in
* byte mode. All input byte arrays are acceptable. Any text string * byte mode. All input byte arrays are acceptable. Any text string
@@ -339,13 +323,11 @@ size_t qrcodegen_calcSegmentBufferSize(enum qrcodegen_Mode mode, size_t numChars
*/ */
struct qrcodegen_Segment qrcodegen_makeBytes(const uint8_t data[], size_t len, uint8_t buf[]); struct qrcodegen_Segment qrcodegen_makeBytes(const uint8_t data[], size_t len, uint8_t buf[]);
/* /*
* Returns a segment representing the given string of decimal digits encoded in numeric mode. * Returns a segment representing the given string of decimal digits encoded in numeric mode.
*/ */
struct qrcodegen_Segment qrcodegen_makeNumeric(const char *digits, uint8_t buf[]); struct qrcodegen_Segment qrcodegen_makeNumeric(const char *digits, uint8_t buf[]);
/* /*
* Returns a segment representing the given text string encoded in alphanumeric mode. * Returns a segment representing the given text string encoded in alphanumeric mode.
* The characters allowed are: 0 to 9, A to Z (uppercase only), space, * The characters allowed are: 0 to 9, A to Z (uppercase only), space,
@@ -353,14 +335,12 @@ struct qrcodegen_Segment qrcodegen_makeNumeric(const char *digits, uint8_t buf[]
*/ */
struct qrcodegen_Segment qrcodegen_makeAlphanumeric(const char *text, uint8_t buf[]); struct qrcodegen_Segment qrcodegen_makeAlphanumeric(const char *text, uint8_t buf[]);
/* /*
* Returns a segment representing an Extended Channel Interpretation * Returns a segment representing an Extended Channel Interpretation
* (ECI) designator with the given assignment value. * (ECI) designator with the given assignment value.
*/ */
struct qrcodegen_Segment qrcodegen_makeEci(long assignVal, uint8_t buf[]); struct qrcodegen_Segment qrcodegen_makeEci(long assignVal, uint8_t buf[]);
/*---- Functions to extract raw data from QR Codes ----*/ /*---- Functions to extract raw data from QR Codes ----*/
/* /*
@@ -371,7 +351,6 @@ struct qrcodegen_Segment qrcodegen_makeEci(long assignVal, uint8_t buf[]);
*/ */
int qrcodegen_getSize(const uint8_t qrcode[]); int qrcodegen_getSize(const uint8_t qrcode[]);
/* /*
* Returns the color of the module (pixel) at the given coordinates, which is false * Returns the color of the module (pixel) at the given coordinates, which is false
* for light or true for dark. The top left corner has the coordinates (x=0, y=0). * for light or true for dark. The top left corner has the coordinates (x=0, y=0).
@@ -379,7 +358,6 @@ int qrcodegen_getSize(const uint8_t qrcode[]);
*/ */
bool qrcodegen_getModule(const uint8_t qrcode[], int x, int y); bool qrcodegen_getModule(const uint8_t qrcode[], int x, int y);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif