Changeset 18271 for trunk/Ohana

Timestamp:

Jun 22, 2008, 8:55:25 AM (18 years ago)

Author:

eugene

Message:

use BYTEPIX in RICE_1 to find pixsize

File:

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

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

@@ -200 +200 @@
 
   // size of a pixel in the output from the decompression routine
-  odata_pixsize = gfits_uncompressed_data_pixsize (cmptype, header[0].bitpix);
+  odata_pixsize = gfits_uncompressed_data_pixsize (cmptype, header[0].bitpix, optname, optvalue, Noptions);
   ALLOCATE (out, char, odata_pixsize*max_tile_size);
 
@@ -455 +455 @@
 }
 
-int gfits_uncompressed_data_pixsize (char *cmptype, int out_bitpix) {
+int gfits_uncompressed_data_pixsize (char *cmptype, int out_bitpix, char **optname, char **optvalue, int Noptions) {
+
+  int i, Nbyte;
 
   if (!strcasecmp(cmptype, "GZIP_1")) {
@@ -461 +463 @@
   }
   if (!strcasecmp(cmptype, "RICE_1")) {
+
+    // if BYTEPIX option is specified, use that for Nbyte
+    for (i = 0; i < Noptions; i++) {
+      if (!strcmp(optname[i], "BYTEPIX")) {
+        Nbyte = atoi (optvalue[i]);
+        return (Nbyte);
+      }
+    }
+
     return (4);
   }