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

Timestamp:

Nov 6, 2007, 5:09:52 PM (19 years ago)

Author:

eugene

Message:

merging changes from eam_branch_20071015 (read compressed images, clean addstar I/O, other minor issues)

File:

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

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

@@ -25 +25 @@
   if (*Fchar == 'E') { *Nbytes = 4;  strcpy (type, "float");  *Nval = Nv;               }
   if (*Fchar == 'D') { *Nbytes = 8;  strcpy (type, "double"); *Nval = Nv;               }
-  if (*Fchar == 'P') { *Nbytes = 8;  strcpy (type, "float");  *Nval = 2*Nv;             }
+  if (*Fchar == 'P') { *Nbytes = 8;  strcpy (type, "var");    *Nval = 2*Nv;             }
   if (*Fchar == 'C') { *Nbytes = 8;  strcpy (type, "float");  *Nval = 2*Nv;             }
   if (*Fchar == 'M') { *Nbytes = 16; strcpy (type, "double"); *Nval = 2*Nv;             }
@@ -194 +194 @@
   int i, j, n, Nx, Ny, Nfields;
   int off, Nchar, Nval, Nbytes, status;
-  char *line, format[64], field[16], type[16];
+  char format[64], field[16], type[16];
   double tzero, tscale;
   char *tmpChar;
@@ -233 +233 @@
       for (j = 0; j < Ny; j++) {
         for (n = 0; n < Nval; n++) {
-          tmpChar = (int *)&ftable[0].buffer[j*Nx + n*Nbytes + off];
+          tmpChar = (char *)&ftable[0].buffer[j*Nx + n*Nbytes + off];
           *tmpChar = *tmpChar * tscale + tzero;
         }
@@ -241 +241 @@
       for (j = 0; j < Ny; j++) {
         for (n = 0; n < Nval; n++) {
-          tmpShort = (int *)&ftable[0].buffer[j*Nx + n*Nbytes + off];
+          tmpShort = (short *)&ftable[0].buffer[j*Nx + n*Nbytes + off];
           *tmpShort = *tmpShort * tscale + tzero;
         }
@@ -264 +264 @@
   int i, j, n, Nx, Ny, Nfields;
   int off, Nchar, Nval, Nbytes, status;
-  char *line, format[64], field[16], type[16];
+  char format[64], field[16], type[16];
   double tzero, tscale;
   char *tmpChar;
@@ -303 +303 @@
       for (j = 0; j < Ny; j++) {
         for (n = 0; n < Nval; n++) {
-          tmpChar = (int *)&ftable[0].buffer[j*Nx + n*Nbytes + off];
+          tmpChar = (char *)&ftable[0].buffer[j*Nx + n*Nbytes + off];
           *tmpChar = (*tmpChar - tzero) / tscale;
         }
@@ -311 +311 @@
       for (j = 0; j < Ny; j++) {
         for (n = 0; n < Nval; n++) {
-          tmpShort = (int *)&ftable[0].buffer[j*Nx + n*Nbytes + off];
+          tmpShort = (short *)&ftable[0].buffer[j*Nx + n*Nbytes + off];
           *tmpShort = (*tmpShort - tzero) / tscale;
         }