generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3513 from mshabunin:compat-30

Browse Source
This commit is contained in:
Vadim Pisarevsky
2014-12-22 11:58:01 +00:00
parent c0005fd293 c485aee464
commit d9f159a554
9 changed files with 37 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/highgui/include/opencv2/highgui.hpp
View File

@@ -692,4 +692,9 @@ CV_EXPORTS int createButton( const String& bar_name, ButtonCallback on_change,
//! @} highgui
} // cv
#ifndef DISABLE_OPENCV_24_COMPATIBILITY
#include "opencv2/highgui/highgui_c.h"
#endif
#endif