Merge branch 'develop'

ChangeLog

@@ -1,22 +1,58 @@
+2014-08-01  Hayaki Saito <[email protected]>
+
+  * README.md, images/sixel.gif, images/sl.gif, tests/data/sixel.tty: Add a
+  test record for sixel
+
 2014-07-31  Hayaki Saito <[email protected]>
 
+  * .coveralls.yml, .travis.yml, Makefile.am, Makefile.in, main.c: Add an error
+  checking code
+
+  * Makefile.am, Makefile.in, configure, configure.ac: Add --enable-gcov
+  configure option
+
+  * dcs.c, pseudo.c: Strip inline keywords
+
+  * Makefile.am, Makefile.in: Check memory violation errors with valgrind
+
+  * Makefile.am, Makefile.in: Add "valgrind" makefile target
+
+  * configure, configure.ac, main.c, package.json: Fix memory access violation
+
+  * ChangeLog, configure, configure.ac, package.json: Update minor version
+
   * tests/data/ls.tty, tests/data/sl.tty: Add test data
 
   * config.h.in, configure, configure.ac, yaft.h: Add --with-fontdata configure
   option
 
+  * configure, configure.ac, package.json: Bump version
+
   * package.json, package.json.in: Add missing files
 
   * Makefile.in, main.c: Add --repeat option
 
   * Makefile.in, configure, configure.ac: Add clib integration
 
+  * README.md, main.c: Minor fix
+
+  * configure, configure.ac: Update minor version
+
   * README.md, main.c, terminal.c, terminal.h, yaft.h: Add --cjkwidth option
 
 2014-07-30  Hayaki Saito <[email protected]>
 
+  * configure, configure.ac, main.c: Update micro version
+
+  * config.h.in, configure, configure.ac, main.c: Minor fix
+
   * config.h.in, configure, configure.ac, main.c: Fix for mingw environment
 
+  * configure, configure.ac: Update version
+
+  * Makefile.am, Makefile.in, malloc_stub.c, malloc_stub.h, terminal.c,
+  wcwidth.h, yaft.h: Minor fix
+
 2014-07-29  Hayaki Saito <[email protected]>
 
   * config.h.in, configure, configure.ac, util.c: Checks calloc availability
@@ -32,6 +68,8 @@
   * config.h.in, configure, configure.ac, dcs.c, gifsave89.c, main.c, osc.c,
   parse.c, util.c: Update configure script
 
+  * configure, configure.ac: Bump minor version
+
   * conf.h, dcs.c, function.c, main.c, osc.c, parse.c, pseudo.c, terminal.c,
   util.c, yaft.h: Drop conf.h
 
@@ -40,11 +78,17 @@
   * conf.h, main.c, pseudo.c, terminal.c, terminal.h, yaft.h: Add
   --cursor-color option
 
+  * configure, configure.ac: Bump micro version
+
   * main.c, parse.c, parse.h: Support sixel animation
 
+  * configure, configure.ac: Bump version
+
   * README.md, conf.h, function.c, main.c, pseudo.c, terminal.c, terminal.h,
   yaft.h: Add --foreground-color/--background-color option
 
+  * configure, configure.ac: Bump version
+
   * README.md, main.c: Add --last-frame-delay option
 
 2014-07-27  Hayaki Saito <[email protected]>
@@ -55,6 +99,8 @@
 
   * COPYING, INSTALL: Add proper COPYING and INSTALL file
 
+  * Makefile.in, aclocal.m4, configure, configure.ac: Update minor version
+
 2014-07-27  saitoha <[email protected]>
 
   * Makefile.am, Makefile.in, aclocal.m4, config.h.in, configure, configure.ac,
@@ -66,8 +112,12 @@
   * configure, configure.ac: Add a hack against that git does not preverve file
   timestamp
 
+  * configure, configure.ac: Bump micro version
+
   * README.md, main.c: Update default width and height value
 
+  * configure, configure.ac: Bump micro version
+
   * config.h.in, configure, configure.ac, main.c: Check getopt_long
   availability
 

README.md

@@ -17,7 +17,17 @@ features such as SIXEL/DRCS.
 Demo
 ----
 
-This demo plays [sl](https://github.com/mtoyoda/sl) and records it with [ttyrec](https://github.com/mjording/ttyrec), and
+Play [sl](https://github.com/mtoyoda/sl).
+
+![img2sixel](https://raw.githubusercontent.com/saitoha/seq2gif/master/images/sl.gif)
+
+
+Show SIXEL animation with [img2sixel](https://github.com/saitoha/libsixel#img2sixel).
+
+![img2sixel](https://raw.githubusercontent.com/saitoha/seq2gif/master/images/sixel.gif)
+
+
+The following demo plays [sl](https://github.com/mtoyoda/sl) and records it with [ttyrec](https://github.com/mjording/ttyrec), and
 converts that record into a GIF animation using seq2gif,
 and converts that GIF into a SIXEL animation and plays it with [img2sixel](https://github.com/saitoha/libsixel#img2sixel).
 Furthermore, generates the log record of above experience using [ttyrec](https://github.com/mjording/ttyrec), and

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for seq2gif 0.10.2.
+# Generated by GNU Autoconf 2.69 for seq2gif 0.10.3.
 #
 # Report bugs to <[email protected]>.
 #
@@ -579,8 +579,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='seq2gif'
 PACKAGE_TARNAME='seq2gif'
-PACKAGE_VERSION='0.10.2'
-PACKAGE_STRING='seq2gif 0.10.2'
+PACKAGE_VERSION='0.10.3'
+PACKAGE_STRING='seq2gif 0.10.3'
 PACKAGE_BUGREPORT='[email protected]'
 PACKAGE_URL=''
 
@@ -1269,7 +1269,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 seq2gif 0.10.2 to adapt to many kinds of systems.
+\`configure' configures seq2gif 0.10.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1335,7 +1335,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of seq2gif 0.10.2:";;
+     short | recursive ) echo "Configuration of seq2gif 0.10.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1433,7 +1433,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-seq2gif configure 0.10.2
+seq2gif configure 0.10.3
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1986,7 +1986,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 seq2gif $as_me 0.10.2, which was
+It was created by seq2gif $as_me 0.10.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2852,7 +2852,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='seq2gif'
- VERSION='0.10.2'
+ VERSION='0.10.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5465,7 +5465,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 seq2gif $as_me 0.10.2, which was
+This file was extended by seq2gif $as_me 0.10.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5531,7 +5531,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="\\
-seq2gif config.status 0.10.2
+seq2gif config.status 0.10.3
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([seq2gif], [0.10.2], [[email protected]])
+AC_INIT([seq2gif], [0.10.3], [[email protected]])
 AC_CONFIG_SRCDIR([color.h])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([foreign])

main.c

@@ -563,21 +563,21 @@ int main(int argc, char *argv[])
             break;
         }
         parse(&term, obuf, nread, &dirty);
+        now = readtime(in_file, obuf);
+        if (now == -1) {
+            break;
+        }
         if (term.esc.state != STATE_DCS || dirty) {
-            delay += now - prev;
             refresh(&pb, &term);
+            delay = now - prev;
 
             /* take screenshot */
             apply_colormap(&pb, img);
-            controlgif(gsdata, -1, (delay + 5000) / 10000 + 1, 0, 0);
+            controlgif(gsdata, -1, delay / 10000, 0, 0);
             prev = now;
             putgif(gsdata, img);
-            delay = 0;
-        }
-        now = readtime(in_file, obuf);
-        if (now == -1) {
-            break;
         }
+        dirty = 0;
     }
     if (settings.last_frame_delay > 0) {
         controlgif(gsdata, -1, settings.last_frame_delay / 10, 0, 0);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "seq2gif",
-  "version": "0.10.2",
+  "version": "0.10.3",
   "repo": "saitoha/seq2gif",
   "description": "@PACKAGE_DESCRIPTION@",
   "keywords": ["terminal", "gif", "ttyrec"],