mirror of
https://github.com/macports/macports-ports.git
synced 2026-07-12 18:20:25 -07:00
80 lines
2.5 KiB
Diff
80 lines
2.5 KiB
Diff
--- cmake/OpenCVFindLibsGUI.cmake
|
|
+++ cmake/OpenCVFindLibsGUI.cmake 2024-09-02 12:52:38.000000000 +0800
|
|
@@ -89,6 +89,6 @@
|
|
# --- Cocoa ---
|
|
if(APPLE)
|
|
if(NOT IOS AND CV_CLANG)
|
|
- set(HAVE_COCOA YES)
|
|
+# set(HAVE_COCOA YES)
|
|
endif()
|
|
endif()
|
|
|
|
--- modules/highgui/CMakeLists.txt
|
|
+++ modules/highgui/CMakeLists.txt 2024-09-02 13:51:35.000000000 +0800
|
|
@@ -123,9 +123,6 @@
|
|
endif()
|
|
elseif(HAVE_GTK OR HAVE_GTK3)
|
|
list(APPEND highgui_srcs ${CMAKE_CURRENT_LIST_DIR}/src/window_gtk.cpp)
|
|
-elseif(HAVE_COCOA)
|
|
- list(APPEND highgui_srcs ${CMAKE_CURRENT_LIST_DIR}/src/window_cocoa.mm)
|
|
- list(APPEND HIGHGUI_LIBRARIES "-framework Cocoa")
|
|
endif()
|
|
|
|
if(TRUE)
|
|
|
|
--- modules/highgui/src/window.cpp
|
|
+++ modules/highgui/src/window.cpp 2024-09-02 14:30:57.000000000 +0800
|
|
@@ -62,8 +62,6 @@
|
|
cvSetModeWindow_W32(name,prop_value);
|
|
#elif defined (HAVE_GTK)
|
|
cvSetModeWindow_GTK(name,prop_value);
|
|
- #elif defined (HAVE_COCOA)
|
|
- cvSetModeWindow_COCOA(name,prop_value);
|
|
#elif defined (WINRT)
|
|
cvSetModeWindow_WinRT(name, prop_value);
|
|
#endif
|
|
@@ -87,8 +85,6 @@
|
|
// nothing
|
|
#elif defined(HAVE_WIN32UI)
|
|
cvSetPropTopmost_W32(name, (prop_value != 0 ? true : false));
|
|
- #elif defined(HAVE_COCOA)
|
|
- cvSetPropTopmost_COCOA(name, (prop_value != 0 ? true : false));
|
|
#endif
|
|
break;
|
|
|
|
@@ -112,8 +108,6 @@
|
|
return cvGetModeWindow_W32(name);
|
|
#elif defined (HAVE_GTK)
|
|
return cvGetModeWindow_GTK(name);
|
|
- #elif defined (HAVE_COCOA)
|
|
- return cvGetModeWindow_COCOA(name);
|
|
#elif defined (WINRT)
|
|
return cvGetModeWindow_WinRT(name);
|
|
#else
|
|
@@ -175,8 +169,6 @@
|
|
return -1;
|
|
#elif defined(HAVE_WIN32UI)
|
|
return cvGetPropTopmost_W32(name);
|
|
- #elif defined(HAVE_COCOA)
|
|
- return cvGetPropTopmost_COCOA(name);
|
|
#else
|
|
return -1;
|
|
#endif
|
|
@@ -198,8 +190,6 @@
|
|
return cvGetWindowRect_W32(name);
|
|
#elif defined (HAVE_GTK)
|
|
return cvGetWindowRect_GTK(name);
|
|
- #elif defined (HAVE_COCOA)
|
|
- return cvGetWindowRect_COCOA(name);
|
|
#else
|
|
return cv::Rect(-1, -1, -1, -1);
|
|
#endif
|
|
@@ -601,7 +591,6 @@
|
|
|
|
#if defined (HAVE_WIN32UI) // see window_w32.cpp
|
|
#elif defined (HAVE_GTK) // see window_gtk.cpp
|
|
-#elif defined (HAVE_COCOA) // see window_cocoa.mm
|
|
#elif defined (HAVE_QT) // see window_QT.cpp
|
|
#elif defined (WINRT) && !defined (WINRT_8_0) // see window_winrt.cpp
|
|
|