From 6cc307548a490ddaf2054ead00b8e354b494e5bc Mon Sep 17 00:00:00 2001 From: Bohumir Zamecnik Date: Thu, 16 Jan 2025 16:52:41 +0700 Subject: [PATCH 1/2] Fix: Remove image.copy() argument in poppler 25.01 - from poppler changelog: "Remove rect parameter from image::copy, it was never implemented" --- src/cpp/image.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/cpp/image.cpp b/src/cpp/image.cpp index 725359b..91131f4 100644 --- a/src/cpp/image.cpp +++ b/src/cpp/image.cpp @@ -102,7 +102,11 @@ PYBIND11_MODULE(image, m) .def(py::init(), py::arg("iwidth"), py::arg("iheight"), py::arg("iformat")) .def("bytes_per_row", &image::bytes_per_row) // .def("const_data", &image::const_data) +#if HAS_VERSION(25, 1) + .def("copy", &image::copy) +#else .def("copy", &image::copy, py::arg("rect") = rect()) +#endif .def("data", &data) .def("set_data", &set_data) .def("format", &image::format) From cb6795b696c49e84fd725ce1d28780b743886942 Mon Sep 17 00:00:00 2001 From: Bohumir Zamecnik Date: Mon, 5 May 2025 21:49:54 +0700 Subject: [PATCH 2/2] Do not pass rectangle to image.copy() - it's not available in the C++ API - also remove it from the Python API, it was an optional argument anyway --- src/poppler/image.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/poppler/image.py b/src/poppler/image.py index a8c27e2..0a6834c 100644 --- a/src/poppler/image.py +++ b/src/poppler/image.py @@ -16,7 +16,6 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. from poppler.cpp import image -from poppler.rectangle import Rectangle class Image: @@ -47,8 +46,8 @@ def bytes_per_row(self): def const_data(self): return self._image.data() - def copy(self, rect=None): - image = self._image.copy(rect or Rectangle()._rect) + def copy(self): + image = self._image.copy() return Image.from_object(image) @property