diff --git a/README b/README index 5313cbb2..47006d0f 100644 --- a/README +++ b/README @@ -73,6 +73,14 @@ maxicode code set correction cmake flags for debugging and sanitize options unit tests for the changes, with a simple test suite based on qrencode/tests +Version 2.6.6 (not jet released): +New features: +PDF row size may be set +PDF numeric compaction +Fixing bugs: +Ticket 164: crash due to call of svg_plot withnull vector +Crash on bullseye raster drawing +qtzint: Micro-QR version option choice corrected (+1 missing). CONTACT US ---------- diff --git a/backend/svg.c b/backend/svg.c index b8ebcc95..745e66a6 100644 --- a/backend/svg.c +++ b/backend/svg.c @@ -1,143 +1,143 @@ -/* svg.c - Scalable Vector Graphics */ - -/* - libzint - the open source barcode library - Copyright (C) 2009-2018 Robin Stuart - - 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 -#include -#include -#include -#include -#ifdef _MSC_VER -#include -#endif - -#include "common.h" - -int svg_plot(struct zint_symbol *symbol) { - FILE *fsvg; - int error_number = 0; - const char *locale = NULL; - float ax, ay, bx, by, cx, cy, dx, dy, ex, ey, fx, fy; - float radius; - - struct zint_vector_rect *rect; - struct zint_vector_hexagon *hex; - struct zint_vector_circle *circle; - struct zint_vector_string *string; - - /* Check for no created vector set */ - /* E-Mail Christian Schmitz 2019-09-10: reason unknown */ - if (symbol->vector == NULL) { - return ZINT_ERROR_INVALID_DATA; - } - if (symbol->output_options & BARCODE_STDOUT) { - fsvg = stdout; - } else { - fsvg = fopen(symbol->outfile, "w"); - } - if (fsvg == NULL) { - strcpy(symbol->errtxt, "660: Could not open output file"); - return ZINT_ERROR_FILE_ACCESS; - } - - locale = setlocale(LC_ALL, "C"); - - /* Start writing the header */ - fprintf(fsvg, "\n"); - fprintf(fsvg, "\n"); - fprintf(fsvg, "vector->width), (int) ceil(symbol->vector->height)); - fprintf(fsvg, " xmlns=\"http://www.w3.org/2000/svg\">\n"); - fprintf(fsvg, " Zint Generated Symbol\n"); - fprintf(fsvg, " \n"); - fprintf(fsvg, "\n \n", symbol->fgcolour); - - fprintf(fsvg, " \n", (int) ceil(symbol->vector->width), (int) ceil(symbol->vector->height), symbol->bgcolour); - - - rect = symbol->vector->rectangles; - while (rect) { - fprintf(fsvg, " \n", rect->x, rect->y, rect->width, rect->height); - rect = rect->next; - } - - hex = symbol->vector->hexagons; - while (hex) { - radius = hex->diameter / 2.0; - ay = hex->y + (1.0 * radius); - by = hex->y + (0.5 * radius); - cy = hex->y - (0.5 * radius); - dy = hex->y - (1.0 * radius); - ey = hex->y - (0.5 * radius); - fy = hex->y + (0.5 * radius); - ax = hex->x; - bx = hex->x + (0.86 * radius); - cx = hex->x + (0.86 * radius); - dx = hex->x; - ex = hex->x - (0.86 * radius); - fx = hex->x - (0.86 * radius); - fprintf(fsvg, " \n", ax, ay, bx, by, cx, cy, dx, dy, ex, ey, fx, fy); - hex = hex->next; - } - - circle = symbol->vector->circles; - while (circle) { - if (circle->colour) { - fprintf(fsvg, " \n", circle->x, circle->y, circle->diameter / 2.0, symbol->bgcolour); - } else { - fprintf(fsvg, " \n", circle->x, circle->y, circle->diameter / 2.0, symbol->fgcolour); - } - circle = circle->next; - } - - string = symbol->vector->strings; - while (string) { - fprintf(fsvg, " x, string->y); - fprintf(fsvg, " font-family=\"Helvetica\" font-size=\"%.1f\" fill=\"#%s\" >\n", string->fsize, symbol->fgcolour); - fprintf(fsvg, " %s\n", string->text); - fprintf(fsvg, " \n"); - string = string->next; - } - - fprintf(fsvg, " \n"); - fprintf(fsvg, "\n"); - - if (symbol->output_options & BARCODE_STDOUT) { - fflush(fsvg); - } else { - fclose(fsvg); - } - - if (locale) - setlocale(LC_ALL, locale); - - return error_number; -} +/* svg.c - Scalable Vector Graphics */ + +/* + libzint - the open source barcode library + Copyright (C) 2009-2018 Robin Stuart + + 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 +#include +#include +#include +#include +#ifdef _MSC_VER +#include +#endif + +#include "common.h" + +int svg_plot(struct zint_symbol *symbol) { + FILE *fsvg; + int error_number = 0; + const char *locale = NULL; + float ax, ay, bx, by, cx, cy, dx, dy, ex, ey, fx, fy; + float radius; + + struct zint_vector_rect *rect; + struct zint_vector_hexagon *hex; + struct zint_vector_circle *circle; + struct zint_vector_string *string; + + /* Check for no created vector set */ + /* E-Mail Christian Schmitz 2019-09-10: reason unknown Ticket #164*/ + if (symbol->vector == NULL) { + return ZINT_ERROR_INVALID_DATA; + } + if (symbol->output_options & BARCODE_STDOUT) { + fsvg = stdout; + } else { + fsvg = fopen(symbol->outfile, "w"); + } + if (fsvg == NULL) { + strcpy(symbol->errtxt, "660: Could not open output file"); + return ZINT_ERROR_FILE_ACCESS; + } + + locale = setlocale(LC_ALL, "C"); + + /* Start writing the header */ + fprintf(fsvg, "\n"); + fprintf(fsvg, "\n"); + fprintf(fsvg, "vector->width), (int) ceil(symbol->vector->height)); + fprintf(fsvg, " xmlns=\"http://www.w3.org/2000/svg\">\n"); + fprintf(fsvg, " Zint Generated Symbol\n"); + fprintf(fsvg, " \n"); + fprintf(fsvg, "\n \n", symbol->fgcolour); + + fprintf(fsvg, " \n", (int) ceil(symbol->vector->width), (int) ceil(symbol->vector->height), symbol->bgcolour); + + + rect = symbol->vector->rectangles; + while (rect) { + fprintf(fsvg, " \n", rect->x, rect->y, rect->width, rect->height); + rect = rect->next; + } + + hex = symbol->vector->hexagons; + while (hex) { + radius = hex->diameter / 2.0; + ay = hex->y + (1.0 * radius); + by = hex->y + (0.5 * radius); + cy = hex->y - (0.5 * radius); + dy = hex->y - (1.0 * radius); + ey = hex->y - (0.5 * radius); + fy = hex->y + (0.5 * radius); + ax = hex->x; + bx = hex->x + (0.86 * radius); + cx = hex->x + (0.86 * radius); + dx = hex->x; + ex = hex->x - (0.86 * radius); + fx = hex->x - (0.86 * radius); + fprintf(fsvg, " \n", ax, ay, bx, by, cx, cy, dx, dy, ex, ey, fx, fy); + hex = hex->next; + } + + circle = symbol->vector->circles; + while (circle) { + if (circle->colour) { + fprintf(fsvg, " \n", circle->x, circle->y, circle->diameter / 2.0, symbol->bgcolour); + } else { + fprintf(fsvg, " \n", circle->x, circle->y, circle->diameter / 2.0, symbol->fgcolour); + } + circle = circle->next; + } + + string = symbol->vector->strings; + while (string) { + fprintf(fsvg, " x, string->y); + fprintf(fsvg, " font-family=\"Helvetica\" font-size=\"%.1f\" fill=\"#%s\" >\n", string->fsize, symbol->fgcolour); + fprintf(fsvg, " %s\n", string->text); + fprintf(fsvg, " \n"); + string = string->next; + } + + fprintf(fsvg, " \n"); + fprintf(fsvg, "\n"); + + if (symbol->output_options & BARCODE_STDOUT) { + fflush(fsvg); + } else { + fclose(fsvg); + } + + if (locale) + setlocale(LC_ALL, locale); + + return error_number; +}