mirror of
https://git.code.sf.net/p/zint/code
synced 2025-05-12 22:25:59 -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
|
@ -74,14 +74,17 @@ extern "C" {
|
|||
|
||||
extern int assertionFailed;
|
||||
extern int assertionNum;
|
||||
extern struct zint_symbol **assertionPPSymbol;
|
||||
extern const char *assertionFilename;
|
||||
|
||||
#if defined(_MSC_VER) && _MSC_VER < 1900 /* MSVC 2015 */
|
||||
#define testStart(__arg__) (testStartReal("", __arg__))
|
||||
#define testStart(name) (testStartReal("", name, NULL))
|
||||
#define testStartSymbol(name, pp_symbol) (testStartReal("", name, pp_symbol))
|
||||
#else
|
||||
#define testStart(__arg__) (testStartReal(__func__, __arg__))
|
||||
#define testStart(name) (testStartReal(__func__, name, NULL))
|
||||
#define testStartSymbol(name, pp_symbol) (testStartReal(__func__, name, pp_symbol))
|
||||
#endif
|
||||
void testStartReal(const char *func, const char *name);
|
||||
void testStartReal(const char *func, const char *name, struct zint_symbol **pp_symbol);
|
||||
void testFinish(void);
|
||||
void testSkip(const char *msg);
|
||||
void testReport(void);
|
||||
|
@ -111,17 +114,18 @@ void assert_equal(int e1, int e2, const char *fmt, ...);
|
|||
void assert_equalu64(uint64_t e1, uint64_t e2, const char *fmt, ...);
|
||||
void assert_notequal(int e1, int e2, const char *fmt, ...);
|
||||
#else
|
||||
#define assert_exp(__exp__, ...) \
|
||||
{ assertionNum++; if (!(__exp__)) { assertionFailed++; printf("%s:%d ", assertionFilename, __LINE__); \
|
||||
printf(__VA_ARGS__); testFinish(); return; } }
|
||||
#define assert_exp(exp, ...) \
|
||||
{ assertionNum++; if (!(exp)) { assertionFailed++; printf("%s:%d ", assertionFilename, __LINE__); \
|
||||
printf(__VA_ARGS__); testFinish(); \
|
||||
if (assertionPPSymbol) { ZBarcode_Delete(*assertionPPSymbol); assertionPPSymbol = NULL; } return; } }
|
||||
|
||||
#define assert_zero(__exp__, ...) assert_exp((__exp__) == 0, __VA_ARGS__)
|
||||
#define assert_nonzero(__exp__, ...) assert_exp((__exp__) != 0, __VA_ARGS__)
|
||||
#define assert_null(__ptr__, ...) assert_exp((__ptr__) == NULL, __VA_ARGS__)
|
||||
#define assert_nonnull(__ptr__, ...) assert_exp((__ptr__) != NULL, __VA_ARGS__)
|
||||
#define assert_equal(__e1__, __e2__, ...) assert_exp((__e1__) == (__e2__), __VA_ARGS__)
|
||||
#define assert_zero(exp, ...) assert_exp((exp) == 0, __VA_ARGS__)
|
||||
#define assert_nonzero(exp, ...) assert_exp((exp) != 0, __VA_ARGS__)
|
||||
#define assert_null(ptr, ...) assert_exp((ptr) == NULL, __VA_ARGS__)
|
||||
#define assert_nonnull(ptr, ...) assert_exp((ptr) != NULL, __VA_ARGS__)
|
||||
#define assert_equal(e1, e2, ...) assert_exp((e1) == (e2), __VA_ARGS__)
|
||||
#define assert_equalu64 assert_equal
|
||||
#define assert_notequal(__e1__, __e2__, ...) assert_exp((__e1__) != (__e2__), __VA_ARGS__)
|
||||
#define assert_notequal(e1, e2, ...) assert_exp((e1) != (e2), __VA_ARGS__)
|
||||
#endif
|
||||
|
||||
#define TU(p) ((unsigned char *) (p))
|
||||
|
@ -158,6 +162,8 @@ char *testUtilUCharArrayDump(unsigned char *array, int size, char *dump, int dum
|
|||
void testUtilBitmapPrint(const struct zint_symbol *symbol, const char *prefix, const char *postfix);
|
||||
int testUtilBitmapCmp(const struct zint_symbol *symbol, const char *expected, int *row, int *column);
|
||||
|
||||
void testUtilVectorPrint(const struct zint_symbol *symbol);
|
||||
|
||||
int testUtilDataPath(char *buffer, int buffer_size, const char *subdir, const char *filename);
|
||||
FILE *testUtilOpen(const char *filename, const char *mode);
|
||||
int testUtilExists(const char *filename);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue