Changeset 38468 for trunk/Ohana/src/dvomerge/include/dvomerge.h

Timestamp:

Jun 12, 2015, 10:30:41 PM (11 years ago)

Author:

eugene

Message:

merge changes from EAM branch ipp-20150419

File:

• trunk/Ohana/src/dvomerge/include/dvomerge.h (modified) (2 diffs)

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

@@ -40 +40 @@
 char  *ALTERNATE_PHOTCODE_FILE;
 int    REPLACE_BY_PHOTCODE;
+int    REPLACE_TYCHO;
 int    FORCE_MERGE;
 int    MAX_CLIENTS;
@@ -232 +233 @@
 int RepairTableCPT_V1(char *cptFilenameSrc, char *cptFilenameTgt, char *cpsFilenameSrc, char *cpsFilenameTgt, Measure *measure, off_t Nmeasure, Image *image, off_t Nimage, myIndexType *imageIDindex, char catformat);
 int *ReadDeleteListExternID(char *filename, int *nindex);
+
+void replace_tycho_init ();
+int  replace_tycho (Average *averageInp, Measure *measureInp, Average *averageOut, Measure *measureOut);