potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 00:03:03 +04:00
Code Packages Releases Wiki Activity

Merge pull request #2990 from vbystricky:highgui_split2

Browse Source
This commit is contained in:
Vadim Pisarevsky
2014-07-23 11:27:25 +00:00
parent 7bd7c85b1d fd51c133df
commit da1ac35930
8 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/highgui/CMakeLists.txt
+1 -1
View File
@@ -1,5 +1,5 @@
set(the_description "High-level GUI and Media I/O")
ocv_add_module(highgui opencv_imgproc opencv_imgcodecs OPTIONAL opencv_androidcamera)
ocv_add_module(highgui opencv_imgproc opencv_imgcodecs opencv_videoio OPTIONAL opencv_androidcamera)
# ----------------------------------------------------------------------------
# CMake file for highgui. See root CMakeLists.txt
modules/highgui/include/opencv2/highgui.hpp
+2
View File
@@ -44,6 +44,8 @@
#define __OPENCV_HIGHGUI_HPP__
#include "opencv2/core.hpp"
#include "opencv2/imgcodecs.hpp"
#include "opencv2/videoio.hpp"
///////////////////////// graphical user interface //////////////////////////
modules/highgui/include/opencv2/highgui/highgui_c.h
+2
View File
@@ -43,6 +43,8 @@
#define __OPENCV_HIGHGUI_H__
#include "opencv2/core/core_c.h"
#include "opencv2/imgcodecs/imgcodecs_c.h"
#include "opencv2/videoio/videoio_c.h"
#ifdef __cplusplus
extern "C" {