Changeset 28484 for branches/pap/Ohana/src/libfits/table/F_table_row.c

Timestamp:

Jun 24, 2010, 2:59:09 PM (16 years ago)

Author:

Paul Price

Message:

Merging trunk in advance of reintegrating into trunk.

Location:

branches/pap

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/libfits/table/F_table_row.c (modified) (6 diffs)

branches/pap/Ohana/src/libfits/table/F_table_row.c

@@ -11 +11 @@
   header = table[0].header;
 
-  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 (header[0].Naxis[1] != Ny) return (FALSE);
@@ -23 +23 @@
   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);
@@ -43 +43 @@
   header = table[0].header;
 
-  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 (header[0].Naxis[1] != Ny) return (FALSE);
@@ -64 +64 @@
   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);
 
   table[0].datasize = gfits_data_size (table[0].header);
@@ -81 +81 @@
   header = table[0].header;
 
-  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 (header[0].Naxis[1] != Ny) return (FALSE);
@@ -97 +97 @@
   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);