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

This reverts commit 36135fc59d59f1ebfce4b00bb36ce6edfbcd9018.

diff --git a/modules/highgui/CMakeLists.txt b/modules/highgui/CMakeLists.txt
index 86ad1c7..30c0c82 100644 (file)
--- a/modules/highgui/CMakeLists.txt
+++ b/modules/highgui/CMakeLists.txt
@@ -70,8 +70,6 @@ set(highgui_srcs
 
 file(GLOB highgui_ext_hdrs "include/opencv2/${name}/*.hpp" "include/opencv2/${name}/*.h")
 
-add_definitions(-DHAVE_ANDROID_UI)
-
 if(HAVE_QT)
   if (HAVE_QT_OPENGL)
     set(QT_USE_QTOPENGL TRUE)

diff --git a/modules/highgui/include/opencv2/highgui/highgui.hpp b/modules/highgui/include/opencv2/highgui/highgui.hpp
index 59be135..c511beb 100644 (file)
--- a/modules/highgui/include/opencv2/highgui/highgui.hpp
+++ b/modules/highgui/include/opencv2/highgui/highgui.hpp
@@ -54,7 +54,6 @@ struct CvVideoWriter;
 namespace cv
 {
 
-#if defined(ANDROID) && defined(HAVE_ANDROID_UI)
 enum { 
     // 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
@@ -156,8 +155,6 @@ CV_EXPORTS int createButton( const string& bar_name, ButtonCallback on_change,
                              void* userdata=NULL, int type=CV_PUSH_BUTTON,
                              bool initial_button_state=0);
 
-#endif
-
 //-------------------------
 
 enum