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

Timestamp:

Jun 8, 2015, 11:01:33 AM (11 years ago)

Author:

eugene

Message:

tap-ify zlib test code; fix windowBits problem (make libfits compatible with older <= 1.2.3.4 versions of zlib); pass catcompress to subcatalogs; force compress and format updates for catalogs even if they already exist

File:

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

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

@@ -119 +119 @@
 # define ESCAPE(RET) { fprintf (stderr, "gzip error in %s @ %s:%d\n", __func__, __FILE__, __LINE__); return (RET); }
 
-// NOTE: CFITSIO uses gzip format, not just zlib
-int gfits_uncompress (Bytef *dest, uLongf *destLen, const Bytef *source, uLong sourceLen)
-{
+int gfits_compress (Bytef *dest, uLongf *destLen, const Bytef *source, uLong sourceLen) {
+
   z_stream stream;
   int i, err;
@@ -130 +129 @@
   /* Check for source > 64K on 16-bit machine: */
   if ((uLong)stream.avail_in != sourceLen) ESCAPE (Z_BUF_ERROR);
-  
+
   stream.next_out = dest;
-  stream.avail_out = (uInt)*destLen;
+  stream.avail_out = (uInt)*destLen; // allocated space
   if ((uLong)stream.avail_out != *destLen) ESCAPE (Z_BUF_ERROR);
-  
+
   stream.zalloc = Z_NULL;
   stream.zfree  = Z_NULL;
   stream.opaque = Z_NULL;
-  
-  if (EXTRA_VERBOSE) {
-    fprintf (stderr, "inp unc: ");
-    for (i = 0; i < sourceLen; i++) {
-      fprintf (stderr, "0x%02hhx ", source[i]);
-    }
-    fprintf (stderr, "\n");
-  }
-  
-  // a value of 32 tells inflate to use the window size used in the compression AND to look for both zlib and gzip headers
-  err = inflateInit2(&stream, 32);
-  if (err != Z_OK) ESCAPE (err);
-  
-  err = inflate(&stream, Z_FINISH);
-  if (err != Z_STREAM_END) {
-    inflateEnd(&stream);
-    if (err == Z_NEED_DICT || (err == Z_BUF_ERROR && stream.avail_in == 0)) ESCAPE (Z_DATA_ERROR);
-    ESCAPE(err);
-  }
-  
-  if (EXTRA_VERBOSE) {
-    fprintf (stderr, "out unc: ");
-    for (i = 0; i < stream.total_out; i++) {
-      fprintf (stderr, "0x%02hhx ", dest[i]);
-    }
-    fprintf (stderr, "\n");
-  }
-
-  assert (stream.total_out <= *destLen);
-  *destLen = stream.total_out;
-
-  err = inflateEnd(&stream);
-  return err;
-}
-
-int gfits_compress (Bytef *dest, uLongf *destLen, const Bytef *source, uLong sourceLen)
-{
-  z_stream stream;
-  int i, err;
-  
-  stream.next_in = (Bytef*)source;
-  stream.avail_in = (uInt)sourceLen;
-
-  /* Check for source > 64K on 16-bit machine: */
-  if ((uLong)stream.avail_in != sourceLen) ESCAPE (Z_BUF_ERROR);
-
-  stream.next_out = dest;
-  stream.avail_out = (uInt)*destLen; // allocated space
-  if ((uLong)stream.avail_out != *destLen) ESCAPE (Z_BUF_ERROR);
-
-  stream.zalloc = Z_NULL;
-  stream.zfree  = Z_NULL;
-  stream.opaque = Z_NULL;
 
   if (EXTRA_VERBOSE) {
@@ -203 +149 @@
   // NOTE: cfitsio uses a fixed value of 1
   // I am using deflateInit2 because cfitsio expects gzip, not just zlib
+  // windowBits = 31 = (15 + 16) = (2^15 window bits) + (create a gzip stream)
   err = deflateInit2(&stream, 1, Z_DEFLATED, 31, 8, Z_DEFAULT_STRATEGY);
   if (0) fprintf (stderr, "inp buffers cmp 0: %d => %d => %d\n", stream.avail_in, stream.avail_out, (int) stream.total_out);
@@ -230 +177 @@
   return err;
 }
+
+// NOTE: CFITSIO uses gzip format, not just zlib
+int gfits_uncompress (Bytef *dest, uLongf *destLen, const Bytef *source, uLong sourceLen) {
+
+  z_stream stream;
+  int i, err;
+  
+  stream.next_in = (Bytef*)source;
+  stream.avail_in = (uInt)sourceLen;
+
+  /* Check for source > 64K on 16-bit machine: */
+  if ((uLong)stream.avail_in != sourceLen) ESCAPE (Z_BUF_ERROR);
+  
+  stream.next_out = dest;
+  stream.avail_out = (uInt)*destLen;
+  if ((uLong)stream.avail_out != *destLen) ESCAPE (Z_BUF_ERROR);
+  
+  stream.zalloc = Z_NULL;
+  stream.zfree  = Z_NULL;
+  stream.opaque = Z_NULL;
+  
+  if (EXTRA_VERBOSE) {
+    fprintf (stderr, "inp unc: ");
+    for (i = 0; i < sourceLen; i++) {
+      fprintf (stderr, "0x%02hhx ", source[i]);
+    }
+    fprintf (stderr, "\n");
+  }
+  
+  // windowBits = 47 = (15 + 32) = (2^15 window bits) + (test for either gzip or zlib
+  // streams).  NOTE: modern versions of zlib (version > 1.2.3.4) allow for windowBits = 0
+  // (or 16 or 32) to use the compressed stream windowBits value.  IPP cluster still has
+  // zlib version = 1.2.3, so we cannot use this feature.
+  err = inflateInit2(&stream, 47);
+  if (err != Z_OK) ESCAPE (err);
+  
+  err = inflate(&stream, Z_FINISH);
+  if (err != Z_STREAM_END) {
+    inflateEnd(&stream);
+    if (err == Z_NEED_DICT || (err == Z_BUF_ERROR && stream.avail_in == 0)) ESCAPE (Z_DATA_ERROR);
+    ESCAPE(err);
+  }
+  
+  if (EXTRA_VERBOSE) {
+    fprintf (stderr, "out unc: ");
+    for (i = 0; i < stream.total_out; i++) {
+      fprintf (stderr, "0x%02hhx ", dest[i]);
+    }
+    fprintf (stderr, "\n");
+  }
+
+  assert (stream.total_out <= *destLen);
+  *destLen = stream.total_out;
+
+  err = inflateEnd(&stream);
+  return err;
+}
+