Changeset 38366 for branches/eam_branches/ohana.20150429/src/libfits/matrix/F_compress_data.c

Timestamp:

Jun 4, 2015, 5:42:47 PM (11 years ago)

Author:

eugene

Message:

libfits compressed I/O seems to be generally working

File:

• branches/eam_branches/ohana.20150429/src/libfits/matrix/F_compress_data.c (modified) (3 diffs)

branches/eam_branches/ohana.20150429/src/libfits/matrix/F_compress_data.c

@@ -42 +42 @@
 
   // do not actually compress : this is used for testing
-  if (!strcasecmp(cmptype, "NONE")) {
+  if (!strcasecmp(cmptype, "NONE") || !strcasecmp(cmptype, "NONE_2")) {
     unsigned long Nbytes = Nrawpix * rawpix_size;
 
@@ -85 +85 @@
     // fprintf (stderr, "%d comp bytes; %d uncomp 'pixels', totals: %d %d\n", Nzdata, Npix, Ninsum, Noutsum);
 
-    char buffer[1000];
     int k;
 
@@ -101 +100 @@
           fprintf (stderr, "Nout: %d, Nrawpix: %d\n", Nout, Nrawpix);
           fprintf (stderr, "cmp inp: "); 
-          for (k = 0; k < Nout; k++) { fprintf (stderr, "0x%02hhx ", zdata[k]); } 
+          for (k = 0; k < Nout; k++) { fprintf (stderr, "%02hhx", zdata[k]); if (k % 2) fprintf (stderr, " "); } 
           fprintf (stderr, "\n");
         }
-
-        status = fits_rdecomp_short ((unsigned char *) zdata, Nout, (unsigned short *) buffer, Nrawpix, blocksize);
-        myAssert (!status, "failed to rdecomp");
         break;