mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-12 20:42:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

highgui: restore convertscale semantics in window_w32.cpp

Browse Source
This commit is contained in:
berak 2018-11-21 11:05:24 +01:00
parent a4ab60920f
commit 9344d0d0e3
1 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
modules/highgui/src/window_w32.cpp
View File

@ -1154,7 +1154,6 @@ cvShowImage( const char* name, const CvArr* arr )
int channels = 0; int channels = 0;
void* dst_ptr = 0; void* dst_ptr = 0;
const int channels0 = 3; const int channels0 = 3;
int origin = 0;
CvMat stub, *image; CvMat stub, *image;
bool changed_size = false; // philipg bool changed_size = false; // philipg
@ -1171,9 +1170,6 @@ cvShowImage( const char* name, const CvArr* arr )
if( !window || !arr ) if( !window || !arr )
EXIT; // keep silence here. EXIT; // keep silence here.
if( CV_IS_IMAGE_HDR( arr ))
origin = ((IplImage*)arr)->origin;
CV_CALL( image = cvGetMat( arr, &stub )); CV_CALL( image = cvGetMat( arr, &stub ));
#ifdef HAVE_OPENGL #ifdef HAVE_OPENGL
@ -1212,21 +1208,15 @@ cvShowImage( const char* name, const CvArr* arr )
{ {
cv::Mat src = cv::cvarrToMat(image); cv::Mat src = cv::cvarrToMat(image);
cv::Mat dst(size.cy, size.cx, CV_8UC3, dst_ptr, (size.cx * channels + 3) & -4); cv::Mat dst(size.cy, size.cx, CV_8UC3, dst_ptr, (size.cx * channels + 3) & -4);
if (src.channels() == 1)
{ cv::Mat tmp;
cv::cvtColor(src, dst, cv::COLOR_GRAY2BGR); int src_depth = src.depth();
cv::flip(dst, dst, 0); 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;
else if (src.channels() == 4) cv::convertScaleAbs(src, tmp, scale, shift);
{ cv::cvtColor(tmp, dst, cv::COLOR_BGRA2BGR, dst.channels());
cv::cvtColor(src, dst, cv::COLOR_BGRA2BGR); cv::flip(dst, dst, 0);
cv::flip(dst, dst, 0);
}
else
{
CV_Assert(src.channels() == 3);
cv::flip(src, dst, 0);
}
CV_Assert(dst.data == (uchar*)dst_ptr); CV_Assert(dst.data == (uchar*)dst_ptr);
} }