Merge pull request #1110 from SpecLad:config-cleanup

2013-07-30 17:39:35 +04:00
parent c43b896541 0b4d0a8171
commit f7ce70f70a
40 changed files with 233 additions and 426 deletions
--- a/modules/gpu/perf4au/main.cpp
+++ b/modules/gpu/perf4au/main.cpp
@@ -42,9 +42,7 @@

 #include <cstdio>

-#ifdef HAVE_CVCONFIG_H
 #include "cvconfig.h"
-#endif

 #include "opencv2/ts/ts.hpp"
 #include "opencv2/ts/gpu_perf.hpp"