Merge pull request #2588 from vpisarev:fix_samples_n_unused

2014-04-10 13:30:20 +04:00
parent 7b366df822 1b339eb0d4
commit b5755b1228
6 changed files with 3 additions and 35 deletions
--- a/modules/core/src/arithm.cpp
+++ b/modules/core/src/arithm.cpp
@@ -448,11 +448,13 @@ template<typename T> struct OpNot
    T operator()( T a, T ) const { return ~a; }
 };

+#if (ARITHM_USE_IPP == 1)
 static inline void fixSteps(Size sz, size_t elemSize, size_t& step1, size_t& step2, size_t& step)
 {
    if( sz.height == 1 )
        step1 = step2 = step = sz.width*elemSize;
 }
+#endif

 static void add8u( const uchar* src1, size_t step1,
                   const uchar* src2, size_t step2,