mirrors/zint
2
0
Fork 0
mirror of https://github.com/zint/zint synced 2024-11-16 20:57:25 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

AZTEC: use short for AztecMap to avoid issues on Windows with VS2017

Browse Source
This commit is contained in:
gitlost 2020-12-17 14:23:23 +00:00
parent 2c3c7293d0
commit 6fb82dc13d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/aztec.c
View File

@ -754,11 +754,11 @@ static int avoidReferenceGrid(int output) {
} }
/* Calculate the position of the bits in the grid */ /* Calculate the position of the bits in the grid */
static void populate_map(int AztecMap[]) { static void populate_map(short AztecMap[]) {
int layer, n, i; int layer, n, i;
int x, y; int x, y;
memset(AztecMap, 0, sizeof(int) * AZTEC_MAP_SIZE); memset(AztecMap, 0, sizeof(short) * AZTEC_MAP_SIZE);
for (layer = 1; layer < 33; layer++) { for (layer = 1; layer < 33; layer++) {
const int start = (112 * (layer - 1)) + (16 * (layer - 1) * (layer - 1)) + 2; const int start = (112 * (layer - 1)) + (16 * (layer - 1) * (layer - 1)) + 2;
@ -872,7 +872,7 @@ INTERNAL int aztec(struct zint_symbol *symbol, unsigned char source[], int lengt
int x, y, i, j, p, data_blocks, ecc_blocks, layers, total_bits; int x, y, i, j, p, data_blocks, ecc_blocks, layers, total_bits;
char binary_string[AZTEC_BIN_CAPACITY + 1], bit_pattern[20045], descriptor[42]; char binary_string[AZTEC_BIN_CAPACITY + 1], bit_pattern[20045], descriptor[42];
char adjusted_string[AZTEC_MAX_CAPACITY + 1]; char adjusted_string[AZTEC_MAX_CAPACITY + 1];
int AztecMap[AZTEC_MAP_SIZE]; short AztecMap[AZTEC_MAP_SIZE];
unsigned char desc_data[4], desc_ecc[6]; unsigned char desc_data[4], desc_ecc[6];
int error_number, ecc_level, compact, data_length, data_maxsize, codeword_size, adjusted_length; int error_number, ecc_level, compact, data_length, data_maxsize, codeword_size, adjusted_length;
int remainder, padbits, count, gs1, adjustment_size; int remainder, padbits, count, gs1, adjustment_size;