Changeset 15656

Timestamp:

Nov 20, 2007, 12:09:06 AM (18 years ago)

Author:

eugene

Message:

working on decompress

Location:

trunk/Ohana/src/libfits

Files:

• include/gfitsio.h (modified) (1 diff)
• matrix/F_compress_M.c (modified) (5 diffs)
• matrix/F_uncompress_data.c (modified) (4 diffs)

trunk/Ohana/src/libfits/include/gfitsio.h

@@ -158 +158 @@
 int     gfits_extension_is_compressed  PROTO((Header *header));
 int     gfits_tile_size                PROTO((Matrix *matrix, int *otile, int *ztile));
-int     gfits_uncompressed_data_pixsize PROTO((char *cmptype));
+int     gfits_uncompressed_data_pixsize PROTO((char *cmptype, int out_bitpix));
 int     gfits_vartable_heap_pixsize    PROTO((char format));
 

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

@@ -30 +30 @@
 int gfits_uncompress_image (Header *header, Matrix *matrix, FTable *ftable) {
 
-  int i, j, status, zimage, zcol, Nzrows, Nout, Nzdata, max_tile_size, bytes_per_pixel;
+  int i, j, status, zimage, zcol, Nzrows, Nout, Nzdata, max_tile_size;
   char cmptype[80];
   char zaxis[10], naxis[10], key[10], word[81], exttype[81], checksum[81], datasum[81];
@@ -183 +183 @@
 
   // size of a pixel in the output from the decompression routine
-  odata_pixsize = gfits_uncompressed_data_pixsize (cmptype);
+  odata_pixsize = gfits_uncompressed_data_pixsize (cmptype, header[0].bitpix);
   ALLOCATE (out, char, odata_pixsize*max_tile_size);
 
@@ -201 +201 @@
 
     // gfits_uncompress_data uncompresses from zdata to the temporary output buffer which must be allocated
-    if (!gfits_uncompress_data ((char *)zdata, Nzdata, cmptype, optname, optvalue, Noptions, out, &Nout, bytes_per_pixel)) return (FALSE);
+    if (!gfits_uncompress_data ((char *)zdata, Nzdata, cmptype, optname, optvalue, Noptions, out, &Nout, odata_pixsize)) return (FALSE);
 
     // copy the uncompressed pixels into their correct locations            
@@ -346 +346 @@
     // determine the offset of the next line relative to the start position
     offset = counter[matrix->Naxes - 1];
-    for (j = 1; j < matrix->Naxes; j++) {
+    for (j = matrix->Naxes - 2; j >= 0; j--) {
       offset = offset*matrix->Naxis[j] + counter[j];
     }      
@@ -436 +436 @@
 }
 
-int gfits_uncompressed_data_pixsize (char *cmptype) {
-
-  if (!strcasecmp(cmptype, "GZIP")) {
-    return (0);
-  }
-  if (!strcasecmp(cmptype, "RICE") || !strcasecmp(cmptype, "RICE_1")) {
+int gfits_uncompressed_data_pixsize (char *cmptype, int out_bitpix) {
+
+  if (!strcasecmp(cmptype, "GZIP_1")) {
     return (4);
   }
-  if (!strcasecmp(cmptype, "PLIO")) {
+  if (!strcasecmp(cmptype, "RICE_1")) {
+    return (4);
+  }
+  if (!strcasecmp(cmptype, "PLIO_1")) {
     return (1);
   }
-  if (!strcasecmp(cmptype, "HCOMPRESS")) {
-    return (4);
+  if (!strcasecmp(cmptype, "HCOMPRESS_1")) {
+    if (out_bitpix == 8)  return (4);
+    if (out_bitpix == 16) return (4);
+    return (8);
   }
   return (0);

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

@@ -26 +26 @@
   static int Noutsum = 0;
 
-  if (!strcasecmp(cmptype, "GZIP")) {
-    unsigned long tNout = *Nout;
+  if (!strcasecmp(cmptype, "GZIP_1")) {
+    unsigned long tNout = *Nout * out_pixsize;
     // uncompress does not require us to know the expected number of pixel; it tells us the number
     status = uncompress ((Bytef *) outdata, &tNout, (Bytef *) zdata, Nzdata);
@@ -38 +38 @@
   }
 
-  if (!strcasecmp(cmptype, "RICE") || !strcasecmp(cmptype, "RICE_1")) {
+  if (!strcasecmp(cmptype, "RICE_1")) {
     int i, blocksize;
     // look for the BLOCKSIZE
@@ -69 +69 @@
   }
   
-  if (!strcasecmp(cmptype, "PLIO")) {
+  if (!strcasecmp(cmptype, "PLIO_1")) {
     int Npix;
-    Npix = pl_l2pi ((short *) zdata, 0, (int *) outdata, *Nout);
+    Npix = pl_l2pi ((short *) zdata, 1, (int *) outdata, *Nout);
     if (Npix != *Nout) {
       fprintf (stderr, "error in plio decompression\n");
@@ -79 +79 @@
   }
 
-  if (!strcasecmp(cmptype, "HCOMPRESS")) {
+  if (!strcasecmp(cmptype, "HCOMPRESS_1")) {
     int Nx, Ny, scale;
     status = 0;