Changeset 39225 for trunk/Ohana/src/dvomerge/include/dvoutils.h

Timestamp:

Dec 3, 2015, 4:16:29 PM (11 years ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-20151113

Location:

trunk

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/dvomerge/include/dvoutils.h (modified) (2 diffs)

trunk/Ohana/src/dvomerge/include/dvoutils.h

@@ -20 +20 @@
   DVOUTILS_NONE,
   DVOUTILS_UNIQ_IMAGES,
+  DVOUTILS_CHECK_IMAGES,
 } DVOUTILS_OP_TYPE;
 
@@ -32 +33 @@
 
 char *IMAGES_LIST;
+char *CATDIR;
+char *EXTERN_ID_LIST;
 
 int main (int argc, char **argv);
 int dvoutils_args (int *argc, char **argv);
 int dvoutils_uniq_images (char *filename);
+int dvoutils_check_images (void);
 
 ImageData *dvoutils_load_image_index (char *filename);