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/superres/src/precomp.hpp
+++ b/modules/superres/src/precomp.hpp
@@ -46,9 +46,7 @@
 #include <vector>
 #include <limits>

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

 #include "opencv2/opencv_modules.hpp"
 #include "opencv2/core/core.hpp"