From 9344d0d0e36fd2a4b468132a78b140562786e55d Mon Sep 17 00:00:00 2001 From: berak Date: Wed, 21 Nov 2018 11:05:24 +0100 Subject: [PATCH] highgui: restore convertscale semantics in window_w32.cpp --- modules/highgui/src/window_w32.cpp | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/modules/highgui/src/window_w32.cpp b/modules/highgui/src/window_w32.cpp index 294f812c50..bed57073dc 100644 --- a/modules/highgui/src/window_w32.cpp +++ b/modules/highgui/src/window_w32.cpp @@ -1154,7 +1154,6 @@ cvShowImage( const char* name, const CvArr* arr ) int channels = 0; void* dst_ptr = 0; const int channels0 = 3; - int origin = 0; CvMat stub, *image; bool changed_size = false; // philipg @@ -1171,9 +1170,6 @@ cvShowImage( const char* name, const CvArr* arr ) if( !window || !arr ) EXIT; // keep silence here. - if( CV_IS_IMAGE_HDR( arr )) - origin = ((IplImage*)arr)->origin; - CV_CALL( image = cvGetMat( arr, &stub )); #ifdef HAVE_OPENGL @@ -1212,21 +1208,15 @@ cvShowImage( const char* name, const CvArr* arr ) { cv::Mat src = cv::cvarrToMat(image); cv::Mat dst(size.cy, size.cx, CV_8UC3, dst_ptr, (size.cx * channels + 3) & -4); - if (src.channels() == 1) - { - cv::cvtColor(src, dst, cv::COLOR_GRAY2BGR); - cv::flip(dst, dst, 0); - } - else if (src.channels() == 4) - { - cv::cvtColor(src, dst, cv::COLOR_BGRA2BGR); - cv::flip(dst, dst, 0); - } - else - { - CV_Assert(src.channels() == 3); - cv::flip(src, dst, 0); - } + + cv::Mat tmp; + int src_depth = src.depth(); + double scale = src_depth <= CV_8S ? 1 : src_depth <= CV_32S ? 1./256 : 255; + double shift = src_depth == CV_8S || src_depth == CV_16S ? 128 : 0; + cv::convertScaleAbs(src, tmp, scale, shift); + cv::cvtColor(tmp, dst, cv::COLOR_BGRA2BGR, dst.channels()); + cv::flip(dst, dst, 0); + CV_Assert(dst.data == (uchar*)dst_ptr); }