Changeset 38355 for branches/eam_branches/ohana.20150429/src/libfits/matrix/F_compress_utils.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_utils.c (modified) (3 diffs)

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

@@ -174 +174 @@
   int i, Nbyte;
 
-  if (!strcasecmp(cmptype, "GZIP_1") || !strcasecmp(cmptype, "NONE")) {
-    if (out_bitpix == 8)  return (1);
-    if (out_bitpix == 16) return (2);
-    if (out_bitpix == 32) return (4);
+  // GZIP_1, GZIP_2 use matched input & output pixels
+  if (!strcasecmp(cmptype, "GZIP_1") || 
+      !strcasecmp(cmptype, "GZIP_2") || 
+      !strcasecmp(cmptype, "NONE")) {
+    if (out_bitpix ==   8) return (1);
+    if (out_bitpix ==  16) return (2);
+    if (out_bitpix ==  32) return (4);
     if (out_bitpix == -32) return (4);
     if (out_bitpix == -64) return (8);
     return (1);
   }
-  if (!strcasecmp(cmptype, "RICE_1")) {
-
+
+  // RICE_1 must operate on integer pixels
+  if (!strcasecmp(cmptype, "RICE_1") ||
+      !strcasecmp(cmptype, "RICE_ONE")) {
     // if BYTEPIX option is specified, use that for Nbyte
     for (i = 0; i < Noptions; i++) {
@@ -191 +196 @@
       }
     }
+    if (out_bitpix ==   8) return (1);
+    if (out_bitpix ==  16) return (2);
+    if (out_bitpix ==  32) return (4);
     return (4);
   }
+
+  // PLIO_1 always results in 4-byte ints (not 2 byte ints?)
   if (!strcasecmp(cmptype, "PLIO_1")) {
     return (4);
   }
+
   if (!strcasecmp(cmptype, "HCOMPRESS_1")) {
     if (out_bitpix == 8)  return (4);
@@ -204 +215 @@
 }
 
+int gfits_compressed_data_pixsize (char *cmptype, int out_bitpix, char **optname, char **optvalue, int Noptions) {
+
+  int i, Nbyte;
+
+  // GZIP_1, GZIP_2 should not be swapped after compression
+  if (!strcasecmp(cmptype, "GZIP_1") || 
+      !strcasecmp(cmptype, "GZIP_2") || 
+      !strcasecmp(cmptype, "NONE")) {
+    if (out_bitpix ==   8) return (1);
+    if (out_bitpix ==  16) return (1);
+    if (out_bitpix ==  32) return (1);
+    if (out_bitpix == -32) return (1);
+    if (out_bitpix == -64) return (1);
+    return (1);
+  }
+
+  // RICE_1 must operate on integer pixels
+  if (!strcasecmp(cmptype, "RICE_1") ||
+      !strcasecmp(cmptype, "RICE_ONE")) {
+    // 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);
+      }
+    }
+    if (out_bitpix ==   8) return (1);
+    if (out_bitpix ==  16) return (2);
+    if (out_bitpix ==  32) return (4);
+    return (4);
+  }
+
+  // PLIO_1 always results in 4-byte ints (not 2 byte ints?)
+  if (!strcasecmp(cmptype, "PLIO_1")) {
+    return (4);
+  }
+
+  if (!strcasecmp(cmptype, "HCOMPRESS_1")) {
+    if (out_bitpix == 8)  return (4);
+    if (out_bitpix == 16) return (4);
+    return (8);
+  }
+  return (0);
+}
+
+int gfits_uncompressed_data_bitpix (char *cmptype, int out_bitpix, char **optname, char **optvalue, int Noptions) {
+
+  int i, Nbyte;
+
+  // GZIP_1, GZIP_2 use matched input & output pixels
+  if (!strcasecmp(cmptype, "GZIP_1") || 
+      !strcasecmp(cmptype, "GZIP_2") || 
+      !strcasecmp(cmptype, "NONE")) {
+    return (out_bitpix);
+  }
+
+  // RICE_1 must operate on integer pixels
+  if (!strcasecmp(cmptype, "RICE_1") ||
+      !strcasecmp(cmptype, "RICE_ONE")) {
+    // 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*8);
+      }
+    }
+    if (out_bitpix ==   8) return (out_bitpix);
+    if (out_bitpix ==  16) return (out_bitpix);
+    if (out_bitpix ==  32) return (out_bitpix);
+    return (32);
+  }
+
+  // PLIO_1 always results in 4-byte ints (not 2 byte ints?)
+  if (!strcasecmp(cmptype, "PLIO_1")) {
+    return (32);
+  }
+
+  if (!strcasecmp(cmptype, "HCOMPRESS_1")) {
+    if (out_bitpix == 8)  return (32);
+    if (out_bitpix == 16) return (32);
+    return (64);
+  }
+  return (0);
+}
+
 int gfits_vartable_heap_pixsize (char format) {