mirrors/zint
2
0
Fork 0
mirror of https://github.com/zint/zint synced 2024-11-16 20:57:25 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Always parse input as GS1 for EAN128 and RSS_EXP

Browse Source
This commit is contained in:
gitlost
2019-10-17 10:06:21 +01:00
parent b1113db942
commit 739793a215
13 changed files with 549 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
backend/rss.c
View File

@ -29,6 +29,7 @@
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.
*/
/* vim: set ts=4 sw=4 et : */
/* The functions "combins" and "getRSSwidths" are copyright BSI and are
released with permission under the following terms:
@ -1865,14 +1866,20 @@ int rssexpanded(struct zint_symbol *symbol, unsigned char source[], int src_len)
int check_char, c_odd, c_even, elements[235], pattern_width, reader, writer;
int separator_row;
#ifndef _MSC_VER
char binary_string[(7 * src_len) + 1];
char reduced[src_len + 1], binary_string[(7 * src_len) + 1];
#else
char* reduced = (char*) _alloca(src_len + 1);
char* binary_string = (char*) _alloca((7 * src_len) + 1);
#endif
separator_row = 0;
reader = 0;
i = gs1_verify(symbol, source, src_len, reduced);
if (i != 0) {
return i;
}
if ((symbol->symbology == BARCODE_RSS_EXP_CC) || (symbol->symbology == BARCODE_RSS_EXPSTACK_CC)) {
/* make space for a composite separator pattern */
separator_row = symbol->rows;
@ -1888,7 +1895,7 @@ int rssexpanded(struct zint_symbol *symbol, unsigned char source[], int src_len)
strcat(binary_string, "0");
}
i = rss_binary_string(symbol, (char *) source, binary_string);
i = rss_binary_string(symbol, reduced, binary_string);
if (i != 0) {
return i;
}