Skip to content

Commit

Permalink
Merge branch 'release'
Browse files Browse the repository at this point in the history
  • Loading branch information
@saitoha
saitoha committed Jun 7, 2018
2 parents 974c521 + 49251f2 commit 1082687
Show file tree
Hide file tree
Showing 50 changed files with 2,482 additions and 1,114 deletions.
56 changes: 28 additions & 28 deletions .travis.yml
View file
Expand Up @@ -6,51 +6,51 @@ matrix:
- os: linux
env: XCC=gcc HOST= PREFIX=/usr DEBUG="--enable-tests --enable-debug" WINE= LIBCURL=--without-libcurl JPEG=--without-jpeg PNG=--without-png
- os: linux
env: XCC=clang HOST= PREFIX=/usr DEBUG="--enable--tests --enable-debug" WINE= LIBCURL=--without-libcurl JPEG=--without-jpeg PNG=--without-png
env: XCC=clang HOST= PREFIX=/usr DEBUG="--enable-tests --enable-debug" WINE= LIBCURL=--without-libcurl JPEG=--without-jpeg PNG=--without-png
- os: osx
env: XCC=clang HOST= PREFIX=/usr/local DEBUG="--enable-tests --enable-debug" WINE= LIBCURL=--without-libcurl JPEG=--without-jpeg PNG=--without-png
- os: linux
env: XCC=i686-w64-mingw32-gcc HOST="--host=i686-w64-mingw32" PREFIX="/usr/i686-w64-mingw32" DEBUG="--enable--tests --enable-debug" WINE=wine
env: XCC=i686-w64-mingw32-gcc HOST="--host=i686-w64-mingw32" PREFIX="/usr/i686-w64-mingw32" DEBUG="--enable-tests --enable-debug" WINE=wine
- os: linux
env: XCC=i586-mingw32msvc-gcc HOST="--host=i586-mingw32msvc" PREFIX="/usr/i586-mingw32msvc" WINE=wine
- os: linux
env: XCC=x86_64-w64-mingw32-gcc HOST="--host=x86_64-w64-mingw32" PREFIX="/usr/x86_64-w64-mingw32" DEBUG="--enable--tests --enable-debug" WINE=wine64
env: XCC=x86_64-w64-mingw32-gcc HOST="--host=x86_64-w64-mingw32" PREFIX="/usr/x86_64-w64-mingw32" DEBUG="--enable-tests --enable-debug" WINE=wine64
- os: linux
env: XCC=clang HOST= PREFIX=/usr DEBUG="--enable--tests --enable-debug" WINE= JPEG="--with-jpeg" PNG="--with-png"
env: XCC=clang HOST= PREFIX=/usr DEBUG="--enable-tests --enable-debug" WINE= JPEG="--with-jpeg" PNG="--with-png"
- os: osx
env: XCC=clang HOST= PREFIX=/usr/local DEBUG="--enable--tests --enable-debug" WINE= JPEG="--with-jpeg" PNG="--with-png"
env: XCC=clang HOST= PREFIX=/usr/local DEBUG="--enable-tests --enable-debug" WINE= JPEG="--with-jpeg" PNG="--with-png"
- os: linux
env: XCC=clang HOST= PREFIX=/usr DEBUG="--enable--tests --enable-debug" WINE= GDKPIXBUF="--with-gdk-pixbuf2" JPEG=--without-jpeg PNG=--without-png
- os: osx
env: XCC=clang HOST= PREFIX=/usr/local DEBUG="--enable--tests --enable-debug" WINE= GDKPIXBUF="--with-gdk-pixbuf2" JPEG=--without-jpeg PNG=--without-png
env: XCC=clang HOST= PREFIX=/usr DEBUG="--enable-tests --enable-debug" WINE= GDKPIXBUF="--with-gdk-pixbuf2" JPEG=--without-jpeg PNG=--without-png
# - os: osx
# env: XCC=clang HOST= PREFIX=/usr/local DEBUG="--enable-tests --enable-debug" WINE= GDKPIXBUF="--with-gdk-pixbuf2" JPEG=--without-jpeg PNG=--without-png
- os: linux
env: XCC=clang HOST= PREFIX=/usr DEBUG="--enable--tests --enable-debug" WINE= LIBCURL="--with-libcurl" JPEG=--without-jpeg PNG=--without-png
env: XCC=clang HOST= PREFIX=/usr DEBUG="--enable-tests --enable-debug" WINE= LIBCURL="--with-libcurl" JPEG=--without-jpeg PNG=--without-png
- os: osx
env: XCC=clang HOST= PREFIX=/usr/local DEBUG="--enable--tests --enable-debug" WINE= LIBCURL="--with-libcurl" JPEG=--without-jpeg PNG=--without-png
env: XCC=clang HOST= PREFIX=/usr/local DEBUG="--enable-tests --enable-debug" WINE= LIBCURL="--with-libcurl" JPEG=--without-jpeg PNG=--without-png
- os: linux
env: XCC=clang HOST= PREFIX=/usr DEBUG="--enable--tests --enable-debug" WINE= GD="--with-gd" JPEG=--without-jpeg PNG=--without-png
- os: osx
env: XCC=clang HOST= PREFIX=/usr/local DEBUG="--enable--tests --enable-debug" WINE= GD="--with-gd" JPEG=--without-jpeg PNG=--without-png
env: XCC=clang HOST= PREFIX=/usr DEBUG="--enable-tests --enable-debug" WINE= GD="--with-gd" JPEG=--without-jpeg PNG=--without-png
# - os: osx
# env: XCC=clang HOST= PREFIX=/usr/local DEBUG="--enable-tests --enable-debug" WINE= GD="--with-gd" JPEG=--without-jpeg PNG=--without-png
- os: linux
env: XCC=clang HOST= PREFIX=/usr DEBUG="--enable--tests --enable-debug" WINE= GDKPIXBUF="--with-gdk-pixbuf2" LIBCURL="--with-libcurl" JPEG=--without-jpeg PNG=--without-png
- os: osx
env: XCC=clang HOST= PREFIX=/usr/local DEBUG="--enable--tests --enable-debug" WINE= GDKPIXBUF="--with-gdk-pixbuf2" LIBCURL="--with-libcurl" JPEG=--without-jpeg PNG=--without-png
env: XCC=clang HOST= PREFIX=/usr DEBUG="--enable-tests --enable-debug" WINE= GDKPIXBUF="--with-gdk-pixbuf2" LIBCURL="--with-libcurl" JPEG=--without-jpeg PNG=--without-png
# - os: osx
# env: XCC=clang HOST= PREFIX=/usr/local DEBUG="--enable-tests --enable-debug" WINE= GDKPIXBUF="--with-gdk-pixbuf2" LIBCURL="--with-libcurl" JPEG=--without-jpeg PNG=--without-png
- os: linux
env: XCC=clang HOST= PREFIX=/usr DEBUG="--enable--tests --enable-debug" WINE= GD="--with-gd" LIBCURL="--with-libcurl" JPEG=--without-jpeg PNG=--without-png
- os: osx
env: XCC=clang HOST= PREFIX=/usr/local DEBUG="--enable--tests --enable-debug" WINE= GD="--with-gd" LIBCURL="--with-libcurl" JPEG=--without-jpeg PNG=--without-png
env: XCC=clang HOST= PREFIX=/usr DEBUG="--enable-tests --enable-debug" WINE= GD="--with-gd" LIBCURL="--with-libcurl" JPEG=--without-jpeg PNG=--without-png
# - os: osx
# env: XCC=clang HOST= PREFIX=/usr/local DEBUG="--enable-tests --enable-debug" WINE= GD="--with-gd" LIBCURL="--with-libcurl" JPEG=--without-jpeg PNG=--without-png
- os: linux
env: XCC=clang HOST= PREFIX=/usr DEBUG="--enable--tests --enable-debug" WINE= GDKPIXBUF="--with-gdk-pixbuf2" GD="--with-gd" JPEG=--without-jpeg PNG=--without-png
- os: osx
env: XCC=clang HOST= PREFIX=/usr/local DEBUG="--enable--tests --enable-debug" WINE= GDKPIXBUF="--with-gdk-pixbuf2" GD="--with-gd" JPEG=--without-jpeg PNG=--without-png
env: XCC=clang HOST= PREFIX=/usr DEBUG="--enable-tests --enable-debug" WINE= GDKPIXBUF="--with-gdk-pixbuf2" GD="--with-gd" JPEG=--without-jpeg PNG=--without-png
# - os: osx
# env: XCC=clang HOST= PREFIX=/usr/local DEBUG="--enable-tests --enable-debug" WINE= GDKPIXBUF="--with-gdk-pixbuf2" GD="--with-gd" JPEG=--without-jpeg PNG=--without-png
- os: linux
env: XCC=clang HOST= PREFIX=/usr DEBUG="--enable--tests --enable-debug" WINE= GDKPIXBUF="--with-gdk-pixbuf2" GD="--with-gd" LIBCURL="--with-libcurl" JPEG=--without-jpeg PNG=--without-png
- os: osx
env: XCC=clang HOST= PREFIX=/usr/local DEBUG="--enable--tests --enable-debug" WINE= GDKPIXBUF="--with-gdk-pixbuf2" GD="--with-gd" LIBCURL="--with-libcurl" JPEG=--without-jpeg PNG=--without-png
env: XCC=clang HOST= PREFIX=/usr DEBUG="--enable-tests --enable-debug" WINE= GDKPIXBUF="--with-gdk-pixbuf2" GD="--with-gd" LIBCURL="--with-libcurl" JPEG=--without-jpeg PNG=--without-png
# - os: osx
# env: XCC=clang HOST= PREFIX=/usr/local DEBUG="--enable-tests --enable-debug" WINE= GDKPIXBUF="--with-gdk-pixbuf2" GD="--with-gd" LIBCURL="--with-libcurl" JPEG=--without-jpeg PNG=--without-png
- os: linux
env: XCC=gcc HOST= PREFIX=/usr DEBUG="--enable--tests --enable-debug" WINE= GDKPIXBUF="--with-gdk-pixbuf2" GD="--with-gd" JPEG="--with-jpeg" PNG="--with-png" LIBCURL="--with-libcurl"
env: XCC=gcc HOST= PREFIX=/usr DEBUG="--enable-tests --enable-debug" WINE= GDKPIXBUF="--with-gdk-pixbuf2" GD="--with-gd" JPEG="--with-jpeg" PNG="--with-png" LIBCURL="--with-libcurl"
- os: osx
env: XCC=gcc HOST= PREFIX=/usr/local DEBUG="--enable--tests --enable-debug" WINE= GDKPIXBUF="--with-gdk-pixbuf2" GD="--with-gd" JPEG="--with-jpeg" PNG="--with-png" LIBCURL="--with-libcurl"
env: XCC=gcc HOST= PREFIX=/usr/local DEBUG="--enable-tests --enable-debug" WINE= GDKPIXBUF="--with-gdk-pixbuf2" GD="--with-gd" JPEG="--with-jpeg" PNG="--with-png" LIBCURL="--with-libcurl"
- os: linux
env: XCC=clang HOST= PREFIX=/usr DEBUG="--enable-tests --enable-debug" WINE= JPEG="--with-jpeg" PNG="--with-png" LIBCURL="--with-libcurl" GCOV="--enable-gcov" STATIC="--disable-shared"

Expand Down Expand Up @@ -81,7 +81,7 @@ before_script:
script:
- "make"
- "sudo make install"
- "make test | tee log | grep succeeded || (cat log|tail -n50; exit 1)"
- "make test | tee log | grep ^\\\\[ || (cat log|tail -n50; exit 1)"

after_success:
- "make valgrind || (cat valgrind.log && exit 1)"
Expand Down
89 changes: 89 additions & 0 deletions ChangeLog
View file
@@ -1,3 +1,80 @@
2017-06-22 Hayaki Saito <saitoha@me.com>

* src/fromsixel.c: Fix wrong HLS color handling

2018-05-11 IWAMOTO Kouichi <sue@iwmt.org>

* src/tosixel.c: fix to use dcs_end_size with dcs_start use
dcs_start_size instead of dcs_end_size.

2018-04-04 Yusuke Endoh <mame@ruby-lang.org>

* src/fromgif.c: Allow a deferred clear code in a GIF format
img2sixel says `corrupt GIF(reason: too many codes)` but this is a
wrong behavior. GIF decoder must do nothing when the table is
full. See Section "DEFERRED CLEAR CODE IN LZW COMPRESSION" in [this
document](https://www.w3.org/Graphics/GIF/spec-gif89a.txt).

2017-05-03 Hayaki Saito <saitoha@me.com>

* README.md: Fix stupid typo, a_dither -> x_dither.
* converters/shell-completion/bash/img2sixel, converters/shell-
completion/zsh/_img2sixel: Add shell completion info -d option
arguments a_dither/x_dither.
* converters/img2sixel.c: Fix typo a_dither -> x_dither
* src/encoder.c: Fix for Issue #57, lack of O_TRUNC when open() is
called. Thanks to @set135.

2017-05-02 Hayaki Saito <saitoha@me.com>

* Makefile.in, aclocal.m4, config.h.in, configure,
converters/Makefile.am, converters/Makefile.in: Add tests for
a_dither/x_dither
* src/encoder.c, src/quant.c, src/tosixel.c: Style fixes
* converters/img2sixel.c, include/sixel.h.in,
python/libsixel/__init__.py, src/encoder.c: Update comments and
help information
* Makefile.in, aclocal.m4, config.h.in, configure, configure.ac,
package.json: Update package version to 1.8.0
* NEWS: Update NEWS
* include/sixel.h.in, python/libsixel/__init__.py: Add constants
SIXEL_DIFFUSE_{A,X}_DITHER to python interface
* src/loader.c: Minor fix
* Makefile.in, aclocal.m4, config.h.in, configure: pkg-config v0.29.2
* Makefile.in, aclocal.m4, config.h.in, configure, configure.ac,
src/loader.c, src/stb_image.h: Use stb_image v2.15

2017-04-25 Hayaki Saito <saitoha@me.com>

* src/tosixel.c: Fixed a bug that makes 15bpp dither no effect.
* src/tosixel.c: Strip trailing spaces

2017-04-21 Hayaki Saito <saitoha@me.com>

* converters/sixel2png.c: Show error details when sixel2png fails
* README.md: Amend fixes
* README.md: More information

2017-04-19 Hayaki Saito <saitoha@me.com>

* README.md: Additional catching-up
* README.md: Catching up

2017-04-11 Hayaki Saito <saitoha@me.com>

* src/sixel.5: Fix a type fixed a typo pointed out by
@silverhammermba(#58).
* converters/img2sixel.c, converters/sixel2png.c, src/loader.c: Print
configuration info about libsixel, with "img2sixel -V"

2016-12-18 Hayaki Saito <saitoha@me.com>

* README.md: Update README

2016-12-10 Hayaki Saito <saitoha@me.com>

* ChangeLog, Makefile.in: Update ChangeLog

2016-12-08 Hayaki Saito <saitoha@me.com>

* Makefile.in, README.md, configure, configure.ac, package.json:
Expand All @@ -12,8 +89,20 @@
* .travis.yml: travis: change --prefix path to /usr/local in OSX
build

2016-10-08 Øyvind Kolås <pippin@gimp.org>

* include/sixel.h.in, src/encoder.c, src/quant.c, src/tosixel.c: add
positional/ordered dithers a_dither and x_dither These are
dithering methods arising from searching the paramater spaces for
simple 2d pattern / pseudo random number generators - optimizing a
fitness metric of both statistical measures and human perceptual
preference - see http://pippin.gimp.org/a_dither/ - these dithering
methods are similar to other AM/FM hybrid digital halftoning
methods.

2016-10-10 Hayaki Saito <saitoha@me.com>

* src/tosixel.c: Small fix for wrong error message
* configure, configure.ac: Build with -Bsymbolic option if it's
available

Expand Down
2 changes: 1 addition & 1 deletion LICENSE.pnmcolormap
View file
@@ -1,5 +1,5 @@

Derived from ppmquant, originally by Jef Poskanzer.
src/quant.c is derived from ppmquant, originally by Jef Poskanzer.

Copyright (C) 1989, 1991 by Jef Poskanzer.
Copyright (C) 2001 by Bryan Henderson.
Expand Down
12 changes: 6 additions & 6 deletions Makefile.in
View file
@@ -1,7 +1,7 @@
# Makefile.in generated by automake 1.15 from Makefile.am.
# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@

# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# Copyright (C) 1994-2017 Free Software Foundation, Inc.

# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
Expand Down Expand Up @@ -648,7 +648,7 @@ distdir: $(DISTFILES)
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r "$(distdir)"
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
$(am__post_remove_distdir)

dist-bzip2: distdir
Expand All @@ -674,7 +674,7 @@ dist-shar: distdir
@echo WARNING: "Support for shar distribution archives is" \
"deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
$(am__post_remove_distdir)

dist-zip: distdir
Expand All @@ -692,7 +692,7 @@ dist dist-all:
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lz*) \
Expand All @@ -702,7 +702,7 @@ distcheck: dist
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
Expand Down
38 changes: 37 additions & 1 deletion NEWS
View file
@@ -1,7 +1,43 @@

------------------------------
What's new in libsixel-1.7 ?
What's new in libsixel-1.8 ?
------------------------------
* core: Upgrade stb_image to 2.19.

* core: Introduce new dithering method, a_dither / x_dither (http://pippin.gimp.org/a_dither/).
Thanks to @hodefoting.
https://github.com/saitoha/libsixel/pull/53

* core: Fix wrong HLS color handling.
https://github.com/saitoha/libsixel/commit/0fb35d22e7ba4ed8bce3be42791e6b39c3187b89

* core: Improve quality of 15bpp(hi-color mode) dither.
https://github.com/saitoha/libsixel/commit/42f34283defea67c2d6294af4bd7dcb4fdf9f046

* img2sixel: Allow a deferred clear code in a GIF format
GIF decoder must do nothing when the table is full.
See Section "DEFERRED CLEAR CODE IN LZW COMPRESSION" in
https://www.w3.org/Graphics/GIF/spec-gif89a.txt.
Thanks to @mame.
https://github.com/saitoha/libsixel/pull/63

* img2sixel: Marks -D option (read source images from stdin continuously) as deprecated
https://github.com/saitoha/libsixel/commit/9c8ffa62203899d866fc28e3ab7c6dfd9a0019b1

* Some bug fixes and minor improvements.
Thanks to @set135, @ttdoda.

* Announcement for package maintainers:
Immutable tarball is provided, because GitHub auto-generated tarball may be not immutable.

https://github.com/saitoha/libsixel/releases/download/v1.8.0/libsixel-1.8.0.tar.gz

For details, see https://github.com/saitoha/libsixel/issues/64 .


------------------------------
What's new in libsixel-1.7 ?
------------------------------
* core: Upgrade stb_image to 2.12.

* core: Upgrade stb_image_write.h to v1.02.
Expand Down

0 comments on commit 1082687

Please sign in to comment.