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

fixed a few warnings on Windows; fixed critical bugs in cvMixChannels and AutoBuffer<>.

Browse Source
This commit is contained in:
Vadim Pisarevsky
2011-05-17 15:44:01 +00:00
parent 306a11a7c5
commit 62569f6926
5 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/core/src/convert.cpp
View File

@@ -1130,11 +1130,19 @@ cvMixChannels( const CvArr** src, int src_count,
CvArr** dst, int dst_count,
const int* from_to, int pair_count )
{
cv::AutoBuffer<cv::Mat, 32> buf;
cv::AutoBuffer<cv::Mat, 32> buf(src_count + dst_count);
int i;
for( i = 0; i < src_count; i++ )
{
printf("%d. %p ", i, src[i]);
if( src[i] )
{
CvMat m, *pm = cvGetMat(src[i], &m);
printf( "%d x %d, type = %d\n", pm->rows, pm->cols, CV_MAT_TYPE(pm->type));
}
buf[i] = cv::cvarrToMat(src[i]);
}
for( i = 0; i < dst_count; i++ )
buf[i+src_count] = cv::cvarrToMat(dst[i]);
cv::mixChannels(&buf[0], src_count, &buf[src_count], dst_count, from_to, pair_count);