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

fix for gcc

Browse Source
This commit is contained in:
Adil Ibragimov 2014-08-13 16:34:18 +04:00
parent 8a4a1bb018
commit 9ac06a9333
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/imgproc/src/filter.cpp
View File

@ -2299,7 +2299,7 @@ template<typename ST, typename DT, class VecOp> struct SymmRowSmallFilter :
void operator()(const uchar* src, uchar* dst, int width, int cn) void operator()(const uchar* src, uchar* dst, int width, int cn)
{ {
int ksize2 = this->ksize/2, ksize2n = ksize2*cn; int ksize2 = this->ksize/2, ksize2n = ksize2*cn;
const DT* kx = this->kernel.ptr<DT>() + ksize2; const DT* kx = this->kernel.template ptr<DT>() + ksize2;
bool symmetrical = (this->symmetryType & KERNEL_SYMMETRICAL) != 0; bool symmetrical = (this->symmetryType & KERNEL_SYMMETRICAL) != 0;
DT* D = (DT*)dst; DT* D = (DT*)dst;
int i = this->vecOp(src, dst, width, cn), j, k; int i = this->vecOp(src, dst, width, cn), j, k;
@ -2437,7 +2437,7 @@ template<class CastOp, class VecOp> struct ColumnFilter : public BaseColumnFilte
void operator()(const uchar** src, uchar* dst, int dststep, int count, int width) void operator()(const uchar** src, uchar* dst, int dststep, int count, int width)
{ {
const ST* ky = kernel.ptr<ST>(); const ST* ky = kernel.template ptr<ST>();
ST _delta = delta; ST _delta = delta;
int _ksize = ksize; int _ksize = ksize;
int i, k; int i, k;
@ -2501,7 +2501,7 @@ template<class CastOp, class VecOp> struct SymmColumnFilter : public ColumnFilte
void operator()(const uchar** src, uchar* dst, int dststep, int count, int width) void operator()(const uchar** src, uchar* dst, int dststep, int count, int width)
{ {
int ksize2 = this->ksize/2; int ksize2 = this->ksize/2;
const ST* ky = this->kernel.ptr<ST>() + ksize2; const ST* ky = this->kernel.template ptr<ST>() + ksize2;
int i, k; int i, k;
bool symmetrical = (symmetryType & KERNEL_SYMMETRICAL) != 0; bool symmetrical = (symmetryType & KERNEL_SYMMETRICAL) != 0;
ST _delta = this->delta; ST _delta = this->delta;
@ -2607,7 +2607,7 @@ struct SymmColumnSmallFilter : public SymmColumnFilter<CastOp, VecOp>
void operator()(const uchar** src, uchar* dst, int dststep, int count, int width) void operator()(const uchar** src, uchar* dst, int dststep, int count, int width)
{ {
int ksize2 = this->ksize/2; int ksize2 = this->ksize/2;
const ST* ky = this->kernel.ptr<ST>() + ksize2; const ST* ky = this->kernel.template ptr<ST>() + ksize2;
int i; int i;
bool symmetrical = (this->symmetryType & KERNEL_SYMMETRICAL) != 0; bool symmetrical = (this->symmetryType & KERNEL_SYMMETRICAL) != 0;
bool is_1_2_1 = ky[0] == 1 && ky[1] == 2; bool is_1_2_1 = ky[0] == 1 && ky[1] == 2;

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

@ -1265,7 +1265,7 @@ public:
} }
if( k1 == ksize ) if( k1 == ksize )
k0 = std::min(k0, k); // remember the first row that needs to be computed k0 = std::min(k0, k); // remember the first row that needs to be computed
srows[k] = src.ptr<T>(sy); srows[k] = src.template ptr<T>(sy);
prev_sy[k] = sy; prev_sy[k] = sy;
} }
@ -1608,10 +1608,10 @@ public:
continue; continue;
} }
dx = vop(src.ptr<T>(sy0), D, w); dx = vop(src.template ptr<T>(sy0), D, w);
for( ; dx < w; dx++ ) for( ; dx < w; dx++ )
{ {
const T* S = src.ptr<T>(sy0) + xofs[dx]; const T* S = src.template ptr<T>(sy0) + xofs[dx];
WT sum = 0; WT sum = 0;
k = 0; k = 0;
#if CV_ENABLE_UNROLLED #if CV_ENABLE_UNROLLED
@ -1635,7 +1635,7 @@ public:
{ {
if( sy0 + sy >= ssize.height ) if( sy0 + sy >= ssize.height )
break; break;
const T* S = src.ptr<T>(sy0 + sy) + sx0; const T* S = src.template ptr<T>(sy0 + sy) + sx0;
for( int sx = 0; sx < scale_x*cn; sx += cn ) for( int sx = 0; sx < scale_x*cn; sx += cn )
{ {
if( sx0 + sx >= ssize.width ) if( sx0 + sx >= ssize.width )
@ -1713,7 +1713,7 @@ public:
int sy = ytab[j].si; int sy = ytab[j].si;
{ {
const T* S = src->ptr<T>(sy); const T* S = src->template ptr<T>(sy);
for( dx = 0; dx < dsize.width; dx++ ) for( dx = 0; dx < dsize.width; dx++ )
buf[dx] = (WT)0; buf[dx] = (WT)0;
@ -1775,7 +1775,7 @@ public:
if( dy != prev_dy ) if( dy != prev_dy )
{ {
T* D = dst->ptr<T>(prev_dy); T* D = dst->template ptr<T>(prev_dy);
for( dx = 0; dx < dsize.width; dx++ ) for( dx = 0; dx < dsize.width; dx++ )
{ {
@ -1792,7 +1792,7 @@ public:
} }
{ {
T* D = dst->ptr<T>(prev_dy); T* D = dst->template ptr<T>(prev_dy);
for( dx = 0; dx < dsize.width; dx++ ) for( dx = 0; dx < dsize.width; dx++ )
D[dx] = saturate_cast<T>(sum[dx]); D[dx] = saturate_cast<T>(sum[dx]);
} }