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

trunk/Ohana/src/dvomerge/src/dvo_image_merge_dbs.c

@@ -17 +17 @@
  /* adjust header */
   Nout = 0;
-  gfits_scan (&out[0].header, "NIMAGES", "%lld", 1, (long long *) &Nout);
-  status = gfits_scan (&out[0].header, "IMAGEID", "%lld", 1, (long long *) &IDstart);
+  gfits_scan (&out[0].header, "NIMAGES", OFF_T_FMT, 1,  &Nout);
+  status = gfits_scan (&out[0].header, "IMAGEID", OFF_T_FMT, 1,  &IDstart);
   if (!status) {
     IDstart = 1;
@@ -36 +36 @@
   Nout += Nimages;
   IDstart += Nimages;
-  gfits_modify (&out[0].header, "NIMAGES", "%lld", 1, (long long) Nout);
-  gfits_modify (&out[0].header, "IMAGEID", "%lld", 1, (long long) IDstart);
+  gfits_modify (&out[0].header, "NIMAGES", OFF_T_FMT, 1,  Nout);
+  gfits_modify (&out[0].header, "IMAGEID", OFF_T_FMT, 1,  IDstart);
 
   gfits_add_rows (&out[0].ftable, (char *) images, Nimages, sizeof(Image));
@@ -65 +65 @@
     newID = dvo_map_image_ID (IDmap, oldID);
     if (newID == 0) {
-      fprintf (stderr, "cannot find image ID %lld\n", (long long) oldID);
+      fprintf (stderr, "cannot find image ID "OFF_T_FMT"\n",  oldID);
       exit (2);
     }