Rework the wxCusor ctor taking wx stock number to provide as many cursors as

[wxWidgets.git] / src / zlib / compress.c

diff --git a/src/zlib/compress.c b/src/zlib/compress.c
index 8644e1db690fa52ae2fcf7769bf6b82d669846cc..df04f0148e6d6a22ce0f5bc4e3eeeb7bb54ca605 100644 (file)
--- a/src/zlib/compress.c
+++ b/src/zlib/compress.c
@@ -1,11 +1,12 @@
 /* compress.c -- compress a memory buffer
- * Copyright (C) 1995-1998 Jean-loup Gailly.
+ * Copyright (C) 1995-2003 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
 /* @(#) $Id$ */
 
-#include "../zlib/zlib.h"
+#define ZLIB_INTERNAL
+#include "zlib.h"
 
 /* ===========================================================================
      Compresses the source buffer into the destination buffer. The level
@@ -18,16 +19,12 @@
    memory, Z_BUF_ERROR if there was not enough room in the output buffer,
    Z_STREAM_ERROR if the level parameter is invalid.
 */
-#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */
-int ZEXPORT compress2 (Bytef* dest, uLongf* destLen, const Bytef* source, uLong sourceLen, int level)
-#else
 int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)
     Bytef *dest;
     uLongf *destLen;
     const Bytef *source;
     uLong sourceLen;
     int level;
-#endif
 {
     z_stream stream;
     int err;
@@ -62,15 +59,21 @@ int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)
 
 /* ===========================================================================
  */
-#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */
-int ZEXPORT compress (Bytef* dest, uLongf* destLen, const Bytef* source, uLong sourceLen)
-#else
 int ZEXPORT compress (dest, destLen, source, sourceLen)
     Bytef *dest;
     uLongf *destLen;
     const Bytef *source;
     uLong sourceLen;
-#endif
 {
     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;
+}