Add enhanced metafile format (EMF) support

backend/CMakeLists.txt

@@ -8,7 +8,7 @@ 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_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 bmp.c pcx.c gif.c png.c raster.c)
+set(zint_OUTPUT_SRCS render.c ps.c svg.c emf.c bmp.c pcx.c gif.c png.c raster.c)
 set(zint_SRCS ${zint_OUTPUT_SRCS} ${zint_COMMON_SRCS} ${zint_ONEDIM_SRCS} ${zint_POSTAL_SRCS} ${zint_TWODIM_SRCS})
 
 if(PNG_FOUND)

backend/emf.h

@@ -0,0 +1,216 @@
+/*  emf.h - header structure for Microsoft EMF
+
+    libzint - the open source barcode library
+    Copyright (C) 2016 Robin Stuart <rstuart114@gmail.com>
+
+    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.
+ */
+
+#ifndef EMF_H
+#define	EMF_H
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+#ifdef _MSC_VER
+#include <windows.h>
+#include "stdint_msvc.h"
+#else
+#include <stdint.h>
+#endif
+    
+#pragma pack(1)
+    
+    typedef struct rect_l {
+        int32_t left;
+        int32_t top;
+        int32_t right;
+        int32_t bottom;
+    } rect_l_t;
+    
+    typedef struct size_l {
+        uint32_t cx;
+        uint32_t cy;
+    } size_l_t;
+    
+    typedef struct point_l {
+        int32_t x;
+        int32_t y;
+    } point_l_t;
+    
+    typedef struct color_ref {
+        uint8_t red;
+        uint8_t green;
+        uint8_t blue;
+        uint8_t reserved;
+    } color_ref_t;
+    
+    typedef struct log_brush_ex {
+        uint32_t brush_style;
+        color_ref_t color;
+        uint32_t brush_hatch;
+    } log_brush_ex_t;
+    
+    typedef struct log_pen {
+        uint32_t pen_style;
+        point_l_t width;
+        color_ref_t color_ref;
+    } log_pen_t;
+    
+    typedef struct log_font {
+        int32_t height;
+        int32_t width;
+        int32_t escapement;
+        int32_t orientation;
+        int32_t weight;
+        uint8_t italic;
+        uint8_t underline;
+        uint8_t strike_out;
+        uint8_t char_set;
+        uint8_t out_precision;
+        uint8_t clip_precision;
+        uint8_t quality;
+        uint8_t pitch_and_family;
+        unsigned char facename[64];
+    } log_font_t;
+    
+    typedef struct emr_text {
+        point_l_t reference;
+        uint32_t chars;
+        uint32_t off_string;
+        uint32_t options;
+        rect_l_t rectangle;
+        uint32_t off_dx;
+    } emr_text_t;
+    
+    typedef struct emf_header {
+        rect_l_t bounds;
+        rect_l_t frame;
+        uint32_t record_signature;
+        uint32_t version;
+        uint32_t bytes;
+        uint32_t records;
+        uint16_t handles;
+        uint16_t reserved;
+        uint32_t n_description;
+        uint32_t off_description;
+        uint32_t n_pal_entries;
+        size_l_t device;
+        size_l_t millimeters;
+    } emf_header_t;
+    
+    typedef struct emr_header {
+        uint32_t type;
+        uint32_t size;
+        emf_header_t emf_header;
+    } emr_header_t;
+    
+    typedef struct emr_createbrushindirect {
+        uint32_t type;
+        uint32_t size;
+        uint32_t ih_brush;
+        log_brush_ex_t log_brush;
+    } emr_createbrushindirect_t;
+    
+    typedef struct emr_createpen {
+        uint32_t type;
+        uint32_t size;
+        uint32_t ih_pen;
+        log_pen_t log_pen;
+    } emr_createpen_t;
+    
+    typedef struct emr_selectobject {
+        uint32_t type;
+        uint32_t size;
+        uint32_t ih_object;
+    } emr_selectobject_t;
+    
+    typedef struct emr_rectangle {
+        uint32_t type;
+        uint32_t size;
+        rect_l_t box;
+    } emr_rectangle_t;
+    
+    typedef struct emr_ellipse {
+        uint32_t type;
+        uint32_t size;
+        rect_l_t box;
+    } emr_ellipse_t;
+    
+    typedef struct emr_polygon {
+        uint32_t type;
+        uint32_t size;
+        rect_l_t bounds;
+        uint32_t count;
+        point_l_t a_points_a;
+        point_l_t a_points_b;
+        point_l_t a_points_c;
+        point_l_t a_points_d;
+        point_l_t a_points_e;
+        point_l_t a_points_f;
+    } emr_polygon_t;
+    
+    typedef struct emr_extcreatefontindirectw {
+        uint32_t type;
+        uint32_t size;
+        uint32_t ih_fonts;
+        log_font_t elw;
+    } emr_extcreatefontindirectw_t;
+    
+    typedef struct emr_exttextoutw {
+        uint32_t type;
+        uint32_t size;
+        rect_l_t bounds;
+        uint32_t i_graphics_mode;
+        float ex_scale;
+        float ey_scale;
+        emr_text_t w_emr_text;
+    } emr_exttextoutw_t;
+    
+    typedef struct emr_eof {
+        uint32_t type;
+        uint32_t size;
+        uint32_t n_pal_entries;
+        uint32_t off_pal_entries;
+        uint32_t size_last;
+    } emr_eof_t;
+    
+    typedef struct box {
+        emr_rectangle_t top;
+        emr_rectangle_t bottom;
+        emr_rectangle_t left;
+        emr_rectangle_t right;
+    } box_t;
+    
+#pragma pack()
+
+#ifdef	__cplusplus
+}
+#endif
+
+#endif	/* EMF_H */
+

backend/library.c

@@ -209,6 +209,7 @@ extern int plot_raster(struct zint_symbol *symbol, int rotate_angle, int file_ty
 extern int render_plot(struct zint_symbol *symbol, float width, float height); /* Plot to gLabels */
 extern int ps_plot(struct zint_symbol *symbol); /* Plot to EPS */
 extern int svg_plot(struct zint_symbol *symbol); /* Plot to SVG */
+extern int emf_plot(struct zint_symbol *symbol); /* Plot to Metafile */
 
 void error_tag(char error_string[], int error_number) {
     char error_buffer[100];
@@ -1130,6 +1131,9 @@ int ZBarcode_Print(struct zint_symbol *symbol, int rotate_angle) {
         } else
             if (!(strcmp(output, "SVG"))) {
             error_number = svg_plot(symbol);
+        } else
+            if (!(strcmp(output, "EMF"))) {
+            error_number = emf_plot(symbol);
         } else {
             strcpy(symbol->errtxt, "Unknown output format (B25)");
             error_tag(symbol->errtxt, ZINT_ERROR_INVALID_OPTION);

backend/svg.c

@@ -316,7 +316,7 @@ int svg_plot(struct zint_symbol *symbol) {
             row_posn += yoffset;
 
             if (symbol->output_options & BARCODE_DOTTY_MODE) {
-                /* Use (currently undocumented) dot mode - see SF ticket #29 */
+                /* Use dot mode */
                 for (i = 0; i < symbol->width; i++) {
                     if (module_is_set(symbol, this_row, i)) {
                         fprintf(fsvg, "      <circle cx=\"%.2f\" cy=\"%.2f\" r=\"%.2f\" fill=\"#%s\" />\n", ((i + xoffset) * scaler) + (scaler / 2.0), (row_posn * scaler) + (scaler / 2.0), (symbol->dot_size / 2.0) * scaler, symbol->fgcolour);

backend/zint.h

@@ -240,6 +240,8 @@ extern "C" {
 #define	OUT_BMP_FILE        120
 #define OUT_GIF_FILE        140
 #define OUT_PCX_FILE        160
+#define OUT_JPG_FILE        180
+#define OUT_TIF_FILE        200
 
 #if defined(__WIN32__) || defined(_WIN32) || defined(WIN32) || defined(_MSC_VER)
 #if defined (DLL_EXPORT) || defined(PIC) || defined(_USRDLL)