generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed Mat::Mat(const IplImage*, bool) constructor (ticket #487). fixed the bayer demosaicing part in the new cv::cvtColor implementation

Browse Source
This commit is contained in:
Vadim Pisarevsky 2010-07-27 17:41:32 +00:00
parent c77e8fc638
commit 4c591ca397
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/src/matrix.cpp
View File

@ -82,7 +82,7 @@ Mat::Mat(const IplImage* img, bool copyData)
if( copyData ) if( copyData )
{ {
Mat m = *this; Mat m = *this;
rows = cols = 0; release();
if( !img->roi || !img->roi->coi || if( !img->roi || !img->roi->coi ||
img->dataOrder == IPL_DATA_ORDER_PLANE) img->dataOrder == IPL_DATA_ORDER_PLANE)
m.copyTo(*this); m.copyTo(*this);

1
modules/imgproc/src/color.cpp
View File

@ -2619,6 +2619,7 @@ void cvtColor( const Mat& src, Mat& dst, int code, int dcn )
case CV_BayerBG2BGR: case CV_BayerGB2BGR: case CV_BayerRG2BGR: case CV_BayerGR2BGR: case CV_BayerBG2BGR: case CV_BayerGB2BGR: case CV_BayerRG2BGR: case CV_BayerGR2BGR:
case CV_BayerBG2BGR_VNG: case CV_BayerGB2BGR_VNG: case CV_BayerRG2BGR_VNG: case CV_BayerGR2BGR_VNG: case CV_BayerBG2BGR_VNG: case CV_BayerGB2BGR_VNG: case CV_BayerRG2BGR_VNG: case CV_BayerGR2BGR_VNG:
if(dcn <= 0) dcn = 3;
CV_Assert( scn == 1 && dcn == 3 && depth == CV_8U ); CV_Assert( scn == 1 && dcn == 3 && depth == CV_8U );
dst.create(sz, CV_8UC3); dst.create(sz, CV_8UC3);