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

Thanks to work being done at SF!

backend/emf.c

@@ -1015,7 +1015,7 @@ int emf_plot(struct zint_symbol *symbol) {
     if (symbol->output_options & BARCODE_STDOUT) {
         emf_file = stdout;
     } else {
-        emf_file = fopen(symbol->outfile, "w");
+        emf_file = fopen(symbol->outfile, "wb");
     }
     if (emf_file == NULL) {
         strcpy(symbol->errtxt, "640: Could not open output file");

backend/tif.c

@@ -294,10 +294,5 @@ int tif_pixel_plot(struct zint_symbol *symbol, char *pixelbuf) {
         fclose(tif_file);
     }
 
-#ifdef _MSC_VER
-    free(strip_offset);
-    free(strip_bytes);
-#endif
-
     return 0;
 }

backend_qt/backend_qt.pro

@@ -96,6 +96,7 @@ SOURCES += ../backend/2of5.c \
            ../backend/imail.c \
            ../backend/large.c \
            ../backend/library.c \
+           ../backend/mailmark.c \
            ../backend/maxicode.c \
            ../backend/medical.c \
            ../backend/pcx.c \

backend_tcl/zint.c

@@ -50,6 +50,9 @@
  2017-10-23 2.6.2 HaO
 -	Framework 2.6.2 bugfixes
 -   Allow dll unload
+ 2018-02-13 2.6.3 HaO
+ -	Framework trunk update
+ -	Added VIN and MailMark symbologies.
 */
 
 #if defined(__WIN32__) || defined(_WIN32) || defined(WIN32)
@@ -159,6 +162,7 @@ static char *s_code_list[] = {
     "RM4SCC",
     "Datamatrix",
     "EAN14",
+	"VIN",
     "CodablockF",
     "NVE18",
     "JapanPost",
@@ -186,6 +190,7 @@ static char *s_code_list[] = {
     "HIBCAztec",
 	"DotCode",
 	"HanXin",
+	"MailMark",
     "AztecRunes",
     "Code32",
     "EAN-CC",
@@ -252,6 +257,7 @@ static int s_code_number[] = {
     BARCODE_RM4SCC,
     BARCODE_DATAMATRIX,
     BARCODE_EAN14,
+	BARCODE_VIN,
     BARCODE_CODABLOCKF,
     BARCODE_NVE18,
     BARCODE_JAPANPOST,
@@ -279,6 +285,7 @@ static int s_code_number[] = {
     BARCODE_HIBC_AZTEC,
 	BARCODE_DOTCODE,
 	BARCODE_HANXIN,
+	BARCODE_MAILMARK,
     BARCODE_AZRUNE,
     BARCODE_CODE32,
     BARCODE_EANX_CC,

backend_tcl/zint_tcl.dsp

@@ -184,6 +184,10 @@ SOURCE=..\backend\library.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\backend\mailmark.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\backend\maxicode.c
 # End Source File
 # Begin Source File

win32/zint_cmdline_vc6/zint_cmdline_vc6.dsp

@@ -188,6 +188,10 @@ SOURCE=..\..\backend\library.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\backend\mailmark.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\frontend\main.c
 # End Source File
 # Begin Source File