Changeset 27517 for branches/eam_branches/20100225/Ohana/src/libdvo/include/loneos_defs.h

Timestamp:

Mar 29, 2010, 3:55:49 PM (16 years ago)

Author:

eugene

Message:

update merges from trunk

Location:

branches/eam_branches/20100225

Files:

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

branches/eam_branches/20100225/Ohana/src/libdvo/include/loneos_defs.h

@@ -1 @@
-Image                   *Image_Loneos_ToInternal (Image_Loneos *in, int Nvalues);
-Image_Loneos            *ImageInternalTo_Loneos (Image *in, int Nvalues);
-Average                 *Average_Loneos_ToInternal (Average_Loneos *in, int Nvalues, SecFilt **primary);
-Average_Loneos          *AverageInternalTo_Loneos (Average *in, int Nvalues, SecFilt *primary);
-Measure                 *Measure_Loneos_ToInternal (Measure_Loneos *in, int Nvalues);
-Measure_Loneos          *MeasureInternalTo_Loneos (Measure *in, int Nvalues);
-SecFilt                 *SecFilt_Loneos_ToInternal (SecFilt_Loneos *in, int Nvalues);
-SecFilt_Loneos          *SecFiltInternalTo_Loneos (SecFilt *in, int Nvalues);
+Image                   *Image_Loneos_ToInternal (Image_Loneos *in, off_t Nvalues);
+Image_Loneos            *ImageInternalTo_Loneos (Image *in, off_t Nvalues);
+Average                 *Average_Loneos_ToInternal (Average_Loneos *in, off_t Nvalues, SecFilt **primary);
+Average_Loneos          *AverageInternalTo_Loneos (Average *in, off_t Nvalues, SecFilt *primary);
+Measure                 *Measure_Loneos_ToInternal (Measure_Loneos *in, off_t Nvalues);
+Measure_Loneos          *MeasureInternalTo_Loneos (Measure *in, off_t Nvalues);
+SecFilt                 *SecFilt_Loneos_ToInternal (SecFilt_Loneos *in, off_t Nvalues);
+SecFilt_Loneos          *SecFiltInternalTo_Loneos (SecFilt *in, off_t Nvalues);