1. 22 1月, 2012 10 次提交
    • J
      Add an --enable-demos option to contrib/minizip/configure. · 32d8a537
      Jonathan Nieder 提交于
      This makes build-testing and installing the minizip/miniunzip programs
      as simple as "autoreconf -if && ./configure --enable-demos && make &&
      make install".  Without --enable-demos, the makefile will only build
      and install the library, as before.  Helped by Mike Frysinger.
      
      minizip/miniunzip were not intended to be general-purpose installed
      utilities, but they can be useful from time to time as a lightweight
      substitute for zip/unzip.  You can also use them to quickly test that
      the library installation procedure worked.
      32d8a537
    • J
      Add support for VPATH builds in contrib/minizip. · f0cff242
      Jonathan Nieder 提交于
      Instead of using relative paths directly, use paths relative to
      top_srcdir and top_builddir to refer to source files and built files,
      respectively.
      
      Note that the toplevel zlib configure script still does not have any
      special support for out-of-tree builds.  But now you can do
      
      	(cd contrib/minizip && autoreconf -fis)
      
      	mkdir -p BUILD/test
      	cp *.c *.h *.in zlib.map configure zlib.3 BUILD
      	cp test/*.c BUILD/test
      	(cd BUILD && ./configure --shared)
      	(cd BUILD && make)
      
      	mkdir -p BUILD/contrib/minizip
      	cd BUILD/contrib/minizip
      	../../../contrib/minizip/configure
      	make
      
      While at it, move the include path and library path settings to
      CPPFLAGS and LDFLAGS respectively instead of setting both in CFLAGS.
      Thanks to Mike Frysinger for advice.
      f0cff242
    • J
      Add missing libs to minizip linker command. · 81015585
      Jonathan Nieder 提交于
      Trying to build the minizip utility from contrib/minizip after an
      autoreconf -f:
      
      	libtool: link: gcc -g -O2 -o minizip minizip.o
      	minizip.o: In function `getFileCrc':
      	/tmp/zlib/contrib/minizip/minizip.c:211: undefined reference to `crc32'
      	minizip.o: In function `main':
      	/tmp/zlib/contrib/minizip/minizip.c:378: undefined reference to `zipOpen64'
      	/tmp/zlib/contrib/minizip/minizip.c:451: undefined reference to `zipOpenNewFileInZip3_64'
      	/tmp/zlib/contrib/minizip/minizip.c:502: undefined reference to `zipCloseFileInZip'
      	/tmp/zlib/contrib/minizip/minizip.c:509: undefined reference to `zipClose'
      	/tmp/zlib/contrib/minizip/minizip.c:485: undefined reference to `zipWriteInFileInZip'
      	collect2: error: ld returned 1 exit status
      
      The cause: contrib/minizip/Makefile.am does not specify that minizip
      needs to be linked to libminizip.  With some linkers (e.g., GNU
      binutils without --copy-dt-needed-entries), an indirect dependency
      cannot be used to resolve symbols, so link to libz for crc32(), too.
      81015585
    • J
      Add -I../.. -L../.. to CFLAGS for minizip and miniunzip. · ad88c19b
      Jonathan Nieder 提交于
      Trying to build miniunzip utility from contrib/minizip after an
      autoreconf -f produces
      
      	[...]
      	In file included from minizip.c:61:0:
      	zip.h:50:18: fatal error: zlib.h: No such file or directory
      
      unless zlib is already installed.  Use AM_CFLAGS to set the include
      path and library path to point to the just-build copy of zlib to
      fix this.  (This was already done for libminizip but not the binaries
      that use it before this patch.)
      ad88c19b
    • M
      Remove trailing space in contrib/minizip/minizip.c. · 17741efa
      Mark Adler 提交于
      17741efa
    • M
      Avoid some warnings in contrib/minizip [Vollant]. · de6cb6fe
      Mark Adler 提交于
      de6cb6fe
    • M
      601b542a
    • M
      Fix bug when compiling minizip with C++ [Vollant]. · 0458bbf2
      Mark Adler 提交于
      0458bbf2
    • M
      Minor cleanup up contrib/minizip/unzip.c [Vollant]. · 06c0e754
      Mark Adler 提交于
      06c0e754
    • M
      9cdb49c9
  2. 21 1月, 2012 1 次提交
  3. 19 1月, 2012 1 次提交
  4. 17 1月, 2012 10 次提交
  5. 16 1月, 2012 1 次提交
  6. 15 1月, 2012 1 次提交
  7. 14 1月, 2012 1 次提交
    • M
      Insert the first two strings in the hash table after a flush. · 4f5779a8
      Mark Adler 提交于
      This allows deflate to generate the same output when continuing after
      a Z_SYNC_FLUSH vs. using deflateSetDictionary() after a Z_FULL_FLUSH
      or a deflateReset().  It also slightly improves compression when
      flushing by providing two more strings to possibly match at the start
      of the new block.
      4f5779a8
  8. 08 1月, 2012 3 次提交
    • M
      Write out all of the available bits when using Z_BLOCK. · 0b828b4a
      Mark Adler 提交于
      Previously, the bit buffer would hold 1 to 16 bits after "all" of the
      output is provided after a Z_BLOCK deflate() call.  Now at most seven
      bits remain in the output buffer after Z_BLOCK.  flush_pending() now
      flushes the bit buffer before copying out the byte buffer, in order
      for it to really flush as much as possible.
      0b828b4a
    • M
      Remove second empty static block for Z_PARTIAL_FLUSH. · 8f5eceef
      Mark Adler 提交于
      Z_PARTIAL_FLUSH would sometimes emit two empty static blocks instead
      of one in order to provide enough lookahead for inflate to be able
      to decode what was last compressed.  inflate no longer needs that
      much lookahead, so this removes the possibility of emitting the
      second empty static block.  Z_PARTIAL_FLUSH will now emit only one
      empty static block.
      8f5eceef
    • M
      Allow deflatePrime() to insert bits in the middle of a stream. · 263b1a05
      Mark Adler 提交于
      This allows the insertion of multiple empty static blocks for the
      purpose of efficiently bringing a stream to a byte boundary.
      263b1a05
  9. 29 12月, 2011 3 次提交
    • M
      Permit Z_NULL arguments to deflatePending. · 19761b85
      Mark Adler 提交于
      This avoids having to create useless variables for return values
      that aren't needed.
      19761b85
    • M
      Avoid extraneous empty blocks when doing empty flushes. · 9d55abc9
      Mark Adler 提交于
      Previously when doing an empty flush, a extra static or stored block
      could be emitted before the requested empty static or stored block.
      This patch prevents the emission of empty blocks by the deflate_*
      functions.
      9d55abc9
    • M
      Permit stronger flushes after Z_BLOCK flushes. · f1ebdd6a
      Mark Adler 提交于
      The incorporation of the Z_BLOCK flush did not update the rejection
      of lower ranked flushes immediately after higher ranked flushes with
      no more input data.  This prevented an empty Z_SYNC_FLUSH right after
      a Z_BLOCK flush, which would be desired to bring the deflate stream
      to a byte boundary conditionally on whether or not it was already at
      a byte boundary.  This patch re-ranks Z_BLOCK above Z_NO_FLUSH but
      below Z_PARTIAL_FLUSH, allowing stronger empty flushes to follow a
      Z_BLOCK flush.
      f1ebdd6a
  10. 24 12月, 2011 1 次提交
  11. 20 12月, 2011 1 次提交
  12. 19 12月, 2011 6 次提交
  13. 18 12月, 2011 1 次提交