[patch] Remove methods using void* arguments

gentoo579848a.patch (text/plain), 4.13 KB, created by Martin von Gagern on 2016-04-19 01:18:12 UTC

commit 98ab383d8e6e51f0ce759d081bcf4740d24ebc66
Author: Martin von Gagern <[e-mail]>
Date:   Tue Apr 19 03:09:48 2016 +0200

    Drop methods which use void* arguments
    
    Boost 1.60 will complain about methods that take a void* argument.  And
    since there appears to be no reasonable way to directly pass a void* from
    Python (as opposed to some object following the buffer interface, from which
    a data pointer and length could be obtained), it's probably better to drop
    these functions until suitable wrappers have been developed to replace them.
    The modifications were performed manually, without pyste, so the next pyste
    run will likely overwrite them unless the pyste files get modified as well.

diff --git a/pythonmagick_src/_Blob.cpp b/pythonmagick_src/_Blob.cpp
index b4985fb..faf555f 100644
--- a/pythonmagick_src/_Blob.cpp
+++ b/pythonmagick_src/_Blob.cpp
@@ -13,9 +13,6 @@ using namespace boost::python;
 // Declarations ================================================================
 namespace  {
 
-BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(Magick_Blob_updateNoCopy_overloads_2_3, updateNoCopy, 2, 3)
-
-
 }// namespace 
 
 
@@ -24,12 +21,10 @@ void Export_pyste_src_Blob()
 {
     scope* Magick_Blob_scope = new scope(
     class_< Magick::Blob >("Blob", init<  >())
-        .def(init< const void*, size_t >())
         .def(init< const Magick::Blob& >())
         .def("base64", (void (Magick::Blob::*)(const std::string) )&Magick::Blob::base64)
         .def("base64", (std::string (Magick::Blob::*)() )&Magick::Blob::base64)
         .def("update", &update_wrapper)
-        .def("updateNoCopy", &Magick::Blob::updateNoCopy, Magick_Blob_updateNoCopy_overloads_2_3())
         .def("length", &Magick::Blob::length)
     );
 
diff --git a/pythonmagick_src/_Image.cpp b/pythonmagick_src/_Image.cpp
index e25bb56..44fbc90 100644
--- a/pythonmagick_src/_Image.cpp
+++ b/pythonmagick_src/_Image.cpp
@@ -73,7 +73,6 @@ void Export_pyste_src_Image()
         .def(init< const Magick::Blob&, const Magick::Geometry&, const size_t >())
         .def(init< const Magick::Blob&, const Magick::Geometry&, const size_t, const std::string& >())
         .def(init< const Magick::Blob&, const Magick::Geometry&, const std::string& >())
-        .def(init< const size_t, const size_t, const std::string&, const MagickCore::StorageType, const void* >())
         .def(init< const Magick::Image& >())
         .def(init< MagickCore::Image* >())
         .def("adaptiveThreshold", &Magick::Image::adaptiveThreshold, Magick_Image_adaptiveThreshold_overloads_2_3())
@@ -153,7 +152,6 @@ void Export_pyste_src_Image()
         .def("read", (void (Magick::Image::*)(const Magick::Blob&, const Magick::Geometry&, const size_t) )&Magick::Image::read)
         .def("read", (void (Magick::Image::*)(const Magick::Blob&, const Magick::Geometry&, const size_t, const std::string&) )&Magick::Image::read)
         .def("read", (void (Magick::Image::*)(const Magick::Blob&, const Magick::Geometry&, const std::string&) )&Magick::Image::read)
-        .def("read", (void (Magick::Image::*)(const size_t, const size_t, const std::string&, const MagickCore::StorageType, const void*) )&Magick::Image::read)
         .def("reduceNoise", (void (Magick::Image::*)() )&Magick::Image::reduceNoise)
         .def("reduceNoise", (void (Magick::Image::*)(const double) )&Magick::Image::reduceNoise)
         .def("resize", &Magick::Image::resize)
@@ -186,7 +184,6 @@ void Export_pyste_src_Image()
         .def("write", (void (Magick::Image::*)(Magick::Blob*) )&Magick::Image::write)
         .def("write", (void (Magick::Image::*)(Magick::Blob*, const std::string&) )&Magick::Image::write)
         .def("write", (void (Magick::Image::*)(Magick::Blob*, const std::string&, const size_t) )&Magick::Image::write)
-        .def("write", (void (Magick::Image::*)(const ::ssize_t, const ::ssize_t, const size_t, const size_t, const std::string&, const MagickCore::StorageType, void*) )&Magick::Image::write)
         .def("zoom", &Magick::Image::zoom)
         .def("adjoin", (void (Magick::Image::*)(const bool) )&Magick::Image::adjoin)
         .def("adjoin", (bool (Magick::Image::*)() const)&Magick::Image::adjoin)