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

Ultra: Adjusted to allow 79-82 codeword range in 3-row symbols

Browse Source
This commit is contained in:
Robin Stuart 2019-12-15 13:48:45 +00:00
parent 77c8e76bfa
commit cfdc7cc262
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
backend/ultra.c
View File

@ -56,6 +56,9 @@ static const char ultra_c43_set2[] = "abcdefghijklmnopqrstuvwxyz:/?#[]@=_~!.,-";
static const char ultra_c43_set3[] = "{}`()\"+'<>|$;&\\^*"; static const char ultra_c43_set3[] = "{}`()\"+'<>|$;&\\^*";
static const char ultra_digit[] = "0123456789,/"; static const char ultra_digit[] = "0123456789,/";
//static const int ultra_maxsize[] = {34, 78, 158, 282}; // According to Table 1
static const int ultra_maxsize[] = {34, 82, 158, 282}; // Adjusted to allow 79-82 codeword range in 3-row symbols
/* The following adapted from ECC283.C "RSEC codeword generator" /* The following adapted from ECC283.C "RSEC codeword generator"
* from Annex B of Ultracode draft * from Annex B of Ultracode draft
* originally written by Ted Williams of Symbol Vision Corp. * originally written by Ted Williams of Symbol Vision Corp.
@ -783,14 +786,10 @@ int ultracode(struct zint_symbol *symbol, const unsigned char source[], const si
total_cws = data_cw_count + ecc_cw; total_cws = data_cw_count + ecc_cw;
rows = 5; rows = 5;
if (total_cws < 164) { for (i = 2; i >= 0; i--) {
rows = 4; if (total_cws < ultra_maxsize[i]) {
} rows--;
if (total_cws < 84) { }
rows = 3;
}
if (total_cws < 40) {
rows = 2;
} }
if ((total_cws % rows) == 0) { if ((total_cws % rows) == 0) {