Merge branch 'release-1.3' into feature-libpng-integration

.travis.yml

@@ -2,19 +2,21 @@
 language: c
 
 env:
-  - XCC=clang HOST= WINE=
-  - XCC=gcc HOST= WINE=
-  - XCC=i686-w64-mingw32-gcc HOST="--host=i686-w64-mingw32" WINE=wine
-  - XCC=i586-mingw32msvc-gcc HOST="--host=i586-mingw32msvc" WINE=wine
-  - XCC=x86_64-w64-mingw32-gcc HOST="--host=x86_64-w64-mingw32" WINE=wine64
-  - XCC=clang HOST= WINE= GDKPIXBUF="--with-gdk-pixbuf2"
-  - XCC=clang HOST= WINE= LIBCURL="--with-libcurl"
-  - XCC=clang HOST= WINE= GD="--with-gd"
-  - XCC=clang HOST= WINE= GDKPIXBUF="--with-gdk-pixbuf2" LIBCURL="--with-libcurl"
-  - XCC=clang HOST= WINE= GD="--with-gd" LIBCURL="--with-libcurl"
-  - XCC=clang HOST= WINE= GDKPIXBUF="--with-gdk-pixbuf2" GD="--with-gd"
-  - XCC=clang HOST= WINE= GDKPIXBUF="--with-gdk-pixbuf2" GD="--with-gd" LIBCURL="--with-libcurl"
-  - XCC=clang HOST= WINE= GDKPIXBUF="--with-gdk-pixbuf2" GD="--with-gd" LIBCURL="--with-libcurl" GCOV="--enable-gcov" STATIC="--disable-shared"
+  - XCC=clang HOST= PREFIX=/usr WINE= LIBCURL=--without-libcurl JPEG=--without-jpeg PNG=--without-png
+  - XCC=gcc HOST= PREFIX=/usr WINE= LIBCURL=--without-libcurl JPEG=--without-jpeg PNG=--without-png
+  - XCC=i686-w64-mingw32-gcc CROSS_COMPILE="yes" HOST="--host=i686-w64-mingw32" PREFIX="/usr/i686-w64-mingw32" WINE=wine
+  - XCC=i586-mingw32msvc-gcc CROSS_COMPILE="yes" HOST="--host=i586-mingw32msvc" PREFIX="/usr/i586-mingw32msvc" WINE=wine
+  - XCC=x86_64-w64-mingw32-gcc CROSS_COMPILE="yes" HOST="--host=x86_64-w64-mingw32" PREFIX="/usr/x86_64-w64-mingw32" WINE=wine64
+  - XCC=clang HOST= PREFIX=/usr WINE= JPEG="--with-jpeg"
+  - XCC=clang HOST= PREFIX=/usr WINE= PNG="--with-png"
+  - XCC=clang HOST= PREFIX=/usr WINE= GDKPIXBUF="--with-gdk-pixbuf2" JPEG=--without-jpeg PNG=--without-png
+  - XCC=clang HOST= PREFIX=/usr WINE= LIBCURL="--with-libcurl" JPEG=--without-jpeg PNG=--without-png
+  - XCC=clang HOST= PREFIX=/usr WINE= GD="--with-gd" JPEG=--without-jpeg PNG=--without-png
+  - XCC=clang HOST= PREFIX=/usr WINE= GDKPIXBUF="--with-gdk-pixbuf2" LIBCURL="--with-libcurl" JPEG=--without-jpeg PNG=--without-png
+  - XCC=clang HOST= PREFIX=/usr WINE= GD="--with-gd" LIBCURL="--with-libcurl" JPEG=--without-jpeg PNG=--without-png
+  - XCC=clang HOST= PREFIX=/usr WINE= GDKPIXBUF="--with-gdk-pixbuf2" GD="--with-gd" JPEG=--without-jpeg PNG=--without-png
+  - XCC=clang HOST= PREFIX=/usr WINE= GDKPIXBUF="--with-gdk-pixbuf2" GD="--with-gd" LIBCURL="--with-libcurl" JPEG=--without-jpeg PNG=--without-png
+  - XCC=clang HOST= PREFIX=/usr WINE= JPEG="--with-jpeg" PNG="--with-png" GDKPIXBUF="--with-gdk-pixbuf2" GD="--with-gd" LIBCURL="--with-libcurl" GCOV="--enable-gcov" STATIC="--disable-shared"
 
 before_install:
   - "sudo apt-get -qq update --force-yes > /dev/null"
@@ -32,8 +34,7 @@ before_install:
   - "if [ x$GCOV != x ]; then sudo pip install cpp-coveralls pyyaml; fi"
 
 before_script:
-  - "echo ./configure --prefix=/usr ${HOST} ${GDKPIXBUF} ${GD} ${LIBCURL} ${GCOV} ${STATIC}"
-  - "CC=$XCC ./configure --prefix=/usr ${HOST} ${GDKPIXBUF} ${GD} ${LIBCURL} ${GCOV} ${STATIC}"
+  - "CC=$XCC cross_compile=${CROSS_COMPILE} ./configure --prefix=${PREFIX} ${HOST} ${GDKPIXBUF} ${GD} ${LIBCURL} ${GCOV} ${STATIC}"
 
 script:
   - "make"
@@ -52,3 +53,4 @@ script:
 
 after_success:
   - "if [ x$WINE = x ]; then make valgrind && exit 0 || cat valgrind.log && exit 1; fi"
+  - "make coveralls"

ChangeLog

@@ -1,3 +1,166 @@
+2014-10-25  Hayaki Saito <user@zuse.jp>
+
+  * configure, configure.ac: Don't terminate configure process if
+  --with-libcurl=auto
+
+  * configure, configure.ac: Don't check pkg-config availability if
+  $cross_compile == yes
+
+  * Makefile.in, configure, configure.ac, converters/Makefile.in,
+  include/Makefile.in, src/Makefile.in: Use $PKG_CONFIG environment variable
+  instead of $have_pkg_config
+
+  * configure, configure.ac: Don't use system pkg-config if $cross_compile ==
+  "yes"
+
+  * configure, configure.ac: Checks zlib availability with libpng, workaround
+  for MinGW build
+
+  * README.md, configure, configure.ac: Links libcurl automatically
+
+  * Makefile.in, NEWS, configure, configure.ac, converters/Makefile.am,
+  converters/Makefile.in, include/Makefile.in, src/Makefile.in: Build with
+  libjpeg/libpng automatically
+
+  * converters/loader.c: Strip alpha in png loader
+
+2014-10-22  Hayaki Saito <user@zuse.jp>
+
+  * Makefile.am, Makefile.in, converters/Makefile.am, converters/Makefile.in,
+  images/snake.png: Add test for loading png with libpng
+
+  * configure, configure.ac, converters/Makefile.am, converters/Makefile.in,
+  images/snake-progressive.jpg: Add a test for loading progressive jpeg
+
+2014-10-20  Hayaki Saito <user@zuse.jp>
+
+  * configure, configure.ac, include/sixel.h.in, src/dither.c, src/dither.h,
+  src/tosixel.c: Add new API, sixel_dither_set_body_only
+
+  * converters/img2sixel.c: Update usage
+
+  * configure: Minor fix
+
+  * configure, configure.ac: Minor fix
+
+  * configure.ac: Fix build error
+
+  * converters/loader.c: Fix build error
+
+  * converters/loader.c: Use libpng reader
+
+  * Makefile.in, config.h.in, configure, configure.ac, converters/Makefile.am,
+  converters/Makefile.in, include/Makefile.in, src/Makefile.in: Add --with-png
+  configure option
+
+  * LICENSE.xterm, README.md, src/fromsixel.c: Fix wrong HLS-to-RGB conversion
+  routine
+
+2014-10-18  Hayaki Saito <user@zuse.jp>
+
+  * converters/img2sixel.c: Introduce --verbose option
+
+  * src/fromsixel.c: Rename some functions as snake case
+
+  * src/fromsixel.c: Rename some functions as snake case
+
+2014-10-17  Hayaki Saito <user@zuse.jp>
+
+  * src/tosixel.c: Omit DCS parameters by default
+
+  * src/tosixel.c: Strip an extra DECGNL character at the end of output data
+
+  * src/tosixel.c: Strip an extra LF character from output data
+
+  * converters/loader.c: Suppress gdk-pixbuf assersion on processing some GIF
+  images, reported by @ttdoda
+
+2014-10-14  Hayaki Saito <user@zuse.jp>
+
+  * LICENSE.sdump, Makefile.in, README.md, config.h.in, configure,
+  configure.ac, converters/Makefile.am, converters/Makefile.in,
+  converters/loader.c, include/Makefile.in, src/Makefile.in: Add libjpeg
+  support with --with-jpeg configure option
+
+2014-10-12  Hayaki Saito <user@zuse.jp>
+
+  * package.json.in.in: clib integration: add --with-libcurl option by default
+
+  * NEWS: Add missing items to NEWS
+
+  * converters/loader.c: Include errno.h in loader.c
+
+  * converters/Makefile.am, converters/Makefile.in, src/Makefile.am,
+  src/Makefile.in: Add -Werror to CFLAGS when --enable-debug configure option
+  is specified
+
+  * config.h.in, configure, configure.ac: Introduce --enable-debug configure
+  option
+
+  * converters/img2sixel.c: Fix a double free error
+
+2014-10-11  Hayaki Saito <user@zuse.jp>
+
+  * NEWS, README.md: Document updates
+
+  * converters/loader.c, src/quant.c: Suppress some compiler wanings
+
+  * src/quant.c: Fix a bug caused by an uninitialized variable
+
+  * converters/Makefile.am, converters/Makefile.in, src/Makefile.am,
+  src/Makefile.in: Add missing -Wall option to cflags to privent stupid bugs
+  like #9
+
+  * converters/loader.c: Quick fix for Issue #9
+
+2014-10-11  Bruce Mitchener <bruce.mitchener@gmail.com>
+
+  * converters/loader.c, converters/shell-completion/bash/img2sixel,
+  converters/sixel2png.1, include/sixel.h.in, src/output.c: Remove whitespace
+  at EOL.
+
+  * ChangeLog, README.md, converters/img2sixel.1, converters/img2sixel.c,
+  converters/quant.h, converters/shell-completion/bash/img2sixel,
+  converters/shell-completion/zsh/_img2sixel, include/sixel.h.in, src/dither.h,
+  src/quant.c: Fix typos.
+
+  * converters/img2sixel.c: Fix uninitialized variable.
+
+  * converters/img2sixel.c, converters/scale.c: Remove unused functions.
+
+  * converters/img2sixel.c, converters/loader.c, converters/sixel2png.c,
+  src/quant.c, src/tosixel.c: Remove unused variables.
+
+  * include/sixel.h.in, src/output.c, src/quant.c: Remove invalid const
+  specifier on return type.
+
+2014-10-11  Hayaki Saito <user@zuse.jp>
+
+  * Makefile.in, NEWS: Add NEWS
+
+2014-10-09  Hayaki Saito <user@zuse.jp>
+
+  * converters/shell-completion/bash/img2sixel: Update bash completion file
+
+  * converters/shell-completion/zsh/_img2sixel: Update zsh completion file
+
+  * converters/img2sixel.1: Add missing descriptions to img2sixel manpage
+
+  * README.md, converters/img2sixel.1, converters/img2sixel.c: Update documents
+
+  * data/example_opengl.gif, data/ffmpeg.png, data/gnuplot.png, data/gs.png,
+  data/libsixel-1.png, data/q_libsixel.png, data/q_ppmtosixel.png,
+  data/q_ppmtosixel2.png, data/q_sixel.png, data/q_sixelconv.png,
+  data/qemu.png, data/sixel.gif, data/w3m-sixel.png, data/wesnoth.png,
+  data/xsdl.png, data/xsixel.png, data/zx81.png: Remove data directory
+
+2014-10-08  Hayaki Saito <user@zuse.jp>
+
+  * README.md, converters/img2sixel.1, converters/img2sixel.c: Update documents
+
+  * converters/img2sixel.c, converters/loader.c, converters/loader.h: Introduce
+  --static option
+
 2014-10-07  Hayaki Saito <user@zuse.jp>
 
   * converters/img2sixel.c: Fix for animation GIF quality degradation
@@ -12,6 +175,8 @@
 
 2014-10-01  Hayaki Saito <user@zuse.jp>
 
+  * configure, configure.ac: Update libtool minor version
+
   * configure, configure.ac: Update libtool micro version
 
   * LICENSE.stb: Declare patches/applied/stb_image.h.diff is in public domain
@@ -27,6 +192,9 @@
 
 2014-09-29  Hayaki Saito <user@zuse.jp>
 
+  * src/tosixel.c: Merge arakiken's amend patch:
+  http://mlterm.sourceforge.net/libsixel-penetrate2.patch
+
   * converters/img2sixel.c: Print short usage explanation if invalid option is
   given.
 
@@ -35,9 +203,31 @@
 
 2014-09-28  Hayaki Saito <user@zuse.jp>
 
+  * converters/img2sixel.c, include/sixel.h.in, src/dither.c, src/dither.h,
+  src/quant.c, src/quant.h: Introduce -C(complexion score) option and implement
+  complexion correction
+
+  * include/sixel.h.in, src/tosixel.c: Fix build broken by fb1cd8a
+
+  * converters/img2sixel.c, src/output.c, src/output.h, src/tosixel.c: Apply
+  arakiken's patch for GNU Screen integration:
+  http://mlterm.sourceforge.net/libsixel-penetrate.patch
+
+  * converters/img2sixel.c, include/sixel.h.in, src/output.c, src/output.h,
+  src/tosixel.c: Introduce new APIs: sixel_output_{get,set}_skip_dcs_envelope
+
   * 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-27  Hayaki Saito <user@zuse.jp>
+
+  * src/dither.c, src/output.c: Add NULL checks
+
+  * src/dither.c, src/output.c: Add NULL checks
+
+  * src/dither.c, src/image.c: Add input parameter validation for some
+  functions
+
 2014-09-26  Hayaki Saito <user@zuse.jp>
 
   * converters/img2sixel.c: Fix a compile error
@@ -1468,10 +1658,10 @@
 
   * src/quant.c: Minor fix for creating palette
 
-  * src/quant.c: Minor fix around creating histogram
+  * src/quant.c: Minor fix around creating histgram
 
   * src/quant.c: Add new parameter for selecting method for detecting largest
-  splitting dimension
+  splitting dimention
 
   * src/quant.c: Import largestByLuminosity function from pnmcolormap.c
 
@@ -1481,7 +1671,7 @@
 
   * src/quant.c: Fix a memory leak problem
 
-  * src/tosixel.c: Comment out unused code which makes histogram
+  * src/tosixel.c: Comment out unused code which makes histgram
 
   * src/quant.c: Minor fix
 
@@ -1523,9 +1713,9 @@
 
 2014-03-28  Hayaki Saito <user@zuse.jp>
 
-  * quant.c: Reduce sample pixels for creating histogram
+  * quant.c: Reduce sample pixels for creating histgram
 
-  * quant.c: Improve the allocation method for creating histogram
+  * quant.c: Improve the allocation method for creating histgram
 
   * quant.c: Minor fix
 

LICENSE.sdump

@@ -0,0 +1,9 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 haru <uobikiemukot at gmail dot com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

LICENSE.xterm

@@ -0,0 +1,34 @@
+The helper function hls2rgb in src/fromsixel.c is imported from
+graphics.c in Xterm pl#310 originally written by Ross Combs.
+
+http://invisible-island.net/xterm/
+
+
+Copyright 2013,2014 by Ross Combs
+
+                        All Rights Reserved
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name(s) of the above copyright
+holders shall not be used in advertising or otherwise to promote the
+sale, use or other dealings in this Software without prior written
+authorization.
+

Makefile.am

@@ -13,7 +13,7 @@ all-am:
 	cp package.json.in package.json
 
 test: all
-	$(MAKE) test -C converters > test.log
+	$(MAKE) test -C converters 2>&1 |tee test.log
 
 winetest: all
 	$(MAKE) winetest -C converters

Makefile.in

@@ -264,6 +264,8 @@ LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBCURL_CFLAGS = @LIBCURL_CFLAGS@
 LIBCURL_LIBS = @LIBCURL_LIBS@
+LIBJPEG_CFLAGS = @LIBJPEG_CFLAGS@
+LIBJPEG_LIBS = @LIBJPEG_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBPNG_CFLAGS = @LIBPNG_CFLAGS@
 LIBPNG_LIBS = @LIBPNG_LIBS@
@@ -327,7 +329,6 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
-have_pkg_config = @have_pkg_config@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -880,7 +881,7 @@ all-am:
 	cp package.json.in package.json
 
 test: all
-	$(MAKE) test -C converters > test.log
+	$(MAKE) test -C converters 2>&1 |tee test.log
 
 winetest: all
 	$(MAKE) winetest -C converters