next: OPENCV_ABI_COMPATIBILITY
drop change:
template<typename _Tp2> operator Vec<_Tp2, 3>() const;
because it break builds due ambiguous errors
This commit is contained in:
@@ -2023,18 +2023,10 @@ static IPPInitSingleton& getIPPSingleton()
|
||||
}
|
||||
#endif
|
||||
|
||||
#if OPENCV_ABI_COMPATIBILITY > 300
|
||||
unsigned long long getIppFeatures()
|
||||
#else
|
||||
int getIppFeatures()
|
||||
#endif
|
||||
{
|
||||
#ifdef HAVE_IPP
|
||||
#if OPENCV_ABI_COMPATIBILITY > 300
|
||||
return getIPPSingleton().ippFeatures;
|
||||
#else
|
||||
return (int)getIPPSingleton().ippFeatures;
|
||||
#endif
|
||||
#else
|
||||
return 0;
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user