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

debug

Browse Source
This commit is contained in:
Ilya Lavrenov 2012-09-24 11:35:46 +04:00
parent 427ce1247a
commit bb589a590e
1 changed files with 38 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
modules/imgproc/src/imgwarp.cpp
View File

@ -47,6 +47,8 @@
// */ // */
#include "precomp.hpp" #include "precomp.hpp"
#include <iostream>
#include <vector>
namespace cv namespace cv
{ {
@ -1414,6 +1416,8 @@ public:
, cur_dy_ofs(_cur_dy_ofs), bands(_bands) , cur_dy_ofs(_cur_dy_ofs), bands(_bands)
#endif #endif
{ {
if (src.size() == Size(16, 16) && dst.size() == Size(5, 5))
std::cout << "scale_y = " << scale_y_ << std::endl << std::endl;
} }
#ifdef HAVE_TBB #ifdef HAVE_TBB
@ -1437,7 +1441,7 @@ public:
#ifdef HAVE_TBB #ifdef HAVE_TBB
cur_dy = cur_dy_ofs[range.start]; cur_dy = cur_dy_ofs[range.start];
#endif #endif
for( sy = range.start; sy < range.end; sy++ ) for (sy = range.start; sy < range.end; sy++)
{ {
const T* S = (const T*)(src.data + src.step*sy); const T* S = (const T*)(src.data + src.step*sy);
if( cn == 1 ) if( cn == 1 )
@ -1484,6 +1488,9 @@ public:
if( (cur_dy + 1)*scale_y <= sy + 1 || sy == ssize.height - 1 ) if( (cur_dy + 1)*scale_y <= sy + 1 || sy == ssize.height - 1 )
{ {
if (dsize == Size(5, 5) && ssize == Size(16, 16))
std::cout << "Band: (" << range.start << ", " << range.end << ")" << std::endl;
WT beta = std::max(sy + 1 - (cur_dy+1)*scale_y, (WT)0); WT beta = std::max(sy + 1 - (cur_dy+1)*scale_y, (WT)0);
WT beta1 = 1 - beta; WT beta1 = 1 - beta;
T* D = (T*)(dst.data + dst.step*cur_dy); T* D = (T*)(dst.data + dst.step*cur_dy);
@ -1493,14 +1500,31 @@ public:
return; return;
for( dx = 0; dx < dsize.width; dx++ ) for( dx = 0; dx < dsize.width; dx++ )
{ {
D[dx] = saturate_cast<T>((sum[dx] + buf[dx]) / min(scale_y, src.rows - cur_dy * scale_y)); D[dx] = saturate_cast<T>((sum[dx] + buf[dx]) / min(scale_y, src.rows - cur_dy * scale_y)); //
if (dsize == Size(5, 5) && ssize == Size(16, 16))
{
std::cout << "sum[" << dx << "] = " << sum[dx] << std::endl;
std::cout << "buf[" << dx << "] = " << buf[dx] << std::endl;
std::cout << "min(scale_y, src.rows - cur_dy * scale_y) = " << min(scale_y, src.rows - cur_dy * scale_y) << std::endl;
std::cout << "D[" << dx << "] = " << D[dx] << std::endl;
std::cout << std::endl;
}
sum[dx] = buf[dx] = 0; sum[dx] = buf[dx] = 0;
} }
} }
else else
for( dx = 0; dx < dsize.width; dx++ ) for( dx = 0; dx < dsize.width; dx++ )
{ {
D[dx] = saturate_cast<T>((sum[dx] + buf[dx]* beta1)/ min(scale_y, src.rows - cur_dy*scale_y)); D[dx] = saturate_cast<T>((sum[dx] + buf[dx]* beta1)/ min(scale_y, src.rows - cur_dy*scale_y)); //
if (dsize == Size(5, 5) && ssize == Size(16, 16))
{
std::cout << "sum[" << dx << "] = " << sum[dx] << std::endl;
std::cout << "buf[" << dx << "] = " << buf[dx] << std::endl;
std::cout << "beta1 = " << beta1 << std::endl;
std::cout << "min(scale_y, src.rows - cur_dy * scale_y) = " << min(scale_y, src.rows - cur_dy * scale_y) << std::endl;
std::cout << "D[" << dx << "] = " << D[dx] << std::endl;
std::cout << std::endl;
}
sum[dx] = buf[dx]*beta; sum[dx] = buf[dx]*beta;
buf[dx] = 0; buf[dx] = 0;
} }
@ -1579,11 +1603,20 @@ static void resizeArea_( const Mat& src, Mat& dst, const DecimateAlpha* xofs, in
cur_dy++; cur_dy++;
} }
} }
bands.push_back(std::make_pair(index, ssize.height)); // bands.push_back(std::make_pair(index, ssize.height));
#endif #endif
#ifdef HAVE_TBB #ifdef HAVE_TBB
Range range(0, bands.size()); Range range(0, bands.size());
if (dsize == Size(5, 5) && ssize == Size(16, 16))
{
std::cout << "Bands" << std::endl;
for (std::vector<std::pair<int, int> >::const_iterator i = bands.begin(), end = bands.end(); i != end; ++i)
std::cout << i->first << " " << i->second << std::endl;
std::cout << std::endl;
}
resizeArea_Invoker<T, WT> invoker(src, dst, xofs, xofs_count, scale_y_, cur_dy_ofs, bands); resizeArea_Invoker<T, WT> invoker(src, dst, xofs, xofs_count, scale_y_, cur_dy_ofs, bands);
#else #else
Range range(0, src.rows); Range range(0, src.rows);