1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 08:13:04 +04:00

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

This commit is contained in:
Andrey Kamaev
2013-03-21 14:47:48 +04:00
committed by OpenCV Buildbot
90 changed files with 709 additions and 621 deletions
+2
View File
@@ -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>
+1 -1
View File
@@ -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) || \