Merge branch 'release-1.3'

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.3.3.
+# Generated by GNU Autoconf 2.69 for sixel 1.3.4.
 #
 # Report bugs to <user@zuse.jp>.
 #
@@ -589,8 +589,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='sixel'
 PACKAGE_TARNAME='sixel'
-PACKAGE_VERSION='1.3.3'
-PACKAGE_STRING='sixel 1.3.3'
+PACKAGE_VERSION='1.3.4'
+PACKAGE_STRING='sixel 1.3.4'
 PACKAGE_BUGREPORT='user@zuse.jp'
 PACKAGE_URL=''
 
@@ -1364,7 +1364,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.3.3 to adapt to many kinds of systems.
+\`configure' configures sixel 1.3.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1434,7 +1434,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of sixel 1.3.3:";;
+     short | recursive ) echo "Configuration of sixel 1.3.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1571,7 +1571,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-sixel configure 1.3.3
+sixel configure 1.3.4
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1986,7 +1986,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.3.3, which was
+It was created by sixel $as_me 1.3.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2929,7 +2929,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='sixel'
- VERSION='1.3.3'
+ VERSION='1.3.4'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -14197,15 +14197,15 @@ fi
           touch aclocal.m4 Makefile.in */Makefile.in configure config.h.in
 
 
- if test x$have_jpeg == xyes; then
+ if test x$have_jpeg = xyes; then
   HAVE_JPEG_TRUE=
   HAVE_JPEG_FALSE='#'
 else
   HAVE_JPEG_TRUE='#'
   HAVE_JPEG_FALSE=
 fi
 
- if test x$have_png == xyes; then
+ if test x$have_png = xyes; then
   HAVE_PNG_TRUE=
   HAVE_PNG_FALSE='#'
 else
@@ -14775,7 +14775,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.3.3, which was
+This file was extended by sixel $as_me 1.3.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14841,7 +14841,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.3.3
+sixel config.status 1.3.4
 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.3.3], [user@zuse.jp])
+AC_INIT([sixel], [1.3.4], [user@zuse.jp])
 LS_LT_CURRENT=1
 LS_LT_REVISION=2
 LS_LT_AGE=0
@@ -367,8 +367,8 @@ AC_DEFUN([LS_UPDATE_TIMESTAMP], [
           ])
 LS_UPDATE_TIMESTAMP
 
-AM_CONDITIONAL([HAVE_JPEG], [test x$have_jpeg == xyes])
-AM_CONDITIONAL([HAVE_PNG], [test x$have_png == xyes])
+AM_CONDITIONAL([HAVE_JPEG], [test x$have_jpeg = xyes])
+AM_CONDITIONAL([HAVE_PNG], [test x$have_png = xyes])
 
 AC_CONFIG_FILES([Makefile
                  libsixel.pc

converters/frompnm.c

@@ -137,14 +137,23 @@ load_pnm(unsigned char *p, int len, int *psx, int *psy, int *pcomp, int *pstride
                         s = tmp;
                     }
                     n = 0;
-                    while (isdigit(*s) && n >= 0)
-                        n = n * 10 + (*s++ - '0');
-                    while (*s == ' ')
-                        s++;
+                    if (maps == 0) {
+                        n = *s++ == '0';
+                    } else {
+                        while (isdigit(*s) && n >= 0)
+                            n = n * 10 + (*s++ - '0');
+                        while (*s == ' ')
+                            s++;
+                    }
                 } else {
                     if (p >= e)
                         break;
-                    n = *(p++);
+                    if (maps == 0) {
+                        n = ((*p << (x & 0x7) >> 0x7) & 1) == 0;
+                        if ((x & 0x7) == 0x7) p++;
+                    } else {
+                        n = *(p++);
+                    }
                 }
                 c[i] = n;
             }

converters/loader.c

@@ -507,6 +507,7 @@ load_with_builtin(chunk_t const *pchunk, int *psx, int *psy,
         *psy = png_get_image_height(png_ptr, info_ptr);
         bitdepth = png_get_bit_depth(png_ptr, info_ptr);
         *pcomp = png_get_channels(png_ptr, info_ptr);
+        *pframe_count = 1;
 
         switch (png_get_color_type(png_ptr, info_ptr)) {
         case PNG_COLOR_TYPE_PALETTE:
@@ -639,6 +640,7 @@ load_with_gdkpixbuf(chunk_t const *pchunk, int *psx, int *psy,
         *psy = gdk_pixbuf_get_height(pixbuf);
         *pcomp = gdk_pixbuf_get_has_alpha(pixbuf) ? 4: 3;
         *pstride = gdk_pixbuf_get_rowstride(pixbuf);
+        *pframe_count = 1;
         memory_write((void *)p, 1, *psx * *psy * *pcomp, (void *)&frames);
         pixels = frames.buffer;
     } else {

package.json

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