Merge pull request opencv#8942 from zwsu:master

alalek · alalek · commit 594652cac168 · 2017-06-20T10:57:17.000Z
diff --git a/samples/gpu/stereo_match.cpp b/samples/gpu/stereo_match.cpp
@@ -212,7 +212,7 @@ void App::run()
         // Show results
         d_disp.download(disp);
         putText(disp, text(), Point(5, 25), FONT_HERSHEY_SIMPLEX, 1.0, Scalar::all(255));
-        imshow("disparity", disp);
+        imshow("disparity", (Mat_<uchar>)disp);
 
         handleKey((char)waitKey(3));
     }

Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ void App::run()`
`212`	`212`	`// Show results`
`213`	`213`	`d_disp.download(disp);`
`214`	`214`	`putText(disp, text(), Point(5, 25), FONT_HERSHEY_SIMPLEX, 1.0, Scalar::all(255));`
`215`		`- imshow("disparity", disp);`
	`215`	`+ imshow("disparity", (Mat_<uchar>)disp);`
`216`	`216`
`217`	`217`	`handleKey((char)waitKey(3));`
`218`	`218`	`}`