diff --git a/modules/viz/include/opencv2/viz/widget_accessor.hpp b/modules/viz/include/opencv2/viz/widget_accessor.hpp index ddfd61b1c..a114c3a26 100644 --- a/modules/viz/include/opencv2/viz/widget_accessor.hpp +++ b/modules/viz/include/opencv2/viz/widget_accessor.hpp @@ -2,7 +2,7 @@ #include #include -#include +#include namespace temp_viz { @@ -13,6 +13,6 @@ namespace temp_viz struct CV_EXPORTS WidgetAccessor { static vtkSmartPointer getProp(const Widget &widget); - static void setProp(Widget &widget, vtkSmartPointer actor); + static void setProp(Widget &widget, vtkSmartPointer prop); }; } diff --git a/modules/viz/include/opencv2/viz/widgets.hpp b/modules/viz/include/opencv2/viz/widgets.hpp index 23eb7b71c..2114838c5 100644 --- a/modules/viz/include/opencv2/viz/widgets.hpp +++ b/modules/viz/include/opencv2/viz/widgets.hpp @@ -15,7 +15,6 @@ namespace temp_viz Widget& operator =(const Widget &other); ~Widget(); - private: class Impl; Impl *impl_; diff --git a/modules/viz/src/widget.cpp b/modules/viz/src/widget.cpp index b832d15df..450e76633 100644 --- a/modules/viz/src/widget.cpp +++ b/modules/viz/src/widget.cpp @@ -6,10 +6,10 @@ class temp_viz::Widget::Impl { public: - vtkSmartPointer actor; + vtkSmartPointer prop; int ref_counter; - Impl() : actor(0) {} + Impl() : prop(0) {} }; temp_viz::Widget::Widget() : impl_(0) @@ -59,12 +59,12 @@ void temp_viz::Widget::release() vtkSmartPointer temp_viz::WidgetAccessor::getProp(const Widget& widget) { - return widget.impl_->actor; + return widget.impl_->prop; } -void temp_viz::WidgetAccessor::setProp(Widget& widget, vtkSmartPointer actor) +void temp_viz::WidgetAccessor::setProp(Widget& widget, vtkSmartPointer prop) { - widget.impl_->actor = actor; + widget.impl_->prop = prop; } /////////////////////////////////////////////////////////////////////////////////////////////// @@ -191,4 +191,4 @@ void temp_viz::Widget2D::setColor(const Color &color) Color c = vtkcolor(color); actor->GetProperty ()->SetColor (c.val); actor->Modified (); -} \ No newline at end of file +}