Changeset 28484 for branches/pap/Ohana/src/libfits/table/F_read_T.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_read_T.c (modified) (3 diffs)

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

@@ -64 +64 @@
     perror (string);
     if (Nread < gfits_data_min_size (table[0].header)) {
-      fprintf (stderr, "error: fits read error in %s, read %lld, need %lld\n", __func__, (long long) Nread, (long long) gfits_data_min_size (table[0].header));
+      fprintf (stderr, "error: fits read error in %s, read "OFF_T_FMT", need "OFF_T_FMT"\n", __func__,  Nread,  gfits_data_min_size (table[0].header));
       gfits_free_table  (table);
       return (FALSE);
@@ -109 +109 @@
   /* modify structure and header to match actual read rows Ny */
   table[0].header[0].Naxis[1] = Nrows;
-  gfits_modify (table[0].header, "NAXIS2",  "%lld", 1, (long long) Nrows);
+  gfits_modify (table[0].header, "NAXIS2",  OFF_T_FMT, 1,  Nrows);
   table[0].datasize = gfits_data_size (table[0].header);
 
@@ -185 +185 @@
     /* file pointer is at beginning of desired table data */
     start = ftello (f);
-    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);
+
     for (i = 0; i < Nrow; i++) {
       if (row[i] > Ny) { return (FALSE); }