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

Timestamp:

May 29, 2015, 5:24:53 PM (11 years ago)

Author:

eugene

Message:

table compression is internally consistent (tables can be generated and compressed)

File:

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

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

@@ -120 +120 @@
 {
     z_stream stream;
-    int err;
+    int i, err;
 
     stream.next_in = (Bytef*)source;
@@ -135 +135 @@
     stream.opaque = Z_NULL;
 
+    if (0) {
+      fprintf (stderr, "inp unc: ");
+      for (i = 0; i < sourceLen; i++) {
+        fprintf (stderr, "0x%02hhx ", source[i]);
+      }
+      fprintf (stderr, "\n");
+    }
+
     // err = inflateInit2(&stream, -15);
     err = inflateInit(&stream);
+    if (0) fprintf (stderr, "inp buffers unc 0: %d => %d => %d\n", stream.avail_in, stream.avail_out, (int) stream.total_out);
+
     if (err != Z_OK) return err;
 
     err = inflate(&stream, Z_FINISH);
+    if (0) fprintf (stderr, "out buffers unc 1: %d => %d => %d\n", stream.avail_in, stream.avail_out, (int) stream.total_out);
     if (err != Z_STREAM_END) {
         inflateEnd(&stream);
-        if (err == Z_NEED_DICT || (err == Z_BUF_ERROR && stream.avail_in == 0))
-            return Z_DATA_ERROR;
+        if (err == Z_NEED_DICT || (err == Z_BUF_ERROR && stream.avail_in == 0)) return Z_DATA_ERROR;
         return err;
     }
+    if (0) fprintf (stderr, "out buffers unc 2: %d => %d => %d\n", stream.avail_in, stream.avail_out, (int) stream.total_out);
+
+    if (0) {
+      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;
@@ -156 +176 @@
 {
   z_stream stream;
-  int err;
+  int i, err;
   
   stream.next_in = (Bytef*)source;
@@ -172 +192 @@
   stream.opaque = Z_NULL;
 
+  if (0) {
+    fprintf (stderr, "inp cmp: ");
+    for (i = 0; i < sourceLen; i++) {
+      fprintf (stderr, "0x%02hhx ", source[i]);
+    }
+    fprintf (stderr, "\n");
+  }
+
   // the '5' is the compression level: make this a user argument
   err = deflateInit(&stream, 5);
+  if (0) fprintf (stderr, "inp buffers cmp 0: %d => %d => %d\n", stream.avail_in, stream.avail_out, (int) stream.total_out);
+
   if (err != Z_OK) return err;
 
@@ -179 +209 @@
   // the compression occur in a series of steps
   err = deflate(&stream, Z_FINISH);
+  if (0) fprintf (stderr, "out buffers cmp 1: %d => %d => %d\n", stream.avail_in, stream.avail_out, (int) stream.total_out);
+
   if (err != Z_STREAM_END) {
-    deflateEnd(&stream);
-    return err;
-  }
+    err = deflateEnd(&stream);
+    return Z_BUF_ERROR;
+  }
+  if (0) fprintf (stderr, "out buffers cmp 2: %d => %d => %d\n", stream.avail_in, stream.avail_out, (int) stream.total_out);
+
+  if (0) {
+    fprintf (stderr, "out cmp: ");
+    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;