Remove depreciated gLabels render code

backend/CMakeLists.txt

@@ -8,7 +8,7 @@ set(zint_COMMON_SRCS common.c library.c large.c reedsol.c gs1.c eci.c general_fi
 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 mailmark.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 ultra.c)
-set(zint_OUTPUT_SRCS vector.c render.c ps.c svg.c emf.c bmp.c pcx.c gif.c png.c tif.c raster.c)
+set(zint_OUTPUT_SRCS vector.c ps.c svg.c emf.c bmp.c pcx.c gif.c png.c tif.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/library.c

@@ -78,7 +78,6 @@ struct zint_symbol *ZBarcode_Create() {
     return symbol;
 }
 
-extern void render_free(struct zint_symbol *symbol); /* Free render structures */
 extern void vector_free(struct zint_symbol *symbol); /* Free vector structures */
 
 void ZBarcode_Clear(struct zint_symbol *symbol) {
@@ -101,7 +100,6 @@ void ZBarcode_Clear(struct zint_symbol *symbol) {
     symbol->bitmap_height = 0;
 
     // If there is a rendered version, ensure its memory is released
-    render_free(symbol);
     vector_free(symbol);
 }
 
@@ -110,7 +108,6 @@ void ZBarcode_Delete(struct zint_symbol *symbol) {
         free(symbol->bitmap);
 
     // If there is a rendered version, ensure its memory is released
-    render_free(symbol);
     vector_free(symbol);
 
     free(symbol);
@@ -185,8 +182,6 @@ extern int ultracode(struct zint_symbol *symbol, const unsigned char source[], c
 extern int plot_raster(struct zint_symbol *symbol, int rotate_angle, int file_type); /* Plot to PNG/BMP/PCX */
 extern int plot_vector(struct zint_symbol *symbol, int rotate_angle, int file_type); /* Plot to EPS/EMF/SVG */
 
-extern int render_plot(struct zint_symbol *symbol, float width, float height); /* Plot to gLabels - depreciated */
-
 void error_tag(char error_string[], int error_number) {
 
     if (error_number != 0) {
@@ -385,7 +380,7 @@ static void check_row_heights(struct zint_symbol *symbol) {
 
 static int check_force_gs1(const int symbology) {
     /* Returns 1 if symbology MUST have GS1 data */
-    
+
     int result = is_composite(symbology);
 
     switch (symbology) {
@@ -397,7 +392,7 @@ static int check_force_gs1(const int symbology) {
             result = 1;
             break;
     }
-    
+
     return result;
 }
 
@@ -449,7 +444,7 @@ static int is_matrix(const int symbology) {
 
 static int is_linear(const int symbology) {
     /* Returns 1 if symbology is linear (1 dimensional) */
-    
+
     int result = 0;
     switch (symbology) {
         case BARCODE_CODE11:
@@ -506,7 +501,7 @@ static int is_linear(const int symbology) {
             result = 1;
             break;
     }
-    
+
     return result;
 }
 
@@ -673,7 +668,7 @@ static int reduced_charset(struct zint_symbol *symbol, const unsigned char *sour
 #else
     unsigned char* preprocessed = (unsigned char*) _alloca(in_length + 1);
 #endif
-    
+
     if (symbol->symbology == BARCODE_CODE16K) {
         symbol->whitespace_width = 16;
         symbol->border_width = 2;
@@ -689,7 +684,7 @@ static int reduced_charset(struct zint_symbol *symbol, const unsigned char *sour
             symbol->output_options += BARCODE_BOX;
         }
     }
-    
+
     switch (symbol->input_mode & 0x07) {
         case DATA_MODE:
         case GS1_MODE:
@@ -705,11 +700,11 @@ static int reduced_charset(struct zint_symbol *symbol, const unsigned char *sour
             }
             break;
     }
-    
+
     if ((symbol->height == 0) && is_linear(symbol->symbology)) {
         symbol->height = 50;
     }
-    
+
     switch (symbol->symbology) {
         case BARCODE_C25MATRIX: error_number = matrix_two_of_five(symbol, preprocessed, in_length);
             break;
@@ -899,7 +894,7 @@ int escape_char_process(struct zint_symbol *symbol, unsigned char *input_string,
 
     in_posn = 0;
     out_posn = 0;
-    
+
     do {
         if (input_string[in_posn] == '\\') {
             switch (input_string[in_posn + 1]) {
@@ -973,11 +968,11 @@ int escape_char_process(struct zint_symbol *symbol, unsigned char *input_string,
         }
         out_posn++;
     } while (in_posn < *length);
-    
+
     memcpy(input_string, escaped_string, out_posn);
     input_string[out_posn] = '\0';
     *length = out_posn;
-    
+
     error_number = 0;
 
     return error_number;
@@ -1305,7 +1300,7 @@ int ZBarcode_Print(struct zint_symbol *symbol, int rotate_angle) {
             error_number = dump_plot(symbol);
         } else
             if (!(strcmp(output, "EPS"))) {
-            error_number = plot_vector(symbol, rotate_angle, OUT_EPS_FILE);  
+            error_number = plot_vector(symbol, rotate_angle, OUT_EPS_FILE);
         } else
             if (!(strcmp(output, "SVG"))) {
             error_number = plot_vector(symbol, rotate_angle, OUT_SVG_FILE);
@@ -1398,7 +1393,7 @@ int ZBarcode_Encode_and_Buffer(struct zint_symbol *symbol, unsigned char *input,
     if (error_number == 0) {
         error_number = first_err;
     }
-    
+
     return error_number;
 }
 
@@ -1416,7 +1411,7 @@ int ZBarcode_Encode_and_Buffer_Vector(struct zint_symbol *symbol, unsigned char
     if (error_number == 0) {
         error_number = first_err;
     }
-    
+
     return error_number;
 }
 
@@ -1487,13 +1482,13 @@ int ZBarcode_Encode_File_and_Print(struct zint_symbol *symbol, char *filename, i
     if (error_number >= 5) {
         return error_number;
     }
-    
+
     first_err = error_number;
     error_number = ZBarcode_Print(symbol, rotate_angle);
     if (error_number == 0) {
         error_number = first_err;
     }
-    
+
     return error_number;
 }
 
@@ -1505,7 +1500,7 @@ int ZBarcode_Encode_File_and_Buffer(struct zint_symbol *symbol, char *filename,
     if (error_number >= 5) {
         return error_number;
     }
-    
+
     first_err = error_number;
     error_number = ZBarcode_Buffer(symbol, rotate_angle);
     if (error_number == 0) {
@@ -1523,7 +1518,7 @@ int ZBarcode_Encode_File_and_Buffer_Vector(struct zint_symbol *symbol, char *fil
     if (error_number >= 5) {
         return error_number;
     }
-    
+
     first_err = error_number;
     error_number = ZBarcode_Buffer_Vector(symbol, rotate_angle);
     if (error_number == 0) {
@@ -1533,22 +1528,6 @@ int ZBarcode_Encode_File_and_Buffer_Vector(struct zint_symbol *symbol, char *fil
     return error_number;
 }
 
-/*
- * Rendering support, initially added by Sam Lown.
- *
- * Converts encoded data into an intermediate format to be interpreted
- * in other applications using this library.
- *
- * If the width and height are not set to zero, the barcode will be resized to those
- * dimensions. The symbol->scale and symbol->height values are totally ignored in this case.
- *
- */
-int ZBarcode_Render(struct zint_symbol *symbol, const float width, const float height) {
-    // Send the request to the render_plot method
-    return render_plot(symbol, width, height);
-}
-
 int ZBarcode_Version() {
     return (ZINT_VERSION_MAJOR * 10000) + (ZINT_VERSION_MINOR * 100) + ZINT_VERSION_RELEASE;
 }
-

backend/render.c

@@ -1,858 +0,0 @@
-/*
- * render.c - Generic Rendered Format
- *
- * Initiall written by Sam Lown for use in gLabels. Converts encoded
- * data into a generic internal structure of lines and characters
- * usable in external applications.
- */
-
-/*
-    libzint - the open source barcode library
-    Copyright (C) 2009-2017 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.
- */
-
-#include <locale.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#ifdef _MSC_VER
-#include <malloc.h>
-#endif
-#include "common.h"
-
-#define   GL_CONST  2.8346
-
-struct zint_render_line *render_plot_create_line(float x, float y, float width, float length);
-int render_plot_add_line(struct zint_symbol *symbol, struct zint_render_line *line, struct zint_render_line **last_line);
-struct zint_render_ring *render_plot_create_ring(float x, float y, float radius, float line_width);
-int render_plot_add_ring(struct zint_symbol *symbol, struct zint_render_ring *ring, struct zint_render_ring **last_ring);
-struct zint_render_hexagon *render_plot_create_hexagon(float x, float y, float height);
-int render_plot_add_hexagon(struct zint_symbol *symbol, struct zint_render_hexagon *hexagon, struct zint_render_hexagon **last_hexagon);
-
-int render_plot_add_string(struct zint_symbol *symbol, unsigned char *text, float x, float y, float fsize, float width, struct zint_render_string **last_string);
-void render_free(struct zint_symbol *symbol);
-
-int render_plot(struct zint_symbol *symbol, float width, float height) {
-    struct zint_render *render;
-    struct zint_render_line *line, *last_line = NULL;
-    struct zint_render_string *last_string = NULL;
-    struct zint_render_ring *last_ring = NULL;
-    struct zint_render_hexagon *last_hexagon = NULL;
-
-    int i, r, latch;
-    float textpos, large_bar_height, preset_height, row_height, row_posn = 0.0;
-    // int error_number = 0;
-    int text_offset, text_height, xoffset, yoffset, textdone, main_symbol_width_x, addon_width_x;
-    char addon[6];
-    int large_bar_count, symbol_lead_in, total_symbol_width_x, total_area_width_x;
-    float addon_text_posn;
-    float default_text_posn;
-    float scaler;
-    const char *locale = NULL;
-    int hide_text = 0;
-    float symbol_aspect = 1;
-    float x_dimension;
-    int upceanflag = 0;
-
-    // Free any previous rendering structures
-    render_free(symbol);
-    // Allocate memory for the rendered version
-    render = symbol->rendered = (struct zint_render *) malloc(sizeof (struct zint_render));
-    if (!symbol->rendered) return ZINT_ERROR_MEMORY;
-    render->lines = NULL;
-    render->strings = NULL;
-    render->rings = NULL;
-    render->hexagons = NULL;
-
-    locale = setlocale(LC_ALL, "C");
-
-    row_height = 0;
-    textdone = 0;
-    textpos = 0.0;
-    main_symbol_width_x = symbol->width;
-    strcpy(addon, "");
-    symbol_lead_in = 0;
-    addon_text_posn = 0.0;
-    addon_width_x = 0;
-
-    /*
-     * Determine if there will be any addon texts and text height
-     */
-    latch = 0;
-    r = 0;
-    /* Isolate add-on text */
-    if (is_extendable(symbol->symbology)) {
-        for(i = 0; i < (int)ustrlen(symbol->text); i++) {
-            if (latch == 1) {
-                addon[r] = symbol->text[i];
-                r++;
-            }
-            if (symbol->text[i] == '+') {
-                latch = 1;
-            }
-        }
-    }
-    addon[r] = '\0';
-
-
-    /*
-     * Calculate the width of the barcode, especially if there are any extra
-     * borders or white space to add.
-     */
-
-    while (!(module_is_set(symbol, symbol->rows - 1, symbol_lead_in))) {
-        symbol_lead_in++;
-    }
-
-    /* Certain symbols need whitespace otherwise characters get chopped off the sides */
-    if ((((symbol->symbology == BARCODE_EANX) && (symbol->rows == 1)) || (symbol->symbology == BARCODE_EANX_CC))
-            || (symbol->symbology == BARCODE_ISBNX)) {
-        switch (ustrlen(symbol->text)) {
-            case 13: /* EAN 13 */
-            case 16:
-            case 19:
-                if (symbol->whitespace_width == 0) {
-                    symbol->whitespace_width = 10;
-                }
-                main_symbol_width_x = 96 + symbol_lead_in;
-                upceanflag = 13;
-                break;
-            case 2:
-                main_symbol_width_x = 22 + symbol_lead_in;
-                upceanflag = 2;
-                break;
-            case 5:
-                main_symbol_width_x = 49 + symbol_lead_in;
-                upceanflag = 5;
-                break;
-            default:
-                main_symbol_width_x = 68 + symbol_lead_in;
-                upceanflag = 8;
-        }
-        switch (ustrlen(symbol->text)) {
-            case 11:
-            case 16:
-                /* EAN-2 add-on */
-                addon_width_x = 31;
-                break;
-            case 14:
-            case 19:
-                /* EAN-5 add-on */
-                addon_width_x = 58;
-                break;
-        }
-    }
-    else if (((symbol->symbology == BARCODE_UPCA) && (symbol->rows == 1)) || (symbol->symbology == BARCODE_UPCA_CC)) {
-        upceanflag = 12;
-        if (symbol->whitespace_width < 10) {
-            symbol->whitespace_width = 10;
-            main_symbol_width_x = 96 + symbol_lead_in;
-        }
-        switch (ustrlen(symbol->text)) {
-            case 15:
-                /* EAN-2 add-on */
-                addon_width_x = 31;
-                break;
-            case 18:
-                /* EAN-5 add-on */
-                addon_width_x = 58;
-                break;
-        }
-    }
-    else if (((symbol->symbology == BARCODE_UPCE) && (symbol->rows == 1)) || (symbol->symbology == BARCODE_UPCE_CC)) {
-        upceanflag = 6;
-        if (symbol->whitespace_width == 0) {
-            symbol->whitespace_width = 10;
-            main_symbol_width_x = 51 + symbol_lead_in;
-        }
-        switch (ustrlen(symbol->text)) {
-            case 11:
-                /* EAN-2 add-on */
-                addon_width_x = 31;
-                break;
-            case 14:
-                /* EAN-5 add-on */
-                addon_width_x = 58;
-                break;
-        }
-    }
-
-    if ((!symbol->show_hrt) || (ustrlen(symbol->text) == 0)) {
-        hide_text = 1;
-        text_height = text_offset = 0.0;
-    }
-    else {
-        text_height = upceanflag ? 11.0 : 9.0;
-        text_offset = 2.0;
-    }
-    if (symbol->output_options & SMALL_TEXT)
-        text_height *= 0.8;
-
-    total_symbol_width_x = 0.0 + main_symbol_width_x + addon_width_x;
-    total_area_width_x = total_symbol_width_x + (2 * (symbol->border_width + symbol->whitespace_width));
-
-    xoffset = symbol->border_width + symbol->whitespace_width;
-    yoffset = symbol->border_width;
-
-
-    // Determine if height should be overridden
-    large_bar_count = 0;
-    preset_height = 0.0;
-    for (i = 0; i < symbol->rows; i++) {
-        preset_height += symbol->row_height[i];
-        if (symbol->row_height[i] == 0) {
-            large_bar_count++;
-        }
-    }
-
-
-    /* Set minimum size of symbol */
-    /* Barcode must be at least 2mm high by 2mm across */
-    if (width < (2.0 * GL_CONST)) {
-        width = (2.0 * GL_CONST);
-    }
-    x_dimension = width / total_area_width_x / GL_CONST;
-    if (height < ((x_dimension * ((2 * symbol->border_width) + text_offset + text_height)) + 2.0) * GL_CONST) {
-        height = ((x_dimension * ((2 * symbol->border_width) + text_offset + text_height)) + 2.0) * GL_CONST;
-    }
-
-    if (symbol->symbology == BARCODE_CODABAR) {
-        /* The minimum X-dimension of Codabar is 0.191mm. The minimum bar height is 5mm */
-        if (x_dimension < 0.191) {
-            x_dimension = 0.191;
-            width = 0.191 * GL_CONST * total_area_width_x;
-        }
-        if (height < ((x_dimension * ((2 * symbol->border_width) + text_offset + text_height)) + 5.0) * GL_CONST) {
-            height = ((x_dimension * ((2 * symbol->border_width) + text_offset + text_height)) + 5.0) * GL_CONST;
-        }
-    }
-    else if (symbol->symbology == BARCODE_CODE49) {
-        /* The minimum X-dimension of Code 49 is 0.191mm */
-        if (x_dimension < 0.191) {
-            float encoded_symbol_aspect;
-            x_dimension = 0.191;
-            width = 0.191 * GL_CONST * total_area_width_x;
-            encoded_symbol_aspect = total_area_width_x;
-            encoded_symbol_aspect /= (preset_height + (2 * yoffset) + text_offset + text_height);
-            height = width / encoded_symbol_aspect;
-        }
-    }
-
-    if (upceanflag != 0) {
-        /* The X-dimension of UPC/EAN symbols is fixed at 0.330mm */
-        /* The phrase before is questionable. It may scale in certain percentages (80% - 200%).
-           see https://internationalbarcodes.com/ean-13-specifications/ */
-        // Can now cope with sizes between 80% and 200%, enforces correct aspect ratio
-        /* NOTE: This code will need adjustment before it correctly deals with composite symbols */
-        //x_dimension = 0.330;
-        if (x_dimension < 0.26) {
-            x_dimension = 0.26;
-        }
-        if (x_dimension > 0.66) {
-            x_dimension = 0.66;
-        }
-        width = x_dimension * GL_CONST * total_area_width_x;
-
-        switch (upceanflag) {
-            case 6:
-            case 12:
-            case 13:
-                /* UPC-A, UPC-E and EAN-13 */
-                /* Height of bars should be 22.85mm */
-                height = ((x_dimension * ((2 * symbol->border_width) + text_offset + text_height)) + (22.85 * (x_dimension / 0.33))) * GL_CONST;
-                break;
-            case 8:
-                /* EAN-8 */
-                /* Height of bars should be 18.23mm */
-                height = ((x_dimension * ((2 * symbol->border_width) + text_offset + text_height)) + (18.23 * (x_dimension / 0.33))) * GL_CONST;
-                break;
-            default:
-                /* EAN-2 and EAN-5 */
-                /* Height of bars should be 21.10mm */
-                height = ((x_dimension * ((2 * symbol->border_width) + text_offset + text_height)) + (21.10 * (x_dimension / 0.33))) * GL_CONST;
-        }
-    }
-
-    if (symbol->symbology == BARCODE_ONECODE) {
-        /* The size of USPS Intelligent Mail barcode is fixed */
-        x_dimension = 0.508;
-        width = 0.508 * GL_CONST * total_area_width_x;
-        height = 4.064 * GL_CONST;
-    }
-    else if ((symbol->symbology == BARCODE_POSTNET) || (symbol->symbology == BARCODE_PLANET)) {
-        /* The size of PostNet and PLANET are fized */
-        x_dimension = 0.508;
-        width = 0.508 * GL_CONST * total_area_width_x;
-        height = 2.921 * GL_CONST;
-    }
-    else if (((symbol->symbology == BARCODE_AUSPOST) || (symbol->symbology == BARCODE_AUSREPLY)) ||
-            ((symbol->symbology == BARCODE_AUSROUTE) || (symbol->symbology == BARCODE_AUSREDIRECT))) {
-        /* Australia Post use the same sizes as USPS */
-        x_dimension = 0.508;
-        width = 0.508 * GL_CONST * total_area_width_x;
-        height = 4.064 * GL_CONST;
-    }
-    else if ((symbol->symbology == BARCODE_RM4SCC) || (symbol->symbology == BARCODE_KIX)) {
-        /* Royal Mail and KIX Code uses 22 bars per inch */
-        x_dimension = 0.577;
-        width = 0.577 * GL_CONST * total_area_width_x;
-        height = 5.22 * GL_CONST;
-    }
-
-
-    if (large_bar_count == 0) {
-        float required_aspect = width / height;
-        symbol_aspect = (total_symbol_width_x + (2 * xoffset)) / (preset_height + (2 * yoffset) + text_offset + text_height);
-        symbol->height = (int) preset_height;
-        if (required_aspect > symbol_aspect) {
-            /* the area is too wide */
-            scaler = height / (preset_height + (2 * yoffset) + text_offset + text_height);
-            render->width = symbol_aspect * height;
-            render->height = height;
-        } else {
-            /* the area is too high */
-            scaler = width / (total_symbol_width_x + (2 * xoffset));
-            render->width = width;
-            render->height = width / symbol_aspect;
-        }
-    } else {
-        scaler = width / (total_symbol_width_x + (2 * xoffset));
-        symbol->height = (int) ((height / scaler) - ((2 * yoffset) + text_offset + text_height));
-
-        render->width = width;
-        render->height = height;
-    }
-    large_bar_height = (symbol->height - preset_height) / large_bar_count;
-
-    if ((symbol->output_options & BARCODE_BOX) || (symbol->output_options & BARCODE_BIND)) {
-        default_text_posn = (symbol->height + text_offset + symbol->border_width + symbol->border_width) * scaler;
-    } else {
-        default_text_posn = (symbol->height + text_offset + symbol->border_width) * scaler;
-    }
-
-
-    if (symbol->symbology == BARCODE_MAXICODE) {
-        struct zint_render_ring *ring;
-        /* Maxicode is a fixed size */
-        scaler = GL_CONST; /* Converts from millimeters to the scale used by glabels */
-        render->width = 28.16 * scaler;
-        render->height = 26.86 * scaler;
-
-        /* Central bullseye pattern */
-        ring = render_plot_create_ring(13.64 * scaler, 13.43 * scaler, 0.85 * scaler, 0.67 * scaler);
-        render_plot_add_ring(symbol, ring, &last_ring);
-        ring = render_plot_create_ring(13.64 * scaler, 13.43 * scaler, 2.20 * scaler, 0.67 * scaler);
-        render_plot_add_ring(symbol, ring, &last_ring);
-        ring = render_plot_create_ring(13.64 * scaler, 13.43 * scaler, 3.54 * scaler, 0.67 * scaler);
-        render_plot_add_ring(symbol, ring, &last_ring);
-
-        /* Hexagons */
-        for (r = 0; r < symbol->rows; r++) {
-            for (i = 0; i < symbol->width; i++) {
-                if (module_is_set(symbol, r, i)) {
-                    struct zint_render_hexagon *hexagon = render_plot_create_hexagon(((i * 0.88) + ((r & 1) ? 1.76 : 1.32)) * scaler, ((r * 0.76) + 0.76) * scaler, 1. * scaler);
-                    render_plot_add_hexagon(symbol, hexagon, &last_hexagon);
-                }
-            }
-        }
-
-    } else {
-        /* everything else uses rectangles (or squares) */
-        /* Works from the bottom of the symbol up */
-        int addon_latch = 0;
-
-        for (r = 0; r < symbol->rows; r++) {
-            int this_row = r;
-            if (symbol->row_height[this_row] == 0) {
-                row_height = large_bar_height;
-            } else {
-                row_height = symbol->row_height[this_row];
-            }
-            row_posn = 0;
-            for (i = 0; i < r; i++) {
-                if (symbol->row_height[i] == 0) {
-                    row_posn += large_bar_height;
-                } else {
-                    row_posn += symbol->row_height[i];
-                }
-            }
-            row_posn += yoffset;
-
-            i = 0;
-            if (module_is_set(symbol, this_row, 0)) {
-                latch = 1;
-            } else {
-                latch = 0;
-            }
-
-            do {
-                int block_width = 0;
-                do {
-                    block_width++;
-                } while (module_is_set(symbol, this_row, i + block_width) == module_is_set(symbol, this_row, i));
-                if ((addon_latch == 0) && (r == (symbol->rows - 1)) && (i > main_symbol_width_x)) {
-                    addon_text_posn = row_posn * scaler;
-                    addon_latch = 1;
-                }
-                if (latch == 1) {
-                    /* a bar */
-                    if (addon_latch == 0) {
-                        line = render_plot_create_line((i + xoffset) * scaler, (row_posn) * scaler, block_width * scaler, row_height * scaler);
-                    } else {
-                        line = render_plot_create_line((i + xoffset) * scaler, (row_posn + 10.0) * scaler, block_width * scaler, (row_height - 5.0) * scaler);
-                    }
-                    latch = 0;
-
-                    render_plot_add_line(symbol, line, &last_line);
-                } else {
-                    /* a space */
-                    latch = 1;
-                }
-                i += block_width;
-
-            } while (i < symbol->width);
-        }
-    }
-    /* That's done the actual data area, everything else is human-friendly */
-
-
-    /* Add the text */
-    xoffset -= symbol_lead_in;
-    row_posn = (row_posn + large_bar_height) * scaler;
-
-    if (!hide_text) {
-        char textpart[10];
-        float textwidth;
-        if (upceanflag == 8) {
-            /* guard bar extensions and text formatting for EAN-8 */
-            i = 0;
-            for (line = symbol->rendered->lines; line != NULL; line = line->next) {
-                switch (i) {
-                    case 0:
-                    case 1:
-                    case 10:
-                    case 11:
-                    case 20:
-                    case 21:
-                        line->length += (5.0 * scaler);
-                        break;
-                }
-                i++;
-            }
-
-            for (i = 0; i < 4; i++) {
-                textpart[i] = symbol->text[i];
-            }
-            textpart[4] = '\0';
-            textpos = 17;
-            textwidth = 4.0 * 8.5;
-            render_plot_add_string(symbol, (unsigned char *) textpart, (textpos + xoffset) * scaler, default_text_posn, text_height * scaler, textwidth * scaler, &last_string);
-            for (i = 0; i < 4; i++) {
-                textpart[i] = symbol->text[i + 4];
-            }
-            textpart[4] = '\0';
-            textpos = 50;
-            render_plot_add_string(symbol, (unsigned char *) textpart, (textpos + xoffset) * scaler, default_text_posn, text_height * scaler, textwidth * scaler, &last_string);
-            textdone = 1;
-            switch (strlen(addon)) {
-                case 2:
-                    textpos = xoffset + 86;
-                    textwidth = 2.0 * 8.5;
-                    render_plot_add_string(symbol, (unsigned char *) addon, textpos * scaler, addon_text_posn * scaler, text_height * scaler, textwidth * scaler, &last_string);
-                    break;
-                case 5:
-                    textpos = xoffset + 100;
-                    textwidth = 5.0 * 8.5;
-                    render_plot_add_string(symbol, (unsigned char *) addon, textpos * scaler, addon_text_posn * scaler, text_height * scaler, textwidth * scaler, &last_string);
-                    break;
-            }
-
-        }
-
-        if (upceanflag == 13) {
-            /* guard bar extensions and text formatting for EAN-13 */
-            i = 0;
-            for (line = symbol->rendered->lines; line != NULL; line = line->next) {
-                switch (i) {
-                    case 0:
-                    case 1:
-                    case 14:
-                    case 15:
-                    case 28:
-                    case 29:
-                        line->length += (5.0 * scaler);
-                        break;
-                }
-                i++;
-            }
-
-            textpart[0] = symbol->text[0];
-            textpart[1] = '\0';
-            textpos = -5; // 7
-            textwidth = 8.5;
-            render_plot_add_string(symbol, (unsigned char *) textpart, (textpos + xoffset) * scaler, default_text_posn, text_height * scaler, textwidth * scaler, &last_string);
-
-            for (i = 0; i < 6; i++) {
-                textpart[i] = symbol->text[i + 1];
-            }
-            textpart[6] = '\0';
-            textpos = 25;
-            textwidth = 6.0 * 8.5;
-            render_plot_add_string(symbol, (unsigned char *) textpart, (textpos + xoffset) * scaler, default_text_posn, text_height * scaler, textwidth * scaler, &last_string);
-            for (i = 0; i < 6; i++) {
-                textpart[i] = symbol->text[i + 7];
-            }
-            textpart[6] = '\0';
-            textpos = 72;
-            render_plot_add_string(symbol, (unsigned char *) textpart, (textpos + xoffset) * scaler, default_text_posn, text_height * scaler, textwidth * scaler, &last_string);
-            textdone = 1;
-            switch (strlen(addon)) {
-                case 2:
-                    textpos = xoffset + 114;
-                    textwidth = 2.0 * 8.5;
-                    render_plot_add_string(symbol, (unsigned char *) addon, textpos * scaler, addon_text_posn * scaler, text_height * scaler, textwidth * scaler, &last_string);
-                    break;
-                case 5:
-                    textpos = xoffset + 128;
-                    textwidth = 5.0 * 8.5;
-                    render_plot_add_string(symbol, (unsigned char *) addon, textpos * scaler, addon_text_posn * scaler, text_height * scaler, textwidth * scaler, &last_string);
-                    break;
-            }
-        }
-
-        if (upceanflag == 12) {
-            /* guard bar extensions and text formatting for UPCA */
-            i = 0;
-            for (line = symbol->rendered->lines; line != NULL; line = line->next) {
-                switch (i) {
-                    case 0:
-                    case 1:
-                    case 2:
-                    case 3:
-                    case 14:
-                    case 15:
-                    case 26:
-                    case 27:
-                    case 28:
-                    case 29:
-                        line->length += (5.0 * scaler);
-                        break;
-                }
-                i++;
-            }
-
-            textpart[0] = symbol->text[0];
-            textpart[1] = '\0';
-            textpos = -5;
-            textwidth = 6.2;
-            render_plot_add_string(symbol, (unsigned char *) textpart, (textpos + xoffset) * scaler, default_text_posn + (2.0 * scaler), text_height * (8.0 / 11.0) * scaler, textwidth * scaler, &last_string);
-            for (i = 0; i < 5; i++) {
-                textpart[i] = symbol->text[i + 1];
-            }
-            textpart[5] = '\0';
-            textpos = 27;
-            textwidth = 5.0 * 8.5;
-            render_plot_add_string(symbol, (unsigned char *) textpart, (textpos + xoffset) * scaler, default_text_posn, text_height * scaler, textwidth * scaler, &last_string);
-            for (i = 0; i < 5; i++) {
-                textpart[i] = symbol->text[i + 6];
-            }
-            textpos = 68;
-            render_plot_add_string(symbol, (unsigned char *) textpart, (textpos + xoffset) * scaler, default_text_posn, text_height * scaler, textwidth * scaler, &last_string);
-            textpart[0] = symbol->text[11];
-            textpart[1] = '\0';
-            textpos = 100;
-            textwidth = 6.2;
-            render_plot_add_string(symbol, (unsigned char *) textpart, (textpos + xoffset) * scaler, default_text_posn + (2.0 * scaler), text_height * (8.0 / 11.0) * scaler, textwidth * scaler, &last_string);
-            textdone = 1;
-            switch (strlen(addon)) {
-                case 2:
-                    textpos = xoffset + 116;
-                    textwidth = 2.0 * 8.5;
-                    render_plot_add_string(symbol, (unsigned char *) addon, textpos * scaler, addon_text_posn * scaler, text_height * scaler, textwidth * scaler, &last_string);
-                    break;
-                case 5:
-                    textpos = xoffset + 130;
-                    textwidth = 5.0 * 8.5;
-                    render_plot_add_string(symbol, (unsigned char *) addon, textpos * scaler, addon_text_posn * scaler, text_height * scaler, textwidth * scaler, &last_string);
-                    break;
-            }
-        }
-
-        if (upceanflag == 6) {
-            /* guard bar extensions and text formatting for UPCE */
-            i = 0;
-            for (line = symbol->rendered->lines; line != NULL; line = line->next) {
-                switch (i) {
-                    case 0:
-                    case 1:
-                    case 14:
-                    case 15:
-                    case 16:
-                        line->length += (5.0 * scaler);
-                        break;
-                }
-                i++;
-            }
-
-            textpart[0] = symbol->text[0];
-            textpart[1] = '\0';
-            textpos = -5;
-            textwidth = 6.2;
-            render_plot_add_string(symbol, (unsigned char *) textpart, (textpos + xoffset) * scaler, default_text_posn + (2.0 * scaler), text_height * (8.0 / 11.0) * scaler, textwidth * scaler, &last_string);
-            for (i = 0; i < 6; i++) {
-                textpart[i] = symbol->text[i + 1];
-            }
-            textpart[6] = '\0';
-            textpos = 24;
-            textwidth = 6.0 * 8.5;
-            render_plot_add_string(symbol, (unsigned char *) textpart, (textpos + xoffset) * scaler, default_text_posn, text_height * scaler, textwidth * scaler, &last_string);
-            textpart[0] = symbol->text[7];
-            textpart[1] = '\0';
-            textpos = 55;
-            textwidth = 6.2;
-            render_plot_add_string(symbol, (unsigned char *) textpart, (textpos + xoffset) * scaler, default_text_posn + (2.0 * scaler), text_height * (8.0 / 11.0) * scaler, textwidth * scaler, &last_string);
-            textdone = 1;
-            switch (strlen(addon)) {
-                case 2:
-                    textpos = xoffset + 70;
-                    textwidth = 2.0 * 8.5;
-                    render_plot_add_string(symbol, (unsigned char *) addon, textpos * scaler, addon_text_posn * scaler, text_height * scaler, textwidth * scaler, &last_string);
-                    break;
-                case 5:
-                    textpos = xoffset + 84;
-                    textwidth = 5.0 * 8.5;
-                    render_plot_add_string(symbol, (unsigned char *) addon, textpos * scaler, addon_text_posn * scaler, text_height * scaler, textwidth * scaler, &last_string);
-                    break;
-            }
-        }
-
-        /* Put normal human readable text at the bottom (and centered) */
-        if (textdone == 0) {
-            // caculate start xoffset to center text
-            render_plot_add_string(symbol, symbol->text, ((symbol->width / 2.0) + xoffset) * scaler, default_text_posn, text_height * scaler, symbol->width * scaler, &last_string);
-        }
-    }
-
-    switch (symbol->symbology) {
-        case BARCODE_MAXICODE:
-            /* Do nothing! */
-            break;
-        default:
-            if ((symbol->output_options & BARCODE_BIND) != 0) {
-                if ((symbol->rows > 1) && (is_stackable(symbol->symbology) == 1)) {
-                    /* row binding */
-                    for (r = 1; r < symbol->rows; r++) {
-                        line = render_plot_create_line(xoffset * scaler, ((r * row_height) + yoffset - 1) * scaler, symbol->width * scaler, 2.0 * scaler);
-                        render_plot_add_line(symbol, line, &last_line);
-                    }
-                }
-            }
-            if ((symbol->output_options & BARCODE_BOX) || (symbol->output_options & BARCODE_BIND)) {
-                line = render_plot_create_line(0, 0, (symbol->width + xoffset + xoffset) * scaler, symbol->border_width * scaler);
-                render_plot_add_line(symbol, line, &last_line);
-                line = render_plot_create_line(0, (symbol->height + symbol->border_width) * scaler, (symbol->width + xoffset + xoffset) * scaler, symbol->border_width * scaler);
-                render_plot_add_line(symbol, line, &last_line);
-            }
-            if (symbol->output_options & BARCODE_BOX) {
-                /* side bars */
-                line = render_plot_create_line(0, 0, symbol->border_width * scaler, (symbol->height + (2 * symbol->border_width)) * scaler);
-                render_plot_add_line(symbol, line, &last_line);
-                line = render_plot_create_line((symbol->width + xoffset + xoffset - symbol->border_width) * scaler, 0, symbol->border_width * scaler, (symbol->height + (2 * symbol->border_width)) * scaler);
-                render_plot_add_line(symbol, line, &last_line);
-            }
-            break;
-    }
-
-    if (locale)
-        setlocale(LC_ALL, locale);
-
-    return 1;
-}
-
-/*
- * Create a new line with its memory allocated ready for adding to the
- * rendered structure.
- *
- * This is much quicker than writing out each line manually (in some cases!)
- */
-struct zint_render_line *render_plot_create_line(float x, float y, float width, float length) {
-    struct zint_render_line *line;
-
-    line = (struct zint_render_line*) malloc(sizeof (struct zint_render_line));
-    if (!line) return NULL;
-
-    line->next = NULL;
-    line->x = x;
-    line->y = y;
-    line->width = width;
-    line->length = length;
-
-    return line;
-}
-
-/*
- * Add the line to the current rendering and update the last line's
- * next value.
- */
-int render_plot_add_line(struct zint_symbol *symbol, struct zint_render_line *line, struct zint_render_line **last_line) {
-    if (!line) return ZINT_ERROR_MEMORY;
-    if (*last_line)
-        (*last_line)->next = line;
-    else
-        symbol->rendered->lines = line; // first line
-
-    *last_line = line;
-    return 1;
-}
-
-struct zint_render_ring *render_plot_create_ring(float x, float y, float radius, float line_width) {
-    struct zint_render_ring *ring;
-
-    ring = (struct zint_render_ring *) malloc(sizeof (struct zint_render_ring));
-    if (!ring) return NULL;
-    ring->next = NULL;
-    ring->x = x;
-    ring->y = y;
-    ring->radius = radius;
-    ring->line_width = line_width;
-
-    return ring;
-}
-
-int render_plot_add_ring(struct zint_symbol *symbol, struct zint_render_ring *ring, struct zint_render_ring **last_ring) {
-    if (!ring) return ZINT_ERROR_MEMORY;
-    if (*last_ring)
-        (*last_ring)->next = ring;
-    else
-        symbol->rendered->rings = ring; // first ring
-
-    *last_ring = ring;
-    return 1;
-}
-
-struct zint_render_hexagon *render_plot_create_hexagon(float x, float y, float height) {
-    struct zint_render_hexagon *hexagon;
-
-    hexagon = (struct zint_render_hexagon*) malloc(sizeof (struct zint_render_hexagon));
-    if (!hexagon) return NULL;
-    hexagon->next = NULL;
-    hexagon->x = x;
-    hexagon->y = y;
-    hexagon->height = height;
-
-    return hexagon;
-}
-
-int render_plot_add_hexagon(struct zint_symbol *symbol, struct zint_render_hexagon *hexagon, struct zint_render_hexagon **last_hexagon) {
-    if (!hexagon) return ZINT_ERROR_MEMORY;
-    if (*last_hexagon)
-        (*last_hexagon)->next = hexagon;
-    else
-        symbol->rendered->hexagons = hexagon; // first hexagon
-
-    *last_hexagon = hexagon;
-    return 1;
-}
-
-/*
- * Add a string structure to the symbol.
- * Coordinates assumed to be from top-center.
- */
-int render_plot_add_string(struct zint_symbol *symbol,
-        unsigned char *text, float x, float y, float fsize, float width,
-        struct zint_render_string **last_string) {
-    struct zint_render_string *string;
-
-    string = (struct zint_render_string*) malloc(sizeof (struct zint_render_string));
-    string->next = NULL;
-    string->x = x;
-    string->y = y;
-    string->width = width;
-    string->fsize = fsize;
-    string->length = ustrlen(text);
-    string->text = (unsigned char*) malloc(sizeof (unsigned char) * (ustrlen(text) + 1));
-    ustrcpy(string->text, text);
-
-    if (*last_string)
-        (*last_string)->next = string;
-    else
-        symbol->rendered->strings = string; // First character
-    *last_string = string;
-
-    return 1;
-}
-
-/*
- * Free the data structures created by render_plot
- */
-void render_free(struct zint_symbol *symbol) {
-  if (symbol->rendered != NULL) {
-    struct zint_render_line *line;
-    struct zint_render_string *string;
-    struct zint_render_ring *ring;
-    struct zint_render_hexagon *hexagon;
-
-    // Free lines
-    line = symbol->rendered->lines;
-    while (line) {
-      struct zint_render_line *l = line;
-      line = line->next;
-      free(l);
-    }
-    // Free Strings
-    string = symbol->rendered->strings;
-    while (string) {
-      struct zint_render_string *s = string;
-      string = string->next;
-      free(s->text);
-      free(s);
-    }
-
-    // Free Rings
-    ring = symbol->rendered->rings;
-    while (ring) {
-      struct zint_render_ring *r = ring;
-      ring = ring->next;
-      free(r);
-    }
-
-    // Free Hexagons
-    hexagon = symbol->rendered->hexagons;
-    while (hexagon) {
-      struct zint_render_hexagon *h = hexagon;
-      hexagon = hexagon->next;
-      free(h);
-    }
-
-    // Free Render
-    free(symbol->rendered);
-    symbol->rendered = NULL;
-  }
-}
-
-