minor changes, opencv cross-branch code

This commit is contained in:
Anatoly Baksheev
2013-11-30 17:57:53 +04:00
parent 15fd3faa40
commit 2d63f60d43
4 changed files with 19 additions and 43 deletions

View File

@@ -64,6 +64,7 @@ namespace cv
class CV_EXPORTS Viz3d
{
public:
typedef cv::viz::Color Color;
typedef void (*KeyboardCallback)(const KeyboardEvent&, void*);
typedef void (*MouseCallback)(const MouseEvent&, void*);

View File

@@ -219,7 +219,7 @@ namespace cv
class CV_EXPORTS WText : public Widget2D
{
public:
WText(const String &text, const Point2i &pos, int font_size = 10, const Color &color = Color::white());
WText(const String &text, const Point2i &pos, int font_size = 20, const Color &color = Color::white());
void setText(const String &text);
String getText() const;