Improved iterator output typemap

Author: jim-easterbrook

src/interface/shared/metadatum_wrappers.i

@@ -166,22 +166,10 @@ public:
     it = argp->_ptr();
     $1 = ⁢
 }
-%newobject Exiv2::container_type::begin;
-%newobject Exiv2::container_type::end;
-%newobject Exiv2::container_type::erase;
-%newobject Exiv2::container_type::findId;
-%newobject Exiv2::container_type::findKey;
-// Assumes arg1 is the base class parent
-#if SWIG_VERSION >= 0x040400
-%typemap(out, fragment="iterator_store")
-    Exiv2::container_type::iterator {
-#else
 %typemap(out) Exiv2::container_type::iterator {
-#endif
-    Exiv2::container_type::iterator tmp = $1;
-    container_type##_iterator* $1 = new container_type##_iterator(
-        tmp, arg1->end());
-    $typemap(out, container_type##_iterator*);
+    $result = SWIG_NewPointerObj(
+        SWIG_as_voidptr(new container_type##_iterator($1, arg1->end())),
+        $descriptor(container_type##_iterator*), SWIG_POINTER_OWN);
 #if SWIG_VERSION >= 0x040400
     // Keep weak reference to the Python iterator
     if (store_iterator(self, $result)) {

src/swig-0_27_7/exif_wrap.cxx

@@ -9725,10 +9725,9 @@ SWIGINTERN PyObject *_wrap_ExifData_erase__SWIG_0(PyObject *self, PyObject *args
     }
   }
   {
-    Exiv2::ExifData::iterator tmp = result;
-    ExifData_iterator* result = new ExifData_iterator(
-      tmp, arg1->end());
-    resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ExifData_iterator, SWIG_POINTER_OWN |  0 );;
+    resultobj = SWIG_NewPointerObj(
+      SWIG_as_voidptr(new ExifData_iterator(result, arg1->end())),
+      SWIGTYPE_p_ExifData_iterator, SWIG_POINTER_OWN);
 
 
 
@@ -9808,10 +9807,9 @@ SWIGINTERN PyObject *_wrap_ExifData_erase__SWIG_1(PyObject *self, PyObject *args
     }
   }
   {
-    Exiv2::ExifData::iterator tmp = result;
-    ExifData_iterator* result = new ExifData_iterator(
-      tmp, arg1->end());
-    resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ExifData_iterator, SWIG_POINTER_OWN |  0 );;
+    resultobj = SWIG_NewPointerObj(
+      SWIG_as_voidptr(new ExifData_iterator(result, arg1->end())),
+      SWIGTYPE_p_ExifData_iterator, SWIG_POINTER_OWN);
 
 
 
@@ -9957,10 +9955,9 @@ SWIGINTERN PyObject *_wrap_ExifData_begin(PyObject *self, PyObject *args) {
   arg1 = reinterpret_cast< Exiv2::ExifData * >(argp1);
   result = (arg1)->begin();
   {
-    Exiv2::ExifData::iterator tmp = result;
-    ExifData_iterator* result = new ExifData_iterator(
-      tmp, arg1->end());
-    resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ExifData_iterator, SWIG_POINTER_OWN |  0 );;
+    resultobj = SWIG_NewPointerObj(
+      SWIG_as_voidptr(new ExifData_iterator(result, arg1->end())),
+      SWIGTYPE_p_ExifData_iterator, SWIG_POINTER_OWN);
 
 
 
@@ -9995,10 +9992,9 @@ SWIGINTERN PyObject *_wrap_ExifData_end(PyObject *self, PyObject *args) {
   arg1 = reinterpret_cast< Exiv2::ExifData * >(argp1);
   result = (arg1)->end();
   {
-    Exiv2::ExifData::iterator tmp = result;
-    ExifData_iterator* result = new ExifData_iterator(
-      tmp, arg1->end());
-    resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ExifData_iterator, SWIG_POINTER_OWN |  0 );;
+    resultobj = SWIG_NewPointerObj(
+      SWIG_as_voidptr(new ExifData_iterator(result, arg1->end())),
+      SWIGTYPE_p_ExifData_iterator, SWIG_POINTER_OWN);
 
 
 
@@ -10053,10 +10049,9 @@ SWIGINTERN PyObject *_wrap_ExifData_findKey(PyObject *self, PyObject *args) {
     }
   }
   {
-    Exiv2::ExifData::iterator tmp = result;
-    ExifData_iterator* result = new ExifData_iterator(
-      tmp, arg1->end());
-    resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ExifData_iterator, SWIG_POINTER_OWN |  0 );;
+    resultobj = SWIG_NewPointerObj(
+      SWIG_as_voidptr(new ExifData_iterator(result, arg1->end())),
+      SWIGTYPE_p_ExifData_iterator, SWIG_POINTER_OWN);
 
 
 

src/swig-0_27_7/image_wrap.cxx

@@ -3989,77 +3989,80 @@ SwigPyBuiltin_iternextfunc_closure(SwigPyWrapperFunction wrapper, PyObject *a) {
 
 /* -------- TYPES TABLE (BEGIN) -------- */
 
-#define SWIGTYPE_p_Exifdatum_reference swig_types[0]
-#define SWIGTYPE_p_Exiv2__AsciiValue swig_types[1]
-#define SWIGTYPE_p_Exiv2__BasicIo swig_types[2]
-#define SWIGTYPE_p_Exiv2__CommentValue swig_types[3]
-#define SWIGTYPE_p_Exiv2__DataBuf swig_types[4]
-#define SWIGTYPE_p_Exiv2__DataSet swig_types[5]
-#define SWIGTYPE_p_Exiv2__DataValue swig_types[6]
-#define SWIGTYPE_p_Exiv2__DateValue swig_types[7]
-#define SWIGTYPE_p_Exiv2__ExifData swig_types[8]
-#define SWIGTYPE_p_Exiv2__ExifKey swig_types[9]
-#define SWIGTYPE_p_Exiv2__FileIo swig_types[10]
-#define SWIGTYPE_p_Exiv2__GroupInfo swig_types[11]
-#define SWIGTYPE_p_Exiv2__HttpIo swig_types[12]
-#define SWIGTYPE_p_Exiv2__Image swig_types[13]
-#define SWIGTYPE_p_Exiv2__ImageFactory swig_types[14]
-#define SWIGTYPE_p_Exiv2__IptcData swig_types[15]
-#define SWIGTYPE_p_Exiv2__IptcKey swig_types[16]
-#define SWIGTYPE_p_Exiv2__Key swig_types[17]
-#define SWIGTYPE_p_Exiv2__LangAltValue swig_types[18]
-#define SWIGTYPE_p_Exiv2__MemIo swig_types[19]
-#define SWIGTYPE_p_Exiv2__RemoteIo swig_types[20]
-#define SWIGTYPE_p_Exiv2__StringValue swig_types[21]
-#define SWIGTYPE_p_Exiv2__StringValueBase swig_types[22]
-#define SWIGTYPE_p_Exiv2__TagInfo swig_types[23]
-#define SWIGTYPE_p_Exiv2__TimeValue swig_types[24]
-#define SWIGTYPE_p_Exiv2__Value swig_types[25]
-#define SWIGTYPE_p_Exiv2__ValueTypeT_double_t swig_types[26]
-#define SWIGTYPE_p_Exiv2__ValueTypeT_float_t swig_types[27]
-#define SWIGTYPE_p_Exiv2__ValueTypeT_int16_t_t swig_types[28]
-#define SWIGTYPE_p_Exiv2__ValueTypeT_int32_t_t swig_types[29]
-#define SWIGTYPE_p_Exiv2__ValueTypeT_std__pairT_int32_t_int32_t_t_t swig_types[30]
-#define SWIGTYPE_p_Exiv2__ValueTypeT_std__pairT_uint32_t_uint32_t_t_t swig_types[31]
-#define SWIGTYPE_p_Exiv2__ValueTypeT_uint16_t_t swig_types[32]
-#define SWIGTYPE_p_Exiv2__ValueTypeT_uint32_t_t swig_types[33]
-#define SWIGTYPE_p_Exiv2__XPathIo swig_types[34]
-#define SWIGTYPE_p_Exiv2__XmpArrayValue swig_types[35]
-#define SWIGTYPE_p_Exiv2__XmpData swig_types[36]
-#define SWIGTYPE_p_Exiv2__XmpKey swig_types[37]
-#define SWIGTYPE_p_Exiv2__XmpPropertyInfo swig_types[38]
-#define SWIGTYPE_p_Exiv2__XmpTextValue swig_types[39]
-#define SWIGTYPE_p_Exiv2__XmpValue swig_types[40]
-#define SWIGTYPE_p_Iptcdatum_reference swig_types[41]
-#define SWIGTYPE_p_SwigPyObject swig_types[42]
-#define SWIGTYPE_p_ValueType swig_types[43]
-#define SWIGTYPE_p_Xmpdatum_reference swig_types[44]
-#define SWIGTYPE_p_allocator_type swig_types[45]
-#define SWIGTYPE_p_char swig_types[46]
-#define SWIGTYPE_p_const_iterator swig_types[47]
-#define SWIGTYPE_p_difference_type swig_types[48]
-#define SWIGTYPE_p_first_type swig_types[49]
-#define SWIGTYPE_p_int swig_types[50]
-#define SWIGTYPE_p_iterator swig_types[51]
-#define SWIGTYPE_p_key_type swig_types[52]
-#define SWIGTYPE_p_long_long swig_types[53]
-#define SWIGTYPE_p_mapped_type swig_types[54]
-#define SWIGTYPE_p_second_type swig_types[55]
-#define SWIGTYPE_p_short swig_types[56]
-#define SWIGTYPE_p_signed_char swig_types[57]
-#define SWIGTYPE_p_size_type swig_types[58]
-#define SWIGTYPE_p_std__listT_Exiv2__Exifdatum_t swig_types[59]
-#define SWIGTYPE_p_std__pairT_int32_t_int32_t_t swig_types[60]
-#define SWIGTYPE_p_std__pairT_uint32_t_uint32_t_t swig_types[61]
-#define SWIGTYPE_p_std__vectorT_Exiv2__Iptcdatum_std__allocatorT_Exiv2__Iptcdatum_t_t swig_types[62]
-#define SWIGTYPE_p_std__vectorT_Exiv2__Xmpdatum_std__allocatorT_Exiv2__Xmpdatum_t_t swig_types[63]
-#define SWIGTYPE_p_unsigned_char swig_types[64]
-#define SWIGTYPE_p_unsigned_int swig_types[65]
-#define SWIGTYPE_p_unsigned_long_long swig_types[66]
-#define SWIGTYPE_p_unsigned_short swig_types[67]
-#define SWIGTYPE_p_value_type swig_types[68]
-static swig_type_info *swig_types[70];
-static swig_module_info swig_module = {swig_types, 69, 0, 0, 0, 0};
+#define SWIGTYPE_p_ExifData_iterator swig_types[0]
+#define SWIGTYPE_p_Exifdatum_reference swig_types[1]
+#define SWIGTYPE_p_Exiv2__AsciiValue swig_types[2]
+#define SWIGTYPE_p_Exiv2__BasicIo swig_types[3]
+#define SWIGTYPE_p_Exiv2__CommentValue swig_types[4]
+#define SWIGTYPE_p_Exiv2__DataBuf swig_types[5]
+#define SWIGTYPE_p_Exiv2__DataSet swig_types[6]
+#define SWIGTYPE_p_Exiv2__DataValue swig_types[7]
+#define SWIGTYPE_p_Exiv2__DateValue swig_types[8]
+#define SWIGTYPE_p_Exiv2__ExifData swig_types[9]
+#define SWIGTYPE_p_Exiv2__ExifKey swig_types[10]
+#define SWIGTYPE_p_Exiv2__FileIo swig_types[11]
+#define SWIGTYPE_p_Exiv2__GroupInfo swig_types[12]
+#define SWIGTYPE_p_Exiv2__HttpIo swig_types[13]
+#define SWIGTYPE_p_Exiv2__Image swig_types[14]
+#define SWIGTYPE_p_Exiv2__ImageFactory swig_types[15]
+#define SWIGTYPE_p_Exiv2__IptcData swig_types[16]
+#define SWIGTYPE_p_Exiv2__IptcKey swig_types[17]
+#define SWIGTYPE_p_Exiv2__Key swig_types[18]
+#define SWIGTYPE_p_Exiv2__LangAltValue swig_types[19]
+#define SWIGTYPE_p_Exiv2__MemIo swig_types[20]
+#define SWIGTYPE_p_Exiv2__RemoteIo swig_types[21]
+#define SWIGTYPE_p_Exiv2__StringValue swig_types[22]
+#define SWIGTYPE_p_Exiv2__StringValueBase swig_types[23]
+#define SWIGTYPE_p_Exiv2__TagInfo swig_types[24]
+#define SWIGTYPE_p_Exiv2__TimeValue swig_types[25]
+#define SWIGTYPE_p_Exiv2__Value swig_types[26]
+#define SWIGTYPE_p_Exiv2__ValueTypeT_double_t swig_types[27]
+#define SWIGTYPE_p_Exiv2__ValueTypeT_float_t swig_types[28]
+#define SWIGTYPE_p_Exiv2__ValueTypeT_int16_t_t swig_types[29]
+#define SWIGTYPE_p_Exiv2__ValueTypeT_int32_t_t swig_types[30]
+#define SWIGTYPE_p_Exiv2__ValueTypeT_std__pairT_int32_t_int32_t_t_t swig_types[31]
+#define SWIGTYPE_p_Exiv2__ValueTypeT_std__pairT_uint32_t_uint32_t_t_t swig_types[32]
+#define SWIGTYPE_p_Exiv2__ValueTypeT_uint16_t_t swig_types[33]
+#define SWIGTYPE_p_Exiv2__ValueTypeT_uint32_t_t swig_types[34]
+#define SWIGTYPE_p_Exiv2__XPathIo swig_types[35]
+#define SWIGTYPE_p_Exiv2__XmpArrayValue swig_types[36]
+#define SWIGTYPE_p_Exiv2__XmpData swig_types[37]
+#define SWIGTYPE_p_Exiv2__XmpKey swig_types[38]
+#define SWIGTYPE_p_Exiv2__XmpPropertyInfo swig_types[39]
+#define SWIGTYPE_p_Exiv2__XmpTextValue swig_types[40]
+#define SWIGTYPE_p_Exiv2__XmpValue swig_types[41]
+#define SWIGTYPE_p_IptcData_iterator swig_types[42]
+#define SWIGTYPE_p_Iptcdatum_reference swig_types[43]
+#define SWIGTYPE_p_SwigPyObject swig_types[44]
+#define SWIGTYPE_p_ValueType swig_types[45]
+#define SWIGTYPE_p_XmpData_iterator swig_types[46]
+#define SWIGTYPE_p_Xmpdatum_reference swig_types[47]
+#define SWIGTYPE_p_allocator_type swig_types[48]
+#define SWIGTYPE_p_char swig_types[49]
+#define SWIGTYPE_p_const_iterator swig_types[50]
+#define SWIGTYPE_p_difference_type swig_types[51]
+#define SWIGTYPE_p_first_type swig_types[52]
+#define SWIGTYPE_p_int swig_types[53]
+#define SWIGTYPE_p_iterator swig_types[54]
+#define SWIGTYPE_p_key_type swig_types[55]
+#define SWIGTYPE_p_long_long swig_types[56]
+#define SWIGTYPE_p_mapped_type swig_types[57]
+#define SWIGTYPE_p_second_type swig_types[58]
+#define SWIGTYPE_p_short swig_types[59]
+#define SWIGTYPE_p_signed_char swig_types[60]
+#define SWIGTYPE_p_size_type swig_types[61]
+#define SWIGTYPE_p_std__listT_Exiv2__Exifdatum_t swig_types[62]
+#define SWIGTYPE_p_std__pairT_int32_t_int32_t_t swig_types[63]
+#define SWIGTYPE_p_std__pairT_uint32_t_uint32_t_t swig_types[64]
+#define SWIGTYPE_p_std__vectorT_Exiv2__Iptcdatum_std__allocatorT_Exiv2__Iptcdatum_t_t swig_types[65]
+#define SWIGTYPE_p_std__vectorT_Exiv2__Xmpdatum_std__allocatorT_Exiv2__Xmpdatum_t_t swig_types[66]
+#define SWIGTYPE_p_unsigned_char swig_types[67]
+#define SWIGTYPE_p_unsigned_int swig_types[68]
+#define SWIGTYPE_p_unsigned_long_long swig_types[69]
+#define SWIGTYPE_p_unsigned_short swig_types[70]
+#define SWIGTYPE_p_value_type swig_types[71]
+static swig_type_info *swig_types[73];
+static swig_module_info swig_module = {swig_types, 72, 0, 0, 0, 0};
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
@@ -8388,6 +8391,7 @@ static void *_p_Exiv2__XmpArrayValueTo_p_Exiv2__XmpValue(void *x, int *SWIGUNUSE
 static void *_p_Exiv2__XmpTextValueTo_p_Exiv2__XmpValue(void *x, int *SWIGUNUSEDPARM(newmemory)) {
     return (void *)((Exiv2::XmpValue *)  ((Exiv2::XmpTextValue *) x));
 }
+static swig_type_info _swigt__p_ExifData_iterator = {"_p_ExifData_iterator", "ExifData_iterator *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_Exifdatum_reference = {"_p_Exifdatum_reference", "Exifdatum_reference *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_Exiv2__AsciiValue = {"_p_Exiv2__AsciiValue", "Exiv2::AsciiValue *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_Exiv2__BasicIo = {"_p_Exiv2__BasicIo", "Exiv2::BasicIo *", 0, 0, (void*)0, 0};
@@ -8429,9 +8433,11 @@ static swig_type_info _swigt__p_Exiv2__XmpKey = {"_p_Exiv2__XmpKey", "Exiv2::Xmp
 static swig_type_info _swigt__p_Exiv2__XmpPropertyInfo = {"_p_Exiv2__XmpPropertyInfo", "Exiv2::XmpPropertyInfo *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_Exiv2__XmpTextValue = {"_p_Exiv2__XmpTextValue", "Exiv2::XmpTextValue *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_Exiv2__XmpValue = {"_p_Exiv2__XmpValue", "Exiv2::XmpValue *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_IptcData_iterator = {"_p_IptcData_iterator", "IptcData_iterator *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_Iptcdatum_reference = {"_p_Iptcdatum_reference", "Iptcdatum_reference *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_SwigPyObject = {"_p_SwigPyObject", "SwigPyObject *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_ValueType = {"_p_ValueType", "ValueType *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_XmpData_iterator = {"_p_XmpData_iterator", "XmpData_iterator *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_Xmpdatum_reference = {"_p_Xmpdatum_reference", "Xmpdatum_reference *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_allocator_type = {"_p_allocator_type", "allocator_type *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0};
@@ -8459,6 +8465,7 @@ static swig_type_info _swigt__p_unsigned_short = {"_p_unsigned_short", "uint16_t
 static swig_type_info _swigt__p_value_type = {"_p_value_type", "value_type *", 0, 0, (void*)0, 0};
 
 static swig_type_info *swig_type_initial[] = {
+  &_swigt__p_ExifData_iterator,
   &_swigt__p_Exifdatum_reference,
   &_swigt__p_Exiv2__AsciiValue,
   &_swigt__p_Exiv2__BasicIo,
@@ -8500,9 +8507,11 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_Exiv2__XmpPropertyInfo,
   &_swigt__p_Exiv2__XmpTextValue,
   &_swigt__p_Exiv2__XmpValue,
+  &_swigt__p_IptcData_iterator,
   &_swigt__p_Iptcdatum_reference,
   &_swigt__p_SwigPyObject,
   &_swigt__p_ValueType,
+  &_swigt__p_XmpData_iterator,
   &_swigt__p_Xmpdatum_reference,
   &_swigt__p_allocator_type,
   &_swigt__p_char,
@@ -8530,6 +8539,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_value_type,
 };
 
+static swig_cast_info _swigc__p_ExifData_iterator[] = {  {&_swigt__p_ExifData_iterator, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_Exifdatum_reference[] = {  {&_swigt__p_Exifdatum_reference, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_Exiv2__AsciiValue[] = {  {&_swigt__p_Exiv2__AsciiValue, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_Exiv2__FileIo[] = {{&_swigt__p_Exiv2__FileIo, 0, 0, 0},{0, 0, 0, 0}};
@@ -8571,9 +8581,11 @@ static swig_cast_info _swigc__p_Exiv2__XmpKey[] = {  {&_swigt__p_Exiv2__XmpKey,
 static swig_cast_info _swigc__p_Exiv2__XmpPropertyInfo[] = {  {&_swigt__p_Exiv2__XmpPropertyInfo, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_Exiv2__XmpTextValue[] = {  {&_swigt__p_Exiv2__XmpTextValue, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_Exiv2__XmpValue[] = {  {&_swigt__p_Exiv2__XmpValue, 0, 0, 0},  {&_swigt__p_Exiv2__LangAltValue, _p_Exiv2__LangAltValueTo_p_Exiv2__XmpValue, 0, 0},  {&_swigt__p_Exiv2__XmpArrayValue, _p_Exiv2__XmpArrayValueTo_p_Exiv2__XmpValue, 0, 0},  {&_swigt__p_Exiv2__XmpTextValue, _p_Exiv2__XmpTextValueTo_p_Exiv2__XmpValue, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_IptcData_iterator[] = {  {&_swigt__p_IptcData_iterator, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_Iptcdatum_reference[] = {  {&_swigt__p_Iptcdatum_reference, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_SwigPyObject[] = {  {&_swigt__p_SwigPyObject, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_ValueType[] = {  {&_swigt__p_ValueType, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_XmpData_iterator[] = {  {&_swigt__p_XmpData_iterator, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_Xmpdatum_reference[] = {  {&_swigt__p_Xmpdatum_reference, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_allocator_type[] = {  {&_swigt__p_allocator_type, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_char[] = {  {&_swigt__p_char, 0, 0, 0},{0, 0, 0, 0}};
@@ -8601,6 +8613,7 @@ static swig_cast_info _swigc__p_unsigned_short[] = {  {&_swigt__p_unsigned_short
 static swig_cast_info _swigc__p_value_type[] = {  {&_swigt__p_value_type, 0, 0, 0},{0, 0, 0, 0}};
 
 static swig_cast_info *swig_cast_initial[] = {
+  _swigc__p_ExifData_iterator,
   _swigc__p_Exifdatum_reference,
   _swigc__p_Exiv2__AsciiValue,
   _swigc__p_Exiv2__BasicIo,
@@ -8642,9 +8655,11 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_Exiv2__XmpPropertyInfo,
   _swigc__p_Exiv2__XmpTextValue,
   _swigc__p_Exiv2__XmpValue,
+  _swigc__p_IptcData_iterator,
   _swigc__p_Iptcdatum_reference,
   _swigc__p_SwigPyObject,
   _swigc__p_ValueType,
+  _swigc__p_XmpData_iterator,
   _swigc__p_Xmpdatum_reference,
   _swigc__p_allocator_type,
   _swigc__p_char,