Merge branch 'release-1.1'

ChangeLog

@@ -1,3 +1,11 @@
+2014-10-07  Hayaki Saito <user@zuse.jp>
+
+  * converters/img2sixel.c: Fix for animation GIF quality degradation
+
+2014-10-06  Hayaki Saito <user@zuse.jp>
+
+  * LICENSE.sixel, README.md: Add a mention about the License of kmiya's sixel
+
 2014-10-05  Hayaki Saito <user@zuse.jp>
 
   * converters/stb_image.h: Skip an unknown code(0x3c) at GIF decoder

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for sixel 1.1.4.
+# Generated by GNU Autoconf 2.69 for sixel 1.1.5.
 #
 # Report bugs to <user@zuse.jp>.
 #
@@ -589,8 +589,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='sixel'
 PACKAGE_TARNAME='sixel'
-PACKAGE_VERSION='1.1.4'
-PACKAGE_STRING='sixel 1.1.4'
+PACKAGE_VERSION='1.1.5'
+PACKAGE_STRING='sixel 1.1.5'
 PACKAGE_BUGREPORT='user@zuse.jp'
 PACKAGE_URL=''
 
@@ -1350,7 +1350,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures sixel 1.1.4 to adapt to many kinds of systems.
+\`configure' configures sixel 1.1.5 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1420,7 +1420,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of sixel 1.1.4:";;
+     short | recursive ) echo "Configuration of sixel 1.1.5:";;
    esac
   cat <<\_ACEOF
 
@@ -1551,7 +1551,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-sixel configure 1.1.4
+sixel configure 1.1.5
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1966,7 +1966,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by sixel $as_me 1.1.4, which was
+It was created by sixel $as_me 1.1.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2909,7 +2909,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='sixel'
- VERSION='1.1.4'
+ VERSION='1.1.5'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -14509,7 +14509,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by sixel $as_me 1.1.4, which was
+This file was extended by sixel $as_me 1.1.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14575,7 +14575,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-sixel config.status 1.1.4
+sixel config.status 1.1.5
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.60])
 LT_PREREQ([2.4])
-AC_INIT([sixel], [1.1.4], [user@zuse.jp])
+AC_INIT([sixel], [1.1.5], [user@zuse.jp])
 LS_LT_CURRENT=1
 LS_LT_REVISION=0
 LS_LT_AGE=1

converters/img2sixel.c

@@ -413,16 +413,15 @@ convert_to_sixel(char const *filename, settings_t *psettings)
     }
 
     frames = malloc(sizeof(unsigned char *) * frame_count);
-
     if (frames == NULL) {
         nret = -1;
         goto end;
     }
 
-    frame = pixels;
+    p = pixels;
     for (n = 0; n < frame_count; ++n) {
-        frames[n] = frame;
-        frame += sx * sy * 3;
+        frames[n] = p;
+        p += sx * sy * 3;
     }
 
     if (psettings->clipfirst) {
@@ -506,6 +505,7 @@ convert_to_sixel(char const *filename, settings_t *psettings)
 
             nret = sixel_encode(frames[n], sx, sy, 3, dither, context);
             if (nret != 0) {
+                free(p);
                 goto end;
             }
 
@@ -587,6 +587,11 @@ convert_to_sixel(char const *filename, settings_t *psettings)
         /* create output context */
         context = sixel_output_create(sixel_write_callback, stdout);
         sixel_output_set_8bit_availability(context, psettings->f8bit);
+        p = malloc(sx * sy * 3);
+        if (nret != 0) {
+            goto end;
+        }
+
         for (c = 0; c != loop_count; ++c) {
             for (n = 0; n < frame_count; ++n) {
                 if (frame_count > 1) {
@@ -614,7 +619,8 @@ convert_to_sixel(char const *filename, settings_t *psettings)
 #endif
                 }
 
-                nret = sixel_encode(frames[n], sx, sy, 3, dither, context);
+                memcpy(p, frames[n], sx * sy * 3);
+                nret = sixel_encode(p, sx, sy, 3, dither, context);
                 if (nret != 0) {
                     goto end;
                 }
@@ -653,6 +659,7 @@ convert_to_sixel(char const *filename, settings_t *psettings)
     free(pixels);
     free(delays);
     free(mappixels);
+    free(p);
 
     return nret;
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "libsixel",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "repo": "saitoha/libsixel",
   "description": "A lightweight, fast implementation of DEC SIXEL graphics codec",
   "keywords": ["terminal", "graphics", "image", "sixel"],