Changeset 28241 for trunk/Ohana/src/getstar

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/getstar/src/MatchImages.c (modified) (1 diff)
• src/getstar/src/SelectImages.c (modified) (1 diff)
• src/getstar/src/select_by_region.c (modified) (1 diff)

trunk/Ohana/src/getstar/src/MatchImages.c

@@ -132 +132 @@
   }
   
-  if (VERBOSE) fprintf (stderr, "found %lld overlapping images\n", (long long) nmatch);
+  if (VERBOSE) fprintf (stderr, "found "OFF_T_FMT" overlapping images\n",  nmatch);
 
   *Nmatch = nmatch;

trunk/Ohana/src/getstar/src/SelectImages.c

@@ -31 +31 @@
   }  
 
-  if (VERBOSE) fprintf (stderr, "found %lld matching images\n", (long long) nmatch);
+  if (VERBOSE) fprintf (stderr, "found "OFF_T_FMT" matching images\n",  nmatch);
 
   *Nmatch = nmatch;

trunk/Ohana/src/getstar/src/select_by_region.c

@@ -161 +161 @@
   output[0].Nsecf_mem = Nave*Nsecfilt;
 
-  fprintf (stderr, "output catalog has %lld stars (%lld measures, %d secfilt)\n",
-           (long long) output[0].Naverage, (long long) output[0].Nmeasure, output[0].Nsecfilt);
+  fprintf (stderr, "output catalog has "OFF_T_FMT" stars ("OFF_T_FMT" measures, %d secfilt)\n",
+            output[0].Naverage,  output[0].Nmeasure, output[0].Nsecfilt);
   return (TRUE);
 }