Merge branch 'develop' into fix-issue-39

Conflicts:
	src/loader.c

.travis.yml

@@ -39,7 +39,7 @@ before_script:
 script:
   - "make"
   - "sudo make install"
-  - "make test | tee log | grep succeeded || (cat log|tail -n100; exit 1)"
+  - "make test | tee log | grep succeeded || (cat log|tail -n5; exit 1)"
 
 after_success:
   - "make valgrind || (cat valgrind.log && exit 1)"

ChangeLog

@@ -1,3 +1,36 @@
+2015-03-07  Hayaki Saito <user@zuse.jp>
+
+  * converters/frompnm.c, converters/frompnm.h, converters/loader.c: Resolve
+  confliction of parameter declarations of load_pnm(), reported by @tautschnig.
+  (for Issue #40)
+
+2015-03-05  Hayaki Saito <user@zuse.jp>
+
+  * converters/stb_image.h: Parse GIF application extension block correctly
+  (Issue #39)
+
+2015-02-28  Hayaki Saito <user@zuse.jp>
+
+  * configure, configure.ac, package.json: Update package version to 1.4.9
+
+  * converters/loader.c: Workaround for libpng 1.2 with grayscale-alpha PNG
+  (for Issue #36)
+
+2015-02-27  saitoha <user@zuse.jp>
+
+  * converters/loader.c: Workaround for libpng 1.2 (for Issue #34)
+
+2015-02-25  Hayaki Saito <user@zuse.jp>
+
+  * Makefile.in, converters/loader.c: Fix broken -p option with 8bpp grayscale
+  PNG (concerned with Issue #34)
+
+  * Makefile.in, converters/loader.c: Fix broken -p option with 8bpp grayscale
+  PNG (concerned with Issue #34)
+
+  * converters/loader.c: Fix broken resize option(-w/-h) with 1/2/4bpp
+  grayscale png (for Issue #34)
+
 2015-02-18  Hayaki Saito <user@zuse.jp>
 
   * converters/loader.c: Call png_set_strip_alpha() when expanding paletted PNG

Makefile.in

@@ -83,7 +83,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/configure $(am__configure_deps) \
 	$(srcdir)/config.h.in $(srcdir)/libsixel.pc.in \
 	$(srcdir)/package.json.in.in ChangeLog NEWS compile \
-	config.guess config.sub install-sh missing ltmain.sh
+	config.guess config.sub depcomp install-sh missing ltmain.sh
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_gcc_func_attribute.m4 \
 	$(top_srcdir)/m4/ax_gcc_var_attribute.m4 \

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.4.8.
+# Generated by GNU Autoconf 2.69 for sixel 1.4.10.
 #
 # Report bugs to <user@zuse.jp>.
 #
@@ -589,8 +589,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='sixel'
 PACKAGE_TARNAME='sixel'
-PACKAGE_VERSION='1.4.8'
-PACKAGE_STRING='sixel 1.4.8'
+PACKAGE_VERSION='1.4.10'
+PACKAGE_STRING='sixel 1.4.10'
 PACKAGE_BUGREPORT='user@zuse.jp'
 PACKAGE_URL=''
 
@@ -1371,7 +1371,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.4.8 to adapt to many kinds of systems.
+\`configure' configures sixel 1.4.10 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1441,7 +1441,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of sixel 1.4.8:";;
+     short | recursive ) echo "Configuration of sixel 1.4.10:";;
    esac
   cat <<\_ACEOF
 
@@ -1581,7 +1581,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-sixel configure 1.4.8
+sixel configure 1.4.10
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1996,7 +1996,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.4.8, which was
+It was created by sixel $as_me 1.4.10, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2939,7 +2939,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='sixel'
- VERSION='1.4.8'
+ VERSION='1.4.10'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -15457,7 +15457,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.4.8, which was
+This file was extended by sixel $as_me 1.4.10, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15523,7 +15523,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.4.8
+sixel config.status 1.4.10
 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.4.8], [user@zuse.jp])
+AC_INIT([sixel], [1.4.10], [user@zuse.jp])
 LS_LT_CURRENT=1
 LS_LT_REVISION=3
 LS_LT_AGE=0

package.json

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

src/frompnm.c

@@ -26,6 +26,7 @@
 #include <ctype.h>
 #include <sixel.h>
 
+
 static unsigned char *
 pnm_get_line(unsigned char *p, unsigned char *end, unsigned char *line)
 {

src/loader.c

@@ -295,7 +295,7 @@ load_jpeg(unsigned char *data,
     jpeg_start_decompress(&cinfo);
 
     if (cinfo.output_components != 3) {
-        fprintf(stderr, "load_jpeg() failed(unknwon format).\n");
+        fprintf(stderr, "load_jpeg() failed(unknown format).\n");
         goto end;
     }
 
@@ -999,13 +999,15 @@ load_with_builtin(
         *pstride = *psx * depth;
 
         switch (depth) {
+        case 1:
         case 3:
+        case 4:
             *ppixelformat = PIXELFORMAT_RGB888;
             break;
         default:
             stbi_image_free(pixels);
             fprintf(stderr, "load_with_builtin() failed.\n"
-                            "reason: unknwon pixel-format.\n");
+                            "reason: unknown pixel-format.(depth: %d)\n", depth);
             return NULL;
         }
     }