Skip to content

Commit

Permalink
Merge branch 'release-1.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
saitoha committed Oct 26, 2014
2 parents 1097eee + 2311e9e commit 04d3495
Show file tree
Hide file tree
Showing 33 changed files with 1,559 additions and 369 deletions.
32 changes: 17 additions & 15 deletions .travis.yml
Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -52,3 +53,4 @@ script:

after_success:
- "if [ x$WINE = x ]; then make valgrind && exit 0 || cat valgrind.log && exit 1; fi"
- "make coveralls"
111 changes: 111 additions & 0 deletions ChangeLog
@@ -1,19 +1,130 @@
2014-10-26 Hayaki Saito <user@zuse.jp>

* converters/shell-completion/bash/img2sixel: Update bash completion file

* converters/shell-completion/zsh/_img2sixel: Update zsh completion file

* README.md, converters/img2sixel.1: Update manpage and README.md

* converters/img2sixel.c: Update help

* converters/sixel2png.c: Write png data using libpng by sixel2png

* converters/sixel2png.c: Fix a typo

* converters/sixel2png.c: Cleanup

* converters/loader.c: Accepts sixel as input format by img2sixel

* converters/img2sixel.c: Fix segmentation fault on quitting GIF animation
with -u option

* converters/img2sixel.c, src/tosixel.c: Support HLS palette

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

* include/sixel.h.in, src/output.c, src/output.h: Add new API
sixel_output_set_palette_type

* converters/img2sixel.c, include/sixel.h.in: Add --palette-type option

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>
Expand Down
9 changes: 9 additions & 0 deletions 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.
34 changes: 34 additions & 0 deletions 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.

2 changes: 1 addition & 1 deletion Makefile.am
Expand Up @@ -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
Expand Down
7 changes: 5 additions & 2 deletions Makefile.in
Expand Up @@ -264,7 +264,11 @@ 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@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIPO = @LIPO@
Expand Down Expand Up @@ -325,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@
Expand Down Expand Up @@ -878,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
Expand Down
46 changes: 38 additions & 8 deletions NEWS
@@ -1,19 +1,49 @@
--------------------------------
What's new in libsixel-1.2.0 ?
--------------------------------
------------------------------
What's new in libsixel-1.3 ?
------------------------------

* Now libcurl is automatically linked to img2sixel.
If you don't want to build with libcurl, you should configure with
--without-libcurl option.

* Add libjpeg integration(linked automatically to img2sixel).

* Add libpng integration(linked automatically to img2sixel/sixel2png).

* Introduce -t(--palette-type) option.
img2sixel can output HLS paletted sixel with "-t hls".
Add new API sixel_output_set_palette_type.

* Introduce -v(--verbose) option.

* Add new API sixel_dither_set_body_only.

* Some bug fixes and minor improvements.

------------------------------
What's new in libsixel-1.2 ?
------------------------------

* Introduce GNU Screen penetration (-P) feature written by @arakiken.
This works with arakiken's GNU screen sixel branch
(screen-sixel, https://bitbucket.org/arakiken/screen/branch/screen).

* Introduce crop operation (-c) feature written by @arakiken.
This works with arakiken's w3m remoteimg branch
(w3m with "-sixel" option, https://bitbucket.org/arakiken/w3m/branch/remoteimg).
https://bitbucket.org/arakiken/w3m/branch/remoteimg
(w3m with "-sixel" option)

* Introduce -C (complexion score) option and implement complexion correction
feature. (discussion with @tsutsui)

* Introduce -C (complexion score) option and implement complexion correction feature. (discussion with @tsutsui)
* Introduce static image extraction from Gif animation (-S).
(discussion with @isaki68k)

* Introduce static image extraction from Gif animation (-S). (discussion with @isaki68k)
* Introduce --enable-debug configure option.

* Add APIs for skipping DCS envelope (sixel_output_{get,set}_skip_dcs_envelope). (disscussion with @uobikiemukot)
* Add APIs for skipping DCS envelope
sixel_output_{get,set}_skip_dcs_envelope. (disscussion with @uobikiemukot)

* Some bug fixes and minor improvements (Thanks to @elfring, @isaki68k, @knok, @mattn, @tsutsui, @waywardmonkeys and @ttdoda).
* Some bug fixes and minor improvements.
Thanks to @elfring, @isaki68k, @knok, @mattn, @tsutsui, @waywardmonkeys
and @ttdoda.

0 comments on commit 04d3495

Please sign in to comment.