minor naming

diff --git a/modules/viz/include/opencv2/viz/widget_accessor.hpp b/modules/viz/include/opencv2/viz/widget_accessor.hpp
index ddfd61b1c5d01980c7dd6e84023bc94caa87a304..a114c3a26370c9dd773092bdd88a42aa6de2179f 100644 (file)
--- a/modules/viz/include/opencv2/viz/widget_accessor.hpp
+++ b/modules/viz/include/opencv2/viz/widget_accessor.hpp
@@ -2,7 +2,7 @@
 
 #include <opencv2/core/cvdef.h>
 #include <vtkSmartPointer.h>
-#include <vtkLODActor.h>
+#include <vtkProp.h>
 
 namespace temp_viz
 {
@@ -13,6 +13,6 @@ namespace temp_viz
     struct CV_EXPORTS WidgetAccessor
     {
         static vtkSmartPointer<vtkProp> getProp(const Widget &widget);
-        static void setProp(Widget &widget, vtkSmartPointer<vtkProp> actor);
+        static void setProp(Widget &widget, vtkSmartPointer<vtkProp> prop);
     };
 }

diff --git a/modules/viz/include/opencv2/viz/widgets.hpp b/modules/viz/include/opencv2/viz/widgets.hpp
index 23eb7b71ca400f7f13efbead1b9eeeb54c369098..2114838c56b794218cfb41f56d38418016d0caef 100644 (file)
--- 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 b832d15df3bf815e9be9920e9a1868545e8cc59f..450e7663390dff503402b657ae6f5cc075581862 100644 (file)
--- a/modules/viz/src/widget.cpp
+++ b/modules/viz/src/widget.cpp
@@ -6,10 +6,10 @@
 class temp_viz::Widget::Impl
 {
 public:
-    vtkSmartPointer<vtkProp> actor;
+    vtkSmartPointer<vtkProp> 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<vtkProp> temp_viz::WidgetAccessor::getProp(const Widget& widget)
 {
-    return widget.impl_->actor;
+    return widget.impl_->prop;
 }
 
-void temp_viz::WidgetAccessor::setProp(Widget& widget, vtkSmartPointer<vtkProp> actor)
+void temp_viz::WidgetAccessor::setProp(Widget& widget, vtkSmartPointer<vtkProp> 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
+}