Merge pull request #665 from taka-no-me:core_utility

2013-03-21 14:47:48 +04:00
parent 0990b42ebc 89356ff16d
commit 2d764fe1c6
90 changed files with 709 additions and 621 deletions
--- a/modules/highgui/src/precomp.hpp
+++ b/modules/highgui/src/precomp.hpp
@@ -47,6 +47,8 @@
 #include "opencv2/highgui.hpp"
 #include "opencv2/highgui/highgui_c.h"
 #include "opencv2/imgproc/imgproc_c.h"
+
+#include "opencv2/core/utility.hpp"
 #include "opencv2/core/internal.hpp"

 #include <stdlib.h>
--- a/modules/highgui/test/test_precomp.hpp
+++ b/modules/highgui/test/test_precomp.hpp
@@ -13,10 +13,10 @@
 # include "cvconfig.h"
 #endif

+#include <iostream>
 #include "opencv2/ts.hpp"
 #include "opencv2/imgproc.hpp"
 #include "opencv2/imgproc/imgproc_c.h"
-#include <iostream>

 #if defined(HAVE_VIDEOINPUT)   || \
    defined(HAVE_TYZX)         || \