Changeset 38329 for branches/eam_branches/ohana.20150429/src/libfits/extern/gzip.c

Timestamp:

May 28, 2015, 8:27:00 PM (11 years ago)

Author:

eugene

Message:

adding code for table compress/uncompress; image compress works (but is not quite compatible with cfitsio for some reason and byteswap is broken)

File:

• branches/eam_branches/ohana.20150429/src/libfits/extern/gzip.c (modified) (3 diffs)

branches/eam_branches/ohana.20150429/src/libfits/extern/gzip.c

@@ -131 +131 @@
     if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR;
 
-    stream.zalloc = (alloc_func)0;
-    stream.zfree = (free_func)0;
+    stream.zalloc = Z_NULL;
+    stream.zfree  = Z_NULL;
+    stream.opaque = Z_NULL;
 
-    // MAX_WBITS = 15
-    err = inflateInit2(&stream, -15);
+    // err = inflateInit2(&stream, -15);
+    err = inflateInit(&stream);
     if (err != Z_OK) return err;
 
@@ -156 +157 @@
   z_stream stream;
   int err;
-
+  
   stream.next_in = (Bytef*)source;
   stream.avail_in = (uInt)sourceLen;
@@ -167 +168 @@
   if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR;
 
-  stream.zalloc = (alloc_func)0;
-  stream.zfree = (free_func)0;
+  stream.zalloc = Z_NULL;
+  stream.zfree  = Z_NULL;
+  stream.opaque = Z_NULL;
 
-  err = deflateInit(&stream);
+  // the '5' is the compression level: make this a user argument
+  err = deflateInit(&stream, 5);
   if (err != Z_OK) return err;