Skip to content

Commit

Permalink
Merge branch 'release-1.8'
Browse files Browse the repository at this point in the history
  • Loading branch information
saitoha committed Jul 22, 2018
2 parents 84ed0bc + ff8aa34 commit 15eb40f
Show file tree
Hide file tree
Showing 25 changed files with 6,144 additions and 4,569 deletions.
8,891 changes: 5,169 additions & 3,722 deletions ChangeLog

Large diffs are not rendered by default.

15 changes: 9 additions & 6 deletions Makefile.in
@@ -1,7 +1,7 @@
# Makefile.in generated by automake 1.15.1 from Makefile.am.
# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@

# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# Copyright (C) 1994-2018 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 @@ -168,7 +168,7 @@ am__recursive_targets = \
$(RECURSIVE_CLEAN_TARGETS) \
$(am__extra_recursive_targets)
AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
cscope distdir dist dist-all distcheck
cscope distdir distdir-am dist dist-all distcheck
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
$(LISP)config.h.in
# Read a list of newline-separated strings from the standard input,
Expand Down Expand Up @@ -415,8 +415,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' $(SHELL) ./config.status'; \
$(SHELL) ./config.status;; \
*) \
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
esac;

$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
Expand Down Expand Up @@ -583,7 +583,10 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-rm -f cscope.out cscope.in.out cscope.po.out cscope.files

distdir: $(DISTFILES)
distdir: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) distdir-am

distdir-am: $(DISTFILES)
$(am__remove_distdir)
test -d "$(distdir)" || mkdir "$(distdir)"
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
Expand Down
12 changes: 11 additions & 1 deletion NEWS
Expand Up @@ -14,6 +14,16 @@
* core: Improve quality of 15bpp(hi-color mode) dither.
https://github.com/saitoha/libsixel/commit/42f34283defea67c2d6294af4bd7dcb4fdf9f046

* core: Fix memory leak problems, Thanks to @fCorleone.
https://github.com/saitoha/libsixel/commit/f94bc6fec696abd77be275226f28409602bd1f27
https://github.com/saitoha/libsixel/commit/84ed0bc35e273ebd0a7fbc9d8f8669f7cf5f5612

* core: Fix some heap buffer-overflow problems, Thanks to @fgeek.
https://github.com/saitoha/libsixel/commit/6a19d99f95dafbbb50facf9267497afbcfba5731
https://github.com/saitoha/libsixel/commit/0d70e046437370c86696f2ed38ac0413855d98ce
https://github.com/saitoha/libsixel/commit/438188c1f8b418a38674364cf5c126ef3ed4166a
https://github.com/saitoha/libsixel/commit/ba21bb94d68f8bf7dc590400a707753f5d5c4709

* 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
Expand All @@ -25,7 +35,7 @@
https://github.com/saitoha/libsixel/commit/9c8ffa62203899d866fc28e3ab7c6dfd9a0019b1

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

* Announcement for package maintainers:
Immutable tarball is provided, because GitHub auto-generated tarball may be not immutable.
Expand Down
49 changes: 13 additions & 36 deletions README.md
Expand Up @@ -9,13 +9,19 @@ libsixel
This package provides encoder/decoder implementation for DEC SIXEL graphics, and
some converter programs.

![img2sixel](https://raw.githubusercontent.com/saitoha/libsixel/data/data/libsixel-1.png)
![img2sixel](https://raw.githubusercontent.com/saitoha/libsixel/data/data/libsixel-1.png)(https://youtu.be/0SasrQ7pnbA)

SIXEL is one of image formats for printer and terminal imaging introduced by
Digital Equipment Corp. (DEC).
Its data scheme is represented as a terminal-friendly escape sequence.
So if you want to view a SIXEL image file, all you have to do is "cat" it to your terminal.

On 80's real hardware terminals, it tooks unbearable long waiting times to display images.

[![vt330sixel](https://raw.githubusercontent.com/saitoha/libsixel/data/data/vt330sixel.png)](https://youtu.be/0SasrQ7pnbA)

But nowdays, with high-speed CPU and broadband network, we got the chance to develop a new scope of SIXELs.

## SIXEL Animation

`img2sixel(1)` can decode GIF animation.
Expand Down Expand Up @@ -200,7 +206,12 @@ Some NetBSD/OpenBSD users are doing amazing challenges.

A sixel image dumper, provides pdf previewer.

### [RetroArch](https://github.com/libretro/RetroArch)

SIXEL video driver is provided if you build it with `--enable-sixel` option.
([screenshot](https://imgur.com/lf3bh2S))


## Highlighted features

### Improved compression
Expand All @@ -221,40 +232,6 @@ Now libsixel and ImageMagick's sixel coder follow it.

`img2sixel(1)` supports color image quantization. It works well even if few number of colors are allowed.

- `ppmtosixel` (`netpbm`)

$ jpegtopnm images/snake.jpg | pnmquant 16 | ppmtosixel

![ppmtosixel](https://raw.githubusercontent.com/saitoha/libsixel/data/data/q_ppmtosixel.png)


- `ppmtosixel` with Floyd–Steinberg dithering (`netpbm`)

$ jpegtopnm images/snake.jpg | pnmquant 16 -floyd | ppmtosixel

![ppmtosixel](https://raw.githubusercontent.com/saitoha/libsixel/data/data/q_ppmtosixel2.png)


- kmiya's `sixel`

$ sixel -p16 images/snake.jpg

![kmiya's sixel](https://raw.githubusercontent.com/saitoha/libsixel/data/data/q_sixel.png)


- PySixel (`sixelconv` command)

$ sixelconv -n16 images/snake.jpg

![PySixel](https://raw.githubusercontent.com/saitoha/libsixel/data/data/q_sixelconv.png)


- libsixel (`img2sixel` command)

$ img2sixel -p16 images/snake.jpg

![PySixel](https://raw.githubusercontent.com/saitoha/libsixel/data/data/q_libsixel.png)


## Terminal requirements

Expand Down Expand Up @@ -341,7 +318,7 @@ You can install libsixel via the following package systems.
- [NixOS](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/libsixel/default.nix)
- [OpenBSD Ports](http://openports.se/graphics/libsixel)
- [Fedora Copr](https://copr.fedorainfracloud.org/coprs/saahriktu/libsixel/)

- [SlackBuilds](https://slackbuilds.org/repository/14.2/libraries/libsixel/)

### Build from source package

Expand Down

0 comments on commit 15eb40f

Please sign in to comment.