mirror of
https://git.code.sf.net/p/zint/code
synced 2025-05-24 03:56:56 -04:00
Add compliant height, using ZINT_COMPLIANT_HEIGHT flag for back-compatibility
Rename barcode funcs to same as BARCODE_XXX name library: barcode funcs array for dispatch, used for ZBarcode_ValidID() also general: change is_sane() comparison to nonzero from ZINT_ERROR_INVALID_OPTION MAILMARK: fuller error messages CODABAR: add option to show check character in HRT zint.h: use 0xNNNN for OR-able defines GUI: add guard descent height reset button, add Zint version to window title, static get_zint_version() method, use QStringLiteral (QSL shorthand), use SIGNAL(toggled()), add errtxt "popup" and status bar, add icons, add saveAs shortcut, add main menu, context menus and actions, add help, reset_view() -> reset_colours(), add copy to clipboard as EMF/GIF/PNG/TIF, lessen triggering of update_preview(), shorten names of getters/setters, simplify/shorten some update_preview() logic in switch, CODEONE disable structapp for Version S qzint.cpp: add on_errored signal, add missing getters, add test
This commit is contained in:
parent
206ae26d20
commit
72eac41c34
82 changed files with 5570 additions and 3774 deletions
|
@ -406,11 +406,11 @@ INTERNAL int set_height(struct zint_symbol *symbol, const float min_row_height,
|
|||
|
||||
if (zero_count) {
|
||||
if (symbol->height) {
|
||||
row_height = (symbol->height - fixed_height) / zero_count;
|
||||
row_height = stripf((symbol->height - fixed_height) / zero_count);
|
||||
} else if (default_height) {
|
||||
row_height = default_height / zero_count;
|
||||
row_height = stripf(default_height / zero_count);
|
||||
} else {
|
||||
row_height = min_row_height;
|
||||
row_height = stripf(min_row_height);
|
||||
}
|
||||
if (row_height < 0.5f) { /* Absolute minimum */
|
||||
row_height = 0.5f;
|
||||
|
@ -421,9 +421,9 @@ INTERNAL int set_height(struct zint_symbol *symbol, const float min_row_height,
|
|||
strcpy(symbol->errtxt, "247: Height not compliant with standards");
|
||||
}
|
||||
}
|
||||
symbol->height = row_height * zero_count + fixed_height;
|
||||
symbol->height = stripf(row_height * zero_count + fixed_height);
|
||||
} else {
|
||||
symbol->height = fixed_height; /* Ignore any given height */
|
||||
symbol->height = stripf(fixed_height); /* Ignore any given height */
|
||||
}
|
||||
if (max_height && symbol->height > max_height) {
|
||||
error_number = ZINT_WARN_NONCOMPLIANT;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue