mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-09 10:40:46 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update window_gtk.cpp

Browse Source 
Update miniflann.cpp

Update test_stereomatching.cpp
This commit is contained in:
Suleyman TURKMEN 2017-09-03 03:37:30 +03:00
parent 62c6656130
commit ee6aacee9c
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/calib3d/test/test_stereomatching.cpp
View File

@ -560,7 +560,7 @@ int CV_StereoMatchingTest::processStereoMatchingResults( FileStorage& fs, int ca
{ {
absdiff( trueRightDisp, Scalar(params.dispUnknVal), rightUnknMask ); absdiff( trueRightDisp, Scalar(params.dispUnknVal), rightUnknMask );
rightUnknMask = rightUnknMask < numeric_limits<float>::epsilon(); rightUnknMask = rightUnknMask < numeric_limits<float>::epsilon();
assert(leftUnknMask.type() == CV_8UC1); assert(rightUnknMask.type() == CV_8UC1);
} }
// calculate errors // calculate errors

2
modules/flann/src/miniflann.cpp
View File

@ -553,7 +553,7 @@ static void createIndicesDists(OutputArray _indices, OutputArray _dists,
if( !dists.isContinuous() || dists.type() != dtype || if( !dists.isContinuous() || dists.type() != dtype ||
dists.rows != rows || dists.cols < minCols || dists.cols > maxCols ) dists.rows != rows || dists.cols < minCols || dists.cols > maxCols )
{ {
if( !indices.isContinuous() ) if( !_dists.isContinuous() )
_dists.release(); _dists.release();
_dists.create( rows, minCols, dtype ); _dists.create( rows, minCols, dtype );
dists = _dists.getMat(); dists = _dists.getMat();

2
modules/highgui/src/window_gtk.cpp
View File

@ -291,7 +291,7 @@ cvImageWidget_get_preferred_height (GtkWidget *widget, gint *minimal_height, gin
if(image_widget->scaled_image != NULL) { if(image_widget->scaled_image != NULL) {
*natural_height = *minimal_height < image_widget->scaled_image->rows ? *natural_height = *minimal_height < image_widget->scaled_image->rows ?
image_widget->scaled_image->cols : *minimal_height; image_widget->scaled_image->rows : *minimal_height;
} }
else { else {
*natural_height = *minimal_height; *natural_height = *minimal_height;