mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-01-18 06:03:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

reverted widget reference count in order to avoid memory leak

Browse Source
This commit is contained in:
ozantonkal 2013-08-28 21:27:30 +02:00 committed by Ozan Tonkal
parent 8007e07ad2
commit 4b443059ec
2 changed files with 48 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,6 +14,9 @@ namespace cv
{
public:
Widget();
Widget(const Widget& other);
Widget& operator=(const Widget& other);
~Widget();
static Widget fromPlyFile(const String &file_name);
@ -25,6 +28,9 @@ namespace cv
class Impl;
Impl *impl_;
friend struct WidgetAccessor;
void create();
void release();
};
/////////////////////////////////////////////////////////////////////////////

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

@ -7,11 +7,52 @@ class cv::viz::Widget::Impl
{
public:
vtkSmartPointer<vtkProp> prop;
int ref_counter;
Impl() : prop(0) {}
};
cv::viz::Widget::Widget() : impl_( new Impl() ) { }
cv::viz::Widget::Widget() : impl_(0)
{
create();
}
cv::viz::Widget::Widget(const Widget& other) : impl_(other.impl_)
{
if (impl_) CV_XADD(&impl_->ref_counter, 1);
}
cv::viz::Widget& cv::viz::Widget::operator=(const Widget& other)
{
if (this != &other)
{
release();
impl_ = other.impl_;
if (impl_) CV_XADD(&impl_->ref_counter, 1);
}
return *this;
}
cv::viz::Widget::~Widget()
{
release();
}
void cv::viz::Widget::create()
{
if (impl_) release();
impl_ = new Impl();
impl_->ref_counter = 1;
}
void cv::viz::Widget::release()
{
if (impl_ && CV_XADD(&impl_->ref_counter, -1) == 1)
{
delete impl_;
impl_ = 0;
}
}
cv::viz::Widget cv::viz::Widget::fromPlyFile(const String &file_name)
{