Changeset 34085 for trunk/psModules/src/objects/pmModelFuncs.h
- Timestamp:
- Jun 26, 2012, 11:31:38 AM (14 years ago)
- Location:
- trunk/psModules
- Files:
-
- 2 edited
-
. (modified) (1 prop)
-
src/objects/pmModelFuncs.h (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/psModules
- Property svn:mergeinfo changed
/branches/eam_branches/ipp-20120601/psModules (added) merged: 34002,34044,34049,34051-34053,34073,34076,34078
- Property svn:mergeinfo changed
-
trunk/psModules/src/objects/pmModelFuncs.h
r33993 r34085 29 29 # define PM_MODEL_FUNCS_H 30 30 31 # define HAVE_MODEL_VAR 132 33 31 /// @addtogroup Objects Object Detection / Analysis Functions 34 32 /// @{ … … 57 55 PM_MODEL_OP_NORM = 0x20, 58 56 PM_MODEL_OP_NOISE = 0x40, 59 # if (HAVE_MODEL_VAR)60 57 PM_MODEL_OP_MODELVAR = 0x80, 61 # endif62 58 } pmModelOpMode; 63 59
Note:
See TracChangeset
for help on using the changeset viewer.
