mirror of
https://git.code.sf.net/p/zint/code
synced 2025-05-13 06:34:32 -04:00
EAN/UPC: add quiet zone indicators option (API output_options
`EANUPC_GUARD_WHITESPACE`, CLI `--guardwhitespace`) (ticket #287) EAN-2/EAN-5: HRT now at top instead of at bottom for standalones, following BWIPP CLI: batch mode: don't close input if stdin EAN/UPC: fix excess 1X to right of add-ons Composites: fix excess whitespace; fix quiet zone calcs to allow for linear shifting CLI: use own (Wine) version of `CommandLineToArgvW()` to avoid loading "shell32.dll" Move "font.h" -> "raster_font.h" EPS/SVG: use new `out_putsf()` func to output floats, avoiding trailing zeroes & locale dependency EPS: simplify "TR" formula SVG: change font from "Helvetica, sans serif" to "OCR-B, monospace"; use single "<path>" instead of multiple "<rect>"s to draw boxes (reduces file size) Add `EMBED_VECTOR_FONT` to `output_options` (CLI `--embedfont`) to enable embedding of font in vector output - currently only for SVG output of EAN/UPC GUI: use "OCR-B" font for EAN/UPC and "Arimo" for all others (was "Helvetica" for both); paint background of screen preview light grey so as contrasts with whitespace and quiet zones EMF: prefix funcs with `emf_`; simplify string `halign` handling large: rename `large_int` -> `large_uint` CODE128/common: move `c128_hrt_cpy_iso8859_1()` to `hrt_cpy_iso8859_1()` and add `ZINT_WARN_HRT_TRUNCATED` warning (for future use) Various symbologies: replace `printf()` with `fputs()` (symbol->debug) QRCODE: better assert(), removing a NOLINT (2 left) CLI: add some more barcode synonyms for DBAR common: various fiddlings CMake: don't include png.c unless ZINT_USE_PNG (avoids clang warning)
This commit is contained in:
parent
6d015d6a8f
commit
607e4ed33a
395 changed files with 11528 additions and 23016 deletions
|
@ -1,7 +1,7 @@
|
|||
/* maxicode.c - Handles MaxiCode */
|
||||
/*
|
||||
libzint - the open source barcode library
|
||||
Copyright (C) 2010-2022 Robin Stuart <rstuart114@gmail.com>
|
||||
Copyright (C) 2010-2023 Robin Stuart <rstuart114@gmail.com>
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions
|
||||
|
@ -327,33 +327,33 @@ static int maxi_text_process(unsigned char set[144], unsigned char character[144
|
|||
character[sp + i] = 63; /* Set B Latch A */
|
||||
current_set = 1;
|
||||
i += 3; /* Next 3 Set A so skip over */
|
||||
if (debug_print) printf("LCHA ");
|
||||
if (debug_print) fputs("LCHA ", stdout);
|
||||
} else {
|
||||
/* 3 Shift A */
|
||||
maxi_bump(set, character, sp + i, &length);
|
||||
character[sp + i] = 57; /* Set B triple shift A */
|
||||
i += 2; /* Next 2 Set A so skip over */
|
||||
if (debug_print) printf("3SHA ");
|
||||
if (debug_print) fputs("3SHA ", stdout);
|
||||
}
|
||||
} else {
|
||||
/* 2 Shift A */
|
||||
maxi_bump(set, character, sp + i, &length);
|
||||
character[sp + i] = 56; /* Set B double shift A */
|
||||
i++; /* Next Set A so skip over */
|
||||
if (debug_print) printf("2SHA ");
|
||||
if (debug_print) fputs("2SHA ", stdout);
|
||||
}
|
||||
} else {
|
||||
/* Shift A */
|
||||
maxi_bump(set, character, sp + i, &length);
|
||||
character[sp + i] = 59; /* Set A Shift B */
|
||||
if (debug_print) printf("SHA ");
|
||||
if (debug_print) fputs("SHA ", stdout);
|
||||
}
|
||||
} else { /* All sets other than B only have latch */
|
||||
/* Latch A */
|
||||
maxi_bump(set, character, sp + i, &length);
|
||||
character[sp + i] = 58; /* Sets C,D,E Latch A */
|
||||
current_set = 1;
|
||||
if (debug_print) printf("LCHA ");
|
||||
if (debug_print) fputs("LCHA ", stdout);
|
||||
}
|
||||
break;
|
||||
case 2: /* Set B */
|
||||
|
@ -363,12 +363,12 @@ static int maxi_text_process(unsigned char set[144], unsigned char character[144
|
|||
maxi_bump(set, character, sp + i, &length);
|
||||
character[sp + i] = 63; /* Sets A,C,D,E Latch B */
|
||||
current_set = 2;
|
||||
if (debug_print) printf("LCHB ");
|
||||
if (debug_print) fputs("LCHB ", stdout);
|
||||
} else { /* Only available from Set A */
|
||||
/* Shift B */
|
||||
maxi_bump(set, character, sp + i, &length);
|
||||
character[sp + i] = 59; /* Set B Shift A */
|
||||
if (debug_print) printf("SHB ");
|
||||
if (debug_print) fputs("SHB ", stdout);
|
||||
}
|
||||
break;
|
||||
case 3: /* Set C */
|
||||
|
@ -408,7 +408,7 @@ static int maxi_text_process(unsigned char set[144], unsigned char character[144
|
|||
i++;
|
||||
} while (sp + i < 144);
|
||||
|
||||
if (debug_print) printf("\n");
|
||||
if (debug_print) fputc('\n', stdout);
|
||||
|
||||
/* Number compression has not been forgotten! - It's handled below */
|
||||
i = 0;
|
||||
|
@ -685,9 +685,9 @@ INTERNAL int maxicode(struct zint_symbol *symbol, struct zint_seg segs[], const
|
|||
maxi_do_secondary_chk_odd(maxi_codeword, eclen / 2); /* do error correction of odd */
|
||||
|
||||
if (debug_print) {
|
||||
printf("Codewords:");
|
||||
fputs("Codewords:", stdout);
|
||||
for (i = 0; i < 144; i++) printf(" %d", maxi_codeword[i]);
|
||||
printf("\n");
|
||||
fputc('\n', stdout);
|
||||
}
|
||||
#ifdef ZINT_TEST
|
||||
if (symbol->debug & ZINT_DEBUG_TEST) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue