lagadic / vision_visp

ViSP stack for ROS
http://wiki.ros.org/vision_visp
GNU General Public License v2.0
184 stars 90 forks source link

vision_visp not building with OpenCV 2.4 #3

Closed vrabaud closed 12 years ago

vrabaud commented 12 years ago

Sorry, we had to change some API to make SURF/SIFT part of a non-free module but changes are fairly minor:

diff ViSP-2.6.1/include/visp//vpFernClassifier.h ./ViSP-2.6.1New/include/visp//vpFernClassifier.h
51c51,55
< #if (VISP_HAVE_OPENCV_VERSION >= 0x020101) // Require opencv >= 2.1.1

---
> #if (VISP_HAVE_OPENCV_VERSION >= 0x020400) // Require opencv >= 2.4.0
> #  include <opencv2/imgproc/imgproc.hpp>
> #  include <opencv2/features2d/features2d.hpp>
> #  include <opencv2/legacy/legacy.hpp>
> #elif (VISP_HAVE_OPENCV_VERSION >= 0x020101) // Require opencv >= 2.1.1
Only in ./ViSP-2.6.1New/include/visp/: vpFernClassifier.h~
diff ViSP-2.6.1/include/visp//vpKeyPointSurf.h ./ViSP-2.6.1New/include/visp//vpKeyPointSurf.h
64c64,67
< #if (VISP_HAVE_OPENCV_VERSION >= 0x020101) // Require opencv >= 2.1.1

---
> #if (VISP_HAVE_OPENCV_VERSION >= 0x020400) // Require opencv >= 2.4.0
> #  include <opencv2/features2d/features2d.hpp>
> #  include <opencv2/legacy/compat.hpp>
> #elif (VISP_HAVE_OPENCV_VERSION >= 0x020101) // Require opencv >= 2.1.1
Only in ./ViSP-2.6.1New/include/visp/: vpKeyPointSurf.h~
diff ViSP-2.6.1/include/visp//vpPlanarObjectDetector.h ./ViSP-2.6.1New/include/visp//vpPlanarObjectDetector.h
50c50,55
< #if (VISP_HAVE_OPENCV_VERSION >= 0x020101) // Require opencv >= 2.1.1

---
> #if (VISP_HAVE_OPENCV_VERSION >= 0x020400) // Require opencv >= 2.4.0
> #  include <opencv2/imgproc/imgproc.hpp>
> #  include <opencv2/features2d/features2d.hpp>
> #  include <opencv2/calib3d/calib3d.hpp>
> #  include <opencv2/legacy/legacy.hpp>
> #elif (VISP_HAVE_OPENCV_VERSION >= 0x020101) // Require opencv >= 2.1.1

Please re-release on fuerte.

fspindle commented 12 years ago

Thanks for your feedback. The fixes are commited in ViSP svn trunk and will be part of the next release coming soon.

Fabien

Le 13/04/12 15:43, vrabaud a écrit :

Sorry, we had to change some API to make SURF/SIFT part of a non-free module but changes are fairly minor:

diff ViSP-2.6.1/include/visp//vpFernClassifier.h ./ViSP-2.6.1New/include/visp//vpFernClassifier.h 51c51,55

< #if (VISP_HAVE_OPENCV_VERSION>= 0x020101) // Require opencv>= 2.1.1

if (VISP_HAVE_OPENCV_VERSION>= 0x020400) // Require opencv>= 2.4.0

include<opencv2/imgproc/imgproc.hpp>

include<opencv2/features2d/features2d.hpp>

include<opencv2/legacy/legacy.hpp>

elif (VISP_HAVE_OPENCV_VERSION>= 0x020101) // Require opencv>= 2.1.1

Only in ./ViSP-2.6.1New/include/visp/: vpFernClassifier.h~ diff ViSP-2.6.1/include/visp//vpKeyPointSurf.h ./ViSP-2.6.1New/include/visp//vpKeyPointSurf.h 64c64,67

< #if (VISP_HAVE_OPENCV_VERSION>= 0x020101) // Require opencv>= 2.1.1

if (VISP_HAVE_OPENCV_VERSION>= 0x020400) // Require opencv>= 2.4.0

include<opencv2/features2d/features2d.hpp>

include<opencv2/legacy/compat.hpp>

elif (VISP_HAVE_OPENCV_VERSION>= 0x020101) // Require opencv>= 2.1.1

Only in ./ViSP-2.6.1New/include/visp/: vpKeyPointSurf.h~ diff ViSP-2.6.1/include/visp//vpPlanarObjectDetector.h ./ViSP-2.6.1New/include/visp//vpPlanarObjectDetector.h 50c50,55

< #if (VISP_HAVE_OPENCV_VERSION>= 0x020101) // Require opencv>= 2.1.1

if (VISP_HAVE_OPENCV_VERSION>= 0x020400) // Require opencv>= 2.4.0

include<opencv2/imgproc/imgproc.hpp>

include<opencv2/features2d/features2d.hpp>

include<opencv2/calib3d/calib3d.hpp>

include<opencv2/legacy/legacy.hpp>

elif (VISP_HAVE_OPENCV_VERSION>= 0x020101) // Require opencv>= 2.1.1

Please re-release on fuerte.


Reply to this email directly or view it on GitHub: https://github.com/laas/vision_visp/issues/3

thomas-moulard commented 12 years ago

Sorry I did not see this issue until now. I will patch the previous ViSP release and re-release ASAP until a new version is released.

thomas-moulard commented 12 years ago

Fixed with new release. Closing.