Tidied up iterator input typemaps

jim-easterbrook · jim-easterbrook · commit d348176d6f28 · 2025-08-27T16:05:57.000+01:00
diff --git a/src/interface/shared/data_iterator.i b/src/interface/shared/data_iterator.i
@@ -22,39 +22,6 @@
 
 // Macro to wrap data iterators
 %define DATA_ITERATOR(container_type, datum_type)
-// Creating a new iterator keeps a reference to the current one
-KEEP_REFERENCE(container_type##_iterator*)
-
-#if SWIG_VERSION < 0x040400
-// erase() invalidates the iterator
-%typemap(in) (Exiv2::container_type::iterator pos)
-        (container_type##_iterator *argp=NULL),
-             (Exiv2::container_type::iterator beg)
-        (container_type##_iterator *argp=NULL) {
-    {
-        container_type##_iterator* arg$argnum = NULL;
-        $typemap(in, container_type##_iterator*)
-        argp = arg$argnum;
-    }
-    $1 = argp->_ptr();
-    argp->_invalidate();
-}
-#endif
-// XmpData::eraseFamily takes an iterator reference (and invalidates it)
-%typemap(in) Exiv2::container_type::iterator&
-        (Exiv2::container_type::iterator it,
-         container_type##_iterator* argp = NULL) {
-    {
-        container_type##_iterator* arg$argnum = NULL;
-        $typemap(in, container_type##_iterator*)
-        argp = arg$argnum;
-    }
-    it = argp->_ptr();
-    $1 = &it;
-#if SWIG_VERSION < 0x040400
-    argp->_invalidate();
-#endif
-}
 
 #if SWIG_VERSION >= 0x040400
 // Functions to store weak references to iterators (swig >= v4.4)
@@ -134,6 +101,17 @@ static int store_iterator(PyObject* py_self, PyObject* iterator) {
 }
 #endif
 
+#if SWIG_VERSION < 0x040400
+// erase() and eraseFamily() invalidate the iterator passed to them
+%typemap(check) (Exiv2::container_type::iterator pos),
+                (Exiv2::container_type::iterator beg) {
+    argp$argnum->_invalidate();
+}
+%typemap(check) Exiv2::container_type::iterator& {
+    argp$argnum->_invalidate();
+}
+#endif
+
 #if SWIG_VERSION >= 0x040400
 // clear() invalidates all iterators
 %typemap(ret, fragment="iterator_store") void clear {
@@ -155,7 +133,4 @@ static int store_iterator(PyObject* py_self, PyObject* iterator) {
 }
 #endif // SWIG_VERSION
 
-// Keep a reference to the data being iterated
-KEEP_REFERENCE(Exiv2::container_type::iterator)
-
 %enddef // DATA_ITERATOR
diff --git a/src/interface/shared/metadatum_wrappers.i b/src/interface/shared/metadatum_wrappers.i
@@ -19,6 +19,9 @@
  */
 
 
+%include "shared/keep_reference.i"
+
+
 // Macro to wrap metadatum iterators and pointers
 %define METADATUM_WRAPPERS(container_type, datum_type)
 
@@ -97,6 +100,10 @@ data it points to."
     }
     $typemap(out, Exiv2::datum_type*)
 }
+// Keep a reference to the data being iterated
+KEEP_REFERENCE(Exiv2::container_type::iterator)
+// Creating a new iterator keeps a reference to the current one
+KEEP_REFERENCE(container_type##_iterator*)
 %inline %{
 class container_type##_iterator: public datum_type##_pointer {
 private:
@@ -148,6 +155,17 @@ public:
     }
     $1 = argp->_ptr();
 %}
+%typemap(in) Exiv2::container_type::iterator&
+        (Exiv2::container_type::iterator it,
+         container_type##_iterator* argp = NULL) {
+    {
+        container_type##_iterator* arg$argnum = NULL;
+        $typemap(in, container_type##_iterator*)
+        argp = arg$argnum;
+    }
+    it = argp->_ptr();
+    $1 = &it;
+}
 %newobject Exiv2::container_type::begin;
 %newobject Exiv2::container_type::end;
 %newobject Exiv2::container_type::erase;
@@ -180,6 +198,8 @@ public:
 Python wrapper for an :class:`" #datum_type "` reference. It has most of
 the methods of :class:`" #datum_type "` allowing easy access to the
 data it points to."
+// Keep a reference to the data being referred to
+KEEP_REFERENCE(Exiv2::datum_type&)
 %inline %{
 class datum_type##_reference: public datum_type##_pointer {
 private:
@@ -216,4 +236,5 @@ public:
         SWIG_as_voidptr(new datum_type##_reference($1)),
         $descriptor(datum_type##_reference*), SWIG_POINTER_OWN);
 }
+
 %enddef // METADATUM_WRAPPERS
diff --git a/src/swig-0_27_7/exif_wrap.cxx b/src/swig-0_27_7/exif_wrap.cxx
@@ -9700,17 +9700,19 @@ SWIGINTERN PyObject *_wrap_ExifData_erase__SWIG_0(PyObject *self, PyObject *args
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ExifData_erase" "', argument " "1"" of type '" "Exiv2::ExifData *""'"); 
   }
   arg1 = reinterpret_cast< Exiv2::ExifData * >(argp1);
+  
   {
-    {
-      ExifData_iterator* arg2 = NULL;
-      res10 = SWIG_ConvertPtr(obj1, &argp10,SWIGTYPE_p_ExifData_iterator, 0 |  0 );
-      if (!SWIG_IsOK(res10)) {
-        SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "ExifData_erase" "', argument " "1"" of type '" "ExifData_iterator *""'"); 
-      }
-      arg2 = reinterpret_cast< ExifData_iterator * >(argp10);
-      argp2 = arg2;
+    ExifData_iterator* arg2 = NULL;
+    res10 = SWIG_ConvertPtr(obj1, &argp10,SWIGTYPE_p_ExifData_iterator, 0 |  0 );
+    if (!SWIG_IsOK(res10)) {
+      SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "ExifData_erase" "', argument " "1"" of type '" "ExifData_iterator *""'"); 
     }
-    arg2 = argp2->_ptr();
+    arg2 = reinterpret_cast< ExifData_iterator * >(argp10);
+    argp2 = arg2;
+  }
+  arg2 = argp2->_ptr();
+  
+  {
     argp2->_invalidate();
   }
   {
@@ -9769,19 +9771,18 @@ SWIGINTERN PyObject *_wrap_ExifData_erase__SWIG_1(PyObject *self, PyObject *args
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ExifData_erase" "', argument " "1"" of type '" "Exiv2::ExifData *""'"); 
   }
   arg1 = reinterpret_cast< Exiv2::ExifData * >(argp1);
+  
   {
-    {
-      ExifData_iterator* arg2 = NULL;
-      res10 = SWIG_ConvertPtr(obj1, &argp10,SWIGTYPE_p_ExifData_iterator, 0 |  0 );
-      if (!SWIG_IsOK(res10)) {
-        SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "ExifData_erase" "', argument " "1"" of type '" "ExifData_iterator *""'"); 
-      }
-      arg2 = reinterpret_cast< ExifData_iterator * >(argp10);
-      argp2 = arg2;
+    ExifData_iterator* arg2 = NULL;
+    res10 = SWIG_ConvertPtr(obj1, &argp10,SWIGTYPE_p_ExifData_iterator, 0 |  0 );
+    if (!SWIG_IsOK(res10)) {
+      SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "ExifData_erase" "', argument " "1"" of type '" "ExifData_iterator *""'"); 
     }
-    arg2 = argp2->_ptr();
-    argp2->_invalidate();
+    arg2 = reinterpret_cast< ExifData_iterator * >(argp10);
+    argp2 = arg2;
   }
+  arg2 = argp2->_ptr();
+  
   
   {
     ExifData_iterator* arg3 = NULL;
@@ -9794,6 +9795,9 @@ SWIGINTERN PyObject *_wrap_ExifData_erase__SWIG_1(PyObject *self, PyObject *args
   }
   arg3 = argp3->_ptr();
   
+  {
+    argp2->_invalidate();
+  }
   {
     try {
       result = (arg1)->erase(SWIG_STD_MOVE(arg2),SWIG_STD_MOVE(arg3));
diff --git a/src/swig-0_27_7/iptc_wrap.cxx b/src/swig-0_27_7/iptc_wrap.cxx
@@ -8759,17 +8759,19 @@ SWIGINTERN PyObject *_wrap_IptcData_erase(PyObject *self, PyObject *args) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IptcData_erase" "', argument " "1"" of type '" "Exiv2::IptcData *""'"); 
   }
   arg1 = reinterpret_cast< Exiv2::IptcData * >(argp1);
+  
   {
-    {
-      IptcData_iterator* arg2 = NULL;
-      res10 = SWIG_ConvertPtr(obj1, &argp10,SWIGTYPE_p_IptcData_iterator, 0 |  0 );
-      if (!SWIG_IsOK(res10)) {
-        SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "IptcData_erase" "', argument " "1"" of type '" "IptcData_iterator *""'"); 
-      }
-      arg2 = reinterpret_cast< IptcData_iterator * >(argp10);
-      argp2 = arg2;
+    IptcData_iterator* arg2 = NULL;
+    res10 = SWIG_ConvertPtr(obj1, &argp10,SWIGTYPE_p_IptcData_iterator, 0 |  0 );
+    if (!SWIG_IsOK(res10)) {
+      SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "IptcData_erase" "', argument " "1"" of type '" "IptcData_iterator *""'"); 
     }
-    arg2 = argp2->_ptr();
+    arg2 = reinterpret_cast< IptcData_iterator * >(argp10);
+    argp2 = arg2;
+  }
+  arg2 = argp2->_ptr();
+  
+  {
     argp2->_invalidate();
   }
   {
diff --git a/src/swig-0_27_7/xmp_wrap.cxx b/src/swig-0_27_7/xmp_wrap.cxx
@@ -8613,17 +8613,19 @@ SWIGINTERN PyObject *_wrap_XmpData_erase(PyObject *self, PyObject *args) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "XmpData_erase" "', argument " "1"" of type '" "Exiv2::XmpData *""'"); 
   }
   arg1 = reinterpret_cast< Exiv2::XmpData * >(argp1);
+  
   {
-    {
-      XmpData_iterator* arg2 = NULL;
-      res10 = SWIG_ConvertPtr(obj1, &argp10,SWIGTYPE_p_XmpData_iterator, 0 |  0 );
-      if (!SWIG_IsOK(res10)) {
-        SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "XmpData_erase" "', argument " "1"" of type '" "XmpData_iterator *""'"); 
-      }
-      arg2 = reinterpret_cast< XmpData_iterator * >(argp10);
-      argp2 = arg2;
+    XmpData_iterator* arg2 = NULL;
+    res10 = SWIG_ConvertPtr(obj1, &argp10,SWIGTYPE_p_XmpData_iterator, 0 |  0 );
+    if (!SWIG_IsOK(res10)) {
+      SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "XmpData_erase" "', argument " "1"" of type '" "XmpData_iterator *""'"); 
     }
-    arg2 = argp2->_ptr();
+    arg2 = reinterpret_cast< XmpData_iterator * >(argp10);
+    argp2 = arg2;
+  }
+  arg2 = argp2->_ptr();
+  
+  {
     argp2->_invalidate();
   }
   {
@@ -8689,9 +8691,9 @@ SWIGINTERN PyObject *_wrap_XmpData_eraseFamily(PyObject *self, PyObject *args) {
     }
     it2 = argp2->_ptr();
     arg2 = &it2;
-    
+  }
+  {
     argp2->_invalidate();
-    
   }
   {
     try {
diff --git a/src/swig-0_28_5/exif_wrap.cxx b/src/swig-0_28_5/exif_wrap.cxx
@@ -9904,17 +9904,19 @@ SWIGINTERN PyObject *_wrap_ExifData_erase__SWIG_0(PyObject *self, PyObject *args
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ExifData_erase" "', argument " "1"" of type '" "Exiv2::ExifData *""'"); 
   }
   arg1 = reinterpret_cast< Exiv2::ExifData * >(argp1);
+  
   {
-    {
-      ExifData_iterator* arg2 = NULL;
-      res10 = SWIG_ConvertPtr(obj1, &argp10,SWIGTYPE_p_ExifData_iterator, 0 |  0 );
-      if (!SWIG_IsOK(res10)) {
-        SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "ExifData_erase" "', argument " "1"" of type '" "ExifData_iterator *""'"); 
-      }
-      arg2 = reinterpret_cast< ExifData_iterator * >(argp10);
-      argp2 = arg2;
+    ExifData_iterator* arg2 = NULL;
+    res10 = SWIG_ConvertPtr(obj1, &argp10,SWIGTYPE_p_ExifData_iterator, 0 |  0 );
+    if (!SWIG_IsOK(res10)) {
+      SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "ExifData_erase" "', argument " "1"" of type '" "ExifData_iterator *""'"); 
     }
-    arg2 = argp2->_ptr();
+    arg2 = reinterpret_cast< ExifData_iterator * >(argp10);
+    argp2 = arg2;
+  }
+  arg2 = argp2->_ptr();
+  
+  {
     argp2->_invalidate();
   }
   {
@@ -9973,19 +9975,18 @@ SWIGINTERN PyObject *_wrap_ExifData_erase__SWIG_1(PyObject *self, PyObject *args
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ExifData_erase" "', argument " "1"" of type '" "Exiv2::ExifData *""'"); 
   }
   arg1 = reinterpret_cast< Exiv2::ExifData * >(argp1);
+  
   {
-    {
-      ExifData_iterator* arg2 = NULL;
-      res10 = SWIG_ConvertPtr(obj1, &argp10,SWIGTYPE_p_ExifData_iterator, 0 |  0 );
-      if (!SWIG_IsOK(res10)) {
-        SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "ExifData_erase" "', argument " "1"" of type '" "ExifData_iterator *""'"); 
-      }
-      arg2 = reinterpret_cast< ExifData_iterator * >(argp10);
-      argp2 = arg2;
+    ExifData_iterator* arg2 = NULL;
+    res10 = SWIG_ConvertPtr(obj1, &argp10,SWIGTYPE_p_ExifData_iterator, 0 |  0 );
+    if (!SWIG_IsOK(res10)) {
+      SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "ExifData_erase" "', argument " "1"" of type '" "ExifData_iterator *""'"); 
     }
-    arg2 = argp2->_ptr();
-    argp2->_invalidate();
+    arg2 = reinterpret_cast< ExifData_iterator * >(argp10);
+    argp2 = arg2;
   }
+  arg2 = argp2->_ptr();
+  
   
   {
     ExifData_iterator* arg3 = NULL;
@@ -9998,6 +9999,9 @@ SWIGINTERN PyObject *_wrap_ExifData_erase__SWIG_1(PyObject *self, PyObject *args
   }
   arg3 = argp3->_ptr();
   
+  {
+    argp2->_invalidate();
+  }
   {
     try {
       result = (arg1)->erase(SWIG_STD_MOVE(arg2),SWIG_STD_MOVE(arg3));
diff --git a/src/swig-0_28_5/iptc_wrap.cxx b/src/swig-0_28_5/iptc_wrap.cxx
@@ -8970,17 +8970,19 @@ SWIGINTERN PyObject *_wrap_IptcData_erase(PyObject *self, PyObject *args) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IptcData_erase" "', argument " "1"" of type '" "Exiv2::IptcData *""'"); 
   }
   arg1 = reinterpret_cast< Exiv2::IptcData * >(argp1);
+  
   {
-    {
-      IptcData_iterator* arg2 = NULL;
-      res10 = SWIG_ConvertPtr(obj1, &argp10,SWIGTYPE_p_IptcData_iterator, 0 |  0 );
-      if (!SWIG_IsOK(res10)) {
-        SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "IptcData_erase" "', argument " "1"" of type '" "IptcData_iterator *""'"); 
-      }
-      arg2 = reinterpret_cast< IptcData_iterator * >(argp10);
-      argp2 = arg2;
+    IptcData_iterator* arg2 = NULL;
+    res10 = SWIG_ConvertPtr(obj1, &argp10,SWIGTYPE_p_IptcData_iterator, 0 |  0 );
+    if (!SWIG_IsOK(res10)) {
+      SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "IptcData_erase" "', argument " "1"" of type '" "IptcData_iterator *""'"); 
     }
-    arg2 = argp2->_ptr();
+    arg2 = reinterpret_cast< IptcData_iterator * >(argp10);
+    argp2 = arg2;
+  }
+  arg2 = argp2->_ptr();
+  
+  {
     argp2->_invalidate();
   }
   {
diff --git a/src/swig-0_28_5/xmp_wrap.cxx b/src/swig-0_28_5/xmp_wrap.cxx
@@ -8876,17 +8876,19 @@ SWIGINTERN PyObject *_wrap_XmpData_erase(PyObject *self, PyObject *args) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "XmpData_erase" "', argument " "1"" of type '" "Exiv2::XmpData *""'"); 
   }
   arg1 = reinterpret_cast< Exiv2::XmpData * >(argp1);
+  
   {
-    {
-      XmpData_iterator* arg2 = NULL;
-      res10 = SWIG_ConvertPtr(obj1, &argp10,SWIGTYPE_p_XmpData_iterator, 0 |  0 );
-      if (!SWIG_IsOK(res10)) {
-        SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "XmpData_erase" "', argument " "1"" of type '" "XmpData_iterator *""'"); 
-      }
-      arg2 = reinterpret_cast< XmpData_iterator * >(argp10);
-      argp2 = arg2;
+    XmpData_iterator* arg2 = NULL;
+    res10 = SWIG_ConvertPtr(obj1, &argp10,SWIGTYPE_p_XmpData_iterator, 0 |  0 );
+    if (!SWIG_IsOK(res10)) {
+      SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "XmpData_erase" "', argument " "1"" of type '" "XmpData_iterator *""'"); 
     }
-    arg2 = argp2->_ptr();
+    arg2 = reinterpret_cast< XmpData_iterator * >(argp10);
+    argp2 = arg2;
+  }
+  arg2 = argp2->_ptr();
+  
+  {
     argp2->_invalidate();
   }
   {
@@ -8952,9 +8954,9 @@ SWIGINTERN PyObject *_wrap_XmpData_eraseFamily(PyObject *self, PyObject *args) {
     }
     it2 = argp2->_ptr();
     arg2 = &it2;
-    
+  }
+  {
     argp2->_invalidate();
-    
   }
   {
     try {

Original file line number	Diff line number	Diff line change
`@@ -9700,17 +9700,19 @@ SWIGINTERN PyObject _wrap_ExifData_erase__SWIG_0(PyObject self, PyObject *args`
`9700`	`9700`	`SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ExifData_erase" "', argument " "1"" of type '" "Exiv2::ExifData *""'");`
`9701`	`9701`	`}`
`9702`	`9702`	`arg1 = reinterpret_cast< Exiv2::ExifData * >(argp1);`
	`9703`	`+`
`9703`	`9704`	`{`
`9704`		`- {`
`9705`		`- ExifData_iterator* arg2 = NULL;`
`9706`		`- res10 = SWIG_ConvertPtr(obj1, &argp10,SWIGTYPE_p_ExifData_iterator, 0 \| 0 );`
`9707`		`- if (!SWIG_IsOK(res10)) {`
`9708`		`- SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "ExifData_erase" "', argument " "1"" of type '" "ExifData_iterator *""'");`
`9709`		`- }`
`9710`		`- arg2 = reinterpret_cast< ExifData_iterator * >(argp10);`
`9711`		`- argp2 = arg2;`
	`9705`	`+ ExifData_iterator* arg2 = NULL;`
	`9706`	`+ res10 = SWIG_ConvertPtr(obj1, &argp10,SWIGTYPE_p_ExifData_iterator, 0 \| 0 );`
	`9707`	`+ if (!SWIG_IsOK(res10)) {`
	`9708`	`+ SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "ExifData_erase" "', argument " "1"" of type '" "ExifData_iterator *""'");`
`9712`	`9709`	`}`
`9713`		`- arg2 = argp2->_ptr();`
	`9710`	`+ arg2 = reinterpret_cast< ExifData_iterator * >(argp10);`
	`9711`	`+ argp2 = arg2;`
	`9712`	`+ }`
	`9713`	`+ arg2 = argp2->_ptr();`
	`9714`	`+`
	`9715`	`+ {`
`9714`	`9716`	`argp2->_invalidate();`
`9715`	`9717`	`}`
`9716`	`9718`	`{`
`@@ -9769,19 +9771,18 @@ SWIGINTERN PyObject _wrap_ExifData_erase__SWIG_1(PyObject self, PyObject *args`
`9769`	`9771`	`SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ExifData_erase" "', argument " "1"" of type '" "Exiv2::ExifData *""'");`
`9770`	`9772`	`}`
`9771`	`9773`	`arg1 = reinterpret_cast< Exiv2::ExifData * >(argp1);`
	`9774`	`+`
`9772`	`9775`	`{`
`9773`		`- {`
`9774`		`- ExifData_iterator* arg2 = NULL;`
`9775`		`- res10 = SWIG_ConvertPtr(obj1, &argp10,SWIGTYPE_p_ExifData_iterator, 0 \| 0 );`
`9776`		`- if (!SWIG_IsOK(res10)) {`
`9777`		`- SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "ExifData_erase" "', argument " "1"" of type '" "ExifData_iterator *""'");`
`9778`		`- }`
`9779`		`- arg2 = reinterpret_cast< ExifData_iterator * >(argp10);`
`9780`		`- argp2 = arg2;`
	`9776`	`+ ExifData_iterator* arg2 = NULL;`
	`9777`	`+ res10 = SWIG_ConvertPtr(obj1, &argp10,SWIGTYPE_p_ExifData_iterator, 0 \| 0 );`
	`9778`	`+ if (!SWIG_IsOK(res10)) {`
	`9779`	`+ SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "ExifData_erase" "', argument " "1"" of type '" "ExifData_iterator *""'");`
`9781`	`9780`	`}`
`9782`		`- arg2 = argp2->_ptr();`
`9783`		`- argp2->_invalidate();`
	`9781`	`+ arg2 = reinterpret_cast< ExifData_iterator * >(argp10);`
	`9782`	`+ argp2 = arg2;`
`9784`	`9783`	`}`
	`9784`	`+ arg2 = argp2->_ptr();`
	`9785`	`+`
`9785`	`9786`
`9786`	`9787`	`{`
`9787`	`9788`	`ExifData_iterator* arg3 = NULL;`
`@@ -9794,6 +9795,9 @@ SWIGINTERN PyObject _wrap_ExifData_erase__SWIG_1(PyObject self, PyObject *args`
`9794`	`9795`	`}`
`9795`	`9796`	`arg3 = argp3->_ptr();`
`9796`	`9797`
	`9798`	`+ {`
	`9799`	`+ argp2->_invalidate();`
	`9800`	`+ }`
`9797`	`9801`	`{`
`9798`	`9802`	`try {`
`9799`	`9803`	`result = (arg1)->erase(SWIG_STD_MOVE(arg2),SWIG_STD_MOVE(arg3));`
Original file line number	Diff line number	Diff line change
`@@ -8759,17 +8759,19 @@ SWIGINTERN PyObject _wrap_IptcData_erase(PyObject self, PyObject *args) {`
`8759`	`8759`	`SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IptcData_erase" "', argument " "1"" of type '" "Exiv2::IptcData *""'");`
`8760`	`8760`	`}`
`8761`	`8761`	`arg1 = reinterpret_cast< Exiv2::IptcData * >(argp1);`
	`8762`	`+`
`8762`	`8763`	`{`
`8763`		`- {`
`8764`		`- IptcData_iterator* arg2 = NULL;`
`8765`		`- res10 = SWIG_ConvertPtr(obj1, &argp10,SWIGTYPE_p_IptcData_iterator, 0 \| 0 );`
`8766`		`- if (!SWIG_IsOK(res10)) {`
`8767`		`- SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "IptcData_erase" "', argument " "1"" of type '" "IptcData_iterator *""'");`
`8768`		`- }`
`8769`		`- arg2 = reinterpret_cast< IptcData_iterator * >(argp10);`
`8770`		`- argp2 = arg2;`
	`8764`	`+ IptcData_iterator* arg2 = NULL;`
	`8765`	`+ res10 = SWIG_ConvertPtr(obj1, &argp10,SWIGTYPE_p_IptcData_iterator, 0 \| 0 );`
	`8766`	`+ if (!SWIG_IsOK(res10)) {`
	`8767`	`+ SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "IptcData_erase" "', argument " "1"" of type '" "IptcData_iterator *""'");`
`8771`	`8768`	`}`
`8772`		`- arg2 = argp2->_ptr();`
	`8769`	`+ arg2 = reinterpret_cast< IptcData_iterator * >(argp10);`
	`8770`	`+ argp2 = arg2;`
	`8771`	`+ }`
	`8772`	`+ arg2 = argp2->_ptr();`
	`8773`	`+`
	`8774`	`+ {`
`8773`	`8775`	`argp2->_invalidate();`
`8774`	`8776`	`}`
`8775`	`8777`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8613,17 +8613,19 @@ SWIGINTERN PyObject _wrap_XmpData_erase(PyObject self, PyObject *args) {`
`8613`	`8613`	`SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "XmpData_erase" "', argument " "1"" of type '" "Exiv2::XmpData *""'");`
`8614`	`8614`	`}`
`8615`	`8615`	`arg1 = reinterpret_cast< Exiv2::XmpData * >(argp1);`
	`8616`	`+`
`8616`	`8617`	`{`
`8617`		`- {`
`8618`		`- XmpData_iterator* arg2 = NULL;`
`8619`		`- res10 = SWIG_ConvertPtr(obj1, &argp10,SWIGTYPE_p_XmpData_iterator, 0 \| 0 );`
`8620`		`- if (!SWIG_IsOK(res10)) {`
`8621`		`- SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "XmpData_erase" "', argument " "1"" of type '" "XmpData_iterator *""'");`
`8622`		`- }`
`8623`		`- arg2 = reinterpret_cast< XmpData_iterator * >(argp10);`
`8624`		`- argp2 = arg2;`
	`8618`	`+ XmpData_iterator* arg2 = NULL;`
	`8619`	`+ res10 = SWIG_ConvertPtr(obj1, &argp10,SWIGTYPE_p_XmpData_iterator, 0 \| 0 );`
	`8620`	`+ if (!SWIG_IsOK(res10)) {`
	`8621`	`+ SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "XmpData_erase" "', argument " "1"" of type '" "XmpData_iterator *""'");`
`8625`	`8622`	`}`
`8626`		`- arg2 = argp2->_ptr();`
	`8623`	`+ arg2 = reinterpret_cast< XmpData_iterator * >(argp10);`
	`8624`	`+ argp2 = arg2;`
	`8625`	`+ }`
	`8626`	`+ arg2 = argp2->_ptr();`
	`8627`	`+`
	`8628`	`+ {`
`8627`	`8629`	`argp2->_invalidate();`
`8628`	`8630`	`}`
`8629`	`8631`	`{`
`@@ -8689,9 +8691,9 @@ SWIGINTERN PyObject _wrap_XmpData_eraseFamily(PyObject self, PyObject *args) {`
`8689`	`8691`	`}`
`8690`	`8692`	`it2 = argp2->_ptr();`
`8691`	`8693`	`arg2 = &it2;`
`8692`		`-`
	`8694`	`+ }`
	`8695`	`+ {`
`8693`	`8696`	`argp2->_invalidate();`
`8694`		`-`
`8695`	`8697`	`}`
`8696`	`8698`	`{`
`8697`	`8699`	`try {`
Original file line number	Diff line number	Diff line change
`@@ -9904,17 +9904,19 @@ SWIGINTERN PyObject _wrap_ExifData_erase__SWIG_0(PyObject self, PyObject *args`
`9904`	`9904`	`SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ExifData_erase" "', argument " "1"" of type '" "Exiv2::ExifData *""'");`
`9905`	`9905`	`}`
`9906`	`9906`	`arg1 = reinterpret_cast< Exiv2::ExifData * >(argp1);`
	`9907`	`+`
`9907`	`9908`	`{`
`9908`		`- {`
`9909`		`- ExifData_iterator* arg2 = NULL;`
`9910`		`- res10 = SWIG_ConvertPtr(obj1, &argp10,SWIGTYPE_p_ExifData_iterator, 0 \| 0 );`
`9911`		`- if (!SWIG_IsOK(res10)) {`
`9912`		`- SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "ExifData_erase" "', argument " "1"" of type '" "ExifData_iterator *""'");`
`9913`		`- }`
`9914`		`- arg2 = reinterpret_cast< ExifData_iterator * >(argp10);`
`9915`		`- argp2 = arg2;`
	`9909`	`+ ExifData_iterator* arg2 = NULL;`
	`9910`	`+ res10 = SWIG_ConvertPtr(obj1, &argp10,SWIGTYPE_p_ExifData_iterator, 0 \| 0 );`
	`9911`	`+ if (!SWIG_IsOK(res10)) {`
	`9912`	`+ SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "ExifData_erase" "', argument " "1"" of type '" "ExifData_iterator *""'");`
`9916`	`9913`	`}`
`9917`		`- arg2 = argp2->_ptr();`
	`9914`	`+ arg2 = reinterpret_cast< ExifData_iterator * >(argp10);`
	`9915`	`+ argp2 = arg2;`
	`9916`	`+ }`
	`9917`	`+ arg2 = argp2->_ptr();`
	`9918`	`+`
	`9919`	`+ {`
`9918`	`9920`	`argp2->_invalidate();`
`9919`	`9921`	`}`
`9920`	`9922`	`{`
`@@ -9973,19 +9975,18 @@ SWIGINTERN PyObject _wrap_ExifData_erase__SWIG_1(PyObject self, PyObject *args`
`9973`	`9975`	`SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ExifData_erase" "', argument " "1"" of type '" "Exiv2::ExifData *""'");`
`9974`	`9976`	`}`
`9975`	`9977`	`arg1 = reinterpret_cast< Exiv2::ExifData * >(argp1);`
	`9978`	`+`
`9976`	`9979`	`{`
`9977`		`- {`
`9978`		`- ExifData_iterator* arg2 = NULL;`
`9979`		`- res10 = SWIG_ConvertPtr(obj1, &argp10,SWIGTYPE_p_ExifData_iterator, 0 \| 0 );`
`9980`		`- if (!SWIG_IsOK(res10)) {`
`9981`		`- SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "ExifData_erase" "', argument " "1"" of type '" "ExifData_iterator *""'");`
`9982`		`- }`
`9983`		`- arg2 = reinterpret_cast< ExifData_iterator * >(argp10);`
`9984`		`- argp2 = arg2;`
	`9980`	`+ ExifData_iterator* arg2 = NULL;`
	`9981`	`+ res10 = SWIG_ConvertPtr(obj1, &argp10,SWIGTYPE_p_ExifData_iterator, 0 \| 0 );`
	`9982`	`+ if (!SWIG_IsOK(res10)) {`
	`9983`	`+ SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "ExifData_erase" "', argument " "1"" of type '" "ExifData_iterator *""'");`
`9985`	`9984`	`}`
`9986`		`- arg2 = argp2->_ptr();`
`9987`		`- argp2->_invalidate();`
	`9985`	`+ arg2 = reinterpret_cast< ExifData_iterator * >(argp10);`
	`9986`	`+ argp2 = arg2;`
`9988`	`9987`	`}`
	`9988`	`+ arg2 = argp2->_ptr();`
	`9989`	`+`
`9989`	`9990`
`9990`	`9991`	`{`
`9991`	`9992`	`ExifData_iterator* arg3 = NULL;`
`@@ -9998,6 +9999,9 @@ SWIGINTERN PyObject _wrap_ExifData_erase__SWIG_1(PyObject self, PyObject *args`
`9998`	`9999`	`}`
`9999`	`10000`	`arg3 = argp3->_ptr();`
`10000`	`10001`
	`10002`	`+ {`
	`10003`	`+ argp2->_invalidate();`
	`10004`	`+ }`
`10001`	`10005`	`{`
`10002`	`10006`	`try {`
`10003`	`10007`	`result = (arg1)->erase(SWIG_STD_MOVE(arg2),SWIG_STD_MOVE(arg3));`
Original file line number	Diff line number	Diff line change
`@@ -8970,17 +8970,19 @@ SWIGINTERN PyObject _wrap_IptcData_erase(PyObject self, PyObject *args) {`
`8970`	`8970`	`SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IptcData_erase" "', argument " "1"" of type '" "Exiv2::IptcData *""'");`
`8971`	`8971`	`}`
`8972`	`8972`	`arg1 = reinterpret_cast< Exiv2::IptcData * >(argp1);`
	`8973`	`+`
`8973`	`8974`	`{`
`8974`		`- {`
`8975`		`- IptcData_iterator* arg2 = NULL;`
`8976`		`- res10 = SWIG_ConvertPtr(obj1, &argp10,SWIGTYPE_p_IptcData_iterator, 0 \| 0 );`
`8977`		`- if (!SWIG_IsOK(res10)) {`
`8978`		`- SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "IptcData_erase" "', argument " "1"" of type '" "IptcData_iterator *""'");`
`8979`		`- }`
`8980`		`- arg2 = reinterpret_cast< IptcData_iterator * >(argp10);`
`8981`		`- argp2 = arg2;`
	`8975`	`+ IptcData_iterator* arg2 = NULL;`
	`8976`	`+ res10 = SWIG_ConvertPtr(obj1, &argp10,SWIGTYPE_p_IptcData_iterator, 0 \| 0 );`
	`8977`	`+ if (!SWIG_IsOK(res10)) {`
	`8978`	`+ SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "IptcData_erase" "', argument " "1"" of type '" "IptcData_iterator *""'");`
`8982`	`8979`	`}`
`8983`		`- arg2 = argp2->_ptr();`
	`8980`	`+ arg2 = reinterpret_cast< IptcData_iterator * >(argp10);`
	`8981`	`+ argp2 = arg2;`
	`8982`	`+ }`
	`8983`	`+ arg2 = argp2->_ptr();`
	`8984`	`+`
	`8985`	`+ {`
`8984`	`8986`	`argp2->_invalidate();`
`8985`	`8987`	`}`
`8986`	`8988`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8876,17 +8876,19 @@ SWIGINTERN PyObject _wrap_XmpData_erase(PyObject self, PyObject *args) {`
`8876`	`8876`	`SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "XmpData_erase" "', argument " "1"" of type '" "Exiv2::XmpData *""'");`
`8877`	`8877`	`}`
`8878`	`8878`	`arg1 = reinterpret_cast< Exiv2::XmpData * >(argp1);`
	`8879`	`+`
`8879`	`8880`	`{`
`8880`		`- {`
`8881`		`- XmpData_iterator* arg2 = NULL;`
`8882`		`- res10 = SWIG_ConvertPtr(obj1, &argp10,SWIGTYPE_p_XmpData_iterator, 0 \| 0 );`
`8883`		`- if (!SWIG_IsOK(res10)) {`
`8884`		`- SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "XmpData_erase" "', argument " "1"" of type '" "XmpData_iterator *""'");`
`8885`		`- }`
`8886`		`- arg2 = reinterpret_cast< XmpData_iterator * >(argp10);`
`8887`		`- argp2 = arg2;`
	`8881`	`+ XmpData_iterator* arg2 = NULL;`
	`8882`	`+ res10 = SWIG_ConvertPtr(obj1, &argp10,SWIGTYPE_p_XmpData_iterator, 0 \| 0 );`
	`8883`	`+ if (!SWIG_IsOK(res10)) {`
	`8884`	`+ SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "XmpData_erase" "', argument " "1"" of type '" "XmpData_iterator *""'");`
`8888`	`8885`	`}`
`8889`		`- arg2 = argp2->_ptr();`
	`8886`	`+ arg2 = reinterpret_cast< XmpData_iterator * >(argp10);`
	`8887`	`+ argp2 = arg2;`
	`8888`	`+ }`
	`8889`	`+ arg2 = argp2->_ptr();`
	`8890`	`+`
	`8891`	`+ {`
`8890`	`8892`	`argp2->_invalidate();`
`8891`	`8893`	`}`
`8892`	`8894`	`{`
`@@ -8952,9 +8954,9 @@ SWIGINTERN PyObject _wrap_XmpData_eraseFamily(PyObject self, PyObject *args) {`
`8952`	`8954`	`}`
`8953`	`8955`	`it2 = argp2->_ptr();`
`8954`	`8956`	`arg2 = &it2;`
`8955`		`-`
	`8957`	`+ }`
	`8958`	`+ {`
`8956`	`8959`	`argp2->_invalidate();`
`8957`		`-`
`8958`	`8960`	`}`
`8959`	`8961`	`{`
`8960`	`8962`	`try {`