Merge branch 'release-1.1'

.gitignore

@@ -53,6 +53,8 @@ stamp-h1
 wic_install.reg
 wic_uninstall.reg
 libsixel.pc
+package.json.in
+include/sixel.h
 converters/snake.png
 converters/img2sixel
 converters/sixel2png

ChangeLog

@@ -1,15 +1,159 @@
+2014-10-01  Hayaki Saito <user@zuse.jp>
+
+  * configure, configure.ac: Update libtool micro version
+
+  * configure, configure.ac, package.json: Bump version
+
+  * Makefile.am, Makefile.in, configure, configure.ac, package.json.in,
+  package.json.in.in: Issue #7: prevent to erase package.json in "make
+  distclean" target
+
+  * Makefile.am, Makefile.in: Issue #7: Add test.log to CLEANFILES
+
+  * converters/Makefile.am, converters/Makefile.in: Issue #7: correct wrong
+  CLEANFILES definition
+
+2014-09-28  Hayaki Saito <user@zuse.jp>
+
+  * src/Makefile.am, src/Makefile.in, src/dither.c, src/dither.h, src/image.c,
+  src/image.h, src/tosixel.c: Drop sixel_image_t object and related functions
+
+2014-09-26  Hayaki Saito <user@zuse.jp>
+
+  * sixel_orig/Makefile, sixel_orig/frompnm.c, sixel_orig/fromsixel.c,
+  sixel_orig/main.c, sixel_orig/tosixel.c: Remove original sixel (kmiya's
+  sixel), Mirror repo is now here: https://github.com/saitoha/sixel
+
+  * converters/img2sixel.c, src/dither.c, src/image.c: Fix Issue #6: Remove
+  unnecessary null pointer checks
+
+2014-09-25  Hayaki Saito <user@zuse.jp>
+
+  * configure, configure.ac, package.json: Update version
+
+  * converters/sixel2png.c, src/image.c: Issue #5: Completion of error handling
+
 2014-09-24  Hayaki Saito <user@zuse.jp>
 
-  * converters/img2sixel.c: Do cropping after resizing by changing the order of arguments
-  * converters/shell-completion/zsh/_img2sixel: Update zsh completion file
-  * converters/shell-completion/bash/img2sixel: Update bash completion file
+  * README.md, converters/img2sixel.1, converters/img2sixel.c: Fix typos
+
+  * configure, configure.ac, package.json: Bump version
 
 2014-09-23  Hayaki Saito <user@zuse.jp>
 
-  * converters/img2sixel.c: Add --crop option
+  * README.md, converters/img2sixel.1, converters/img2sixel.c: Update documents
+
+  * data/w3m-sixel.png, data/xsdl.png, data/xsixel.png: Add some images
+
+  * configure, configure.ac: Bump version
+
+2014-09-02  Hayaki Saito <user@zuse.jp>
+
+  * config.h.in, configure, configure.ac, package.json: v1.0.3 revert
+  stb_image.h to 1.41
+
+  * configure, configure.ac, package.json: v1.0.3 revert stb_image.h to 1.41
+
+  * README.md, converters/stb_image.h: Revert stb_image.h to 1.41 for
+  preventing segfault
+
+2014-08-29  Hayaki Saito <user@zuse.jp>
+
+  * data/qemu.png, data/wesnoth.png: Add some images for README
+
+  * configure, configure.ac, package.json: Update version
+
+2014-08-25  Hayaki Saito <user@zuse.jp>
+
+  * README.md, converters/stb_image.h: Update stb_image.h version to 1.44
+
+2014-08-23  Hayaki Saito <user@zuse.jp>
+
+  * configure, configure.ac, package.json: Bump version
+
+  * src/dither.c, src/quant.c: Don't create cache table when it is not needed
+
+2014-08-17  Hayaki Saito <user@zuse.jp>
+
+  * src/dither.c, src/dither.h, src/quant.c, src/quant.h: Add quant.h and fix
+  signature confusion of some functions
+
+  * README.md, data/ffmpeg.png: Update README
+
+  * configure, configure.ac, package.json: Bump version: 1.0.0
+
+  * README.md, data/example_opengl.gif, examples/osx/opengl/Makefile,
+  examples/osx/opengl/opengl, include/sixel.h.in: Update README
+
+  * Makefile.in, aclocal.m4, configure, configure.ac, converters/Makefile.in,
+  converters/img2sixel.c, converters/sixel2png.c, examples/osx/opengl/opengl,
+  examples/osx/opengl/opengl.c, include/Makefile.in, include/sixel.h.in,
+  src/Makefile.in, src/dither.c, src/dither.h, src/fromsixel.c, src/image.c,
+  src/image.h, src/output.c, src/quant.c, src/tosixel.c: ABI version 1.0.0
+
+  * src/dither.c, src/dither.h: Add missing files
+
+  * configure, configure.ac, converters/img2sixel.c,
+  examples/osx/opengl/opengl, examples/osx/opengl/opengl.c, include/sixel.h.in,
+  src/Makefile.am, src/Makefile.in, src/image.c, src/output.c, src/quant.c,
+  src/tosixel.c: ABI version 0.3.0
+
+2014-08-16  Hayaki Saito <user@zuse.jp>
+
+  * include/sixel.h.in, src/quant.c: Performance optimization
+
+  * converters/img2sixel.c, examples/osx/opengl/opengl.c, include/sixel.h.in,
+  src/quant.c: Minor update
+
+  * converters/img2sixel.c, converters/loader.c, include/sixel.h,
+  include/sixel.h.in, src/quant.c: Add new function sixel_dither_get
+
+  * converters/img2sixel.c, converters/sixel2png.c, examples/osx/opengl/opengl,
+  examples/osx/opengl/opengl.c, include/sixel.h, include/sixel.h.in,
+  src/image.c, src/quant.c, src/tosixel.c: Update interface symbols
+
+  * src/quant.c, src/tosixel.c: Minor fix
+
+2014-08-15  Hayaki Saito <user@zuse.jp>
+
+  * Makefile.in, README.md, aclocal.m4, config.h.in, configure, configure.ac,
+  converters/Makefile.in, include/Makefile.in, include/sixel.h,
+  include/sixel.h.in, m4/ax_gcc_func_attribute.m4, m4/ax_gcc_var_attribute.m4,
+  src/Makefile.in: Add deprecated attribute to some functions
+
+  * configure, configure.ac, converters/img2sixel.c, converters/loader.c,
+  include/sixel.h, src/image.c, src/quant.c, src/tosixel.c: ABI version 0.2.0
+
+  * examples/osx/opengl/opengl, examples/osx/opengl/opengl.c: Add an example:
+  opengl test
+
+2014-08-07  Hayaki Saito <user@zuse.jp>
+
+  * config.h.in, configure, configure.ac, include/sixel.h, src/output.c,
+  src/tosixel.c: +
+
+  * src/quant.c, src/tosixel.c: Minor fixes
+
+2014-08-06  Hayaki Saito <user@zuse.jp>
+
+  * converters/img2sixel.c, include/sixel.h, src/quant.c: Allocate cache table
+  only once to improve performance
+
+  * converters/img2sixel.c, include/sixel.h, src/quant.c: Minor fix of applying
+  palette
+
+2014-08-04  Hayaki Saito <user@zuse.jp>
+
+  * Makefile.am, Makefile.in: Minor fix
+
+  * Makefile.am, Makefile.in: Update .travis.yml
 
 2014-08-03  Hayaki Saito <user@zuse.jp>
 
+  * configure, configure.ac, converters/Makefile.am, converters/Makefile.in,
+  converters/img2sixel.c, converters/quant.c, include/sixel.h, src/Makefile.am,
+  src/Makefile.in, src/quant.c: Move quantization APIs to library domain
+
   * README.md, converters/img2sixel.c, converters/sixel2png.c: Add --version
   and --help option
 

LICENSE.stb

@@ -1,7 +1,11 @@
 
 This software includes some part of stb(https://github.com/nothings/stb),
 
-- stb_image.h: public domain JPEG/PNG reader.
-- stb_image_write.h: public domain PNG/BMP/TGA writer.
+- converters/stb_image.h: public domain JPEG/PNG reader.
+- converters/stb_image_write.h: public domain PNG/BMP/TGA writer.
+
+These great works is written by Sean Barrett(@nothings) and some contributers.
+
+Hayaki Saito(@saitoha) applied a small fix(patches/applied/stb_image.h.diff) for stb_image.h.
+That patch is also in public domain.
 
-These great works is written by @nothings and some contributers.

Makefile.am

@@ -7,7 +7,10 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 pkgconfigdir = @pkgconfigdir@
 pkgconfig_DATA = libsixel.pc
 
-CLEANFILES = valgrind.log
+CLEANFILES = valgrind.log test.log
+
+all-am:
+	cp package.json.in package.json
 
 test: all
 	$(MAKE) test -C converters > test.log

Makefile.in

@@ -82,7 +82,7 @@ subdir = .
 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 ChangeLog compile config.guess \
+	$(srcdir)/package.json.in.in ChangeLog compile 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 \
@@ -96,7 +96,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = libsixel.pc package.json
+CONFIG_CLEAN_FILES = libsixel.pc package.json.in
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -362,7 +362,7 @@ SUBDIRS = include src converters
 DIST_SUBDIRS = $(SUBDIRS)
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 pkgconfig_DATA = libsixel.pc
-CLEANFILES = valgrind.log
+CLEANFILES = valgrind.log test.log
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -418,7 +418,7 @@ distclean-hdr:
 	-rm -f config.h stamp-h1
 libsixel.pc: $(top_builddir)/config.status $(srcdir)/libsixel.pc.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
-package.json: $(top_builddir)/config.status $(srcdir)/package.json.in
+package.json.in: $(top_builddir)/config.status $(srcdir)/package.json.in.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 
 mostlyclean-libtool:
@@ -874,6 +874,9 @@ uninstall-am: uninstall-pkgconfigDATA
 	uninstall-am uninstall-pkgconfigDATA
 
 
+all-am:
+	cp package.json.in package.json
+
 test: all
 	$(MAKE) test -C converters > test.log
 

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.2.
+# Generated by GNU Autoconf 2.69 for sixel 1.1.3.
 #
 # 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.2'
-PACKAGE_STRING='sixel 1.1.2'
+PACKAGE_VERSION='1.1.3'
+PACKAGE_STRING='sixel 1.1.3'
 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.2 to adapt to many kinds of systems.
+\`configure' configures sixel 1.1.3 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.2:";;
+     short | recursive ) echo "Configuration of sixel 1.1.3:";;
    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.2
+sixel configure 1.1.3
 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.2, which was
+It was created by sixel $as_me 1.1.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2316,7 +2316,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 LS_LT_CURRENT=1
 LS_LT_REVISION=0
-LS_LT_AGE=0
+LS_LT_AGE=1
 LS_LTVERSION=$LS_LT_CURRENT:$LS_LT_REVISION:$LS_LT_AGE
 
 PACKAGE_DESCRIPTION="A lightweight, fast implementation of DEC SIXEL graphics codec"
@@ -2909,7 +2909,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='sixel'
- VERSION='1.1.2'
+ VERSION='1.1.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -13960,7 +13960,7 @@ fi
           touch aclocal.m4 Makefile.in */Makefile.in configure config.h.in
 
 
-ac_config_files="$ac_config_files Makefile libsixel.pc package.json include/sixel.h src/Makefile include/Makefile converters/Makefile"
+ac_config_files="$ac_config_files Makefile libsixel.pc package.json.in include/sixel.h src/Makefile include/Makefile converters/Makefile"
 
 
 cat >confcache <<\_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.2, which was
+This file was extended by sixel $as_me 1.1.3, 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.2
+sixel config.status 1.1.3
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -14986,7 +14986,7 @@ do
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "libsixel.pc") CONFIG_FILES="$CONFIG_FILES libsixel.pc" ;;
-    "package.json") CONFIG_FILES="$CONFIG_FILES package.json" ;;
+    "package.json.in") CONFIG_FILES="$CONFIG_FILES package.json.in" ;;
     "include/sixel.h") CONFIG_FILES="$CONFIG_FILES include/sixel.h" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;

configure.ac

@@ -3,10 +3,10 @@
 
 AC_PREREQ([2.60])
 LT_PREREQ([2.4])
-AC_INIT([sixel], [1.1.2], [user@zuse.jp])
+AC_INIT([sixel], [1.1.3], [user@zuse.jp])
 LS_LT_CURRENT=1
 LS_LT_REVISION=0
-LS_LT_AGE=0
+LS_LT_AGE=1
 AC_SUBST([LS_LTVERSION], [$LS_LT_CURRENT:$LS_LT_REVISION:$LS_LT_AGE])
 AC_SUBST([PACKAGE_DESCRIPTION],
          ["A lightweight, fast implementation of DEC SIXEL graphics codec"])
@@ -296,7 +296,7 @@ LS_UPDATE_TIMESTAMP
 
 AC_CONFIG_FILES([Makefile
                  libsixel.pc
-                 package.json
+                 package.json.in
                  include/sixel.h
                  src/Makefile
                  include/Makefile

converters/Makefile.am

@@ -13,7 +13,7 @@ if COND_GCOV
 MAYBE_COVERAGE = --coverage
 endif
 
-CLEANFILES = *.gcno *.gcda *.gcov snake.png snake.sixel
+CLEANFILES = *.gcno *.gcda *.gcov snake1.png snake2.png snake2.sixel
 
 if WANT_IMG2SIXEL
 bin_PROGRAMS += img2sixel

converters/Makefile.in

@@ -416,7 +416,7 @@ dist_man_MANS = $(am__append_2) $(am__append_6)
 dist_bashcompletion_DATA = $(am__append_3)
 dist_zshcompletion_DATA = $(am__append_4)
 @COND_GCOV_TRUE@MAYBE_COVERAGE = --coverage
-CLEANFILES = *.gcno *.gcda *.gcov snake.png snake.sixel
+CLEANFILES = *.gcno *.gcda *.gcov snake1.png snake2.png snake2.sixel
 @WANT_IMG2SIXEL_TRUE@img2sixel_SOURCES = img2sixel.c scale.c malloc_stub.c loader.c frompnm.c \
 @WANT_IMG2SIXEL_TRUE@                    scale.h malloc_stub.h loader.h frompnm.h