Skip to content

SWIG: Ensure SWIG 4.4 compatibility #510

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jmr merged 1 commit into from
Jan 6, 2026
Merged

SWIG: Ensure SWIG 4.4 compatibility #510

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions src/python/s2_common.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,29 +156,29 @@ public:
%apply SWIGTYPE *DISOWN {S2Builder::Layer *layer_disown};
%apply SWIGTYPE *DISOWN {S2Polygon *polygon_disown};

%typemap(in) std::vector<S2Loop *> * (std::vector<S2Loop *> loops){
PyObject *element(nullptr);
PyObject *iterator(PyObject_GetIter($input));
if (!iterator) {
SWIG_fail;
%typemap(in) std::vector<S2Loop *> * (std::vector<S2Loop *> loops) {
PyObject *iter = PyObject_GetIter($input);
if (iter == nullptr) {
%argument_fail(SWIG_TypeError, "iterable of S2Loop *", $symname, $argnum);
}
int i(0);
while ((element = PyIter_Next(iterator))) {
i++;
S2Loop *loop(nullptr);
int res(SWIG_ConvertPtr(element, (void **)&loop, $descriptor(S2Loop *), 0));
if (SWIG_IsOK(res)) {
loops.push_back(loop->Clone());
} else {
SWIG_Python_TypeError(SWIG_TypePrettyName($descriptor(S2Loop *)), element);
SWIG_Python_ArgFail(i);
Py_DECREF(element);
Py_DECREF(iterator);
SWIG_fail;

for (PyObject *elem; (elem = PyIter_Next(iter)); Py_DECREF(elem)) {
S2Loop *loop = nullptr;
int res = SWIG_ConvertPtr(
elem, reinterpret_cast<void **>(&loop), $descriptor(S2Loop *),
SWIG_POINTER_NO_NULL);

if (!SWIG_IsOK(res)) {
Py_DECREF(elem);
Py_DECREF(iter);
for (S2Loop *loop : loops) delete loop;
%argument_fail(res, "$type", $symname, $argnum);
}
Py_DECREF(element);

loops.push_back(new S2Loop(*loop));
}
Py_DECREF(iterator);

Py_DECREF(iter);
$1 = &loops;
}

Expand Down
Loading