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

Fixed/suppressed remaining warnings from the python bindings

Browse Source
This commit is contained in:
Andrey Kamaev 2012-04-10 15:50:19 +00:00
parent c712f376d5
commit a13f03f61e
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/python/CMakeLists.txt
View File

@ -72,8 +72,8 @@ set_target_properties(${the_module} PROPERTIES
OUTPUT_NAME cv2 OUTPUT_NAME cv2
SUFFIX ${CVPY_SUFFIX}) SUFFIX ${CVPY_SUFFIX})
if(MSVC AND NOT BUILD_SHARED_LIBS) if(CMAKE_COMPILER_IS_GNUCXX AND NOT ENABLE_NOISY_WARNINGS)
set_target_properties(${the_module} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:atlthunk.lib /NODEFAULTLIB:atlsd.lib /DEBUG") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-function")
endif() endif()
if(MSVC AND NOT ENABLE_NOISY_WARNINGS) 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}") string(REPLACE "/W4" "/W3" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
endif() 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) if(MSVC)
set(PYTHON_INSTALL_CONFIGURATIONS CONFIGURATIONS Release) set(PYTHON_INSTALL_CONFIGURATIONS CONFIGURATIONS Release)
else() else()

4
modules/python/src2/cv2.cv.hpp
View File

@ -545,7 +545,7 @@ static PyObject *cvmat_array_struct(cvmat_t *cva)
static PyObject *cvmatnd_array_struct(cvmatnd_t *cva) static PyObject *cvmatnd_array_struct(cvmatnd_t *cva)
{ {
CvMatND *m; CvMatND *m = 0;
convert_to_CvMatND((PyObject *)cva, &m, ""); convert_to_CvMatND((PyObject *)cva, &m, "");
arrayTrack *at = new arrayTrack; arrayTrack *at = new arrayTrack;
@ -693,7 +693,7 @@ static size_t cvmatnd_size(CvMatND *m)
static PyObject *cvmatnd_tostring(PyObject *self, PyObject *args) static PyObject *cvmatnd_tostring(PyObject *self, PyObject *args)
{ {
CvMatND *m; CvMatND *m = 0;
if (!convert_to_CvMatND(self, &m, "self")) if (!convert_to_CvMatND(self, &m, "self"))
return NULL; return NULL;