OpenCV definition
- types added

Test code modified