FreeImage updated to 3.15.4

removed not used formats

git-svn-id: http://svn.miranda-ng.org/main/trunk@2926 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

3 files changed, 795 insertions, 741 deletions

diff --git a/plugins/AdvaImg/src/Zlib/zconf.h b/plugins/AdvaImg/src/Zlib/zconf.h
index 93c1bb27e3..54b82a3ccc 100644
--- a/plugins/AdvaImg/src/Zlib/zconf.h
+++ b/plugins/AdvaImg/src/Zlib/zconf.h
@@ -1,468 +1,506 @@
-/* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2011 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* @(#) $Id: zconf.h,v 1.8 2012/02/05 18:10:25 drolon Exp $ */
-
-#ifndef ZCONF_H
-#define ZCONF_H
-/* #undef Z_PREFIX */
-/* #undef Z_HAVE_UNISTD_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.
- * Even better than compiling with -DZ_PREFIX would be to use configure to set
- * this permanently in zconf.h using "./configure --zprefix".
- */
-#ifdef Z_PREFIX     /* may be set to #if 1 by ./configure */
-#  define Z_PREFIX_SET
-
-/* all linked symbols */
-#  define _dist_code            z__dist_code
-#  define _length_code          z__length_code
-#  define _tr_align             z__tr_align
-#  define _tr_flush_block       z__tr_flush_block
-#  define _tr_init              z__tr_init
-#  define _tr_stored_block      z__tr_stored_block
-#  define _tr_tally             z__tr_tally
-#  define adler32               z_adler32
-#  define adler32_combine       z_adler32_combine
-#  define adler32_combine64     z_adler32_combine64
-#  ifndef Z_SOLO
-#    define compress              z_compress
-#    define compress2             z_compress2
-#    define compressBound         z_compressBound
-#  endif
-#  define crc32                 z_crc32
-#  define crc32_combine         z_crc32_combine
-#  define crc32_combine64       z_crc32_combine64
-#  define deflate               z_deflate
-#  define deflateBound          z_deflateBound
-#  define deflateCopy           z_deflateCopy
-#  define deflateEnd            z_deflateEnd
-#  define deflateInit2_         z_deflateInit2_
-#  define deflateInit_          z_deflateInit_
-#  define deflateParams         z_deflateParams
-#  define deflatePending        z_deflatePending
-#  define deflatePrime          z_deflatePrime
-#  define deflateReset          z_deflateReset
-#  define deflateResetKeep      z_deflateResetKeep
-#  define deflateSetDictionary  z_deflateSetDictionary
-#  define deflateSetHeader      z_deflateSetHeader
-#  define deflateTune           z_deflateTune
-#  define deflate_copyright     z_deflate_copyright
-#  define get_crc_table         z_get_crc_table
-#  ifndef Z_SOLO
-#    define gz_error              z_gz_error
-#    define gz_intmax             z_gz_intmax
-#    define gz_strwinerror        z_gz_strwinerror
-#    define gzbuffer              z_gzbuffer
-#    define gzclearerr            z_gzclearerr
-#    define gzclose               z_gzclose
-#    define gzclose_r             z_gzclose_r
-#    define gzclose_w             z_gzclose_w
-#    define gzdirect              z_gzdirect
-#    define gzdopen               z_gzdopen
-#    define gzeof                 z_gzeof
-#    define gzerror               z_gzerror
-#    define gzflags               z_gzflags
-#    define gzflush               z_gzflush
-#    define gzgetc                z_gzgetc
-#    define gzgetc_               z_gzgetc_
-#    define gzgets                z_gzgets
-#    define gzoffset              z_gzoffset
-#    define gzoffset64            z_gzoffset64
-#    define gzopen                z_gzopen
-#    define gzopen64              z_gzopen64
-#    define gzprintf              z_gzprintf
-#    define gzputc                z_gzputc
-#    define gzputs                z_gzputs
-#    define gzread                z_gzread
-#    define gzrewind              z_gzrewind
-#    define gzseek                z_gzseek
-#    define gzseek64              z_gzseek64
-#    define gzsetparams           z_gzsetparams
-#    define gztell                z_gztell
-#    define gztell64              z_gztell64
-#    define gzungetc              z_gzungetc
-#    define gzwrite               z_gzwrite
-#  endif
-#  define inflate               z_inflate
-#  define inflateBack           z_inflateBack
-#  define inflateBackEnd        z_inflateBackEnd
-#  define inflateBackInit_      z_inflateBackInit_
-#  define inflateCopy           z_inflateCopy
-#  define inflateEnd            z_inflateEnd
-#  define inflateGetHeader      z_inflateGetHeader
-#  define inflateInit2_         z_inflateInit2_
-#  define inflateInit_          z_inflateInit_
-#  define inflateMark           z_inflateMark
-#  define inflatePrime          z_inflatePrime
-#  define inflateReset          z_inflateReset
-#  define inflateReset2         z_inflateReset2
-#  define inflateSetDictionary  z_inflateSetDictionary
-#  define inflateSync           z_inflateSync
-#  define inflateSyncPoint      z_inflateSyncPoint
-#  define inflateUndermine      z_inflateUndermine
-#  define inflateResetKeep      z_inflateResetKeep
-#  define inflate_copyright     z_inflate_copyright
-#  define inflate_fast          z_inflate_fast
-#  define inflate_table         z_inflate_table
-#  ifndef Z_SOLO
-#    define uncompress            z_uncompress
-#  endif
-#  define zError                z_zError
-#  ifndef Z_SOLO
-#    define zcalloc               z_zcalloc
-#    define zcfree                z_zcfree
-#  endif
-#  define zlibCompileFlags      z_zlibCompileFlags
-#  define zlibVersion           z_zlibVersion
-
-/* all zlib typedefs in zlib.h and zconf.h */
-#  define Byte                  z_Byte
-#  define Bytef                 z_Bytef
-#  define alloc_func            z_alloc_func
-#  define charf                 z_charf
-#  define free_func             z_free_func
-#  ifndef Z_SOLO
-#    define gzFile                z_gzFile
-#    define gz_header             z_gz_header
-#    define gz_headerp            z_gz_headerp
-#  endif
-#  define in_func               z_in_func
-#  define intf                  z_intf
-#  define out_func              z_out_func
-#  define uInt                  z_uInt
-#  define uIntf                 z_uIntf
-#  define uLong                 z_uLong
-#  define uLongf                z_uLongf
-#  define voidp                 z_voidp
-#  define voidpc                z_voidpc
-#  define voidpf                z_voidpf
-
-/* all zlib structs in zlib.h and zconf.h */
-#  ifndef Z_SOLO
-#    define gz_header_s           z_gz_header_s
-#  endif
-#  define internal_state        z_internal_state
-
-#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_WCE) || defined(__WIN32__)
-#  ifndef WIN32
-#    define WIN32
-#  endif
-#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
-
-#if defined(ZLIB_CONST) && !defined(z_const)
-#  define z_const const
-#else
-#  define z_const
-#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
-
-#ifndef Z_ARG /* function prototypes for stdarg */
-#  if defined(STDC) || defined(Z_HAVE_STDARG_H)
-#    define Z_ARG(args)  args
-#  else
-#    define Z_ARG(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 /*#ifdef HAVE_UNISTD_H    /* may be set to #if 1 by ./configure */
-#  define Z_HAVE_UNISTD_H
-#endif
-
-#ifdef HAVE_STDARG_H    /* may be set to #if 1 by ./configure */
-#  define Z_HAVE_STDARG_H
-#endif
-
-#ifdef STDC
-#  ifndef Z_SOLO
-#    include <sys/types.h>      /* for off_t */
-#  endif
-#endif
-
-/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
- * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
- * though the former does not conform to the LFS document), but considering
- * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
- * equivalently requesting no 64-bit operations
- */
-#if -_LARGEFILE64_SOURCE - -1 == 1
-#  undef _LARGEFILE64_SOURCE
-#endif
-
-#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
-#  define Z_LARGE
-#endif
-
-#if (defined(Z_HAVE_UNISTD_H) || defined(Z_LARGE)) && !defined(Z_SOLO)
-#  include <unistd.h>       /* for SEEK_* and off_t */
-#  ifdef VMS
-#    include <unixio.h>     /* for off_t */
-#  endif
-#  ifndef z_off_t
-#    define z_off_t off_t
-#  endif
-#endif
-
-#if !defined(SEEK_SET) && !defined(Z_SOLO)
-#  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(_WIN32) && (defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0)
-#  define z_off64_t off64_t
-#else
-#  if defined(_WIN32)
-#    define z_off64_t __int64
-#  else
-#  define z_off64_t z_off_t
-#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-2012 Jean-loup Gailly.

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

+ */

+

+/* @(#) $Id: zconf.h,v 1.9 2012/05/13 12:18:39 drolon Exp $ */

+

+#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.

+ * Even better than compiling with -DZ_PREFIX would be to use configure to set

+ * this permanently in zconf.h using "./configure --zprefix".

+ */

+#ifdef Z_PREFIX     /* may be set to #if 1 by ./configure */

+#  define Z_PREFIX_SET

+

+/* all linked symbols */

+#  define _dist_code            z__dist_code

+#  define _length_code          z__length_code

+#  define _tr_align             z__tr_align

+#  define _tr_flush_block       z__tr_flush_block

+#  define _tr_init              z__tr_init

+#  define _tr_stored_block      z__tr_stored_block

+#  define _tr_tally             z__tr_tally

+#  define adler32               z_adler32

+#  define adler32_combine       z_adler32_combine

+#  define adler32_combine64     z_adler32_combine64

+#  ifndef Z_SOLO

+#    define compress              z_compress

+#    define compress2             z_compress2

+#    define compressBound         z_compressBound

+#  endif

+#  define crc32                 z_crc32

+#  define crc32_combine         z_crc32_combine

+#  define crc32_combine64       z_crc32_combine64

+#  define deflate               z_deflate

+#  define deflateBound          z_deflateBound

+#  define deflateCopy           z_deflateCopy

+#  define deflateEnd            z_deflateEnd

+#  define deflateInit2_         z_deflateInit2_

+#  define deflateInit_          z_deflateInit_

+#  define deflateParams         z_deflateParams

+#  define deflatePending        z_deflatePending

+#  define deflatePrime          z_deflatePrime

+#  define deflateReset          z_deflateReset

+#  define deflateResetKeep      z_deflateResetKeep

+#  define deflateSetDictionary  z_deflateSetDictionary

+#  define deflateSetHeader      z_deflateSetHeader

+#  define deflateTune           z_deflateTune

+#  define deflate_copyright     z_deflate_copyright

+#  define get_crc_table         z_get_crc_table

+#  ifndef Z_SOLO

+#    define gz_error              z_gz_error

+#    define gz_intmax             z_gz_intmax

+#    define gz_strwinerror        z_gz_strwinerror

+#    define gzbuffer              z_gzbuffer

+#    define gzclearerr            z_gzclearerr

+#    define gzclose               z_gzclose

+#    define gzclose_r             z_gzclose_r

+#    define gzclose_w             z_gzclose_w

+#    define gzdirect              z_gzdirect

+#    define gzdopen               z_gzdopen

+#    define gzeof                 z_gzeof

+#    define gzerror               z_gzerror

+#    define gzflush               z_gzflush

+#    define gzgetc                z_gzgetc

+#    define gzgetc_               z_gzgetc_

+#    define gzgets                z_gzgets

+#    define gzoffset              z_gzoffset

+#    define gzoffset64            z_gzoffset64

+#    define gzopen                z_gzopen

+#    define gzopen64              z_gzopen64

+#    ifdef _WIN32

+#      define gzopen_w              z_gzopen_w

+#    endif

+#    define gzprintf              z_gzprintf

+#    define gzputc                z_gzputc

+#    define gzputs                z_gzputs

+#    define gzread                z_gzread

+#    define gzrewind              z_gzrewind

+#    define gzseek                z_gzseek

+#    define gzseek64              z_gzseek64

+#    define gzsetparams           z_gzsetparams

+#    define gztell                z_gztell

+#    define gztell64              z_gztell64

+#    define gzungetc              z_gzungetc

+#    define gzwrite               z_gzwrite

+#  endif

+#  define inflate               z_inflate

+#  define inflateBack           z_inflateBack

+#  define inflateBackEnd        z_inflateBackEnd

+#  define inflateBackInit_      z_inflateBackInit_

+#  define inflateCopy           z_inflateCopy

+#  define inflateEnd            z_inflateEnd

+#  define inflateGetHeader      z_inflateGetHeader

+#  define inflateInit2_         z_inflateInit2_

+#  define inflateInit_          z_inflateInit_

+#  define inflateMark           z_inflateMark

+#  define inflatePrime          z_inflatePrime

+#  define inflateReset          z_inflateReset

+#  define inflateReset2         z_inflateReset2

+#  define inflateSetDictionary  z_inflateSetDictionary

+#  define inflateSync           z_inflateSync

+#  define inflateSyncPoint      z_inflateSyncPoint

+#  define inflateUndermine      z_inflateUndermine

+#  define inflateResetKeep      z_inflateResetKeep

+#  define inflate_copyright     z_inflate_copyright

+#  define inflate_fast          z_inflate_fast

+#  define inflate_table         z_inflate_table

+#  ifndef Z_SOLO

+#    define uncompress            z_uncompress

+#  endif

+#  define zError                z_zError

+#  ifndef Z_SOLO

+#    define zcalloc               z_zcalloc

+#    define zcfree                z_zcfree

+#  endif

+#  define zlibCompileFlags      z_zlibCompileFlags

+#  define zlibVersion           z_zlibVersion

+

+/* all zlib typedefs in zlib.h and zconf.h */

+#  define Byte                  z_Byte

+#  define Bytef                 z_Bytef

+#  define alloc_func            z_alloc_func

+#  define charf                 z_charf

+#  define free_func             z_free_func

+#  ifndef Z_SOLO

+#    define gzFile                z_gzFile

+#  endif

+#  define gz_header             z_gz_header

+#  define gz_headerp            z_gz_headerp

+#  define in_func               z_in_func

+#  define intf                  z_intf

+#  define out_func              z_out_func

+#  define uInt                  z_uInt

+#  define uIntf                 z_uIntf

+#  define uLong                 z_uLong

+#  define uLongf                z_uLongf

+#  define voidp                 z_voidp

+#  define voidpc                z_voidpc

+#  define voidpf                z_voidpf

+

+/* all zlib structs in zlib.h and zconf.h */

+#  define gz_header_s           z_gz_header_s

+#  define internal_state        z_internal_state

+

+#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_WCE) || defined(__WIN32__)

+#  ifndef WIN32

+#    define WIN32

+#  endif

+#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

+

+#if defined(ZLIB_CONST) && !defined(z_const)

+#  define z_const const

+#else

+#  define z_const

+#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

+

+#ifndef Z_ARG /* function prototypes for stdarg */

+#  if defined(STDC) || defined(Z_HAVE_STDARG_H)

+#    define Z_ARG(args)  args

+#  else

+#    define Z_ARG(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

+

+/* ./configure may #define Z_U4 here */

+

+#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)

+#  include <limits.h>

+#  if (UINT_MAX == 0xffffffffUL)

+#    define Z_U4 unsigned

+#  else

+#    if (ULONG_MAX == 0xffffffffUL)

+#      define Z_U4 unsigned long

+#    else

+#      if (USHRT_MAX == 0xffffffffUL)

+#        define Z_U4 unsigned short

+#      endif

+#    endif

+#  endif

+#endif

+

+#ifdef Z_U4

+   typedef Z_U4 z_crc_t;

+#else

+   typedef unsigned long z_crc_t;

+#endif

+

+#ifdef HAVE_UNISTD_H    /* may be set to #if 1 by ./configure */

+#  define Z_HAVE_UNISTD_H

+#endif

+

+#ifdef HAVE_STDARG_H    /* may be set to #if 1 by ./configure */

+#  define Z_HAVE_STDARG_H

+#endif

+

+#ifdef STDC

+#  ifndef Z_SOLO

+#    include <sys/types.h>      /* for off_t */

+#  endif

+#endif

+

+#ifdef _WIN32

+#  include <stddef.h>           /* for wchar_t */

+#endif

+

+/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and

+ * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even

+ * though the former does not conform to the LFS document), but considering

+ * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as

+ * equivalently requesting no 64-bit operations

+ */

+#if defined(LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1

+#  undef _LARGEFILE64_SOURCE

+#endif

+

+#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H)

+#  define Z_HAVE_UNISTD_H

+#endif

+#ifndef Z_SOLO

+#  if defined(Z_HAVE_UNISTD_H) || defined(LARGEFILE64_SOURCE)

+#    include <unistd.h>         /* for SEEK_*, off_t, and _LFS64_LARGEFILE */

+#    ifdef VMS

+#      include <unixio.h>       /* for off_t */

+#    endif

+#    ifndef z_off_t

+#      define z_off_t off_t

+#    endif

+#  endif

+#endif

+

+#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0

+#  define Z_LFS64

+#endif

+

+#if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64)

+#  define Z_LARGE64

+#endif

+

+#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64)

+#  define Z_WANT64

+#endif

+

+#if !defined(SEEK_SET) && !defined(Z_SOLO)

+#  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(_WIN32) && defined(Z_LARGE64)

+#  define z_off64_t off64_t

+#else

+#  if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)

+#    define z_off64_t __int64

+#  else

+#    define z_off64_t z_off_t

+#  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/plugins/AdvaImg/src/Zlib/zlib.h b/plugins/AdvaImg/src/Zlib/zlib.h
index 79142d1172..3edf3acdb5 100644
--- a/plugins/AdvaImg/src/Zlib/zlib.h
+++ b/plugins/AdvaImg/src/Zlib/zlib.h
@@ -1,5 +1,5 @@
 /* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.2.6, January 29th, 2012
+  version 1.2.7, May 2nd, 2012
 
   Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler
 
@@ -37,11 +37,11 @@
 extern "C" {
 #endif
 
-#define ZLIB_VERSION "1.2.6"
-#define ZLIB_VERNUM 0x1260
+#define ZLIB_VERSION "1.2.7"
+#define ZLIB_VERNUM 0x1270
 #define ZLIB_VER_MAJOR 1
 #define ZLIB_VER_MINOR 2
-#define ZLIB_VER_REVISION 6
+#define ZLIB_VER_REVISION 7
 #define ZLIB_VER_SUBREVISION 0
 
 /*
@@ -452,14 +452,17 @@ ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
   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 not required to perform an
-  inflation in one step.  However it may be used to inform inflate that a
-  faster approach can be used for the single inflate() call.  Z_FINISH also
-  informs inflate to not maintain a sliding window if the stream completes,
-  which reduces inflate's memory footprint.
+  avail_out must be large enough to hold all of the uncompressed data for the
+  operation to complete.  (The size of the uncompressed data may have been
+  saved by the compressor for this purpose.) The use of Z_FINISH is not
+  required to perform an inflation in one step.  However it may be used to
+  inform inflate that a faster approach can be used for the single inflate()
+  call.  Z_FINISH also informs inflate to not maintain a sliding window if the
+  stream completes, which reduces inflate's memory footprint.  If the stream
+  does not complete, either because not all of the stream is provided or not
+  enough output space is provided, then a sliding window will be allocated and
+  inflate() can be called again to continue the operation as if Z_NO_FLUSH had
+  been used.
 
      In this implementation, inflate() always flushes as much output as
   possible to the output buffer, and always uses the faster approach on the
@@ -1217,7 +1220,10 @@ ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode));
 
      "a" can be used instead of "w" to request that the gzip stream that will
    be written be appended to the file.  "+" will result in an error, since
-   reading and writing to the same gzip file is not supported.
+   reading and writing to the same gzip file is not supported.  The addition of
+   "x" when writing will create the file exclusively, which fails if the file
+   already exists.  On systems that support it, the addition of "e" when
+   reading or writing will set the flag to close the file on an execve() call.
 
      These functions, as well as gzip, will read and decode a sequence of gzip
    streams in a file.  The append function of gzopen() can be used to create
@@ -1578,9 +1584,8 @@ ZEXTERN uLong ZEXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));
 /*
      Update a running CRC-32 with the bytes buf[0..len-1] and return the
    updated CRC-32.  If buf is Z_NULL, this function returns the required
-   initial value for the for the crc.  Pre- and post-conditioning (one's
-   complement) is performed within this function so it shouldn't be done by the
-   application.
+   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:
 
@@ -1650,9 +1655,15 @@ struct gzFile_s {
     unsigned char *next;
     z_off64_t pos;
 };
-ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));
-#define gzgetc(g) \
-    ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc_(g))
+ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));  /* backward compatibility */
+#ifdef Z_PREFIX_SET
+#  undef z_gzgetc
+#  define z_gzgetc(g) \
+          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g))
+#else
+#  define gzgetc(g) \
+          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g))
+#endif
 
 /* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or
  * change the regular functions to 64 bits if _FILE_OFFSET_BITS is 64 (if
@@ -1660,7 +1671,7 @@ ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));
  * functions are changed to 64 bits) -- in case these are set on systems
  * without large file support, _LFS64_LARGEFILE must also be true
  */
-#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
+#ifdef Z_LARGE64
    ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
    ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int));
    ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile));
@@ -1669,7 +1680,7 @@ ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));
    ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off64_t));
 #endif
 
-#if !defined(ZLIB_INTERNAL) && _FILE_OFFSET_BITS-0 == 64 && _LFS64_LARGEFILE-0
+#if !defined(ZLIB_INTERNAL) && defined(Z_WANT64)
 #  ifdef Z_PREFIX_SET
 #    define z_gzopen z_gzopen64
 #    define z_gzseek z_gzseek64
@@ -1685,7 +1696,7 @@ ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));
 #    define adler32_combine adler32_combine64
 #    define crc32_combine crc32_combine64
 #  endif
-#  ifndef _LARGEFILE64_SOURCE
+#  ifndef Z_LARGE64
      ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
      ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
      ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));
@@ -1717,12 +1728,13 @@ ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));
 /* undocumented functions */
 ZEXTERN const char   * ZEXPORT zError           OF((int));
 ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp));
-ZEXTERN const uLongf * ZEXPORT get_crc_table    OF((void));
+ZEXTERN const z_crc_t FAR * ZEXPORT get_crc_table    OF((void));
 ZEXTERN int            ZEXPORT inflateUndermine OF((z_streamp, int));
 ZEXTERN int            ZEXPORT inflateResetKeep OF((z_streamp));
 ZEXTERN int            ZEXPORT deflateResetKeep OF((z_streamp));
-#ifndef Z_SOLO
-  ZEXTERN unsigned long  ZEXPORT gzflags          OF((void));
+#if defined(_WIN32) && !defined(Z_SOLO)
+ZEXTERN gzFile         ZEXPORT gzopen_w OF((const wchar_t *path,
+                                            const char *mode));
 #endif
 
 #ifdef __cplusplus
diff --git a/plugins/AdvaImg/src/Zlib/zutil.h b/plugins/AdvaImg/src/Zlib/zutil.h
index 8f33fd3e7d..9a5427578e 100644
--- a/plugins/AdvaImg/src/Zlib/zutil.h
+++ b/plugins/AdvaImg/src/Zlib/zutil.h
@@ -1,248 +1,252 @@
-/* zutil.h -- internal interface and configuration of the compression library
- * Copyright (C) 1995-2011 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: zutil.h,v 1.8 2012/02/05 18:10:25 drolon Exp $ */
-
-#ifndef ZUTIL_H
-#define ZUTIL_H
-
-#if ((__GNUC__-0) * 10 + __GNUC_MINOR__-0 >= 33) && !defined(NO_VIZ)
-#  define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
-#else
-#  define ZLIB_INTERNAL
-#endif
-
-#include "zlib.h"
-
-#if defined(STDC) && !defined(Z_SOLO)
-#  if !(defined(_WIN32_WCE) && defined(_MSC_VER))
-#    include <stddef.h>
-#  endif
-#  include <string.h>
-#  include <stdlib.h>
-#endif
-
-#ifdef Z_SOLO
-   typedef long ptrdiff_t;  /* guess -- will be caught if guess is wrong */
-#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
-#  ifndef Z_SOLO
-#    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
-#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
-#  if defined(M_I86) && !defined(Z_SOLO)
-#    include <malloc.h>
-#  endif
-#endif
-
-#if defined(MACOS) || defined(TARGET_OS_MAC)
-#  define OS_CODE  0x07
-#  ifndef Z_SOLO
-#    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
-#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)) && !defined __INTERIX
-#  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
-
-#if defined(__BORLANDC__) && !defined(MSDOS)
-  #pragma warn -8004
-  #pragma warn -8008
-  #pragma warn -8066
-#endif
-
-/* provide prototypes for these when building zlib without LFS */
-#if !defined(_WIN32) && (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0)
-    ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
-    ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
-#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(pyr) || defined(Z_SOLO)
-#  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
-   void ZLIB_INTERNAL zmemcpy OF((Bytef* dest, const Bytef* source, uInt len));
-   int ZLIB_INTERNAL zmemcmp OF((const Bytef* s1, const Bytef* s2, uInt len));
-   void ZLIB_INTERNAL zmemzero OF((Bytef* dest, uInt len));
-#endif
-
-/* Diagnostic functions */
-#ifdef DEBUG
-#  include <stdio.h>
-   extern int ZLIB_INTERNAL z_verbose;
-   extern void ZLIB_INTERNAL 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
-
-#ifndef Z_SOLO
-   voidpf ZLIB_INTERNAL zcalloc OF((voidpf opaque, unsigned items,
-                                    unsigned size));
-   void ZLIB_INTERNAL zcfree  OF((voidpf opaque, voidpf ptr));
-#endif
-
-#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-2012 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: zutil.h,v 1.9 2012/05/13 12:18:39 drolon Exp $ */

+

+#ifndef ZUTIL_H

+#define ZUTIL_H

+

+#ifdef HAVE_HIDDEN

+#  define ZLIB_INTERNAL __attribute__((visibility ("hidden")))

+#else

+#  define ZLIB_INTERNAL

+#endif

+

+#include "zlib.h"

+

+#if defined(STDC) && !defined(Z_SOLO)

+#  if !(defined(_WIN32_WCE) && defined(_MSC_VER))

+#    include <stddef.h>

+#  endif

+#  include <string.h>

+#  include <stdlib.h>

+#endif

+

+#ifdef Z_SOLO

+   typedef long ptrdiff_t;  /* guess -- will be caught if guess is wrong */

+#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

+#  ifndef Z_SOLO

+#    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

+#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

+#  if defined(M_I86) && !defined(Z_SOLO)

+#    include <malloc.h>

+#  endif

+#endif

+

+#if defined(MACOS) || defined(TARGET_OS_MAC)

+#  define OS_CODE  0x07

+#  ifndef Z_SOLO

+#    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

+#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)) && !defined __INTERIX

+#  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

+

+#if defined(__BORLANDC__) && !defined(MSDOS)

+  #pragma warn -8004

+  #pragma warn -8008

+  #pragma warn -8066

+#endif

+

+/* provide prototypes for these when building zlib without LFS */

+#if !defined(_WIN32) && (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0)

+    ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));

+    ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));

+#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(pyr) || defined(Z_SOLO)

+#  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

+   void ZLIB_INTERNAL zmemcpy OF((Bytef* dest, const Bytef* source, uInt len));

+   int ZLIB_INTERNAL zmemcmp OF((const Bytef* s1, const Bytef* s2, uInt len));

+   void ZLIB_INTERNAL zmemzero OF((Bytef* dest, uInt len));

+#endif

+

+/* Diagnostic functions */

+#ifdef DEBUG

+#  include <stdio.h>

+   extern int ZLIB_INTERNAL z_verbose;

+   extern void ZLIB_INTERNAL 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

+

+#ifndef Z_SOLO

+   voidpf ZLIB_INTERNAL zcalloc OF((voidpf opaque, unsigned items,

+                                    unsigned size));

+   void ZLIB_INTERNAL zcfree  OF((voidpf opaque, voidpf ptr));

+#endif

+

+#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);}

+

+/* Reverse the bytes in a 32-bit value */

+#define ZSWAP32(q) ((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \

+                    (((q) & 0xff00) << 8) + (((q) & 0xff) << 24))

+

+#endif /* ZUTIL_H */