From eb1dd1900bfcd0614f9d6c0fbc11087f8e3604b5 Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Fri, 16 May 2014 12:18:35 +0400 Subject: [PATCH] fixed conditions --- modules/core/src/matrix.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/core/src/matrix.cpp b/modules/core/src/matrix.cpp index 3eea9031e1..3824699814 100644 --- a/modules/core/src/matrix.cpp +++ b/modules/core/src/matrix.cpp @@ -3643,9 +3643,9 @@ static IppFlipFunc getFlipFunc(int depth) CV_SUPPRESS_DEPRECATED_START return depth == CV_8U || depth == CV_8S ? (IppFlipFunc)ippsFlip_8u_I : - /*depth == CV_16U || depth == CV_16S ? (IppFlipFunc)ippsFlip_16u_I : + depth == CV_16U || depth == CV_16S ? (IppFlipFunc)ippsFlip_16u_I : depth == CV_32S || depth == CV_32F ? (IppFlipFunc)ippsFlip_32f_I : - depth == CV_64F ? (IppFlipFunc)ippsFlip_64f_I : */0; + depth == CV_64F ? (IppFlipFunc)ippsFlip_64f_I : 0; CV_SUPPRESS_DEPRECATED_END } @@ -3700,7 +3700,7 @@ template static void sort_( const Mat& src, Mat& dst, int flags ) #endif { #ifdef USE_IPP_SORT - if (depth != CV_8U) + if (depth == CV_8U) setIppErrorStatus(); #endif std::sort( ptr, ptr + len );