Changeset 41422 for trunk/Ohana/src/libfits/table/F_table_format.c

Timestamp:

Sep 24, 2020, 2:44:55 PM (6 years ago)

Author:

eugene

Message:

rename libfits byte-type to gfbyte to avoid collisions

File:

• trunk/Ohana/src/libfits/table/F_table_format.c (modified) (5 diffs)

trunk/Ohana/src/libfits/table/F_table_format.c

@@ -24 +24 @@
   switch (*Fchar) {
   case  'X':
-    { *Nbytes = 1;  strcpy (type, "byte");   *Nval = 1 + (int) Nv / 8; }
+    { *Nbytes = 1;  strcpy (type, "gfbyte");   *Nval = 1 + (int) Nv / 8; }
     break;
   case  'L':
-    { *Nbytes = 1;  strcpy (type, "byte");   *Nval = Nv;               }
+    { *Nbytes = 1;  strcpy (type, "gfbyte");   *Nval = Nv;               }
     break;
   case  'A':
@@ -33 +33 @@
     break;
   case  'B':
-    { *Nbytes = 1;  strcpy (type, "byte");   *Nval = Nv;               }
+    { *Nbytes = 1;  strcpy (type, "gfbyte");   *Nval = Nv;               }
     break;
   case  'I':
@@ -108 +108 @@
   
   Type = 'x';
+  if (Fchar == 'D') { *Nbytes = 1;  strcpy (type, "double"); Type = 'e'; *Nval = Nv; }
+  if (Fchar == 'E') { *Nbytes = 1;  strcpy (type, "float");  Type = 'e'; *Nval = Nv; }
   if (Fchar == 'F') { *Nbytes = 1;  strcpy (type, "float");  Type = 'f'; *Nval = Nv; }
   if (Fchar == 'I') { *Nbytes = 1;  strcpy (type, "int");    Type = 'd'; *Nval = Nv; }
@@ -284 +286 @@
       }
     }
-    if (!strcmp (type, "byte"))   { 
+    if (!strcmp (type, "gfbyte"))   { 
       for (j = 0; j < Ny; j++) {
         for (n = 0; n < Nval; n++) {
@@ -377 +379 @@
       }
     }
-    if (!strcmp (type, "byte"))   { 
+    if (!strcmp (type, "gfbyte"))   { 
       for (j = 0; j < Ny; j++) {
         for (n = 0; n < Nval; n++) {