Changeset 38340 for branches/eam_branches/ohana.20150429/src/opihi/cmd.data/rd.c

Timestamp:

May 30, 2015, 7:59:48 PM (11 years ago)

Author:

eugene

Message:

more work on compression : cfitsio assumes gzip, not zlib (I have made uncompress general )

File:

• branches/eam_branches/ohana.20150429/src/opihi/cmd.data/rd.c (modified) (3 diffs)

branches/eam_branches/ohana.20150429/src/opihi/cmd.data/rd.c

@@ -85 +85 @@
       return (FALSE);
     }
-    if (gfits_extension_is_compressed (&buf[0].header)) {
+    if (gfits_extension_is_compressed_image (&buf[0].header)) {
         IsCompressed = TRUE;
     }
@@ -118 +118 @@
       Nword = 1;
       IsCompressed = FALSE;
-      if (gfits_extension_is_compressed (&buf[0].header)) {
+      if (gfits_extension_is_compressed_image (&buf[0].header)) {
         if (!strcmp (CCDKeyword, "EXTNAME")) Nword = 1;
         IsCompressed = TRUE;
@@ -194 +194 @@
 
     if (!gfits_fread_ftable_data (f, &ftable, FALSE)) { fprintf (stderr, "problem reading compressed image table data\n"); fclose (f); return FALSE; }
-    fprintf (stderr, "rd 1: ");
-    for (i = 0; i < 32; i++) {
-      fprintf (stderr, "0x%0hhx ", ftable.buffer[i]);
-    }
-    fprintf (stderr, "\n");
-  
     if (!gfits_byteswap_varlength_column (&ftable, 1)) { fprintf (stderr, "problem doing byteswap on compressed image metadata column\n"); fclose (f); gfits_free_table (&ftable); return FALSE; }
-    fprintf (stderr, "rd 2: ");
-    for (i = 0; i < 32; i++) {
-      fprintf (stderr, "0x%0hhx ", ftable.buffer[i]);
-    }
-    fprintf (stderr, "\n");
-
     if (!gfits_uncompress_image (&buf[0].header, &buf[0].matrix, &ftable)) { fprintf (stderr, "problem uncompressing the image data\n"); fclose (f); gfits_free_table (&ftable); return FALSE; }