Merge pull request opencv#9546 from sturkmen72:GrammaTech

mshabunin · mshabunin · commit 334241d82ef8 · 2017-09-04T09:51:22.000Z
diff --git a/modules/calib3d/test/test_stereomatching.cpp b/modules/calib3d/test/test_stereomatching.cpp
@@ -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
diff --git a/modules/flann/src/miniflann.cpp b/modules/flann/src/miniflann.cpp
@@ -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();
diff --git a/modules/highgui/src/window_gtk.cpp b/modules/highgui/src/window_gtk.cpp
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -560,7 +560,7 @@ int CV_StereoMatchingTest::processStereoMatchingResults( FileStorage& fs, int ca`
`560`	`560`	`{`
`561`	`561`	`absdiff( trueRightDisp, Scalar(params.dispUnknVal), rightUnknMask );`
`562`	`562`	`rightUnknMask = rightUnknMask < numeric_limits<float>::epsilon();`
`563`		`- assert(leftUnknMask.type() == CV_8UC1);`
	`563`	`+ assert(rightUnknMask.type() == CV_8UC1);`
`564`	`564`	`}`
`565`	`565`
`566`	`566`	`// calculate errors`
Original file line number	Diff line number	Diff line change
`@@ -553,7 +553,7 @@ static void createIndicesDists(OutputArray _indices, OutputArray _dists,`
`553`	`553`	`if( !dists.isContinuous() \|\| dists.type() != dtype \|\|`
`554`	`554`	`dists.rows != rows \|\| dists.cols < minCols \|\| dists.cols > maxCols )`
`555`	`555`	`{`
`556`		`- if( !indices.isContinuous() )`
	`556`	`+ if( !_dists.isContinuous() )`
`557`	`557`	`_dists.release();`
`558`	`558`	`_dists.create( rows, minCols, dtype );`
`559`	`559`	`dists = _dists.getMat();`
Original file line number	Diff line number	Diff line change
`@@ -291,7 +291,7 @@ cvImageWidget_get_preferred_height (GtkWidget widget, gint minimal_height, gin`
`291`	`291`
`292`	`292`	`if(image_widget->scaled_image != NULL) {`
`293`	`293`	`natural_height = minimal_height < image_widget->scaled_image->rows ?`
`294`		`- image_widget->scaled_image->cols : *minimal_height;`
	`294`	`+ image_widget->scaled_image->rows : *minimal_height;`
`295`	`295`	`}`
`296`	`296`	`else {`
`297`	`297`	`natural_height = minimal_height;`