Merge pull request #3128 from asmorkalov:android_tegra_optimizations_build_fix

d47a2988 · Alexander Alekhin · de2a8d37 · f38ebba3 · d47a2988 · d47a2988
Commit d47a2988 authored Aug 21, 2014 by Alexander Alekhin
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 8 deletions

precomp.hpp modules/imgcodecs/src/precomp.hpp +0 -4

precomp.hpp modules/videoio/src/precomp.hpp +0 -4

No files found.
--- a/modules/imgcodecs/src/precomp.hpp
+++ b/modules/imgcodecs/src/precomp.hpp
@@ -73,10 +73,6 @@
    #undef abs
 #endif

-#ifdef HAVE_TEGRA_OPTIMIZATION
-#include "opencv2/imgcodecs/imgcodecs_tegra.hpp"
-#endif
-
 #define __BEGIN__ __CV_BEGIN__
 #define __END__  __CV_END__
 #define EXIT __CV_EXIT__

--- a/modules/videoio/src/precomp.hpp
+++ b/modules/videoio/src/precomp.hpp
@@ -76,10 +76,6 @@
    #undef abs
 #endif

-#ifdef HAVE_TEGRA_OPTIMIZATION
-#include "opencv2/videoio/videoio_tegra.hpp"
-#endif
-
 #define __BEGIN__ __CV_BEGIN__
 #define __END__  __CV_END__
 #define EXIT __CV_EXIT__