Merged the trunk r8589:8653 - all changes related to build warnings

2012-06-15 13:04:17 +00:00
parent 73c152abc4
commit bd0e0b5800
438 changed files with 20374 additions and 19674 deletions
--- a/apps/traincascade/lbpfeatures.cpp
+++ b/apps/traincascade/lbpfeatures.cpp
@@ -1,3 +1,6 @@
+#include "opencv2/core/core.hpp"
+#include "opencv2/core/internal.hpp"
+
 #include "lbpfeatures.h"
 #include "cascadeclassifier.h"