diff --git a/src/python/magnum/trade.cpp b/src/python/magnum/trade.cpp index 2f6f099..9d68938 100644 --- a/src/python/magnum/trade.cpp +++ b/src/python/magnum/trade.cpp @@ -286,7 +286,7 @@ template std::string checkOpenedBoundsReturnsString(Trade::AbstractImporter& self, UnsignedInt id) { +template std::string checkOpenedBoundsReturnsString(Trade::AbstractImporter& self, R id) { if(!self.isOpened()) { PyErr_SetString(PyExc_AssertionError, "no file opened"); throw py::error_already_set{}; @@ -832,7 +832,7 @@ void trade(py::module_& m) { .def_property_readonly("mesh_count", checkOpened, "Mesh count") .def("mesh_level_count", checkOpenedBounds, "Mesh level count", py::arg("id")) .def("mesh_for_name", checkOpenedString, "Mesh ID for given name", py::arg("name")) - .def("mesh_name", checkOpenedBoundsReturnsString<&Trade::AbstractImporter::meshName, &Trade::AbstractImporter::meshCount>, "Mesh name", py::arg("id")) + .def("mesh_name", checkOpenedBoundsReturnsString, "Mesh name", py::arg("id")) .def("mesh", checkOpenedBoundsResult, "Mesh", py::arg("id"), py::arg("level") = 0) .def("mesh", checkOpenedBoundsResultString, "Mesh for given name", py::arg("name"), py::arg("level") = 0) /** @todo drop std::string in favor of our own string caster */ @@ -858,9 +858,9 @@ void trade(py::module_& m) { .def("image1d_for_name", checkOpenedString, "One-dimensional image ID for given name", py::arg("name")) .def("image2d_for_name", checkOpenedString, "Two-dimensional image ID for given name", py::arg("name")) .def("image3d_for_name", checkOpenedString, "Three-dimensional image ID for given name", py::arg("name")) - .def("image1d_name", checkOpenedBoundsReturnsString<&Trade::AbstractImporter::image1DName, &Trade::AbstractImporter::image1DCount>, "One-dimensional image name", py::arg("id")) - .def("image2d_name", checkOpenedBoundsReturnsString<&Trade::AbstractImporter::image2DName, &Trade::AbstractImporter::image2DCount>, "Two-dimensional image name", py::arg("id")) - .def("image3d_name", checkOpenedBoundsReturnsString< &Trade::AbstractImporter::image3DName, &Trade::AbstractImporter::image3DCount>, "Three-dimensional image name", py::arg("id")) + .def("image1d_name", checkOpenedBoundsReturnsString, "One-dimensional image name", py::arg("id")) + .def("image2d_name", checkOpenedBoundsReturnsString, "Two-dimensional image name", py::arg("id")) + .def("image3d_name", checkOpenedBoundsReturnsString, "Three-dimensional image name", py::arg("id")) .def("image1d", checkOpenedBoundsResult, "One-dimensional image", py::arg("id"), py::arg("level") = 0) .def("image1d", checkOpenedBoundsResultString, "One-dimensional image for given name", py::arg("name"), py::arg("level") = 0) .def("image2d", checkOpenedBoundsResult, "Two-dimensional image", py::arg("id"), py::arg("level") = 0)