potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00
Code Packages Releases Wiki Activity

Merge remote-tracking branch 'upstream/2.4' into 2.4

Browse Source
This commit is contained in:
Prof. Dr. Rudolf Haussmann
2015-03-20 01:44:29 +01:00
parent a7bf1d53d8 69344f175b
commit 756c1a22d9
9 changed files with 29441 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/highgui/src/window_QT.cpp
+1 -1
View File
@@ -1848,7 +1848,7 @@ bool CvWindow::isOpenGl()
void CvWindow::setViewportSize(QSize _size)
{
myView->getWidget()->resize(_size);
resize(_size);
myView->setSize(_size);
}