Changeset 28306

Timestamp:

Jun 11, 2010, 4:10:31 PM (16 years ago)

Author:

eugene

Message:

fix build issues

Location:

trunk/Ohana/src/photdbc/src

Files:

• copy_images.c (modified) (1 diff)
• join_stars.c (modified) (2 diffs)
• make_subcatalog.c (modified) (2 diffs)
• photdbc.c (modified) (1 diff)

trunk/Ohana/src/photdbc/src/copy_images.c

@@ -3 +3 @@
 int copy_images (char *outdir) {
 
-  int status, Nimage;
+  int status;
+  off_t Nimage;
   char *ImageOut;
   FITS_DB in;

trunk/Ohana/src/photdbc/src/join_stars.c

@@ -7 +7 @@
   off_t Naverage, Nmeasure, *index;
   double *X, *Y, dX, dY, dR, RADIUS2;
-  double Sr, Sd, Rmid, Dmid;
+  double Rmid, Dmid;
   int basecode, baseNsec, Nsecfilt, *found;
 
@@ -202 +202 @@
 
   if (Nmeas != Nmeasure) {
-    fprintf (stderr, "failure to match %d measures (%d of %d matched)\n", Nmeasure - Nmeas, Nmeas, Nmeasure);
+    fprintf (stderr, "failure to match "OFF_T_FMT" measures ("OFF_T_FMT" of "OFF_T_FMT" matched)\n", Nmeasure - Nmeas, Nmeas, Nmeasure);
   }
   

trunk/Ohana/src/photdbc/src/make_subcatalog.c

@@ -5 +5 @@
 int make_subcatalog (Catalog *subcatalog, Catalog *catalog) {
   
-  int i, j, offset;
-  int NAVERAGE, NMEASURE, Naverage, Nmeasure, Nm, Nsecfilt;
+  off_t i, j, offset;
+  off_t NAVERAGE, NMEASURE, Naverage, Nmeasure, Nm, Nsecfilt;
   double mag, minMag;
 
@@ -105 +105 @@
 
   if (VERBOSE) {
-    fprintf (stderr, "%d: using %d stars (%d measures) for catalog\n", i, 
+    fprintf (stderr, OFF_T_FMT": using "OFF_T_FMT" stars ("OFF_T_FMT" measures) for catalog\n", i, 
              subcatalog[0].Naverage, subcatalog[0].Nmeasure);
   }

trunk/Ohana/src/photdbc/src/photdbc.c

@@ -60 +60 @@
         
     // XXX add other filters here:
-    join_stars (&outcatalog);
+    // join_stars (&outcatalog);
     // unique_measures (catalog);
     // flag_measures (&db, catalog);