Seth/sethLabels
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Support libzint >= 2.15 (#225,#222,#186))

Browse Source 
- Update libzint support for 2.15 as new baseline version, removing support for earlier versions, avoiding '#ifdef'-hell
- Based on #186

---------

Co-authored-by: gitlost <burmartke@gmail.com>
This commit is contained in:
Jaye Evins
2025-08-16 17:00:14 -04:00
committed by GitHub
parent fa96cc5a17
commit 0e7049ed73
19 changed files with 957 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backends/barcode/Backends.cpp
+111 -43
View File
@@ -184,12 +184,17 @@ namespace glabels
glbarcode::Factory::registerType( "zint::ausrd", Zint::AusRD::create );
glbarcode::Factory::registerType( "zint::aztec", Zint::Aztec::create );
glbarcode::Factory::registerType( "zint::azrun", Zint::Azrun::create );
glbarcode::Factory::registerType( "zint::bc412", Zint::Bc412::create );
glbarcode::Factory::registerType( "zint::cepnet", Zint::Cepnet::create );
glbarcode::Factory::registerType( "zint::cbr", Zint::Cbr::create );
glbarcode::Factory::registerType( "zint::cblockf", Zint::Cblockf::create );
glbarcode::Factory::registerType( "zint::channel", Zint::Channel::create );
glbarcode::Factory::registerType( "zint::code1", Zint::Code1::create );
glbarcode::Factory::registerType( "zint::code11", Zint::Code11::create );
glbarcode::Factory::registerType( "zint::c16k", Zint::C16k::create );
glbarcode::Factory::registerType( "zint::c25m", Zint::C25m::create );
glbarcode::Factory::registerType( "zint::c25i", Zint::C25i::create );
glbarcode::Factory::registerType( "zint::c25ind", Zint::C25ind::create );
glbarcode::Factory::registerType( "zint::c25dl", Zint::C25dl::create );
glbarcode::Factory::registerType( "zint::code32", Zint::Code32::create );
glbarcode::Factory::registerType( "zint::code39", Zint::Code39::create );
@@ -202,10 +207,16 @@ namespace glabels
glbarcode::Factory::registerType( "zint::dmtx", Zint::Dmtx::create );
glbarcode::Factory::registerType( "zint::dpl", Zint::Dpl::create );
glbarcode::Factory::registerType( "zint::dpi", Zint::Dpi::create );
glbarcode::Factory::registerType( "zint::dotcode", Zint::Dotcode::create );
glbarcode::Factory::registerType( "zint::dpd", Zint::Dpd::create );
glbarcode::Factory::registerType( "zint::kix", Zint::Kix::create );
glbarcode::Factory::registerType( "zint::ean", Zint::Ean::create );
glbarcode::Factory::registerType( "zint::ean14", Zint::Ean14::create );
glbarcode::Factory::registerType( "zint::fim", Zint::Fim::create );
glbarcode::Factory::registerType( "zint::flat", Zint::Flat::create );
glbarcode::Factory::registerType( "zint::gmtx", Zint::Gmtx::create );
glbarcode::Factory::registerType( "zint::gs1-128", Zint::Gs1128::create );
glbarcode::Factory::registerType( "zint::hanxin", Zint::Hanxin::create );
glbarcode::Factory::registerType( "zint::rss14", Zint::Rss14::create );
glbarcode::Factory::registerType( "zint::rssltd", Zint::Rssltd::create );
glbarcode::Factory::registerType( "zint::rssexp", Zint::Rssexp::create );
@@ -218,6 +229,7 @@ namespace glabels
glbarcode::Factory::registerType( "zint::hibcqr", Zint::Hibcqr::create );
glbarcode::Factory::registerType( "zint::hibcpdf", Zint::Hibcpdf::create );
glbarcode::Factory::registerType( "zint::hibcmpdf", Zint::Hibcmpdf::create );
glbarcode::Factory::registerType( "zint::hibcblkf", Zint::Hibcblkf::create );
glbarcode::Factory::registerType( "zint::hibcaz", Zint::Hibcaz::create );
glbarcode::Factory::registerType( "zint::i25", Zint::I25::create );
glbarcode::Factory::registerType( "zint::isbn", Zint::Isbn::create );
@@ -238,13 +250,18 @@ namespace glabels
glbarcode::Factory::registerType( "zint::pharma2", Zint::Pharma2::create );
glbarcode::Factory::registerType( "zint::pzn", Zint::Pzn::create );
glbarcode::Factory::registerType( "zint::qr", Zint::Qr::create );
glbarcode::Factory::registerType( "zint::rmqr", Zint::Rmqr::create );
glbarcode::Factory::registerType( "zint::rm4", Zint::Rm4::create );
glbarcode::Factory::registerType( "zint::rm4sm", Zint::Rm4sm::create );
glbarcode::Factory::registerType( "zint::rm2dm", Zint::Rm2dm::create );
glbarcode::Factory::registerType( "zint::tele", Zint::Tele::create );
glbarcode::Factory::registerType( "zint::telex", Zint::Telex::create );
glbarcode::Factory::registerType( "zint::upc-a", Zint::UpcA::create );
glbarcode::Factory::registerType( "zint::upc-e", Zint::UpcE::create );
glbarcode::Factory::registerType( "zint::upus10", Zint::UpuS10::create );
glbarcode::Factory::registerType( "zint::usps", Zint::Usps::create );
glbarcode::Factory::registerType( "zint::pls", Zint::Pls::create );
glbarcode::Factory::registerType( "zint::vin", Zint::Vin::create );
registerStyle( "ausp", "zint", tr("Australia Post Standard"),
false, false, true, false, "12345678901234567890123", true, 23 );
@@ -261,38 +278,53 @@ namespace glabels
registerStyle( "aztec", "zint", tr("Aztec Code"),
false, false, true, false, "1234567890", true, 10 );
registerStyle( "azrun", "zint", tr("Aztec Rune"),
registerStyle( "azrun", "zint", tr("Aztec Runes"),
false, false, true, false, "255", true, 3 );
registerStyle( "bc412", "zint", tr("BC412 (SEMI TI-95)"),
true, true, true, false, "12345678", true, 8 );
registerStyle( "cepnet", "zint", tr("CEPNet (Brazilian Post)"),
false, false, true, false, "12345678", true, 8 );
registerStyle( "channel", "zint", tr("Channel Code"),
true, true, false, false, "00", true, 2 );
registerStyle( "cbr", "zint", tr("Codabar"),
true, true, true, false, "ABCDABCDAB", true, 10 );
true, true, true, true, "A00000000B", true, 10 );
registerStyle( "cblockf", "zint", tr("Codablock-F"),
false, false, true, false, "0000000000", true, 10 );
registerStyle( "code1", "zint", tr("Code One"),
false, false, true, false, "0000000000", true, 10 );
registerStyle( "code11", "zint", tr("Code 11"),
true, true, true, false, "0000000000", true, 10 );
true, true, true, true, "0000000000", true, 10 );
registerStyle( "c16k", "zint", tr("Code 16K"),
false, false, true, false, "0000000000", true, 10 );
registerStyle( "c25m", "zint", tr("Code 2 of 5 Matrix"),
true, true, true, false, "0000000000", true, 10 );
registerStyle( "c25m", "zint", tr("Code 2 of 5 Standard"),
true, true, true, true, "0000000000", true, 10 );
registerStyle( "c25i", "zint", tr("Code 2 of 5 IATA"),
true, true, true, false, "0000000000", true, 10 );
true, true, true, true, "0000000000", true, 10 );
registerStyle( "c25ind", "zint", tr("Code 2 of 5 Industrial"),
true, true, true, true, "0000000000", true, 10 );
registerStyle( "c25dl", "zint", tr("Code 2 of 5 Data Logic"),
true, true, true, false, "0000000000", true, 10 );
true, true, true, true, "0000000000", true, 10 );
registerStyle( "code32", "zint", tr("Code 32 (Italian Pharmacode)"),
true, true, true, false, "12345678", true, 8 );
registerStyle( "code39", "zint", tr("Code 39"),
true, true, false, false, "0000000000", true, 10 );
true, true, true, true, "0000000000", true, 10 );
registerStyle( "code39e", "zint", tr("Code 39 Extended"),
true, true, true, false, "0000000000", true, 10 );
true, true, true, true, "0000000000", true, 10 );
registerStyle( "code49", "zint", tr("Code 49"),
false, false, true, false, "0000000000", true, 10 );
@@ -317,36 +349,54 @@ namespace glabels
registerStyle( "dpi", "zint", tr("Deutsche Post Identcode"),
true, true, true, false, "12345678901", true, 11 );
registerStyle( "kix", "zint", tr("Dutch Post KIX Code"),
registerStyle( "dotcode", "zint", tr("DotCode"),
false, false, true, false, "0000000000", true, 10 );
registerStyle( "dpd", "zint", tr("DPD Code"),
true, true, true, false, "000000000000000000000000000", true, 27 );
registerStyle( "kix", "zint", tr("Dutch Post KIX Code"),
false, false, false, false, "0000000000", true, 10 );
registerStyle( "ean", "zint", tr("EAN"),
true, true, true, false, "123456789012", false, 12 );
registerStyle( "ean14", "zint", tr("EAN-14"),
true, true, true, false, "1234567890123", false, 13 );
registerStyle( "fim", "zint", tr("FIM (Facing ID Mark)"),
false, false, false, false, "A", false, 1 );
registerStyle( "flat", "zint", tr("Flattermarken"),
false, false, false, false, "11111111", false, 8 );
registerStyle( "gmtx", "zint", tr("Grid Matrix"),
false, false, true, false, "0000000000", true, 10 );
registerStyle( "gs1-128", "zint", tr("GS1-128"),
true, true, true, false, "[01]12345678901234", false, 18 );
true, true, true, false, "[01]12345678901231", false, 18 );
registerStyle( "rss14", "zint", tr("GS1 DataBar-14"),
registerStyle( "rss14", "zint", tr("GS1 DataBar Omnidirectional"),
true, true, true, false, "1234567890123", true, 13 );
registerStyle( "rssltd", "zint", "GS1 DataBar-14 Limited",
registerStyle( "rssltd", "zint", "GS1 DataBar Limited",
true, true, true, false, "1234567890123", true, 13 );
registerStyle( "rssexp", "zint", "GS1 DataBar Extended",
true, true, true, false, "[01]12345678901234", false, 18 );
registerStyle( "rssexp", "zint", "GS1 DataBar Expanded",
true, true, true, false, "[01]12345678901231", false, 18 );
registerStyle( "rsss", "zint", tr("GS1 DataBar-14 Stacked"),
registerStyle( "rsss", "zint", tr("GS1 DataBar Stacked"),
false, false, true, false, "0000000000", true, 10 );
registerStyle( "rssso", "zint", tr("GS1 DataBar-14 Stacked Omni."),
registerStyle( "rssso", "zint", tr("GS1 DataBar Stacked Omni."),
false, false, true, false, "0000000000", true, 10 );
registerStyle( "rssse", "zint", tr("GS1 DataBar Extended Stacked"),
false, false, true, false, "[01]12345678901234", false, 18 );
registerStyle( "rssse", "zint", tr("GS1 DataBar Expanded Stacked"),
false, false, true, false, "[01]12345678901231", false, 18 );
registerStyle( "hanxin", "zint", tr("Han Xin"),
false, false, true, false, "0000000000", true, 10 );
registerStyle( "hibc128", "zint", tr("HIBC Code 128"),
true, true, true, false, "0000000000", true, 10 );
@@ -363,14 +413,17 @@ namespace glabels
registerStyle( "hibcpdf", "zint", tr("HIBC PDF417"),
false, false, true, false, "0000000000", true, 10 );
registerStyle( "hibcmpdf", "zint", tr("HIBC Micro PDF417"),
registerStyle( "hibcmpdf", "zint", tr("HIBC MicroPDF417"),
false, false, true, false, "0000000000", true, 10 );
registerStyle( "hibcblkf", "zint", tr("HIBC Codablock-F"),
false, false, true, false, "0000000000", true, 10 );
registerStyle( "hibcaz", "zint", tr("HIBC Aztec Code"),
true, true, true, false, "0000000000", true, 10 );
false, false, true, false, "0000000000", true, 10 );
registerStyle( "i25", "zint", tr("Interleaved 2 of 5"),
true, true, true, false, "0000000000", true, 10 );
true, true, true, true, "0000000000", true, 10 );
registerStyle( "isbn", "zint", tr("ISBN"),
true, true, true, false, "123456789", false, 9 );
@@ -385,67 +438,82 @@ namespace glabels
true, true, true, false, "123456", false, 6 );
registerStyle( "logm", "zint", tr("LOGMARS"),
true, true, true, false, "0000000000", true, 10 );
true, true, true, true, "0000000000", true, 10 );
registerStyle( "maxi", "zint", tr("Maxicode"),
false, false, false, false, "0000000000", true, 10 );
false, false, true, false, "0000000000", true, 10 );
registerStyle( "mpdf", "zint", tr("Micro PDF417"),
registerStyle( "mpdf", "zint", tr("MicroPDF417"),
false, false, true, false, "0000000000", true, 10 );
registerStyle( "mqr", "zint", tr("Micro QR Code"),
false, false, true, false, "0000000000", true, 10 );
registerStyle( "msi", "zint", tr("MSI Plessey"),
true, true, true, false, "0000000000", true, 10 );
true, true, true, true, "0000000000", true, 10 );
registerStyle( "nve", "zint", tr("NVE-18"),
registerStyle( "nve", "zint", tr("NVE-18 (SSCC-18)"),
true, true, true, false, "12345678901234567", false, 17 );
registerStyle( "pdf", "zint", tr("PDF417"),
false, false, true, false, "0000000000", true, 10 );
registerStyle( "pdft", "zint", tr("PDF417 Truncated"),
registerStyle( "pdft", "zint", tr("PDF417 Compact"),
false, false, true, false, "0000000000", true, 10 );
registerStyle( "plan", "zint", tr("PLANET"),
false, false, true, false, "0000000000", true, 10 );
false, false, true, false, "00000000000", true, 11 );
registerStyle( "postnet", "zint", tr("PostNet"),
true, true, true, false, "0000000000", true, 10 );
registerStyle( "postnet", "zint", tr("POSTNET"),
false, false, true, false, "00000000000", true, 11 );
registerStyle( "pharma", "zint", tr("Pharmacode"),
false, false, true, false, "123456", false, 6 );
false, false, false, false, "123456", false, 6 );
registerStyle( "pharma2", "zint", tr("Pharmacode 2-track"),
false, false, true, false, "12345678", false, 8 );
false, false, false, false, "12345678", false, 8 );
registerStyle( "pzn", "zint", tr("Pharmazentral Nummer (PZN)"),
true, true, true, false, "123456", false, 6 );
registerStyle( "pzn", "zint", tr("Pharmazentralnummer (PZN)"),
true, true, true, false, "1234567", false, 7 );
registerStyle( "qr", "zint", tr("QR Code"),
true, true, true, false, "0000000000", true, 10 );
registerStyle( "rm4", "zint", tr("Royal Mail 4-State"),
false, false, true, false, "0000000000", true, 10 );
registerStyle( "rmqr", "zint", tr("rMQR (Rectangular Micro QR)"),
false, false, true, false, "0000000000", true, 10 );
registerStyle( "rm4", "zint", tr("Royal Mail 4-State Customer"),
false, false, true, false, "0000000000", true, 10 );
registerStyle( "rm4sm", "zint", tr("Royal Mail 4-State Mailmark"),
false, false, true, false, "01000000000000000AA00AA0A", true, 25 );
registerStyle( "rm2dm", "zint", tr("Royal Mail 2-D Mailmark"),
false, false, true, false, "012100123412345678AB19XY1A 0", true, 28 );
registerStyle( "tele", "zint", tr("Telepen"),
true, true, true, false, "0000000000", true, 10 );
registerStyle( "telex", "zint", tr("Telepen Numeric"),
true, true, true, false, "0000000000", true, 10 );
registerStyle( "pls", "zint", tr("UK Plessey"),
true, true, true, false, "0000000000", true, 10 );
registerStyle( "upc-a", "zint", tr("UPC-A"),
true, true, true, false, "12345678901", false, 11 );
registerStyle( "upc-e", "zint", tr("UPC-E"),
true, true, true, false, "1234567", false, 7 );
registerStyle( "usps", "zint", tr("USPS One Code"),
registerStyle( "upus10", "zint", tr("UPU S10"),
true, true, true, false, "EE876543216CA", false, 13 );
registerStyle( "usps", "zint", tr("USPS Intelligent Mail"),
false, false, true, false, "12345678901234567890", true, 20 );
registerStyle( "pls", "zint", tr("UK Plessey"),
true, true, true, false, "0000000000", true, 10 );
registerStyle( "vin", "zint", tr("VIN (Vehicle ID Number)"),
true, true, true, false, "12345678701234567", false, 27 );
#endif // HAVE_ZINT
}