diff --git a/ANNOUNCE b/ANNOUNCE index fc87204d0..b955efde3 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -53,7 +53,7 @@ version 1.4.2rc04 [April 28, 2010] version 1.4.2rc05 [April 29, 2010] Include png_reset_zstream() in png.c only when PNG_READ_SUPPORTED is defined. - Removed dummy_inflate.c from contrib/pngminim/encoder + Removed dummy_inflate.c and uncompr.c from contrib/pngminim/encoder Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index f10a28350..ba7f4cf35 100644 --- a/CHANGES +++ b/CHANGES @@ -2564,7 +2564,7 @@ version 1.4.2rc04 [April 28, 2010] version 1.4.2rc05 [April 29, 2010] Include png_reset_zstream() in png.c only when PNG_READ_SUPPORTED is defined. - Removed dummy_inflate.c from contrib/pngminim/encoder + Removed dummy_inflate.c and uncompr.c from contrib/pngminim/encoder Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/contrib/pngminim/encoder/dummy_inflate.c b/contrib/pngminim/encoder/dummy_inflate.c deleted file mode 100644 index 1422edb43..000000000 --- a/contrib/pngminim/encoder/dummy_inflate.c +++ /dev/null @@ -1,27 +0,0 @@ -#include "zlib.h" - -int ZEXPORT inflate(strm, flush) -z_streamp strm; -int flush; -{ return Z_OK ; } - -int ZEXPORT inflateReset(strm) -z_streamp strm; -{ return Z_OK ; } - -int ZEXPORT inflateEnd(strm) -z_streamp strm; -{ return Z_STREAM_ERROR ; } - -int ZEXPORT inflateInit_(strm, version, stream_size) -z_streamp strm; -const char *version; -int stream_size; -{ return Z_OK ; } - -int ZEXPORT inflateInit2_(strm, windowBits, version, stream_size) -z_streamp strm; -int windowBits; -const char *version; -int stream_size; -{ return Z_STREAM_ERROR ; } diff --git a/contrib/pngminim/encoder/gather.sh b/contrib/pngminim/encoder/gather.sh index d79cd2b85..ad4cc03fb 100755 --- a/contrib/pngminim/encoder/gather.sh +++ b/contrib/pngminim/encoder/gather.sh @@ -6,4 +6,4 @@ rm example.c pngtest.c pngr*.c pngpread.c cp ../../../../zlib/*.h . cp ../../../../zlib/*.c . rm inf*.[ch] -rm minigzip.c example.c gz* +rm uncompr.c minigzip.c example.c gz* diff --git a/contrib/pngminim/encoder/makefile b/contrib/pngminim/encoder/makefile index 31caff289..10794f975 100644 --- a/contrib/pngminim/encoder/makefile +++ b/contrib/pngminim/encoder/makefile @@ -15,8 +15,7 @@ L=.a E= ZOBJS = adler32$(O) compress$(O) crc32$(O) deflate$(O) \ - dummy_inflate$(O) \ - trees$(O) uncompr$(O) zutil$(O) + trees$(O) zutil$(O) OBJS = pnm2pngm$(O) png$(O) pngerror$(O) pngget$(O) pngmem$(O) \ pngset$(O) pngtrans$(O) pngwio$(O) pngwrite$(O) \