Merge branch 2.4

2012-11-30 19:52:59 +04:00
parent 50bebd6f0b f6ca38a579
commit e10ee89ec4
194 changed files with 1359 additions and 147098 deletions
--- a/modules/objdetect/src/cascadedetect.cpp
+++ b/modules/objdetect/src/cascadedetect.cpp
@@ -46,7 +46,7 @@

 #include <string>

-
+#if defined (LOG_CASCADE_STATISTIC)
 struct Logger
 {
    enum { STADIES_NUM = 20 };
@@ -109,7 +109,7 @@ struct Logger
    }

 } logger;
-
+#endif

 namespace cv
 {