Changeset 38717 for branches/eam_branches/ipp-20150625/Ohana/src/dvomerge/include/dvoutils.h

Timestamp:

Sep 8, 2015, 11:37:39 AM (11 years ago)

Author:

eugene

Message:

test for photcode = 0 before checking on uniq externID values

File:

• branches/eam_branches/ipp-20150625/Ohana/src/dvomerge/include/dvoutils.h (modified) (2 diffs)

branches/eam_branches/ipp-20150625/Ohana/src/dvomerge/include/dvoutils.h

@@ -22 +22 @@
 } DVOUTILS_OP_TYPE;
 
+typedef struct {
+  int   *externID;
+  short *photcode;
+  int Nimages;
+} ImageData;
+
 int VERBOSE;
 int DVOUTILS_OP;
@@ -30 +36 @@
 int dvoutils_args (int *argc, char **argv);
 int dvoutils_uniq_images (char *filename);
-int *dvoutils_load_image_index (char *filename, int *nindex);
+
+ImageData *dvoutils_load_image_index (char *filename);
 
 Image *dvoutils_load_image_table (char *filename, int *nimage);