Changeset 34049 for branches/eam_branches/ipp-20120601/psModules/src/objects/pmModelFuncs.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/pmModelFuncs.h (modified) (2 diffs)

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

@@ -29 +29 @@
 # define PM_MODEL_FUNCS_H
 
+# define HAVE_MODEL_VAR 1
+
 /// @addtogroup Objects Object Detection / Analysis Functions
 /// @{
@@ -55 +57 @@
     PM_MODEL_OP_NORM     = 0x20,
     PM_MODEL_OP_NOISE    = 0x40,
+# if (HAVE_MODEL_VAR)
     PM_MODEL_OP_MODELVAR = 0x80,
+# endif
 } pmModelOpMode;