Skip to content
Snippets Groups Projects

Updates for OpenCV 3 api (keeping OpenCV 2 back compatibility)

Merged Angel Santamaria-Navarro requested to merge opencv3_new_api into master
3 files
+ 59
34
Compare changes
  • Side-by-side
  • Inline
Files
3
//std includes
#include <iostream>
//opencv includes
#include "opencv2/features2d/features2d.hpp"
// OpenCV includes
#if defined (HAVE_OPENCV3)
#include <opencv2/features2d.hpp>
#include <opencv2/highgui.hpp>
#include <opencv2/core.hpp>
#include <opencv2/imgproc.hpp>
#else
#include <opencv2/features2d/features2d.hpp>
#include <opencv2/highgui/highgui.hpp>
#include <opencv2/imgproc/imgproc.hpp>
#include <opencv2/core/core.hpp>
#endif
int main(int argc, char** argv)
{
Loading