Changeset 38447 for branches/eam_branches/ipp-20150419/Ohana/src/markrock/src/markrock.c

Timestamp:

Jun 12, 2015, 9:44:51 PM (11 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20150419/Ohana/src

Files:

• . (modified) (1 prop)
• markrock/src/markrock.c (modified) (2 diffs)

branches/eam_branches/ipp-20150419/Ohana/src/markrock/src/markrock.c

@@ -38 +38 @@
   catalog.filename = argv[1];
   catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
-  catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
+  catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
 
   // an error exit status here is a significant error
@@ -45 +45 @@
     exit (2);
   }
-  if (catalog.Naves_disk) {
+  if (catalog.Naverage_disk) {
     dvo_catalog_unlock (&catalog);
     dvo_catalog_free (&catalog);