Hello community, here is the log from the commit of package libansilove for openSUSE:Factory checked in at 2020-06-22 17:46:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libansilove (Old) and /work/SRC/openSUSE:Factory/.libansilove.new.2956 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libansilove" Mon Jun 22 17:46:59 2020 rev:9 rq:816386 version:1.2.4 Changes: -------- --- /work/SRC/openSUSE:Factory/libansilove/libansilove.changes 2020-06-03 20:32:02.301085296 +0200 +++ /work/SRC/openSUSE:Factory/.libansilove.new.2956/libansilove.changes 2020-06-22 17:47:00.866055649 +0200 @@ -1,0 +2,13 @@ +Sun Jun 21 07:48:24 UTC 2020 - Martin Hauke <[email protected]> + +- Update to version 1.2.4 + * Use size_t in for loops setting color palettes + * Remove unneeded gdImageFill() call when using Workbench mode + * Define _GNU_SOURCE in CMakeLists.txt to avoid cluttering + source files + * Use size_t type for variables used to loop over arrays + * Separate RGB values for palettes, makes color allocation code + more readable and efficient + * Move ADF color mapping array to config.h + +------------------------------------------------------------------- Old: ---- libansilove-1.2.3.tar.gz New: ---- libansilove-1.2.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libansilove.spec ++++++ --- /var/tmp/diff_new_pack.nP96aD/_old 2020-06-22 17:47:01.322057079 +0200 +++ /var/tmp/diff_new_pack.nP96aD/_new 2020-06-22 17:47:01.326057091 +0200 @@ -20,7 +20,7 @@ %global sover 1 %global libname %{name}%{sover} Name: libansilove -Version: 1.2.3 +Version: 1.2.4 Release: 0 Summary: Library for converting ANSI, ASCII, and other formats to PNG License: BSD-2-Clause ++++++ libansilove-1.2.3.tar.gz -> libansilove-1.2.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libansilove-1.2.3/.travis.yml new/libansilove-1.2.4/.travis.yml --- old/libansilove-1.2.3/.travis.yml 2020-05-25 18:47:27.000000000 +0200 +++ new/libansilove-1.2.4/.travis.yml 2020-06-21 09:24:32.000000000 +0200 @@ -31,7 +31,7 @@ coverity_scan: project: name: "ansilove/libansilove" - version: 1.2.3 + version: 1.2.4 description: "Library for converting ANSI, ASCII, and other formats to PNG" notification_email: [email protected] build_command_prepend: cmake . diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libansilove-1.2.3/CMakeLists.txt new/libansilove-1.2.4/CMakeLists.txt --- old/libansilove-1.2.3/CMakeLists.txt 2020-05-25 18:47:27.000000000 +0200 +++ new/libansilove-1.2.4/CMakeLists.txt 2020-06-21 09:24:32.000000000 +0200 @@ -2,7 +2,7 @@ set(LIB_VERSION_MAJOR 1) set(LIB_VERSION_MINOR 2) -set(LIB_VERSION_PATCH 3) +set(LIB_VERSION_PATCH 4) set(LIB_VERSION_STRING ${LIB_VERSION_MAJOR}.${LIB_VERSION_MINOR}.${LIB_VERSION_PATCH}) project (ansilove C) @@ -28,7 +28,7 @@ set (SRC ${SRC} compat/strtonum.c) endif() -add_definitions(-Wall -Wextra -std=c99 -pedantic) +add_definitions(-D_GNU_SOURCE -Wall -Wextra -std=c99 -pedantic) add_library(ansilove SHARED ${SRC} ${LOADERS}) target_link_libraries(ansilove ${GD_LIBRARIES} m) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libansilove-1.2.3/ChangeLog new/libansilove-1.2.4/ChangeLog --- old/libansilove-1.2.3/ChangeLog 2020-05-25 18:47:27.000000000 +0200 +++ new/libansilove-1.2.4/ChangeLog 2020-06-21 09:24:32.000000000 +0200 @@ -1,3 +1,15 @@ +libansilove 1.2.4 (2020-06-21) + +- Use size_t in for loops setting color palettes +- Remove unneeded gdImageFill() call when using Workbench mode +- Define _GNU_SOURCE in CMakeLists.txt to avoid cluttering source files +- Use size_t type for variables used to loop over arrays +- Separate RGB values for palettes, makes color allocation code more + readable and efficient +- Move ADF color mapping array to config.h + + + libansilove 1.2.3 (2020-05-25) - Call memset() to set all fontData struct fields to zero in all loaders diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libansilove-1.2.3/README.md new/libansilove-1.2.4/README.md --- old/libansilove-1.2.3/README.md 2020-05-25 18:47:27.000000000 +0200 +++ new/libansilove-1.2.4/README.md 2020-06-21 09:24:32.000000000 +0200 @@ -79,7 +79,7 @@ [1]: https://api.travis-ci.org/ansilove/libansilove.png?branch=master [2]: https://travis-ci.org/ansilove/libansilove [3]: https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/graphics/libansilove -[4]: http://pkgsrc.se/graphics/libansilove +[4]: https://pkgsrc.se/graphics/libansilove [5]: https://www.freshports.org/graphics/libansilove/ [6]: https://packages.debian.org/search?keywords=libansilove [7]: https://packages.ubuntu.com/search?keywords=libansilove diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libansilove-1.2.3/include/ansilove.h new/libansilove-1.2.4/include/ansilove.h --- old/libansilove-1.2.3/include/ansilove.h 2020-05-25 18:47:27.000000000 +0200 +++ new/libansilove-1.2.4/include/ansilove.h 2020-06-21 09:24:32.000000000 +0200 @@ -1,6 +1,6 @@ /* * ansilove.h - * libansilove 1.2.3 + * libansilove 1.2.4 * https://www.ansilove.org * * Copyright (c) 2011-2020 Stefan Vogt, Brian Cassidy, and Frederic Cambus @@ -20,11 +20,11 @@ #define ANSILOVE_EXTERN __attribute__((visibility("default"))) /* Version number */ -#define ANSILOVE_VERSION "1.2.3" +#define ANSILOVE_VERSION "1.2.4" #define ANSILOVE_VERSION_MAJOR 1 #define ANSILOVE_VERSION_MINOR 2 -#define ANSILOVE_VERSION_PATCH 3 +#define ANSILOVE_VERSION_PATCH 4 /* Error codes */ #define ANSILOVE_INVALID_PARAM 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libansilove-1.2.3/src/clean.c new/libansilove-1.2.4/src/clean.c --- old/libansilove-1.2.3/src/clean.c 2020-05-25 18:47:27.000000000 +0200 +++ new/libansilove-1.2.4/src/clean.c 2020-06-21 09:24:32.000000000 +0200 @@ -1,6 +1,6 @@ /* * clean.c - * libansilove 1.2.3 + * libansilove 1.2.4 * https://www.ansilove.org * * Copyright (c) 2011-2020 Stefan Vogt, Brian Cassidy, and Frederic Cambus diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libansilove-1.2.3/src/config.h new/libansilove-1.2.4/src/config.h --- old/libansilove-1.2.3/src/config.h 2020-05-25 18:47:27.000000000 +0200 +++ new/libansilove-1.2.4/src/config.h 2020-06-21 09:24:32.000000000 +0200 @@ -1,6 +1,6 @@ /* * config.h - * libansilove 1.2.3 + * libansilove 1.2.4 * https://www.ansilove.org * * Copyright (c) 2011-2020 Stefan Vogt, Brian Cassidy, and Frederic Cambus @@ -15,27 +15,54 @@ #include <stdint.h> -static const uint8_t ansi_palette[] = { - 0x00, 0x00, 0x00, 0xaa, 0x00, 0x00, 0x00, 0xaa, 0x00, 0xaa, 0x55, 0x00, - 0x00, 0x00, 0xaa, 0xaa, 0x00, 0xaa, 0x00, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, - 0x55, 0x55, 0x55, 0xff, 0x55, 0x55, 0x55, 0xff, 0x55, 0xff, 0xff, 0x55, - 0x55, 0x55, 0xff, 0xff, 0x55, 0xff, 0x55, 0xff, 0xff, 0xff, 0xff, 0xff -}; - -static const uint8_t workbench_palette[] = { - 0xaa, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x66, 0x88, 0xbb, - 0x00, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xaa, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x66, 0x88, 0xbb, - 0x00, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff -}; - -static const uint8_t vga_palette[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0x00, 0xaa, 0x00, 0x00, 0xaa, 0xaa, - 0xaa, 0x00, 0x00, 0xaa, 0x00, 0xaa, 0xaa, 0x55, 0x00, 0xaa, 0xaa, 0xaa, - 0x55, 0x55, 0x55, 0x55, 0x55, 0xff, 0x55, 0xff, 0x55, 0x55, 0xff, 0xff, - 0xff, 0x55, 0x55, 0xff, 0x55, 0xff, 0xff, 0xff, 0x55, 0xff, 0xff, 0xff +static const uint8_t ansi_palette_red[] = { + 0x00, 0xaa, 0x00, 0xaa, 0x00, 0xaa, 0x00, 0xaa, + 0x55, 0xff, 0x55, 0xff, 0x55, 0xff, 0x55, 0xff }; +static const uint8_t ansi_palette_green[] = { + 0x00, 0x00, 0xaa, 0x55, 0x00, 0x00, 0xaa, 0xaa, + 0x55, 0x55, 0xff, 0xff, 0x55, 0x55, 0xff, 0xff +}; + +static const uint8_t ansi_palette_blue[] = { + 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0xaa, + 0x55, 0x55, 0x55, 0x55, 0xff, 0xff, 0xff, 0xff +}; + +static const uint8_t workbench_palette_red[] = { + 0xaa, 0x00, 0xff, 0x66, 0x00, 0xff, 0x00, 0xff, + 0xaa, 0x00, 0xff, 0x66, 0x00, 0xff, 0x00, 0xff +}; + +static const uint8_t workbench_palette_green[] = { + 0xaa, 0x00, 0xff, 0x88, 0x00, 0x00, 0xff, 0xff, + 0xaa, 0x00, 0xff, 0x88, 0x00, 0x00, 0xff, 0xff +}; + +static const uint8_t workbench_palette_blue[] = { + 0xaa, 0x00, 0xff, 0xbb, 0xff, 0xff, 0xff, 0xff, + 0xaa, 0x00, 0xff, 0xbb, 0xff, 0xff, 0xff, 0xff +}; + +static const uint8_t vga_palette_red[] = { + 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0xaa, + 0x55, 0x55, 0x55, 0x55, 0xff, 0xff, 0xff, 0xff +}; + +static const uint8_t vga_palette_green[] = { + 0x00, 0x00, 0xaa, 0xaa, 0x00, 0x00, 0x55, 0xaa, + 0x55, 0x55, 0xff, 0xff, 0x55, 0x55, 0xff, 0xff +}; + +static const uint8_t vga_palette_blue[] = { + 0x00, 0xaa, 0x00, 0xaa, 0x00, 0xaa, 0x00, 0xaa, + 0x55, 0xff, 0x55, 0xff, 0x55, 0xff, 0x55, 0xff +}; + +/* ADF color mapping array */ +static const uint8_t adf_colors[16] = { 0, 1, 2, 3, 4, 5, 20, 7, 56, 57, 58, 59, 60, 61, 62, 63 }; + static const uint8_t pcb_colors[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libansilove-1.2.3/src/drawchar.c new/libansilove-1.2.4/src/drawchar.c --- old/libansilove-1.2.3/src/drawchar.c 2020-05-25 18:47:27.000000000 +0200 +++ new/libansilove-1.2.4/src/drawchar.c 2020-06-21 09:24:32.000000000 +0200 @@ -1,6 +1,6 @@ /* * drawchar.c - * libansilove 1.2.3 + * libansilove 1.2.4 * https://www.ansilove.org * * Copyright (c) 2011-2020 Stefan Vogt, Brian Cassidy, and Frederic Cambus diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libansilove-1.2.3/src/drawchar.h new/libansilove-1.2.4/src/drawchar.h --- old/libansilove-1.2.3/src/drawchar.h 2020-05-25 18:47:27.000000000 +0200 +++ new/libansilove-1.2.4/src/drawchar.h 2020-06-21 09:24:32.000000000 +0200 @@ -1,6 +1,6 @@ /* * drawchar.h - * libansilove 1.2.3 + * libansilove 1.2.4 * https://www.ansilove.org * * Copyright (c) 2011-2020 Stefan Vogt, Brian Cassidy, and Frederic Cambus diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libansilove-1.2.3/src/error.c new/libansilove-1.2.4/src/error.c --- old/libansilove-1.2.3/src/error.c 2020-05-25 18:47:27.000000000 +0200 +++ new/libansilove-1.2.4/src/error.c 2020-06-21 09:24:32.000000000 +0200 @@ -1,6 +1,6 @@ /* * error.c - * libansilove 1.2.3 + * libansilove 1.2.4 * https://www.ansilove.org * * Copyright (c) 2011-2020 Stefan Vogt, Brian Cassidy, and Frederic Cambus diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libansilove-1.2.3/src/fonts.c new/libansilove-1.2.4/src/fonts.c --- old/libansilove-1.2.3/src/fonts.c 2020-05-25 18:47:27.000000000 +0200 +++ new/libansilove-1.2.4/src/fonts.c 2020-06-21 09:24:32.000000000 +0200 @@ -1,6 +1,6 @@ /* * fonts.c - * libansilove 1.2.3 + * libansilove 1.2.4 * https://www.ansilove.org * * Copyright (c) 2011-2020 Stefan Vogt, Brian Cassidy, and Frederic Cambus diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libansilove-1.2.3/src/fonts.h new/libansilove-1.2.4/src/fonts.h --- old/libansilove-1.2.3/src/fonts.h 2020-05-25 18:47:27.000000000 +0200 +++ new/libansilove-1.2.4/src/fonts.h 2020-06-21 09:24:32.000000000 +0200 @@ -1,6 +1,6 @@ /* * fonts.h - * libansilove 1.2.3 + * libansilove 1.2.4 * https://www.ansilove.org * * Copyright (c) 2011-2020 Stefan Vogt, Brian Cassidy, and Frederic Cambus diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libansilove-1.2.3/src/init.c new/libansilove-1.2.4/src/init.c --- old/libansilove-1.2.3/src/init.c 2020-05-25 18:47:27.000000000 +0200 +++ new/libansilove-1.2.4/src/init.c 2020-06-21 09:24:32.000000000 +0200 @@ -1,6 +1,6 @@ /* * init.c - * libansilove 1.2.3 + * libansilove 1.2.4 * https://www.ansilove.org * * Copyright (c) 2011-2020 Stefan Vogt, Brian Cassidy, and Frederic Cambus diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libansilove-1.2.3/src/loaders/ansi.c new/libansilove-1.2.4/src/loaders/ansi.c --- old/libansilove-1.2.3/src/loaders/ansi.c 2020-05-25 18:47:27.000000000 +0200 +++ new/libansilove-1.2.4/src/loaders/ansi.c 2020-06-21 09:24:32.000000000 +0200 @@ -1,6 +1,6 @@ /* * ansi.c - * libansilove 1.2.3 + * libansilove 1.2.4 * https://www.ansilove.org * * Copyright (c) 2011-2020 Stefan Vogt, Brian Cassidy, and Frederic Cambus @@ -10,9 +10,6 @@ * See LICENSE file for details. */ -#define _XOPEN_SOURCE 700 -#define _NETBSD_SOURCE - #include <gd.h> #include <limits.h> #include <math.h> @@ -88,8 +85,7 @@ gdImagePtr canvas; /* ANSi processing loops */ - size_t loop = 0; - uint32_t ansi_sequence_loop; + size_t loop = 0, ansi_sequence_loop; /* character definitions */ uint8_t current_character, character; @@ -394,10 +390,10 @@ switch (seqValue) { case 0: - background24 = (color_R << 16) | (color_G << 8) | (color_B); + background24 = color_R << 16 | color_G << 8 | color_B; break; case 1: - foreground24 = (color_R << 16) | (color_G << 8) | (color_B); + foreground24 = color_R << 16 | color_G << 8 | color_B; break; } @@ -489,19 +485,18 @@ ced_foreground = gdImageColorAllocate(canvas, 0, 0, 0); gdImageFill(canvas, 0, 0, ced_background); } else if (workbench) { - gdImageFill(canvas, 0, 0, 0); - - for (int i = 0; i < 16; i++) - colors[i] = gdImageColorAllocate(canvas, workbench_palette[i*3], - workbench_palette[i*3+1], - workbench_palette[i*3+2]); + for (size_t i = 0; i < 16; i++) + colors[i] = gdImageColorAllocate(canvas, + workbench_palette_red[i], + workbench_palette_green[i], + workbench_palette_blue[i]); } else { /* Allocate standard ANSi color palette */ - for (int i = 0; i < 16; i++) - colors[i] = gdImageColorAllocate(canvas, ansi_palette[i*3], - ansi_palette[i*3+1], - ansi_palette[i*3+2]); + for (size_t i = 0; i < 16; i++) + colors[i] = gdImageColorAllocate(canvas, + ansi_palette_red[i], ansi_palette_green[i], + ansi_palette_blue[i]); } /* render ANSi */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libansilove-1.2.3/src/loaders/artworx.c new/libansilove-1.2.4/src/loaders/artworx.c --- old/libansilove-1.2.3/src/loaders/artworx.c 2020-05-25 18:47:27.000000000 +0200 +++ new/libansilove-1.2.4/src/loaders/artworx.c 2020-06-21 09:24:32.000000000 +0200 @@ -1,6 +1,6 @@ /* * artworx.c - * libansilove 1.2.3 + * libansilove 1.2.4 * https://www.ansilove.org * * Copyright (c) 2011-2020 Stefan Vogt, Brian Cassidy, and Frederic Cambus @@ -14,6 +14,7 @@ #include <stddef.h> #include <stdint.h> #include "ansilove.h" +#include "config.h" #include "drawchar.h" #include "output.h" @@ -44,11 +45,7 @@ return -1; } - /* ADF color palette array */ - uint32_t adf_colors[16] = { 0, 1, 2, 3, 4, 5, 20, 7, 56, 57, 58, 59, 60, 61, 62, 63 }; - - uint32_t loop; - uint32_t index; + size_t index, loop; /* process ADF palette */ for (loop = 0; loop < 16; loop++) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libansilove-1.2.3/src/loaders/binary.c new/libansilove-1.2.4/src/loaders/binary.c --- old/libansilove-1.2.3/src/loaders/binary.c 2020-05-25 18:47:27.000000000 +0200 +++ new/libansilove-1.2.4/src/loaders/binary.c 2020-06-21 09:24:32.000000000 +0200 @@ -1,6 +1,6 @@ /* * binary.c - * libansilove 1.2.3 + * libansilove 1.2.4 * https://www.ansilove.org * * Copyright (c) 2011-2020 Stefan Vogt, Brian Cassidy, and Frederic Cambus @@ -54,14 +54,14 @@ /* allocate color palette */ uint32_t colors[16]; - for (int i = 0; i < 16; i++) { - colors[i] = gdImageColorAllocate(canvas, vga_palette[i*3], - vga_palette[i*3+1], vga_palette[i*3+2]); + for (size_t i = 0; i < 16; i++) { + colors[i] = gdImageColorAllocate(canvas, vga_palette_red[i], + vga_palette_green[i], vga_palette_blue[i]); } /* process binary */ uint32_t character, attribute, background, foreground; - uint32_t loop = 0; + size_t loop = 0; int32_t column = 0, row = 0; while (loop < ctx->length) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libansilove-1.2.3/src/loaders/icedraw.c new/libansilove-1.2.4/src/loaders/icedraw.c --- old/libansilove-1.2.3/src/loaders/icedraw.c 2020-05-25 18:47:27.000000000 +0200 +++ new/libansilove-1.2.4/src/loaders/icedraw.c 2020-06-21 09:24:32.000000000 +0200 @@ -1,6 +1,6 @@ /* * icedraw.c - * libansilove 1.2.3 + * libansilove 1.2.4 * https://www.ansilove.org * * Copyright (c) 2011-2020 Stefan Vogt, Brian Cassidy, and Frederic Cambus @@ -42,8 +42,7 @@ /* libgd image pointers */ gdImagePtr canvas; - uint32_t loop = IDF_HEADER_LENGTH; - uint32_t index; + size_t index, loop = IDF_HEADER_LENGTH; uint32_t colors[16]; /* process IDF */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libansilove-1.2.3/src/loaders/pcboard.c new/libansilove-1.2.4/src/loaders/pcboard.c --- old/libansilove-1.2.3/src/loaders/pcboard.c 2020-05-25 18:47:27.000000000 +0200 +++ new/libansilove-1.2.4/src/loaders/pcboard.c 2020-06-21 09:24:32.000000000 +0200 @@ -1,6 +1,6 @@ /* * pcboard.c - * libansilove 1.2.3 + * libansilove 1.2.4 * https://www.ansilove.org * * Copyright (c) 2011-2020 Stefan Vogt, Brian Cassidy, and Frederic Cambus @@ -164,10 +164,9 @@ /* allocate color palette */ uint32_t colors[16]; - for (int i = 0; i < 16; i++) { - colors[i] = gdImageColorAllocate(canvas, ansi_palette[i*3], - ansi_palette[i*3+1], - ansi_palette[i*3+2]); + for (size_t i = 0; i < 16; i++) { + colors[i] = gdImageColorAllocate(canvas, ansi_palette_red[i], + ansi_palette_green[i], ansi_palette_blue[i]); } /* render PCB */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libansilove-1.2.3/src/loaders/tundra.c new/libansilove-1.2.4/src/loaders/tundra.c --- old/libansilove-1.2.3/src/loaders/tundra.c 2020-05-25 18:47:27.000000000 +0200 +++ new/libansilove-1.2.4/src/loaders/tundra.c 2020-06-21 09:24:32.000000000 +0200 @@ -1,6 +1,6 @@ /* * tundra.c - * libansilove 1.2.3 + * libansilove 1.2.4 * https://www.ansilove.org * * Copyright (c) 2011-2020 Stefan Vogt, Brian Cassidy, and Frederic Cambus @@ -68,7 +68,7 @@ /* read tundra file a first time to find the image size */ uint32_t cursor, character, background = 0, foreground = 0; - uint32_t loop = TUNDRA_HEADER_LENGTH; + size_t loop = TUNDRA_HEADER_LENGTH; int32_t column = 0, row = 1; while (loop < ctx->length) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libansilove-1.2.3/src/loaders/xbin.c new/libansilove-1.2.4/src/loaders/xbin.c --- old/libansilove-1.2.3/src/loaders/xbin.c 2020-05-25 18:47:27.000000000 +0200 +++ new/libansilove-1.2.4/src/loaders/xbin.c 2020-06-21 09:24:32.000000000 +0200 @@ -1,6 +1,6 @@ /* * xbin.c - * libansilove 1.2.3 + * libansilove 1.2.4 * https://www.ansilove.org * * Copyright (c) 2011-2020 Stefan Vogt, Brian Cassidy, and Frederic Cambus @@ -74,8 +74,7 @@ /* palette */ if ((xbin_flags & 1) == 1) { - uint32_t loop; - uint32_t index; + size_t index, loop; if (offset + XBIN_PALETTE_LENGTH > ctx->length) { ctx->error = ANSILOVE_FORMAT_ERROR; @@ -93,10 +92,10 @@ offset += XBIN_PALETTE_LENGTH; } else { - for (int i = 0; i < 16; i++) { + for (size_t i = 0; i < 16; i++) { colors[i] = gdImageColorAllocate(canvas, - vga_palette[i*3], vga_palette[i*3+1], - vga_palette[i*3+2]); + vga_palette_red[i], vga_palette_green[i], + vga_palette_blue[i]); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libansilove-1.2.3/src/loadfile.c new/libansilove-1.2.4/src/loadfile.c --- old/libansilove-1.2.3/src/loadfile.c 2020-05-25 18:47:27.000000000 +0200 +++ new/libansilove-1.2.4/src/loadfile.c 2020-06-21 09:24:32.000000000 +0200 @@ -1,6 +1,6 @@ /* * loadfile.c - * libansilove 1.2.3 + * libansilove 1.2.4 * https://www.ansilove.org * * Copyright (c) 2011-2020 Stefan Vogt, Brian Cassidy, and Frederic Cambus diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libansilove-1.2.3/src/output.c new/libansilove-1.2.4/src/output.c --- old/libansilove-1.2.3/src/output.c 2020-05-25 18:47:27.000000000 +0200 +++ new/libansilove-1.2.4/src/output.c 2020-06-21 09:24:32.000000000 +0200 @@ -1,6 +1,6 @@ /* * output.c - * libansilove 1.2.3 + * libansilove 1.2.4 * https://www.ansilove.org * * Copyright (c) 2011-2020 Stefan Vogt, Brian Cassidy, and Frederic Cambus diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libansilove-1.2.3/src/output.h new/libansilove-1.2.4/src/output.h --- old/libansilove-1.2.3/src/output.h 2020-05-25 18:47:27.000000000 +0200 +++ new/libansilove-1.2.4/src/output.h 2020-06-21 09:24:32.000000000 +0200 @@ -1,6 +1,6 @@ /* * output.h - * libansilove 1.2.3 + * libansilove 1.2.4 * https://www.ansilove.org * * Copyright (c) 2011-2020 Stefan Vogt, Brian Cassidy, and Frederic Cambus diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libansilove-1.2.3/src/savefile.c new/libansilove-1.2.4/src/savefile.c --- old/libansilove-1.2.3/src/savefile.c 2020-05-25 18:47:27.000000000 +0200 +++ new/libansilove-1.2.4/src/savefile.c 2020-06-21 09:24:32.000000000 +0200 @@ -1,6 +1,6 @@ /* * savefile.c - * libansilove 1.2.3 + * libansilove 1.2.4 * https://www.ansilove.org * * Copyright (c) 2011-2020 Stefan Vogt, Brian Cassidy, and Frederic Cambus
