mirror of
https://git.code.sf.net/p/zint/code
synced 2025-12-20 03:17:12 +00: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:
@@ -1,7 +1,7 @@
|
||||
/* hanxin.c - Han Xin Code */
|
||||
/*
|
||||
libzint - the open source barcode library
|
||||
Copyright (C) 2009-2022 Robin Stuart <rstuart114@gmail.com>
|
||||
Copyright (C) 2009-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
|
||||
@@ -548,7 +548,7 @@ static void hx_calculate_binary(char binary[], const char mode[], const unsigned
|
||||
bp = bin_append_posn(1, 4, binary, bp);
|
||||
|
||||
if (debug_print) {
|
||||
printf("Numeric\n");
|
||||
fputs("Numeric\n", stdout);
|
||||
}
|
||||
|
||||
count = 0; /* Suppress gcc -Wmaybe-uninitialized */
|
||||
@@ -604,7 +604,7 @@ static void hx_calculate_binary(char binary[], const char mode[], const unsigned
|
||||
bp = bin_append_posn(2, 4, binary, bp);
|
||||
|
||||
if (debug_print) {
|
||||
printf("Text\n");
|
||||
fputs("Text\n", stdout);
|
||||
}
|
||||
|
||||
submode = 1;
|
||||
@@ -618,7 +618,7 @@ static void hx_calculate_binary(char binary[], const char mode[], const unsigned
|
||||
bp = bin_append_posn(62, 6, binary, bp);
|
||||
submode = hx_getsubmode(ddata[i + position]);
|
||||
if (debug_print) {
|
||||
printf("SWITCH ");
|
||||
fputs("SWITCH ", stdout);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -640,7 +640,7 @@ static void hx_calculate_binary(char binary[], const char mode[], const unsigned
|
||||
bp = bin_append_posn(63, 6, binary, bp);
|
||||
|
||||
if (debug_print) {
|
||||
printf("\n");
|
||||
fputs("\n", stdout);
|
||||
}
|
||||
break;
|
||||
case 'b':
|
||||
@@ -670,7 +670,7 @@ static void hx_calculate_binary(char binary[], const char mode[], const unsigned
|
||||
}
|
||||
|
||||
if (debug_print) {
|
||||
printf("\n");
|
||||
fputs("\n", stdout);
|
||||
}
|
||||
break;
|
||||
case '1':
|
||||
@@ -766,7 +766,7 @@ static void hx_calculate_binary(char binary[], const char mode[], const unsigned
|
||||
bp = bin_append_posn(6, 4, binary, bp);
|
||||
|
||||
if (debug_print) {
|
||||
printf("Double byte\n");
|
||||
fputs("Double byte\n", stdout);
|
||||
}
|
||||
|
||||
i = 0;
|
||||
@@ -795,13 +795,13 @@ static void hx_calculate_binary(char binary[], const char mode[], const unsigned
|
||||
- confirmed by Wang Yi */
|
||||
|
||||
if (debug_print) {
|
||||
printf("\n");
|
||||
fputc('\n', stdout);
|
||||
}
|
||||
break;
|
||||
case 'f':
|
||||
/* Four-byte encoding */
|
||||
if (debug_print) {
|
||||
printf("Four byte\n");
|
||||
fputs("Four byte\n", stdout);
|
||||
}
|
||||
|
||||
i = 0;
|
||||
@@ -830,7 +830,7 @@ static void hx_calculate_binary(char binary[], const char mode[], const unsigned
|
||||
/* No terminator */
|
||||
|
||||
if (debug_print) {
|
||||
printf("\n");
|
||||
fputc('\n', stdout);
|
||||
}
|
||||
break;
|
||||
}
|
||||
@@ -1454,7 +1454,7 @@ static void hx_apply_bitmask(unsigned char *grid, const int size, const int vers
|
||||
if (!user_mask) {
|
||||
for (pattern = 0; pattern < 4; pattern++) printf(" %d:%d", pattern, penalty[pattern]);
|
||||
}
|
||||
printf("\n");
|
||||
fputc('\n', stdout);
|
||||
}
|
||||
|
||||
/* Apply mask */
|
||||
@@ -1645,11 +1645,11 @@ INTERNAL int hanxin(struct zint_symbol *symbol, struct zint_seg segs[], const in
|
||||
}
|
||||
|
||||
if (debug_print) {
|
||||
printf("Datastream (%d): ", data_codewords);
|
||||
printf("Datastream (%d):", data_codewords);
|
||||
for (i = 0; i < data_codewords; i++) {
|
||||
printf("%.2x ", datastream[i]);
|
||||
printf(" %.2x", datastream[i]);
|
||||
}
|
||||
printf("\n");
|
||||
fputc('\n', stdout);
|
||||
}
|
||||
#ifdef ZINT_TEST
|
||||
if (symbol->debug & ZINT_DEBUG_TEST) debug_test_codeword_dump(symbol, datastream, data_codewords);
|
||||
@@ -1660,11 +1660,11 @@ INTERNAL int hanxin(struct zint_symbol *symbol, struct zint_seg segs[], const in
|
||||
hx_add_ecc(fullstream, datastream, data_codewords, version, ecc_level);
|
||||
|
||||
if (debug_print) {
|
||||
printf("Fullstream (%d): ", hx_total_codewords[version - 1]);
|
||||
printf("Fullstream (%d):", hx_total_codewords[version - 1]);
|
||||
for (i = 0; i < hx_total_codewords[version - 1]; i++) {
|
||||
printf("%.2x ", fullstream[i]);
|
||||
printf(" %.2x", fullstream[i]);
|
||||
}
|
||||
printf("\n");
|
||||
fputc('\n', stdout);
|
||||
}
|
||||
|
||||
hx_make_picket_fence(fullstream, picket_fence, hx_total_codewords[version - 1]);
|
||||
|
||||
Reference in New Issue
Block a user