swig 4.4 compatibility

Author: jim-easterbrook

src/interface/shared/containers.i

@@ -89,13 +89,19 @@ static PyObject* set_value_from_py(Exiv2::datum_type* datum,
     Exiv2::base_class::count;
 MP_SUBSCRIPT(Exiv2::base_class, Exiv2::datum_type&, (*self)[key])
 %fragment("set_value_from_py"{Exiv2::datum_type});
+#if SWIG_VERSION >= 0x040400
+%fragment("pointer_store");
+#endif
 MP_ASS_SUBSCRIPT(Exiv2::base_class, PyObject*,
 // setfunc
     return set_value_from_py(&(*self)[key], value),
 // delfunc
     auto pos = self->findKey(Exiv2::key_type(key));
     if (pos == self->end())
         return PyErr_Format(PyExc_KeyError, "'%s'", key);
+#if SWIG_VERSION >= 0x040400
+    invalidate_pointers(py_self, pos);
+#endif
     self->erase(pos))
 SQ_CONTAINS(
     Exiv2::base_class, self->findKey(Exiv2::key_type(key)) != self->end())

src/interface/shared/slots.i

@@ -142,7 +142,7 @@ static int __setitem__%mangle(type)_closure(
 %define SQ_CONTAINS(type, func)
 %fragment("__contains__"{type}, "header") {
 static int __contains__%mangle(type)(PyObject* py_self, PyObject* py_key) {
-    type* self;
+    type* self = NULL;
     SWIG_ConvertPtr(py_self, (void**)&self, $descriptor(type*), 0);
     const char* key = PyUnicode_AsUTF8(py_key);
     if (!key)
@@ -159,7 +159,7 @@ static int __contains__%mangle(type)(PyObject* py_self, PyObject* py_key) {
 %define SQ_LENGTH(type, func)
 %fragment("__len__"{type}, "header") {
 static Py_ssize_t __len__%mangle(type)(PyObject* py_self) {
-    type* self;
+    type* self = NULL;
     SWIG_ConvertPtr(py_self, (void**)&self, $descriptor(type*), 0);
     return func;
 };
@@ -200,7 +200,7 @@ static PyObject* __getitem__%mangle(type)_closure(
 %define TP_STR(type, func)
 %fragment("__str__"{type}, "header") {
 static PyObject* __str__%mangle(type)(PyObject* py_self) {
-    type* self;
+    type* self = NULL;
     SWIG_ConvertPtr(py_self, (void**)&self, $descriptor(type*), 0);
     std::string result = func;
     return SWIG_FromCharPtrAndSize(result.data(), result.size());

src/swig-0_27_7/exif_wrap.cxx

@@ -5178,7 +5178,7 @@ static int private_store_del(PyObject* py_self, const char* name) {
 
 
 static PyObject* __str__Exifdatum_pointer(PyObject* py_self) {
-    Exifdatum_pointer* self;
+    Exifdatum_pointer* self = NULL;
     SWIG_ConvertPtr(py_self, (void**)&self, SWIGTYPE_p_Exifdatum_pointer, 0);
     std::string result = self->__str__();
     return SWIG_FromCharPtrAndSize(result.data(), result.size());
@@ -5399,6 +5399,9 @@ static PyObject* __delitem__Exiv2_ExifData(
         auto pos = self->findKey(Exiv2::ExifKey(key));
     if (pos == self->end())
         return PyErr_Format(PyExc_KeyError, "'%s'", key);
+#if 0x040301 >= 0x040400
+    invalidate_pointers(py_self, pos);
+#endif
     self->erase(pos);
     return SWIG_Py_Void();
 };
@@ -5428,7 +5431,7 @@ static int __setitem__Exiv2_ExifData_closure(
 
 
 static int __contains__Exiv2_ExifData(PyObject* py_self, PyObject* py_key) {
-    Exiv2::ExifData* self;
+    Exiv2::ExifData* self = NULL;
     SWIG_ConvertPtr(py_self, (void**)&self, SWIGTYPE_p_Exiv2__ExifData, 0);
     const char* key = PyUnicode_AsUTF8(py_key);
     if (!key)

src/swig-0_27_7/iptc_wrap.cxx

@@ -5171,7 +5171,7 @@ static int private_store_del(PyObject* py_self, const char* name) {
 
 
 static PyObject* __str__Iptcdatum_pointer(PyObject* py_self) {
-    Iptcdatum_pointer* self;
+    Iptcdatum_pointer* self = NULL;
     SWIG_ConvertPtr(py_self, (void**)&self, SWIGTYPE_p_Iptcdatum_pointer, 0);
     std::string result = self->__str__();
     return SWIG_FromCharPtrAndSize(result.data(), result.size());
@@ -5392,6 +5392,9 @@ static PyObject* __delitem__Exiv2_IptcData(
         auto pos = self->findKey(Exiv2::IptcKey(key));
     if (pos == self->end())
         return PyErr_Format(PyExc_KeyError, "'%s'", key);
+#if 0x040301 >= 0x040400
+    invalidate_pointers(py_self, pos);
+#endif
     self->erase(pos);
     return SWIG_Py_Void();
 };
@@ -5421,7 +5424,7 @@ static int __setitem__Exiv2_IptcData_closure(
 
 
 static int __contains__Exiv2_IptcData(PyObject* py_self, PyObject* py_key) {
-    Exiv2::IptcData* self;
+    Exiv2::IptcData* self = NULL;
     SWIG_ConvertPtr(py_self, (void**)&self, SWIGTYPE_p_Exiv2__IptcData, 0);
     const char* key = PyUnicode_AsUTF8(py_key);
     if (!key)

src/swig-0_27_7/metadatum_wrap.cxx

@@ -4356,7 +4356,7 @@ static std::string metadatum_str(Exiv2::Metadatum* datum) {
 
 
 static PyObject* __str__Exiv2_Metadatum(PyObject* py_self) {
-    Exiv2::Metadatum* self;
+    Exiv2::Metadatum* self = NULL;
     SWIG_ConvertPtr(py_self, (void**)&self, SWIGTYPE_p_Exiv2__Metadatum, 0);
     std::string result = metadatum_str(self);
     return SWIG_FromCharPtrAndSize(result.data(), result.size());

src/swig-0_27_7/preview_wrap.cxx

@@ -5414,7 +5414,7 @@ namespace swig {
 
 
 static Py_ssize_t __len__Exiv2_PreviewImage(PyObject* py_self) {
-    Exiv2::PreviewImage* self;
+    Exiv2::PreviewImage* self = NULL;
     SWIG_ConvertPtr(py_self, (void**)&self, SWIGTYPE_p_Exiv2__PreviewImage, 0);
     return self->size();
 };

src/swig-0_27_7/types_wrap.cxx

@@ -4565,7 +4565,7 @@ static PyObject* _get_enum_data_Exiv2_TypeId() {
 
 
 static Py_ssize_t __len__Exiv2_DataBuf(PyObject* py_self) {
-    Exiv2::DataBuf* self;
+    Exiv2::DataBuf* self = NULL;
     SWIG_ConvertPtr(py_self, (void**)&self, SWIGTYPE_p_Exiv2__DataBuf, 0);
     return self->DATABUF_SIZE;
 };

src/swig-0_27_7/value_wrap.cxx

@@ -4889,7 +4889,7 @@ static int __setitem__Exiv2_LangAltValue_closure(
 
 
 static int __contains__Exiv2_LangAltValue(PyObject* py_self, PyObject* py_key) {
-    Exiv2::LangAltValue* self;
+    Exiv2::LangAltValue* self = NULL;
     SWIG_ConvertPtr(py_self, (void**)&self, SWIGTYPE_p_Exiv2__LangAltValue, 0);
     const char* key = PyUnicode_AsUTF8(py_key);
     if (!key)
@@ -5445,7 +5445,7 @@ namespace swig {
 
 
 static PyObject* __str__Exiv2_Value(PyObject* py_self) {
-    Exiv2::Value* self;
+    Exiv2::Value* self = NULL;
     SWIG_ConvertPtr(py_self, (void**)&self, SWIGTYPE_p_Exiv2__Value, 0);
     std::string result = self->toString();
     return SWIG_FromCharPtrAndSize(result.data(), result.size());

src/swig-0_27_7/xmp_wrap.cxx

@@ -5174,7 +5174,7 @@ static int private_store_del(PyObject* py_self, const char* name) {
 
 
 static PyObject* __str__Xmpdatum_pointer(PyObject* py_self) {
-    Xmpdatum_pointer* self;
+    Xmpdatum_pointer* self = NULL;
     SWIG_ConvertPtr(py_self, (void**)&self, SWIGTYPE_p_Xmpdatum_pointer, 0);
     std::string result = self->__str__();
     return SWIG_FromCharPtrAndSize(result.data(), result.size());
@@ -5395,6 +5395,9 @@ static PyObject* __delitem__Exiv2_XmpData(
         auto pos = self->findKey(Exiv2::XmpKey(key));
     if (pos == self->end())
         return PyErr_Format(PyExc_KeyError, "'%s'", key);
+#if 0x040301 >= 0x040400
+    invalidate_pointers(py_self, pos);
+#endif
     self->erase(pos);
     return SWIG_Py_Void();
 };
@@ -5424,7 +5427,7 @@ static int __setitem__Exiv2_XmpData_closure(
 
 
 static int __contains__Exiv2_XmpData(PyObject* py_self, PyObject* py_key) {
-    Exiv2::XmpData* self;
+    Exiv2::XmpData* self = NULL;
     SWIG_ConvertPtr(py_self, (void**)&self, SWIGTYPE_p_Exiv2__XmpData, 0);
     const char* key = PyUnicode_AsUTF8(py_key);
     if (!key)

src/swig-0_28_7/exif_wrap.cxx

@@ -5340,7 +5340,7 @@ SWIGINTERNINLINE PyObject*
 
 
 static PyObject* __str__Exifdatum_pointer(PyObject* py_self) {
-    Exifdatum_pointer* self;
+    Exifdatum_pointer* self = NULL;
     SWIG_ConvertPtr(py_self, (void**)&self, SWIGTYPE_p_Exifdatum_pointer, 0);
     std::string result = self->__str__();
     return SWIG_FromCharPtrAndSize(result.data(), result.size());
@@ -5561,6 +5561,9 @@ static PyObject* __delitem__Exiv2_ExifData(
         auto pos = self->findKey(Exiv2::ExifKey(key));
     if (pos == self->end())
         return PyErr_Format(PyExc_KeyError, "'%s'", key);
+#if 0x040301 >= 0x040400
+    invalidate_pointers(py_self, pos);
+#endif
     self->erase(pos);
     return SWIG_Py_Void();
 };
@@ -5590,7 +5593,7 @@ static int __setitem__Exiv2_ExifData_closure(
 
 
 static int __contains__Exiv2_ExifData(PyObject* py_self, PyObject* py_key) {
-    Exiv2::ExifData* self;
+    Exiv2::ExifData* self = NULL;
     SWIG_ConvertPtr(py_self, (void**)&self, SWIGTYPE_p_Exiv2__ExifData, 0);
     const char* key = PyUnicode_AsUTF8(py_key);
     if (!key)