diff --git a/modules/core/src/matrix.cpp b/modules/core/src/matrix.cpp index 6b233c453..8188c1bd6 100644 --- a/modules/core/src/matrix.cpp +++ b/modules/core/src/matrix.cpp @@ -1976,13 +1976,8 @@ void cv::reduce(InputArray _src, OutputArray _dst, int dim, int op, int dtype) { if( op == CV_REDUCE_SUM ) { - if(sdepth == CV_8U && ddepth == CV_32S) { -#ifdef HAVE_TEGRA_OPTIMIZATION - func = tegra::getTegraOptimized_reduceR8uAdd(tegra::reduceR8uAdd); -#else + if(sdepth == CV_8U && ddepth == CV_32S) func = reduceR_ >; -#endif - } else if(sdepth == CV_8U && ddepth == CV_32F) func = reduceR_ >; else if(sdepth == CV_8U && ddepth == CV_64F) @@ -1993,63 +1988,38 @@ void cv::reduce(InputArray _src, OutputArray _dst, int dim, int op, int dtype) func = reduceR_ >; else if(sdepth == CV_16S && ddepth == CV_32F) func = reduceR_ >; - else if(sdepth == CV_16S && ddepth == CV_64F) - func = reduceR_ >; - else if(sdepth == CV_32F && ddepth == CV_32F) { -#ifdef HAVE_TEGRA_OPTIMIZATION - func = tegra::getTegraOptimized_reduceR32fAdd(tegra::reduceR32fAdd); -#else + else if(sdepth == CV_16S && ddepth == CV_64F) + func = reduceR_ >; + else if(sdepth == CV_32F && ddepth == CV_32F) func = reduceR_ >; -#endif - } - else if(sdepth == CV_32F && ddepth == CV_64F) + else if(sdepth == CV_32F && ddepth == CV_64F) func = reduceR_ >; else if(sdepth == CV_64F && ddepth == CV_64F) func = reduceR_ >; } else if(op == CV_REDUCE_MAX) { - if(sdepth == CV_8U && ddepth == CV_8U) { -#ifdef HAVE_TEGRA_OPTIMIZATION - func = tegra::getTegraOptimized_reduceR8uMax(tegra::reduceR8uMax); -#else + if(sdepth == CV_8U && ddepth == CV_8U) func = reduceR_ >; -#endif - } else if(sdepth == CV_16U && ddepth == CV_16U) func = reduceR_ >; else if(sdepth == CV_16S && ddepth == CV_16S) func = reduceR_ >; - else if(sdepth == CV_32F && ddepth == CV_32F) { -#ifdef HAVE_TEGRA_OPTIMIZATION - func = tegra::getTegraOptimized_reduceR32fMax(tegra::reduceR32fMax); -#else + else if(sdepth == CV_32F && ddepth == CV_32F) func = reduceR_ >; -#endif - } else if(sdepth == CV_64F && ddepth == CV_64F) func = reduceR_ >; } else if(op == CV_REDUCE_MIN) { - if(sdepth == CV_8U && ddepth == CV_8U) { -#ifdef HAVE_TEGRA_OPTIMIZATION - func = tegra::getTegraOptimized_reduceR8uMin(tegra::reduceR8uMin); -#else + if(sdepth == CV_8U && ddepth == CV_8U) func = reduceR_ >; -#endif - } else if(sdepth == CV_16U && ddepth == CV_16U) func = reduceR_ >; else if(sdepth == CV_16S && ddepth == CV_16S) func = reduceR_ >; - else if(sdepth == CV_32F && ddepth == CV_32F) { -#ifdef HAVE_TEGRA_OPTIMIZATION - func = tegra::getTegraOptimized_reduceR32fMin(tegra::reduceR32fMin); -#else + else if(sdepth == CV_32F && ddepth == CV_32F) func = reduceR_ >; -#endif - } else if(sdepth == CV_64F && ddepth == CV_64F) func = reduceR_ >; } @@ -2058,7 +2028,7 @@ void cv::reduce(InputArray _src, OutputArray _dst, int dim, int op, int dtype) { if(op == CV_REDUCE_SUM) { - if(sdepth == CV_8U && ddepth == CV_32S) + if(sdepth == CV_8U && ddepth == CV_32S) func = reduceC_ >; else if(sdepth == CV_8U && ddepth == CV_32F) func = reduceC_ >; @@ -2072,7 +2042,7 @@ void cv::reduce(InputArray _src, OutputArray _dst, int dim, int op, int dtype) func = reduceC_ >; else if(sdepth == CV_16S && ddepth == CV_64F) func = reduceC_ >; - else if(sdepth == CV_32F && ddepth == CV_32F) + else if(sdepth == CV_32F && ddepth == CV_32F) func = reduceC_ >; else if(sdepth == CV_32F && ddepth == CV_64F) func = reduceC_ >; @@ -2081,26 +2051,26 @@ void cv::reduce(InputArray _src, OutputArray _dst, int dim, int op, int dtype) } else if(op == CV_REDUCE_MAX) { - if(sdepth == CV_8U && ddepth == CV_8U) + if(sdepth == CV_8U && ddepth == CV_8U) func = reduceC_ >; else if(sdepth == CV_16U && ddepth == CV_16U) func = reduceC_ >; else if(sdepth == CV_16S && ddepth == CV_16S) func = reduceC_ >; - else if(sdepth == CV_32F && ddepth == CV_32F) + else if(sdepth == CV_32F && ddepth == CV_32F) func = reduceC_ >; else if(sdepth == CV_64F && ddepth == CV_64F) func = reduceC_ >; } else if(op == CV_REDUCE_MIN) { - if(sdepth == CV_8U && ddepth == CV_8U) + if(sdepth == CV_8U && ddepth == CV_8U) func = reduceC_ >; else if(sdepth == CV_16U && ddepth == CV_16U) func = reduceC_ >; else if(sdepth == CV_16S && ddepth == CV_16S) func = reduceC_ >; - else if(sdepth == CV_32F && ddepth == CV_32F) + else if(sdepth == CV_32F && ddepth == CV_32F) func = reduceC_ >; else if(sdepth == CV_64F && ddepth == CV_64F) func = reduceC_ >;