From 59116f689da64804a8e983a41183ee1b70b4b347 Mon Sep 17 00:00:00 2001 From: Robin Stuart Date: Tue, 6 Feb 2018 20:57:01 +0000 Subject: [PATCH] Add new symbology: Royal Mail Mailmark --- backend/CMakeLists.txt | 2 +- backend/library.c | 12 +- backend/mailmark.c | 635 +++++++++++++++++++++++++++++++++++++++++ backend/postal.c | 9 +- backend/zint.h | 3 + 5 files changed, 650 insertions(+), 11 deletions(-) create mode 100644 backend/mailmark.c diff --git a/backend/CMakeLists.txt b/backend/CMakeLists.txt index 9de4127f..ac93865a 100644 --- a/backend/CMakeLists.txt +++ b/backend/CMakeLists.txt @@ -6,7 +6,7 @@ find_package(PNG) set(zint_COMMON_SRCS common.c library.c render.c large.c reedsol.c gs1.c eci.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_POSTAL_SRCS postal.c auspost.c imail.c mailmark.c) set(zint_TWODIM_SRCS code16k.c codablock.c dmatrix.c pdf417.c qr.c maxicode.c composite.c aztec.c code49.c code1.c gridmtx.c hanxin.c dotcode.c) set(zint_OUTPUT_SRCS render.c ps.c svg.c emf.c bmp.c pcx.c gif.c png.c tif.c raster.c) set(zint_SRCS ${zint_OUTPUT_SRCS} ${zint_COMMON_SRCS} ${zint_ONEDIM_SRCS} ${zint_POSTAL_SRCS} ${zint_TWODIM_SRCS}) diff --git a/backend/library.c b/backend/library.c index f34388d2..a6596989 100644 --- a/backend/library.c +++ b/backend/library.c @@ -174,6 +174,7 @@ extern int upnqr(struct zint_symbol *symbol, const unsigned char source[], size_ extern int qr_code(struct zint_symbol *symbol, const unsigned char source[], size_t length); /* QR Code */ extern int dmatrix(struct zint_symbol *symbol, const unsigned char source[], const size_t in_length); /* Data Matrix (IEC16022) */ extern int vin(struct zint_symbol *symbol, const unsigned char source[], const size_t in_length); /* VIN Code (Vehicle Identification Number) */ +extern int mailmark(struct zint_symbol *symbol, const unsigned char source[], const size_t in_length); /* Royal Mail 4-state Mailmark */ extern int plot_raster(struct zint_symbol *symbol, int rotate_angle, int file_type); /* Plot to PNG/BMP/PCX */ extern int render_plot(struct zint_symbol *symbol, float width, float height); /* Plot to gLabels */ @@ -556,6 +557,7 @@ int ZBarcode_ValidID(int symbol_id) { case BARCODE_CODABLOCKF: case BARCODE_UPNQR: case BARCODE_VIN: + case BARCODE_MAILMARK: result = 1; break; } @@ -777,6 +779,8 @@ static int reduced_charset(struct zint_symbol *symbol, const unsigned char *sour break; case BARCODE_VIN: error_number = vin(symbol, preprocessed, in_length); break; + case BARCODE_MAILMARK: error_number = mailmark(symbol, preprocessed, in_length); + break; } return error_number; @@ -1028,9 +1032,11 @@ int ZBarcode_Encode(struct zint_symbol *symbol, const unsigned char *source, int symbol->symbology = BARCODE_DOTCODE; } if ((symbol->symbology >= 117) && (symbol->symbology <= 127)) { - strcpy(symbol->errtxt, "215: Symbology out of range, using Code 128"); - symbol->symbology = BARCODE_CODE128; - error_number = ZINT_WARN_INVALID_OPTION; + if (symbol->symbology != 121) { + strcpy(symbol->errtxt, "215: Symbology out of range, using Code 128"); + symbol->symbology = BARCODE_CODE128; + error_number = ZINT_WARN_INVALID_OPTION; + } } /* Everything from 128 up is Zint-specific */ if (symbol->symbology >= 144) { diff --git a/backend/mailmark.c b/backend/mailmark.c new file mode 100644 index 00000000..cbace0d2 --- /dev/null +++ b/backend/mailmark.c @@ -0,0 +1,635 @@ +/* mailmark.c - Royal Mail 4-state Mailmark barcodes */ + +/* + libzint - the open source barcode library + Copyright (C) 2008-2018 Robin Stuart + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. Neither the name of the project nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. + */ + +/* + * Developed in accordance with "Royal Mail Mailmark barcode C encoding and deconding instructions" + * (https://www.royalmail.com/sites/default/files/Mailmark-4-state-barcode-C-encoding-and-decoding-instructions-Sept-2015.pdf) + * and "Royal Mail Mailmark barcode L encoding and decoding" + * (https://www.royalmail.com/sites/default/files/Mailmark-4-state-barcode-L-encoding-and-decoding-instructions-Sept-2015.pdf) + * + */ + +#include +#include +#include +#ifdef _MSC_VER +#include +#endif +#include "common.h" +#include "large.h" +#include "reedsol.h" + +#define RUBIDIUM "01234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ " + +// Allowed character values from Table 3 +#define SET_F "ABCDEFGHIJKLMNOPQRSTUVWXYZ" +#define SET_L "ABDEFGHJLNPQRSTUWXYZ" +#define SET_N "0123456789" +#define SET_S " " + +static const char *postcode_format[6] = { + "FNFNLLNLS", "FFNNLLNLS", "FFNNNLLNL", "FFNFNLLNL", "FNNLLNLSS", "FNNNLLNLS" +}; + +// Data/Check Symbols from Table 5 +static const unsigned short data_symbol_odd[32] = { + 0x01, 0x02, 0x04, 0x07, 0x08, 0x0B, 0x0D, 0x0E, 0x10, 0x13, 0x15, 0x16, + 0x19, 0x1A, 0x1C, 0x1F, 0x20, 0x23, 0x25, 0x26, 0x29, 0x2A, 0x2C, 0x2F, + 0x31, 0x32, 0x34, 0x37, 0x38, 0x3B, 0x3D, 0x3E +}; + +static const unsigned short data_symbol_even[30] = { + 0x03, 0x05, 0x06, 0x09, 0x0A, 0x0C, 0x0F, 0x11, 0x12, 0x14, 0x17, 0x18, + 0x1B, 0x1D, 0x1E, 0x21, 0x22, 0x24, 0x27, 0x28, 0x2B, 0x2D, 0x2E, 0x30, + 0x33, 0x35, 0x36, 0x39, 0x3A, 0x3C +}; + +static const unsigned short extender_group_c[22] = { + 3, 5, 7, 11, 13, 14, 16, 17, 19, 0, 1, 2, 4, 6, 8, 9, 10, 12, 15, 18, 20, 21 +}; + +static const unsigned short extender_group_l[26] = { + 2, 5, 7, 8, 13, 14, 15, 16, 21, 22, 23, 0, 1, 3, 4, 6, 9, 10, 11, 12, 17, 18, 19, 20, 24, 25 +}; + +int verify_character(char input, char type) { + int val = 0; + + switch (type) { + case 'F': + val = posn(SET_F, input); + break; + case 'L': + val = posn(SET_L, input); + break; + case 'N': + val = posn(SET_N, input); + break; + case 'S': + val = posn(SET_S, input); + break; + } + + if (val == -1) { + return 0; + } else { + return 1; + } +} + +int verify_postcode(char* postcode, int type) { + int i; + char pattern[11]; + + strcpy(pattern, postcode_format[type - 1]); + + for (i = 0; i < 9; i++) { + if (!(verify_character(postcode[i], pattern[i]))) { + return 1; + } + } + + return 0; +} + +/* Royal Mail Mailmark */ +int mailmark(struct zint_symbol *symbol, unsigned char source[], int length) { + + char local_source[28]; + int format; + int version_id; + int class; + int supply_chain_id; + long item_id; + char postcode[10]; + int postcode_type; + char pattern[10]; + short int destination_postcode[112]; + short int a[112]; + short int b[112]; + short int temp[112]; + short int cdv[112]; + unsigned char data[25]; + int data_top, data_step; + unsigned char check[7]; + short int extender[27]; + char bar[80]; + int check_count; + int i, j; + + if ((length != 22) && (length != 26)) { + strcpy(symbol->errtxt, "Invalid length input"); + return ZINT_ERROR_INVALID_DATA; + } + + strcpy(local_source, (char*) source); + to_upper((unsigned char*) local_source); + + if (symbol->debug) { + printf("Producing Mailmark %s\n", local_source); + } + + if (is_sane(RUBIDIUM, (unsigned char *) local_source, length) != 0) { + strcpy(symbol->errtxt, "Invalid characters or format in input data"); + return ZINT_ERROR_INVALID_DATA; + } + + // Format is in the range 0-4 + format = ctoi(local_source[0]); + if ((format < 0) || (format > 4)) { + strcpy(symbol->errtxt, "Invalid format"); + return ZINT_ERROR_INVALID_DATA; + } + + // Version ID is in the range 1-4 + version_id = ctoi(local_source[1]) - 1; + if ((version_id < 0) || (version_id > 3)) { + strcpy(symbol->errtxt, "Invalid Version ID"); + return ZINT_ERROR_INVALID_DATA; + } + + // Class is in the range 0-9,A-E + class = ctoi(local_source[2]); + if ((class < 0) || (class > 14)) { + strcpy(symbol->errtxt, "Invalid Class"); + return ZINT_ERROR_INVALID_DATA; + } + + // Supply Chain ID is 2 digits for barcode C and 6 digits for barcode L + supply_chain_id = 0; + for (i = 3; i < (length - 17); i++) { + if ((local_source[i] >= '0') && (local_source[i] <= '9')) { + supply_chain_id *= 10; + supply_chain_id += ctoi(local_source[i]); + } else { + strcpy(symbol->errtxt, "Invalid Supply Chain ID"); + return ZINT_ERROR_INVALID_DATA; + } + } + + // Item ID is 8 digits + item_id = 0; + for (i = length - 17; i < (length - 9); i++) { + if ((local_source[i] >= '0') && (local_source[i] <= '9')) { + item_id *= 10; + item_id += (long) ctoi(local_source[i]); + } else { + strcpy(symbol->errtxt, "Invalid Item ID"); + return ZINT_ERROR_INVALID_DATA; + } + } + + // Seperate Destination Post Code plus DPS field + for (i = 0; i < 9; i++) { + postcode[i] = local_source[(length - 9) + i]; + } + postcode[9] = '\0'; + + // Detect postcode type + /* postcode_type is used to select which format of postcode + * + * 1 = FNFNLLNLS + * 2 = FFNNLLNLS + * 3 = FFNNNLLNL + * 4 = FFNFNLLNL + * 5 = FNNLLNLSS + * 6 = FNNNLLNLS + * 7 = International designation + */ + + postcode_type = 0; + if (strcmp(postcode, "XY11 ") == 0) { + postcode_type = 7; + } else { + if (postcode[7] == ' ') { + postcode_type = 5; + } else { + if (postcode[8] == ' ') { + // Types 1, 2 and 6 + if ((postcode[1] >= '0') && (postcode[1] <= '9')) { + if ((postcode[2] >= '0') && (postcode[2] <= '9')) { + postcode_type = 6; + } else { + postcode_type = 1; + } + } else { + postcode_type = 2; + } + } else { + // Types 3 and 4 + if ((postcode[3] >= '0') && (postcode[3] <= '9')) { + postcode_type = 3; + } else { + postcode_type = 4; + } + } + } + } + + // Verify postcode type + if (postcode_type != 7) { + if (verify_postcode(postcode, postcode_type) != 0) { + strcpy(symbol->errtxt, "Invalid postcode"); + return ZINT_ERROR_INVALID_DATA; + } + } + + // Convert postcode to internal user field + for (i = 0; i < 112; i++) { + destination_postcode[i] = 0; + a[i] = 0; + b[i] = 0; + } + + if (postcode_type != 7) { + strcpy(pattern, postcode_format[postcode_type - 1]); + + binary_load(b, "0", 1); + + for (i = 0; i < 9; i++) { + switch (pattern[i]) { + case 'F': + for (j = 0; j < 112; j++) { + temp[j] = b[j]; + } + + // b *= 26 + for (j = 1; j < 26; j++) { + binary_add(b, temp); + } + + binary_load(temp, "0", 1); + for (j = 0; j < 5; j++) { + if (posn(SET_F, postcode[i]) & (0x01 << j)) temp[j] = 1; + } + + binary_add(b, temp); + break; + case 'L': + for (j = 0; j < 112; j++) { + temp[j] = b[j]; + } + + // b *= 20 + for (j = 1; j < 20; j++) { + binary_add(b, temp); + } + + binary_load(temp, "0", 1); + for (j = 0; j < 5; j++) { + if (posn(SET_L, postcode[i]) & (0x01 << j)) temp[j] = 1; + } + + binary_add(b, temp); + break; + case 'N': + for (j = 0; j < 112; j++) { + temp[j] = b[j]; + } + + for (j = 1; j < 10; j++) { + // b *= 10 + binary_add(b, temp); + } + + binary_load(temp, "0", 1); + for (j = 0; j < 4; j++) { + if (posn(SET_N, postcode[i]) & (0x01 << j)) temp[j] = 1; + } + + binary_add(b, temp); + break; + // case 'S' ignorred as value is 0 + } + } + + // detination_postcode = a + b + binary_load(destination_postcode, "0", 1); + binary_add(destination_postcode, b); + + binary_load(a, "1", 1); + if (postcode_type == 1) { + binary_add(destination_postcode, a); + } + binary_load(temp, "5408000000", 10); + binary_add(a, temp); + if (postcode_type == 2) { + binary_add(destination_postcode, a); + } + binary_load(temp, "5408000000", 10); + binary_add(a, temp); + if (postcode_type == 3) { + binary_add(destination_postcode, a); + } + binary_load(temp, "54080000000", 11); + binary_add(a, temp); + if (postcode_type == 4) { + binary_add(destination_postcode, a); + } + binary_load(temp, "140608000000", 12); + binary_add(a, temp); + if (postcode_type == 5) { + binary_add(destination_postcode, a); + } + binary_load(temp, "208000000", 9); + binary_add(a, temp); + if (postcode_type == 6) { + binary_add(destination_postcode, a); + } + } + + // Conversion from Internal User Fields to Consolidated Data Value + // Set CDV to 0 + binary_load(cdv, "0", 1); + + // Add Destination Post Code plus DPS + binary_add(cdv, destination_postcode); + + // Multiply by 100,000,000 + for (i = 0; i < 8; i++) { + binary_load(temp, "0", 1); + binary_add(temp, cdv); + + for (j = 1; j < 10; j++) { + binary_add(cdv, temp); + } + } + + // Add Item ID + binary_load(temp, "0", 1); + for (i = 0; i < 38; i++) { + if (0x01 & (item_id >> i)) temp[i] = 1; + } + binary_add(cdv, temp); + + if (length == 22) { + // Barcode C - Multiply by 100 + for (i = 0; i < 2; i++) { + binary_load(temp, "0", 1); + binary_add(temp, cdv); + + for (j = 1; j < 10; j++) { + binary_add(cdv, temp); + } + } + } else { + // Barcode L - Multiply by 1,000,000 + for (i = 0; i < 6; i++) { + binary_load(temp, "0", 1); + binary_add(temp, cdv); + + for (j = 1; j < 10; j++) { + binary_add(cdv, temp); + } + } + } + + // Add Supply Chain ID + binary_load(temp, "0", 1); + for (i = 0; i < 20; i++) { + if (0x01 & (supply_chain_id >> i)) temp[i] = 1; + } + binary_add(cdv, temp); + + // Multiply by 15 + binary_load(temp, "0", 1); + binary_add(temp, cdv); + + for (j = 1; j < 15; j++) { + binary_add(cdv, temp); + } + + // Add Class + binary_load(temp, "0", 1); + for (i = 0; i < 4; i++) { + if (0x01 & (class >> i)) temp[i] = 1; + } + binary_add(cdv, temp); + + // Multiply by 5 + binary_load(temp, "0", 1); + binary_add(temp, cdv); + + for (j = 1; j < 5; j++) { + binary_add(cdv, temp); + } + + // Add Format + binary_load(temp, "0", 1); + for (i = 0; i < 4; i++) { + if (0x01 & (format >> i)) temp[i] = 1; + } + binary_add(cdv, temp); + + // Multiply by 4 + binary_load(temp, "0", 1); + binary_add(temp, cdv); + + for (j = 1; j < 4; j++) { + binary_add(cdv, temp); + } + + // Add Version ID + binary_load(temp, "0", 1); + for (i = 0; i < 4; i++) { + if (0x01 & (version_id >> i)) temp[i] = 1; + } + binary_add(cdv, temp); + + if (symbol->debug) { + printf("DPC type %d\n", postcode_type); + printf("CDV: "); + for (i = 96; i >= 0; i-= 4) { + j = 0; + + j += cdv[i]; + j += cdv[i + 1] * 2; + j += cdv[i + 2] * 4; + j += cdv[i + 3] * 8; + + printf("%c", itoc(j)); + } + printf("\n"); + } + + + if (length == 22) { + data_top = 15; + data_step = 8; + check_count = 6; + } else { + data_top = 18; + data_step = 10; + check_count = 7; + } + + // Conversion from Consolidated Data Value to Data Numbers + for (i = 0; i < 112; i++) { + b[i] = cdv[i]; + } + + for (j = data_top; j >= (data_step + 1); j--) { + for (i = 0; i < 112; i++) { + cdv[i] = b[i]; + b[i] = 0; + a[i] = 0; + } + a[96] = 1; + for (i = 91; i >= 0; i--) { + b[i] = islarger(cdv, a); + if (b[i] == 1) { + binary_subtract(cdv, a); + } + shiftdown(a); + } + + data[j] = (cdv[5] * 32) + (cdv[4] * 16) + (cdv[3] * 8) + (cdv[2] * 4) + + (cdv[1] * 2) + cdv[0]; + } + + for (j = data_step; j >= 0; j--) { + for (i = 0; i < 112; i++) { + cdv[i] = b[i]; + b[i] = 0; + a[i] = 0; + } + a[95] = 1; + a[94] = 1; + a[93] = 1; + a[92] = 1; + for (i = 91; i >= 0; i--) { + b[i] = islarger(cdv, a); + if (b[i] == 1) { + binary_subtract(cdv, a); + } + shiftdown(a); + } + + data[j] = (cdv[5] * 32) + (cdv[4] * 16) + (cdv[3] * 8) + (cdv[2] * 4) + + (cdv[1] * 2) + cdv[0]; + } + + // Generation of Reed-Solomon Check Numbers + rs_init_gf(0x25); + rs_init_code(check_count, 1); + rs_encode((data_top + 1), data, check); + rs_free(); + + // Append check digits to data + for (i = 1; i <= check_count; i++) { + data[data_top + i] = check[check_count - i]; + } + + if (symbol->debug) { + printf("Codewords: "); + for (i = 0; i <= data_top + check_count; i++) { + printf("%d ", (int) data[i]); + } + printf("\n"); + } + + // Conversion from Data Numbers and Check Numbers to Data Symbols and Check Symbols + for (i = 0; i <= data_step; i++) { + data[i] = data_symbol_even[data[i]]; + } + for (i = data_step + 1; i <= (data_top + check_count); i++) { + data[i] = data_symbol_odd[data[i]]; + } + + // Conversion from Data Symbols and Check Symbols to Extender Groups + for (i = 0; i < length; i++) { + if (length == 22) { + extender[extender_group_c[i]] = data[i]; + } else { + extender[extender_group_l[i]] = data[i]; + } + } + + // Conversion from Extender Groups to Bar Identifiers + strcpy(bar, ""); + + for (i = 0; i < length; i++) { + for (j = 0; j < 3; j++) { + switch(extender[i] & 0x24) { + case 0x24: + strcat(bar, "F"); + break; + case 0x20: + if (i % 2) { + strcat(bar, "D"); + } else { + strcat(bar, "A"); + } + break; + case 0x04: + if (i % 2) { + strcat(bar, "A"); + } else { + strcat(bar, "D"); + } + break; + default: + strcat(bar, "T"); + break; + } + extender[i] = extender[i] << 1; + } + } + + bar[(length * 3)] = '\0'; + + if (symbol->debug) { + printf("Bar pattern: %s\n", bar); + } + + /* Translate 4-state data pattern to symbol */ + j = 0; + for (i = 0; i < strlen(bar); i++) { + if ((bar[i] == 'F') || (bar[i] == 'A')) { + set_module(symbol, 0, j); + } + set_module(symbol, 1, j); + if ((bar[i] == 'F') || (bar[i] == 'D')) { + set_module(symbol, 2, j); + } + j += 2; + } + + symbol->row_height[0] = 3; + symbol->row_height[1] = 2; + symbol->row_height[2] = 3; + + symbol->rows = 3; + symbol->width = j - 1; + + return 0; +} diff --git a/backend/postal.c b/backend/postal.c index 13be8b57..08f0dbf9 100644 --- a/backend/postal.c +++ b/backend/postal.c @@ -531,15 +531,11 @@ int japan_post(struct zint_symbol *symbol, unsigned char source[], int length) { error_number = 0; strcpy(local_source, (char*) source); - for (i = 0; i < length; i++) { - local_source[i] = source[i]; - } to_upper((unsigned char*) local_source); - error_number = is_sane(SHKASUTSET, (unsigned char*) local_source, length); - if (error_number == ZINT_ERROR_INVALID_DATA) { + if (is_sane(SHKASUTSET, (unsigned char*) local_source, length) == ZINT_ERROR_INVALID_DATA) { strcpy(symbol->errtxt, "497: Invalid characters in data"); - return error_number; + return ZINT_ERROR_INVALID_DATA; } memset(inter, 'd', 20); /* Pad character CC4 */ inter[20] = '\0'; @@ -619,4 +615,3 @@ int japan_post(struct zint_symbol *symbol, unsigned char source[], int length) { return error_number; } - diff --git a/backend/zint.h b/backend/zint.h index 473dfc40..8f526221 100644 --- a/backend/zint.h +++ b/backend/zint.h @@ -185,6 +185,9 @@ extern "C" { /* Tbarcode 10 codes */ #define BARCODE_DOTCODE 115 #define BARCODE_HANXIN 116 + + /*Tbarcode 11 codes*/ +#define BARCODE_MAILMARK 121 /* Zint specific */ #define BARCODE_AZRUNE 128