PDF417 no longer uses option_3 for no. codewords so set default 0 & remove from Studio

This commit is contained in:
gitlost 2019-12-19 20:29:11 +00:00
parent fa9af12fc6
commit b00b227b4f
9 changed files with 215 additions and 57 deletions

View file

@ -31,7 +31,6 @@ namespace Zint {
m_border = NO_BORDER;
m_borderWidth = 0;
m_securityLevel = -1;
m_pdf417CodeWords = 928;
m_fgColor = Qt::black;
m_bgColor = Qt::white;
m_zintSymbol = 0;
@ -72,11 +71,7 @@ namespace Zint {
} else {
m_zintSymbol->show_hrt = 1;
}
if (m_symbol == BARCODE_PDF417) {
m_zintSymbol->option_3 = m_pdf417CodeWords;
} else {
m_zintSymbol->option_3 = m_option_3;
}
m_zintSymbol->option_3 = m_option_3;
QByteArray bstr = m_text.toUtf8();
QByteArray pstr = m_primaryMessage.left(99).toLatin1();
strcpy(m_zintSymbol->primary, pstr.data());
@ -190,14 +185,6 @@ namespace Zint {
m_whitespace = whitespace;
}
int QZint::pdf417CodeWords() const {
return m_pdf417CodeWords;
}
void QZint::setPdf417CodeWords(int pdf417CodeWords) {
m_pdf417CodeWords = pdf417CodeWords;
}
int QZint::securityLevel() const {
return m_securityLevel;
}
@ -249,11 +236,7 @@ namespace Zint {
} else {
m_zintSymbol->show_hrt = 1;
}
if (m_symbol == BARCODE_PDF417) {
m_zintSymbol->option_3 = m_pdf417CodeWords;
} else {
m_zintSymbol->option_3 = m_option_3;
}
m_zintSymbol->option_3 = m_option_3;
m_zintSymbol->scale = m_scale;
QByteArray bstr = m_text.toUtf8();
QByteArray pstr = m_primaryMessage.left(99).toLatin1();