Changeset 34049 for branches/eam_branches/ipp-20120601/psModules/src/objects/pmSource.h

Timestamp:

Jun 20, 2012, 12:22:52 PM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20120601

Files:

• . (modified) (1 prop)
• psModules (modified) (1 prop)
• psModules/src/objects/pmSource.h (modified) (1 diff)

branches/eam_branches/ipp-20120601/psModules/src/objects/pmSource.h

@@ -72 +72 @@
     psImage *pixels;                    ///< Rectangular region including object pixels.
     psImage *variance;                  ///< Image variance.
+# if (HAVE_MODEL_VAR)
     psImage *modelVar;                  ///< variance based on current models
+# endif
     psImage *maskObj;                   ///< unique mask for this object which marks included pixels associated with objects.
     psImage *maskView;                  ///< view into global image mask for this object region