wxRTC table layout now uses cell content to calculate column widths if no other width...

[wxWidgets.git] / src / zlib / deflate.h

diff --git a/src/zlib/deflate.h b/src/zlib/deflate.h
index 04830164dd65702fdffa907c424ff34637f05870..958822f61382ee365af8c8caa38674b208ff682c 100644 (file)
--- a/src/zlib/deflate.h
+++ b/src/zlib/deflate.h
@@ -1,6 +1,6 @@
 /* deflate.h -- internal compression state
 /* deflate.h -- internal compression state

- * Copyright (C) 1995-1998 Jean-loup Gailly
- * For conditions of distribution and use, see copyright notice in zlib.h 
+ * 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
  */
 
 /* WARNING: this file should *not* be used by applications. It is


@@ -8,13 +8,20 @@
    subject to change. Applications should only use zlib.h.
  */
 
    subject to change. Applications should only use zlib.h.
  */
 

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

 
 

-#ifndef _DEFLATE_H
-#define _DEFLATE_H
+#ifndef DEFLATE_H
+#define DEFLATE_H

 
 #include "zutil.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.
  */
 /* ===========================================================================
  * Internal compression state.
  */


@@ -40,7 +47,14 @@
 #define MAX_BITS 15
 /* All codes must not exceed MAX_BITS bits */
 
 #define MAX_BITS 15
 /* All codes must not exceed MAX_BITS bits */
 

+#define Buf_size 16
+/* size of bit buffer in bi_buf */
+

 #define INIT_STATE    42
 #define INIT_STATE    42

+#define EXTRA_STATE   69
+#define NAME_STATE    73
+#define COMMENT_STATE 91
+#define HCRC_STATE   103

 #define BUSY_STATE   113
 #define FINISH_STATE 666
 /* Stream status */
 #define BUSY_STATE   113
 #define FINISH_STATE 666
 /* Stream status */


@@ -85,10 +99,11 @@ typedef struct internal_state {
     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 */
     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   noheader;      /* suppress zlib header and adler32 */
-    Byte  data_type;     /* UNKNOWN, BINARY or ASCII */
-    Byte  method;        /* STORED (for zip only) or DEFLATED */
+    uInt   pending;      /* nb of bytes in the pending buffer */
+    int   wrap;          /* bit 0 true for zlib, bit 1 true for gzip */
+    gz_headerp  gzhead;  /* gzip header information to write */
+    uInt   gzindex;      /* where in extra, name, or comment */
+    Byte  method;        /* can only be DEFLATED */

     int   last_flush;    /* value of flush param for previous deflate call */
 
                 /* used by deflate.c: */
     int   last_flush;    /* value of flush param for previous deflate call */
 
                 /* used by deflate.c: */


@@ -175,7 +190,7 @@ typedef struct internal_state {
     int nice_match; /* Stop searching when current match exceeds this */
 
                 /* used by trees.c: */
     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 */
+    /* Didn't use ct_data typedef below to suppress 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 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 */


@@ -230,12 +245,12 @@ typedef struct internal_state {
 
     ulg opt_len;        /* bit length of current block with optimal trees */
     ulg static_len;     /* bit length of current block with static trees */
 
     ulg opt_len;        /* bit length of current block with optimal trees */
     ulg static_len;     /* bit length of current block with static trees */

-    ulg compressed_len; /* total bit length of compressed file */

     uInt matches;       /* number of string matches in current block */
     uInt matches;       /* number of string matches in current block */

-    int last_eob_len;   /* bit length of EOB code for last block */
+    uInt insert;        /* bytes at end of window left to insert */

 
 #ifdef DEBUG
 
 #ifdef DEBUG

-    ulg bits_sent;      /* bit length of the compressed data */
+    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;
 #endif
 
     ush bi_buf;


@@ -247,6 +262,13 @@ typedef struct internal_state {
      * are always zero.
      */
 
      * are always zero.
      */
 

+    ulg high_water;
+    /* High water mark offset in window for initialized bytes -- bytes above
+     * this are set to zero in order to avoid memory check warnings when
+     * longest match routines access bytes past the input.  This is then
+     * updated to the new high water mark.
+     */
+

 } FAR deflate_state;
 
 /* Output a byte on the stream.
 } FAR deflate_state;
 
 /* Output a byte on the stream.


@@ -265,14 +287,19 @@ typedef struct internal_state {
  * distances are limited to MAX_DIST instead of WSIZE.
  */
 
  * distances are limited to MAX_DIST instead of WSIZE.
  */
 

+#define WIN_INIT MAX_MATCH
+/* Number of bytes after end of data in window to initialize in order to avoid
+   memory checker errors from longest match routines */
+

         /* in trees.c */
         /* in trees.c */

-void _tr_init         OF((deflate_state *s));
-int  _tr_tally        OF((deflate_state *s, unsigned dist, unsigned lc));
-ulg  _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));
+void ZLIB_INTERNAL _tr_init OF((deflate_state *s));
+int ZLIB_INTERNAL _tr_tally OF((deflate_state *s, unsigned dist, unsigned lc));
+void ZLIB_INTERNAL _tr_flush_block OF((deflate_state *s, charf *buf,
+                        ulg stored_len, int last));
+void ZLIB_INTERNAL _tr_flush_bits OF((deflate_state *s));
+void ZLIB_INTERNAL _tr_align OF((deflate_state *s));
+void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf,
+                        ulg stored_len, int last));

 
 #define d_code(dist) \
    ((dist) < 256 ? _dist_code[dist] : _dist_code[256+((dist)>>7)])
 
 #define d_code(dist) \
    ((dist) < 256 ? _dist_code[dist] : _dist_code[256+((dist)>>7)])


@@ -285,11 +312,11 @@ void _tr_stored_block OF((deflate_state *s, charf *buf, ulg stored_len,
 /* Inline versions of _tr_tally for speed: */
 
 #if defined(GEN_TREES_H) || !defined(STDC)
 /* Inline versions of _tr_tally for speed: */
 
 #if defined(GEN_TREES_H) || !defined(STDC)

-  extern uch _length_code[];
-  extern uch _dist_code[];
+  extern uch ZLIB_INTERNAL _length_code[];
+  extern uch ZLIB_INTERNAL _dist_code[];

 #else
 #else

-  extern const uch _length_code[];
-  extern const uch _dist_code[];
+  extern const uch ZLIB_INTERNAL _length_code[];
+  extern const uch ZLIB_INTERNAL _dist_code[];

 #endif
 
 # define _tr_tally_lit(s, c, flush) \
 #endif
 
 # define _tr_tally_lit(s, c, flush) \


@@ -312,7 +339,7 @@ void _tr_stored_block OF((deflate_state *s, charf *buf, ulg stored_len,
 #else
 # define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c)
 # define _tr_tally_dist(s, distance, length, flush) \
 #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) 
+              flush = _tr_tally(s, distance, length)

 #endif
 
 #endif
 

-#endif
+#endif /* DEFLATE_H */