Merge pull request #2997 from jkseppan/rule-of-three

Disable copying of C++ classes with nontrivial destructors

src/_backend_agg.h

@@ -107,6 +107,11 @@ class BufferRegion : public Py::PythonExtension<BufferRegion>
             data = NULL;
         }
     };
+
+private:
+    // prevent copying
+    BufferRegion(const BufferRegion&);
+    BufferRegion& operator=(const BufferRegion&);
 };
 
 class GCAgg
@@ -284,6 +289,10 @@ class RendererAgg: public Py::PythonExtension<RendererAgg>
 
 private:
     void create_alpha_buffers();
+
+    // prevent copying
+    RendererAgg(const RendererAgg&);
+    RendererAgg& operator=(const RendererAgg&);
 };
 
 // the extension module
@@ -306,6 +315,10 @@ class _backend_agg_module : public Py::ExtensionModule<_backend_agg_module>
 private:
 
     Py::Object new_renderer(const Py::Tuple &args, const Py::Dict &kws);
+
+    // prevent copying
+    _backend_agg_module(const _backend_agg_module&);
+    _backend_agg_module& operator=(const _backend_agg_module&);
 };
 
 

src/_image.h

@@ -118,6 +118,9 @@ class Image : public Py::PythonExtension<Image>
     static char get_resample__doc__[];
     static char set_resample__doc__[];
 
+    // prevent copying
+    Image(const Image&);
+    Image& operator=(const Image&);
 };
 
 

src/ft2font.h

@@ -75,6 +75,10 @@ class FT2Image : public Py::PythonClass<FT2Image>
     unsigned long _height;
 
     void resize(long width, long height);
+
+    // prevent copying
+    FT2Image(const FT2Image&);
+    FT2Image& operator=(const FT2Image&);
 };
 
 class Glyph : public Py::PythonClass<Glyph>
@@ -90,6 +94,10 @@ class Glyph : public Py::PythonClass<Glyph>
     size_t glyphInd;
 private:
     Py::Dict __dict__;
+
+    // prevent copying
+    Glyph(const Glyph&);
+    Glyph& operator=(const Glyph&);
 };
 
 class FT2Font : public Py::PythonClass<FT2Font>
@@ -172,15 +180,23 @@ class FT2Font : public Py::PythonClass<FT2Font>
     static char get_image__doc__[];
     static char attach_file__doc__[];
     static char get_path__doc__[];
+
+    // prevent copying
+    FT2Font(const FT2Font&);
+    FT2Font& operator=(const FT2Font&);
 };
 
 // the extension module
 class ft2font_module : public Py::ExtensionModule<ft2font_module>
-
 {
 public:
     ft2font_module();
     virtual ~ft2font_module();
+
+private:
+    // prevent copying
+    ft2font_module(const ft2font_module&);
+    ft2font_module operator=(const ft2font_module&);
 };
 
 #endif

src/mplutils.h

@@ -45,6 +45,9 @@ class Printf
 {
 private :
     char *buffer;
+    // prevent copying
+    Printf(const Printf&);
+    Printf& operator=(const Printf&);
 public :
     Printf(const char *, ...);
     ~Printf();