mirrors/zint-barcode-generator
1
0
Fork 0
mirror of https://git.code.sf.net/p/zint/code synced 2025-05-31 23:28:27 -04:00
Code Issues Projects Releases Packages Wiki Activity

Add text_length (length of text) to zint_symbol, and new

Browse source 
`BARCODE_PLAIN_HRT` option for `output_options` - for use
  primarily by ZXing-C++ but may be generally useful;
  centralize setting of HRT using new common `hrt_cpy_nochk()` etc.
  routines to ensure `text_length` always set
PLESSEY: add show default check characters option
CODE32: ignore `option_2` (check digit options)
PZN: ignore `option_2` (check digit options) except when indicates
  PZN7 only
DPD: exclude DEL from ident tag also
out_maybe_mkdir: fix `utf8_to_wide()` return (Windows only)
general: replace use of `strcpy()` etc. (except for test suite)
  with `memcpy()`, `hrt_()` etc. in lib & `cpy_str()` etc. in CLI
  & `cpy_bytearray_left()` in backend_qt
clang-tidy: update README reflecting above
backend_tcl: use sizeof(primary) to check length; tabs -> spaces
general: various code fiddling
docs: pandoc 3.6.2 -> 3.6.3
This commit is contained in:
gitlost 2025-02-15 20:32:55 +00:00
parent ddedd00d2d
commit fef8b083b4
82 changed files with 2873 additions and 1671 deletions
backend
2of5.c

24
backend/2of5.c
View file

@ -60,8 +60,9 @@ static int c25_common(struct zint_symbol *symbol, const unsigned char source[],
int i;
char dest[818]; /* Largest destination 4 + (80 + 1) * 10 + 3 + 1 = 818 */
char *d = dest;
unsigned char temp[113 + 1 + 1]; /* Largest maximum 113 + optional check digit */
unsigned char local_source[113 + 1]; /* Largest maximum 113 + optional check digit */
const int have_checkdigit = symbol->option_2 == 1 || symbol->option_2 == 2;
const int plain_hrt = symbol->output_options & BARCODE_PLAIN_HRT;
if (length > max) {
/* errtxt 301: 303: 305: 307: */
@ -75,13 +76,13 @@ static int c25_common(struct zint_symbol *symbol, const unsigned char source[],
"Invalid character at position %d in input (digits only)", i);
}
ustrcpy(temp, source);
memcpy(local_source, source, length);
if (have_checkdigit) {
/* Add standard GS1 check digit */
temp[length] = gs1_check_digit(source, length);
temp[++length] = '\0';
if (symbol->debug & ZINT_DEBUG_PRINT) printf("Check digit: %c\n", temp[length - 1]);
local_source[length] = gs1_check_digit(source, length);
length++;
if (symbol->debug & ZINT_DEBUG_PRINT) printf("Check digit: %c\n", local_source[length - 1]);
}
/* Start character */
@ -90,11 +91,11 @@ static int c25_common(struct zint_symbol *symbol, const unsigned char source[],
if (is_matrix) {
for (i = 0; i < length; i++, d += 6) {
memcpy(d, C25MatrixTable[temp[i] - '0'], 6);
memcpy(d, C25MatrixTable[local_source[i] - '0'], 6);
}
} else {
for (i = 0; i < length; i++, d += 10) {
memcpy(d, C25IndustTable[temp[i] - '0'], 10);
memcpy(d, C25IndustTable[local_source[i] - '0'], 10);
}
}
@ -104,10 +105,11 @@ static int c25_common(struct zint_symbol *symbol, const unsigned char source[],
expand(symbol, dest, d - dest);
ustrcpy(symbol->text, temp);
if (symbol->option_2 == 2) {
/* Remove check digit from HRT */
symbol->text[length - 1] = '\0';
if (symbol->option_2 == 2 && !plain_hrt) {
/* Exclude check digit from HRT */
hrt_cpy_nochk(symbol, local_source, length - 1);
} else {
hrt_cpy_nochk(symbol, local_source, length);
}
return 0;