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

Reinstate height adjustment for PDF

Browse Source 
Allows height adjustment of PDF417 and MicroPDF417 symbols.
Fixes #161 reported by 'DigitalResident'
This commit is contained in:
Robin Stuart 2019-09-03 19:53:01 +01:00
parent 158834b6b4
commit f2262f2616
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
backend/pdf417.c
View File

@ -551,7 +551,7 @@ void numbprocess(int *chainemc, int *mclength, char chaine[], int start, int len
/* 366 */ /* 366 */
static int pdf417(struct zint_symbol *symbol, unsigned char chaine[], const size_t length) { static int pdf417(struct zint_symbol *symbol, unsigned char chaine[], const size_t length) {
int i, k, j, indexchaine, indexliste, mode, longueur, loop, mccorrection[520], offset; int i, k, j, indexchaine, indexliste, mode, longueur, loop, mccorrection[520], offset;
int total, chainemc[2700], mclength, c1, c2, c3, dummy[35]; int total, chainemc[2700], mclength, c1, c2, c3, dummy[35], calcheight;
char pattern[580]; char pattern[580];
int debug = symbol->debug; int debug = symbol->debug;
@ -808,10 +808,18 @@ static int pdf417(struct zint_symbol *symbol, unsigned char chaine[], const size
set_module(symbol, i, loop); set_module(symbol, i, loop);
} }
} }
symbol->row_height[i] = 3;
} }
/* Allow user to adjust height of symbol, but enforce minimum row height of 3X */
calcheight = (int)(symbol->height / i);
if (calcheight < 3) {
calcheight = 3;
}
for (j = 0; j < i; j++) {
symbol->row_height[j] = calcheight;
}
symbol->rows = (mclength / symbol->option_2); symbol->rows = (mclength / symbol->option_2);
symbol->width =(int)strlen(pattern); symbol->width =(int)strlen(pattern);
@ -878,7 +886,7 @@ int micro_pdf417(struct zint_symbol *symbol, unsigned char chaine[], const size_
int total, chainemc[2700], mclength, dummy[5], codeerr; int total, chainemc[2700], mclength, dummy[5], codeerr;
char pattern[580]; char pattern[580];
int variant, LeftRAPStart, CentreRAPStart, RightRAPStart, StartCluster; int variant, LeftRAPStart, CentreRAPStart, RightRAPStart, StartCluster;
int LeftRAP, CentreRAP, RightRAP, Cluster, loop; int LeftRAP, CentreRAP, RightRAP, Cluster, loop, calcheight;
int debug = 0; int debug = 0;
/* Encoding starts out the same as PDF417, so use the same code */ /* Encoding starts out the same as PDF417, so use the same code */
@ -1283,6 +1291,16 @@ int micro_pdf417(struct zint_symbol *symbol, unsigned char chaine[], const size_
Cluster = 0; Cluster = 0;
} }
} }
/* Allow user to adjust height of symbol, but enforce minimum row height of 2X */
calcheight = (int)(symbol->height / i);
if (calcheight < 2) {
calcheight = 2;
}
for (j = 0; j < i; j++) {
symbol->row_height[j] = calcheight;
}
return codeerr; return codeerr;
} }