generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge with Itseez/opencv

Browse Source
This commit is contained in:
Ozan Tonkal
2013-09-15 16:32:56 +02:00
parent c31fb8ffff eff21788a8
commit 3165b526f2
2634 changed files with 198260 additions and 141747 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/viz/src/precomp.hpp
View File

@@ -125,11 +125,14 @@
#undef __DEPRECATED_DISABLED__
#endif
#include <opencv2/ts.hpp>
#include <opencv2/core.hpp>
namespace cv
{
namespace viz
{
typedef std::map<std::string, vtkSmartPointer<vtkProp> > WidgetActorMap;
typedef std::map<String, vtkSmartPointer<vtkProp> > WidgetActorMap;
}
}
@@ -139,12 +142,11 @@ namespace cv
{
namespace viz
{
typedef std::map<std::string, Viz3d> VizMap;
typedef std::pair<std::string, Viz3d> VizPair;
typedef std::map<String, Viz3d> VizMap;
typedef std::pair<String, Viz3d> VizPair;
}
}
#include <opencv2/core.hpp>
#include <opencv2/viz.hpp>
#include <opencv2/viz/types.hpp>
#include "opencv2/viz/widget_accessor.hpp"