Changeset 27435 for trunk/Ohana/src/libfits/matrix/F_convert_format.c

Timestamp:

Mar 24, 2010, 11:22:25 AM (16 years ago)

Author:

eugene

Message:

large update merging in changes for Ohana to support large files

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/libfits/matrix/F_convert_format.c (modified) (6 diffs)

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

@@ -24 +24 @@
       *out = *in*A + B;                                 \
     }                                                   \
-  REALLOCATE (matrix[0].buffer, char, matrix[0].size); 
+  REALLOCATE (matrix[0].buffer, char, matrix[0].datasize); 
 
 # define CONVERTSAME(MY_NAN)                    \
@@ -41 +41 @@
   inMode  *in;                                          \
   outMode *out;                                         \
-  REALLOCATE (matrix[0].buffer, char, matrix[0].size);  \
+  REALLOCATE (matrix[0].buffer, char, matrix[0].datasize);      \
   out = (outMode *)matrix[0].buffer + Npixels - 1;      \
   in  = (inMode  *)matrix[0].buffer + Npixels - 1;      \
@@ -62 +62 @@
       *out = *in*A + B;                                 \
     }                                                   \
-  REALLOCATE (matrix[0].buffer, char, matrix[0].size); 
+  REALLOCATE (matrix[0].buffer, char, matrix[0].datasize); 
 
 # define CONVERTSAME_FF(MY_NAN)                 \
@@ -79 +79 @@
   inMode  *in;                                          \
   outMode *out;                                         \
-  REALLOCATE (matrix[0].buffer, char, matrix[0].size);  \
+  REALLOCATE (matrix[0].buffer, char, matrix[0].datasize);      \
   out = (outMode *)matrix[0].buffer + Npixels - 1;      \
   in  = (inMode  *)matrix[0].buffer + Npixels - 1;      \
@@ -106 +106 @@
     return (TRUE);
 
-  matrix[0].bitpix = header[0].bitpix = outBitpix;
-  matrix[0].bscale = header[0].bscale = outScale;
-  matrix[0].bzero  = header[0].bzero  = outZero;
-  matrix[0].unsign = header[0].unsign = outUnsign;
-  matrix[0].size   = gfits_data_size (header);
+  matrix[0].bitpix   = header[0].bitpix = outBitpix;
+  matrix[0].bscale   = header[0].bscale = outScale;
+  matrix[0].bzero    = header[0].bzero  = outZero;
+  matrix[0].unsign   = header[0].unsign = outUnsign;
+  matrix[0].datasize = gfits_data_size (header);
   gfits_modify (header, "BITPIX", "%d", 1, outBitpix);
   gfits_modify (header, "BSCALE", "%lf", 1, outScale);
   gfits_modify (header, "BZERO",  "%lf", 1, outZero);
-  gfits_modify (header, "UNSIGN", "%t", 1, outUnsign);
+  gfits_modify_alt (header, "UNSIGN", "%t", 1, outUnsign);
 
   Npixels          = header[0].Naxis[0]*header[0].Naxis[1];
@@ -426 +426 @@
   {
     char *out;
-    int Nextra;
+    off_t Nextra;
     
     out = (char *)matrix[0].buffer;
-    Nextra = matrix[0].size - nbytes;
+    Nextra = matrix[0].datasize - nbytes;
     bzero (&out[nbytes], Nextra);
   }