Changeset 27517 for branches/eam_branches/20100225/Ohana/src/getstar/include/dvoImagesAtCoords.h

Timestamp:

Mar 29, 2010, 3:55:49 PM (16 years ago)

Author:

eugene

Message:

update merges from trunk

Location:

branches/eam_branches/20100225

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/getstar/include/dvoImagesAtCoords.h (modified) (1 diff)

branches/eam_branches/20100225/Ohana/src/getstar/include/dvoImagesAtCoords.h

@@ -39 +39 @@
 int  args_coords         PROTO((int argc, char **argv));
 int  ConfigInit_coords PROTO((int *argc, char **argv));
-int  Shutdown         PROTO((char *format, ...));
+int  Shutdown         PROTO((char *format, ...) OHANA_FORMAT(printf, 1, 2));
 void TrapSignal       PROTO((int sig));
 void SetProtect       PROTO((int mode));
 int  SetSignals       PROTO((void));
 
-Image *ReadImageFiles (char *filename, int *Nimages);
+Image *ReadImageFiles (char *filename, off_t *Nimages);
 int ReadImageHeader (Header *header, Image *image);
-int MatchCoords(Image *, int, Point *, int);
+off_t MatchCoords (Image *dbImages, off_t NdbImages, Point *points, int Npoints);
 
 int GetFileMode (Header *header);