mirrors/zint-barcode-generator
1
0
Fork 0
mirror of https://git.code.sf.net/p/zint/code synced 2025-05-20 18:25:12 -04:00
Code Issues Projects Releases Packages Wiki Activity

Do not apply rect/dmre options if concrete size is given. E.g. "zint -b72 --vers 31" will ignore eventual option "--square or --dmre".

Browse source
This commit is contained in:
Harald Oehlmann 2018-04-08 20:20:56 +02:00
parent 68fdae09c3
commit 3853897d88
1 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

18
backend/dmatrix.c
View file

@ -1171,29 +1171,29 @@ int data_matrix_200(struct zint_symbol *symbol,const unsigned char source[], con
} }
} }
if (optionsize == -1) {
// We are in automatic size mode as the exact symbol size was not given
// Now check the detailed search options square only or no dmre
if (symbol->option_3 == DM_SQUARE) { if (symbol->option_3 == DM_SQUARE) {
/* Skip rectangular symbols in square only mode */ /* Skip rectangular symbols in square only mode */
while (matrixH[calcsize] != matrixW[calcsize]) { while (matrixH[calcsize] != matrixW[calcsize]) {
calcsize++; calcsize++;
} }
if (optionsize != -1) {
strcpy(symbol->errtxt, "521: Can not force square symbols when symbol size is selected");
error_number = ZINT_WARN_INVALID_OPTION;
}
} else if (symbol->option_3 != DM_DMRE) { } else if (symbol->option_3 != DM_DMRE) {
/* Skip DMRE symbols */ /* Skip DMRE symbols in no dmre mode */
while (isDMRE[calcsize]) { while (isDMRE[calcsize]) {
calcsize++; calcsize++;
} }
} }
symbolsize = optionsize;
if (calcsize > optionsize) {
symbolsize = calcsize; symbolsize = calcsize;
if (optionsize != -1) { } else {
// The symbol size was given by --ver (option_2)
// Thus check if the data fits into this symbol size and use this size
if (calcsize > optionsize) {
strcpy(symbol->errtxt, "522: Input too long for selected symbol size"); strcpy(symbol->errtxt, "522: Input too long for selected symbol size");
return ZINT_ERROR_TOO_LONG; return ZINT_ERROR_TOO_LONG;
} }
symbolsize = optionsize;
} }
// Now we know the symbol size we can handle the remaining data in the process buffer. // Now we know the symbol size we can handle the remaining data in the process buffer.