Merge pull request #747 from taka-no-me:split_c_cpp

This commit is contained in:
Andrey Kamaev
2013-04-04 00:55:21 +04:00
committed by OpenCV Buildbot
232 changed files with 14517 additions and 12876 deletions

View File

@@ -47,10 +47,6 @@
#pragma warning( disable: 4251 4710 4711 4514 4996 )
#endif
#ifdef HAVE_CVCONFIG_H
#include "cvconfig.h"
#endif
#include <cstring>
#include <iostream>
#include <limits>
@@ -71,9 +67,10 @@
#include "opencv2/imgproc.hpp"
#include "opencv2/imgproc/imgproc_c.h"
#include "opencv2/calib3d.hpp"
#include "opencv2/core/internal.hpp"
#include "opencv2/video.hpp"
#include "opencv2/core/private.hpp"
#if defined WIN32 || defined WINCE
#include <windows.h>
#undef small