continue fixing nonfree elements

fixed dependency of stitching module on xfeatures2d module as optional
fixed the initModule_xfeatures2d function that was called in module stitching since it is in another namespace than the standard cv one.
This commit is contained in:
StevenPuttemans
2014-08-27 13:50:11 +02:00
parent d66815978a
commit d27e440b2a
8 changed files with 9 additions and 9 deletions

View File

@@ -6,7 +6,7 @@
SET(OPENCV_CPP_SAMPLES_REQUIRED_DEPS opencv_core opencv_imgproc opencv_flann
opencv_imgcodecs opencv_videoio opencv_highgui opencv_ml opencv_video
opencv_objdetect opencv_photo opencv_features2d opencv_calib3d
opencv_stitching opencv_videostab opencv_shape)
opencv_stitching opencv_videostab opencv_shape opencv_xfeatures2d)
ocv_check_dependencies(${OPENCV_CPP_SAMPLES_REQUIRED_DEPS})