Commit 2057f2c4 authored by Vladimir Dudnik's avatar Vladimir Dudnik

fixed build issues related to changes in IPP calls.

parent 8e776837
This diff is collapsed.
This diff is collapsed.
...@@ -87,7 +87,7 @@ extern const uchar g_Saturate8u[]; ...@@ -87,7 +87,7 @@ extern const uchar g_Saturate8u[];
void deleteThreadAllocData(); void deleteThreadAllocData();
void deleteThreadRNGData(); void deleteThreadRNGData();
#endif #endif
template<typename T1, typename T2=T1, typename T3=T1> struct OpAdd template<typename T1, typename T2=T1, typename T3=T1> struct OpAdd
{ {
typedef T1 type1; typedef T1 type1;
...@@ -176,24 +176,24 @@ typedef void (*BinaryFunc)(const uchar* src1, size_t step1, ...@@ -176,24 +176,24 @@ typedef void (*BinaryFunc)(const uchar* src1, size_t step1,
void*); void*);
BinaryFunc getConvertFunc(int sdepth, int ddepth); BinaryFunc getConvertFunc(int sdepth, int ddepth);
BinaryFunc getConvertScaleFunc(int sdepth, int ddepth); BinaryFunc getConvertScaleFunc(int sdepth, int ddepth);
BinaryFunc getCopyMaskFunc(size_t esz); BinaryFunc getCopyMaskFunc(size_t esz);
enum { BLOCK_SIZE = 1024 }; enum { BLOCK_SIZE = 1024 };
#ifdef HAVE_IPP #ifdef HAVE_IPP
static inline IppiSize ippiSize(int width, int height) { IppiSize sz={width, height}; return sz; } static inline IppiSize ippiSize(int width, int height) { IppiSize sz = { width, height}; return sz; }
static inline IppiSize ippiSize(Size _sz) { reIppiSize sz={_sz.width, _sz.height}; return sz; } static inline IppiSize ippiSize(Size _sz) { IppiSize sz = { _sz.width, _sz.height}; return sz; }
#endif #endif
#if defined HAVE_IPP && (IPP_VERSION_MAJOR >= 7) #if defined HAVE_IPP && (IPP_VERSION_MAJOR >= 7)
#define ARITHM_USE_IPP 1 #define ARITHM_USE_IPP 1
#define IF_IPP(then_call, else_call) then_call #define IF_IPP(then_call, else_call) then_call
#else #else
#define ARITHM_USE_IPP 0 #define ARITHM_USE_IPP 0
#define IF_IPP(then_call, else_call) else_call #define IF_IPP(then_call, else_call) else_call
#endif #endif
} }
#endif /*_CXCORE_INTERNAL_H_*/ #endif /*_CXCORE_INTERNAL_H_*/
...@@ -170,9 +170,10 @@ struct IPPInitializer ...@@ -170,9 +170,10 @@ struct IPPInitializer
IPPInitializer ippInitializer; IPPInitializer ippInitializer;
#else #else
volatile bool useOptimizedFlag = false; volatile bool useOptimizedFlag = false;
volatile bool USE_SSE2 = false;
#endif #endif
volatile bool USE_SSE2 = false;
void setUseOptimized( bool flag ) void setUseOptimized( bool flag )
{ {
useOptimizedFlag = flag; useOptimizedFlag = flag;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment