mirror of
https://git.code.sf.net/p/zint/code
synced 2025-05-20 18:25:12 -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
|
@ -2,7 +2,7 @@
|
|||
|
||||
/*
|
||||
libzint - the open source barcode library
|
||||
Copyright (C) 2008-2022 Robin Stuart <rstuart114@gmail.com>
|
||||
Copyright (C) 2008-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
|
||||
|
@ -38,7 +38,7 @@
|
|||
extern "C" {
|
||||
#endif /* __cplusplus */
|
||||
|
||||
typedef struct { uint64_t lo; uint64_t hi; } large_int;
|
||||
typedef struct { uint64_t lo; uint64_t hi; } large_uint;
|
||||
|
||||
#define large_lo(s) ((s)->lo)
|
||||
#define large_hi(s) ((s)->hi)
|
||||
|
@ -49,24 +49,35 @@ typedef struct { uint64_t lo; uint64_t hi; } large_int;
|
|||
/* Set 128-bit `t` from 64-bit `s` */
|
||||
#define large_load_u64(t, s) do { (t)->lo = (s); (t)->hi = 0; } while (0)
|
||||
|
||||
INTERNAL void large_load_str_u64(large_int *t, const unsigned char *s, const int length);
|
||||
/* Convert decimal string `s` of (at most) length `length` to 64-bit and place in 128-bit `t` */
|
||||
INTERNAL void large_load_str_u64(large_uint *t, const unsigned char *s, const int length);
|
||||
|
||||
INTERNAL void large_add(large_int *t, const large_int *s);
|
||||
INTERNAL void large_add_u64(large_int *t, const uint64_t s);
|
||||
/* Add 128-bit `s` to 128-bit `t` */
|
||||
INTERNAL void large_add(large_uint *t, const large_uint *s);
|
||||
/* Add 64-bit `s` to 128-bit `t` */
|
||||
INTERNAL void large_add_u64(large_uint *t, const uint64_t s);
|
||||
|
||||
INTERNAL void large_sub_u64(large_int *t, const uint64_t s);
|
||||
/* Subtract 64-bit `s` from 128-bit `t` */
|
||||
INTERNAL void large_sub_u64(large_uint *t, const uint64_t s);
|
||||
|
||||
INTERNAL void large_mul_u64(large_int *t, const uint64_t s);
|
||||
/* Multiply 128-bit `t` by 64-bit `s` */
|
||||
INTERNAL void large_mul_u64(large_uint *t, const uint64_t s);
|
||||
|
||||
INTERNAL uint64_t large_div_u64(large_int *t, uint64_t v);
|
||||
/* Divide 128-bit dividend `t` by 64-bit divisor `v`, returning 64-bit remainder */
|
||||
INTERNAL uint64_t large_div_u64(large_uint *t, uint64_t v);
|
||||
|
||||
INTERNAL void large_unset_bit(large_int *t, const int bit);
|
||||
/* Unset a bit (zero-based) */
|
||||
INTERNAL void large_unset_bit(large_uint *t, const int bit);
|
||||
|
||||
INTERNAL void large_uint_array(const large_int *t, unsigned int *uint_array, const int size, int bits);
|
||||
INTERNAL void large_uchar_array(const large_int *t, unsigned char *uchar_array, const int size, int bits);
|
||||
/* Output large_uint into an unsigned int array of size `size`, each element containing `bits` bits */
|
||||
INTERNAL void large_uint_array(const large_uint *t, unsigned int *uint_array, const int size, int bits);
|
||||
/* As `large_uint_array()` above, except output to unsigned char array */
|
||||
INTERNAL void large_uchar_array(const large_uint *t, unsigned char *uchar_array, const int size, int bits);
|
||||
|
||||
INTERNAL char *large_dump(const large_int *t, char *buf);
|
||||
INTERNAL void large_print(const large_int *t);
|
||||
/* Format large_uint into buffer, which should be at least 35 chars in size */
|
||||
INTERNAL char *large_dump(const large_uint *t, char *buf);
|
||||
/* Output formatted large_uint to stdout */
|
||||
INTERNAL void large_print(const large_uint *t);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue