Changeset 28241 for trunk/Ohana/src/imregister/imphot/rtext.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/imregister/imphot/rtext.c (modified) (3 diffs)

trunk/Ohana/src/imregister/imphot/rtext.c

@@ -10 +10 @@
   /* check that file size makes sense */
   Nimage = 0;
-  gfits_scan (&db[0].header, "NIMAGES", "%lld", 1, (long long *) &Nimage);
+  gfits_scan (&db[0].header, "NIMAGES", OFF_T_FMT, 1,  &Nimage);
   if (stat (db[0].filename, &filestatus) == -1) {
     if (VERBOSE) fprintf (stderr, "ERROR: failed to get status of image catalog\n");
@@ -21 +21 @@
     Ndata = (filestatus.st_size - db[0].header.datasize) / sizeof (Image);
     if (VERBOSE) fprintf (stderr, "ERROR: image catalog has inconsistent size\n");
-    if (VERBOSE) fprintf (stderr, "header: %lld, data: %d\n", (long long) Nimage, Ndata);
+    if (VERBOSE) fprintf (stderr, "header: "OFF_T_FMT", data: %d\n",  Nimage, Ndata);
     if (!FORCE_READ) exit (1);
     Nimage = Ndata;
@@ -41 +41 @@
   } 
   db[0].ftable.buffer = (char *) image;
-  gfits_modify (&db[0].theader, "NAXIS2", "%lld", 1, (long long) Nimage);
+  gfits_modify (&db[0].theader, "NAXIS2", OFF_T_FMT, 1,  Nimage);
   db[0].theader.Naxis[1] = Nimage;
   db[0].ftable.datasize = gfits_data_size (&db[0].theader);