From a13f03f61eeb953ebcdae849a09d59d86447f06d Mon Sep 17 00:00:00 2001 From: Andrey Kamaev Date: Tue, 10 Apr 2012 15:50:19 +0000 Subject: [PATCH] Fixed/suppressed remaining warnings from the python bindings --- modules/python/CMakeLists.txt | 8 ++++++-- modules/python/src2/cv2.cv.hpp | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/modules/python/CMakeLists.txt b/modules/python/CMakeLists.txt index 7b876e4..0bfd71f 100644 --- a/modules/python/CMakeLists.txt +++ b/modules/python/CMakeLists.txt @@ -72,8 +72,8 @@ set_target_properties(${the_module} PROPERTIES OUTPUT_NAME cv2 SUFFIX ${CVPY_SUFFIX}) -if(MSVC AND NOT BUILD_SHARED_LIBS) - set_target_properties(${the_module} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:atlthunk.lib /NODEFAULTLIB:atlsd.lib /DEBUG") +if(CMAKE_COMPILER_IS_GNUCXX AND NOT ENABLE_NOISY_WARNINGS) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-function") endif() if(MSVC AND NOT ENABLE_NOISY_WARNINGS) @@ -83,6 +83,10 @@ if(MSVC AND NOT ENABLE_NOISY_WARNINGS) string(REPLACE "/W4" "/W3" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") endif() +if(MSVC AND NOT BUILD_SHARED_LIBS) + set_target_properties(${the_module} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:atlthunk.lib /NODEFAULTLIB:atlsd.lib /DEBUG") +endif() + if(MSVC) set(PYTHON_INSTALL_CONFIGURATIONS CONFIGURATIONS Release) else() diff --git a/modules/python/src2/cv2.cv.hpp b/modules/python/src2/cv2.cv.hpp index d971d20..b90ff7a 100644 --- a/modules/python/src2/cv2.cv.hpp +++ b/modules/python/src2/cv2.cv.hpp @@ -545,7 +545,7 @@ static PyObject *cvmat_array_struct(cvmat_t *cva) static PyObject *cvmatnd_array_struct(cvmatnd_t *cva) { - CvMatND *m; + CvMatND *m = 0; convert_to_CvMatND((PyObject *)cva, &m, ""); arrayTrack *at = new arrayTrack; @@ -693,7 +693,7 @@ static size_t cvmatnd_size(CvMatND *m) static PyObject *cvmatnd_tostring(PyObject *self, PyObject *args) { - CvMatND *m; + CvMatND *m = 0; if (!convert_to_CvMatND(self, &m, "self")) return NULL; -- 2.7.4