Changeset 38443 for branches/eam_branches/ipp-20150419/Ohana/src/opihi/dvo/extract.c

Timestamp:

Jun 12, 2015, 9:26:15 PM (11 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20150419/Ohana/src/opihi

Files:

• . (modified) (1 prop)
• dvo/extract.c (modified) (1 diff)

branches/eam_branches/ipp-20150419/Ohana/src/opihi/dvo/extract.c

@@ -252 +252 @@
       catalog.measure = (Measure *) NULL;
       catalog.secfilt = (SecFilt *) NULL;
-      loadmode = LOAD_AVES | LOAD_SECF;
+      loadmode = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT;
       if ((mode == REF) || (mode == TYPE) || (mode == NPHOT) || (mode == NCODE)) 
-        loadmode = loadmode | LOAD_MEAS;
+        loadmode = loadmode | DVO_LOAD_MEASURE;
 
       /* lock, load, unlock catalog */