Changeset 37067 for branches/eam_branches/ipp-ops-20130712/Ohana/src/libdvo/include/elixir_defs.h

Timestamp:

Jul 17, 2014, 12:32:26 PM (12 years ago)

Author:

eugene

Message:

merge changes (from past YEAR) into trunk

Location:

branches/eam_branches/ipp-ops-20130712/Ohana

Files:

• . (modified) (1 prop)
• src/libdvo/include/elixir_defs.h (modified) (1 diff)

branches/eam_branches/ipp-ops-20130712/Ohana/src/libdvo/include/elixir_defs.h

@@ -3 +3 @@
 Average                 *Average_Elixir_ToInternal (Average_Elixir *in, off_t Nvalues, SecFilt **primary);
 Average_Elixir          *AverageInternalTo_Elixir (Average *in, off_t Nvalues, SecFilt *primary);
-Measure                 *Measure_Elixir_ToInternal (Measure_Elixir *in, off_t Nvalues);
-Measure_Elixir          *MeasureInternalTo_Elixir (Measure *in, off_t Nvalues);
+Measure                 *Measure_Elixir_ToInternal (Average *ave, Measure_Elixir *in, off_t Nvalues);
+Measure_Elixir          *MeasureInternalTo_Elixir (Average *ave, Measure *in, off_t Nvalues);
 SecFilt                 *SecFilt_Elixir_ToInternal (SecFilt_Elixir *in, off_t Nvalues);
 SecFilt_Elixir          *SecFiltInternalTo_Elixir (SecFilt *in, off_t Nvalues);