Mirrors/zint
1
0
Fork 0
mirror of https://git.code.sf.net/p/zint/code synced 2025-12-18 02:17:06 +00:00
Code Issues Projects Releases Wiki Activity

- GS1: fix square brackets treated as FNC1 in GS1PARENS_MODE by

Browse Source 
changing internal FNC1 marker '[' -> '\x1D' (GS), ticket #319,
  props Moli Sojet;
  also fix non-AI square brackets -> round brackets in GS1_128 HRT
- BWIPP: update to latest
This commit is contained in:
gitlost
2024-07-11 00:35:13 +01:00
parent 7246d67175
commit fb3b3001aa
25 changed files with 352 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
backend/dotcode.c
View File

@@ -1,7 +1,7 @@
/* dotcode.c - Handles DotCode */
/*
libzint - the open source barcode library
Copyright (C) 2017-2023 Robin Stuart <rstuart114@gmail.com>
Copyright (C) 2017-2024 Robin Stuart <rstuart114@gmail.com>
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
@@ -658,8 +658,8 @@ static int dc_encode_message(struct zint_symbol *symbol, const unsigned char sou
continue;
}
if (dc_datum_c(source, length, position) || (source[position] == '[' && gs1)) {
if (source[position] == '[') {
if (dc_datum_c(source, length, position) || (gs1 && source[position] == '\x1D')) {
if (source[position] == '\x1D') {
codeword_array[ap++] = 107; /* FNC1 */
position++;
} else {
@@ -747,7 +747,7 @@ static int dc_encode_message(struct zint_symbol *symbol, const unsigned char sou
}
/* Step D2 */
if ((source[position] == '[') && gs1) {
if (gs1 && source[position] == '\x1D') {
codeword_array[ap++] = 107; /* FNC1 */
position++;
if (debug_print) fputs("D2/1 ", stdout);
@@ -841,7 +841,7 @@ static int dc_encode_message(struct zint_symbol *symbol, const unsigned char sou
}
/* Step E2 */
if ((source[position] == '[') && gs1) {
if (gs1 && source[position] == '\x1D') {
/* Note: this branch probably never reached as no reason to be in Code Set A for GS1 data */
codeword_array[ap++] = 107; /* FNC1 */
position++;