Menu
▾
▴
[opengtoolkit-cvs] lvzip/c_source Makefile,1.3,1.4 Makefile.in,1.2,1.3 README,1.2,1.3 minigzip.c,1.3,1.4 trees.c,1.2,1.3 uncompr.c,1.2,1.3 unzip.c,1.3,1.4 unzip.h,1.3,1.4 zconf.h,1.4,1.5 zconf.in.h,1.1,1.2 zip.c,1.3,1.4 zip.h,1.3,1.4 zlib.3,1.2,1.3 zlib.h,1.2,1.3 zlib.rc,1.2,1.3 zutil.c,1.2,1.3 zutil.h,1.2,1.3
|
From: Rolf K. <lab...@us...> - 2004-12-08 20:29:25
|
Update of /cvsroot/opengtoolkit/lvzip/c_source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12693/c_source Modified Files: Makefile Makefile.in README minigzip.c trees.c uncompr.c unzip.c unzip.h zconf.h zconf.in.h zip.c zip.h zlib.3 zlib.h zlib.rc zutil.c zutil.h Log Message: Updated zlib library to version 1.2.2 and zip/unzip to 1.01d Index: trees.c =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/trees.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** trees.c 7 Dec 2004 22:52:50 -0000 1.2 --- trees.c 8 Dec 2004 20:29:15 -0000 1.3 *************** *** 932,936 **** /* Check if the file is ascii or binary */ ! if (s->data_type == Z_UNKNOWN) set_data_type(s); /* Construct the literal and distance trees */ --- 932,936 ---- /* Check if the file is ascii or binary */ ! if (s->strm->data_type == Z_UNKNOWN) set_data_type(s); /* Construct the literal and distance trees */ *************** *** 1132,1136 **** while (n < 128) ascii_freq += s->dyn_ltree[n++].Freq; while (n < LITERALS) bin_freq += s->dyn_ltree[n++].Freq; ! s->data_type = (Byte)(bin_freq > (ascii_freq >> 2) ? Z_BINARY : Z_ASCII); } --- 1132,1136 ---- while (n < 128) ascii_freq += s->dyn_ltree[n++].Freq; while (n < LITERALS) bin_freq += s->dyn_ltree[n++].Freq; ! s->strm->data_type = bin_freq > (ascii_freq >> 2) ? Z_BINARY : Z_ASCII; } Index: zip.c =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/zip.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** zip.c 7 Dec 2004 22:52:50 -0000 1.3 --- zip.c 8 Dec 2004 20:29:15 -0000 1.4 *************** *** 1,6 **** /* zip.c -- IO on .zip files using zlib ! Version 1.00, September 10th, 2003 ! Copyright (C) 1998-2003 Gilles Vollant Read zip.h for more info --- 1,6 ---- /* zip.c -- IO on .zip files using zlib ! Version 1.01, May 8th, 2004 ! Copyright (C) 1998-2004 Gilles Vollant Read zip.h for more info *************** *** 78,82 **** #endif const char zip_copyright[] = ! " zip 1.00 Copyright 1998-2003 Gilles Vollant - http://www.winimage.com/zLibDll"; --- 78,82 ---- #endif const char zip_copyright[] = ! " zip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll"; *************** *** 266,273 **** unsigned char buf[4]; int n; ! for (n = 0; n < nbByte; n++) { buf[n] = (unsigned char)(x & 0xff); x >>= 8; } if (ZWRITE(*pzlib_filefunc_def,filestream,buf,nbByte)!=(uLong)nbByte) return ZIP_ERRNO; --- 266,282 ---- unsigned char buf[4]; int n; ! for (n = 0; n < nbByte; n++) ! { buf[n] = (unsigned char)(x & 0xff); x >>= 8; } + if (x != 0) + { /* data overflow - hack for ZIP64 (X Roche) */ + for (n = 0; n < nbByte; n++) + { + buf[n] = 0xff; + } + } + if (ZWRITE(*pzlib_filefunc_def,filestream,buf,nbByte)!=(uLong)nbByte) return ZIP_ERRNO; *************** *** 288,292 **** --- 297,310 ---- x >>= 8; } + + if (x != 0) + { /* data overflow - hack for ZIP64 */ + for (n = 0; n < nbByte; n++) + { + buf[n] = 0xff; + } + } } + /****************************************************************************/ *************** *** 700,706 **** size_comment = 0; else ! size_comment = strlen(comment); ! size_filename = strlen(filename); if (zipfi == NULL) --- 718,724 ---- size_comment = 0; else ! size_comment = (uInt)strlen(comment); ! size_filename = (uInt)strlen(filename); if (zipfi == NULL) *************** *** 1109,1113 **** size_global_comment = 0; else ! size_global_comment = strlen(global_comment); --- 1127,1131 ---- size_global_comment = 0; else ! size_global_comment = (uInt)strlen(global_comment); Index: zlib.h =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/zlib.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** zlib.h 7 Dec 2004 22:52:50 -0000 1.2 --- zlib.h 8 Dec 2004 20:29:15 -0000 1.3 *************** *** 1,6 **** /* zlib.h -- interface of the 'zlib' general purpose compression library ! version 1.2.1, November 17th, 2003 ! Copyright (C) 1995-2003 Jean-loup Gailly and Mark Adler This software is provided 'as-is', without any express or implied --- 1,6 ---- /* zlib.h -- interface of the 'zlib' general purpose compression library ! version 1.2.2, October 3rd, 2004 ! Copyright (C) 1995-2004 Jean-loup Gailly and Mark Adler This software is provided 'as-is', without any express or implied *************** *** 38,43 **** #endif ! #define ZLIB_VERSION "1.2.1" ! #define ZLIB_VERNUM 0x1210 /* --- 38,43 ---- #endif ! #define ZLIB_VERSION "1.2.2" ! #define ZLIB_VERNUM 0x1220 /* *************** *** 54,60 **** (providing more output space) before each call. ! The compressed data format used by the in-memory functions is the zlib ! format, which is a zlib wrapper documented in RFC 1950, wrapped around a ! deflate stream, which is itself documented in RFC 1951. The library also supports reading and writing files in gzip (.gz) format --- 54,60 ---- (providing more output space) before each call. ! The compressed data format used by default by the in-memory functions is ! the zlib format, which is a zlib wrapper documented in RFC 1950, wrapped ! around a deflate stream, which is itself documented in RFC 1951. The library also supports reading and writing files in gzip (.gz) format *************** *** 63,66 **** --- 63,68 ---- gzip wrapper, documented in RFC 1952, wrapped around a deflate stream. + This library can optionally read and write gzip streams in memory as well. + The zlib format was designed to be compact and fast for use in memory and on communications channels. The gzip format was designed for single- *************** *** 68,75 **** directory information, and uses a different, slower check method than zlib. - This library does not provide any functions to write gzip files in memory. - However such functions could be easily written using zlib's deflate function, - the documentation in the gzip RFC, and the examples in gzio.c. - The library does not install any signal handler. The decoder checks the consistency of the compressed data, so the library should never --- 70,73 ---- *************** *** 402,406 **** If a preset dictionary is needed after this call (see inflateSetDictionary ! below), inflate sets strm-adler to the adler32 checksum of the dictionary chosen by the compressor and returns Z_NEED_DICT; otherwise it sets strm->adler to the adler32 checksum of all output produced so far (that is, --- 400,404 ---- If a preset dictionary is needed after this call (see inflateSetDictionary ! below), inflate sets strm->adler to the adler32 checksum of the dictionary chosen by the compressor and returns Z_NEED_DICT; otherwise it sets strm->adler to the adler32 checksum of all output produced so far (that is, *************** *** 479,483 **** compressed data instead of a zlib wrapper. The gzip header will have no file name, no extra data, no comment, no modification time (set to zero), ! no header crc, and the operating system will be set to 255 (unknown). The memLevel parameter specifies how much memory should be allocated --- 477,482 ---- compressed data instead of a zlib wrapper. The gzip header will have no file name, no extra data, no comment, no modification time (set to zero), ! no header crc, and the operating system will be set to 255 (unknown). If a ! gzip stream is being written, strm->adler is a crc32 instead of an adler32. The memLevel parameter specifies how much memory should be allocated *************** *** 650,654 **** 32 to windowBits to enable zlib and gzip decoding with automatic header detection, or add 16 to decode only the gzip format (the zlib format will ! return a Z_DATA_ERROR). inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough --- 649,654 ---- 32 to windowBits to enable zlib and gzip decoding with automatic header detection, or add 16 to decode only the gzip format (the zlib format will ! return a Z_DATA_ERROR. If a gzip stream is being decoded, strm->adler is ! a crc32 instead of an adler32. inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough *************** *** 1190,1194 **** #endif ! ZEXTERN const char * ZEXPORT zError OF((int err)); ZEXTERN int ZEXPORT inflateSyncPoint OF((z_streamp z)); ZEXTERN const uLongf * ZEXPORT get_crc_table OF((void)); --- 1190,1194 ---- #endif ! ZEXTERN const char * ZEXPORT zError OF((int)); ZEXTERN int ZEXPORT inflateSyncPoint OF((z_streamp z)); ZEXTERN const uLongf * ZEXPORT get_crc_table OF((void)); Index: Makefile.in =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/Makefile.in,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.in 3 Mar 2004 13:15:24 -0000 1.2 --- Makefile.in 8 Dec 2004 20:29:15 -0000 1.3 *************** *** 1,14 **** # Makefile for lvzlib ! # Copyright (C) 1995-2002 Jean-loup Gailly. ! # Copyright (C) 2003 Rolf Kalbermatter. # For conditions of distribution and use, see copyright notice in zlib.h # To compile and test, type: ! # ./configure -s; make test ! # The call of ./configure is optional if you don't have special requirements CC=cc ! CFLAGS=-fPIC -O3 -DHAVE_UNISTD_H -DUSE_MMAP -Wall #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7 #CFLAGS=-g -DDEBUG --- 1,24 ---- # Makefile for lvzlib ! # Copyright (C) 1995-2003 Jean-loup Gailly. ! # Copyright (C) 2003-2004 Rolf Kalbermatter. # For conditions of distribution and use, see copyright notice in zlib.h # To compile and test, type: ! # ./configure; make test ! # The call of configure is optional if you don't have special requirements ! # If you wish to build zlib as a shared library, use: ./configure -s ! ! # To use the asm code, type: ! # cp contrib/asm?86/match.S ./match.S ! # make LOC=-DASMV OBJA=match.o ! ! # To install /usr/local/lib/libz.* and /usr/local/include/zlib.h, type: ! # make install ! # To install in $HOME instead of /usr/local, use: ! # make install prefix=$HOME CC=cc ! CFLAGS=-O #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7 #CFLAGS=-g -DDEBUG *************** *** 16,25 **** # -Wstrict-prototypes -Wmissing-prototypes ! LDFLAGS=-L. -lz ! LDSHARED=$(CC) -shared -Wl CPP=$(CC) -E ! LIBS=lvzlib.so SHAREDLIB=lvzlib.so AR=ar rc --- 26,37 ---- # -Wstrict-prototypes -Wmissing-prototypes ! LDFLAGS=libz.a ! LDSHARED=$(CC) CPP=$(CC) -E ! LIBS=libz.a SHAREDLIB=lvzlib.so + SHAREDLIBV=lvzlib.so.1.2.2 + SHAREDLIBM=lvzlib.so.1 AR=ar rc *************** *** 27,30 **** --- 39,43 ---- TAR=tar SHELL=/bin/sh + EXE= prefix = /usr/local *************** *** 32,38 **** libdir = ${exec_prefix}/lib includedir = ${prefix}/include OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \ ! zutil.o inflate.o infblock.o inftrees.o infcodes.o infutil.o inffast.o \ ioapi.o macbin.o zip.o unzip.o --- 45,53 ---- libdir = ${exec_prefix}/lib includedir = ${prefix}/include + mandir = ${prefix}/share/man + man3dir = ${mandir}/man3 OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \ ! zutil.o inflate.o infback.o inftrees.o inffast.o ioapi.o macbin.o zip.o unzip.o *************** *** 42,50 **** TEST_OBJS = example.o minigzip.o ! DISTFILES = README FAQ INDEX ChangeLog configure Make*[a-z0-9] *.[ch] gvmat32.* \ ! mkgvmt32.bat algorithm.txt zlib.3 zlib.html zlib.rc zlibvc.* ! ! all: example minigzip test: all @LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \ --- 57,63 ---- TEST_OBJS = example.o minigzip.o ! all: example$(EXE) minigzip$(EXE) + check: test test: all @LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \ *************** *** 57,61 **** fi ! lvzlib.a: $(OBJS) $(OBJA) $(AR) $@ $(OBJS) $(OBJA) -@ ($(RANLIB) $@ || true) >/dev/null 2>&1 --- 70,74 ---- fi ! libz.a: $(OBJS) $(OBJA) $(AR) $@ $(OBJS) $(OBJA) -@ ($(RANLIB) $@ || true) >/dev/null 2>&1 *************** *** 67,82 **** rm -f _match.s ! $(SHAREDLIB): $(OBJS) $(LDSHARED) -o $@ $(OBJS) ! example: example.o $(LIBS) $(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS) ! minigzip: minigzip.o $(LIBS) $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS) install: $(LIBS) ! -@if [ ! -d $(includedir) ]; then mkdir $(includedir); fi ! -@if [ ! -d $(libdir) ]; then mkdir $(libdir); fi cp zlib.h zconf.h $(includedir) chmod 644 $(includedir)/zlib.h $(includedir)/zconf.h --- 80,100 ---- rm -f _match.s ! $(SHAREDLIBV): $(OBJS) $(LDSHARED) -o $@ $(OBJS) + rm -f $(SHAREDLIB) $(SHAREDLIBM) + ln -s $@ $(SHAREDLIB) + ln -s $@ $(SHAREDLIBM) ! example$(EXE): example.o $(LIBS) $(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS) ! minigzip$(EXE): minigzip.o $(LIBS) $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS) install: $(LIBS) ! -@if [ ! -d $(exec_prefix) ]; then mkdir -p $(exec_prefix); fi ! -@if [ ! -d $(includedir) ]; then mkdir -p $(includedir); fi ! -@if [ ! -d $(libdir) ]; then mkdir -p $(libdir); fi ! -@if [ ! -d $(man3dir) ]; then mkdir -p $(man3dir); fi cp zlib.h zconf.h $(includedir) chmod 644 $(includedir)/zlib.h $(includedir)/zconf.h *************** *** 84,93 **** cd $(libdir); chmod 755 $(LIBS) -@(cd $(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1 ! cd $(libdir); if test -f $(SHAREDLIB).$(VER); then \ ! rm -f $(SHAREDLIB) $(SHAREDLIB).1; \ ! ln -s $(SHAREDLIB).$(VER) $(SHAREDLIB); \ ! ln -s $(SHAREDLIB).$(VER) $(SHAREDLIB).1; \ (ldconfig || true) >/dev/null 2>&1; \ fi # The ranlib in install is needed on NeXTSTEP which checks file times # ldconfig is for Linux --- 102,113 ---- cd $(libdir); chmod 755 $(LIBS) -@(cd $(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1 ! cd $(libdir); if test -f $(SHAREDLIBV); then \ ! rm -f $(SHAREDLIB) $(SHAREDLIBM); \ ! ln -s $(SHAREDLIBV) $(SHAREDLIB); \ ! ln -s $(SHAREDLIBV) $(SHAREDLIBM); \ (ldconfig || true) >/dev/null 2>&1; \ fi + cp zlib.3 $(man3dir) + chmod 644 $(man3dir)/zlib.3 # The ranlib in install is needed on NeXTSTEP which checks file times # ldconfig is for Linux *************** *** 95,133 **** uninstall: cd $(includedir); \ - v=$(VER); \ - if test -f zlib.h; then \ - v=`sed -n '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`; \ - rm -f zlib.h zconf.h; \ - fi; \ cd $(libdir); rm -f libz.a; \ ! if test -f $(SHAREDLIB).$$v; then \ ! rm -f $(SHAREDLIB).$$v $(SHAREDLIB) $(SHAREDLIB).1; \ fi clean: ! rm -f *.o *~ example minigzip libz.a libz.so* foo.gz so_locations \ ! _match.s maketree ! ! distclean: clean ! ! zip: ! mv Makefile Makefile~; cp -p Makefile.in Makefile ! rm -f test.c ztest*.c contrib/minizip/test.zip ! v=`sed -n -e 's/\.//g' -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`;\ ! zip -ul9 zlib$$v $(DISTFILES) ! mv Makefile~ Makefile ! dist: ! mv Makefile Makefile~; cp -p Makefile.in Makefile ! rm -f test.c ztest*.c contrib/minizip/test.zip ! d=zlib-`sed -n '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`;\ ! rm -f $$d.tar.gz; \ ! if test ! -d ../$$d; then rm -f ../$$d; ln -s `pwd` ../$$d; fi; \ ! files=""; \ ! for f in $(DISTFILES); do files="$$files $$d/$$f"; done; \ ! cd ..; \ ! GZIP=-9 $(TAR) chofz $$d/$$d.tar.gz $$files; \ ! if test ! -d $$d; then rm -f $$d; fi ! mv Makefile~ Makefile tags: --- 115,135 ---- uninstall: cd $(includedir); \ cd $(libdir); rm -f libz.a; \ ! if test -f $(SHAREDLIBV); then \ ! rm -f $(SHAREDLIBV) $(SHAREDLIB) $(SHAREDLIBM); \ fi + cd $(man3dir); rm -f zlib.3 + mostlyclean: clean clean: ! rm -f *.o *~ example$(EXE) minigzip$(EXE) \ ! libz.* foo.gz so_locations \ ! _match.s maketree contrib/infback9/*.o ! maintainer-clean: distclean ! distclean: clean ! cp -p Makefile.in Makefile ! cp -p zconf.in.h zconf.h ! rm -f .DS_Store tags: *************** *** 141,156 **** adler32.o: zlib.h zconf.h compress.o: zlib.h zconf.h ! crc32.o: zlib.h zconf.h deflate.o: deflate.h zutil.h zlib.h zconf.h example.o: zlib.h zconf.h gzio.o: zutil.h zlib.h zconf.h ! infblock.o: infblock.h inftrees.h infcodes.h infutil.h zutil.h zlib.h zconf.h ! infcodes.o: zutil.h zlib.h zconf.h ! infcodes.o: inftrees.h infblock.h infcodes.h infutil.h inffast.h ! inffast.o: zutil.h zlib.h zconf.h inftrees.h ! inffast.o: infblock.h infcodes.h infutil.h inffast.h ! inflate.o: zutil.h zlib.h zconf.h infblock.h inftrees.o: zutil.h zlib.h zconf.h inftrees.h - infutil.o: zutil.h zlib.h zconf.h infblock.h inftrees.h infcodes.h infutil.h macbin.o: zlib.h macbin.h minigzip.o: zlib.h zconf.h --- 143,154 ---- adler32.o: zlib.h zconf.h compress.o: zlib.h zconf.h ! crc32.o: crc32.h zlib.h zconf.h deflate.o: deflate.h zutil.h zlib.h zconf.h example.o: zlib.h zconf.h gzio.o: zutil.h zlib.h zconf.h ! inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h ! inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h ! infback.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h inftrees.o: zutil.h zlib.h zconf.h inftrees.h macbin.o: zlib.h macbin.h minigzip.o: zlib.h zconf.h Index: zconf.h =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/zconf.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** zconf.h 7 Dec 2004 22:52:50 -0000 1.4 --- zconf.h 8 Dec 2004 20:29:15 -0000 1.5 *************** *** 1,4 **** /* zconf.h -- configuration of the zlib compression library ! * Copyright (C) 1995-2003 Jean-loup Gailly. * For conditions of distribution and use, see copyright notice in zlib.h */ --- 1,4 ---- /* zconf.h -- configuration of the zlib compression library ! * Copyright (C) 1995-2004 Jean-loup Gailly. * For conditions of distribution and use, see copyright notice in zlib.h */ *************** *** 14,54 **** */ #ifdef Z_PREFIX ! # define deflateInit_ z_deflateInit_ ! # define deflate z_deflate ! # define deflateEnd z_deflateEnd ! # define inflateInit_ z_inflateInit_ ! # define inflate z_inflate ! # define inflateEnd z_inflateEnd ! # define deflateInit2_ z_deflateInit2_ ! # define deflateSetDictionary z_deflateSetDictionary ! # define deflateCopy z_deflateCopy ! # define deflateReset z_deflateReset ! # define deflatePrime z_deflatePrime ! # define deflateParams z_deflateParams ! # define deflateBound z_deflateBound ! # define inflateInit2_ z_inflateInit2_ ! # define inflateSetDictionary z_inflateSetDictionary ! # define inflateSync z_inflateSync ! # define inflateSyncPoint z_inflateSyncPoint ! # define inflateCopy z_inflateCopy ! # define inflateReset z_inflateReset ! # define compress z_compress ! # define compress2 z_compress2 ! # define compressBound z_compressBound ! # define uncompress z_uncompress ! # define adler32 z_adler32 ! # define crc32 z_crc32 ! # define get_crc_table z_get_crc_table ! # define Byte z_Byte ! # define uInt z_uInt ! # define uLong z_uLong ! # define Bytef z_Bytef ! # define charf z_charf ! # define intf z_intf ! # define uIntf z_uIntf ! # define uLongf z_uLongf ! # define voidpf z_voidpf ! # define voidp z_voidp #endif --- 14,57 ---- */ #ifdef Z_PREFIX ! # define deflateInit_ z_deflateInit_ ! # define deflate z_deflate ! # define deflateEnd z_deflateEnd ! # define inflateInit_ z_inflateInit_ ! # define inflate z_inflate ! # define inflateEnd z_inflateEnd ! # define deflateInit2_ z_deflateInit2_ ! # define deflateSetDictionary z_deflateSetDictionary ! # define deflateCopy z_deflateCopy ! # define deflateReset z_deflateReset ! # define deflateParams z_deflateParams ! # define deflateBound z_deflateBound ! # define deflatePrime z_deflatePrime ! # define inflateInit2_ z_inflateInit2_ ! # define inflateSetDictionary z_inflateSetDictionary ! # define inflateSync z_inflateSync ! # define inflateSyncPoint z_inflateSyncPoint ! # define inflateCopy z_inflateCopy ! # define inflateReset z_inflateReset ! # define inflateBack z_inflateBack ! # define inflateBackEnd z_inflateBackEnd ! # define compress z_compress ! # define compress2 z_compress2 ! # define compressBound z_compressBound ! # define uncompress z_uncompress ! # define adler32 z_adler32 ! # define crc32 z_crc32 ! # define get_crc_table z_get_crc_table ! # define zError z_zError ! # define Byte z_Byte ! # define uInt z_uInt ! # define uLong z_uLong ! # define Bytef z_Bytef ! # define charf z_charf ! # define intf z_intf ! # define uIntf z_uIntf ! # define uLongf z_uLongf ! # define voidpf z_voidpf ! # define voidp z_voidp #endif *************** *** 282,286 **** # include <unixio.h> /* for off_t */ # endif ! # define z_off_t off_t #endif #ifndef SEEK_SET --- 285,289 ---- # include <unixio.h> /* for off_t */ # endif ! # define z_off_t off_t #endif #ifndef SEEK_SET *************** *** 290,298 **** #endif #ifndef z_off_t ! # define z_off_t long #endif #if defined(__OS400__) ! #define NO_vsnprintf #endif --- 293,301 ---- #endif #ifndef z_off_t ! # define z_off_t long #endif #if defined(__OS400__) ! # define NO_vsnprintf #endif Index: Makefile =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile 3 Mar 2004 13:15:24 -0000 1.3 --- Makefile 8 Dec 2004 20:29:15 -0000 1.4 *************** *** 1,4 **** # Makefile for zlib ! # Copyright (C) 1995-2002 Jean-loup Gailly. # For conditions of distribution and use, see copyright notice in zlib.h --- 1,4 ---- # Makefile for zlib ! # Copyright (C) 1995-2003 Jean-loup Gailly. # For conditions of distribution and use, see copyright notice in zlib.h *************** *** 8,11 **** --- 8,15 ---- # If you wish to build zlib as a shared library, use: ./configure -s + # To use the asm code, type: + # cp contrib/asm?86/match.S ./match.S + # make LOC=-DASMV OBJA=match.o + # To install /usr/local/lib/libz.* and /usr/local/include/zlib.h, type: # make install *************** *** 13,19 **** # make install prefix=$HOME ! CC=gcc ! CFLAGS=-fPIC -O3 -DHAVE_UNISTD_H -DUSE_MMAP -Wall #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7 #CFLAGS=-g -DDEBUG --- 17,23 ---- # make install prefix=$HOME ! CC=cc ! CFLAGS=-O #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7 #CFLAGS=-g -DDEBUG *************** *** 21,30 **** # -Wstrict-prototypes -Wmissing-prototypes ! LDFLAGS=-L. -lz ! LDSHARED=$(CC) -shared -Wl CPP=$(CC) -E ! LIBS=lvzlib.so ! SHAREDLIB=lvzlib.so AR=ar rc --- 25,36 ---- # -Wstrict-prototypes -Wmissing-prototypes ! LDFLAGS=libz.a ! LDSHARED=$(CC) CPP=$(CC) -E ! LIBS=libz.a ! SHAREDLIB=libz.so ! SHAREDLIBV=libz.so.1.2.2 ! SHAREDLIBM=libz.so.1 AR=ar rc *************** *** 32,35 **** --- 38,42 ---- TAR=tar SHELL=/bin/sh + EXE= prefix = /usr/local *************** *** 37,43 **** libdir = ${exec_prefix}/lib includedir = ${prefix}/include OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \ ! zutil.o inflate.o infblock.o inftrees.o infcodes.o infutil.o inffast.o \ ioapi.o macbin.o zip.o unzip.o --- 44,52 ---- libdir = ${exec_prefix}/lib includedir = ${prefix}/include + mandir = ${prefix}/share/man + man3dir = ${mandir}/man3 OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \ ! zutil.o inflate.o infback.o inftrees.o inffast.o ioapi.o macbin.o zip.o unzip.o *************** *** 47,55 **** TEST_OBJS = example.o minigzip.o ! DISTFILES = README FAQ INDEX ChangeLog configure Make*[a-z0-9] *.[ch] gvmat32.* \ ! mkgvmt32.bat algorithm.txt zlib.3 zlib.html zlib.rc zlibvc.* ! ! all: example minigzip test: all @LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \ --- 56,62 ---- TEST_OBJS = example.o minigzip.o ! all: example$(EXE) minigzip$(EXE) + check: test test: all @LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \ *************** *** 62,66 **** fi ! lvzlib.a: $(OBJS) $(OBJA) $(AR) $@ $(OBJS) $(OBJA) -@ ($(RANLIB) $@ || true) >/dev/null 2>&1 --- 69,73 ---- fi ! libz.a: $(OBJS) $(OBJA) $(AR) $@ $(OBJS) $(OBJA) -@ ($(RANLIB) $@ || true) >/dev/null 2>&1 *************** *** 72,87 **** rm -f _match.s ! $(SHAREDLIB): $(OBJS) $(OBJA) ! $(LDSHARED) -o $@ $(OBJS) $(OBJA) ! example: example.o $(LIBS) $(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS) ! minigzip: minigzip.o $(LIBS) $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS) install: $(LIBS) ! -@if [ ! -d $(includedir) ]; then mkdir $(includedir); fi ! -@if [ ! -d $(libdir) ]; then mkdir $(libdir); fi cp zlib.h zconf.h $(includedir) chmod 644 $(includedir)/zlib.h $(includedir)/zconf.h --- 79,99 ---- rm -f _match.s ! $(SHAREDLIBV): $(OBJS) ! $(LDSHARED) -o $@ $(OBJS) ! rm -f $(SHAREDLIB) $(SHAREDLIBM) ! ln -s $@ $(SHAREDLIB) ! ln -s $@ $(SHAREDLIBM) ! example$(EXE): example.o $(LIBS) $(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS) ! minigzip$(EXE): minigzip.o $(LIBS) $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS) install: $(LIBS) ! -@if [ ! -d $(exec_prefix) ]; then mkdir -p $(exec_prefix); fi ! -@if [ ! -d $(includedir) ]; then mkdir -p $(includedir); fi ! -@if [ ! -d $(libdir) ]; then mkdir -p $(libdir); fi ! -@if [ ! -d $(man3dir) ]; then mkdir -p $(man3dir); fi cp zlib.h zconf.h $(includedir) chmod 644 $(includedir)/zlib.h $(includedir)/zconf.h *************** *** 89,98 **** cd $(libdir); chmod 755 $(LIBS) -@(cd $(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1 ! cd $(libdir); if test -f $(SHAREDLIB).$(VER); then \ ! rm -f $(SHAREDLIB) $(SHAREDLIB).1; \ ! ln -s $(SHAREDLIB).$(VER) $(SHAREDLIB); \ ! ln -s $(SHAREDLIB).$(VER) $(SHAREDLIB).1; \ (ldconfig || true) >/dev/null 2>&1; \ fi # The ranlib in install is needed on NeXTSTEP which checks file times # ldconfig is for Linux --- 101,112 ---- cd $(libdir); chmod 755 $(LIBS) -@(cd $(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1 ! cd $(libdir); if test -f $(SHAREDLIBV); then \ ! rm -f $(SHAREDLIB) $(SHAREDLIBM); \ ! ln -s $(SHAREDLIBV) $(SHAREDLIB); \ ! ln -s $(SHAREDLIBV) $(SHAREDLIBM); \ (ldconfig || true) >/dev/null 2>&1; \ fi + cp zlib.3 $(man3dir) + chmod 644 $(man3dir)/zlib.3 # The ranlib in install is needed on NeXTSTEP which checks file times # ldconfig is for Linux *************** *** 100,138 **** uninstall: cd $(includedir); \ - v=$(VER); \ - if test -f zlib.h; then \ - v=`sed -n '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`; \ - rm -f zlib.h zconf.h; \ - fi; \ cd $(libdir); rm -f libz.a; \ ! if test -f $(SHAREDLIB).$$v; then \ ! rm -f $(SHAREDLIB).$$v $(SHAREDLIB) $(SHAREDLIB).1; \ fi clean: ! rm -f *.o *~ example minigzip libz.a libz.so* foo.gz so_locations \ ! _match.s maketree ! ! distclean: clean ! ! zip: ! mv Makefile Makefile~; cp -p Makefile.in Makefile ! rm -f test.c ztest*.c contrib/minizip/test.zip ! v=`sed -n -e 's/\.//g' -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`;\ ! zip -ul9 zlib$$v $(DISTFILES) ! mv Makefile~ Makefile ! dist: ! mv Makefile Makefile~; cp -p Makefile.in Makefile ! rm -f test.c ztest*.c contrib/minizip/test.zip ! d=zlib-`sed -n '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`;\ ! rm -f $$d.tar.gz; \ ! if test ! -d ../$$d; then rm -f ../$$d; ln -s `pwd` ../$$d; fi; \ ! files=""; \ ! for f in $(DISTFILES); do files="$$files $$d/$$f"; done; \ ! cd ..; \ ! GZIP=-9 $(TAR) chofz $$d/$$d.tar.gz $$files; \ ! if test ! -d $$d; then rm -f $$d; fi ! mv Makefile~ Makefile tags: --- 114,134 ---- uninstall: cd $(includedir); \ cd $(libdir); rm -f libz.a; \ ! if test -f $(SHAREDLIBV); then \ ! rm -f $(SHAREDLIBV) $(SHAREDLIB) $(SHAREDLIBM); \ fi + cd $(man3dir); rm -f zlib.3 + mostlyclean: clean clean: ! rm -f *.o *~ example$(EXE) minigzip$(EXE) \ ! libz.* foo.gz so_locations \ ! _match.s maketree contrib/infback9/*.o ! maintainer-clean: distclean ! distclean: clean ! cp -p Makefile.in Makefile ! cp -p zconf.in.h zconf.h ! rm -f .DS_Store tags: *************** *** 146,161 **** adler32.o: zlib.h zconf.h compress.o: zlib.h zconf.h ! crc32.o: zlib.h zconf.h deflate.o: deflate.h zutil.h zlib.h zconf.h example.o: zlib.h zconf.h gzio.o: zutil.h zlib.h zconf.h ! infblock.o: infblock.h inftrees.h infcodes.h infutil.h zutil.h zlib.h zconf.h ! infcodes.o: zutil.h zlib.h zconf.h ! infcodes.o: inftrees.h infblock.h infcodes.h infutil.h inffast.h ! inffast.o: zutil.h zlib.h zconf.h inftrees.h ! inffast.o: infblock.h infcodes.h infutil.h inffast.h ! inflate.o: zutil.h zlib.h zconf.h infblock.h inftrees.o: zutil.h zlib.h zconf.h inftrees.h - infutil.o: zutil.h zlib.h zconf.h infblock.h inftrees.h infcodes.h infutil.h macbin.o: zlib.h macbin.h minigzip.o: zlib.h zconf.h --- 142,153 ---- adler32.o: zlib.h zconf.h compress.o: zlib.h zconf.h ! crc32.o: crc32.h zlib.h zconf.h deflate.o: deflate.h zutil.h zlib.h zconf.h example.o: zlib.h zconf.h gzio.o: zutil.h zlib.h zconf.h ! inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h ! inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h ! infback.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h inftrees.o: zutil.h zlib.h zconf.h inftrees.h macbin.o: zlib.h macbin.h minigzip.o: zlib.h zconf.h Index: minigzip.c =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/minigzip.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** minigzip.c 11 Sep 2003 22:34:12 -0000 1.3 --- minigzip.c 8 Dec 2004 20:29:15 -0000 1.4 *************** *** 1,5 **** /* minigzip.c -- simulate gzip using the zlib compression library * Copyright (C) 1995-2002 Jean-loup Gailly. ! * For conditions of distribution and use, see copyright notice in zlib.h */ --- 1,5 ---- /* minigzip.c -- simulate gzip using the zlib compression library * Copyright (C) 1995-2002 Jean-loup Gailly. ! * For conditions of distribution and use, see copyright notice in zlib.h */ *************** *** 32,36 **** #endif ! #if defined(MSDOS) || defined(OS2) || defined(WIN32) # include <fcntl.h> # include <io.h> --- 32,36 ---- #endif ! #if defined(MSDOS) || defined(OS2) || defined(WIN32) || defined(__CYGWIN__) # include <fcntl.h> # include <io.h> *************** *** 113,117 **** #endif for (;;) { ! len = fread(buf, 1, sizeof(buf), in); if (ferror(in)) { perror("fread"); --- 113,117 ---- #endif for (;;) { ! len = (int)fread(buf, 1, sizeof(buf), in); if (ferror(in)) { perror("fread"); *************** *** 148,152 **** /* Now do the actual mmap: */ ! buf = mmap((caddr_t) 0, buf_len, PROT_READ, MAP_SHARED, ifd, (off_t)0); if (buf == (caddr_t)(-1)) return Z_ERRNO; --- 148,152 ---- /* Now do the actual mmap: */ ! buf = mmap((caddr_t) 0, buf_len, PROT_READ, MAP_SHARED, ifd, (off_t)0); if (buf == (caddr_t)(-1)) return Z_ERRNO; *************** *** 180,185 **** if ((int)fwrite(buf, 1, (unsigned)len, out) != len) { ! error("failed fwrite"); ! } } if (fclose(out)) error("failed fclose"); --- 180,185 ---- if ((int)fwrite(buf, 1, (unsigned)len, out) != len) { ! error("failed fwrite"); ! } } if (fclose(out)) error("failed fclose"); *************** *** 230,234 **** FILE *out; gzFile in; ! int len = strlen(file); strcpy(buf, file); --- 230,234 ---- FILE *out; gzFile in; ! uInt len = (uInt)strlen(file); strcpy(buf, file); *************** *** 261,268 **** /* =========================================================================== ! * Usage: minigzip [-d] [-f] [-h] [-1 to -9] [files...] * -d : decompress * -f : compress with Z_FILTERED * -h : compress with Z_HUFFMAN_ONLY * -1 to -9 : compression level */ --- 261,269 ---- /* =========================================================================== ! * Usage: minigzip [-d] [-f] [-h] [-r] [-1 to -9] [files...] * -d : decompress * -f : compress with Z_FILTERED * -h : compress with Z_HUFFMAN_ONLY + * -r : compress with Z_RLE * -1 to -9 : compression level */ *************** *** 283,296 **** while (argc > 0) { if (strcmp(*argv, "-d") == 0) ! uncompr = 1; else if (strcmp(*argv, "-f") == 0) ! outmode[3] = 'f'; else if (strcmp(*argv, "-h") == 0) ! outmode[3] = 'h'; else if ((*argv)[0] == '-' && (*argv)[1] >= '1' && (*argv)[1] <= '9' && ! (*argv)[2] == 0) ! outmode[2] = (*argv)[1]; else ! break; argc--, argv++; } --- 284,299 ---- while (argc > 0) { if (strcmp(*argv, "-d") == 0) ! uncompr = 1; else if (strcmp(*argv, "-f") == 0) ! outmode[3] = 'f'; else if (strcmp(*argv, "-h") == 0) ! outmode[3] = 'h'; ! else if (strcmp(*argv, "-r") == 0) ! outmode[3] = 'R'; else if ((*argv)[0] == '-' && (*argv)[1] >= '1' && (*argv)[1] <= '9' && ! (*argv)[2] == 0) ! outmode[2] = (*argv)[1]; else ! break; argc--, argv++; } *************** *** 316,320 **** } while (argv++, --argc); } ! exit(0); ! return 0; /* to avoid warning */ } --- 319,322 ---- } while (argv++, --argc); } ! return 0; } Index: zip.h =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/zip.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** zip.h 7 Dec 2004 22:52:50 -0000 1.3 --- zip.h 8 Dec 2004 20:29:15 -0000 1.4 *************** *** 1,6 **** /* zip.h -- IO for compress .zip files using zlib ! Version 1.00, September 10th, 2003 ! Copyright (C) 1998-2003 Gilles Vollant This unzip package allow creates .ZIP file, compatible with PKZip 2.04g --- 1,6 ---- /* zip.h -- IO for compress .zip files using zlib ! Version 1.01, May 8th, 2004 ! Copyright (C) 1998-2004 Gilles Vollant This unzip package allow creates .ZIP file, compatible with PKZip 2.04g *************** *** 213,217 **** */ - extern int ZEXPORT zipCloseFileInZipRaw OF((zipFile file, uLong uncompressed_size, --- 213,216 ---- Index: unzip.c =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/unzip.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** unzip.c 7 Dec 2004 22:52:50 -0000 1.3 --- unzip.c 8 Dec 2004 20:29:15 -0000 1.4 *************** *** 1,6 **** /* unzip.c -- IO for uncompress .zip files using zlib ! Version 1.00, September 10th, 2003 ! Copyright (C) 1998-2003 Gilles Vollant Read unzip.h for more info --- 1,6 ---- /* unzip.c -- IO for uncompress .zip files using zlib ! Version 1.01d, September 22th, 2004 ! Copyright (C) 1998-2004 Gilles Vollant Read unzip.h for more info *************** *** 89,93 **** const char unz_copyright[] = ! " unzip 1.00 Copyright 1998-2003 Gilles Vollant - http://www.winimage.com/zLibDll"; /* unz_file_info_interntal contain internal info about a file in zipfile*/ --- 89,93 ---- const char unz_copyright[] = ! " unzip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll"; /* unz_file_info_interntal contain internal info about a file in zipfile*/ *************** *** 799,803 **** if (!s->current_file_ok) return UNZ_END_OF_LIST_OF_FILE; ! if (s->num_file+1==s->gi.number_entry) return UNZ_END_OF_LIST_OF_FILE; --- 799,804 ---- if (!s->current_file_ok) return UNZ_END_OF_LIST_OF_FILE; ! if (s->gi.number_entry != 0xffff) /* 2^16 files overflow hack */ ! if (s->num_file+1==s->gi.number_entry) return UNZ_END_OF_LIST_OF_FILE; *************** *** 1245,1252 **** pfile_in_zip_read_info->stream.avail_out = (uInt)len; ! if (len>pfile_in_zip_read_info->rest_read_uncompressed) pfile_in_zip_read_info->stream.avail_out = (uInt)pfile_in_zip_read_info->rest_read_uncompressed; while (pfile_in_zip_read_info->stream.avail_out>0) { --- 1246,1261 ---- pfile_in_zip_read_info->stream.avail_out = (uInt)len; ! if ((len>pfile_in_zip_read_info->rest_read_uncompressed) && ! (!(pfile_in_zip_read_info->raw))) pfile_in_zip_read_info->stream.avail_out = (uInt)pfile_in_zip_read_info->rest_read_uncompressed; + if ((len>pfile_in_zip_read_info->rest_read_compressed+ + pfile_in_zip_read_info->stream.avail_in) && + (pfile_in_zip_read_info->raw)) + pfile_in_zip_read_info->stream.avail_out = + (uInt)pfile_in_zip_read_info->rest_read_compressed+ + pfile_in_zip_read_info->stream.avail_in; + while (pfile_in_zip_read_info->stream.avail_out>0) { *************** *** 1340,1343 **** --- 1349,1355 ---- err=inflate(&pfile_in_zip_read_info->stream,flush); + if ((err>=0) && (pfile_in_zip_read_info->stream.msg!=NULL)) + err = Z_DATA_ERROR; + uTotalOutAfter = pfile_in_zip_read_info->stream.total_out; uOutThis = uTotalOutAfter-uTotalOutBefore; *************** *** 1462,1466 **** if (ZREAD(pfile_in_zip_read_info->z_filefunc, pfile_in_zip_read_info->filestream, ! buf,size_to_read)!=size_to_read) return UNZ_ERRNO; --- 1474,1478 ---- if (ZREAD(pfile_in_zip_read_info->z_filefunc, pfile_in_zip_read_info->filestream, ! buf,read_now)!=read_now) return UNZ_ERRNO; *************** *** 1545,1546 **** --- 1557,1595 ---- return (int)uReadThis; } + + /* Additions by RX '2004 */ + extern uLong ZEXPORT unzGetOffset (file) + unzFile file; + { + unz_s* s; + + if (file==NULL) + return UNZ_PARAMERROR; + s=(unz_s*)file; + if (!s->current_file_ok) + return 0; + if (s->gi.number_entry != 0 && s->gi.number_entry != 0xffff) + if (s->num_file==s->gi.number_entry) + return 0; + return s->pos_in_central_dir; + } + + extern int ZEXPORT unzSetOffset (file, pos) + unzFile file; + uLong pos; + { + unz_s* s; + int err; + + if (file==NULL) + return UNZ_PARAMERROR; + s=(unz_s*)file; + + s->pos_in_central_dir = pos; + s->num_file = s->gi.number_entry; /* hack */ + err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info, + &s->cur_file_info_internal, + NULL,0,NULL,0,NULL,0); + s->current_file_ok = (err == UNZ_OK); + return err; + } Index: README =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/README,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** README 7 Dec 2004 22:52:50 -0000 1.2 --- README 8 Dec 2004 20:29:15 -0000 1.3 *************** *** 1,5 **** ZLIB DATA COMPRESSION LIBRARY ! zlib 1.2.1 is a general purpose data compression library. All the code is thread safe. The data format used by the zlib library is described by RFCs (Request for Comments) 1950 to 1952 in the files --- 1,5 ---- ZLIB DATA COMPRESSION LIBRARY ! zlib 1.2.2 is a general purpose data compression library. All the code is thread safe. The data format used by the zlib library is described by RFCs (Request for Comments) 1950 to 1952 in the files *************** *** 35,39 **** http://dogma.net/markn/articles/zlibtool/zlibtool.htm ! The changes made in version 1.2.1 are documented in the file ChangeLog. Unsupported third party contributions are provided in directory "contrib". --- 35,39 ---- http://dogma.net/markn/articles/zlibtool/zlibtool.htm ! The changes made in version 1.2.2 are documented in the file ChangeLog. Unsupported third party contributions are provided in directory "contrib". *************** *** 47,51 **** http://www.cpan.org/modules/by-module/Compress/ ! A Python interface to zlib written by A.M. Kuchling <am...@ma...> is available in Python 1.5 and later versions, see http://www.python.org/doc/lib/module-zlib.html --- 47,51 ---- http://www.cpan.org/modules/by-module/Compress/ ! A Python interface to zlib written by A.M. Kuchling <am...@am...> is available in Python 1.5 and later versions, see http://www.python.org/doc/lib/module-zlib.html *************** *** 94,98 **** Copyright notice: ! (C) 1995-2003 Jean-loup Gailly and Mark Adler This software is provided 'as-is', without any express or implied --- 94,98 ---- Copyright notice: ! (C) 1995-2004 Jean-loup Gailly and Mark Adler This software is provided 'as-is', without any express or implied Index: zutil.h =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/zutil.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** zutil.h 7 Dec 2004 22:52:50 -0000 1.2 --- zutil.h 8 Dec 2004 20:29:15 -0000 1.3 *************** *** 190,196 **** # endif #endif #ifdef HAVE_STRERROR ! extern char *strerror OF((int)); # define zstrerror(errnum) strerror(errnum) #else --- 190,201 ---- # endif #endif + #ifdef VMS + # define NO_vsnprintf + #endif #ifdef HAVE_STRERROR ! # ifndef VMS ! extern char *strerror OF((int)); ! # endif # define zstrerror(errnum) strerror(errnum) #else Index: zlib.rc =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/zlib.rc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** zlib.rc 7 Dec 2004 22:52:50 -0000 1.2 --- zlib.rc 8 Dec 2004 20:29:15 -0000 1.3 *************** *** 3,8 **** #define IDR_VERSION1 1 IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE ! FILEVERSION 1,2,1,0 ! PRODUCTVERSION 1,2,1,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS 0 --- 3,8 ---- #define IDR_VERSION1 1 IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE ! FILEVERSION 1,2,2,0 ! PRODUCTVERSION 1,2,2,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS 0 *************** *** 18,22 **** BEGIN VALUE "FileDescription", "LabVIEW zlib data compression library\0" ! VALUE "FileVersion", "1.2.1.0.LV6\0" VALUE "InternalName", "lvzlib\0" VALUE "OriginalFilename", "lvzlib.dll\0" --- 18,22 ---- BEGIN VALUE "FileDescription", "LabVIEW zlib data compression library\0" ! VALUE "FileVersion", "1.2.2.0.LV6\0" VALUE "InternalName", "lvzlib\0" VALUE "OriginalFilename", "lvzlib.dll\0" Index: zconf.in.h =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/zconf.in.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** zconf.in.h 7 Dec 2004 22:52:50 -0000 1.1 --- zconf.in.h 8 Dec 2004 20:29:15 -0000 1.2 *************** *** 1,4 **** /* zconf.h -- configuration of the zlib compression library ! * Copyright (C) 1995-2003 Jean-loup Gailly. * For conditions of distribution and use, see copyright notice in zlib.h */ --- 1,4 ---- /* zconf.h -- configuration of the zlib compression library ! * Copyright (C) 1995-2004 Jean-loup Gailly. * For conditions of distribution and use, see copyright notice in zlib.h */ *************** *** 14,54 **** */ #ifdef Z_PREFIX ! # define deflateInit_ z_deflateInit_ ! # define deflate z_deflate ! # define deflateEnd z_deflateEnd ! # define inflateInit_ z_inflateInit_ ! # define inflate z_inflate ! # define inflateEnd z_inflateEnd ! # define deflateInit2_ z_deflateInit2_ ! # define deflateSetDictionary z_deflateSetDictionary ! # define deflateCopy z_deflateCopy ! # define deflateReset z_deflateReset ! # define deflatePrime z_deflatePrime ! # define deflateParams z_deflateParams ! # define deflateBound z_deflateBound ! # define inflateInit2_ z_inflateInit2_ ! # define inflateSetDictionary z_inflateSetDictionary ! # define inflateSync z_inflateSync ! # define inflateSyncPoint z_inflateSyncPoint ! # define inflateCopy z_inflateCopy ! # define inflateReset z_inflateReset ! # define compress z_compress ! # define compress2 z_compress2 ! # define compressBound z_compressBound ! # define uncompress z_uncompress ! # define adler32 z_adler32 ! # define crc32 z_crc32 ! # define get_crc_table z_get_crc_table ! # define Byte z_Byte ! # define uInt z_uInt ! # define uLong z_uLong ! # define Bytef z_Bytef ! # define charf z_charf ! # define intf z_intf ! # define uIntf z_uIntf ! # define uLongf z_uLongf ! # define voidpf z_voidpf ! # define voidp z_voidp #endif --- 14,57 ---- */ #ifdef Z_PREFIX ! # define deflateInit_ z_deflateInit_ ! # define deflate z_deflate ! # define deflateEnd z_deflateEnd ! # define inflateInit_ z_inflateInit_ ! # define inflate z_inflate ! # define inflateEnd z_inflateEnd ! # define deflateInit2_ z_deflateInit2_ ! # define deflateSetDictionary z_deflateSetDictionary ! # define deflateCopy z_deflateCopy ! # define deflateReset z_deflateReset ! # define deflateParams z_deflateParams ! # define deflateBound z_deflateBound ! # define deflatePrime z_deflatePrime ! # define inflateInit2_ z_inflateInit2_ ! # define inflateSetDictionary z_inflateSetDictionary ! # define inflateSync z_inflateSync ! # define inflateSyncPoint z_inflateSyncPoint ! # define inflateCopy z_inflateCopy ! # define inflateReset z_inflateReset ! # define inflateBack z_inflateBack ! # define inflateBackEnd z_inflateBackEnd ! # define compress z_compress ! # define compress2 z_compress2 ! # define compressBound z_compressBound ! # define uncompress z_uncompress ! # define adler32 z_adler32 ! # define crc32 z_crc32 ! # define get_crc_table z_get_crc_table ! # define zError z_zError ! # define Byte z_Byte ! # define uInt z_uInt ! # define uLong z_uLong ! # define Bytef z_Bytef ! # define charf z_charf ! # define intf z_intf ! # define uIntf z_uIntf ! # define uLongf z_uLongf ! # define voidpf z_voidpf ! # define voidp z_voidp #endif *************** *** 282,286 **** # include <unixio.h> /* for off_t */ # endif ! # define z_off_t off_t #endif #ifndef SEEK_SET --- 285,289 ---- # include <unixio.h> /* for off_t */ # endif ! # define z_off_t off_t #endif #ifndef SEEK_SET *************** *** 290,298 **** #endif #ifndef z_off_t ! # define z_off_t long #endif #if defined(__OS400__) ! #define NO_vsnprintf #endif --- 293,301 ---- #endif #ifndef z_off_t ! # define z_off_t long #endif #if defined(__OS400__) ! # define NO_vsnprintf #endif Index: unzip.h =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/unzip.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** unzip.h 7 Dec 2004 22:52:50 -0000 1.3 --- unzip.h 8 Dec 2004 20:29:15 -0000 1.4 *************** *** 1,6 **** /* unzip.h -- IO for uncompress .zip files using zlib ! Version 1.00, September 10th, 2003 ! Copyright (C) 1998-2003 Gilles Vollant This unzip package allow extract file from .ZIP file, compatible with PKZip 2.04g --- 1,6 ---- /* unzip.h -- IO for uncompress .zip files using zlib ! Version 1.01, May 8th, 2004 ! Copyright (C) 1998-2004 Gilles Vollant This unzip package allow extract file from .ZIP file, compatible with PKZip 2.04g *************** *** 336,339 **** --- 336,349 ---- */ + /***************************************************************************/ + + /* Get the current file offset */ + extern uLong ZEXPORT unzGetOffset (unzFile file); + + /* Set the current file offset */ + extern int ZEXPORT unzSetOffset (unzFile file, uLong pos); + + + #ifdef __cplusplus } Index: zlib.3 =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/zlib.3,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** zlib.3 7 Dec 2004 22:52:50 -0000 1.2 --- zlib.3 8 Dec 2004 20:29:15 -0000 1.3 *************** *** 1,3 **** ! .TH ZLIB 3 "17 November 2003" .SH NAME zlib \- compression/decompression library --- 1,3 ---- ! .TH ZLIB 3 "3 October 2004" .SH NAME zlib \- compression/decompression library *************** *** 134,139 **** or (for the Windows DLL version) to Gilles Vollant (in...@wi...). .SH AUTHORS ! Version 1.2.1 ! Copyright (C) 1995-2003 Jean-loup Gailly (jl...@gz...) and Mark Adler (ma...@al...). .LP --- 134,139 ---- or (for the Windows DLL version) to Gilles Vollant (in...@wi...). .SH AUTHORS ! Version 1.2.2 ! Copyright (C) 1995-2004 Jean-loup Gailly (jl...@gz...) and Mark Adler (ma...@al...). .LP |
