Changeset 15656 for trunk/Ohana/src/libfits/matrix/F_compress_M.c

Timestamp:

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

Author:

eugene

Message:

working on decompress

File:

• trunk/Ohana/src/libfits/matrix/F_compress_M.c (modified) (5 diffs)

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);