commit giflib

Hello community, here is the log from the commit of package giflib checked in at Fri Sep 5 02:24:37 CEST 2008. -------- --- giflib/giflib.changes 2008-04-10 12:57:53.000000000 +0200 +++ giflib/giflib.changes 2008-08-30 14:57:17.000000000 +0200 @@ -1,0 +2,14 @@ +Sat Aug 30 14:55:14 CEST 2008 - crrodriguez@suse.de + +- update to version 4.1.6, changes since 4.1.4 includes: + * Fix segfault in utilities due to referencing ColorMaps in GifFiles that had + no ColorMap present. + * Fix gif2x11 to work on 24 bit displays. + * Fix for giftext segfault when the GifFile does not store a global colormap. + * Checks to fail gracefully when an image contains improper LZ codes. + * Close file handles on failure in DGifOpenFileHandle() + * Checks to operate on files in binary mode on WIN32 as well as MSDOS. +- kill "la" files and static libraries + + +------------------------------------------------------------------- Old: ---- giflib-4.1.4.tar.bz2 New: ---- giflib-4.1.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ giflib.spec ++++++ --- /var/tmp/diff_new_pack.i28309/_old 2008-09-05 02:22:18.000000000 +0200 +++ /var/tmp/diff_new_pack.i28309/_new 2008-09-05 02:22:18.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package giflib (Version 4.1.4) +# spec file for package giflib (Version 4.1.6) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -17,8 +24,8 @@ Group: System/Libraries Url: http://sourceforge.net/projects/libungif AutoReqProv: on -Version: 4.1.4 -Release: 121 +Version: 4.1.6 +Release: 1 Summary: A Library for Working with GIF Images Provides: libungif %ifarch ia64 x86_64 s390x ppc64 @@ -31,7 +38,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -Since the LZW patents have expired, giflib can be usedinstead of +Since the LZW patents have expired, giflib can be used instead of libungif again. @@ -63,11 +70,10 @@ License: X11/MIT Summary: Library for Working with GIF Images - Files Mandatory for Development Group: Development/Libraries/C and C++ -AutoReqProv: on -Requires: giflib +Requires: %name = %version %description devel -Since the LZW patents have expired, giflib can be usedinstead of +Since the LZW patents have expired, giflib can be used instead of libungif again. @@ -78,30 +84,26 @@ Eric S. Raymond >esr@snark.thyrsus.com> %prep -%setup +%setup -q %build -%{?suse_update_config:%{suse_update_config -f}} -libtoolize --force -autoreconf --force --install -CFLAGS="$RPM_OPT_FLAGS -fstack-protector" \ - ./configure --prefix=/usr --libdir=%{_libdir} --x-libraries=/usr/%{_lib} -make +autoreconf -fiv +%configure --disable-static --with-pic --x-libraries=%{_libdir} +%{__make} %{?jobs:-j%jobs} %install -rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT chmod 755 $RPM_BUILD_ROOT/%{_libdir}/lib*.so.* ln -sf libgif.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libungif.so.%{version} ln -sf libungif.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libungif.so.4 ln -sf libungif.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libungif.so -ln -sf libgif.a $RPM_BUILD_ROOT%{_libdir}/libungif.a +#ln -sf libgif.a $RPM_BUILD_ROOT%{_libdir}/libungif.a +rm -f %{buildroot}%{_libdir}/*.la +find doc -name "Makefile*" -print -delete -%post -%run_ldconfig +%post -p /sbin/ldconfig -%postun -%run_ldconfig +%postun -p /sbin/ldconfig %files %defattr(-,root,root) @@ -112,8 +114,6 @@ %defattr(-,root,root) /usr/include/gif_lib.h %{_libdir}/lib*.so -%{_libdir}/lib*.a -%{_libdir}/lib*.la %files progs %defattr(-,root,root) @@ -121,6 +121,16 @@ /usr/bin/* %changelog +* Sat Aug 30 2008 crrodriguez@suse.de +- update to version 4.1.6, changes since 4.1.4 includes: + * Fix segfault in utilities due to referencing ColorMaps in GifFiles that had + no ColorMap present. + * Fix gif2x11 to work on 24 bit displays. + * Fix for giftext segfault when the GifFile does not store a global colormap. + * Checks to fail gracefully when an image contains improper LZ codes. + * Close file handles on failure in DGifOpenFileHandle() + * Checks to operate on files in binary mode on WIN32 as well as MSDOS. +- kill "la" files and static libraries * Thu Apr 10 2008 ro@suse.de - added baselibs.conf file to build xxbit packages for multilib support ++++++ giflib-4.1.4.tar.bz2 -> giflib-4.1.6.tar.bz2 ++++++ ++++ 34954 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/giflib-4.1.4/AUTHORS new/giflib-4.1.6/AUTHORS --- old/giflib-4.1.4/AUTHORS 2005-10-10 08:22:19.000000000 +0200 +++ new/giflib-4.1.6/AUTHORS 2005-11-06 17:32:14.000000000 +0100 @@ -30,7 +30,10 @@ int/pointer fixes for Alpha Eric Raymond - long time maintainer of giflib code + long time former maintainer of giflib code +Petter Reinholdtsen + Tru64 build fixs + Georg Schwarz IRIX fixes diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/giflib-4.1.4/ChangeLog new/giflib-4.1.6/ChangeLog --- old/giflib-4.1.4/ChangeLog 2005-10-10 08:22:19.000000000 +0200 +++ new/giflib-4.1.6/ChangeLog 2007-11-10 23:52:34.000000000 +0100 @@ -1,3 +1,115 @@ +2007-11-10 14:50 abadger1999 + + * NEWS, configure.ac, lib/Makefile.am, lib/egif_lib.c, + lib/gif_hash.c: 4.1.6 update. Errors in including headers could + lead to build problems on some platforms. + +2007-11-10 13:16 abadger1999 + + * configure.ac: Bump release version in configure.ac. + +2007-11-10 13:15 abadger1999 + + * Makefile.am: Remove PATENT_PROBLEMS from build rules as well. + +2007-11-10 13:09 abadger1999 + + * NEWS, PATENT_PROBLEMS, lib/Makefile.am: Remove PATENT_PROBLEMS as + it's no longer covered. Update NEWS and Makefile.am for the new + release. + +2007-11-10 10:46 abadger1999 + + * configure.ac, util/gif2epsn.c, util/gif2iris.c, util/gif2ps.c, + util/gif2rgb.c, util/gif2rle.c, util/gif2x11.c: Find and fix + segfaults in the gif2* programs due to referencing the ColorMap + beforefinding out if hte GifFile produced a valid colormap or was + corrupt. + +2007-11-10 09:30 abadger1999 + + * lib/dgif_lib.c: Add checks to fail gracefully when corrupted + images are submitted that have improper LZ codes. + +2007-11-10 09:22 abadger1999 + + * lib/: dgif_lib.c, egif_lib.c: Further checks to compile correctly + on WIN32. + +2007-11-09 20:28 abadger1999 + + * util/giftext.c: Fix a SegFault when a GifFile does not store a + global colormap. + +2007-11-09 20:13 abadger1999 + + * util/gif2x11.c: Fix gif2x11 to work with modern, 24 bit displays. + +2007-11-09 14:18 abadger1999 + + * configure.ac: Check for headers as well as the libraries for rle, + X11, and gl_s. + +2007-11-09 13:24 abadger1999 + + * configure.ac: Merge better fix for finding an unsignd 32 bit + integer type. + +2007-11-09 13:01 abadger1999 + + * configure.ac: Add configure comman line switches to turn off X11, + rle, and gl support. + +2007-11-09 12:36 abadger1999 + + * configure.ac, util/Makefile.am: Fixes to build under cygwin. + +2007-11-09 11:49 abadger1999 + + * configure.ac: Make GCC check more robust. Add a needed automake + check. + +2007-11-09 11:48 abadger1999 + + * lib/dgif_lib.c: Fix closing file handles on failure in + DGifOpenFileHandle(). + +2007-11-09 11:33 abadger1999 + + * lib/egif_lib.c: Save files in binary mode for WIN32 as well as + MSDOS. + +2007-11-09 11:25 abadger1999 + + * lib/Makefile.ms: * Makefile for building under Visual C++ from + Bug #981209. + +2005-11-13 20:14 abadger1999 + + * configure.ac, lib/Makefile.am, util/Makefile.am: Changes to + conditionalize -Wall upon compiling with gcc. + +2005-11-06 08:45 abadger1999 + + * lib/: gif_hash.c, gif_hash.h: Add inttypes.h to the headers we + could include to get a 32-it int type. + +2005-11-06 08:34 abadger1999 + + * configure.ac: Search for ISO/ANSI definitions of uint32_t in + stdint.h _and_ inttypes.h before POSIX u_int32_t in sys/types.h + as some systems have sys/types.h without the definition. + Eventually we need to code a test that the expected UINT32 + definition exists in the header we select so order does not + matter. + +2005-11-06 08:32 abadger1999 + + * AUTHORS, README: Modify so that it no longer appears that esr + still maintains this package. + += giflib-4.1.4 = + 2005-10-09 Toshio Kuratomi - r94 * Sync with libungif r93. * ChangeLog: Update to r92. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/giflib-4.1.4/compile new/giflib-4.1.6/compile --- old/giflib-4.1.4/compile 1970-01-01 01:00:00.000000000 +0100 +++ new/giflib-4.1.6/compile 2007-11-10 23:53:34.000000000 +0100 @@ -0,0 +1,142 @@ +#! /bin/sh +# Wrapper for compilers which do not understand `-c -o'. + +scriptversion=2005-05-14.22 + +# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. +# Written by Tom Tromey . +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + +case $1 in + '') + echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: compile [--help] [--version] PROGRAM [ARGS] + +Wrapper for compilers which do not understand `-c -o'. +Remove `-o dest.o' from ARGS, run PROGRAM with the remaining +arguments, and rename the output as expected. + +If you are trying to build a whole package this is not the +right script to run: please start by reading the file `INSTALL'. + +Report bugs to . +EOF + exit $? + ;; + -v | --v*) + echo "compile $scriptversion" + exit $? + ;; +esac + +ofile= +cfile= +eat= + +for arg +do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as `compile cc -o foo foo.c'. + # So we strip `-o arg' only if arg is an object. + eat=1 + case $2 in + *.o | *.obj) + ofile=$2 + ;; + *) + set x "$@" -o "$2" + shift + ;; + esac + ;; + *.c) + cfile=$1 + set x "$@" "$1" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift +done + +if test -z "$ofile" || test -z "$cfile"; then + # If no `-o' option was seen then we might have been invoked from a + # pattern rule where we don't need one. That is ok -- this is a + # normal compilation that the losing compiler can handle. If no + # `.c' file was seen then we are probably linking. That is also + # ok. + exec "$@" +fi + +# Name of file we expect compiler to create. +cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'` + +# Create the lock directory. +# Note: use `[/.-]' here to ensure that we don't use the same name +# that we are using for the .o file. Also, base the name on the expected +# object file name, since that is what matters with a parallel build. +lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d +while true; do + if mkdir "$lockdir" >/dev/null 2>&1; then + break + fi + sleep 1 +done +# FIXME: race condition here if user kills between mkdir and trap. +trap "rmdir '$lockdir'; exit 1" 1 2 15 + +# Run the compile. +"$@" +ret=$? + +if test -f "$cofile"; then + mv "$cofile" "$ofile" +elif test -f "${cofile}bj"; then + mv "${cofile}bj" "$ofile" +fi + +rmdir "$lockdir" +exit $ret + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/giflib-4.1.4/config.h.in new/giflib-4.1.6/config.h.in --- old/giflib-4.1.4/config.h.in 2005-10-18 15:53:19.000000000 +0200 +++ new/giflib-4.1.6/config.h.in 2007-11-10 23:53:33.000000000 +0100 @@ -9,6 +9,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_FCNTL_H +/* Define to 1 if you have the header file. */ +#undef HAVE_GL_GL_H + /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H @@ -21,6 +24,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H +/* Define to 1 if you have the header file. */ +#undef HAVE_RLE_H + /* Define to 1 if you have the header file. */ #undef HAVE_STDARG_H @@ -45,15 +51,30 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYS_TYPES_H +/* Define to 1 if the system has the type `uint32_t'. */ +#undef HAVE_UINT32_T + /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H +/* Define to 1 if the system has the type `u_int32_t'. */ +#undef HAVE_U_INT32_T + /* Define to 1 if you have the header file. */ #undef HAVE_VARARGS_H /* Define to 1 if you have the `vprintf' function. */ #undef HAVE_VPRINTF +/* Define to 1 if you have the header file. */ +#undef HAVE_X11_XLIB_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_X11_XUTIL_H + +/* Define to 1 if your C compiler doesn't accept -c and -o together. */ +#undef NO_MINUS_C_MINUS_O + /* Name of package */ #undef PACKAGE @@ -80,10 +101,10 @@ release 3. */ #undef SETVBUF_REVERSED -/* The size of a `unsigned int', as computed by sizeof. */ +/* The size of `unsigned int', as computed by sizeof. */ #undef SIZEOF_UNSIGNED_INT -/* The size of a `unsigned long', as computed by sizeof. */ +/* The size of `unsigned long', as computed by sizeof. */ #undef SIZEOF_UNSIGNED_LONG /* Define to 1 if you have the ANSI C header files. */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/giflib-4.1.4/configure.ac new/giflib-4.1.6/configure.ac --- old/giflib-4.1.4/configure.ac 2005-10-10 08:22:20.000000000 +0200 +++ new/giflib-4.1.6/configure.ac 2007-11-10 23:49:15.000000000 +0100 @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(giflib, [4.1.4], [abadger1999@sourceforge.net], giflib) +AC_INIT(giflib, [4.1.6], [abadger1999@sourceforge.net], giflib) AC_CONFIG_SRCDIR([lib/dgif_lib.c]) AM_INIT_AUTOMAKE([gnu check-news dist-bzip2 -Wall]) AM_CONFIG_HEADER(config.h) @@ -11,37 +11,62 @@ AC_PROG_INSTALL AC_PROG_LN_S AC_PROG_MAKE_SET +AM_PROG_CC_C_O -AC_PATH_XTRA +dnl Define warnings if we're compiling with gcc. +dnl Set it in CFLAGS so the end-user can disable it if they wish. +if test "x$GCC" = "xyes" ; then + CFLAGS="$CFLAGS -Wall" +fi dnl Checks for libraries. - AC_CHECK_LIB(m, pow, [MATH_LIB="${MATH_LIB} -lm" - COMPILABLE_EXTRAS="${COMPILABLE_EXTRAS} gifclrmp gifrotat"] ) +AC_CHECK_LIB(m, pow, [MATH_LIB="${MATH_LIB} -lm" + COMPILABLE_EXTRAS="${COMPILABLE_EXTRAS} gifclrmp${EXEEXT} gifrotat${EXEEXT}"] ) -if test ${MATH_LIB}; then - AC_CHECK_LIB(rle, rle_hdr_init, [RLE_LIB="${RLE_LIBS} -lrle -lm" - COMPILABLE_EXTRAS="${COMPILABLE_EXTRAS} gif2rle rle2gif"], - ,"-lm" ) -fi +AC_ARG_ENABLE(rle, AC_HELP_STRING([rle],[detect whether we can support conversion to/from rle]), + enable_rle=$enableval, enable_rle=auto) + +AC_ARG_ENABLE(x11, AC_HELP_STRING([x11],[detect whether we can support conversion directly to X11 Windows]), + enable_x11=$enableval, enable_x11=auto) + +AC_ARG_ENABLE(gl, AC_HELP_STRING([gl],[detect whether we can support conversion to/from gl]), + enable_gl=$enableval, enable_gl=auto) dnl I don't have this on my system. Could someone else configure it and dnl check that it works? +if test "x$enable_rle" != "xno" ; then + if test ${MATH_LIB}; then + AC_CHECK_HEADERS([rle.h], + AC_CHECK_LIB(rle, rle_hdr_init, [RLE_LIB="${RLE_LIBS} -lrle -lm" + COMPILABLE_EXTRAS="${COMPILABLE_EXTRAS} gif2rle${EXEEXT} rle2gif${EXEEXT}"], + ,"-lm" )) + fi +fi + +if test "x$enable_gl" != "xno" ; then + AC_CHECK_HEADERS([gl/gl.h], AC_CHECK_LIB(gl_s, main, [GL_S_LIB="${GL_S_LIB} -lgl_s $X_LIBS" - AC_DEFINE(HAVE_LIBGL_S, [1], [Define if the gl_s library is installed (SGI GL library)]) - COMPILABLE_EXTRAS="${COMPILABLE_EXTRAS} gif2iris"],, $X_LIBS) + AC_DEFINE(HAVE_LIBGL_S, [1], [Define if the gl_s library is installed (SGI GL library)]) + COMPILABLE_EXTRAS="${COMPILABLE_EXTRAS} gif2iris${EXEEXT}"],, $X_LIBS)) +fi +if test "x$enable_x11" != "xno" ; then + AC_PATH_XTRA + AC_CHECK_HEADERS([X11/Xlib.h X11/Xutil.h], AC_CHECK_LIB(X11, main, [X11_LIB="${X11_LIB} ${X_PRE_LIBS} $X_LIBS ${X_EXTRA_LIBS} -lX11" - AC_DEFINE(HAVE_LIBX11, [1], [Define if the X11 library is installed]) - COMPILABLE_EXTRAS="${COMPILABLE_EXTRAS} gif2x11"],, $X_LIBS) - DEVS="${GL_S_LIB} ${X11_LIB}" - AC_SUBST(DEVS) - AC_SUBST(COMPILABLE_EXTRAS) - AC_SUBST(GL_S_LIB) - AC_SUBST(X11_LIB) - AC_SUBST(X_CFLAGS) - AC_SUBST(MATH_LIB) - AC_SUBST(RLE_LIB) + AC_DEFINE(HAVE_LIBX11, [1], [Define if the X11 library is installed]) + COMPILABLE_EXTRAS="${COMPILABLE_EXTRAS} gif2x11${EXEEXT}"],, $X_LIBS)) +fi + +DEVS="${GL_S_LIB} ${X11_LIB}" +AC_SUBST(DEVS) +AC_SUBST(COMPILABLE_EXTRAS) +AC_SUBST(GL_S_LIB) +AC_SUBST(X11_LIB) +AC_SUBST(X_CFLAGS) +AC_SUBST(MATH_LIB) +AC_SUBST(RLE_LIB) dnl Checks for header files. AC_HEADER_STDC @@ -54,25 +79,20 @@ AC_CHECK_HEADERS(fcntl.h, , AC_MSG_ERROR([giflib 4.x must have fcntl.h to compile])) -dnl Can we survive without these? -AC_CHECK_HEADERS(unistd.h) - -dnl Find a way to define a 32 bit integer +dnl Now look for a 32 bit integer type foundint=no -AC_CHECK_HEADERS([sys/types.h], [ - AC_DEFINE([UINT32], u_int32_t, +AC_CHECK_TYPES([u_int32_t], [AC_DEFINE([UINT32], u_int32_t, [Set to an unsigned 32 bit integer available on this system]) - foundint=yes] + foundint=yes] ) - if test x$foundint != x'yes'; then -AC_CHECK_HEADERS([stdint.h], [ - AC_DEFINE([UINT32], uint32_t, + AC_CHECK_TYPES([uint32_t], [AC_DEFINE([UINT32], uint32_t, [Set to an unsigned 32 bit integer available on this system]) - foundint=yes] -) + foundint=yes] + ) fi +dnl Fall back on trying to find one ourselves by compiling and checking sizes. if test x$foundint != x'yes'; then AC_CHECK_SIZEOF(unsigned int) if test $ac_cv_sizeof_unsigned_int -eq 4; then diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/giflib-4.1.4/INSTALL new/giflib-4.1.6/INSTALL --- old/giflib-4.1.4/INSTALL 2005-02-13 16:53:27.000000000 +0100 +++ new/giflib-4.1.6/INSTALL 2007-11-10 23:53:34.000000000 +0100 @@ -1,8 +1,8 @@ Installation Instructions ************************* -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free -Software Foundation, Inc. +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006 Free Software Foundation, Inc. This file is free documentation; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. @@ -10,7 +10,10 @@ Basic Installation ================== -These are generic installation instructions. +Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. The `configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses @@ -23,9 +26,9 @@ It can also use an optional file (typically called `config.cache' and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. (Caching is +the results of its tests to speed up reconfiguring. Caching is disabled by default to prevent problems with accidental use of stale -cache files.) +cache files. If you need to do unusual things to compile the package, please try to figure out how `configure' could check whether to do them, and mail @@ -35,20 +38,17 @@ may remove or edit it. The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You only need -`configure.ac' if you want to change it or regenerate `configure' using -a newer version of `autoconf'. +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. The simplest way to compile this package is: 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. If you're - using `csh' on an old version of System V, you might need to type - `sh ./configure' instead to prevent `csh' from trying to execute - `configure' itself. + `./configure' to configure the package for your system. - Running `configure' takes awhile. While running, it prints some - messages telling which features it is checking for. + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. 2. Type `make' to compile the package. @@ -78,7 +78,7 @@ by setting variables in the command line or in the environment. Here is an example: - ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix + ./configure CC=c99 CFLAGS=-g LIBS=-lposix *Note Defining Variables::, for more details. @@ -87,31 +87,29 @@ You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their -own directory. To do this, you must use a version of `make' that -supports the `VPATH' variable, such as GNU `make'. `cd' to the +own directory. To do this, you can use GNU `make'. `cd' to the directory where you want the object files and executables to go and run the `configure' script. `configure' automatically checks for the source code in the directory that `configure' is in and in `..'. - If you have to use a `make' that does not support the `VPATH' -variable, you have to compile the package for one architecture at a -time in the source code directory. After you have installed the -package for one architecture, use `make distclean' before reconfiguring -for another architecture. + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. Installation Names ================== -By default, `make install' will install the package's files in -`/usr/local/bin', `/usr/local/man', etc. You can specify an -installation prefix other than `/usr/local' by giving `configure' the -option `--prefix=PREFIX'. +By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX'. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you -give `configure' the option `--exec-prefix=PREFIX', the package will -use PREFIX as the prefix for installing programs and libraries. -Documentation and other data files will still use the regular prefix. +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. In addition, if you use an unusual directory layout you can give options like `--bindir=DIR' to specify different values for particular @@ -159,7 +157,7 @@ need to know the machine type. If you are _building_ compiler tools for cross-compiling, you should -use the `--target=TYPE' option to select the type of system they will +use the option `--target=TYPE' to select the type of system they will produce code for. If you want to _use_ a cross compiler, that generates code for a @@ -190,12 +188,12 @@ ./configure CC=/usr/local2/bin/gcc causes the specified `gcc' to be used as the C compiler (unless it is -overridden in the site shell script). Here is a another example: +overridden in the site shell script). - /bin/bash ./configure CONFIG_SHELL=/bin/bash +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: -Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent -configuration-related scripts to be executed by `/bin/bash'. + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash `configure' Invocation ====================== diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/giflib-4.1.4/lib/dgif_lib.c new/giflib-4.1.6/lib/dgif_lib.c --- old/giflib-4.1.4/lib/dgif_lib.c 2005-10-10 08:22:21.000000000 +0200 +++ new/giflib-4.1.6/lib/dgif_lib.c 2007-11-10 23:54:44.000000000 +0100 @@ -69,7 +69,7 @@ GifFileType *GifFile; if ((FileHandle = open(FileName, O_RDONLY -#if defined(__MSDOS__) || defined(_OPEN_BINARY) +#if defined(__MSDOS__) || defined(WINDOWS32) || defined(_OPEN_BINARY) | O_BINARY #endif /* __MSDOS__ || _OPEN_BINARY */ )) == -1) { @@ -78,8 +78,6 @@ } GifFile = DGifOpenFileHandle(FileHandle); - if (GifFile == (GifFileType *)NULL) - close(FileHandle); return GifFile; } @@ -99,6 +97,7 @@ GifFile = (GifFileType *)malloc(sizeof(GifFileType)); if (GifFile == NULL) { _GifError = D_GIF_ERR_NOT_ENOUGH_MEM; + close(FileHandle); return NULL; } @@ -107,16 +106,17 @@ Private = (GifFilePrivateType *)malloc(sizeof(GifFilePrivateType)); if (Private == NULL) { _GifError = D_GIF_ERR_NOT_ENOUGH_MEM; + close(FileHandle); free((char *)GifFile); return NULL; } -#ifdef __MSDOS__ +#if defined(__MSDOS__) || defined(WINDOWS32) || defined(_OPEN_BINARY) setmode(FileHandle, O_BINARY); /* Make sure it is in binary mode. */ #endif /* __MSDOS__ */ f = fdopen(FileHandle, "rb"); /* Make it into a stream: */ -#ifdef __MSDOS__ +#if defined(__MSDOS__) || defined(WINDOWS32) setvbuf(f, NULL, _IOFBF, GIF_FILE_BUFFER_SIZE); /* And inc. stream buffer. */ #endif /* __MSDOS__ */ @@ -440,7 +440,7 @@ if (!LineLen) LineLen = GifFile->Image.Width; -#if defined(__MSDOS__) || defined(__GNUC__) +#if defined(__MSDOS__) || defined(WINDOWS32) || defined(__GNUC__) if ((Private->PixelCount -= LineLen) > 0xffff0000UL) { #else if ((Private->PixelCount -= LineLen) > 0xffff0000) { @@ -479,7 +479,7 @@ _GifError = D_GIF_ERR_NOT_READABLE; return GIF_ERROR; } -#if defined(__MSDOS__) || defined(__GNUC__) +#if defined(__MSDOS__) || defined(WINDOWS32) || defined(__GNUC__) if (--Private->PixelCount > 0xffff0000UL) #else if (--Private->PixelCount > 0xffff0000) @@ -748,6 +748,10 @@ ClearCode = Private->ClearCode; LastCode = Private->LastCode; + if (StackPtr > LZ_MAX_CODE) { + return GIF_ERROR; + } + if (StackPtr != 0) { /* Let pop the stack off before continueing to read the gif file: */ while (StackPtr != 0 && i < LineLen) @@ -865,8 +869,12 @@ int i = 0; - while (Code > ClearCode && i++ <= LZ_MAX_CODE) + while (Code > ClearCode && i++ <= LZ_MAX_CODE) { + if (Code > LZ_MAX_CODE) { + return NO_SUCH_CODE; + } Code = Prefix[Code]; + } return Code; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/giflib-4.1.4/lib/egif_lib.c new/giflib-4.1.6/lib/egif_lib.c --- old/giflib-4.1.4/lib/egif_lib.c 2005-10-10 08:22:21.000000000 +0200 +++ new/giflib-4.1.6/lib/egif_lib.c 2007-11-10 23:48:40.000000000 +0100 @@ -22,6 +22,12 @@ #ifdef HAVE_STDINT_H #include #endif +#ifdef HAVE_UNISTD_H +#include +#endif +#ifdef HAVE_INTTYPES_H +#include +#endif #ifdef __MSDOS__ #include @@ -92,13 +98,13 @@ if (TestExistance) FileHandle = open(FileName, O_WRONLY | O_CREAT | O_EXCL -#ifdef __MSDOS__ +#if defined(__MSDOS__) || defined(WINDOWS32) || defined(_OPEN_BINARY) | O_BINARY #endif /* __MSDOS__ */ , S_IREAD | S_IWRITE); else FileHandle = open(FileName, O_WRONLY | O_CREAT | O_TRUNC -#ifdef __MSDOS__ +#if defined(__MSDOS__) || defined(WINDOWS32) || defined(_OPEN_BINARY) | O_BINARY #endif /* __MSDOS__ */ , S_IREAD | S_IWRITE); @@ -147,13 +153,13 @@ return NULL; } -#ifdef __MSDOS__ +#if defined(__MSDOS__) || defined(WINDOWS32) || defined(_OPEN_BINARY) setmode(FileHandle, O_BINARY); /* Make sure it is in binary mode. */ #endif /* __MSDOS__ */ f = fdopen(FileHandle, "wb"); /* Make it into a stream: */ -#ifdef __MSDOS__ +#if defined (__MSDOS__) || defined(WINDOWS32) setvbuf(f, NULL, _IOFBF, GIF_FILE_BUFFER_SIZE); /* And inc. stream * buffer. */ #endif /* __MSDOS__ */ @@ -339,7 +345,7 @@ GifFilePrivateType *Private = (GifFilePrivateType *)GifFile->Private; if (Private->FileState & FILE_STATE_IMAGE && -#if defined(__MSDOS__) || defined(__GNUC__) +#if defined(__MSDOS__) || defined(WINDOWS32) || defined(__GNUC__) Private->PixelCount > 0xffff0000UL) { #else Private->PixelCount > 0xffff0000) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/giflib-4.1.4/lib/gif_hash.c new/giflib-4.1.6/lib/gif_hash.c --- old/giflib-4.1.4/lib/gif_hash.c 2005-10-10 08:22:21.000000000 +0200 +++ new/giflib-4.1.6/lib/gif_hash.c 2007-11-10 23:48:51.000000000 +0100 @@ -24,9 +24,15 @@ #ifdef HAVE_STDINT_H #include #endif +#ifdef HAVE_INTTYPES_H +#include +#endif #ifdef HAVE_SYS_TYPES_H #include #endif +#ifdef HAVE_UNISTD_H +#include +#endif #ifdef __MSDOS__ #include diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/giflib-4.1.4/lib/gif_hash.h new/giflib-4.1.6/lib/gif_hash.h --- old/giflib-4.1.4/lib/gif_hash.h 2005-10-18 15:48:51.000000000 +0200 +++ new/giflib-4.1.6/lib/gif_hash.h 2007-11-11 00:15:03.000000000 +0100 @@ -15,12 +15,19 @@ #endif /* Find a thirty-two bit int type */ +#ifdef HAVE_STDINT_H +#include +#endif +#ifdef HAVE_INTTYPES_H +#include +#endif #ifdef HAVE_SYS_TYPES_H #include #endif -#ifdef HAVE_STDINT_H -#include +#ifdef HAVE_UNISTD_H +#include #endif + #ifdef HAVE_BASETSD_H #include #endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/giflib-4.1.4/lib/Makefile.am new/giflib-4.1.6/lib/Makefile.am --- old/giflib-4.1.4/lib/Makefile.am 2005-10-10 08:22:22.000000000 +0200 +++ new/giflib-4.1.6/lib/Makefile.am 2007-11-10 23:47:55.000000000 +0100 @@ -21,6 +21,6 @@ quantize.c \ gif_lib_private.h -libgif_la_LDFLAGS = -version-info 5:4:1 +libgif_la_LDFLAGS = -version-info 5:6:1 libgif_la_LIBADD = @DEVS@ -AM_CFLAGS = @CFLAGS@ $(X_CFLAGS) -Wall +libgif_CFLAGS = $(X_CFLAGS) $(AM_CFLAGS) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/giflib-4.1.4/Makefile.am new/giflib-4.1.6/Makefile.am --- old/giflib-4.1.4/Makefile.am 2005-10-10 08:22:20.000000000 +0200 +++ new/giflib-4.1.6/Makefile.am 2007-11-10 22:15:58.000000000 +0100 @@ -20,7 +20,6 @@ EXTRA_DIST = Makefile.unx \ ONEWS \ - PATENT_PROBLEMS \ autogen.sh \ giflib.spec \ test-unx \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/giflib-4.1.4/missing new/giflib-4.1.6/missing --- old/giflib-4.1.4/missing 2005-02-13 16:53:27.000000000 +0100 +++ new/giflib-4.1.6/missing 2007-11-10 23:53:34.000000000 +0100 @@ -1,9 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2005-02-08.22 +scriptversion=2006-05-10.23 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 # Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. @@ -19,8 +19,8 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -33,6 +33,8 @@ fi run=: +sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' +sed_minuso='s/.* -o \([^ ]*\).*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -44,7 +46,7 @@ msg="missing on your system" -case "$1" in +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= @@ -77,6 +79,7 @@ aclocal touch file \`aclocal.m4' autoconf touch file \`configure' autoheader touch file \`config.h.in' + autom4te touch the output file, or create a stub one automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c @@ -106,7 +109,7 @@ # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect # the program). -case "$1" in +case $1 in lex|yacc) # Not GNU programs, they don't have --version. ;; @@ -135,7 +138,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case "$1" in +case $1 in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -164,7 +167,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -192,8 +195,8 @@ You can get \`$1' as part of \`Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -214,25 +217,25 @@ in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; @@ -244,18 +247,18 @@ in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; @@ -267,11 +270,9 @@ \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file @@ -289,14 +290,23 @@ DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then # ... or it is the one specified with @setfilename ... infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile` + file=`sed -n ' + /^@setfilename/{ + s/.* \([^ ]*\) *$/\1/ + p + q + }' $infile` # ... or it is derived from the source name (dir/f.texi becomes f.info) test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info fi + # If the file does not exist, the user really needs makeinfo; + # let's fail without touching anything. + test -f $file || exit 1 touch $file ;; @@ -314,13 +324,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/giflib-4.1.4/NEWS new/giflib-4.1.6/NEWS --- old/giflib-4.1.4/NEWS 2005-10-10 08:22:20.000000000 +0200 +++ new/giflib-4.1.6/NEWS 2007-11-10 23:49:08.000000000 +0100 @@ -1,3 +1,30 @@ +Version 4.1.6 +============= +Brown paper bag release. Fix a problem with header inclusion that could +prevent the library from building on some platforms. + +Version 4.1.5 +============= +This version has some important fixes for segfaults when working with corrupt +files. All users are strongly encouraged to upgrade. + +Code Fixes +---------- +* Fix segfault in utilities due to referencing ColorMaps in GifFiles that had + no ColorMap present. +* Fix gif2x11 to work on 24 bit displays. +* Fix for giftext segfault when the GifFile does not store a global colormap. +* Checks to fail gracefully when an image contains improper LZ codes. +* Close file handles on failure in DGifOpenFileHandle() +* Checks to operate on files in binary mode on WIN32 as well as MSDOS. + +Building +-------- +* Add checks to make building on Win32 easier. +* Allow turning off gl_s, rle, and X11 support from the configure command line. +* Fix for finding a 32 bit integer type on some platforms. +* Only enable -Wall if we're using gcc. + Version 4.1.4 ============= This version fixes some bugs with deallocating ColorMaps. Fix building on diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/giflib-4.1.4/PATENT_PROBLEMS new/giflib-4.1.6/PATENT_PROBLEMS --- old/giflib-4.1.4/PATENT_PROBLEMS 2005-10-10 08:22:19.000000000 +0200 +++ new/giflib-4.1.6/PATENT_PROBLEMS 1970-01-01 01:00:00.000000000 +0100 @@ -1,21 +0,0 @@ -Unisys has a patent on the LZW compressor used in gif images. Use of giflib -is highly discouraged as it may put you into legal difficulties with UniSys. -I take no responsibility for any liability you may incur by using this -software. If you must access gif files, use libungif (available from -sunsite.unc.edu/pub/Linux/libs/graphics/), which writes uncompressed gifs -rather than gifs utilizing LZW compression. - -Eric Raymond, the previous maintainer of giflib has this to say: - - Note: due to Unisys's increasingly aggressive interpretation of its - patent claims on the LZW compression format, I can no longer recommend - the use of the GIFLIB library or utilities. GIFLIB may be withdrawn - in the near future. - - For extended discussion of the situation, see - http://www.cloanto.com/users/mcb/19950127giflzw.html, The GIF - Controversy: A Software Developer's Perspective. Essentially, - since 1996 Unisys no longer exempts even `freeware' from its - licensing requirements. If you use this library in any way and Unisys - decides it doesn't like you, you could be open to lawsuit. - diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/giflib-4.1.4/README new/giflib-4.1.6/README --- old/giflib-4.1.4/README 2005-10-10 08:22:20.000000000 +0200 +++ new/giflib-4.1.6/README 2005-11-06 17:32:14.000000000 +0100 @@ -1,13 +1,5 @@ -This is giflib version 4.1.2, a library for manipulating gif files. It is based -on Eric S. Raymond's giflib-3.0 with bugfixes and changes generated for the -libungif library. - -PLEASE BE AWARE OF POSSIBLE LEGAL PROBLEMS WITH USING THIS LIBRARY: READ -THE PATENT_PROBLEMS FILE NOW! - -======= -Latest versions of giflib, as well as a library which does not have the -mentioned patent problems (libungif), are available from: +This is giflib version 4.1.2, a library for manipulating gif files. +Latest versions of giflib are currently hosted at: http://sourceforge.net/projects/libungif ==== @@ -53,17 +45,3 @@ Good luck! -Toshio Kuratomi - -==== READ.ME file for giflib version 3.0: - - READ ME for GIFLIB - -For complete documentation on the package, point a web browser at -doc/index.html. See the file INSTALL for instructions on how to -install and test the package. - -GIFLIB has a home page at http://www.ccil.org/~esr/giflib. - - Eric S. Raymond - esr@snark.thyrsus.com. - (http://www.ccil.org/~esr) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/giflib-4.1.4/util/gif2epsn.c new/giflib-4.1.6/util/gif2epsn.c --- old/giflib-4.1.4/util/gif2epsn.c 2005-10-10 08:22:23.000000000 +0200 +++ new/giflib-4.1.6/util/gif2epsn.c 2007-11-10 19:46:31.000000000 +0100 @@ -282,7 +282,12 @@ /* Lets display it - set the global variables required and do it: */ BackGround = GifFile->SBackGroundColor; ColorMap = (GifFile->Image.ColorMap ? GifFile->Image.ColorMap->Colors : - GifFile->SColorMap->Colors); + (GifFile->SColorMap ? GifFile->SColorMap->Colors : + NULL)); + if (ColorMap == NULL) { + fprintf(stderr, "Gif Image does not have a colormap\n"); + exit(EXIT_FAILURE); + } DumpScreen2Epsn(ScreenBuffer, GifFile->SWidth, GifFile->SHeight); if (DGifCloseFile(GifFile) == GIF_ERROR) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/giflib-4.1.4/util/gif2iris.c new/giflib-4.1.6/util/gif2iris.c --- old/giflib-4.1.4/util/gif2iris.c 2005-10-10 08:22:23.000000000 +0200 +++ new/giflib-4.1.6/util/gif2iris.c 2007-11-10 19:46:31.000000000 +0100 @@ -229,9 +229,11 @@ BackGround = GifFile->SBackGroundColor; ColorMap = (GifFile->Image.ColorMap ? GifFile->Image.ColorMap : GifFile->SColorMap); - ColorMapSize = 1 << (GifFile->Image.ColorMap ? - GifFile->Image.ColorMap->BitsPerPixel : - GifFile->SColorMap->BitsPerPixel); + if (ColorMap == NULL) { + fprintf(stderr, "Gif Image does not have a colormap\n"); + exit(EXIT_FAILURE); + } + ColorMapSize = 1 << ColorMap->BitsPerPixel; GifQprintf("\n"); Screen2Iris(ScreenBuffer, GifFile->SWidth, GifFile->SHeight); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/giflib-4.1.4/util/gif2ps.c new/giflib-4.1.6/util/gif2ps.c --- old/giflib-4.1.4/util/gif2ps.c 2005-10-10 08:22:23.000000000 +0200 +++ new/giflib-4.1.6/util/gif2ps.c 2007-11-10 19:46:31.000000000 +0100 @@ -254,7 +254,11 @@ BackGround = GifFile->SBackGroundColor; ColorMap = (GifFile->Image.ColorMap ? GifFile->Image.ColorMap->Colors - : GifFile->SColorMap->Colors); + : (GifFile->SColorMap ? GifFile->SColorMap->Colors : NULL)); + if (ColorMap == NULL) { + fprintf(stderr, "Gif Image does not have a colormap\n"); + exit(EXIT_FAILURE); + } DumpScreen2PS(ScreenBuffer, GifFile->SWidth, GifFile->SHeight); if (DGifCloseFile(GifFile) == GIF_ERROR) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/giflib-4.1.4/util/gif2rgb.c new/giflib-4.1.6/util/gif2rgb.c --- old/giflib-4.1.4/util/gif2rgb.c 2005-10-10 08:22:23.000000000 +0200 +++ new/giflib-4.1.6/util/gif2rgb.c 2007-11-10 19:46:31.000000000 +0100 @@ -72,7 +72,6 @@ BackGround = 0, OneFileFlag = FALSE, HelpFlag = FALSE, - ColorMapSize = 0, InterlacedOffset[] = { 0, 4, 2, 1 }, /* The way Interlaced image should. */ InterlacedJumps[] = { 8, 8, 4, 2 }; /* be read - offsets and jumps... */ static ColorMapObject @@ -113,7 +112,6 @@ GAPrintHowTo(CtrlStr); exit(EXIT_SUCCESS); } - if (!OutFileFlag) OutFileName = NULL; if (NumFiles == 1) { @@ -222,15 +220,17 @@ default: /* Should be traps by DGifGetRecordType. */ break; } - } - while (RecordType != TERMINATE_RECORD_TYPE); + } while (RecordType != TERMINATE_RECORD_TYPE); /* Lets dump it - set the global variables required and do it: */ BackGround = GifFile->SBackGroundColor; ColorMap = (GifFile->Image.ColorMap ? GifFile->Image.ColorMap : GifFile->SColorMap); - ColorMapSize = ColorMap->ColorCount; + if (ColorMap == NULL) { + fprintf(stderr, "Gif Image does not have a colormap\n"); + exit(EXIT_FAILURE); + } DumpScreen2RGB(OutFileName, OneFileFlag, ScreenBuffer, GifFile->SWidth, GifFile->SHeight); @@ -247,94 +247,90 @@ * The real dumping routine. * ******************************************************************************/ static void DumpScreen2RGB(char *FileName, int OneFileFlag, - GifRowType *ScreenBuffer, - int ScreenWidth, int ScreenHeight) + GifRowType *ScreenBuffer, + int ScreenWidth, int ScreenHeight) { int i, j; GifRowType GifRow; - static GifColorType - *ColorMapEntry; + static GifColorType *ColorMapEntry; FILE *f[3]; if (FileName != NULL) { - char OneFileName[80]; + char OneFileName[80]; - if (OneFileFlag) { - if ((f[0] = fopen(FileName, "wb")) == NULL) - GIF_EXIT("Can't open input file name."); - } - else { - static char *Postfixes[] = { ".R", ".G", ".B" }; - - for (i = 0; i < 3; i++) { - strcpy(OneFileName, FileName); - strcat(OneFileName, Postfixes[i]); - - if ((f[i] = fopen(OneFileName, "wb")) == NULL) - GIF_EXIT("Can't open input file name."); - } - } - } - else { - OneFileFlag = TRUE; - -#ifdef __MSDOS__ - setmode(0, O_BINARY); -#endif /* __MSDOS__ */ - - f[0] = stdout; + if (OneFileFlag) { + if ((f[0] = fopen(FileName, "wb")) == NULL) + GIF_EXIT("Can't open input file name."); + } else { + static char *Postfixes[] = { ".R", ".G", ".B" }; + + for (i = 0; i < 3; i++) { + strcpy(OneFileName, FileName); + strcat(OneFileName, Postfixes[i]); + + if ((f[i] = fopen(OneFileName, "wb")) == NULL) { + GIF_EXIT("Can't open input file name."); + } + } + } + } else { + OneFileFlag = TRUE; + + #ifdef __MSDOS__ + setmode(0, O_BINARY); + #endif /* __MSDOS__ */ + + f[0] = stdout; } if (OneFileFlag) { - unsigned char *Buffer, *BufferP; - - if ((Buffer = (unsigned char *) malloc(ScreenWidth * 3)) == NULL) - GIF_EXIT("Failed to allocate memory required, aborted."); - - for (i = 0; i < ScreenHeight; i++) { - GifRow = ScreenBuffer[i]; - GifQprintf("\b\b\b\b%-4d", ScreenHeight - i); - for (j = 0, BufferP = Buffer; j < ScreenWidth; j++) { - ColorMapEntry = &ColorMap->Colors[GifRow[j]]; - *BufferP++ = ColorMapEntry->Red; - *BufferP++ = ColorMapEntry->Green; - *BufferP++ = ColorMapEntry->Blue; - } - if (fwrite(Buffer, ScreenWidth * 3, 1, f[0]) != 1) - GIF_EXIT("Write to file(s) failed."); - } - - free((char *) Buffer); - fclose(f[0]); - } - else { - unsigned char *Buffers[3]; - - if ((Buffers[0] = (unsigned char *) malloc(ScreenWidth)) == NULL || - (Buffers[1] = (unsigned char *) malloc(ScreenWidth)) == NULL || - (Buffers[2] = (unsigned char *) malloc(ScreenWidth)) == NULL) - GIF_EXIT("Failed to allocate memory required, aborted."); - - for (i = 0; i < ScreenHeight; i++) { - GifRow = ScreenBuffer[i]; - GifQprintf("\b\b\b\b%-4d", ScreenHeight - i); - for (j = 0; j < ScreenWidth; j++) { - ColorMapEntry = &ColorMap->Colors[GifRow[j]]; - Buffers[0][j] = ColorMapEntry->Red; - Buffers[1][j] = ColorMapEntry->Green; - Buffers[2][j] = ColorMapEntry->Blue; - } - if (fwrite(Buffers[0], ScreenWidth, 1, f[0]) != 1 || - fwrite(Buffers[1], ScreenWidth, 1, f[1]) != 1 || - fwrite(Buffers[2], ScreenWidth, 1, f[2]) != 1) - GIF_EXIT("Write to file(s) failed."); - } + unsigned char *Buffer, *BufferP; - free((char *) Buffers[0]); - free((char *) Buffers[1]); - free((char *) Buffers[2]); - fclose(f[0]); - fclose(f[1]); - fclose(f[2]); + if ((Buffer = (unsigned char *) malloc(ScreenWidth * 3)) == NULL) + GIF_EXIT("Failed to allocate memory required, aborted."); + for (i = 0; i < ScreenHeight; i++) { + GifRow = ScreenBuffer[i]; + GifQprintf("\b\b\b\b%-4d", ScreenHeight - i); + for (j = 0, BufferP = Buffer; j < ScreenWidth; j++) { + ColorMapEntry = &ColorMap->Colors[GifRow[j]]; + *BufferP++ = ColorMapEntry->Red; + *BufferP++ = ColorMapEntry->Green; + *BufferP++ = ColorMapEntry->Blue; + } + if (fwrite(Buffer, ScreenWidth * 3, 1, f[0]) != 1) + GIF_EXIT("Write to file(s) failed."); + } + + free((char *) Buffer); + fclose(f[0]); + } else { + unsigned char *Buffers[3]; + + if ((Buffers[0] = (unsigned char *) malloc(ScreenWidth)) == NULL || + (Buffers[1] = (unsigned char *) malloc(ScreenWidth)) == NULL || + (Buffers[2] = (unsigned char *) malloc(ScreenWidth)) == NULL) + GIF_EXIT("Failed to allocate memory required, aborted."); + + for (i = 0; i < ScreenHeight; i++) { + GifRow = ScreenBuffer[i]; + GifQprintf("\b\b\b\b%-4d", ScreenHeight - i); + for (j = 0; j < ScreenWidth; j++) { + ColorMapEntry = &ColorMap->Colors[GifRow[j]]; + Buffers[0][j] = ColorMapEntry->Red; + Buffers[1][j] = ColorMapEntry->Green; + Buffers[2][j] = ColorMapEntry->Blue; + } + if (fwrite(Buffers[0], ScreenWidth, 1, f[0]) != 1 || + fwrite(Buffers[1], ScreenWidth, 1, f[1]) != 1 || + fwrite(Buffers[2], ScreenWidth, 1, f[2]) != 1) + GIF_EXIT("Write to file(s) failed."); + } + + free((char *) Buffers[0]); + free((char *) Buffers[1]); + free((char *) Buffers[2]); + fclose(f[0]); + fclose(f[1]); + fclose(f[2]); } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/giflib-4.1.4/util/gif2rle.c new/giflib-4.1.6/util/gif2rle.c --- old/giflib-4.1.4/util/gif2rle.c 2005-10-10 08:22:23.000000000 +0200 +++ new/giflib-4.1.6/util/gif2rle.c 2007-11-10 19:46:31.000000000 +0100 @@ -222,8 +222,11 @@ ColorMap = (GifFile->Image.ColorMap ? GifFile->Image.ColorMap->Colors : GifFile->SColorMap->Colors); - ColorMapSize = 1 << (GifFile->Image.ColorMap ? GifFile->Image.ColorMap->BitsPerPixel : - GifFile->SColorMap->BitsPerPixel); + if (ColorMap == NULL) { + fprintf(stderr, "Gif Image does not have a colormap\n"); + exit(EXIT_FAILURE); + } + ColorMapSize = 1 << ColorMap->BitsPerPixel; DumpScreen2Rle(ScreenBuffer, GifFile->SWidth, GifFile->SHeight); if (DGifCloseFile(GifFile) == GIF_ERROR) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/giflib-4.1.4/util/gif2x11.c new/giflib-4.1.6/util/gif2x11.c --- old/giflib-4.1.4/util/gif2x11.c 2005-10-10 08:22:23.000000000 +0200 +++ new/giflib-4.1.6/util/gif2x11.c 2007-11-10 19:46:31.000000000 +0100 @@ -109,6 +109,7 @@ static Pixmap XIcon; static Cursor XCursor; +#define BYTESPERPIXEL 4 static void Screen2X(int argc, char **argv, GifRowType *ScreenBuffer, int ScreenWidth, int ScreenHeight); @@ -272,6 +273,10 @@ ColorMap = (GifFile->Image.ColorMap ? GifFile->Image.ColorMap : GifFile->SColorMap); + if (ColorMap == NULL) { + fprintf(stderr, "Gif Image does not have a colormap\n"); + exit(EXIT_FAILURE); + } ColorMapSize = ColorMap->ColorCount; Screen2X(argc, argv, ScreenBuffer, GifFile->SWidth, GifFile->SHeight); @@ -404,17 +409,20 @@ XMapWindow(XDisplay, XImageWndw); /* Create the image in X format: */ - if ((XImageData = (char *) malloc(ScreenWidth * ScreenHeight)) == NULL) + if ((XImageData = (char *) malloc(ScreenWidth * ScreenHeight * BYTESPERPIXEL)) == NULL) GIF_EXIT("Failed to allocate memory required, aborted."); for (i = 0; i < ScreenHeight; i++) { y = i * ScreenWidth; - for (j = 0; j < ScreenWidth; j++) - XImageData[y + j] = XPixelTable[ScreenBuffer[i][j]]; + for (j = 0; j < ScreenWidth; j++) { + XImageData[(y + j)*BYTESPERPIXEL] = XColorTable[ScreenBuffer[i][j]].blue; + XImageData[(y + j)*BYTESPERPIXEL+1] = XColorTable[ScreenBuffer[i][j]].green; + XImageData[(y + j)*BYTESPERPIXEL+2] = XColorTable[ScreenBuffer[i][j]].red; + } } - XImageBuffer = XCreateImage(XDisplay, XVisual, 8, ZPixmap, 0, + XImageBuffer = XCreateImage(XDisplay, XVisual, DefaultDepth(XDisplay, DefaultScreen(XDisplay)), ZPixmap, 0, XImageData, ScreenWidth, ScreenHeight, - 8, ScreenWidth); + BitmapPad(XDisplay), ScreenWidth*BYTESPERPIXEL); while (TRUE) { XNextEvent(XDisplay, &Event); @@ -454,7 +462,7 @@ for (Strip = 0, Msk = 0xff; Strip < 8; Strip++, Msk <<= 1) { for (i = 0; i < ColorMapSize; i++) { - /* Prepere color entry in X format. */ + /* Prepare color entry in X format. */ XColorTable[i].red = (ColorMap->Colors[i].Red & Msk) << 8; XColorTable[i].green = (ColorMap->Colors[i].Green & Msk) << 8; XColorTable[i].blue = (ColorMap->Colors[i].Blue & Msk) << 8; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/giflib-4.1.4/util/giftext.c new/giflib-4.1.6/util/giftext.c --- old/giflib-4.1.4/util/giftext.c 2005-10-10 08:22:23.000000000 +0200 +++ new/giflib-4.1.6/util/giftext.c 2007-11-10 05:28:56.000000000 +0100 @@ -135,7 +135,7 @@ GifFileName, GifFile->SWidth, GifFile->SHeight); printf("\tColorResolution = %d, BitsPerPixel = %d, BackGround = %d.\n", GifFile->SColorResolution, - GifFile->SColorMap->BitsPerPixel, + GifFile->SColorMap ? GifFile->SColorMap->BitsPerPixel : 0, GifFile->SBackGroundColor); if (GifFile->SColorMap) printf("\tHas Global Color Map.\n\n"); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/giflib-4.1.4/util/Makefile.am new/giflib-4.1.6/util/Makefile.am --- old/giflib-4.1.4/util/Makefile.am 2005-10-10 08:22:23.000000000 +0200 +++ new/giflib-4.1.6/util/Makefile.am 2007-11-09 21:36:30.000000000 +0100 @@ -9,9 +9,8 @@ EXTRA_DIST=Makefile.unx $(bin_SCRIPTS) LDADD = ../lib/libgif.la ../lib/libgetarg.a -AM_CFLAGS = @CFLAGS@ $(X_CFLAGS) -Wall -AM_CPPFLAGS = -I. -I.. -I$(top_srcdir)/lib +AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir)/lib gif2rle_SOURCES = gif2rle.c gif2rle_LDADD = $(LDADD) @RLE_LIB@ @@ -24,6 +23,7 @@ gif2x11_SOURCES = gif2x11.c gif2x11_LDADD = $(LDADD) @X11_LIB@ +gif2x11_CFLAGS = @X_CFLAGS@ $(AM_CFLAGS) gifclrmp_SOURCES = gifclrmp.c gifclrmp_LDADD = $(LDADD) @MATH_LIB@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org