Merge branch 2.4

2012-12-24 17:10:07 +04:00
parent 2128bd25e4 014a500f79
commit 13b6a3a15e
20 changed files with 67 additions and 40 deletions
--- a/samples/c/facedetect.cpp
+++ b/samples/c/facedetect.cpp
@@ -2,6 +2,7 @@
 #include "opencv2/highgui/highgui.hpp"
 #include "opencv2/imgproc/imgproc.hpp"

+#include <cctype>
 #include <iostream>
 #include <iterator>
 #include <stdio.h>