From e1d06a81b148252b25fea22c47e29abc95e86ea4 Mon Sep 17 00:00:00 2001 From: francesco-ST Date: 2010年10月22日 15:46:07 +0200 Subject: fixed error with bounding box calculation / code simplification The "dispose" method was no longer needed. Now we use normal destructors. --- agg-plot/scalable.h | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'agg-plot/scalable.h') diff --git a/agg-plot/scalable.h b/agg-plot/scalable.h index fae4a31a..8599fd33 100644 --- a/agg-plot/scalable.h +++ b/agg-plot/scalable.h @@ -30,10 +30,7 @@ struct vertex_source { virtual ~vertex_source() { }; }; -struct scalable : public vertex_source { - virtual bool dispose() = 0; - virtual ~scalable() { }; -}; +typedef vertex_source scalable; template class vs_proxy : public vertex_source { @@ -81,8 +78,6 @@ class boxed_scalable : public scalable { virtual unsigned vertex(double* x, double* y) { return m_object->vertex(x, y); }; virtual void apply_transform(const agg::trans_affine& m, double as) { m_object->apply_transform(m, as); }; - virtual bool dispose() { return false; }; - private: boxed_scalable(); }; @@ -98,6 +93,8 @@ protected: public: vs_adapter(base_type* src): m_output(*src), m_source(src) { }; + + ~vs_adapter() { delete this->m_source; }; template vs_adapter(base_type* src, init_type& val): @@ -114,13 +111,6 @@ public: return m_output.vertex(x, y); }; - virtual bool dispose() - { - if (this->m_source->dispose()) - delete this->m_source; - return true; - }; - conv_type& self() { return m_output; }; }; -- cgit v1.2.3

AltStyle によって変換されたページ (->オリジナル) /