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

Revert "Issue #2035 Calling cv::namedWindow crashes on Android fixed."

Browse Source 
This reverts commit 36135fc59d59f1ebfce4b00bb36ce6edfbcd9018.
This commit is contained in:
Andrey Kamaev 2012-10-10 13:17:37 +04:00
parent e83ff354bd
commit cabddaeb4f
2 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/highgui/CMakeLists.txt
View File

@ -70,8 +70,6 @@ set(highgui_srcs
file(GLOB highgui_ext_hdrs "include/opencv2/${name}/*.hpp" "include/opencv2/${name}/*.h") file(GLOB highgui_ext_hdrs "include/opencv2/${name}/*.hpp" "include/opencv2/${name}/*.h")
add_definitions(-DHAVE_ANDROID_UI)
if(HAVE_QT) if(HAVE_QT)
if (HAVE_QT_OPENGL) if (HAVE_QT_OPENGL)
set(QT_USE_QTOPENGL TRUE) set(QT_USE_QTOPENGL TRUE)

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

@ -54,7 +54,6 @@ struct CvVideoWriter;
namespace cv namespace cv
{ {
#if defined(ANDROID) && defined(HAVE_ANDROID_UI)
enum { enum {
// Flags for namedWindow // Flags for namedWindow
WINDOW_NORMAL = CV_WINDOW_NORMAL, // the user can resize the window (no constraint) / also use to switch a fullscreen window to a normal size WINDOW_NORMAL = CV_WINDOW_NORMAL, // the user can resize the window (no constraint) / also use to switch a fullscreen window to a normal size
@ -156,8 +155,6 @@ CV_EXPORTS int createButton( const string& bar_name, ButtonCallback on_change,
void* userdata=NULL, int type=CV_PUSH_BUTTON, void* userdata=NULL, int type=CV_PUSH_BUTTON,
bool initial_button_state=0); bool initial_button_state=0);
#endif
//------------------------- //-------------------------
enum enum