Changeset 28241 for trunk/Ohana/src/libfits/table/F_set_column.c

Timestamp:

Jun 6, 2010, 4:06:31 PM (16 years ago)

Author:

eugene

Message:

merging changes from branches/eam_branches/Ohana.20100606: re-work the off_t print/scan format; fix and test NAN implementation in gnu89 context; fix and test BYTE_SWAP for libohana

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/libfits/table/F_set_column.c (modified) (2 diffs)

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

@@ -49 +49 @@
   
   /* check existing table dimensions */
-  gfits_scan (header, "NAXIS1", "%lld", 1, (long long *) &Nx);
-  gfits_scan (header, "NAXIS2", "%lld", 1, (long long *) &Ny);
+  gfits_scan (header, "NAXIS1", OFF_T_FMT, 1,  &Nx);
+  gfits_scan (header, "NAXIS2", OFF_T_FMT, 1,  &Ny);
   if (Ny == 0) { 
     Ny = Nrow;
     header[0].Naxis[1] = Ny;
-    gfits_modify (header, "NAXIS2", "%lld", 1, (long long) Ny);
+    gfits_modify (header, "NAXIS2", OFF_T_FMT, 1,  Ny);
 
     nbytes = gfits_data_size (header);
@@ -181 +181 @@
   
   /* check existing table dimensions */
-  gfits_scan (header, "NAXIS1", "%lld", 1, (long long *) &Nx);
-  gfits_scan (header, "NAXIS2", "%lld", 1, (long long *) &Ny);
+  gfits_scan (header, "NAXIS1", OFF_T_FMT, 1,  &Nx);
+  gfits_scan (header, "NAXIS2", OFF_T_FMT, 1,  &Ny);
   if (Ny == 0) { 
     Ny = Nrow;
     header[0].Naxis[1] = Ny;
-    gfits_modify (header, "NAXIS2", "%lld", 1, (long long) Ny);
+    gfits_modify (header, "NAXIS2", OFF_T_FMT, 1,  Ny);
 
     nbytes = gfits_data_size (header);