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:
Alexander Alekhin
2018-03-22 14:38:53 +03:00
parent 964a4d75b4
commit 2d54fed3cc
5 changed files with 1 additions and 32 deletions
-8
View File
@@ -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