updated copyright message

[modules/shaper.git] / src / FiltersAPI / FiltersAPI.i

diff --git a/src/FiltersAPI/FiltersAPI.i b/src/FiltersAPI/FiltersAPI.i
index 8c65ec5b59509f8e435d9e2dc040c911eb63ae76..86f078200824f416ffb78752ebbde4be0d46e381 100644 (file)
--- a/src/FiltersAPI/FiltersAPI.i
+++ b/src/FiltersAPI/FiltersAPI.i
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2019  CEA/DEN, EDF R&D
+// Copyright (C) 2014-2023  CEA, EDF
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -24,8 +24,15 @@
 %{
   #include "FiltersAPI_swig.h"
 
+  // fix for SWIG v4.1.1
+  #if PY_VERSION_HEX >= 0x03020000
+  # define SWIGPY_SLICEOBJECT PyObject
+  #else
+  # define SWIGPY_SLICEOBJECT PySliceObject
+  #endif
+
   // fix for SWIG v2.0.4
-  #define SWIGPY_SLICE_ARG(obj) ((PyObject*)(obj))
+  #define SWIGPY_SLICE_ARG(obj)   ((SWIGPY_SLICEOBJECT*)(obj))
 %}
 
 %include "doxyhelp.i"
@@ -74,6 +81,9 @@
           $1 = 0;
         }
       } else
+      if (!PyFloat_Check(item) && PyLong_Check(item))
+        $1 = 0;
+      else
       if (!PyUnicode_Check(item) && !PyBool_Check(item))
         $1 = 0;
     }
@@ -83,13 +93,14 @@
 %typemap(in) const std::list<FiltersAPI_Argument> & (std::list<FiltersAPI_Argument> temp) {
   ModelHighAPI_Selection* temp_selection;
   std::string* temp_string;
+  ModelHighAPI_Double* temp_double;
   int newmem = 0;
   if (PySequence_Check($input)) {
     for (Py_ssize_t i = 0; i < PySequence_Size($input); ++i) {
       PyObject * item = PySequence_GetItem($input, i);
       if ((SWIG_ConvertPtrAndOwn(item, (void **)&temp_selection, $descriptor(ModelHighAPI_Selection*), SWIG_POINTER_EXCEPTION, &newmem)) == 0) {
         if (!temp_selection) {
-          PyErr_SetString(PyExc_TypeError, "argument must be ModelHighAPI_Selection, string or boolean.");
+          PyErr_SetString(PyExc_TypeError, "argument must be ModelHighAPI_Selection, string, double or boolean.1");
           return NULL;
         }
         temp.push_back(FiltersAPI_Argument(*temp_selection));
@@ -99,7 +110,7 @@
       } else
       if ((SWIG_ConvertPtrAndOwn(item, (void **)&temp_string, $descriptor(std::string*), SWIG_POINTER_EXCEPTION, &newmem)) == 0) {
         if (!temp_string) {
-          PyErr_SetString(PyExc_TypeError, "argument must be ModelHighAPI_Selection, string or boolean.");
+          PyErr_SetString(PyExc_TypeError, "argument must be ModelHighAPI_Selection, string, double or boolean.2");
           return NULL;
         }
         temp.push_back(FiltersAPI_Argument(*temp_string));
@@ -112,15 +123,18 @@
       } else
       if (PyBool_Check(item)) {
         temp.push_back(FiltersAPI_Argument(item == Py_True));
+      } else
+      if (PyFloat_Check(item) || PyLong_Check(item)) {
+        temp.push_back(FiltersAPI_Argument(ModelHighAPI_Double(PyFloat_AsDouble(item))));
       } else {
-        PyErr_SetString(PyExc_TypeError, "argument must be ModelHighAPI_Selection, string or boolean.");
+        PyErr_SetString(PyExc_TypeError, "argument must be ModelHighAPI_Selection, string, double or boolean.4");
         return NULL;
       }
       Py_DECREF(item);
     }
     $1 = &temp;
   } else {
-    PyErr_SetString(PyExc_TypeError, "argument must be ModelHighAPI_Selection, string or boolean.");
+    PyErr_SetString(PyExc_TypeError, "argument must be ModelHighAPI_Selection, string, double or boolean.5");
     return NULL;
   }
 }