1
0
mirror of https://github.com/opencv/opencv_contrib.git synced 2025-10-21 06:11:09 +08:00

Merge pull request #36 from vbystricky/highgui_split

Split highgui module to videoio and highgui
This commit is contained in:
Vadim Pisarevsky
2014-07-17 00:09:47 +04:00
5 changed files with 5 additions and 0 deletions

View File

@@ -11,6 +11,7 @@
#include "opencv2/bioinspired.hpp" #include "opencv2/bioinspired.hpp"
#include "opencv2/imgcodecs.hpp" #include "opencv2/imgcodecs.hpp"
#include "opencv2/videoio.hpp"
#include "opencv2/highgui.hpp" #include "opencv2/highgui.hpp"
static void help(std::string errorMessage) static void help(std::string errorMessage)

View File

@@ -12,6 +12,7 @@
#include "opencv2/ts.hpp" #include "opencv2/ts.hpp"
#include <opencv2/imgproc.hpp> #include <opencv2/imgproc.hpp>
#include <opencv2/tracking.hpp> #include <opencv2/tracking.hpp>
#include <opencv2/videoio.hpp>
#include <opencv2/highgui.hpp> #include <opencv2/highgui.hpp>
#ifdef GTEST_CREATE_SHARED_LIBRARY #ifdef GTEST_CREATE_SHARED_LIBRARY

View File

@@ -1,5 +1,6 @@
#include <opencv2/core/utility.hpp> #include <opencv2/core/utility.hpp>
#include <opencv2/tracking.hpp> #include <opencv2/tracking.hpp>
#include <opencv2/videoio.hpp>
#include <opencv2/highgui.hpp> #include <opencv2/highgui.hpp>
#include <iostream> #include <iostream>
#include <time.h> #include <time.h>

View File

@@ -1,5 +1,6 @@
#include <opencv2/core/utility.hpp> #include <opencv2/core/utility.hpp>
#include <opencv2/tracking.hpp> #include <opencv2/tracking.hpp>
#include <opencv2/videoio.hpp>
#include <opencv2/highgui.hpp> #include <opencv2/highgui.hpp>
#include <iostream> #include <iostream>
#include <cstring> #include <cstring>

View File

@@ -14,5 +14,6 @@
#include "opencv2/imgproc.hpp" #include "opencv2/imgproc.hpp"
#include "opencv2/tracking.hpp" #include "opencv2/tracking.hpp"
#include "opencv2/highgui.hpp" #include "opencv2/highgui.hpp"
#include "opencv2/videoio.hpp"
#endif #endif