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

reference counting in widget

Browse Source
This commit is contained in:
ozantonkal 2013-07-04 15:57:49 +03:00
parent 141cfd562c
commit 158ed299c1
2 changed files with 37 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/viz/include/opencv2/viz/widgets.hpp
View File

@ -14,6 +14,8 @@ namespace temp_viz
Widget(const Widget &other); Widget(const Widget &other);
Widget& operator =(const Widget &other); Widget& operator =(const Widget &other);
~Widget();
void copyTo(Widget &dst); void copyTo(Widget &dst);
void setColor(const Color &color); void setColor(const Color &color);
@ -23,7 +25,11 @@ namespace temp_viz
private: private:
class Impl; class Impl;
cv::Ptr<Impl> impl_; Impl* impl_;
void create();
void release();
friend struct WidgetAccessor; friend struct WidgetAccessor;
}; };

34
modules/viz/src/widget.cpp
View File

@ -4,6 +4,7 @@ class temp_viz::Widget::Impl
{ {
public: public:
vtkSmartPointer<vtkLODActor> actor; vtkSmartPointer<vtkLODActor> actor;
int ref_counter;
Impl() : actor(vtkSmartPointer<vtkLODActor>::New()) {} Impl() : actor(vtkSmartPointer<vtkLODActor>::New()) {}
@ -79,23 +80,34 @@ vtkSmartPointer<vtkLODActor> temp_viz::WidgetAccessor::getActor(const Widget& wi
/////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////
/// widget implementaion /// widget implementaion
temp_viz::Widget::Widget() temp_viz::Widget::Widget() : impl_(0)
{ {
impl_ = new Impl(); create();
} }
temp_viz::Widget::Widget(const Widget& other) temp_viz::Widget::Widget(const Widget& other) : impl_(other.impl_)
{ {
impl_ = other.impl_; if (impl_)
CV_XADD(&impl_->ref_counter, 1);
} }
temp_viz::Widget& temp_viz::Widget::operator =(const Widget &other) temp_viz::Widget& temp_viz::Widget::operator =(const Widget &other)
{ {
if (this != &other) if (this != &other)
{
release();
impl_ = other.impl_; impl_ = other.impl_;
if (impl_)
CV_XADD(&impl_->ref_counter, 1);
}
return *this; return *this;
} }
temp_viz::Widget::~Widget()
{
release();
}
void temp_viz::Widget::copyTo(Widget& /*dst*/) void temp_viz::Widget::copyTo(Widget& /*dst*/)
{ {
// TODO Deep copy the data if there is any // TODO Deep copy the data if there is any
@ -106,5 +118,19 @@ void temp_viz::Widget::setPose(const Affine3f& pose) { impl_->setPose(pose); }
void temp_viz::Widget::updatePose(const Affine3f& pose) { impl_->updatePose(pose); } void temp_viz::Widget::updatePose(const Affine3f& pose) { impl_->updatePose(pose); }
temp_viz::Affine3f temp_viz::Widget::getPose() const { return impl_->getPose(); } temp_viz::Affine3f temp_viz::Widget::getPose() const { return impl_->getPose(); }
void temp_viz::Widget::create()
{
if (impl_)
release();
impl_ = new Impl();
impl_->ref_counter = 1;
}
void temp_viz::Widget::release()
{
if (impl_ && CV_XADD(&impl_->ref_counter, -1) == 1)
{
delete impl_;
}
}