Chiebot-Mirror
/
opencv
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

some fixes from http://code.opencv.org/issues/3733

Browse Source
pull/4018/head
Vadim Pisarevsky 10 years ago
parent 4743184078
commit 71002e0e79
1 changed files with 10 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 27
      modules/imgproc/src/filter.cpp

27
modules/imgproc/src/filter.cpp
Unescape View File

@ -3455,7 +3455,7 @@ struct SymmColumnSmallFilter : public SymmColumnFilter<CastOp, VecOp>
bool symmetrical = (this->symmetryType & KERNEL_SYMMETRICAL) != 0; bool symmetrical = (this->symmetryType & KERNEL_SYMMETRICAL) != 0;
bool is_1_2_1 = ky[0] == 2 && ky[1] == 1; bool is_1_2_1 = ky[0] == 2 && ky[1] == 1;
bool is_1_m2_1 = ky[0] == -2 && ky[1] == 1; bool is_1_m2_1 = ky[0] == -2 && ky[1] == 1;
bool is_m1_0_1 = ky[1] == 1 || ky[1] == -1; bool is_m1_0_1 = ky[0] == 0 && (ky[1] == 1 || ky[1] == -1);
ST f0 = ky[0], f1 = ky[1]; ST f0 = ky[0], f1 = ky[1];
ST _delta = this->delta; ST _delta = this->delta;
CastOp castOp = this->castOp0; CastOp castOp = this->castOp0;
@ -3486,13 +3486,12 @@ struct SymmColumnSmallFilter : public SymmColumnFilter<CastOp, VecOp>
D[i+2] = castOp(s0); D[i+2] = castOp(s0);
D[i+3] = castOp(s1); D[i+3] = castOp(s1);
} }
#else #endif
for( ; i < width; i ++ ) for( ; i < width; i ++ )
{ {
ST s0 = S0[i] + S1[i]*2 + S2[i] + _delta; ST s0 = S0[i] + S1[i]*2 + S2[i] + _delta;
D[i] = castOp(s0); D[i] = castOp(s0);
} }
#endif
} }
else if( is_1_m2_1 ) else if( is_1_m2_1 )
{ {
@ -3509,17 +3508,16 @@ struct SymmColumnSmallFilter : public SymmColumnFilter<CastOp, VecOp>
D[i+2] = castOp(s0); D[i+2] = castOp(s0);
D[i+3] = castOp(s1); D[i+3] = castOp(s1);
} }
#else #endif
for( ; i < width; i ++ ) for( ; i < width; i ++ )
{ {
ST s0 = S0[i] - S1[i]*2 + S2[i] + _delta; ST s0 = S0[i] - S1[i]*2 + S2[i] + _delta;
D[i] = castOp(s0); D[i] = castOp(s0);
} }
#endif
} }
else else
{ {
#if CV_ENABLE_UNROLLED #if CV_ENABLE_UNROLLED
for( ; i <= width - 4; i += 4 ) for( ; i <= width - 4; i += 4 )
{ {
ST s0 = (S0[i] + S2[i])*f1 + S1[i]*f0 + _delta; ST s0 = (S0[i] + S2[i])*f1 + S1[i]*f0 + _delta;
@ -3532,16 +3530,13 @@ struct SymmColumnSmallFilter : public SymmColumnFilter<CastOp, VecOp>
D[i+2] = castOp(s0); D[i+2] = castOp(s0);
D[i+3] = castOp(s1); D[i+3] = castOp(s1);
} }
#else #endif
for( ; i < width; i ++ ) for( ; i < width; i ++ )
{ {
ST s0 = (S0[i] + S2[i])*f1 + S1[i]*f0 + _delta; ST s0 = (S0[i] + S2[i])*f1 + S1[i]*f0 + _delta;
D[i] = castOp(s0); D[i] = castOp(s0);
} }
#endif
} }
for( ; i < width; i++ )
D[i] = castOp((S0[i] + S2[i])*f1 + S1[i]*f0 + _delta);
} }
else else
{ {
@ -3549,7 +3544,7 @@ struct SymmColumnSmallFilter : public SymmColumnFilter<CastOp, VecOp>
{ {
if( f1 < 0 ) if( f1 < 0 )
std::swap(S0, S2); std::swap(S0, S2);
#if CV_ENABLE_UNROLLED #if CV_ENABLE_UNROLLED
for( ; i <= width - 4; i += 4 ) for( ; i <= width - 4; i += 4 )
{ {
ST s0 = S2[i] - S0[i] + _delta; ST s0 = S2[i] - S0[i] + _delta;
@ -3562,19 +3557,18 @@ struct SymmColumnSmallFilter : public SymmColumnFilter<CastOp, VecOp>
D[i+2] = castOp(s0); D[i+2] = castOp(s0);
D[i+3] = castOp(s1); D[i+3] = castOp(s1);
} }
#else #endif
for( ; i < width; i ++ ) for( ; i < width; i ++ )
{ {
ST s0 = S2[i] - S0[i] + _delta; ST s0 = S2[i] - S0[i] + _delta;
D[i] = castOp(s0); D[i] = castOp(s0);
} }
#endif
if( f1 < 0 ) if( f1 < 0 )
std::swap(S0, S2); std::swap(S0, S2);
} }
else else
{ {
#if CV_ENABLE_UNROLLED #if CV_ENABLE_UNROLLED
for( ; i <= width - 4; i += 4 ) for( ; i <= width - 4; i += 4 )
{ {
ST s0 = (S2[i] - S0[i])*f1 + _delta; ST s0 = (S2[i] - S0[i])*f1 + _delta;
@ -3588,10 +3582,9 @@ struct SymmColumnSmallFilter : public SymmColumnFilter<CastOp, VecOp>
D[i+3] = castOp(s1); D[i+3] = castOp(s1);
} }
#endif #endif
for( ; i < width; i++ )
D[i] = castOp((S2[i] - S0[i])*f1 + _delta);
} }
for( ; i < width; i++ )
D[i] = castOp((S2[i] - S0[i])*f1 + _delta);
} }
} }
} }

Write Preview
Loading…
Cancel
Save