Changeset 27435 for trunk/Ohana/src/libdvo/include/dvo_util.h

Timestamp:

Mar 24, 2010, 11:22:25 AM (16 years ago)

Author:

eugene

Message:

large update merging in changes for Ohana to support large files

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/libdvo/include/dvo_util.h (modified) (4 diffs)

trunk/Ohana/src/libdvo/include/dvo_util.h

@@ -9 +9 @@
 
 typedef struct {
-    char        gscfile[256];
-    char        catdir[256];
-    char        catmode[256];
-    char        catformat[256];
-    char        photcodeFile[256];
-    char        skyTableFile[256];
-    int         skyDepth;
-    FITS_DB     imageDB;
-    Image       *images;
-    int         nImages;
-    SkyTable    *skyTable;
+  char        gscfile[256];
+  char        catdir[256];
+  char        catmode[256];
+  char        catformat[256];
+  char        photcodeFile[256];
+  char        skyTableFile[256];
+  int         skyDepth;
+  FITS_DB     imageDB;
+  Image      *images;
+  off_t       nImages;
+  SkyTable   *skyTable;
 #if (DVO_UTIL_READ_CAMERA_CONFIG)
-    char        cameraConfig[256];
-    int         *ccdNum;
-    int         nCCD;
+  char        cameraConfig[256];
+  int        *ccdNum;
+  int         nCCD;
 #endif
 } dvoConfig;
@@ -29 +29 @@
 // This structure needs to be fleshed out
 typedef struct {
-    int         valid;
-    Average     ave;
-    Measure     meas;
+  int         valid;
+  Average     ave;
+  Measure     meas;
 #ifdef notdef
-    int         objID;
-    int         catID;
-    int         detID;
-    uint64_t    pspsObjID;
-    uint64_t    pspsDetID;
+  int         objID;
+  int         catID;
+  int         detID;
+  uint64_t    pspsObjID;
+  uint64_t    pspsDetID;
 #endif
 } dvoDetection;
@@ -52 +52 @@
 dvoConfig *dvoConfigRead(int *argc, char **argv);
 
-// free's memory associated with the dvoConfig structure
+// frees memory associated with the dvoConfig structure
 void dvoConfigFree(dvoConfig *dvoConfig);
 
@@ -70 +70 @@
 SkyList *dvoSkyListByExternID(dvoConfig *dvoConfig, int sourceID, int externID, Image **ppImage);
 
-// return a list of detectsions from a particular image id
+// return a list of detections from a particular image id
 // Use dvoFree() to free the memory pointed to by results
-int dvoGetDetections(SkyList *skylist, int imageID, dvoDetection **results, int *pMaxDetID);
+off_t dvoGetDetections(SkyList *skylist, int imageID, dvoDetection **results, int *pMaxDetID);
 
 // free memory returned by various dvo util functions