Merge branch 'master' of ssh://git.code.sf.net/p/zint/code

README

@@ -94,6 +94,18 @@ The default of the parameter changed from 3 to 0.
 Fixed bugs:
 Ticket 146, 165: fix wrong encoding of RSS composite codes
 
+Version 2.6.8 2019-11-17:
+Changes:
+- Automatic height option added to qzint
+- DotCode in line with new specification
+- New GS1 AIs 7240, 235, 417, 7040, 8026, updated checks for 7007, 8008
+
+Fixed bugs:
+- Many improvements in composite codes
+- SVG output corrected for messages containing "<" and "&".
+- GS1-128 and RSS may only be used with GS1 contents
+- Han Xin chinese character handling
+
 CONTACT US
 ----------
 The home of Zint is:

backend/gs1.c

@@ -75,16 +75,22 @@ int gs1_verify(struct zint_symbol *symbol, const unsigned char source[], const s
     char ai_string[7]; /* 6 char max "(NNNN)" */
     int bracket_level, max_bracket_level, ai_length, max_ai_length, min_ai_length;
     int ai_count;
+    int error_latch;
+#ifdef _MSC_VER
+    int *ai_value;
+    int *ai_location;
+    int *data_location;
+    int *data_length;
+#endif
     int ai_max = ustrchr_cnt(source, src_len, '[') + 1; /* Plus 1 so non-zero */
 #ifndef _MSC_VER
     int ai_value[ai_max], ai_location[ai_max], data_location[ai_max], data_length[ai_max];
 #else
-    int ai_value = (int*) _alloca(ai_max * sizeof(int));
+    ai_value = (int*) _alloca(ai_max * sizeof(int));
-    int ai_location = (int*) _alloca(ai_max * sizeof(int));
+    ai_location = (int*) _alloca(ai_max * sizeof(int));
-    int data_location = (int*) _alloca(ai_max * sizeof(int));
+    data_location = (int*) _alloca(ai_max * sizeof(int));
-    int data_length = (int*) _alloca(ai_max * sizeof(int));
+    data_length = (int*) _alloca(ai_max * sizeof(int));
 #endif
-    int error_latch;
 
     /* Detect extended ASCII characters */
     for (i = 0; i < src_len; i++) {

backend/svg.c

@@ -91,15 +91,20 @@ int svg_plot(struct zint_symbol *symbol) {
     const char *locale = NULL;
     float ax, ay, bx, by, cx, cy, dx, dy, ex, ey, fx, fy;
     float radius;
+    int i;
 
     struct zint_vector_rect *rect;
     struct zint_vector_hexagon *hex;
     struct zint_vector_circle *circle;
     struct zint_vector_string *string;
 
+#ifdef _MSC_VER
+    char* html_string;
+#endif
+
     int html_len = strlen((char *)symbol->text) + 1;
 
-    for (int i = 0; i < strlen((char *)symbol->text); i++) {
+    for (0; i < strlen((char *)symbol->text); i++) {
         switch(symbol->text[i]) {
             case '>':
             case '<':
@@ -114,7 +119,7 @@ int svg_plot(struct zint_symbol *symbol) {
 #ifndef _MSC_VER
     char html_string[html_len];
 #else
-    char* html_string = (unsigned char*) _alloca(html_len);
+    html_string = (char*) _alloca(html_len);
 #endif
 
     /* Check for no created vector set */

backend_qt/backend_qt.pro

@@ -89,6 +89,7 @@ SOURCES += ../backend/2of5.c \
            ../backend/dotcode.c \
            ../backend/eci.c \
            ../backend/emf.c \
+           ../backend/general_field.c \
            ../backend/gif.c \
            ../backend/gridmtx.c \
            ../backend/gs1.c \

backend_tcl/zint_tcl.dsp

@@ -156,6 +156,10 @@ SOURCE=..\backend\emf.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\backend\general_field.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\backend\gif.c
 # End Source File
 # Begin Source File

win32/zint_cmdline_vc6/zint_cmdline_vc6.dsp

@@ -152,6 +152,10 @@ SOURCE=..\..\backend\emf.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\backend\general_field.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\frontend\getopt.c
 # End Source File
 # Begin Source File