Changeset 38356 for branches/eam_branches/ohana.20150429/src/libfits/matrix/F_compress_utils.c

Timestamp:

Jun 3, 2015, 7:00:55 AM (11 years ago)

Author:

eugene

Message:

get the input / output / compressed pixels sizes right and get the byteswaps right

File:

• branches/eam_branches/ohana.20150429/src/libfits/matrix/F_compress_utils.c (modified) (5 diffs)

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

@@ -101 +101 @@
   int i;
 
+  // fprintf (stderr, "swapping %d bytes in pix of size %d bytes...\n", Nzdata, pixsize);
   switch (pixsize) {
     case 1:
@@ -106 +107 @@
 
     case 2:
-      for (i = 0; i < 2*Nzdata; i+=2) {
+      for (i = 0; i < Nzdata; i+=2) {
         DOSWAP (zdata[i+0], zdata[i+1]);
       }
@@ -112 +113 @@
 
     case 4:
-      for (i = 0; i < 4*Nzdata; i+=4) {
+      for (i = 0; i < Nzdata; i+=4) {
         DOSWAP (zdata[i+0], zdata[i+3]);
         DOSWAP (zdata[i+1], zdata[i+2]);
@@ -119 +120 @@
 
     case 8:
-      for (i = 0; i < 8*Nzdata; i+=8) {
+      for (i = 0; i < Nzdata; i+=8) {
         DOSWAP (zdata[i+0], zdata[i+7]);
         DOSWAP (zdata[i+1], zdata[i+6]);
@@ -168 +169 @@
 
     return (FALSE);
+}
+
+int gfits_cmptype_valid (char *cmptype) {
+
+  if (!strcasecmp(cmptype, "NONE")) return TRUE;
+  if (!strcasecmp(cmptype, "GZIP_1")) return TRUE;
+  if (!strcasecmp(cmptype, "GZIP_2")) return TRUE;
+  if (!strcasecmp(cmptype, "PLIO_1")) return TRUE;
+  if (!strcasecmp(cmptype, "RICE_1")) return TRUE;
+  if (!strcasecmp(cmptype, "RICE_ONE")) return TRUE;
+  if (!strcasecmp(cmptype, "HCOMPRESS_1")) return TRUE;
+  return FALSE;
 }