Mirrors/zint
1
0
Fork 0
mirror of https://git.code.sf.net/p/zint/code synced 2026-05-01 11:45:29 +00:00
Code Issues Projects Releases Wiki Activity

AZTEC: az_punct_size(): small perf. improvement

Browse Source
This commit is contained in:
gitlost
2026-02-03 05:07:06 +00:00
parent bcb3ceefe1
commit 1a7e174b6a
1 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
backend/aztec.c
View File

@@ -571,22 +571,20 @@ static int az_count_byte_only(const unsigned char source[], const int length, co
static int az_punct_size(const unsigned char source[], const int len, const int gs1) { static int az_punct_size(const unsigned char source[], const int len, const int gs1) {
int i; int i;
int cnt_doubles = 0; int cnt_doubles = 0;
int cnt_fnc1s = 0;
int size;
if (gs1) { if (gs1) {
for (i = 0; i < len; i++) { int cnt_fnc1s = 0;
cnt_doubles += AZ_DOUBLE_PUNCT(source, len, i); for (i = 0; i + 1 < len; i++) {
cnt_fnc1s += (source[i] == '\x1D'); cnt_doubles += AZ_DOUBLE_PUNCT_NO_LEN_CHECK(source, i);
cnt_fnc1s += source[i] == '\x1D';
} }
} else { cnt_fnc1s += source[i] == '\x1D';
for (i = 0; i < len; i++) { return 5 * (len - cnt_doubles - cnt_fnc1s) + (cnt_fnc1s << 3);
cnt_doubles += AZ_DOUBLE_PUNCT(source, len, i);
} }
for (i = 0; i + 1 < len; i++) {
cnt_doubles += AZ_DOUBLE_PUNCT_NO_LEN_CHECK(source, i);
} }
size = 5 * (len - cnt_doubles - cnt_fnc1s) + 8 * cnt_fnc1s; return 5 * (len - cnt_doubles);
return size;
} }
struct az_edge { struct az_edge {
@@ -700,7 +698,7 @@ static void az_new_Edge(const struct az_edge *edges, const char mode, const unsi
} }
edge->bytes = len + previous->bytes; edge->bytes = len + previous->bytes;
} }
edge->size += 8 * len; edge->size += len << 3;
edge->startMode = previousStartMode; edge->startMode = previousStartMode;
break; break;
} }
@@ -709,7 +707,7 @@ static void az_new_Edge(const struct az_edge *edges, const char mode, const unsi
/* Add an edge for a mode at a vertex if no existing edge or if more optimal than existing edge */ /* Add an edge for a mode at a vertex if no existing edge or if more optimal than existing edge */
static void az_addEdge(const unsigned char *source, const int length, struct az_edge *edges, const char mode, static void az_addEdge(const unsigned char *source, const int length, struct az_edge *edges, const char mode,
const int from, const int len, const int gs1, const int initial_mode, struct az_edge *previous) { const int from, const int len, const int gs1, const int initial_mode, const struct az_edge *previous) {
struct az_edge edge; struct az_edge edge;
const int vertexIndex = from + len; const int vertexIndex = from + len;
const int v_ij = vertexIndex * AZ_NUM_MODES + AZ_MASK(mode) - 1; const int v_ij = vertexIndex * AZ_NUM_MODES + AZ_MASK(mode) - 1;
@@ -726,7 +724,7 @@ static void az_addEdge(const unsigned char *source, const int length, struct az_
/* Add edges for the various modes at a vertex */ /* Add edges for the various modes at a vertex */
static void az_addEdges(const unsigned char source[], const int length, const int gs1, const int initial_mode, static void az_addEdges(const unsigned char source[], const int length, const int gs1, const int initial_mode,
struct az_edge *edges, const int from, struct az_edge *previous) { struct az_edge *edges, const int from, const struct az_edge *previous) {
const unsigned char ch = source[from]; const unsigned char ch = source[from];
int len; int len;
@@ -962,7 +960,7 @@ static int az_text_size(const char *modes, const unsigned char *source, int leng
if (count > 2047) { /* Max 11-bit number */ if (count > 2047) { /* Max 11-bit number */
big_batch = count > 2078 ? 2078 : count; big_batch = count > 2078 ? 2078 : count;
/* Put 00000 followed by 11-bit number of bytes less 31 */ /* Put 00000 followed by 11-bit number of bytes less 31 */
size += 16 + 8 * big_batch; size += 16 + (big_batch << 3);
i += big_batch; i += big_batch;
count -= big_batch; count -= big_batch;
} }
@@ -978,7 +976,7 @@ static int az_text_size(const char *modes, const unsigned char *source, int leng
/* Put 5-bit number of bytes */ /* Put 5-bit number of bytes */
size += 5; size += 5;
} }
size += 8 * count; size += count << 3;
i += count; i += count;
} }
i--; i--;