Refactored Tegra related macro usage

modules/imgproc/src/morph.cpp

@@ -585,11 +585,11 @@ struct MorphNoVec
 };
 
 #ifdef HAVE_TEGRA_OPTIMIZATION
-typedef tegra::MorphRowIVec<tegra::VMin8u> ErodeRowVec8u;
-typedef tegra::MorphRowIVec<tegra::VMax8u> DilateRowVec8u;
+using tegra::ErodeRowVec8u;
+using tegra::DilateRowVec8u;
 
-typedef tegra::MorphColumnIVec<tegra::VMin8u> ErodeColumnVec8u;
-typedef tegra::MorphColumnIVec<tegra::VMax8u> DilateColumnVec8u;
+using tegra::ErodeColumnVec8u;
+using tegra::DilateColumnVec8u;
 #else
 typedef MorphRowNoVec ErodeRowVec8u;
 typedef MorphRowNoVec DilateRowVec8u;

modules/imgproc/src/sumpixels.cpp

@@ -211,19 +211,7 @@ void integral_##suffix( T* src, size_t srcstep, ST* sum, size_t sumstep, QT* sqs
                         ST* tilted, size_t tiltedstep, Size size, int cn ) \
 { integral_(src, srcstep, sum, sumstep, sqsum, sqsumstep, tilted, tiltedstep, size, cn); }
 
-#ifdef HAVE_TEGRA_OPTIMIZATION
-DEF_INTEGRAL_FUNC(8u32sOCV, uchar, int, double)
-
-void integral_8u32s(uchar* src, size_t srcstep, int* sum, size_t sumstep, double* sqsum, size_t sqsumstep,
-                        int* tilted, size_t tiltedstep, Size size, int cn )
-{
-    if (tegra::integral_8u32s(src, srcstep, sum, sumstep, sqsum, sqsumstep, tilted, tiltedstep, size, cn))
-        return;
-    integral_8u32sOCV(src, srcstep, sum, sumstep, sqsum, sqsumstep, tilted, tiltedstep, size, cn);
-}
-#else
 DEF_INTEGRAL_FUNC(8u32s, uchar, int, double)
-#endif
 DEF_INTEGRAL_FUNC(8u32f, uchar, float, double)
 DEF_INTEGRAL_FUNC(8u64f, uchar, double, double)
 DEF_INTEGRAL_FUNC(32f, float, float, double)
@@ -264,7 +252,7 @@ void cv::integral( InputArray _src, OutputArray _sum, OutputArray _sqsum, Output
     IntegralFunc func = 0;
 
     if( depth == CV_8U && sdepth == CV_32S )
-        func = (IntegralFunc)integral_8u32s;
+        func = (IntegralFunc)GET_OPTIMIZED(integral_8u32s);
     else if( depth == CV_8U && sdepth == CV_32F )
         func = (IntegralFunc)integral_8u32f;
     else if( depth == CV_8U && sdepth == CV_64F )