diff --git a/CMakeLists.txt b/CMakeLists.txt index 6a420c07..9ae6684b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,11 +33,11 @@ IF(APPLE) IF(NOT ZINT_HAS_BEEN_RUN_BEFORE) IF(EXISTS /Developer/SDKs/MacOSX10.5.sdk OR EXISTS /SDKs/MacOSX10.5.sdk) SET(CMAKE_OSX_ARCHITECTURES "ppc;i386;ppc64;x86_64" CACHE STRING "Build architectures for OSX" FORCE) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden" CACHE STRING "Flags used by the compiler during all build types." FORCE) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden -Wl -single_module" CACHE STRING "Flags used by the compiler during all build types." FORCE) ELSE(EXISTS /Developer/SDKs/MacOSX10.5.sdk OR EXISTS /SDKs/MacOSX10.5.sdk) IF(EXISTS /Developer/SDKs/MacOSX10.4u.sdk OR EXISTS /SDKs/MacOSX10.4u.sdk) SET(CMAKE_OSX_ARCHITECTURES "ppc;i386" CACHE STRING "Build architectures for OSX" FORCE) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden" CACHE STRING "Flags used by the compiler during all build types." FORCE) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden -Wl -single_module" CACHE STRING "Flags used by the compiler during all build types." FORCE) ENDIF(EXISTS /Developer/SDKs/MacOSX10.4u.sdk OR EXISTS /SDKs/MacOSX10.4u.sdk) ENDIF(EXISTS /Developer/SDKs/MacOSX10.5.sdk OR EXISTS /SDKs/MacOSX10.5.sdk) message("Build architectures for OSX:${CMAKE_OSX_ARCHITECTURES}") diff --git a/backend/CMakeLists.txt b/backend/CMakeLists.txt index 385f015d..57a819ed 100644 --- a/backend/CMakeLists.txt +++ b/backend/CMakeLists.txt @@ -7,7 +7,7 @@ find_package(PNG) set(zint_COMMON_SRCS common.c library.c ps.c large.c reedsol.c gs1.c svg.c png.c) set(zint_ONEDIM_SRCS code.c code128.c 2of5.c upcean.c telepen.c medical.c plessey.c rss.c) set(zint_POSTAL_SRCS postal.c auspost.c imail.c) -set(zint_TWODIM_SRCS code16k.c blockf.c dmatrix.c dm200.c pdf417.c qr.c maxicode.c composite.c aztec.c code49.c code1.c gridmtx.c) +set(zint_TWODIM_SRCS code16k.c dmatrix.c dm200.c pdf417.c qr.c maxicode.c composite.c aztec.c code49.c code1.c gridmtx.c) set(zint_SRCS ${zint_COMMON_SRCS} ${zint_ONEDIM_SRCS} ${zint_POSTAL_SRCS} ${zint_TWODIM_SRCS} ) if(PNG_FOUND) diff --git a/backend/library.c b/backend/library.c index edb18759..eca39453 100644 --- a/backend/library.c +++ b/backend/library.c @@ -127,7 +127,7 @@ extern int code16k(struct zint_symbol *symbol, unsigned char source[], int lengt extern int pdf417enc(struct zint_symbol *symbol, unsigned char source[], int length); /* PDF417 */ extern int dmatrix(struct zint_symbol *symbol, unsigned char source[], int length); /* Data Matrix (IEC16022) */ extern int qr_code(struct zint_symbol *symbol, unsigned char source[], int length); /* QR Code */ -extern int micro_pdf417(struct zint_symbol *symbol, unsigned char source[], int length); /* Micro PDF417 */ +extern int micro_pdf417(struct zint_symbol *symbol, unsigned char chaine[], int length); /* Micro PDF417 */ extern int maxicode(struct zint_symbol *symbol, unsigned char source[], int length); /* Maxicode */ extern int rss14(struct zint_symbol *symbol, unsigned char source[], int length); /* RSS-14 */ extern int rsslimited(struct zint_symbol *symbol, unsigned char source[], int length); /* RSS Limited */ @@ -136,7 +136,6 @@ extern int composite(struct zint_symbol *symbol, unsigned char source[], int len extern int kix_code(struct zint_symbol *symbol, unsigned char source[], int length); /* TNT KIX Code */ extern int aztec(struct zint_symbol *symbol, unsigned char source[], int length); /* Aztec Code */ extern int code32(struct zint_symbol *symbol, unsigned char source[], int length); /* Italian Pharmacode */ -extern int codablock(struct zint_symbol *symbol, unsigned char source[], int length); /* Codablock F */ extern int daft_code(struct zint_symbol *symbol, unsigned char source[], int length); /* DAFT Code */ extern int ean_14(struct zint_symbol *symbol, unsigned char source[], int length); /* EAN-14 */ extern int nve_18(struct zint_symbol *symbol, unsigned char source[], int length); /* NVE-18 */ @@ -249,9 +248,6 @@ int hibc(struct zint_symbol *symbol, unsigned char source[], int length) case BARCODE_HIBC_MICPDF: error_number = micro_pdf417(symbol, (unsigned char *)to_process, length); break; - case BARCODE_HIBC_BLOCKF: - error_number = codablock(symbol, (unsigned char *)to_process, length); - break; case BARCODE_HIBC_AZTEC: error_number = aztec(symbol, (unsigned char *)to_process, length); break; @@ -283,7 +279,6 @@ int gs1_compliant(int symbology) case BARCODE_CODE16K: case BARCODE_AZTEC: case BARCODE_DATAMATRIX: - case BARCODE_CODABLOCKF: case BARCODE_CODEONE: case BARCODE_CODE49: case BARCODE_QRCODE: @@ -368,7 +363,6 @@ int ZBarcode_ValidID(int symbol_id) case BARCODE_HIBC_QR: case BARCODE_HIBC_PDF: case BARCODE_HIBC_MICPDF: - case BARCODE_HIBC_BLOCKF: case BARCODE_HIBC_AZTEC: case BARCODE_AZRUNE: case BARCODE_CODE32: @@ -500,7 +494,6 @@ int reduced_charset(struct zint_symbol *symbol, unsigned char *source, int lengt case BARCODE_RSS_EXPSTACK_CC: error_number = composite(symbol, preprocessed, length); break; case BARCODE_KIX: error_number = kix_code(symbol, preprocessed, length); break; case BARCODE_CODE32: error_number = code32(symbol, preprocessed, length); break; - case BARCODE_CODABLOCKF: error_number = codablock(symbol, preprocessed, length); break; case BARCODE_DAFT: error_number = daft_code(symbol, preprocessed, length); break; case BARCODE_EAN14: error_number = ean_14(symbol, preprocessed, length); break; case BARCODE_AZRUNE: error_number = aztec_runes(symbol, preprocessed, length); break; @@ -511,7 +504,6 @@ int reduced_charset(struct zint_symbol *symbol, unsigned char *source, int lengt case BARCODE_HIBC_QR: error_number = hibc(symbol, preprocessed, length); break; case BARCODE_HIBC_PDF: error_number = hibc(symbol, preprocessed, length); break; case BARCODE_HIBC_MICPDF: error_number = hibc(symbol, preprocessed, length); break; - case BARCODE_HIBC_BLOCKF: error_number = hibc(symbol, preprocessed, length); break; case BARCODE_HIBC_AZTEC: error_number = hibc(symbol, preprocessed, length); break; case BARCODE_JAPANPOST: error_number = japan_post(symbol, preprocessed, length); break; case BARCODE_CODE49: error_number = code_49(symbol, preprocessed, length); break; @@ -586,6 +578,7 @@ int ZBarcode_Encode(struct zint_symbol *symbol, unsigned char *source, int lengt if((symbol->symbology >= 113) && (symbol->symbology <= 127)) { strcpy(symbol->errtxt, "Symbology out of range, using Code 128"); symbol->symbology = BARCODE_CODE128; error_number = WARN_INVALID_OPTION; } /* Everything from 128 up is Zint-specific */ if(symbol->symbology >= 143) { strcpy(symbol->errtxt, "Symbology out of range, using Code 128"); symbol->symbology = BARCODE_CODE128; error_number = WARN_INVALID_OPTION; } + if((symbol->symbology == BARCODE_CODABLOCKF) || (symbol->symbology == BARCODE_HIBC_BLOCKF)) { strcpy(symbol->errtxt, "Codablock F not supported"); error_number = ERROR_INVALID_OPTION; } if(error_number > 4) { error_tag(symbol->errtxt, error_number); diff --git a/backend/pdf417.c b/backend/pdf417.c index 81cefe7c..99c7996c 100644 --- a/backend/pdf417.c +++ b/backend/pdf417.c @@ -30,7 +30,7 @@ symbol->option_2 is used to adjust the width of the resulting symbol (i.e. the number of codeword columns not including row start and end data) */ -/* @(#) $Id: pdf417.c,v 1.20 2009/12/21 08:42:49 hooper114 Exp $ */ +/* @(#) $Id: pdf417.c,v 1.21 2010/01/28 17:55:59 hooper114 Exp $ */ #include #include diff --git a/frontend/main.c b/frontend/main.c index d00ed427..3ca0292e 100644 --- a/frontend/main.c +++ b/frontend/main.c @@ -32,34 +32,34 @@ #define NESET "0123456789" void types(void) { - printf( " 1: Code 11 51: Pharma One-Track 89: ITF-14\n" - " 2: Standard 2of5 52: PZN 90: KIX Code\n" - " 3: Interleaved 2of5 53: Pharma Two-Track 92: Aztec Code\n" - " 4: IATA 2of5 55: PDF417 93: DAFT Code\n" - " 6: Data Logic 56: PDF417 Trunc 97: Micro QR Code\n" - " 7: Industrial 2of5 57: Maxicode 98: HIBC Code 128\n" - " 8: Code 39 58: QR Code 99: HIBC Code 39\n" - " 9: Extended Code 39 60: Code 128-B 102: HIBC Data Matrix\n" - "13: EAN 63: AP Standard Customer 104: HIBC QR Code\n" - "16: GS1-128 66: AP Reply Paid 106: HIBC PDF417\n" - "18: Codabar 67: AP Routing 108: HIBC MicroPDF417\n" - "20: Code 128 68: AP Redirection 110: HIBC Codablock-F\n" - "21: Leitcode 69: ISBN 112: HIBC Aztec Code\n" - "22: Identcode 70: RM4SCC 128: Aztec Runes\n" - "23: Code 16k 71: Data Matrix 129: Code 23\n" - "24: Code 49 72: EAN-14 130: Comp EAN\n" - "25: Code 93 74: Codablock-F 131: Comp GS1-128\n" - "28: Flattermarken 75: NVE-18 132: Comp Databar-14\n" - "29: Databar-14 76: Japanese Post 133: Comp Databar Ltd\n" - "30: Databar Limited 77: Korea Post 134: Comp Databar Ext\n" - "31: Databar Extended 79: Databar-14 Stack 135: Comp UPC-A\n" - "32: Telepen Alpha 80: Databar-14 Stack Omni 136: Comp UPC-E\n" - "34: UPC-A 81: Databar Extended Stack 137: Comp Databar-14 Stack\n" - "37: UPC-E 82: Planet 138: Comp Databar Stack Omni\n" - "40: Postnet 84: MicroPDF 139: Comp Databar Ext Stack\n" - "47: MSI Plessey 85: USPS OneCode 140: Channel Code\n" - "49: FIM 86: UK Plessey 141: Code One\n" - "50: Logmars 87: Telepen Numeric 142: Grid Matrix\n" + printf( " 1: Code 11 51: Pharma One-Track 90: KIX Code\n" + " 2: Standard 2of5 52: PZN 92: Aztec Code\n" + " 3: Interleaved 2of5 53: Pharma Two-Track 93: DAFT Code\n" + " 4: IATA 2of5 55: PDF417 97: Micro QR Code\n" + " 6: Data Logic 56: PDF417 Trunc 98: HIBC Code 128\n" + " 7: Industrial 2of5 57: Maxicode 99: HIBC Code 39\n" + " 8: Code 39 58: QR Code 102: HIBC Data Matrix\n" + " 9: Extended Code 39 60: Code 128-B 104: HIBC QR Code\n" + "13: EAN 63: AP Standard Customer 106: HIBC PDF417\n" + "16: GS1-128 66: AP Reply Paid 108: HIBC MicroPDF417\n" + "18: Codabar 67: AP Routing 112: HIBC Aztec Code\n" + "20: Code 128 68: AP Redirection 128: Aztec Runes\n" + "21: Leitcode 69: ISBN 129: Code 23\n" + "22: Identcode 70: RM4SCC 130: Comp EAN\n" + "23: Code 16k 71: Data Matrix 131: Comp GS1-128\n" + "24: Code 49 72: EAN-14 132: Comp Databar-14\n" + "25: Code 93 75: NVE-18 133: Comp Databar Ltd\n" + "28: Flattermarken 76: Japanese Post 134: Comp Databar Ext\n" + "29: Databar-14 77: Korea Post 135: Comp UPC-A\n" + "30: Databar Limited 79: Databar-14 Stack 136: Comp UPC-E\n" + "31: Databar Extended 80: Databar-14 Stack Omni 137: Comp Databar-14 Stack\n" + "32: Telepen Alpha 81: Databar Extended Stack 138: Comp Databar Stack Omni\n" + "34: UPC-A 82: Planet 139: Comp Databar Ext Stack\n" + "37: UPC-E 84: MicroPDF 140: Channel Code\n" + "40: Postnet 85: USPS OneCode 141: Code One\n" + "47: MSI Plessey 86: UK Plessey 142: Grid Matrix\n" + "49: FIM 87: Telepen Numeric\n" + "50: Logmars 89: ITF-14\n" ); } diff --git a/frontend/test.sh b/frontend/test.sh index d91c782d..c312339f 100755 --- a/frontend/test.sh +++ b/frontend/test.sh @@ -66,11 +66,11 @@ echo testing Code 128 zint -o bar20.png -b 20 --height=50 --border=10 -d 'Code 128' zint -o bar20.eps -b 20 --height=50 --border=10 -d 'Code 128' zint -o bar20.svg -b 20 --height=50 --border=10 -d 'Code 128' -echo testing Deutshe Post Leitcode +echo testing Deutsche Post Leitcode zint -o bar21.png -b 21 --height=50 --border=10 -d 3210987654321 zint -o bar21.eps -b 21 --height=50 --border=10 -d 3210987654321 zint -o bar21.svg -b 21 --height=50 --border=10 -d 3210987654321 -echo testing Deutche Post Identcode +echo testing Deutsche Post Identcode zint -o bar22.png -b 22 --height=50 --border=10 -d 10987654321 zint -o bar22.eps -b 22 --height=50 --border=10 -d 10987654321 zint -o bar22.svg -b 22 --height=50 --border=10 -d 10987654321 @@ -93,15 +93,15 @@ echo testing Flattermarken zint -o bar28.png -b 28 --height=50 --border=10 -d 87654321 zint -o bar28.eps -b 28 --height=50 --border=10 -d 87654321 zint -o bar28.svg -b 28 --height=50 --border=10 -d 87654321 -echo testing GS1 DataBar-14 +echo testing DataBar-14 zint -o bar29.png -b 29 --height=33 --border=10 -d 2001234567890 zint -o bar29.eps -b 29 --height=33 --border=10 -d 2001234567890 zint -o bar29.svg -b 29 --height=33 --border=10 -d 2001234567890 -echo testing GS1 DataBar Limited +echo testing DataBar Limited zint -o bar30.png -b 30 --height=50 --border=10 -w 2 -d 31234567890 zint -o bar30.eps -b 30 --height=50 --border=10 -w 2 -d 31234567890 zint -o bar30.svg -b 30 --height=50 --border=10 -w 2 -d 31234567890 -echo testing GS1 DataBar Expanded +echo testing DataBar Expanded zint -o bar31.png -b 31 --height=50 --border=10 -d "[01]90012345678908[3103]001750" zint -o bar31.eps -b 31 --height=50 --border=10 -d "[01]90012345678908[3103]001750" zint -o bar31.svg -b 31 --height=50 --border=10 -d "[01]90012345678908[3103]001750" @@ -258,19 +258,19 @@ echo testing Korea Post zint -o bar77.png -b 77 --height=50 --border=10 -d 123456 zint -o bar77.eps -b 77 --height=50 --border=10 -d 123456 zint -o bar77.svg -b 77 --height=50 --border=10 -d 123456 -echo testing GS1 DataBar Truncated +echo testing DataBar Truncated zint -o bar78.png -b 29 --height=13 --border=10 -d 1234567890 zint -o bar78.eps -b 29 --height=13 --border=10 -d 1234567890 zint -o bar78.svg -b 29 --height=13 --border=10 -d 1234567890 -echo testing GS1 DataBar Stacked +echo testing DataBar Stacked zint -o bar79.png -b 79 --border=10 -d 1234567890 zint -o bar79.eps -b 79 --border=10 -d 1234567890 zint -o bar79.svg -b 79 --border=10 -d 1234567890 -echo testing GS1 DataBar Stacked Omnidirectional +echo testing DataBar Stacked Omnidirectional zint -o bar80.png -b 80 --height=69 --border=10 -d 3456789012 zint -o bar80.eps -b 80 --height=69 --border=10 -d 3456789012 zint -o bar80.svg -b 80 --height=69 --border=10 -d 3456789012 -echo testing GS1 DataBar Expanded Stacked +echo testing DataBar Expanded Stacked zint -o bar81.png -b 81 --border=10 -d "[01]98898765432106[3202]012345[15]991231" zint -o bar81.eps -b 81 --border=10 -d "[01]98898765432106[3202]012345[15]991231" zint -o bar81.svg -b 81 --border=10 -d "[01]98898765432106[3202]012345[15]991231" @@ -380,15 +380,15 @@ echo testing UCC/EAN-128 Composite with CC-C zint -o bar131a.png -b 131 --height=100 --border=10 --mode=3 --primary="[00]030123456789012340" -d "[02]13012345678909[10]1234567ABCDEFG" zint -o bar131a.eps -b 131 --height=100 --border=10 --mode=3 --primary="[00]030123456789012340" -d "[02]13012345678909[10]1234567ABCDEFG" zint -o bar131a.svg -b 131 --height=100 --border=10 --mode=3 --primary="[00]030123456789012340" -d "[02]13012345678909[10]1234567ABCDEFG" -echo testing RSS-14 Composite with CC-A +echo testing DataBar-14 Composite with CC-A zint -o bar132.png -b 132 --height=100 --border=10 --mode=1 --primary=361234567890 -d "[11]990102" zint -o bar132.eps -b 132 --height=100 --border=10 --mode=1 --primary=361234567890 -d "[11]990102" zint -o bar132.svg -b 132 --height=100 --border=10 --mode=1 --primary=361234567890 -d "[11]990102" -echo testing RSS Limited Composite with CC-B +echo testing DataBar Limited Composite with CC-B zint -o bar133.png -b 133 --height=100 --border=10 --mode=2 --primary=351234567890 -d "[21]abcdefghijklmnopqrstuv" zint -o bar133.eps -b 133 --height=100 --border=10 --mode=2 --primary=351234567890 -d "[21]abcdefghijklmnopqrstuv" zint -o bar133.svg -b 133 --height=100 --border=10 --mode=2 --primary=351234567890 -d "[21]abcdefghijklmnopqrstuv" -echo testing RSS Expanded Composite with CC-A +echo testing DataBar Expanded Composite with CC-A zint -o bar134.png -b 134 --height=100 --border=10 --mode=1 --primary="[01]93712345678904[3103]001234" -d "[91]1A2B3C4D5E" zint -o bar134.eps -b 134 --height=100 --border=10 --mode=1 --primary="[01]93712345678904[3103]001234" -d "[91]1A2B3C4D5E" zint -o bar134.svg -b 134 --height=100 --border=10 --mode=1 --primary="[01]93712345678904[3103]001234" -d "[91]1A2B3C4D5E" @@ -400,15 +400,15 @@ echo testing UPC-E Composite with CC-A zint -o bar136.png -b 136 --height=100 --border=10 --mode=1 --primary=121230 -d "[15]021231" zint -o bar136.eps -b 136 --height=100 --border=10 --mode=1 --primary=121230 -d "[15]021231" zint -o bar136.svg -b 136 --height=100 --border=10 --mode=1 --primary=121230 -d "[15]021231" -echo testing RSS-14 Stacked Composite with CC-A +echo testing DataBar-14 Stacked Composite with CC-A zint -o bar137.png -b 137 --border=10 --mode=1 --primary=341234567890 -d "[17]010200" zint -o bar137.eps -b 137 --border=10 --mode=1 --primary=341234567890 -d "[17]010200" zint -o bar137.svg -b 137 --border=10 --mode=1 --primary=341234567890 -d "[17]010200" -echo testing RSS-14 Stacked Omnidirectional Composite with CC-A +echo testing DataBar-14 Stacked Omnidirectional Composite with CC-A zint -o bar138.png -b 138 --border=10 --mode=1 --primary=341234567890 -d "[17]010200" zint -o bar138.eps -b 138 --border=10 --mode=1 --primary=341234567890 -d "[17]010200" zint -o bar138.svg -b 138 --border=10 --mode=1 --primary=341234567890 -d "[17]010200" -echo testing RSS Expanded Stacked Composite with CC-A +echo testing DataBar Expanded Stacked Composite with CC-A zint -o bar139.png -b 139 --height=150 --border=10 --mode=1 --primary="[01]00012345678905[10]ABCDEF" -d "[21]12345678" zint -o bar139.eps -b 139 --height=150 --border=10 --mode=1 --primary="[01]00012345678905[10]ABCDEF" -d "[21]12345678" zint -o bar139.svg -b 139 --height=150 --border=10 --mode=1 --primary="[01]00012345678905[10]ABCDEF" -d "[21]12345678" diff --git a/frontend_qt4/mainwindow.cpp b/frontend_qt4/mainwindow.cpp index 883a8519..e1c7acce 100644 --- a/frontend_qt4/mainwindow.cpp +++ b/frontend_qt4/mainwindow.cpp @@ -39,7 +39,6 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags fl) "Aztec Runes", "Channel Code", "Codabar", - "Codablock-F", "Code 11", "Code 128 (ISO 15417)", "Code 16k", @@ -107,7 +106,7 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags fl) bstyle->addItem(metaObject()->enumerator(0).key(i)); bstyle->setItemText(i,bstyle_text[i]); } - bstyle->setCurrentIndex(10); + bstyle->setCurrentIndex(9); change_options(); update_preview(); view->scene()->addItem(&m_bc); @@ -346,19 +345,6 @@ void MainWindow::change_options() m_optionWidget->findChild("radC39HIBC")->setEnabled(true); } - if(metaObject()->enumerator(0).value(bstyle->currentIndex()) == BARCODE_CODABLOCKF) - { - QFile file(":/grpCodablock.ui"); - if (!file.open(QIODevice::ReadOnly)) - return; - m_optionWidget=uiload.load(&file); - file.close(); - tabMain->insertTab(1,m_optionWidget,tr("Codablock-F")); - connect(m_optionWidget->findChild("radCodaStand"), SIGNAL(clicked( bool )), SLOT(update_preview())); - connect(m_optionWidget->findChild("radCodaGS1"), SIGNAL(clicked( bool )), SLOT(update_preview())); - connect(m_optionWidget->findChild("radCodaHIBC"), SIGNAL(clicked( bool )), SLOT(update_preview())); - } - if(metaObject()->enumerator(0).value(bstyle->currentIndex()) == BARCODE_CODE16K) { QFile file(":/grpC16k.ui"); diff --git a/frontend_qt4/mainwindow.h b/frontend_qt4/mainwindow.h index ae83de3e..8c6078cc 100644 --- a/frontend_qt4/mainwindow.h +++ b/frontend_qt4/mainwindow.h @@ -46,7 +46,6 @@ public: AZRUNE =128, CHANNEL =140, CODABAR =18, - CODABLOCKF =74, CODE11 =1, CODE128 =20, CODE16K =23,