mirror of
https://github.com/opencv/opencv.git
synced 2024-11-24 19:20:28 +08:00
Update window_gtk.cpp
Update miniflann.cpp Update test_stereomatching.cpp
This commit is contained in:
parent
62c6656130
commit
ee6aacee9c
@ -560,7 +560,7 @@ int CV_StereoMatchingTest::processStereoMatchingResults( FileStorage& fs, int ca
|
||||
{
|
||||
absdiff( trueRightDisp, Scalar(params.dispUnknVal), rightUnknMask );
|
||||
rightUnknMask = rightUnknMask < numeric_limits<float>::epsilon();
|
||||
assert(leftUnknMask.type() == CV_8UC1);
|
||||
assert(rightUnknMask.type() == CV_8UC1);
|
||||
}
|
||||
|
||||
// calculate errors
|
||||
|
@ -553,7 +553,7 @@ static void createIndicesDists(OutputArray _indices, OutputArray _dists,
|
||||
if( !dists.isContinuous() || dists.type() != dtype ||
|
||||
dists.rows != rows || dists.cols < minCols || dists.cols > maxCols )
|
||||
{
|
||||
if( !indices.isContinuous() )
|
||||
if( !_dists.isContinuous() )
|
||||
_dists.release();
|
||||
_dists.create( rows, minCols, dtype );
|
||||
dists = _dists.getMat();
|
||||
|
@ -291,7 +291,7 @@ cvImageWidget_get_preferred_height (GtkWidget *widget, gint *minimal_height, gin
|
||||
|
||||
if(image_widget->scaled_image != NULL) {
|
||||
*natural_height = *minimal_height < image_widget->scaled_image->rows ?
|
||||
image_widget->scaled_image->cols : *minimal_height;
|
||||
image_widget->scaled_image->rows : *minimal_height;
|
||||
}
|
||||
else {
|
||||
*natural_height = *minimal_height;
|
||||
|
Loading…
Reference in New Issue
Block a user