Changeset 15657

Timestamp:

Nov 20, 2007, 12:21:39 AM (18 years ago)

Author:

eugene

Message:

fix decompress

Location:

trunk/Ohana/src

Files:

• libfits/matrix/F_uncompress_data.c (modified) (2 diffs)
• opihi/cmd.data/rd.c (modified) (1 diff)

trunk/Ohana/src/libfits/matrix/F_uncompress_data.c

@@ -58 +58 @@
     Ninsum += Nzdata;
     Noutsum += *Nout;
-    fprintf (stderr, "%d comp bytes; %d uncomp 'pixels', totals: %d %d\n", Nzdata, Npix, Ninsum, Noutsum);
+    // fprintf (stderr, "%d comp bytes; %d uncomp 'pixels', totals: %d %d\n", Nzdata, Npix, Ninsum, Noutsum);
 
     // rice decompression from the CFITSIO source tree : we need to tell it the expected number of pixels
@@ -88 +88 @@
       return (FALSE);
     }
-    fprintf (stderr, "decompression yields image %d x %d (scale: %d)\n", Nx, Ny, scale);
+    // fprintf (stderr, "decompression yields image %d x %d (scale: %d)\n", Nx, Ny, scale);
     
     if (Nx * Ny != *Nout) {

trunk/Ohana/src/opihi/cmd.data/rd.c

@@ -120 +120 @@
       IsCompressed = FALSE;
       if (gfits_extension_is_compressed (&buf[0].header)) {
-        if (!strcmp (CCDKeyword, "EXTNAME")) Nword = 2;
+        if (!strcmp (CCDKeyword, "EXTNAME")) Nword = 1;
         IsCompressed = TRUE;
       }