fix the end-of-line styles for linux platforms [MouseJstr]

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1348 54d463be-8e91-2dee-dedb-b68131a5f0ec

21 files changed, 8852 insertions, 8852 deletions

diff --git a/src/zlib/FAQ b/src/zlib/FAQ
index bb5355fc6..4f61f1094 100644
--- a/src/zlib/FAQ
+++ b/src/zlib/FAQ
@@ -1,337 +1,337 @@
-

-                Frequently Asked Questions about zlib

-

-

-If your question is not there, please check the zlib home page

-http://www.zlib.org which may have more recent information.

-The lastest zlib FAQ is at http://www.gzip.org/zlib/zlib_faq.html

-

-

- 1. Is zlib Y2K-compliant?

-

-    Yes. zlib doesn't handle dates.

-

- 2. Where can I get a Windows DLL version?

-

-    The zlib sources can be compiled without change to produce a DLL.

-    See the file win32/DLL_FAQ.txt in the zlib distribution.

-    Pointers to the precompiled DLL are found in the zlib web site at

-    http://www.zlib.org.

-

- 3. Where can I get a Visual Basic interface to zlib?

-

-    See

-        * http://www.dogma.net/markn/articles/zlibtool/zlibtool.htm

-        * contrib/visual-basic.txt in the zlib distribution

-        * win32/DLL_FAQ.txt in the zlib distribution

-

- 4. compress() returns Z_BUF_ERROR.

-

-    Make sure that before the call of compress, the length of the compressed

-    buffer is equal to the total size of the compressed buffer and not

-    zero. For Visual Basic, check that this parameter is passed by reference

-    ("as any"), not by value ("as long").

-

- 5. deflate() or inflate() returns Z_BUF_ERROR.

-

-    Before making the call, make sure that avail_in and avail_out are not

-    zero. When setting the parameter flush equal to Z_FINISH, also make sure

-    that avail_out is big enough to allow processing all pending input.

-    Note that a Z_BUF_ERROR is not fatal--another call to deflate() or

-    inflate() can be made with more input or output space. A Z_BUF_ERROR

-    may in fact be unavoidable depending on how the functions are used, since

-    it is not possible to tell whether or not there is more output pending

-    when strm.avail_out returns with zero.

-

- 6. Where's the zlib documentation (man pages, etc.)?

-

-    It's in zlib.h for the moment, and Francis S. Lin has converted it to a

-    web page zlib.html. Volunteers to transform this to Unix-style man pages,

-    please contact us (zlib@gzip.org). Examples of zlib usage are in the files

-    example.c and minigzip.c.

-

- 7. Why don't you use GNU autoconf or libtool or ...?

-

-    Because we would like to keep zlib as a very small and simple

-    package. zlib is rather portable and doesn't need much configuration.

-

- 8. I found a bug in zlib.

-

-    Most of the time, such problems are due to an incorrect usage of

-    zlib. Please try to reproduce the problem with a small program and send

-    the corresponding source to us at zlib@gzip.org . Do not send

-    multi-megabyte data files without prior agreement.

-

- 9. Why do I get "undefined reference to gzputc"?

-

-    If "make test" produces something like

-

-       example.o(.text+0x154): undefined reference to `gzputc'

-

-    check that you don't have old files libz.* in /usr/lib, /usr/local/lib or

-    /usr/X11R6/lib. Remove any old versions, then do "make install".

-

-10. I need a Delphi interface to zlib.

-

-    See the contrib/delphi directory in the zlib distribution.

-

-11. Can zlib handle .zip archives?

-

-    Not by itself, no.  See the directory contrib/minizip in the zlib

-    distribution.

-

-12. Can zlib handle .Z files?

-

-    No, sorry. You have to spawn an uncompress or gunzip subprocess, or adapt

-    the code of uncompress on your own.

-

-13. How can I make a Unix shared library?

-

-    make clean

-    ./configure -s

-    make

-

-14. How do I install a shared zlib library on Unix?

-

-    After the above, then:

-

-    make install

-

-    However, many flavors of Unix come with a shared zlib already installed.

-    Before going to the trouble of compiling a shared version of zlib and

-    trying to install it, you may want to check if it's already there! If you

-    can #include <zlib.h>, it's there. The -lz option will probably link to it.

-

-15. I have a question about OttoPDF.

-

-    We are not the authors of OttoPDF. The real author is on the OttoPDF web

-    site: Joel Hainley, jhainley@myndkryme.com.

-

-16. Can zlib decode Flate data in an Adobe PDF file?

-

-    Yes. See http://www.fastio.com/ (ClibPDF), or http://www.pdflib.com/ .

-    To modify PDF forms, see http://sourceforge.net/projects/acroformtool/ .

-

-17. Why am I getting this "register_frame_info not found" error on Solaris?

-

-    After installing zlib 1.1.4 on Solaris 2.6, running applications using zlib

-    generates an error such as:

-

-        ld.so.1: rpm: fatal: relocation error: file /usr/local/lib/libz.so:

-        symbol __register_frame_info: referenced symbol not found

-

-    The symbol __register_frame_info is not part of zlib, it is generated by

-    the C compiler (cc or gcc). You must recompile applications using zlib

-    which have this problem. This problem is specific to Solaris. See

-    http://www.sunfreeware.com for Solaris versions of zlib and applications

-    using zlib.

-

-18. Why does gzip give an error on a file I make with compress/deflate?

-

-    The compress and deflate functions produce data in the zlib format, which

-    is different and incompatible with the gzip format. The gz* functions in

-    zlib on the other hand use the gzip format. Both the zlib and gzip

-    formats use the same compressed data format internally, but have different

-    headers and trailers around the compressed data.

-

-19. Ok, so why are there two different formats?

-

-    The gzip format was designed to retain the directory information about

-    a single file, such as the name and last modification date. The zlib

-    format on the other hand was designed for in-memory and communication

-    channel applications, and has a much more compact header and trailer and

-    uses a faster integrity check than gzip.

-

-20. Well that's nice, but how do I make a gzip file in memory?

-

-    You can request that deflate write the gzip format instead of the zlib

-    format using deflateInit2(). You can also request that inflate decode

-    the gzip format using inflateInit2(). Read zlib.h for more details.

-

-    Note that you cannot specify special gzip header contents (e.g. a file

-    name or modification date), nor will inflate tell you what was in the

-    gzip header. If you need to customize the header or see what's in it,

-    you can use the raw deflate and inflate operations and the crc32()

-    function and roll your own gzip encoding and decoding. Read the gzip

-    RFC 1952 for details of the header and trailer format.

-

-21. Is zlib thread-safe?

-

-    Yes. However any library routines that zlib uses and any application-

-    provided memory allocation routines must also be thread-safe. zlib's gz*

-    functions use stdio library routines, and most of zlib's functions use the

-    library memory allocation routines by default. zlib's Init functions allow

-    for the application to provide custom memory allocation routines.

-

-    Of course, you should only operate on any given zlib or gzip stream from a

-    single thread at a time.

-

-22. Can I use zlib in my commercial application?

-

-    Yes. Please read the license in zlib.h.

-

-23. Is zlib under the GNU license?

-

-    No. Please read the license in zlib.h.

-

-24. The license says that altered source versions must be "plainly marked". So

-    what exactly do I need to do to meet that requirement?

-

-    You need to change the ZLIB_VERSION and ZLIB_VERNUM #defines in zlib.h. In

-    particular, the final version number needs to be changed to "f", and an

-    identification string should be appended to ZLIB_VERSION. Version numbers

-    x.x.x.f are reserved for modifications to zlib by others than the zlib

-    maintainers. For example, if the version of the base zlib you are altering

-    is "1.2.3.4", then in zlib.h you should change ZLIB_VERNUM to 0x123f, and

-    ZLIB_VERSION to something like "1.2.3.f-zachary-mods-v3". You can also

-    update the version strings in deflate.c and inftrees.c.

-

-    For altered source distributions, you should also note the origin and

-    nature of the changes in zlib.h, as well as in ChangeLog and README, along

-    with the dates of the alterations. The origin should include at least your

-    name (or your company's name), and an email address to contact for help or

-    issues with the library.

-

-    Note that distributing a compiled zlib library along with zlib.h and

-    zconf.h is also a source distribution, and so you should change

-    ZLIB_VERSION and ZLIB_VERNUM and note the origin and nature of the changes

-    in zlib.h as you would for a full source distribution.

-

-25. Will zlib work on a big-endian or little-endian architecture, and can I

-    exchange compressed data between them?

-

-    Yes and yes.

-

-26. Will zlib work on a 64-bit machine?

-

-    It should. It has been tested on 64-bit machines, and has no dependence

-    on any data types being limited to 32-bits in length. If you have any

-    difficulties, please provide a complete problem report to zlib@gzip.org

-

-27. Will zlib decompress data from the PKWare Data Compression Library?

-

-    No. The PKWare DCL uses a completely different compressed data format

-    than does PKZIP and zlib. However, you can look in zlib's contrib/blast

-    directory for a possible solution to your problem.

-

-28. Can I access data randomly in a compressed stream?

-

-    No, not without some preparation. If when compressing you periodically

-    use Z_FULL_FLUSH, carefully write all the pending data at those points,

-    and keep an index of those locations, then you can start decompression

-    at those points. You have to be careful to not use Z_FULL_FLUSH too

-    often, since it can significantly degrade compression.

-

-29. Does zlib work on MVS, OS/390, CICS, etc.?

-

-    We don't know for sure. We have heard occasional reports of success on

-    these systems. If you do use it on one of these, please provide us with

-    a report, instructions, and patches that we can reference when we get

-    these questions. Thanks.

-

-30. Is there some simpler, easier to read version of inflate I can look at

-    to understand the deflate format?

-

-    First off, you should read RFC 1951. Second, yes. Look in zlib's

-    contrib/puff directory.

-

-31. Does zlib infringe on any patents?

-

-    As far as we know, no. In fact, that was originally the whole point behind

-    zlib. Look here for some more information:

-

-    http://www.gzip.org/#faq11

-

-32. Can zlib work with greater than 4 GB of data?

-

-    Yes. inflate() and deflate() will process any amount of data correctly.

-    Each call of inflate() or deflate() is limited to input and output chunks

-    of the maximum value that can be stored in the compiler's "unsigned int"

-    type, but there is no limit to the number of chunks. Note however that the

-    strm.total_in and strm_total_out counters may be limited to 4 GB. These

-    counters are provided as a convenience and are not used internally by

-    inflate() or deflate(). The application can easily set up its own counters

-    updated after each call of inflate() or deflate() to count beyond 4 GB.

-    compress() and uncompress() may be limited to 4 GB, since they operate in a

-    single call. gzseek() and gztell() may be limited to 4 GB depending on how

-    zlib is compiled. See the zlibCompileFlags() function in zlib.h.

-

-    The word "may" appears several times above since there is a 4 GB limit

-    only if the compiler's "long" type is 32 bits. If the compiler's "long"

-    type is 64 bits, then the limit is 16 exabytes.

-

-33. Does zlib have any security vulnerabilities?

-

-    The only one that we are aware of is potentially in gzprintf(). If zlib

-    is compiled to use sprintf() or vsprintf(), then there is no protection

-    against a buffer overflow of a 4K string space, other than the caller of

-    gzprintf() assuring that the output will not exceed 4K. On the other

-    hand, if zlib is compiled to use snprintf() or vsnprintf(), which should

-    normally be the case, then there is no vulnerability. The ./configure

-    script will display warnings if an insecure variation of sprintf() will

-    be used by gzprintf(). Also the zlibCompileFlags() function will return

-    information on what variant of sprintf() is used by gzprintf().

-

-    If you don't have snprintf() or vsnprintf() and would like one, you can

-    find a portable implementation here:

-

-        http://www.ijs.si/software/snprintf/

-

-    Note that you should be using the most recent version of zlib. Versions

-    1.1.3 and before were subject to a double-free vulnerability.

-

-34. Is there a Java version of zlib?

-

-    Probably what you want is to use zlib in Java. zlib is already included

-    as part of the Java SDK in the java.util.zip package. If you really want

-    a version of zlib written in the Java language, look on the zlib home

-    page for links: http://www.zlib.org/

-

-35. I get this or that compiler or source-code scanner warning when I crank it

-    up to maximally-pedantic. Can't you guys write proper code?

-

-    Many years ago, we gave up attempting to avoid warnings on every compiler

-    in the universe. It just got to be a waste of time, and some compilers

-    were downright silly. So now, we simply make sure that the code always

-    works.

-

-36. Will zlib read the (insert any ancient or arcane format here) compressed

-    data format?

-

-    Probably not. Look in the comp.compression FAQ for pointers to various

-    formats and associated software.

-

-37. How can I encrypt/decrypt zip files with zlib?

-

-    zlib doesn't support encryption. The original PKZIP encryption is very weak

-    and can be broken with freely available programs. To get strong encryption,

-    use GnuPG, http://www.gnupg.org/ , which already includes zlib compression.

-    For PKZIP compatible "encryption", look at http://www.info-zip.org/

-

-38. What's the difference between the "gzip" and "deflate" HTTP 1.1 encodings?

-

-    "gzip" is the gzip format, and "deflate" is the zlib format. They should

-    probably have called the second one "zlib" instead to avoid confusion

-    with the raw deflate compressed data format. While the HTTP 1.1 RFC 2616

-    correctly points to the zlib specification in RFC 1950 for the "deflate"

-    transfer encoding, there have been reports of servers and browsers that

-    incorrectly produce or expect raw deflate data per the deflate

-    specficiation in RFC 1951, most notably Microsoft. So even though the

-    "deflate" transfer encoding using the zlib format would be the more

-    efficient approach (and in fact exactly what the zlib format was designed

-    for), using the "gzip" transfer encoding is probably more reliable due to

-    an unfortunate choice of name on the part of the HTTP 1.1 authors.

-

-    Bottom line: use the gzip format for HTTP 1.1 encoding.

-

-39. Does zlib support the new "Deflate64" format introduced by PKWare?

-

-    No. PKWare has apparently decided to keep that format proprietary, since

-    they have not documented it as they have previous compression formats.

-    In any case, the compression improvements are so modest compared to other

-    more modern approaches, that it's not worth the effort to implement.

-

-40. Can you please sign these lengthy legal documents and fax them back to us

-    so that we can use your software in our product?

-

-    No. Go away. Shoo.

+
+                Frequently Asked Questions about zlib
+
+
+If your question is not there, please check the zlib home page
+http://www.zlib.org which may have more recent information.
+The lastest zlib FAQ is at http://www.gzip.org/zlib/zlib_faq.html
+
+
+ 1. Is zlib Y2K-compliant?
+
+    Yes. zlib doesn't handle dates.
+
+ 2. Where can I get a Windows DLL version?
+
+    The zlib sources can be compiled without change to produce a DLL.
+    See the file win32/DLL_FAQ.txt in the zlib distribution.
+    Pointers to the precompiled DLL are found in the zlib web site at
+    http://www.zlib.org.
+
+ 3. Where can I get a Visual Basic interface to zlib?
+
+    See
+        * http://www.dogma.net/markn/articles/zlibtool/zlibtool.htm
+        * contrib/visual-basic.txt in the zlib distribution
+        * win32/DLL_FAQ.txt in the zlib distribution
+
+ 4. compress() returns Z_BUF_ERROR.
+
+    Make sure that before the call of compress, the length of the compressed
+    buffer is equal to the total size of the compressed buffer and not
+    zero. For Visual Basic, check that this parameter is passed by reference
+    ("as any"), not by value ("as long").
+
+ 5. deflate() or inflate() returns Z_BUF_ERROR.
+
+    Before making the call, make sure that avail_in and avail_out are not
+    zero. When setting the parameter flush equal to Z_FINISH, also make sure
+    that avail_out is big enough to allow processing all pending input.
+    Note that a Z_BUF_ERROR is not fatal--another call to deflate() or
+    inflate() can be made with more input or output space. A Z_BUF_ERROR
+    may in fact be unavoidable depending on how the functions are used, since
+    it is not possible to tell whether or not there is more output pending
+    when strm.avail_out returns with zero.
+
+ 6. Where's the zlib documentation (man pages, etc.)?
+
+    It's in zlib.h for the moment, and Francis S. Lin has converted it to a
+    web page zlib.html. Volunteers to transform this to Unix-style man pages,
+    please contact us (zlib@gzip.org). Examples of zlib usage are in the files
+    example.c and minigzip.c.
+
+ 7. Why don't you use GNU autoconf or libtool or ...?
+
+    Because we would like to keep zlib as a very small and simple
+    package. zlib is rather portable and doesn't need much configuration.
+
+ 8. I found a bug in zlib.
+
+    Most of the time, such problems are due to an incorrect usage of
+    zlib. Please try to reproduce the problem with a small program and send
+    the corresponding source to us at zlib@gzip.org . Do not send
+    multi-megabyte data files without prior agreement.
+
+ 9. Why do I get "undefined reference to gzputc"?
+
+    If "make test" produces something like
+
+       example.o(.text+0x154): undefined reference to `gzputc'
+
+    check that you don't have old files libz.* in /usr/lib, /usr/local/lib or
+    /usr/X11R6/lib. Remove any old versions, then do "make install".
+
+10. I need a Delphi interface to zlib.
+
+    See the contrib/delphi directory in the zlib distribution.
+
+11. Can zlib handle .zip archives?
+
+    Not by itself, no.  See the directory contrib/minizip in the zlib
+    distribution.
+
+12. Can zlib handle .Z files?
+
+    No, sorry. You have to spawn an uncompress or gunzip subprocess, or adapt
+    the code of uncompress on your own.
+
+13. How can I make a Unix shared library?
+
+    make clean
+    ./configure -s
+    make
+
+14. How do I install a shared zlib library on Unix?
+
+    After the above, then:
+
+    make install
+
+    However, many flavors of Unix come with a shared zlib already installed.
+    Before going to the trouble of compiling a shared version of zlib and
+    trying to install it, you may want to check if it's already there! If you
+    can #include <zlib.h>, it's there. The -lz option will probably link to it.
+
+15. I have a question about OttoPDF.
+
+    We are not the authors of OttoPDF. The real author is on the OttoPDF web
+    site: Joel Hainley, jhainley@myndkryme.com.
+
+16. Can zlib decode Flate data in an Adobe PDF file?
+
+    Yes. See http://www.fastio.com/ (ClibPDF), or http://www.pdflib.com/ .
+    To modify PDF forms, see http://sourceforge.net/projects/acroformtool/ .
+
+17. Why am I getting this "register_frame_info not found" error on Solaris?
+
+    After installing zlib 1.1.4 on Solaris 2.6, running applications using zlib
+    generates an error such as:
+
+        ld.so.1: rpm: fatal: relocation error: file /usr/local/lib/libz.so:
+        symbol __register_frame_info: referenced symbol not found
+
+    The symbol __register_frame_info is not part of zlib, it is generated by
+    the C compiler (cc or gcc). You must recompile applications using zlib
+    which have this problem. This problem is specific to Solaris. See
+    http://www.sunfreeware.com for Solaris versions of zlib and applications
+    using zlib.
+
+18. Why does gzip give an error on a file I make with compress/deflate?
+
+    The compress and deflate functions produce data in the zlib format, which
+    is different and incompatible with the gzip format. The gz* functions in
+    zlib on the other hand use the gzip format. Both the zlib and gzip
+    formats use the same compressed data format internally, but have different
+    headers and trailers around the compressed data.
+
+19. Ok, so why are there two different formats?
+
+    The gzip format was designed to retain the directory information about
+    a single file, such as the name and last modification date. The zlib
+    format on the other hand was designed for in-memory and communication
+    channel applications, and has a much more compact header and trailer and
+    uses a faster integrity check than gzip.
+
+20. Well that's nice, but how do I make a gzip file in memory?
+
+    You can request that deflate write the gzip format instead of the zlib
+    format using deflateInit2(). You can also request that inflate decode
+    the gzip format using inflateInit2(). Read zlib.h for more details.
+
+    Note that you cannot specify special gzip header contents (e.g. a file
+    name or modification date), nor will inflate tell you what was in the
+    gzip header. If you need to customize the header or see what's in it,
+    you can use the raw deflate and inflate operations and the crc32()
+    function and roll your own gzip encoding and decoding. Read the gzip
+    RFC 1952 for details of the header and trailer format.
+
+21. Is zlib thread-safe?
+
+    Yes. However any library routines that zlib uses and any application-
+    provided memory allocation routines must also be thread-safe. zlib's gz*
+    functions use stdio library routines, and most of zlib's functions use the
+    library memory allocation routines by default. zlib's Init functions allow
+    for the application to provide custom memory allocation routines.
+
+    Of course, you should only operate on any given zlib or gzip stream from a
+    single thread at a time.
+
+22. Can I use zlib in my commercial application?
+
+    Yes. Please read the license in zlib.h.
+
+23. Is zlib under the GNU license?
+
+    No. Please read the license in zlib.h.
+
+24. The license says that altered source versions must be "plainly marked". So
+    what exactly do I need to do to meet that requirement?
+
+    You need to change the ZLIB_VERSION and ZLIB_VERNUM #defines in zlib.h. In
+    particular, the final version number needs to be changed to "f", and an
+    identification string should be appended to ZLIB_VERSION. Version numbers
+    x.x.x.f are reserved for modifications to zlib by others than the zlib
+    maintainers. For example, if the version of the base zlib you are altering
+    is "1.2.3.4", then in zlib.h you should change ZLIB_VERNUM to 0x123f, and
+    ZLIB_VERSION to something like "1.2.3.f-zachary-mods-v3". You can also
+    update the version strings in deflate.c and inftrees.c.
+
+    For altered source distributions, you should also note the origin and
+    nature of the changes in zlib.h, as well as in ChangeLog and README, along
+    with the dates of the alterations. The origin should include at least your
+    name (or your company's name), and an email address to contact for help or
+    issues with the library.
+
+    Note that distributing a compiled zlib library along with zlib.h and
+    zconf.h is also a source distribution, and so you should change
+    ZLIB_VERSION and ZLIB_VERNUM and note the origin and nature of the changes
+    in zlib.h as you would for a full source distribution.
+
+25. Will zlib work on a big-endian or little-endian architecture, and can I
+    exchange compressed data between them?
+
+    Yes and yes.
+
+26. Will zlib work on a 64-bit machine?
+
+    It should. It has been tested on 64-bit machines, and has no dependence
+    on any data types being limited to 32-bits in length. If you have any
+    difficulties, please provide a complete problem report to zlib@gzip.org
+
+27. Will zlib decompress data from the PKWare Data Compression Library?
+
+    No. The PKWare DCL uses a completely different compressed data format
+    than does PKZIP and zlib. However, you can look in zlib's contrib/blast
+    directory for a possible solution to your problem.
+
+28. Can I access data randomly in a compressed stream?
+
+    No, not without some preparation. If when compressing you periodically
+    use Z_FULL_FLUSH, carefully write all the pending data at those points,
+    and keep an index of those locations, then you can start decompression
+    at those points. You have to be careful to not use Z_FULL_FLUSH too
+    often, since it can significantly degrade compression.
+
+29. Does zlib work on MVS, OS/390, CICS, etc.?
+
+    We don't know for sure. We have heard occasional reports of success on
+    these systems. If you do use it on one of these, please provide us with
+    a report, instructions, and patches that we can reference when we get
+    these questions. Thanks.
+
+30. Is there some simpler, easier to read version of inflate I can look at
+    to understand the deflate format?
+
+    First off, you should read RFC 1951. Second, yes. Look in zlib's
+    contrib/puff directory.
+
+31. Does zlib infringe on any patents?
+
+    As far as we know, no. In fact, that was originally the whole point behind
+    zlib. Look here for some more information:
+
+    http://www.gzip.org/#faq11
+
+32. Can zlib work with greater than 4 GB of data?
+
+    Yes. inflate() and deflate() will process any amount of data correctly.
+    Each call of inflate() or deflate() is limited to input and output chunks
+    of the maximum value that can be stored in the compiler's "unsigned int"
+    type, but there is no limit to the number of chunks. Note however that the
+    strm.total_in and strm_total_out counters may be limited to 4 GB. These
+    counters are provided as a convenience and are not used internally by
+    inflate() or deflate(). The application can easily set up its own counters
+    updated after each call of inflate() or deflate() to count beyond 4 GB.
+    compress() and uncompress() may be limited to 4 GB, since they operate in a
+    single call. gzseek() and gztell() may be limited to 4 GB depending on how
+    zlib is compiled. See the zlibCompileFlags() function in zlib.h.
+
+    The word "may" appears several times above since there is a 4 GB limit
+    only if the compiler's "long" type is 32 bits. If the compiler's "long"
+    type is 64 bits, then the limit is 16 exabytes.
+
+33. Does zlib have any security vulnerabilities?
+
+    The only one that we are aware of is potentially in gzprintf(). If zlib
+    is compiled to use sprintf() or vsprintf(), then there is no protection
+    against a buffer overflow of a 4K string space, other than the caller of
+    gzprintf() assuring that the output will not exceed 4K. On the other
+    hand, if zlib is compiled to use snprintf() or vsnprintf(), which should
+    normally be the case, then there is no vulnerability. The ./configure
+    script will display warnings if an insecure variation of sprintf() will
+    be used by gzprintf(). Also the zlibCompileFlags() function will return
+    information on what variant of sprintf() is used by gzprintf().
+
+    If you don't have snprintf() or vsnprintf() and would like one, you can
+    find a portable implementation here:
+
+        http://www.ijs.si/software/snprintf/
+
+    Note that you should be using the most recent version of zlib. Versions
+    1.1.3 and before were subject to a double-free vulnerability.
+
+34. Is there a Java version of zlib?
+
+    Probably what you want is to use zlib in Java. zlib is already included
+    as part of the Java SDK in the java.util.zip package. If you really want
+    a version of zlib written in the Java language, look on the zlib home
+    page for links: http://www.zlib.org/
+
+35. I get this or that compiler or source-code scanner warning when I crank it
+    up to maximally-pedantic. Can't you guys write proper code?
+
+    Many years ago, we gave up attempting to avoid warnings on every compiler
+    in the universe. It just got to be a waste of time, and some compilers
+    were downright silly. So now, we simply make sure that the code always
+    works.
+
+36. Will zlib read the (insert any ancient or arcane format here) compressed
+    data format?
+
+    Probably not. Look in the comp.compression FAQ for pointers to various
+    formats and associated software.
+
+37. How can I encrypt/decrypt zip files with zlib?
+
+    zlib doesn't support encryption. The original PKZIP encryption is very weak
+    and can be broken with freely available programs. To get strong encryption,
+    use GnuPG, http://www.gnupg.org/ , which already includes zlib compression.
+    For PKZIP compatible "encryption", look at http://www.info-zip.org/
+
+38. What's the difference between the "gzip" and "deflate" HTTP 1.1 encodings?
+
+    "gzip" is the gzip format, and "deflate" is the zlib format. They should
+    probably have called the second one "zlib" instead to avoid confusion
+    with the raw deflate compressed data format. While the HTTP 1.1 RFC 2616
+    correctly points to the zlib specification in RFC 1950 for the "deflate"
+    transfer encoding, there have been reports of servers and browsers that
+    incorrectly produce or expect raw deflate data per the deflate
+    specficiation in RFC 1951, most notably Microsoft. So even though the
+    "deflate" transfer encoding using the zlib format would be the more
+    efficient approach (and in fact exactly what the zlib format was designed
+    for), using the "gzip" transfer encoding is probably more reliable due to
+    an unfortunate choice of name on the part of the HTTP 1.1 authors.
+
+    Bottom line: use the gzip format for HTTP 1.1 encoding.
+
+39. Does zlib support the new "Deflate64" format introduced by PKWare?
+
+    No. PKWare has apparently decided to keep that format proprietary, since
+    they have not documented it as they have previous compression formats.
+    In any case, the compression improvements are so modest compared to other
+    more modern approaches, that it's not worth the effort to implement.
+
+40. Can you please sign these lengthy legal documents and fax them back to us
+    so that we can use your software in our product?
+
+    No. Go away. Shoo.
diff --git a/src/zlib/README b/src/zlib/README
index c3453b8e8..df95ae13f 100644
--- a/src/zlib/README
+++ b/src/zlib/README
@@ -1,126 +1,126 @@
-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

-http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format)

-and rfc1952.txt (gzip format). These documents are also available in other

-formats from ftp://ftp.uu.net/graphics/png/documents/zlib/zdoc-index.html

-

-All functions of the compression library are documented in the file zlib.h

-(volunteer to write man pages welcome, contact zlib@gzip.org). A usage example

-of the library is given in the file example.c which also tests that the library

-is working correctly. Another example is given in the file minigzip.c. The

-compression library itself is composed of all source files except example.c and

-minigzip.c.

-

-To compile all files and run the test program, follow the instructions given at

-the top of Makefile. In short "make test; make install" should work for most

-machines. For Unix: "./configure; make test; make install" For MSDOS, use one

-of the special makefiles such as Makefile.msc. For VMS, use Make_vms.com or

-descrip.mms.

-

-Questions about zlib should be sent to <zlib@gzip.org>, or to Gilles Vollant

-<info@winimage.com> for the Windows DLL version. The zlib home page is

-http://www.zlib.org or http://www.gzip.org/zlib/ Before reporting a problem,

-please check this site to verify that you have the latest version of zlib;

-otherwise get the latest version and check whether the problem still exists or

-not.

-

-PLEASE read the zlib FAQ http://www.gzip.org/zlib/zlib_faq.html before asking

-for help.

-

-Mark Nelson <markn@ieee.org> wrote an article about zlib for the Jan. 1997

-issue of  Dr. Dobb's Journal; a copy of the article is available in

-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".

-

-A Java implementation of zlib is available in the Java Development Kit

-http://java.sun.com/j2se/1.4.2/docs/api/java/util/zip/package-summary.html

-See the zlib home page http://www.zlib.org for details.

-

-A Perl interface to zlib written by Paul Marquess <pmqs@cpan.org> is in the

-CPAN (Comprehensive Perl Archive Network) sites

-http://www.cpan.org/modules/by-module/Compress/

-

-A Python interface to zlib written by A.M. Kuchling <amk@amk.ca> is

-available in Python 1.5 and later versions, see

-http://www.python.org/doc/lib/module-zlib.html

-

-A zlib binding for TCL written by Andreas Kupries <a.kupries@westend.com> is

-availlable at http://www.oche.de/~akupries/soft/trf/trf_zip.html

-

-An experimental package to read and write files in .zip format, written on top

-of zlib by Gilles Vollant <info@winimage.com>, is available in the

-contrib/minizip directory of zlib.

-

-

-Notes for some targets:

-

-- For Windows DLL versions, please see win32/DLL_FAQ.txt

-

-- For 64-bit Irix, deflate.c must be compiled without any optimization. With

-  -O, one libpng test fails. The test works in 32 bit mode (with the -n32

-  compiler flag). The compiler bug has been reported to SGI.

-

-- zlib doesn't work with gcc 2.6.3 on a DEC 3000/300LX under OSF/1 2.1 it works

-  when compiled with cc.

-

-- On Digital Unix 4.0D (formely OSF/1) on AlphaServer, the cc option -std1 is

-  necessary to get gzprintf working correctly. This is done by configure.

-

-- zlib doesn't work on HP-UX 9.05 with some versions of /bin/cc. It works with

-  other compilers. Use "make test" to check your compiler.

-

-- gzdopen is not supported on RISCOS, BEOS and by some Mac compilers.

-

-- For PalmOs, see http://palmzlib.sourceforge.net/

-

-- When building a shared, i.e. dynamic library on Mac OS X, the library must be

-  installed before testing (do "make install" before "make test"), since the

-  library location is specified in the library.

-

-

-Acknowledgments:

-

-  The deflate format used by zlib was defined by Phil Katz. The deflate

-  and zlib specifications were written by L. Peter Deutsch. Thanks to all the

-  people who reported problems and suggested various improvements in zlib;

-  they are too numerous to cite here.

-

-Copyright notice:

-

- (C) 1995-2004 Jean-loup Gailly and Mark Adler

-

-  This software is provided 'as-is', without any express or implied

-  warranty.  In no event will the authors be held liable for any damages

-  arising from the use of this software.

-

-  Permission is granted to anyone to use this software for any purpose,

-  including commercial applications, and to alter it and redistribute it

-  freely, subject to the following restrictions:

-

-  1. The origin of this software must not be misrepresented; you must not

-     claim that you wrote the original software. If you use this software

-     in a product, an acknowledgment in the product documentation would be

-     appreciated but is not required.

-  2. Altered source versions must be plainly marked as such, and must not be

-     misrepresented as being the original software.

-  3. This notice may not be removed or altered from any source distribution.

-

-  Jean-loup Gailly        Mark Adler

-  jloup@gzip.org          madler@alumni.caltech.edu

-

-If you use the zlib library in a product, we would appreciate *not*

-receiving lengthy legal documents to sign. The sources are provided

-for free but without warranty of any kind.  The library has been

-entirely written by Jean-loup Gailly and Mark Adler; it does not

-include third-party code.

-

-If you redistribute modified sources, we would appreciate that you include

-in the file ChangeLog history information documenting your changes. Please

-read the FAQ for more information on the distribution of modified source

-versions.

+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
+http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format)
+and rfc1952.txt (gzip format). These documents are also available in other
+formats from ftp://ftp.uu.net/graphics/png/documents/zlib/zdoc-index.html
+
+All functions of the compression library are documented in the file zlib.h
+(volunteer to write man pages welcome, contact zlib@gzip.org). A usage example
+of the library is given in the file example.c which also tests that the library
+is working correctly. Another example is given in the file minigzip.c. The
+compression library itself is composed of all source files except example.c and
+minigzip.c.
+
+To compile all files and run the test program, follow the instructions given at
+the top of Makefile. In short "make test; make install" should work for most
+machines. For Unix: "./configure; make test; make install" For MSDOS, use one
+of the special makefiles such as Makefile.msc. For VMS, use Make_vms.com or
+descrip.mms.
+
+Questions about zlib should be sent to <zlib@gzip.org>, or to Gilles Vollant
+<info@winimage.com> for the Windows DLL version. The zlib home page is
+http://www.zlib.org or http://www.gzip.org/zlib/ Before reporting a problem,
+please check this site to verify that you have the latest version of zlib;
+otherwise get the latest version and check whether the problem still exists or
+not.
+
+PLEASE read the zlib FAQ http://www.gzip.org/zlib/zlib_faq.html before asking
+for help.
+
+Mark Nelson <markn@ieee.org> wrote an article about zlib for the Jan. 1997
+issue of  Dr. Dobb's Journal; a copy of the article is available in
+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".
+
+A Java implementation of zlib is available in the Java Development Kit
+http://java.sun.com/j2se/1.4.2/docs/api/java/util/zip/package-summary.html
+See the zlib home page http://www.zlib.org for details.
+
+A Perl interface to zlib written by Paul Marquess <pmqs@cpan.org> is in the
+CPAN (Comprehensive Perl Archive Network) sites
+http://www.cpan.org/modules/by-module/Compress/
+
+A Python interface to zlib written by A.M. Kuchling <amk@amk.ca> is
+available in Python 1.5 and later versions, see
+http://www.python.org/doc/lib/module-zlib.html
+
+A zlib binding for TCL written by Andreas Kupries <a.kupries@westend.com> is
+availlable at http://www.oche.de/~akupries/soft/trf/trf_zip.html
+
+An experimental package to read and write files in .zip format, written on top
+of zlib by Gilles Vollant <info@winimage.com>, is available in the
+contrib/minizip directory of zlib.
+
+
+Notes for some targets:
+
+- For Windows DLL versions, please see win32/DLL_FAQ.txt
+
+- For 64-bit Irix, deflate.c must be compiled without any optimization. With
+  -O, one libpng test fails. The test works in 32 bit mode (with the -n32
+  compiler flag). The compiler bug has been reported to SGI.
+
+- zlib doesn't work with gcc 2.6.3 on a DEC 3000/300LX under OSF/1 2.1 it works
+  when compiled with cc.
+
+- On Digital Unix 4.0D (formely OSF/1) on AlphaServer, the cc option -std1 is
+  necessary to get gzprintf working correctly. This is done by configure.
+
+- zlib doesn't work on HP-UX 9.05 with some versions of /bin/cc. It works with
+  other compilers. Use "make test" to check your compiler.
+
+- gzdopen is not supported on RISCOS, BEOS and by some Mac compilers.
+
+- For PalmOs, see http://palmzlib.sourceforge.net/
+
+- When building a shared, i.e. dynamic library on Mac OS X, the library must be
+  installed before testing (do "make install" before "make test"), since the
+  library location is specified in the library.
+
+
+Acknowledgments:
+
+  The deflate format used by zlib was defined by Phil Katz. The deflate
+  and zlib specifications were written by L. Peter Deutsch. Thanks to all the
+  people who reported problems and suggested various improvements in zlib;
+  they are too numerous to cite here.
+
+Copyright notice:
+
+ (C) 1995-2004 Jean-loup Gailly and Mark Adler
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  Jean-loup Gailly        Mark Adler
+  jloup@gzip.org          madler@alumni.caltech.edu
+
+If you use the zlib library in a product, we would appreciate *not*
+receiving lengthy legal documents to sign. The sources are provided
+for free but without warranty of any kind.  The library has been
+entirely written by Jean-loup Gailly and Mark Adler; it does not
+include third-party code.
+
+If you redistribute modified sources, we would appreciate that you include
+in the file ChangeLog history information documenting your changes. Please
+read the FAQ for more information on the distribution of modified source
+versions.
diff --git a/src/zlib/adler32.c b/src/zlib/adler32.c
index dd6d60f7a..624a1696e 100644
--- a/src/zlib/adler32.c
+++ b/src/zlib/adler32.c
@@ -1,74 +1,74 @@
-/* adler32.c -- compute the Adler-32 checksum of a data stream

- * Copyright (C) 1995-2003 Mark Adler

- * For conditions of distribution and use, see copyright notice in zlib.h

- */

-

-/* @(#) $Id$ */

-

-#define ZLIB_INTERNAL

-#include "zlib.h"

-

-#define BASE 65521UL    /* largest prime smaller than 65536 */

-#define NMAX 5552

-/* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */

-

-#define DO1(buf,i)  {s1 += buf[i]; s2 += s1;}

-#define DO2(buf,i)  DO1(buf,i); DO1(buf,i+1);

-#define DO4(buf,i)  DO2(buf,i); DO2(buf,i+2);

-#define DO8(buf,i)  DO4(buf,i); DO4(buf,i+4);

-#define DO16(buf)   DO8(buf,0); DO8(buf,8);

-

-#ifdef NO_DIVIDE

-#  define MOD(a) \

-    do { \

-        if (a >= (BASE << 16)) a -= (BASE << 16); \

-        if (a >= (BASE << 15)) a -= (BASE << 15); \

-        if (a >= (BASE << 14)) a -= (BASE << 14); \

-        if (a >= (BASE << 13)) a -= (BASE << 13); \

-        if (a >= (BASE << 12)) a -= (BASE << 12); \

-        if (a >= (BASE << 11)) a -= (BASE << 11); \

-        if (a >= (BASE << 10)) a -= (BASE << 10); \

-        if (a >= (BASE << 9)) a -= (BASE << 9); \

-        if (a >= (BASE << 8)) a -= (BASE << 8); \

-        if (a >= (BASE << 7)) a -= (BASE << 7); \

-        if (a >= (BASE << 6)) a -= (BASE << 6); \

-        if (a >= (BASE << 5)) a -= (BASE << 5); \

-        if (a >= (BASE << 4)) a -= (BASE << 4); \

-        if (a >= (BASE << 3)) a -= (BASE << 3); \

-        if (a >= (BASE << 2)) a -= (BASE << 2); \

-        if (a >= (BASE << 1)) a -= (BASE << 1); \

-        if (a >= BASE) a -= BASE; \

-    } while (0)

-#else

-#  define MOD(a) a %= BASE

-#endif

-

-/* ========================================================================= */

-uLong ZEXPORT adler32(adler, buf, len)

-    uLong adler;

-    const Bytef *buf;

-    uInt len;

-{

-    unsigned long s1 = adler & 0xffff;

-    unsigned long s2 = (adler >> 16) & 0xffff;

-    int k;

-

-    if (buf == Z_NULL) return 1L;

-

-    while (len > 0) {

-        k = len < NMAX ? (int)len : NMAX;

-        len -= k;

-        while (k >= 16) {

-            DO16(buf);

-            buf += 16;

-            k -= 16;

-        }

-        if (k != 0) do {

-            s1 += *buf++;

-            s2 += s1;

-        } while (--k);

-        MOD(s1);

-        MOD(s2);

-    }

-    return (s2 << 16) | s1;

-}

+/* adler32.c -- compute the Adler-32 checksum of a data stream
+ * Copyright (C) 1995-2003 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id$ */
+
+#define ZLIB_INTERNAL
+#include "zlib.h"
+
+#define BASE 65521UL    /* largest prime smaller than 65536 */
+#define NMAX 5552
+/* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */
+
+#define DO1(buf,i)  {s1 += buf[i]; s2 += s1;}
+#define DO2(buf,i)  DO1(buf,i); DO1(buf,i+1);
+#define DO4(buf,i)  DO2(buf,i); DO2(buf,i+2);
+#define DO8(buf,i)  DO4(buf,i); DO4(buf,i+4);
+#define DO16(buf)   DO8(buf,0); DO8(buf,8);
+
+#ifdef NO_DIVIDE
+#  define MOD(a) \
+    do { \
+        if (a >= (BASE << 16)) a -= (BASE << 16); \
+        if (a >= (BASE << 15)) a -= (BASE << 15); \
+        if (a >= (BASE << 14)) a -= (BASE << 14); \
+        if (a >= (BASE << 13)) a -= (BASE << 13); \
+        if (a >= (BASE << 12)) a -= (BASE << 12); \
+        if (a >= (BASE << 11)) a -= (BASE << 11); \
+        if (a >= (BASE << 10)) a -= (BASE << 10); \
+        if (a >= (BASE << 9)) a -= (BASE << 9); \
+        if (a >= (BASE << 8)) a -= (BASE << 8); \
+        if (a >= (BASE << 7)) a -= (BASE << 7); \
+        if (a >= (BASE << 6)) a -= (BASE << 6); \
+        if (a >= (BASE << 5)) a -= (BASE << 5); \
+        if (a >= (BASE << 4)) a -= (BASE << 4); \
+        if (a >= (BASE << 3)) a -= (BASE << 3); \
+        if (a >= (BASE << 2)) a -= (BASE << 2); \
+        if (a >= (BASE << 1)) a -= (BASE << 1); \
+        if (a >= BASE) a -= BASE; \
+    } while (0)
+#else
+#  define MOD(a) a %= BASE
+#endif
+
+/* ========================================================================= */
+uLong ZEXPORT adler32(adler, buf, len)
+    uLong adler;
+    const Bytef *buf;
+    uInt len;
+{
+    unsigned long s1 = adler & 0xffff;
+    unsigned long s2 = (adler >> 16) & 0xffff;
+    int k;
+
+    if (buf == Z_NULL) return 1L;
+
+    while (len > 0) {
+        k = len < NMAX ? (int)len : NMAX;
+        len -= k;
+        while (k >= 16) {
+            DO16(buf);
+            buf += 16;
+            k -= 16;
+        }
+        if (k != 0) do {
+            s1 += *buf++;
+            s2 += s1;
+        } while (--k);
+        MOD(s1);
+        MOD(s2);
+    }
+    return (s2 << 16) | s1;
+}
diff --git a/src/zlib/compress.c b/src/zlib/compress.c
index 5a7eeeeb2..24ef02919 100644
--- a/src/zlib/compress.c
+++ b/src/zlib/compress.c
@@ -1,79 +1,79 @@
-/* compress.c -- compress a memory buffer

- * Copyright (C) 1995-2002 Jean-loup Gailly.

- * For conditions of distribution and use, see copyright notice in zlib.h

- */

-

-/* @(#) $Id$ */

-

-#define ZLIB_INTERNAL

-#include "zlib.h"

-

-/* ===========================================================================

-     Compresses the source buffer into the destination buffer. The level

-   parameter has the same meaning as in deflateInit.  sourceLen is the byte

-   length of the source buffer. Upon entry, destLen is the total size of the

-   destination buffer, which must be at least 0.1% larger than sourceLen plus

-   12 bytes. Upon exit, destLen is the actual size of the compressed buffer.

-

-     compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough

-   memory, Z_BUF_ERROR if there was not enough room in the output buffer,

-   Z_STREAM_ERROR if the level parameter is invalid.

-*/

-int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)

-    Bytef *dest;

-    uLongf *destLen;

-    const Bytef *source;

-    uLong sourceLen;

-    int level;

-{

-    z_stream stream;

-    int err;

-

-    stream.next_in = (Bytef*)source;

-    stream.avail_in = (uInt)sourceLen;

-#ifdef MAXSEG_64K

-    /* Check for source > 64K on 16-bit machine: */

-    if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;

-#endif

-    stream.next_out = dest;

-    stream.avail_out = (uInt)*destLen;

-    if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR;

-

-    stream.zalloc = (alloc_func)0;

-    stream.zfree = (free_func)0;

-    stream.opaque = (voidpf)0;

-

-    err = deflateInit(&stream, level);

-    if (err != Z_OK) return err;

-

-    err = deflate(&stream, Z_FINISH);

-    if (err != Z_STREAM_END) {

-        deflateEnd(&stream);

-        return err == Z_OK ? Z_BUF_ERROR : err;

-    }

-    *destLen = stream.total_out;

-

-    err = deflateEnd(&stream);

-    return err;

-}

-

-/* ===========================================================================

- */

-int ZEXPORT compress (dest, destLen, source, sourceLen)

-    Bytef *dest;

-    uLongf *destLen;

-    const Bytef *source;

-    uLong sourceLen;

-{

-    return compress2(dest, destLen, source, sourceLen, Z_DEFAULT_COMPRESSION);

-}

-

-/* ===========================================================================

-     If the default memLevel or windowBits for deflateInit() is changed, then

-   this function needs to be updated.

- */

-uLong ZEXPORT compressBound (sourceLen)

-    uLong sourceLen;

-{

-    return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) + 11;

-}

+/* compress.c -- compress a memory buffer
+ * Copyright (C) 1995-2002 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id$ */
+
+#define ZLIB_INTERNAL
+#include "zlib.h"
+
+/* ===========================================================================
+     Compresses the source buffer into the destination buffer. The level
+   parameter has the same meaning as in deflateInit.  sourceLen is the byte
+   length of the source buffer. Upon entry, destLen is the total size of the
+   destination buffer, which must be at least 0.1% larger than sourceLen plus
+   12 bytes. Upon exit, destLen is the actual size of the compressed buffer.
+
+     compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_BUF_ERROR if there was not enough room in the output buffer,
+   Z_STREAM_ERROR if the level parameter is invalid.
+*/
+int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)
+    Bytef *dest;
+    uLongf *destLen;
+    const Bytef *source;
+    uLong sourceLen;
+    int level;
+{
+    z_stream stream;
+    int err;
+
+    stream.next_in = (Bytef*)source;
+    stream.avail_in = (uInt)sourceLen;
+#ifdef MAXSEG_64K
+    /* Check for source > 64K on 16-bit machine: */
+    if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;
+#endif
+    stream.next_out = dest;
+    stream.avail_out = (uInt)*destLen;
+    if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR;
+
+    stream.zalloc = (alloc_func)0;
+    stream.zfree = (free_func)0;
+    stream.opaque = (voidpf)0;
+
+    err = deflateInit(&stream, level);
+    if (err != Z_OK) return err;
+
+    err = deflate(&stream, Z_FINISH);
+    if (err != Z_STREAM_END) {
+        deflateEnd(&stream);
+        return err == Z_OK ? Z_BUF_ERROR : err;
+    }
+    *destLen = stream.total_out;
+
+    err = deflateEnd(&stream);
+    return err;
+}
+
+/* ===========================================================================
+ */
+int ZEXPORT compress (dest, destLen, source, sourceLen)
+    Bytef *dest;
+    uLongf *destLen;
+    const Bytef *source;
+    uLong sourceLen;
+{
+    return compress2(dest, destLen, source, sourceLen, Z_DEFAULT_COMPRESSION);
+}
+
+/* ===========================================================================
+     If the default memLevel or windowBits for deflateInit() is changed, then
+   this function needs to be updated.
+ */
+uLong ZEXPORT compressBound (sourceLen)
+    uLong sourceLen;
+{
+    return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) + 11;
+}
diff --git a/src/zlib/crc32.c b/src/zlib/crc32.c
index 7373092ee..b39c7e125 100644
--- a/src/zlib/crc32.c
+++ b/src/zlib/crc32.c
@@ -1,333 +1,333 @@
-/* crc32.c -- compute the CRC-32 of a data stream

- * Copyright (C) 1995-2003 Mark Adler

- * For conditions of distribution and use, see copyright notice in zlib.h

- *

- * Thanks to Rodney Brown <rbrown64@csc.com.au> for his contribution of faster

- * CRC methods: exclusive-oring 32 bits of data at a time, and pre-computing

- * tables for updating the shift register in one step with three exclusive-ors

- * instead of four steps with four exclusive-ors.  This results about a factor

- * of two increase in speed on a Power PC G4 (PPC7455) using gcc -O3.

- */

-

-/* @(#) $Id$ */

-

-/*

-  Note on the use of DYNAMIC_CRC_TABLE: there is no mutex or semaphore

-  protection on the static variables used to control the first-use generation

-  of the crc tables.  Therefore, if you #define DYNAMIC_CRC_TABLE, you should

-  first call get_crc_table() to initialize the tables before allowing more than

-  one thread to use crc32().

- */

-

-#ifdef MAKECRCH

-#  include <stdio.h>

-#  ifndef DYNAMIC_CRC_TABLE

-#    define DYNAMIC_CRC_TABLE

-#  endif /* !DYNAMIC_CRC_TABLE */

-#endif /* MAKECRCH */

-

-#include "zutil.h"      /* for STDC and FAR definitions */

-

-#define local static

-

-/* Find a four-byte integer type for crc32_little() and crc32_big(). */

-#ifndef NOBYFOUR

-#  ifdef STDC           /* need ANSI C limits.h to determine sizes */

-#    include <limits.h>

-#    define BYFOUR

-#    if (UINT_MAX == 0xffffffffUL)

-       typedef unsigned int u4;

-#    else

-#      if (ULONG_MAX == 0xffffffffUL)

-         typedef unsigned long u4;

-#      else

-#        if (USHRT_MAX == 0xffffffffUL)

-           typedef unsigned short u4;

-#        else

-#          undef BYFOUR     /* can't find a four-byte integer type! */

-#        endif

-#      endif

-#    endif

-#  endif /* STDC */

-#endif /* !NOBYFOUR */

-

-/* Definitions for doing the crc four data bytes at a time. */

-#ifdef BYFOUR

-#  define REV(w) (((w)>>24)+(((w)>>8)&0xff00)+ \

-                (((w)&0xff00)<<8)+(((w)&0xff)<<24))

-   local unsigned long crc32_little OF((unsigned long,

-                        const unsigned char FAR *, unsigned));

-   local unsigned long crc32_big OF((unsigned long,

-                        const unsigned char FAR *, unsigned));

-#  define TBLS 8

-#else

-#  define TBLS 1

-#endif /* BYFOUR */

-

-#ifdef DYNAMIC_CRC_TABLE

-

-local volatile int crc_table_empty = 1;

-local unsigned long FAR crc_table[TBLS][256];

-local void make_crc_table OF((void));

-#ifdef MAKECRCH

-   local void write_table OF((FILE *, const unsigned long FAR *));

-#endif /* MAKECRCH */

-

-/*

-  Generate tables for a byte-wise 32-bit CRC calculation on the polynomial:

-  x^32+x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x+1.

-

-  Polynomials over GF(2) are represented in binary, one bit per coefficient,

-  with the lowest powers in the most significant bit.  Then adding polynomials

-  is just exclusive-or, and multiplying a polynomial by x is a right shift by

-  one.  If we call the above polynomial p, and represent a byte as the

-  polynomial q, also with the lowest power in the most significant bit (so the

-  byte 0xb1 is the polynomial x^7+x^3+x+1), then the CRC is (q*x^32) mod p,

-  where a mod b means the remainder after dividing a by b.

-

-  This calculation is done using the shift-register method of multiplying and

-  taking the remainder.  The register is initialized to zero, and for each

-  incoming bit, x^32 is added mod p to the register if the bit is a one (where

-  x^32 mod p is p+x^32 = x^26+...+1), and the register is multiplied mod p by

-  x (which is shifting right by one and adding x^32 mod p if the bit shifted

-  out is a one).  We start with the highest power (least significant bit) of

-  q and repeat for all eight bits of q.

-

-  The first table is simply the CRC of all possible eight bit values.  This is

-  all the information needed to generate CRCs on data a byte at a time for all

-  combinations of CRC register values and incoming bytes.  The remaining tables

-  allow for word-at-a-time CRC calculation for both big-endian and little-

-  endian machines, where a word is four bytes.

-*/

-local void make_crc_table()

-{

-    unsigned long c;

-    int n, k;

-    unsigned long poly;                 /* polynomial exclusive-or pattern */

-    /* terms of polynomial defining this crc (except x^32): */

-    static volatile int first = 1;      /* flag to limit concurrent making */

-    static const unsigned char p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26};

-

-    /* See if another task is already doing this (not thread-safe, but better

-       than nothing -- significantly reduces duration of vulnerability in

-       case the advice about DYNAMIC_CRC_TABLE is ignored) */

-    if (first) {

-        first = 0;

-

-        /* make exclusive-or pattern from polynomial (0xedb88320UL) */

-        poly = 0UL;

-        for (n = 0; n < sizeof(p)/sizeof(unsigned char); n++)

-            poly |= 1UL << (31 - p[n]);

-

-        /* generate a crc for every 8-bit value */

-        for (n = 0; n < 256; n++) {

-            c = (unsigned long)n;

-            for (k = 0; k < 8; k++)

-                c = c & 1 ? poly ^ (c >> 1) : c >> 1;

-            crc_table[0][n] = c;

-        }

-

-#ifdef BYFOUR

-        /* generate crc for each value followed by one, two, and three zeros,

-           and then the byte reversal of those as well as the first table */

-        for (n = 0; n < 256; n++) {

-            c = crc_table[0][n];

-            crc_table[4][n] = REV(c);

-            for (k = 1; k < 4; k++) {

-                c = crc_table[0][c & 0xff] ^ (c >> 8);

-                crc_table[k][n] = c;

-                crc_table[k + 4][n] = REV(c);

-            }

-        }

-#endif /* BYFOUR */

-

-        crc_table_empty = 0;

-    }

-    else {      /* not first */

-        /* wait for the other guy to finish (not efficient, but rare) */

-        while (crc_table_empty)

-            ;

-    }

-

-#ifdef MAKECRCH

-    /* write out CRC tables to crc32.h */

-    {

-        FILE *out;

-

-        out = fopen("crc32.h", "w");

-        if (out == NULL) return;

-        fprintf(out, "/* crc32.h -- tables for rapid CRC calculation\n");

-        fprintf(out, " * Generated automatically by crc32.c\n */\n\n");

-        fprintf(out, "local const unsigned long FAR ");

-        fprintf(out, "crc_table[TBLS][256] =\n{\n  {\n");

-        write_table(out, crc_table[0]);

-#  ifdef BYFOUR

-        fprintf(out, "#ifdef BYFOUR\n");

-        for (k = 1; k < 8; k++) {

-            fprintf(out, "  },\n  {\n");

-            write_table(out, crc_table[k]);

-        }

-        fprintf(out, "#endif\n");

-#  endif /* BYFOUR */

-        fprintf(out, "  }\n};\n");

-        fclose(out);

-    }

-#endif /* MAKECRCH */

-}

-

-#ifdef MAKECRCH

-local void write_table(out, table)

-    FILE *out;

-    const unsigned long FAR *table;

-{

-    int n;

-

-    for (n = 0; n < 256; n++)

-        fprintf(out, "%s0x%08lxUL%s", n % 5 ? "" : "    ", table[n],

-                n == 255 ? "\n" : (n % 5 == 4 ? ",\n" : ", "));

-}

-#endif /* MAKECRCH */

-

-#else /* !DYNAMIC_CRC_TABLE */

-/* ========================================================================

- * Tables of CRC-32s of all single-byte values, made by make_crc_table().

- */

-#include "crc32.h"

-#endif /* DYNAMIC_CRC_TABLE */

-

-/* =========================================================================

- * This function can be used by asm versions of crc32()

- */

-const unsigned long FAR * ZEXPORT get_crc_table()

-{

-#ifdef DYNAMIC_CRC_TABLE

-    if (crc_table_empty)

-        make_crc_table();

-#endif /* DYNAMIC_CRC_TABLE */

-    return (const unsigned long FAR *)crc_table;

-}

-

-/* ========================================================================= */

-#define DO1 crc = crc_table[0][((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8)

-#define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1

-

-/* ========================================================================= */

-unsigned long ZEXPORT crc32(crc, buf, len)

-    unsigned long crc;

-    const unsigned char FAR *buf;

-    unsigned len;

-{

-    if (buf == Z_NULL) return 0UL;

-

-#ifdef DYNAMIC_CRC_TABLE

-    if (crc_table_empty)

-        make_crc_table();

-#endif /* DYNAMIC_CRC_TABLE */

-

-#ifdef BYFOUR

-    if (sizeof(void *) == sizeof(ptrdiff_t)) {

-        u4 endian;

-

-        endian = 1;

-        if (*((unsigned char *)(&endian)))

-            return crc32_little(crc, buf, len);

-        else

-            return crc32_big(crc, buf, len);

-    }

-#endif /* BYFOUR */

-    crc = crc ^ 0xffffffffUL;

-    while (len >= 8) {

-        DO8;

-        len -= 8;

-    }

-    if (len) do {

-        DO1;

-    } while (--len);

-    return crc ^ 0xffffffffUL;

-}

-

-#ifdef BYFOUR

-

-/* ========================================================================= */

-#define DOLIT4 c ^= *buf4++; \

-        c = crc_table[3][c & 0xff] ^ crc_table[2][(c >> 8) & 0xff] ^ \

-            crc_table[1][(c >> 16) & 0xff] ^ crc_table[0][c >> 24]

-#define DOLIT32 DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4

-

-/* ========================================================================= */

-local unsigned long crc32_little(crc, buf, len)

-    unsigned long crc;

-    const unsigned char FAR *buf;

-    unsigned len;

-{

-    register u4 c;

-    register const u4 FAR *buf4;

-

-    c = (u4)crc;

-    c = ~c;

-    while (len && ((ptrdiff_t)buf & 3)) {

-        c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);

-        len--;

-    }

-

-    buf4 = (const u4 FAR *)buf;

-    while (len >= 32) {

-        DOLIT32;

-        len -= 32;

-    }

-    while (len >= 4) {

-        DOLIT4;

-        len -= 4;

-    }

-    buf = (const unsigned char FAR *)buf4;

-

-    if (len) do {

-        c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);

-    } while (--len);

-    c = ~c;

-    return (unsigned long)c;

-}

-

-/* ========================================================================= */

-#define DOBIG4 c ^= *++buf4; \

-        c = crc_table[4][c & 0xff] ^ crc_table[5][(c >> 8) & 0xff] ^ \

-            crc_table[6][(c >> 16) & 0xff] ^ crc_table[7][c >> 24]

-#define DOBIG32 DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4

-

-/* ========================================================================= */

-local unsigned long crc32_big(crc, buf, len)

-    unsigned long crc;

-    const unsigned char FAR *buf;

-    unsigned len;

-{

-    register u4 c;

-    register const u4 FAR *buf4;

-

-    c = REV((u4)crc);

-    c = ~c;

-    while (len && ((ptrdiff_t)buf & 3)) {

-        c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);

-        len--;

-    }

-

-    buf4 = (const u4 FAR *)buf;

-    buf4--;

-    while (len >= 32) {

-        DOBIG32;

-        len -= 32;

-    }

-    while (len >= 4) {

-        DOBIG4;

-        len -= 4;

-    }

-    buf4++;

-    buf = (const unsigned char FAR *)buf4;

-

-    if (len) do {

-        c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);

-    } while (--len);

-    c = ~c;

-    return (unsigned long)(REV(c));

-}

-

-#endif /* BYFOUR */

+/* crc32.c -- compute the CRC-32 of a data stream
+ * Copyright (C) 1995-2003 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ *
+ * Thanks to Rodney Brown <rbrown64@csc.com.au> for his contribution of faster
+ * CRC methods: exclusive-oring 32 bits of data at a time, and pre-computing
+ * tables for updating the shift register in one step with three exclusive-ors
+ * instead of four steps with four exclusive-ors.  This results about a factor
+ * of two increase in speed on a Power PC G4 (PPC7455) using gcc -O3.
+ */
+
+/* @(#) $Id$ */
+
+/*
+  Note on the use of DYNAMIC_CRC_TABLE: there is no mutex or semaphore
+  protection on the static variables used to control the first-use generation
+  of the crc tables.  Therefore, if you #define DYNAMIC_CRC_TABLE, you should
+  first call get_crc_table() to initialize the tables before allowing more than
+  one thread to use crc32().
+ */
+
+#ifdef MAKECRCH
+#  include <stdio.h>
+#  ifndef DYNAMIC_CRC_TABLE
+#    define DYNAMIC_CRC_TABLE
+#  endif /* !DYNAMIC_CRC_TABLE */
+#endif /* MAKECRCH */
+
+#include "zutil.h"      /* for STDC and FAR definitions */
+
+#define local static
+
+/* Find a four-byte integer type for crc32_little() and crc32_big(). */
+#ifndef NOBYFOUR
+#  ifdef STDC           /* need ANSI C limits.h to determine sizes */
+#    include <limits.h>
+#    define BYFOUR
+#    if (UINT_MAX == 0xffffffffUL)
+       typedef unsigned int u4;
+#    else
+#      if (ULONG_MAX == 0xffffffffUL)
+         typedef unsigned long u4;
+#      else
+#        if (USHRT_MAX == 0xffffffffUL)
+           typedef unsigned short u4;
+#        else
+#          undef BYFOUR     /* can't find a four-byte integer type! */
+#        endif
+#      endif
+#    endif
+#  endif /* STDC */
+#endif /* !NOBYFOUR */
+
+/* Definitions for doing the crc four data bytes at a time. */
+#ifdef BYFOUR
+#  define REV(w) (((w)>>24)+(((w)>>8)&0xff00)+ \
+                (((w)&0xff00)<<8)+(((w)&0xff)<<24))
+   local unsigned long crc32_little OF((unsigned long,
+                        const unsigned char FAR *, unsigned));
+   local unsigned long crc32_big OF((unsigned long,
+                        const unsigned char FAR *, unsigned));
+#  define TBLS 8
+#else
+#  define TBLS 1
+#endif /* BYFOUR */
+
+#ifdef DYNAMIC_CRC_TABLE
+
+local volatile int crc_table_empty = 1;
+local unsigned long FAR crc_table[TBLS][256];
+local void make_crc_table OF((void));
+#ifdef MAKECRCH
+   local void write_table OF((FILE *, const unsigned long FAR *));
+#endif /* MAKECRCH */
+
+/*
+  Generate tables for a byte-wise 32-bit CRC calculation on the polynomial:
+  x^32+x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x+1.
+
+  Polynomials over GF(2) are represented in binary, one bit per coefficient,
+  with the lowest powers in the most significant bit.  Then adding polynomials
+  is just exclusive-or, and multiplying a polynomial by x is a right shift by
+  one.  If we call the above polynomial p, and represent a byte as the
+  polynomial q, also with the lowest power in the most significant bit (so the
+  byte 0xb1 is the polynomial x^7+x^3+x+1), then the CRC is (q*x^32) mod p,
+  where a mod b means the remainder after dividing a by b.
+
+  This calculation is done using the shift-register method of multiplying and
+  taking the remainder.  The register is initialized to zero, and for each
+  incoming bit, x^32 is added mod p to the register if the bit is a one (where
+  x^32 mod p is p+x^32 = x^26+...+1), and the register is multiplied mod p by
+  x (which is shifting right by one and adding x^32 mod p if the bit shifted
+  out is a one).  We start with the highest power (least significant bit) of
+  q and repeat for all eight bits of q.
+
+  The first table is simply the CRC of all possible eight bit values.  This is
+  all the information needed to generate CRCs on data a byte at a time for all
+  combinations of CRC register values and incoming bytes.  The remaining tables
+  allow for word-at-a-time CRC calculation for both big-endian and little-
+  endian machines, where a word is four bytes.
+*/
+local void make_crc_table()
+{
+    unsigned long c;
+    int n, k;
+    unsigned long poly;                 /* polynomial exclusive-or pattern */
+    /* terms of polynomial defining this crc (except x^32): */
+    static volatile int first = 1;      /* flag to limit concurrent making */
+    static const unsigned char p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26};
+
+    /* See if another task is already doing this (not thread-safe, but better
+       than nothing -- significantly reduces duration of vulnerability in
+       case the advice about DYNAMIC_CRC_TABLE is ignored) */
+    if (first) {
+        first = 0;
+
+        /* make exclusive-or pattern from polynomial (0xedb88320UL) */
+        poly = 0UL;
+        for (n = 0; n < sizeof(p)/sizeof(unsigned char); n++)
+            poly |= 1UL << (31 - p[n]);
+
+        /* generate a crc for every 8-bit value */
+        for (n = 0; n < 256; n++) {
+            c = (unsigned long)n;
+            for (k = 0; k < 8; k++)
+                c = c & 1 ? poly ^ (c >> 1) : c >> 1;
+            crc_table[0][n] = c;
+        }
+
+#ifdef BYFOUR
+        /* generate crc for each value followed by one, two, and three zeros,
+           and then the byte reversal of those as well as the first table */
+        for (n = 0; n < 256; n++) {
+            c = crc_table[0][n];
+            crc_table[4][n] = REV(c);
+            for (k = 1; k < 4; k++) {
+                c = crc_table[0][c & 0xff] ^ (c >> 8);
+                crc_table[k][n] = c;
+                crc_table[k + 4][n] = REV(c);
+            }
+        }
+#endif /* BYFOUR */
+
+        crc_table_empty = 0;
+    }
+    else {      /* not first */
+        /* wait for the other guy to finish (not efficient, but rare) */
+        while (crc_table_empty)
+            ;
+    }
+
+#ifdef MAKECRCH
+    /* write out CRC tables to crc32.h */
+    {
+        FILE *out;
+
+        out = fopen("crc32.h", "w");
+        if (out == NULL) return;
+        fprintf(out, "/* crc32.h -- tables for rapid CRC calculation\n");
+        fprintf(out, " * Generated automatically by crc32.c\n */\n\n");
+        fprintf(out, "local const unsigned long FAR ");
+        fprintf(out, "crc_table[TBLS][256] =\n{\n  {\n");
+        write_table(out, crc_table[0]);
+#  ifdef BYFOUR
+        fprintf(out, "#ifdef BYFOUR\n");
+        for (k = 1; k < 8; k++) {
+            fprintf(out, "  },\n  {\n");
+            write_table(out, crc_table[k]);
+        }
+        fprintf(out, "#endif\n");
+#  endif /* BYFOUR */
+        fprintf(out, "  }\n};\n");
+        fclose(out);
+    }
+#endif /* MAKECRCH */
+}
+
+#ifdef MAKECRCH
+local void write_table(out, table)
+    FILE *out;
+    const unsigned long FAR *table;
+{
+    int n;
+
+    for (n = 0; n < 256; n++)
+        fprintf(out, "%s0x%08lxUL%s", n % 5 ? "" : "    ", table[n],
+                n == 255 ? "\n" : (n % 5 == 4 ? ",\n" : ", "));
+}
+#endif /* MAKECRCH */
+
+#else /* !DYNAMIC_CRC_TABLE */
+/* ========================================================================
+ * Tables of CRC-32s of all single-byte values, made by make_crc_table().
+ */
+#include "crc32.h"
+#endif /* DYNAMIC_CRC_TABLE */
+
+/* =========================================================================
+ * This function can be used by asm versions of crc32()
+ */
+const unsigned long FAR * ZEXPORT get_crc_table()
+{
+#ifdef DYNAMIC_CRC_TABLE
+    if (crc_table_empty)
+        make_crc_table();
+#endif /* DYNAMIC_CRC_TABLE */
+    return (const unsigned long FAR *)crc_table;
+}
+
+/* ========================================================================= */
+#define DO1 crc = crc_table[0][((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8)
+#define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1
+
+/* ========================================================================= */
+unsigned long ZEXPORT crc32(crc, buf, len)
+    unsigned long crc;
+    const unsigned char FAR *buf;
+    unsigned len;
+{
+    if (buf == Z_NULL) return 0UL;
+
+#ifdef DYNAMIC_CRC_TABLE
+    if (crc_table_empty)
+        make_crc_table();
+#endif /* DYNAMIC_CRC_TABLE */
+
+#ifdef BYFOUR
+    if (sizeof(void *) == sizeof(ptrdiff_t)) {
+        u4 endian;
+
+        endian = 1;
+        if (*((unsigned char *)(&endian)))
+            return crc32_little(crc, buf, len);
+        else
+            return crc32_big(crc, buf, len);
+    }
+#endif /* BYFOUR */
+    crc = crc ^ 0xffffffffUL;
+    while (len >= 8) {
+        DO8;
+        len -= 8;
+    }
+    if (len) do {
+        DO1;
+    } while (--len);
+    return crc ^ 0xffffffffUL;
+}
+
+#ifdef BYFOUR
+
+/* ========================================================================= */
+#define DOLIT4 c ^= *buf4++; \
+        c = crc_table[3][c & 0xff] ^ crc_table[2][(c >> 8) & 0xff] ^ \
+            crc_table[1][(c >> 16) & 0xff] ^ crc_table[0][c >> 24]
+#define DOLIT32 DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4
+
+/* ========================================================================= */
+local unsigned long crc32_little(crc, buf, len)
+    unsigned long crc;
+    const unsigned char FAR *buf;
+    unsigned len;
+{
+    register u4 c;
+    register const u4 FAR *buf4;
+
+    c = (u4)crc;
+    c = ~c;
+    while (len && ((ptrdiff_t)buf & 3)) {
+        c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);
+        len--;
+    }
+
+    buf4 = (const u4 FAR *)buf;
+    while (len >= 32) {
+        DOLIT32;
+        len -= 32;
+    }
+    while (len >= 4) {
+        DOLIT4;
+        len -= 4;
+    }
+    buf = (const unsigned char FAR *)buf4;
+
+    if (len) do {
+        c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);
+    } while (--len);
+    c = ~c;
+    return (unsigned long)c;
+}
+
+/* ========================================================================= */
+#define DOBIG4 c ^= *++buf4; \
+        c = crc_table[4][c & 0xff] ^ crc_table[5][(c >> 8) & 0xff] ^ \
+            crc_table[6][(c >> 16) & 0xff] ^ crc_table[7][c >> 24]
+#define DOBIG32 DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4
+
+/* ========================================================================= */
+local unsigned long crc32_big(crc, buf, len)
+    unsigned long crc;
+    const unsigned char FAR *buf;
+    unsigned len;
+{
+    register u4 c;
+    register const u4 FAR *buf4;
+
+    c = REV((u4)crc);
+    c = ~c;
+    while (len && ((ptrdiff_t)buf & 3)) {
+        c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
+        len--;
+    }
+
+    buf4 = (const u4 FAR *)buf;
+    buf4--;
+    while (len >= 32) {
+        DOBIG32;
+        len -= 32;
+    }
+    while (len >= 4) {
+        DOBIG4;
+        len -= 4;
+    }
+    buf4++;
+    buf = (const unsigned char FAR *)buf4;
+
+    if (len) do {
+        c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
+    } while (--len);
+    c = ~c;
+    return (unsigned long)(REV(c));
+}
+
+#endif /* BYFOUR */
diff --git a/src/zlib/crc32.h b/src/zlib/crc32.h
index 5de49bc97..8053b6117 100644
--- a/src/zlib/crc32.h
+++ b/src/zlib/crc32.h
@@ -1,441 +1,441 @@
-/* crc32.h -- tables for rapid CRC calculation

- * Generated automatically by crc32.c

- */

-

-local const unsigned long FAR crc_table[TBLS][256] =

-{

-  {

-    0x00000000UL, 0x77073096UL, 0xee0e612cUL, 0x990951baUL, 0x076dc419UL,

-    0x706af48fUL, 0xe963a535UL, 0x9e6495a3UL, 0x0edb8832UL, 0x79dcb8a4UL,

-    0xe0d5e91eUL, 0x97d2d988UL, 0x09b64c2bUL, 0x7eb17cbdUL, 0xe7b82d07UL,

-    0x90bf1d91UL, 0x1db71064UL, 0x6ab020f2UL, 0xf3b97148UL, 0x84be41deUL,

-    0x1adad47dUL, 0x6ddde4ebUL, 0xf4d4b551UL, 0x83d385c7UL, 0x136c9856UL,

-    0x646ba8c0UL, 0xfd62f97aUL, 0x8a65c9ecUL, 0x14015c4fUL, 0x63066cd9UL,

-    0xfa0f3d63UL, 0x8d080df5UL, 0x3b6e20c8UL, 0x4c69105eUL, 0xd56041e4UL,

-    0xa2677172UL, 0x3c03e4d1UL, 0x4b04d447UL, 0xd20d85fdUL, 0xa50ab56bUL,

-    0x35b5a8faUL, 0x42b2986cUL, 0xdbbbc9d6UL, 0xacbcf940UL, 0x32d86ce3UL,

-    0x45df5c75UL, 0xdcd60dcfUL, 0xabd13d59UL, 0x26d930acUL, 0x51de003aUL,

-    0xc8d75180UL, 0xbfd06116UL, 0x21b4f4b5UL, 0x56b3c423UL, 0xcfba9599UL,

-    0xb8bda50fUL, 0x2802b89eUL, 0x5f058808UL, 0xc60cd9b2UL, 0xb10be924UL,

-    0x2f6f7c87UL, 0x58684c11UL, 0xc1611dabUL, 0xb6662d3dUL, 0x76dc4190UL,

-    0x01db7106UL, 0x98d220bcUL, 0xefd5102aUL, 0x71b18589UL, 0x06b6b51fUL,

-    0x9fbfe4a5UL, 0xe8b8d433UL, 0x7807c9a2UL, 0x0f00f934UL, 0x9609a88eUL,

-    0xe10e9818UL, 0x7f6a0dbbUL, 0x086d3d2dUL, 0x91646c97UL, 0xe6635c01UL,

-    0x6b6b51f4UL, 0x1c6c6162UL, 0x856530d8UL, 0xf262004eUL, 0x6c0695edUL,

-    0x1b01a57bUL, 0x8208f4c1UL, 0xf50fc457UL, 0x65b0d9c6UL, 0x12b7e950UL,

-    0x8bbeb8eaUL, 0xfcb9887cUL, 0x62dd1ddfUL, 0x15da2d49UL, 0x8cd37cf3UL,

-    0xfbd44c65UL, 0x4db26158UL, 0x3ab551ceUL, 0xa3bc0074UL, 0xd4bb30e2UL,

-    0x4adfa541UL, 0x3dd895d7UL, 0xa4d1c46dUL, 0xd3d6f4fbUL, 0x4369e96aUL,

-    0x346ed9fcUL, 0xad678846UL, 0xda60b8d0UL, 0x44042d73UL, 0x33031de5UL,

-    0xaa0a4c5fUL, 0xdd0d7cc9UL, 0x5005713cUL, 0x270241aaUL, 0xbe0b1010UL,

-    0xc90c2086UL, 0x5768b525UL, 0x206f85b3UL, 0xb966d409UL, 0xce61e49fUL,

-    0x5edef90eUL, 0x29d9c998UL, 0xb0d09822UL, 0xc7d7a8b4UL, 0x59b33d17UL,

-    0x2eb40d81UL, 0xb7bd5c3bUL, 0xc0ba6cadUL, 0xedb88320UL, 0x9abfb3b6UL,

-    0x03b6e20cUL, 0x74b1d29aUL, 0xead54739UL, 0x9dd277afUL, 0x04db2615UL,

-    0x73dc1683UL, 0xe3630b12UL, 0x94643b84UL, 0x0d6d6a3eUL, 0x7a6a5aa8UL,

-    0xe40ecf0bUL, 0x9309ff9dUL, 0x0a00ae27UL, 0x7d079eb1UL, 0xf00f9344UL,

-    0x8708a3d2UL, 0x1e01f268UL, 0x6906c2feUL, 0xf762575dUL, 0x806567cbUL,

-    0x196c3671UL, 0x6e6b06e7UL, 0xfed41b76UL, 0x89d32be0UL, 0x10da7a5aUL,

-    0x67dd4accUL, 0xf9b9df6fUL, 0x8ebeeff9UL, 0x17b7be43UL, 0x60b08ed5UL,

-    0xd6d6a3e8UL, 0xa1d1937eUL, 0x38d8c2c4UL, 0x4fdff252UL, 0xd1bb67f1UL,

-    0xa6bc5767UL, 0x3fb506ddUL, 0x48b2364bUL, 0xd80d2bdaUL, 0xaf0a1b4cUL,

-    0x36034af6UL, 0x41047a60UL, 0xdf60efc3UL, 0xa867df55UL, 0x316e8eefUL,

-    0x4669be79UL, 0xcb61b38cUL, 0xbc66831aUL, 0x256fd2a0UL, 0x5268e236UL,

-    0xcc0c7795UL, 0xbb0b4703UL, 0x220216b9UL, 0x5505262fUL, 0xc5ba3bbeUL,

-    0xb2bd0b28UL, 0x2bb45a92UL, 0x5cb36a04UL, 0xc2d7ffa7UL, 0xb5d0cf31UL,

-    0x2cd99e8bUL, 0x5bdeae1dUL, 0x9b64c2b0UL, 0xec63f226UL, 0x756aa39cUL,

-    0x026d930aUL, 0x9c0906a9UL, 0xeb0e363fUL, 0x72076785UL, 0x05005713UL,

-    0x95bf4a82UL, 0xe2b87a14UL, 0x7bb12baeUL, 0x0cb61b38UL, 0x92d28e9bUL,

-    0xe5d5be0dUL, 0x7cdcefb7UL, 0x0bdbdf21UL, 0x86d3d2d4UL, 0xf1d4e242UL,

-    0x68ddb3f8UL, 0x1fda836eUL, 0x81be16cdUL, 0xf6b9265bUL, 0x6fb077e1UL,

-    0x18b74777UL, 0x88085ae6UL, 0xff0f6a70UL, 0x66063bcaUL, 0x11010b5cUL,

-    0x8f659effUL, 0xf862ae69UL, 0x616bffd3UL, 0x166ccf45UL, 0xa00ae278UL,

-    0xd70dd2eeUL, 0x4e048354UL, 0x3903b3c2UL, 0xa7672661UL, 0xd06016f7UL,

-    0x4969474dUL, 0x3e6e77dbUL, 0xaed16a4aUL, 0xd9d65adcUL, 0x40df0b66UL,

-    0x37d83bf0UL, 0xa9bcae53UL, 0xdebb9ec5UL, 0x47b2cf7fUL, 0x30b5ffe9UL,

-    0xbdbdf21cUL, 0xcabac28aUL, 0x53b39330UL, 0x24b4a3a6UL, 0xbad03605UL,

-    0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL,

-    0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL,

-    0x2d02ef8dUL

-#ifdef BYFOUR

-  },

-  {

-    0x00000000UL, 0x191b3141UL, 0x32366282UL, 0x2b2d53c3UL, 0x646cc504UL,

-    0x7d77f445UL, 0x565aa786UL, 0x4f4196c7UL, 0xc8d98a08UL, 0xd1c2bb49UL,

-    0xfaefe88aUL, 0xe3f4d9cbUL, 0xacb54f0cUL, 0xb5ae7e4dUL, 0x9e832d8eUL,

-    0x87981ccfUL, 0x4ac21251UL, 0x53d92310UL, 0x78f470d3UL, 0x61ef4192UL,

-    0x2eaed755UL, 0x37b5e614UL, 0x1c98b5d7UL, 0x05838496UL, 0x821b9859UL,

-    0x9b00a918UL, 0xb02dfadbUL, 0xa936cb9aUL, 0xe6775d5dUL, 0xff6c6c1cUL,

-    0xd4413fdfUL, 0xcd5a0e9eUL, 0x958424a2UL, 0x8c9f15e3UL, 0xa7b24620UL,

-    0xbea97761UL, 0xf1e8e1a6UL, 0xe8f3d0e7UL, 0xc3de8324UL, 0xdac5b265UL,

-    0x5d5daeaaUL, 0x44469febUL, 0x6f6bcc28UL, 0x7670fd69UL, 0x39316baeUL,

-    0x202a5aefUL, 0x0b07092cUL, 0x121c386dUL, 0xdf4636f3UL, 0xc65d07b2UL,

-    0xed705471UL, 0xf46b6530UL, 0xbb2af3f7UL, 0xa231c2b6UL, 0x891c9175UL,

-    0x9007a034UL, 0x179fbcfbUL, 0x0e848dbaUL, 0x25a9de79UL, 0x3cb2ef38UL,

-    0x73f379ffUL, 0x6ae848beUL, 0x41c51b7dUL, 0x58de2a3cUL, 0xf0794f05UL,

-    0xe9627e44UL, 0xc24f2d87UL, 0xdb541cc6UL, 0x94158a01UL, 0x8d0ebb40UL,

-    0xa623e883UL, 0xbf38d9c2UL, 0x38a0c50dUL, 0x21bbf44cUL, 0x0a96a78fUL,

-    0x138d96ceUL, 0x5ccc0009UL, 0x45d73148UL, 0x6efa628bUL, 0x77e153caUL,

-    0xbabb5d54UL, 0xa3a06c15UL, 0x888d3fd6UL, 0x91960e97UL, 0xded79850UL,

-    0xc7cca911UL, 0xece1fad2UL, 0xf5facb93UL, 0x7262d75cUL, 0x6b79e61dUL,

-    0x4054b5deUL, 0x594f849fUL, 0x160e1258UL, 0x0f152319UL, 0x243870daUL,

-    0x3d23419bUL, 0x65fd6ba7UL, 0x7ce65ae6UL, 0x57cb0925UL, 0x4ed03864UL,

-    0x0191aea3UL, 0x188a9fe2UL, 0x33a7cc21UL, 0x2abcfd60UL, 0xad24e1afUL,

-    0xb43fd0eeUL, 0x9f12832dUL, 0x8609b26cUL, 0xc94824abUL, 0xd05315eaUL,

-    0xfb7e4629UL, 0xe2657768UL, 0x2f3f79f6UL, 0x362448b7UL, 0x1d091b74UL,

-    0x04122a35UL, 0x4b53bcf2UL, 0x52488db3UL, 0x7965de70UL, 0x607eef31UL,

-    0xe7e6f3feUL, 0xfefdc2bfUL, 0xd5d0917cUL, 0xcccba03dUL, 0x838a36faUL,

-    0x9a9107bbUL, 0xb1bc5478UL, 0xa8a76539UL, 0x3b83984bUL, 0x2298a90aUL,

-    0x09b5fac9UL, 0x10aecb88UL, 0x5fef5d4fUL, 0x46f46c0eUL, 0x6dd93fcdUL,

-    0x74c20e8cUL, 0xf35a1243UL, 0xea412302UL, 0xc16c70c1UL, 0xd8774180UL,

-    0x9736d747UL, 0x8e2de606UL, 0xa500b5c5UL, 0xbc1b8484UL, 0x71418a1aUL,

-    0x685abb5bUL, 0x4377e898UL, 0x5a6cd9d9UL, 0x152d4f1eUL, 0x0c367e5fUL,

-    0x271b2d9cUL, 0x3e001cddUL, 0xb9980012UL, 0xa0833153UL, 0x8bae6290UL,

-    0x92b553d1UL, 0xddf4c516UL, 0xc4eff457UL, 0xefc2a794UL, 0xf6d996d5UL,

-    0xae07bce9UL, 0xb71c8da8UL, 0x9c31de6bUL, 0x852aef2aUL, 0xca6b79edUL,

-    0xd37048acUL, 0xf85d1b6fUL, 0xe1462a2eUL, 0x66de36e1UL, 0x7fc507a0UL,

-    0x54e85463UL, 0x4df36522UL, 0x02b2f3e5UL, 0x1ba9c2a4UL, 0x30849167UL,

-    0x299fa026UL, 0xe4c5aeb8UL, 0xfdde9ff9UL, 0xd6f3cc3aUL, 0xcfe8fd7bUL,

-    0x80a96bbcUL, 0x99b25afdUL, 0xb29f093eUL, 0xab84387fUL, 0x2c1c24b0UL,

-    0x350715f1UL, 0x1e2a4632UL, 0x07317773UL, 0x4870e1b4UL, 0x516bd0f5UL,

-    0x7a468336UL, 0x635db277UL, 0xcbfad74eUL, 0xd2e1e60fUL, 0xf9ccb5ccUL,

-    0xe0d7848dUL, 0xaf96124aUL, 0xb68d230bUL, 0x9da070c8UL, 0x84bb4189UL,

-    0x03235d46UL, 0x1a386c07UL, 0x31153fc4UL, 0x280e0e85UL, 0x674f9842UL,

-    0x7e54a903UL, 0x5579fac0UL, 0x4c62cb81UL, 0x8138c51fUL, 0x9823f45eUL,

-    0xb30ea79dUL, 0xaa1596dcUL, 0xe554001bUL, 0xfc4f315aUL, 0xd7626299UL,

-    0xce7953d8UL, 0x49e14f17UL, 0x50fa7e56UL, 0x7bd72d95UL, 0x62cc1cd4UL,

-    0x2d8d8a13UL, 0x3496bb52UL, 0x1fbbe891UL, 0x06a0d9d0UL, 0x5e7ef3ecUL,

-    0x4765c2adUL, 0x6c48916eUL, 0x7553a02fUL, 0x3a1236e8UL, 0x230907a9UL,

-    0x0824546aUL, 0x113f652bUL, 0x96a779e4UL, 0x8fbc48a5UL, 0xa4911b66UL,

-    0xbd8a2a27UL, 0xf2cbbce0UL, 0xebd08da1UL, 0xc0fdde62UL, 0xd9e6ef23UL,

-    0x14bce1bdUL, 0x0da7d0fcUL, 0x268a833fUL, 0x3f91b27eUL, 0x70d024b9UL,

-    0x69cb15f8UL, 0x42e6463bUL, 0x5bfd777aUL, 0xdc656bb5UL, 0xc57e5af4UL,

-    0xee530937UL, 0xf7483876UL, 0xb809aeb1UL, 0xa1129ff0UL, 0x8a3fcc33UL,

-    0x9324fd72UL

-  },

-  {

-    0x00000000UL, 0x01c26a37UL, 0x0384d46eUL, 0x0246be59UL, 0x0709a8dcUL,

-    0x06cbc2ebUL, 0x048d7cb2UL, 0x054f1685UL, 0x0e1351b8UL, 0x0fd13b8fUL,

-    0x0d9785d6UL, 0x0c55efe1UL, 0x091af964UL, 0x08d89353UL, 0x0a9e2d0aUL,

-    0x0b5c473dUL, 0x1c26a370UL, 0x1de4c947UL, 0x1fa2771eUL, 0x1e601d29UL,

-    0x1b2f0bacUL, 0x1aed619bUL, 0x18abdfc2UL, 0x1969b5f5UL, 0x1235f2c8UL,

-    0x13f798ffUL, 0x11b126a6UL, 0x10734c91UL, 0x153c5a14UL, 0x14fe3023UL,

-    0x16b88e7aUL, 0x177ae44dUL, 0x384d46e0UL, 0x398f2cd7UL, 0x3bc9928eUL,

-    0x3a0bf8b9UL, 0x3f44ee3cUL, 0x3e86840bUL, 0x3cc03a52UL, 0x3d025065UL,

-    0x365e1758UL, 0x379c7d6fUL, 0x35dac336UL, 0x3418a901UL, 0x3157bf84UL,

-    0x3095d5b3UL, 0x32d36beaUL, 0x331101ddUL, 0x246be590UL, 0x25a98fa7UL,

-    0x27ef31feUL, 0x262d5bc9UL, 0x23624d4cUL, 0x22a0277bUL, 0x20e69922UL,

-    0x2124f315UL, 0x2a78b428UL, 0x2bbade1fUL, 0x29fc6046UL, 0x283e0a71UL,

-    0x2d711cf4UL, 0x2cb376c3UL, 0x2ef5c89aUL, 0x2f37a2adUL, 0x709a8dc0UL,

-    0x7158e7f7UL, 0x731e59aeUL, 0x72dc3399UL, 0x7793251cUL, 0x76514f2bUL,

-    0x7417f172UL, 0x75d59b45UL, 0x7e89dc78UL, 0x7f4bb64fUL, 0x7d0d0816UL,

-    0x7ccf6221UL, 0x798074a4UL, 0x78421e93UL, 0x7a04a0caUL, 0x7bc6cafdUL,

-    0x6cbc2eb0UL, 0x6d7e4487UL, 0x6f38fadeUL, 0x6efa90e9UL, 0x6bb5866cUL,

-    0x6a77ec5bUL, 0x68315202UL, 0x69f33835UL, 0x62af7f08UL, 0x636d153fUL,

-    0x612bab66UL, 0x60e9c151UL, 0x65a6d7d4UL, 0x6464bde3UL, 0x662203baUL,

-    0x67e0698dUL, 0x48d7cb20UL, 0x4915a117UL, 0x4b531f4eUL, 0x4a917579UL,

-    0x4fde63fcUL, 0x4e1c09cbUL, 0x4c5ab792UL, 0x4d98dda5UL, 0x46c49a98UL,

-    0x4706f0afUL, 0x45404ef6UL, 0x448224c1UL, 0x41cd3244UL, 0x400f5873UL,

-    0x4249e62aUL, 0x438b8c1dUL, 0x54f16850UL, 0x55330267UL, 0x5775bc3eUL,

-    0x56b7d609UL, 0x53f8c08cUL, 0x523aaabbUL, 0x507c14e2UL, 0x51be7ed5UL,

-    0x5ae239e8UL, 0x5b2053dfUL, 0x5966ed86UL, 0x58a487b1UL, 0x5deb9134UL,

-    0x5c29fb03UL, 0x5e6f455aUL, 0x5fad2f6dUL, 0xe1351b80UL, 0xe0f771b7UL,

-    0xe2b1cfeeUL, 0xe373a5d9UL, 0xe63cb35cUL, 0xe7fed96bUL, 0xe5b86732UL,

-    0xe47a0d05UL, 0xef264a38UL, 0xeee4200fUL, 0xeca29e56UL, 0xed60f461UL,

-    0xe82fe2e4UL, 0xe9ed88d3UL, 0xebab368aUL, 0xea695cbdUL, 0xfd13b8f0UL,

-    0xfcd1d2c7UL, 0xfe976c9eUL, 0xff5506a9UL, 0xfa1a102cUL, 0xfbd87a1bUL,

-    0xf99ec442UL, 0xf85cae75UL, 0xf300e948UL, 0xf2c2837fUL, 0xf0843d26UL,

-    0xf1465711UL, 0xf4094194UL, 0xf5cb2ba3UL, 0xf78d95faUL, 0xf64fffcdUL,

-    0xd9785d60UL, 0xd8ba3757UL, 0xdafc890eUL, 0xdb3ee339UL, 0xde71f5bcUL,

-    0xdfb39f8bUL, 0xddf521d2UL, 0xdc374be5UL, 0xd76b0cd8UL, 0xd6a966efUL,

-    0xd4efd8b6UL, 0xd52db281UL, 0xd062a404UL, 0xd1a0ce33UL, 0xd3e6706aUL,

-    0xd2241a5dUL, 0xc55efe10UL, 0xc49c9427UL, 0xc6da2a7eUL, 0xc7184049UL,

-    0xc25756ccUL, 0xc3953cfbUL, 0xc1d382a2UL, 0xc011e895UL, 0xcb4dafa8UL,

-    0xca8fc59fUL, 0xc8c97bc6UL, 0xc90b11f1UL, 0xcc440774UL, 0xcd866d43UL,

-    0xcfc0d31aUL, 0xce02b92dUL, 0x91af9640UL, 0x906dfc77UL, 0x922b422eUL,

-    0x93e92819UL, 0x96a63e9cUL, 0x976454abUL, 0x9522eaf2UL, 0x94e080c5UL,

-    0x9fbcc7f8UL, 0x9e7eadcfUL, 0x9c381396UL, 0x9dfa79a1UL, 0x98b56f24UL,

-    0x99770513UL, 0x9b31bb4aUL, 0x9af3d17dUL, 0x8d893530UL, 0x8c4b5f07UL,

-    0x8e0de15eUL, 0x8fcf8b69UL, 0x8a809decUL, 0x8b42f7dbUL, 0x89044982UL,

-    0x88c623b5UL, 0x839a6488UL, 0x82580ebfUL, 0x801eb0e6UL, 0x81dcdad1UL,

-    0x8493cc54UL, 0x8551a663UL, 0x8717183aUL, 0x86d5720dUL, 0xa9e2d0a0UL,

-    0xa820ba97UL, 0xaa6604ceUL, 0xaba46ef9UL, 0xaeeb787cUL, 0xaf29124bUL,

-    0xad6fac12UL, 0xacadc625UL, 0xa7f18118UL, 0xa633eb2fUL, 0xa4755576UL,

-    0xa5b73f41UL, 0xa0f829c4UL, 0xa13a43f3UL, 0xa37cfdaaUL, 0xa2be979dUL,

-    0xb5c473d0UL, 0xb40619e7UL, 0xb640a7beUL, 0xb782cd89UL, 0xb2cddb0cUL,

-    0xb30fb13bUL, 0xb1490f62UL, 0xb08b6555UL, 0xbbd72268UL, 0xba15485fUL,

-    0xb853f606UL, 0xb9919c31UL, 0xbcde8ab4UL, 0xbd1ce083UL, 0xbf5a5edaUL,

-    0xbe9834edUL

-  },

-  {

-    0x00000000UL, 0xb8bc6765UL, 0xaa09c88bUL, 0x12b5afeeUL, 0x8f629757UL,

-    0x37def032UL, 0x256b5fdcUL, 0x9dd738b9UL, 0xc5b428efUL, 0x7d084f8aUL,

-    0x6fbde064UL, 0xd7018701UL, 0x4ad6bfb8UL, 0xf26ad8ddUL, 0xe0df7733UL,

-    0x58631056UL, 0x5019579fUL, 0xe8a530faUL, 0xfa109f14UL, 0x42acf871UL,

-    0xdf7bc0c8UL, 0x67c7a7adUL, 0x75720843UL, 0xcdce6f26UL, 0x95ad7f70UL,

-    0x2d111815UL, 0x3fa4b7fbUL, 0x8718d09eUL, 0x1acfe827UL, 0xa2738f42UL,

-    0xb0c620acUL, 0x087a47c9UL, 0xa032af3eUL, 0x188ec85bUL, 0x0a3b67b5UL,

-    0xb28700d0UL, 0x2f503869UL, 0x97ec5f0cUL, 0x8559f0e2UL, 0x3de59787UL,

-    0x658687d1UL, 0xdd3ae0b4UL, 0xcf8f4f5aUL, 0x7733283fUL, 0xeae41086UL,

-    0x525877e3UL, 0x40edd80dUL, 0xf851bf68UL, 0xf02bf8a1UL, 0x48979fc4UL,

-    0x5a22302aUL, 0xe29e574fUL, 0x7f496ff6UL, 0xc7f50893UL, 0xd540a77dUL,

-    0x6dfcc018UL, 0x359fd04eUL, 0x8d23b72bUL, 0x9f9618c5UL, 0x272a7fa0UL,

-    0xbafd4719UL, 0x0241207cUL, 0x10f48f92UL, 0xa848e8f7UL, 0x9b14583dUL,

-    0x23a83f58UL, 0x311d90b6UL, 0x89a1f7d3UL, 0x1476cf6aUL, 0xaccaa80fUL,

-    0xbe7f07e1UL, 0x06c36084UL, 0x5ea070d2UL, 0xe61c17b7UL, 0xf4a9b859UL,

-    0x4c15df3cUL, 0xd1c2e785UL, 0x697e80e0UL, 0x7bcb2f0eUL, 0xc377486bUL,

-    0xcb0d0fa2UL, 0x73b168c7UL, 0x6104c729UL, 0xd9b8a04cUL, 0x446f98f5UL,

-    0xfcd3ff90UL, 0xee66507eUL, 0x56da371bUL, 0x0eb9274dUL, 0xb6054028UL,

-    0xa4b0efc6UL, 0x1c0c88a3UL, 0x81dbb01aUL, 0x3967d77fUL, 0x2bd27891UL,

-    0x936e1ff4UL, 0x3b26f703UL, 0x839a9066UL, 0x912f3f88UL, 0x299358edUL,

-    0xb4446054UL, 0x0cf80731UL, 0x1e4da8dfUL, 0xa6f1cfbaUL, 0xfe92dfecUL,

-    0x462eb889UL, 0x549b1767UL, 0xec277002UL, 0x71f048bbUL, 0xc94c2fdeUL,

-    0xdbf98030UL, 0x6345e755UL, 0x6b3fa09cUL, 0xd383c7f9UL, 0xc1366817UL,

-    0x798a0f72UL, 0xe45d37cbUL, 0x5ce150aeUL, 0x4e54ff40UL, 0xf6e89825UL,

-    0xae8b8873UL, 0x1637ef16UL, 0x048240f8UL, 0xbc3e279dUL, 0x21e91f24UL,

-    0x99557841UL, 0x8be0d7afUL, 0x335cb0caUL, 0xed59b63bUL, 0x55e5d15eUL,

-    0x47507eb0UL, 0xffec19d5UL, 0x623b216cUL, 0xda874609UL, 0xc832e9e7UL,

-    0x708e8e82UL, 0x28ed9ed4UL, 0x9051f9b1UL, 0x82e4565fUL, 0x3a58313aUL,

-    0xa78f0983UL, 0x1f336ee6UL, 0x0d86c108UL, 0xb53aa66dUL, 0xbd40e1a4UL,

-    0x05fc86c1UL, 0x1749292fUL, 0xaff54e4aUL, 0x322276f3UL, 0x8a9e1196UL,

-    0x982bbe78UL, 0x2097d91dUL, 0x78f4c94bUL, 0xc048ae2eUL, 0xd2fd01c0UL,

-    0x6a4166a5UL, 0xf7965e1cUL, 0x4f2a3979UL, 0x5d9f9697UL, 0xe523f1f2UL,

-    0x4d6b1905UL, 0xf5d77e60UL, 0xe762d18eUL, 0x5fdeb6ebUL, 0xc2098e52UL,

-    0x7ab5e937UL, 0x680046d9UL, 0xd0bc21bcUL, 0x88df31eaUL, 0x3063568fUL,

-    0x22d6f961UL, 0x9a6a9e04UL, 0x07bda6bdUL, 0xbf01c1d8UL, 0xadb46e36UL,

-    0x15080953UL, 0x1d724e9aUL, 0xa5ce29ffUL, 0xb77b8611UL, 0x0fc7e174UL,

-    0x9210d9cdUL, 0x2aacbea8UL, 0x38191146UL, 0x80a57623UL, 0xd8c66675UL,

-    0x607a0110UL, 0x72cfaefeUL, 0xca73c99bUL, 0x57a4f122UL, 0xef189647UL,

-    0xfdad39a9UL, 0x45115eccUL, 0x764dee06UL, 0xcef18963UL, 0xdc44268dUL,

-    0x64f841e8UL, 0xf92f7951UL, 0x41931e34UL, 0x5326b1daUL, 0xeb9ad6bfUL,

-    0xb3f9c6e9UL, 0x0b45a18cUL, 0x19f00e62UL, 0xa14c6907UL, 0x3c9b51beUL,

-    0x842736dbUL, 0x96929935UL, 0x2e2efe50UL, 0x2654b999UL, 0x9ee8defcUL,

-    0x8c5d7112UL, 0x34e11677UL, 0xa9362eceUL, 0x118a49abUL, 0x033fe645UL,

-    0xbb838120UL, 0xe3e09176UL, 0x5b5cf613UL, 0x49e959fdUL, 0xf1553e98UL,

-    0x6c820621UL, 0xd43e6144UL, 0xc68bceaaUL, 0x7e37a9cfUL, 0xd67f4138UL,

-    0x6ec3265dUL, 0x7c7689b3UL, 0xc4caeed6UL, 0x591dd66fUL, 0xe1a1b10aUL,

-    0xf3141ee4UL, 0x4ba87981UL, 0x13cb69d7UL, 0xab770eb2UL, 0xb9c2a15cUL,

-    0x017ec639UL, 0x9ca9fe80UL, 0x241599e5UL, 0x36a0360bUL, 0x8e1c516eUL,

-    0x866616a7UL, 0x3eda71c2UL, 0x2c6fde2cUL, 0x94d3b949UL, 0x090481f0UL,

-    0xb1b8e695UL, 0xa30d497bUL, 0x1bb12e1eUL, 0x43d23e48UL, 0xfb6e592dUL,

-    0xe9dbf6c3UL, 0x516791a6UL, 0xccb0a91fUL, 0x740cce7aUL, 0x66b96194UL,

-    0xde0506f1UL

-  },

-  {

-    0x00000000UL, 0x96300777UL, 0x2c610eeeUL, 0xba510999UL, 0x19c46d07UL,

-    0x8ff46a70UL, 0x35a563e9UL, 0xa395649eUL, 0x3288db0eUL, 0xa4b8dc79UL,

-    0x1ee9d5e0UL, 0x88d9d297UL, 0x2b4cb609UL, 0xbd7cb17eUL, 0x072db8e7UL,

-    0x911dbf90UL, 0x6410b71dUL, 0xf220b06aUL, 0x4871b9f3UL, 0xde41be84UL,

-    0x7dd4da1aUL, 0xebe4dd6dUL, 0x51b5d4f4UL, 0xc785d383UL, 0x56986c13UL,

-    0xc0a86b64UL, 0x7af962fdUL, 0xecc9658aUL, 0x4f5c0114UL, 0xd96c0663UL,

-    0x633d0ffaUL, 0xf50d088dUL, 0xc8206e3bUL, 0x5e10694cUL, 0xe44160d5UL,

-    0x727167a2UL, 0xd1e4033cUL, 0x47d4044bUL, 0xfd850dd2UL, 0x6bb50aa5UL,

-    0xfaa8b535UL, 0x6c98b242UL, 0xd6c9bbdbUL, 0x40f9bcacUL, 0xe36cd832UL,

-    0x755cdf45UL, 0xcf0dd6dcUL, 0x593dd1abUL, 0xac30d926UL, 0x3a00de51UL,

-    0x8051d7c8UL, 0x1661d0bfUL, 0xb5f4b421UL, 0x23c4b356UL, 0x9995bacfUL,

-    0x0fa5bdb8UL, 0x9eb80228UL, 0x0888055fUL, 0xb2d90cc6UL, 0x24e90bb1UL,

-    0x877c6f2fUL, 0x114c6858UL, 0xab1d61c1UL, 0x3d2d66b6UL, 0x9041dc76UL,

-    0x0671db01UL, 0xbc20d298UL, 0x2a10d5efUL, 0x8985b171UL, 0x1fb5b606UL,

-    0xa5e4bf9fUL, 0x33d4b8e8UL, 0xa2c90778UL, 0x34f9000fUL, 0x8ea80996UL,

-    0x18980ee1UL, 0xbb0d6a7fUL, 0x2d3d6d08UL, 0x976c6491UL, 0x015c63e6UL,

-    0xf4516b6bUL, 0x62616c1cUL, 0xd8306585UL, 0x4e0062f2UL, 0xed95066cUL,

-    0x7ba5011bUL, 0xc1f40882UL, 0x57c40ff5UL, 0xc6d9b065UL, 0x50e9b712UL,

-    0xeab8be8bUL, 0x7c88b9fcUL, 0xdf1ddd62UL, 0x492dda15UL, 0xf37cd38cUL,

-    0x654cd4fbUL, 0x5861b24dUL, 0xce51b53aUL, 0x7400bca3UL, 0xe230bbd4UL,

-    0x41a5df4aUL, 0xd795d83dUL, 0x6dc4d1a4UL, 0xfbf4d6d3UL, 0x6ae96943UL,

-    0xfcd96e34UL, 0x468867adUL, 0xd0b860daUL, 0x732d0444UL, 0xe51d0333UL,

-    0x5f4c0aaaUL, 0xc97c0dddUL, 0x3c710550UL, 0xaa410227UL, 0x10100bbeUL,

-    0x86200cc9UL, 0x25b56857UL, 0xb3856f20UL, 0x09d466b9UL, 0x9fe461ceUL,

-    0x0ef9de5eUL, 0x98c9d929UL, 0x2298d0b0UL, 0xb4a8d7c7UL, 0x173db359UL,

-    0x810db42eUL, 0x3b5cbdb7UL, 0xad6cbac0UL, 0x2083b8edUL, 0xb6b3bf9aUL,

-    0x0ce2b603UL, 0x9ad2b174UL, 0x3947d5eaUL, 0xaf77d29dUL, 0x1526db04UL,

-    0x8316dc73UL, 0x120b63e3UL, 0x843b6494UL, 0x3e6a6d0dUL, 0xa85a6a7aUL,

-    0x0bcf0ee4UL, 0x9dff0993UL, 0x27ae000aUL, 0xb19e077dUL, 0x44930ff0UL,

-    0xd2a30887UL, 0x68f2011eUL, 0xfec20669UL, 0x5d5762f7UL, 0xcb676580UL,

-    0x71366c19UL, 0xe7066b6eUL, 0x761bd4feUL, 0xe02bd389UL, 0x5a7ada10UL,

-    0xcc4add67UL, 0x6fdfb9f9UL, 0xf9efbe8eUL, 0x43beb717UL, 0xd58eb060UL,

-    0xe8a3d6d6UL, 0x7e93d1a1UL, 0xc4c2d838UL, 0x52f2df4fUL, 0xf167bbd1UL,

-    0x6757bca6UL, 0xdd06b53fUL, 0x4b36b248UL, 0xda2b0dd8UL, 0x4c1b0aafUL,

-    0xf64a0336UL, 0x607a0441UL, 0xc3ef60dfUL, 0x55df67a8UL, 0xef8e6e31UL,

-    0x79be6946UL, 0x8cb361cbUL, 0x1a8366bcUL, 0xa0d26f25UL, 0x36e26852UL,

-    0x95770cccUL, 0x03470bbbUL, 0xb9160222UL, 0x2f260555UL, 0xbe3bbac5UL,

-    0x280bbdb2UL, 0x925ab42bUL, 0x046ab35cUL, 0xa7ffd7c2UL, 0x31cfd0b5UL,

-    0x8b9ed92cUL, 0x1daede5bUL, 0xb0c2649bUL, 0x26f263ecUL, 0x9ca36a75UL,

-    0x0a936d02UL, 0xa906099cUL, 0x3f360eebUL, 0x85670772UL, 0x13570005UL,

-    0x824abf95UL, 0x147ab8e2UL, 0xae2bb17bUL, 0x381bb60cUL, 0x9b8ed292UL,

-    0x0dbed5e5UL, 0xb7efdc7cUL, 0x21dfdb0bUL, 0xd4d2d386UL, 0x42e2d4f1UL,

-    0xf8b3dd68UL, 0x6e83da1fUL, 0xcd16be81UL, 0x5b26b9f6UL, 0xe177b06fUL,

-    0x7747b718UL, 0xe65a0888UL, 0x706a0fffUL, 0xca3b0666UL, 0x5c0b0111UL,

-    0xff9e658fUL, 0x69ae62f8UL, 0xd3ff6b61UL, 0x45cf6c16UL, 0x78e20aa0UL,

-    0xeed20dd7UL, 0x5483044eUL, 0xc2b30339UL, 0x612667a7UL, 0xf71660d0UL,

-    0x4d476949UL, 0xdb776e3eUL, 0x4a6ad1aeUL, 0xdc5ad6d9UL, 0x660bdf40UL,

-    0xf03bd837UL, 0x53aebca9UL, 0xc59ebbdeUL, 0x7fcfb247UL, 0xe9ffb530UL,

-    0x1cf2bdbdUL, 0x8ac2bacaUL, 0x3093b353UL, 0xa6a3b424UL, 0x0536d0baUL,

-    0x9306d7cdUL, 0x2957de54UL, 0xbf67d923UL, 0x2e7a66b3UL, 0xb84a61c4UL,

-    0x021b685dUL, 0x942b6f2aUL, 0x37be0bb4UL, 0xa18e0cc3UL, 0x1bdf055aUL,

-    0x8def022dUL

-  },

-  {

-    0x00000000UL, 0x41311b19UL, 0x82623632UL, 0xc3532d2bUL, 0x04c56c64UL,

-    0x45f4777dUL, 0x86a75a56UL, 0xc796414fUL, 0x088ad9c8UL, 0x49bbc2d1UL,

-    0x8ae8effaUL, 0xcbd9f4e3UL, 0x0c4fb5acUL, 0x4d7eaeb5UL, 0x8e2d839eUL,

-    0xcf1c9887UL, 0x5112c24aUL, 0x1023d953UL, 0xd370f478UL, 0x9241ef61UL,

-    0x55d7ae2eUL, 0x14e6b537UL, 0xd7b5981cUL, 0x96848305UL, 0x59981b82UL,

-    0x18a9009bUL, 0xdbfa2db0UL, 0x9acb36a9UL, 0x5d5d77e6UL, 0x1c6c6cffUL,

-    0xdf3f41d4UL, 0x9e0e5acdUL, 0xa2248495UL, 0xe3159f8cUL, 0x2046b2a7UL,

-    0x6177a9beUL, 0xa6e1e8f1UL, 0xe7d0f3e8UL, 0x2483dec3UL, 0x65b2c5daUL,

-    0xaaae5d5dUL, 0xeb9f4644UL, 0x28cc6b6fUL, 0x69fd7076UL, 0xae6b3139UL,

-    0xef5a2a20UL, 0x2c09070bUL, 0x6d381c12UL, 0xf33646dfUL, 0xb2075dc6UL,

-    0x715470edUL, 0x30656bf4UL, 0xf7f32abbUL, 0xb6c231a2UL, 0x75911c89UL,

-    0x34a00790UL, 0xfbbc9f17UL, 0xba8d840eUL, 0x79dea925UL, 0x38efb23cUL,

-    0xff79f373UL, 0xbe48e86aUL, 0x7d1bc541UL, 0x3c2ade58UL, 0x054f79f0UL,

-    0x447e62e9UL, 0x872d4fc2UL, 0xc61c54dbUL, 0x018a1594UL, 0x40bb0e8dUL,

-    0x83e823a6UL, 0xc2d938bfUL, 0x0dc5a038UL, 0x4cf4bb21UL, 0x8fa7960aUL,

-    0xce968d13UL, 0x0900cc5cUL, 0x4831d745UL, 0x8b62fa6eUL, 0xca53e177UL,

-    0x545dbbbaUL, 0x156ca0a3UL, 0xd63f8d88UL, 0x970e9691UL, 0x5098d7deUL,

-    0x11a9ccc7UL, 0xd2fae1ecUL, 0x93cbfaf5UL, 0x5cd76272UL, 0x1de6796bUL,

-    0xdeb55440UL, 0x9f844f59UL, 0x58120e16UL, 0x1923150fUL, 0xda703824UL,

-    0x9b41233dUL, 0xa76bfd65UL, 0xe65ae67cUL, 0x2509cb57UL, 0x6438d04eUL,

-    0xa3ae9101UL, 0xe29f8a18UL, 0x21cca733UL, 0x60fdbc2aUL, 0xafe124adUL,

-    0xeed03fb4UL, 0x2d83129fUL, 0x6cb20986UL, 0xab2448c9UL, 0xea1553d0UL,

-    0x29467efbUL, 0x687765e2UL, 0xf6793f2fUL, 0xb7482436UL, 0x741b091dUL,

-    0x352a1204UL, 0xf2bc534bUL, 0xb38d4852UL, 0x70de6579UL, 0x31ef7e60UL,

-    0xfef3e6e7UL, 0xbfc2fdfeUL, 0x7c91d0d5UL, 0x3da0cbccUL, 0xfa368a83UL,

-    0xbb07919aUL, 0x7854bcb1UL, 0x3965a7a8UL, 0x4b98833bUL, 0x0aa99822UL,

-    0xc9fab509UL, 0x88cbae10UL, 0x4f5def5fUL, 0x0e6cf446UL, 0xcd3fd96dUL,

-    0x8c0ec274UL, 0x43125af3UL, 0x022341eaUL, 0xc1706cc1UL, 0x804177d8UL,

-    0x47d73697UL, 0x06e62d8eUL, 0xc5b500a5UL, 0x84841bbcUL, 0x1a8a4171UL,

-    0x5bbb5a68UL, 0x98e87743UL, 0xd9d96c5aUL, 0x1e4f2d15UL, 0x5f7e360cUL,

-    0x9c2d1b27UL, 0xdd1c003eUL, 0x120098b9UL, 0x533183a0UL, 0x9062ae8bUL,

-    0xd153b592UL, 0x16c5f4ddUL, 0x57f4efc4UL, 0x94a7c2efUL, 0xd596d9f6UL,

-    0xe9bc07aeUL, 0xa88d1cb7UL, 0x6bde319cUL, 0x2aef2a85UL, 0xed796bcaUL,

-    0xac4870d3UL, 0x6f1b5df8UL, 0x2e2a46e1UL, 0xe136de66UL, 0xa007c57fUL,

-    0x6354e854UL, 0x2265f34dUL, 0xe5f3b202UL, 0xa4c2a91bUL, 0x67918430UL,

-    0x26a09f29UL, 0xb8aec5e4UL, 0xf99fdefdUL, 0x3accf3d6UL, 0x7bfde8cfUL,

-    0xbc6ba980UL, 0xfd5ab299UL, 0x3e099fb2UL, 0x7f3884abUL, 0xb0241c2cUL,

-    0xf1150735UL, 0x32462a1eUL, 0x73773107UL, 0xb4e17048UL, 0xf5d06b51UL,

-    0x3683467aUL, 0x77b25d63UL, 0x4ed7facbUL, 0x0fe6e1d2UL, 0xccb5ccf9UL,

-    0x8d84d7e0UL, 0x4a1296afUL, 0x0b238db6UL, 0xc870a09dUL, 0x8941bb84UL,

-    0x465d2303UL, 0x076c381aUL, 0xc43f1531UL, 0x850e0e28UL, 0x42984f67UL,

-    0x03a9547eUL, 0xc0fa7955UL, 0x81cb624cUL, 0x1fc53881UL, 0x5ef42398UL,

-    0x9da70eb3UL, 0xdc9615aaUL, 0x1b0054e5UL, 0x5a314ffcUL, 0x996262d7UL,

-    0xd85379ceUL, 0x174fe149UL, 0x567efa50UL, 0x952dd77bUL, 0xd41ccc62UL,

-    0x138a8d2dUL, 0x52bb9634UL, 0x91e8bb1fUL, 0xd0d9a006UL, 0xecf37e5eUL,

-    0xadc26547UL, 0x6e91486cUL, 0x2fa05375UL, 0xe836123aUL, 0xa9070923UL,

-    0x6a542408UL, 0x2b653f11UL, 0xe479a796UL, 0xa548bc8fUL, 0x661b91a4UL,

-    0x272a8abdUL, 0xe0bccbf2UL, 0xa18dd0ebUL, 0x62defdc0UL, 0x23efe6d9UL,

-    0xbde1bc14UL, 0xfcd0a70dUL, 0x3f838a26UL, 0x7eb2913fUL, 0xb924d070UL,

-    0xf815cb69UL, 0x3b46e642UL, 0x7a77fd5bUL, 0xb56b65dcUL, 0xf45a7ec5UL,

-    0x370953eeUL, 0x763848f7UL, 0xb1ae09b8UL, 0xf09f12a1UL, 0x33cc3f8aUL,

-    0x72fd2493UL

-  },

-  {

-    0x00000000UL, 0x376ac201UL, 0x6ed48403UL, 0x59be4602UL, 0xdca80907UL,

-    0xebc2cb06UL, 0xb27c8d04UL, 0x85164f05UL, 0xb851130eUL, 0x8f3bd10fUL,

-    0xd685970dUL, 0xe1ef550cUL, 0x64f91a09UL, 0x5393d808UL, 0x0a2d9e0aUL,

-    0x3d475c0bUL, 0x70a3261cUL, 0x47c9e41dUL, 0x1e77a21fUL, 0x291d601eUL,

-    0xac0b2f1bUL, 0x9b61ed1aUL, 0xc2dfab18UL, 0xf5b56919UL, 0xc8f23512UL,

-    0xff98f713UL, 0xa626b111UL, 0x914c7310UL, 0x145a3c15UL, 0x2330fe14UL,

-    0x7a8eb816UL, 0x4de47a17UL, 0xe0464d38UL, 0xd72c8f39UL, 0x8e92c93bUL,

-    0xb9f80b3aUL, 0x3cee443fUL, 0x0b84863eUL, 0x523ac03cUL, 0x6550023dUL,

-    0x58175e36UL, 0x6f7d9c37UL, 0x36c3da35UL, 0x01a91834UL, 0x84bf5731UL,

-    0xb3d59530UL, 0xea6bd332UL, 0xdd011133UL, 0x90e56b24UL, 0xa78fa925UL,

-    0xfe31ef27UL, 0xc95b2d26UL, 0x4c4d6223UL, 0x7b27a022UL, 0x2299e620UL,

-    0x15f32421UL, 0x28b4782aUL, 0x1fdeba2bUL, 0x4660fc29UL, 0x710a3e28UL,

-    0xf41c712dUL, 0xc376b32cUL, 0x9ac8f52eUL, 0xada2372fUL, 0xc08d9a70UL,

-    0xf7e75871UL, 0xae591e73UL, 0x9933dc72UL, 0x1c259377UL, 0x2b4f5176UL,

-    0x72f11774UL, 0x459bd575UL, 0x78dc897eUL, 0x4fb64b7fUL, 0x16080d7dUL,

-    0x2162cf7cUL, 0xa4748079UL, 0x931e4278UL, 0xcaa0047aUL, 0xfdcac67bUL,

-    0xb02ebc6cUL, 0x87447e6dUL, 0xdefa386fUL, 0xe990fa6eUL, 0x6c86b56bUL,

-    0x5bec776aUL, 0x02523168UL, 0x3538f369UL, 0x087faf62UL, 0x3f156d63UL,

-    0x66ab2b61UL, 0x51c1e960UL, 0xd4d7a665UL, 0xe3bd6464UL, 0xba032266UL,

-    0x8d69e067UL, 0x20cbd748UL, 0x17a11549UL, 0x4e1f534bUL, 0x7975914aUL,

-    0xfc63de4fUL, 0xcb091c4eUL, 0x92b75a4cUL, 0xa5dd984dUL, 0x989ac446UL,

-    0xaff00647UL, 0xf64e4045UL, 0xc1248244UL, 0x4432cd41UL, 0x73580f40UL,

-    0x2ae64942UL, 0x1d8c8b43UL, 0x5068f154UL, 0x67023355UL, 0x3ebc7557UL,

-    0x09d6b756UL, 0x8cc0f853UL, 0xbbaa3a52UL, 0xe2147c50UL, 0xd57ebe51UL,

-    0xe839e25aUL, 0xdf53205bUL, 0x86ed6659UL, 0xb187a458UL, 0x3491eb5dUL,

-    0x03fb295cUL, 0x5a456f5eUL, 0x6d2fad5fUL, 0x801b35e1UL, 0xb771f7e0UL,

-    0xeecfb1e2UL, 0xd9a573e3UL, 0x5cb33ce6UL, 0x6bd9fee7UL, 0x3267b8e5UL,

-    0x050d7ae4UL, 0x384a26efUL, 0x0f20e4eeUL, 0x569ea2ecUL, 0x61f460edUL,

-    0xe4e22fe8UL, 0xd388ede9UL, 0x8a36abebUL, 0xbd5c69eaUL, 0xf0b813fdUL,

-    0xc7d2d1fcUL, 0x9e6c97feUL, 0xa90655ffUL, 0x2c101afaUL, 0x1b7ad8fbUL,

-    0x42c49ef9UL, 0x75ae5cf8UL, 0x48e900f3UL, 0x7f83c2f2UL, 0x263d84f0UL,

-    0x115746f1UL, 0x944109f4UL, 0xa32bcbf5UL, 0xfa958df7UL, 0xcdff4ff6UL,

-    0x605d78d9UL, 0x5737bad8UL, 0x0e89fcdaUL, 0x39e33edbUL, 0xbcf571deUL,

-    0x8b9fb3dfUL, 0xd221f5ddUL, 0xe54b37dcUL, 0xd80c6bd7UL, 0xef66a9d6UL,

-    0xb6d8efd4UL, 0x81b22dd5UL, 0x04a462d0UL, 0x33cea0d1UL, 0x6a70e6d3UL,

-    0x5d1a24d2UL, 0x10fe5ec5UL, 0x27949cc4UL, 0x7e2adac6UL, 0x494018c7UL,

-    0xcc5657c2UL, 0xfb3c95c3UL, 0xa282d3c1UL, 0x95e811c0UL, 0xa8af4dcbUL,

-    0x9fc58fcaUL, 0xc67bc9c8UL, 0xf1110bc9UL, 0x740744ccUL, 0x436d86cdUL,

-    0x1ad3c0cfUL, 0x2db902ceUL, 0x4096af91UL, 0x77fc6d90UL, 0x2e422b92UL,

-    0x1928e993UL, 0x9c3ea696UL, 0xab546497UL, 0xf2ea2295UL, 0xc580e094UL,

-    0xf8c7bc9fUL, 0xcfad7e9eUL, 0x9613389cUL, 0xa179fa9dUL, 0x246fb598UL,

-    0x13057799UL, 0x4abb319bUL, 0x7dd1f39aUL, 0x3035898dUL, 0x075f4b8cUL,

-    0x5ee10d8eUL, 0x698bcf8fUL, 0xec9d808aUL, 0xdbf7428bUL, 0x82490489UL,

-    0xb523c688UL, 0x88649a83UL, 0xbf0e5882UL, 0xe6b01e80UL, 0xd1dadc81UL,

-    0x54cc9384UL, 0x63a65185UL, 0x3a181787UL, 0x0d72d586UL, 0xa0d0e2a9UL,

-    0x97ba20a8UL, 0xce0466aaUL, 0xf96ea4abUL, 0x7c78ebaeUL, 0x4b1229afUL,

-    0x12ac6fadUL, 0x25c6adacUL, 0x1881f1a7UL, 0x2feb33a6UL, 0x765575a4UL,

-    0x413fb7a5UL, 0xc429f8a0UL, 0xf3433aa1UL, 0xaafd7ca3UL, 0x9d97bea2UL,

-    0xd073c4b5UL, 0xe71906b4UL, 0xbea740b6UL, 0x89cd82b7UL, 0x0cdbcdb2UL,

-    0x3bb10fb3UL, 0x620f49b1UL, 0x55658bb0UL, 0x6822d7bbUL, 0x5f4815baUL,

-    0x06f653b8UL, 0x319c91b9UL, 0xb48adebcUL, 0x83e01cbdUL, 0xda5e5abfUL,

-    0xed3498beUL

-  },

-  {

-    0x00000000UL, 0x6567bcb8UL, 0x8bc809aaUL, 0xeeafb512UL, 0x5797628fUL,

-    0x32f0de37UL, 0xdc5f6b25UL, 0xb938d79dUL, 0xef28b4c5UL, 0x8a4f087dUL,

-    0x64e0bd6fUL, 0x018701d7UL, 0xb8bfd64aUL, 0xddd86af2UL, 0x3377dfe0UL,

-    0x56106358UL, 0x9f571950UL, 0xfa30a5e8UL, 0x149f10faUL, 0x71f8ac42UL,

-    0xc8c07bdfUL, 0xada7c767UL, 0x43087275UL, 0x266fcecdUL, 0x707fad95UL,

-    0x1518112dUL, 0xfbb7a43fUL, 0x9ed01887UL, 0x27e8cf1aUL, 0x428f73a2UL,

-    0xac20c6b0UL, 0xc9477a08UL, 0x3eaf32a0UL, 0x5bc88e18UL, 0xb5673b0aUL,

-    0xd00087b2UL, 0x6938502fUL, 0x0c5fec97UL, 0xe2f05985UL, 0x8797e53dUL,

-    0xd1878665UL, 0xb4e03addUL, 0x5a4f8fcfUL, 0x3f283377UL, 0x8610e4eaUL,

-    0xe3775852UL, 0x0dd8ed40UL, 0x68bf51f8UL, 0xa1f82bf0UL, 0xc49f9748UL,

-    0x2a30225aUL, 0x4f579ee2UL, 0xf66f497fUL, 0x9308f5c7UL, 0x7da740d5UL,

-    0x18c0fc6dUL, 0x4ed09f35UL, 0x2bb7238dUL, 0xc518969fUL, 0xa07f2a27UL,

-    0x1947fdbaUL, 0x7c204102UL, 0x928ff410UL, 0xf7e848a8UL, 0x3d58149bUL,

-    0x583fa823UL, 0xb6901d31UL, 0xd3f7a189UL, 0x6acf7614UL, 0x0fa8caacUL,

-    0xe1077fbeUL, 0x8460c306UL, 0xd270a05eUL, 0xb7171ce6UL, 0x59b8a9f4UL,

-    0x3cdf154cUL, 0x85e7c2d1UL, 0xe0807e69UL, 0x0e2fcb7bUL, 0x6b4877c3UL,

-    0xa20f0dcbUL, 0xc768b173UL, 0x29c70461UL, 0x4ca0b8d9UL, 0xf5986f44UL,

-    0x90ffd3fcUL, 0x7e5066eeUL, 0x1b37da56UL, 0x4d27b90eUL, 0x284005b6UL,

-    0xc6efb0a4UL, 0xa3880c1cUL, 0x1ab0db81UL, 0x7fd76739UL, 0x9178d22bUL,

-    0xf41f6e93UL, 0x03f7263bUL, 0x66909a83UL, 0x883f2f91UL, 0xed589329UL,

-    0x546044b4UL, 0x3107f80cUL, 0xdfa84d1eUL, 0xbacff1a6UL, 0xecdf92feUL,

-    0x89b82e46UL, 0x67179b54UL, 0x027027ecUL, 0xbb48f071UL, 0xde2f4cc9UL,

-    0x3080f9dbUL, 0x55e74563UL, 0x9ca03f6bUL, 0xf9c783d3UL, 0x176836c1UL,

-    0x720f8a79UL, 0xcb375de4UL, 0xae50e15cUL, 0x40ff544eUL, 0x2598e8f6UL,

-    0x73888baeUL, 0x16ef3716UL, 0xf8408204UL, 0x9d273ebcUL, 0x241fe921UL,

-    0x41785599UL, 0xafd7e08bUL, 0xcab05c33UL, 0x3bb659edUL, 0x5ed1e555UL,

-    0xb07e5047UL, 0xd519ecffUL, 0x6c213b62UL, 0x094687daUL, 0xe7e932c8UL,

-    0x828e8e70UL, 0xd49eed28UL, 0xb1f95190UL, 0x5f56e482UL, 0x3a31583aUL,

-    0x83098fa7UL, 0xe66e331fUL, 0x08c1860dUL, 0x6da63ab5UL, 0xa4e140bdUL,

-    0xc186fc05UL, 0x2f294917UL, 0x4a4ef5afUL, 0xf3762232UL, 0x96119e8aUL,

-    0x78be2b98UL, 0x1dd99720UL, 0x4bc9f478UL, 0x2eae48c0UL, 0xc001fdd2UL,

-    0xa566416aUL, 0x1c5e96f7UL, 0x79392a4fUL, 0x97969f5dUL, 0xf2f123e5UL,

-    0x05196b4dUL, 0x607ed7f5UL, 0x8ed162e7UL, 0xebb6de5fUL, 0x528e09c2UL,

-    0x37e9b57aUL, 0xd9460068UL, 0xbc21bcd0UL, 0xea31df88UL, 0x8f566330UL,

-    0x61f9d622UL, 0x049e6a9aUL, 0xbda6bd07UL, 0xd8c101bfUL, 0x366eb4adUL,

-    0x53090815UL, 0x9a4e721dUL, 0xff29cea5UL, 0x11867bb7UL, 0x74e1c70fUL,

-    0xcdd91092UL, 0xa8beac2aUL, 0x46111938UL, 0x2376a580UL, 0x7566c6d8UL,

-    0x10017a60UL, 0xfeaecf72UL, 0x9bc973caUL, 0x22f1a457UL, 0x479618efUL,

-    0xa939adfdUL, 0xcc5e1145UL, 0x06ee4d76UL, 0x6389f1ceUL, 0x8d2644dcUL,

-    0xe841f864UL, 0x51792ff9UL, 0x341e9341UL, 0xdab12653UL, 0xbfd69aebUL,

-    0xe9c6f9b3UL, 0x8ca1450bUL, 0x620ef019UL, 0x07694ca1UL, 0xbe519b3cUL,

-    0xdb362784UL, 0x35999296UL, 0x50fe2e2eUL, 0x99b95426UL, 0xfcdee89eUL,

-    0x12715d8cUL, 0x7716e134UL, 0xce2e36a9UL, 0xab498a11UL, 0x45e63f03UL,

-    0x208183bbUL, 0x7691e0e3UL, 0x13f65c5bUL, 0xfd59e949UL, 0x983e55f1UL,

-    0x2106826cUL, 0x44613ed4UL, 0xaace8bc6UL, 0xcfa9377eUL, 0x38417fd6UL,

-    0x5d26c36eUL, 0xb389767cUL, 0xd6eecac4UL, 0x6fd61d59UL, 0x0ab1a1e1UL,

-    0xe41e14f3UL, 0x8179a84bUL, 0xd769cb13UL, 0xb20e77abUL, 0x5ca1c2b9UL,

-    0x39c67e01UL, 0x80fea99cUL, 0xe5991524UL, 0x0b36a036UL, 0x6e511c8eUL,

-    0xa7166686UL, 0xc271da3eUL, 0x2cde6f2cUL, 0x49b9d394UL, 0xf0810409UL,

-    0x95e6b8b1UL, 0x7b490da3UL, 0x1e2eb11bUL, 0x483ed243UL, 0x2d596efbUL,

-    0xc3f6dbe9UL, 0xa6916751UL, 0x1fa9b0ccUL, 0x7ace0c74UL, 0x9461b966UL,

-    0xf10605deUL

-#endif

-  }

-};

+/* crc32.h -- tables for rapid CRC calculation
+ * Generated automatically by crc32.c
+ */
+
+local const unsigned long FAR crc_table[TBLS][256] =
+{
+  {
+    0x00000000UL, 0x77073096UL, 0xee0e612cUL, 0x990951baUL, 0x076dc419UL,
+    0x706af48fUL, 0xe963a535UL, 0x9e6495a3UL, 0x0edb8832UL, 0x79dcb8a4UL,
+    0xe0d5e91eUL, 0x97d2d988UL, 0x09b64c2bUL, 0x7eb17cbdUL, 0xe7b82d07UL,
+    0x90bf1d91UL, 0x1db71064UL, 0x6ab020f2UL, 0xf3b97148UL, 0x84be41deUL,
+    0x1adad47dUL, 0x6ddde4ebUL, 0xf4d4b551UL, 0x83d385c7UL, 0x136c9856UL,
+    0x646ba8c0UL, 0xfd62f97aUL, 0x8a65c9ecUL, 0x14015c4fUL, 0x63066cd9UL,
+    0xfa0f3d63UL, 0x8d080df5UL, 0x3b6e20c8UL, 0x4c69105eUL, 0xd56041e4UL,
+    0xa2677172UL, 0x3c03e4d1UL, 0x4b04d447UL, 0xd20d85fdUL, 0xa50ab56bUL,
+    0x35b5a8faUL, 0x42b2986cUL, 0xdbbbc9d6UL, 0xacbcf940UL, 0x32d86ce3UL,
+    0x45df5c75UL, 0xdcd60dcfUL, 0xabd13d59UL, 0x26d930acUL, 0x51de003aUL,
+    0xc8d75180UL, 0xbfd06116UL, 0x21b4f4b5UL, 0x56b3c423UL, 0xcfba9599UL,
+    0xb8bda50fUL, 0x2802b89eUL, 0x5f058808UL, 0xc60cd9b2UL, 0xb10be924UL,
+    0x2f6f7c87UL, 0x58684c11UL, 0xc1611dabUL, 0xb6662d3dUL, 0x76dc4190UL,
+    0x01db7106UL, 0x98d220bcUL, 0xefd5102aUL, 0x71b18589UL, 0x06b6b51fUL,
+    0x9fbfe4a5UL, 0xe8b8d433UL, 0x7807c9a2UL, 0x0f00f934UL, 0x9609a88eUL,
+    0xe10e9818UL, 0x7f6a0dbbUL, 0x086d3d2dUL, 0x91646c97UL, 0xe6635c01UL,
+    0x6b6b51f4UL, 0x1c6c6162UL, 0x856530d8UL, 0xf262004eUL, 0x6c0695edUL,
+    0x1b01a57bUL, 0x8208f4c1UL, 0xf50fc457UL, 0x65b0d9c6UL, 0x12b7e950UL,
+    0x8bbeb8eaUL, 0xfcb9887cUL, 0x62dd1ddfUL, 0x15da2d49UL, 0x8cd37cf3UL,
+    0xfbd44c65UL, 0x4db26158UL, 0x3ab551ceUL, 0xa3bc0074UL, 0xd4bb30e2UL,
+    0x4adfa541UL, 0x3dd895d7UL, 0xa4d1c46dUL, 0xd3d6f4fbUL, 0x4369e96aUL,
+    0x346ed9fcUL, 0xad678846UL, 0xda60b8d0UL, 0x44042d73UL, 0x33031de5UL,
+    0xaa0a4c5fUL, 0xdd0d7cc9UL, 0x5005713cUL, 0x270241aaUL, 0xbe0b1010UL,
+    0xc90c2086UL, 0x5768b525UL, 0x206f85b3UL, 0xb966d409UL, 0xce61e49fUL,
+    0x5edef90eUL, 0x29d9c998UL, 0xb0d09822UL, 0xc7d7a8b4UL, 0x59b33d17UL,
+    0x2eb40d81UL, 0xb7bd5c3bUL, 0xc0ba6cadUL, 0xedb88320UL, 0x9abfb3b6UL,
+    0x03b6e20cUL, 0x74b1d29aUL, 0xead54739UL, 0x9dd277afUL, 0x04db2615UL,
+    0x73dc1683UL, 0xe3630b12UL, 0x94643b84UL, 0x0d6d6a3eUL, 0x7a6a5aa8UL,
+    0xe40ecf0bUL, 0x9309ff9dUL, 0x0a00ae27UL, 0x7d079eb1UL, 0xf00f9344UL,
+    0x8708a3d2UL, 0x1e01f268UL, 0x6906c2feUL, 0xf762575dUL, 0x806567cbUL,
+    0x196c3671UL, 0x6e6b06e7UL, 0xfed41b76UL, 0x89d32be0UL, 0x10da7a5aUL,
+    0x67dd4accUL, 0xf9b9df6fUL, 0x8ebeeff9UL, 0x17b7be43UL, 0x60b08ed5UL,
+    0xd6d6a3e8UL, 0xa1d1937eUL, 0x38d8c2c4UL, 0x4fdff252UL, 0xd1bb67f1UL,
+    0xa6bc5767UL, 0x3fb506ddUL, 0x48b2364bUL, 0xd80d2bdaUL, 0xaf0a1b4cUL,
+    0x36034af6UL, 0x41047a60UL, 0xdf60efc3UL, 0xa867df55UL, 0x316e8eefUL,
+    0x4669be79UL, 0xcb61b38cUL, 0xbc66831aUL, 0x256fd2a0UL, 0x5268e236UL,
+    0xcc0c7795UL, 0xbb0b4703UL, 0x220216b9UL, 0x5505262fUL, 0xc5ba3bbeUL,
+    0xb2bd0b28UL, 0x2bb45a92UL, 0x5cb36a04UL, 0xc2d7ffa7UL, 0xb5d0cf31UL,
+    0x2cd99e8bUL, 0x5bdeae1dUL, 0x9b64c2b0UL, 0xec63f226UL, 0x756aa39cUL,
+    0x026d930aUL, 0x9c0906a9UL, 0xeb0e363fUL, 0x72076785UL, 0x05005713UL,
+    0x95bf4a82UL, 0xe2b87a14UL, 0x7bb12baeUL, 0x0cb61b38UL, 0x92d28e9bUL,
+    0xe5d5be0dUL, 0x7cdcefb7UL, 0x0bdbdf21UL, 0x86d3d2d4UL, 0xf1d4e242UL,
+    0x68ddb3f8UL, 0x1fda836eUL, 0x81be16cdUL, 0xf6b9265bUL, 0x6fb077e1UL,
+    0x18b74777UL, 0x88085ae6UL, 0xff0f6a70UL, 0x66063bcaUL, 0x11010b5cUL,
+    0x8f659effUL, 0xf862ae69UL, 0x616bffd3UL, 0x166ccf45UL, 0xa00ae278UL,
+    0xd70dd2eeUL, 0x4e048354UL, 0x3903b3c2UL, 0xa7672661UL, 0xd06016f7UL,
+    0x4969474dUL, 0x3e6e77dbUL, 0xaed16a4aUL, 0xd9d65adcUL, 0x40df0b66UL,
+    0x37d83bf0UL, 0xa9bcae53UL, 0xdebb9ec5UL, 0x47b2cf7fUL, 0x30b5ffe9UL,
+    0xbdbdf21cUL, 0xcabac28aUL, 0x53b39330UL, 0x24b4a3a6UL, 0xbad03605UL,
+    0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL,
+    0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL,
+    0x2d02ef8dUL
+#ifdef BYFOUR
+  },
+  {
+    0x00000000UL, 0x191b3141UL, 0x32366282UL, 0x2b2d53c3UL, 0x646cc504UL,
+    0x7d77f445UL, 0x565aa786UL, 0x4f4196c7UL, 0xc8d98a08UL, 0xd1c2bb49UL,
+    0xfaefe88aUL, 0xe3f4d9cbUL, 0xacb54f0cUL, 0xb5ae7e4dUL, 0x9e832d8eUL,
+    0x87981ccfUL, 0x4ac21251UL, 0x53d92310UL, 0x78f470d3UL, 0x61ef4192UL,
+    0x2eaed755UL, 0x37b5e614UL, 0x1c98b5d7UL, 0x05838496UL, 0x821b9859UL,
+    0x9b00a918UL, 0xb02dfadbUL, 0xa936cb9aUL, 0xe6775d5dUL, 0xff6c6c1cUL,
+    0xd4413fdfUL, 0xcd5a0e9eUL, 0x958424a2UL, 0x8c9f15e3UL, 0xa7b24620UL,
+    0xbea97761UL, 0xf1e8e1a6UL, 0xe8f3d0e7UL, 0xc3de8324UL, 0xdac5b265UL,
+    0x5d5daeaaUL, 0x44469febUL, 0x6f6bcc28UL, 0x7670fd69UL, 0x39316baeUL,
+    0x202a5aefUL, 0x0b07092cUL, 0x121c386dUL, 0xdf4636f3UL, 0xc65d07b2UL,
+    0xed705471UL, 0xf46b6530UL, 0xbb2af3f7UL, 0xa231c2b6UL, 0x891c9175UL,
+    0x9007a034UL, 0x179fbcfbUL, 0x0e848dbaUL, 0x25a9de79UL, 0x3cb2ef38UL,
+    0x73f379ffUL, 0x6ae848beUL, 0x41c51b7dUL, 0x58de2a3cUL, 0xf0794f05UL,
+    0xe9627e44UL, 0xc24f2d87UL, 0xdb541cc6UL, 0x94158a01UL, 0x8d0ebb40UL,
+    0xa623e883UL, 0xbf38d9c2UL, 0x38a0c50dUL, 0x21bbf44cUL, 0x0a96a78fUL,
+    0x138d96ceUL, 0x5ccc0009UL, 0x45d73148UL, 0x6efa628bUL, 0x77e153caUL,
+    0xbabb5d54UL, 0xa3a06c15UL, 0x888d3fd6UL, 0x91960e97UL, 0xded79850UL,
+    0xc7cca911UL, 0xece1fad2UL, 0xf5facb93UL, 0x7262d75cUL, 0x6b79e61dUL,
+    0x4054b5deUL, 0x594f849fUL, 0x160e1258UL, 0x0f152319UL, 0x243870daUL,
+    0x3d23419bUL, 0x65fd6ba7UL, 0x7ce65ae6UL, 0x57cb0925UL, 0x4ed03864UL,
+    0x0191aea3UL, 0x188a9fe2UL, 0x33a7cc21UL, 0x2abcfd60UL, 0xad24e1afUL,
+    0xb43fd0eeUL, 0x9f12832dUL, 0x8609b26cUL, 0xc94824abUL, 0xd05315eaUL,
+    0xfb7e4629UL, 0xe2657768UL, 0x2f3f79f6UL, 0x362448b7UL, 0x1d091b74UL,
+    0x04122a35UL, 0x4b53bcf2UL, 0x52488db3UL, 0x7965de70UL, 0x607eef31UL,
+    0xe7e6f3feUL, 0xfefdc2bfUL, 0xd5d0917cUL, 0xcccba03dUL, 0x838a36faUL,
+    0x9a9107bbUL, 0xb1bc5478UL, 0xa8a76539UL, 0x3b83984bUL, 0x2298a90aUL,
+    0x09b5fac9UL, 0x10aecb88UL, 0x5fef5d4fUL, 0x46f46c0eUL, 0x6dd93fcdUL,
+    0x74c20e8cUL, 0xf35a1243UL, 0xea412302UL, 0xc16c70c1UL, 0xd8774180UL,
+    0x9736d747UL, 0x8e2de606UL, 0xa500b5c5UL, 0xbc1b8484UL, 0x71418a1aUL,
+    0x685abb5bUL, 0x4377e898UL, 0x5a6cd9d9UL, 0x152d4f1eUL, 0x0c367e5fUL,
+    0x271b2d9cUL, 0x3e001cddUL, 0xb9980012UL, 0xa0833153UL, 0x8bae6290UL,
+    0x92b553d1UL, 0xddf4c516UL, 0xc4eff457UL, 0xefc2a794UL, 0xf6d996d5UL,
+    0xae07bce9UL, 0xb71c8da8UL, 0x9c31de6bUL, 0x852aef2aUL, 0xca6b79edUL,
+    0xd37048acUL, 0xf85d1b6fUL, 0xe1462a2eUL, 0x66de36e1UL, 0x7fc507a0UL,
+    0x54e85463UL, 0x4df36522UL, 0x02b2f3e5UL, 0x1ba9c2a4UL, 0x30849167UL,
+    0x299fa026UL, 0xe4c5aeb8UL, 0xfdde9ff9UL, 0xd6f3cc3aUL, 0xcfe8fd7bUL,
+    0x80a96bbcUL, 0x99b25afdUL, 0xb29f093eUL, 0xab84387fUL, 0x2c1c24b0UL,
+    0x350715f1UL, 0x1e2a4632UL, 0x07317773UL, 0x4870e1b4UL, 0x516bd0f5UL,
+    0x7a468336UL, 0x635db277UL, 0xcbfad74eUL, 0xd2e1e60fUL, 0xf9ccb5ccUL,
+    0xe0d7848dUL, 0xaf96124aUL, 0xb68d230bUL, 0x9da070c8UL, 0x84bb4189UL,
+    0x03235d46UL, 0x1a386c07UL, 0x31153fc4UL, 0x280e0e85UL, 0x674f9842UL,
+    0x7e54a903UL, 0x5579fac0UL, 0x4c62cb81UL, 0x8138c51fUL, 0x9823f45eUL,
+    0xb30ea79dUL, 0xaa1596dcUL, 0xe554001bUL, 0xfc4f315aUL, 0xd7626299UL,
+    0xce7953d8UL, 0x49e14f17UL, 0x50fa7e56UL, 0x7bd72d95UL, 0x62cc1cd4UL,
+    0x2d8d8a13UL, 0x3496bb52UL, 0x1fbbe891UL, 0x06a0d9d0UL, 0x5e7ef3ecUL,
+    0x4765c2adUL, 0x6c48916eUL, 0x7553a02fUL, 0x3a1236e8UL, 0x230907a9UL,
+    0x0824546aUL, 0x113f652bUL, 0x96a779e4UL, 0x8fbc48a5UL, 0xa4911b66UL,
+    0xbd8a2a27UL, 0xf2cbbce0UL, 0xebd08da1UL, 0xc0fdde62UL, 0xd9e6ef23UL,
+    0x14bce1bdUL, 0x0da7d0fcUL, 0x268a833fUL, 0x3f91b27eUL, 0x70d024b9UL,
+    0x69cb15f8UL, 0x42e6463bUL, 0x5bfd777aUL, 0xdc656bb5UL, 0xc57e5af4UL,
+    0xee530937UL, 0xf7483876UL, 0xb809aeb1UL, 0xa1129ff0UL, 0x8a3fcc33UL,
+    0x9324fd72UL
+  },
+  {
+    0x00000000UL, 0x01c26a37UL, 0x0384d46eUL, 0x0246be59UL, 0x0709a8dcUL,
+    0x06cbc2ebUL, 0x048d7cb2UL, 0x054f1685UL, 0x0e1351b8UL, 0x0fd13b8fUL,
+    0x0d9785d6UL, 0x0c55efe1UL, 0x091af964UL, 0x08d89353UL, 0x0a9e2d0aUL,
+    0x0b5c473dUL, 0x1c26a370UL, 0x1de4c947UL, 0x1fa2771eUL, 0x1e601d29UL,
+    0x1b2f0bacUL, 0x1aed619bUL, 0x18abdfc2UL, 0x1969b5f5UL, 0x1235f2c8UL,
+    0x13f798ffUL, 0x11b126a6UL, 0x10734c91UL, 0x153c5a14UL, 0x14fe3023UL,
+    0x16b88e7aUL, 0x177ae44dUL, 0x384d46e0UL, 0x398f2cd7UL, 0x3bc9928eUL,
+    0x3a0bf8b9UL, 0x3f44ee3cUL, 0x3e86840bUL, 0x3cc03a52UL, 0x3d025065UL,
+    0x365e1758UL, 0x379c7d6fUL, 0x35dac336UL, 0x3418a901UL, 0x3157bf84UL,
+    0x3095d5b3UL, 0x32d36beaUL, 0x331101ddUL, 0x246be590UL, 0x25a98fa7UL,
+    0x27ef31feUL, 0x262d5bc9UL, 0x23624d4cUL, 0x22a0277bUL, 0x20e69922UL,
+    0x2124f315UL, 0x2a78b428UL, 0x2bbade1fUL, 0x29fc6046UL, 0x283e0a71UL,
+    0x2d711cf4UL, 0x2cb376c3UL, 0x2ef5c89aUL, 0x2f37a2adUL, 0x709a8dc0UL,
+    0x7158e7f7UL, 0x731e59aeUL, 0x72dc3399UL, 0x7793251cUL, 0x76514f2bUL,
+    0x7417f172UL, 0x75d59b45UL, 0x7e89dc78UL, 0x7f4bb64fUL, 0x7d0d0816UL,
+    0x7ccf6221UL, 0x798074a4UL, 0x78421e93UL, 0x7a04a0caUL, 0x7bc6cafdUL,
+    0x6cbc2eb0UL, 0x6d7e4487UL, 0x6f38fadeUL, 0x6efa90e9UL, 0x6bb5866cUL,
+    0x6a77ec5bUL, 0x68315202UL, 0x69f33835UL, 0x62af7f08UL, 0x636d153fUL,
+    0x612bab66UL, 0x60e9c151UL, 0x65a6d7d4UL, 0x6464bde3UL, 0x662203baUL,
+    0x67e0698dUL, 0x48d7cb20UL, 0x4915a117UL, 0x4b531f4eUL, 0x4a917579UL,
+    0x4fde63fcUL, 0x4e1c09cbUL, 0x4c5ab792UL, 0x4d98dda5UL, 0x46c49a98UL,
+    0x4706f0afUL, 0x45404ef6UL, 0x448224c1UL, 0x41cd3244UL, 0x400f5873UL,
+    0x4249e62aUL, 0x438b8c1dUL, 0x54f16850UL, 0x55330267UL, 0x5775bc3eUL,
+    0x56b7d609UL, 0x53f8c08cUL, 0x523aaabbUL, 0x507c14e2UL, 0x51be7ed5UL,
+    0x5ae239e8UL, 0x5b2053dfUL, 0x5966ed86UL, 0x58a487b1UL, 0x5deb9134UL,
+    0x5c29fb03UL, 0x5e6f455aUL, 0x5fad2f6dUL, 0xe1351b80UL, 0xe0f771b7UL,
+    0xe2b1cfeeUL, 0xe373a5d9UL, 0xe63cb35cUL, 0xe7fed96bUL, 0xe5b86732UL,
+    0xe47a0d05UL, 0xef264a38UL, 0xeee4200fUL, 0xeca29e56UL, 0xed60f461UL,
+    0xe82fe2e4UL, 0xe9ed88d3UL, 0xebab368aUL, 0xea695cbdUL, 0xfd13b8f0UL,
+    0xfcd1d2c7UL, 0xfe976c9eUL, 0xff5506a9UL, 0xfa1a102cUL, 0xfbd87a1bUL,
+    0xf99ec442UL, 0xf85cae75UL, 0xf300e948UL, 0xf2c2837fUL, 0xf0843d26UL,
+    0xf1465711UL, 0xf4094194UL, 0xf5cb2ba3UL, 0xf78d95faUL, 0xf64fffcdUL,
+    0xd9785d60UL, 0xd8ba3757UL, 0xdafc890eUL, 0xdb3ee339UL, 0xde71f5bcUL,
+    0xdfb39f8bUL, 0xddf521d2UL, 0xdc374be5UL, 0xd76b0cd8UL, 0xd6a966efUL,
+    0xd4efd8b6UL, 0xd52db281UL, 0xd062a404UL, 0xd1a0ce33UL, 0xd3e6706aUL,
+    0xd2241a5dUL, 0xc55efe10UL, 0xc49c9427UL, 0xc6da2a7eUL, 0xc7184049UL,
+    0xc25756ccUL, 0xc3953cfbUL, 0xc1d382a2UL, 0xc011e895UL, 0xcb4dafa8UL,
+    0xca8fc59fUL, 0xc8c97bc6UL, 0xc90b11f1UL, 0xcc440774UL, 0xcd866d43UL,
+    0xcfc0d31aUL, 0xce02b92dUL, 0x91af9640UL, 0x906dfc77UL, 0x922b422eUL,
+    0x93e92819UL, 0x96a63e9cUL, 0x976454abUL, 0x9522eaf2UL, 0x94e080c5UL,
+    0x9fbcc7f8UL, 0x9e7eadcfUL, 0x9c381396UL, 0x9dfa79a1UL, 0x98b56f24UL,
+    0x99770513UL, 0x9b31bb4aUL, 0x9af3d17dUL, 0x8d893530UL, 0x8c4b5f07UL,
+    0x8e0de15eUL, 0x8fcf8b69UL, 0x8a809decUL, 0x8b42f7dbUL, 0x89044982UL,
+    0x88c623b5UL, 0x839a6488UL, 0x82580ebfUL, 0x801eb0e6UL, 0x81dcdad1UL,
+    0x8493cc54UL, 0x8551a663UL, 0x8717183aUL, 0x86d5720dUL, 0xa9e2d0a0UL,
+    0xa820ba97UL, 0xaa6604ceUL, 0xaba46ef9UL, 0xaeeb787cUL, 0xaf29124bUL,
+    0xad6fac12UL, 0xacadc625UL, 0xa7f18118UL, 0xa633eb2fUL, 0xa4755576UL,
+    0xa5b73f41UL, 0xa0f829c4UL, 0xa13a43f3UL, 0xa37cfdaaUL, 0xa2be979dUL,
+    0xb5c473d0UL, 0xb40619e7UL, 0xb640a7beUL, 0xb782cd89UL, 0xb2cddb0cUL,
+    0xb30fb13bUL, 0xb1490f62UL, 0xb08b6555UL, 0xbbd72268UL, 0xba15485fUL,
+    0xb853f606UL, 0xb9919c31UL, 0xbcde8ab4UL, 0xbd1ce083UL, 0xbf5a5edaUL,
+    0xbe9834edUL
+  },
+  {
+    0x00000000UL, 0xb8bc6765UL, 0xaa09c88bUL, 0x12b5afeeUL, 0x8f629757UL,
+    0x37def032UL, 0x256b5fdcUL, 0x9dd738b9UL, 0xc5b428efUL, 0x7d084f8aUL,
+    0x6fbde064UL, 0xd7018701UL, 0x4ad6bfb8UL, 0xf26ad8ddUL, 0xe0df7733UL,
+    0x58631056UL, 0x5019579fUL, 0xe8a530faUL, 0xfa109f14UL, 0x42acf871UL,
+    0xdf7bc0c8UL, 0x67c7a7adUL, 0x75720843UL, 0xcdce6f26UL, 0x95ad7f70UL,
+    0x2d111815UL, 0x3fa4b7fbUL, 0x8718d09eUL, 0x1acfe827UL, 0xa2738f42UL,
+    0xb0c620acUL, 0x087a47c9UL, 0xa032af3eUL, 0x188ec85bUL, 0x0a3b67b5UL,
+    0xb28700d0UL, 0x2f503869UL, 0x97ec5f0cUL, 0x8559f0e2UL, 0x3de59787UL,
+    0x658687d1UL, 0xdd3ae0b4UL, 0xcf8f4f5aUL, 0x7733283fUL, 0xeae41086UL,
+    0x525877e3UL, 0x40edd80dUL, 0xf851bf68UL, 0xf02bf8a1UL, 0x48979fc4UL,
+    0x5a22302aUL, 0xe29e574fUL, 0x7f496ff6UL, 0xc7f50893UL, 0xd540a77dUL,
+    0x6dfcc018UL, 0x359fd04eUL, 0x8d23b72bUL, 0x9f9618c5UL, 0x272a7fa0UL,
+    0xbafd4719UL, 0x0241207cUL, 0x10f48f92UL, 0xa848e8f7UL, 0x9b14583dUL,
+    0x23a83f58UL, 0x311d90b6UL, 0x89a1f7d3UL, 0x1476cf6aUL, 0xaccaa80fUL,
+    0xbe7f07e1UL, 0x06c36084UL, 0x5ea070d2UL, 0xe61c17b7UL, 0xf4a9b859UL,
+    0x4c15df3cUL, 0xd1c2e785UL, 0x697e80e0UL, 0x7bcb2f0eUL, 0xc377486bUL,
+    0xcb0d0fa2UL, 0x73b168c7UL, 0x6104c729UL, 0xd9b8a04cUL, 0x446f98f5UL,
+    0xfcd3ff90UL, 0xee66507eUL, 0x56da371bUL, 0x0eb9274dUL, 0xb6054028UL,
+    0xa4b0efc6UL, 0x1c0c88a3UL, 0x81dbb01aUL, 0x3967d77fUL, 0x2bd27891UL,
+    0x936e1ff4UL, 0x3b26f703UL, 0x839a9066UL, 0x912f3f88UL, 0x299358edUL,
+    0xb4446054UL, 0x0cf80731UL, 0x1e4da8dfUL, 0xa6f1cfbaUL, 0xfe92dfecUL,
+    0x462eb889UL, 0x549b1767UL, 0xec277002UL, 0x71f048bbUL, 0xc94c2fdeUL,
+    0xdbf98030UL, 0x6345e755UL, 0x6b3fa09cUL, 0xd383c7f9UL, 0xc1366817UL,
+    0x798a0f72UL, 0xe45d37cbUL, 0x5ce150aeUL, 0x4e54ff40UL, 0xf6e89825UL,
+    0xae8b8873UL, 0x1637ef16UL, 0x048240f8UL, 0xbc3e279dUL, 0x21e91f24UL,
+    0x99557841UL, 0x8be0d7afUL, 0x335cb0caUL, 0xed59b63bUL, 0x55e5d15eUL,
+    0x47507eb0UL, 0xffec19d5UL, 0x623b216cUL, 0xda874609UL, 0xc832e9e7UL,
+    0x708e8e82UL, 0x28ed9ed4UL, 0x9051f9b1UL, 0x82e4565fUL, 0x3a58313aUL,
+    0xa78f0983UL, 0x1f336ee6UL, 0x0d86c108UL, 0xb53aa66dUL, 0xbd40e1a4UL,
+    0x05fc86c1UL, 0x1749292fUL, 0xaff54e4aUL, 0x322276f3UL, 0x8a9e1196UL,
+    0x982bbe78UL, 0x2097d91dUL, 0x78f4c94bUL, 0xc048ae2eUL, 0xd2fd01c0UL,
+    0x6a4166a5UL, 0xf7965e1cUL, 0x4f2a3979UL, 0x5d9f9697UL, 0xe523f1f2UL,
+    0x4d6b1905UL, 0xf5d77e60UL, 0xe762d18eUL, 0x5fdeb6ebUL, 0xc2098e52UL,
+    0x7ab5e937UL, 0x680046d9UL, 0xd0bc21bcUL, 0x88df31eaUL, 0x3063568fUL,
+    0x22d6f961UL, 0x9a6a9e04UL, 0x07bda6bdUL, 0xbf01c1d8UL, 0xadb46e36UL,
+    0x15080953UL, 0x1d724e9aUL, 0xa5ce29ffUL, 0xb77b8611UL, 0x0fc7e174UL,
+    0x9210d9cdUL, 0x2aacbea8UL, 0x38191146UL, 0x80a57623UL, 0xd8c66675UL,
+    0x607a0110UL, 0x72cfaefeUL, 0xca73c99bUL, 0x57a4f122UL, 0xef189647UL,
+    0xfdad39a9UL, 0x45115eccUL, 0x764dee06UL, 0xcef18963UL, 0xdc44268dUL,
+    0x64f841e8UL, 0xf92f7951UL, 0x41931e34UL, 0x5326b1daUL, 0xeb9ad6bfUL,
+    0xb3f9c6e9UL, 0x0b45a18cUL, 0x19f00e62UL, 0xa14c6907UL, 0x3c9b51beUL,
+    0x842736dbUL, 0x96929935UL, 0x2e2efe50UL, 0x2654b999UL, 0x9ee8defcUL,
+    0x8c5d7112UL, 0x34e11677UL, 0xa9362eceUL, 0x118a49abUL, 0x033fe645UL,
+    0xbb838120UL, 0xe3e09176UL, 0x5b5cf613UL, 0x49e959fdUL, 0xf1553e98UL,
+    0x6c820621UL, 0xd43e6144UL, 0xc68bceaaUL, 0x7e37a9cfUL, 0xd67f4138UL,
+    0x6ec3265dUL, 0x7c7689b3UL, 0xc4caeed6UL, 0x591dd66fUL, 0xe1a1b10aUL,
+    0xf3141ee4UL, 0x4ba87981UL, 0x13cb69d7UL, 0xab770eb2UL, 0xb9c2a15cUL,
+    0x017ec639UL, 0x9ca9fe80UL, 0x241599e5UL, 0x36a0360bUL, 0x8e1c516eUL,
+    0x866616a7UL, 0x3eda71c2UL, 0x2c6fde2cUL, 0x94d3b949UL, 0x090481f0UL,
+    0xb1b8e695UL, 0xa30d497bUL, 0x1bb12e1eUL, 0x43d23e48UL, 0xfb6e592dUL,
+    0xe9dbf6c3UL, 0x516791a6UL, 0xccb0a91fUL, 0x740cce7aUL, 0x66b96194UL,
+    0xde0506f1UL
+  },
+  {
+    0x00000000UL, 0x96300777UL, 0x2c610eeeUL, 0xba510999UL, 0x19c46d07UL,
+    0x8ff46a70UL, 0x35a563e9UL, 0xa395649eUL, 0x3288db0eUL, 0xa4b8dc79UL,
+    0x1ee9d5e0UL, 0x88d9d297UL, 0x2b4cb609UL, 0xbd7cb17eUL, 0x072db8e7UL,
+    0x911dbf90UL, 0x6410b71dUL, 0xf220b06aUL, 0x4871b9f3UL, 0xde41be84UL,
+    0x7dd4da1aUL, 0xebe4dd6dUL, 0x51b5d4f4UL, 0xc785d383UL, 0x56986c13UL,
+    0xc0a86b64UL, 0x7af962fdUL, 0xecc9658aUL, 0x4f5c0114UL, 0xd96c0663UL,
+    0x633d0ffaUL, 0xf50d088dUL, 0xc8206e3bUL, 0x5e10694cUL, 0xe44160d5UL,
+    0x727167a2UL, 0xd1e4033cUL, 0x47d4044bUL, 0xfd850dd2UL, 0x6bb50aa5UL,
+    0xfaa8b535UL, 0x6c98b242UL, 0xd6c9bbdbUL, 0x40f9bcacUL, 0xe36cd832UL,
+    0x755cdf45UL, 0xcf0dd6dcUL, 0x593dd1abUL, 0xac30d926UL, 0x3a00de51UL,
+    0x8051d7c8UL, 0x1661d0bfUL, 0xb5f4b421UL, 0x23c4b356UL, 0x9995bacfUL,
+    0x0fa5bdb8UL, 0x9eb80228UL, 0x0888055fUL, 0xb2d90cc6UL, 0x24e90bb1UL,
+    0x877c6f2fUL, 0x114c6858UL, 0xab1d61c1UL, 0x3d2d66b6UL, 0x9041dc76UL,
+    0x0671db01UL, 0xbc20d298UL, 0x2a10d5efUL, 0x8985b171UL, 0x1fb5b606UL,
+    0xa5e4bf9fUL, 0x33d4b8e8UL, 0xa2c90778UL, 0x34f9000fUL, 0x8ea80996UL,
+    0x18980ee1UL, 0xbb0d6a7fUL, 0x2d3d6d08UL, 0x976c6491UL, 0x015c63e6UL,
+    0xf4516b6bUL, 0x62616c1cUL, 0xd8306585UL, 0x4e0062f2UL, 0xed95066cUL,
+    0x7ba5011bUL, 0xc1f40882UL, 0x57c40ff5UL, 0xc6d9b065UL, 0x50e9b712UL,
+    0xeab8be8bUL, 0x7c88b9fcUL, 0xdf1ddd62UL, 0x492dda15UL, 0xf37cd38cUL,
+    0x654cd4fbUL, 0x5861b24dUL, 0xce51b53aUL, 0x7400bca3UL, 0xe230bbd4UL,
+    0x41a5df4aUL, 0xd795d83dUL, 0x6dc4d1a4UL, 0xfbf4d6d3UL, 0x6ae96943UL,
+    0xfcd96e34UL, 0x468867adUL, 0xd0b860daUL, 0x732d0444UL, 0xe51d0333UL,
+    0x5f4c0aaaUL, 0xc97c0dddUL, 0x3c710550UL, 0xaa410227UL, 0x10100bbeUL,
+    0x86200cc9UL, 0x25b56857UL, 0xb3856f20UL, 0x09d466b9UL, 0x9fe461ceUL,
+    0x0ef9de5eUL, 0x98c9d929UL, 0x2298d0b0UL, 0xb4a8d7c7UL, 0x173db359UL,
+    0x810db42eUL, 0x3b5cbdb7UL, 0xad6cbac0UL, 0x2083b8edUL, 0xb6b3bf9aUL,
+    0x0ce2b603UL, 0x9ad2b174UL, 0x3947d5eaUL, 0xaf77d29dUL, 0x1526db04UL,
+    0x8316dc73UL, 0x120b63e3UL, 0x843b6494UL, 0x3e6a6d0dUL, 0xa85a6a7aUL,
+    0x0bcf0ee4UL, 0x9dff0993UL, 0x27ae000aUL, 0xb19e077dUL, 0x44930ff0UL,
+    0xd2a30887UL, 0x68f2011eUL, 0xfec20669UL, 0x5d5762f7UL, 0xcb676580UL,
+    0x71366c19UL, 0xe7066b6eUL, 0x761bd4feUL, 0xe02bd389UL, 0x5a7ada10UL,
+    0xcc4add67UL, 0x6fdfb9f9UL, 0xf9efbe8eUL, 0x43beb717UL, 0xd58eb060UL,
+    0xe8a3d6d6UL, 0x7e93d1a1UL, 0xc4c2d838UL, 0x52f2df4fUL, 0xf167bbd1UL,
+    0x6757bca6UL, 0xdd06b53fUL, 0x4b36b248UL, 0xda2b0dd8UL, 0x4c1b0aafUL,
+    0xf64a0336UL, 0x607a0441UL, 0xc3ef60dfUL, 0x55df67a8UL, 0xef8e6e31UL,
+    0x79be6946UL, 0x8cb361cbUL, 0x1a8366bcUL, 0xa0d26f25UL, 0x36e26852UL,
+    0x95770cccUL, 0x03470bbbUL, 0xb9160222UL, 0x2f260555UL, 0xbe3bbac5UL,
+    0x280bbdb2UL, 0x925ab42bUL, 0x046ab35cUL, 0xa7ffd7c2UL, 0x31cfd0b5UL,
+    0x8b9ed92cUL, 0x1daede5bUL, 0xb0c2649bUL, 0x26f263ecUL, 0x9ca36a75UL,
+    0x0a936d02UL, 0xa906099cUL, 0x3f360eebUL, 0x85670772UL, 0x13570005UL,
+    0x824abf95UL, 0x147ab8e2UL, 0xae2bb17bUL, 0x381bb60cUL, 0x9b8ed292UL,
+    0x0dbed5e5UL, 0xb7efdc7cUL, 0x21dfdb0bUL, 0xd4d2d386UL, 0x42e2d4f1UL,
+    0xf8b3dd68UL, 0x6e83da1fUL, 0xcd16be81UL, 0x5b26b9f6UL, 0xe177b06fUL,
+    0x7747b718UL, 0xe65a0888UL, 0x706a0fffUL, 0xca3b0666UL, 0x5c0b0111UL,
+    0xff9e658fUL, 0x69ae62f8UL, 0xd3ff6b61UL, 0x45cf6c16UL, 0x78e20aa0UL,
+    0xeed20dd7UL, 0x5483044eUL, 0xc2b30339UL, 0x612667a7UL, 0xf71660d0UL,
+    0x4d476949UL, 0xdb776e3eUL, 0x4a6ad1aeUL, 0xdc5ad6d9UL, 0x660bdf40UL,
+    0xf03bd837UL, 0x53aebca9UL, 0xc59ebbdeUL, 0x7fcfb247UL, 0xe9ffb530UL,
+    0x1cf2bdbdUL, 0x8ac2bacaUL, 0x3093b353UL, 0xa6a3b424UL, 0x0536d0baUL,
+    0x9306d7cdUL, 0x2957de54UL, 0xbf67d923UL, 0x2e7a66b3UL, 0xb84a61c4UL,
+    0x021b685dUL, 0x942b6f2aUL, 0x37be0bb4UL, 0xa18e0cc3UL, 0x1bdf055aUL,
+    0x8def022dUL
+  },
+  {
+    0x00000000UL, 0x41311b19UL, 0x82623632UL, 0xc3532d2bUL, 0x04c56c64UL,
+    0x45f4777dUL, 0x86a75a56UL, 0xc796414fUL, 0x088ad9c8UL, 0x49bbc2d1UL,
+    0x8ae8effaUL, 0xcbd9f4e3UL, 0x0c4fb5acUL, 0x4d7eaeb5UL, 0x8e2d839eUL,
+    0xcf1c9887UL, 0x5112c24aUL, 0x1023d953UL, 0xd370f478UL, 0x9241ef61UL,
+    0x55d7ae2eUL, 0x14e6b537UL, 0xd7b5981cUL, 0x96848305UL, 0x59981b82UL,
+    0x18a9009bUL, 0xdbfa2db0UL, 0x9acb36a9UL, 0x5d5d77e6UL, 0x1c6c6cffUL,
+    0xdf3f41d4UL, 0x9e0e5acdUL, 0xa2248495UL, 0xe3159f8cUL, 0x2046b2a7UL,
+    0x6177a9beUL, 0xa6e1e8f1UL, 0xe7d0f3e8UL, 0x2483dec3UL, 0x65b2c5daUL,
+    0xaaae5d5dUL, 0xeb9f4644UL, 0x28cc6b6fUL, 0x69fd7076UL, 0xae6b3139UL,
+    0xef5a2a20UL, 0x2c09070bUL, 0x6d381c12UL, 0xf33646dfUL, 0xb2075dc6UL,
+    0x715470edUL, 0x30656bf4UL, 0xf7f32abbUL, 0xb6c231a2UL, 0x75911c89UL,
+    0x34a00790UL, 0xfbbc9f17UL, 0xba8d840eUL, 0x79dea925UL, 0x38efb23cUL,
+    0xff79f373UL, 0xbe48e86aUL, 0x7d1bc541UL, 0x3c2ade58UL, 0x054f79f0UL,
+    0x447e62e9UL, 0x872d4fc2UL, 0xc61c54dbUL, 0x018a1594UL, 0x40bb0e8dUL,
+    0x83e823a6UL, 0xc2d938bfUL, 0x0dc5a038UL, 0x4cf4bb21UL, 0x8fa7960aUL,
+    0xce968d13UL, 0x0900cc5cUL, 0x4831d745UL, 0x8b62fa6eUL, 0xca53e177UL,
+    0x545dbbbaUL, 0x156ca0a3UL, 0xd63f8d88UL, 0x970e9691UL, 0x5098d7deUL,
+    0x11a9ccc7UL, 0xd2fae1ecUL, 0x93cbfaf5UL, 0x5cd76272UL, 0x1de6796bUL,
+    0xdeb55440UL, 0x9f844f59UL, 0x58120e16UL, 0x1923150fUL, 0xda703824UL,
+    0x9b41233dUL, 0xa76bfd65UL, 0xe65ae67cUL, 0x2509cb57UL, 0x6438d04eUL,
+    0xa3ae9101UL, 0xe29f8a18UL, 0x21cca733UL, 0x60fdbc2aUL, 0xafe124adUL,
+    0xeed03fb4UL, 0x2d83129fUL, 0x6cb20986UL, 0xab2448c9UL, 0xea1553d0UL,
+    0x29467efbUL, 0x687765e2UL, 0xf6793f2fUL, 0xb7482436UL, 0x741b091dUL,
+    0x352a1204UL, 0xf2bc534bUL, 0xb38d4852UL, 0x70de6579UL, 0x31ef7e60UL,
+    0xfef3e6e7UL, 0xbfc2fdfeUL, 0x7c91d0d5UL, 0x3da0cbccUL, 0xfa368a83UL,
+    0xbb07919aUL, 0x7854bcb1UL, 0x3965a7a8UL, 0x4b98833bUL, 0x0aa99822UL,
+    0xc9fab509UL, 0x88cbae10UL, 0x4f5def5fUL, 0x0e6cf446UL, 0xcd3fd96dUL,
+    0x8c0ec274UL, 0x43125af3UL, 0x022341eaUL, 0xc1706cc1UL, 0x804177d8UL,
+    0x47d73697UL, 0x06e62d8eUL, 0xc5b500a5UL, 0x84841bbcUL, 0x1a8a4171UL,
+    0x5bbb5a68UL, 0x98e87743UL, 0xd9d96c5aUL, 0x1e4f2d15UL, 0x5f7e360cUL,
+    0x9c2d1b27UL, 0xdd1c003eUL, 0x120098b9UL, 0x533183a0UL, 0x9062ae8bUL,
+    0xd153b592UL, 0x16c5f4ddUL, 0x57f4efc4UL, 0x94a7c2efUL, 0xd596d9f6UL,
+    0xe9bc07aeUL, 0xa88d1cb7UL, 0x6bde319cUL, 0x2aef2a85UL, 0xed796bcaUL,
+    0xac4870d3UL, 0x6f1b5df8UL, 0x2e2a46e1UL, 0xe136de66UL, 0xa007c57fUL,
+    0x6354e854UL, 0x2265f34dUL, 0xe5f3b202UL, 0xa4c2a91bUL, 0x67918430UL,
+    0x26a09f29UL, 0xb8aec5e4UL, 0xf99fdefdUL, 0x3accf3d6UL, 0x7bfde8cfUL,
+    0xbc6ba980UL, 0xfd5ab299UL, 0x3e099fb2UL, 0x7f3884abUL, 0xb0241c2cUL,
+    0xf1150735UL, 0x32462a1eUL, 0x73773107UL, 0xb4e17048UL, 0xf5d06b51UL,
+    0x3683467aUL, 0x77b25d63UL, 0x4ed7facbUL, 0x0fe6e1d2UL, 0xccb5ccf9UL,
+    0x8d84d7e0UL, 0x4a1296afUL, 0x0b238db6UL, 0xc870a09dUL, 0x8941bb84UL,
+    0x465d2303UL, 0x076c381aUL, 0xc43f1531UL, 0x850e0e28UL, 0x42984f67UL,
+    0x03a9547eUL, 0xc0fa7955UL, 0x81cb624cUL, 0x1fc53881UL, 0x5ef42398UL,
+    0x9da70eb3UL, 0xdc9615aaUL, 0x1b0054e5UL, 0x5a314ffcUL, 0x996262d7UL,
+    0xd85379ceUL, 0x174fe149UL, 0x567efa50UL, 0x952dd77bUL, 0xd41ccc62UL,
+    0x138a8d2dUL, 0x52bb9634UL, 0x91e8bb1fUL, 0xd0d9a006UL, 0xecf37e5eUL,
+    0xadc26547UL, 0x6e91486cUL, 0x2fa05375UL, 0xe836123aUL, 0xa9070923UL,
+    0x6a542408UL, 0x2b653f11UL, 0xe479a796UL, 0xa548bc8fUL, 0x661b91a4UL,
+    0x272a8abdUL, 0xe0bccbf2UL, 0xa18dd0ebUL, 0x62defdc0UL, 0x23efe6d9UL,
+    0xbde1bc14UL, 0xfcd0a70dUL, 0x3f838a26UL, 0x7eb2913fUL, 0xb924d070UL,
+    0xf815cb69UL, 0x3b46e642UL, 0x7a77fd5bUL, 0xb56b65dcUL, 0xf45a7ec5UL,
+    0x370953eeUL, 0x763848f7UL, 0xb1ae09b8UL, 0xf09f12a1UL, 0x33cc3f8aUL,
+    0x72fd2493UL
+  },
+  {
+    0x00000000UL, 0x376ac201UL, 0x6ed48403UL, 0x59be4602UL, 0xdca80907UL,
+    0xebc2cb06UL, 0xb27c8d04UL, 0x85164f05UL, 0xb851130eUL, 0x8f3bd10fUL,
+    0xd685970dUL, 0xe1ef550cUL, 0x64f91a09UL, 0x5393d808UL, 0x0a2d9e0aUL,
+    0x3d475c0bUL, 0x70a3261cUL, 0x47c9e41dUL, 0x1e77a21fUL, 0x291d601eUL,
+    0xac0b2f1bUL, 0x9b61ed1aUL, 0xc2dfab18UL, 0xf5b56919UL, 0xc8f23512UL,
+    0xff98f713UL, 0xa626b111UL, 0x914c7310UL, 0x145a3c15UL, 0x2330fe14UL,
+    0x7a8eb816UL, 0x4de47a17UL, 0xe0464d38UL, 0xd72c8f39UL, 0x8e92c93bUL,
+    0xb9f80b3aUL, 0x3cee443fUL, 0x0b84863eUL, 0x523ac03cUL, 0x6550023dUL,
+    0x58175e36UL, 0x6f7d9c37UL, 0x36c3da35UL, 0x01a91834UL, 0x84bf5731UL,
+    0xb3d59530UL, 0xea6bd332UL, 0xdd011133UL, 0x90e56b24UL, 0xa78fa925UL,
+    0xfe31ef27UL, 0xc95b2d26UL, 0x4c4d6223UL, 0x7b27a022UL, 0x2299e620UL,
+    0x15f32421UL, 0x28b4782aUL, 0x1fdeba2bUL, 0x4660fc29UL, 0x710a3e28UL,
+    0xf41c712dUL, 0xc376b32cUL, 0x9ac8f52eUL, 0xada2372fUL, 0xc08d9a70UL,
+    0xf7e75871UL, 0xae591e73UL, 0x9933dc72UL, 0x1c259377UL, 0x2b4f5176UL,
+    0x72f11774UL, 0x459bd575UL, 0x78dc897eUL, 0x4fb64b7fUL, 0x16080d7dUL,
+    0x2162cf7cUL, 0xa4748079UL, 0x931e4278UL, 0xcaa0047aUL, 0xfdcac67bUL,
+    0xb02ebc6cUL, 0x87447e6dUL, 0xdefa386fUL, 0xe990fa6eUL, 0x6c86b56bUL,
+    0x5bec776aUL, 0x02523168UL, 0x3538f369UL, 0x087faf62UL, 0x3f156d63UL,
+    0x66ab2b61UL, 0x51c1e960UL, 0xd4d7a665UL, 0xe3bd6464UL, 0xba032266UL,
+    0x8d69e067UL, 0x20cbd748UL, 0x17a11549UL, 0x4e1f534bUL, 0x7975914aUL,
+    0xfc63de4fUL, 0xcb091c4eUL, 0x92b75a4cUL, 0xa5dd984dUL, 0x989ac446UL,
+    0xaff00647UL, 0xf64e4045UL, 0xc1248244UL, 0x4432cd41UL, 0x73580f40UL,
+    0x2ae64942UL, 0x1d8c8b43UL, 0x5068f154UL, 0x67023355UL, 0x3ebc7557UL,
+    0x09d6b756UL, 0x8cc0f853UL, 0xbbaa3a52UL, 0xe2147c50UL, 0xd57ebe51UL,
+    0xe839e25aUL, 0xdf53205bUL, 0x86ed6659UL, 0xb187a458UL, 0x3491eb5dUL,
+    0x03fb295cUL, 0x5a456f5eUL, 0x6d2fad5fUL, 0x801b35e1UL, 0xb771f7e0UL,
+    0xeecfb1e2UL, 0xd9a573e3UL, 0x5cb33ce6UL, 0x6bd9fee7UL, 0x3267b8e5UL,
+    0x050d7ae4UL, 0x384a26efUL, 0x0f20e4eeUL, 0x569ea2ecUL, 0x61f460edUL,
+    0xe4e22fe8UL, 0xd388ede9UL, 0x8a36abebUL, 0xbd5c69eaUL, 0xf0b813fdUL,
+    0xc7d2d1fcUL, 0x9e6c97feUL, 0xa90655ffUL, 0x2c101afaUL, 0x1b7ad8fbUL,
+    0x42c49ef9UL, 0x75ae5cf8UL, 0x48e900f3UL, 0x7f83c2f2UL, 0x263d84f0UL,
+    0x115746f1UL, 0x944109f4UL, 0xa32bcbf5UL, 0xfa958df7UL, 0xcdff4ff6UL,
+    0x605d78d9UL, 0x5737bad8UL, 0x0e89fcdaUL, 0x39e33edbUL, 0xbcf571deUL,
+    0x8b9fb3dfUL, 0xd221f5ddUL, 0xe54b37dcUL, 0xd80c6bd7UL, 0xef66a9d6UL,
+    0xb6d8efd4UL, 0x81b22dd5UL, 0x04a462d0UL, 0x33cea0d1UL, 0x6a70e6d3UL,
+    0x5d1a24d2UL, 0x10fe5ec5UL, 0x27949cc4UL, 0x7e2adac6UL, 0x494018c7UL,
+    0xcc5657c2UL, 0xfb3c95c3UL, 0xa282d3c1UL, 0x95e811c0UL, 0xa8af4dcbUL,
+    0x9fc58fcaUL, 0xc67bc9c8UL, 0xf1110bc9UL, 0x740744ccUL, 0x436d86cdUL,
+    0x1ad3c0cfUL, 0x2db902ceUL, 0x4096af91UL, 0x77fc6d90UL, 0x2e422b92UL,
+    0x1928e993UL, 0x9c3ea696UL, 0xab546497UL, 0xf2ea2295UL, 0xc580e094UL,
+    0xf8c7bc9fUL, 0xcfad7e9eUL, 0x9613389cUL, 0xa179fa9dUL, 0x246fb598UL,
+    0x13057799UL, 0x4abb319bUL, 0x7dd1f39aUL, 0x3035898dUL, 0x075f4b8cUL,
+    0x5ee10d8eUL, 0x698bcf8fUL, 0xec9d808aUL, 0xdbf7428bUL, 0x82490489UL,
+    0xb523c688UL, 0x88649a83UL, 0xbf0e5882UL, 0xe6b01e80UL, 0xd1dadc81UL,
+    0x54cc9384UL, 0x63a65185UL, 0x3a181787UL, 0x0d72d586UL, 0xa0d0e2a9UL,
+    0x97ba20a8UL, 0xce0466aaUL, 0xf96ea4abUL, 0x7c78ebaeUL, 0x4b1229afUL,
+    0x12ac6fadUL, 0x25c6adacUL, 0x1881f1a7UL, 0x2feb33a6UL, 0x765575a4UL,
+    0x413fb7a5UL, 0xc429f8a0UL, 0xf3433aa1UL, 0xaafd7ca3UL, 0x9d97bea2UL,
+    0xd073c4b5UL, 0xe71906b4UL, 0xbea740b6UL, 0x89cd82b7UL, 0x0cdbcdb2UL,
+    0x3bb10fb3UL, 0x620f49b1UL, 0x55658bb0UL, 0x6822d7bbUL, 0x5f4815baUL,
+    0x06f653b8UL, 0x319c91b9UL, 0xb48adebcUL, 0x83e01cbdUL, 0xda5e5abfUL,
+    0xed3498beUL
+  },
+  {
+    0x00000000UL, 0x6567bcb8UL, 0x8bc809aaUL, 0xeeafb512UL, 0x5797628fUL,
+    0x32f0de37UL, 0xdc5f6b25UL, 0xb938d79dUL, 0xef28b4c5UL, 0x8a4f087dUL,
+    0x64e0bd6fUL, 0x018701d7UL, 0xb8bfd64aUL, 0xddd86af2UL, 0x3377dfe0UL,
+    0x56106358UL, 0x9f571950UL, 0xfa30a5e8UL, 0x149f10faUL, 0x71f8ac42UL,
+    0xc8c07bdfUL, 0xada7c767UL, 0x43087275UL, 0x266fcecdUL, 0x707fad95UL,
+    0x1518112dUL, 0xfbb7a43fUL, 0x9ed01887UL, 0x27e8cf1aUL, 0x428f73a2UL,
+    0xac20c6b0UL, 0xc9477a08UL, 0x3eaf32a0UL, 0x5bc88e18UL, 0xb5673b0aUL,
+    0xd00087b2UL, 0x6938502fUL, 0x0c5fec97UL, 0xe2f05985UL, 0x8797e53dUL,
+    0xd1878665UL, 0xb4e03addUL, 0x5a4f8fcfUL, 0x3f283377UL, 0x8610e4eaUL,
+    0xe3775852UL, 0x0dd8ed40UL, 0x68bf51f8UL, 0xa1f82bf0UL, 0xc49f9748UL,
+    0x2a30225aUL, 0x4f579ee2UL, 0xf66f497fUL, 0x9308f5c7UL, 0x7da740d5UL,
+    0x18c0fc6dUL, 0x4ed09f35UL, 0x2bb7238dUL, 0xc518969fUL, 0xa07f2a27UL,
+    0x1947fdbaUL, 0x7c204102UL, 0x928ff410UL, 0xf7e848a8UL, 0x3d58149bUL,
+    0x583fa823UL, 0xb6901d31UL, 0xd3f7a189UL, 0x6acf7614UL, 0x0fa8caacUL,
+    0xe1077fbeUL, 0x8460c306UL, 0xd270a05eUL, 0xb7171ce6UL, 0x59b8a9f4UL,
+    0x3cdf154cUL, 0x85e7c2d1UL, 0xe0807e69UL, 0x0e2fcb7bUL, 0x6b4877c3UL,
+    0xa20f0dcbUL, 0xc768b173UL, 0x29c70461UL, 0x4ca0b8d9UL, 0xf5986f44UL,
+    0x90ffd3fcUL, 0x7e5066eeUL, 0x1b37da56UL, 0x4d27b90eUL, 0x284005b6UL,
+    0xc6efb0a4UL, 0xa3880c1cUL, 0x1ab0db81UL, 0x7fd76739UL, 0x9178d22bUL,
+    0xf41f6e93UL, 0x03f7263bUL, 0x66909a83UL, 0x883f2f91UL, 0xed589329UL,
+    0x546044b4UL, 0x3107f80cUL, 0xdfa84d1eUL, 0xbacff1a6UL, 0xecdf92feUL,
+    0x89b82e46UL, 0x67179b54UL, 0x027027ecUL, 0xbb48f071UL, 0xde2f4cc9UL,
+    0x3080f9dbUL, 0x55e74563UL, 0x9ca03f6bUL, 0xf9c783d3UL, 0x176836c1UL,
+    0x720f8a79UL, 0xcb375de4UL, 0xae50e15cUL, 0x40ff544eUL, 0x2598e8f6UL,
+    0x73888baeUL, 0x16ef3716UL, 0xf8408204UL, 0x9d273ebcUL, 0x241fe921UL,
+    0x41785599UL, 0xafd7e08bUL, 0xcab05c33UL, 0x3bb659edUL, 0x5ed1e555UL,
+    0xb07e5047UL, 0xd519ecffUL, 0x6c213b62UL, 0x094687daUL, 0xe7e932c8UL,
+    0x828e8e70UL, 0xd49eed28UL, 0xb1f95190UL, 0x5f56e482UL, 0x3a31583aUL,
+    0x83098fa7UL, 0xe66e331fUL, 0x08c1860dUL, 0x6da63ab5UL, 0xa4e140bdUL,
+    0xc186fc05UL, 0x2f294917UL, 0x4a4ef5afUL, 0xf3762232UL, 0x96119e8aUL,
+    0x78be2b98UL, 0x1dd99720UL, 0x4bc9f478UL, 0x2eae48c0UL, 0xc001fdd2UL,
+    0xa566416aUL, 0x1c5e96f7UL, 0x79392a4fUL, 0x97969f5dUL, 0xf2f123e5UL,
+    0x05196b4dUL, 0x607ed7f5UL, 0x8ed162e7UL, 0xebb6de5fUL, 0x528e09c2UL,
+    0x37e9b57aUL, 0xd9460068UL, 0xbc21bcd0UL, 0xea31df88UL, 0x8f566330UL,
+    0x61f9d622UL, 0x049e6a9aUL, 0xbda6bd07UL, 0xd8c101bfUL, 0x366eb4adUL,
+    0x53090815UL, 0x9a4e721dUL, 0xff29cea5UL, 0x11867bb7UL, 0x74e1c70fUL,
+    0xcdd91092UL, 0xa8beac2aUL, 0x46111938UL, 0x2376a580UL, 0x7566c6d8UL,
+    0x10017a60UL, 0xfeaecf72UL, 0x9bc973caUL, 0x22f1a457UL, 0x479618efUL,
+    0xa939adfdUL, 0xcc5e1145UL, 0x06ee4d76UL, 0x6389f1ceUL, 0x8d2644dcUL,
+    0xe841f864UL, 0x51792ff9UL, 0x341e9341UL, 0xdab12653UL, 0xbfd69aebUL,
+    0xe9c6f9b3UL, 0x8ca1450bUL, 0x620ef019UL, 0x07694ca1UL, 0xbe519b3cUL,
+    0xdb362784UL, 0x35999296UL, 0x50fe2e2eUL, 0x99b95426UL, 0xfcdee89eUL,
+    0x12715d8cUL, 0x7716e134UL, 0xce2e36a9UL, 0xab498a11UL, 0x45e63f03UL,
+    0x208183bbUL, 0x7691e0e3UL, 0x13f65c5bUL, 0xfd59e949UL, 0x983e55f1UL,
+    0x2106826cUL, 0x44613ed4UL, 0xaace8bc6UL, 0xcfa9377eUL, 0x38417fd6UL,
+    0x5d26c36eUL, 0xb389767cUL, 0xd6eecac4UL, 0x6fd61d59UL, 0x0ab1a1e1UL,
+    0xe41e14f3UL, 0x8179a84bUL, 0xd769cb13UL, 0xb20e77abUL, 0x5ca1c2b9UL,
+    0x39c67e01UL, 0x80fea99cUL, 0xe5991524UL, 0x0b36a036UL, 0x6e511c8eUL,
+    0xa7166686UL, 0xc271da3eUL, 0x2cde6f2cUL, 0x49b9d394UL, 0xf0810409UL,
+    0x95e6b8b1UL, 0x7b490da3UL, 0x1e2eb11bUL, 0x483ed243UL, 0x2d596efbUL,
+    0xc3f6dbe9UL, 0xa6916751UL, 0x1fa9b0ccUL, 0x7ace0c74UL, 0x9461b966UL,
+    0xf10605deUL
+#endif
+  }
+};
diff --git a/src/zlib/deflate.c b/src/zlib/deflate.c
index 33a41e9ce..0fc53bc1e 100644
--- a/src/zlib/deflate.c
+++ b/src/zlib/deflate.c
@@ -1,1502 +1,1502 @@
-/* deflate.c -- compress data using the deflation algorithm

- * Copyright (C) 1995-2004 Jean-loup Gailly.

- * For conditions of distribution and use, see copyright notice in zlib.h

- */

-

-/*

- *  ALGORITHM

- *

- *      The "deflation" process depends on being able to identify portions

- *      of the input text which are identical to earlier input (within a

- *      sliding window trailing behind the input currently being processed).

- *

- *      The most straightforward technique turns out to be the fastest for

- *      most input files: try all possible matches and select the longest.

- *      The key feature of this algorithm is that insertions into the string

- *      dictionary are very simple and thus fast, and deletions are avoided

- *      completely. Insertions are performed at each input character, whereas

- *      string matches are performed only when the previous match ends. So it

- *      is preferable to spend more time in matches to allow very fast string

- *      insertions and avoid deletions. The matching algorithm for small

- *      strings is inspired from that of Rabin & Karp. A brute force approach

- *      is used to find longer strings when a small match has been found.

- *      A similar algorithm is used in comic (by Jan-Mark Wams) and freeze

- *      (by Leonid Broukhis).

- *         A previous version of this file used a more sophisticated algorithm

- *      (by Fiala and Greene) which is guaranteed to run in linear amortized

- *      time, but has a larger average cost, uses more memory and is patented.

- *      However the F&G algorithm may be faster for some highly redundant

- *      files if the parameter max_chain_length (described below) is too large.

- *

- *  ACKNOWLEDGEMENTS

- *

- *      The idea of lazy evaluation of matches is due to Jan-Mark Wams, and

- *      I found it in 'freeze' written by Leonid Broukhis.

- *      Thanks to many people for bug reports and testing.

- *

- *  REFERENCES

- *

- *      Deutsch, L.P.,"DEFLATE Compressed Data Format Specification".

- *      Available in http://www.ietf.org/rfc/rfc1951.txt

- *

- *      A description of the Rabin and Karp algorithm is given in the book

- *         "Algorithms" by R. Sedgewick, Addison-Wesley, p252.

- *

- *      Fiala,E.R., and Greene,D.H.

- *         Data Compression with Finite Windows, Comm.ACM, 32,4 (1989) 490-595

- *

- */

-

-/* @(#) $Id$ */

-

-#include "deflate.h"

-

-const char deflate_copyright[] =

-   " deflate 1.2.2 Copyright 1995-2004 Jean-loup Gailly ";

-/*

-  If you use the zlib library in a product, an acknowledgment is welcome

-  in the documentation of your product. If for some reason you cannot

-  include such an acknowledgment, I would appreciate that you keep this

-  copyright string in the executable of your product.

- */

-

-/* ===========================================================================

- *  Function prototypes.

- */

-typedef enum {

-    need_more,      /* block not completed, need more input or more output */

-    block_done,     /* block flush performed */

-    finish_started, /* finish started, need only more output at next deflate */

-    finish_done     /* finish done, accept no more input or output */

-} block_state;

-

-typedef block_state (*compress_func) OF((deflate_state *s, int flush));

-/* Compression function. Returns the block state after the call. */

-

-local void fill_window    OF((deflate_state *s));

-local block_state deflate_stored OF((deflate_state *s, int flush));

-local block_state deflate_fast   OF((deflate_state *s, int flush));

-#ifndef FASTEST

-local block_state deflate_slow   OF((deflate_state *s, int flush));

-#endif

-local void lm_init        OF((deflate_state *s));

-local void putShortMSB    OF((deflate_state *s, uInt b));

-local void flush_pending  OF((z_streamp strm));

-local int read_buf        OF((z_streamp strm, Bytef *buf, unsigned size));

-#ifndef FASTEST

-#ifdef ASMV

-      void match_init OF((void)); /* asm code initialization */

-      uInt longest_match  OF((deflate_state *s, IPos cur_match));

-#else

-local uInt longest_match  OF((deflate_state *s, IPos cur_match));

-#endif

-#endif

-local uInt longest_match_fast OF((deflate_state *s, IPos cur_match));

-

-#ifdef DEBUG

-local  void check_match OF((deflate_state *s, IPos start, IPos match,

-                            int length));

-#endif

-

-/* ===========================================================================

- * Local data

- */

-

-#define NIL 0

-/* Tail of hash chains */

-

-#ifndef TOO_FAR

-#  define TOO_FAR 4096

-#endif

-/* Matches of length 3 are discarded if their distance exceeds TOO_FAR */

-

-#define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1)

-/* Minimum amount of lookahead, except at the end of the input file.

- * See deflate.c for comments about the MIN_MATCH+1.

- */

-

-/* Values for max_lazy_match, good_match and max_chain_length, depending on

- * the desired pack level (0..9). The values given below have been tuned to

- * exclude worst case performance for pathological files. Better values may be

- * found for specific files.

- */

-typedef struct config_s {

-   ush good_length; /* reduce lazy search above this match length */

-   ush max_lazy;    /* do not perform lazy search above this match length */

-   ush nice_length; /* quit search above this match length */

-   ush max_chain;

-   compress_func func;

-} config;

-

-#ifdef FASTEST

-local const config configuration_table[2] = {

-/*      good lazy nice chain */

-/* 0 */ {0,    0,  0,    0, deflate_stored},  /* store only */

-/* 1 */ {4,    4,  8,    4, deflate_fast}}; /* max speed, no lazy matches */

-#else

-local const config configuration_table[10] = {

-/*      good lazy nice chain */

-/* 0 */ {0,    0,  0,    0, deflate_stored},  /* store only */

-/* 1 */ {4,    4,  8,    4, deflate_fast}, /* max speed, no lazy matches */

-/* 2 */ {4,    5, 16,    8, deflate_fast},

-/* 3 */ {4,    6, 32,   32, deflate_fast},

-

-/* 4 */ {4,    4, 16,   16, deflate_slow},  /* lazy matches */

-/* 5 */ {8,   16, 32,   32, deflate_slow},

-/* 6 */ {8,   16, 128, 128, deflate_slow},

-/* 7 */ {8,   32, 128, 256, deflate_slow},

-/* 8 */ {32, 128, 258, 1024, deflate_slow},

-/* 9 */ {32, 258, 258, 4096, deflate_slow}}; /* max compression */

-#endif

-

-/* Note: the deflate() code requires max_lazy >= MIN_MATCH and max_chain >= 4

- * For deflate_fast() (levels <= 3) good is ignored and lazy has a different

- * meaning.

- */

-

-#define EQUAL 0

-/* result of memcmp for equal strings */

-

-#ifndef NO_DUMMY_DECL

-struct static_tree_desc_s {int dummy;}; /* for buggy compilers */

-#endif

-

-/* ===========================================================================

- * Update a hash value with the given input byte

- * IN  assertion: all calls to to UPDATE_HASH are made with consecutive

- *    input characters, so that a running hash key can be computed from the

- *    previous key instead of complete recalculation each time.

- */

-#define UPDATE_HASH(s,h,c) (h = (((h)<<s->hash_shift) ^ (c)) & s->hash_mask)

-

-

-/* ===========================================================================

- * Insert string str in the dictionary and set match_head to the previous head

- * of the hash chain (the most recent string with same hash key). Return

- * the previous length of the hash chain.

- * If this file is compiled with -DFASTEST, the compression level is forced

- * to 1, and no hash chains are maintained.

- * IN  assertion: all calls to to INSERT_STRING are made with consecutive

- *    input characters and the first MIN_MATCH bytes of str are valid

- *    (except for the last MIN_MATCH-1 bytes of the input file).

- */

-#ifdef FASTEST

-#define INSERT_STRING(s, str, match_head) \

-   (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \

-    match_head = s->head[s->ins_h], \

-    s->head[s->ins_h] = (Pos)(str))

-#else

-#define INSERT_STRING(s, str, match_head) \

-   (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \

-    match_head = s->prev[(str) & s->w_mask] = s->head[s->ins_h], \

-    s->head[s->ins_h] = (Pos)(str))

-#endif

-

-/* ===========================================================================

- * Initialize the hash table (avoiding 64K overflow for 16 bit systems).

- * prev[] will be initialized on the fly.

- */

-#define CLEAR_HASH(s) \

-    s->head[s->hash_size-1] = NIL; \

-    zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head));

-

-/* ========================================================================= */

-int ZEXPORT deflateInit_(strm, level, version, stream_size)

-    z_streamp strm;

-    int level;

-    const char *version;

-    int stream_size;

-{

-    return deflateInit2_(strm, level, Z_DEFLATED, MAX_WBITS, DEF_MEM_LEVEL,

-                         Z_DEFAULT_STRATEGY, version, stream_size);

-    /* To do: ignore strm->next_in if we use it as window */

-}

-

-/* ========================================================================= */

-int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,

-                  version, stream_size)

-    z_streamp strm;

-    int  level;

-    int  method;

-    int  windowBits;

-    int  memLevel;

-    int  strategy;

-    const char *version;

-    int stream_size;

-{

-    deflate_state *s;

-    int wrap = 1;

-    static const char my_version[] = ZLIB_VERSION;

-

-    ushf *overlay;

-    /* We overlay pending_buf and d_buf+l_buf. This works since the average

-     * output size for (length,distance) codes is <= 24 bits.

-     */

-

-    if (version == Z_NULL || version[0] != my_version[0] ||

-        stream_size != sizeof(z_stream)) {

-        return Z_VERSION_ERROR;

-    }

-    if (strm == Z_NULL) return Z_STREAM_ERROR;

-

-    strm->msg = Z_NULL;

-    if (strm->zalloc == (alloc_func)0) {

-        strm->zalloc = zcalloc;

-        strm->opaque = (voidpf)0;

-    }

-    if (strm->zfree == (free_func)0) strm->zfree = zcfree;

-

-#ifdef FASTEST

-    if (level != 0) level = 1;

-#else

-    if (level == Z_DEFAULT_COMPRESSION) level = 6;

-#endif

-

-    if (windowBits < 0) { /* suppress zlib wrapper */

-        wrap = 0;

-        windowBits = -windowBits;

-    }

-#ifdef GZIP

-    else if (windowBits > 15) {

-        wrap = 2;       /* write gzip wrapper instead */

-        windowBits -= 16;

-    }

-#endif

-    if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method != Z_DEFLATED ||

-        windowBits < 8 || windowBits > 15 || level < 0 || level > 9 ||

-        strategy < 0 || strategy > Z_RLE) {

-        return Z_STREAM_ERROR;

-    }

-    if (windowBits == 8) windowBits = 9;  /* until 256-byte window bug fixed */

-    s = (deflate_state *) ZALLOC(strm, 1, sizeof(deflate_state));

-    if (s == Z_NULL) return Z_MEM_ERROR;

-    strm->state = (struct internal_state FAR *)s;

-    s->strm = strm;

-

-    s->wrap = wrap;

-    s->w_bits = windowBits;

-    s->w_size = 1 << s->w_bits;

-    s->w_mask = s->w_size - 1;

-

-    s->hash_bits = memLevel + 7;

-    s->hash_size = 1 << s->hash_bits;

-    s->hash_mask = s->hash_size - 1;

-    s->hash_shift =  ((s->hash_bits+MIN_MATCH-1)/MIN_MATCH);

-

-    s->window = (Bytef *) ZALLOC(strm, s->w_size, 2*sizeof(Byte));

-    s->prev   = (Posf *)  ZALLOC(strm, s->w_size, sizeof(Pos));

-    s->head   = (Posf *)  ZALLOC(strm, s->hash_size, sizeof(Pos));

-

-    s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */

-

-    overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2);

-    s->pending_buf = (uchf *) overlay;

-    s->pending_buf_size = (ulg)s->lit_bufsize * (sizeof(ush)+2L);

-

-    if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL ||

-        s->pending_buf == Z_NULL) {

-        s->status = FINISH_STATE;

-        strm->msg = (char*)ERR_MSG(Z_MEM_ERROR);

-        deflateEnd (strm);

-        return Z_MEM_ERROR;

-    }

-    s->d_buf = overlay + s->lit_bufsize/sizeof(ush);

-    s->l_buf = s->pending_buf + (1+sizeof(ush))*s->lit_bufsize;

-

-    s->level = level;

-    s->strategy = strategy;

-    s->method = (Byte)method;

-

-    return deflateReset(strm);

-}

-

-/* ========================================================================= */

-int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)

-    z_streamp strm;

-    const Bytef *dictionary;

-    uInt  dictLength;

-{

-    deflate_state *s;

-    uInt length = dictLength;

-    uInt n;

-    IPos hash_head = 0;

-

-    if (strm == Z_NULL || strm->state == Z_NULL || dictionary == Z_NULL ||

-        strm->state->wrap == 2 ||

-        (strm->state->wrap == 1 && strm->state->status != INIT_STATE))

-        return Z_STREAM_ERROR;

-

-    s = strm->state;

-    if (s->wrap)

-        strm->adler = adler32(strm->adler, dictionary, dictLength);

-

-    if (length < MIN_MATCH) return Z_OK;

-    if (length > MAX_DIST(s)) {

-        length = MAX_DIST(s);

-#ifndef USE_DICT_HEAD

-        dictionary += dictLength - length; /* use the tail of the dictionary */

-#endif

-    }

-    zmemcpy(s->window, dictionary, length);

-    s->strstart = length;

-    s->block_start = (long)length;

-

-    /* Insert all strings in the hash table (except for the last two bytes).

-     * s->lookahead stays null, so s->ins_h will be recomputed at the next

-     * call of fill_window.

-     */

-    s->ins_h = s->window[0];

-    UPDATE_HASH(s, s->ins_h, s->window[1]);

-    for (n = 0; n <= length - MIN_MATCH; n++) {

-        INSERT_STRING(s, n, hash_head);

-    }

-    if (hash_head) hash_head = 0;  /* to make compiler happy */

-    return Z_OK;

-}

-

-/* ========================================================================= */

-int ZEXPORT deflateReset (strm)

-    z_streamp strm;

-{

-    deflate_state *s;

-

-    if (strm == Z_NULL || strm->state == Z_NULL ||

-        strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0) {

-        return Z_STREAM_ERROR;

-    }

-

-    strm->total_in = strm->total_out = 0;

-    strm->msg = Z_NULL; /* use zfree if we ever allocate msg dynamically */

-    strm->data_type = Z_UNKNOWN;

-

-    s = (deflate_state *)strm->state;

-    s->pending = 0;

-    s->pending_out = s->pending_buf;

-

-    if (s->wrap < 0) {

-        s->wrap = -s->wrap; /* was made negative by deflate(..., Z_FINISH); */

-    }

-    s->status = s->wrap ? INIT_STATE : BUSY_STATE;

-    strm->adler =

-#ifdef GZIP

-        s->wrap == 2 ? crc32(0L, Z_NULL, 0) :

-#endif

-        adler32(0L, Z_NULL, 0);

-    s->last_flush = Z_NO_FLUSH;

-

-    _tr_init(s);

-    lm_init(s);

-

-    return Z_OK;

-}

-

-/* ========================================================================= */

-int ZEXPORT deflatePrime (strm, bits, value)

-    z_streamp strm;

-    int bits;

-    int value;

-{

-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;

-    strm->state->bi_valid = bits;

-    strm->state->bi_buf = (ush)(value & ((1 << bits) - 1));

-    return Z_OK;

-}

-

-/* ========================================================================= */

-int ZEXPORT deflateParams(strm, level, strategy)

-    z_streamp strm;

-    int level;

-    int strategy;

-{

-    deflate_state *s;

-    compress_func func;

-    int err = Z_OK;

-

-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;

-    s = strm->state;

-

-#ifdef FASTEST

-    if (level != 0) level = 1;

-#else

-    if (level == Z_DEFAULT_COMPRESSION) level = 6;

-#endif

-    if (level < 0 || level > 9 || strategy < 0 || strategy > Z_RLE) {

-        return Z_STREAM_ERROR;

-    }

-    func = configuration_table[s->level].func;

-

-    if (func != configuration_table[level].func && strm->total_in != 0) {

-        /* Flush the last buffer: */

-        err = deflate(strm, Z_PARTIAL_FLUSH);

-    }

-    if (s->level != level) {

-        s->level = level;

-        s->max_lazy_match   = configuration_table[level].max_lazy;

-        s->good_match       = configuration_table[level].good_length;

-        s->nice_match       = configuration_table[level].nice_length;

-        s->max_chain_length = configuration_table[level].max_chain;

-    }

-    s->strategy = strategy;

-    return err;

-}

-

-/* =========================================================================

- * For the default windowBits of 15 and memLevel of 8, this function returns

- * a close to exact, as well as small, upper bound on the compressed size.

- * They are coded as constants here for a reason--if the #define's are

- * changed, then this function needs to be changed as well.  The return

- * value for 15 and 8 only works for those exact settings.

- *

- * For any setting other than those defaults for windowBits and memLevel,

- * the value returned is a conservative worst case for the maximum expansion

- * resulting from using fixed blocks instead of stored blocks, which deflate

- * can emit on compressed data for some combinations of the parameters.

- *

- * This function could be more sophisticated to provide closer upper bounds

- * for every combination of windowBits and memLevel, as well as wrap.

- * But even the conservative upper bound of about 14% expansion does not

- * seem onerous for output buffer allocation.

- */

-uLong ZEXPORT deflateBound(strm, sourceLen)

-    z_streamp strm;

-    uLong sourceLen;

-{

-    deflate_state *s;

-    uLong destLen;

-

-    /* conservative upper bound */

-    destLen = sourceLen +

-              ((sourceLen + 7) >> 3) + ((sourceLen + 63) >> 6) + 11;

-

-    /* if can't get parameters, return conservative bound */

-    if (strm == Z_NULL || strm->state == Z_NULL)

-        return destLen;

-

-    /* if not default parameters, return conservative bound */

-    s = strm->state;

-    if (s->w_bits != 15 || s->hash_bits != 8 + 7)

-        return destLen;

-

-    /* default settings: return tight bound for that case */

-    return compressBound(sourceLen);

-}

-

-/* =========================================================================

- * Put a short in the pending buffer. The 16-bit value is put in MSB order.

- * IN assertion: the stream state is correct and there is enough room in

- * pending_buf.

- */

-local void putShortMSB (s, b)

-    deflate_state *s;

-    uInt b;

-{

-    put_byte(s, (Byte)(b >> 8));

-    put_byte(s, (Byte)(b & 0xff));

-}

-

-/* =========================================================================

- * Flush as much pending output as possible. All deflate() output goes

- * through this function so some applications may wish to modify it

- * to avoid allocating a large strm->next_out buffer and copying into it.

- * (See also read_buf()).

- */

-local void flush_pending(strm)

-    z_streamp strm;

-{

-    unsigned len = strm->state->pending;

-

-    if (len > strm->avail_out) len = strm->avail_out;

-    if (len == 0) return;

-

-    zmemcpy(strm->next_out, strm->state->pending_out, len);

-    strm->next_out  += len;

-    strm->state->pending_out  += len;

-    strm->total_out += len;

-    strm->avail_out  -= len;

-    strm->state->pending -= len;

-    if (strm->state->pending == 0) {

-        strm->state->pending_out = strm->state->pending_buf;

-    }

-}

-

-/* ========================================================================= */

-int ZEXPORT deflate (strm, flush)

-    z_streamp strm;

-    int flush;

-{

-    int old_flush; /* value of flush param for previous deflate call */

-    deflate_state *s;

-

-    if (strm == Z_NULL || strm->state == Z_NULL ||

-        flush > Z_FINISH || flush < 0) {

-        return Z_STREAM_ERROR;

-    }

-    s = strm->state;

-

-    if (strm->next_out == Z_NULL ||

-        (strm->next_in == Z_NULL && strm->avail_in != 0) ||

-        (s->status == FINISH_STATE && flush != Z_FINISH)) {

-        ERR_RETURN(strm, Z_STREAM_ERROR);

-    }

-    if (strm->avail_out == 0) ERR_RETURN(strm, Z_BUF_ERROR);

-

-    s->strm = strm; /* just in case */

-    old_flush = s->last_flush;

-    s->last_flush = flush;

-

-    /* Write the header */

-    if (s->status == INIT_STATE) {

-#ifdef GZIP

-        if (s->wrap == 2) {

-            put_byte(s, 31);

-            put_byte(s, 139);

-            put_byte(s, 8);

-            put_byte(s, 0);

-            put_byte(s, 0);

-            put_byte(s, 0);

-            put_byte(s, 0);

-            put_byte(s, 0);

-            put_byte(s, s->level == 9 ? 2 :

-                        (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?

-                         4 : 0));

-            put_byte(s, 255);

-            s->status = BUSY_STATE;

-            strm->adler = crc32(0L, Z_NULL, 0);

-        }

-        else

-#endif

-        {

-            uInt header = (Z_DEFLATED + ((s->w_bits-8)<<4)) << 8;

-            uInt level_flags;

-

-            if (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2)

-                level_flags = 0;

-            else if (s->level < 6)

-                level_flags = 1;

-            else if (s->level == 6)

-                level_flags = 2;

-            else

-                level_flags = 3;

-            header |= (level_flags << 6);

-            if (s->strstart != 0) header |= PRESET_DICT;

-            header += 31 - (header % 31);

-

-            s->status = BUSY_STATE;

-            putShortMSB(s, header);

-

-            /* Save the adler32 of the preset dictionary: */

-            if (s->strstart != 0) {

-                putShortMSB(s, (uInt)(strm->adler >> 16));

-                putShortMSB(s, (uInt)(strm->adler & 0xffff));

-            }

-            strm->adler = adler32(0L, Z_NULL, 0);

-        }

-    }

-

-    /* Flush as much pending output as possible */

-    if (s->pending != 0) {

-        flush_pending(strm);

-        if (strm->avail_out == 0) {

-            /* Since avail_out is 0, deflate will be called again with

-             * more output space, but possibly with both pending and

-             * avail_in equal to zero. There won't be anything to do,

-             * but this is not an error situation so make sure we

-             * return OK instead of BUF_ERROR at next call of deflate:

-             */

-            s->last_flush = -1;

-            return Z_OK;

-        }

-

-    /* Make sure there is something to do and avoid duplicate consecutive

-     * flushes. For repeated and useless calls with Z_FINISH, we keep

-     * returning Z_STREAM_END instead of Z_BUF_ERROR.

-     */

-    } else if (strm->avail_in == 0 && flush <= old_flush &&

-               flush != Z_FINISH) {

-        ERR_RETURN(strm, Z_BUF_ERROR);

-    }

-

-    /* User must not provide more input after the first FINISH: */

-    if (s->status == FINISH_STATE && strm->avail_in != 0) {

-        ERR_RETURN(strm, Z_BUF_ERROR);

-    }

-

-    /* Start a new block or continue the current one.

-     */

-    if (strm->avail_in != 0 || s->lookahead != 0 ||

-        (flush != Z_NO_FLUSH && s->status != FINISH_STATE)) {

-        block_state bstate;

-

-        bstate = (*(configuration_table[s->level].func))(s, flush);

-

-        if (bstate == finish_started || bstate == finish_done) {

-            s->status = FINISH_STATE;

-        }

-        if (bstate == need_more || bstate == finish_started) {

-            if (strm->avail_out == 0) {

-                s->last_flush = -1; /* avoid BUF_ERROR next call, see above */

-            }

-            return Z_OK;

-            /* If flush != Z_NO_FLUSH && avail_out == 0, the next call

-             * of deflate should use the same flush parameter to make sure

-             * that the flush is complete. So we don't have to output an

-             * empty block here, this will be done at next call. This also

-             * ensures that for a very small output buffer, we emit at most

-             * one empty block.

-             */

-        }

-        if (bstate == block_done) {

-            if (flush == Z_PARTIAL_FLUSH) {

-                _tr_align(s);

-            } else { /* FULL_FLUSH or SYNC_FLUSH */

-                _tr_stored_block(s, (char*)0, 0L, 0);

-                /* For a full flush, this empty block will be recognized

-                 * as a special marker by inflate_sync().

-                 */

-                if (flush == Z_FULL_FLUSH) {

-                    CLEAR_HASH(s);             /* forget history */

-                }

-            }

-            flush_pending(strm);

-            if (strm->avail_out == 0) {

-              s->last_flush = -1; /* avoid BUF_ERROR at next call, see above */

-              return Z_OK;

-            }

-        }

-    }

-    Assert(strm->avail_out > 0, "bug2");

-

-    if (flush != Z_FINISH) return Z_OK;

-    if (s->wrap <= 0) return Z_STREAM_END;

-

-    /* Write the trailer */

-#ifdef GZIP

-    if (s->wrap == 2) {

-        put_byte(s, (Byte)(strm->adler & 0xff));

-        put_byte(s, (Byte)((strm->adler >> 8) & 0xff));

-        put_byte(s, (Byte)((strm->adler >> 16) & 0xff));

-        put_byte(s, (Byte)((strm->adler >> 24) & 0xff));

-        put_byte(s, (Byte)(strm->total_in & 0xff));

-        put_byte(s, (Byte)((strm->total_in >> 8) & 0xff));

-        put_byte(s, (Byte)((strm->total_in >> 16) & 0xff));

-        put_byte(s, (Byte)((strm->total_in >> 24) & 0xff));

-    }

-    else

-#endif

-    {

-        putShortMSB(s, (uInt)(strm->adler >> 16));

-        putShortMSB(s, (uInt)(strm->adler & 0xffff));

-    }

-    flush_pending(strm);

-    /* If avail_out is zero, the application will call deflate again

-     * to flush the rest.

-     */

-    if (s->wrap > 0) s->wrap = -s->wrap; /* write the trailer only once! */

-    return s->pending != 0 ? Z_OK : Z_STREAM_END;

-}

-

-/* ========================================================================= */

-int ZEXPORT deflateEnd (strm)

-    z_streamp strm;

-{

-    int status;

-

-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;

-

-    status = strm->state->status;

-    if (status != INIT_STATE && status != BUSY_STATE &&

-        status != FINISH_STATE) {

-      return Z_STREAM_ERROR;

-    }

-

-    /* Deallocate in reverse order of allocations: */

-    TRY_FREE(strm, strm->state->pending_buf);

-    TRY_FREE(strm, strm->state->head);

-    TRY_FREE(strm, strm->state->prev);

-    TRY_FREE(strm, strm->state->window);

-

-    ZFREE(strm, strm->state);

-    strm->state = Z_NULL;

-

-    return status == BUSY_STATE ? Z_DATA_ERROR : Z_OK;

-}

-

-/* =========================================================================

- * Copy the source state to the destination state.

- * To simplify the source, this is not supported for 16-bit MSDOS (which

- * doesn't have enough memory anyway to duplicate compression states).

- */

-int ZEXPORT deflateCopy (dest, source)

-    z_streamp dest;

-    z_streamp source;

-{

-#ifdef MAXSEG_64K

-    return Z_STREAM_ERROR;

-#else

-    deflate_state *ds;

-    deflate_state *ss;

-    ushf *overlay;

-

-

-    if (source == Z_NULL || dest == Z_NULL || source->state == Z_NULL) {

-        return Z_STREAM_ERROR;

-    }

-

-    ss = source->state;

-

-    *dest = *source;

-

-    ds = (deflate_state *) ZALLOC(dest, 1, sizeof(deflate_state));

-    if (ds == Z_NULL) return Z_MEM_ERROR;

-    dest->state = (struct internal_state FAR *) ds;

-    *ds = *ss;

-    ds->strm = dest;

-

-    ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte));

-    ds->prev   = (Posf *)  ZALLOC(dest, ds->w_size, sizeof(Pos));

-    ds->head   = (Posf *)  ZALLOC(dest, ds->hash_size, sizeof(Pos));

-    overlay = (ushf *) ZALLOC(dest, ds->lit_bufsize, sizeof(ush)+2);

-    ds->pending_buf = (uchf *) overlay;

-

-    if (ds->window == Z_NULL || ds->prev == Z_NULL || ds->head == Z_NULL ||

-        ds->pending_buf == Z_NULL) {

-        deflateEnd (dest);

-        return Z_MEM_ERROR;

-    }

-    /* following zmemcpy do not work for 16-bit MSDOS */

-    zmemcpy(ds->window, ss->window, ds->w_size * 2 * sizeof(Byte));

-    zmemcpy(ds->prev, ss->prev, ds->w_size * sizeof(Pos));

-    zmemcpy(ds->head, ss->head, ds->hash_size * sizeof(Pos));

-    zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size);

-

-    ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf);

-    ds->d_buf = overlay + ds->lit_bufsize/sizeof(ush);

-    ds->l_buf = ds->pending_buf + (1+sizeof(ush))*ds->lit_bufsize;

-

-    ds->l_desc.dyn_tree = ds->dyn_ltree;

-    ds->d_desc.dyn_tree = ds->dyn_dtree;

-    ds->bl_desc.dyn_tree = ds->bl_tree;

-

-    return Z_OK;

-#endif /* MAXSEG_64K */

-}

-

-/* ===========================================================================

- * Read a new buffer from the current input stream, update the adler32

- * and total number of bytes read.  All deflate() input goes through

- * this function so some applications may wish to modify it to avoid

- * allocating a large strm->next_in buffer and copying from it.

- * (See also flush_pending()).

- */

-local int read_buf(strm, buf, size)

-    z_streamp strm;

-    Bytef *buf;

-    unsigned size;

-{

-    unsigned len = strm->avail_in;

-

-    if (len > size) len = size;

-    if (len == 0) return 0;

-

-    strm->avail_in  -= len;

-

-    if (strm->state->wrap == 1) {

-        strm->adler = adler32(strm->adler, strm->next_in, len);

-    }

-#ifdef GZIP

-    else if (strm->state->wrap == 2) {

-        strm->adler = crc32(strm->adler, strm->next_in, len);

-    }

-#endif

-    zmemcpy(buf, strm->next_in, len);

-    strm->next_in  += len;

-    strm->total_in += len;

-

-    return (int)len;

-}

-

-/* ===========================================================================

- * Initialize the "longest match" routines for a new zlib stream

- */

-local void lm_init (s)

-    deflate_state *s;

-{

-    s->window_size = (ulg)2L*s->w_size;

-

-    CLEAR_HASH(s);

-

-    /* Set the default configuration parameters:

-     */

-    s->max_lazy_match   = configuration_table[s->level].max_lazy;

-    s->good_match       = configuration_table[s->level].good_length;

-    s->nice_match       = configuration_table[s->level].nice_length;

-    s->max_chain_length = configuration_table[s->level].max_chain;

-

-    s->strstart = 0;

-    s->block_start = 0L;

-    s->lookahead = 0;

-    s->match_length = s->prev_length = MIN_MATCH-1;

-    s->match_available = 0;

-    s->ins_h = 0;

-#ifdef ASMV

-    match_init(); /* initialize the asm code */

-#endif

-}

-

-#ifndef FASTEST

-/* ===========================================================================

- * Set match_start to the longest match starting at the given string and

- * return its length. Matches shorter or equal to prev_length are discarded,

- * in which case the result is equal to prev_length and match_start is

- * garbage.

- * IN assertions: cur_match is the head of the hash chain for the current

- *   string (strstart) and its distance is <= MAX_DIST, and prev_length >= 1

- * OUT assertion: the match length is not greater than s->lookahead.

- */

-#ifndef ASMV

-/* For 80x86 and 680x0, an optimized version will be provided in match.asm or

- * match.S. The code will be functionally equivalent.

- */

-local uInt longest_match(s, cur_match)

-    deflate_state *s;

-    IPos cur_match;                             /* current match */

-{

-    unsigned chain_length = s->max_chain_length;/* max hash chain length */

-    register Bytef *scan = s->window + s->strstart; /* current string */

-    register Bytef *match;                       /* matched string */

-    register int len;                           /* length of current match */

-    int best_len = s->prev_length;              /* best match length so far */

-    int nice_match = s->nice_match;             /* stop if match long enough */

-    IPos limit = s->strstart > (IPos)MAX_DIST(s) ?

-        s->strstart - (IPos)MAX_DIST(s) : NIL;

-    /* Stop when cur_match becomes <= limit. To simplify the code,

-     * we prevent matches with the string of window index 0.

-     */

-    Posf *prev = s->prev;

-    uInt wmask = s->w_mask;

-

-#ifdef UNALIGNED_OK

-    /* Compare two bytes at a time. Note: this is not always beneficial.

-     * Try with and without -DUNALIGNED_OK to check.

-     */

-    register Bytef *strend = s->window + s->strstart + MAX_MATCH - 1;

-    register ush scan_start = *(ushf*)scan;

-    register ush scan_end   = *(ushf*)(scan+best_len-1);

-#else

-    register Bytef *strend = s->window + s->strstart + MAX_MATCH;

-    register Byte scan_end1  = scan[best_len-1];

-    register Byte scan_end   = scan[best_len];

-#endif

-

-    /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.

-     * It is easy to get rid of this optimization if necessary.

-     */

-    Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");

-

-    /* Do not waste too much time if we already have a good match: */

-    if (s->prev_length >= s->good_match) {

-        chain_length >>= 2;

-    }

-    /* Do not look for matches beyond the end of the input. This is necessary

-     * to make deflate deterministic.

-     */

-    if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead;

-

-    Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");

-

-    do {

-        Assert(cur_match < s->strstart, "no future");

-        match = s->window + cur_match;

-

-        /* Skip to next match if the match length cannot increase

-         * or if the match length is less than 2:

-         */

-#if (defined(UNALIGNED_OK) && MAX_MATCH == 258)

-        /* This code assumes sizeof(unsigned short) == 2. Do not use

-         * UNALIGNED_OK if your compiler uses a different size.

-         */

-        if (*(ushf*)(match+best_len-1) != scan_end ||

-            *(ushf*)match != scan_start) continue;

-

-        /* It is not necessary to compare scan[2] and match[2] since they are

-         * always equal when the other bytes match, given that the hash keys

-         * are equal and that HASH_BITS >= 8. Compare 2 bytes at a time at

-         * strstart+3, +5, ... up to strstart+257. We check for insufficient

-         * lookahead only every 4th comparison; the 128th check will be made

-         * at strstart+257. If MAX_MATCH-2 is not a multiple of 8, it is

-         * necessary to put more guard bytes at the end of the window, or

-         * to check more often for insufficient lookahead.

-         */

-        Assert(scan[2] == match[2], "scan[2]?");

-        scan++, match++;

-        do {

-        } while (*(ushf*)(scan+=2) == *(ushf*)(match+=2) &&

-                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&

-                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&

-                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&

-                 scan < strend);

-        /* The funny "do {}" generates better code on most compilers */

-

-        /* Here, scan <= window+strstart+257 */

-        Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");

-        if (*scan == *match) scan++;

-

-        len = (MAX_MATCH - 1) - (int)(strend-scan);

-        scan = strend - (MAX_MATCH-1);

-

-#else /* UNALIGNED_OK */

-

-        if (match[best_len]   != scan_end  ||

-            match[best_len-1] != scan_end1 ||

-            *match            != *scan     ||

-            *++match          != scan[1])      continue;

-

-        /* The check at best_len-1 can be removed because it will be made

-         * again later. (This heuristic is not always a win.)

-         * It is not necessary to compare scan[2] and match[2] since they

-         * are always equal when the other bytes match, given that

-         * the hash keys are equal and that HASH_BITS >= 8.

-         */

-        scan += 2, match++;

-        Assert(*scan == *match, "match[2]?");

-

-        /* We check for insufficient lookahead only every 8th comparison;

-         * the 256th check will be made at strstart+258.

-         */

-        do {

-        } while (*++scan == *++match && *++scan == *++match &&

-                 *++scan == *++match && *++scan == *++match &&

-                 *++scan == *++match && *++scan == *++match &&

-                 *++scan == *++match && *++scan == *++match &&

-                 scan < strend);

-

-        Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");

-

-        len = MAX_MATCH - (int)(strend - scan);

-        scan = strend - MAX_MATCH;

-

-#endif /* UNALIGNED_OK */

-

-        if (len > best_len) {

-            s->match_start = cur_match;

-            best_len = len;

-            if (len >= nice_match) break;

-#ifdef UNALIGNED_OK

-            scan_end = *(ushf*)(scan+best_len-1);

-#else

-            scan_end1  = scan[best_len-1];

-            scan_end   = scan[best_len];

-#endif

-        }

-    } while ((cur_match = prev[cur_match & wmask]) > limit

-             && --chain_length != 0);

-

-    if ((uInt)best_len <= s->lookahead) return (uInt)best_len;

-    return s->lookahead;

-}

-#endif /* ASMV */

-#endif /* FASTEST */

-

-/* ---------------------------------------------------------------------------

- * Optimized version for level == 1 or strategy == Z_RLE only

- */

-local uInt longest_match_fast(s, cur_match)

-    deflate_state *s;

-    IPos cur_match;                             /* current match */

-{

-    register Bytef *scan = s->window + s->strstart; /* current string */

-    register Bytef *match;                       /* matched string */

-    register int len;                           /* length of current match */

-    register Bytef *strend = s->window + s->strstart + MAX_MATCH;

-

-    /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.

-     * It is easy to get rid of this optimization if necessary.

-     */

-    Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");

-

-    Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");

-

-    Assert(cur_match < s->strstart, "no future");

-

-    match = s->window + cur_match;

-

-    /* Return failure if the match length is less than 2:

-     */

-    if (match[0] != scan[0] || match[1] != scan[1]) return MIN_MATCH-1;

-

-    /* The check at best_len-1 can be removed because it will be made

-     * again later. (This heuristic is not always a win.)

-     * It is not necessary to compare scan[2] and match[2] since they

-     * are always equal when the other bytes match, given that

-     * the hash keys are equal and that HASH_BITS >= 8.

-     */

-    scan += 2, match += 2;

-    Assert(*scan == *match, "match[2]?");

-

-    /* We check for insufficient lookahead only every 8th comparison;

-     * the 256th check will be made at strstart+258.

-     */

-    do {

-    } while (*++scan == *++match && *++scan == *++match &&

-             *++scan == *++match && *++scan == *++match &&

-             *++scan == *++match && *++scan == *++match &&

-             *++scan == *++match && *++scan == *++match &&

-             scan < strend);

-

-    Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");

-

-    len = MAX_MATCH - (int)(strend - scan);

-

-    if (len < MIN_MATCH) return MIN_MATCH - 1;

-

-    s->match_start = cur_match;

-    return (uInt)len <= s->lookahead ? (uInt)len : s->lookahead;

-}

-

-#ifdef DEBUG

-/* ===========================================================================

- * Check that the match at match_start is indeed a match.

- */

-local void check_match(s, start, match, length)

-    deflate_state *s;

-    IPos start, match;

-    int length;

-{

-    /* check that the match is indeed a match */

-    if (zmemcmp(s->window + match,

-                s->window + start, length) != EQUAL) {

-        fprintf(stderr, " start %u, match %u, length %d\n",

-                start, match, length);

-        do {

-            fprintf(stderr, "%c%c", s->window[match++], s->window[start++]);

-        } while (--length != 0);

-        z_error("invalid match");

-    }

-    if (z_verbose > 1) {

-        fprintf(stderr,"\\[%d,%d]", start-match, length);

-        do { putc(s->window[start++], stderr); } while (--length != 0);

-    }

-}

-#else

-#  define check_match(s, start, match, length)

-#endif /* DEBUG */

-

-/* ===========================================================================

- * Fill the window when the lookahead becomes insufficient.

- * Updates strstart and lookahead.

- *

- * IN assertion: lookahead < MIN_LOOKAHEAD

- * OUT assertions: strstart <= window_size-MIN_LOOKAHEAD

- *    At least one byte has been read, or avail_in == 0; reads are

- *    performed for at least two bytes (required for the zip translate_eol

- *    option -- not supported here).

- */

-local void fill_window(s)

-    deflate_state *s;

-{

-    register unsigned n, m;

-    register Posf *p;

-    unsigned more;    /* Amount of free space at the end of the window. */

-    uInt wsize = s->w_size;

-

-    do {

-        more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart);

-

-        /* Deal with !@#$% 64K limit: */

-        if (sizeof(int) <= 2) {

-            if (more == 0 && s->strstart == 0 && s->lookahead == 0) {

-                more = wsize;

-

-            } else if (more == (unsigned)(-1)) {

-                /* Very unlikely, but possible on 16 bit machine if

-                 * strstart == 0 && lookahead == 1 (input done a byte at time)

-                 */

-                more--;

-            }

-        }

-

-        /* If the window is almost full and there is insufficient lookahead,

-         * move the upper half to the lower one to make room in the upper half.

-         */

-        if (s->strstart >= wsize+MAX_DIST(s)) {

-

-            zmemcpy(s->window, s->window+wsize, (unsigned)wsize);

-            s->match_start -= wsize;

-            s->strstart    -= wsize; /* we now have strstart >= MAX_DIST */

-            s->block_start -= (long) wsize;

-

-            /* Slide the hash table (could be avoided with 32 bit values

-               at the expense of memory usage). We slide even when level == 0

-               to keep the hash table consistent if we switch back to level > 0

-               later. (Using level 0 permanently is not an optimal usage of

-               zlib, so we don't care about this pathological case.)

-             */

-            n = s->hash_size;

-            p = &s->head[n];

-            do {

-                m = *--p;

-                *p = (Pos)(m >= wsize ? m-wsize : NIL);

-            } while (--n);

-

-            n = wsize;

-#ifndef FASTEST

-            p = &s->prev[n];

-            do {

-                m = *--p;

-                *p = (Pos)(m >= wsize ? m-wsize : NIL);

-                /* If n is not on any hash chain, prev[n] is garbage but

-                 * its value will never be used.

-                 */

-            } while (--n);

-#endif

-            more += wsize;

-        }

-        if (s->strm->avail_in == 0) return;

-

-        /* If there was no sliding:

-         *    strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 &&

-         *    more == window_size - lookahead - strstart

-         * => more >= window_size - (MIN_LOOKAHEAD-1 + WSIZE + MAX_DIST-1)

-         * => more >= window_size - 2*WSIZE + 2

-         * In the BIG_MEM or MMAP case (not yet supported),

-         *   window_size == input_size + MIN_LOOKAHEAD  &&

-         *   strstart + s->lookahead <= input_size => more >= MIN_LOOKAHEAD.

-         * Otherwise, window_size == 2*WSIZE so more >= 2.

-         * If there was sliding, more >= WSIZE. So in all cases, more >= 2.

-         */

-        Assert(more >= 2, "more < 2");

-

-        n = read_buf(s->strm, s->window + s->strstart + s->lookahead, more);

-        s->lookahead += n;

-

-        /* Initialize the hash value now that we have some input: */

-        if (s->lookahead >= MIN_MATCH) {

-            s->ins_h = s->window[s->strstart];

-            UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]);

-#if MIN_MATCH != 3

-            Call UPDATE_HASH() MIN_MATCH-3 more times

-#endif

-        }

-        /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage,

-         * but this is not important since only literal bytes will be emitted.

-         */

-

-    } while (s->lookahead < MIN_LOOKAHEAD && s->strm->avail_in != 0);

-}

-

-/* ===========================================================================

- * Flush the current block, with given end-of-file flag.

- * IN assertion: strstart is set to the end of the current match.

- */

-#define FLUSH_BLOCK_ONLY(s, eof) { \

-   _tr_flush_block(s, (s->block_start >= 0L ? \

-                   (charf *)&s->window[(unsigned)s->block_start] : \

-                   (charf *)Z_NULL), \

-                (ulg)((long)s->strstart - s->block_start), \

-                (eof)); \

-   s->block_start = s->strstart; \

-   flush_pending(s->strm); \

-   Tracev((stderr,"[FLUSH]")); \

-}

-

-/* Same but force premature exit if necessary. */

-#define FLUSH_BLOCK(s, eof) { \

-   FLUSH_BLOCK_ONLY(s, eof); \

-   if (s->strm->avail_out == 0) return (eof) ? finish_started : need_more; \

-}

-

-/* ===========================================================================

- * Copy without compression as much as possible from the input stream, return

- * the current block state.

- * This function does not insert new strings in the dictionary since

- * uncompressible data is probably not useful. This function is used

- * only for the level=0 compression option.

- * NOTE: this function should be optimized to avoid extra copying from

- * window to pending_buf.

- */

-local block_state deflate_stored(s, flush)

-    deflate_state *s;

-    int flush;

-{

-    /* Stored blocks are limited to 0xffff bytes, pending_buf is limited

-     * to pending_buf_size, and each stored block has a 5 byte header:

-     */

-    ulg max_block_size = 0xffff;

-    ulg max_start;

-

-    if (max_block_size > s->pending_buf_size - 5) {

-        max_block_size = s->pending_buf_size - 5;

-    }

-

-    /* Copy as much as possible from input to output: */

-    for (;;) {

-        /* Fill the window as much as possible: */

-        if (s->lookahead <= 1) {

-

-            Assert(s->strstart < s->w_size+MAX_DIST(s) ||

-                   s->block_start >= (long)s->w_size, "slide too late");

-

-            fill_window(s);

-            if (s->lookahead == 0 && flush == Z_NO_FLUSH) return need_more;

-

-            if (s->lookahead == 0) break; /* flush the current block */

-        }

-        Assert(s->block_start >= 0L, "block gone");

-

-        s->strstart += s->lookahead;

-        s->lookahead = 0;

-

-        /* Emit a stored block if pending_buf will be full: */

-        max_start = s->block_start + max_block_size;

-        if (s->strstart == 0 || (ulg)s->strstart >= max_start) {

-            /* strstart == 0 is possible when wraparound on 16-bit machine */

-            s->lookahead = (uInt)(s->strstart - max_start);

-            s->strstart = (uInt)max_start;

-            FLUSH_BLOCK(s, 0);

-        }

-        /* Flush if we may have to slide, otherwise block_start may become

-         * negative and the data will be gone:

-         */

-        if (s->strstart - (uInt)s->block_start >= MAX_DIST(s)) {

-            FLUSH_BLOCK(s, 0);

-        }

-    }

-    FLUSH_BLOCK(s, flush == Z_FINISH);

-    return flush == Z_FINISH ? finish_done : block_done;

-}

-

-/* ===========================================================================

- * Compress as much as possible from the input stream, return the current

- * block state.

- * This function does not perform lazy evaluation of matches and inserts

- * new strings in the dictionary only for unmatched strings or for short

- * matches. It is used only for the fast compression options.

- */

-local block_state deflate_fast(s, flush)

-    deflate_state *s;

-    int flush;

-{

-    IPos hash_head = NIL; /* head of the hash chain */

-    int bflush;           /* set if current block must be flushed */

-

-    for (;;) {

-        /* Make sure that we always have enough lookahead, except

-         * at the end of the input file. We need MAX_MATCH bytes

-         * for the next match, plus MIN_MATCH bytes to insert the

-         * string following the next match.

-         */

-        if (s->lookahead < MIN_LOOKAHEAD) {

-            fill_window(s);

-            if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) {

-                return need_more;

-            }

-            if (s->lookahead == 0) break; /* flush the current block */

-        }

-

-        /* Insert the string window[strstart .. strstart+2] in the

-         * dictionary, and set hash_head to the head of the hash chain:

-         */

-        if (s->lookahead >= MIN_MATCH) {

-            INSERT_STRING(s, s->strstart, hash_head);

-        }

-

-        /* Find the longest match, discarding those <= prev_length.

-         * At this point we have always match_length < MIN_MATCH

-         */

-        if (hash_head != NIL && s->strstart - hash_head <= MAX_DIST(s)) {

-            /* To simplify the code, we prevent matches with the string

-             * of window index 0 (in particular we have to avoid a match

-             * of the string with itself at the start of the input file).

-             */

-#ifdef FASTEST

-            if ((s->strategy < Z_HUFFMAN_ONLY) ||

-                (s->strategy == Z_RLE && s->strstart - hash_head == 1)) {

-                s->match_length = longest_match_fast (s, hash_head);

-            }

-#else

-            if (s->strategy < Z_HUFFMAN_ONLY) {

-                s->match_length = longest_match (s, hash_head);

-            } else if (s->strategy == Z_RLE && s->strstart - hash_head == 1) {

-                s->match_length = longest_match_fast (s, hash_head);

-            }

-#endif

-            /* longest_match() or longest_match_fast() sets match_start */

-        }

-        if (s->match_length >= MIN_MATCH) {

-            check_match(s, s->strstart, s->match_start, s->match_length);

-

-            _tr_tally_dist(s, s->strstart - s->match_start,

-                           s->match_length - MIN_MATCH, bflush);

-

-            s->lookahead -= s->match_length;

-

-            /* Insert new strings in the hash table only if the match length

-             * is not too large. This saves time but degrades compression.

-             */

-#ifndef FASTEST

-            if (s->match_length <= s->max_insert_length &&

-                s->lookahead >= MIN_MATCH) {

-                s->match_length--; /* string at strstart already in table */

-                do {

-                    s->strstart++;

-                    INSERT_STRING(s, s->strstart, hash_head);

-                    /* strstart never exceeds WSIZE-MAX_MATCH, so there are

-                     * always MIN_MATCH bytes ahead.

-                     */

-                } while (--s->match_length != 0);

-                s->strstart++;

-            } else

-#endif

-            {

-                s->strstart += s->match_length;

-                s->match_length = 0;

-                s->ins_h = s->window[s->strstart];

-                UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]);

-#if MIN_MATCH != 3

-                Call UPDATE_HASH() MIN_MATCH-3 more times

-#endif

-                /* If lookahead < MIN_MATCH, ins_h is garbage, but it does not

-                 * matter since it will be recomputed at next deflate call.

-                 */

-            }

-        } else {

-            /* No match, output a literal byte */

-            Tracevv((stderr,"%c", s->window[s->strstart]));

-            _tr_tally_lit (s, s->window[s->strstart], bflush);

-            s->lookahead--;

-            s->strstart++;

-        }

-        if (bflush) FLUSH_BLOCK(s, 0);

-    }

-    FLUSH_BLOCK(s, flush == Z_FINISH);

-    return flush == Z_FINISH ? finish_done : block_done;

-}

-

-#ifndef FASTEST

-/* ===========================================================================

- * Same as above, but achieves better compression. We use a lazy

- * evaluation for matches: a match is finally adopted only if there is

- * no better match at the next window position.

- */

-local block_state deflate_slow(s, flush)

-    deflate_state *s;

-    int flush;

-{

-    IPos hash_head = NIL;    /* head of hash chain */

-    int bflush;              /* set if current block must be flushed */

-

-    /* Process the input block. */

-    for (;;) {

-        /* Make sure that we always have enough lookahead, except

-         * at the end of the input file. We need MAX_MATCH bytes

-         * for the next match, plus MIN_MATCH bytes to insert the

-         * string following the next match.

-         */

-        if (s->lookahead < MIN_LOOKAHEAD) {

-            fill_window(s);

-            if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) {

-                return need_more;

-            }

-            if (s->lookahead == 0) break; /* flush the current block */

-        }

-

-        /* Insert the string window[strstart .. strstart+2] in the

-         * dictionary, and set hash_head to the head of the hash chain:

-         */

-        if (s->lookahead >= MIN_MATCH) {

-            INSERT_STRING(s, s->strstart, hash_head);

-        }

-

-        /* Find the longest match, discarding those <= prev_length.

-         */

-        s->prev_length = s->match_length, s->prev_match = s->match_start;

-        s->match_length = MIN_MATCH-1;

-

-        if (hash_head != NIL && s->prev_length < s->max_lazy_match &&

-            s->strstart - hash_head <= MAX_DIST(s)) {

-            /* To simplify the code, we prevent matches with the string

-             * of window index 0 (in particular we have to avoid a match

-             * of the string with itself at the start of the input file).

-             */

-            if (s->strategy < Z_HUFFMAN_ONLY) {

-                s->match_length = longest_match (s, hash_head);

-            } else if (s->strategy == Z_RLE && s->strstart - hash_head == 1) {

-                s->match_length = longest_match_fast (s, hash_head);

-            }

-            /* longest_match() or longest_match_fast() sets match_start */

-

-            if (s->match_length <= 5 && (s->strategy == Z_FILTERED

-#if TOO_FAR <= 32767

-                || (s->match_length == MIN_MATCH &&

-                    s->strstart - s->match_start > TOO_FAR)

-#endif

-                )) {

-

-                /* If prev_match is also MIN_MATCH, match_start is garbage

-                 * but we will ignore the current match anyway.

-                 */

-                s->match_length = MIN_MATCH-1;

-            }

-        }

-        /* If there was a match at the previous step and the current

-         * match is not better, output the previous match:

-         */

-        if (s->prev_length >= MIN_MATCH && s->match_length <= s->prev_length) {

-            uInt max_insert = s->strstart + s->lookahead - MIN_MATCH;

-            /* Do not insert strings in hash table beyond this. */

-

-            check_match(s, s->strstart-1, s->prev_match, s->prev_length);

-

-            _tr_tally_dist(s, s->strstart -1 - s->prev_match,

-                           s->prev_length - MIN_MATCH, bflush);

-

-            /* Insert in hash table all strings up to the end of the match.

-             * strstart-1 and strstart are already inserted. If there is not

-             * enough lookahead, the last two strings are not inserted in

-             * the hash table.

-             */

-            s->lookahead -= s->prev_length-1;

-            s->prev_length -= 2;

-            do {

-                if (++s->strstart <= max_insert) {

-                    INSERT_STRING(s, s->strstart, hash_head);

-                }

-            } while (--s->prev_length != 0);

-            s->match_available = 0;

-            s->match_length = MIN_MATCH-1;

-            s->strstart++;

-

-            if (bflush) FLUSH_BLOCK(s, 0);

-

-        } else if (s->match_available) {

-            /* If there was no match at the previous position, output a

-             * single literal. If there was a match but the current match

-             * is longer, truncate the previous match to a single literal.

-             */

-            Tracevv((stderr,"%c", s->window[s->strstart-1]));

-            _tr_tally_lit(s, s->window[s->strstart-1], bflush);

-            if (bflush) {

-                FLUSH_BLOCK_ONLY(s, 0);

-            }

-            s->strstart++;

-            s->lookahead--;

-            if (s->strm->avail_out == 0) return need_more;

-        } else {

-            /* There is no previous match to compare with, wait for

-             * the next step to decide.

-             */

-            s->match_available = 1;

-            s->strstart++;

-            s->lookahead--;

-        }

-    }

-    Assert (flush != Z_NO_FLUSH, "no flush?");

-    if (s->match_available) {

-        Tracevv((stderr,"%c", s->window[s->strstart-1]));

-        _tr_tally_lit(s, s->window[s->strstart-1], bflush);

-        s->match_available = 0;

-    }

-    FLUSH_BLOCK(s, flush == Z_FINISH);

-    return flush == Z_FINISH ? finish_done : block_done;

-}

-#endif /* FASTEST */

+/* deflate.c -- compress data using the deflation algorithm
+ * Copyright (C) 1995-2004 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/*
+ *  ALGORITHM
+ *
+ *      The "deflation" process depends on being able to identify portions
+ *      of the input text which are identical to earlier input (within a
+ *      sliding window trailing behind the input currently being processed).
+ *
+ *      The most straightforward technique turns out to be the fastest for
+ *      most input files: try all possible matches and select the longest.
+ *      The key feature of this algorithm is that insertions into the string
+ *      dictionary are very simple and thus fast, and deletions are avoided
+ *      completely. Insertions are performed at each input character, whereas
+ *      string matches are performed only when the previous match ends. So it
+ *      is preferable to spend more time in matches to allow very fast string
+ *      insertions and avoid deletions. The matching algorithm for small
+ *      strings is inspired from that of Rabin & Karp. A brute force approach
+ *      is used to find longer strings when a small match has been found.
+ *      A similar algorithm is used in comic (by Jan-Mark Wams) and freeze
+ *      (by Leonid Broukhis).
+ *         A previous version of this file used a more sophisticated algorithm
+ *      (by Fiala and Greene) which is guaranteed to run in linear amortized
+ *      time, but has a larger average cost, uses more memory and is patented.
+ *      However the F&G algorithm may be faster for some highly redundant
+ *      files if the parameter max_chain_length (described below) is too large.
+ *
+ *  ACKNOWLEDGEMENTS
+ *
+ *      The idea of lazy evaluation of matches is due to Jan-Mark Wams, and
+ *      I found it in 'freeze' written by Leonid Broukhis.
+ *      Thanks to many people for bug reports and testing.
+ *
+ *  REFERENCES
+ *
+ *      Deutsch, L.P.,"DEFLATE Compressed Data Format Specification".
+ *      Available in http://www.ietf.org/rfc/rfc1951.txt
+ *
+ *      A description of the Rabin and Karp algorithm is given in the book
+ *         "Algorithms" by R. Sedgewick, Addison-Wesley, p252.
+ *
+ *      Fiala,E.R., and Greene,D.H.
+ *         Data Compression with Finite Windows, Comm.ACM, 32,4 (1989) 490-595
+ *
+ */
+
+/* @(#) $Id$ */
+
+#include "deflate.h"
+
+const char deflate_copyright[] =
+   " deflate 1.2.2 Copyright 1995-2004 Jean-loup Gailly ";
+/*
+  If you use the zlib library in a product, an acknowledgment is welcome
+  in the documentation of your product. If for some reason you cannot
+  include such an acknowledgment, I would appreciate that you keep this
+  copyright string in the executable of your product.
+ */
+
+/* ===========================================================================
+ *  Function prototypes.
+ */
+typedef enum {
+    need_more,      /* block not completed, need more input or more output */
+    block_done,     /* block flush performed */
+    finish_started, /* finish started, need only more output at next deflate */
+    finish_done     /* finish done, accept no more input or output */
+} block_state;
+
+typedef block_state (*compress_func) OF((deflate_state *s, int flush));
+/* Compression function. Returns the block state after the call. */
+
+local void fill_window    OF((deflate_state *s));
+local block_state deflate_stored OF((deflate_state *s, int flush));
+local block_state deflate_fast   OF((deflate_state *s, int flush));
+#ifndef FASTEST
+local block_state deflate_slow   OF((deflate_state *s, int flush));
+#endif
+local void lm_init        OF((deflate_state *s));
+local void putShortMSB    OF((deflate_state *s, uInt b));
+local void flush_pending  OF((z_streamp strm));
+local int read_buf        OF((z_streamp strm, Bytef *buf, unsigned size));
+#ifndef FASTEST
+#ifdef ASMV
+      void match_init OF((void)); /* asm code initialization */
+      uInt longest_match  OF((deflate_state *s, IPos cur_match));
+#else
+local uInt longest_match  OF((deflate_state *s, IPos cur_match));
+#endif
+#endif
+local uInt longest_match_fast OF((deflate_state *s, IPos cur_match));
+
+#ifdef DEBUG
+local  void check_match OF((deflate_state *s, IPos start, IPos match,
+                            int length));
+#endif
+
+/* ===========================================================================
+ * Local data
+ */
+
+#define NIL 0
+/* Tail of hash chains */
+
+#ifndef TOO_FAR
+#  define TOO_FAR 4096
+#endif
+/* Matches of length 3 are discarded if their distance exceeds TOO_FAR */
+
+#define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1)
+/* Minimum amount of lookahead, except at the end of the input file.
+ * See deflate.c for comments about the MIN_MATCH+1.
+ */
+
+/* Values for max_lazy_match, good_match and max_chain_length, depending on
+ * the desired pack level (0..9). The values given below have been tuned to
+ * exclude worst case performance for pathological files. Better values may be
+ * found for specific files.
+ */
+typedef struct config_s {
+   ush good_length; /* reduce lazy search above this match length */
+   ush max_lazy;    /* do not perform lazy search above this match length */
+   ush nice_length; /* quit search above this match length */
+   ush max_chain;
+   compress_func func;
+} config;
+
+#ifdef FASTEST
+local const config configuration_table[2] = {
+/*      good lazy nice chain */
+/* 0 */ {0,    0,  0,    0, deflate_stored},  /* store only */
+/* 1 */ {4,    4,  8,    4, deflate_fast}}; /* max speed, no lazy matches */
+#else
+local const config configuration_table[10] = {
+/*      good lazy nice chain */
+/* 0 */ {0,    0,  0,    0, deflate_stored},  /* store only */
+/* 1 */ {4,    4,  8,    4, deflate_fast}, /* max speed, no lazy matches */
+/* 2 */ {4,    5, 16,    8, deflate_fast},
+/* 3 */ {4,    6, 32,   32, deflate_fast},
+
+/* 4 */ {4,    4, 16,   16, deflate_slow},  /* lazy matches */
+/* 5 */ {8,   16, 32,   32, deflate_slow},
+/* 6 */ {8,   16, 128, 128, deflate_slow},
+/* 7 */ {8,   32, 128, 256, deflate_slow},
+/* 8 */ {32, 128, 258, 1024, deflate_slow},
+/* 9 */ {32, 258, 258, 4096, deflate_slow}}; /* max compression */
+#endif
+
+/* Note: the deflate() code requires max_lazy >= MIN_MATCH and max_chain >= 4
+ * For deflate_fast() (levels <= 3) good is ignored and lazy has a different
+ * meaning.
+ */
+
+#define EQUAL 0
+/* result of memcmp for equal strings */
+
+#ifndef NO_DUMMY_DECL
+struct static_tree_desc_s {int dummy;}; /* for buggy compilers */
+#endif
+
+/* ===========================================================================
+ * Update a hash value with the given input byte
+ * IN  assertion: all calls to to UPDATE_HASH are made with consecutive
+ *    input characters, so that a running hash key can be computed from the
+ *    previous key instead of complete recalculation each time.
+ */
+#define UPDATE_HASH(s,h,c) (h = (((h)<<s->hash_shift) ^ (c)) & s->hash_mask)
+
+
+/* ===========================================================================
+ * Insert string str in the dictionary and set match_head to the previous head
+ * of the hash chain (the most recent string with same hash key). Return
+ * the previous length of the hash chain.
+ * If this file is compiled with -DFASTEST, the compression level is forced
+ * to 1, and no hash chains are maintained.
+ * IN  assertion: all calls to to INSERT_STRING are made with consecutive
+ *    input characters and the first MIN_MATCH bytes of str are valid
+ *    (except for the last MIN_MATCH-1 bytes of the input file).
+ */
+#ifdef FASTEST
+#define INSERT_STRING(s, str, match_head) \
+   (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \
+    match_head = s->head[s->ins_h], \
+    s->head[s->ins_h] = (Pos)(str))
+#else
+#define INSERT_STRING(s, str, match_head) \
+   (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \
+    match_head = s->prev[(str) & s->w_mask] = s->head[s->ins_h], \
+    s->head[s->ins_h] = (Pos)(str))
+#endif
+
+/* ===========================================================================
+ * Initialize the hash table (avoiding 64K overflow for 16 bit systems).
+ * prev[] will be initialized on the fly.
+ */
+#define CLEAR_HASH(s) \
+    s->head[s->hash_size-1] = NIL; \
+    zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head));
+
+/* ========================================================================= */
+int ZEXPORT deflateInit_(strm, level, version, stream_size)
+    z_streamp strm;
+    int level;
+    const char *version;
+    int stream_size;
+{
+    return deflateInit2_(strm, level, Z_DEFLATED, MAX_WBITS, DEF_MEM_LEVEL,
+                         Z_DEFAULT_STRATEGY, version, stream_size);
+    /* To do: ignore strm->next_in if we use it as window */
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
+                  version, stream_size)
+    z_streamp strm;
+    int  level;
+    int  method;
+    int  windowBits;
+    int  memLevel;
+    int  strategy;
+    const char *version;
+    int stream_size;
+{
+    deflate_state *s;
+    int wrap = 1;
+    static const char my_version[] = ZLIB_VERSION;
+
+    ushf *overlay;
+    /* We overlay pending_buf and d_buf+l_buf. This works since the average
+     * output size for (length,distance) codes is <= 24 bits.
+     */
+
+    if (version == Z_NULL || version[0] != my_version[0] ||
+        stream_size != sizeof(z_stream)) {
+        return Z_VERSION_ERROR;
+    }
+    if (strm == Z_NULL) return Z_STREAM_ERROR;
+
+    strm->msg = Z_NULL;
+    if (strm->zalloc == (alloc_func)0) {
+        strm->zalloc = zcalloc;
+        strm->opaque = (voidpf)0;
+    }
+    if (strm->zfree == (free_func)0) strm->zfree = zcfree;
+
+#ifdef FASTEST
+    if (level != 0) level = 1;
+#else
+    if (level == Z_DEFAULT_COMPRESSION) level = 6;
+#endif
+
+    if (windowBits < 0) { /* suppress zlib wrapper */
+        wrap = 0;
+        windowBits = -windowBits;
+    }
+#ifdef GZIP
+    else if (windowBits > 15) {
+        wrap = 2;       /* write gzip wrapper instead */
+        windowBits -= 16;
+    }
+#endif
+    if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method != Z_DEFLATED ||
+        windowBits < 8 || windowBits > 15 || level < 0 || level > 9 ||
+        strategy < 0 || strategy > Z_RLE) {
+        return Z_STREAM_ERROR;
+    }
+    if (windowBits == 8) windowBits = 9;  /* until 256-byte window bug fixed */
+    s = (deflate_state *) ZALLOC(strm, 1, sizeof(deflate_state));
+    if (s == Z_NULL) return Z_MEM_ERROR;
+    strm->state = (struct internal_state FAR *)s;
+    s->strm = strm;
+
+    s->wrap = wrap;
+    s->w_bits = windowBits;
+    s->w_size = 1 << s->w_bits;
+    s->w_mask = s->w_size - 1;
+
+    s->hash_bits = memLevel + 7;
+    s->hash_size = 1 << s->hash_bits;
+    s->hash_mask = s->hash_size - 1;
+    s->hash_shift =  ((s->hash_bits+MIN_MATCH-1)/MIN_MATCH);
+
+    s->window = (Bytef *) ZALLOC(strm, s->w_size, 2*sizeof(Byte));
+    s->prev   = (Posf *)  ZALLOC(strm, s->w_size, sizeof(Pos));
+    s->head   = (Posf *)  ZALLOC(strm, s->hash_size, sizeof(Pos));
+
+    s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */
+
+    overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2);
+    s->pending_buf = (uchf *) overlay;
+    s->pending_buf_size = (ulg)s->lit_bufsize * (sizeof(ush)+2L);
+
+    if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL ||
+        s->pending_buf == Z_NULL) {
+        s->status = FINISH_STATE;
+        strm->msg = (char*)ERR_MSG(Z_MEM_ERROR);
+        deflateEnd (strm);
+        return Z_MEM_ERROR;
+    }
+    s->d_buf = overlay + s->lit_bufsize/sizeof(ush);
+    s->l_buf = s->pending_buf + (1+sizeof(ush))*s->lit_bufsize;
+
+    s->level = level;
+    s->strategy = strategy;
+    s->method = (Byte)method;
+
+    return deflateReset(strm);
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
+    z_streamp strm;
+    const Bytef *dictionary;
+    uInt  dictLength;
+{
+    deflate_state *s;
+    uInt length = dictLength;
+    uInt n;
+    IPos hash_head = 0;
+
+    if (strm == Z_NULL || strm->state == Z_NULL || dictionary == Z_NULL ||
+        strm->state->wrap == 2 ||
+        (strm->state->wrap == 1 && strm->state->status != INIT_STATE))
+        return Z_STREAM_ERROR;
+
+    s = strm->state;
+    if (s->wrap)
+        strm->adler = adler32(strm->adler, dictionary, dictLength);
+
+    if (length < MIN_MATCH) return Z_OK;
+    if (length > MAX_DIST(s)) {
+        length = MAX_DIST(s);
+#ifndef USE_DICT_HEAD
+        dictionary += dictLength - length; /* use the tail of the dictionary */
+#endif
+    }
+    zmemcpy(s->window, dictionary, length);
+    s->strstart = length;
+    s->block_start = (long)length;
+
+    /* Insert all strings in the hash table (except for the last two bytes).
+     * s->lookahead stays null, so s->ins_h will be recomputed at the next
+     * call of fill_window.
+     */
+    s->ins_h = s->window[0];
+    UPDATE_HASH(s, s->ins_h, s->window[1]);
+    for (n = 0; n <= length - MIN_MATCH; n++) {
+        INSERT_STRING(s, n, hash_head);
+    }
+    if (hash_head) hash_head = 0;  /* to make compiler happy */
+    return Z_OK;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateReset (strm)
+    z_streamp strm;
+{
+    deflate_state *s;
+
+    if (strm == Z_NULL || strm->state == Z_NULL ||
+        strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0) {
+        return Z_STREAM_ERROR;
+    }
+
+    strm->total_in = strm->total_out = 0;
+    strm->msg = Z_NULL; /* use zfree if we ever allocate msg dynamically */
+    strm->data_type = Z_UNKNOWN;
+
+    s = (deflate_state *)strm->state;
+    s->pending = 0;
+    s->pending_out = s->pending_buf;
+
+    if (s->wrap < 0) {
+        s->wrap = -s->wrap; /* was made negative by deflate(..., Z_FINISH); */
+    }
+    s->status = s->wrap ? INIT_STATE : BUSY_STATE;
+    strm->adler =
+#ifdef GZIP
+        s->wrap == 2 ? crc32(0L, Z_NULL, 0) :
+#endif
+        adler32(0L, Z_NULL, 0);
+    s->last_flush = Z_NO_FLUSH;
+
+    _tr_init(s);
+    lm_init(s);
+
+    return Z_OK;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflatePrime (strm, bits, value)
+    z_streamp strm;
+    int bits;
+    int value;
+{
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    strm->state->bi_valid = bits;
+    strm->state->bi_buf = (ush)(value & ((1 << bits) - 1));
+    return Z_OK;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateParams(strm, level, strategy)
+    z_streamp strm;
+    int level;
+    int strategy;
+{
+    deflate_state *s;
+    compress_func func;
+    int err = Z_OK;
+
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    s = strm->state;
+
+#ifdef FASTEST
+    if (level != 0) level = 1;
+#else
+    if (level == Z_DEFAULT_COMPRESSION) level = 6;
+#endif
+    if (level < 0 || level > 9 || strategy < 0 || strategy > Z_RLE) {
+        return Z_STREAM_ERROR;
+    }
+    func = configuration_table[s->level].func;
+
+    if (func != configuration_table[level].func && strm->total_in != 0) {
+        /* Flush the last buffer: */
+        err = deflate(strm, Z_PARTIAL_FLUSH);
+    }
+    if (s->level != level) {
+        s->level = level;
+        s->max_lazy_match   = configuration_table[level].max_lazy;
+        s->good_match       = configuration_table[level].good_length;
+        s->nice_match       = configuration_table[level].nice_length;
+        s->max_chain_length = configuration_table[level].max_chain;
+    }
+    s->strategy = strategy;
+    return err;
+}
+
+/* =========================================================================
+ * For the default windowBits of 15 and memLevel of 8, this function returns
+ * a close to exact, as well as small, upper bound on the compressed size.
+ * They are coded as constants here for a reason--if the #define's are
+ * changed, then this function needs to be changed as well.  The return
+ * value for 15 and 8 only works for those exact settings.
+ *
+ * For any setting other than those defaults for windowBits and memLevel,
+ * the value returned is a conservative worst case for the maximum expansion
+ * resulting from using fixed blocks instead of stored blocks, which deflate
+ * can emit on compressed data for some combinations of the parameters.
+ *
+ * This function could be more sophisticated to provide closer upper bounds
+ * for every combination of windowBits and memLevel, as well as wrap.
+ * But even the conservative upper bound of about 14% expansion does not
+ * seem onerous for output buffer allocation.
+ */
+uLong ZEXPORT deflateBound(strm, sourceLen)
+    z_streamp strm;
+    uLong sourceLen;
+{
+    deflate_state *s;
+    uLong destLen;
+
+    /* conservative upper bound */
+    destLen = sourceLen +
+              ((sourceLen + 7) >> 3) + ((sourceLen + 63) >> 6) + 11;
+
+    /* if can't get parameters, return conservative bound */
+    if (strm == Z_NULL || strm->state == Z_NULL)
+        return destLen;
+
+    /* if not default parameters, return conservative bound */
+    s = strm->state;
+    if (s->w_bits != 15 || s->hash_bits != 8 + 7)
+        return destLen;
+
+    /* default settings: return tight bound for that case */
+    return compressBound(sourceLen);
+}
+
+/* =========================================================================
+ * Put a short in the pending buffer. The 16-bit value is put in MSB order.
+ * IN assertion: the stream state is correct and there is enough room in
+ * pending_buf.
+ */
+local void putShortMSB (s, b)
+    deflate_state *s;
+    uInt b;
+{
+    put_byte(s, (Byte)(b >> 8));
+    put_byte(s, (Byte)(b & 0xff));
+}
+
+/* =========================================================================
+ * Flush as much pending output as possible. All deflate() output goes
+ * through this function so some applications may wish to modify it
+ * to avoid allocating a large strm->next_out buffer and copying into it.
+ * (See also read_buf()).
+ */
+local void flush_pending(strm)
+    z_streamp strm;
+{
+    unsigned len = strm->state->pending;
+
+    if (len > strm->avail_out) len = strm->avail_out;
+    if (len == 0) return;
+
+    zmemcpy(strm->next_out, strm->state->pending_out, len);
+    strm->next_out  += len;
+    strm->state->pending_out  += len;
+    strm->total_out += len;
+    strm->avail_out  -= len;
+    strm->state->pending -= len;
+    if (strm->state->pending == 0) {
+        strm->state->pending_out = strm->state->pending_buf;
+    }
+}
+
+/* ========================================================================= */
+int ZEXPORT deflate (strm, flush)
+    z_streamp strm;
+    int flush;
+{
+    int old_flush; /* value of flush param for previous deflate call */
+    deflate_state *s;
+
+    if (strm == Z_NULL || strm->state == Z_NULL ||
+        flush > Z_FINISH || flush < 0) {
+        return Z_STREAM_ERROR;
+    }
+    s = strm->state;
+
+    if (strm->next_out == Z_NULL ||
+        (strm->next_in == Z_NULL && strm->avail_in != 0) ||
+        (s->status == FINISH_STATE && flush != Z_FINISH)) {
+        ERR_RETURN(strm, Z_STREAM_ERROR);
+    }
+    if (strm->avail_out == 0) ERR_RETURN(strm, Z_BUF_ERROR);
+
+    s->strm = strm; /* just in case */
+    old_flush = s->last_flush;
+    s->last_flush = flush;
+
+    /* Write the header */
+    if (s->status == INIT_STATE) {
+#ifdef GZIP
+        if (s->wrap == 2) {
+            put_byte(s, 31);
+            put_byte(s, 139);
+            put_byte(s, 8);
+            put_byte(s, 0);
+            put_byte(s, 0);
+            put_byte(s, 0);
+            put_byte(s, 0);
+            put_byte(s, 0);
+            put_byte(s, s->level == 9 ? 2 :
+                        (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?
+                         4 : 0));
+            put_byte(s, 255);
+            s->status = BUSY_STATE;
+            strm->adler = crc32(0L, Z_NULL, 0);
+        }
+        else
+#endif
+        {
+            uInt header = (Z_DEFLATED + ((s->w_bits-8)<<4)) << 8;
+            uInt level_flags;
+
+            if (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2)
+                level_flags = 0;
+            else if (s->level < 6)
+                level_flags = 1;
+            else if (s->level == 6)
+                level_flags = 2;
+            else
+                level_flags = 3;
+            header |= (level_flags << 6);
+            if (s->strstart != 0) header |= PRESET_DICT;
+            header += 31 - (header % 31);
+
+            s->status = BUSY_STATE;
+            putShortMSB(s, header);
+
+            /* Save the adler32 of the preset dictionary: */
+            if (s->strstart != 0) {
+                putShortMSB(s, (uInt)(strm->adler >> 16));
+                putShortMSB(s, (uInt)(strm->adler & 0xffff));
+            }
+            strm->adler = adler32(0L, Z_NULL, 0);
+        }
+    }
+
+    /* Flush as much pending output as possible */
+    if (s->pending != 0) {
+        flush_pending(strm);
+        if (strm->avail_out == 0) {
+            /* Since avail_out is 0, deflate will be called again with
+             * more output space, but possibly with both pending and
+             * avail_in equal to zero. There won't be anything to do,
+             * but this is not an error situation so make sure we
+             * return OK instead of BUF_ERROR at next call of deflate:
+             */
+            s->last_flush = -1;
+            return Z_OK;
+        }
+
+    /* Make sure there is something to do and avoid duplicate consecutive
+     * flushes. For repeated and useless calls with Z_FINISH, we keep
+     * returning Z_STREAM_END instead of Z_BUF_ERROR.
+     */
+    } else if (strm->avail_in == 0 && flush <= old_flush &&
+               flush != Z_FINISH) {
+        ERR_RETURN(strm, Z_BUF_ERROR);
+    }
+
+    /* User must not provide more input after the first FINISH: */
+    if (s->status == FINISH_STATE && strm->avail_in != 0) {
+        ERR_RETURN(strm, Z_BUF_ERROR);
+    }
+
+    /* Start a new block or continue the current one.
+     */
+    if (strm->avail_in != 0 || s->lookahead != 0 ||
+        (flush != Z_NO_FLUSH && s->status != FINISH_STATE)) {
+        block_state bstate;
+
+        bstate = (*(configuration_table[s->level].func))(s, flush);
+
+        if (bstate == finish_started || bstate == finish_done) {
+            s->status = FINISH_STATE;
+        }
+        if (bstate == need_more || bstate == finish_started) {
+            if (strm->avail_out == 0) {
+                s->last_flush = -1; /* avoid BUF_ERROR next call, see above */
+            }
+            return Z_OK;
+            /* If flush != Z_NO_FLUSH && avail_out == 0, the next call
+             * of deflate should use the same flush parameter to make sure
+             * that the flush is complete. So we don't have to output an
+             * empty block here, this will be done at next call. This also
+             * ensures that for a very small output buffer, we emit at most
+             * one empty block.
+             */
+        }
+        if (bstate == block_done) {
+            if (flush == Z_PARTIAL_FLUSH) {
+                _tr_align(s);
+            } else { /* FULL_FLUSH or SYNC_FLUSH */
+                _tr_stored_block(s, (char*)0, 0L, 0);
+                /* For a full flush, this empty block will be recognized
+                 * as a special marker by inflate_sync().
+                 */
+                if (flush == Z_FULL_FLUSH) {
+                    CLEAR_HASH(s);             /* forget history */
+                }
+            }
+            flush_pending(strm);
+            if (strm->avail_out == 0) {
+              s->last_flush = -1; /* avoid BUF_ERROR at next call, see above */
+              return Z_OK;
+            }
+        }
+    }
+    Assert(strm->avail_out > 0, "bug2");
+
+    if (flush != Z_FINISH) return Z_OK;
+    if (s->wrap <= 0) return Z_STREAM_END;
+
+    /* Write the trailer */
+#ifdef GZIP
+    if (s->wrap == 2) {
+        put_byte(s, (Byte)(strm->adler & 0xff));
+        put_byte(s, (Byte)((strm->adler >> 8) & 0xff));
+        put_byte(s, (Byte)((strm->adler >> 16) & 0xff));
+        put_byte(s, (Byte)((strm->adler >> 24) & 0xff));
+        put_byte(s, (Byte)(strm->total_in & 0xff));
+        put_byte(s, (Byte)((strm->total_in >> 8) & 0xff));
+        put_byte(s, (Byte)((strm->total_in >> 16) & 0xff));
+        put_byte(s, (Byte)((strm->total_in >> 24) & 0xff));
+    }
+    else
+#endif
+    {
+        putShortMSB(s, (uInt)(strm->adler >> 16));
+        putShortMSB(s, (uInt)(strm->adler & 0xffff));
+    }
+    flush_pending(strm);
+    /* If avail_out is zero, the application will call deflate again
+     * to flush the rest.
+     */
+    if (s->wrap > 0) s->wrap = -s->wrap; /* write the trailer only once! */
+    return s->pending != 0 ? Z_OK : Z_STREAM_END;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateEnd (strm)
+    z_streamp strm;
+{
+    int status;
+
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+
+    status = strm->state->status;
+    if (status != INIT_STATE && status != BUSY_STATE &&
+        status != FINISH_STATE) {
+      return Z_STREAM_ERROR;
+    }
+
+    /* Deallocate in reverse order of allocations: */
+    TRY_FREE(strm, strm->state->pending_buf);
+    TRY_FREE(strm, strm->state->head);
+    TRY_FREE(strm, strm->state->prev);
+    TRY_FREE(strm, strm->state->window);
+
+    ZFREE(strm, strm->state);
+    strm->state = Z_NULL;
+
+    return status == BUSY_STATE ? Z_DATA_ERROR : Z_OK;
+}
+
+/* =========================================================================
+ * Copy the source state to the destination state.
+ * To simplify the source, this is not supported for 16-bit MSDOS (which
+ * doesn't have enough memory anyway to duplicate compression states).
+ */
+int ZEXPORT deflateCopy (dest, source)
+    z_streamp dest;
+    z_streamp source;
+{
+#ifdef MAXSEG_64K
+    return Z_STREAM_ERROR;
+#else
+    deflate_state *ds;
+    deflate_state *ss;
+    ushf *overlay;
+
+
+    if (source == Z_NULL || dest == Z_NULL || source->state == Z_NULL) {
+        return Z_STREAM_ERROR;
+    }
+
+    ss = source->state;
+
+    *dest = *source;
+
+    ds = (deflate_state *) ZALLOC(dest, 1, sizeof(deflate_state));
+    if (ds == Z_NULL) return Z_MEM_ERROR;
+    dest->state = (struct internal_state FAR *) ds;
+    *ds = *ss;
+    ds->strm = dest;
+
+    ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte));
+    ds->prev   = (Posf *)  ZALLOC(dest, ds->w_size, sizeof(Pos));
+    ds->head   = (Posf *)  ZALLOC(dest, ds->hash_size, sizeof(Pos));
+    overlay = (ushf *) ZALLOC(dest, ds->lit_bufsize, sizeof(ush)+2);
+    ds->pending_buf = (uchf *) overlay;
+
+    if (ds->window == Z_NULL || ds->prev == Z_NULL || ds->head == Z_NULL ||
+        ds->pending_buf == Z_NULL) {
+        deflateEnd (dest);
+        return Z_MEM_ERROR;
+    }
+    /* following zmemcpy do not work for 16-bit MSDOS */
+    zmemcpy(ds->window, ss->window, ds->w_size * 2 * sizeof(Byte));
+    zmemcpy(ds->prev, ss->prev, ds->w_size * sizeof(Pos));
+    zmemcpy(ds->head, ss->head, ds->hash_size * sizeof(Pos));
+    zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size);
+
+    ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf);
+    ds->d_buf = overlay + ds->lit_bufsize/sizeof(ush);
+    ds->l_buf = ds->pending_buf + (1+sizeof(ush))*ds->lit_bufsize;
+
+    ds->l_desc.dyn_tree = ds->dyn_ltree;
+    ds->d_desc.dyn_tree = ds->dyn_dtree;
+    ds->bl_desc.dyn_tree = ds->bl_tree;
+
+    return Z_OK;
+#endif /* MAXSEG_64K */
+}
+
+/* ===========================================================================
+ * Read a new buffer from the current input stream, update the adler32
+ * and total number of bytes read.  All deflate() input goes through
+ * this function so some applications may wish to modify it to avoid
+ * allocating a large strm->next_in buffer and copying from it.
+ * (See also flush_pending()).
+ */
+local int read_buf(strm, buf, size)
+    z_streamp strm;
+    Bytef *buf;
+    unsigned size;
+{
+    unsigned len = strm->avail_in;
+
+    if (len > size) len = size;
+    if (len == 0) return 0;
+
+    strm->avail_in  -= len;
+
+    if (strm->state->wrap == 1) {
+        strm->adler = adler32(strm->adler, strm->next_in, len);
+    }
+#ifdef GZIP
+    else if (strm->state->wrap == 2) {
+        strm->adler = crc32(strm->adler, strm->next_in, len);
+    }
+#endif
+    zmemcpy(buf, strm->next_in, len);
+    strm->next_in  += len;
+    strm->total_in += len;
+
+    return (int)len;
+}
+
+/* ===========================================================================
+ * Initialize the "longest match" routines for a new zlib stream
+ */
+local void lm_init (s)
+    deflate_state *s;
+{
+    s->window_size = (ulg)2L*s->w_size;
+
+    CLEAR_HASH(s);
+
+    /* Set the default configuration parameters:
+     */
+    s->max_lazy_match   = configuration_table[s->level].max_lazy;
+    s->good_match       = configuration_table[s->level].good_length;
+    s->nice_match       = configuration_table[s->level].nice_length;
+    s->max_chain_length = configuration_table[s->level].max_chain;
+
+    s->strstart = 0;
+    s->block_start = 0L;
+    s->lookahead = 0;
+    s->match_length = s->prev_length = MIN_MATCH-1;
+    s->match_available = 0;
+    s->ins_h = 0;
+#ifdef ASMV
+    match_init(); /* initialize the asm code */
+#endif
+}
+
+#ifndef FASTEST
+/* ===========================================================================
+ * Set match_start to the longest match starting at the given string and
+ * return its length. Matches shorter or equal to prev_length are discarded,
+ * in which case the result is equal to prev_length and match_start is
+ * garbage.
+ * IN assertions: cur_match is the head of the hash chain for the current
+ *   string (strstart) and its distance is <= MAX_DIST, and prev_length >= 1
+ * OUT assertion: the match length is not greater than s->lookahead.
+ */
+#ifndef ASMV
+/* For 80x86 and 680x0, an optimized version will be provided in match.asm or
+ * match.S. The code will be functionally equivalent.
+ */
+local uInt longest_match(s, cur_match)
+    deflate_state *s;
+    IPos cur_match;                             /* current match */
+{
+    unsigned chain_length = s->max_chain_length;/* max hash chain length */
+    register Bytef *scan = s->window + s->strstart; /* current string */
+    register Bytef *match;                       /* matched string */
+    register int len;                           /* length of current match */
+    int best_len = s->prev_length;              /* best match length so far */
+    int nice_match = s->nice_match;             /* stop if match long enough */
+    IPos limit = s->strstart > (IPos)MAX_DIST(s) ?
+        s->strstart - (IPos)MAX_DIST(s) : NIL;
+    /* Stop when cur_match becomes <= limit. To simplify the code,
+     * we prevent matches with the string of window index 0.
+     */
+    Posf *prev = s->prev;
+    uInt wmask = s->w_mask;
+
+#ifdef UNALIGNED_OK
+    /* Compare two bytes at a time. Note: this is not always beneficial.
+     * Try with and without -DUNALIGNED_OK to check.
+     */
+    register Bytef *strend = s->window + s->strstart + MAX_MATCH - 1;
+    register ush scan_start = *(ushf*)scan;
+    register ush scan_end   = *(ushf*)(scan+best_len-1);
+#else
+    register Bytef *strend = s->window + s->strstart + MAX_MATCH;
+    register Byte scan_end1  = scan[best_len-1];
+    register Byte scan_end   = scan[best_len];
+#endif
+
+    /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
+     * It is easy to get rid of this optimization if necessary.
+     */
+    Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
+
+    /* Do not waste too much time if we already have a good match: */
+    if (s->prev_length >= s->good_match) {
+        chain_length >>= 2;
+    }
+    /* Do not look for matches beyond the end of the input. This is necessary
+     * to make deflate deterministic.
+     */
+    if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead;
+
+    Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
+
+    do {
+        Assert(cur_match < s->strstart, "no future");
+        match = s->window + cur_match;
+
+        /* Skip to next match if the match length cannot increase
+         * or if the match length is less than 2:
+         */
+#if (defined(UNALIGNED_OK) && MAX_MATCH == 258)
+        /* This code assumes sizeof(unsigned short) == 2. Do not use
+         * UNALIGNED_OK if your compiler uses a different size.
+         */
+        if (*(ushf*)(match+best_len-1) != scan_end ||
+            *(ushf*)match != scan_start) continue;
+
+        /* It is not necessary to compare scan[2] and match[2] since they are
+         * always equal when the other bytes match, given that the hash keys
+         * are equal and that HASH_BITS >= 8. Compare 2 bytes at a time at
+         * strstart+3, +5, ... up to strstart+257. We check for insufficient
+         * lookahead only every 4th comparison; the 128th check will be made
+         * at strstart+257. If MAX_MATCH-2 is not a multiple of 8, it is
+         * necessary to put more guard bytes at the end of the window, or
+         * to check more often for insufficient lookahead.
+         */
+        Assert(scan[2] == match[2], "scan[2]?");
+        scan++, match++;
+        do {
+        } while (*(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
+                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
+                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
+                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
+                 scan < strend);
+        /* The funny "do {}" generates better code on most compilers */
+
+        /* Here, scan <= window+strstart+257 */
+        Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
+        if (*scan == *match) scan++;
+
+        len = (MAX_MATCH - 1) - (int)(strend-scan);
+        scan = strend - (MAX_MATCH-1);
+
+#else /* UNALIGNED_OK */
+
+        if (match[best_len]   != scan_end  ||
+            match[best_len-1] != scan_end1 ||
+            *match            != *scan     ||
+            *++match          != scan[1])      continue;
+
+        /* The check at best_len-1 can be removed because it will be made
+         * again later. (This heuristic is not always a win.)
+         * It is not necessary to compare scan[2] and match[2] since they
+         * are always equal when the other bytes match, given that
+         * the hash keys are equal and that HASH_BITS >= 8.
+         */
+        scan += 2, match++;
+        Assert(*scan == *match, "match[2]?");
+
+        /* We check for insufficient lookahead only every 8th comparison;
+         * the 256th check will be made at strstart+258.
+         */
+        do {
+        } while (*++scan == *++match && *++scan == *++match &&
+                 *++scan == *++match && *++scan == *++match &&
+                 *++scan == *++match && *++scan == *++match &&
+                 *++scan == *++match && *++scan == *++match &&
+                 scan < strend);
+
+        Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
+
+        len = MAX_MATCH - (int)(strend - scan);
+        scan = strend - MAX_MATCH;
+
+#endif /* UNALIGNED_OK */
+
+        if (len > best_len) {
+            s->match_start = cur_match;
+            best_len = len;
+            if (len >= nice_match) break;
+#ifdef UNALIGNED_OK
+            scan_end = *(ushf*)(scan+best_len-1);
+#else
+            scan_end1  = scan[best_len-1];
+            scan_end   = scan[best_len];
+#endif
+        }
+    } while ((cur_match = prev[cur_match & wmask]) > limit
+             && --chain_length != 0);
+
+    if ((uInt)best_len <= s->lookahead) return (uInt)best_len;
+    return s->lookahead;
+}
+#endif /* ASMV */
+#endif /* FASTEST */
+
+/* ---------------------------------------------------------------------------
+ * Optimized version for level == 1 or strategy == Z_RLE only
+ */
+local uInt longest_match_fast(s, cur_match)
+    deflate_state *s;
+    IPos cur_match;                             /* current match */
+{
+    register Bytef *scan = s->window + s->strstart; /* current string */
+    register Bytef *match;                       /* matched string */
+    register int len;                           /* length of current match */
+    register Bytef *strend = s->window + s->strstart + MAX_MATCH;
+
+    /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
+     * It is easy to get rid of this optimization if necessary.
+     */
+    Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
+
+    Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
+
+    Assert(cur_match < s->strstart, "no future");
+
+    match = s->window + cur_match;
+
+    /* Return failure if the match length is less than 2:
+     */
+    if (match[0] != scan[0] || match[1] != scan[1]) return MIN_MATCH-1;
+
+    /* The check at best_len-1 can be removed because it will be made
+     * again later. (This heuristic is not always a win.)
+     * It is not necessary to compare scan[2] and match[2] since they
+     * are always equal when the other bytes match, given that
+     * the hash keys are equal and that HASH_BITS >= 8.
+     */
+    scan += 2, match += 2;
+    Assert(*scan == *match, "match[2]?");
+
+    /* We check for insufficient lookahead only every 8th comparison;
+     * the 256th check will be made at strstart+258.
+     */
+    do {
+    } while (*++scan == *++match && *++scan == *++match &&
+             *++scan == *++match && *++scan == *++match &&
+             *++scan == *++match && *++scan == *++match &&
+             *++scan == *++match && *++scan == *++match &&
+             scan < strend);
+
+    Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
+
+    len = MAX_MATCH - (int)(strend - scan);
+
+    if (len < MIN_MATCH) return MIN_MATCH - 1;
+
+    s->match_start = cur_match;
+    return (uInt)len <= s->lookahead ? (uInt)len : s->lookahead;
+}
+
+#ifdef DEBUG
+/* ===========================================================================
+ * Check that the match at match_start is indeed a match.
+ */
+local void check_match(s, start, match, length)
+    deflate_state *s;
+    IPos start, match;
+    int length;
+{
+    /* check that the match is indeed a match */
+    if (zmemcmp(s->window + match,
+                s->window + start, length) != EQUAL) {
+        fprintf(stderr, " start %u, match %u, length %d\n",
+                start, match, length);
+        do {
+            fprintf(stderr, "%c%c", s->window[match++], s->window[start++]);
+        } while (--length != 0);
+        z_error("invalid match");
+    }
+    if (z_verbose > 1) {
+        fprintf(stderr,"\\[%d,%d]", start-match, length);
+        do { putc(s->window[start++], stderr); } while (--length != 0);
+    }
+}
+#else
+#  define check_match(s, start, match, length)
+#endif /* DEBUG */
+
+/* ===========================================================================
+ * Fill the window when the lookahead becomes insufficient.
+ * Updates strstart and lookahead.
+ *
+ * IN assertion: lookahead < MIN_LOOKAHEAD
+ * OUT assertions: strstart <= window_size-MIN_LOOKAHEAD
+ *    At least one byte has been read, or avail_in == 0; reads are
+ *    performed for at least two bytes (required for the zip translate_eol
+ *    option -- not supported here).
+ */
+local void fill_window(s)
+    deflate_state *s;
+{
+    register unsigned n, m;
+    register Posf *p;
+    unsigned more;    /* Amount of free space at the end of the window. */
+    uInt wsize = s->w_size;
+
+    do {
+        more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart);
+
+        /* Deal with !@#$% 64K limit: */
+        if (sizeof(int) <= 2) {
+            if (more == 0 && s->strstart == 0 && s->lookahead == 0) {
+                more = wsize;
+
+            } else if (more == (unsigned)(-1)) {
+                /* Very unlikely, but possible on 16 bit machine if
+                 * strstart == 0 && lookahead == 1 (input done a byte at time)
+                 */
+                more--;
+            }
+        }
+
+        /* If the window is almost full and there is insufficient lookahead,
+         * move the upper half to the lower one to make room in the upper half.
+         */
+        if (s->strstart >= wsize+MAX_DIST(s)) {
+
+            zmemcpy(s->window, s->window+wsize, (unsigned)wsize);
+            s->match_start -= wsize;
+            s->strstart    -= wsize; /* we now have strstart >= MAX_DIST */
+            s->block_start -= (long) wsize;
+
+            /* Slide the hash table (could be avoided with 32 bit values
+               at the expense of memory usage). We slide even when level == 0
+               to keep the hash table consistent if we switch back to level > 0
+               later. (Using level 0 permanently is not an optimal usage of
+               zlib, so we don't care about this pathological case.)
+             */
+            n = s->hash_size;
+            p = &s->head[n];
+            do {
+                m = *--p;
+                *p = (Pos)(m >= wsize ? m-wsize : NIL);
+            } while (--n);
+
+            n = wsize;
+#ifndef FASTEST
+            p = &s->prev[n];
+            do {
+                m = *--p;
+                *p = (Pos)(m >= wsize ? m-wsize : NIL);
+                /* If n is not on any hash chain, prev[n] is garbage but
+                 * its value will never be used.
+                 */
+            } while (--n);
+#endif
+            more += wsize;
+        }
+        if (s->strm->avail_in == 0) return;
+
+        /* If there was no sliding:
+         *    strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 &&
+         *    more == window_size - lookahead - strstart
+         * => more >= window_size - (MIN_LOOKAHEAD-1 + WSIZE + MAX_DIST-1)
+         * => more >= window_size - 2*WSIZE + 2
+         * In the BIG_MEM or MMAP case (not yet supported),
+         *   window_size == input_size + MIN_LOOKAHEAD  &&
+         *   strstart + s->lookahead <= input_size => more >= MIN_LOOKAHEAD.
+         * Otherwise, window_size == 2*WSIZE so more >= 2.
+         * If there was sliding, more >= WSIZE. So in all cases, more >= 2.
+         */
+        Assert(more >= 2, "more < 2");
+
+        n = read_buf(s->strm, s->window + s->strstart + s->lookahead, more);
+        s->lookahead += n;
+
+        /* Initialize the hash value now that we have some input: */
+        if (s->lookahead >= MIN_MATCH) {
+            s->ins_h = s->window[s->strstart];
+            UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]);
+#if MIN_MATCH != 3
+            Call UPDATE_HASH() MIN_MATCH-3 more times
+#endif
+        }
+        /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage,
+         * but this is not important since only literal bytes will be emitted.
+         */
+
+    } while (s->lookahead < MIN_LOOKAHEAD && s->strm->avail_in != 0);
+}
+
+/* ===========================================================================
+ * Flush the current block, with given end-of-file flag.
+ * IN assertion: strstart is set to the end of the current match.
+ */
+#define FLUSH_BLOCK_ONLY(s, eof) { \
+   _tr_flush_block(s, (s->block_start >= 0L ? \
+                   (charf *)&s->window[(unsigned)s->block_start] : \
+                   (charf *)Z_NULL), \
+                (ulg)((long)s->strstart - s->block_start), \
+                (eof)); \
+   s->block_start = s->strstart; \
+   flush_pending(s->strm); \
+   Tracev((stderr,"[FLUSH]")); \
+}
+
+/* Same but force premature exit if necessary. */
+#define FLUSH_BLOCK(s, eof) { \
+   FLUSH_BLOCK_ONLY(s, eof); \
+   if (s->strm->avail_out == 0) return (eof) ? finish_started : need_more; \
+}
+
+/* ===========================================================================
+ * Copy without compression as much as possible from the input stream, return
+ * the current block state.
+ * This function does not insert new strings in the dictionary since
+ * uncompressible data is probably not useful. This function is used
+ * only for the level=0 compression option.
+ * NOTE: this function should be optimized to avoid extra copying from
+ * window to pending_buf.
+ */
+local block_state deflate_stored(s, flush)
+    deflate_state *s;
+    int flush;
+{
+    /* Stored blocks are limited to 0xffff bytes, pending_buf is limited
+     * to pending_buf_size, and each stored block has a 5 byte header:
+     */
+    ulg max_block_size = 0xffff;
+    ulg max_start;
+
+    if (max_block_size > s->pending_buf_size - 5) {
+        max_block_size = s->pending_buf_size - 5;
+    }
+
+    /* Copy as much as possible from input to output: */
+    for (;;) {
+        /* Fill the window as much as possible: */
+        if (s->lookahead <= 1) {
+
+            Assert(s->strstart < s->w_size+MAX_DIST(s) ||
+                   s->block_start >= (long)s->w_size, "slide too late");
+
+            fill_window(s);
+            if (s->lookahead == 0 && flush == Z_NO_FLUSH) return need_more;
+
+            if (s->lookahead == 0) break; /* flush the current block */
+        }
+        Assert(s->block_start >= 0L, "block gone");
+
+        s->strstart += s->lookahead;
+        s->lookahead = 0;
+
+        /* Emit a stored block if pending_buf will be full: */
+        max_start = s->block_start + max_block_size;
+        if (s->strstart == 0 || (ulg)s->strstart >= max_start) {
+            /* strstart == 0 is possible when wraparound on 16-bit machine */
+            s->lookahead = (uInt)(s->strstart - max_start);
+            s->strstart = (uInt)max_start;
+            FLUSH_BLOCK(s, 0);
+        }
+        /* Flush if we may have to slide, otherwise block_start may become
+         * negative and the data will be gone:
+         */
+        if (s->strstart - (uInt)s->block_start >= MAX_DIST(s)) {
+            FLUSH_BLOCK(s, 0);
+        }
+    }
+    FLUSH_BLOCK(s, flush == Z_FINISH);
+    return flush == Z_FINISH ? finish_done : block_done;
+}
+
+/* ===========================================================================
+ * Compress as much as possible from the input stream, return the current
+ * block state.
+ * This function does not perform lazy evaluation of matches and inserts
+ * new strings in the dictionary only for unmatched strings or for short
+ * matches. It is used only for the fast compression options.
+ */
+local block_state deflate_fast(s, flush)
+    deflate_state *s;
+    int flush;
+{
+    IPos hash_head = NIL; /* head of the hash chain */
+    int bflush;           /* set if current block must be flushed */
+
+    for (;;) {
+        /* Make sure that we always have enough lookahead, except
+         * at the end of the input file. We need MAX_MATCH bytes
+         * for the next match, plus MIN_MATCH bytes to insert the
+         * string following the next match.
+         */
+        if (s->lookahead < MIN_LOOKAHEAD) {
+            fill_window(s);
+            if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) {
+                return need_more;
+            }
+            if (s->lookahead == 0) break; /* flush the current block */
+        }
+
+        /* Insert the string window[strstart .. strstart+2] in the
+         * dictionary, and set hash_head to the head of the hash chain:
+         */
+        if (s->lookahead >= MIN_MATCH) {
+            INSERT_STRING(s, s->strstart, hash_head);
+        }
+
+        /* Find the longest match, discarding those <= prev_length.
+         * At this point we have always match_length < MIN_MATCH
+         */
+        if (hash_head != NIL && s->strstart - hash_head <= MAX_DIST(s)) {
+            /* To simplify the code, we prevent matches with the string
+             * of window index 0 (in particular we have to avoid a match
+             * of the string with itself at the start of the input file).
+             */
+#ifdef FASTEST
+            if ((s->strategy < Z_HUFFMAN_ONLY) ||
+                (s->strategy == Z_RLE && s->strstart - hash_head == 1)) {
+                s->match_length = longest_match_fast (s, hash_head);
+            }
+#else
+            if (s->strategy < Z_HUFFMAN_ONLY) {
+                s->match_length = longest_match (s, hash_head);
+            } else if (s->strategy == Z_RLE && s->strstart - hash_head == 1) {
+                s->match_length = longest_match_fast (s, hash_head);
+            }
+#endif
+            /* longest_match() or longest_match_fast() sets match_start */
+        }
+        if (s->match_length >= MIN_MATCH) {
+            check_match(s, s->strstart, s->match_start, s->match_length);
+
+            _tr_tally_dist(s, s->strstart - s->match_start,
+                           s->match_length - MIN_MATCH, bflush);
+
+            s->lookahead -= s->match_length;
+
+            /* Insert new strings in the hash table only if the match length
+             * is not too large. This saves time but degrades compression.
+             */
+#ifndef FASTEST
+            if (s->match_length <= s->max_insert_length &&
+                s->lookahead >= MIN_MATCH) {
+                s->match_length--; /* string at strstart already in table */
+                do {
+                    s->strstart++;
+                    INSERT_STRING(s, s->strstart, hash_head);
+                    /* strstart never exceeds WSIZE-MAX_MATCH, so there are
+                     * always MIN_MATCH bytes ahead.
+                     */
+                } while (--s->match_length != 0);
+                s->strstart++;
+            } else
+#endif
+            {
+                s->strstart += s->match_length;
+                s->match_length = 0;
+                s->ins_h = s->window[s->strstart];
+                UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]);
+#if MIN_MATCH != 3
+                Call UPDATE_HASH() MIN_MATCH-3 more times
+#endif
+                /* If lookahead < MIN_MATCH, ins_h is garbage, but it does not
+                 * matter since it will be recomputed at next deflate call.
+                 */
+            }
+        } else {
+            /* No match, output a literal byte */
+            Tracevv((stderr,"%c", s->window[s->strstart]));
+            _tr_tally_lit (s, s->window[s->strstart], bflush);
+            s->lookahead--;
+            s->strstart++;
+        }
+        if (bflush) FLUSH_BLOCK(s, 0);
+    }
+    FLUSH_BLOCK(s, flush == Z_FINISH);
+    return flush == Z_FINISH ? finish_done : block_done;
+}
+
+#ifndef FASTEST
+/* ===========================================================================
+ * Same as above, but achieves better compression. We use a lazy
+ * evaluation for matches: a match is finally adopted only if there is
+ * no better match at the next window position.
+ */
+local block_state deflate_slow(s, flush)
+    deflate_state *s;
+    int flush;
+{
+    IPos hash_head = NIL;    /* head of hash chain */
+    int bflush;              /* set if current block must be flushed */
+
+    /* Process the input block. */
+    for (;;) {
+        /* Make sure that we always have enough lookahead, except
+         * at the end of the input file. We need MAX_MATCH bytes
+         * for the next match, plus MIN_MATCH bytes to insert the
+         * string following the next match.
+         */
+        if (s->lookahead < MIN_LOOKAHEAD) {
+            fill_window(s);
+            if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) {
+                return need_more;
+            }
+            if (s->lookahead == 0) break; /* flush the current block */
+        }
+
+        /* Insert the string window[strstart .. strstart+2] in the
+         * dictionary, and set hash_head to the head of the hash chain:
+         */
+        if (s->lookahead >= MIN_MATCH) {
+            INSERT_STRING(s, s->strstart, hash_head);
+        }
+
+        /* Find the longest match, discarding those <= prev_length.
+         */
+        s->prev_length = s->match_length, s->prev_match = s->match_start;
+        s->match_length = MIN_MATCH-1;
+
+        if (hash_head != NIL && s->prev_length < s->max_lazy_match &&
+            s->strstart - hash_head <= MAX_DIST(s)) {
+            /* To simplify the code, we prevent matches with the string
+             * of window index 0 (in particular we have to avoid a match
+             * of the string with itself at the start of the input file).
+             */
+            if (s->strategy < Z_HUFFMAN_ONLY) {
+                s->match_length = longest_match (s, hash_head);
+            } else if (s->strategy == Z_RLE && s->strstart - hash_head == 1) {
+                s->match_length = longest_match_fast (s, hash_head);
+            }
+            /* longest_match() or longest_match_fast() sets match_start */
+
+            if (s->match_length <= 5 && (s->strategy == Z_FILTERED
+#if TOO_FAR <= 32767
+                || (s->match_length == MIN_MATCH &&
+                    s->strstart - s->match_start > TOO_FAR)
+#endif
+                )) {
+
+                /* If prev_match is also MIN_MATCH, match_start is garbage
+                 * but we will ignore the current match anyway.
+                 */
+                s->match_length = MIN_MATCH-1;
+            }
+        }
+        /* If there was a match at the previous step and the current
+         * match is not better, output the previous match:
+         */
+        if (s->prev_length >= MIN_MATCH && s->match_length <= s->prev_length) {
+            uInt max_insert = s->strstart + s->lookahead - MIN_MATCH;
+            /* Do not insert strings in hash table beyond this. */
+
+            check_match(s, s->strstart-1, s->prev_match, s->prev_length);
+
+            _tr_tally_dist(s, s->strstart -1 - s->prev_match,
+                           s->prev_length - MIN_MATCH, bflush);
+
+            /* Insert in hash table all strings up to the end of the match.
+             * strstart-1 and strstart are already inserted. If there is not
+             * enough lookahead, the last two strings are not inserted in
+             * the hash table.
+             */
+            s->lookahead -= s->prev_length-1;
+            s->prev_length -= 2;
+            do {
+                if (++s->strstart <= max_insert) {
+                    INSERT_STRING(s, s->strstart, hash_head);
+                }
+            } while (--s->prev_length != 0);
+            s->match_available = 0;
+            s->match_length = MIN_MATCH-1;
+            s->strstart++;
+
+            if (bflush) FLUSH_BLOCK(s, 0);
+
+        } else if (s->match_available) {
+            /* If there was no match at the previous position, output a
+             * single literal. If there was a match but the current match
+             * is longer, truncate the previous match to a single literal.
+             */
+            Tracevv((stderr,"%c", s->window[s->strstart-1]));
+            _tr_tally_lit(s, s->window[s->strstart-1], bflush);
+            if (bflush) {
+                FLUSH_BLOCK_ONLY(s, 0);
+            }
+            s->strstart++;
+            s->lookahead--;
+            if (s->strm->avail_out == 0) return need_more;
+        } else {
+            /* There is no previous match to compare with, wait for
+             * the next step to decide.
+             */
+            s->match_available = 1;
+            s->strstart++;
+            s->lookahead--;
+        }
+    }
+    Assert (flush != Z_NO_FLUSH, "no flush?");
+    if (s->match_available) {
+        Tracevv((stderr,"%c", s->window[s->strstart-1]));
+        _tr_tally_lit(s, s->window[s->strstart-1], bflush);
+        s->match_available = 0;
+    }
+    FLUSH_BLOCK(s, flush == Z_FINISH);
+    return flush == Z_FINISH ? finish_done : block_done;
+}
+#endif /* FASTEST */
diff --git a/src/zlib/deflate.h b/src/zlib/deflate.h
index 043328367..410681d18 100644
--- a/src/zlib/deflate.h
+++ b/src/zlib/deflate.h
@@ -1,325 +1,325 @@
-/* deflate.h -- internal compression state

- * Copyright (C) 1995-2002 Jean-loup Gailly

- * For conditions of distribution and use, see copyright notice in zlib.h

- */

-

-/* WARNING: this file should *not* be used by applications. It is

-   part of the implementation of the compression library and is

-   subject to change. Applications should only use zlib.h.

- */

-

-/* @(#) $Id$ */

-

-#ifndef DEFLATE_H

-#define DEFLATE_H

-

-#include "zutil.h"

-

-/* define NO_GZIP when compiling if you want to disable gzip header and

-   trailer creation by deflate().  NO_GZIP would be used to avoid linking in

-   the crc code when it is not needed.  For shared libraries, gzip encoding

-   should be left enabled. */

-#ifndef NO_GZIP

-#  define GZIP

-#endif

-

-/* ===========================================================================

- * Internal compression state.

- */

-

-#define LENGTH_CODES 29

-/* number of length codes, not counting the special END_BLOCK code */

-

-#define LITERALS  256

-/* number of literal bytes 0..255 */

-

-#define L_CODES (LITERALS+1+LENGTH_CODES)

-/* number of Literal or Length codes, including the END_BLOCK code */

-

-#define D_CODES   30

-/* number of distance codes */

-

-#define BL_CODES  19

-/* number of codes used to transfer the bit lengths */

-

-#define HEAP_SIZE (2*L_CODES+1)

-/* maximum heap size */

-

-#define MAX_BITS 15

-/* All codes must not exceed MAX_BITS bits */

-

-#define INIT_STATE    42

-#define BUSY_STATE   113

-#define FINISH_STATE 666

-/* Stream status */

-

-

-/* Data structure describing a single value and its code string. */

-typedef struct ct_data_s {

-    union {

-        ush  freq;       /* frequency count */

-        ush  code;       /* bit string */

-    } fc;

-    union {

-        ush  dad;        /* father node in Huffman tree */

-        ush  len;        /* length of bit string */

-    } dl;

-} FAR ct_data;

-

-#define Freq fc.freq

-#define Code fc.code

-#define Dad  dl.dad

-#define Len  dl.len

-

-typedef struct static_tree_desc_s  static_tree_desc;

-

-typedef struct tree_desc_s {

-    ct_data *dyn_tree;           /* the dynamic tree */

-    int     max_code;            /* largest code with non zero frequency */

-    static_tree_desc *stat_desc; /* the corresponding static tree */

-} FAR tree_desc;

-

-typedef ush Pos;

-typedef Pos FAR Posf;

-typedef unsigned IPos;

-

-/* A Pos is an index in the character window. We use short instead of int to

- * save space in the various tables. IPos is used only for parameter passing.

- */

-

-typedef struct internal_state {

-    z_streamp strm;      /* pointer back to this zlib stream */

-    int   status;        /* as the name implies */

-    Bytef *pending_buf;  /* output still pending */

-    ulg   pending_buf_size; /* size of pending_buf */

-    Bytef *pending_out;  /* next pending byte to output to the stream */

-    int   pending;       /* nb of bytes in the pending buffer */

-    int   wrap;          /* bit 0 true for zlib, bit 1 true for gzip */

-    Byte  method;        /* STORED (for zip only) or DEFLATED */

-    int   last_flush;    /* value of flush param for previous deflate call */

-

-                /* used by deflate.c: */

-

-    uInt  w_size;        /* LZ77 window size (32K by default) */

-    uInt  w_bits;        /* log2(w_size)  (8..16) */

-    uInt  w_mask;        /* w_size - 1 */

-

-    Bytef *window;

-    /* Sliding window. Input bytes are read into the second half of the window,

-     * and move to the first half later to keep a dictionary of at least wSize

-     * bytes. With this organization, matches are limited to a distance of

-     * wSize-MAX_MATCH bytes, but this ensures that IO is always

-     * performed with a length multiple of the block size. Also, it limits

-     * the window size to 64K, which is quite useful on MSDOS.

-     * To do: use the user input buffer as sliding window.

-     */

-

-    ulg window_size;

-    /* Actual size of window: 2*wSize, except when the user input buffer

-     * is directly used as sliding window.

-     */

-

-    Posf *prev;

-    /* Link to older string with same hash index. To limit the size of this

-     * array to 64K, this link is maintained only for the last 32K strings.

-     * An index in this array is thus a window index modulo 32K.

-     */

-

-    Posf *head; /* Heads of the hash chains or NIL. */

-

-    uInt  ins_h;          /* hash index of string to be inserted */

-    uInt  hash_size;      /* number of elements in hash table */

-    uInt  hash_bits;      /* log2(hash_size) */

-    uInt  hash_mask;      /* hash_size-1 */

-

-    uInt  hash_shift;

-    /* Number of bits by which ins_h must be shifted at each input

-     * step. It must be such that after MIN_MATCH steps, the oldest

-     * byte no longer takes part in the hash key, that is:

-     *   hash_shift * MIN_MATCH >= hash_bits

-     */

-

-    long block_start;

-    /* Window position at the beginning of the current output block. Gets

-     * negative when the window is moved backwards.

-     */

-

-    uInt match_length;           /* length of best match */

-    IPos prev_match;             /* previous match */

-    int match_available;         /* set if previous match exists */

-    uInt strstart;               /* start of string to insert */

-    uInt match_start;            /* start of matching string */

-    uInt lookahead;              /* number of valid bytes ahead in window */

-

-    uInt prev_length;

-    /* Length of the best match at previous step. Matches not greater than this

-     * are discarded. This is used in the lazy match evaluation.

-     */

-

-    uInt max_chain_length;

-    /* To speed up deflation, hash chains are never searched beyond this

-     * length.  A higher limit improves compression ratio but degrades the

-     * speed.

-     */

-

-    uInt max_lazy_match;

-    /* Attempt to find a better match only when the current match is strictly

-     * smaller than this value. This mechanism is used only for compression

-     * levels >= 4.

-     */

-#   define max_insert_length  max_lazy_match

-    /* Insert new strings in the hash table only if the match length is not

-     * greater than this length. This saves time but degrades compression.

-     * max_insert_length is used only for compression levels <= 3.

-     */

-

-    int level;    /* compression level (1..9) */

-    int strategy; /* favor or force Huffman coding*/

-

-    uInt good_match;

-    /* Use a faster search when the previous match is longer than this */

-

-    int nice_match; /* Stop searching when current match exceeds this */

-

-                /* used by trees.c: */

-    /* Didn't use ct_data typedef below to supress compiler warning */

-    struct ct_data_s dyn_ltree[HEAP_SIZE];   /* literal and length tree */

-    struct ct_data_s dyn_dtree[2*D_CODES+1]; /* distance tree */

-    struct ct_data_s bl_tree[2*BL_CODES+1];  /* Huffman tree for bit lengths */

-

-    struct tree_desc_s l_desc;               /* desc. for literal tree */

-    struct tree_desc_s d_desc;               /* desc. for distance tree */

-    struct tree_desc_s bl_desc;              /* desc. for bit length tree */

-

-    ush bl_count[MAX_BITS+1];

-    /* number of codes at each bit length for an optimal tree */

-

-    int heap[2*L_CODES+1];      /* heap used to build the Huffman trees */

-    int heap_len;               /* number of elements in the heap */

-    int heap_max;               /* element of largest frequency */

-    /* The sons of heap[n] are heap[2*n] and heap[2*n+1]. heap[0] is not used.

-     * The same heap array is used to build all trees.

-     */

-

-    uch depth[2*L_CODES+1];

-    /* Depth of each subtree used as tie breaker for trees of equal frequency

-     */

-

-    uchf *l_buf;          /* buffer for literals or lengths */

-

-    uInt  lit_bufsize;

-    /* Size of match buffer for literals/lengths.  There are 4 reasons for

-     * limiting lit_bufsize to 64K:

-     *   - frequencies can be kept in 16 bit counters

-     *   - if compression is not successful for the first block, all input

-     *     data is still in the window so we can still emit a stored block even

-     *     when input comes from standard input.  (This can also be done for

-     *     all blocks if lit_bufsize is not greater than 32K.)

-     *   - if compression is not successful for a file smaller than 64K, we can

-     *     even emit a stored file instead of a stored block (saving 5 bytes).

-     *     This is applicable only for zip (not gzip or zlib).

-     *   - creating new Huffman trees less frequently may not provide fast

-     *     adaptation to changes in the input data statistics. (Take for

-     *     example a binary file with poorly compressible code followed by

-     *     a highly compressible string table.) Smaller buffer sizes give

-     *     fast adaptation but have of course the overhead of transmitting

-     *     trees more frequently.

-     *   - I can't count above 4

-     */

-

-    uInt last_lit;      /* running index in l_buf */

-

-    ushf *d_buf;

-    /* Buffer for distances. To simplify the code, d_buf and l_buf have

-     * the same number of elements. To use different lengths, an extra flag

-     * array would be necessary.

-     */

-

-    ulg opt_len;        /* bit length of current block with optimal trees */

-    ulg static_len;     /* bit length of current block with static trees */

-    uInt matches;       /* number of string matches in current block */

-    int last_eob_len;   /* bit length of EOB code for last block */

-

-#ifdef DEBUG

-    ulg compressed_len; /* total bit length of compressed file mod 2^32 */

-    ulg bits_sent;      /* bit length of compressed data sent mod 2^32 */

-#endif

-

-    ush bi_buf;

-    /* Output buffer. bits are inserted starting at the bottom (least

-     * significant bits).

-     */

-    int bi_valid;

-    /* Number of valid bits in bi_buf.  All bits above the last valid bit

-     * are always zero.

-     */

-

-} FAR deflate_state;

-

-/* Output a byte on the stream.

- * IN assertion: there is enough room in pending_buf.

- */

-#define put_byte(s, c) {s->pending_buf[s->pending++] = (c);}

-

-

-#define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1)

-/* Minimum amount of lookahead, except at the end of the input file.

- * See deflate.c for comments about the MIN_MATCH+1.

- */

-

-#define MAX_DIST(s)  ((s)->w_size-MIN_LOOKAHEAD)

-/* In order to simplify the code, particularly on 16 bit machines, match

- * distances are limited to MAX_DIST instead of WSIZE.

- */

-

-        /* in trees.c */

-void _tr_init         OF((deflate_state *s));

-int  _tr_tally        OF((deflate_state *s, unsigned dist, unsigned lc));

-void _tr_flush_block  OF((deflate_state *s, charf *buf, ulg stored_len,

-                          int eof));

-void _tr_align        OF((deflate_state *s));

-void _tr_stored_block OF((deflate_state *s, charf *buf, ulg stored_len,

-                          int eof));

-

-#define d_code(dist) \

-   ((dist) < 256 ? _dist_code[dist] : _dist_code[256+((dist)>>7)])

-/* Mapping from a distance to a distance code. dist is the distance - 1 and

- * must not have side effects. _dist_code[256] and _dist_code[257] are never

- * used.

- */

-

-#ifndef DEBUG

-/* Inline versions of _tr_tally for speed: */

-

-#if defined(GEN_TREES_H) || !defined(STDC)

-  extern uch _length_code[];

-  extern uch _dist_code[];

-#else

-  extern const uch _length_code[];

-  extern const uch _dist_code[];

-#endif

-

-# define _tr_tally_lit(s, c, flush) \

-  { uch cc = (c); \

-    s->d_buf[s->last_lit] = 0; \

-    s->l_buf[s->last_lit++] = cc; \

-    s->dyn_ltree[cc].Freq++; \

-    flush = (s->last_lit == s->lit_bufsize-1); \

-   }

-# define _tr_tally_dist(s, distance, length, flush) \

-  { uch len = (length); \

-    ush dist = (distance); \

-    s->d_buf[s->last_lit] = dist; \

-    s->l_buf[s->last_lit++] = len; \

-    dist--; \

-    s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \

-    s->dyn_dtree[d_code(dist)].Freq++; \

-    flush = (s->last_lit == s->lit_bufsize-1); \

-  }

-#else

-# define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c)

-# define _tr_tally_dist(s, distance, length, flush) \

-              flush = _tr_tally(s, distance, length)

-#endif

-

-#endif /* DEFLATE_H */

+/* deflate.h -- internal compression state
+ * Copyright (C) 1995-2002 Jean-loup Gailly
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+   part of the implementation of the compression library and is
+   subject to change. Applications should only use zlib.h.
+ */
+
+/* @(#) $Id$ */
+
+#ifndef DEFLATE_H
+#define DEFLATE_H
+
+#include "zutil.h"
+
+/* define NO_GZIP when compiling if you want to disable gzip header and
+   trailer creation by deflate().  NO_GZIP would be used to avoid linking in
+   the crc code when it is not needed.  For shared libraries, gzip encoding
+   should be left enabled. */
+#ifndef NO_GZIP
+#  define GZIP
+#endif
+
+/* ===========================================================================
+ * Internal compression state.
+ */
+
+#define LENGTH_CODES 29
+/* number of length codes, not counting the special END_BLOCK code */
+
+#define LITERALS  256
+/* number of literal bytes 0..255 */
+
+#define L_CODES (LITERALS+1+LENGTH_CODES)
+/* number of Literal or Length codes, including the END_BLOCK code */
+
+#define D_CODES   30
+/* number of distance codes */
+
+#define BL_CODES  19
+/* number of codes used to transfer the bit lengths */
+
+#define HEAP_SIZE (2*L_CODES+1)
+/* maximum heap size */
+
+#define MAX_BITS 15
+/* All codes must not exceed MAX_BITS bits */
+
+#define INIT_STATE    42
+#define BUSY_STATE   113
+#define FINISH_STATE 666
+/* Stream status */
+
+
+/* Data structure describing a single value and its code string. */
+typedef struct ct_data_s {
+    union {
+        ush  freq;       /* frequency count */
+        ush  code;       /* bit string */
+    } fc;
+    union {
+        ush  dad;        /* father node in Huffman tree */
+        ush  len;        /* length of bit string */
+    } dl;
+} FAR ct_data;
+
+#define Freq fc.freq
+#define Code fc.code
+#define Dad  dl.dad
+#define Len  dl.len
+
+typedef struct static_tree_desc_s  static_tree_desc;
+
+typedef struct tree_desc_s {
+    ct_data *dyn_tree;           /* the dynamic tree */
+    int     max_code;            /* largest code with non zero frequency */
+    static_tree_desc *stat_desc; /* the corresponding static tree */
+} FAR tree_desc;
+
+typedef ush Pos;
+typedef Pos FAR Posf;
+typedef unsigned IPos;
+
+/* A Pos is an index in the character window. We use short instead of int to
+ * save space in the various tables. IPos is used only for parameter passing.
+ */
+
+typedef struct internal_state {
+    z_streamp strm;      /* pointer back to this zlib stream */
+    int   status;        /* as the name implies */
+    Bytef *pending_buf;  /* output still pending */
+    ulg   pending_buf_size; /* size of pending_buf */
+    Bytef *pending_out;  /* next pending byte to output to the stream */
+    int   pending;       /* nb of bytes in the pending buffer */
+    int   wrap;          /* bit 0 true for zlib, bit 1 true for gzip */
+    Byte  method;        /* STORED (for zip only) or DEFLATED */
+    int   last_flush;    /* value of flush param for previous deflate call */
+
+                /* used by deflate.c: */
+
+    uInt  w_size;        /* LZ77 window size (32K by default) */
+    uInt  w_bits;        /* log2(w_size)  (8..16) */
+    uInt  w_mask;        /* w_size - 1 */
+
+    Bytef *window;
+    /* Sliding window. Input bytes are read into the second half of the window,
+     * and move to the first half later to keep a dictionary of at least wSize
+     * bytes. With this organization, matches are limited to a distance of
+     * wSize-MAX_MATCH bytes, but this ensures that IO is always
+     * performed with a length multiple of the block size. Also, it limits
+     * the window size to 64K, which is quite useful on MSDOS.
+     * To do: use the user input buffer as sliding window.
+     */
+
+    ulg window_size;
+    /* Actual size of window: 2*wSize, except when the user input buffer
+     * is directly used as sliding window.
+     */
+
+    Posf *prev;
+    /* Link to older string with same hash index. To limit the size of this
+     * array to 64K, this link is maintained only for the last 32K strings.
+     * An index in this array is thus a window index modulo 32K.
+     */
+
+    Posf *head; /* Heads of the hash chains or NIL. */
+
+    uInt  ins_h;          /* hash index of string to be inserted */
+    uInt  hash_size;      /* number of elements in hash table */
+    uInt  hash_bits;      /* log2(hash_size) */
+    uInt  hash_mask;      /* hash_size-1 */
+
+    uInt  hash_shift;
+    /* Number of bits by which ins_h must be shifted at each input
+     * step. It must be such that after MIN_MATCH steps, the oldest
+     * byte no longer takes part in the hash key, that is:
+     *   hash_shift * MIN_MATCH >= hash_bits
+     */
+
+    long block_start;
+    /* Window position at the beginning of the current output block. Gets
+     * negative when the window is moved backwards.
+     */
+
+    uInt match_length;           /* length of best match */
+    IPos prev_match;             /* previous match */
+    int match_available;         /* set if previous match exists */
+    uInt strstart;               /* start of string to insert */
+    uInt match_start;            /* start of matching string */
+    uInt lookahead;              /* number of valid bytes ahead in window */
+
+    uInt prev_length;
+    /* Length of the best match at previous step. Matches not greater than this
+     * are discarded. This is used in the lazy match evaluation.
+     */
+
+    uInt max_chain_length;
+    /* To speed up deflation, hash chains are never searched beyond this
+     * length.  A higher limit improves compression ratio but degrades the
+     * speed.
+     */
+
+    uInt max_lazy_match;
+    /* Attempt to find a better match only when the current match is strictly
+     * smaller than this value. This mechanism is used only for compression
+     * levels >= 4.
+     */
+#   define max_insert_length  max_lazy_match
+    /* Insert new strings in the hash table only if the match length is not
+     * greater than this length. This saves time but degrades compression.
+     * max_insert_length is used only for compression levels <= 3.
+     */
+
+    int level;    /* compression level (1..9) */
+    int strategy; /* favor or force Huffman coding*/
+
+    uInt good_match;
+    /* Use a faster search when the previous match is longer than this */
+
+    int nice_match; /* Stop searching when current match exceeds this */
+
+                /* used by trees.c: */
+    /* Didn't use ct_data typedef below to supress compiler warning */
+    struct ct_data_s dyn_ltree[HEAP_SIZE];   /* literal and length tree */
+    struct ct_data_s dyn_dtree[2*D_CODES+1]; /* distance tree */
+    struct ct_data_s bl_tree[2*BL_CODES+1];  /* Huffman tree for bit lengths */
+
+    struct tree_desc_s l_desc;               /* desc. for literal tree */
+    struct tree_desc_s d_desc;               /* desc. for distance tree */
+    struct tree_desc_s bl_desc;              /* desc. for bit length tree */
+
+    ush bl_count[MAX_BITS+1];
+    /* number of codes at each bit length for an optimal tree */
+
+    int heap[2*L_CODES+1];      /* heap used to build the Huffman trees */
+    int heap_len;               /* number of elements in the heap */
+    int heap_max;               /* element of largest frequency */
+    /* The sons of heap[n] are heap[2*n] and heap[2*n+1]. heap[0] is not used.
+     * The same heap array is used to build all trees.
+     */
+
+    uch depth[2*L_CODES+1];
+    /* Depth of each subtree used as tie breaker for trees of equal frequency
+     */
+
+    uchf *l_buf;          /* buffer for literals or lengths */
+
+    uInt  lit_bufsize;
+    /* Size of match buffer for literals/lengths.  There are 4 reasons for
+     * limiting lit_bufsize to 64K:
+     *   - frequencies can be kept in 16 bit counters
+     *   - if compression is not successful for the first block, all input
+     *     data is still in the window so we can still emit a stored block even
+     *     when input comes from standard input.  (This can also be done for
+     *     all blocks if lit_bufsize is not greater than 32K.)
+     *   - if compression is not successful for a file smaller than 64K, we can
+     *     even emit a stored file instead of a stored block (saving 5 bytes).
+     *     This is applicable only for zip (not gzip or zlib).
+     *   - creating new Huffman trees less frequently may not provide fast
+     *     adaptation to changes in the input data statistics. (Take for
+     *     example a binary file with poorly compressible code followed by
+     *     a highly compressible string table.) Smaller buffer sizes give
+     *     fast adaptation but have of course the overhead of transmitting
+     *     trees more frequently.
+     *   - I can't count above 4
+     */
+
+    uInt last_lit;      /* running index in l_buf */
+
+    ushf *d_buf;
+    /* Buffer for distances. To simplify the code, d_buf and l_buf have
+     * the same number of elements. To use different lengths, an extra flag
+     * array would be necessary.
+     */
+
+    ulg opt_len;        /* bit length of current block with optimal trees */
+    ulg static_len;     /* bit length of current block with static trees */
+    uInt matches;       /* number of string matches in current block */
+    int last_eob_len;   /* bit length of EOB code for last block */
+
+#ifdef DEBUG
+    ulg compressed_len; /* total bit length of compressed file mod 2^32 */
+    ulg bits_sent;      /* bit length of compressed data sent mod 2^32 */
+#endif
+
+    ush bi_buf;
+    /* Output buffer. bits are inserted starting at the bottom (least
+     * significant bits).
+     */
+    int bi_valid;
+    /* Number of valid bits in bi_buf.  All bits above the last valid bit
+     * are always zero.
+     */
+
+} FAR deflate_state;
+
+/* Output a byte on the stream.
+ * IN assertion: there is enough room in pending_buf.
+ */
+#define put_byte(s, c) {s->pending_buf[s->pending++] = (c);}
+
+
+#define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1)
+/* Minimum amount of lookahead, except at the end of the input file.
+ * See deflate.c for comments about the MIN_MATCH+1.
+ */
+
+#define MAX_DIST(s)  ((s)->w_size-MIN_LOOKAHEAD)
+/* In order to simplify the code, particularly on 16 bit machines, match
+ * distances are limited to MAX_DIST instead of WSIZE.
+ */
+
+        /* in trees.c */
+void _tr_init         OF((deflate_state *s));
+int  _tr_tally        OF((deflate_state *s, unsigned dist, unsigned lc));
+void _tr_flush_block  OF((deflate_state *s, charf *buf, ulg stored_len,
+                          int eof));
+void _tr_align        OF((deflate_state *s));
+void _tr_stored_block OF((deflate_state *s, charf *buf, ulg stored_len,
+                          int eof));
+
+#define d_code(dist) \
+   ((dist) < 256 ? _dist_code[dist] : _dist_code[256+((dist)>>7)])
+/* Mapping from a distance to a distance code. dist is the distance - 1 and
+ * must not have side effects. _dist_code[256] and _dist_code[257] are never
+ * used.
+ */
+
+#ifndef DEBUG
+/* Inline versions of _tr_tally for speed: */
+
+#if defined(GEN_TREES_H) || !defined(STDC)
+  extern uch _length_code[];
+  extern uch _dist_code[];
+#else
+  extern const uch _length_code[];
+  extern const uch _dist_code[];
+#endif
+
+# define _tr_tally_lit(s, c, flush) \
+  { uch cc = (c); \
+    s->d_buf[s->last_lit] = 0; \
+    s->l_buf[s->last_lit++] = cc; \
+    s->dyn_ltree[cc].Freq++; \
+    flush = (s->last_lit == s->lit_bufsize-1); \
+   }
+# define _tr_tally_dist(s, distance, length, flush) \
+  { uch len = (length); \
+    ush dist = (distance); \
+    s->d_buf[s->last_lit] = dist; \
+    s->l_buf[s->last_lit++] = len; \
+    dist--; \
+    s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \
+    s->dyn_dtree[d_code(dist)].Freq++; \
+    flush = (s->last_lit == s->lit_bufsize-1); \
+  }
+#else
+# define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c)
+# define _tr_tally_dist(s, distance, length, flush) \
+              flush = _tr_tally(s, distance, length)
+#endif
+
+#endif /* DEFLATE_H */
diff --git a/src/zlib/inffast.c b/src/zlib/inffast.c
index af9f38f9a..8c02a178d 100644
--- a/src/zlib/inffast.c
+++ b/src/zlib/inffast.c
@@ -1,305 +1,305 @@
-/* inffast.c -- fast decoding

- * Copyright (C) 1995-2004 Mark Adler

- * For conditions of distribution and use, see copyright notice in zlib.h

- */

-

-#include "zutil.h"

-#include "inftrees.h"

-#include "inflate.h"

-#include "inffast.h"

-

-#ifndef ASMINF

-

-/* Allow machine dependent optimization for post-increment or pre-increment.

-   Based on testing to date,

-   Pre-increment preferred for:

-   - PowerPC G3 (Adler)

-   - MIPS R5000 (Randers-Pehrson)

-   Post-increment preferred for:

-   - none

-   No measurable difference:

-   - Pentium III (Anderson)

-   - M68060 (Nikl)

- */

-#ifdef POSTINC

-#  define OFF 0

-#  define PUP(a) *(a)++

-#else

-#  define OFF 1

-#  define PUP(a) *++(a)

-#endif

-

-/*

-   Decode literal, length, and distance codes and write out the resulting

-   literal and match bytes until either not enough input or output is

-   available, an end-of-block is encountered, or a data error is encountered.

-   When large enough input and output buffers are supplied to inflate(), for

-   example, a 16K input buffer and a 64K output buffer, more than 95% of the

-   inflate execution time is spent in this routine.

-

-   Entry assumptions:

-

-        state->mode == LEN

-        strm->avail_in >= 6

-        strm->avail_out >= 258

-        start >= strm->avail_out

-        state->bits < 8

-

-   On return, state->mode is one of:

-

-        LEN -- ran out of enough output space or enough available input

-        TYPE -- reached end of block code, inflate() to interpret next block

-        BAD -- error in block data

-

-   Notes:

-

-    - The maximum input bits used by a length/distance pair is 15 bits for the

-      length code, 5 bits for the length extra, 15 bits for the distance code,

-      and 13 bits for the distance extra.  This totals 48 bits, or six bytes.

-      Therefore if strm->avail_in >= 6, then there is enough input to avoid

-      checking for available input while decoding.

-

-    - The maximum bytes that a single length/distance pair can output is 258

-      bytes, which is the maximum length that can be coded.  inflate_fast()

-      requires strm->avail_out >= 258 for each loop to avoid checking for

-      output space.

- */

-void inflate_fast(strm, start)

-z_streamp strm;

-unsigned start;         /* inflate()'s starting value for strm->avail_out */

-{

-    struct inflate_state FAR *state;

-    unsigned char FAR *in;      /* local strm->next_in */

-    unsigned char FAR *last;    /* while in < last, enough input available */

-    unsigned char FAR *out;     /* local strm->next_out */

-    unsigned char FAR *beg;     /* inflate()'s initial strm->next_out */

-    unsigned char FAR *end;     /* while out < end, enough space available */

-    unsigned wsize;             /* window size or zero if not using window */

-    unsigned whave;             /* valid bytes in the window */

-    unsigned write;             /* window write index */

-    unsigned char FAR *window;  /* allocated sliding window, if wsize != 0 */

-    unsigned long hold;         /* local strm->hold */

-    unsigned bits;              /* local strm->bits */

-    code const FAR *lcode;      /* local strm->lencode */

-    code const FAR *dcode;      /* local strm->distcode */

-    unsigned lmask;             /* mask for first level of length codes */

-    unsigned dmask;             /* mask for first level of distance codes */

-    code this;                  /* retrieved table entry */

-    unsigned op;                /* code bits, operation, extra bits, or */

-                                /*  window position, window bytes to copy */

-    unsigned len;               /* match length, unused bytes */

-    unsigned dist;              /* match distance */

-    unsigned char FAR *from;    /* where to copy match from */

-

-    /* copy state to local variables */

-    state = (struct inflate_state FAR *)strm->state;

-    in = strm->next_in - OFF;

-    last = in + (strm->avail_in - 5);

-    out = strm->next_out - OFF;

-    beg = out - (start - strm->avail_out);

-    end = out + (strm->avail_out - 257);

-    wsize = state->wsize;

-    whave = state->whave;

-    write = state->write;

-    window = state->window;

-    hold = state->hold;

-    bits = state->bits;

-    lcode = state->lencode;

-    dcode = state->distcode;

-    lmask = (1U << state->lenbits) - 1;

-    dmask = (1U << state->distbits) - 1;

-

-    /* decode literals and length/distances until end-of-block or not enough

-       input data or output space */

-    do {

-        if (bits < 15) {

-            hold += (unsigned long)(PUP(in)) << bits;

-            bits += 8;

-            hold += (unsigned long)(PUP(in)) << bits;

-            bits += 8;

-        }

-        this = lcode[hold & lmask];

-      dolen:

-        op = (unsigned)(this.bits);

-        hold >>= op;

-        bits -= op;

-        op = (unsigned)(this.op);

-        if (op == 0) {                          /* literal */

-            Tracevv((stderr, this.val >= 0x20 && this.val < 0x7f ?

-                    "inflate:         literal '%c'\n" :

-                    "inflate:         literal 0x%02x\n", this.val));

-            PUP(out) = (unsigned char)(this.val);

-        }

-        else if (op & 16) {                     /* length base */

-            len = (unsigned)(this.val);

-            op &= 15;                           /* number of extra bits */

-            if (op) {

-                if (bits < op) {

-                    hold += (unsigned long)(PUP(in)) << bits;

-                    bits += 8;

-                }

-                len += (unsigned)hold & ((1U << op) - 1);

-                hold >>= op;

-                bits -= op;

-            }

-            Tracevv((stderr, "inflate:         length %u\n", len));

-            if (bits < 15) {

-                hold += (unsigned long)(PUP(in)) << bits;

-                bits += 8;

-                hold += (unsigned long)(PUP(in)) << bits;

-                bits += 8;

-            }

-            this = dcode[hold & dmask];

-          dodist:

-            op = (unsigned)(this.bits);

-            hold >>= op;

-            bits -= op;

-            op = (unsigned)(this.op);

-            if (op & 16) {                      /* distance base */

-                dist = (unsigned)(this.val);

-                op &= 15;                       /* number of extra bits */

-                if (bits < op) {

-                    hold += (unsigned long)(PUP(in)) << bits;

-                    bits += 8;

-                    if (bits < op) {

-                        hold += (unsigned long)(PUP(in)) << bits;

-                        bits += 8;

-                    }

-                }

-                dist += (unsigned)hold & ((1U << op) - 1);

-                hold >>= op;

-                bits -= op;

-                Tracevv((stderr, "inflate:         distance %u\n", dist));

-                op = (unsigned)(out - beg);     /* max distance in output */

-                if (dist > op) {                /* see if copy from window */

-                    op = dist - op;             /* distance back in window */

-                    if (op > whave) {

-                        strm->msg = (char *)"invalid distance too far back";

-                        state->mode = BAD;

-                        break;

-                    }

-                    from = window - OFF;

-                    if (write == 0) {           /* very common case */

-                        from += wsize - op;

-                        if (op < len) {         /* some from window */

-                            len -= op;

-                            do {

-                                PUP(out) = PUP(from);

-                            } while (--op);

-                            from = out - dist;  /* rest from output */

-                        }

-                    }

-                    else if (write < op) {      /* wrap around window */

-                        from += wsize + write - op;

-                        op -= write;

-                        if (op < len) {         /* some from end of window */

-                            len -= op;

-                            do {

-                                PUP(out) = PUP(from);

-                            } while (--op);

-                            from = window - OFF;

-                            if (write < len) {  /* some from start of window */

-                                op = write;

-                                len -= op;

-                                do {

-                                    PUP(out) = PUP(from);

-                                } while (--op);

-                                from = out - dist;      /* rest from output */

-                            }

-                        }

-                    }

-                    else {                      /* contiguous in window */

-                        from += write - op;

-                        if (op < len) {         /* some from window */

-                            len -= op;

-                            do {

-                                PUP(out) = PUP(from);

-                            } while (--op);

-                            from = out - dist;  /* rest from output */

-                        }

-                    }

-                    while (len > 2) {

-                        PUP(out) = PUP(from);

-                        PUP(out) = PUP(from);

-                        PUP(out) = PUP(from);

-                        len -= 3;

-                    }

-                    if (len) {

-                        PUP(out) = PUP(from);

-                        if (len > 1)

-                            PUP(out) = PUP(from);

-                    }

-                }

-                else {

-                    from = out - dist;          /* copy direct from output */

-                    do {                        /* minimum length is three */

-                        PUP(out) = PUP(from);

-                        PUP(out) = PUP(from);

-                        PUP(out) = PUP(from);

-                        len -= 3;

-                    } while (len > 2);

-                    if (len) {

-                        PUP(out) = PUP(from);

-                        if (len > 1)

-                            PUP(out) = PUP(from);

-                    }

-                }

-            }

-            else if ((op & 64) == 0) {          /* 2nd level distance code */

-                this = dcode[this.val + (hold & ((1U << op) - 1))];

-                goto dodist;

-            }

-            else {

-                strm->msg = (char *)"invalid distance code";

-                state->mode = BAD;

-                break;

-            }

-        }

-        else if ((op & 64) == 0) {              /* 2nd level length code */

-            this = lcode[this.val + (hold & ((1U << op) - 1))];

-            goto dolen;

-        }

-        else if (op & 32) {                     /* end-of-block */

-            Tracevv((stderr, "inflate:         end of block\n"));

-            state->mode = TYPE;

-            break;

-        }

-        else {

-            strm->msg = (char *)"invalid literal/length code";

-            state->mode = BAD;

-            break;

-        }

-    } while (in < last && out < end);

-

-    /* return unused bytes (on entry, bits < 8, so in won't go too far back) */

-    len = bits >> 3;

-    in -= len;

-    bits -= len << 3;

-    hold &= (1U << bits) - 1;

-

-    /* update state and return */

-    strm->next_in = in + OFF;

-    strm->next_out = out + OFF;

-    strm->avail_in = (unsigned)(in < last ? 5 + (last - in) : 5 - (in - last));

-    strm->avail_out = (unsigned)(out < end ?

-                                 257 + (end - out) : 257 - (out - end));

-    state->hold = hold;

-    state->bits = bits;

-    return;

-}

-

-/*

-   inflate_fast() speedups that turned out slower (on a PowerPC G3 750CXe):

-   - Using bit fields for code structure

-   - Different op definition to avoid & for extra bits (do & for table bits)

-   - Three separate decoding do-loops for direct, window, and write == 0

-   - Special case for distance > 1 copies to do overlapped load and store copy

-   - Explicit branch predictions (based on measured branch probabilities)

-   - Deferring match copy and interspersed it with decoding subsequent codes

-   - Swapping literal/length else

-   - Swapping window/direct else

-   - Larger unrolled copy loops (three is about right)

-   - Moving len -= 3 statement into middle of loop

- */

-

-#endif /* !ASMINF */

+/* inffast.c -- fast decoding
+ * Copyright (C) 1995-2004 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include "zutil.h"
+#include "inftrees.h"
+#include "inflate.h"
+#include "inffast.h"
+
+#ifndef ASMINF
+
+/* Allow machine dependent optimization for post-increment or pre-increment.
+   Based on testing to date,
+   Pre-increment preferred for:
+   - PowerPC G3 (Adler)
+   - MIPS R5000 (Randers-Pehrson)
+   Post-increment preferred for:
+   - none
+   No measurable difference:
+   - Pentium III (Anderson)
+   - M68060 (Nikl)
+ */
+#ifdef POSTINC
+#  define OFF 0
+#  define PUP(a) *(a)++
+#else
+#  define OFF 1
+#  define PUP(a) *++(a)
+#endif
+
+/*
+   Decode literal, length, and distance codes and write out the resulting
+   literal and match bytes until either not enough input or output is
+   available, an end-of-block is encountered, or a data error is encountered.
+   When large enough input and output buffers are supplied to inflate(), for
+   example, a 16K input buffer and a 64K output buffer, more than 95% of the
+   inflate execution time is spent in this routine.
+
+   Entry assumptions:
+
+        state->mode == LEN
+        strm->avail_in >= 6
+        strm->avail_out >= 258
+        start >= strm->avail_out
+        state->bits < 8
+
+   On return, state->mode is one of:
+
+        LEN -- ran out of enough output space or enough available input
+        TYPE -- reached end of block code, inflate() to interpret next block
+        BAD -- error in block data
+
+   Notes:
+
+    - The maximum input bits used by a length/distance pair is 15 bits for the
+      length code, 5 bits for the length extra, 15 bits for the distance code,
+      and 13 bits for the distance extra.  This totals 48 bits, or six bytes.
+      Therefore if strm->avail_in >= 6, then there is enough input to avoid
+      checking for available input while decoding.
+
+    - The maximum bytes that a single length/distance pair can output is 258
+      bytes, which is the maximum length that can be coded.  inflate_fast()
+      requires strm->avail_out >= 258 for each loop to avoid checking for
+      output space.
+ */
+void inflate_fast(strm, start)
+z_streamp strm;
+unsigned start;         /* inflate()'s starting value for strm->avail_out */
+{
+    struct inflate_state FAR *state;
+    unsigned char FAR *in;      /* local strm->next_in */
+    unsigned char FAR *last;    /* while in < last, enough input available */
+    unsigned char FAR *out;     /* local strm->next_out */
+    unsigned char FAR *beg;     /* inflate()'s initial strm->next_out */
+    unsigned char FAR *end;     /* while out < end, enough space available */
+    unsigned wsize;             /* window size or zero if not using window */
+    unsigned whave;             /* valid bytes in the window */
+    unsigned write;             /* window write index */
+    unsigned char FAR *window;  /* allocated sliding window, if wsize != 0 */
+    unsigned long hold;         /* local strm->hold */
+    unsigned bits;              /* local strm->bits */
+    code const FAR *lcode;      /* local strm->lencode */
+    code const FAR *dcode;      /* local strm->distcode */
+    unsigned lmask;             /* mask for first level of length codes */
+    unsigned dmask;             /* mask for first level of distance codes */
+    code this;                  /* retrieved table entry */
+    unsigned op;                /* code bits, operation, extra bits, or */
+                                /*  window position, window bytes to copy */
+    unsigned len;               /* match length, unused bytes */
+    unsigned dist;              /* match distance */
+    unsigned char FAR *from;    /* where to copy match from */
+
+    /* copy state to local variables */
+    state = (struct inflate_state FAR *)strm->state;
+    in = strm->next_in - OFF;
+    last = in + (strm->avail_in - 5);
+    out = strm->next_out - OFF;
+    beg = out - (start - strm->avail_out);
+    end = out + (strm->avail_out - 257);
+    wsize = state->wsize;
+    whave = state->whave;
+    write = state->write;
+    window = state->window;
+    hold = state->hold;
+    bits = state->bits;
+    lcode = state->lencode;
+    dcode = state->distcode;
+    lmask = (1U << state->lenbits) - 1;
+    dmask = (1U << state->distbits) - 1;
+
+    /* decode literals and length/distances until end-of-block or not enough
+       input data or output space */
+    do {
+        if (bits < 15) {
+            hold += (unsigned long)(PUP(in)) << bits;
+            bits += 8;
+            hold += (unsigned long)(PUP(in)) << bits;
+            bits += 8;
+        }
+        this = lcode[hold & lmask];
+      dolen:
+        op = (unsigned)(this.bits);
+        hold >>= op;
+        bits -= op;
+        op = (unsigned)(this.op);
+        if (op == 0) {                          /* literal */
+            Tracevv((stderr, this.val >= 0x20 && this.val < 0x7f ?
+                    "inflate:         literal '%c'\n" :
+                    "inflate:         literal 0x%02x\n", this.val));
+            PUP(out) = (unsigned char)(this.val);
+        }
+        else if (op & 16) {                     /* length base */
+            len = (unsigned)(this.val);
+            op &= 15;                           /* number of extra bits */
+            if (op) {
+                if (bits < op) {
+                    hold += (unsigned long)(PUP(in)) << bits;
+                    bits += 8;
+                }
+                len += (unsigned)hold & ((1U << op) - 1);
+                hold >>= op;
+                bits -= op;
+            }
+            Tracevv((stderr, "inflate:         length %u\n", len));
+            if (bits < 15) {
+                hold += (unsigned long)(PUP(in)) << bits;
+                bits += 8;
+                hold += (unsigned long)(PUP(in)) << bits;
+                bits += 8;
+            }
+            this = dcode[hold & dmask];
+          dodist:
+            op = (unsigned)(this.bits);
+            hold >>= op;
+            bits -= op;
+            op = (unsigned)(this.op);
+            if (op & 16) {                      /* distance base */
+                dist = (unsigned)(this.val);
+                op &= 15;                       /* number of extra bits */
+                if (bits < op) {
+                    hold += (unsigned long)(PUP(in)) << bits;
+                    bits += 8;
+                    if (bits < op) {
+                        hold += (unsigned long)(PUP(in)) << bits;
+                        bits += 8;
+                    }
+                }
+                dist += (unsigned)hold & ((1U << op) - 1);
+                hold >>= op;
+                bits -= op;
+                Tracevv((stderr, "inflate:         distance %u\n", dist));
+                op = (unsigned)(out - beg);     /* max distance in output */
+                if (dist > op) {                /* see if copy from window */
+                    op = dist - op;             /* distance back in window */
+                    if (op > whave) {
+                        strm->msg = (char *)"invalid distance too far back";
+                        state->mode = BAD;
+                        break;
+                    }
+                    from = window - OFF;
+                    if (write == 0) {           /* very common case */
+                        from += wsize - op;
+                        if (op < len) {         /* some from window */
+                            len -= op;
+                            do {
+                                PUP(out) = PUP(from);
+                            } while (--op);
+                            from = out - dist;  /* rest from output */
+                        }
+                    }
+                    else if (write < op) {      /* wrap around window */
+                        from += wsize + write - op;
+                        op -= write;
+                        if (op < len) {         /* some from end of window */
+                            len -= op;
+                            do {
+                                PUP(out) = PUP(from);
+                            } while (--op);
+                            from = window - OFF;
+                            if (write < len) {  /* some from start of window */
+                                op = write;
+                                len -= op;
+                                do {
+                                    PUP(out) = PUP(from);
+                                } while (--op);
+                                from = out - dist;      /* rest from output */
+                            }
+                        }
+                    }
+                    else {                      /* contiguous in window */
+                        from += write - op;
+                        if (op < len) {         /* some from window */
+                            len -= op;
+                            do {
+                                PUP(out) = PUP(from);
+                            } while (--op);
+                            from = out - dist;  /* rest from output */
+                        }
+                    }
+                    while (len > 2) {
+                        PUP(out) = PUP(from);
+                        PUP(out) = PUP(from);
+                        PUP(out) = PUP(from);
+                        len -= 3;
+                    }
+                    if (len) {
+                        PUP(out) = PUP(from);
+                        if (len > 1)
+                            PUP(out) = PUP(from);
+                    }
+                }
+                else {
+                    from = out - dist;          /* copy direct from output */
+                    do {                        /* minimum length is three */
+                        PUP(out) = PUP(from);
+                        PUP(out) = PUP(from);
+                        PUP(out) = PUP(from);
+                        len -= 3;
+                    } while (len > 2);
+                    if (len) {
+                        PUP(out) = PUP(from);
+                        if (len > 1)
+                            PUP(out) = PUP(from);
+                    }
+                }
+            }
+            else if ((op & 64) == 0) {          /* 2nd level distance code */
+                this = dcode[this.val + (hold & ((1U << op) - 1))];
+                goto dodist;
+            }
+            else {
+                strm->msg = (char *)"invalid distance code";
+                state->mode = BAD;
+                break;
+            }
+        }
+        else if ((op & 64) == 0) {              /* 2nd level length code */
+            this = lcode[this.val + (hold & ((1U << op) - 1))];
+            goto dolen;
+        }
+        else if (op & 32) {                     /* end-of-block */
+            Tracevv((stderr, "inflate:         end of block\n"));
+            state->mode = TYPE;
+            break;
+        }
+        else {
+            strm->msg = (char *)"invalid literal/length code";
+            state->mode = BAD;
+            break;
+        }
+    } while (in < last && out < end);
+
+    /* return unused bytes (on entry, bits < 8, so in won't go too far back) */
+    len = bits >> 3;
+    in -= len;
+    bits -= len << 3;
+    hold &= (1U << bits) - 1;
+
+    /* update state and return */
+    strm->next_in = in + OFF;
+    strm->next_out = out + OFF;
+    strm->avail_in = (unsigned)(in < last ? 5 + (last - in) : 5 - (in - last));
+    strm->avail_out = (unsigned)(out < end ?
+                                 257 + (end - out) : 257 - (out - end));
+    state->hold = hold;
+    state->bits = bits;
+    return;
+}
+
+/*
+   inflate_fast() speedups that turned out slower (on a PowerPC G3 750CXe):
+   - Using bit fields for code structure
+   - Different op definition to avoid & for extra bits (do & for table bits)
+   - Three separate decoding do-loops for direct, window, and write == 0
+   - Special case for distance > 1 copies to do overlapped load and store copy
+   - Explicit branch predictions (based on measured branch probabilities)
+   - Deferring match copy and interspersed it with decoding subsequent codes
+   - Swapping literal/length else
+   - Swapping window/direct else
+   - Larger unrolled copy loops (three is about right)
+   - Moving len -= 3 statement into middle of loop
+ */
+
+#endif /* !ASMINF */
diff --git a/src/zlib/inffast.h b/src/zlib/inffast.h
index 614fa7877..1e88d2d97 100644
--- a/src/zlib/inffast.h
+++ b/src/zlib/inffast.h
@@ -1,11 +1,11 @@
-/* inffast.h -- header to use inffast.c

- * Copyright (C) 1995-2003 Mark Adler

- * For conditions of distribution and use, see copyright notice in zlib.h

- */

-

-/* WARNING: this file should *not* be used by applications. It is

-   part of the implementation of the compression library and is

-   subject to change. Applications should only use zlib.h.

- */

-

-void inflate_fast OF((z_streamp strm, unsigned start));

+/* inffast.h -- header to use inffast.c
+ * Copyright (C) 1995-2003 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+   part of the implementation of the compression library and is
+   subject to change. Applications should only use zlib.h.
+ */
+
+void inflate_fast OF((z_streamp strm, unsigned start));
diff --git a/src/zlib/inffixed.h b/src/zlib/inffixed.h
index 423d5c5b5..75ed4b597 100644
--- a/src/zlib/inffixed.h
+++ b/src/zlib/inffixed.h
@@ -1,94 +1,94 @@
-    /* inffixed.h -- table for decoding fixed codes

-     * Generated automatically by makefixed().

-     */

-

-    /* WARNING: this file should *not* be used by applications. It

-       is part of the implementation of the compression library and

-       is subject to change. Applications should only use zlib.h.

-     */

-

-    static const code lenfix[512] = {

-        {96,7,0},{0,8,80},{0,8,16},{20,8,115},{18,7,31},{0,8,112},{0,8,48},

-        {0,9,192},{16,7,10},{0,8,96},{0,8,32},{0,9,160},{0,8,0},{0,8,128},

-        {0,8,64},{0,9,224},{16,7,6},{0,8,88},{0,8,24},{0,9,144},{19,7,59},

-        {0,8,120},{0,8,56},{0,9,208},{17,7,17},{0,8,104},{0,8,40},{0,9,176},

-        {0,8,8},{0,8,136},{0,8,72},{0,9,240},{16,7,4},{0,8,84},{0,8,20},

-        {21,8,227},{19,7,43},{0,8,116},{0,8,52},{0,9,200},{17,7,13},{0,8,100},

-        {0,8,36},{0,9,168},{0,8,4},{0,8,132},{0,8,68},{0,9,232},{16,7,8},

-        {0,8,92},{0,8,28},{0,9,152},{20,7,83},{0,8,124},{0,8,60},{0,9,216},

-        {18,7,23},{0,8,108},{0,8,44},{0,9,184},{0,8,12},{0,8,140},{0,8,76},

-        {0,9,248},{16,7,3},{0,8,82},{0,8,18},{21,8,163},{19,7,35},{0,8,114},

-        {0,8,50},{0,9,196},{17,7,11},{0,8,98},{0,8,34},{0,9,164},{0,8,2},

-        {0,8,130},{0,8,66},{0,9,228},{16,7,7},{0,8,90},{0,8,26},{0,9,148},

-        {20,7,67},{0,8,122},{0,8,58},{0,9,212},{18,7,19},{0,8,106},{0,8,42},

-        {0,9,180},{0,8,10},{0,8,138},{0,8,74},{0,9,244},{16,7,5},{0,8,86},

-        {0,8,22},{64,8,0},{19,7,51},{0,8,118},{0,8,54},{0,9,204},{17,7,15},

-        {0,8,102},{0,8,38},{0,9,172},{0,8,6},{0,8,134},{0,8,70},{0,9,236},

-        {16,7,9},{0,8,94},{0,8,30},{0,9,156},{20,7,99},{0,8,126},{0,8,62},

-        {0,9,220},{18,7,27},{0,8,110},{0,8,46},{0,9,188},{0,8,14},{0,8,142},

-        {0,8,78},{0,9,252},{96,7,0},{0,8,81},{0,8,17},{21,8,131},{18,7,31},

-        {0,8,113},{0,8,49},{0,9,194},{16,7,10},{0,8,97},{0,8,33},{0,9,162},

-        {0,8,1},{0,8,129},{0,8,65},{0,9,226},{16,7,6},{0,8,89},{0,8,25},

-        {0,9,146},{19,7,59},{0,8,121},{0,8,57},{0,9,210},{17,7,17},{0,8,105},

-        {0,8,41},{0,9,178},{0,8,9},{0,8,137},{0,8,73},{0,9,242},{16,7,4},

-        {0,8,85},{0,8,21},{16,8,258},{19,7,43},{0,8,117},{0,8,53},{0,9,202},

-        {17,7,13},{0,8,101},{0,8,37},{0,9,170},{0,8,5},{0,8,133},{0,8,69},

-        {0,9,234},{16,7,8},{0,8,93},{0,8,29},{0,9,154},{20,7,83},{0,8,125},

-        {0,8,61},{0,9,218},{18,7,23},{0,8,109},{0,8,45},{0,9,186},{0,8,13},

-        {0,8,141},{0,8,77},{0,9,250},{16,7,3},{0,8,83},{0,8,19},{21,8,195},

-        {19,7,35},{0,8,115},{0,8,51},{0,9,198},{17,7,11},{0,8,99},{0,8,35},

-        {0,9,166},{0,8,3},{0,8,131},{0,8,67},{0,9,230},{16,7,7},{0,8,91},

-        {0,8,27},{0,9,150},{20,7,67},{0,8,123},{0,8,59},{0,9,214},{18,7,19},

-        {0,8,107},{0,8,43},{0,9,182},{0,8,11},{0,8,139},{0,8,75},{0,9,246},

-        {16,7,5},{0,8,87},{0,8,23},{64,8,0},{19,7,51},{0,8,119},{0,8,55},

-        {0,9,206},{17,7,15},{0,8,103},{0,8,39},{0,9,174},{0,8,7},{0,8,135},

-        {0,8,71},{0,9,238},{16,7,9},{0,8,95},{0,8,31},{0,9,158},{20,7,99},

-        {0,8,127},{0,8,63},{0,9,222},{18,7,27},{0,8,111},{0,8,47},{0,9,190},

-        {0,8,15},{0,8,143},{0,8,79},{0,9,254},{96,7,0},{0,8,80},{0,8,16},

-        {20,8,115},{18,7,31},{0,8,112},{0,8,48},{0,9,193},{16,7,10},{0,8,96},

-        {0,8,32},{0,9,161},{0,8,0},{0,8,128},{0,8,64},{0,9,225},{16,7,6},

-        {0,8,88},{0,8,24},{0,9,145},{19,7,59},{0,8,120},{0,8,56},{0,9,209},

-        {17,7,17},{0,8,104},{0,8,40},{0,9,177},{0,8,8},{0,8,136},{0,8,72},

-        {0,9,241},{16,7,4},{0,8,84},{0,8,20},{21,8,227},{19,7,43},{0,8,116},

-        {0,8,52},{0,9,201},{17,7,13},{0,8,100},{0,8,36},{0,9,169},{0,8,4},

-        {0,8,132},{0,8,68},{0,9,233},{16,7,8},{0,8,92},{0,8,28},{0,9,153},

-        {20,7,83},{0,8,124},{0,8,60},{0,9,217},{18,7,23},{0,8,108},{0,8,44},

-        {0,9,185},{0,8,12},{0,8,140},{0,8,76},{0,9,249},{16,7,3},{0,8,82},

-        {0,8,18},{21,8,163},{19,7,35},{0,8,114},{0,8,50},{0,9,197},{17,7,11},

-        {0,8,98},{0,8,34},{0,9,165},{0,8,2},{0,8,130},{0,8,66},{0,9,229},

-        {16,7,7},{0,8,90},{0,8,26},{0,9,149},{20,7,67},{0,8,122},{0,8,58},

-        {0,9,213},{18,7,19},{0,8,106},{0,8,42},{0,9,181},{0,8,10},{0,8,138},

-        {0,8,74},{0,9,245},{16,7,5},{0,8,86},{0,8,22},{64,8,0},{19,7,51},

-        {0,8,118},{0,8,54},{0,9,205},{17,7,15},{0,8,102},{0,8,38},{0,9,173},

-        {0,8,6},{0,8,134},{0,8,70},{0,9,237},{16,7,9},{0,8,94},{0,8,30},

-        {0,9,157},{20,7,99},{0,8,126},{0,8,62},{0,9,221},{18,7,27},{0,8,110},

-        {0,8,46},{0,9,189},{0,8,14},{0,8,142},{0,8,78},{0,9,253},{96,7,0},

-        {0,8,81},{0,8,17},{21,8,131},{18,7,31},{0,8,113},{0,8,49},{0,9,195},

-        {16,7,10},{0,8,97},{0,8,33},{0,9,163},{0,8,1},{0,8,129},{0,8,65},

-        {0,9,227},{16,7,6},{0,8,89},{0,8,25},{0,9,147},{19,7,59},{0,8,121},

-        {0,8,57},{0,9,211},{17,7,17},{0,8,105},{0,8,41},{0,9,179},{0,8,9},

-        {0,8,137},{0,8,73},{0,9,243},{16,7,4},{0,8,85},{0,8,21},{16,8,258},

-        {19,7,43},{0,8,117},{0,8,53},{0,9,203},{17,7,13},{0,8,101},{0,8,37},

-        {0,9,171},{0,8,5},{0,8,133},{0,8,69},{0,9,235},{16,7,8},{0,8,93},

-        {0,8,29},{0,9,155},{20,7,83},{0,8,125},{0,8,61},{0,9,219},{18,7,23},

-        {0,8,109},{0,8,45},{0,9,187},{0,8,13},{0,8,141},{0,8,77},{0,9,251},

-        {16,7,3},{0,8,83},{0,8,19},{21,8,195},{19,7,35},{0,8,115},{0,8,51},

-        {0,9,199},{17,7,11},{0,8,99},{0,8,35},{0,9,167},{0,8,3},{0,8,131},

-        {0,8,67},{0,9,231},{16,7,7},{0,8,91},{0,8,27},{0,9,151},{20,7,67},

-        {0,8,123},{0,8,59},{0,9,215},{18,7,19},{0,8,107},{0,8,43},{0,9,183},

-        {0,8,11},{0,8,139},{0,8,75},{0,9,247},{16,7,5},{0,8,87},{0,8,23},

-        {64,8,0},{19,7,51},{0,8,119},{0,8,55},{0,9,207},{17,7,15},{0,8,103},

-        {0,8,39},{0,9,175},{0,8,7},{0,8,135},{0,8,71},{0,9,239},{16,7,9},

-        {0,8,95},{0,8,31},{0,9,159},{20,7,99},{0,8,127},{0,8,63},{0,9,223},

-        {18,7,27},{0,8,111},{0,8,47},{0,9,191},{0,8,15},{0,8,143},{0,8,79},

-        {0,9,255}

-    };

-

-    static const code distfix[32] = {

-        {16,5,1},{23,5,257},{19,5,17},{27,5,4097},{17,5,5},{25,5,1025},

-        {21,5,65},{29,5,16385},{16,5,3},{24,5,513},{20,5,33},{28,5,8193},

-        {18,5,9},{26,5,2049},{22,5,129},{64,5,0},{16,5,2},{23,5,385},

-        {19,5,25},{27,5,6145},{17,5,7},{25,5,1537},{21,5,97},{29,5,24577},

-        {16,5,4},{24,5,769},{20,5,49},{28,5,12289},{18,5,13},{26,5,3073},

-        {22,5,193},{64,5,0}

-    };

+    /* inffixed.h -- table for decoding fixed codes
+     * Generated automatically by makefixed().
+     */
+
+    /* WARNING: this file should *not* be used by applications. It
+       is part of the implementation of the compression library and
+       is subject to change. Applications should only use zlib.h.
+     */
+
+    static const code lenfix[512] = {
+        {96,7,0},{0,8,80},{0,8,16},{20,8,115},{18,7,31},{0,8,112},{0,8,48},
+        {0,9,192},{16,7,10},{0,8,96},{0,8,32},{0,9,160},{0,8,0},{0,8,128},
+        {0,8,64},{0,9,224},{16,7,6},{0,8,88},{0,8,24},{0,9,144},{19,7,59},
+        {0,8,120},{0,8,56},{0,9,208},{17,7,17},{0,8,104},{0,8,40},{0,9,176},
+        {0,8,8},{0,8,136},{0,8,72},{0,9,240},{16,7,4},{0,8,84},{0,8,20},
+        {21,8,227},{19,7,43},{0,8,116},{0,8,52},{0,9,200},{17,7,13},{0,8,100},
+        {0,8,36},{0,9,168},{0,8,4},{0,8,132},{0,8,68},{0,9,232},{16,7,8},
+        {0,8,92},{0,8,28},{0,9,152},{20,7,83},{0,8,124},{0,8,60},{0,9,216},
+        {18,7,23},{0,8,108},{0,8,44},{0,9,184},{0,8,12},{0,8,140},{0,8,76},
+        {0,9,248},{16,7,3},{0,8,82},{0,8,18},{21,8,163},{19,7,35},{0,8,114},
+        {0,8,50},{0,9,196},{17,7,11},{0,8,98},{0,8,34},{0,9,164},{0,8,2},
+        {0,8,130},{0,8,66},{0,9,228},{16,7,7},{0,8,90},{0,8,26},{0,9,148},
+        {20,7,67},{0,8,122},{0,8,58},{0,9,212},{18,7,19},{0,8,106},{0,8,42},
+        {0,9,180},{0,8,10},{0,8,138},{0,8,74},{0,9,244},{16,7,5},{0,8,86},
+        {0,8,22},{64,8,0},{19,7,51},{0,8,118},{0,8,54},{0,9,204},{17,7,15},
+        {0,8,102},{0,8,38},{0,9,172},{0,8,6},{0,8,134},{0,8,70},{0,9,236},
+        {16,7,9},{0,8,94},{0,8,30},{0,9,156},{20,7,99},{0,8,126},{0,8,62},
+        {0,9,220},{18,7,27},{0,8,110},{0,8,46},{0,9,188},{0,8,14},{0,8,142},
+        {0,8,78},{0,9,252},{96,7,0},{0,8,81},{0,8,17},{21,8,131},{18,7,31},
+        {0,8,113},{0,8,49},{0,9,194},{16,7,10},{0,8,97},{0,8,33},{0,9,162},
+        {0,8,1},{0,8,129},{0,8,65},{0,9,226},{16,7,6},{0,8,89},{0,8,25},
+        {0,9,146},{19,7,59},{0,8,121},{0,8,57},{0,9,210},{17,7,17},{0,8,105},
+        {0,8,41},{0,9,178},{0,8,9},{0,8,137},{0,8,73},{0,9,242},{16,7,4},
+        {0,8,85},{0,8,21},{16,8,258},{19,7,43},{0,8,117},{0,8,53},{0,9,202},
+        {17,7,13},{0,8,101},{0,8,37},{0,9,170},{0,8,5},{0,8,133},{0,8,69},
+        {0,9,234},{16,7,8},{0,8,93},{0,8,29},{0,9,154},{20,7,83},{0,8,125},
+        {0,8,61},{0,9,218},{18,7,23},{0,8,109},{0,8,45},{0,9,186},{0,8,13},
+        {0,8,141},{0,8,77},{0,9,250},{16,7,3},{0,8,83},{0,8,19},{21,8,195},
+        {19,7,35},{0,8,115},{0,8,51},{0,9,198},{17,7,11},{0,8,99},{0,8,35},
+        {0,9,166},{0,8,3},{0,8,131},{0,8,67},{0,9,230},{16,7,7},{0,8,91},
+        {0,8,27},{0,9,150},{20,7,67},{0,8,123},{0,8,59},{0,9,214},{18,7,19},
+        {0,8,107},{0,8,43},{0,9,182},{0,8,11},{0,8,139},{0,8,75},{0,9,246},
+        {16,7,5},{0,8,87},{0,8,23},{64,8,0},{19,7,51},{0,8,119},{0,8,55},
+        {0,9,206},{17,7,15},{0,8,103},{0,8,39},{0,9,174},{0,8,7},{0,8,135},
+        {0,8,71},{0,9,238},{16,7,9},{0,8,95},{0,8,31},{0,9,158},{20,7,99},
+        {0,8,127},{0,8,63},{0,9,222},{18,7,27},{0,8,111},{0,8,47},{0,9,190},
+        {0,8,15},{0,8,143},{0,8,79},{0,9,254},{96,7,0},{0,8,80},{0,8,16},
+        {20,8,115},{18,7,31},{0,8,112},{0,8,48},{0,9,193},{16,7,10},{0,8,96},
+        {0,8,32},{0,9,161},{0,8,0},{0,8,128},{0,8,64},{0,9,225},{16,7,6},
+        {0,8,88},{0,8,24},{0,9,145},{19,7,59},{0,8,120},{0,8,56},{0,9,209},
+        {17,7,17},{0,8,104},{0,8,40},{0,9,177},{0,8,8},{0,8,136},{0,8,72},
+        {0,9,241},{16,7,4},{0,8,84},{0,8,20},{21,8,227},{19,7,43},{0,8,116},
+        {0,8,52},{0,9,201},{17,7,13},{0,8,100},{0,8,36},{0,9,169},{0,8,4},
+        {0,8,132},{0,8,68},{0,9,233},{16,7,8},{0,8,92},{0,8,28},{0,9,153},
+        {20,7,83},{0,8,124},{0,8,60},{0,9,217},{18,7,23},{0,8,108},{0,8,44},
+        {0,9,185},{0,8,12},{0,8,140},{0,8,76},{0,9,249},{16,7,3},{0,8,82},
+        {0,8,18},{21,8,163},{19,7,35},{0,8,114},{0,8,50},{0,9,197},{17,7,11},
+        {0,8,98},{0,8,34},{0,9,165},{0,8,2},{0,8,130},{0,8,66},{0,9,229},
+        {16,7,7},{0,8,90},{0,8,26},{0,9,149},{20,7,67},{0,8,122},{0,8,58},
+        {0,9,213},{18,7,19},{0,8,106},{0,8,42},{0,9,181},{0,8,10},{0,8,138},
+        {0,8,74},{0,9,245},{16,7,5},{0,8,86},{0,8,22},{64,8,0},{19,7,51},
+        {0,8,118},{0,8,54},{0,9,205},{17,7,15},{0,8,102},{0,8,38},{0,9,173},
+        {0,8,6},{0,8,134},{0,8,70},{0,9,237},{16,7,9},{0,8,94},{0,8,30},
+        {0,9,157},{20,7,99},{0,8,126},{0,8,62},{0,9,221},{18,7,27},{0,8,110},
+        {0,8,46},{0,9,189},{0,8,14},{0,8,142},{0,8,78},{0,9,253},{96,7,0},
+        {0,8,81},{0,8,17},{21,8,131},{18,7,31},{0,8,113},{0,8,49},{0,9,195},
+        {16,7,10},{0,8,97},{0,8,33},{0,9,163},{0,8,1},{0,8,129},{0,8,65},
+        {0,9,227},{16,7,6},{0,8,89},{0,8,25},{0,9,147},{19,7,59},{0,8,121},
+        {0,8,57},{0,9,211},{17,7,17},{0,8,105},{0,8,41},{0,9,179},{0,8,9},
+        {0,8,137},{0,8,73},{0,9,243},{16,7,4},{0,8,85},{0,8,21},{16,8,258},
+        {19,7,43},{0,8,117},{0,8,53},{0,9,203},{17,7,13},{0,8,101},{0,8,37},
+        {0,9,171},{0,8,5},{0,8,133},{0,8,69},{0,9,235},{16,7,8},{0,8,93},
+        {0,8,29},{0,9,155},{20,7,83},{0,8,125},{0,8,61},{0,9,219},{18,7,23},
+        {0,8,109},{0,8,45},{0,9,187},{0,8,13},{0,8,141},{0,8,77},{0,9,251},
+        {16,7,3},{0,8,83},{0,8,19},{21,8,195},{19,7,35},{0,8,115},{0,8,51},
+        {0,9,199},{17,7,11},{0,8,99},{0,8,35},{0,9,167},{0,8,3},{0,8,131},
+        {0,8,67},{0,9,231},{16,7,7},{0,8,91},{0,8,27},{0,9,151},{20,7,67},
+        {0,8,123},{0,8,59},{0,9,215},{18,7,19},{0,8,107},{0,8,43},{0,9,183},
+        {0,8,11},{0,8,139},{0,8,75},{0,9,247},{16,7,5},{0,8,87},{0,8,23},
+        {64,8,0},{19,7,51},{0,8,119},{0,8,55},{0,9,207},{17,7,15},{0,8,103},
+        {0,8,39},{0,9,175},{0,8,7},{0,8,135},{0,8,71},{0,9,239},{16,7,9},
+        {0,8,95},{0,8,31},{0,9,159},{20,7,99},{0,8,127},{0,8,63},{0,9,223},
+        {18,7,27},{0,8,111},{0,8,47},{0,9,191},{0,8,15},{0,8,143},{0,8,79},
+        {0,9,255}
+    };
+
+    static const code distfix[32] = {
+        {16,5,1},{23,5,257},{19,5,17},{27,5,4097},{17,5,5},{25,5,1025},
+        {21,5,65},{29,5,16385},{16,5,3},{24,5,513},{20,5,33},{28,5,8193},
+        {18,5,9},{26,5,2049},{22,5,129},{64,5,0},{16,5,2},{23,5,385},
+        {19,5,25},{27,5,6145},{17,5,7},{25,5,1537},{21,5,97},{29,5,24577},
+        {16,5,4},{24,5,769},{20,5,49},{28,5,12289},{18,5,13},{26,5,3073},
+        {22,5,193},{64,5,0}
+    };
diff --git a/src/zlib/inflate.c b/src/zlib/inflate.c
index 81d93b0a7..c6d38266d 100644
--- a/src/zlib/inflate.c
+++ b/src/zlib/inflate.c
@@ -1,1274 +1,1274 @@
-/* inflate.c -- zlib decompression

- * Copyright (C) 1995-2003 Mark Adler

- * For conditions of distribution and use, see copyright notice in zlib.h

- */

-

-/*

- * Change history:

- *

- * 1.2.beta0    24 Nov 2002

- * - First version -- complete rewrite of inflate to simplify code, avoid

- *   creation of window when not needed, minimize use of window when it is

- *   needed, make inffast.c even faster, implement gzip decoding, and to

- *   improve code readability and style over the previous zlib inflate code

- *

- * 1.2.beta1    25 Nov 2002

- * - Use pointers for available input and output checking in inffast.c

- * - Remove input and output counters in inffast.c

- * - Change inffast.c entry and loop from avail_in >= 7 to >= 6

- * - Remove unnecessary second byte pull from length extra in inffast.c

- * - Unroll direct copy to three copies per loop in inffast.c

- *

- * 1.2.beta2    4 Dec 2002

- * - Change external routine names to reduce potential conflicts

- * - Correct filename to inffixed.h for fixed tables in inflate.c

- * - Make hbuf[] unsigned char to match parameter type in inflate.c

- * - Change strm->next_out[-state->offset] to *(strm->next_out - state->offset)

- *   to avoid negation problem on Alphas (64 bit) in inflate.c

- *

- * 1.2.beta3    22 Dec 2002

- * - Add comments on state->bits assertion in inffast.c

- * - Add comments on op field in inftrees.h

- * - Fix bug in reuse of allocated window after inflateReset()

- * - Remove bit fields--back to byte structure for speed

- * - Remove distance extra == 0 check in inflate_fast()--only helps for lengths

- * - Change post-increments to pre-increments in inflate_fast(), PPC biased?

- * - Add compile time option, POSTINC, to use post-increments instead (Intel?)

- * - Make MATCH copy in inflate() much faster for when inflate_fast() not used

- * - Use local copies of stream next and avail values, as well as local bit

- *   buffer and bit count in inflate()--for speed when inflate_fast() not used

- *

- * 1.2.beta4    1 Jan 2003

- * - Split ptr - 257 statements in inflate_table() to avoid compiler warnings

- * - Move a comment on output buffer sizes from inffast.c to inflate.c

- * - Add comments in inffast.c to introduce the inflate_fast() routine

- * - Rearrange window copies in inflate_fast() for speed and simplification

- * - Unroll last copy for window match in inflate_fast()

- * - Use local copies of window variables in inflate_fast() for speed

- * - Pull out common write == 0 case for speed in inflate_fast()

- * - Make op and len in inflate_fast() unsigned for consistency

- * - Add FAR to lcode and dcode declarations in inflate_fast()

- * - Simplified bad distance check in inflate_fast()

- * - Added inflateBackInit(), inflateBack(), and inflateBackEnd() in new

- *   source file infback.c to provide a call-back interface to inflate for

- *   programs like gzip and unzip -- uses window as output buffer to avoid

- *   window copying

- *

- * 1.2.beta5    1 Jan 2003

- * - Improved inflateBack() interface to allow the caller to provide initial

- *   input in strm.

- * - Fixed stored blocks bug in inflateBack()

- *

- * 1.2.beta6    4 Jan 2003

- * - Added comments in inffast.c on effectiveness of POSTINC

- * - Typecasting all around to reduce compiler warnings

- * - Changed loops from while (1) or do {} while (1) to for (;;), again to

- *   make compilers happy

- * - Changed type of window in inflateBackInit() to unsigned char *

- *

- * 1.2.beta7    27 Jan 2003

- * - Changed many types to unsigned or unsigned short to avoid warnings

- * - Added inflateCopy() function

- *

- * 1.2.0        9 Mar 2003

- * - Changed inflateBack() interface to provide separate opaque descriptors

- *   for the in() and out() functions

- * - Changed inflateBack() argument and in_func typedef to swap the length

- *   and buffer address return values for the input function

- * - Check next_in and next_out for Z_NULL on entry to inflate()

- *

- * The history for versions after 1.2.0 are in ChangeLog in zlib distribution.

- */

-

-#include "zutil.h"

-#include "inftrees.h"

-#include "inflate.h"

-#include "inffast.h"

-

-#ifdef MAKEFIXED

-#  ifndef BUILDFIXED

-#    define BUILDFIXED

-#  endif

-#endif

-

-/* function prototypes */

-local void fixedtables OF((struct inflate_state FAR *state));

-local int updatewindow OF((z_streamp strm, unsigned out));

-#ifdef BUILDFIXED

-   void makefixed OF((void));

-#endif

-local unsigned syncsearch OF((unsigned FAR *have, unsigned char FAR *buf,

-                              unsigned len));

-

-int ZEXPORT inflateReset(strm)

-z_streamp strm;

-{

-    struct inflate_state FAR *state;

-

-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;

-    state = (struct inflate_state FAR *)strm->state;

-    strm->total_in = strm->total_out = state->total = 0;

-    strm->msg = Z_NULL;

-    strm->adler = 1;        /* to support ill-conceived Java test suite */

-    state->mode = HEAD;

-    state->last = 0;

-    state->havedict = 0;

-    state->wsize = 0;

-    state->whave = 0;

-    state->hold = 0;

-    state->bits = 0;

-    state->lencode = state->distcode = state->next = state->codes;

-    Tracev((stderr, "inflate: reset\n"));

-    return Z_OK;

-}

-

-int ZEXPORT inflateInit2_(strm, windowBits, version, stream_size)

-z_streamp strm;

-int windowBits;

-const char *version;

-int stream_size;

-{

-    struct inflate_state FAR *state;

-

-    if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||

-        stream_size != (int)(sizeof(z_stream)))

-        return Z_VERSION_ERROR;

-    if (strm == Z_NULL) return Z_STREAM_ERROR;

-    strm->msg = Z_NULL;                 /* in case we return an error */

-    if (strm->zalloc == (alloc_func)0) {

-        strm->zalloc = zcalloc;

-        strm->opaque = (voidpf)0;

-    }

-    if (strm->zfree == (free_func)0) strm->zfree = zcfree;

-    state = (struct inflate_state FAR *)

-            ZALLOC(strm, 1, sizeof(struct inflate_state));

-    if (state == Z_NULL) return Z_MEM_ERROR;

-    Tracev((stderr, "inflate: allocated\n"));

-    strm->state = (voidpf)state;

-    if (windowBits < 0) {

-        state->wrap = 0;

-        windowBits = -windowBits;

-    }

-    else {

-        state->wrap = (windowBits >> 4) + 1;

-#ifdef GUNZIP

-        if (windowBits < 48) windowBits &= 15;

-#endif

-    }

-    if (windowBits < 8 || windowBits > 15) {

-        ZFREE(strm, state);

-        strm->state = Z_NULL;

-        return Z_STREAM_ERROR;

-    }

-    state->wbits = (unsigned)windowBits;

-    state->window = Z_NULL;

-    return inflateReset(strm);

-}

-

-int ZEXPORT inflateInit_(strm, version, stream_size)

-z_streamp strm;

-const char *version;

-int stream_size;

-{

-    return inflateInit2_(strm, DEF_WBITS, version, stream_size);

-}

-

-/*

-   Return state with length and distance decoding tables and index sizes set to

-   fixed code decoding.  Normally this returns fixed tables from inffixed.h.

-   If BUILDFIXED is defined, then instead this routine builds the tables the

-   first time it's called, and returns those tables the first time and

-   thereafter.  This reduces the size of the code by about 2K bytes, in

-   exchange for a little execution time.  However, BUILDFIXED should not be

-   used for threaded applications, since the rewriting of the tables and virgin

-   may not be thread-safe.

- */

-local void fixedtables(state)

-struct inflate_state FAR *state;

-{

-#ifdef BUILDFIXED

-    static int virgin = 1;

-    static code *lenfix, *distfix;

-    static code fixed[544];

-

-    /* build fixed huffman tables if first call (may not be thread safe) */

-    if (virgin) {

-        unsigned sym, bits;

-        static code *next;

-

-        /* literal/length table */

-        sym = 0;

-        while (sym < 144) state->lens[sym++] = 8;

-        while (sym < 256) state->lens[sym++] = 9;

-        while (sym < 280) state->lens[sym++] = 7;

-        while (sym < 288) state->lens[sym++] = 8;

-        next = fixed;

-        lenfix = next;

-        bits = 9;

-        inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work);

-

-        /* distance table */

-        sym = 0;

-        while (sym < 32) state->lens[sym++] = 5;

-        distfix = next;

-        bits = 5;

-        inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work);

-

-        /* do this just once */

-        virgin = 0;

-    }

-#else /* !BUILDFIXED */

-#   include "inffixed.h"

-#endif /* BUILDFIXED */

-    state->lencode = lenfix;

-    state->lenbits = 9;

-    state->distcode = distfix;

-    state->distbits = 5;

-}

-

-#ifdef MAKEFIXED

-#include <stdio.h>

-

-/*

-   Write out the inffixed.h that is #include'd above.  Defining MAKEFIXED also

-   defines BUILDFIXED, so the tables are built on the fly.  makefixed() writes

-   those tables to stdout, which would be piped to inffixed.h.  A small program

-   can simply call makefixed to do this:

-

-    void makefixed(void);

-

-    int main(void)

-    {

-        makefixed();

-        return 0;

-    }

-

-   Then that can be linked with zlib built with MAKEFIXED defined and run:

-

-    a.out > inffixed.h

- */

-void makefixed()

-{

-    unsigned low, size;

-    struct inflate_state state;

-

-    fixedtables(&state);

-    puts("    /* inffixed.h -- table for decoding fixed codes");

-    puts("     * Generated automatically by makefixed().");

-    puts("     */");

-    puts("");

-    puts("    /* WARNING: this file should *not* be used by applications.");

-    puts("       It is part of the implementation of this library and is");

-    puts("       subject to change. Applications should only use zlib.h.");

-    puts("     */");

-    puts("");

-    size = 1U << 9;

-    printf("    static const code lenfix[%u] = {", size);

-    low = 0;

-    for (;;) {

-        if ((low % 7) == 0) printf("\n        ");

-        printf("{%u,%u,%d}", state.lencode[low].op, state.lencode[low].bits,

-               state.lencode[low].val);

-        if (++low == size) break;

-        putchar(',');

-    }

-    puts("\n    };");

-    size = 1U << 5;

-    printf("\n    static const code distfix[%u] = {", size);

-    low = 0;

-    for (;;) {

-        if ((low % 6) == 0) printf("\n        ");

-        printf("{%u,%u,%d}", state.distcode[low].op, state.distcode[low].bits,

-               state.distcode[low].val);

-        if (++low == size) break;

-        putchar(',');

-    }

-    puts("\n    };");

-}

-#endif /* MAKEFIXED */

-

-/*

-   Update the window with the last wsize (normally 32K) bytes written before

-   returning.  If window does not exist yet, create it.  This is only called

-   when a window is already in use, or when output has been written during this

-   inflate call, but the end of the deflate stream has not been reached yet.

-   It is also called to create a window for dictionary data when a dictionary

-   is loaded.

-

-   Providing output buffers larger than 32K to inflate() should provide a speed

-   advantage, since only the last 32K of output is copied to the sliding window

-   upon return from inflate(), and since all distances after the first 32K of

-   output will fall in the output data, making match copies simpler and faster.

-   The advantage may be dependent on the size of the processor's data caches.

- */

-local int updatewindow(strm, out)

-z_streamp strm;

-unsigned out;

-{

-    struct inflate_state FAR *state;

-    unsigned copy, dist;

-

-    state = (struct inflate_state FAR *)strm->state;

-

-    /* if it hasn't been done already, allocate space for the window */

-    if (state->window == Z_NULL) {

-        state->window = (unsigned char FAR *)

-                        ZALLOC(strm, 1U << state->wbits,

-                               sizeof(unsigned char));

-        if (state->window == Z_NULL) return 1;

-    }

-

-    /* if window not in use yet, initialize */

-    if (state->wsize == 0) {

-        state->wsize = 1U << state->wbits;

-        state->write = 0;

-        state->whave = 0;

-    }

-

-    /* copy state->wsize or less output bytes into the circular window */

-    copy = out - strm->avail_out;

-    if (copy >= state->wsize) {

-        zmemcpy(state->window, strm->next_out - state->wsize, state->wsize);

-        state->write = 0;

-        state->whave = state->wsize;

-    }

-    else {

-        dist = state->wsize - state->write;

-        if (dist > copy) dist = copy;

-        zmemcpy(state->window + state->write, strm->next_out - copy, dist);

-        copy -= dist;

-        if (copy) {

-            zmemcpy(state->window, strm->next_out - copy, copy);

-            state->write = copy;

-            state->whave = state->wsize;

-        }

-        else {

-            state->write += dist;

-            if (state->write == state->wsize) state->write = 0;

-            if (state->whave < state->wsize) state->whave += dist;

-        }

-    }

-    return 0;

-}

-

-/* Macros for inflate(): */

-

-/* check function to use adler32() for zlib or crc32() for gzip */

-#ifdef GUNZIP

-#  define UPDATE(check, buf, len) \

-    (state->flags ? crc32(check, buf, len) : adler32(check, buf, len))

-#else

-#  define UPDATE(check, buf, len) adler32(check, buf, len)

-#endif

-

-/* check macros for header crc */

-#ifdef GUNZIP

-#  define CRC2(check, word) \

-    do { \

-        hbuf[0] = (unsigned char)(word); \

-        hbuf[1] = (unsigned char)((word) >> 8); \

-        check = crc32(check, hbuf, 2); \

-    } while (0)

-

-#  define CRC4(check, word) \

-    do { \

-        hbuf[0] = (unsigned char)(word); \

-        hbuf[1] = (unsigned char)((word) >> 8); \

-        hbuf[2] = (unsigned char)((word) >> 16); \

-        hbuf[3] = (unsigned char)((word) >> 24); \

-        check = crc32(check, hbuf, 4); \

-    } while (0)

-#endif

-

-/* Load registers with state in inflate() for speed */

-#define LOAD() \

-    do { \

-        put = strm->next_out; \

-        left = strm->avail_out; \

-        next = strm->next_in; \

-        have = strm->avail_in; \

-        hold = state->hold; \

-        bits = state->bits; \

-    } while (0)

-

-/* Restore state from registers in inflate() */

-#define RESTORE() \

-    do { \

-        strm->next_out = put; \

-        strm->avail_out = left; \

-        strm->next_in = next; \

-        strm->avail_in = have; \

-        state->hold = hold; \

-        state->bits = bits; \

-    } while (0)

-

-/* Clear the input bit accumulator */

-#define INITBITS() \

-    do { \

-        hold = 0; \

-        bits = 0; \

-    } while (0)

-

-/* Get a byte of input into the bit accumulator, or return from inflate()

-   if there is no input available. */

-#define PULLBYTE() \

-    do { \

-        if (have == 0) goto inf_leave; \

-        have--; \

-        hold += (unsigned long)(*next++) << bits; \

-        bits += 8; \

-    } while (0)

-

-/* Assure that there are at least n bits in the bit accumulator.  If there is

-   not enough available input to do that, then return from inflate(). */

-#define NEEDBITS(n) \

-    do { \

-        while (bits < (unsigned)(n)) \

-            PULLBYTE(); \

-    } while (0)

-

-/* Return the low n bits of the bit accumulator (n < 16) */

-#define BITS(n) \

-    ((unsigned)hold & ((1U << (n)) - 1))

-

-/* Remove n bits from the bit accumulator */

-#define DROPBITS(n) \

-    do { \

-        hold >>= (n); \

-        bits -= (unsigned)(n); \

-    } while (0)

-

-/* Remove zero to seven bits as needed to go to a byte boundary */

-#define BYTEBITS() \

-    do { \

-        hold >>= bits & 7; \

-        bits -= bits & 7; \

-    } while (0)

-

-/* Reverse the bytes in a 32-bit value */

-#define REVERSE(q) \

-    ((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \

-     (((q) & 0xff00) << 8) + (((q) & 0xff) << 24))

-

-/*

-   inflate() uses a state machine to process as much input data and generate as

-   much output data as possible before returning.  The state machine is

-   structured roughly as follows:

-

-    for (;;) switch (state) {

-    ...

-    case STATEn:

-        if (not enough input data or output space to make progress)

-            return;

-        ... make progress ...

-        state = STATEm;

-        break;

-    ...

-    }

-

-   so when inflate() is called again, the same case is attempted again, and

-   if the appropriate resources are provided, the machine proceeds to the

-   next state.  The NEEDBITS() macro is usually the way the state evaluates

-   whether it can proceed or should return.  NEEDBITS() does the return if

-   the requested bits are not available.  The typical use of the BITS macros

-   is:

-

-        NEEDBITS(n);

-        ... do something with BITS(n) ...

-        DROPBITS(n);

-

-   where NEEDBITS(n) either returns from inflate() if there isn't enough

-   input left to load n bits into the accumulator, or it continues.  BITS(n)

-   gives the low n bits in the accumulator.  When done, DROPBITS(n) drops

-   the low n bits off the accumulator.  INITBITS() clears the accumulator

-   and sets the number of available bits to zero.  BYTEBITS() discards just

-   enough bits to put the accumulator on a byte boundary.  After BYTEBITS()

-   and a NEEDBITS(8), then BITS(8) would return the next byte in the stream.

-

-   NEEDBITS(n) uses PULLBYTE() to get an available byte of input, or to return

-   if there is no input available.  The decoding of variable length codes uses

-   PULLBYTE() directly in order to pull just enough bytes to decode the next

-   code, and no more.

-

-   Some states loop until they get enough input, making sure that enough

-   state information is maintained to continue the loop where it left off

-   if NEEDBITS() returns in the loop.  For example, want, need, and keep

-   would all have to actually be part of the saved state in case NEEDBITS()

-   returns:

-

-    case STATEw:

-        while (want < need) {

-            NEEDBITS(n);

-            keep[want++] = BITS(n);

-            DROPBITS(n);

-        }

-        state = STATEx;

-    case STATEx:

-

-   As shown above, if the next state is also the next case, then the break

-   is omitted.

-

-   A state may also return if there is not enough output space available to

-   complete that state.  Those states are copying stored data, writing a

-   literal byte, and copying a matching string.

-

-   When returning, a "goto inf_leave" is used to update the total counters,

-   update the check value, and determine whether any progress has been made

-   during that inflate() call in order to return the proper return code.

-   Progress is defined as a change in either strm->avail_in or strm->avail_out.

-   When there is a window, goto inf_leave will update the window with the last

-   output written.  If a goto inf_leave occurs in the middle of decompression

-   and there is no window currently, goto inf_leave will create one and copy

-   output to the window for the next call of inflate().

-

-   In this implementation, the flush parameter of inflate() only affects the

-   return code (per zlib.h).  inflate() always writes as much as possible to

-   strm->next_out, given the space available and the provided input--the effect

-   documented in zlib.h of Z_SYNC_FLUSH.  Furthermore, inflate() always defers

-   the allocation of and copying into a sliding window until necessary, which

-   provides the effect documented in zlib.h for Z_FINISH when the entire input

-   stream available.  So the only thing the flush parameter actually does is:

-   when flush is set to Z_FINISH, inflate() cannot return Z_OK.  Instead it

-   will return Z_BUF_ERROR if it has not reached the end of the stream.

- */

-

-int ZEXPORT inflate(strm, flush)

-z_streamp strm;

-int flush;

-{

-    struct inflate_state FAR *state;

-    unsigned char FAR *next;    /* next input */

-    unsigned char FAR *put;     /* next output */

-    unsigned have, left;        /* available input and output */

-    unsigned long hold;         /* bit buffer */

-    unsigned bits;              /* bits in bit buffer */

-    unsigned in, out;           /* save starting available input and output */

-    unsigned copy;              /* number of stored or match bytes to copy */

-    unsigned char FAR *from;    /* where to copy match bytes from */

-    code this;                  /* current decoding table entry */

-    code last;                  /* parent table entry */

-    unsigned len;               /* length to copy for repeats, bits to drop */

-    int ret;                    /* return code */

-#ifdef GUNZIP

-    unsigned char hbuf[4];      /* buffer for gzip header crc calculation */

-#endif

-    static const unsigned short order[19] = /* permutation of code lengths */

-        {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};

-

-    if (strm == Z_NULL || strm->state == Z_NULL || strm->next_out == Z_NULL ||

-        (strm->next_in == Z_NULL && strm->avail_in != 0))

-        return Z_STREAM_ERROR;

-

-    state = (struct inflate_state FAR *)strm->state;

-    if (state->mode == TYPE) state->mode = TYPEDO;      /* skip check */

-    LOAD();

-    in = have;

-    out = left;

-    ret = Z_OK;

-    for (;;)

-        switch (state->mode) {

-        case HEAD:

-            if (state->wrap == 0) {

-                state->mode = TYPEDO;

-                break;

-            }

-            NEEDBITS(16);

-#ifdef GUNZIP

-            if ((state->wrap & 2) && hold == 0x8b1f) {  /* gzip header */

-                state->check = crc32(0L, Z_NULL, 0);

-                CRC2(state->check, hold);

-                INITBITS();

-                state->mode = FLAGS;

-                break;

-            }

-            state->flags = 0;           /* expect zlib header */

-            if (!(state->wrap & 1) ||   /* check if zlib header allowed */

-#else

-            if (

-#endif

-                ((BITS(8) << 8) + (hold >> 8)) % 31) {

-                strm->msg = (char *)"incorrect header check";

-                state->mode = BAD;

-                break;

-            }

-            if (BITS(4) != Z_DEFLATED) {

-                strm->msg = (char *)"unknown compression method";

-                state->mode = BAD;

-                break;

-            }

-            DROPBITS(4);

-            if (BITS(4) + 8 > state->wbits) {

-                strm->msg = (char *)"invalid window size";

-                state->mode = BAD;

-                break;

-            }

-            Tracev((stderr, "inflate:   zlib header ok\n"));

-            strm->adler = state->check = adler32(0L, Z_NULL, 0);

-            state->mode = hold & 0x200 ? DICTID : TYPE;

-            INITBITS();

-            break;

-#ifdef GUNZIP

-        case FLAGS:

-            NEEDBITS(16);

-            state->flags = (int)(hold);

-            if ((state->flags & 0xff) != Z_DEFLATED) {

-                strm->msg = (char *)"unknown compression method";

-                state->mode = BAD;

-                break;

-            }

-            if (state->flags & 0xe000) {

-                strm->msg = (char *)"unknown header flags set";

-                state->mode = BAD;

-                break;

-            }

-            if (state->flags & 0x0200) CRC2(state->check, hold);

-            INITBITS();

-            state->mode = TIME;

-        case TIME:

-            NEEDBITS(32);

-            if (state->flags & 0x0200) CRC4(state->check, hold);

-            INITBITS();

-            state->mode = OS;

-        case OS:

-            NEEDBITS(16);

-            if (state->flags & 0x0200) CRC2(state->check, hold);

-            INITBITS();

-            state->mode = EXLEN;

-        case EXLEN:

-            if (state->flags & 0x0400) {

-                NEEDBITS(16);

-                state->length = (unsigned)(hold);

-                if (state->flags & 0x0200) CRC2(state->check, hold);

-                INITBITS();

-            }

-            state->mode = EXTRA;

-        case EXTRA:

-            if (state->flags & 0x0400) {

-                copy = state->length;

-                if (copy > have) copy = have;

-                if (copy) {

-                    if (state->flags & 0x0200)

-                        state->check = crc32(state->check, next, copy);

-                    have -= copy;

-                    next += copy;

-                    state->length -= copy;

-                }

-                if (state->length) goto inf_leave;

-            }

-            state->mode = NAME;

-        case NAME:

-            if (state->flags & 0x0800) {

-                if (have == 0) goto inf_leave;

-                copy = 0;

-                do {

-                    len = (unsigned)(next[copy++]);

-                } while (len && copy < have);

-                if (state->flags & 0x02000)

-                    state->check = crc32(state->check, next, copy);

-                have -= copy;

-                next += copy;

-                if (len) goto inf_leave;

-            }

-            state->mode = COMMENT;

-        case COMMENT:

-            if (state->flags & 0x1000) {

-                if (have == 0) goto inf_leave;

-                copy = 0;

-                do {

-                    len = (unsigned)(next[copy++]);

-                } while (len && copy < have);

-                if (state->flags & 0x02000)

-                    state->check = crc32(state->check, next, copy);

-                have -= copy;

-                next += copy;

-                if (len) goto inf_leave;

-            }

-            state->mode = HCRC;

-        case HCRC:

-            if (state->flags & 0x0200) {

-                NEEDBITS(16);

-                if (hold != (state->check & 0xffff)) {

-                    strm->msg = (char *)"header crc mismatch";

-                    state->mode = BAD;

-                    break;

-                }

-                INITBITS();

-            }

-            strm->adler = state->check = crc32(0L, Z_NULL, 0);

-            state->mode = TYPE;

-            break;

-#endif

-        case DICTID:

-            NEEDBITS(32);

-            strm->adler = state->check = REVERSE(hold);

-            INITBITS();

-            state->mode = DICT;

-        case DICT:

-            if (state->havedict == 0) {

-                RESTORE();

-                return Z_NEED_DICT;

-            }

-            strm->adler = state->check = adler32(0L, Z_NULL, 0);

-            state->mode = TYPE;

-        case TYPE:

-            if (flush == Z_BLOCK) goto inf_leave;

-        case TYPEDO:

-            if (state->last) {

-                BYTEBITS();

-                state->mode = CHECK;

-                break;

-            }

-            NEEDBITS(3);

-            state->last = BITS(1);

-            DROPBITS(1);

-            switch (BITS(2)) {

-            case 0:                             /* stored block */

-                Tracev((stderr, "inflate:     stored block%s\n",

-                        state->last ? " (last)" : ""));

-                state->mode = STORED;

-                break;

-            case 1:                             /* fixed block */

-                fixedtables(state);

-                Tracev((stderr, "inflate:     fixed codes block%s\n",

-                        state->last ? " (last)" : ""));

-                state->mode = LEN;              /* decode codes */

-                break;

-            case 2:                             /* dynamic block */

-                Tracev((stderr, "inflate:     dynamic codes block%s\n",

-                        state->last ? " (last)" : ""));

-                state->mode = TABLE;

-                break;

-            case 3:

-                strm->msg = (char *)"invalid block type";

-                state->mode = BAD;

-            }

-            DROPBITS(2);

-            break;

-        case STORED:

-            BYTEBITS();                         /* go to byte boundary */

-            NEEDBITS(32);

-            if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {

-                strm->msg = (char *)"invalid stored block lengths";

-                state->mode = BAD;

-                break;

-            }

-            state->length = (unsigned)hold & 0xffff;

-            Tracev((stderr, "inflate:       stored length %u\n",

-                    state->length));

-            INITBITS();

-            state->mode = COPY;

-        case COPY:

-            copy = state->length;

-            if (copy) {

-                if (copy > have) copy = have;

-                if (copy > left) copy = left;

-                if (copy == 0) goto inf_leave;

-                zmemcpy(put, next, copy);

-                have -= copy;

-                next += copy;

-                left -= copy;

-                put += copy;

-                state->length -= copy;

-                break;

-            }

-            Tracev((stderr, "inflate:       stored end\n"));

-            state->mode = TYPE;

-            break;

-        case TABLE:

-            NEEDBITS(14);

-            state->nlen = BITS(5) + 257;

-            DROPBITS(5);

-            state->ndist = BITS(5) + 1;

-            DROPBITS(5);

-            state->ncode = BITS(4) + 4;

-            DROPBITS(4);

-#ifndef PKZIP_BUG_WORKAROUND

-            if (state->nlen > 286 || state->ndist > 30) {

-                strm->msg = (char *)"too many length or distance symbols";

-                state->mode = BAD;

-                break;

-            }

-#endif

-            Tracev((stderr, "inflate:       table sizes ok\n"));

-            state->have = 0;

-            state->mode = LENLENS;

-        case LENLENS:

-            while (state->have < state->ncode) {

-                NEEDBITS(3);

-                state->lens[order[state->have++]] = (unsigned short)BITS(3);

-                DROPBITS(3);

-            }

-            while (state->have < 19)

-                state->lens[order[state->have++]] = 0;

-            state->next = state->codes;

-            state->lencode = (code const FAR *)(state->next);

-            state->lenbits = 7;

-            ret = inflate_table(CODES, state->lens, 19, &(state->next),

-                                &(state->lenbits), state->work);

-            if (ret) {

-                strm->msg = (char *)"invalid code lengths set";

-                state->mode = BAD;

-                break;

-            }

-            Tracev((stderr, "inflate:       code lengths ok\n"));

-            state->have = 0;

-            state->mode = CODELENS;

-        case CODELENS:

-            while (state->have < state->nlen + state->ndist) {

-                for (;;) {

-                    this = state->lencode[BITS(state->lenbits)];

-                    if ((unsigned)(this.bits) <= bits) break;

-                    PULLBYTE();

-                }

-                if (this.val < 16) {

-                    NEEDBITS(this.bits);

-                    DROPBITS(this.bits);

-                    state->lens[state->have++] = this.val;

-                }

-                else {

-                    if (this.val == 16) {

-                        NEEDBITS(this.bits + 2);

-                        DROPBITS(this.bits);

-                        if (state->have == 0) {

-                            strm->msg = (char *)"invalid bit length repeat";

-                            state->mode = BAD;

-                            break;

-                        }

-                        len = state->lens[state->have - 1];

-                        copy = 3 + BITS(2);

-                        DROPBITS(2);

-                    }

-                    else if (this.val == 17) {

-                        NEEDBITS(this.bits + 3);

-                        DROPBITS(this.bits);

-                        len = 0;

-                        copy = 3 + BITS(3);

-                        DROPBITS(3);

-                    }

-                    else {

-                        NEEDBITS(this.bits + 7);

-                        DROPBITS(this.bits);

-                        len = 0;

-                        copy = 11 + BITS(7);

-                        DROPBITS(7);

-                    }

-                    if (state->have + copy > state->nlen + state->ndist) {

-                        strm->msg = (char *)"invalid bit length repeat";

-                        state->mode = BAD;

-                        break;

-                    }

-                    while (copy--)

-                        state->lens[state->have++] = (unsigned short)len;

-                }

-            }

-

-            /* handle error breaks in while */

-            if (state->mode == BAD) break;

-

-            /* build code tables */

-            state->next = state->codes;

-            state->lencode = (code const FAR *)(state->next);

-            state->lenbits = 9;

-            ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),

-                                &(state->lenbits), state->work);

-            if (ret) {

-                strm->msg = (char *)"invalid literal/lengths set";

-                state->mode = BAD;

-                break;

-            }

-            state->distcode = (code const FAR *)(state->next);

-            state->distbits = 6;

-            ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,

-                            &(state->next), &(state->distbits), state->work);

-            if (ret) {

-                strm->msg = (char *)"invalid distances set";

-                state->mode = BAD;

-                break;

-            }

-            Tracev((stderr, "inflate:       codes ok\n"));

-            state->mode = LEN;

-        case LEN:

-            if (have >= 6 && left >= 258) {

-                RESTORE();

-                inflate_fast(strm, out);

-                LOAD();

-                break;

-            }

-            for (;;) {

-                this = state->lencode[BITS(state->lenbits)];

-                if ((unsigned)(this.bits) <= bits) break;

-                PULLBYTE();

-            }

-            if (this.op && (this.op & 0xf0) == 0) {

-                last = this;

-                for (;;) {

-                    this = state->lencode[last.val +

-                            (BITS(last.bits + last.op) >> last.bits)];

-                    if ((unsigned)(last.bits + this.bits) <= bits) break;

-                    PULLBYTE();

-                }

-                DROPBITS(last.bits);

-            }

-            DROPBITS(this.bits);

-            state->length = (unsigned)this.val;

-            if ((int)(this.op) == 0) {

-                Tracevv((stderr, this.val >= 0x20 && this.val < 0x7f ?

-                        "inflate:         literal '%c'\n" :

-                        "inflate:         literal 0x%02x\n", this.val));

-                state->mode = LIT;

-                break;

-            }

-            if (this.op & 32) {

-                Tracevv((stderr, "inflate:         end of block\n"));

-                state->mode = TYPE;

-                break;

-            }

-            if (this.op & 64) {

-                strm->msg = (char *)"invalid literal/length code";

-                state->mode = BAD;

-                break;

-            }

-            state->extra = (unsigned)(this.op) & 15;

-            state->mode = LENEXT;

-        case LENEXT:

-            if (state->extra) {

-                NEEDBITS(state->extra);

-                state->length += BITS(state->extra);

-                DROPBITS(state->extra);

-            }

-            Tracevv((stderr, "inflate:         length %u\n", state->length));

-            state->mode = DIST;

-        case DIST:

-            for (;;) {

-                this = state->distcode[BITS(state->distbits)];

-                if ((unsigned)(this.bits) <= bits) break;

-                PULLBYTE();

-            }

-            if ((this.op & 0xf0) == 0) {

-                last = this;

-                for (;;) {

-                    this = state->distcode[last.val +

-                            (BITS(last.bits + last.op) >> last.bits)];

-                    if ((unsigned)(last.bits + this.bits) <= bits) break;

-                    PULLBYTE();

-                }

-                DROPBITS(last.bits);

-            }

-            DROPBITS(this.bits);

-            if (this.op & 64) {

-                strm->msg = (char *)"invalid distance code";

-                state->mode = BAD;

-                break;

-            }

-            state->offset = (unsigned)this.val;

-            state->extra = (unsigned)(this.op) & 15;

-            state->mode = DISTEXT;

-        case DISTEXT:

-            if (state->extra) {

-                NEEDBITS(state->extra);

-                state->offset += BITS(state->extra);

-                DROPBITS(state->extra);

-            }

-            if (state->offset > state->whave + out - left) {

-                strm->msg = (char *)"invalid distance too far back";

-                state->mode = BAD;

-                break;

-            }

-            Tracevv((stderr, "inflate:         distance %u\n", state->offset));

-            state->mode = MATCH;

-        case MATCH:

-            if (left == 0) goto inf_leave;

-            copy = out - left;

-            if (state->offset > copy) {         /* copy from window */

-                copy = state->offset - copy;

-                if (copy > state->write) {

-                    copy -= state->write;

-                    from = state->window + (state->wsize - copy);

-                }

-                else

-                    from = state->window + (state->write - copy);

-                if (copy > state->length) copy = state->length;

-            }

-            else {                              /* copy from output */

-                from = put - state->offset;

-                copy = state->length;

-            }

-            if (copy > left) copy = left;

-            left -= copy;

-            state->length -= copy;

-            do {

-                *put++ = *from++;

-            } while (--copy);

-            if (state->length == 0) state->mode = LEN;

-            break;

-        case LIT:

-            if (left == 0) goto inf_leave;

-            *put++ = (unsigned char)(state->length);

-            left--;

-            state->mode = LEN;

-            break;

-        case CHECK:

-            if (state->wrap) {

-                NEEDBITS(32);

-                out -= left;

-                strm->total_out += out;

-                state->total += out;

-                if (out)

-                    strm->adler = state->check =

-                        UPDATE(state->check, put - out, out);

-                out = left;

-                if ((

-#ifdef GUNZIP

-                     state->flags ? hold :

-#endif

-                     REVERSE(hold)) != state->check) {

-                    strm->msg = (char *)"incorrect data check";

-                    state->mode = BAD;

-                    break;

-                }

-                INITBITS();

-                Tracev((stderr, "inflate:   check matches trailer\n"));

-            }

-#ifdef GUNZIP

-            state->mode = LENGTH;

-        case LENGTH:

-            if (state->wrap && state->flags) {

-                NEEDBITS(32);

-                if (hold != (state->total & 0xffffffffUL)) {

-                    strm->msg = (char *)"incorrect length check";

-                    state->mode = BAD;

-                    break;

-                }

-                INITBITS();

-                Tracev((stderr, "inflate:   length matches trailer\n"));

-            }

-#endif

-            state->mode = DONE;

-        case DONE:

-            ret = Z_STREAM_END;

-            goto inf_leave;

-        case BAD:

-            ret = Z_DATA_ERROR;

-            goto inf_leave;

-        case MEM:

-            return Z_MEM_ERROR;

-        case SYNC:

-        default:

-            return Z_STREAM_ERROR;

-        }

-

-    /*

-       Return from inflate(), updating the total counts and the check value.

-       If there was no progress during the inflate() call, return a buffer

-       error.  Call updatewindow() to create and/or update the window state.

-       Note: a memory error from inflate() is non-recoverable.

-     */

-  inf_leave:

-    RESTORE();

-    if (state->wsize || (state->mode < CHECK && out != strm->avail_out))

-        if (updatewindow(strm, out)) {

-            state->mode = MEM;

-            return Z_MEM_ERROR;

-        }

-    in -= strm->avail_in;

-    out -= strm->avail_out;

-    strm->total_in += in;

-    strm->total_out += out;

-    state->total += out;

-    if (state->wrap && out)

-        strm->adler = state->check =

-            UPDATE(state->check, strm->next_out - out, out);

-    strm->data_type = state->bits + (state->last ? 64 : 0) +

-                      (state->mode == TYPE ? 128 : 0);

-    if (((in == 0 && out == 0) || flush == Z_FINISH) && ret == Z_OK)

-        ret = Z_BUF_ERROR;

-    return ret;

-}

-

-int ZEXPORT inflateEnd(strm)

-z_streamp strm;

-{

-    struct inflate_state FAR *state;

-    if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0)

-        return Z_STREAM_ERROR;

-    state = (struct inflate_state FAR *)strm->state;

-    if (state->window != Z_NULL) ZFREE(strm, state->window);

-    ZFREE(strm, strm->state);

-    strm->state = Z_NULL;

-    Tracev((stderr, "inflate: end\n"));

-    return Z_OK;

-}

-

-int ZEXPORT inflateSetDictionary(strm, dictionary, dictLength)

-z_streamp strm;

-const Bytef *dictionary;

-uInt dictLength;

-{

-    struct inflate_state FAR *state;

-    unsigned long id;

-

-    /* check state */

-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;

-    state = (struct inflate_state FAR *)strm->state;

-    if (state->mode != DICT) return Z_STREAM_ERROR;

-

-    /* check for correct dictionary id */

-    id = adler32(0L, Z_NULL, 0);

-    id = adler32(id, dictionary, dictLength);

-    if (id != state->check) return Z_DATA_ERROR;

-

-    /* copy dictionary to window */

-    if (updatewindow(strm, strm->avail_out)) {

-        state->mode = MEM;

-        return Z_MEM_ERROR;

-    }

-    if (dictLength > state->wsize) {

-        zmemcpy(state->window, dictionary + dictLength - state->wsize,

-                state->wsize);

-        state->whave = state->wsize;

-    }

-    else {

-        zmemcpy(state->window + state->wsize - dictLength, dictionary,

-                dictLength);

-        state->whave = dictLength;

-    }

-    state->havedict = 1;

-    Tracev((stderr, "inflate:   dictionary set\n"));

-    return Z_OK;

-}

-

-/*

-   Search buf[0..len-1] for the pattern: 0, 0, 0xff, 0xff.  Return when found

-   or when out of input.  When called, *have is the number of pattern bytes

-   found in order so far, in 0..3.  On return *have is updated to the new

-   state.  If on return *have equals four, then the pattern was found and the

-   return value is how many bytes were read including the last byte of the

-   pattern.  If *have is less than four, then the pattern has not been found

-   yet and the return value is len.  In the latter case, syncsearch() can be

-   called again with more data and the *have state.  *have is initialized to

-   zero for the first call.

- */

-local unsigned syncsearch(have, buf, len)

-unsigned FAR *have;

-unsigned char FAR *buf;

-unsigned len;

-{

-    unsigned got;

-    unsigned next;

-

-    got = *have;

-    next = 0;

-    while (next < len && got < 4) {

-        if ((int)(buf[next]) == (got < 2 ? 0 : 0xff))

-            got++;

-        else if (buf[next])

-            got = 0;

-        else

-            got = 4 - got;

-        next++;

-    }

-    *have = got;

-    return next;

-}

-

-int ZEXPORT inflateSync(strm)

-z_streamp strm;

-{

-    unsigned len;               /* number of bytes to look at or looked at */

-    unsigned long in, out;      /* temporary to save total_in and total_out */

-    unsigned char buf[4];       /* to restore bit buffer to byte string */

-    struct inflate_state FAR *state;

-

-    /* check parameters */

-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;

-    state = (struct inflate_state FAR *)strm->state;

-    if (strm->avail_in == 0 && state->bits < 8) return Z_BUF_ERROR;

-

-    /* if first time, start search in bit buffer */

-    if (state->mode != SYNC) {

-        state->mode = SYNC;

-        state->hold <<= state->bits & 7;

-        state->bits -= state->bits & 7;

-        len = 0;

-        while (state->bits >= 8) {

-            buf[len++] = (unsigned char)(state->hold);

-            state->hold >>= 8;

-            state->bits -= 8;

-        }

-        state->have = 0;

-        syncsearch(&(state->have), buf, len);

-    }

-

-    /* search available input */

-    len = syncsearch(&(state->have), strm->next_in, strm->avail_in);

-    strm->avail_in -= len;

-    strm->next_in += len;

-    strm->total_in += len;

-

-    /* return no joy or set up to restart inflate() on a new block */

-    if (state->have != 4) return Z_DATA_ERROR;

-    in = strm->total_in;  out = strm->total_out;

-    inflateReset(strm);

-    strm->total_in = in;  strm->total_out = out;

-    state->mode = TYPE;

-    return Z_OK;

-}

-

-/*

-   Returns true if inflate is currently at the end of a block generated by

-   Z_SYNC_FLUSH or Z_FULL_FLUSH. This function is used by one PPP

-   implementation to provide an additional safety check. PPP uses

-   Z_SYNC_FLUSH but removes the length bytes of the resulting empty stored

-   block. When decompressing, PPP checks that at the end of input packet,

-   inflate is waiting for these length bytes.

- */

-int ZEXPORT inflateSyncPoint(strm)

-z_streamp strm;

-{

-    struct inflate_state FAR *state;

-

-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;

-    state = (struct inflate_state FAR *)strm->state;

-    return state->mode == STORED && state->bits == 0;

-}

-

-int ZEXPORT inflateCopy(dest, source)

-z_streamp dest;

-z_streamp source;

-{

-    struct inflate_state FAR *state;

-    struct inflate_state FAR *copy;

-    unsigned char FAR *window;

-

-    /* check input */

-    if (dest == Z_NULL || source == Z_NULL || source->state == Z_NULL ||

-        source->zalloc == (alloc_func)0 || source->zfree == (free_func)0)

-        return Z_STREAM_ERROR;

-    state = (struct inflate_state FAR *)source->state;

-

-    /* allocate space */

-    copy = (struct inflate_state FAR *)

-           ZALLOC(source, 1, sizeof(struct inflate_state));

-    if (copy == Z_NULL) return Z_MEM_ERROR;

-    window = Z_NULL;

-    if (state->window != Z_NULL) {

-        window = (unsigned char FAR *)

-                 ZALLOC(source, 1U << state->wbits, sizeof(unsigned char));

-        if (window == Z_NULL) {

-            ZFREE(source, copy);

-            return Z_MEM_ERROR;

-        }

-    }

-

-    /* copy state */

-    *dest = *source;

-    *copy = *state;

-    copy->lencode = copy->codes + (state->lencode - state->codes);

-    copy->distcode = copy->codes + (state->distcode - state->codes);

-    copy->next = copy->codes + (state->next - state->codes);

-    if (window != Z_NULL)

-        zmemcpy(window, state->window, 1U << state->wbits);

-    copy->window = window;

-    dest->state = (voidpf)copy;

-    return Z_OK;

-}

+/* inflate.c -- zlib decompression
+ * Copyright (C) 1995-2003 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/*
+ * Change history:
+ *
+ * 1.2.beta0    24 Nov 2002
+ * - First version -- complete rewrite of inflate to simplify code, avoid
+ *   creation of window when not needed, minimize use of window when it is
+ *   needed, make inffast.c even faster, implement gzip decoding, and to
+ *   improve code readability and style over the previous zlib inflate code
+ *
+ * 1.2.beta1    25 Nov 2002
+ * - Use pointers for available input and output checking in inffast.c
+ * - Remove input and output counters in inffast.c
+ * - Change inffast.c entry and loop from avail_in >= 7 to >= 6
+ * - Remove unnecessary second byte pull from length extra in inffast.c
+ * - Unroll direct copy to three copies per loop in inffast.c
+ *
+ * 1.2.beta2    4 Dec 2002
+ * - Change external routine names to reduce potential conflicts
+ * - Correct filename to inffixed.h for fixed tables in inflate.c
+ * - Make hbuf[] unsigned char to match parameter type in inflate.c
+ * - Change strm->next_out[-state->offset] to *(strm->next_out - state->offset)
+ *   to avoid negation problem on Alphas (64 bit) in inflate.c
+ *
+ * 1.2.beta3    22 Dec 2002
+ * - Add comments on state->bits assertion in inffast.c
+ * - Add comments on op field in inftrees.h
+ * - Fix bug in reuse of allocated window after inflateReset()
+ * - Remove bit fields--back to byte structure for speed
+ * - Remove distance extra == 0 check in inflate_fast()--only helps for lengths
+ * - Change post-increments to pre-increments in inflate_fast(), PPC biased?
+ * - Add compile time option, POSTINC, to use post-increments instead (Intel?)
+ * - Make MATCH copy in inflate() much faster for when inflate_fast() not used
+ * - Use local copies of stream next and avail values, as well as local bit
+ *   buffer and bit count in inflate()--for speed when inflate_fast() not used
+ *
+ * 1.2.beta4    1 Jan 2003
+ * - Split ptr - 257 statements in inflate_table() to avoid compiler warnings
+ * - Move a comment on output buffer sizes from inffast.c to inflate.c
+ * - Add comments in inffast.c to introduce the inflate_fast() routine
+ * - Rearrange window copies in inflate_fast() for speed and simplification
+ * - Unroll last copy for window match in inflate_fast()
+ * - Use local copies of window variables in inflate_fast() for speed
+ * - Pull out common write == 0 case for speed in inflate_fast()
+ * - Make op and len in inflate_fast() unsigned for consistency
+ * - Add FAR to lcode and dcode declarations in inflate_fast()
+ * - Simplified bad distance check in inflate_fast()
+ * - Added inflateBackInit(), inflateBack(), and inflateBackEnd() in new
+ *   source file infback.c to provide a call-back interface to inflate for
+ *   programs like gzip and unzip -- uses window as output buffer to avoid
+ *   window copying
+ *
+ * 1.2.beta5    1 Jan 2003
+ * - Improved inflateBack() interface to allow the caller to provide initial
+ *   input in strm.
+ * - Fixed stored blocks bug in inflateBack()
+ *
+ * 1.2.beta6    4 Jan 2003
+ * - Added comments in inffast.c on effectiveness of POSTINC
+ * - Typecasting all around to reduce compiler warnings
+ * - Changed loops from while (1) or do {} while (1) to for (;;), again to
+ *   make compilers happy
+ * - Changed type of window in inflateBackInit() to unsigned char *
+ *
+ * 1.2.beta7    27 Jan 2003
+ * - Changed many types to unsigned or unsigned short to avoid warnings
+ * - Added inflateCopy() function
+ *
+ * 1.2.0        9 Mar 2003
+ * - Changed inflateBack() interface to provide separate opaque descriptors
+ *   for the in() and out() functions
+ * - Changed inflateBack() argument and in_func typedef to swap the length
+ *   and buffer address return values for the input function
+ * - Check next_in and next_out for Z_NULL on entry to inflate()
+ *
+ * The history for versions after 1.2.0 are in ChangeLog in zlib distribution.
+ */
+
+#include "zutil.h"
+#include "inftrees.h"
+#include "inflate.h"
+#include "inffast.h"
+
+#ifdef MAKEFIXED
+#  ifndef BUILDFIXED
+#    define BUILDFIXED
+#  endif
+#endif
+
+/* function prototypes */
+local void fixedtables OF((struct inflate_state FAR *state));
+local int updatewindow OF((z_streamp strm, unsigned out));
+#ifdef BUILDFIXED
+   void makefixed OF((void));
+#endif
+local unsigned syncsearch OF((unsigned FAR *have, unsigned char FAR *buf,
+                              unsigned len));
+
+int ZEXPORT inflateReset(strm)
+z_streamp strm;
+{
+    struct inflate_state FAR *state;
+
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    strm->total_in = strm->total_out = state->total = 0;
+    strm->msg = Z_NULL;
+    strm->adler = 1;        /* to support ill-conceived Java test suite */
+    state->mode = HEAD;
+    state->last = 0;
+    state->havedict = 0;
+    state->wsize = 0;
+    state->whave = 0;
+    state->hold = 0;
+    state->bits = 0;
+    state->lencode = state->distcode = state->next = state->codes;
+    Tracev((stderr, "inflate: reset\n"));
+    return Z_OK;
+}
+
+int ZEXPORT inflateInit2_(strm, windowBits, version, stream_size)
+z_streamp strm;
+int windowBits;
+const char *version;
+int stream_size;
+{
+    struct inflate_state FAR *state;
+
+    if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
+        stream_size != (int)(sizeof(z_stream)))
+        return Z_VERSION_ERROR;
+    if (strm == Z_NULL) return Z_STREAM_ERROR;
+    strm->msg = Z_NULL;                 /* in case we return an error */
+    if (strm->zalloc == (alloc_func)0) {
+        strm->zalloc = zcalloc;
+        strm->opaque = (voidpf)0;
+    }
+    if (strm->zfree == (free_func)0) strm->zfree = zcfree;
+    state = (struct inflate_state FAR *)
+            ZALLOC(strm, 1, sizeof(struct inflate_state));
+    if (state == Z_NULL) return Z_MEM_ERROR;
+    Tracev((stderr, "inflate: allocated\n"));
+    strm->state = (voidpf)state;
+    if (windowBits < 0) {
+        state->wrap = 0;
+        windowBits = -windowBits;
+    }
+    else {
+        state->wrap = (windowBits >> 4) + 1;
+#ifdef GUNZIP
+        if (windowBits < 48) windowBits &= 15;
+#endif
+    }
+    if (windowBits < 8 || windowBits > 15) {
+        ZFREE(strm, state);
+        strm->state = Z_NULL;
+        return Z_STREAM_ERROR;
+    }
+    state->wbits = (unsigned)windowBits;
+    state->window = Z_NULL;
+    return inflateReset(strm);
+}
+
+int ZEXPORT inflateInit_(strm, version, stream_size)
+z_streamp strm;
+const char *version;
+int stream_size;
+{
+    return inflateInit2_(strm, DEF_WBITS, version, stream_size);
+}
+
+/*
+   Return state with length and distance decoding tables and index sizes set to
+   fixed code decoding.  Normally this returns fixed tables from inffixed.h.
+   If BUILDFIXED is defined, then instead this routine builds the tables the
+   first time it's called, and returns those tables the first time and
+   thereafter.  This reduces the size of the code by about 2K bytes, in
+   exchange for a little execution time.  However, BUILDFIXED should not be
+   used for threaded applications, since the rewriting of the tables and virgin
+   may not be thread-safe.
+ */
+local void fixedtables(state)
+struct inflate_state FAR *state;
+{
+#ifdef BUILDFIXED
+    static int virgin = 1;
+    static code *lenfix, *distfix;
+    static code fixed[544];
+
+    /* build fixed huffman tables if first call (may not be thread safe) */
+    if (virgin) {
+        unsigned sym, bits;
+        static code *next;
+
+        /* literal/length table */
+        sym = 0;
+        while (sym < 144) state->lens[sym++] = 8;
+        while (sym < 256) state->lens[sym++] = 9;
+        while (sym < 280) state->lens[sym++] = 7;
+        while (sym < 288) state->lens[sym++] = 8;
+        next = fixed;
+        lenfix = next;
+        bits = 9;
+        inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work);
+
+        /* distance table */
+        sym = 0;
+        while (sym < 32) state->lens[sym++] = 5;
+        distfix = next;
+        bits = 5;
+        inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work);
+
+        /* do this just once */
+        virgin = 0;
+    }
+#else /* !BUILDFIXED */
+#   include "inffixed.h"
+#endif /* BUILDFIXED */
+    state->lencode = lenfix;
+    state->lenbits = 9;
+    state->distcode = distfix;
+    state->distbits = 5;
+}
+
+#ifdef MAKEFIXED
+#include <stdio.h>
+
+/*
+   Write out the inffixed.h that is #include'd above.  Defining MAKEFIXED also
+   defines BUILDFIXED, so the tables are built on the fly.  makefixed() writes
+   those tables to stdout, which would be piped to inffixed.h.  A small program
+   can simply call makefixed to do this:
+
+    void makefixed(void);
+
+    int main(void)
+    {
+        makefixed();
+        return 0;
+    }
+
+   Then that can be linked with zlib built with MAKEFIXED defined and run:
+
+    a.out > inffixed.h
+ */
+void makefixed()
+{
+    unsigned low, size;
+    struct inflate_state state;
+
+    fixedtables(&state);
+    puts("    /* inffixed.h -- table for decoding fixed codes");
+    puts("     * Generated automatically by makefixed().");
+    puts("     */");
+    puts("");
+    puts("    /* WARNING: this file should *not* be used by applications.");
+    puts("       It is part of the implementation of this library and is");
+    puts("       subject to change. Applications should only use zlib.h.");
+    puts("     */");
+    puts("");
+    size = 1U << 9;
+    printf("    static const code lenfix[%u] = {", size);
+    low = 0;
+    for (;;) {
+        if ((low % 7) == 0) printf("\n        ");
+        printf("{%u,%u,%d}", state.lencode[low].op, state.lencode[low].bits,
+               state.lencode[low].val);
+        if (++low == size) break;
+        putchar(',');
+    }
+    puts("\n    };");
+    size = 1U << 5;
+    printf("\n    static const code distfix[%u] = {", size);
+    low = 0;
+    for (;;) {
+        if ((low % 6) == 0) printf("\n        ");
+        printf("{%u,%u,%d}", state.distcode[low].op, state.distcode[low].bits,
+               state.distcode[low].val);
+        if (++low == size) break;
+        putchar(',');
+    }
+    puts("\n    };");
+}
+#endif /* MAKEFIXED */
+
+/*
+   Update the window with the last wsize (normally 32K) bytes written before
+   returning.  If window does not exist yet, create it.  This is only called
+   when a window is already in use, or when output has been written during this
+   inflate call, but the end of the deflate stream has not been reached yet.
+   It is also called to create a window for dictionary data when a dictionary
+   is loaded.
+
+   Providing output buffers larger than 32K to inflate() should provide a speed
+   advantage, since only the last 32K of output is copied to the sliding window
+   upon return from inflate(), and since all distances after the first 32K of
+   output will fall in the output data, making match copies simpler and faster.
+   The advantage may be dependent on the size of the processor's data caches.
+ */
+local int updatewindow(strm, out)
+z_streamp strm;
+unsigned out;
+{
+    struct inflate_state FAR *state;
+    unsigned copy, dist;
+
+    state = (struct inflate_state FAR *)strm->state;
+
+    /* if it hasn't been done already, allocate space for the window */
+    if (state->window == Z_NULL) {
+        state->window = (unsigned char FAR *)
+                        ZALLOC(strm, 1U << state->wbits,
+                               sizeof(unsigned char));
+        if (state->window == Z_NULL) return 1;
+    }
+
+    /* if window not in use yet, initialize */
+    if (state->wsize == 0) {
+        state->wsize = 1U << state->wbits;
+        state->write = 0;
+        state->whave = 0;
+    }
+
+    /* copy state->wsize or less output bytes into the circular window */
+    copy = out - strm->avail_out;
+    if (copy >= state->wsize) {
+        zmemcpy(state->window, strm->next_out - state->wsize, state->wsize);
+        state->write = 0;
+        state->whave = state->wsize;
+    }
+    else {
+        dist = state->wsize - state->write;
+        if (dist > copy) dist = copy;
+        zmemcpy(state->window + state->write, strm->next_out - copy, dist);
+        copy -= dist;
+        if (copy) {
+            zmemcpy(state->window, strm->next_out - copy, copy);
+            state->write = copy;
+            state->whave = state->wsize;
+        }
+        else {
+            state->write += dist;
+            if (state->write == state->wsize) state->write = 0;
+            if (state->whave < state->wsize) state->whave += dist;
+        }
+    }
+    return 0;
+}
+
+/* Macros for inflate(): */
+
+/* check function to use adler32() for zlib or crc32() for gzip */
+#ifdef GUNZIP
+#  define UPDATE(check, buf, len) \
+    (state->flags ? crc32(check, buf, len) : adler32(check, buf, len))
+#else
+#  define UPDATE(check, buf, len) adler32(check, buf, len)
+#endif
+
+/* check macros for header crc */
+#ifdef GUNZIP
+#  define CRC2(check, word) \
+    do { \
+        hbuf[0] = (unsigned char)(word); \
+        hbuf[1] = (unsigned char)((word) >> 8); \
+        check = crc32(check, hbuf, 2); \
+    } while (0)
+
+#  define CRC4(check, word) \
+    do { \
+        hbuf[0] = (unsigned char)(word); \
+        hbuf[1] = (unsigned char)((word) >> 8); \
+        hbuf[2] = (unsigned char)((word) >> 16); \
+        hbuf[3] = (unsigned char)((word) >> 24); \
+        check = crc32(check, hbuf, 4); \
+    } while (0)
+#endif
+
+/* Load registers with state in inflate() for speed */
+#define LOAD() \
+    do { \
+        put = strm->next_out; \
+        left = strm->avail_out; \
+        next = strm->next_in; \
+        have = strm->avail_in; \
+        hold = state->hold; \
+        bits = state->bits; \
+    } while (0)
+
+/* Restore state from registers in inflate() */
+#define RESTORE() \
+    do { \
+        strm->next_out = put; \
+        strm->avail_out = left; \
+        strm->next_in = next; \
+        strm->avail_in = have; \
+        state->hold = hold; \
+        state->bits = bits; \
+    } while (0)
+
+/* Clear the input bit accumulator */
+#define INITBITS() \
+    do { \
+        hold = 0; \
+        bits = 0; \
+    } while (0)
+
+/* Get a byte of input into the bit accumulator, or return from inflate()
+   if there is no input available. */
+#define PULLBYTE() \
+    do { \
+        if (have == 0) goto inf_leave; \
+        have--; \
+        hold += (unsigned long)(*next++) << bits; \
+        bits += 8; \
+    } while (0)
+
+/* Assure that there are at least n bits in the bit accumulator.  If there is
+   not enough available input to do that, then return from inflate(). */
+#define NEEDBITS(n) \
+    do { \
+        while (bits < (unsigned)(n)) \
+            PULLBYTE(); \
+    } while (0)
+
+/* Return the low n bits of the bit accumulator (n < 16) */
+#define BITS(n) \
+    ((unsigned)hold & ((1U << (n)) - 1))
+
+/* Remove n bits from the bit accumulator */
+#define DROPBITS(n) \
+    do { \
+        hold >>= (n); \
+        bits -= (unsigned)(n); \
+    } while (0)
+
+/* Remove zero to seven bits as needed to go to a byte boundary */
+#define BYTEBITS() \
+    do { \
+        hold >>= bits & 7; \
+        bits -= bits & 7; \
+    } while (0)
+
+/* Reverse the bytes in a 32-bit value */
+#define REVERSE(q) \
+    ((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \
+     (((q) & 0xff00) << 8) + (((q) & 0xff) << 24))
+
+/*
+   inflate() uses a state machine to process as much input data and generate as
+   much output data as possible before returning.  The state machine is
+   structured roughly as follows:
+
+    for (;;) switch (state) {
+    ...
+    case STATEn:
+        if (not enough input data or output space to make progress)
+            return;
+        ... make progress ...
+        state = STATEm;
+        break;
+    ...
+    }
+
+   so when inflate() is called again, the same case is attempted again, and
+   if the appropriate resources are provided, the machine proceeds to the
+   next state.  The NEEDBITS() macro is usually the way the state evaluates
+   whether it can proceed or should return.  NEEDBITS() does the return if
+   the requested bits are not available.  The typical use of the BITS macros
+   is:
+
+        NEEDBITS(n);
+        ... do something with BITS(n) ...
+        DROPBITS(n);
+
+   where NEEDBITS(n) either returns from inflate() if there isn't enough
+   input left to load n bits into the accumulator, or it continues.  BITS(n)
+   gives the low n bits in the accumulator.  When done, DROPBITS(n) drops
+   the low n bits off the accumulator.  INITBITS() clears the accumulator
+   and sets the number of available bits to zero.  BYTEBITS() discards just
+   enough bits to put the accumulator on a byte boundary.  After BYTEBITS()
+   and a NEEDBITS(8), then BITS(8) would return the next byte in the stream.
+
+   NEEDBITS(n) uses PULLBYTE() to get an available byte of input, or to return
+   if there is no input available.  The decoding of variable length codes uses
+   PULLBYTE() directly in order to pull just enough bytes to decode the next
+   code, and no more.
+
+   Some states loop until they get enough input, making sure that enough
+   state information is maintained to continue the loop where it left off
+   if NEEDBITS() returns in the loop.  For example, want, need, and keep
+   would all have to actually be part of the saved state in case NEEDBITS()
+   returns:
+
+    case STATEw:
+        while (want < need) {
+            NEEDBITS(n);
+            keep[want++] = BITS(n);
+            DROPBITS(n);
+        }
+        state = STATEx;
+    case STATEx:
+
+   As shown above, if the next state is also the next case, then the break
+   is omitted.
+
+   A state may also return if there is not enough output space available to
+   complete that state.  Those states are copying stored data, writing a
+   literal byte, and copying a matching string.
+
+   When returning, a "goto inf_leave" is used to update the total counters,
+   update the check value, and determine whether any progress has been made
+   during that inflate() call in order to return the proper return code.
+   Progress is defined as a change in either strm->avail_in or strm->avail_out.
+   When there is a window, goto inf_leave will update the window with the last
+   output written.  If a goto inf_leave occurs in the middle of decompression
+   and there is no window currently, goto inf_leave will create one and copy
+   output to the window for the next call of inflate().
+
+   In this implementation, the flush parameter of inflate() only affects the
+   return code (per zlib.h).  inflate() always writes as much as possible to
+   strm->next_out, given the space available and the provided input--the effect
+   documented in zlib.h of Z_SYNC_FLUSH.  Furthermore, inflate() always defers
+   the allocation of and copying into a sliding window until necessary, which
+   provides the effect documented in zlib.h for Z_FINISH when the entire input
+   stream available.  So the only thing the flush parameter actually does is:
+   when flush is set to Z_FINISH, inflate() cannot return Z_OK.  Instead it
+   will return Z_BUF_ERROR if it has not reached the end of the stream.
+ */
+
+int ZEXPORT inflate(strm, flush)
+z_streamp strm;
+int flush;
+{
+    struct inflate_state FAR *state;
+    unsigned char FAR *next;    /* next input */
+    unsigned char FAR *put;     /* next output */
+    unsigned have, left;        /* available input and output */
+    unsigned long hold;         /* bit buffer */
+    unsigned bits;              /* bits in bit buffer */
+    unsigned in, out;           /* save starting available input and output */
+    unsigned copy;              /* number of stored or match bytes to copy */
+    unsigned char FAR *from;    /* where to copy match bytes from */
+    code this;                  /* current decoding table entry */
+    code last;                  /* parent table entry */
+    unsigned len;               /* length to copy for repeats, bits to drop */
+    int ret;                    /* return code */
+#ifdef GUNZIP
+    unsigned char hbuf[4];      /* buffer for gzip header crc calculation */
+#endif
+    static const unsigned short order[19] = /* permutation of code lengths */
+        {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
+
+    if (strm == Z_NULL || strm->state == Z_NULL || strm->next_out == Z_NULL ||
+        (strm->next_in == Z_NULL && strm->avail_in != 0))
+        return Z_STREAM_ERROR;
+
+    state = (struct inflate_state FAR *)strm->state;
+    if (state->mode == TYPE) state->mode = TYPEDO;      /* skip check */
+    LOAD();
+    in = have;
+    out = left;
+    ret = Z_OK;
+    for (;;)
+        switch (state->mode) {
+        case HEAD:
+            if (state->wrap == 0) {
+                state->mode = TYPEDO;
+                break;
+            }
+            NEEDBITS(16);
+#ifdef GUNZIP
+            if ((state->wrap & 2) && hold == 0x8b1f) {  /* gzip header */
+                state->check = crc32(0L, Z_NULL, 0);
+                CRC2(state->check, hold);
+                INITBITS();
+                state->mode = FLAGS;
+                break;
+            }
+            state->flags = 0;           /* expect zlib header */
+            if (!(state->wrap & 1) ||   /* check if zlib header allowed */
+#else
+            if (
+#endif
+                ((BITS(8) << 8) + (hold >> 8)) % 31) {
+                strm->msg = (char *)"incorrect header check";
+                state->mode = BAD;
+                break;
+            }
+            if (BITS(4) != Z_DEFLATED) {
+                strm->msg = (char *)"unknown compression method";
+                state->mode = BAD;
+                break;
+            }
+            DROPBITS(4);
+            if (BITS(4) + 8 > state->wbits) {
+                strm->msg = (char *)"invalid window size";
+                state->mode = BAD;
+                break;
+            }
+            Tracev((stderr, "inflate:   zlib header ok\n"));
+            strm->adler = state->check = adler32(0L, Z_NULL, 0);
+            state->mode = hold & 0x200 ? DICTID : TYPE;
+            INITBITS();
+            break;
+#ifdef GUNZIP
+        case FLAGS:
+            NEEDBITS(16);
+            state->flags = (int)(hold);
+            if ((state->flags & 0xff) != Z_DEFLATED) {
+                strm->msg = (char *)"unknown compression method";
+                state->mode = BAD;
+                break;
+            }
+            if (state->flags & 0xe000) {
+                strm->msg = (char *)"unknown header flags set";
+                state->mode = BAD;
+                break;
+            }
+            if (state->flags & 0x0200) CRC2(state->check, hold);
+            INITBITS();
+            state->mode = TIME;
+        case TIME:
+            NEEDBITS(32);
+            if (state->flags & 0x0200) CRC4(state->check, hold);
+            INITBITS();
+            state->mode = OS;
+        case OS:
+            NEEDBITS(16);
+            if (state->flags & 0x0200) CRC2(state->check, hold);
+            INITBITS();
+            state->mode = EXLEN;
+        case EXLEN:
+            if (state->flags & 0x0400) {
+                NEEDBITS(16);
+                state->length = (unsigned)(hold);
+                if (state->flags & 0x0200) CRC2(state->check, hold);
+                INITBITS();
+            }
+            state->mode = EXTRA;
+        case EXTRA:
+            if (state->flags & 0x0400) {
+                copy = state->length;
+                if (copy > have) copy = have;
+                if (copy) {
+                    if (state->flags & 0x0200)
+                        state->check = crc32(state->check, next, copy);
+                    have -= copy;
+                    next += copy;
+                    state->length -= copy;
+                }
+                if (state->length) goto inf_leave;
+            }
+            state->mode = NAME;
+        case NAME:
+            if (state->flags & 0x0800) {
+                if (have == 0) goto inf_leave;
+                copy = 0;
+                do {
+                    len = (unsigned)(next[copy++]);
+                } while (len && copy < have);
+                if (state->flags & 0x02000)
+                    state->check = crc32(state->check, next, copy);
+                have -= copy;
+                next += copy;
+                if (len) goto inf_leave;
+            }
+            state->mode = COMMENT;
+        case COMMENT:
+            if (state->flags & 0x1000) {
+                if (have == 0) goto inf_leave;
+                copy = 0;
+                do {
+                    len = (unsigned)(next[copy++]);
+                } while (len && copy < have);
+                if (state->flags & 0x02000)
+                    state->check = crc32(state->check, next, copy);
+                have -= copy;
+                next += copy;
+                if (len) goto inf_leave;
+            }
+            state->mode = HCRC;
+        case HCRC:
+            if (state->flags & 0x0200) {
+                NEEDBITS(16);
+                if (hold != (state->check & 0xffff)) {
+                    strm->msg = (char *)"header crc mismatch";
+                    state->mode = BAD;
+                    break;
+                }
+                INITBITS();
+            }
+            strm->adler = state->check = crc32(0L, Z_NULL, 0);
+            state->mode = TYPE;
+            break;
+#endif
+        case DICTID:
+            NEEDBITS(32);
+            strm->adler = state->check = REVERSE(hold);
+            INITBITS();
+            state->mode = DICT;
+        case DICT:
+            if (state->havedict == 0) {
+                RESTORE();
+                return Z_NEED_DICT;
+            }
+            strm->adler = state->check = adler32(0L, Z_NULL, 0);
+            state->mode = TYPE;
+        case TYPE:
+            if (flush == Z_BLOCK) goto inf_leave;
+        case TYPEDO:
+            if (state->last) {
+                BYTEBITS();
+                state->mode = CHECK;
+                break;
+            }
+            NEEDBITS(3);
+            state->last = BITS(1);
+            DROPBITS(1);
+            switch (BITS(2)) {
+            case 0:                             /* stored block */
+                Tracev((stderr, "inflate:     stored block%s\n",
+                        state->last ? " (last)" : ""));
+                state->mode = STORED;
+                break;
+            case 1:                             /* fixed block */
+                fixedtables(state);
+                Tracev((stderr, "inflate:     fixed codes block%s\n",
+                        state->last ? " (last)" : ""));
+                state->mode = LEN;              /* decode codes */
+                break;
+            case 2:                             /* dynamic block */
+                Tracev((stderr, "inflate:     dynamic codes block%s\n",
+                        state->last ? " (last)" : ""));
+                state->mode = TABLE;
+                break;
+            case 3:
+                strm->msg = (char *)"invalid block type";
+                state->mode = BAD;
+            }
+            DROPBITS(2);
+            break;
+        case STORED:
+            BYTEBITS();                         /* go to byte boundary */
+            NEEDBITS(32);
+            if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {
+                strm->msg = (char *)"invalid stored block lengths";
+                state->mode = BAD;
+                break;
+            }
+            state->length = (unsigned)hold & 0xffff;
+            Tracev((stderr, "inflate:       stored length %u\n",
+                    state->length));
+            INITBITS();
+            state->mode = COPY;
+        case COPY:
+            copy = state->length;
+            if (copy) {
+                if (copy > have) copy = have;
+                if (copy > left) copy = left;
+                if (copy == 0) goto inf_leave;
+                zmemcpy(put, next, copy);
+                have -= copy;
+                next += copy;
+                left -= copy;
+                put += copy;
+                state->length -= copy;
+                break;
+            }
+            Tracev((stderr, "inflate:       stored end\n"));
+            state->mode = TYPE;
+            break;
+        case TABLE:
+            NEEDBITS(14);
+            state->nlen = BITS(5) + 257;
+            DROPBITS(5);
+            state->ndist = BITS(5) + 1;
+            DROPBITS(5);
+            state->ncode = BITS(4) + 4;
+            DROPBITS(4);
+#ifndef PKZIP_BUG_WORKAROUND
+            if (state->nlen > 286 || state->ndist > 30) {
+                strm->msg = (char *)"too many length or distance symbols";
+                state->mode = BAD;
+                break;
+            }
+#endif
+            Tracev((stderr, "inflate:       table sizes ok\n"));
+            state->have = 0;
+            state->mode = LENLENS;
+        case LENLENS:
+            while (state->have < state->ncode) {
+                NEEDBITS(3);
+                state->lens[order[state->have++]] = (unsigned short)BITS(3);
+                DROPBITS(3);
+            }
+            while (state->have < 19)
+                state->lens[order[state->have++]] = 0;
+            state->next = state->codes;
+            state->lencode = (code const FAR *)(state->next);
+            state->lenbits = 7;
+            ret = inflate_table(CODES, state->lens, 19, &(state->next),
+                                &(state->lenbits), state->work);
+            if (ret) {
+                strm->msg = (char *)"invalid code lengths set";
+                state->mode = BAD;
+                break;
+            }
+            Tracev((stderr, "inflate:       code lengths ok\n"));
+            state->have = 0;
+            state->mode = CODELENS;
+        case CODELENS:
+            while (state->have < state->nlen + state->ndist) {
+                for (;;) {
+                    this = state->lencode[BITS(state->lenbits)];
+                    if ((unsigned)(this.bits) <= bits) break;
+                    PULLBYTE();
+                }
+                if (this.val < 16) {
+                    NEEDBITS(this.bits);
+                    DROPBITS(this.bits);
+                    state->lens[state->have++] = this.val;
+                }
+                else {
+                    if (this.val == 16) {
+                        NEEDBITS(this.bits + 2);
+                        DROPBITS(this.bits);
+                        if (state->have == 0) {
+                            strm->msg = (char *)"invalid bit length repeat";
+                            state->mode = BAD;
+                            break;
+                        }
+                        len = state->lens[state->have - 1];
+                        copy = 3 + BITS(2);
+                        DROPBITS(2);
+                    }
+                    else if (this.val == 17) {
+                        NEEDBITS(this.bits + 3);
+                        DROPBITS(this.bits);
+                        len = 0;
+                        copy = 3 + BITS(3);
+                        DROPBITS(3);
+                    }
+                    else {
+                        NEEDBITS(this.bits + 7);
+                        DROPBITS(this.bits);
+                        len = 0;
+                        copy = 11 + BITS(7);
+                        DROPBITS(7);
+                    }
+                    if (state->have + copy > state->nlen + state->ndist) {
+                        strm->msg = (char *)"invalid bit length repeat";
+                        state->mode = BAD;
+                        break;
+                    }
+                    while (copy--)
+                        state->lens[state->have++] = (unsigned short)len;
+                }
+            }
+
+            /* handle error breaks in while */
+            if (state->mode == BAD) break;
+
+            /* build code tables */
+            state->next = state->codes;
+            state->lencode = (code const FAR *)(state->next);
+            state->lenbits = 9;
+            ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),
+                                &(state->lenbits), state->work);
+            if (ret) {
+                strm->msg = (char *)"invalid literal/lengths set";
+                state->mode = BAD;
+                break;
+            }
+            state->distcode = (code const FAR *)(state->next);
+            state->distbits = 6;
+            ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,
+                            &(state->next), &(state->distbits), state->work);
+            if (ret) {
+                strm->msg = (char *)"invalid distances set";
+                state->mode = BAD;
+                break;
+            }
+            Tracev((stderr, "inflate:       codes ok\n"));
+            state->mode = LEN;
+        case LEN:
+            if (have >= 6 && left >= 258) {
+                RESTORE();
+                inflate_fast(strm, out);
+                LOAD();
+                break;
+            }
+            for (;;) {
+                this = state->lencode[BITS(state->lenbits)];
+                if ((unsigned)(this.bits) <= bits) break;
+                PULLBYTE();
+            }
+            if (this.op && (this.op & 0xf0) == 0) {
+                last = this;
+                for (;;) {
+                    this = state->lencode[last.val +
+                            (BITS(last.bits + last.op) >> last.bits)];
+                    if ((unsigned)(last.bits + this.bits) <= bits) break;
+                    PULLBYTE();
+                }
+                DROPBITS(last.bits);
+            }
+            DROPBITS(this.bits);
+            state->length = (unsigned)this.val;
+            if ((int)(this.op) == 0) {
+                Tracevv((stderr, this.val >= 0x20 && this.val < 0x7f ?
+                        "inflate:         literal '%c'\n" :
+                        "inflate:         literal 0x%02x\n", this.val));
+                state->mode = LIT;
+                break;
+            }
+            if (this.op & 32) {
+                Tracevv((stderr, "inflate:         end of block\n"));
+                state->mode = TYPE;
+                break;
+            }
+            if (this.op & 64) {
+                strm->msg = (char *)"invalid literal/length code";
+                state->mode = BAD;
+                break;
+            }
+            state->extra = (unsigned)(this.op) & 15;
+            state->mode = LENEXT;
+        case LENEXT:
+            if (state->extra) {
+                NEEDBITS(state->extra);
+                state->length += BITS(state->extra);
+                DROPBITS(state->extra);
+            }
+            Tracevv((stderr, "inflate:         length %u\n", state->length));
+            state->mode = DIST;
+        case DIST:
+            for (;;) {
+                this = state->distcode[BITS(state->distbits)];
+                if ((unsigned)(this.bits) <= bits) break;
+                PULLBYTE();
+            }
+            if ((this.op & 0xf0) == 0) {
+                last = this;
+                for (;;) {
+                    this = state->distcode[last.val +
+                            (BITS(last.bits + last.op) >> last.bits)];
+                    if ((unsigned)(last.bits + this.bits) <= bits) break;
+                    PULLBYTE();
+                }
+                DROPBITS(last.bits);
+            }
+            DROPBITS(this.bits);
+            if (this.op & 64) {
+                strm->msg = (char *)"invalid distance code";
+                state->mode = BAD;
+                break;
+            }
+            state->offset = (unsigned)this.val;
+            state->extra = (unsigned)(this.op) & 15;
+            state->mode = DISTEXT;
+        case DISTEXT:
+            if (state->extra) {
+                NEEDBITS(state->extra);
+                state->offset += BITS(state->extra);
+                DROPBITS(state->extra);
+            }
+            if (state->offset > state->whave + out - left) {
+                strm->msg = (char *)"invalid distance too far back";
+                state->mode = BAD;
+                break;
+            }
+            Tracevv((stderr, "inflate:         distance %u\n", state->offset));
+            state->mode = MATCH;
+        case MATCH:
+            if (left == 0) goto inf_leave;
+            copy = out - left;
+            if (state->offset > copy) {         /* copy from window */
+                copy = state->offset - copy;
+                if (copy > state->write) {
+                    copy -= state->write;
+                    from = state->window + (state->wsize - copy);
+                }
+                else
+                    from = state->window + (state->write - copy);
+                if (copy > state->length) copy = state->length;
+            }
+            else {                              /* copy from output */
+                from = put - state->offset;
+                copy = state->length;
+            }
+            if (copy > left) copy = left;
+            left -= copy;
+            state->length -= copy;
+            do {
+                *put++ = *from++;
+            } while (--copy);
+            if (state->length == 0) state->mode = LEN;
+            break;
+        case LIT:
+            if (left == 0) goto inf_leave;
+            *put++ = (unsigned char)(state->length);
+            left--;
+            state->mode = LEN;
+            break;
+        case CHECK:
+            if (state->wrap) {
+                NEEDBITS(32);
+                out -= left;
+                strm->total_out += out;
+                state->total += out;
+                if (out)
+                    strm->adler = state->check =
+                        UPDATE(state->check, put - out, out);
+                out = left;
+                if ((
+#ifdef GUNZIP
+                     state->flags ? hold :
+#endif
+                     REVERSE(hold)) != state->check) {
+                    strm->msg = (char *)"incorrect data check";
+                    state->mode = BAD;
+                    break;
+                }
+                INITBITS();
+                Tracev((stderr, "inflate:   check matches trailer\n"));
+            }
+#ifdef GUNZIP
+            state->mode = LENGTH;
+        case LENGTH:
+            if (state->wrap && state->flags) {
+                NEEDBITS(32);
+                if (hold != (state->total & 0xffffffffUL)) {
+                    strm->msg = (char *)"incorrect length check";
+                    state->mode = BAD;
+                    break;
+                }
+                INITBITS();
+                Tracev((stderr, "inflate:   length matches trailer\n"));
+            }
+#endif
+            state->mode = DONE;
+        case DONE:
+            ret = Z_STREAM_END;
+            goto inf_leave;
+        case BAD:
+            ret = Z_DATA_ERROR;
+            goto inf_leave;
+        case MEM:
+            return Z_MEM_ERROR;
+        case SYNC:
+        default:
+            return Z_STREAM_ERROR;
+        }
+
+    /*
+       Return from inflate(), updating the total counts and the check value.
+       If there was no progress during the inflate() call, return a buffer
+       error.  Call updatewindow() to create and/or update the window state.
+       Note: a memory error from inflate() is non-recoverable.
+     */
+  inf_leave:
+    RESTORE();
+    if (state->wsize || (state->mode < CHECK && out != strm->avail_out))
+        if (updatewindow(strm, out)) {
+            state->mode = MEM;
+            return Z_MEM_ERROR;
+        }
+    in -= strm->avail_in;
+    out -= strm->avail_out;
+    strm->total_in += in;
+    strm->total_out += out;
+    state->total += out;
+    if (state->wrap && out)
+        strm->adler = state->check =
+            UPDATE(state->check, strm->next_out - out, out);
+    strm->data_type = state->bits + (state->last ? 64 : 0) +
+                      (state->mode == TYPE ? 128 : 0);
+    if (((in == 0 && out == 0) || flush == Z_FINISH) && ret == Z_OK)
+        ret = Z_BUF_ERROR;
+    return ret;
+}
+
+int ZEXPORT inflateEnd(strm)
+z_streamp strm;
+{
+    struct inflate_state FAR *state;
+    if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0)
+        return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    if (state->window != Z_NULL) ZFREE(strm, state->window);
+    ZFREE(strm, strm->state);
+    strm->state = Z_NULL;
+    Tracev((stderr, "inflate: end\n"));
+    return Z_OK;
+}
+
+int ZEXPORT inflateSetDictionary(strm, dictionary, dictLength)
+z_streamp strm;
+const Bytef *dictionary;
+uInt dictLength;
+{
+    struct inflate_state FAR *state;
+    unsigned long id;
+
+    /* check state */
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    if (state->mode != DICT) return Z_STREAM_ERROR;
+
+    /* check for correct dictionary id */
+    id = adler32(0L, Z_NULL, 0);
+    id = adler32(id, dictionary, dictLength);
+    if (id != state->check) return Z_DATA_ERROR;
+
+    /* copy dictionary to window */
+    if (updatewindow(strm, strm->avail_out)) {
+        state->mode = MEM;
+        return Z_MEM_ERROR;
+    }
+    if (dictLength > state->wsize) {
+        zmemcpy(state->window, dictionary + dictLength - state->wsize,
+                state->wsize);
+        state->whave = state->wsize;
+    }
+    else {
+        zmemcpy(state->window + state->wsize - dictLength, dictionary,
+                dictLength);
+        state->whave = dictLength;
+    }
+    state->havedict = 1;
+    Tracev((stderr, "inflate:   dictionary set\n"));
+    return Z_OK;
+}
+
+/*
+   Search buf[0..len-1] for the pattern: 0, 0, 0xff, 0xff.  Return when found
+   or when out of input.  When called, *have is the number of pattern bytes
+   found in order so far, in 0..3.  On return *have is updated to the new
+   state.  If on return *have equals four, then the pattern was found and the
+   return value is how many bytes were read including the last byte of the
+   pattern.  If *have is less than four, then the pattern has not been found
+   yet and the return value is len.  In the latter case, syncsearch() can be
+   called again with more data and the *have state.  *have is initialized to
+   zero for the first call.
+ */
+local unsigned syncsearch(have, buf, len)
+unsigned FAR *have;
+unsigned char FAR *buf;
+unsigned len;
+{
+    unsigned got;
+    unsigned next;
+
+    got = *have;
+    next = 0;
+    while (next < len && got < 4) {
+        if ((int)(buf[next]) == (got < 2 ? 0 : 0xff))
+            got++;
+        else if (buf[next])
+            got = 0;
+        else
+            got = 4 - got;
+        next++;
+    }
+    *have = got;
+    return next;
+}
+
+int ZEXPORT inflateSync(strm)
+z_streamp strm;
+{
+    unsigned len;               /* number of bytes to look at or looked at */
+    unsigned long in, out;      /* temporary to save total_in and total_out */
+    unsigned char buf[4];       /* to restore bit buffer to byte string */
+    struct inflate_state FAR *state;
+
+    /* check parameters */
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    if (strm->avail_in == 0 && state->bits < 8) return Z_BUF_ERROR;
+
+    /* if first time, start search in bit buffer */
+    if (state->mode != SYNC) {
+        state->mode = SYNC;
+        state->hold <<= state->bits & 7;
+        state->bits -= state->bits & 7;
+        len = 0;
+        while (state->bits >= 8) {
+            buf[len++] = (unsigned char)(state->hold);
+            state->hold >>= 8;
+            state->bits -= 8;
+        }
+        state->have = 0;
+        syncsearch(&(state->have), buf, len);
+    }
+
+    /* search available input */
+    len = syncsearch(&(state->have), strm->next_in, strm->avail_in);
+    strm->avail_in -= len;
+    strm->next_in += len;
+    strm->total_in += len;
+
+    /* return no joy or set up to restart inflate() on a new block */
+    if (state->have != 4) return Z_DATA_ERROR;
+    in = strm->total_in;  out = strm->total_out;
+    inflateReset(strm);
+    strm->total_in = in;  strm->total_out = out;
+    state->mode = TYPE;
+    return Z_OK;
+}
+
+/*
+   Returns true if inflate is currently at the end of a block generated by
+   Z_SYNC_FLUSH or Z_FULL_FLUSH. This function is used by one PPP
+   implementation to provide an additional safety check. PPP uses
+   Z_SYNC_FLUSH but removes the length bytes of the resulting empty stored
+   block. When decompressing, PPP checks that at the end of input packet,
+   inflate is waiting for these length bytes.
+ */
+int ZEXPORT inflateSyncPoint(strm)
+z_streamp strm;
+{
+    struct inflate_state FAR *state;
+
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    return state->mode == STORED && state->bits == 0;
+}
+
+int ZEXPORT inflateCopy(dest, source)
+z_streamp dest;
+z_streamp source;
+{
+    struct inflate_state FAR *state;
+    struct inflate_state FAR *copy;
+    unsigned char FAR *window;
+
+    /* check input */
+    if (dest == Z_NULL || source == Z_NULL || source->state == Z_NULL ||
+        source->zalloc == (alloc_func)0 || source->zfree == (free_func)0)
+        return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)source->state;
+
+    /* allocate space */
+    copy = (struct inflate_state FAR *)
+           ZALLOC(source, 1, sizeof(struct inflate_state));
+    if (copy == Z_NULL) return Z_MEM_ERROR;
+    window = Z_NULL;
+    if (state->window != Z_NULL) {
+        window = (unsigned char FAR *)
+                 ZALLOC(source, 1U << state->wbits, sizeof(unsigned char));
+        if (window == Z_NULL) {
+            ZFREE(source, copy);
+            return Z_MEM_ERROR;
+        }
+    }
+
+    /* copy state */
+    *dest = *source;
+    *copy = *state;
+    copy->lencode = copy->codes + (state->lencode - state->codes);
+    copy->distcode = copy->codes + (state->distcode - state->codes);
+    copy->next = copy->codes + (state->next - state->codes);
+    if (window != Z_NULL)
+        zmemcpy(window, state->window, 1U << state->wbits);
+    copy->window = window;
+    dest->state = (voidpf)copy;
+    return Z_OK;
+}
diff --git a/src/zlib/inflate.h b/src/zlib/inflate.h
index b6965127b..9a12c8fd2 100644
--- a/src/zlib/inflate.h
+++ b/src/zlib/inflate.h
@@ -1,117 +1,117 @@
-/* inflate.h -- internal inflate state definition

- * Copyright (C) 1995-2003 Mark Adler

- * For conditions of distribution and use, see copyright notice in zlib.h

- */

-

-/* WARNING: this file should *not* be used by applications. It is

-   part of the implementation of the compression library and is

-   subject to change. Applications should only use zlib.h.

- */

-

-/* define NO_GZIP when compiling if you want to disable gzip header and

-   trailer decoding by inflate().  NO_GZIP would be used to avoid linking in

-   the crc code when it is not needed.  For shared libraries, gzip decoding

-   should be left enabled. */

-#ifndef NO_GZIP

-#  define GUNZIP

-#endif

-

-/* Possible inflate modes between inflate() calls */

-typedef enum {

-    HEAD,       /* i: waiting for magic header */

-#ifdef GUNZIP

-    FLAGS,      /* i: waiting for method and flags (gzip) */

-    TIME,       /* i: waiting for modification time (gzip) */

-    OS,         /* i: waiting for extra flags and operating system (gzip) */

-    EXLEN,      /* i: waiting for extra length (gzip) */

-    EXTRA,      /* i: waiting for extra bytes (gzip) */

-    NAME,       /* i: waiting for end of file name (gzip) */

-    COMMENT,    /* i: waiting for end of comment (gzip) */

-    HCRC,       /* i: waiting for header crc (gzip) */

-#endif

-    DICTID,     /* i: waiting for dictionary check value */

-    DICT,       /* waiting for inflateSetDictionary() call */

-        TYPE,       /* i: waiting for type bits, including last-flag bit */

-        TYPEDO,     /* i: same, but skip check to exit inflate on new block */

-        STORED,     /* i: waiting for stored size (length and complement) */

-        COPY,       /* i/o: waiting for input or output to copy stored block */

-        TABLE,      /* i: waiting for dynamic block table lengths */

-        LENLENS,    /* i: waiting for code length code lengths */

-        CODELENS,   /* i: waiting for length/lit and distance code lengths */

-            LEN,        /* i: waiting for length/lit code */

-            LENEXT,     /* i: waiting for length extra bits */

-            DIST,       /* i: waiting for distance code */

-            DISTEXT,    /* i: waiting for distance extra bits */

-            MATCH,      /* o: waiting for output space to copy string */

-            LIT,        /* o: waiting for output space to write literal */

-    CHECK,      /* i: waiting for 32-bit check value */

-#ifdef GUNZIP

-    LENGTH,     /* i: waiting for 32-bit length (gzip) */

-#endif

-    DONE,       /* finished check, done -- remain here until reset */

-    BAD,        /* got a data error -- remain here until reset */

-    MEM,        /* got an inflate() memory error -- remain here until reset */

-    SYNC        /* looking for synchronization bytes to restart inflate() */

-} inflate_mode;

-

-/*

-    State transitions between above modes -

-

-    (most modes can go to the BAD or MEM mode -- not shown for clarity)

-

-    Process header:

-        HEAD -> (gzip) or (zlib)

-        (gzip) -> FLAGS -> TIME -> OS -> EXLEN -> EXTRA -> NAME

-        NAME -> COMMENT -> HCRC -> TYPE

-        (zlib) -> DICTID or TYPE

-        DICTID -> DICT -> TYPE

-    Read deflate blocks:

-            TYPE -> STORED or TABLE or LEN or CHECK

-            STORED -> COPY -> TYPE

-            TABLE -> LENLENS -> CODELENS -> LEN

-    Read deflate codes:

-                LEN -> LENEXT or LIT or TYPE

-                LENEXT -> DIST -> DISTEXT -> MATCH -> LEN

-                LIT -> LEN

-    Process trailer:

-        CHECK -> LENGTH -> DONE

- */

-

-/* state maintained between inflate() calls.  Approximately 7K bytes. */

-struct inflate_state {

-    inflate_mode mode;          /* current inflate mode */

-    int last;                   /* true if processing last block */

-    int wrap;                   /* bit 0 true for zlib, bit 1 true for gzip */

-    int havedict;               /* true if dictionary provided */

-    int flags;                  /* gzip header method and flags (0 if zlib) */

-    unsigned long check;        /* protected copy of check value */

-    unsigned long total;        /* protected copy of output count */

-        /* sliding window */

-    unsigned wbits;             /* log base 2 of requested window size */

-    unsigned wsize;             /* window size or zero if not using window */

-    unsigned whave;             /* valid bytes in the window */

-    unsigned write;             /* window write index */

-    unsigned char FAR *window;  /* allocated sliding window, if needed */

-        /* bit accumulator */

-    unsigned long hold;         /* input bit accumulator */

-    unsigned bits;              /* number of bits in "in" */

-        /* for string and stored block copying */

-    unsigned length;            /* literal or length of data to copy */

-    unsigned offset;            /* distance back to copy string from */

-        /* for table and code decoding */

-    unsigned extra;             /* extra bits needed */

-        /* fixed and dynamic code tables */

-    code const FAR *lencode;    /* starting table for length/literal codes */

-    code const FAR *distcode;   /* starting table for distance codes */

-    unsigned lenbits;           /* index bits for lencode */

-    unsigned distbits;          /* index bits for distcode */

-        /* dynamic table building */

-    unsigned ncode;             /* number of code length code lengths */

-    unsigned nlen;              /* number of length code lengths */

-    unsigned ndist;             /* number of distance code lengths */

-    unsigned have;              /* number of code lengths in lens[] */

-    code FAR *next;             /* next available space in codes[] */

-    unsigned short lens[320];   /* temporary storage for code lengths */

-    unsigned short work[288];   /* work area for code table building */

-    code codes[ENOUGH];         /* space for code tables */

-};

+/* inflate.h -- internal inflate state definition
+ * Copyright (C) 1995-2003 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+   part of the implementation of the compression library and is
+   subject to change. Applications should only use zlib.h.
+ */
+
+/* define NO_GZIP when compiling if you want to disable gzip header and
+   trailer decoding by inflate().  NO_GZIP would be used to avoid linking in
+   the crc code when it is not needed.  For shared libraries, gzip decoding
+   should be left enabled. */
+#ifndef NO_GZIP
+#  define GUNZIP
+#endif
+
+/* Possible inflate modes between inflate() calls */
+typedef enum {
+    HEAD,       /* i: waiting for magic header */
+#ifdef GUNZIP
+    FLAGS,      /* i: waiting for method and flags (gzip) */
+    TIME,       /* i: waiting for modification time (gzip) */
+    OS,         /* i: waiting for extra flags and operating system (gzip) */
+    EXLEN,      /* i: waiting for extra length (gzip) */
+    EXTRA,      /* i: waiting for extra bytes (gzip) */
+    NAME,       /* i: waiting for end of file name (gzip) */
+    COMMENT,    /* i: waiting for end of comment (gzip) */
+    HCRC,       /* i: waiting for header crc (gzip) */
+#endif
+    DICTID,     /* i: waiting for dictionary check value */
+    DICT,       /* waiting for inflateSetDictionary() call */
+        TYPE,       /* i: waiting for type bits, including last-flag bit */
+        TYPEDO,     /* i: same, but skip check to exit inflate on new block */
+        STORED,     /* i: waiting for stored size (length and complement) */
+        COPY,       /* i/o: waiting for input or output to copy stored block */
+        TABLE,      /* i: waiting for dynamic block table lengths */
+        LENLENS,    /* i: waiting for code length code lengths */
+        CODELENS,   /* i: waiting for length/lit and distance code lengths */
+            LEN,        /* i: waiting for length/lit code */
+            LENEXT,     /* i: waiting for length extra bits */
+            DIST,       /* i: waiting for distance code */
+            DISTEXT,    /* i: waiting for distance extra bits */
+            MATCH,      /* o: waiting for output space to copy string */
+            LIT,        /* o: waiting for output space to write literal */
+    CHECK,      /* i: waiting for 32-bit check value */
+#ifdef GUNZIP
+    LENGTH,     /* i: waiting for 32-bit length (gzip) */
+#endif
+    DONE,       /* finished check, done -- remain here until reset */
+    BAD,        /* got a data error -- remain here until reset */
+    MEM,        /* got an inflate() memory error -- remain here until reset */
+    SYNC        /* looking for synchronization bytes to restart inflate() */
+} inflate_mode;
+
+/*
+    State transitions between above modes -
+
+    (most modes can go to the BAD or MEM mode -- not shown for clarity)
+
+    Process header:
+        HEAD -> (gzip) or (zlib)
+        (gzip) -> FLAGS -> TIME -> OS -> EXLEN -> EXTRA -> NAME
+        NAME -> COMMENT -> HCRC -> TYPE
+        (zlib) -> DICTID or TYPE
+        DICTID -> DICT -> TYPE
+    Read deflate blocks:
+            TYPE -> STORED or TABLE or LEN or CHECK
+            STORED -> COPY -> TYPE
+            TABLE -> LENLENS -> CODELENS -> LEN
+    Read deflate codes:
+                LEN -> LENEXT or LIT or TYPE
+                LENEXT -> DIST -> DISTEXT -> MATCH -> LEN
+                LIT -> LEN
+    Process trailer:
+        CHECK -> LENGTH -> DONE
+ */
+
+/* state maintained between inflate() calls.  Approximately 7K bytes. */
+struct inflate_state {
+    inflate_mode mode;          /* current inflate mode */
+    int last;                   /* true if processing last block */
+    int wrap;                   /* bit 0 true for zlib, bit 1 true for gzip */
+    int havedict;               /* true if dictionary provided */
+    int flags;                  /* gzip header method and flags (0 if zlib) */
+    unsigned long check;        /* protected copy of check value */
+    unsigned long total;        /* protected copy of output count */
+        /* sliding window */
+    unsigned wbits;             /* log base 2 of requested window size */
+    unsigned wsize;             /* window size or zero if not using window */
+    unsigned whave;             /* valid bytes in the window */
+    unsigned write;             /* window write index */
+    unsigned char FAR *window;  /* allocated sliding window, if needed */
+        /* bit accumulator */
+    unsigned long hold;         /* input bit accumulator */
+    unsigned bits;              /* number of bits in "in" */
+        /* for string and stored block copying */
+    unsigned length;            /* literal or length of data to copy */
+    unsigned offset;            /* distance back to copy string from */
+        /* for table and code decoding */
+    unsigned extra;             /* extra bits needed */
+        /* fixed and dynamic code tables */
+    code const FAR *lencode;    /* starting table for length/literal codes */
+    code const FAR *distcode;   /* starting table for distance codes */
+    unsigned lenbits;           /* index bits for lencode */
+    unsigned distbits;          /* index bits for distcode */
+        /* dynamic table building */
+    unsigned ncode;             /* number of code length code lengths */
+    unsigned nlen;              /* number of length code lengths */
+    unsigned ndist;             /* number of distance code lengths */
+    unsigned have;              /* number of code lengths in lens[] */
+    code FAR *next;             /* next available space in codes[] */
+    unsigned short lens[320];   /* temporary storage for code lengths */
+    unsigned short work[288];   /* work area for code table building */
+    code codes[ENOUGH];         /* space for code tables */
+};
diff --git a/src/zlib/inftrees.c b/src/zlib/inftrees.c
index 214cb236c..8a896b287 100644
--- a/src/zlib/inftrees.c
+++ b/src/zlib/inftrees.c
@@ -1,328 +1,328 @@
-/* inftrees.c -- generate Huffman trees for efficient decoding

- * Copyright (C) 1995-2004 Mark Adler

- * For conditions of distribution and use, see copyright notice in zlib.h

- */

-

-#include "zutil.h"

-#include "inftrees.h"

-

-#define MAXBITS 15

-

-const char inflate_copyright[] =

-   " inflate 1.2.2 Copyright 1995-2004 Mark Adler ";

-/*

-  If you use the zlib library in a product, an acknowledgment is welcome

-  in the documentation of your product. If for some reason you cannot

-  include such an acknowledgment, I would appreciate that you keep this

-  copyright string in the executable of your product.

- */

-

-/*

-   Build a set of tables to decode the provided canonical Huffman code.

-   The code lengths are lens[0..codes-1].  The result starts at *table,

-   whose indices are 0..2^bits-1.  work is a writable array of at least

-   lens shorts, which is used as a work area.  type is the type of code

-   to be generated, CODES, LENS, or DISTS.  On return, zero is success,

-   -1 is an invalid code, and +1 means that ENOUGH isn't enough.  table

-   on return points to the next available entry's address.  bits is the

-   requested root table index bits, and on return it is the actual root

-   table index bits.  It will differ if the request is greater than the

-   longest code or if it is less than the shortest code.

- */

-int inflate_table(type, lens, codes, table, bits, work)

-codetype type;

-unsigned short FAR *lens;

-unsigned codes;

-code FAR * FAR *table;

-unsigned FAR *bits;

-unsigned short FAR *work;

-{

-    unsigned len;               /* a code's length in bits */

-    unsigned sym;               /* index of code symbols */

-    unsigned min, max;          /* minimum and maximum code lengths */

-    unsigned root;              /* number of index bits for root table */

-    unsigned curr;              /* number of index bits for current table */

-    unsigned drop;              /* code bits to drop for sub-table */

-    int left;                   /* number of prefix codes available */

-    unsigned used;              /* code entries in table used */

-    unsigned huff;              /* Huffman code */

-    unsigned incr;              /* for incrementing code, index */

-    unsigned fill;              /* index for replicating entries */

-    unsigned low;               /* low bits for current root entry */

-    unsigned mask;              /* mask for low root bits */

-    code this;                  /* table entry for duplication */

-    code FAR *next;             /* next available space in table */

-    const unsigned short FAR *base;     /* base value table to use */

-    const unsigned short FAR *extra;    /* extra bits table to use */

-    int end;                    /* use base and extra for symbol > end */

-    unsigned short count[MAXBITS+1];    /* number of codes of each length */

-    unsigned short offs[MAXBITS+1];     /* offsets in table for each length */

-    static const unsigned short lbase[31] = { /* Length codes 257..285 base */

-        3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,

-        35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};

-    static const unsigned short lext[31] = { /* Length codes 257..285 extra */

-        16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,

-        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 199, 198};

-    static const unsigned short dbase[32] = { /* Distance codes 0..29 base */

-        1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,

-        257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,

-        8193, 12289, 16385, 24577, 0, 0};

-    static const unsigned short dext[32] = { /* Distance codes 0..29 extra */

-        16, 16, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22,

-        23, 23, 24, 24, 25, 25, 26, 26, 27, 27,

-        28, 28, 29, 29, 64, 64};

-

-    /*

-       Process a set of code lengths to create a canonical Huffman code.  The

-       code lengths are lens[0..codes-1].  Each length corresponds to the

-       symbols 0..codes-1.  The Huffman code is generated by first sorting the

-       symbols by length from short to long, and retaining the symbol order

-       for codes with equal lengths.  Then the code starts with all zero bits

-       for the first code of the shortest length, and the codes are integer

-       increments for the same length, and zeros are appended as the length

-       increases.  For the deflate format, these bits are stored backwards

-       from their more natural integer increment ordering, and so when the

-       decoding tables are built in the large loop below, the integer codes

-       are incremented backwards.

-

-       This routine assumes, but does not check, that all of the entries in

-       lens[] are in the range 0..MAXBITS.  The caller must assure this.

-       1..MAXBITS is interpreted as that code length.  zero means that that

-       symbol does not occur in this code.

-

-       The codes are sorted by computing a count of codes for each length,

-       creating from that a table of starting indices for each length in the

-       sorted table, and then entering the symbols in order in the sorted

-       table.  The sorted table is work[], with that space being provided by

-       the caller.

-

-       The length counts are used for other purposes as well, i.e. finding

-       the minimum and maximum length codes, determining if there are any

-       codes at all, checking for a valid set of lengths, and looking ahead

-       at length counts to determine sub-table sizes when building the

-       decoding tables.

-     */

-

-    /* accumulate lengths for codes (assumes lens[] all in 0..MAXBITS) */

-    for (len = 0; len <= MAXBITS; len++)

-        count[len] = 0;

-    for (sym = 0; sym < codes; sym++)

-        count[lens[sym]]++;

-

-    /* bound code lengths, force root to be within code lengths */

-    root = *bits;

-    for (max = MAXBITS; max >= 1; max--)

-        if (count[max] != 0) break;

-    if (root > max) root = max;

-    if (max == 0) {                     /* no symbols to code at all */

-        this.op = (unsigned char)64;    /* invalid code marker */

-        this.bits = (unsigned char)1;

-        this.val = (unsigned short)0;

-        *(*table)++ = this;             /* make a table to force an error */

-        *(*table)++ = this;

-        *bits = 1;

-        return 0;     /* no symbols, but wait for decoding to report error */

-    }

-    for (min = 1; min <= MAXBITS; min++)

-        if (count[min] != 0) break;

-    if (root < min) root = min;

-

-    /* check for an over-subscribed or incomplete set of lengths */

-    left = 1;

-    for (len = 1; len <= MAXBITS; len++) {

-        left <<= 1;

-        left -= count[len];

-        if (left < 0) return -1;        /* over-subscribed */

-    }

-    if (left > 0 && (type == CODES || (codes - count[0] != 1)))

-        return -1;                      /* incomplete set */

-

-    /* generate offsets into symbol table for each length for sorting */

-    offs[1] = 0;

-    for (len = 1; len < MAXBITS; len++)

-        offs[len + 1] = offs[len] + count[len];

-

-    /* sort symbols by length, by symbol order within each length */

-    for (sym = 0; sym < codes; sym++)

-        if (lens[sym] != 0) work[offs[lens[sym]]++] = (unsigned short)sym;

-

-    /*

-       Create and fill in decoding tables.  In this loop, the table being

-       filled is at next and has curr index bits.  The code being used is huff

-       with length len.  That code is converted to an index by dropping drop

-       bits off of the bottom.  For codes where len is less than drop + curr,

-       those top drop + curr - len bits are incremented through all values to

-       fill the table with replicated entries.

-

-       root is the number of index bits for the root table.  When len exceeds

-       root, sub-tables are created pointed to by the root entry with an index

-       of the low root bits of huff.  This is saved in low to check for when a

-       new sub-table should be started.  drop is zero when the root table is

-       being filled, and drop is root when sub-tables are being filled.

-

-       When a new sub-table is needed, it is necessary to look ahead in the

-       code lengths to determine what size sub-table is needed.  The length

-       counts are used for this, and so count[] is decremented as codes are

-       entered in the tables.

-

-       used keeps track of how many table entries have been allocated from the

-       provided *table space.  It is checked when a LENS table is being made

-       against the space in *table, ENOUGH, minus the maximum space needed by

-       the worst case distance code, MAXD.  This should never happen, but the

-       sufficiency of ENOUGH has not been proven exhaustively, hence the check.

-       This assumes that when type == LENS, bits == 9.

-

-       sym increments through all symbols, and the loop terminates when

-       all codes of length max, i.e. all codes, have been processed.  This

-       routine permits incomplete codes, so another loop after this one fills

-       in the rest of the decoding tables with invalid code markers.

-     */

-

-    /* set up for code type */

-    switch (type) {

-    case CODES:

-        base = extra = work;    /* dummy value--not used */

-        end = 19;

-        break;

-    case LENS:

-        base = lbase;

-        base -= 257;

-        extra = lext;

-        extra -= 257;

-        end = 256;

-        break;

-    default:            /* DISTS */

-        base = dbase;

-        extra = dext;

-        end = -1;

-    }

-

-    /* initialize state for loop */

-    huff = 0;                   /* starting code */

-    sym = 0;                    /* starting code symbol */

-    len = min;                  /* starting code length */

-    next = *table;              /* current table to fill in */

-    curr = root;                /* current table index bits */

-    drop = 0;                   /* current bits to drop from code for index */

-    low = (unsigned)(-1);       /* trigger new sub-table when len > root */

-    used = 1U << root;          /* use root table entries */

-    mask = used - 1;            /* mask for comparing low */

-

-    /* check available table space */

-    if (type == LENS && used >= ENOUGH - MAXD)

-        return 1;

-

-    /* process all codes and make table entries */

-    for (;;) {

-        /* create table entry */

-        this.bits = (unsigned char)(len - drop);

-        if ((int)(work[sym]) < end) {

-            this.op = (unsigned char)0;

-            this.val = work[sym];

-        }

-        else if ((int)(work[sym]) > end) {

-            this.op = (unsigned char)(extra[work[sym]]);

-            this.val = base[work[sym]];

-        }

-        else {

-            this.op = (unsigned char)(32 + 64);         /* end of block */

-            this.val = 0;

-        }

-

-        /* replicate for those indices with low len bits equal to huff */

-        incr = 1U << (len - drop);

-        fill = 1U << curr;

-        do {

-            fill -= incr;

-            next[(huff >> drop) + fill] = this;

-        } while (fill != 0);

-

-        /* backwards increment the len-bit code huff */

-        incr = 1U << (len - 1);

-        while (huff & incr)

-            incr >>= 1;

-        if (incr != 0) {

-            huff &= incr - 1;

-            huff += incr;

-        }

-        else

-            huff = 0;

-

-        /* go to next symbol, update count, len */

-        sym++;

-        if (--(count[len]) == 0) {

-            if (len == max) break;

-            len = lens[work[sym]];

-        }

-

-        /* create new sub-table if needed */

-        if (len > root && (huff & mask) != low) {

-            /* if first time, transition to sub-tables */

-            if (drop == 0)

-                drop = root;

-

-            /* increment past last table */

-            next += 1U << curr;

-

-            /* determine length of next table */

-            curr = len - drop;

-            left = (int)(1 << curr);

-            while (curr + drop < max) {

-                left -= count[curr + drop];

-                if (left <= 0) break;

-                curr++;

-                left <<= 1;

-            }

-

-            /* check for enough space */

-            used += 1U << curr;

-            if (type == LENS && used >= ENOUGH - MAXD)

-                return 1;

-

-            /* point entry in root table to sub-table */

-            low = huff & mask;

-            (*table)[low].op = (unsigned char)curr;

-            (*table)[low].bits = (unsigned char)root;

-            (*table)[low].val = (unsigned short)(next - *table);

-        }

-    }

-

-    /*

-       Fill in rest of table for incomplete codes.  This loop is similar to the

-       loop above in incrementing huff for table indices.  It is assumed that

-       len is equal to curr + drop, so there is no loop needed to increment

-       through high index bits.  When the current sub-table is filled, the loop

-       drops back to the root table to fill in any remaining entries there.

-     */

-    this.op = (unsigned char)64;                /* invalid code marker */

-    this.bits = (unsigned char)(len - drop);

-    this.val = (unsigned short)0;

-    while (huff != 0) {

-        /* when done with sub-table, drop back to root table */

-        if (drop != 0 && (huff & mask) != low) {

-            drop = 0;

-            len = root;

-            next = *table;

-            this.bits = (unsigned char)len;

-        }

-

-        /* put invalid code marker in table */

-        next[huff >> drop] = this;

-

-        /* backwards increment the len-bit code huff */

-        incr = 1U << (len - 1);

-        while (huff & incr)

-            incr >>= 1;

-        if (incr != 0) {

-            huff &= incr - 1;

-            huff += incr;

-        }

-        else

-            huff = 0;

-    }

-

-    /* set return parameters */

-    *table += used;

-    *bits = root;

-    return 0;

-}

+/* inftrees.c -- generate Huffman trees for efficient decoding
+ * Copyright (C) 1995-2004 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include "zutil.h"
+#include "inftrees.h"
+
+#define MAXBITS 15
+
+const char inflate_copyright[] =
+   " inflate 1.2.2 Copyright 1995-2004 Mark Adler ";
+/*
+  If you use the zlib library in a product, an acknowledgment is welcome
+  in the documentation of your product. If for some reason you cannot
+  include such an acknowledgment, I would appreciate that you keep this
+  copyright string in the executable of your product.
+ */
+
+/*
+   Build a set of tables to decode the provided canonical Huffman code.
+   The code lengths are lens[0..codes-1].  The result starts at *table,
+   whose indices are 0..2^bits-1.  work is a writable array of at least
+   lens shorts, which is used as a work area.  type is the type of code
+   to be generated, CODES, LENS, or DISTS.  On return, zero is success,
+   -1 is an invalid code, and +1 means that ENOUGH isn't enough.  table
+   on return points to the next available entry's address.  bits is the
+   requested root table index bits, and on return it is the actual root
+   table index bits.  It will differ if the request is greater than the
+   longest code or if it is less than the shortest code.
+ */
+int inflate_table(type, lens, codes, table, bits, work)
+codetype type;
+unsigned short FAR *lens;
+unsigned codes;
+code FAR * FAR *table;
+unsigned FAR *bits;
+unsigned short FAR *work;
+{
+    unsigned len;               /* a code's length in bits */
+    unsigned sym;               /* index of code symbols */
+    unsigned min, max;          /* minimum and maximum code lengths */
+    unsigned root;              /* number of index bits for root table */
+    unsigned curr;              /* number of index bits for current table */
+    unsigned drop;              /* code bits to drop for sub-table */
+    int left;                   /* number of prefix codes available */
+    unsigned used;              /* code entries in table used */
+    unsigned huff;              /* Huffman code */
+    unsigned incr;              /* for incrementing code, index */
+    unsigned fill;              /* index for replicating entries */
+    unsigned low;               /* low bits for current root entry */
+    unsigned mask;              /* mask for low root bits */
+    code this;                  /* table entry for duplication */
+    code FAR *next;             /* next available space in table */
+    const unsigned short FAR *base;     /* base value table to use */
+    const unsigned short FAR *extra;    /* extra bits table to use */
+    int end;                    /* use base and extra for symbol > end */
+    unsigned short count[MAXBITS+1];    /* number of codes of each length */
+    unsigned short offs[MAXBITS+1];     /* offsets in table for each length */
+    static const unsigned short lbase[31] = { /* Length codes 257..285 base */
+        3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
+        35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
+    static const unsigned short lext[31] = { /* Length codes 257..285 extra */
+        16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
+        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 199, 198};
+    static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
+        1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
+        257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
+        8193, 12289, 16385, 24577, 0, 0};
+    static const unsigned short dext[32] = { /* Distance codes 0..29 extra */
+        16, 16, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22,
+        23, 23, 24, 24, 25, 25, 26, 26, 27, 27,
+        28, 28, 29, 29, 64, 64};
+
+    /*
+       Process a set of code lengths to create a canonical Huffman code.  The
+       code lengths are lens[0..codes-1].  Each length corresponds to the
+       symbols 0..codes-1.  The Huffman code is generated by first sorting the
+       symbols by length from short to long, and retaining the symbol order
+       for codes with equal lengths.  Then the code starts with all zero bits
+       for the first code of the shortest length, and the codes are integer
+       increments for the same length, and zeros are appended as the length
+       increases.  For the deflate format, these bits are stored backwards
+       from their more natural integer increment ordering, and so when the
+       decoding tables are built in the large loop below, the integer codes
+       are incremented backwards.
+
+       This routine assumes, but does not check, that all of the entries in
+       lens[] are in the range 0..MAXBITS.  The caller must assure this.
+       1..MAXBITS is interpreted as that code length.  zero means that that
+       symbol does not occur in this code.
+
+       The codes are sorted by computing a count of codes for each length,
+       creating from that a table of starting indices for each length in the
+       sorted table, and then entering the symbols in order in the sorted
+       table.  The sorted table is work[], with that space being provided by
+       the caller.
+
+       The length counts are used for other purposes as well, i.e. finding
+       the minimum and maximum length codes, determining if there are any
+       codes at all, checking for a valid set of lengths, and looking ahead
+       at length counts to determine sub-table sizes when building the
+       decoding tables.
+     */
+
+    /* accumulate lengths for codes (assumes lens[] all in 0..MAXBITS) */
+    for (len = 0; len <= MAXBITS; len++)
+        count[len] = 0;
+    for (sym = 0; sym < codes; sym++)
+        count[lens[sym]]++;
+
+    /* bound code lengths, force root to be within code lengths */
+    root = *bits;
+    for (max = MAXBITS; max >= 1; max--)
+        if (count[max] != 0) break;
+    if (root > max) root = max;
+    if (max == 0) {                     /* no symbols to code at all */
+        this.op = (unsigned char)64;    /* invalid code marker */
+        this.bits = (unsigned char)1;
+        this.val = (unsigned short)0;
+        *(*table)++ = this;             /* make a table to force an error */
+        *(*table)++ = this;
+        *bits = 1;
+        return 0;     /* no symbols, but wait for decoding to report error */
+    }
+    for (min = 1; min <= MAXBITS; min++)
+        if (count[min] != 0) break;
+    if (root < min) root = min;
+
+    /* check for an over-subscribed or incomplete set of lengths */
+    left = 1;
+    for (len = 1; len <= MAXBITS; len++) {
+        left <<= 1;
+        left -= count[len];
+        if (left < 0) return -1;        /* over-subscribed */
+    }
+    if (left > 0 && (type == CODES || (codes - count[0] != 1)))
+        return -1;                      /* incomplete set */
+
+    /* generate offsets into symbol table for each length for sorting */
+    offs[1] = 0;
+    for (len = 1; len < MAXBITS; len++)
+        offs[len + 1] = offs[len] + count[len];
+
+    /* sort symbols by length, by symbol order within each length */
+    for (sym = 0; sym < codes; sym++)
+        if (lens[sym] != 0) work[offs[lens[sym]]++] = (unsigned short)sym;
+
+    /*
+       Create and fill in decoding tables.  In this loop, the table being
+       filled is at next and has curr index bits.  The code being used is huff
+       with length len.  That code is converted to an index by dropping drop
+       bits off of the bottom.  For codes where len is less than drop + curr,
+       those top drop + curr - len bits are incremented through all values to
+       fill the table with replicated entries.
+
+       root is the number of index bits for the root table.  When len exceeds
+       root, sub-tables are created pointed to by the root entry with an index
+       of the low root bits of huff.  This is saved in low to check for when a
+       new sub-table should be started.  drop is zero when the root table is
+       being filled, and drop is root when sub-tables are being filled.
+
+       When a new sub-table is needed, it is necessary to look ahead in the
+       code lengths to determine what size sub-table is needed.  The length
+       counts are used for this, and so count[] is decremented as codes are
+       entered in the tables.
+
+       used keeps track of how many table entries have been allocated from the
+       provided *table space.  It is checked when a LENS table is being made
+       against the space in *table, ENOUGH, minus the maximum space needed by
+       the worst case distance code, MAXD.  This should never happen, but the
+       sufficiency of ENOUGH has not been proven exhaustively, hence the check.
+       This assumes that when type == LENS, bits == 9.
+
+       sym increments through all symbols, and the loop terminates when
+       all codes of length max, i.e. all codes, have been processed.  This
+       routine permits incomplete codes, so another loop after this one fills
+       in the rest of the decoding tables with invalid code markers.
+     */
+
+    /* set up for code type */
+    switch (type) {
+    case CODES:
+        base = extra = work;    /* dummy value--not used */
+        end = 19;
+        break;
+    case LENS:
+        base = lbase;
+        base -= 257;
+        extra = lext;
+        extra -= 257;
+        end = 256;
+        break;
+    default:            /* DISTS */
+        base = dbase;
+        extra = dext;
+        end = -1;
+    }
+
+    /* initialize state for loop */
+    huff = 0;                   /* starting code */
+    sym = 0;                    /* starting code symbol */
+    len = min;                  /* starting code length */
+    next = *table;              /* current table to fill in */
+    curr = root;                /* current table index bits */
+    drop = 0;                   /* current bits to drop from code for index */
+    low = (unsigned)(-1);       /* trigger new sub-table when len > root */
+    used = 1U << root;          /* use root table entries */
+    mask = used - 1;            /* mask for comparing low */
+
+    /* check available table space */
+    if (type == LENS && used >= ENOUGH - MAXD)
+        return 1;
+
+    /* process all codes and make table entries */
+    for (;;) {
+        /* create table entry */
+        this.bits = (unsigned char)(len - drop);
+        if ((int)(work[sym]) < end) {
+            this.op = (unsigned char)0;
+            this.val = work[sym];
+        }
+        else if ((int)(work[sym]) > end) {
+            this.op = (unsigned char)(extra[work[sym]]);
+            this.val = base[work[sym]];
+        }
+        else {
+            this.op = (unsigned char)(32 + 64);         /* end of block */
+            this.val = 0;
+        }
+
+        /* replicate for those indices with low len bits equal to huff */
+        incr = 1U << (len - drop);
+        fill = 1U << curr;
+        do {
+            fill -= incr;
+            next[(huff >> drop) + fill] = this;
+        } while (fill != 0);
+
+        /* backwards increment the len-bit code huff */
+        incr = 1U << (len - 1);
+        while (huff & incr)
+            incr >>= 1;
+        if (incr != 0) {
+            huff &= incr - 1;
+            huff += incr;
+        }
+        else
+            huff = 0;
+
+        /* go to next symbol, update count, len */
+        sym++;
+        if (--(count[len]) == 0) {
+            if (len == max) break;
+            len = lens[work[sym]];
+        }
+
+        /* create new sub-table if needed */
+        if (len > root && (huff & mask) != low) {
+            /* if first time, transition to sub-tables */
+            if (drop == 0)
+                drop = root;
+
+            /* increment past last table */
+            next += 1U << curr;
+
+            /* determine length of next table */
+            curr = len - drop;
+            left = (int)(1 << curr);
+            while (curr + drop < max) {
+                left -= count[curr + drop];
+                if (left <= 0) break;
+                curr++;
+                left <<= 1;
+            }
+
+            /* check for enough space */
+            used += 1U << curr;
+            if (type == LENS && used >= ENOUGH - MAXD)
+                return 1;
+
+            /* point entry in root table to sub-table */
+            low = huff & mask;
+            (*table)[low].op = (unsigned char)curr;
+            (*table)[low].bits = (unsigned char)root;
+            (*table)[low].val = (unsigned short)(next - *table);
+        }
+    }
+
+    /*
+       Fill in rest of table for incomplete codes.  This loop is similar to the
+       loop above in incrementing huff for table indices.  It is assumed that
+       len is equal to curr + drop, so there is no loop needed to increment
+       through high index bits.  When the current sub-table is filled, the loop
+       drops back to the root table to fill in any remaining entries there.
+     */
+    this.op = (unsigned char)64;                /* invalid code marker */
+    this.bits = (unsigned char)(len - drop);
+    this.val = (unsigned short)0;
+    while (huff != 0) {
+        /* when done with sub-table, drop back to root table */
+        if (drop != 0 && (huff & mask) != low) {
+            drop = 0;
+            len = root;
+            next = *table;
+            this.bits = (unsigned char)len;
+        }
+
+        /* put invalid code marker in table */
+        next[huff >> drop] = this;
+
+        /* backwards increment the len-bit code huff */
+        incr = 1U << (len - 1);
+        while (huff & incr)
+            incr >>= 1;
+        if (incr != 0) {
+            huff &= incr - 1;
+            huff += incr;
+        }
+        else
+            huff = 0;
+    }
+
+    /* set return parameters */
+    *table += used;
+    *bits = root;
+    return 0;
+}
diff --git a/src/zlib/inftrees.h b/src/zlib/inftrees.h
index 1dbfe53a6..82d365a7e 100644
--- a/src/zlib/inftrees.h
+++ b/src/zlib/inftrees.h
@@ -1,55 +1,55 @@
-/* inftrees.h -- header to use inftrees.c

- * Copyright (C) 1995-2003 Mark Adler

- * For conditions of distribution and use, see copyright notice in zlib.h

- */

-

-/* WARNING: this file should *not* be used by applications. It is

-   part of the implementation of the compression library and is

-   subject to change. Applications should only use zlib.h.

- */

-

-/* Structure for decoding tables.  Each entry provides either the

-   information needed to do the operation requested by the code that

-   indexed that table entry, or it provides a pointer to another

-   table that indexes more bits of the code.  op indicates whether

-   the entry is a pointer to another table, a literal, a length or

-   distance, an end-of-block, or an invalid code.  For a table

-   pointer, the low four bits of op is the number of index bits of

-   that table.  For a length or distance, the low four bits of op

-   is the number of extra bits to get after the code.  bits is

-   the number of bits in this code or part of the code to drop off

-   of the bit buffer.  val is the actual byte to output in the case

-   of a literal, the base length or distance, or the offset from

-   the current table to the next table.  Each entry is four bytes. */

-typedef struct {

-    unsigned char op;           /* operation, extra bits, table bits */

-    unsigned char bits;         /* bits in this part of the code */

-    unsigned short val;         /* offset in table or code value */

-} code;

-

-/* op values as set by inflate_table():

-    00000000 - literal

-    0000tttt - table link, tttt != 0 is the number of table index bits

-    0001eeee - length or distance, eeee is the number of extra bits

-    01100000 - end of block

-    01000000 - invalid code

- */

-

-/* Maximum size of dynamic tree.  The maximum found in a long but non-

-   exhaustive search was 1004 code structures (850 for length/literals

-   and 154 for distances, the latter actually the result of an

-   exhaustive search).  The true maximum is not known, but the value

-   below is more than safe. */

-#define ENOUGH 1440

-#define MAXD 154

-

-/* Type of code to build for inftable() */

-typedef enum {

-    CODES,

-    LENS,

-    DISTS

-} codetype;

-

-extern int inflate_table OF((codetype type, unsigned short FAR *lens,

-                             unsigned codes, code FAR * FAR *table,

-                             unsigned FAR *bits, unsigned short FAR *work));

+/* inftrees.h -- header to use inftrees.c
+ * Copyright (C) 1995-2003 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+   part of the implementation of the compression library and is
+   subject to change. Applications should only use zlib.h.
+ */
+
+/* Structure for decoding tables.  Each entry provides either the
+   information needed to do the operation requested by the code that
+   indexed that table entry, or it provides a pointer to another
+   table that indexes more bits of the code.  op indicates whether
+   the entry is a pointer to another table, a literal, a length or
+   distance, an end-of-block, or an invalid code.  For a table
+   pointer, the low four bits of op is the number of index bits of
+   that table.  For a length or distance, the low four bits of op
+   is the number of extra bits to get after the code.  bits is
+   the number of bits in this code or part of the code to drop off
+   of the bit buffer.  val is the actual byte to output in the case
+   of a literal, the base length or distance, or the offset from
+   the current table to the next table.  Each entry is four bytes. */
+typedef struct {
+    unsigned char op;           /* operation, extra bits, table bits */
+    unsigned char bits;         /* bits in this part of the code */
+    unsigned short val;         /* offset in table or code value */
+} code;
+
+/* op values as set by inflate_table():
+    00000000 - literal
+    0000tttt - table link, tttt != 0 is the number of table index bits
+    0001eeee - length or distance, eeee is the number of extra bits
+    01100000 - end of block
+    01000000 - invalid code
+ */
+
+/* Maximum size of dynamic tree.  The maximum found in a long but non-
+   exhaustive search was 1004 code structures (850 for length/literals
+   and 154 for distances, the latter actually the result of an
+   exhaustive search).  The true maximum is not known, but the value
+   below is more than safe. */
+#define ENOUGH 1440
+#define MAXD 154
+
+/* Type of code to build for inftable() */
+typedef enum {
+    CODES,
+    LENS,
+    DISTS
+} codetype;
+
+extern int inflate_table OF((codetype type, unsigned short FAR *lens,
+                             unsigned codes, code FAR * FAR *table,
+                             unsigned FAR *bits, unsigned short FAR *work));
diff --git a/src/zlib/trees.c b/src/zlib/trees.c
index 26f3cf161..52c820fa2 100644
--- a/src/zlib/trees.c
+++ b/src/zlib/trees.c
@@ -1,1215 +1,1215 @@
-/* trees.c -- output deflated data using Huffman coding

- * Copyright (C) 1995-2003 Jean-loup Gailly

- * For conditions of distribution and use, see copyright notice in zlib.h

- */

-

-/*

- *  ALGORITHM

- *

- *      The "deflation" process uses several Huffman trees. The more

- *      common source values are represented by shorter bit sequences.

- *

- *      Each code tree is stored in a compressed form which is itself

- * a Huffman encoding of the lengths of all the code strings (in

- * ascending order by source values).  The actual code strings are

- * reconstructed from the lengths in the inflate process, as described

- * in the deflate specification.

- *

- *  REFERENCES

- *

- *      Deutsch, L.P.,"'Deflate' Compressed Data Format Specification".

- *      Available in ftp.uu.net:/pub/archiving/zip/doc/deflate-1.1.doc

- *

- *      Storer, James A.

- *          Data Compression:  Methods and Theory, pp. 49-50.

- *          Computer Science Press, 1988.  ISBN 0-7167-8156-5.

- *

- *      Sedgewick, R.

- *          Algorithms, p290.

- *          Addison-Wesley, 1983. ISBN 0-201-06672-6.

- */

-

-/* @(#) $Id$ */

-

-/* #define GEN_TREES_H */

-

-#include "deflate.h"

-

-#ifdef DEBUG

-#  include <ctype.h>

-#endif

-

-/* ===========================================================================

- * Constants

- */

-

-#define MAX_BL_BITS 7

-/* Bit length codes must not exceed MAX_BL_BITS bits */

-

-#define END_BLOCK 256

-/* end of block literal code */

-

-#define REP_3_6      16

-/* repeat previous bit length 3-6 times (2 bits of repeat count) */

-

-#define REPZ_3_10    17

-/* repeat a zero length 3-10 times  (3 bits of repeat count) */

-

-#define REPZ_11_138  18

-/* repeat a zero length 11-138 times  (7 bits of repeat count) */

-

-local const int extra_lbits[LENGTH_CODES] /* extra bits for each length code */

-   = {0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0};

-

-local const int extra_dbits[D_CODES] /* extra bits for each distance code */

-   = {0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13};

-

-local const int extra_blbits[BL_CODES]/* extra bits for each bit length code */

-   = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,7};

-

-local const uch bl_order[BL_CODES]

-   = {16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15};

-/* The lengths of the bit length codes are sent in order of decreasing

- * probability, to avoid transmitting the lengths for unused bit length codes.

- */

-

-#define Buf_size (8 * 2*sizeof(char))

-/* Number of bits used within bi_buf. (bi_buf might be implemented on

- * more than 16 bits on some systems.)

- */

-

-/* ===========================================================================

- * Local data. These are initialized only once.

- */

-

-#define DIST_CODE_LEN  512 /* see definition of array dist_code below */

-

-#if defined(GEN_TREES_H) || !defined(STDC)

-/* non ANSI compilers may not accept trees.h */

-

-local ct_data static_ltree[L_CODES+2];

-/* The static literal tree. Since the bit lengths are imposed, there is no

- * need for the L_CODES extra codes used during heap construction. However

- * The codes 286 and 287 are needed to build a canonical tree (see _tr_init

- * below).

- */

-

-local ct_data static_dtree[D_CODES];

-/* The static distance tree. (Actually a trivial tree since all codes use

- * 5 bits.)

- */

-

-uch _dist_code[DIST_CODE_LEN];

-/* Distance codes. The first 256 values correspond to the distances

- * 3 .. 258, the last 256 values correspond to the top 8 bits of

- * the 15 bit distances.

- */

-

-uch _length_code[MAX_MATCH-MIN_MATCH+1];

-/* length code for each normalized match length (0 == MIN_MATCH) */

-

-local int base_length[LENGTH_CODES];

-/* First normalized length for each code (0 = MIN_MATCH) */

-

-local int base_dist[D_CODES];

-/* First normalized distance for each code (0 = distance of 1) */

-

-#else

-#  include "trees.h"

-#endif /* GEN_TREES_H */

-

-struct static_tree_desc_s {

-    const ct_data *static_tree;  /* static tree or NULL */

-    const intf *extra_bits;      /* extra bits for each code or NULL */

-    int     extra_base;          /* base index for extra_bits */

-    int     elems;               /* max number of elements in the tree */

-    int     max_length;          /* max bit length for the codes */

-};

-

-local static_tree_desc  static_l_desc =

-{static_ltree, extra_lbits, LITERALS+1, L_CODES, MAX_BITS};

-

-local static_tree_desc  static_d_desc =

-{static_dtree, extra_dbits, 0,          D_CODES, MAX_BITS};

-

-local static_tree_desc  static_bl_desc =

-{(const ct_data *)0, extra_blbits, 0,   BL_CODES, MAX_BL_BITS};

-

-/* ===========================================================================

- * Local (static) routines in this file.

- */

-

-local void tr_static_init OF((void));

-local void init_block     OF((deflate_state *s));

-local void pqdownheap     OF((deflate_state *s, ct_data *tree, int k));

-local void gen_bitlen     OF((deflate_state *s, tree_desc *desc));

-local void gen_codes      OF((ct_data *tree, int max_code, ushf *bl_count));

-local void build_tree     OF((deflate_state *s, tree_desc *desc));

-local void scan_tree      OF((deflate_state *s, ct_data *tree, int max_code));

-local void send_tree      OF((deflate_state *s, ct_data *tree, int max_code));

-local int  build_bl_tree  OF((deflate_state *s));

-local void send_all_trees OF((deflate_state *s, int lcodes, int dcodes,

-                              int blcodes));

-local void compress_block OF((deflate_state *s, ct_data *ltree,

-                              ct_data *dtree));

-local void set_data_type  OF((deflate_state *s));

-local unsigned bi_reverse OF((unsigned value, int length));

-local void bi_windup      OF((deflate_state *s));

-local void bi_flush       OF((deflate_state *s));

-local void copy_block     OF((deflate_state *s, charf *buf, unsigned len,

-                              int header));

-

-#ifdef GEN_TREES_H

-local void gen_trees_header OF((void));

-#endif

-

-#ifndef DEBUG

-#  define send_code(s, c, tree) send_bits(s, tree[c].Code, tree[c].Len)

-   /* Send a code of the given tree. c and tree must not have side effects */

-

-#else /* DEBUG */

-#  define send_code(s, c, tree) \

-     { if (z_verbose>2) fprintf(stderr,"\ncd %3d ",(c)); \

-       send_bits(s, tree[c].Code, tree[c].Len); }

-#endif

-

-/* ===========================================================================

- * Output a short LSB first on the stream.

- * IN assertion: there is enough room in pendingBuf.

- */

-#define put_short(s, w) { \

-    put_byte(s, (uch)((w) & 0xff)); \

-    put_byte(s, (uch)((ush)(w) >> 8)); \

-}

-

-/* ===========================================================================

- * Send a value on a given number of bits.

- * IN assertion: length <= 16 and value fits in length bits.

- */

-#ifdef DEBUG

-local void send_bits      OF((deflate_state *s, int value, int length));

-

-local void send_bits(s, value, length)

-    deflate_state *s;

-    int value;  /* value to send */

-    int length; /* number of bits */

-{

-    Tracevv((stderr," l %2d v %4x ", length, value));

-    Assert(length > 0 && length <= 15, "invalid length");

-    s->bits_sent += (ulg)length;

-

-    /* If not enough room in bi_buf, use (valid) bits from bi_buf and

-     * (16 - bi_valid) bits from value, leaving (width - (16-bi_valid))

-     * unused bits in value.

-     */

-    if (s->bi_valid > (int)Buf_size - length) {

-        s->bi_buf |= (value << s->bi_valid);

-        put_short(s, s->bi_buf);

-        s->bi_buf = (ush)value >> (Buf_size - s->bi_valid);

-        s->bi_valid += length - Buf_size;

-    } else {

-        s->bi_buf |= value << s->bi_valid;

-        s->bi_valid += length;

-    }

-}

-#else /* !DEBUG */

-

-#define send_bits(s, value, length) \

-{ int len = length;\

-  if (s->bi_valid > (int)Buf_size - len) {\

-    int val = value;\

-    s->bi_buf |= (val << s->bi_valid);\

-    put_short(s, s->bi_buf);\

-    s->bi_buf = (ush)val >> (Buf_size - s->bi_valid);\

-    s->bi_valid += len - Buf_size;\

-  } else {\

-    s->bi_buf |= (value) << s->bi_valid;\

-    s->bi_valid += len;\

-  }\

-}

-#endif /* DEBUG */

-

-

-/* the arguments must not have side effects */

-

-/* ===========================================================================

- * Initialize the various 'constant' tables.

- */

-local void tr_static_init()

-{

-#if defined(GEN_TREES_H) || !defined(STDC)

-    static int static_init_done = 0;

-    int n;        /* iterates over tree elements */

-    int bits;     /* bit counter */

-    int length;   /* length value */

-    int code;     /* code value */

-    int dist;     /* distance index */

-    ush bl_count[MAX_BITS+1];

-    /* number of codes at each bit length for an optimal tree */

-

-    if (static_init_done) return;

-

-    /* For some embedded targets, global variables are not initialized: */

-    static_l_desc.static_tree = static_ltree;

-    static_l_desc.extra_bits = extra_lbits;

-    static_d_desc.static_tree = static_dtree;

-    static_d_desc.extra_bits = extra_dbits;

-    static_bl_desc.extra_bits = extra_blbits;

-

-    /* Initialize the mapping length (0..255) -> length code (0..28) */

-    length = 0;

-    for (code = 0; code < LENGTH_CODES-1; code++) {

-        base_length[code] = length;

-        for (n = 0; n < (1<<extra_lbits[code]); n++) {

-            _length_code[length++] = (uch)code;

-        }

-    }

-    Assert (length == 256, "tr_static_init: length != 256");

-    /* Note that the length 255 (match length 258) can be represented

-     * in two different ways: code 284 + 5 bits or code 285, so we

-     * overwrite length_code[255] to use the best encoding:

-     */

-    _length_code[length-1] = (uch)code;

-

-    /* Initialize the mapping dist (0..32K) -> dist code (0..29) */

-    dist = 0;

-    for (code = 0 ; code < 16; code++) {

-        base_dist[code] = dist;

-        for (n = 0; n < (1<<extra_dbits[code]); n++) {

-            _dist_code[dist++] = (uch)code;

-        }

-    }

-    Assert (dist == 256, "tr_static_init: dist != 256");

-    dist >>= 7; /* from now on, all distances are divided by 128 */

-    for ( ; code < D_CODES; code++) {

-        base_dist[code] = dist << 7;

-        for (n = 0; n < (1<<(extra_dbits[code]-7)); n++) {

-            _dist_code[256 + dist++] = (uch)code;

-        }

-    }

-    Assert (dist == 256, "tr_static_init: 256+dist != 512");

-

-    /* Construct the codes of the static literal tree */

-    for (bits = 0; bits <= MAX_BITS; bits++) bl_count[bits] = 0;

-    n = 0;

-    while (n <= 143) static_ltree[n++].Len = 8, bl_count[8]++;

-    while (n <= 255) static_ltree[n++].Len = 9, bl_count[9]++;

-    while (n <= 279) static_ltree[n++].Len = 7, bl_count[7]++;

-    while (n <= 287) static_ltree[n++].Len = 8, bl_count[8]++;

-    /* Codes 286 and 287 do not exist, but we must include them in the

-     * tree construction to get a canonical Huffman tree (longest code

-     * all ones)

-     */

-    gen_codes((ct_data *)static_ltree, L_CODES+1, bl_count);

-

-    /* The static distance tree is trivial: */

-    for (n = 0; n < D_CODES; n++) {

-        static_dtree[n].Len = 5;

-        static_dtree[n].Code = bi_reverse((unsigned)n, 5);

-    }

-    static_init_done = 1;

-

-#  ifdef GEN_TREES_H

-    gen_trees_header();

-#  endif

-#endif /* defined(GEN_TREES_H) || !defined(STDC) */

-}

-

-/* ===========================================================================

- * Genererate the file trees.h describing the static trees.

- */

-#ifdef GEN_TREES_H

-#  ifndef DEBUG

-#    include <stdio.h>

-#  endif

-

-#  define SEPARATOR(i, last, width) \

-      ((i) == (last)? "\n};\n\n" :    \

-       ((i) % (width) == (width)-1 ? ",\n" : ", "))

-

-void gen_trees_header()

-{

-    FILE *header = fopen("trees.h", "w");

-    int i;

-

-    Assert (header != NULL, "Can't open trees.h");

-    fprintf(header,

-            "/* header created automatically with -DGEN_TREES_H */\n\n");

-

-    fprintf(header, "local const ct_data static_ltree[L_CODES+2] = {\n");

-    for (i = 0; i < L_CODES+2; i++) {

-        fprintf(header, "{{%3u},{%3u}}%s", static_ltree[i].Code,

-                static_ltree[i].Len, SEPARATOR(i, L_CODES+1, 5));

-    }

-

-    fprintf(header, "local const ct_data static_dtree[D_CODES] = {\n");

-    for (i = 0; i < D_CODES; i++) {

-        fprintf(header, "{{%2u},{%2u}}%s", static_dtree[i].Code,

-                static_dtree[i].Len, SEPARATOR(i, D_CODES-1, 5));

-    }

-

-    fprintf(header, "const uch _dist_code[DIST_CODE_LEN] = {\n");

-    for (i = 0; i < DIST_CODE_LEN; i++) {

-        fprintf(header, "%2u%s", _dist_code[i],

-                SEPARATOR(i, DIST_CODE_LEN-1, 20));

-    }

-

-    fprintf(header, "const uch _length_code[MAX_MATCH-MIN_MATCH+1]= {\n");

-    for (i = 0; i < MAX_MATCH-MIN_MATCH+1; i++) {

-        fprintf(header, "%2u%s", _length_code[i],

-                SEPARATOR(i, MAX_MATCH-MIN_MATCH, 20));

-    }

-

-    fprintf(header, "local const int base_length[LENGTH_CODES] = {\n");

-    for (i = 0; i < LENGTH_CODES; i++) {

-        fprintf(header, "%1u%s", base_length[i],

-                SEPARATOR(i, LENGTH_CODES-1, 20));

-    }

-

-    fprintf(header, "local const int base_dist[D_CODES] = {\n");

-    for (i = 0; i < D_CODES; i++) {

-        fprintf(header, "%5u%s", base_dist[i],

-                SEPARATOR(i, D_CODES-1, 10));

-    }

-

-    fclose(header);

-}

-#endif /* GEN_TREES_H */

-

-/* ===========================================================================

- * Initialize the tree data structures for a new zlib stream.

- */

-void _tr_init(s)

-    deflate_state *s;

-{

-    tr_static_init();

-

-    s->l_desc.dyn_tree = s->dyn_ltree;

-    s->l_desc.stat_desc = &static_l_desc;

-

-    s->d_desc.dyn_tree = s->dyn_dtree;

-    s->d_desc.stat_desc = &static_d_desc;

-

-    s->bl_desc.dyn_tree = s->bl_tree;

-    s->bl_desc.stat_desc = &static_bl_desc;

-

-    s->bi_buf = 0;

-    s->bi_valid = 0;

-    s->last_eob_len = 8; /* enough lookahead for inflate */

-#ifdef DEBUG

-    s->compressed_len = 0L;

-    s->bits_sent = 0L;

-#endif

-

-    /* Initialize the first block of the first file: */

-    init_block(s);

-}

-

-/* ===========================================================================

- * Initialize a new block.

- */

-local void init_block(s)

-    deflate_state *s;

-{

-    int n; /* iterates over tree elements */

-

-    /* Initialize the trees. */

-    for (n = 0; n < L_CODES;  n++) s->dyn_ltree[n].Freq = 0;

-    for (n = 0; n < D_CODES;  n++) s->dyn_dtree[n].Freq = 0;

-    for (n = 0; n < BL_CODES; n++) s->bl_tree[n].Freq = 0;

-

-    s->dyn_ltree[END_BLOCK].Freq = 1;

-    s->opt_len = s->static_len = 0L;

-    s->last_lit = s->matches = 0;

-}

-

-#define SMALLEST 1

-/* Index within the heap array of least frequent node in the Huffman tree */

-

-

-/* ===========================================================================

- * Remove the smallest element from the heap and recreate the heap with

- * one less element. Updates heap and heap_len.

- */

-#define pqremove(s, tree, top) \

-{\

-    top = s->heap[SMALLEST]; \

-    s->heap[SMALLEST] = s->heap[s->heap_len--]; \

-    pqdownheap(s, tree, SMALLEST); \

-}

-

-/* ===========================================================================

- * Compares to subtrees, using the tree depth as tie breaker when

- * the subtrees have equal frequency. This minimizes the worst case length.

- */

-#define smaller(tree, n, m, depth) \

-   (tree[n].Freq < tree[m].Freq || \

-   (tree[n].Freq == tree[m].Freq && depth[n] <= depth[m]))

-

-/* ===========================================================================

- * Restore the heap property by moving down the tree starting at node k,

- * exchanging a node with the smallest of its two sons if necessary, stopping

- * when the heap property is re-established (each father smaller than its

- * two sons).

- */

-local void pqdownheap(s, tree, k)

-    deflate_state *s;

-    ct_data *tree;  /* the tree to restore */

-    int k;               /* node to move down */

-{

-    int v = s->heap[k];

-    int j = k << 1;  /* left son of k */

-    while (j <= s->heap_len) {

-        /* Set j to the smallest of the two sons: */

-        if (j < s->heap_len &&

-            smaller(tree, s->heap[j+1], s->heap[j], s->depth)) {

-            j++;

-        }

-        /* Exit if v is smaller than both sons */

-        if (smaller(tree, v, s->heap[j], s->depth)) break;

-

-        /* Exchange v with the smallest son */

-        s->heap[k] = s->heap[j];  k = j;

-

-        /* And continue down the tree, setting j to the left son of k */

-        j <<= 1;

-    }

-    s->heap[k] = v;

-}

-

-/* ===========================================================================

- * Compute the optimal bit lengths for a tree and update the total bit length

- * for the current block.

- * IN assertion: the fields freq and dad are set, heap[heap_max] and

- *    above are the tree nodes sorted by increasing frequency.

- * OUT assertions: the field len is set to the optimal bit length, the

- *     array bl_count contains the frequencies for each bit length.

- *     The length opt_len is updated; static_len is also updated if stree is

- *     not null.

- */

-local void gen_bitlen(s, desc)

-    deflate_state *s;

-    tree_desc *desc;    /* the tree descriptor */

-{

-    ct_data *tree        = desc->dyn_tree;

-    int max_code         = desc->max_code;

-    const ct_data *stree = desc->stat_desc->static_tree;

-    const intf *extra    = desc->stat_desc->extra_bits;

-    int base             = desc->stat_desc->extra_base;

-    int max_length       = desc->stat_desc->max_length;

-    int h;              /* heap index */

-    int n, m;           /* iterate over the tree elements */

-    int bits;           /* bit length */

-    int xbits;          /* extra bits */

-    ush f;              /* frequency */

-    int overflow = 0;   /* number of elements with bit length too large */

-

-    for (bits = 0; bits <= MAX_BITS; bits++) s->bl_count[bits] = 0;

-

-    /* In a first pass, compute the optimal bit lengths (which may

-     * overflow in the case of the bit length tree).

-     */

-    tree[s->heap[s->heap_max]].Len = 0; /* root of the heap */

-

-    for (h = s->heap_max+1; h < HEAP_SIZE; h++) {

-        n = s->heap[h];

-        bits = tree[tree[n].Dad].Len + 1;

-        if (bits > max_length) bits = max_length, overflow++;

-        tree[n].Len = (ush)bits;

-        /* We overwrite tree[n].Dad which is no longer needed */

-

-        if (n > max_code) continue; /* not a leaf node */

-

-        s->bl_count[bits]++;

-        xbits = 0;

-        if (n >= base) xbits = extra[n-base];

-        f = tree[n].Freq;

-        s->opt_len += (ulg)f * (bits + xbits);

-        if (stree) s->static_len += (ulg)f * (stree[n].Len + xbits);

-    }

-    if (overflow == 0) return;

-

-    Trace((stderr,"\nbit length overflow\n"));

-    /* This happens for example on obj2 and pic of the Calgary corpus */

-

-    /* Find the first bit length which could increase: */

-    do {

-        bits = max_length-1;

-        while (s->bl_count[bits] == 0) bits--;

-        s->bl_count[bits]--;      /* move one leaf down the tree */

-        s->bl_count[bits+1] += 2; /* move one overflow item as its brother */

-        s->bl_count[max_length]--;

-        /* The brother of the overflow item also moves one step up,

-         * but this does not affect bl_count[max_length]

-         */

-        overflow -= 2;

-    } while (overflow > 0);

-

-    /* Now recompute all bit lengths, scanning in increasing frequency.

-     * h is still equal to HEAP_SIZE. (It is simpler to reconstruct all

-     * lengths instead of fixing only the wrong ones. This idea is taken

-     * from 'ar' written by Haruhiko Okumura.)

-     */

-    for (bits = max_length; bits != 0; bits--) {

-        n = s->bl_count[bits];

-        while (n != 0) {

-            m = s->heap[--h];

-            if (m > max_code) continue;

-            if (tree[m].Len != (unsigned) bits) {

-                Trace((stderr,"code %d bits %d->%d\n", m, tree[m].Len, bits));

-                s->opt_len += ((long)bits - (long)tree[m].Len)

-                              *(long)tree[m].Freq;

-                tree[m].Len = (ush)bits;

-            }

-            n--;

-        }

-    }

-}

-

-/* ===========================================================================

- * Generate the codes for a given tree and bit counts (which need not be

- * optimal).

- * IN assertion: the array bl_count contains the bit length statistics for

- * the given tree and the field len is set for all tree elements.

- * OUT assertion: the field code is set for all tree elements of non

- *     zero code length.

- */

-local void gen_codes (tree, max_code, bl_count)

-    ct_data *tree;             /* the tree to decorate */

-    int max_code;              /* largest code with non zero frequency */

-    ushf *bl_count;            /* number of codes at each bit length */

-{

-    ush next_code[MAX_BITS+1]; /* next code value for each bit length */

-    ush code = 0;              /* running code value */

-    int bits;                  /* bit index */

-    int n;                     /* code index */

-

-    /* The distribution counts are first used to generate the code values

-     * without bit reversal.

-     */

-    for (bits = 1; bits <= MAX_BITS; bits++) {

-        next_code[bits] = code = (code + bl_count[bits-1]) << 1;

-    }

-    /* Check that the bit counts in bl_count are consistent. The last code

-     * must be all ones.

-     */

-    Assert (code + bl_count[MAX_BITS]-1 == (1<<MAX_BITS)-1,

-            "inconsistent bit counts");

-    Tracev((stderr,"\ngen_codes: max_code %d ", max_code));

-

-    for (n = 0;  n <= max_code; n++) {

-        int len = tree[n].Len;

-        if (len == 0) continue;

-        /* Now reverse the bits */

-        tree[n].Code = bi_reverse(next_code[len]++, len);

-

-        Tracecv(tree != static_ltree, (stderr,"\nn %3d %c l %2d c %4x (%x) ",

-             n, (isgraph(n) ? n : ' '), len, tree[n].Code, next_code[len]-1));

-    }

-}

-

-/* ===========================================================================

- * Construct one Huffman tree and assigns the code bit strings and lengths.

- * Update the total bit length for the current block.

- * IN assertion: the field freq is set for all tree elements.

- * OUT assertions: the fields len and code are set to the optimal bit length

- *     and corresponding code. The length opt_len is updated; static_len is

- *     also updated if stree is not null. The field max_code is set.

- */

-local void build_tree(s, desc)

-    deflate_state *s;

-    tree_desc *desc; /* the tree descriptor */

-{

-    ct_data *tree         = desc->dyn_tree;

-    const ct_data *stree  = desc->stat_desc->static_tree;

-    int elems             = desc->stat_desc->elems;

-    int n, m;          /* iterate over heap elements */

-    int max_code = -1; /* largest code with non zero frequency */

-    int node;          /* new node being created */

-

-    /* Construct the initial heap, with least frequent element in

-     * heap[SMALLEST]. The sons of heap[n] are heap[2*n] and heap[2*n+1].

-     * heap[0] is not used.

-     */

-    s->heap_len = 0, s->heap_max = HEAP_SIZE;

-

-    for (n = 0; n < elems; n++) {

-        if (tree[n].Freq != 0) {

-            s->heap[++(s->heap_len)] = max_code = n;

-            s->depth[n] = 0;

-        } else {

-            tree[n].Len = 0;

-        }

-    }

-

-    /* The pkzip format requires that at least one distance code exists,

-     * and that at least one bit should be sent even if there is only one

-     * possible code. So to avoid special checks later on we force at least

-     * two codes of non zero frequency.

-     */

-    while (s->heap_len < 2) {

-        node = s->heap[++(s->heap_len)] = (max_code < 2 ? ++max_code : 0);

-        tree[node].Freq = 1;

-        s->depth[node] = 0;

-        s->opt_len--; if (stree) s->static_len -= stree[node].Len;

-        /* node is 0 or 1 so it does not have extra bits */

-    }

-    desc->max_code = max_code;

-

-    /* The elements heap[heap_len/2+1 .. heap_len] are leaves of the tree,

-     * establish sub-heaps of increasing lengths:

-     */

-    for (n = s->heap_len/2; n >= 1; n--) pqdownheap(s, tree, n);

-

-    /* Construct the Huffman tree by repeatedly combining the least two

-     * frequent nodes.

-     */

-    node = elems;              /* next internal node of the tree */

-    do {

-        pqremove(s, tree, n);  /* n = node of least frequency */

-        m = s->heap[SMALLEST]; /* m = node of next least frequency */

-

-        s->heap[--(s->heap_max)] = n; /* keep the nodes sorted by frequency */

-        s->heap[--(s->heap_max)] = m;

-

-        /* Create a new node father of n and m */

-        tree[node].Freq = tree[n].Freq + tree[m].Freq;

-        s->depth[node] = (uch)((s->depth[n] >= s->depth[m] ?

-                                s->depth[n] : s->depth[m]) + 1);

-        tree[n].Dad = tree[m].Dad = (ush)node;

-#ifdef DUMP_BL_TREE

-        if (tree == s->bl_tree) {

-            fprintf(stderr,"\nnode %d(%d), sons %d(%d) %d(%d)",

-                    node, tree[node].Freq, n, tree[n].Freq, m, tree[m].Freq);

-        }

-#endif

-        /* and insert the new node in the heap */

-        s->heap[SMALLEST] = node++;

-        pqdownheap(s, tree, SMALLEST);

-

-    } while (s->heap_len >= 2);

-

-    s->heap[--(s->heap_max)] = s->heap[SMALLEST];

-

-    /* At this point, the fields freq and dad are set. We can now

-     * generate the bit lengths.

-     */

-    gen_bitlen(s, (tree_desc *)desc);

-

-    /* The field len is now set, we can generate the bit codes */

-    gen_codes ((ct_data *)tree, max_code, s->bl_count);

-}

-

-/* ===========================================================================

- * Scan a literal or distance tree to determine the frequencies of the codes

- * in the bit length tree.

- */

-local void scan_tree (s, tree, max_code)

-    deflate_state *s;

-    ct_data *tree;   /* the tree to be scanned */

-    int max_code;    /* and its largest code of non zero frequency */

-{

-    int n;                     /* iterates over all tree elements */

-    int prevlen = -1;          /* last emitted length */

-    int curlen;                /* length of current code */

-    int nextlen = tree[0].Len; /* length of next code */

-    int count = 0;             /* repeat count of the current code */

-    int max_count = 7;         /* max repeat count */

-    int min_count = 4;         /* min repeat count */

-

-    if (nextlen == 0) max_count = 138, min_count = 3;

-    tree[max_code+1].Len = (ush)0xffff; /* guard */

-

-    for (n = 0; n <= max_code; n++) {

-        curlen = nextlen; nextlen = tree[n+1].Len;

-        if (++count < max_count && curlen == nextlen) {

-            continue;

-        } else if (count < min_count) {

-            s->bl_tree[curlen].Freq += count;

-        } else if (curlen != 0) {

-            if (curlen != prevlen) s->bl_tree[curlen].Freq++;

-            s->bl_tree[REP_3_6].Freq++;

-        } else if (count <= 10) {

-            s->bl_tree[REPZ_3_10].Freq++;

-        } else {

-            s->bl_tree[REPZ_11_138].Freq++;

-        }

-        count = 0; prevlen = curlen;

-        if (nextlen == 0) {

-            max_count = 138, min_count = 3;

-        } else if (curlen == nextlen) {

-            max_count = 6, min_count = 3;

-        } else {

-            max_count = 7, min_count = 4;

-        }

-    }

-}

-

-/* ===========================================================================

- * Send a literal or distance tree in compressed form, using the codes in

- * bl_tree.

- */

-local void send_tree (s, tree, max_code)

-    deflate_state *s;

-    ct_data *tree; /* the tree to be scanned */

-    int max_code;       /* and its largest code of non zero frequency */

-{

-    int n;                     /* iterates over all tree elements */

-    int prevlen = -1;          /* last emitted length */

-    int curlen;                /* length of current code */

-    int nextlen = tree[0].Len; /* length of next code */

-    int count = 0;             /* repeat count of the current code */

-    int max_count = 7;         /* max repeat count */

-    int min_count = 4;         /* min repeat count */

-

-    /* tree[max_code+1].Len = -1; */  /* guard already set */

-    if (nextlen == 0) max_count = 138, min_count = 3;

-

-    for (n = 0; n <= max_code; n++) {

-        curlen = nextlen; nextlen = tree[n+1].Len;

-        if (++count < max_count && curlen == nextlen) {

-            continue;

-        } else if (count < min_count) {

-            do { send_code(s, curlen, s->bl_tree); } while (--count != 0);

-

-        } else if (curlen != 0) {

-            if (curlen != prevlen) {

-                send_code(s, curlen, s->bl_tree); count--;

-            }

-            Assert(count >= 3 && count <= 6, " 3_6?");

-            send_code(s, REP_3_6, s->bl_tree); send_bits(s, count-3, 2);

-

-        } else if (count <= 10) {

-            send_code(s, REPZ_3_10, s->bl_tree); send_bits(s, count-3, 3);

-

-        } else {

-            send_code(s, REPZ_11_138, s->bl_tree); send_bits(s, count-11, 7);

-        }

-        count = 0; prevlen = curlen;

-        if (nextlen == 0) {

-            max_count = 138, min_count = 3;

-        } else if (curlen == nextlen) {

-            max_count = 6, min_count = 3;

-        } else {

-            max_count = 7, min_count = 4;

-        }

-    }

-}

-

-/* ===========================================================================

- * Construct the Huffman tree for the bit lengths and return the index in

- * bl_order of the last bit length code to send.

- */

-local int build_bl_tree(s)

-    deflate_state *s;

-{

-    int max_blindex;  /* index of last bit length code of non zero freq */

-

-    /* Determine the bit length frequencies for literal and distance trees */

-    scan_tree(s, (ct_data *)s->dyn_ltree, s->l_desc.max_code);

-    scan_tree(s, (ct_data *)s->dyn_dtree, s->d_desc.max_code);

-

-    /* Build the bit length tree: */

-    build_tree(s, (tree_desc *)(&(s->bl_desc)));

-    /* opt_len now includes the length of the tree representations, except

-     * the lengths of the bit lengths codes and the 5+5+4 bits for the counts.

-     */

-

-    /* Determine the number of bit length codes to send. The pkzip format

-     * requires that at least 4 bit length codes be sent. (appnote.txt says

-     * 3 but the actual value used is 4.)

-     */

-    for (max_blindex = BL_CODES-1; max_blindex >= 3; max_blindex--) {

-        if (s->bl_tree[bl_order[max_blindex]].Len != 0) break;

-    }

-    /* Update opt_len to include the bit length tree and counts */

-    s->opt_len += 3*(max_blindex+1) + 5+5+4;

-    Tracev((stderr, "\ndyn trees: dyn %ld, stat %ld",

-            s->opt_len, s->static_len));

-

-    return max_blindex;

-}

-

-/* ===========================================================================

- * Send the header for a block using dynamic Huffman trees: the counts, the

- * lengths of the bit length codes, the literal tree and the distance tree.

- * IN assertion: lcodes >= 257, dcodes >= 1, blcodes >= 4.

- */

-local void send_all_trees(s, lcodes, dcodes, blcodes)

-    deflate_state *s;

-    int lcodes, dcodes, blcodes; /* number of codes for each tree */

-{

-    int rank;                    /* index in bl_order */

-

-    Assert (lcodes >= 257 && dcodes >= 1 && blcodes >= 4, "not enough codes");

-    Assert (lcodes <= L_CODES && dcodes <= D_CODES && blcodes <= BL_CODES,

-            "too many codes");

-    Tracev((stderr, "\nbl counts: "));

-    send_bits(s, lcodes-257, 5); /* not +255 as stated in appnote.txt */

-    send_bits(s, dcodes-1,   5);

-    send_bits(s, blcodes-4,  4); /* not -3 as stated in appnote.txt */

-    for (rank = 0; rank < blcodes; rank++) {

-        Tracev((stderr, "\nbl code %2d ", bl_order[rank]));

-        send_bits(s, s->bl_tree[bl_order[rank]].Len, 3);

-    }

-    Tracev((stderr, "\nbl tree: sent %ld", s->bits_sent));

-

-    send_tree(s, (ct_data *)s->dyn_ltree, lcodes-1); /* literal tree */

-    Tracev((stderr, "\nlit tree: sent %ld", s->bits_sent));

-

-    send_tree(s, (ct_data *)s->dyn_dtree, dcodes-1); /* distance tree */

-    Tracev((stderr, "\ndist tree: sent %ld", s->bits_sent));

-}

-

-/* ===========================================================================

- * Send a stored block

- */

-void _tr_stored_block(s, buf, stored_len, eof)

-    deflate_state *s;

-    charf *buf;       /* input block */

-    ulg stored_len;   /* length of input block */

-    int eof;          /* true if this is the last block for a file */

-{

-    send_bits(s, (STORED_BLOCK<<1)+eof, 3);  /* send block type */

-#ifdef DEBUG

-    s->compressed_len = (s->compressed_len + 3 + 7) & (ulg)~7L;

-    s->compressed_len += (stored_len + 4) << 3;

-#endif

-    copy_block(s, buf, (unsigned)stored_len, 1); /* with header */

-}

-

-/* ===========================================================================

- * Send one empty static block to give enough lookahead for inflate.

- * This takes 10 bits, of which 7 may remain in the bit buffer.

- * The current inflate code requires 9 bits of lookahead. If the

- * last two codes for the previous block (real code plus EOB) were coded

- * on 5 bits or less, inflate may have only 5+3 bits of lookahead to decode

- * the last real code. In this case we send two empty static blocks instead

- * of one. (There are no problems if the previous block is stored or fixed.)

- * To simplify the code, we assume the worst case of last real code encoded

- * on one bit only.

- */

-void _tr_align(s)

-    deflate_state *s;

-{

-    send_bits(s, STATIC_TREES<<1, 3);

-    send_code(s, END_BLOCK, static_ltree);

-#ifdef DEBUG

-    s->compressed_len += 10L; /* 3 for block type, 7 for EOB */

-#endif

-    bi_flush(s);

-    /* Of the 10 bits for the empty block, we have already sent

-     * (10 - bi_valid) bits. The lookahead for the last real code (before

-     * the EOB of the previous block) was thus at least one plus the length

-     * of the EOB plus what we have just sent of the empty static block.

-     */

-    if (1 + s->last_eob_len + 10 - s->bi_valid < 9) {

-        send_bits(s, STATIC_TREES<<1, 3);

-        send_code(s, END_BLOCK, static_ltree);

-#ifdef DEBUG

-        s->compressed_len += 10L;

-#endif

-        bi_flush(s);

-    }

-    s->last_eob_len = 7;

-}

-

-/* ===========================================================================

- * Determine the best encoding for the current block: dynamic trees, static

- * trees or store, and output the encoded block to the zip file.

- */

-void _tr_flush_block(s, buf, stored_len, eof)

-    deflate_state *s;

-    charf *buf;       /* input block, or NULL if too old */

-    ulg stored_len;   /* length of input block */

-    int eof;          /* true if this is the last block for a file */

-{

-    ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */

-    int max_blindex = 0;  /* index of last bit length code of non zero freq */

-

-    /* Build the Huffman trees unless a stored block is forced */

-    if (s->level > 0) {

-

-         /* 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 */

-        build_tree(s, (tree_desc *)(&(s->l_desc)));

-        Tracev((stderr, "\nlit data: dyn %ld, stat %ld", s->opt_len,

-                s->static_len));

-

-        build_tree(s, (tree_desc *)(&(s->d_desc)));

-        Tracev((stderr, "\ndist data: dyn %ld, stat %ld", s->opt_len,

-                s->static_len));

-        /* At this point, opt_len and static_len are the total bit lengths of

-         * the compressed block data, excluding the tree representations.

-         */

-

-        /* Build the bit length tree for the above two trees, and get the index

-         * in bl_order of the last bit length code to send.

-         */

-        max_blindex = build_bl_tree(s);

-

-        /* Determine the best encoding. Compute the block lengths in bytes. */

-        opt_lenb = (s->opt_len+3+7)>>3;

-        static_lenb = (s->static_len+3+7)>>3;

-

-        Tracev((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u ",

-                opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len,

-                s->last_lit));

-

-        if (static_lenb <= opt_lenb) opt_lenb = static_lenb;

-

-    } else {

-        Assert(buf != (char*)0, "lost buf");

-        opt_lenb = static_lenb = stored_len + 5; /* force a stored block */

-    }

-

-#ifdef FORCE_STORED

-    if (buf != (char*)0) { /* force stored block */

-#else

-    if (stored_len+4 <= opt_lenb && buf != (char*)0) {

-                       /* 4: two words for the lengths */

-#endif

-        /* The test buf != NULL is only necessary if LIT_BUFSIZE > WSIZE.

-         * Otherwise we can't have processed more than WSIZE input bytes since

-         * the last block flush, because compression would have been

-         * successful. If LIT_BUFSIZE <= WSIZE, it is never too late to

-         * transform a block into a stored block.

-         */

-        _tr_stored_block(s, buf, stored_len, eof);

-

-#ifdef FORCE_STATIC

-    } else if (static_lenb >= 0) { /* force static trees */

-#else

-    } else if (static_lenb == opt_lenb) {

-#endif

-        send_bits(s, (STATIC_TREES<<1)+eof, 3);

-        compress_block(s, (ct_data *)static_ltree, (ct_data *)static_dtree);

-#ifdef DEBUG

-        s->compressed_len += 3 + s->static_len;

-#endif

-    } else {

-        send_bits(s, (DYN_TREES<<1)+eof, 3);

-        send_all_trees(s, s->l_desc.max_code+1, s->d_desc.max_code+1,

-                       max_blindex+1);

-        compress_block(s, (ct_data *)s->dyn_ltree, (ct_data *)s->dyn_dtree);

-#ifdef DEBUG

-        s->compressed_len += 3 + s->opt_len;

-#endif

-    }

-    Assert (s->compressed_len == s->bits_sent, "bad compressed size");

-    /* The above check is made mod 2^32, for files larger than 512 MB

-     * and uLong implemented on 32 bits.

-     */

-    init_block(s);

-

-    if (eof) {

-        bi_windup(s);

-#ifdef DEBUG

-        s->compressed_len += 7;  /* align on byte boundary */

-#endif

-    }

-    Tracev((stderr,"\ncomprlen %lu(%lu) ", s->compressed_len>>3,

-           s->compressed_len-7*eof));

-}

-

-/* ===========================================================================

- * Save the match info and tally the frequency counts. Return true if

- * the current block must be flushed.

- */

-int _tr_tally (s, dist, lc)

-    deflate_state *s;

-    unsigned dist;  /* distance of matched string */

-    unsigned lc;    /* match length-MIN_MATCH or unmatched char (if dist==0) */

-{

-    s->d_buf[s->last_lit] = (ush)dist;

-    s->l_buf[s->last_lit++] = (uch)lc;

-    if (dist == 0) {

-        /* lc is the unmatched char */

-        s->dyn_ltree[lc].Freq++;

-    } else {

-        s->matches++;

-        /* Here, lc is the match length - MIN_MATCH */

-        dist--;             /* dist = match distance - 1 */

-        Assert((ush)dist < (ush)MAX_DIST(s) &&

-               (ush)lc <= (ush)(MAX_MATCH-MIN_MATCH) &&

-               (ush)d_code(dist) < (ush)D_CODES,  "_tr_tally: bad match");

-

-        s->dyn_ltree[_length_code[lc]+LITERALS+1].Freq++;

-        s->dyn_dtree[d_code(dist)].Freq++;

-    }

-

-#ifdef TRUNCATE_BLOCK

-    /* Try to guess if it is profitable to stop the current block here */

-    if ((s->last_lit & 0x1fff) == 0 && s->level > 2) {

-        /* Compute an upper bound for the compressed length */

-        ulg out_length = (ulg)s->last_lit*8L;

-        ulg in_length = (ulg)((long)s->strstart - s->block_start);

-        int dcode;

-        for (dcode = 0; dcode < D_CODES; dcode++) {

-            out_length += (ulg)s->dyn_dtree[dcode].Freq *

-                (5L+extra_dbits[dcode]);

-        }

-        out_length >>= 3;

-        Tracev((stderr,"\nlast_lit %u, in %ld, out ~%ld(%ld%%) ",

-               s->last_lit, in_length, out_length,

-               100L - out_length*100L/in_length));

-        if (s->matches < s->last_lit/2 && out_length < in_length/2) return 1;

-    }

-#endif

-    return (s->last_lit == s->lit_bufsize-1);

-    /* We avoid equality with lit_bufsize because of wraparound at 64K

-     * on 16 bit machines and because stored blocks are restricted to

-     * 64K-1 bytes.

-     */

-}

-

-/* ===========================================================================

- * Send the block data compressed using the given Huffman trees

- */

-local void compress_block(s, ltree, dtree)

-    deflate_state *s;

-    ct_data *ltree; /* literal tree */

-    ct_data *dtree; /* distance tree */

-{

-    unsigned dist;      /* distance of matched string */

-    int lc;             /* match length or unmatched char (if dist == 0) */

-    unsigned lx = 0;    /* running index in l_buf */

-    unsigned code;      /* the code to send */

-    int extra;          /* number of extra bits to send */

-

-    if (s->last_lit != 0) do {

-        dist = s->d_buf[lx];

-        lc = s->l_buf[lx++];

-        if (dist == 0) {

-            send_code(s, lc, ltree); /* send a literal byte */

-            Tracecv(isgraph(lc), (stderr," '%c' ", lc));

-        } else {

-            /* Here, lc is the match length - MIN_MATCH */

-            code = _length_code[lc];

-            send_code(s, code+LITERALS+1, ltree); /* send the length code */

-            extra = extra_lbits[code];

-            if (extra != 0) {

-                lc -= base_length[code];

-                send_bits(s, lc, extra);       /* send the extra length bits */

-            }

-            dist--; /* dist is now the match distance - 1 */

-            code = d_code(dist);

-            Assert (code < D_CODES, "bad d_code");

-

-            send_code(s, code, dtree);       /* send the distance code */

-            extra = extra_dbits[code];

-            if (extra != 0) {

-                dist -= base_dist[code];

-                send_bits(s, dist, extra);   /* send the extra distance bits */

-            }

-        } /* literal or match pair ? */

-

-        /* Check that the overlay between pending_buf and d_buf+l_buf is ok: */

-        Assert((uInt)(s->pending) < s->lit_bufsize + 2*lx,

-               "pendingBuf overflow");

-

-    } while (lx < s->last_lit);

-

-    send_code(s, END_BLOCK, ltree);

-    s->last_eob_len = ltree[END_BLOCK].Len;

-}

-

-/* ===========================================================================

- * Set the data type to ASCII or BINARY, using a crude approximation:

- * binary if more than 20% of the bytes are <= 6 or >= 128, ascii otherwise.

- * IN assertion: the fields freq of dyn_ltree are set and the total of all

- * frequencies does not exceed 64K (to fit in an int on 16 bit machines).

- */

-local void set_data_type(s)

-    deflate_state *s;

-{

-    int n = 0;

-    unsigned ascii_freq = 0;

-    unsigned bin_freq = 0;

-    while (n < 7)        bin_freq += s->dyn_ltree[n++].Freq;

-    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;

-}

-

-/* ===========================================================================

- * Reverse the first len bits of a code, using straightforward code (a faster

- * method would use a table)

- * IN assertion: 1 <= len <= 15

- */

-local unsigned bi_reverse(code, len)

-    unsigned code; /* the value to invert */

-    int len;       /* its bit length */

-{

-    register unsigned res = 0;

-    do {

-        res |= code & 1;

-        code >>= 1, res <<= 1;

-    } while (--len > 0);

-    return res >> 1;

-}

-

-/* ===========================================================================

- * Flush the bit buffer, keeping at most 7 bits in it.

- */

-local void bi_flush(s)

-    deflate_state *s;

-{

-    if (s->bi_valid == 16) {

-        put_short(s, s->bi_buf);

-        s->bi_buf = 0;

-        s->bi_valid = 0;

-    } else if (s->bi_valid >= 8) {

-        put_byte(s, (Byte)s->bi_buf);

-        s->bi_buf >>= 8;

-        s->bi_valid -= 8;

-    }

-}

-

-/* ===========================================================================

- * Flush the bit buffer and align the output on a byte boundary

- */

-local void bi_windup(s)

-    deflate_state *s;

-{

-    if (s->bi_valid > 8) {

-        put_short(s, s->bi_buf);

-    } else if (s->bi_valid > 0) {

-        put_byte(s, (Byte)s->bi_buf);

-    }

-    s->bi_buf = 0;

-    s->bi_valid = 0;

-#ifdef DEBUG

-    s->bits_sent = (s->bits_sent+7) & ~7;

-#endif

-}

-

-/* ===========================================================================

- * Copy a stored block, storing first the length and its

- * one's complement if requested.

- */

-local void copy_block(s, buf, len, header)

-    deflate_state *s;

-    charf    *buf;    /* the input data */

-    unsigned len;     /* its length */

-    int      header;  /* true if block header must be written */

-{

-    bi_windup(s);        /* align on byte boundary */

-    s->last_eob_len = 8; /* enough lookahead for inflate */

-

-    if (header) {

-        put_short(s, (ush)len);

-        put_short(s, (ush)~len);

-#ifdef DEBUG

-        s->bits_sent += 2*16;

-#endif

-    }

-#ifdef DEBUG

-    s->bits_sent += (ulg)len<<3;

-#endif

-    while (len--) {

-        put_byte(s, *buf++);

-    }

-}

+/* trees.c -- output deflated data using Huffman coding
+ * Copyright (C) 1995-2003 Jean-loup Gailly
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/*
+ *  ALGORITHM
+ *
+ *      The "deflation" process uses several Huffman trees. The more
+ *      common source values are represented by shorter bit sequences.
+ *
+ *      Each code tree is stored in a compressed form which is itself
+ * a Huffman encoding of the lengths of all the code strings (in
+ * ascending order by source values).  The actual code strings are
+ * reconstructed from the lengths in the inflate process, as described
+ * in the deflate specification.
+ *
+ *  REFERENCES
+ *
+ *      Deutsch, L.P.,"'Deflate' Compressed Data Format Specification".
+ *      Available in ftp.uu.net:/pub/archiving/zip/doc/deflate-1.1.doc
+ *
+ *      Storer, James A.
+ *          Data Compression:  Methods and Theory, pp. 49-50.
+ *          Computer Science Press, 1988.  ISBN 0-7167-8156-5.
+ *
+ *      Sedgewick, R.
+ *          Algorithms, p290.
+ *          Addison-Wesley, 1983. ISBN 0-201-06672-6.
+ */
+
+/* @(#) $Id$ */
+
+/* #define GEN_TREES_H */
+
+#include "deflate.h"
+
+#ifdef DEBUG
+#  include <ctype.h>
+#endif
+
+/* ===========================================================================
+ * Constants
+ */
+
+#define MAX_BL_BITS 7
+/* Bit length codes must not exceed MAX_BL_BITS bits */
+
+#define END_BLOCK 256
+/* end of block literal code */
+
+#define REP_3_6      16
+/* repeat previous bit length 3-6 times (2 bits of repeat count) */
+
+#define REPZ_3_10    17
+/* repeat a zero length 3-10 times  (3 bits of repeat count) */
+
+#define REPZ_11_138  18
+/* repeat a zero length 11-138 times  (7 bits of repeat count) */
+
+local const int extra_lbits[LENGTH_CODES] /* extra bits for each length code */
+   = {0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0};
+
+local const int extra_dbits[D_CODES] /* extra bits for each distance code */
+   = {0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13};
+
+local const int extra_blbits[BL_CODES]/* extra bits for each bit length code */
+   = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,7};
+
+local const uch bl_order[BL_CODES]
+   = {16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15};
+/* The lengths of the bit length codes are sent in order of decreasing
+ * probability, to avoid transmitting the lengths for unused bit length codes.
+ */
+
+#define Buf_size (8 * 2*sizeof(char))
+/* Number of bits used within bi_buf. (bi_buf might be implemented on
+ * more than 16 bits on some systems.)
+ */
+
+/* ===========================================================================
+ * Local data. These are initialized only once.
+ */
+
+#define DIST_CODE_LEN  512 /* see definition of array dist_code below */
+
+#if defined(GEN_TREES_H) || !defined(STDC)
+/* non ANSI compilers may not accept trees.h */
+
+local ct_data static_ltree[L_CODES+2];
+/* The static literal tree. Since the bit lengths are imposed, there is no
+ * need for the L_CODES extra codes used during heap construction. However
+ * The codes 286 and 287 are needed to build a canonical tree (see _tr_init
+ * below).
+ */
+
+local ct_data static_dtree[D_CODES];
+/* The static distance tree. (Actually a trivial tree since all codes use
+ * 5 bits.)
+ */
+
+uch _dist_code[DIST_CODE_LEN];
+/* Distance codes. The first 256 values correspond to the distances
+ * 3 .. 258, the last 256 values correspond to the top 8 bits of
+ * the 15 bit distances.
+ */
+
+uch _length_code[MAX_MATCH-MIN_MATCH+1];
+/* length code for each normalized match length (0 == MIN_MATCH) */
+
+local int base_length[LENGTH_CODES];
+/* First normalized length for each code (0 = MIN_MATCH) */
+
+local int base_dist[D_CODES];
+/* First normalized distance for each code (0 = distance of 1) */
+
+#else
+#  include "trees.h"
+#endif /* GEN_TREES_H */
+
+struct static_tree_desc_s {
+    const ct_data *static_tree;  /* static tree or NULL */
+    const intf *extra_bits;      /* extra bits for each code or NULL */
+    int     extra_base;          /* base index for extra_bits */
+    int     elems;               /* max number of elements in the tree */
+    int     max_length;          /* max bit length for the codes */
+};
+
+local static_tree_desc  static_l_desc =
+{static_ltree, extra_lbits, LITERALS+1, L_CODES, MAX_BITS};
+
+local static_tree_desc  static_d_desc =
+{static_dtree, extra_dbits, 0,          D_CODES, MAX_BITS};
+
+local static_tree_desc  static_bl_desc =
+{(const ct_data *)0, extra_blbits, 0,   BL_CODES, MAX_BL_BITS};
+
+/* ===========================================================================
+ * Local (static) routines in this file.
+ */
+
+local void tr_static_init OF((void));
+local void init_block     OF((deflate_state *s));
+local void pqdownheap     OF((deflate_state *s, ct_data *tree, int k));
+local void gen_bitlen     OF((deflate_state *s, tree_desc *desc));
+local void gen_codes      OF((ct_data *tree, int max_code, ushf *bl_count));
+local void build_tree     OF((deflate_state *s, tree_desc *desc));
+local void scan_tree      OF((deflate_state *s, ct_data *tree, int max_code));
+local void send_tree      OF((deflate_state *s, ct_data *tree, int max_code));
+local int  build_bl_tree  OF((deflate_state *s));
+local void send_all_trees OF((deflate_state *s, int lcodes, int dcodes,
+                              int blcodes));
+local void compress_block OF((deflate_state *s, ct_data *ltree,
+                              ct_data *dtree));
+local void set_data_type  OF((deflate_state *s));
+local unsigned bi_reverse OF((unsigned value, int length));
+local void bi_windup      OF((deflate_state *s));
+local void bi_flush       OF((deflate_state *s));
+local void copy_block     OF((deflate_state *s, charf *buf, unsigned len,
+                              int header));
+
+#ifdef GEN_TREES_H
+local void gen_trees_header OF((void));
+#endif
+
+#ifndef DEBUG
+#  define send_code(s, c, tree) send_bits(s, tree[c].Code, tree[c].Len)
+   /* Send a code of the given tree. c and tree must not have side effects */
+
+#else /* DEBUG */
+#  define send_code(s, c, tree) \
+     { if (z_verbose>2) fprintf(stderr,"\ncd %3d ",(c)); \
+       send_bits(s, tree[c].Code, tree[c].Len); }
+#endif
+
+/* ===========================================================================
+ * Output a short LSB first on the stream.
+ * IN assertion: there is enough room in pendingBuf.
+ */
+#define put_short(s, w) { \
+    put_byte(s, (uch)((w) & 0xff)); \
+    put_byte(s, (uch)((ush)(w) >> 8)); \
+}
+
+/* ===========================================================================
+ * Send a value on a given number of bits.
+ * IN assertion: length <= 16 and value fits in length bits.
+ */
+#ifdef DEBUG
+local void send_bits      OF((deflate_state *s, int value, int length));
+
+local void send_bits(s, value, length)
+    deflate_state *s;
+    int value;  /* value to send */
+    int length; /* number of bits */
+{
+    Tracevv((stderr," l %2d v %4x ", length, value));
+    Assert(length > 0 && length <= 15, "invalid length");
+    s->bits_sent += (ulg)length;
+
+    /* If not enough room in bi_buf, use (valid) bits from bi_buf and
+     * (16 - bi_valid) bits from value, leaving (width - (16-bi_valid))
+     * unused bits in value.
+     */
+    if (s->bi_valid > (int)Buf_size - length) {
+        s->bi_buf |= (value << s->bi_valid);
+        put_short(s, s->bi_buf);
+        s->bi_buf = (ush)value >> (Buf_size - s->bi_valid);
+        s->bi_valid += length - Buf_size;
+    } else {
+        s->bi_buf |= value << s->bi_valid;
+        s->bi_valid += length;
+    }
+}
+#else /* !DEBUG */
+
+#define send_bits(s, value, length) \
+{ int len = length;\
+  if (s->bi_valid > (int)Buf_size - len) {\
+    int val = value;\
+    s->bi_buf |= (val << s->bi_valid);\
+    put_short(s, s->bi_buf);\
+    s->bi_buf = (ush)val >> (Buf_size - s->bi_valid);\
+    s->bi_valid += len - Buf_size;\
+  } else {\
+    s->bi_buf |= (value) << s->bi_valid;\
+    s->bi_valid += len;\
+  }\
+}
+#endif /* DEBUG */
+
+
+/* the arguments must not have side effects */
+
+/* ===========================================================================
+ * Initialize the various 'constant' tables.
+ */
+local void tr_static_init()
+{
+#if defined(GEN_TREES_H) || !defined(STDC)
+    static int static_init_done = 0;
+    int n;        /* iterates over tree elements */
+    int bits;     /* bit counter */
+    int length;   /* length value */
+    int code;     /* code value */
+    int dist;     /* distance index */
+    ush bl_count[MAX_BITS+1];
+    /* number of codes at each bit length for an optimal tree */
+
+    if (static_init_done) return;
+
+    /* For some embedded targets, global variables are not initialized: */
+    static_l_desc.static_tree = static_ltree;
+    static_l_desc.extra_bits = extra_lbits;
+    static_d_desc.static_tree = static_dtree;
+    static_d_desc.extra_bits = extra_dbits;
+    static_bl_desc.extra_bits = extra_blbits;
+
+    /* Initialize the mapping length (0..255) -> length code (0..28) */
+    length = 0;
+    for (code = 0; code < LENGTH_CODES-1; code++) {
+        base_length[code] = length;
+        for (n = 0; n < (1<<extra_lbits[code]); n++) {
+            _length_code[length++] = (uch)code;
+        }
+    }
+    Assert (length == 256, "tr_static_init: length != 256");
+    /* Note that the length 255 (match length 258) can be represented
+     * in two different ways: code 284 + 5 bits or code 285, so we
+     * overwrite length_code[255] to use the best encoding:
+     */
+    _length_code[length-1] = (uch)code;
+
+    /* Initialize the mapping dist (0..32K) -> dist code (0..29) */
+    dist = 0;
+    for (code = 0 ; code < 16; code++) {
+        base_dist[code] = dist;
+        for (n = 0; n < (1<<extra_dbits[code]); n++) {
+            _dist_code[dist++] = (uch)code;
+        }
+    }
+    Assert (dist == 256, "tr_static_init: dist != 256");
+    dist >>= 7; /* from now on, all distances are divided by 128 */
+    for ( ; code < D_CODES; code++) {
+        base_dist[code] = dist << 7;
+        for (n = 0; n < (1<<(extra_dbits[code]-7)); n++) {
+            _dist_code[256 + dist++] = (uch)code;
+        }
+    }
+    Assert (dist == 256, "tr_static_init: 256+dist != 512");
+
+    /* Construct the codes of the static literal tree */
+    for (bits = 0; bits <= MAX_BITS; bits++) bl_count[bits] = 0;
+    n = 0;
+    while (n <= 143) static_ltree[n++].Len = 8, bl_count[8]++;
+    while (n <= 255) static_ltree[n++].Len = 9, bl_count[9]++;
+    while (n <= 279) static_ltree[n++].Len = 7, bl_count[7]++;
+    while (n <= 287) static_ltree[n++].Len = 8, bl_count[8]++;
+    /* Codes 286 and 287 do not exist, but we must include them in the
+     * tree construction to get a canonical Huffman tree (longest code
+     * all ones)
+     */
+    gen_codes((ct_data *)static_ltree, L_CODES+1, bl_count);
+
+    /* The static distance tree is trivial: */
+    for (n = 0; n < D_CODES; n++) {
+        static_dtree[n].Len = 5;
+        static_dtree[n].Code = bi_reverse((unsigned)n, 5);
+    }
+    static_init_done = 1;
+
+#  ifdef GEN_TREES_H
+    gen_trees_header();
+#  endif
+#endif /* defined(GEN_TREES_H) || !defined(STDC) */
+}
+
+/* ===========================================================================
+ * Genererate the file trees.h describing the static trees.
+ */
+#ifdef GEN_TREES_H
+#  ifndef DEBUG
+#    include <stdio.h>
+#  endif
+
+#  define SEPARATOR(i, last, width) \
+      ((i) == (last)? "\n};\n\n" :    \
+       ((i) % (width) == (width)-1 ? ",\n" : ", "))
+
+void gen_trees_header()
+{
+    FILE *header = fopen("trees.h", "w");
+    int i;
+
+    Assert (header != NULL, "Can't open trees.h");
+    fprintf(header,
+            "/* header created automatically with -DGEN_TREES_H */\n\n");
+
+    fprintf(header, "local const ct_data static_ltree[L_CODES+2] = {\n");
+    for (i = 0; i < L_CODES+2; i++) {
+        fprintf(header, "{{%3u},{%3u}}%s", static_ltree[i].Code,
+                static_ltree[i].Len, SEPARATOR(i, L_CODES+1, 5));
+    }
+
+    fprintf(header, "local const ct_data static_dtree[D_CODES] = {\n");
+    for (i = 0; i < D_CODES; i++) {
+        fprintf(header, "{{%2u},{%2u}}%s", static_dtree[i].Code,
+                static_dtree[i].Len, SEPARATOR(i, D_CODES-1, 5));
+    }
+
+    fprintf(header, "const uch _dist_code[DIST_CODE_LEN] = {\n");
+    for (i = 0; i < DIST_CODE_LEN; i++) {
+        fprintf(header, "%2u%s", _dist_code[i],
+                SEPARATOR(i, DIST_CODE_LEN-1, 20));
+    }
+
+    fprintf(header, "const uch _length_code[MAX_MATCH-MIN_MATCH+1]= {\n");
+    for (i = 0; i < MAX_MATCH-MIN_MATCH+1; i++) {
+        fprintf(header, "%2u%s", _length_code[i],
+                SEPARATOR(i, MAX_MATCH-MIN_MATCH, 20));
+    }
+
+    fprintf(header, "local const int base_length[LENGTH_CODES] = {\n");
+    for (i = 0; i < LENGTH_CODES; i++) {
+        fprintf(header, "%1u%s", base_length[i],
+                SEPARATOR(i, LENGTH_CODES-1, 20));
+    }
+
+    fprintf(header, "local const int base_dist[D_CODES] = {\n");
+    for (i = 0; i < D_CODES; i++) {
+        fprintf(header, "%5u%s", base_dist[i],
+                SEPARATOR(i, D_CODES-1, 10));
+    }
+
+    fclose(header);
+}
+#endif /* GEN_TREES_H */
+
+/* ===========================================================================
+ * Initialize the tree data structures for a new zlib stream.
+ */
+void _tr_init(s)
+    deflate_state *s;
+{
+    tr_static_init();
+
+    s->l_desc.dyn_tree = s->dyn_ltree;
+    s->l_desc.stat_desc = &static_l_desc;
+
+    s->d_desc.dyn_tree = s->dyn_dtree;
+    s->d_desc.stat_desc = &static_d_desc;
+
+    s->bl_desc.dyn_tree = s->bl_tree;
+    s->bl_desc.stat_desc = &static_bl_desc;
+
+    s->bi_buf = 0;
+    s->bi_valid = 0;
+    s->last_eob_len = 8; /* enough lookahead for inflate */
+#ifdef DEBUG
+    s->compressed_len = 0L;
+    s->bits_sent = 0L;
+#endif
+
+    /* Initialize the first block of the first file: */
+    init_block(s);
+}
+
+/* ===========================================================================
+ * Initialize a new block.
+ */
+local void init_block(s)
+    deflate_state *s;
+{
+    int n; /* iterates over tree elements */
+
+    /* Initialize the trees. */
+    for (n = 0; n < L_CODES;  n++) s->dyn_ltree[n].Freq = 0;
+    for (n = 0; n < D_CODES;  n++) s->dyn_dtree[n].Freq = 0;
+    for (n = 0; n < BL_CODES; n++) s->bl_tree[n].Freq = 0;
+
+    s->dyn_ltree[END_BLOCK].Freq = 1;
+    s->opt_len = s->static_len = 0L;
+    s->last_lit = s->matches = 0;
+}
+
+#define SMALLEST 1
+/* Index within the heap array of least frequent node in the Huffman tree */
+
+
+/* ===========================================================================
+ * Remove the smallest element from the heap and recreate the heap with
+ * one less element. Updates heap and heap_len.
+ */
+#define pqremove(s, tree, top) \
+{\
+    top = s->heap[SMALLEST]; \
+    s->heap[SMALLEST] = s->heap[s->heap_len--]; \
+    pqdownheap(s, tree, SMALLEST); \
+}
+
+/* ===========================================================================
+ * Compares to subtrees, using the tree depth as tie breaker when
+ * the subtrees have equal frequency. This minimizes the worst case length.
+ */
+#define smaller(tree, n, m, depth) \
+   (tree[n].Freq < tree[m].Freq || \
+   (tree[n].Freq == tree[m].Freq && depth[n] <= depth[m]))
+
+/* ===========================================================================
+ * Restore the heap property by moving down the tree starting at node k,
+ * exchanging a node with the smallest of its two sons if necessary, stopping
+ * when the heap property is re-established (each father smaller than its
+ * two sons).
+ */
+local void pqdownheap(s, tree, k)
+    deflate_state *s;
+    ct_data *tree;  /* the tree to restore */
+    int k;               /* node to move down */
+{
+    int v = s->heap[k];
+    int j = k << 1;  /* left son of k */
+    while (j <= s->heap_len) {
+        /* Set j to the smallest of the two sons: */
+        if (j < s->heap_len &&
+            smaller(tree, s->heap[j+1], s->heap[j], s->depth)) {
+            j++;
+        }
+        /* Exit if v is smaller than both sons */
+        if (smaller(tree, v, s->heap[j], s->depth)) break;
+
+        /* Exchange v with the smallest son */
+        s->heap[k] = s->heap[j];  k = j;
+
+        /* And continue down the tree, setting j to the left son of k */
+        j <<= 1;
+    }
+    s->heap[k] = v;
+}
+
+/* ===========================================================================
+ * Compute the optimal bit lengths for a tree and update the total bit length
+ * for the current block.
+ * IN assertion: the fields freq and dad are set, heap[heap_max] and
+ *    above are the tree nodes sorted by increasing frequency.
+ * OUT assertions: the field len is set to the optimal bit length, the
+ *     array bl_count contains the frequencies for each bit length.
+ *     The length opt_len is updated; static_len is also updated if stree is
+ *     not null.
+ */
+local void gen_bitlen(s, desc)
+    deflate_state *s;
+    tree_desc *desc;    /* the tree descriptor */
+{
+    ct_data *tree        = desc->dyn_tree;
+    int max_code         = desc->max_code;
+    const ct_data *stree = desc->stat_desc->static_tree;
+    const intf *extra    = desc->stat_desc->extra_bits;
+    int base             = desc->stat_desc->extra_base;
+    int max_length       = desc->stat_desc->max_length;
+    int h;              /* heap index */
+    int n, m;           /* iterate over the tree elements */
+    int bits;           /* bit length */
+    int xbits;          /* extra bits */
+    ush f;              /* frequency */
+    int overflow = 0;   /* number of elements with bit length too large */
+
+    for (bits = 0; bits <= MAX_BITS; bits++) s->bl_count[bits] = 0;
+
+    /* In a first pass, compute the optimal bit lengths (which may
+     * overflow in the case of the bit length tree).
+     */
+    tree[s->heap[s->heap_max]].Len = 0; /* root of the heap */
+
+    for (h = s->heap_max+1; h < HEAP_SIZE; h++) {
+        n = s->heap[h];
+        bits = tree[tree[n].Dad].Len + 1;
+        if (bits > max_length) bits = max_length, overflow++;
+        tree[n].Len = (ush)bits;
+        /* We overwrite tree[n].Dad which is no longer needed */
+
+        if (n > max_code) continue; /* not a leaf node */
+
+        s->bl_count[bits]++;
+        xbits = 0;
+        if (n >= base) xbits = extra[n-base];
+        f = tree[n].Freq;
+        s->opt_len += (ulg)f * (bits + xbits);
+        if (stree) s->static_len += (ulg)f * (stree[n].Len + xbits);
+    }
+    if (overflow == 0) return;
+
+    Trace((stderr,"\nbit length overflow\n"));
+    /* This happens for example on obj2 and pic of the Calgary corpus */
+
+    /* Find the first bit length which could increase: */
+    do {
+        bits = max_length-1;
+        while (s->bl_count[bits] == 0) bits--;
+        s->bl_count[bits]--;      /* move one leaf down the tree */
+        s->bl_count[bits+1] += 2; /* move one overflow item as its brother */
+        s->bl_count[max_length]--;
+        /* The brother of the overflow item also moves one step up,
+         * but this does not affect bl_count[max_length]
+         */
+        overflow -= 2;
+    } while (overflow > 0);
+
+    /* Now recompute all bit lengths, scanning in increasing frequency.
+     * h is still equal to HEAP_SIZE. (It is simpler to reconstruct all
+     * lengths instead of fixing only the wrong ones. This idea is taken
+     * from 'ar' written by Haruhiko Okumura.)
+     */
+    for (bits = max_length; bits != 0; bits--) {
+        n = s->bl_count[bits];
+        while (n != 0) {
+            m = s->heap[--h];
+            if (m > max_code) continue;
+            if (tree[m].Len != (unsigned) bits) {
+                Trace((stderr,"code %d bits %d->%d\n", m, tree[m].Len, bits));
+                s->opt_len += ((long)bits - (long)tree[m].Len)
+                              *(long)tree[m].Freq;
+                tree[m].Len = (ush)bits;
+            }
+            n--;
+        }
+    }
+}
+
+/* ===========================================================================
+ * Generate the codes for a given tree and bit counts (which need not be
+ * optimal).
+ * IN assertion: the array bl_count contains the bit length statistics for
+ * the given tree and the field len is set for all tree elements.
+ * OUT assertion: the field code is set for all tree elements of non
+ *     zero code length.
+ */
+local void gen_codes (tree, max_code, bl_count)
+    ct_data *tree;             /* the tree to decorate */
+    int max_code;              /* largest code with non zero frequency */
+    ushf *bl_count;            /* number of codes at each bit length */
+{
+    ush next_code[MAX_BITS+1]; /* next code value for each bit length */
+    ush code = 0;              /* running code value */
+    int bits;                  /* bit index */
+    int n;                     /* code index */
+
+    /* The distribution counts are first used to generate the code values
+     * without bit reversal.
+     */
+    for (bits = 1; bits <= MAX_BITS; bits++) {
+        next_code[bits] = code = (code + bl_count[bits-1]) << 1;
+    }
+    /* Check that the bit counts in bl_count are consistent. The last code
+     * must be all ones.
+     */
+    Assert (code + bl_count[MAX_BITS]-1 == (1<<MAX_BITS)-1,
+            "inconsistent bit counts");
+    Tracev((stderr,"\ngen_codes: max_code %d ", max_code));
+
+    for (n = 0;  n <= max_code; n++) {
+        int len = tree[n].Len;
+        if (len == 0) continue;
+        /* Now reverse the bits */
+        tree[n].Code = bi_reverse(next_code[len]++, len);
+
+        Tracecv(tree != static_ltree, (stderr,"\nn %3d %c l %2d c %4x (%x) ",
+             n, (isgraph(n) ? n : ' '), len, tree[n].Code, next_code[len]-1));
+    }
+}
+
+/* ===========================================================================
+ * Construct one Huffman tree and assigns the code bit strings and lengths.
+ * Update the total bit length for the current block.
+ * IN assertion: the field freq is set for all tree elements.
+ * OUT assertions: the fields len and code are set to the optimal bit length
+ *     and corresponding code. The length opt_len is updated; static_len is
+ *     also updated if stree is not null. The field max_code is set.
+ */
+local void build_tree(s, desc)
+    deflate_state *s;
+    tree_desc *desc; /* the tree descriptor */
+{
+    ct_data *tree         = desc->dyn_tree;
+    const ct_data *stree  = desc->stat_desc->static_tree;
+    int elems             = desc->stat_desc->elems;
+    int n, m;          /* iterate over heap elements */
+    int max_code = -1; /* largest code with non zero frequency */
+    int node;          /* new node being created */
+
+    /* Construct the initial heap, with least frequent element in
+     * heap[SMALLEST]. The sons of heap[n] are heap[2*n] and heap[2*n+1].
+     * heap[0] is not used.
+     */
+    s->heap_len = 0, s->heap_max = HEAP_SIZE;
+
+    for (n = 0; n < elems; n++) {
+        if (tree[n].Freq != 0) {
+            s->heap[++(s->heap_len)] = max_code = n;
+            s->depth[n] = 0;
+        } else {
+            tree[n].Len = 0;
+        }
+    }
+
+    /* The pkzip format requires that at least one distance code exists,
+     * and that at least one bit should be sent even if there is only one
+     * possible code. So to avoid special checks later on we force at least
+     * two codes of non zero frequency.
+     */
+    while (s->heap_len < 2) {
+        node = s->heap[++(s->heap_len)] = (max_code < 2 ? ++max_code : 0);
+        tree[node].Freq = 1;
+        s->depth[node] = 0;
+        s->opt_len--; if (stree) s->static_len -= stree[node].Len;
+        /* node is 0 or 1 so it does not have extra bits */
+    }
+    desc->max_code = max_code;
+
+    /* The elements heap[heap_len/2+1 .. heap_len] are leaves of the tree,
+     * establish sub-heaps of increasing lengths:
+     */
+    for (n = s->heap_len/2; n >= 1; n--) pqdownheap(s, tree, n);
+
+    /* Construct the Huffman tree by repeatedly combining the least two
+     * frequent nodes.
+     */
+    node = elems;              /* next internal node of the tree */
+    do {
+        pqremove(s, tree, n);  /* n = node of least frequency */
+        m = s->heap[SMALLEST]; /* m = node of next least frequency */
+
+        s->heap[--(s->heap_max)] = n; /* keep the nodes sorted by frequency */
+        s->heap[--(s->heap_max)] = m;
+
+        /* Create a new node father of n and m */
+        tree[node].Freq = tree[n].Freq + tree[m].Freq;
+        s->depth[node] = (uch)((s->depth[n] >= s->depth[m] ?
+                                s->depth[n] : s->depth[m]) + 1);
+        tree[n].Dad = tree[m].Dad = (ush)node;
+#ifdef DUMP_BL_TREE
+        if (tree == s->bl_tree) {
+            fprintf(stderr,"\nnode %d(%d), sons %d(%d) %d(%d)",
+                    node, tree[node].Freq, n, tree[n].Freq, m, tree[m].Freq);
+        }
+#endif
+        /* and insert the new node in the heap */
+        s->heap[SMALLEST] = node++;
+        pqdownheap(s, tree, SMALLEST);
+
+    } while (s->heap_len >= 2);
+
+    s->heap[--(s->heap_max)] = s->heap[SMALLEST];
+
+    /* At this point, the fields freq and dad are set. We can now
+     * generate the bit lengths.
+     */
+    gen_bitlen(s, (tree_desc *)desc);
+
+    /* The field len is now set, we can generate the bit codes */
+    gen_codes ((ct_data *)tree, max_code, s->bl_count);
+}
+
+/* ===========================================================================
+ * Scan a literal or distance tree to determine the frequencies of the codes
+ * in the bit length tree.
+ */
+local void scan_tree (s, tree, max_code)
+    deflate_state *s;
+    ct_data *tree;   /* the tree to be scanned */
+    int max_code;    /* and its largest code of non zero frequency */
+{
+    int n;                     /* iterates over all tree elements */
+    int prevlen = -1;          /* last emitted length */
+    int curlen;                /* length of current code */
+    int nextlen = tree[0].Len; /* length of next code */
+    int count = 0;             /* repeat count of the current code */
+    int max_count = 7;         /* max repeat count */
+    int min_count = 4;         /* min repeat count */
+
+    if (nextlen == 0) max_count = 138, min_count = 3;
+    tree[max_code+1].Len = (ush)0xffff; /* guard */
+
+    for (n = 0; n <= max_code; n++) {
+        curlen = nextlen; nextlen = tree[n+1].Len;
+        if (++count < max_count && curlen == nextlen) {
+            continue;
+        } else if (count < min_count) {
+            s->bl_tree[curlen].Freq += count;
+        } else if (curlen != 0) {
+            if (curlen != prevlen) s->bl_tree[curlen].Freq++;
+            s->bl_tree[REP_3_6].Freq++;
+        } else if (count <= 10) {
+            s->bl_tree[REPZ_3_10].Freq++;
+        } else {
+            s->bl_tree[REPZ_11_138].Freq++;
+        }
+        count = 0; prevlen = curlen;
+        if (nextlen == 0) {
+            max_count = 138, min_count = 3;
+        } else if (curlen == nextlen) {
+            max_count = 6, min_count = 3;
+        } else {
+            max_count = 7, min_count = 4;
+        }
+    }
+}
+
+/* ===========================================================================
+ * Send a literal or distance tree in compressed form, using the codes in
+ * bl_tree.
+ */
+local void send_tree (s, tree, max_code)
+    deflate_state *s;
+    ct_data *tree; /* the tree to be scanned */
+    int max_code;       /* and its largest code of non zero frequency */
+{
+    int n;                     /* iterates over all tree elements */
+    int prevlen = -1;          /* last emitted length */
+    int curlen;                /* length of current code */
+    int nextlen = tree[0].Len; /* length of next code */
+    int count = 0;             /* repeat count of the current code */
+    int max_count = 7;         /* max repeat count */
+    int min_count = 4;         /* min repeat count */
+
+    /* tree[max_code+1].Len = -1; */  /* guard already set */
+    if (nextlen == 0) max_count = 138, min_count = 3;
+
+    for (n = 0; n <= max_code; n++) {
+        curlen = nextlen; nextlen = tree[n+1].Len;
+        if (++count < max_count && curlen == nextlen) {
+            continue;
+        } else if (count < min_count) {
+            do { send_code(s, curlen, s->bl_tree); } while (--count != 0);
+
+        } else if (curlen != 0) {
+            if (curlen != prevlen) {
+                send_code(s, curlen, s->bl_tree); count--;
+            }
+            Assert(count >= 3 && count <= 6, " 3_6?");
+            send_code(s, REP_3_6, s->bl_tree); send_bits(s, count-3, 2);
+
+        } else if (count <= 10) {
+            send_code(s, REPZ_3_10, s->bl_tree); send_bits(s, count-3, 3);
+
+        } else {
+            send_code(s, REPZ_11_138, s->bl_tree); send_bits(s, count-11, 7);
+        }
+        count = 0; prevlen = curlen;
+        if (nextlen == 0) {
+            max_count = 138, min_count = 3;
+        } else if (curlen == nextlen) {
+            max_count = 6, min_count = 3;
+        } else {
+            max_count = 7, min_count = 4;
+        }
+    }
+}
+
+/* ===========================================================================
+ * Construct the Huffman tree for the bit lengths and return the index in
+ * bl_order of the last bit length code to send.
+ */
+local int build_bl_tree(s)
+    deflate_state *s;
+{
+    int max_blindex;  /* index of last bit length code of non zero freq */
+
+    /* Determine the bit length frequencies for literal and distance trees */
+    scan_tree(s, (ct_data *)s->dyn_ltree, s->l_desc.max_code);
+    scan_tree(s, (ct_data *)s->dyn_dtree, s->d_desc.max_code);
+
+    /* Build the bit length tree: */
+    build_tree(s, (tree_desc *)(&(s->bl_desc)));
+    /* opt_len now includes the length of the tree representations, except
+     * the lengths of the bit lengths codes and the 5+5+4 bits for the counts.
+     */
+
+    /* Determine the number of bit length codes to send. The pkzip format
+     * requires that at least 4 bit length codes be sent. (appnote.txt says
+     * 3 but the actual value used is 4.)
+     */
+    for (max_blindex = BL_CODES-1; max_blindex >= 3; max_blindex--) {
+        if (s->bl_tree[bl_order[max_blindex]].Len != 0) break;
+    }
+    /* Update opt_len to include the bit length tree and counts */
+    s->opt_len += 3*(max_blindex+1) + 5+5+4;
+    Tracev((stderr, "\ndyn trees: dyn %ld, stat %ld",
+            s->opt_len, s->static_len));
+
+    return max_blindex;
+}
+
+/* ===========================================================================
+ * Send the header for a block using dynamic Huffman trees: the counts, the
+ * lengths of the bit length codes, the literal tree and the distance tree.
+ * IN assertion: lcodes >= 257, dcodes >= 1, blcodes >= 4.
+ */
+local void send_all_trees(s, lcodes, dcodes, blcodes)
+    deflate_state *s;
+    int lcodes, dcodes, blcodes; /* number of codes for each tree */
+{
+    int rank;                    /* index in bl_order */
+
+    Assert (lcodes >= 257 && dcodes >= 1 && blcodes >= 4, "not enough codes");
+    Assert (lcodes <= L_CODES && dcodes <= D_CODES && blcodes <= BL_CODES,
+            "too many codes");
+    Tracev((stderr, "\nbl counts: "));
+    send_bits(s, lcodes-257, 5); /* not +255 as stated in appnote.txt */
+    send_bits(s, dcodes-1,   5);
+    send_bits(s, blcodes-4,  4); /* not -3 as stated in appnote.txt */
+    for (rank = 0; rank < blcodes; rank++) {
+        Tracev((stderr, "\nbl code %2d ", bl_order[rank]));
+        send_bits(s, s->bl_tree[bl_order[rank]].Len, 3);
+    }
+    Tracev((stderr, "\nbl tree: sent %ld", s->bits_sent));
+
+    send_tree(s, (ct_data *)s->dyn_ltree, lcodes-1); /* literal tree */
+    Tracev((stderr, "\nlit tree: sent %ld", s->bits_sent));
+
+    send_tree(s, (ct_data *)s->dyn_dtree, dcodes-1); /* distance tree */
+    Tracev((stderr, "\ndist tree: sent %ld", s->bits_sent));
+}
+
+/* ===========================================================================
+ * Send a stored block
+ */
+void _tr_stored_block(s, buf, stored_len, eof)
+    deflate_state *s;
+    charf *buf;       /* input block */
+    ulg stored_len;   /* length of input block */
+    int eof;          /* true if this is the last block for a file */
+{
+    send_bits(s, (STORED_BLOCK<<1)+eof, 3);  /* send block type */
+#ifdef DEBUG
+    s->compressed_len = (s->compressed_len + 3 + 7) & (ulg)~7L;
+    s->compressed_len += (stored_len + 4) << 3;
+#endif
+    copy_block(s, buf, (unsigned)stored_len, 1); /* with header */
+}
+
+/* ===========================================================================
+ * Send one empty static block to give enough lookahead for inflate.
+ * This takes 10 bits, of which 7 may remain in the bit buffer.
+ * The current inflate code requires 9 bits of lookahead. If the
+ * last two codes for the previous block (real code plus EOB) were coded
+ * on 5 bits or less, inflate may have only 5+3 bits of lookahead to decode
+ * the last real code. In this case we send two empty static blocks instead
+ * of one. (There are no problems if the previous block is stored or fixed.)
+ * To simplify the code, we assume the worst case of last real code encoded
+ * on one bit only.
+ */
+void _tr_align(s)
+    deflate_state *s;
+{
+    send_bits(s, STATIC_TREES<<1, 3);
+    send_code(s, END_BLOCK, static_ltree);
+#ifdef DEBUG
+    s->compressed_len += 10L; /* 3 for block type, 7 for EOB */
+#endif
+    bi_flush(s);
+    /* Of the 10 bits for the empty block, we have already sent
+     * (10 - bi_valid) bits. The lookahead for the last real code (before
+     * the EOB of the previous block) was thus at least one plus the length
+     * of the EOB plus what we have just sent of the empty static block.
+     */
+    if (1 + s->last_eob_len + 10 - s->bi_valid < 9) {
+        send_bits(s, STATIC_TREES<<1, 3);
+        send_code(s, END_BLOCK, static_ltree);
+#ifdef DEBUG
+        s->compressed_len += 10L;
+#endif
+        bi_flush(s);
+    }
+    s->last_eob_len = 7;
+}
+
+/* ===========================================================================
+ * Determine the best encoding for the current block: dynamic trees, static
+ * trees or store, and output the encoded block to the zip file.
+ */
+void _tr_flush_block(s, buf, stored_len, eof)
+    deflate_state *s;
+    charf *buf;       /* input block, or NULL if too old */
+    ulg stored_len;   /* length of input block */
+    int eof;          /* true if this is the last block for a file */
+{
+    ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */
+    int max_blindex = 0;  /* index of last bit length code of non zero freq */
+
+    /* Build the Huffman trees unless a stored block is forced */
+    if (s->level > 0) {
+
+         /* 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 */
+        build_tree(s, (tree_desc *)(&(s->l_desc)));
+        Tracev((stderr, "\nlit data: dyn %ld, stat %ld", s->opt_len,
+                s->static_len));
+
+        build_tree(s, (tree_desc *)(&(s->d_desc)));
+        Tracev((stderr, "\ndist data: dyn %ld, stat %ld", s->opt_len,
+                s->static_len));
+        /* At this point, opt_len and static_len are the total bit lengths of
+         * the compressed block data, excluding the tree representations.
+         */
+
+        /* Build the bit length tree for the above two trees, and get the index
+         * in bl_order of the last bit length code to send.
+         */
+        max_blindex = build_bl_tree(s);
+
+        /* Determine the best encoding. Compute the block lengths in bytes. */
+        opt_lenb = (s->opt_len+3+7)>>3;
+        static_lenb = (s->static_len+3+7)>>3;
+
+        Tracev((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u ",
+                opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len,
+                s->last_lit));
+
+        if (static_lenb <= opt_lenb) opt_lenb = static_lenb;
+
+    } else {
+        Assert(buf != (char*)0, "lost buf");
+        opt_lenb = static_lenb = stored_len + 5; /* force a stored block */
+    }
+
+#ifdef FORCE_STORED
+    if (buf != (char*)0) { /* force stored block */
+#else
+    if (stored_len+4 <= opt_lenb && buf != (char*)0) {
+                       /* 4: two words for the lengths */
+#endif
+        /* The test buf != NULL is only necessary if LIT_BUFSIZE > WSIZE.
+         * Otherwise we can't have processed more than WSIZE input bytes since
+         * the last block flush, because compression would have been
+         * successful. If LIT_BUFSIZE <= WSIZE, it is never too late to
+         * transform a block into a stored block.
+         */
+        _tr_stored_block(s, buf, stored_len, eof);
+
+#ifdef FORCE_STATIC
+    } else if (static_lenb >= 0) { /* force static trees */
+#else
+    } else if (static_lenb == opt_lenb) {
+#endif
+        send_bits(s, (STATIC_TREES<<1)+eof, 3);
+        compress_block(s, (ct_data *)static_ltree, (ct_data *)static_dtree);
+#ifdef DEBUG
+        s->compressed_len += 3 + s->static_len;
+#endif
+    } else {
+        send_bits(s, (DYN_TREES<<1)+eof, 3);
+        send_all_trees(s, s->l_desc.max_code+1, s->d_desc.max_code+1,
+                       max_blindex+1);
+        compress_block(s, (ct_data *)s->dyn_ltree, (ct_data *)s->dyn_dtree);
+#ifdef DEBUG
+        s->compressed_len += 3 + s->opt_len;
+#endif
+    }
+    Assert (s->compressed_len == s->bits_sent, "bad compressed size");
+    /* The above check is made mod 2^32, for files larger than 512 MB
+     * and uLong implemented on 32 bits.
+     */
+    init_block(s);
+
+    if (eof) {
+        bi_windup(s);
+#ifdef DEBUG
+        s->compressed_len += 7;  /* align on byte boundary */
+#endif
+    }
+    Tracev((stderr,"\ncomprlen %lu(%lu) ", s->compressed_len>>3,
+           s->compressed_len-7*eof));
+}
+
+/* ===========================================================================
+ * Save the match info and tally the frequency counts. Return true if
+ * the current block must be flushed.
+ */
+int _tr_tally (s, dist, lc)
+    deflate_state *s;
+    unsigned dist;  /* distance of matched string */
+    unsigned lc;    /* match length-MIN_MATCH or unmatched char (if dist==0) */
+{
+    s->d_buf[s->last_lit] = (ush)dist;
+    s->l_buf[s->last_lit++] = (uch)lc;
+    if (dist == 0) {
+        /* lc is the unmatched char */
+        s->dyn_ltree[lc].Freq++;
+    } else {
+        s->matches++;
+        /* Here, lc is the match length - MIN_MATCH */
+        dist--;             /* dist = match distance - 1 */
+        Assert((ush)dist < (ush)MAX_DIST(s) &&
+               (ush)lc <= (ush)(MAX_MATCH-MIN_MATCH) &&
+               (ush)d_code(dist) < (ush)D_CODES,  "_tr_tally: bad match");
+
+        s->dyn_ltree[_length_code[lc]+LITERALS+1].Freq++;
+        s->dyn_dtree[d_code(dist)].Freq++;
+    }
+
+#ifdef TRUNCATE_BLOCK
+    /* Try to guess if it is profitable to stop the current block here */
+    if ((s->last_lit & 0x1fff) == 0 && s->level > 2) {
+        /* Compute an upper bound for the compressed length */
+        ulg out_length = (ulg)s->last_lit*8L;
+        ulg in_length = (ulg)((long)s->strstart - s->block_start);
+        int dcode;
+        for (dcode = 0; dcode < D_CODES; dcode++) {
+            out_length += (ulg)s->dyn_dtree[dcode].Freq *
+                (5L+extra_dbits[dcode]);
+        }
+        out_length >>= 3;
+        Tracev((stderr,"\nlast_lit %u, in %ld, out ~%ld(%ld%%) ",
+               s->last_lit, in_length, out_length,
+               100L - out_length*100L/in_length));
+        if (s->matches < s->last_lit/2 && out_length < in_length/2) return 1;
+    }
+#endif
+    return (s->last_lit == s->lit_bufsize-1);
+    /* We avoid equality with lit_bufsize because of wraparound at 64K
+     * on 16 bit machines and because stored blocks are restricted to
+     * 64K-1 bytes.
+     */
+}
+
+/* ===========================================================================
+ * Send the block data compressed using the given Huffman trees
+ */
+local void compress_block(s, ltree, dtree)
+    deflate_state *s;
+    ct_data *ltree; /* literal tree */
+    ct_data *dtree; /* distance tree */
+{
+    unsigned dist;      /* distance of matched string */
+    int lc;             /* match length or unmatched char (if dist == 0) */
+    unsigned lx = 0;    /* running index in l_buf */
+    unsigned code;      /* the code to send */
+    int extra;          /* number of extra bits to send */
+
+    if (s->last_lit != 0) do {
+        dist = s->d_buf[lx];
+        lc = s->l_buf[lx++];
+        if (dist == 0) {
+            send_code(s, lc, ltree); /* send a literal byte */
+            Tracecv(isgraph(lc), (stderr," '%c' ", lc));
+        } else {
+            /* Here, lc is the match length - MIN_MATCH */
+            code = _length_code[lc];
+            send_code(s, code+LITERALS+1, ltree); /* send the length code */
+            extra = extra_lbits[code];
+            if (extra != 0) {
+                lc -= base_length[code];
+                send_bits(s, lc, extra);       /* send the extra length bits */
+            }
+            dist--; /* dist is now the match distance - 1 */
+            code = d_code(dist);
+            Assert (code < D_CODES, "bad d_code");
+
+            send_code(s, code, dtree);       /* send the distance code */
+            extra = extra_dbits[code];
+            if (extra != 0) {
+                dist -= base_dist[code];
+                send_bits(s, dist, extra);   /* send the extra distance bits */
+            }
+        } /* literal or match pair ? */
+
+        /* Check that the overlay between pending_buf and d_buf+l_buf is ok: */
+        Assert((uInt)(s->pending) < s->lit_bufsize + 2*lx,
+               "pendingBuf overflow");
+
+    } while (lx < s->last_lit);
+
+    send_code(s, END_BLOCK, ltree);
+    s->last_eob_len = ltree[END_BLOCK].Len;
+}
+
+/* ===========================================================================
+ * Set the data type to ASCII or BINARY, using a crude approximation:
+ * binary if more than 20% of the bytes are <= 6 or >= 128, ascii otherwise.
+ * IN assertion: the fields freq of dyn_ltree are set and the total of all
+ * frequencies does not exceed 64K (to fit in an int on 16 bit machines).
+ */
+local void set_data_type(s)
+    deflate_state *s;
+{
+    int n = 0;
+    unsigned ascii_freq = 0;
+    unsigned bin_freq = 0;
+    while (n < 7)        bin_freq += s->dyn_ltree[n++].Freq;
+    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;
+}
+
+/* ===========================================================================
+ * Reverse the first len bits of a code, using straightforward code (a faster
+ * method would use a table)
+ * IN assertion: 1 <= len <= 15
+ */
+local unsigned bi_reverse(code, len)
+    unsigned code; /* the value to invert */
+    int len;       /* its bit length */
+{
+    register unsigned res = 0;
+    do {
+        res |= code & 1;
+        code >>= 1, res <<= 1;
+    } while (--len > 0);
+    return res >> 1;
+}
+
+/* ===========================================================================
+ * Flush the bit buffer, keeping at most 7 bits in it.
+ */
+local void bi_flush(s)
+    deflate_state *s;
+{
+    if (s->bi_valid == 16) {
+        put_short(s, s->bi_buf);
+        s->bi_buf = 0;
+        s->bi_valid = 0;
+    } else if (s->bi_valid >= 8) {
+        put_byte(s, (Byte)s->bi_buf);
+        s->bi_buf >>= 8;
+        s->bi_valid -= 8;
+    }
+}
+
+/* ===========================================================================
+ * Flush the bit buffer and align the output on a byte boundary
+ */
+local void bi_windup(s)
+    deflate_state *s;
+{
+    if (s->bi_valid > 8) {
+        put_short(s, s->bi_buf);
+    } else if (s->bi_valid > 0) {
+        put_byte(s, (Byte)s->bi_buf);
+    }
+    s->bi_buf = 0;
+    s->bi_valid = 0;
+#ifdef DEBUG
+    s->bits_sent = (s->bits_sent+7) & ~7;
+#endif
+}
+
+/* ===========================================================================
+ * Copy a stored block, storing first the length and its
+ * one's complement if requested.
+ */
+local void copy_block(s, buf, len, header)
+    deflate_state *s;
+    charf    *buf;    /* the input data */
+    unsigned len;     /* its length */
+    int      header;  /* true if block header must be written */
+{
+    bi_windup(s);        /* align on byte boundary */
+    s->last_eob_len = 8; /* enough lookahead for inflate */
+
+    if (header) {
+        put_short(s, (ush)len);
+        put_short(s, (ush)~len);
+#ifdef DEBUG
+        s->bits_sent += 2*16;
+#endif
+    }
+#ifdef DEBUG
+    s->bits_sent += (ulg)len<<3;
+#endif
+    while (len--) {
+        put_byte(s, *buf++);
+    }
+}
diff --git a/src/zlib/trees.h b/src/zlib/trees.h
index 1ca868b84..72facf900 100644
--- a/src/zlib/trees.h
+++ b/src/zlib/trees.h
@@ -1,128 +1,128 @@
-/* header created automatically with -DGEN_TREES_H */

-

-local const ct_data static_ltree[L_CODES+2] = {

-{{ 12},{  8}}, {{140},{  8}}, {{ 76},{  8}}, {{204},{  8}}, {{ 44},{  8}},

-{{172},{  8}}, {{108},{  8}}, {{236},{  8}}, {{ 28},{  8}}, {{156},{  8}},

-{{ 92},{  8}}, {{220},{  8}}, {{ 60},{  8}}, {{188},{  8}}, {{124},{  8}},

-{{252},{  8}}, {{  2},{  8}}, {{130},{  8}}, {{ 66},{  8}}, {{194},{  8}},

-{{ 34},{  8}}, {{162},{  8}}, {{ 98},{  8}}, {{226},{  8}}, {{ 18},{  8}},

-{{146},{  8}}, {{ 82},{  8}}, {{210},{  8}}, {{ 50},{  8}}, {{178},{  8}},

-{{114},{  8}}, {{242},{  8}}, {{ 10},{  8}}, {{138},{  8}}, {{ 74},{  8}},

-{{202},{  8}}, {{ 42},{  8}}, {{170},{  8}}, {{106},{  8}}, {{234},{  8}},

-{{ 26},{  8}}, {{154},{  8}}, {{ 90},{  8}}, {{218},{  8}}, {{ 58},{  8}},

-{{186},{  8}}, {{122},{  8}}, {{250},{  8}}, {{  6},{  8}}, {{134},{  8}},

-{{ 70},{  8}}, {{198},{  8}}, {{ 38},{  8}}, {{166},{  8}}, {{102},{  8}},

-{{230},{  8}}, {{ 22},{  8}}, {{150},{  8}}, {{ 86},{  8}}, {{214},{  8}},

-{{ 54},{  8}}, {{182},{  8}}, {{118},{  8}}, {{246},{  8}}, {{ 14},{  8}},

-{{142},{  8}}, {{ 78},{  8}}, {{206},{  8}}, {{ 46},{  8}}, {{174},{  8}},

-{{110},{  8}}, {{238},{  8}}, {{ 30},{  8}}, {{158},{  8}}, {{ 94},{  8}},

-{{222},{  8}}, {{ 62},{  8}}, {{190},{  8}}, {{126},{  8}}, {{254},{  8}},

-{{  1},{  8}}, {{129},{  8}}, {{ 65},{  8}}, {{193},{  8}}, {{ 33},{  8}},

-{{161},{  8}}, {{ 97},{  8}}, {{225},{  8}}, {{ 17},{  8}}, {{145},{  8}},

-{{ 81},{  8}}, {{209},{  8}}, {{ 49},{  8}}, {{177},{  8}}, {{113},{  8}},

-{{241},{  8}}, {{  9},{  8}}, {{137},{  8}}, {{ 73},{  8}}, {{201},{  8}},

-{{ 41},{  8}}, {{169},{  8}}, {{105},{  8}}, {{233},{  8}}, {{ 25},{  8}},

-{{153},{  8}}, {{ 89},{  8}}, {{217},{  8}}, {{ 57},{  8}}, {{185},{  8}},

-{{121},{  8}}, {{249},{  8}}, {{  5},{  8}}, {{133},{  8}}, {{ 69},{  8}},

-{{197},{  8}}, {{ 37},{  8}}, {{165},{  8}}, {{101},{  8}}, {{229},{  8}},

-{{ 21},{  8}}, {{149},{  8}}, {{ 85},{  8}}, {{213},{  8}}, {{ 53},{  8}},

-{{181},{  8}}, {{117},{  8}}, {{245},{  8}}, {{ 13},{  8}}, {{141},{  8}},

-{{ 77},{  8}}, {{205},{  8}}, {{ 45},{  8}}, {{173},{  8}}, {{109},{  8}},

-{{237},{  8}}, {{ 29},{  8}}, {{157},{  8}}, {{ 93},{  8}}, {{221},{  8}},

-{{ 61},{  8}}, {{189},{  8}}, {{125},{  8}}, {{253},{  8}}, {{ 19},{  9}},

-{{275},{  9}}, {{147},{  9}}, {{403},{  9}}, {{ 83},{  9}}, {{339},{  9}},

-{{211},{  9}}, {{467},{  9}}, {{ 51},{  9}}, {{307},{  9}}, {{179},{  9}},

-{{435},{  9}}, {{115},{  9}}, {{371},{  9}}, {{243},{  9}}, {{499},{  9}},

-{{ 11},{  9}}, {{267},{  9}}, {{139},{  9}}, {{395},{  9}}, {{ 75},{  9}},

-{{331},{  9}}, {{203},{  9}}, {{459},{  9}}, {{ 43},{  9}}, {{299},{  9}},

-{{171},{  9}}, {{427},{  9}}, {{107},{  9}}, {{363},{  9}}, {{235},{  9}},

-{{491},{  9}}, {{ 27},{  9}}, {{283},{  9}}, {{155},{  9}}, {{411},{  9}},

-{{ 91},{  9}}, {{347},{  9}}, {{219},{  9}}, {{475},{  9}}, {{ 59},{  9}},

-{{315},{  9}}, {{187},{  9}}, {{443},{  9}}, {{123},{  9}}, {{379},{  9}},

-{{251},{  9}}, {{507},{  9}}, {{  7},{  9}}, {{263},{  9}}, {{135},{  9}},

-{{391},{  9}}, {{ 71},{  9}}, {{327},{  9}}, {{199},{  9}}, {{455},{  9}},

-{{ 39},{  9}}, {{295},{  9}}, {{167},{  9}}, {{423},{  9}}, {{103},{  9}},

-{{359},{  9}}, {{231},{  9}}, {{487},{  9}}, {{ 23},{  9}}, {{279},{  9}},

-{{151},{  9}}, {{407},{  9}}, {{ 87},{  9}}, {{343},{  9}}, {{215},{  9}},

-{{471},{  9}}, {{ 55},{  9}}, {{311},{  9}}, {{183},{  9}}, {{439},{  9}},

-{{119},{  9}}, {{375},{  9}}, {{247},{  9}}, {{503},{  9}}, {{ 15},{  9}},

-{{271},{  9}}, {{143},{  9}}, {{399},{  9}}, {{ 79},{  9}}, {{335},{  9}},

-{{207},{  9}}, {{463},{  9}}, {{ 47},{  9}}, {{303},{  9}}, {{175},{  9}},

-{{431},{  9}}, {{111},{  9}}, {{367},{  9}}, {{239},{  9}}, {{495},{  9}},

-{{ 31},{  9}}, {{287},{  9}}, {{159},{  9}}, {{415},{  9}}, {{ 95},{  9}},

-{{351},{  9}}, {{223},{  9}}, {{479},{  9}}, {{ 63},{  9}}, {{319},{  9}},

-{{191},{  9}}, {{447},{  9}}, {{127},{  9}}, {{383},{  9}}, {{255},{  9}},

-{{511},{  9}}, {{  0},{  7}}, {{ 64},{  7}}, {{ 32},{  7}}, {{ 96},{  7}},

-{{ 16},{  7}}, {{ 80},{  7}}, {{ 48},{  7}}, {{112},{  7}}, {{  8},{  7}},

-{{ 72},{  7}}, {{ 40},{  7}}, {{104},{  7}}, {{ 24},{  7}}, {{ 88},{  7}},

-{{ 56},{  7}}, {{120},{  7}}, {{  4},{  7}}, {{ 68},{  7}}, {{ 36},{  7}},

-{{100},{  7}}, {{ 20},{  7}}, {{ 84},{  7}}, {{ 52},{  7}}, {{116},{  7}},

-{{  3},{  8}}, {{131},{  8}}, {{ 67},{  8}}, {{195},{  8}}, {{ 35},{  8}},

-{{163},{  8}}, {{ 99},{  8}}, {{227},{  8}}

-};

-

-local const ct_data static_dtree[D_CODES] = {

-{{ 0},{ 5}}, {{16},{ 5}}, {{ 8},{ 5}}, {{24},{ 5}}, {{ 4},{ 5}},

-{{20},{ 5}}, {{12},{ 5}}, {{28},{ 5}}, {{ 2},{ 5}}, {{18},{ 5}},

-{{10},{ 5}}, {{26},{ 5}}, {{ 6},{ 5}}, {{22},{ 5}}, {{14},{ 5}},

-{{30},{ 5}}, {{ 1},{ 5}}, {{17},{ 5}}, {{ 9},{ 5}}, {{25},{ 5}},

-{{ 5},{ 5}}, {{21},{ 5}}, {{13},{ 5}}, {{29},{ 5}}, {{ 3},{ 5}},

-{{19},{ 5}}, {{11},{ 5}}, {{27},{ 5}}, {{ 7},{ 5}}, {{23},{ 5}}

-};

-

-const uch _dist_code[DIST_CODE_LEN] = {

- 0,  1,  2,  3,  4,  4,  5,  5,  6,  6,  6,  6,  7,  7,  7,  7,  8,  8,  8,  8,

- 8,  8,  8,  8,  9,  9,  9,  9,  9,  9,  9,  9, 10, 10, 10, 10, 10, 10, 10, 10,

-10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,

-11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,

-12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 13, 13, 13, 13,

-13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,

-13, 13, 13, 13, 13, 13, 13, 13, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,

-14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,

-14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,

-14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15,

-15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,

-15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,

-15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,  0,  0, 16, 17,

-18, 18, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22,

-23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,

-24, 24, 24, 24, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,

-26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,

-26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27,

-27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,

-27, 27, 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,

-28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,

-28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,

-28, 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,

-29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,

-29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,

-29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29

-};

-

-const uch _length_code[MAX_MATCH-MIN_MATCH+1]= {

- 0,  1,  2,  3,  4,  5,  6,  7,  8,  8,  9,  9, 10, 10, 11, 11, 12, 12, 12, 12,

-13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16,

-17, 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19,

-19, 19, 19, 19, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,

-21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 22, 22, 22, 22,

-22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23,

-23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,

-24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,

-25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,

-25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 26, 26, 26, 26, 26, 26, 26, 26,

-26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,

-26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,

-27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 28

-};

-

-local const int base_length[LENGTH_CODES] = {

-0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 14, 16, 20, 24, 28, 32, 40, 48, 56,

-64, 80, 96, 112, 128, 160, 192, 224, 0

-};

-

-local const int base_dist[D_CODES] = {

-    0,     1,     2,     3,     4,     6,     8,    12,    16,    24,

-   32,    48,    64,    96,   128,   192,   256,   384,   512,   768,

- 1024,  1536,  2048,  3072,  4096,  6144,  8192, 12288, 16384, 24576

-};

-

+/* header created automatically with -DGEN_TREES_H */
+
+local const ct_data static_ltree[L_CODES+2] = {
+{{ 12},{  8}}, {{140},{  8}}, {{ 76},{  8}}, {{204},{  8}}, {{ 44},{  8}},
+{{172},{  8}}, {{108},{  8}}, {{236},{  8}}, {{ 28},{  8}}, {{156},{  8}},
+{{ 92},{  8}}, {{220},{  8}}, {{ 60},{  8}}, {{188},{  8}}, {{124},{  8}},
+{{252},{  8}}, {{  2},{  8}}, {{130},{  8}}, {{ 66},{  8}}, {{194},{  8}},
+{{ 34},{  8}}, {{162},{  8}}, {{ 98},{  8}}, {{226},{  8}}, {{ 18},{  8}},
+{{146},{  8}}, {{ 82},{  8}}, {{210},{  8}}, {{ 50},{  8}}, {{178},{  8}},
+{{114},{  8}}, {{242},{  8}}, {{ 10},{  8}}, {{138},{  8}}, {{ 74},{  8}},
+{{202},{  8}}, {{ 42},{  8}}, {{170},{  8}}, {{106},{  8}}, {{234},{  8}},
+{{ 26},{  8}}, {{154},{  8}}, {{ 90},{  8}}, {{218},{  8}}, {{ 58},{  8}},
+{{186},{  8}}, {{122},{  8}}, {{250},{  8}}, {{  6},{  8}}, {{134},{  8}},
+{{ 70},{  8}}, {{198},{  8}}, {{ 38},{  8}}, {{166},{  8}}, {{102},{  8}},
+{{230},{  8}}, {{ 22},{  8}}, {{150},{  8}}, {{ 86},{  8}}, {{214},{  8}},
+{{ 54},{  8}}, {{182},{  8}}, {{118},{  8}}, {{246},{  8}}, {{ 14},{  8}},
+{{142},{  8}}, {{ 78},{  8}}, {{206},{  8}}, {{ 46},{  8}}, {{174},{  8}},
+{{110},{  8}}, {{238},{  8}}, {{ 30},{  8}}, {{158},{  8}}, {{ 94},{  8}},
+{{222},{  8}}, {{ 62},{  8}}, {{190},{  8}}, {{126},{  8}}, {{254},{  8}},
+{{  1},{  8}}, {{129},{  8}}, {{ 65},{  8}}, {{193},{  8}}, {{ 33},{  8}},
+{{161},{  8}}, {{ 97},{  8}}, {{225},{  8}}, {{ 17},{  8}}, {{145},{  8}},
+{{ 81},{  8}}, {{209},{  8}}, {{ 49},{  8}}, {{177},{  8}}, {{113},{  8}},
+{{241},{  8}}, {{  9},{  8}}, {{137},{  8}}, {{ 73},{  8}}, {{201},{  8}},
+{{ 41},{  8}}, {{169},{  8}}, {{105},{  8}}, {{233},{  8}}, {{ 25},{  8}},
+{{153},{  8}}, {{ 89},{  8}}, {{217},{  8}}, {{ 57},{  8}}, {{185},{  8}},
+{{121},{  8}}, {{249},{  8}}, {{  5},{  8}}, {{133},{  8}}, {{ 69},{  8}},
+{{197},{  8}}, {{ 37},{  8}}, {{165},{  8}}, {{101},{  8}}, {{229},{  8}},
+{{ 21},{  8}}, {{149},{  8}}, {{ 85},{  8}}, {{213},{  8}}, {{ 53},{  8}},
+{{181},{  8}}, {{117},{  8}}, {{245},{  8}}, {{ 13},{  8}}, {{141},{  8}},
+{{ 77},{  8}}, {{205},{  8}}, {{ 45},{  8}}, {{173},{  8}}, {{109},{  8}},
+{{237},{  8}}, {{ 29},{  8}}, {{157},{  8}}, {{ 93},{  8}}, {{221},{  8}},
+{{ 61},{  8}}, {{189},{  8}}, {{125},{  8}}, {{253},{  8}}, {{ 19},{  9}},
+{{275},{  9}}, {{147},{  9}}, {{403},{  9}}, {{ 83},{  9}}, {{339},{  9}},
+{{211},{  9}}, {{467},{  9}}, {{ 51},{  9}}, {{307},{  9}}, {{179},{  9}},
+{{435},{  9}}, {{115},{  9}}, {{371},{  9}}, {{243},{  9}}, {{499},{  9}},
+{{ 11},{  9}}, {{267},{  9}}, {{139},{  9}}, {{395},{  9}}, {{ 75},{  9}},
+{{331},{  9}}, {{203},{  9}}, {{459},{  9}}, {{ 43},{  9}}, {{299},{  9}},
+{{171},{  9}}, {{427},{  9}}, {{107},{  9}}, {{363},{  9}}, {{235},{  9}},
+{{491},{  9}}, {{ 27},{  9}}, {{283},{  9}}, {{155},{  9}}, {{411},{  9}},
+{{ 91},{  9}}, {{347},{  9}}, {{219},{  9}}, {{475},{  9}}, {{ 59},{  9}},
+{{315},{  9}}, {{187},{  9}}, {{443},{  9}}, {{123},{  9}}, {{379},{  9}},
+{{251},{  9}}, {{507},{  9}}, {{  7},{  9}}, {{263},{  9}}, {{135},{  9}},
+{{391},{  9}}, {{ 71},{  9}}, {{327},{  9}}, {{199},{  9}}, {{455},{  9}},
+{{ 39},{  9}}, {{295},{  9}}, {{167},{  9}}, {{423},{  9}}, {{103},{  9}},
+{{359},{  9}}, {{231},{  9}}, {{487},{  9}}, {{ 23},{  9}}, {{279},{  9}},
+{{151},{  9}}, {{407},{  9}}, {{ 87},{  9}}, {{343},{  9}}, {{215},{  9}},
+{{471},{  9}}, {{ 55},{  9}}, {{311},{  9}}, {{183},{  9}}, {{439},{  9}},
+{{119},{  9}}, {{375},{  9}}, {{247},{  9}}, {{503},{  9}}, {{ 15},{  9}},
+{{271},{  9}}, {{143},{  9}}, {{399},{  9}}, {{ 79},{  9}}, {{335},{  9}},
+{{207},{  9}}, {{463},{  9}}, {{ 47},{  9}}, {{303},{  9}}, {{175},{  9}},
+{{431},{  9}}, {{111},{  9}}, {{367},{  9}}, {{239},{  9}}, {{495},{  9}},
+{{ 31},{  9}}, {{287},{  9}}, {{159},{  9}}, {{415},{  9}}, {{ 95},{  9}},
+{{351},{  9}}, {{223},{  9}}, {{479},{  9}}, {{ 63},{  9}}, {{319},{  9}},
+{{191},{  9}}, {{447},{  9}}, {{127},{  9}}, {{383},{  9}}, {{255},{  9}},
+{{511},{  9}}, {{  0},{  7}}, {{ 64},{  7}}, {{ 32},{  7}}, {{ 96},{  7}},
+{{ 16},{  7}}, {{ 80},{  7}}, {{ 48},{  7}}, {{112},{  7}}, {{  8},{  7}},
+{{ 72},{  7}}, {{ 40},{  7}}, {{104},{  7}}, {{ 24},{  7}}, {{ 88},{  7}},
+{{ 56},{  7}}, {{120},{  7}}, {{  4},{  7}}, {{ 68},{  7}}, {{ 36},{  7}},
+{{100},{  7}}, {{ 20},{  7}}, {{ 84},{  7}}, {{ 52},{  7}}, {{116},{  7}},
+{{  3},{  8}}, {{131},{  8}}, {{ 67},{  8}}, {{195},{  8}}, {{ 35},{  8}},
+{{163},{  8}}, {{ 99},{  8}}, {{227},{  8}}
+};
+
+local const ct_data static_dtree[D_CODES] = {
+{{ 0},{ 5}}, {{16},{ 5}}, {{ 8},{ 5}}, {{24},{ 5}}, {{ 4},{ 5}},
+{{20},{ 5}}, {{12},{ 5}}, {{28},{ 5}}, {{ 2},{ 5}}, {{18},{ 5}},
+{{10},{ 5}}, {{26},{ 5}}, {{ 6},{ 5}}, {{22},{ 5}}, {{14},{ 5}},
+{{30},{ 5}}, {{ 1},{ 5}}, {{17},{ 5}}, {{ 9},{ 5}}, {{25},{ 5}},
+{{ 5},{ 5}}, {{21},{ 5}}, {{13},{ 5}}, {{29},{ 5}}, {{ 3},{ 5}},
+{{19},{ 5}}, {{11},{ 5}}, {{27},{ 5}}, {{ 7},{ 5}}, {{23},{ 5}}
+};
+
+const uch _dist_code[DIST_CODE_LEN] = {
+ 0,  1,  2,  3,  4,  4,  5,  5,  6,  6,  6,  6,  7,  7,  7,  7,  8,  8,  8,  8,
+ 8,  8,  8,  8,  9,  9,  9,  9,  9,  9,  9,  9, 10, 10, 10, 10, 10, 10, 10, 10,
+10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
+11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
+12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 13, 13, 13, 13,
+13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+13, 13, 13, 13, 13, 13, 13, 13, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15,
+15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,  0,  0, 16, 17,
+18, 18, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22,
+23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+24, 24, 24, 24, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
+26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
+26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27,
+27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
+27, 27, 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+28, 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29
+};
+
+const uch _length_code[MAX_MATCH-MIN_MATCH+1]= {
+ 0,  1,  2,  3,  4,  5,  6,  7,  8,  8,  9,  9, 10, 10, 11, 11, 12, 12, 12, 12,
+13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16,
+17, 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19,
+19, 19, 19, 19, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 22, 22, 22, 22,
+22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23,
+23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
+25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 26, 26, 26, 26, 26, 26, 26, 26,
+26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
+26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
+27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 28
+};
+
+local const int base_length[LENGTH_CODES] = {
+0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 14, 16, 20, 24, 28, 32, 40, 48, 56,
+64, 80, 96, 112, 128, 160, 192, 224, 0
+};
+
+local const int base_dist[D_CODES] = {
+    0,     1,     2,     3,     4,     6,     8,    12,    16,    24,
+   32,    48,    64,    96,   128,   192,   256,   384,   512,   768,
+ 1024,  1536,  2048,  3072,  4096,  6144,  8192, 12288, 16384, 24576
+};
+
diff --git a/src/zlib/zconf.h b/src/zlib/zconf.h
index b849dbb63..3c21403fc 100644
--- a/src/zlib/zconf.h
+++ b/src/zlib/zconf.h
@@ -1,326 +1,326 @@
-/* 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

- */

-

-/* @(#) $Id$ */

-

-#ifndef ZCONF_H

-#define ZCONF_H

-

-/*

- * If you *really* need a unique prefix for all types and library functions,

- * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.

- */

-#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

-

-#if defined(__MSDOS__) && !defined(MSDOS)

-#  define MSDOS

-#endif

-#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)

-#  define OS2

-#endif

-#if defined(_WINDOWS) && !defined(WINDOWS)

-#  define WINDOWS

-#endif

-#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)

-#  define WIN32

-#endif

-#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)

-#  if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)

-#    ifndef SYS16BIT

-#      define SYS16BIT

-#    endif

-#  endif

-#endif

-

-/*

- * Compile with -DMAXSEG_64K if the alloc function cannot allocate more

- * than 64k bytes at a time (needed on systems with 16-bit int).

- */

-#ifdef SYS16BIT

-#  define MAXSEG_64K

-#endif

-#ifdef MSDOS

-#  define UNALIGNED_OK

-#endif

-

-#ifdef __STDC_VERSION__

-#  ifndef STDC

-#    define STDC

-#  endif

-#  if __STDC_VERSION__ >= 199901L

-#    ifndef STDC99

-#      define STDC99

-#    endif

-#  endif

-#endif

-#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))

-#  define STDC

-#endif

-#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))

-#  define STDC

-#endif

-#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))

-#  define STDC

-#endif

-#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))

-#  define STDC

-#endif

-

-#if defined(__OS400__) && !defined(STDC)    /* iSeries (formerly AS/400). */

-#  define STDC

-#endif

-

-#ifndef STDC

-#  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */

-#    define const       /* note: need a more gentle solution here */

-#  endif

-#endif

-

-/* Some Mac compilers merge all .h files incorrectly: */

-#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)

-#  define NO_DUMMY_DECL

-#endif

-

-/* Maximum value for memLevel in deflateInit2 */

-#ifndef MAX_MEM_LEVEL

-#  ifdef MAXSEG_64K

-#    define MAX_MEM_LEVEL 8

-#  else

-#    define MAX_MEM_LEVEL 9

-#  endif

-#endif

-

-/* Maximum value for windowBits in deflateInit2 and inflateInit2.

- * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files

- * created by gzip. (Files created by minigzip can still be extracted by

- * gzip.)

- */

-#ifndef MAX_WBITS

-#  define MAX_WBITS   15 /* 32K LZ77 window */

-#endif

-

-/* The memory requirements for deflate are (in bytes):

-            (1 << (windowBits+2)) +  (1 << (memLevel+9))

- that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)

- plus a few kilobytes for small objects. For example, if you want to reduce

- the default memory requirements from 256K to 128K, compile with

-     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"

- Of course this will generally degrade compression (there's no free lunch).

-

-   The memory requirements for inflate are (in bytes) 1 << windowBits

- that is, 32K for windowBits=15 (default value) plus a few kilobytes

- for small objects.

-*/

-

-                        /* Type declarations */

-

-#ifndef OF /* function prototypes */

-#  ifdef STDC

-#    define OF(args)  args

-#  else

-#    define OF(args)  ()

-#  endif

-#endif

-

-/* The following definitions for FAR are needed only for MSDOS mixed

- * model programming (small or medium model with some far allocations).

- * This was tested only with MSC; for other MSDOS compilers you may have

- * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,

- * just define FAR to be empty.

- */

-#ifdef SYS16BIT

-#  if defined(M_I86SM) || defined(M_I86MM)

-     /* MSC small or medium model */

-#    define SMALL_MEDIUM

-#    ifdef _MSC_VER

-#      define FAR _far

-#    else

-#      define FAR far

-#    endif

-#  endif

-#  if (defined(__SMALL__) || defined(__MEDIUM__))

-     /* Turbo C small or medium model */

-#    define SMALL_MEDIUM

-#    ifdef __BORLANDC__

-#      define FAR _far

-#    else

-#      define FAR far

-#    endif

-#  endif

-#endif

-

-#if defined(WINDOWS) || defined(WIN32)

-   /* If building or using zlib as a DLL, define ZLIB_DLL.

-    * This is not mandatory, but it offers a little performance increase.

-    */

-#  ifdef ZLIB_DLL

-#    if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))

-#      ifdef ZLIB_INTERNAL

-#        define ZEXTERN extern __declspec(dllexport)

-#      else

-#        define ZEXTERN extern __declspec(dllimport)

-#      endif

-#    endif

-#  endif  /* ZLIB_DLL */

-   /* If building or using zlib with the WINAPI/WINAPIV calling convention,

-    * define ZLIB_WINAPI.

-    * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.

-    */

-#  ifdef ZLIB_WINAPI

-#    ifdef FAR

-#      undef FAR

-#    endif

-#    include <windows.h>

-     /* No need for _export, use ZLIB.DEF instead. */

-     /* For complete Windows compatibility, use WINAPI, not __stdcall. */

-#    define ZEXPORT WINAPI

-#    ifdef WIN32

-#      define ZEXPORTVA WINAPIV

-#    else

-#      define ZEXPORTVA FAR CDECL

-#    endif

-#  endif

-#endif

-

-#if defined (__BEOS__)

-#  ifdef ZLIB_DLL

-#    ifdef ZLIB_INTERNAL

-#      define ZEXPORT   __declspec(dllexport)

-#      define ZEXPORTVA __declspec(dllexport)

-#    else

-#      define ZEXPORT   __declspec(dllimport)

-#      define ZEXPORTVA __declspec(dllimport)

-#    endif

-#  endif

-#endif

-

-#ifndef ZEXTERN

-#  define ZEXTERN extern

-#endif

-#ifndef ZEXPORT

-#  define ZEXPORT

-#endif

-#ifndef ZEXPORTVA

-#  define ZEXPORTVA

-#endif

-

-#ifndef FAR

-#  define FAR

-#endif

-

-#if !defined(__MACTYPES__)

-typedef unsigned char  Byte;  /* 8 bits */

-#endif

-typedef unsigned int   uInt;  /* 16 bits or more */

-typedef unsigned long  uLong; /* 32 bits or more */

-

-#ifdef SMALL_MEDIUM

-   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */

-#  define Bytef Byte FAR

-#else

-   typedef Byte  FAR Bytef;

-#endif

-typedef char  FAR charf;

-typedef int   FAR intf;

-typedef uInt  FAR uIntf;

-typedef uLong FAR uLongf;

-

-#ifdef STDC

-   typedef void const *voidpc;

-   typedef void FAR   *voidpf;

-   typedef void       *voidp;

-#else

-   typedef Byte const *voidpc;

-   typedef Byte FAR   *voidpf;

-   typedef Byte       *voidp;

-#endif

-

-#if 0           /* HAVE_UNISTD_H -- this line is updated by ./configure */

-#  include <sys/types.h> /* for off_t */

-#  include <unistd.h>    /* for SEEK_* and off_t */

-#  ifdef VMS

-#    include <unixio.h>   /* for off_t */

-#  endif

-#  define z_off_t off_t

-#endif

-#ifndef SEEK_SET

-#  define SEEK_SET        0       /* Seek from beginning of file.  */

-#  define SEEK_CUR        1       /* Seek from current position.  */

-#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */

-#endif

-#ifndef z_off_t

-#  define z_off_t long

-#endif

-

-#if defined(__OS400__)

-#  define NO_vsnprintf

-#endif

-

-#if defined(__MVS__)

-#  define NO_vsnprintf

-#  ifdef FAR

-#    undef FAR

-#  endif

-#endif

-

-/* MVS linker does not support external names larger than 8 bytes */

-#if defined(__MVS__)

-#   pragma map(deflateInit_,"DEIN")

-#   pragma map(deflateInit2_,"DEIN2")

-#   pragma map(deflateEnd,"DEEND")

-#   pragma map(deflateBound,"DEBND")

-#   pragma map(inflateInit_,"ININ")

-#   pragma map(inflateInit2_,"ININ2")

-#   pragma map(inflateEnd,"INEND")

-#   pragma map(inflateSync,"INSY")

-#   pragma map(inflateSetDictionary,"INSEDI")

-#   pragma map(compressBound,"CMBND")

-#   pragma map(inflate_table,"INTABL")

-#   pragma map(inflate_fast,"INFA")

-#   pragma map(inflate_copyright,"INCOPY")

-#endif

-

-#endif /* ZCONF_H */

+/* 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
+ */
+
+/* @(#) $Id$ */
+
+#ifndef ZCONF_H
+#define ZCONF_H
+
+/*
+ * If you *really* need a unique prefix for all types and library functions,
+ * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
+ */
+#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
+
+#if defined(__MSDOS__) && !defined(MSDOS)
+#  define MSDOS
+#endif
+#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
+#  define OS2
+#endif
+#if defined(_WINDOWS) && !defined(WINDOWS)
+#  define WINDOWS
+#endif
+#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)
+#  define WIN32
+#endif
+#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
+#  if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
+#    ifndef SYS16BIT
+#      define SYS16BIT
+#    endif
+#  endif
+#endif
+
+/*
+ * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
+ * than 64k bytes at a time (needed on systems with 16-bit int).
+ */
+#ifdef SYS16BIT
+#  define MAXSEG_64K
+#endif
+#ifdef MSDOS
+#  define UNALIGNED_OK
+#endif
+
+#ifdef __STDC_VERSION__
+#  ifndef STDC
+#    define STDC
+#  endif
+#  if __STDC_VERSION__ >= 199901L
+#    ifndef STDC99
+#      define STDC99
+#    endif
+#  endif
+#endif
+#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
+#  define STDC
+#endif
+#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
+#  define STDC
+#endif
+#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
+#  define STDC
+#endif
+#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
+#  define STDC
+#endif
+
+#if defined(__OS400__) && !defined(STDC)    /* iSeries (formerly AS/400). */
+#  define STDC
+#endif
+
+#ifndef STDC
+#  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
+#    define const       /* note: need a more gentle solution here */
+#  endif
+#endif
+
+/* Some Mac compilers merge all .h files incorrectly: */
+#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
+#  define NO_DUMMY_DECL
+#endif
+
+/* Maximum value for memLevel in deflateInit2 */
+#ifndef MAX_MEM_LEVEL
+#  ifdef MAXSEG_64K
+#    define MAX_MEM_LEVEL 8
+#  else
+#    define MAX_MEM_LEVEL 9
+#  endif
+#endif
+
+/* Maximum value for windowBits in deflateInit2 and inflateInit2.
+ * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
+ * created by gzip. (Files created by minigzip can still be extracted by
+ * gzip.)
+ */
+#ifndef MAX_WBITS
+#  define MAX_WBITS   15 /* 32K LZ77 window */
+#endif
+
+/* The memory requirements for deflate are (in bytes):
+            (1 << (windowBits+2)) +  (1 << (memLevel+9))
+ that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)
+ plus a few kilobytes for small objects. For example, if you want to reduce
+ the default memory requirements from 256K to 128K, compile with
+     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
+ Of course this will generally degrade compression (there's no free lunch).
+
+   The memory requirements for inflate are (in bytes) 1 << windowBits
+ that is, 32K for windowBits=15 (default value) plus a few kilobytes
+ for small objects.
+*/
+
+                        /* Type declarations */
+
+#ifndef OF /* function prototypes */
+#  ifdef STDC
+#    define OF(args)  args
+#  else
+#    define OF(args)  ()
+#  endif
+#endif
+
+/* The following definitions for FAR are needed only for MSDOS mixed
+ * model programming (small or medium model with some far allocations).
+ * This was tested only with MSC; for other MSDOS compilers you may have
+ * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,
+ * just define FAR to be empty.
+ */
+#ifdef SYS16BIT
+#  if defined(M_I86SM) || defined(M_I86MM)
+     /* MSC small or medium model */
+#    define SMALL_MEDIUM
+#    ifdef _MSC_VER
+#      define FAR _far
+#    else
+#      define FAR far
+#    endif
+#  endif
+#  if (defined(__SMALL__) || defined(__MEDIUM__))
+     /* Turbo C small or medium model */
+#    define SMALL_MEDIUM
+#    ifdef __BORLANDC__
+#      define FAR _far
+#    else
+#      define FAR far
+#    endif
+#  endif
+#endif
+
+#if defined(WINDOWS) || defined(WIN32)
+   /* If building or using zlib as a DLL, define ZLIB_DLL.
+    * This is not mandatory, but it offers a little performance increase.
+    */
+#  ifdef ZLIB_DLL
+#    if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
+#      ifdef ZLIB_INTERNAL
+#        define ZEXTERN extern __declspec(dllexport)
+#      else
+#        define ZEXTERN extern __declspec(dllimport)
+#      endif
+#    endif
+#  endif  /* ZLIB_DLL */
+   /* If building or using zlib with the WINAPI/WINAPIV calling convention,
+    * define ZLIB_WINAPI.
+    * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
+    */
+#  ifdef ZLIB_WINAPI
+#    ifdef FAR
+#      undef FAR
+#    endif
+#    include <windows.h>
+     /* No need for _export, use ZLIB.DEF instead. */
+     /* For complete Windows compatibility, use WINAPI, not __stdcall. */
+#    define ZEXPORT WINAPI
+#    ifdef WIN32
+#      define ZEXPORTVA WINAPIV
+#    else
+#      define ZEXPORTVA FAR CDECL
+#    endif
+#  endif
+#endif
+
+#if defined (__BEOS__)
+#  ifdef ZLIB_DLL
+#    ifdef ZLIB_INTERNAL
+#      define ZEXPORT   __declspec(dllexport)
+#      define ZEXPORTVA __declspec(dllexport)
+#    else
+#      define ZEXPORT   __declspec(dllimport)
+#      define ZEXPORTVA __declspec(dllimport)
+#    endif
+#  endif
+#endif
+
+#ifndef ZEXTERN
+#  define ZEXTERN extern
+#endif
+#ifndef ZEXPORT
+#  define ZEXPORT
+#endif
+#ifndef ZEXPORTVA
+#  define ZEXPORTVA
+#endif
+
+#ifndef FAR
+#  define FAR
+#endif
+
+#if !defined(__MACTYPES__)
+typedef unsigned char  Byte;  /* 8 bits */
+#endif
+typedef unsigned int   uInt;  /* 16 bits or more */
+typedef unsigned long  uLong; /* 32 bits or more */
+
+#ifdef SMALL_MEDIUM
+   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
+#  define Bytef Byte FAR
+#else
+   typedef Byte  FAR Bytef;
+#endif
+typedef char  FAR charf;
+typedef int   FAR intf;
+typedef uInt  FAR uIntf;
+typedef uLong FAR uLongf;
+
+#ifdef STDC
+   typedef void const *voidpc;
+   typedef void FAR   *voidpf;
+   typedef void       *voidp;
+#else
+   typedef Byte const *voidpc;
+   typedef Byte FAR   *voidpf;
+   typedef Byte       *voidp;
+#endif
+
+#if 0           /* HAVE_UNISTD_H -- this line is updated by ./configure */
+#  include <sys/types.h> /* for off_t */
+#  include <unistd.h>    /* for SEEK_* and off_t */
+#  ifdef VMS
+#    include <unixio.h>   /* for off_t */
+#  endif
+#  define z_off_t off_t
+#endif
+#ifndef SEEK_SET
+#  define SEEK_SET        0       /* Seek from beginning of file.  */
+#  define SEEK_CUR        1       /* Seek from current position.  */
+#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
+#endif
+#ifndef z_off_t
+#  define z_off_t long
+#endif
+
+#if defined(__OS400__)
+#  define NO_vsnprintf
+#endif
+
+#if defined(__MVS__)
+#  define NO_vsnprintf
+#  ifdef FAR
+#    undef FAR
+#  endif
+#endif
+
+/* MVS linker does not support external names larger than 8 bytes */
+#if defined(__MVS__)
+#   pragma map(deflateInit_,"DEIN")
+#   pragma map(deflateInit2_,"DEIN2")
+#   pragma map(deflateEnd,"DEEND")
+#   pragma map(deflateBound,"DEBND")
+#   pragma map(inflateInit_,"ININ")
+#   pragma map(inflateInit2_,"ININ2")
+#   pragma map(inflateEnd,"INEND")
+#   pragma map(inflateSync,"INSY")
+#   pragma map(inflateSetDictionary,"INSEDI")
+#   pragma map(compressBound,"CMBND")
+#   pragma map(inflate_table,"INTABL")
+#   pragma map(inflate_fast,"INFA")
+#   pragma map(inflate_copyright,"INCOPY")
+#endif
+
+#endif /* ZCONF_H */
diff --git a/src/zlib/zlib.h b/src/zlib/zlib.h
index e067b127b..b4ddd3439 100644
--- a/src/zlib/zlib.h
+++ b/src/zlib/zlib.h
@@ -1,1200 +1,1200 @@
-/* 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

-  warranty.  In no event will the authors be held liable for any damages

-  arising from the use of this software.

-

-  Permission is granted to anyone to use this software for any purpose,

-  including commercial applications, and to alter it and redistribute it

-  freely, subject to the following restrictions:

-

-  1. The origin of this software must not be misrepresented; you must not

-     claim that you wrote the original software. If you use this software

-     in a product, an acknowledgment in the product documentation would be

-     appreciated but is not required.

-  2. Altered source versions must be plainly marked as such, and must not be

-     misrepresented as being the original software.

-  3. This notice may not be removed or altered from any source distribution.

-

-  Jean-loup Gailly        Mark Adler

-  jloup@gzip.org          madler@alumni.caltech.edu

-

-

-  The data format used by the zlib library is described by RFCs (Request for

-  Comments) 1950 to 1952 in the files http://www.ietf.org/rfc/rfc1950.txt

-  (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format).

-*/

-

-#ifndef ZLIB_H

-#define ZLIB_H

-

-#include "zconf.h"

-

-#ifdef __cplusplus

-extern "C" {

-#endif

-

-#define ZLIB_VERSION "1.2.2"

-#define ZLIB_VERNUM 0x1220

-

-/*

-     The 'zlib' compression library provides in-memory compression and

-  decompression functions, including integrity checks of the uncompressed

-  data.  This version of the library supports only one compression method

-  (deflation) but other algorithms will be added later and will have the same

-  stream interface.

-

-     Compression can be done in a single step if the buffers are large

-  enough (for example if an input file is mmap'ed), or can be done by

-  repeated calls of the compression function.  In the latter case, the

-  application must provide more input and/or consume the output

-  (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

-  with an interface similar to that of stdio using the functions that start

-  with "gz".  The gzip format is different from the zlib format.  gzip is a

-  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-

-  file compression on file systems, has a larger header than zlib to maintain

-  directory information, and uses a different, slower check method than zlib.

-

-     The library does not install any signal handler. The decoder checks

-  the consistency of the compressed data, so the library should never

-  crash even in case of corrupted input.

-*/

-

-typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));

-typedef void   (*free_func)  OF((voidpf opaque, voidpf address));

-

-struct internal_state;

-

-typedef struct z_stream_s {

-    Bytef    *next_in;  /* next input byte */

-    uInt     avail_in;  /* number of bytes available at next_in */

-    uLong    total_in;  /* total nb of input bytes read so far */

-

-    Bytef    *next_out; /* next output byte should be put there */

-    uInt     avail_out; /* remaining free space at next_out */

-    uLong    total_out; /* total nb of bytes output so far */

-

-    char     *msg;      /* last error message, NULL if no error */

-    struct internal_state FAR *state; /* not visible by applications */

-

-    alloc_func zalloc;  /* used to allocate the internal state */

-    free_func  zfree;   /* used to free the internal state */

-    voidpf     opaque;  /* private data object passed to zalloc and zfree */

-

-    int     data_type;  /* best guess about the data type: ascii or binary */

-    uLong   adler;      /* adler32 value of the uncompressed data */

-    uLong   reserved;   /* reserved for future use */

-} z_stream;

-

-typedef z_stream FAR *z_streamp;

-

-/*

-   The application must update next_in and avail_in when avail_in has

-   dropped to zero. It must update next_out and avail_out when avail_out

-   has dropped to zero. The application must initialize zalloc, zfree and

-   opaque before calling the init function. All other fields are set by the

-   compression library and must not be updated by the application.

-

-   The opaque value provided by the application will be passed as the first

-   parameter for calls of zalloc and zfree. This can be useful for custom

-   memory management. The compression library attaches no meaning to the

-   opaque value.

-

-   zalloc must return Z_NULL if there is not enough memory for the object.

-   If zlib is used in a multi-threaded application, zalloc and zfree must be

-   thread safe.

-

-   On 16-bit systems, the functions zalloc and zfree must be able to allocate

-   exactly 65536 bytes, but will not be required to allocate more than this

-   if the symbol MAXSEG_64K is defined (see zconf.h). WARNING: On MSDOS,

-   pointers returned by zalloc for objects of exactly 65536 bytes *must*

-   have their offset normalized to zero. The default allocation function

-   provided by this library ensures this (see zutil.c). To reduce memory

-   requirements and avoid any allocation of 64K objects, at the expense of

-   compression ratio, compile the library with -DMAX_WBITS=14 (see zconf.h).

-

-   The fields total_in and total_out can be used for statistics or

-   progress reports. After compression, total_in holds the total size of

-   the uncompressed data and may be saved for use in the decompressor

-   (particularly if the decompressor wants to decompress everything in

-   a single step).

-*/

-

-                        /* constants */

-

-#define Z_NO_FLUSH      0

-#define Z_PARTIAL_FLUSH 1 /* will be removed, use Z_SYNC_FLUSH instead */

-#define Z_SYNC_FLUSH    2

-#define Z_FULL_FLUSH    3

-#define Z_FINISH        4

-#define Z_BLOCK         5

-/* Allowed flush values; see deflate() and inflate() below for details */

-

-#define Z_OK            0

-#define Z_STREAM_END    1

-#define Z_NEED_DICT     2

-#define Z_ERRNO        (-1)

-#define Z_STREAM_ERROR (-2)

-#define Z_DATA_ERROR   (-3)

-#define Z_MEM_ERROR    (-4)

-#define Z_BUF_ERROR    (-5)

-#define Z_VERSION_ERROR (-6)

-/* Return codes for the compression/decompression functions. Negative

- * values are errors, positive values are used for special but normal events.

- */

-

-#define Z_NO_COMPRESSION         0

-#define Z_BEST_SPEED             1

-#define Z_BEST_COMPRESSION       9

-#define Z_DEFAULT_COMPRESSION  (-1)

-/* compression levels */

-

-#define Z_FILTERED            1

-#define Z_HUFFMAN_ONLY        2

-#define Z_RLE                 3

-#define Z_DEFAULT_STRATEGY    0

-/* compression strategy; see deflateInit2() below for details */

-

-#define Z_BINARY   0

-#define Z_ASCII    1

-#define Z_UNKNOWN  2

-/* Possible values of the data_type field (though see inflate()) */

-

-#define Z_DEFLATED   8

-/* The deflate compression method (the only one supported in this version) */

-

-#define Z_NULL  0  /* for initializing zalloc, zfree, opaque */

-

-#define zlib_version zlibVersion()

-/* for compatibility with versions < 1.0.2 */

-

-                        /* basic functions */

-

-ZEXTERN const char * ZEXPORT zlibVersion OF((void));

-/* The application can compare zlibVersion and ZLIB_VERSION for consistency.

-   If the first character differs, the library code actually used is

-   not compatible with the zlib.h header file used by the application.

-   This check is automatically made by deflateInit and inflateInit.

- */

-

-/*

-ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level));

-

-     Initializes the internal stream state for compression. The fields

-   zalloc, zfree and opaque must be initialized before by the caller.

-   If zalloc and zfree are set to Z_NULL, deflateInit updates them to

-   use default allocation functions.

-

-     The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:

-   1 gives best speed, 9 gives best compression, 0 gives no compression at

-   all (the input data is simply copied a block at a time).

-   Z_DEFAULT_COMPRESSION requests a default compromise between speed and

-   compression (currently equivalent to level 6).

-

-     deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not

-   enough memory, Z_STREAM_ERROR if level is not a valid compression level,

-   Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible

-   with the version assumed by the caller (ZLIB_VERSION).

-   msg is set to null if there is no error message.  deflateInit does not

-   perform any compression: this will be done by deflate().

-*/

-

-

-ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));

-/*

-    deflate compresses as much data as possible, and stops when the input

-  buffer becomes empty or the output buffer becomes full. It may introduce some

-  output latency (reading input without producing any output) except when

-  forced to flush.

-

-    The detailed semantics are as follows. deflate performs one or both of the

-  following actions:

-

-  - Compress more input starting at next_in and update next_in and avail_in

-    accordingly. If not all input can be processed (because there is not

-    enough room in the output buffer), next_in and avail_in are updated and

-    processing will resume at this point for the next call of deflate().

-

-  - Provide more output starting at next_out and update next_out and avail_out

-    accordingly. This action is forced if the parameter flush is non zero.

-    Forcing flush frequently degrades the compression ratio, so this parameter

-    should be set only when necessary (in interactive applications).

-    Some output may be provided even if flush is not set.

-

-  Before the call of deflate(), the application should ensure that at least

-  one of the actions is possible, by providing more input and/or consuming

-  more output, and updating avail_in or avail_out accordingly; avail_out

-  should never be zero before the call. The application can consume the

-  compressed output when it wants, for example when the output buffer is full

-  (avail_out == 0), or after each call of deflate(). If deflate returns Z_OK

-  and with zero avail_out, it must be called again after making room in the

-  output buffer because there might be more output pending.

-

-    If the parameter flush is set to Z_SYNC_FLUSH, all pending output is

-  flushed to the output buffer and the output is aligned on a byte boundary, so

-  that the decompressor can get all input data available so far. (In particular

-  avail_in is zero after the call if enough output space has been provided

-  before the call.)  Flushing may degrade compression for some compression

-  algorithms and so it should be used only when necessary.

-

-    If flush is set to Z_FULL_FLUSH, all output is flushed as with

-  Z_SYNC_FLUSH, and the compression state is reset so that decompression can

-  restart from this point if previous compressed data has been damaged or if

-  random access is desired. Using Z_FULL_FLUSH too often can seriously degrade

-  the compression.

-

-    If deflate returns with avail_out == 0, this function must be called again

-  with the same value of the flush parameter and more output space (updated

-  avail_out), until the flush is complete (deflate returns with non-zero

-  avail_out). In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that

-  avail_out is greater than six to avoid repeated flush markers due to

-  avail_out == 0 on return.

-

-    If the parameter flush is set to Z_FINISH, pending input is processed,

-  pending output is flushed and deflate returns with Z_STREAM_END if there

-  was enough output space; if deflate returns with Z_OK, this function must be

-  called again with Z_FINISH and more output space (updated avail_out) but no

-  more input data, until it returns with Z_STREAM_END or an error. After

-  deflate has returned Z_STREAM_END, the only possible operations on the

-  stream are deflateReset or deflateEnd.

-

-    Z_FINISH can be used immediately after deflateInit if all the compression

-  is to be done in a single step. In this case, avail_out must be at least

-  the value returned by deflateBound (see below). If deflate does not return

-  Z_STREAM_END, then it must be called again as described above.

-

-    deflate() sets strm->adler to the adler32 checksum of all input read

-  so far (that is, total_in bytes).

-

-    deflate() may update data_type if it can make a good guess about

-  the input data type (Z_ASCII or Z_BINARY). In doubt, the data is considered

-  binary. This field is only for information purposes and does not affect

-  the compression algorithm in any manner.

-

-    deflate() returns Z_OK if some progress has been made (more input

-  processed or more output produced), Z_STREAM_END if all input has been

-  consumed and all output has been produced (only when flush is set to

-  Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example

-  if next_in or next_out was NULL), Z_BUF_ERROR if no progress is possible

-  (for example avail_in or avail_out was zero). Note that Z_BUF_ERROR is not

-  fatal, and deflate() can be called again with more input and more output

-  space to continue compressing.

-*/

-

-

-ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm));

-/*

-     All dynamically allocated data structures for this stream are freed.

-   This function discards any unprocessed input and does not flush any

-   pending output.

-

-     deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the

-   stream state was inconsistent, Z_DATA_ERROR if the stream was freed

-   prematurely (some input or output was discarded). In the error case,

-   msg may be set but then points to a static string (which must not be

-   deallocated).

-*/

-

-

-/*

-ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));

-

-     Initializes the internal stream state for decompression. The fields

-   next_in, avail_in, zalloc, zfree and opaque must be initialized before by

-   the caller. If next_in is not Z_NULL and avail_in is large enough (the exact

-   value depends on the compression method), inflateInit determines the

-   compression method from the zlib header and allocates all data structures

-   accordingly; otherwise the allocation will be deferred to the first call of

-   inflate.  If zalloc and zfree are set to Z_NULL, inflateInit updates them to

-   use default allocation functions.

-

-     inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough

-   memory, Z_VERSION_ERROR if the zlib library version is incompatible with the

-   version assumed by the caller.  msg is set to null if there is no error

-   message. inflateInit does not perform any decompression apart from reading

-   the zlib header if present: this will be done by inflate().  (So next_in and

-   avail_in may be modified, but next_out and avail_out are unchanged.)

-*/

-

-

-ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));

-/*

-    inflate decompresses as much data as possible, and stops when the input

-  buffer becomes empty or the output buffer becomes full. It may introduce

-  some output latency (reading input without producing any output) except when

-  forced to flush.

-

-  The detailed semantics are as follows. inflate performs one or both of the

-  following actions:

-

-  - Decompress more input starting at next_in and update next_in and avail_in

-    accordingly. If not all input can be processed (because there is not

-    enough room in the output buffer), next_in is updated and processing

-    will resume at this point for the next call of inflate().

-

-  - Provide more output starting at next_out and update next_out and avail_out

-    accordingly.  inflate() provides as much output as possible, until there

-    is no more input data or no more space in the output buffer (see below

-    about the flush parameter).

-

-  Before the call of inflate(), the application should ensure that at least

-  one of the actions is possible, by providing more input and/or consuming

-  more output, and updating the next_* and avail_* values accordingly.

-  The application can consume the uncompressed output when it wants, for

-  example when the output buffer is full (avail_out == 0), or after each

-  call of inflate(). If inflate returns Z_OK and with zero avail_out, it

-  must be called again after making room in the output buffer because there

-  might be more output pending.

-

-    The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH,

-  Z_FINISH, or Z_BLOCK. Z_SYNC_FLUSH requests that inflate() flush as much

-  output as possible to the output buffer. Z_BLOCK requests that inflate() stop

-  if and when it get to the next deflate block boundary. When decoding the zlib

-  or gzip format, this will cause inflate() to return immediately after the

-  header and before the first block. When doing a raw inflate, inflate() will

-  go ahead and process the first block, and will return when it gets to the end

-  of that block, or when it runs out of data.

-

-    The Z_BLOCK option assists in appending to or combining deflate streams.

-  Also to assist in this, on return inflate() will set strm->data_type to the

-  number of unused bits in the last byte taken from strm->next_in, plus 64

-  if inflate() is currently decoding the last block in the deflate stream,

-  plus 128 if inflate() returned immediately after decoding an end-of-block

-  code or decoding the complete header up to just before the first byte of the

-  deflate stream. The end-of-block will not be indicated until all of the

-  uncompressed data from that block has been written to strm->next_out.  The

-  number of unused bits may in general be greater than seven, except when

-  bit 7 of data_type is set, in which case the number of unused bits will be

-  less than eight.

-

-    inflate() should normally be called until it returns Z_STREAM_END or an

-  error. However if all decompression is to be performed in a single step

-  (a single call of inflate), the parameter flush should be set to

-  Z_FINISH. In this case all pending input is processed and all pending

-  output is flushed; avail_out must be large enough to hold all the

-  uncompressed data. (The size of the uncompressed data may have been saved

-  by the compressor for this purpose.) The next operation on this stream must

-  be inflateEnd to deallocate the decompression state. The use of Z_FINISH

-  is never required, but can be used to inform inflate that a faster approach

-  may be used for the single inflate() call.

-

-     In this implementation, inflate() always flushes as much output as

-  possible to the output buffer, and always uses the faster approach on the

-  first call. So the only effect of the flush parameter in this implementation

-  is on the return value of inflate(), as noted below, or when it returns early

-  because Z_BLOCK is used.

-

-     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,

-  total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described

-  below. At the end of the stream, inflate() checks that its computed adler32

-  checksum is equal to that saved by the compressor and returns Z_STREAM_END

-  only if the checksum is correct.

-

-    inflate() will decompress and check either zlib-wrapped or gzip-wrapped

-  deflate data.  The header type is detected automatically.  Any information

-  contained in the gzip header is not retained, so applications that need that

-  information should instead use raw inflate, see inflateInit2() below, or

-  inflateBack() and perform their own processing of the gzip header and

-  trailer.

-

-    inflate() returns Z_OK if some progress has been made (more input processed

-  or more output produced), Z_STREAM_END if the end of the compressed data has

-  been reached and all uncompressed output has been produced, Z_NEED_DICT if a

-  preset dictionary is needed at this point, Z_DATA_ERROR if the input data was

-  corrupted (input stream not conforming to the zlib format or incorrect check

-  value), Z_STREAM_ERROR if the stream structure was inconsistent (for example

-  if next_in or next_out was NULL), Z_MEM_ERROR if there was not enough memory,

-  Z_BUF_ERROR if no progress is possible or if there was not enough room in the

-  output buffer when Z_FINISH is used. Note that Z_BUF_ERROR is not fatal, and

-  inflate() can be called again with more input and more output space to

-  continue decompressing. If Z_DATA_ERROR is returned, the application may then

-  call inflateSync() to look for a good compression block if a partial recovery

-  of the data is desired.

-*/

-

-

-ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));

-/*

-     All dynamically allocated data structures for this stream are freed.

-   This function discards any unprocessed input and does not flush any

-   pending output.

-

-     inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state

-   was inconsistent. In the error case, msg may be set but then points to a

-   static string (which must not be deallocated).

-*/

-

-                        /* Advanced functions */

-

-/*

-    The following functions are needed only in some special applications.

-*/

-

-/*

-ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,

-                                     int  level,

-                                     int  method,

-                                     int  windowBits,

-                                     int  memLevel,

-                                     int  strategy));

-

-     This is another version of deflateInit with more compression options. The

-   fields next_in, zalloc, zfree and opaque must be initialized before by

-   the caller.

-

-     The method parameter is the compression method. It must be Z_DEFLATED in

-   this version of the library.

-

-     The windowBits parameter is the base two logarithm of the window size

-   (the size of the history buffer). It should be in the range 8..15 for this

-   version of the library. Larger values of this parameter result in better

-   compression at the expense of memory usage. The default value is 15 if

-   deflateInit is used instead.

-

-     windowBits can also be -8..-15 for raw deflate. In this case, -windowBits

-   determines the window size. deflate() will then generate raw deflate data

-   with no zlib header or trailer, and will not compute an adler32 check value.

-

-     windowBits can also be greater than 15 for optional gzip encoding. Add

-   16 to windowBits to write a simple gzip header and trailer around the

-   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

-   for the internal compression state. memLevel=1 uses minimum memory but

-   is slow and reduces compression ratio; memLevel=9 uses maximum memory

-   for optimal speed. The default value is 8. See zconf.h for total memory

-   usage as a function of windowBits and memLevel.

-

-     The strategy parameter is used to tune the compression algorithm. Use the

-   value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a

-   filter (or predictor), Z_HUFFMAN_ONLY to force Huffman encoding only (no

-   string match), or Z_RLE to limit match distances to one (run-length

-   encoding). Filtered data consists mostly of small values with a somewhat

-   random distribution. In this case, the compression algorithm is tuned to

-   compress them better. The effect of Z_FILTERED is to force more Huffman

-   coding and less string matching; it is somewhat intermediate between

-   Z_DEFAULT and Z_HUFFMAN_ONLY. Z_RLE is designed to be almost as fast as

-   Z_HUFFMAN_ONLY, but give better compression for PNG image data. The strategy

-   parameter only affects the compression ratio but not the correctness of the

-   compressed output even if it is not set appropriately.

-

-      deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough

-   memory, Z_STREAM_ERROR if a parameter is invalid (such as an invalid

-   method). msg is set to null if there is no error message.  deflateInit2 does

-   not perform any compression: this will be done by deflate().

-*/

-

-ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,

-                                             const Bytef *dictionary,

-                                             uInt  dictLength));

-/*

-     Initializes the compression dictionary from the given byte sequence

-   without producing any compressed output. This function must be called

-   immediately after deflateInit, deflateInit2 or deflateReset, before any

-   call of deflate. The compressor and decompressor must use exactly the same

-   dictionary (see inflateSetDictionary).

-

-     The dictionary should consist of strings (byte sequences) that are likely

-   to be encountered later in the data to be compressed, with the most commonly

-   used strings preferably put towards the end of the dictionary. Using a

-   dictionary is most useful when the data to be compressed is short and can be

-   predicted with good accuracy; the data can then be compressed better than

-   with the default empty dictionary.

-

-     Depending on the size of the compression data structures selected by

-   deflateInit or deflateInit2, a part of the dictionary may in effect be

-   discarded, for example if the dictionary is larger than the window size in

-   deflate or deflate2. Thus the strings most likely to be useful should be

-   put at the end of the dictionary, not at the front.

-

-     Upon return of this function, strm->adler is set to the adler32 value

-   of the dictionary; the decompressor may later use this value to determine

-   which dictionary has been used by the compressor. (The adler32 value

-   applies to the whole dictionary even if only a subset of the dictionary is

-   actually used by the compressor.) If a raw deflate was requested, then the

-   adler32 value is not computed and strm->adler is not set.

-

-     deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a

-   parameter is invalid (such as NULL dictionary) or the stream state is

-   inconsistent (for example if deflate has already been called for this stream

-   or if the compression method is bsort). deflateSetDictionary does not

-   perform any compression: this will be done by deflate().

-*/

-

-ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,

-                                    z_streamp source));

-/*

-     Sets the destination stream as a complete copy of the source stream.

-

-     This function can be useful when several compression strategies will be

-   tried, for example when there are several ways of pre-processing the input

-   data with a filter. The streams that will be discarded should then be freed

-   by calling deflateEnd.  Note that deflateCopy duplicates the internal

-   compression state which can be quite large, so this strategy is slow and

-   can consume lots of memory.

-

-     deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not

-   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent

-   (such as zalloc being NULL). msg is left unchanged in both source and

-   destination.

-*/

-

-ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));

-/*

-     This function is equivalent to deflateEnd followed by deflateInit,

-   but does not free and reallocate all the internal compression state.

-   The stream will keep the same compression level and any other attributes

-   that may have been set by deflateInit2.

-

-      deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source

-   stream state was inconsistent (such as zalloc or state being NULL).

-*/

-

-ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,

-                                      int level,

-                                      int strategy));

-/*

-     Dynamically update the compression level and compression strategy.  The

-   interpretation of level and strategy is as in deflateInit2.  This can be

-   used to switch between compression and straight copy of the input data, or

-   to switch to a different kind of input data requiring a different

-   strategy. If the compression level is changed, the input available so far

-   is compressed with the old level (and may be flushed); the new level will

-   take effect only at the next call of deflate().

-

-     Before the call of deflateParams, the stream state must be set as for

-   a call of deflate(), since the currently available input may have to

-   be compressed and flushed. In particular, strm->avail_out must be non-zero.

-

-     deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source

-   stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR

-   if strm->avail_out was zero.

-*/

-

-ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm,

-                                       uLong sourceLen));

-/*

-     deflateBound() returns an upper bound on the compressed size after

-   deflation of sourceLen bytes.  It must be called after deflateInit()

-   or deflateInit2().  This would be used to allocate an output buffer

-   for deflation in a single pass, and so would be called before deflate().

-*/

-

-ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm,

-                                     int bits,

-                                     int value));

-/*

-     deflatePrime() inserts bits in the deflate output stream.  The intent

-  is that this function is used to start off the deflate output with the

-  bits leftover from a previous deflate stream when appending to it.  As such,

-  this function can only be used for raw deflate, and must be used before the

-  first deflate() call after a deflateInit2() or deflateReset().  bits must be

-  less than or equal to 16, and that many of the least significant bits of

-  value will be inserted in the output.

-

-      deflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source

-   stream state was inconsistent.

-*/

-

-/*

-ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,

-                                     int  windowBits));

-

-     This is another version of inflateInit with an extra parameter. The

-   fields next_in, avail_in, zalloc, zfree and opaque must be initialized

-   before by the caller.

-

-     The windowBits parameter is the base two logarithm of the maximum window

-   size (the size of the history buffer).  It should be in the range 8..15 for

-   this version of the library. The default value is 15 if inflateInit is used

-   instead. windowBits must be greater than or equal to the windowBits value

-   provided to deflateInit2() while compressing, or it must be equal to 15 if

-   deflateInit2() was not used. If a compressed stream with a larger window

-   size is given as input, inflate() will return with the error code

-   Z_DATA_ERROR instead of trying to allocate a larger window.

-

-     windowBits can also be -8..-15 for raw inflate. In this case, -windowBits

-   determines the window size. inflate() will then process raw deflate data,

-   not looking for a zlib or gzip header, not generating a check value, and not

-   looking for any check values for comparison at the end of the stream. This

-   is for use with other formats that use the deflate compressed data format

-   such as zip.  Those formats provide their own check values. If a custom

-   format is developed using the raw deflate format for compressed data, it is

-   recommended that a check value such as an adler32 or a crc32 be applied to

-   the uncompressed data as is done in the zlib, gzip, and zip formats.  For

-   most applications, the zlib format should be used as is. Note that comments

-   above on the use in deflateInit2() applies to the magnitude of windowBits.

-

-     windowBits can also be greater than 15 for optional gzip decoding. Add

-   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

-   memory, Z_STREAM_ERROR if a parameter is invalid (such as a negative

-   memLevel). msg is set to null if there is no error message.  inflateInit2

-   does not perform any decompression apart from reading the zlib header if

-   present: this will be done by inflate(). (So next_in and avail_in may be

-   modified, but next_out and avail_out are unchanged.)

-*/

-

-ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,

-                                             const Bytef *dictionary,

-                                             uInt  dictLength));

-/*

-     Initializes the decompression dictionary from the given uncompressed byte

-   sequence. This function must be called immediately after a call of inflate

-   if this call returned Z_NEED_DICT. The dictionary chosen by the compressor

-   can be determined from the adler32 value returned by this call of

-   inflate. The compressor and decompressor must use exactly the same

-   dictionary (see deflateSetDictionary).

-

-     inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a

-   parameter is invalid (such as NULL dictionary) or the stream state is

-   inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the

-   expected one (incorrect adler32 value). inflateSetDictionary does not

-   perform any decompression: this will be done by subsequent calls of

-   inflate().

-*/

-

-ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));

-/*

-    Skips invalid compressed data until a full flush point (see above the

-  description of deflate with Z_FULL_FLUSH) can be found, or until all

-  available input is skipped. No output is provided.

-

-    inflateSync returns Z_OK if a full flush point has been found, Z_BUF_ERROR

-  if no more input was provided, Z_DATA_ERROR if no flush point has been found,

-  or Z_STREAM_ERROR if the stream structure was inconsistent. In the success

-  case, the application may save the current current value of total_in which

-  indicates where valid compressed data was found. In the error case, the

-  application may repeatedly call inflateSync, providing more input each time,

-  until success or end of the input data.

-*/

-

-ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,

-                                    z_streamp source));

-/*

-     Sets the destination stream as a complete copy of the source stream.

-

-     This function can be useful when randomly accessing a large stream.  The

-   first pass through the stream can periodically record the inflate state,

-   allowing restarting inflate at those points when randomly accessing the

-   stream.

-

-     inflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not

-   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent

-   (such as zalloc being NULL). msg is left unchanged in both source and

-   destination.

-*/

-

-ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));

-/*

-     This function is equivalent to inflateEnd followed by inflateInit,

-   but does not free and reallocate all the internal decompression state.

-   The stream will keep attributes that may have been set by inflateInit2.

-

-      inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source

-   stream state was inconsistent (such as zalloc or state being NULL).

-*/

-

-/*

-ZEXTERN int ZEXPORT inflateBackInit OF((z_stream FAR *strm, int windowBits,

-                                        unsigned char FAR *window));

-

-     Initialize the internal stream state for decompression using inflateBack()

-   calls.  The fields zalloc, zfree and opaque in strm must be initialized

-   before the call.  If zalloc and zfree are Z_NULL, then the default library-

-   derived memory allocation routines are used.  windowBits is the base two

-   logarithm of the window size, in the range 8..15.  window is a caller

-   supplied buffer of that size.  Except for special applications where it is

-   assured that deflate was used with small window sizes, windowBits must be 15

-   and a 32K byte window must be supplied to be able to decompress general

-   deflate streams.

-

-     See inflateBack() for the usage of these routines.

-

-     inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of

-   the paramaters are invalid, Z_MEM_ERROR if the internal state could not

-   be allocated, or Z_VERSION_ERROR if the version of the library does not

-   match the version of the header file.

-*/

-

-typedef unsigned (*in_func) OF((void FAR *, unsigned char FAR * FAR *));

-typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned));

-

-ZEXTERN int ZEXPORT inflateBack OF((z_stream FAR *strm,

-                                    in_func in, void FAR *in_desc,

-                                    out_func out, void FAR *out_desc));

-/*

-     inflateBack() does a raw inflate with a single call using a call-back

-   interface for input and output.  This is more efficient than inflate() for

-   file i/o applications in that it avoids copying between the output and the

-   sliding window by simply making the window itself the output buffer.  This

-   function trusts the application to not change the output buffer passed by

-   the output function, at least until inflateBack() returns.

-

-     inflateBackInit() must be called first to allocate the internal state

-   and to initialize the state with the user-provided window buffer.

-   inflateBack() may then be used multiple times to inflate a complete, raw

-   deflate stream with each call.  inflateBackEnd() is then called to free

-   the allocated state.

-

-     A raw deflate stream is one with no zlib or gzip header or trailer.

-   This routine would normally be used in a utility that reads zip or gzip

-   files and writes out uncompressed files.  The utility would decode the

-   header and process the trailer on its own, hence this routine expects

-   only the raw deflate stream to decompress.  This is different from the

-   normal behavior of inflate(), which expects either a zlib or gzip header and

-   trailer around the deflate stream.

-

-     inflateBack() uses two subroutines supplied by the caller that are then

-   called by inflateBack() for input and output.  inflateBack() calls those

-   routines until it reads a complete deflate stream and writes out all of the

-   uncompressed data, or until it encounters an error.  The function's

-   parameters and return types are defined above in the in_func and out_func

-   typedefs.  inflateBack() will call in(in_desc, &buf) which should return the

-   number of bytes of provided input, and a pointer to that input in buf.  If

-   there is no input available, in() must return zero--buf is ignored in that

-   case--and inflateBack() will return a buffer error.  inflateBack() will call

-   out(out_desc, buf, len) to write the uncompressed data buf[0..len-1].  out()

-   should return zero on success, or non-zero on failure.  If out() returns

-   non-zero, inflateBack() will return with an error.  Neither in() nor out()

-   are permitted to change the contents of the window provided to

-   inflateBackInit(), which is also the buffer that out() uses to write from.

-   The length written by out() will be at most the window size.  Any non-zero

-   amount of input may be provided by in().

-

-     For convenience, inflateBack() can be provided input on the first call by

-   setting strm->next_in and strm->avail_in.  If that input is exhausted, then

-   in() will be called.  Therefore strm->next_in must be initialized before

-   calling inflateBack().  If strm->next_in is Z_NULL, then in() will be called

-   immediately for input.  If strm->next_in is not Z_NULL, then strm->avail_in

-   must also be initialized, and then if strm->avail_in is not zero, input will

-   initially be taken from strm->next_in[0 .. strm->avail_in - 1].

-

-     The in_desc and out_desc parameters of inflateBack() is passed as the

-   first parameter of in() and out() respectively when they are called.  These

-   descriptors can be optionally used to pass any information that the caller-

-   supplied in() and out() functions need to do their job.

-

-     On return, inflateBack() will set strm->next_in and strm->avail_in to

-   pass back any unused input that was provided by the last in() call.  The

-   return values of inflateBack() can be Z_STREAM_END on success, Z_BUF_ERROR

-   if in() or out() returned an error, Z_DATA_ERROR if there was a format

-   error in the deflate stream (in which case strm->msg is set to indicate the

-   nature of the error), or Z_STREAM_ERROR if the stream was not properly

-   initialized.  In the case of Z_BUF_ERROR, an input or output error can be

-   distinguished using strm->next_in which will be Z_NULL only if in() returned

-   an error.  If strm->next is not Z_NULL, then the Z_BUF_ERROR was due to

-   out() returning non-zero.  (in() will always be called before out(), so

-   strm->next_in is assured to be defined if out() returns non-zero.)  Note

-   that inflateBack() cannot return Z_OK.

-*/

-

-ZEXTERN int ZEXPORT inflateBackEnd OF((z_stream FAR *strm));

-/*

-     All memory allocated by inflateBackInit() is freed.

-

-     inflateBackEnd() returns Z_OK on success, or Z_STREAM_ERROR if the stream

-   state was inconsistent.

-*/

-

-ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void));

-/* Return flags indicating compile-time options.

-

-    Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other:

-     1.0: size of uInt

-     3.2: size of uLong

-     5.4: size of voidpf (pointer)

-     7.6: size of z_off_t

-

-    Compiler, assembler, and debug options:

-     8: DEBUG

-     9: ASMV or ASMINF -- use ASM code

-     10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention

-     11: 0 (reserved)

-

-    One-time table building (smaller code, but not thread-safe if true):

-     12: BUILDFIXED -- build static block decoding tables when needed

-     13: DYNAMIC_CRC_TABLE -- build CRC calculation tables when needed

-     14,15: 0 (reserved)

-

-    Library content (indicates missing functionality):

-     16: NO_GZCOMPRESS -- gz* functions cannot compress (to avoid linking

-                          deflate code when not needed)

-     17: NO_GZIP -- deflate can't write gzip streams, and inflate can't detect

-                    and decode gzip streams (to avoid linking crc code)

-     18-19: 0 (reserved)

-

-    Operation variations (changes in library functionality):

-     20: PKZIP_BUG_WORKAROUND -- slightly more permissive inflate

-     21: FASTEST -- deflate algorithm with only one, lowest compression level

-     22,23: 0 (reserved)

-

-    The sprintf variant used by gzprintf (zero is best):

-     24: 0 = vs*, 1 = s* -- 1 means limited to 20 arguments after the format

-     25: 0 = *nprintf, 1 = *printf -- 1 means gzprintf() not secure!

-     26: 0 = returns value, 1 = void -- 1 means inferred string length returned

-

-    Remainder:

-     27-31: 0 (reserved)

- */

-

-

-                        /* utility functions */

-

-/*

-     The following utility functions are implemented on top of the

-   basic stream-oriented functions. To simplify the interface, some

-   default options are assumed (compression level and memory usage,

-   standard memory allocation functions). The source code of these

-   utility functions can easily be modified if you need special options.

-*/

-

-ZEXTERN int ZEXPORT compress OF((Bytef *dest,   uLongf *destLen,

-                                 const Bytef *source, uLong sourceLen));

-/*

-     Compresses the source buffer into the destination buffer.  sourceLen is

-   the byte length of the source buffer. Upon entry, destLen is the total

-   size of the destination buffer, which must be at least the value returned

-   by compressBound(sourceLen). Upon exit, destLen is the actual size of the

-   compressed buffer.

-     This function can be used to compress a whole file at once if the

-   input file is mmap'ed.

-     compress returns Z_OK if success, Z_MEM_ERROR if there was not

-   enough memory, Z_BUF_ERROR if there was not enough room in the output

-   buffer.

-*/

-

-ZEXTERN int ZEXPORT compress2 OF((Bytef *dest,   uLongf *destLen,

-                                  const Bytef *source, uLong sourceLen,

-                                  int level));

-/*

-     Compresses the source buffer into the destination buffer. The level

-   parameter has the same meaning as in deflateInit.  sourceLen is the byte

-   length of the source buffer. Upon entry, destLen is the total size of the

-   destination buffer, which must be at least the value returned by

-   compressBound(sourceLen). Upon exit, destLen is the actual size of the

-   compressed buffer.

-

-     compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough

-   memory, Z_BUF_ERROR if there was not enough room in the output buffer,

-   Z_STREAM_ERROR if the level parameter is invalid.

-*/

-

-ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen));

-/*

-     compressBound() returns an upper bound on the compressed size after

-   compress() or compress2() on sourceLen bytes.  It would be used before

-   a compress() or compress2() call to allocate the destination buffer.

-*/

-

-ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,

-                                   const Bytef *source, uLong sourceLen));

-/*

-     Decompresses the source buffer into the destination buffer.  sourceLen is

-   the byte length of the source buffer. Upon entry, destLen is the total

-   size of the destination buffer, which must be large enough to hold the

-   entire uncompressed data. (The size of the uncompressed data must have

-   been saved previously by the compressor and transmitted to the decompressor

-   by some mechanism outside the scope of this compression library.)

-   Upon exit, destLen is the actual size of the compressed buffer.

-     This function can be used to decompress a whole file at once if the

-   input file is mmap'ed.

-

-     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not

-   enough memory, Z_BUF_ERROR if there was not enough room in the output

-   buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete.

-*/

-

-

-typedef voidp gzFile;

-

-ZEXTERN gzFile ZEXPORT gzopen  OF((const char *path, const char *mode));

-/*

-     Opens a gzip (.gz) file for reading or writing. The mode parameter

-   is as in fopen ("rb" or "wb") but can also include a compression level

-   ("wb9") or a strategy: 'f' for filtered data as in "wb6f", 'h' for

-   Huffman only compression as in "wb1h", or 'R' for run-length encoding

-   as in "wb1R". (See the description of deflateInit2 for more information

-   about the strategy parameter.)

-

-     gzopen can be used to read a file which is not in gzip format; in this

-   case gzread will directly read from the file without decompression.

-

-     gzopen returns NULL if the file could not be opened or if there was

-   insufficient memory to allocate the (de)compression state; errno

-   can be checked to distinguish the two cases (if errno is zero, the

-   zlib error is Z_MEM_ERROR).  */

-

-ZEXTERN gzFile ZEXPORT gzdopen  OF((int fd, const char *mode));

-/*

-     gzdopen() associates a gzFile with the file descriptor fd.  File

-   descriptors are obtained from calls like open, dup, creat, pipe or

-   fileno (in the file has been previously opened with fopen).

-   The mode parameter is as in gzopen.

-     The next call of gzclose on the returned gzFile will also close the

-   file descriptor fd, just like fclose(fdopen(fd), mode) closes the file

-   descriptor fd. If you want to keep fd open, use gzdopen(dup(fd), mode).

-     gzdopen returns NULL if there was insufficient memory to allocate

-   the (de)compression state.

-*/

-

-ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));

-/*

-     Dynamically update the compression level or strategy. See the description

-   of deflateInit2 for the meaning of these parameters.

-     gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not

-   opened for writing.

-*/

-

-ZEXTERN int ZEXPORT    gzread  OF((gzFile file, voidp buf, unsigned len));

-/*

-     Reads the given number of uncompressed bytes from the compressed file.

-   If the input file was not in gzip format, gzread copies the given number

-   of bytes into the buffer.

-     gzread returns the number of uncompressed bytes actually read (0 for

-   end of file, -1 for error). */

-

-ZEXTERN int ZEXPORT    gzwrite OF((gzFile file,

-                                   voidpc buf, unsigned len));

-/*

-     Writes the given number of uncompressed bytes into the compressed file.

-   gzwrite returns the number of uncompressed bytes actually written

-   (0 in case of error).

-*/

-

-ZEXTERN int ZEXPORTVA   gzprintf OF((gzFile file, const char *format, ...));

-/*

-     Converts, formats, and writes the args to the compressed file under

-   control of the format string, as in fprintf. gzprintf returns the number of

-   uncompressed bytes actually written (0 in case of error).  The number of

-   uncompressed bytes written is limited to 4095. The caller should assure that

-   this limit is not exceeded. If it is exceeded, then gzprintf() will return

-   return an error (0) with nothing written. In this case, there may also be a

-   buffer overflow with unpredictable consequences, which is possible only if

-   zlib was compiled with the insecure functions sprintf() or vsprintf()

-   because the secure snprintf() or vsnprintf() functions were not available.

-*/

-

-ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));

-/*

-      Writes the given null-terminated string to the compressed file, excluding

-   the terminating null character.

-      gzputs returns the number of characters written, or -1 in case of error.

-*/

-

-ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len));

-/*

-      Reads bytes from the compressed file until len-1 characters are read, or

-   a newline character is read and transferred to buf, or an end-of-file

-   condition is encountered.  The string is then terminated with a null

-   character.

-      gzgets returns buf, or Z_NULL in case of error.

-*/

-

-ZEXTERN int ZEXPORT    gzputc OF((gzFile file, int c));

-/*

-      Writes c, converted to an unsigned char, into the compressed file.

-   gzputc returns the value that was written, or -1 in case of error.

-*/

-

-ZEXTERN int ZEXPORT    gzgetc OF((gzFile file));

-/*

-      Reads one byte from the compressed file. gzgetc returns this byte

-   or -1 in case of end of file or error.

-*/

-

-ZEXTERN int ZEXPORT    gzungetc OF((int c, gzFile file));

-/*

-      Push one character back onto the stream to be read again later.

-   Only one character of push-back is allowed.  gzungetc() returns the

-   character pushed, or -1 on failure.  gzungetc() will fail if a

-   character has been pushed but not read yet, or if c is -1. The pushed

-   character will be discarded if the stream is repositioned with gzseek()

-   or gzrewind().

-*/

-

-ZEXTERN int ZEXPORT    gzflush OF((gzFile file, int flush));

-/*

-     Flushes all pending output into the compressed file. The parameter

-   flush is as in the deflate() function. The return value is the zlib

-   error number (see function gzerror below). gzflush returns Z_OK if

-   the flush parameter is Z_FINISH and all output could be flushed.

-     gzflush should be called only when strictly necessary because it can

-   degrade compression.

-*/

-

-ZEXTERN z_off_t ZEXPORT    gzseek OF((gzFile file,

-                                      z_off_t offset, int whence));

-/*

-      Sets the starting position for the next gzread or gzwrite on the

-   given compressed file. The offset represents a number of bytes in the

-   uncompressed data stream. The whence parameter is defined as in lseek(2);

-   the value SEEK_END is not supported.

-     If the file is opened for reading, this function is emulated but can be

-   extremely slow. If the file is opened for writing, only forward seeks are

-   supported; gzseek then compresses a sequence of zeroes up to the new

-   starting position.

-

-      gzseek returns the resulting offset location as measured in bytes from

-   the beginning of the uncompressed stream, or -1 in case of error, in

-   particular if the file is opened for writing and the new starting position

-   would be before the current position.

-*/

-

-ZEXTERN int ZEXPORT    gzrewind OF((gzFile file));

-/*

-     Rewinds the given file. This function is supported only for reading.

-

-   gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)

-*/

-

-ZEXTERN z_off_t ZEXPORT    gztell OF((gzFile file));

-/*

-     Returns the starting position for the next gzread or gzwrite on the

-   given compressed file. This position represents a number of bytes in the

-   uncompressed data stream.

-

-   gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)

-*/

-

-ZEXTERN int ZEXPORT gzeof OF((gzFile file));

-/*

-     Returns 1 when EOF has previously been detected reading the given

-   input stream, otherwise zero.

-*/

-

-ZEXTERN int ZEXPORT    gzclose OF((gzFile file));

-/*

-     Flushes all pending output if necessary, closes the compressed file

-   and deallocates all the (de)compression state. The return value is the zlib

-   error number (see function gzerror below).

-*/

-

-ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum));

-/*

-     Returns the error message for the last error which occurred on the

-   given compressed file. errnum is set to zlib error number. If an

-   error occurred in the file system and not in the compression library,

-   errnum is set to Z_ERRNO and the application may consult errno

-   to get the exact error code.

-*/

-

-ZEXTERN void ZEXPORT gzclearerr OF((gzFile file));

-/*

-     Clears the error and end-of-file flags for file. This is analogous to the

-   clearerr() function in stdio. This is useful for continuing to read a gzip

-   file that is being written concurrently.

-*/

-

-                        /* checksum functions */

-

-/*

-     These functions are not related to compression but are exported

-   anyway because they might be useful in applications using the

-   compression library.

-*/

-

-ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));

-

-/*

-     Update a running Adler-32 checksum with the bytes buf[0..len-1] and

-   return the updated checksum. If buf is NULL, this function returns

-   the required initial value for the checksum.

-   An Adler-32 checksum is almost as reliable as a CRC32 but can be computed

-   much faster. Usage example:

-

-     uLong adler = adler32(0L, Z_NULL, 0);

-

-     while (read_buffer(buffer, length) != EOF) {

-       adler = adler32(adler, buffer, length);

-     }

-     if (adler != original_adler) error();

-*/

-

-ZEXTERN uLong ZEXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));

-/*

-     Update a running crc with the bytes buf[0..len-1] and return the updated

-   crc. If buf is NULL, this function returns the required initial value

-   for the crc. Pre- and post-conditioning (one's complement) is performed

-   within this function so it shouldn't be done by the application.

-   Usage example:

-

-     uLong crc = crc32(0L, Z_NULL, 0);

-

-     while (read_buffer(buffer, length) != EOF) {

-       crc = crc32(crc, buffer, length);

-     }

-     if (crc != original_crc) error();

-*/

-

-

-                        /* various hacks, don't look :) */

-

-/* deflateInit and inflateInit are macros to allow checking the zlib version

- * and the compiler's view of z_stream:

- */

-ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level,

-                                     const char *version, int stream_size));

-ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm,

-                                     const char *version, int stream_size));

-ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int  level, int  method,

-                                      int windowBits, int memLevel,

-                                      int strategy, const char *version,

-                                      int stream_size));

-ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int  windowBits,

-                                      const char *version, int stream_size));

-ZEXTERN int ZEXPORT inflateBackInit_ OF((z_stream FAR *strm, int windowBits,

-                                         unsigned char FAR *window,

-                                         const char *version,

-                                         int stream_size));

-#define deflateInit(strm, level) \

-        deflateInit_((strm), (level),       ZLIB_VERSION, sizeof(z_stream))

-#define inflateInit(strm) \

-        inflateInit_((strm),                ZLIB_VERSION, sizeof(z_stream))

-#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \

-        deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\

-                      (strategy),           ZLIB_VERSION, sizeof(z_stream))

-#define inflateInit2(strm, windowBits) \

-        inflateInit2_((strm), (windowBits), ZLIB_VERSION, sizeof(z_stream))

-#define inflateBackInit(strm, windowBits, window) \

-        inflateBackInit_((strm), (windowBits), (window), \

-        ZLIB_VERSION, sizeof(z_stream))

-

-

-#if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL)

-    struct internal_state {int dummy;}; /* hack for buggy compilers */

-#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));

-

-#ifdef __cplusplus

-}

-#endif

-

-#endif /* ZLIB_H */

+/* 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
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  Jean-loup Gailly        Mark Adler
+  jloup@gzip.org          madler@alumni.caltech.edu
+
+
+  The data format used by the zlib library is described by RFCs (Request for
+  Comments) 1950 to 1952 in the files http://www.ietf.org/rfc/rfc1950.txt
+  (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format).
+*/
+
+#ifndef ZLIB_H
+#define ZLIB_H
+
+#include "zconf.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define ZLIB_VERSION "1.2.2"
+#define ZLIB_VERNUM 0x1220
+
+/*
+     The 'zlib' compression library provides in-memory compression and
+  decompression functions, including integrity checks of the uncompressed
+  data.  This version of the library supports only one compression method
+  (deflation) but other algorithms will be added later and will have the same
+  stream interface.
+
+     Compression can be done in a single step if the buffers are large
+  enough (for example if an input file is mmap'ed), or can be done by
+  repeated calls of the compression function.  In the latter case, the
+  application must provide more input and/or consume the output
+  (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
+  with an interface similar to that of stdio using the functions that start
+  with "gz".  The gzip format is different from the zlib format.  gzip is a
+  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-
+  file compression on file systems, has a larger header than zlib to maintain
+  directory information, and uses a different, slower check method than zlib.
+
+     The library does not install any signal handler. The decoder checks
+  the consistency of the compressed data, so the library should never
+  crash even in case of corrupted input.
+*/
+
+typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));
+typedef void   (*free_func)  OF((voidpf opaque, voidpf address));
+
+struct internal_state;
+
+typedef struct z_stream_s {
+    Bytef    *next_in;  /* next input byte */
+    uInt     avail_in;  /* number of bytes available at next_in */
+    uLong    total_in;  /* total nb of input bytes read so far */
+
+    Bytef    *next_out; /* next output byte should be put there */
+    uInt     avail_out; /* remaining free space at next_out */
+    uLong    total_out; /* total nb of bytes output so far */
+
+    char     *msg;      /* last error message, NULL if no error */
+    struct internal_state FAR *state; /* not visible by applications */
+
+    alloc_func zalloc;  /* used to allocate the internal state */
+    free_func  zfree;   /* used to free the internal state */
+    voidpf     opaque;  /* private data object passed to zalloc and zfree */
+
+    int     data_type;  /* best guess about the data type: ascii or binary */
+    uLong   adler;      /* adler32 value of the uncompressed data */
+    uLong   reserved;   /* reserved for future use */
+} z_stream;
+
+typedef z_stream FAR *z_streamp;
+
+/*
+   The application must update next_in and avail_in when avail_in has
+   dropped to zero. It must update next_out and avail_out when avail_out
+   has dropped to zero. The application must initialize zalloc, zfree and
+   opaque before calling the init function. All other fields are set by the
+   compression library and must not be updated by the application.
+
+   The opaque value provided by the application will be passed as the first
+   parameter for calls of zalloc and zfree. This can be useful for custom
+   memory management. The compression library attaches no meaning to the
+   opaque value.
+
+   zalloc must return Z_NULL if there is not enough memory for the object.
+   If zlib is used in a multi-threaded application, zalloc and zfree must be
+   thread safe.
+
+   On 16-bit systems, the functions zalloc and zfree must be able to allocate
+   exactly 65536 bytes, but will not be required to allocate more than this
+   if the symbol MAXSEG_64K is defined (see zconf.h). WARNING: On MSDOS,
+   pointers returned by zalloc for objects of exactly 65536 bytes *must*
+   have their offset normalized to zero. The default allocation function
+   provided by this library ensures this (see zutil.c). To reduce memory
+   requirements and avoid any allocation of 64K objects, at the expense of
+   compression ratio, compile the library with -DMAX_WBITS=14 (see zconf.h).
+
+   The fields total_in and total_out can be used for statistics or
+   progress reports. After compression, total_in holds the total size of
+   the uncompressed data and may be saved for use in the decompressor
+   (particularly if the decompressor wants to decompress everything in
+   a single step).
+*/
+
+                        /* constants */
+
+#define Z_NO_FLUSH      0
+#define Z_PARTIAL_FLUSH 1 /* will be removed, use Z_SYNC_FLUSH instead */
+#define Z_SYNC_FLUSH    2
+#define Z_FULL_FLUSH    3
+#define Z_FINISH        4
+#define Z_BLOCK         5
+/* Allowed flush values; see deflate() and inflate() below for details */
+
+#define Z_OK            0
+#define Z_STREAM_END    1
+#define Z_NEED_DICT     2
+#define Z_ERRNO        (-1)
+#define Z_STREAM_ERROR (-2)
+#define Z_DATA_ERROR   (-3)
+#define Z_MEM_ERROR    (-4)
+#define Z_BUF_ERROR    (-5)
+#define Z_VERSION_ERROR (-6)
+/* Return codes for the compression/decompression functions. Negative
+ * values are errors, positive values are used for special but normal events.
+ */
+
+#define Z_NO_COMPRESSION         0
+#define Z_BEST_SPEED             1
+#define Z_BEST_COMPRESSION       9
+#define Z_DEFAULT_COMPRESSION  (-1)
+/* compression levels */
+
+#define Z_FILTERED            1
+#define Z_HUFFMAN_ONLY        2
+#define Z_RLE                 3
+#define Z_DEFAULT_STRATEGY    0
+/* compression strategy; see deflateInit2() below for details */
+
+#define Z_BINARY   0
+#define Z_ASCII    1
+#define Z_UNKNOWN  2
+/* Possible values of the data_type field (though see inflate()) */
+
+#define Z_DEFLATED   8
+/* The deflate compression method (the only one supported in this version) */
+
+#define Z_NULL  0  /* for initializing zalloc, zfree, opaque */
+
+#define zlib_version zlibVersion()
+/* for compatibility with versions < 1.0.2 */
+
+                        /* basic functions */
+
+ZEXTERN const char * ZEXPORT zlibVersion OF((void));
+/* The application can compare zlibVersion and ZLIB_VERSION for consistency.
+   If the first character differs, the library code actually used is
+   not compatible with the zlib.h header file used by the application.
+   This check is automatically made by deflateInit and inflateInit.
+ */
+
+/*
+ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level));
+
+     Initializes the internal stream state for compression. The fields
+   zalloc, zfree and opaque must be initialized before by the caller.
+   If zalloc and zfree are set to Z_NULL, deflateInit updates them to
+   use default allocation functions.
+
+     The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:
+   1 gives best speed, 9 gives best compression, 0 gives no compression at
+   all (the input data is simply copied a block at a time).
+   Z_DEFAULT_COMPRESSION requests a default compromise between speed and
+   compression (currently equivalent to level 6).
+
+     deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not
+   enough memory, Z_STREAM_ERROR if level is not a valid compression level,
+   Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible
+   with the version assumed by the caller (ZLIB_VERSION).
+   msg is set to null if there is no error message.  deflateInit does not
+   perform any compression: this will be done by deflate().
+*/
+
+
+ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
+/*
+    deflate compresses as much data as possible, and stops when the input
+  buffer becomes empty or the output buffer becomes full. It may introduce some
+  output latency (reading input without producing any output) except when
+  forced to flush.
+
+    The detailed semantics are as follows. deflate performs one or both of the
+  following actions:
+
+  - Compress more input starting at next_in and update next_in and avail_in
+    accordingly. If not all input can be processed (because there is not
+    enough room in the output buffer), next_in and avail_in are updated and
+    processing will resume at this point for the next call of deflate().
+
+  - Provide more output starting at next_out and update next_out and avail_out
+    accordingly. This action is forced if the parameter flush is non zero.
+    Forcing flush frequently degrades the compression ratio, so this parameter
+    should be set only when necessary (in interactive applications).
+    Some output may be provided even if flush is not set.
+
+  Before the call of deflate(), the application should ensure that at least
+  one of the actions is possible, by providing more input and/or consuming
+  more output, and updating avail_in or avail_out accordingly; avail_out
+  should never be zero before the call. The application can consume the
+  compressed output when it wants, for example when the output buffer is full
+  (avail_out == 0), or after each call of deflate(). If deflate returns Z_OK
+  and with zero avail_out, it must be called again after making room in the
+  output buffer because there might be more output pending.
+
+    If the parameter flush is set to Z_SYNC_FLUSH, all pending output is
+  flushed to the output buffer and the output is aligned on a byte boundary, so
+  that the decompressor can get all input data available so far. (In particular
+  avail_in is zero after the call if enough output space has been provided
+  before the call.)  Flushing may degrade compression for some compression
+  algorithms and so it should be used only when necessary.
+
+    If flush is set to Z_FULL_FLUSH, all output is flushed as with
+  Z_SYNC_FLUSH, and the compression state is reset so that decompression can
+  restart from this point if previous compressed data has been damaged or if
+  random access is desired. Using Z_FULL_FLUSH too often can seriously degrade
+  the compression.
+
+    If deflate returns with avail_out == 0, this function must be called again
+  with the same value of the flush parameter and more output space (updated
+  avail_out), until the flush is complete (deflate returns with non-zero
+  avail_out). In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that
+  avail_out is greater than six to avoid repeated flush markers due to
+  avail_out == 0 on return.
+
+    If the parameter flush is set to Z_FINISH, pending input is processed,
+  pending output is flushed and deflate returns with Z_STREAM_END if there
+  was enough output space; if deflate returns with Z_OK, this function must be
+  called again with Z_FINISH and more output space (updated avail_out) but no
+  more input data, until it returns with Z_STREAM_END or an error. After
+  deflate has returned Z_STREAM_END, the only possible operations on the
+  stream are deflateReset or deflateEnd.
+
+    Z_FINISH can be used immediately after deflateInit if all the compression
+  is to be done in a single step. In this case, avail_out must be at least
+  the value returned by deflateBound (see below). If deflate does not return
+  Z_STREAM_END, then it must be called again as described above.
+
+    deflate() sets strm->adler to the adler32 checksum of all input read
+  so far (that is, total_in bytes).
+
+    deflate() may update data_type if it can make a good guess about
+  the input data type (Z_ASCII or Z_BINARY). In doubt, the data is considered
+  binary. This field is only for information purposes and does not affect
+  the compression algorithm in any manner.
+
+    deflate() returns Z_OK if some progress has been made (more input
+  processed or more output produced), Z_STREAM_END if all input has been
+  consumed and all output has been produced (only when flush is set to
+  Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example
+  if next_in or next_out was NULL), Z_BUF_ERROR if no progress is possible
+  (for example avail_in or avail_out was zero). Note that Z_BUF_ERROR is not
+  fatal, and deflate() can be called again with more input and more output
+  space to continue compressing.
+*/
+
+
+ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm));
+/*
+     All dynamically allocated data structures for this stream are freed.
+   This function discards any unprocessed input and does not flush any
+   pending output.
+
+     deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the
+   stream state was inconsistent, Z_DATA_ERROR if the stream was freed
+   prematurely (some input or output was discarded). In the error case,
+   msg may be set but then points to a static string (which must not be
+   deallocated).
+*/
+
+
+/*
+ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
+
+     Initializes the internal stream state for decompression. The fields
+   next_in, avail_in, zalloc, zfree and opaque must be initialized before by
+   the caller. If next_in is not Z_NULL and avail_in is large enough (the exact
+   value depends on the compression method), inflateInit determines the
+   compression method from the zlib header and allocates all data structures
+   accordingly; otherwise the allocation will be deferred to the first call of
+   inflate.  If zalloc and zfree are set to Z_NULL, inflateInit updates them to
+   use default allocation functions.
+
+     inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
+   version assumed by the caller.  msg is set to null if there is no error
+   message. inflateInit does not perform any decompression apart from reading
+   the zlib header if present: this will be done by inflate().  (So next_in and
+   avail_in may be modified, but next_out and avail_out are unchanged.)
+*/
+
+
+ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
+/*
+    inflate decompresses as much data as possible, and stops when the input
+  buffer becomes empty or the output buffer becomes full. It may introduce
+  some output latency (reading input without producing any output) except when
+  forced to flush.
+
+  The detailed semantics are as follows. inflate performs one or both of the
+  following actions:
+
+  - Decompress more input starting at next_in and update next_in and avail_in
+    accordingly. If not all input can be processed (because there is not
+    enough room in the output buffer), next_in is updated and processing
+    will resume at this point for the next call of inflate().
+
+  - Provide more output starting at next_out and update next_out and avail_out
+    accordingly.  inflate() provides as much output as possible, until there
+    is no more input data or no more space in the output buffer (see below
+    about the flush parameter).
+
+  Before the call of inflate(), the application should ensure that at least
+  one of the actions is possible, by providing more input and/or consuming
+  more output, and updating the next_* and avail_* values accordingly.
+  The application can consume the uncompressed output when it wants, for
+  example when the output buffer is full (avail_out == 0), or after each
+  call of inflate(). If inflate returns Z_OK and with zero avail_out, it
+  must be called again after making room in the output buffer because there
+  might be more output pending.
+
+    The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH,
+  Z_FINISH, or Z_BLOCK. Z_SYNC_FLUSH requests that inflate() flush as much
+  output as possible to the output buffer. Z_BLOCK requests that inflate() stop
+  if and when it get to the next deflate block boundary. When decoding the zlib
+  or gzip format, this will cause inflate() to return immediately after the
+  header and before the first block. When doing a raw inflate, inflate() will
+  go ahead and process the first block, and will return when it gets to the end
+  of that block, or when it runs out of data.
+
+    The Z_BLOCK option assists in appending to or combining deflate streams.
+  Also to assist in this, on return inflate() will set strm->data_type to the
+  number of unused bits in the last byte taken from strm->next_in, plus 64
+  if inflate() is currently decoding the last block in the deflate stream,
+  plus 128 if inflate() returned immediately after decoding an end-of-block
+  code or decoding the complete header up to just before the first byte of the
+  deflate stream. The end-of-block will not be indicated until all of the
+  uncompressed data from that block has been written to strm->next_out.  The
+  number of unused bits may in general be greater than seven, except when
+  bit 7 of data_type is set, in which case the number of unused bits will be
+  less than eight.
+
+    inflate() should normally be called until it returns Z_STREAM_END or an
+  error. However if all decompression is to be performed in a single step
+  (a single call of inflate), the parameter flush should be set to
+  Z_FINISH. In this case all pending input is processed and all pending
+  output is flushed; avail_out must be large enough to hold all the
+  uncompressed data. (The size of the uncompressed data may have been saved
+  by the compressor for this purpose.) The next operation on this stream must
+  be inflateEnd to deallocate the decompression state. The use of Z_FINISH
+  is never required, but can be used to inform inflate that a faster approach
+  may be used for the single inflate() call.
+
+     In this implementation, inflate() always flushes as much output as
+  possible to the output buffer, and always uses the faster approach on the
+  first call. So the only effect of the flush parameter in this implementation
+  is on the return value of inflate(), as noted below, or when it returns early
+  because Z_BLOCK is used.
+
+     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,
+  total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described
+  below. At the end of the stream, inflate() checks that its computed adler32
+  checksum is equal to that saved by the compressor and returns Z_STREAM_END
+  only if the checksum is correct.
+
+    inflate() will decompress and check either zlib-wrapped or gzip-wrapped
+  deflate data.  The header type is detected automatically.  Any information
+  contained in the gzip header is not retained, so applications that need that
+  information should instead use raw inflate, see inflateInit2() below, or
+  inflateBack() and perform their own processing of the gzip header and
+  trailer.
+
+    inflate() returns Z_OK if some progress has been made (more input processed
+  or more output produced), Z_STREAM_END if the end of the compressed data has
+  been reached and all uncompressed output has been produced, Z_NEED_DICT if a
+  preset dictionary is needed at this point, Z_DATA_ERROR if the input data was
+  corrupted (input stream not conforming to the zlib format or incorrect check
+  value), Z_STREAM_ERROR if the stream structure was inconsistent (for example
+  if next_in or next_out was NULL), Z_MEM_ERROR if there was not enough memory,
+  Z_BUF_ERROR if no progress is possible or if there was not enough room in the
+  output buffer when Z_FINISH is used. Note that Z_BUF_ERROR is not fatal, and
+  inflate() can be called again with more input and more output space to
+  continue decompressing. If Z_DATA_ERROR is returned, the application may then
+  call inflateSync() to look for a good compression block if a partial recovery
+  of the data is desired.
+*/
+
+
+ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
+/*
+     All dynamically allocated data structures for this stream are freed.
+   This function discards any unprocessed input and does not flush any
+   pending output.
+
+     inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state
+   was inconsistent. In the error case, msg may be set but then points to a
+   static string (which must not be deallocated).
+*/
+
+                        /* Advanced functions */
+
+/*
+    The following functions are needed only in some special applications.
+*/
+
+/*
+ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
+                                     int  level,
+                                     int  method,
+                                     int  windowBits,
+                                     int  memLevel,
+                                     int  strategy));
+
+     This is another version of deflateInit with more compression options. The
+   fields next_in, zalloc, zfree and opaque must be initialized before by
+   the caller.
+
+     The method parameter is the compression method. It must be Z_DEFLATED in
+   this version of the library.
+
+     The windowBits parameter is the base two logarithm of the window size
+   (the size of the history buffer). It should be in the range 8..15 for this
+   version of the library. Larger values of this parameter result in better
+   compression at the expense of memory usage. The default value is 15 if
+   deflateInit is used instead.
+
+     windowBits can also be -8..-15 for raw deflate. In this case, -windowBits
+   determines the window size. deflate() will then generate raw deflate data
+   with no zlib header or trailer, and will not compute an adler32 check value.
+
+     windowBits can also be greater than 15 for optional gzip encoding. Add
+   16 to windowBits to write a simple gzip header and trailer around the
+   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
+   for the internal compression state. memLevel=1 uses minimum memory but
+   is slow and reduces compression ratio; memLevel=9 uses maximum memory
+   for optimal speed. The default value is 8. See zconf.h for total memory
+   usage as a function of windowBits and memLevel.
+
+     The strategy parameter is used to tune the compression algorithm. Use the
+   value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a
+   filter (or predictor), Z_HUFFMAN_ONLY to force Huffman encoding only (no
+   string match), or Z_RLE to limit match distances to one (run-length
+   encoding). Filtered data consists mostly of small values with a somewhat
+   random distribution. In this case, the compression algorithm is tuned to
+   compress them better. The effect of Z_FILTERED is to force more Huffman
+   coding and less string matching; it is somewhat intermediate between
+   Z_DEFAULT and Z_HUFFMAN_ONLY. Z_RLE is designed to be almost as fast as
+   Z_HUFFMAN_ONLY, but give better compression for PNG image data. The strategy
+   parameter only affects the compression ratio but not the correctness of the
+   compressed output even if it is not set appropriately.
+
+      deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_STREAM_ERROR if a parameter is invalid (such as an invalid
+   method). msg is set to null if there is no error message.  deflateInit2 does
+   not perform any compression: this will be done by deflate().
+*/
+
+ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
+                                             const Bytef *dictionary,
+                                             uInt  dictLength));
+/*
+     Initializes the compression dictionary from the given byte sequence
+   without producing any compressed output. This function must be called
+   immediately after deflateInit, deflateInit2 or deflateReset, before any
+   call of deflate. The compressor and decompressor must use exactly the same
+   dictionary (see inflateSetDictionary).
+
+     The dictionary should consist of strings (byte sequences) that are likely
+   to be encountered later in the data to be compressed, with the most commonly
+   used strings preferably put towards the end of the dictionary. Using a
+   dictionary is most useful when the data to be compressed is short and can be
+   predicted with good accuracy; the data can then be compressed better than
+   with the default empty dictionary.
+
+     Depending on the size of the compression data structures selected by
+   deflateInit or deflateInit2, a part of the dictionary may in effect be
+   discarded, for example if the dictionary is larger than the window size in
+   deflate or deflate2. Thus the strings most likely to be useful should be
+   put at the end of the dictionary, not at the front.
+
+     Upon return of this function, strm->adler is set to the adler32 value
+   of the dictionary; the decompressor may later use this value to determine
+   which dictionary has been used by the compressor. (The adler32 value
+   applies to the whole dictionary even if only a subset of the dictionary is
+   actually used by the compressor.) If a raw deflate was requested, then the
+   adler32 value is not computed and strm->adler is not set.
+
+     deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
+   parameter is invalid (such as NULL dictionary) or the stream state is
+   inconsistent (for example if deflate has already been called for this stream
+   or if the compression method is bsort). deflateSetDictionary does not
+   perform any compression: this will be done by deflate().
+*/
+
+ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
+                                    z_streamp source));
+/*
+     Sets the destination stream as a complete copy of the source stream.
+
+     This function can be useful when several compression strategies will be
+   tried, for example when there are several ways of pre-processing the input
+   data with a filter. The streams that will be discarded should then be freed
+   by calling deflateEnd.  Note that deflateCopy duplicates the internal
+   compression state which can be quite large, so this strategy is slow and
+   can consume lots of memory.
+
+     deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
+   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
+   (such as zalloc being NULL). msg is left unchanged in both source and
+   destination.
+*/
+
+ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));
+/*
+     This function is equivalent to deflateEnd followed by deflateInit,
+   but does not free and reallocate all the internal compression state.
+   The stream will keep the same compression level and any other attributes
+   that may have been set by deflateInit2.
+
+      deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent (such as zalloc or state being NULL).
+*/
+
+ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
+                                      int level,
+                                      int strategy));
+/*
+     Dynamically update the compression level and compression strategy.  The
+   interpretation of level and strategy is as in deflateInit2.  This can be
+   used to switch between compression and straight copy of the input data, or
+   to switch to a different kind of input data requiring a different
+   strategy. If the compression level is changed, the input available so far
+   is compressed with the old level (and may be flushed); the new level will
+   take effect only at the next call of deflate().
+
+     Before the call of deflateParams, the stream state must be set as for
+   a call of deflate(), since the currently available input may have to
+   be compressed and flushed. In particular, strm->avail_out must be non-zero.
+
+     deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source
+   stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR
+   if strm->avail_out was zero.
+*/
+
+ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm,
+                                       uLong sourceLen));
+/*
+     deflateBound() returns an upper bound on the compressed size after
+   deflation of sourceLen bytes.  It must be called after deflateInit()
+   or deflateInit2().  This would be used to allocate an output buffer
+   for deflation in a single pass, and so would be called before deflate().
+*/
+
+ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm,
+                                     int bits,
+                                     int value));
+/*
+     deflatePrime() inserts bits in the deflate output stream.  The intent
+  is that this function is used to start off the deflate output with the
+  bits leftover from a previous deflate stream when appending to it.  As such,
+  this function can only be used for raw deflate, and must be used before the
+  first deflate() call after a deflateInit2() or deflateReset().  bits must be
+  less than or equal to 16, and that many of the least significant bits of
+  value will be inserted in the output.
+
+      deflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent.
+*/
+
+/*
+ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
+                                     int  windowBits));
+
+     This is another version of inflateInit with an extra parameter. The
+   fields next_in, avail_in, zalloc, zfree and opaque must be initialized
+   before by the caller.
+
+     The windowBits parameter is the base two logarithm of the maximum window
+   size (the size of the history buffer).  It should be in the range 8..15 for
+   this version of the library. The default value is 15 if inflateInit is used
+   instead. windowBits must be greater than or equal to the windowBits value
+   provided to deflateInit2() while compressing, or it must be equal to 15 if
+   deflateInit2() was not used. If a compressed stream with a larger window
+   size is given as input, inflate() will return with the error code
+   Z_DATA_ERROR instead of trying to allocate a larger window.
+
+     windowBits can also be -8..-15 for raw inflate. In this case, -windowBits
+   determines the window size. inflate() will then process raw deflate data,
+   not looking for a zlib or gzip header, not generating a check value, and not
+   looking for any check values for comparison at the end of the stream. This
+   is for use with other formats that use the deflate compressed data format
+   such as zip.  Those formats provide their own check values. If a custom
+   format is developed using the raw deflate format for compressed data, it is
+   recommended that a check value such as an adler32 or a crc32 be applied to
+   the uncompressed data as is done in the zlib, gzip, and zip formats.  For
+   most applications, the zlib format should be used as is. Note that comments
+   above on the use in deflateInit2() applies to the magnitude of windowBits.
+
+     windowBits can also be greater than 15 for optional gzip decoding. Add
+   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
+   memory, Z_STREAM_ERROR if a parameter is invalid (such as a negative
+   memLevel). msg is set to null if there is no error message.  inflateInit2
+   does not perform any decompression apart from reading the zlib header if
+   present: this will be done by inflate(). (So next_in and avail_in may be
+   modified, but next_out and avail_out are unchanged.)
+*/
+
+ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
+                                             const Bytef *dictionary,
+                                             uInt  dictLength));
+/*
+     Initializes the decompression dictionary from the given uncompressed byte
+   sequence. This function must be called immediately after a call of inflate
+   if this call returned Z_NEED_DICT. The dictionary chosen by the compressor
+   can be determined from the adler32 value returned by this call of
+   inflate. The compressor and decompressor must use exactly the same
+   dictionary (see deflateSetDictionary).
+
+     inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
+   parameter is invalid (such as NULL dictionary) or the stream state is
+   inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the
+   expected one (incorrect adler32 value). inflateSetDictionary does not
+   perform any decompression: this will be done by subsequent calls of
+   inflate().
+*/
+
+ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
+/*
+    Skips invalid compressed data until a full flush point (see above the
+  description of deflate with Z_FULL_FLUSH) can be found, or until all
+  available input is skipped. No output is provided.
+
+    inflateSync returns Z_OK if a full flush point has been found, Z_BUF_ERROR
+  if no more input was provided, Z_DATA_ERROR if no flush point has been found,
+  or Z_STREAM_ERROR if the stream structure was inconsistent. In the success
+  case, the application may save the current current value of total_in which
+  indicates where valid compressed data was found. In the error case, the
+  application may repeatedly call inflateSync, providing more input each time,
+  until success or end of the input data.
+*/
+
+ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,
+                                    z_streamp source));
+/*
+     Sets the destination stream as a complete copy of the source stream.
+
+     This function can be useful when randomly accessing a large stream.  The
+   first pass through the stream can periodically record the inflate state,
+   allowing restarting inflate at those points when randomly accessing the
+   stream.
+
+     inflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
+   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
+   (such as zalloc being NULL). msg is left unchanged in both source and
+   destination.
+*/
+
+ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
+/*
+     This function is equivalent to inflateEnd followed by inflateInit,
+   but does not free and reallocate all the internal decompression state.
+   The stream will keep attributes that may have been set by inflateInit2.
+
+      inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent (such as zalloc or state being NULL).
+*/
+
+/*
+ZEXTERN int ZEXPORT inflateBackInit OF((z_stream FAR *strm, int windowBits,
+                                        unsigned char FAR *window));
+
+     Initialize the internal stream state for decompression using inflateBack()
+   calls.  The fields zalloc, zfree and opaque in strm must be initialized
+   before the call.  If zalloc and zfree are Z_NULL, then the default library-
+   derived memory allocation routines are used.  windowBits is the base two
+   logarithm of the window size, in the range 8..15.  window is a caller
+   supplied buffer of that size.  Except for special applications where it is
+   assured that deflate was used with small window sizes, windowBits must be 15
+   and a 32K byte window must be supplied to be able to decompress general
+   deflate streams.
+
+     See inflateBack() for the usage of these routines.
+
+     inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of
+   the paramaters are invalid, Z_MEM_ERROR if the internal state could not
+   be allocated, or Z_VERSION_ERROR if the version of the library does not
+   match the version of the header file.
+*/
+
+typedef unsigned (*in_func) OF((void FAR *, unsigned char FAR * FAR *));
+typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned));
+
+ZEXTERN int ZEXPORT inflateBack OF((z_stream FAR *strm,
+                                    in_func in, void FAR *in_desc,
+                                    out_func out, void FAR *out_desc));
+/*
+     inflateBack() does a raw inflate with a single call using a call-back
+   interface for input and output.  This is more efficient than inflate() for
+   file i/o applications in that it avoids copying between the output and the
+   sliding window by simply making the window itself the output buffer.  This
+   function trusts the application to not change the output buffer passed by
+   the output function, at least until inflateBack() returns.
+
+     inflateBackInit() must be called first to allocate the internal state
+   and to initialize the state with the user-provided window buffer.
+   inflateBack() may then be used multiple times to inflate a complete, raw
+   deflate stream with each call.  inflateBackEnd() is then called to free
+   the allocated state.
+
+     A raw deflate stream is one with no zlib or gzip header or trailer.
+   This routine would normally be used in a utility that reads zip or gzip
+   files and writes out uncompressed files.  The utility would decode the
+   header and process the trailer on its own, hence this routine expects
+   only the raw deflate stream to decompress.  This is different from the
+   normal behavior of inflate(), which expects either a zlib or gzip header and
+   trailer around the deflate stream.
+
+     inflateBack() uses two subroutines supplied by the caller that are then
+   called by inflateBack() for input and output.  inflateBack() calls those
+   routines until it reads a complete deflate stream and writes out all of the
+   uncompressed data, or until it encounters an error.  The function's
+   parameters and return types are defined above in the in_func and out_func
+   typedefs.  inflateBack() will call in(in_desc, &buf) which should return the
+   number of bytes of provided input, and a pointer to that input in buf.  If
+   there is no input available, in() must return zero--buf is ignored in that
+   case--and inflateBack() will return a buffer error.  inflateBack() will call
+   out(out_desc, buf, len) to write the uncompressed data buf[0..len-1].  out()
+   should return zero on success, or non-zero on failure.  If out() returns
+   non-zero, inflateBack() will return with an error.  Neither in() nor out()
+   are permitted to change the contents of the window provided to
+   inflateBackInit(), which is also the buffer that out() uses to write from.
+   The length written by out() will be at most the window size.  Any non-zero
+   amount of input may be provided by in().
+
+     For convenience, inflateBack() can be provided input on the first call by
+   setting strm->next_in and strm->avail_in.  If that input is exhausted, then
+   in() will be called.  Therefore strm->next_in must be initialized before
+   calling inflateBack().  If strm->next_in is Z_NULL, then in() will be called
+   immediately for input.  If strm->next_in is not Z_NULL, then strm->avail_in
+   must also be initialized, and then if strm->avail_in is not zero, input will
+   initially be taken from strm->next_in[0 .. strm->avail_in - 1].
+
+     The in_desc and out_desc parameters of inflateBack() is passed as the
+   first parameter of in() and out() respectively when they are called.  These
+   descriptors can be optionally used to pass any information that the caller-
+   supplied in() and out() functions need to do their job.
+
+     On return, inflateBack() will set strm->next_in and strm->avail_in to
+   pass back any unused input that was provided by the last in() call.  The
+   return values of inflateBack() can be Z_STREAM_END on success, Z_BUF_ERROR
+   if in() or out() returned an error, Z_DATA_ERROR if there was a format
+   error in the deflate stream (in which case strm->msg is set to indicate the
+   nature of the error), or Z_STREAM_ERROR if the stream was not properly
+   initialized.  In the case of Z_BUF_ERROR, an input or output error can be
+   distinguished using strm->next_in which will be Z_NULL only if in() returned
+   an error.  If strm->next is not Z_NULL, then the Z_BUF_ERROR was due to
+   out() returning non-zero.  (in() will always be called before out(), so
+   strm->next_in is assured to be defined if out() returns non-zero.)  Note
+   that inflateBack() cannot return Z_OK.
+*/
+
+ZEXTERN int ZEXPORT inflateBackEnd OF((z_stream FAR *strm));
+/*
+     All memory allocated by inflateBackInit() is freed.
+
+     inflateBackEnd() returns Z_OK on success, or Z_STREAM_ERROR if the stream
+   state was inconsistent.
+*/
+
+ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void));
+/* Return flags indicating compile-time options.
+
+    Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other:
+     1.0: size of uInt
+     3.2: size of uLong
+     5.4: size of voidpf (pointer)
+     7.6: size of z_off_t
+
+    Compiler, assembler, and debug options:
+     8: DEBUG
+     9: ASMV or ASMINF -- use ASM code
+     10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention
+     11: 0 (reserved)
+
+    One-time table building (smaller code, but not thread-safe if true):
+     12: BUILDFIXED -- build static block decoding tables when needed
+     13: DYNAMIC_CRC_TABLE -- build CRC calculation tables when needed
+     14,15: 0 (reserved)
+
+    Library content (indicates missing functionality):
+     16: NO_GZCOMPRESS -- gz* functions cannot compress (to avoid linking
+                          deflate code when not needed)
+     17: NO_GZIP -- deflate can't write gzip streams, and inflate can't detect
+                    and decode gzip streams (to avoid linking crc code)
+     18-19: 0 (reserved)
+
+    Operation variations (changes in library functionality):
+     20: PKZIP_BUG_WORKAROUND -- slightly more permissive inflate
+     21: FASTEST -- deflate algorithm with only one, lowest compression level
+     22,23: 0 (reserved)
+
+    The sprintf variant used by gzprintf (zero is best):
+     24: 0 = vs*, 1 = s* -- 1 means limited to 20 arguments after the format
+     25: 0 = *nprintf, 1 = *printf -- 1 means gzprintf() not secure!
+     26: 0 = returns value, 1 = void -- 1 means inferred string length returned
+
+    Remainder:
+     27-31: 0 (reserved)
+ */
+
+
+                        /* utility functions */
+
+/*
+     The following utility functions are implemented on top of the
+   basic stream-oriented functions. To simplify the interface, some
+   default options are assumed (compression level and memory usage,
+   standard memory allocation functions). The source code of these
+   utility functions can easily be modified if you need special options.
+*/
+
+ZEXTERN int ZEXPORT compress OF((Bytef *dest,   uLongf *destLen,
+                                 const Bytef *source, uLong sourceLen));
+/*
+     Compresses the source buffer into the destination buffer.  sourceLen is
+   the byte length of the source buffer. Upon entry, destLen is the total
+   size of the destination buffer, which must be at least the value returned
+   by compressBound(sourceLen). Upon exit, destLen is the actual size of the
+   compressed buffer.
+     This function can be used to compress a whole file at once if the
+   input file is mmap'ed.
+     compress returns Z_OK if success, Z_MEM_ERROR if there was not
+   enough memory, Z_BUF_ERROR if there was not enough room in the output
+   buffer.
+*/
+
+ZEXTERN int ZEXPORT compress2 OF((Bytef *dest,   uLongf *destLen,
+                                  const Bytef *source, uLong sourceLen,
+                                  int level));
+/*
+     Compresses the source buffer into the destination buffer. The level
+   parameter has the same meaning as in deflateInit.  sourceLen is the byte
+   length of the source buffer. Upon entry, destLen is the total size of the
+   destination buffer, which must be at least the value returned by
+   compressBound(sourceLen). Upon exit, destLen is the actual size of the
+   compressed buffer.
+
+     compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_BUF_ERROR if there was not enough room in the output buffer,
+   Z_STREAM_ERROR if the level parameter is invalid.
+*/
+
+ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen));
+/*
+     compressBound() returns an upper bound on the compressed size after
+   compress() or compress2() on sourceLen bytes.  It would be used before
+   a compress() or compress2() call to allocate the destination buffer.
+*/
+
+ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
+                                   const Bytef *source, uLong sourceLen));
+/*
+     Decompresses the source buffer into the destination buffer.  sourceLen is
+   the byte length of the source buffer. Upon entry, destLen is the total
+   size of the destination buffer, which must be large enough to hold the
+   entire uncompressed data. (The size of the uncompressed data must have
+   been saved previously by the compressor and transmitted to the decompressor
+   by some mechanism outside the scope of this compression library.)
+   Upon exit, destLen is the actual size of the compressed buffer.
+     This function can be used to decompress a whole file at once if the
+   input file is mmap'ed.
+
+     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
+   enough memory, Z_BUF_ERROR if there was not enough room in the output
+   buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete.
+*/
+
+
+typedef voidp gzFile;
+
+ZEXTERN gzFile ZEXPORT gzopen  OF((const char *path, const char *mode));
+/*
+     Opens a gzip (.gz) file for reading or writing. The mode parameter
+   is as in fopen ("rb" or "wb") but can also include a compression level
+   ("wb9") or a strategy: 'f' for filtered data as in "wb6f", 'h' for
+   Huffman only compression as in "wb1h", or 'R' for run-length encoding
+   as in "wb1R". (See the description of deflateInit2 for more information
+   about the strategy parameter.)
+
+     gzopen can be used to read a file which is not in gzip format; in this
+   case gzread will directly read from the file without decompression.
+
+     gzopen returns NULL if the file could not be opened or if there was
+   insufficient memory to allocate the (de)compression state; errno
+   can be checked to distinguish the two cases (if errno is zero, the
+   zlib error is Z_MEM_ERROR).  */
+
+ZEXTERN gzFile ZEXPORT gzdopen  OF((int fd, const char *mode));
+/*
+     gzdopen() associates a gzFile with the file descriptor fd.  File
+   descriptors are obtained from calls like open, dup, creat, pipe or
+   fileno (in the file has been previously opened with fopen).
+   The mode parameter is as in gzopen.
+     The next call of gzclose on the returned gzFile will also close the
+   file descriptor fd, just like fclose(fdopen(fd), mode) closes the file
+   descriptor fd. If you want to keep fd open, use gzdopen(dup(fd), mode).
+     gzdopen returns NULL if there was insufficient memory to allocate
+   the (de)compression state.
+*/
+
+ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
+/*
+     Dynamically update the compression level or strategy. See the description
+   of deflateInit2 for the meaning of these parameters.
+     gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not
+   opened for writing.
+*/
+
+ZEXTERN int ZEXPORT    gzread  OF((gzFile file, voidp buf, unsigned len));
+/*
+     Reads the given number of uncompressed bytes from the compressed file.
+   If the input file was not in gzip format, gzread copies the given number
+   of bytes into the buffer.
+     gzread returns the number of uncompressed bytes actually read (0 for
+   end of file, -1 for error). */
+
+ZEXTERN int ZEXPORT    gzwrite OF((gzFile file,
+                                   voidpc buf, unsigned len));
+/*
+     Writes the given number of uncompressed bytes into the compressed file.
+   gzwrite returns the number of uncompressed bytes actually written
+   (0 in case of error).
+*/
+
+ZEXTERN int ZEXPORTVA   gzprintf OF((gzFile file, const char *format, ...));
+/*
+     Converts, formats, and writes the args to the compressed file under
+   control of the format string, as in fprintf. gzprintf returns the number of
+   uncompressed bytes actually written (0 in case of error).  The number of
+   uncompressed bytes written is limited to 4095. The caller should assure that
+   this limit is not exceeded. If it is exceeded, then gzprintf() will return
+   return an error (0) with nothing written. In this case, there may also be a
+   buffer overflow with unpredictable consequences, which is possible only if
+   zlib was compiled with the insecure functions sprintf() or vsprintf()
+   because the secure snprintf() or vsnprintf() functions were not available.
+*/
+
+ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));
+/*
+      Writes the given null-terminated string to the compressed file, excluding
+   the terminating null character.
+      gzputs returns the number of characters written, or -1 in case of error.
+*/
+
+ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len));
+/*
+      Reads bytes from the compressed file until len-1 characters are read, or
+   a newline character is read and transferred to buf, or an end-of-file
+   condition is encountered.  The string is then terminated with a null
+   character.
+      gzgets returns buf, or Z_NULL in case of error.
+*/
+
+ZEXTERN int ZEXPORT    gzputc OF((gzFile file, int c));
+/*
+      Writes c, converted to an unsigned char, into the compressed file.
+   gzputc returns the value that was written, or -1 in case of error.
+*/
+
+ZEXTERN int ZEXPORT    gzgetc OF((gzFile file));
+/*
+      Reads one byte from the compressed file. gzgetc returns this byte
+   or -1 in case of end of file or error.
+*/
+
+ZEXTERN int ZEXPORT    gzungetc OF((int c, gzFile file));
+/*
+      Push one character back onto the stream to be read again later.
+   Only one character of push-back is allowed.  gzungetc() returns the
+   character pushed, or -1 on failure.  gzungetc() will fail if a
+   character has been pushed but not read yet, or if c is -1. The pushed
+   character will be discarded if the stream is repositioned with gzseek()
+   or gzrewind().
+*/
+
+ZEXTERN int ZEXPORT    gzflush OF((gzFile file, int flush));
+/*
+     Flushes all pending output into the compressed file. The parameter
+   flush is as in the deflate() function. The return value is the zlib
+   error number (see function gzerror below). gzflush returns Z_OK if
+   the flush parameter is Z_FINISH and all output could be flushed.
+     gzflush should be called only when strictly necessary because it can
+   degrade compression.
+*/
+
+ZEXTERN z_off_t ZEXPORT    gzseek OF((gzFile file,
+                                      z_off_t offset, int whence));
+/*
+      Sets the starting position for the next gzread or gzwrite on the
+   given compressed file. The offset represents a number of bytes in the
+   uncompressed data stream. The whence parameter is defined as in lseek(2);
+   the value SEEK_END is not supported.
+     If the file is opened for reading, this function is emulated but can be
+   extremely slow. If the file is opened for writing, only forward seeks are
+   supported; gzseek then compresses a sequence of zeroes up to the new
+   starting position.
+
+      gzseek returns the resulting offset location as measured in bytes from
+   the beginning of the uncompressed stream, or -1 in case of error, in
+   particular if the file is opened for writing and the new starting position
+   would be before the current position.
+*/
+
+ZEXTERN int ZEXPORT    gzrewind OF((gzFile file));
+/*
+     Rewinds the given file. This function is supported only for reading.
+
+   gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)
+*/
+
+ZEXTERN z_off_t ZEXPORT    gztell OF((gzFile file));
+/*
+     Returns the starting position for the next gzread or gzwrite on the
+   given compressed file. This position represents a number of bytes in the
+   uncompressed data stream.
+
+   gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)
+*/
+
+ZEXTERN int ZEXPORT gzeof OF((gzFile file));
+/*
+     Returns 1 when EOF has previously been detected reading the given
+   input stream, otherwise zero.
+*/
+
+ZEXTERN int ZEXPORT    gzclose OF((gzFile file));
+/*
+     Flushes all pending output if necessary, closes the compressed file
+   and deallocates all the (de)compression state. The return value is the zlib
+   error number (see function gzerror below).
+*/
+
+ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum));
+/*
+     Returns the error message for the last error which occurred on the
+   given compressed file. errnum is set to zlib error number. If an
+   error occurred in the file system and not in the compression library,
+   errnum is set to Z_ERRNO and the application may consult errno
+   to get the exact error code.
+*/
+
+ZEXTERN void ZEXPORT gzclearerr OF((gzFile file));
+/*
+     Clears the error and end-of-file flags for file. This is analogous to the
+   clearerr() function in stdio. This is useful for continuing to read a gzip
+   file that is being written concurrently.
+*/
+
+                        /* checksum functions */
+
+/*
+     These functions are not related to compression but are exported
+   anyway because they might be useful in applications using the
+   compression library.
+*/
+
+ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
+
+/*
+     Update a running Adler-32 checksum with the bytes buf[0..len-1] and
+   return the updated checksum. If buf is NULL, this function returns
+   the required initial value for the checksum.
+   An Adler-32 checksum is almost as reliable as a CRC32 but can be computed
+   much faster. Usage example:
+
+     uLong adler = adler32(0L, Z_NULL, 0);
+
+     while (read_buffer(buffer, length) != EOF) {
+       adler = adler32(adler, buffer, length);
+     }
+     if (adler != original_adler) error();
+*/
+
+ZEXTERN uLong ZEXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));
+/*
+     Update a running crc with the bytes buf[0..len-1] and return the updated
+   crc. If buf is NULL, this function returns the required initial value
+   for the crc. Pre- and post-conditioning (one's complement) is performed
+   within this function so it shouldn't be done by the application.
+   Usage example:
+
+     uLong crc = crc32(0L, Z_NULL, 0);
+
+     while (read_buffer(buffer, length) != EOF) {
+       crc = crc32(crc, buffer, length);
+     }
+     if (crc != original_crc) error();
+*/
+
+
+                        /* various hacks, don't look :) */
+
+/* deflateInit and inflateInit are macros to allow checking the zlib version
+ * and the compiler's view of z_stream:
+ */
+ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level,
+                                     const char *version, int stream_size));
+ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm,
+                                     const char *version, int stream_size));
+ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int  level, int  method,
+                                      int windowBits, int memLevel,
+                                      int strategy, const char *version,
+                                      int stream_size));
+ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int  windowBits,
+                                      const char *version, int stream_size));
+ZEXTERN int ZEXPORT inflateBackInit_ OF((z_stream FAR *strm, int windowBits,
+                                         unsigned char FAR *window,
+                                         const char *version,
+                                         int stream_size));
+#define deflateInit(strm, level) \
+        deflateInit_((strm), (level),       ZLIB_VERSION, sizeof(z_stream))
+#define inflateInit(strm) \
+        inflateInit_((strm),                ZLIB_VERSION, sizeof(z_stream))
+#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
+        deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
+                      (strategy),           ZLIB_VERSION, sizeof(z_stream))
+#define inflateInit2(strm, windowBits) \
+        inflateInit2_((strm), (windowBits), ZLIB_VERSION, sizeof(z_stream))
+#define inflateBackInit(strm, windowBits, window) \
+        inflateBackInit_((strm), (windowBits), (window), \
+        ZLIB_VERSION, sizeof(z_stream))
+
+
+#if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL)
+    struct internal_state {int dummy;}; /* hack for buggy compilers */
+#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));
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ZLIB_H */
diff --git a/src/zlib/zutil.c b/src/zlib/zutil.c
index a94cdb80c..0ef4f99f5 100644
--- a/src/zlib/zutil.c
+++ b/src/zlib/zutil.c
@@ -1,319 +1,319 @@
-/* zutil.c -- target dependent utility functions for the compression library

- * Copyright (C) 1995-2003 Jean-loup Gailly.

- * For conditions of distribution and use, see copyright notice in zlib.h

- */

-

-/* @(#) $Id$ */

-

-#include "zutil.h"

-

-#ifndef NO_DUMMY_DECL

-struct internal_state      {int dummy;}; /* for buggy compilers */

-#endif

-

-#ifndef STDC

-extern void exit OF((int));

-#endif

-

-const char * const z_errmsg[10] = {

-"need dictionary",     /* Z_NEED_DICT       2  */

-"stream end",          /* Z_STREAM_END      1  */

-"",                    /* Z_OK              0  */

-"file error",          /* Z_ERRNO         (-1) */

-"stream error",        /* Z_STREAM_ERROR  (-2) */

-"data error",          /* Z_DATA_ERROR    (-3) */

-"insufficient memory", /* Z_MEM_ERROR     (-4) */

-"buffer error",        /* Z_BUF_ERROR     (-5) */

-"incompatible version",/* Z_VERSION_ERROR (-6) */

-""};

-

-

-const char * ZEXPORT zlibVersion()

-{

-    return ZLIB_VERSION;

-}

-

-uLong ZEXPORT zlibCompileFlags()

-{

-    uLong flags;

-

-    flags = 0;

-    switch (sizeof(uInt)) {

-    case 2:     break;

-    case 4:     flags += 1;     break;

-    case 8:     flags += 2;     break;

-    default:    flags += 3;

-    }

-    switch (sizeof(uLong)) {

-    case 2:     break;

-    case 4:     flags += 1 << 2;        break;

-    case 8:     flags += 2 << 2;        break;

-    default:    flags += 3 << 2;

-    }

-    switch (sizeof(voidpf)) {

-    case 2:     break;

-    case 4:     flags += 1 << 4;        break;

-    case 8:     flags += 2 << 4;        break;

-    default:    flags += 3 << 4;

-    }

-    switch (sizeof(z_off_t)) {

-    case 2:     break;

-    case 4:     flags += 1 << 6;        break;

-    case 8:     flags += 2 << 6;        break;

-    default:    flags += 3 << 6;

-    }

-#ifdef DEBUG

-    flags += 1 << 8;

-#endif

-#if defined(ASMV) || defined(ASMINF)

-    flags += 1 << 9;

-#endif

-#ifdef ZLIB_WINAPI

-    flags += 1 << 10;

-#endif

-#ifdef BUILDFIXED

-    flags += 1 << 12;

-#endif

-#ifdef DYNAMIC_CRC_TABLE

-    flags += 1 << 13;

-#endif

-#ifdef NO_GZCOMPRESS

-    flags += 1 << 16;

-#endif

-#ifdef NO_GZIP

-    flags += 1 << 17;

-#endif

-#ifdef PKZIP_BUG_WORKAROUND

-    flags += 1 << 20;

-#endif

-#ifdef FASTEST

-    flags += 1 << 21;

-#endif

-#ifdef STDC

-#  ifdef NO_vsnprintf

-        flags += 1 << 25;

-#    ifdef HAS_vsprintf_void

-        flags += 1 << 26;

-#    endif

-#  else

-#    ifdef HAS_vsnprintf_void

-        flags += 1 << 26;

-#    endif

-#  endif

-#else

-        flags += 1 << 24;

-#  ifdef NO_snprintf

-        flags += 1 << 25;

-#    ifdef HAS_sprintf_void

-        flags += 1 << 26;

-#    endif

-#  else

-#    ifdef HAS_snprintf_void

-        flags += 1 << 26;

-#    endif

-#  endif

-#endif

-    return flags;

-}

-

-#ifdef DEBUG

-

-#  ifndef verbose

-#    define verbose 0

-#  endif

-int z_verbose = verbose;

-

-void z_error (m)

-    char *m;

-{

-    fprintf(stderr, "%s\n", m);

-    exit(1);

-}

-#endif

-

-/* exported to allow conversion of error code to string for compress() and

- * uncompress()

- */

-const char * ZEXPORT zError(err)

-    int err;

-{

-    return ERR_MSG(err);

-}

-

-#if defined(_WIN32_WCE)

-    /* does not exist on WCE */

-    int errno = 0;

-#endif

-

-#ifndef HAVE_MEMCPY

-

-void zmemcpy(dest, source, len)

-    Bytef* dest;

-    const Bytef* source;

-    uInt  len;

-{

-    if (len == 0) return;

-    do {

-        *dest++ = *source++; /* ??? to be unrolled */

-    } while (--len != 0);

-}

-

-int zmemcmp(s1, s2, len)

-    const Bytef* s1;

-    const Bytef* s2;

-    uInt  len;

-{

-    uInt j;

-

-    for (j = 0; j < len; j++) {

-        if (s1[j] != s2[j]) return 2*(s1[j] > s2[j])-1;

-    }

-    return 0;

-}

-

-void zmemzero(dest, len)

-    Bytef* dest;

-    uInt  len;

-{

-    if (len == 0) return;

-    do {

-        *dest++ = 0;  /* ??? to be unrolled */

-    } while (--len != 0);

-}

-#endif

-

-

-#ifdef SYS16BIT

-

-#ifdef __TURBOC__

-/* Turbo C in 16-bit mode */

-

-#  define MY_ZCALLOC

-

-/* Turbo C malloc() does not allow dynamic allocation of 64K bytes

- * and farmalloc(64K) returns a pointer with an offset of 8, so we

- * must fix the pointer. Warning: the pointer must be put back to its

- * original form in order to free it, use zcfree().

- */

-

-#define MAX_PTR 10

-/* 10*64K = 640K */

-

-local int next_ptr = 0;

-

-typedef struct ptr_table_s {

-    voidpf org_ptr;

-    voidpf new_ptr;

-} ptr_table;

-

-local ptr_table table[MAX_PTR];

-/* This table is used to remember the original form of pointers

- * to large buffers (64K). Such pointers are normalized with a zero offset.

- * Since MSDOS is not a preemptive multitasking OS, this table is not

- * protected from concurrent access. This hack doesn't work anyway on

- * a protected system like OS/2. Use Microsoft C instead.

- */

-

-voidpf zcalloc (voidpf opaque, unsigned items, unsigned size)

-{

-    voidpf buf = opaque; /* just to make some compilers happy */

-    ulg bsize = (ulg)items*size;

-

-    /* If we allocate less than 65520 bytes, we assume that farmalloc

-     * will return a usable pointer which doesn't have to be normalized.

-     */

-    if (bsize < 65520L) {

-        buf = farmalloc(bsize);

-        if (*(ush*)&buf != 0) return buf;

-    } else {

-        buf = farmalloc(bsize + 16L);

-    }

-    if (buf == NULL || next_ptr >= MAX_PTR) return NULL;

-    table[next_ptr].org_ptr = buf;

-

-    /* Normalize the pointer to seg:0 */

-    *((ush*)&buf+1) += ((ush)((uch*)buf-0) + 15) >> 4;

-    *(ush*)&buf = 0;

-    table[next_ptr++].new_ptr = buf;

-    return buf;

-}

-

-void  zcfree (voidpf opaque, voidpf ptr)

-{

-    int n;

-    if (*(ush*)&ptr != 0) { /* object < 64K */

-        farfree(ptr);

-        return;

-    }

-    /* Find the original pointer */

-    for (n = 0; n < next_ptr; n++) {

-        if (ptr != table[n].new_ptr) continue;

-

-        farfree(table[n].org_ptr);

-        while (++n < next_ptr) {

-            table[n-1] = table[n];

-        }

-        next_ptr--;

-        return;

-    }

-    ptr = opaque; /* just to make some compilers happy */

-    Assert(0, "zcfree: ptr not found");

-}

-

-#endif /* __TURBOC__ */

-

-

-#ifdef M_I86

-/* Microsoft C in 16-bit mode */

-

-#  define MY_ZCALLOC

-

-#if (!defined(_MSC_VER) || (_MSC_VER <= 600))

-#  define _halloc  halloc

-#  define _hfree   hfree

-#endif

-

-voidpf zcalloc (voidpf opaque, unsigned items, unsigned size)

-{

-    if (opaque) opaque = 0; /* to make compiler happy */

-    return _halloc((long)items, size);

-}

-

-void  zcfree (voidpf opaque, voidpf ptr)

-{

-    if (opaque) opaque = 0; /* to make compiler happy */

-    _hfree(ptr);

-}

-

-#endif /* M_I86 */

-

-#endif /* SYS16BIT */

-

-

-#ifndef MY_ZCALLOC /* Any system without a special alloc function */

-

-#ifndef STDC

-extern voidp  malloc OF((uInt size));

-extern voidp  calloc OF((uInt items, uInt size));

-extern void   free   OF((voidpf ptr));

-#endif

-

-voidpf zcalloc (opaque, items, size)

-    voidpf opaque;

-    unsigned items;

-    unsigned size;

-{

-    if (opaque) items += size - size; /* make compiler happy */

-    return sizeof(uInt) > 2 ? (voidpf)malloc(items * size) :

-                              (voidpf)calloc(items, size);

-}

-

-void  zcfree (opaque, ptr)

-    voidpf opaque;

-    voidpf ptr;

-{

-    free(ptr);

-    if (opaque) return; /* make compiler happy */

-}

-

-#endif /* MY_ZCALLOC */

+/* zutil.c -- target dependent utility functions for the compression library
+ * Copyright (C) 1995-2003 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id$ */
+
+#include "zutil.h"
+
+#ifndef NO_DUMMY_DECL
+struct internal_state      {int dummy;}; /* for buggy compilers */
+#endif
+
+#ifndef STDC
+extern void exit OF((int));
+#endif
+
+const char * const z_errmsg[10] = {
+"need dictionary",     /* Z_NEED_DICT       2  */
+"stream end",          /* Z_STREAM_END      1  */
+"",                    /* Z_OK              0  */
+"file error",          /* Z_ERRNO         (-1) */
+"stream error",        /* Z_STREAM_ERROR  (-2) */
+"data error",          /* Z_DATA_ERROR    (-3) */
+"insufficient memory", /* Z_MEM_ERROR     (-4) */
+"buffer error",        /* Z_BUF_ERROR     (-5) */
+"incompatible version",/* Z_VERSION_ERROR (-6) */
+""};
+
+
+const char * ZEXPORT zlibVersion()
+{
+    return ZLIB_VERSION;
+}
+
+uLong ZEXPORT zlibCompileFlags()
+{
+    uLong flags;
+
+    flags = 0;
+    switch (sizeof(uInt)) {
+    case 2:     break;
+    case 4:     flags += 1;     break;
+    case 8:     flags += 2;     break;
+    default:    flags += 3;
+    }
+    switch (sizeof(uLong)) {
+    case 2:     break;
+    case 4:     flags += 1 << 2;        break;
+    case 8:     flags += 2 << 2;        break;
+    default:    flags += 3 << 2;
+    }
+    switch (sizeof(voidpf)) {
+    case 2:     break;
+    case 4:     flags += 1 << 4;        break;
+    case 8:     flags += 2 << 4;        break;
+    default:    flags += 3 << 4;
+    }
+    switch (sizeof(z_off_t)) {
+    case 2:     break;
+    case 4:     flags += 1 << 6;        break;
+    case 8:     flags += 2 << 6;        break;
+    default:    flags += 3 << 6;
+    }
+#ifdef DEBUG
+    flags += 1 << 8;
+#endif
+#if defined(ASMV) || defined(ASMINF)
+    flags += 1 << 9;
+#endif
+#ifdef ZLIB_WINAPI
+    flags += 1 << 10;
+#endif
+#ifdef BUILDFIXED
+    flags += 1 << 12;
+#endif
+#ifdef DYNAMIC_CRC_TABLE
+    flags += 1 << 13;
+#endif
+#ifdef NO_GZCOMPRESS
+    flags += 1 << 16;
+#endif
+#ifdef NO_GZIP
+    flags += 1 << 17;
+#endif
+#ifdef PKZIP_BUG_WORKAROUND
+    flags += 1 << 20;
+#endif
+#ifdef FASTEST
+    flags += 1 << 21;
+#endif
+#ifdef STDC
+#  ifdef NO_vsnprintf
+        flags += 1 << 25;
+#    ifdef HAS_vsprintf_void
+        flags += 1 << 26;
+#    endif
+#  else
+#    ifdef HAS_vsnprintf_void
+        flags += 1 << 26;
+#    endif
+#  endif
+#else
+        flags += 1 << 24;
+#  ifdef NO_snprintf
+        flags += 1 << 25;
+#    ifdef HAS_sprintf_void
+        flags += 1 << 26;
+#    endif
+#  else
+#    ifdef HAS_snprintf_void
+        flags += 1 << 26;
+#    endif
+#  endif
+#endif
+    return flags;
+}
+
+#ifdef DEBUG
+
+#  ifndef verbose
+#    define verbose 0
+#  endif
+int z_verbose = verbose;
+
+void z_error (m)
+    char *m;
+{
+    fprintf(stderr, "%s\n", m);
+    exit(1);
+}
+#endif
+
+/* exported to allow conversion of error code to string for compress() and
+ * uncompress()
+ */
+const char * ZEXPORT zError(err)
+    int err;
+{
+    return ERR_MSG(err);
+}
+
+#if defined(_WIN32_WCE)
+    /* does not exist on WCE */
+    int errno = 0;
+#endif
+
+#ifndef HAVE_MEMCPY
+
+void zmemcpy(dest, source, len)
+    Bytef* dest;
+    const Bytef* source;
+    uInt  len;
+{
+    if (len == 0) return;
+    do {
+        *dest++ = *source++; /* ??? to be unrolled */
+    } while (--len != 0);
+}
+
+int zmemcmp(s1, s2, len)
+    const Bytef* s1;
+    const Bytef* s2;
+    uInt  len;
+{
+    uInt j;
+
+    for (j = 0; j < len; j++) {
+        if (s1[j] != s2[j]) return 2*(s1[j] > s2[j])-1;
+    }
+    return 0;
+}
+
+void zmemzero(dest, len)
+    Bytef* dest;
+    uInt  len;
+{
+    if (len == 0) return;
+    do {
+        *dest++ = 0;  /* ??? to be unrolled */
+    } while (--len != 0);
+}
+#endif
+
+
+#ifdef SYS16BIT
+
+#ifdef __TURBOC__
+/* Turbo C in 16-bit mode */
+
+#  define MY_ZCALLOC
+
+/* Turbo C malloc() does not allow dynamic allocation of 64K bytes
+ * and farmalloc(64K) returns a pointer with an offset of 8, so we
+ * must fix the pointer. Warning: the pointer must be put back to its
+ * original form in order to free it, use zcfree().
+ */
+
+#define MAX_PTR 10
+/* 10*64K = 640K */
+
+local int next_ptr = 0;
+
+typedef struct ptr_table_s {
+    voidpf org_ptr;
+    voidpf new_ptr;
+} ptr_table;
+
+local ptr_table table[MAX_PTR];
+/* This table is used to remember the original form of pointers
+ * to large buffers (64K). Such pointers are normalized with a zero offset.
+ * Since MSDOS is not a preemptive multitasking OS, this table is not
+ * protected from concurrent access. This hack doesn't work anyway on
+ * a protected system like OS/2. Use Microsoft C instead.
+ */
+
+voidpf zcalloc (voidpf opaque, unsigned items, unsigned size)
+{
+    voidpf buf = opaque; /* just to make some compilers happy */
+    ulg bsize = (ulg)items*size;
+
+    /* If we allocate less than 65520 bytes, we assume that farmalloc
+     * will return a usable pointer which doesn't have to be normalized.
+     */
+    if (bsize < 65520L) {
+        buf = farmalloc(bsize);
+        if (*(ush*)&buf != 0) return buf;
+    } else {
+        buf = farmalloc(bsize + 16L);
+    }
+    if (buf == NULL || next_ptr >= MAX_PTR) return NULL;
+    table[next_ptr].org_ptr = buf;
+
+    /* Normalize the pointer to seg:0 */
+    *((ush*)&buf+1) += ((ush)((uch*)buf-0) + 15) >> 4;
+    *(ush*)&buf = 0;
+    table[next_ptr++].new_ptr = buf;
+    return buf;
+}
+
+void  zcfree (voidpf opaque, voidpf ptr)
+{
+    int n;
+    if (*(ush*)&ptr != 0) { /* object < 64K */
+        farfree(ptr);
+        return;
+    }
+    /* Find the original pointer */
+    for (n = 0; n < next_ptr; n++) {
+        if (ptr != table[n].new_ptr) continue;
+
+        farfree(table[n].org_ptr);
+        while (++n < next_ptr) {
+            table[n-1] = table[n];
+        }
+        next_ptr--;
+        return;
+    }
+    ptr = opaque; /* just to make some compilers happy */
+    Assert(0, "zcfree: ptr not found");
+}
+
+#endif /* __TURBOC__ */
+
+
+#ifdef M_I86
+/* Microsoft C in 16-bit mode */
+
+#  define MY_ZCALLOC
+
+#if (!defined(_MSC_VER) || (_MSC_VER <= 600))
+#  define _halloc  halloc
+#  define _hfree   hfree
+#endif
+
+voidpf zcalloc (voidpf opaque, unsigned items, unsigned size)
+{
+    if (opaque) opaque = 0; /* to make compiler happy */
+    return _halloc((long)items, size);
+}
+
+void  zcfree (voidpf opaque, voidpf ptr)
+{
+    if (opaque) opaque = 0; /* to make compiler happy */
+    _hfree(ptr);
+}
+
+#endif /* M_I86 */
+
+#endif /* SYS16BIT */
+
+
+#ifndef MY_ZCALLOC /* Any system without a special alloc function */
+
+#ifndef STDC
+extern voidp  malloc OF((uInt size));
+extern voidp  calloc OF((uInt items, uInt size));
+extern void   free   OF((voidpf ptr));
+#endif
+
+voidpf zcalloc (opaque, items, size)
+    voidpf opaque;
+    unsigned items;
+    unsigned size;
+{
+    if (opaque) items += size - size; /* make compiler happy */
+    return sizeof(uInt) > 2 ? (voidpf)malloc(items * size) :
+                              (voidpf)calloc(items, size);
+}
+
+void  zcfree (opaque, ptr)
+    voidpf opaque;
+    voidpf ptr;
+{
+    free(ptr);
+    if (opaque) return; /* make compiler happy */
+}
+
+#endif /* MY_ZCALLOC */
diff --git a/src/zlib/zutil.h b/src/zlib/zutil.h
index 08f944034..7b42edcaa 100644
--- a/src/zlib/zutil.h
+++ b/src/zlib/zutil.h
@@ -1,263 +1,263 @@
-/* zutil.h -- internal interface and configuration of the compression library

- * Copyright (C) 1995-2003 Jean-loup Gailly.

- * For conditions of distribution and use, see copyright notice in zlib.h

- */

-

-/* WARNING: this file should *not* be used by applications. It is

-   part of the implementation of the compression library and is

-   subject to change. Applications should only use zlib.h.

- */

-

-/* @(#) $Id$ */

-

-#ifndef ZUTIL_H

-#define ZUTIL_H

-

-#define ZLIB_INTERNAL

-#include "zlib.h"

-

-#ifdef STDC

-#  include <stddef.h>

-#  include <string.h>

-#  include <stdlib.h>

-#endif

-#ifdef NO_ERRNO_H

-    extern int errno;

-#else

-#   include <errno.h>

-#endif

-

-#ifndef local

-#  define local static

-#endif

-/* compile with -Dlocal if your debugger can't find static symbols */

-

-typedef unsigned char  uch;

-typedef uch FAR uchf;

-typedef unsigned short ush;

-typedef ush FAR ushf;

-typedef unsigned long  ulg;

-

-extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */

-/* (size given to avoid silly warnings with Visual C++) */

-

-#define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)]

-

-#define ERR_RETURN(strm,err) \

-  return (strm->msg = (char*)ERR_MSG(err), (err))

-/* To be used only when the state is known to be valid */

-

-        /* common constants */

-

-#ifndef DEF_WBITS

-#  define DEF_WBITS MAX_WBITS

-#endif

-/* default windowBits for decompression. MAX_WBITS is for compression only */

-

-#if MAX_MEM_LEVEL >= 8

-#  define DEF_MEM_LEVEL 8

-#else

-#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL

-#endif

-/* default memLevel */

-

-#define STORED_BLOCK 0

-#define STATIC_TREES 1

-#define DYN_TREES    2

-/* The three kinds of block type */

-

-#define MIN_MATCH  3

-#define MAX_MATCH  258

-/* The minimum and maximum match lengths */

-

-#define PRESET_DICT 0x20 /* preset dictionary flag in zlib header */

-

-        /* target dependencies */

-

-#if defined(MSDOS) || (defined(WINDOWS) && !defined(WIN32))

-#  define OS_CODE  0x00

-#  if defined(__TURBOC__) || defined(__BORLANDC__)

-#    if(__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__))

-       /* Allow compilation with ANSI keywords only enabled */

-       void _Cdecl farfree( void *block );

-       void *_Cdecl farmalloc( unsigned long nbytes );

-#    else

-#      include <alloc.h>

-#    endif

-#  else /* MSC or DJGPP */

-#    include <malloc.h>

-#  endif

-#endif

-

-#ifdef AMIGA

-#  define OS_CODE  0x01

-#endif

-

-#if defined(VAXC) || defined(VMS)

-#  define OS_CODE  0x02

-#  define F_OPEN(name, mode) \

-     fopen((name), (mode), "mbc=60", "ctx=stm", "rfm=fix", "mrs=512")

-#endif

-

-#if defined(ATARI) || defined(atarist)

-#  define OS_CODE  0x05

-#endif

-

-#ifdef OS2

-#  define OS_CODE  0x06

-#endif

-

-#if defined(MACOS) || defined(TARGET_OS_MAC)

-#  define OS_CODE  0x07

-#  if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os

-#    include <unix.h> /* for fdopen */

-#  else

-#    ifndef fdopen

-#      define fdopen(fd,mode) NULL /* No fdopen() */

-#    endif

-#  endif

-#endif

-

-#ifdef TOPS20

-#  define OS_CODE  0x0a

-#endif

-

-#ifdef WIN32

-#  ifndef __CYGWIN__  /* Cygwin is Unix, not Win32 */

-#    define OS_CODE  0x0b

-#  endif

-#endif

-

-#ifdef __50SERIES /* Prime/PRIMOS */

-#  define OS_CODE  0x0f

-#endif

-

-#if defined(_BEOS_) || defined(RISCOS)

-#  define fdopen(fd,mode) NULL /* No fdopen() */

-#endif

-

-#if (defined(_MSC_VER) && (_MSC_VER > 600))

-#  if defined(_WIN32_WCE)

-#    define fdopen(fd,mode) NULL /* No fdopen() */

-#    ifndef _PTRDIFF_T_DEFINED

-       typedef int ptrdiff_t;

-#      define _PTRDIFF_T_DEFINED

-#    endif

-#  else

-#    define fdopen(fd,type)  _fdopen(fd,type)

-#  endif

-#endif

-

-        /* common defaults */

-

-#ifndef OS_CODE

-#  define OS_CODE  0x03  /* assume Unix */

-#endif

-

-#ifndef F_OPEN

-#  define F_OPEN(name, mode) fopen((name), (mode))

-#endif

-

-         /* functions */

-

-#if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550)

-#  ifndef HAVE_VSNPRINTF

-#    define HAVE_VSNPRINTF

-#  endif

-#endif

-#if defined(__CYGWIN__)

-#  ifndef HAVE_VSNPRINTF

-#    define HAVE_VSNPRINTF

-#  endif

-#endif

-#ifndef HAVE_VSNPRINTF

-#  ifdef MSDOS

-     /* vsnprintf may exist on some MS-DOS compilers (DJGPP?),

-        but for now we just assume it doesn't. */

-#    define NO_vsnprintf

-#  endif

-#  ifdef __TURBOC__

-#    define NO_vsnprintf

-#  endif

-#  ifdef WIN32

-     /* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */

-#    if !defined(vsnprintf) && !defined(NO_vsnprintf)

-#      define vsnprintf _vsnprintf

-#    endif

-#  endif

-#  ifdef __SASC

-#    define NO_vsnprintf

-#  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

-#  define zstrerror(errnum) ""

-#endif

-

-#if defined(pyr)

-#  define NO_MEMCPY

-#endif

-#if defined(SMALL_MEDIUM) && !defined(_MSC_VER) && !defined(__SC__)

- /* Use our own functions for small and medium model with MSC <= 5.0.

-  * You may have to use the same strategy for Borland C (untested).

-  * The __SC__ check is for Symantec.

-  */

-#  define NO_MEMCPY

-#endif

-#if defined(STDC) && !defined(HAVE_MEMCPY) && !defined(NO_MEMCPY)

-#  define HAVE_MEMCPY

-#endif

-#ifdef HAVE_MEMCPY

-#  ifdef SMALL_MEDIUM /* MSDOS small or medium model */

-#    define zmemcpy _fmemcpy

-#    define zmemcmp _fmemcmp

-#    define zmemzero(dest, len) _fmemset(dest, 0, len)

-#  else

-#    define zmemcpy memcpy

-#    define zmemcmp memcmp

-#    define zmemzero(dest, len) memset(dest, 0, len)

-#  endif

-#else

-   extern void zmemcpy  OF((Bytef* dest, const Bytef* source, uInt len));

-   extern int  zmemcmp  OF((const Bytef* s1, const Bytef* s2, uInt len));

-   extern void zmemzero OF((Bytef* dest, uInt len));

-#endif

-

-/* Diagnostic functions */

-#ifdef DEBUG

-#  include <stdio.h>

-   extern int z_verbose;

-   extern void z_error    OF((char *m));

-#  define Assert(cond,msg) {if(!(cond)) z_error(msg);}

-#  define Trace(x) {if (z_verbose>=0) fprintf x ;}

-#  define Tracev(x) {if (z_verbose>0) fprintf x ;}

-#  define Tracevv(x) {if (z_verbose>1) fprintf x ;}

-#  define Tracec(c,x) {if (z_verbose>0 && (c)) fprintf x ;}

-#  define Tracecv(c,x) {if (z_verbose>1 && (c)) fprintf x ;}

-#else

-#  define Assert(cond,msg)

-#  define Trace(x)

-#  define Tracev(x)

-#  define Tracevv(x)

-#  define Tracec(c,x)

-#  define Tracecv(c,x)

-#endif

-

-

-voidpf zcalloc OF((voidpf opaque, unsigned items, unsigned size));

-void   zcfree  OF((voidpf opaque, voidpf ptr));

-

-#define ZALLOC(strm, items, size) \

-           (*((strm)->zalloc))((strm)->opaque, (items), (size))

-#define ZFREE(strm, addr)  (*((strm)->zfree))((strm)->opaque, (voidpf)(addr))

-#define TRY_FREE(s, p) {if (p) ZFREE(s, p);}

-

-#endif /* ZUTIL_H */

+/* zutil.h -- internal interface and configuration of the compression library
+ * Copyright (C) 1995-2003 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+   part of the implementation of the compression library and is
+   subject to change. Applications should only use zlib.h.
+ */
+
+/* @(#) $Id$ */
+
+#ifndef ZUTIL_H
+#define ZUTIL_H
+
+#define ZLIB_INTERNAL
+#include "zlib.h"
+
+#ifdef STDC
+#  include <stddef.h>
+#  include <string.h>
+#  include <stdlib.h>
+#endif
+#ifdef NO_ERRNO_H
+    extern int errno;
+#else
+#   include <errno.h>
+#endif
+
+#ifndef local
+#  define local static
+#endif
+/* compile with -Dlocal if your debugger can't find static symbols */
+
+typedef unsigned char  uch;
+typedef uch FAR uchf;
+typedef unsigned short ush;
+typedef ush FAR ushf;
+typedef unsigned long  ulg;
+
+extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
+/* (size given to avoid silly warnings with Visual C++) */
+
+#define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)]
+
+#define ERR_RETURN(strm,err) \
+  return (strm->msg = (char*)ERR_MSG(err), (err))
+/* To be used only when the state is known to be valid */
+
+        /* common constants */
+
+#ifndef DEF_WBITS
+#  define DEF_WBITS MAX_WBITS
+#endif
+/* default windowBits for decompression. MAX_WBITS is for compression only */
+
+#if MAX_MEM_LEVEL >= 8
+#  define DEF_MEM_LEVEL 8
+#else
+#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL
+#endif
+/* default memLevel */
+
+#define STORED_BLOCK 0
+#define STATIC_TREES 1
+#define DYN_TREES    2
+/* The three kinds of block type */
+
+#define MIN_MATCH  3
+#define MAX_MATCH  258
+/* The minimum and maximum match lengths */
+
+#define PRESET_DICT 0x20 /* preset dictionary flag in zlib header */
+
+        /* target dependencies */
+
+#if defined(MSDOS) || (defined(WINDOWS) && !defined(WIN32))
+#  define OS_CODE  0x00
+#  if defined(__TURBOC__) || defined(__BORLANDC__)
+#    if(__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__))
+       /* Allow compilation with ANSI keywords only enabled */
+       void _Cdecl farfree( void *block );
+       void *_Cdecl farmalloc( unsigned long nbytes );
+#    else
+#      include <alloc.h>
+#    endif
+#  else /* MSC or DJGPP */
+#    include <malloc.h>
+#  endif
+#endif
+
+#ifdef AMIGA
+#  define OS_CODE  0x01
+#endif
+
+#if defined(VAXC) || defined(VMS)
+#  define OS_CODE  0x02
+#  define F_OPEN(name, mode) \
+     fopen((name), (mode), "mbc=60", "ctx=stm", "rfm=fix", "mrs=512")
+#endif
+
+#if defined(ATARI) || defined(atarist)
+#  define OS_CODE  0x05
+#endif
+
+#ifdef OS2
+#  define OS_CODE  0x06
+#endif
+
+#if defined(MACOS) || defined(TARGET_OS_MAC)
+#  define OS_CODE  0x07
+#  if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
+#    include <unix.h> /* for fdopen */
+#  else
+#    ifndef fdopen
+#      define fdopen(fd,mode) NULL /* No fdopen() */
+#    endif
+#  endif
+#endif
+
+#ifdef TOPS20
+#  define OS_CODE  0x0a
+#endif
+
+#ifdef WIN32
+#  ifndef __CYGWIN__  /* Cygwin is Unix, not Win32 */
+#    define OS_CODE  0x0b
+#  endif
+#endif
+
+#ifdef __50SERIES /* Prime/PRIMOS */
+#  define OS_CODE  0x0f
+#endif
+
+#if defined(_BEOS_) || defined(RISCOS)
+#  define fdopen(fd,mode) NULL /* No fdopen() */
+#endif
+
+#if (defined(_MSC_VER) && (_MSC_VER > 600))
+#  if defined(_WIN32_WCE)
+#    define fdopen(fd,mode) NULL /* No fdopen() */
+#    ifndef _PTRDIFF_T_DEFINED
+       typedef int ptrdiff_t;
+#      define _PTRDIFF_T_DEFINED
+#    endif
+#  else
+#    define fdopen(fd,type)  _fdopen(fd,type)
+#  endif
+#endif
+
+        /* common defaults */
+
+#ifndef OS_CODE
+#  define OS_CODE  0x03  /* assume Unix */
+#endif
+
+#ifndef F_OPEN
+#  define F_OPEN(name, mode) fopen((name), (mode))
+#endif
+
+         /* functions */
+
+#if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550)
+#  ifndef HAVE_VSNPRINTF
+#    define HAVE_VSNPRINTF
+#  endif
+#endif
+#if defined(__CYGWIN__)
+#  ifndef HAVE_VSNPRINTF
+#    define HAVE_VSNPRINTF
+#  endif
+#endif
+#ifndef HAVE_VSNPRINTF
+#  ifdef MSDOS
+     /* vsnprintf may exist on some MS-DOS compilers (DJGPP?),
+        but for now we just assume it doesn't. */
+#    define NO_vsnprintf
+#  endif
+#  ifdef __TURBOC__
+#    define NO_vsnprintf
+#  endif
+#  ifdef WIN32
+     /* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */
+#    if !defined(vsnprintf) && !defined(NO_vsnprintf)
+#      define vsnprintf _vsnprintf
+#    endif
+#  endif
+#  ifdef __SASC
+#    define NO_vsnprintf
+#  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
+#  define zstrerror(errnum) ""
+#endif
+
+#if defined(pyr)
+#  define NO_MEMCPY
+#endif
+#if defined(SMALL_MEDIUM) && !defined(_MSC_VER) && !defined(__SC__)
+ /* Use our own functions for small and medium model with MSC <= 5.0.
+  * You may have to use the same strategy for Borland C (untested).
+  * The __SC__ check is for Symantec.
+  */
+#  define NO_MEMCPY
+#endif
+#if defined(STDC) && !defined(HAVE_MEMCPY) && !defined(NO_MEMCPY)
+#  define HAVE_MEMCPY
+#endif
+#ifdef HAVE_MEMCPY
+#  ifdef SMALL_MEDIUM /* MSDOS small or medium model */
+#    define zmemcpy _fmemcpy
+#    define zmemcmp _fmemcmp
+#    define zmemzero(dest, len) _fmemset(dest, 0, len)
+#  else
+#    define zmemcpy memcpy
+#    define zmemcmp memcmp
+#    define zmemzero(dest, len) memset(dest, 0, len)
+#  endif
+#else
+   extern void zmemcpy  OF((Bytef* dest, const Bytef* source, uInt len));
+   extern int  zmemcmp  OF((const Bytef* s1, const Bytef* s2, uInt len));
+   extern void zmemzero OF((Bytef* dest, uInt len));
+#endif
+
+/* Diagnostic functions */
+#ifdef DEBUG
+#  include <stdio.h>
+   extern int z_verbose;
+   extern void z_error    OF((char *m));
+#  define Assert(cond,msg) {if(!(cond)) z_error(msg);}
+#  define Trace(x) {if (z_verbose>=0) fprintf x ;}
+#  define Tracev(x) {if (z_verbose>0) fprintf x ;}
+#  define Tracevv(x) {if (z_verbose>1) fprintf x ;}
+#  define Tracec(c,x) {if (z_verbose>0 && (c)) fprintf x ;}
+#  define Tracecv(c,x) {if (z_verbose>1 && (c)) fprintf x ;}
+#else
+#  define Assert(cond,msg)
+#  define Trace(x)
+#  define Tracev(x)
+#  define Tracevv(x)
+#  define Tracec(c,x)
+#  define Tracecv(c,x)
+#endif
+
+
+voidpf zcalloc OF((voidpf opaque, unsigned items, unsigned size));
+void   zcfree  OF((voidpf opaque, voidpf ptr));
+
+#define ZALLOC(strm, items, size) \
+           (*((strm)->zalloc))((strm)->opaque, (items), (size))
+#define ZFREE(strm, addr)  (*((strm)->zfree))((strm)->opaque, (voidpf)(addr))
+#define TRY_FREE(s, p) {if (p) ZFREE(s, p);}
+
+#endif /* ZUTIL_H */