Merge remote-tracking branch 'upstream/master' into lossy

* upstream/master: (30 commits)
  Add initial NEWS.
  Whoops, thanks wilkesybear
  Fix configury: AC_SEARCH_LIBS is required.
  Multithreaded resize detects whether -U is necessary.
  Thread updates.
  It is very important that we have only one kd3_sort_lock.
  Improve threaded configury, and fix SIMD configury error.
  Implemented work stealing 'thread pool,' as proposed by Dr. Kohler
  Remove debug line from configure, change default thread count to 8
  Make threads a maybe in configure, renamed from 'threaded' or 'threading' to 'threads'
  Correct error in issue #39: Frame selection '#0-' is parsed correctly.
  Warn if SIMD defaults to off.
  Add configury for SIMD.
  Use macros to abstract scale_color vector operations.
  In --resize-method mix, construct a `mix` array in advance.
  Use SIMD vector types.
  Prepare for SIMD: Input screen is floating-point colors.
  Use ac_check_lib instead of naked call to LIBS for pthread
  Wrap POSIX lines with the env variable that controls threaded resize
  Changes to (dis)allow threaded gifsicle in configure script
  ...

Author: kornelski

.travis.yml

@@ -1,7 +1,22 @@
 language: c
 env:
-  - CC="gcc"
-  - CC="gcc -std=c89"
-  - CC="clang"
+  global:
+    # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
+    #   via the "travis encrypt" command using the project repo's public key
+    - secure: "NEQUeZwTTJ+1Pdy2CpNte1nJLYRY2H8+dpvnGS2HP6U/Ok6ZQm4Zxic+ufhabuymbCV7Jvwwy6Gaj8+ObIDahhzAsiMRXSymnvFHELAnq7DiikJ2HqBvFhPzPI2/vDmEP37msGW1dloipLhdKMeuYYP++BpApnC6KVRVJDXg5JI="
+  matrix:
+    - CC="gcc"
+    - CC="gcc -std=c89"
+    - CC="clang"
 script: ./configure && make check
 before_script: ./bootstrap.sh
+
+addons:
+  coverity_scan:
+    project:
+      name: "kohler/gifsicle"
+      description: "Build submitted via Travis CI"
+    notification_email: [email protected]
+    build_command_prepend: "./configure; make clean"
+    build_command: "make -j 4"
+    branch_pattern: coverity_scan

Makefile.am

@@ -22,11 +22,11 @@ EXTRA_DIST = COPYING README.md gifsicle.spec \
 	test/010-warnings.testie \
 	test/011-resizemix.testie
 
-gifsicle:
+gifsicle: config.h
 	@cd src && $(MAKE) gifsicle
-gifdiff:
+gifdiff: config.h
 	@cd src && $(MAKE) gifdiff
-gifview:
+gifview: config.h
 	@cd src && $(MAKE) gifview
 
 srclinks:

NEWS

@@ -1,4 +1,17 @@
 Gifsicle NEWS
+
+Version 1.89
+
+* Add SIMD support for resizing. When enabled this improves resize
+  performance enormously for complex resize methods.
+
+* Add thread support for resizing. `-j[NTHREADS]` tells gifsicle to use
+  up to NTHREADS threads to resize an input image. There are several
+  caveats---multiple threads can be only used on unoptimized images.
+  Thanks to Github user `wilkesybear`.
+
+* Minor bug fixes.
+
 
 Version 1.88   1.Jul.2015
 

configure.ac

@@ -11,53 +11,35 @@ AC_C_CONST
 AC_C_INLINE
 
 build_gifview=maybe
-AC_ARG_ENABLE(gifview,
-[  --disable-gifview       do not build gifview, a GIF viewer for X11],
-if test "x$enableval" != xyes ; then
-  build_gifview=no
-fi)
+AC_ARG_ENABLE([gifview],
+    [AS_HELP_STRING([--disable-gifview], [do not build gifview X11 viewer])],
+    [if test "x$enableval" != xyes; then build_gifview=no; fi])
 
 build_gifdiff=yes
-AC_ARG_ENABLE(gifdiff,
-[  --disable-gifdiff       do not build gifdiff, a utility for comparing GIFs],
-if test "x$enableval" != xyes ; then
-  build_gifdiff=no
-fi)
+AC_ARG_ENABLE([gifdiff],
+    [AS_HELP_STRING([--disable-gifdiff], [do not build gifdiff comparison utility])],
+    [if test "x$enableval" != xyes; then build_gifdiff=no; fi])
 
-use_dmalloc=
-AC_ARG_ENABLE(dmalloc,
-[  --enable-dmalloc        build with debugging malloc library],
-if test "x$enableval" = xyes ; then
-  use_dmalloc=yes
-fi)
-
-AC_ARG_ENABLE(warnings,
-[  --enable-warnings       compile with -W -Wall],
-if test "x$enableval" = xyes ; then
-  CC="$CC -W -Wall"
-fi)
+AC_ARG_ENABLE([warnings],
+    [AS_HELP_STRING([--enable-warnings], [compile with -W -Wall])],
+    [if test "x$enableval" = xyes; then CC="$CC -W -Wall"; fi])
 
+WERROR=
 AC_ARG_ENABLE([werror],
-[  --enable-werror         compile with -Werror],
-if test "x$enableval" = xyes ; then
-  WERROR="-Werror"
-fi)
+    [AS_HELP_STRING([--enable-werror], [compile with -Werror])],
+    [if test "x$enableval" = xyes; then WERROR="-Werror"; fi])
 AC_SUBST([WERROR])
 
-AC_ARG_ENABLE(all,
-[  --enable-all            --enable-gifview --enable-gifdiff --enable-warnings],
-if test "x$enableval" = xyes ; then
-  build_gifview=yes
-  build_gifdiff=yes
-  CC="$CC -W -Wall"
-fi)
+use_dmalloc=
+AC_ARG_ENABLE([dmalloc],
+    [AS_HELP_STRING([--enable-dmalloc], [build with debugging malloc library])],
+    [if test "x$enableval" = xyes; then use_dmalloc=yes; fi])
 
 ungif=
-AC_ARG_ENABLE(ungif,
-[  --enable-ungif          build without compression],
-if test "x$enableval" = xyes ; then
-  ungif=yes
-fi)
+AC_ARG_ENABLE([ungif],
+    [AS_HELP_STRING([--enable-ungif], [build without LZW compression])],
+    [if test "x$enableval" = xyes; then ungif=yes; fi])
+
 
 dnl
 dnl Choose programs to build. Always build gifsicle
@@ -69,50 +51,52 @@ OTHERMANS=""
 if test "x$build_gifview" = xyes -o "x$build_gifview" = xmaybe; then
     AC_PATH_XTRA
     if test "x$no_x" = xyes; then
-	if test "x$build_gifview" = xyes; then
-	    AC_MSG_ERROR([
+        if test "x$build_gifview" = xyes; then
+            AC_MSG_ERROR([
 ******************************************************************************
 Cannot find X, but you explicitly requested that gifview be built.
 You may need to install an X11 development package to get the X headers,
 supply a '--with-x' option, or simply '--disable-gifview'.])
-	else
-	    AC_MSG_WARN([Not compiling gifview since X is not available.])
-	    build_gifview=no
-	fi
+	      else
+	          AC_MSG_WARN([Not compiling gifview since X is not available.])
+	          build_gifview=no
+	      fi
     else
-	build_gifview=yes
+	      build_gifview=yes
     fi
 fi
 
 if test "x$build_gifview" = xyes ; then
-  OTHERPROGRAMS="$OTHERPROGRAMS gifview"'$(EXEEXT)'
-  OTHERMANS="$OTHERMANS gifview.1"
-  AC_CACHE_CHECK(for gettimeofday prototype, ac_cv_gettimeofday,
-[AC_TRY_COMPILE([#include <time.h>
-#include <sys/time.h>],
-[gettimeofday((void *)0, (void *)0);],
-[AC_TRY_COMPILE([#include <time.h>
-#include <sys/time.h>],
-[gettimeofday((void *)0);],
-ac_cv_gettimeofday=0,
-ac_cv_gettimeofday=2)],
-ac_cv_gettimeofday=1)])
-  AC_DEFINE_UNQUOTED(GETTIMEOFDAY_PROTO, $ac_cv_gettimeofday, [Define to the number of arguments to gettimeofday (gifview only).])
+    OTHERPROGRAMS="$OTHERPROGRAMS gifview"'$(EXEEXT)'
+    OTHERMANS="$OTHERMANS gifview.1"
+    AC_CHECK_HEADERS([time.h sys/time.h])
+    AC_CACHE_CHECK([for gettimeofday prototype], [ac_cv_gettimeofday],
+        [AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+            [[#include <time.h>
+#include <sys/time.h>]],
+            [[gettimeofday((void*) 0, (void*) 0)]])],
+            [ac_cv_gettimeofday=2],
+            [AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+                [[#include <time.h>
+    #include <sys/time.h>]],
+                [[gettimeofday((void*) 0)]])],
+                [ac_cv_gettimeofday=1], [ac_cv_gettimeofday=0])])])
+    AC_DEFINE_UNQUOTED([GETTIMEOFDAY_PROTO], [$ac_cv_gettimeofday], [Define to the number of arguments to gettimeofday.])
 else
-  AC_DEFINE_UNQUOTED(X_DISPLAY_MISSING, 1, [Define if X is not available.])
+    AC_DEFINE_UNQUOTED(X_DISPLAY_MISSING, 1, [Define if X is not available.])
 fi
 
 if test "x$build_gifdiff" = xyes ; then
-  OTHERPROGRAMS="$OTHERPROGRAMS gifdiff"'$(EXEEXT)'
-  OTHERMANS="$OTHERMANS gifdiff.1"
+    OTHERPROGRAMS="$OTHERPROGRAMS gifdiff"'$(EXEEXT)'
+    OTHERMANS="$OTHERMANS gifdiff.1"
 fi
 
-AC_SUBST(OTHERPROGRAMS)dnl
-AC_SUBST(OTHERMANS)dnl
+AC_SUBST(OTHERPROGRAMS)
+AC_SUBST(OTHERMANS)
 
 
 dnl
-dnl Set up `ungif' support
+dnl Set up ungif support
 dnl
 
 if test "x$ungif" = xyes -o "x$GIFSICLE_UNGIF" = xyes ; then
@@ -138,7 +122,7 @@ AC_REPLACE_FUNCS([strerror])
 AC_CHECK_FUNCS([strtoul mkstemp])
 AC_SEARCH_LIBS([pow], [m], [AC_DEFINE([HAVE_POW], [1], [Define to 1 if you have the `pow' function.])])
 
-AC_CHECK_HEADERS([sys/select.h inttypes.h unistd.h])
+AC_CHECK_HEADERS([sys/select.h sys/stat.h inttypes.h unistd.h])
 
 
 dnl
@@ -166,7 +150,7 @@ elif test "$ac_cv_u_int_t" = yes; then
     AC_DEFINE([HAVE_U_INT_TYPES], [1], [Define if you have u_intXX_t types but not uintXX_t types.])
 fi
 
-AC_CHECK_TYPES([uintptr_t, int64_t], [], [],
+AC_CHECK_TYPES([uintptr_t, int64_t, uint64_t], [], [],
 [#if HAVE_INTTYPES_H
 # include <inttypes.h>
 #endif
@@ -175,11 +159,88 @@ AC_CHECK_TYPES([uintptr_t, int64_t], [], [],
 #endif
 ])
 
+AC_CHECK_SIZEOF([float])
 AC_CHECK_SIZEOF([unsigned int])
 AC_CHECK_SIZEOF([unsigned long])
 AC_CHECK_SIZEOF([void *])
 
 
+dnl
+dnl vector types
+dnl
+
+AC_MSG_CHECKING([for usable vector_size vector types])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+    [AC_INCLUDES_DEFAULT
+    [typedef float float4 __attribute__((vector_size (4 * sizeof(float))));]],
+    [[float4 a;
+    a[0] = a[1] = a[2] = a[3] = (float) rand();
+    a *= (float) 3;
+    printf("%f\n", a[0]);]])],
+    [AC_DEFINE([HAVE_VECTOR_SIZE_VECTOR_TYPES], 1, [Define to 1 if `vector_size' vector types are usable.])
+    ac_cv_vector_size_vector_types=yes], [ac_cv_vector_size_vector_types=no])
+AC_MSG_RESULT([$ac_cv_vector_size_vector_types])
+
+AC_MSG_CHECKING([for usable ext_vector_type vector types])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+    [AC_INCLUDES_DEFAULT
+    [typedef float float4 __attribute__((ext_vector_type (4)));]],
+    [[float4 a;
+    a[0] = a[1] = a[2] = a[3] = (float) rand();
+    a *= (float) 3;
+    printf("%f\n", a[0]);]])],
+    [AC_DEFINE([HAVE_EXT_VECTOR_TYPE_VECTOR_TYPES], 1, [Define to 1 if `ext_vector_type' vector types are usable.])
+    ac_cv_ext_vector_type_vector_types=yes], [ac_cv_ext_vector_type_vector_types=no])
+AC_MSG_RESULT([$ac_cv_ext_vector_type_vector_types])
+
+AC_ARG_ENABLE([simd],
+    [AS_HELP_STRING([--disable-simd], [do not use SIMD instructions])],
+    [], [enable_simd=maybe])
+
+if test $ac_cv_vector_size_vector_types = no -a $ac_cv_ext_vector_type_vector_types = no; then
+    if test x$enable_simd = xmaybe; then
+        AC_MSG_WARN([
+Not using SIMD since your compiler's support for SIMD types is inadequate.
+])
+    elif test x$enable_simd != xno; then
+        AC_MSG_ERROR([
+******************************************************************************
+`--enable-simd' was supplied, but this compiler does not support SIMD types.])
+    fi
+    enable_simd=no
+fi
+if test x"$enable_simd" != xno; then
+    AC_DEFINE([HAVE_SIMD], [1], [Define to 1 if SIMD types should be used.])
+fi
+
+
+dnl
+dnl threads
+dnl
+
+AC_SEARCH_LIBS([pthread_create], [pthread], [have_threads=yes], [have_threads=no])
+AC_MSG_CHECKING([for __sync_add_and_fetch])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+    [AC_INCLUDES_DEFAULT
+    extern volatile int x;],
+    [[printf("%d", __sync_add_and_fetch(&x, 1));]])],
+    [AC_DEFINE([HAVE___SYNC_ADD_AND_FETCH], 1, [Define to 1 if you have the `__sync_add_and_fetch' function.])
+    result=yes], [result=no])
+AC_MSG_RESULT([$result])
+
+AC_ARG_ENABLE([threads],
+    [AS_HELP_STRING([--disable-threads], [do not include multithreading])],
+    [], [enable_threads=maybe])
+
+if test "x$have_threads" = xno -a "x$enable_threads" = xyes; then
+    AC_MSG_ERROR([
+******************************************************************************
+Threading support is not available on this platform.])
+elif test "x$have_threads" = xyes -a "x$enable_threads" != xno; then
+    AC_DEFINE([ENABLE_THREADS], [1], [Define to 1 if multithreading support is available.])
+fi
+
+
 dnl
 dnl verbatim portions of the header
 dnl

src/gifdiff.c

@@ -118,11 +118,10 @@ apply_image(int is_second, Gif_Stream *gfs, int imageno, uint16_t background)
   Gif_Colormap *gfcm = gfi->local ? gfi->local : gfs->global;
 
   /* set up colormap */
-  for (i = 0; i < 256; i++)
+  for (i = 0; i < gfcm->ncol; ++i)
+    map[i] = gfcm->col[i].pixel;
+  for (i = gfcm->ncol; i < 256; ++i)
     map[i] = 1;
-  if (gfs)
-    for (i = 0; i < gfcm->ncol; i++)
-      map[i] = gfcm->col[i].pixel;
   if (gfi->transparent >= 0 && gfi->transparent < 256)
     map[gfi->transparent] = TRANSP;
 
@@ -458,7 +457,7 @@ gifread_error(Gif_Stream* gfs, Gif_Image* gfi,
   static int same_error_count = 0;
   int which_image = Gif_ImageNumber(gfs, gfi);
   const char *filename = gfs->landmark;
-  if (gfs && which_image < 0)
+  if (which_image < 0)
     which_image = gfs->nimages;
 
   if (gifread_error_count == 0) {

src/giffunc.c

@@ -87,8 +87,10 @@ Gif_Colormap *
 Gif_NewFullColormap(int count, int capacity)
 {
   Gif_Colormap *gfcm = Gif_New(Gif_Colormap);
-  if (!gfcm || capacity <= 0 || count < 0)
+  if (!gfcm || capacity <= 0 || count < 0) {
+    Gif_Delete(gfcm);
     return 0;
+  }
   if (count > capacity)
     capacity = count;
   gfcm->ncol = count;

src/gifread.c

@@ -548,7 +548,7 @@ Gif_FullUncompressImage(Gif_Stream* gfs, Gif_Image* gfi,
   gfc.handler = h;
   gfc.errors[0] = gfc.errors[1] = 0;
 
-  if (gfi && gfc.prefix && gfc.suffix && gfc.length && gfi->compressed) {
+  if (gfc.prefix && gfc.suffix && gfc.length && gfi->compressed) {
     make_data_reader(&grr, gfi->compressed, gfi->compressed_len);
     ok = uncompress_image(&gfc, gfi, &grr);
   }
@@ -802,7 +802,6 @@ read_gif(Gif_Reader *grr, int read_flags,
 
   gfs = Gif_NewStream();
   gfi = Gif_NewImage();
-  gfs->landmark = landmark;
 
   gfc.stream = gfs;
   gfc.prefix = Gif_NewArray(Gif_Code, GIF_MAX_CODE);
@@ -814,6 +813,7 @@ read_gif(Gif_Reader *grr, int read_flags,
 
   if (!gfs || !gfi || !gfc.prefix || !gfc.suffix || !gfc.length)
     goto done;
+  gfs->landmark = landmark;
 
   GIF_DEBUG(("\nGIF"));
   if (!read_logical_screen_descriptor(gfs, grr))