mirror of
https://git.code.sf.net/p/zint/code
synced 2026-05-01 19:55:29 +00:00
DATAMATRIX: add new options DM_B256_START and DM_C40_START to
`options_3`, allowing forcing of Base 256 or C40 mode a la BWIPP for initial no. of characters specified in `option_1`, with 0 meaning all (CLI "--dmb256=" and "--dmc40=", GUI also (apart from MAILMARK_2D, which may be added later); export masks `DM_B256_C40_START_MASK` & `DM_SQUARE_DMRE_MASK` in "zint.h" ZBarcode_Encode_File: report filename (possibly truncated) in error message on failed open GUI: uniquify some accelerators and add some child widget getter helpers to "mainwindow.cpp" backend/DEVELOPER -> backend/README, with some expansion debian/copyright: a few more fixes BWIPP/pandoc: update to latest tests/fuzz: adjust for new DATAMATRIX options
This commit is contained in:
@@ -1380,8 +1380,16 @@ namespace Zint {
|
||||
}
|
||||
|
||||
if (m_symbol == BARCODE_DATAMATRIX || m_symbol == BARCODE_HIBC_DM) {
|
||||
if (option3() & DM_B256_C40_START_MASK) {
|
||||
arg_int(cmd, option3() & DM_B256_START ? "--dmb256=" : "--dmc40=", option1(), true /*allowZero*/);
|
||||
}
|
||||
arg_bool(cmd, "--dmiso144", (option3() & DM_ISO_144) == DM_ISO_144);
|
||||
arg_bool(cmd, "--dmre", (option3() & 0x7F) == DM_DMRE);
|
||||
arg_bool(cmd, "--dmre", (option3() & DM_SQUARE_DMRE_MASK) == DM_DMRE);
|
||||
} else if (m_symbol == BARCODE_MAILMARK_2D) {
|
||||
/* Accessing C40_START for MAILMARK_2D not currently in GUI but may be added later */
|
||||
if ((option3() & DM_B256_C40_START_MASK) == DM_C40_START) {
|
||||
arg_int(cmd, "--dmc40=", option1(), true /*allowZero*/);
|
||||
}
|
||||
}
|
||||
|
||||
if ((m_symbol == BARCODE_DOTCODE || (isDotty() && dotty())) && dotSize() != 0.8f) {
|
||||
@@ -1494,7 +1502,7 @@ namespace Zint {
|
||||
arg_bool(cmd, "--small", !notext && (fontSetting() & SMALL_TEXT));
|
||||
|
||||
if (m_symbol == BARCODE_DATAMATRIX || m_symbol == BARCODE_HIBC_DM) {
|
||||
arg_bool(cmd, "--square", (option3() & 0x7F) == DM_SQUARE);
|
||||
arg_bool(cmd, "--square", (option3() & DM_SQUARE_DMRE_MASK) == DM_SQUARE);
|
||||
}
|
||||
|
||||
if (supportsStructApp()) {
|
||||
|
||||
Reference in New Issue
Block a user