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

Timestamp:

May 28, 2015, 8:27:00 PM (11 years ago)

Author:

eugene

Message:

adding code for table compress/uncompress; image compress works (but is not quite compatible with cfitsio for some reason and byteswap is broken)

File:

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

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

@@ -3 +3 @@
 # include <zlib.h>
 
-int gfits_compress_data (char *zdata, int *Nzdata, char *cmptype, char **optname, char **optvalue, int Nopt, char *rawdata, int Nraw, int raw_pixsize) {
+/* functions defined in ricecomp.c */
+int fits_rcomp(int 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);
+int fits_rdecomp_byte (unsigned char *c, int clen, unsigned char array[], int nx, int nblock);
+
+/* functions defined in fits_hcompress.c */
+# define LONGLONG long long
+int fits_hcompress(int *a, int ny, int nx, int scale, char *output, long *nbytes, int *status);
+int fits_hcompress64(LONGLONG *a, int ny, int nx, int scale, char *output, long *nbytes, int *status);
+
+/* functions defined in fits_hdeccompress.c */
+int fits_hdecompress(unsigned char *input, int smooth, int *a, int *ny, int *nx, int *scale, int *status);
+int fits_hdecompress64(unsigned char *input, int smooth, LONGLONG *a, int *ny, int *nx, int *scale, int *status);
+
+/* functions defined in pliocomp.c */
+int pl_p2li (int *pxsrc, int xs, short *lldst, int npix);
+int pl_l2pi (short *ll_src, int xs, int *px_dst, int npix);
+
+/* functions defined in gzip.c */
+int gfits_gz_stripheader (unsigned char *data, int *ndata);
+int gfits_uncompress (Bytef *dest, uLongf *destLen, const Bytef *source, uLong sourceLen);
+int gfits_compress (Bytef *dest, uLongf *destLen, const Bytef *source, uLong sourceLen);
+
+static int pass = 0;
+
+int gfits_compress_data (char *zdata, int *Nzdata, char *cmptype, 
+                         char **optname, char **optvalue, int Nopt, 
+                         char *rawdata, int Nrawpix, int rawpix_size) {
 
   int status;
-  static int Ninsum = 0;
-  static int Noutsum = 0;
 
   if (!strcasecmp(cmptype, "GZIP_1")) {
-    unsigned long tNraw = Nraw * out_pixsize;
+    unsigned long Nbytes = Nrawpix * rawpix_size;
 
     // the data must be byteswapped before compression begins
-    if (!gfits_byteswap_zdata (rawdata, Nraw, raw_pixsize)) return (FALSE);
+    // if (!gfits_byteswap_zdata (rawdata, Nrawpix, rawpix_size)) return (FALSE);
 
     // Nzdata is the size of the allocated buffer before the function is called, returns the actual size
-    // tNraw is the number of bytes in the raw data buffer
-    status = gfits_compress ((Bytef *) zdata, &Nzdata, (Bytef *) rawdata, tNraw);
+    // Nbytes is the number of bytes in the raw data buffer
+    uLongf destLen = *Nzdata;
+    status = gfits_compress ((Bytef *) zdata, &destLen, (Bytef *) rawdata, Nbytes);
+    *Nzdata = destLen;
     if (status != Z_OK) {
       fprintf (stderr, "error in compress (GZIP)\n");
@@ -23 +51 @@
     }
 
+    // test of deflate (vs I/O)
+    { 
+      char *srcbuf, *tgtbuf;
+      ALLOCATE (srcbuf, char, destLen);
+      memcpy (srcbuf, zdata, destLen);
+
+      ALLOCATE (tgtbuf, char, Nbytes);
+      
+      uLongf Ndeflate = Nbytes;
+      status = gfits_uncompress ((Bytef *) tgtbuf, &Ndeflate, (Bytef *) zdata, destLen);
+      if (status != Z_OK) {
+        fprintf (stderr, "error in uncompress (GZIP) : %d vs %d\n", status, Z_OK);
+        return (FALSE);
+      }
+      
+      myAssert (Ndeflate == Nbytes, "invalid output size?");
+
+      int i; 
+      for (i = 0; i < Ndeflate; i++) {
+        myAssert (rawdata[i] == tgtbuf[i], "data mismatch?");
+      }
+
+    }
+
+    if (pass == 0) {
+      int i;
+      for (i = 0; i < 32; i++) {
+        fprintf (stderr, "0x%02hhx ", zdata[i]);
+      }
+      fprintf (stderr, "\n");
+      pass = 1;
+    }
     return (TRUE);
   }