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

Timestamp:

Jun 3, 2015, 4:10:26 AM (11 years ago)

Author:

eugene

Message:

clarify image vs compression buffer vs compressed pixel sizes to allow hcompress and rice

File:

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

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

@@ -5 +5 @@
 /* functions defined in ricecomp.c */
 int fits_rcomp(int a[], int nx, unsigned char *c, int clen, int nblock);
+int fits_rcomp_short(short a[], int nx, unsigned char *c, int clen, int nblock);
+int fits_rcomp_byte(char a[], int nx, unsigned char *c, int clen, int nblock);
 int fits_rdecomp (unsigned char *c, int clen, unsigned int array[], int nx, int nblock);
 int fits_rdecomp_short (unsigned char *c, int clen, unsigned short array[], int nx, int nblock);
@@ -29 +31 @@
 # define ESCAPE(RET) { fprintf (stderr, "gzip error in %s @ %s:%d\n", __func__, __FILE__, __LINE__); return (RET); }
 
+// XXX I'm putting Nx and Ny on the argument list -- only used by hcompress
+// with a little work, these could go on the option list
 int gfits_compress_data (char *zdata, int *Nzdata, char *cmptype, 
                          char **optname, char **optvalue, int Nopt, 
-                         char *rawdata, int Nrawpix, int rawpix_size) {
+                         char *rawdata, int Nrawpix, int rawpix_size,
+                         int Nx, int Ny) {
 
+  int Nout;
   int status;
 
@@ -59 +65 @@
   }
 
-# if (0)
   if (!strcasecmp(cmptype, "RICE_1")) {
     int i, blocksize;
@@ -74 +79 @@
     }
 
-    int Npix;
-    // Npix = *Nout * (out_pixsize / 4.0);
-    Npix = *Nout;
-
-    Ninsum += Nzdata;
-    Noutsum += *Nout;
+    // Ninsum += Nzdata;
+    // Noutsum += *Nout;
     // fprintf (stderr, "%d comp bytes; %d uncomp 'pixels', totals: %d %d\n", Nzdata, Npix, Ninsum, Noutsum);
 
-    switch (out_pixsize) {
+    switch (rawpix_size) {
       case 4:
-        // rice decompression from the CFITSIO source tree : we need to tell it the expected number of pixels
-        // is also REQUIRES 4byte output, which is fairly stupid.
-        if (fits_rdecomp ((unsigned char *) zdata, Nzdata, (unsigned int *) outdata, Npix, blocksize)) {
-          fprintf (stderr, "error in rice decompression\n");
-          return (FALSE);
-        }
-        return (TRUE);
+        // rice compression from the CFITSIO source tree
+        Nout = fits_rcomp ((int *) rawdata, Nrawpix, (unsigned char *) zdata, *Nzdata, blocksize);
+        break;
 
       case 2:
-        if (fits_rdecomp_short ((unsigned char *) zdata, Nzdata, (unsigned short *) outdata, Npix, blocksize)) {
-          fprintf (stderr, "error in rice decompression\n");
-          return (FALSE);
-        }
-        return (TRUE);
+        Nout = fits_rcomp_short ((short *) rawdata, Nrawpix, (unsigned char *) zdata, *Nzdata, blocksize);
+        break;
 
       case 1:
-        if (fits_rdecomp_byte ((unsigned char *) zdata, Nzdata, (unsigned char *) outdata, Npix, blocksize)) {
-          fprintf (stderr, "error in rice decompression\n");
-          return (FALSE);
-        }
-        return (TRUE);
+        Nout = fits_rcomp_byte ((char *) rawdata, Nrawpix, (unsigned char *) zdata, *Nzdata, blocksize);
+        break;
         
       default:
-        fprintf (stderr, "invalid output pixel size %d\n", out_pixsize);
+        fprintf (stderr, "invalid output pixel size %d\n", rawpix_size);
+        *Nzdata = 0;
         return (FALSE);
     }
-    
+    if (Nout < 0) {
+      fprintf (stderr, "error in rice decompression\n");
+      *Nzdata = 0;
+      return (FALSE);
+    }
+    *Nzdata = Nout;
+    return TRUE;
   }
   
   if (!strcasecmp(cmptype, "PLIO_1")) {
-    int Npix;
-    Npix = pl_l2pi ((short *) zdata, 1, (int *) outdata, *Nout);
-    if (Npix != *Nout) {
-      fprintf (stderr, "error in plio decompression\n");
-      return (FALSE);
-    }
+    // note the fortan starting point: zdata is decremented at start
+    Nout = pl_p2li ((int *) rawdata, 1, (short *) zdata, Nrawpix);
+    *Nzdata = Nout;
+    if (!Nout) return (FALSE);
     return (TRUE);
   }
 
   if (!strcasecmp(cmptype, "HCOMPRESS_1")) {
-    int Nx, Ny, scale;
+    long Nbytes = Nrawpix * rawpix_size;
+    int scale = 0;
     status = 0;
     // call hdecompress without smoothing
-    fits_hdecompress ((unsigned char *) zdata, FALSE, (int *) outdata, &Nx, &Ny, &scale, &status);
+
+    if (rawpix_size == 4) {
+      fits_hcompress ((int *) rawdata, Nx, Ny, scale, (char *) zdata, &Nbytes, &status);
+    } 
+    if (rawpix_size == 8) {
+      fits_hcompress64 ((long long *) rawdata, Nx, Ny, scale, (char *) zdata, &Nbytes, &status);
+    }
+
     if (status) {
       fprintf (stderr, "error in hdecompress\n");
@@ -134 +138 @@
     // fprintf (stderr, "decompression yields image %d x %d (scale: %d)\n", Nx, Ny, scale);
     
-    if (Nx * Ny != *Nout) {
-      fprintf (stderr, "error in hdecompress: mismatched output size\n");
-      return (FALSE);
-    }
+    *Nzdata = Nbytes / rawpix_size;
     return (TRUE);
   }
-# endif
 
   fprintf (stderr, "unknown compression %s\n", cmptype);