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

applied patches from #1005

Browse Source
This commit is contained in:
Vadim Pisarevsky 2011-06-13 22:04:28 +00:00
parent 238b94cbf1
commit 23d211bfed
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/highgui/src/window_QT.cpp
View File

@ -42,6 +42,15 @@
#if defined(HAVE_QT) #if defined(HAVE_QT)
#include <window_QT.h> #include <window_QT.h>
#include <math.h>
#ifdef _WIN32
#include <windows.h>
#define usleep Sleep
#endif
#ifndef M_PI
#define M_PI 3.14159265358979323846
#endif
//Static and global first //Static and global first
static GuiReceiver *guiMainThread = NULL; static GuiReceiver *guiMainThread = NULL;

4
modules/python/src2/cv2.cpp
View File

@ -525,10 +525,10 @@ template<typename _Tp> struct pyopencvVecConverter
} }
if( channels > 1 ) if( channels > 1 )
{ {
if( PyArray_Check(obj)) if( PyArray_Check(item))
{ {
Mat src; Mat src;
pyopencv_to(obj, src, name); pyopencv_to(item, src, name);
if( src.dims != 2 || src.channels() != 1 || if( src.dims != 2 || src.channels() != 1 ||
((src.cols != 1 || src.rows != channels) && ((src.cols != 1 || src.rows != channels) &&
(src.cols != channels || src.rows != 1))) (src.cols != channels || src.rows != 1)))