Mirrors/zint
1
0
Fork 0
mirror of https://git.code.sf.net/p/zint/code synced 2025-12-20 03:17:12 +00:00
Code Issues Projects Releases Wiki Activity

EAN/UPC: add quiet zone indicators option (API output_options

Browse Source 
`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:
gitlost
2023-06-12 01:25:55 +01:00
parent 6d015d6a8f
commit 607e4ed33a
395 changed files with 11528 additions and 23016 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
backend/ultra.c
View File

@@ -1,7 +1,7 @@
/* ultra.c - Ultracode */
/*
libzint - the open source barcode library
Copyright (C) 2020-2022 Robin Stuart <rstuart114@gmail.com>
Copyright (C) 2020-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
@@ -592,7 +592,7 @@ static float ult_look_ahead_c43(const unsigned char source[], const int length,
if (debug_print) {
printf("C43 codewords %.*s: (%d)", length, source + in_locn, subcodeword_count);
for (i = 0; i < subcodeword_count; i++) printf( " %d", subcw[i]);
printf("\n");
fputc('\n', stdout);
}
letters_encoded = sublocn - in_locn;
@@ -998,7 +998,7 @@ INTERNAL int ultra(struct zint_symbol *symbol, struct zint_seg segs[], const int
for (i = 0; i < data_cw_count; i++) {
printf(" %d", data_codewords[i]);
}
printf("\n");
fputc('\n', stdout);
}
#ifdef ZINT_TEST
if (symbol->debug & ZINT_DEBUG_TEST) {
@@ -1052,7 +1052,7 @@ INTERNAL int ultra(struct zint_symbol *symbol, struct zint_seg segs[], const int
printf(", SCR1: %d, SCR2: %d", scr[1], scr[2]);
}
}
printf("\n");
fputc('\n', stdout);
}
/* Maximum capacity is 282 codewords */
@@ -1102,7 +1102,7 @@ INTERNAL int ultra(struct zint_symbol *symbol, struct zint_seg segs[], const int
for (i = 0; i < qcc; i++) {
printf(" %d", data_codewords[(282 - qcc) + i]);
}
printf("\n");
fputc('\n', stdout);
}
/* Rearrange to make final codeword sequence */
@@ -1128,11 +1128,11 @@ INTERNAL int ultra(struct zint_symbol *symbol, struct zint_seg segs[], const int
codeword[locn++] = qcc; /* QCC */
if (debug_print) {
printf("Rearranged codewords with ECC:\n");
fputs("Rearranged codewords with ECC:\n", stdout);
for (i = 0; i < locn; i++) {
printf("%d ", codeword[i]);
printf(" %d", codeword[i]);
}
printf("\n");
fputc('\n', stdout);
}
total_height = (rows * 6) + 1;
@@ -1228,7 +1228,7 @@ INTERNAL int ultra(struct zint_symbol *symbol, struct zint_seg segs[], const int
for (i = 0; i < (total_height * total_width); i++) {
printf("%c", pattern[i]);
if ((i + 1) % total_width == 0) {
printf("\n");
fputc('\n', stdout);
}
}
}