generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

move tegra namespace out of cv to prevent conflicts

Browse Source
This commit is contained in:
Vladislav Vinogradov
2015-02-27 12:52:11 +03:00
parent d696fac8b8
commit cda6fed41f
22 changed files with 48 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
modules/core/src/system.cpp
View File

@@ -1257,13 +1257,15 @@ void setUseIPP(bool flag)
} // namespace ipp
} // namespace cv
#ifdef HAVE_TEGRA_OPTIMIZATION
namespace tegra {
bool useTegra()
{
CoreTLSData* data = getCoreTlsData().get();
cv::CoreTLSData* data = cv::getCoreTlsData().get();
if (data->useTegra < 0)
{
@@ -1279,7 +1281,7 @@ bool useTegra()
void setUseTegra(bool flag)
{
CoreTLSData* data = getCoreTlsData().get();
cv::CoreTLSData* data = cv::getCoreTlsData().get();
data->useTegra = flag;
}
@@ -1287,12 +1289,14 @@ void setUseTegra(bool flag)
#endif
namespace cv {
void setOptimizations(bool enabled)
{
cv::ipp::setUseIPP(enabled);
cv::ocl::setUseOpenCL(enabled);
ipp::setUseIPP(enabled);
ocl::setUseOpenCL(enabled);
#ifdef HAVE_TEGRA_OPTIMIZATION
cv::tegra::setUseTegra(enabled);
::tegra::setUseTegra(enabled);
#endif
}