From d38bd13684adfa96e27870d7503211ccd6872763 Mon Sep 17 00:00:00 2001 From: Jim Easterbrook Date: Sat, 2 Dec 2023 12:53:23 +0000 Subject: [PATCH] Make more dataset and tag info available to Python --- src/interface/datasets.i | 13 +++ src/interface/tags.i | 12 +++ src/swig-0_27_0/datasets_wrap.cxx | 22 +++- src/swig-0_27_0/image_wrap.cxx | 159 ++++++++++++++-------------- src/swig-0_27_0/iptc_wrap.cxx | 131 ++++++++++++----------- src/swig-0_27_0/preview_wrap.cxx | 159 ++++++++++++++-------------- src/swig-0_27_0/properties_wrap.cxx | 129 +++++++++++----------- src/swig-0_27_0/tags_wrap.cxx | 56 +++++----- src/swig-0_27_0/xmp_wrap.cxx | 139 ++++++++++++------------ src/swig-0_27_4/datasets_wrap.cxx | 22 +++- src/swig-0_27_4/image_wrap.cxx | 159 ++++++++++++++-------------- src/swig-0_27_4/iptc_wrap.cxx | 131 ++++++++++++----------- src/swig-0_27_4/preview_wrap.cxx | 159 ++++++++++++++-------------- src/swig-0_27_4/properties_wrap.cxx | 129 +++++++++++----------- src/swig-0_27_4/tags_wrap.cxx | 56 +++++----- src/swig-0_27_4/xmp_wrap.cxx | 139 ++++++++++++------------ src/swig-0_28_0/datasets_wrap.cxx | 22 +++- src/swig-0_28_0/image_wrap.cxx | 147 ++++++++++++------------- src/swig-0_28_0/iptc_wrap.cxx | 119 +++++++++++---------- src/swig-0_28_0/preview_wrap.cxx | 147 ++++++++++++------------- src/swig-0_28_0/properties_wrap.cxx | 117 ++++++++++---------- src/swig-0_28_0/tags_wrap.cxx | 56 +++++----- src/swig-0_28_0/xmp_wrap.cxx | 127 +++++++++++----------- tests/test_datasets.py | 10 +- tests/test_tags.py | 4 +- 25 files changed, 1267 insertions(+), 1097 deletions(-) diff --git a/src/interface/datasets.i b/src/interface/datasets.i index de19758c..316510af 100644 --- a/src/interface/datasets.i +++ b/src/interface/datasets.i @@ -23,6 +23,19 @@ wrap_auto_unique_ptr(Exiv2::IptcKey); +// IptcDataSets::application2RecordList and IptcDataSets::envelopeRecordList +// return a static list as a pointer +%typemap(out) const Exiv2::DataSet* { + const Exiv2::DataSet* ptr = $1; + PyObject* list = PyList_New(0); + while (ptr->number_ != 0xffff) { + PyList_Append(list, SWIG_NewPointerObj( + SWIG_as_voidptr(ptr), $descriptor(Exiv2::DataSet*), 0)); + ++ptr; + } + $result = SWIG_Python_AppendOutput($result, PyList_AsTuple(list)); +} + %ignore Exiv2::RecordInfo::RecordInfo; %ignore Exiv2::DataSet::DataSet; %ignore Exiv2::IptcDataSets::dataSetList; diff --git a/src/interface/tags.i b/src/interface/tags.i index 9f0a0b2a..480b0e98 100644 --- a/src/interface/tags.i +++ b/src/interface/tags.i @@ -47,6 +47,18 @@ wrap_auto_unique_ptr(Exiv2::ExifKey); $result = SWIG_Python_AppendOutput($result, PyList_AsTuple(list)); } +// GroupInfo::tagList_ returns a function pointer +%typemap(out) const Exiv2::TagInfo*(*)() { + const Exiv2::TagInfo* ti = $1(); + PyObject* list = PyList_New(0); + while (ti->tag_ != 0xFFFF) { + PyList_Append(list, SWIG_NewPointerObj( + SWIG_as_voidptr(ti), $descriptor(Exiv2::TagInfo*), 0)); + ++ti; + } + $result = SWIG_Python_AppendOutput($result, PyList_AsTuple(list)); +} + %ignore Exiv2::GroupInfo::GroupInfo; %ignore Exiv2::GroupInfo::GroupName; %ignore Exiv2::TagInfo::TagInfo; diff --git a/src/swig-0_27_0/datasets_wrap.cxx b/src/swig-0_27_0/datasets_wrap.cxx index b2fc1c3e..45e17690 100644 --- a/src/swig-0_27_0/datasets_wrap.cxx +++ b/src/swig-0_27_0/datasets_wrap.cxx @@ -5159,7 +5159,16 @@ SWIGINTERN PyObject *_wrap_IptcDataSets_envelopeRecordList(PyObject *self, PyObj SWIG_fail; } } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Exiv2__DataSet, 0 | 0 ); + { + const Exiv2::DataSet* ptr = result; + PyObject* list = PyList_New(0); + while (ptr->number_ != 0xffff) { + PyList_Append(list, SWIG_NewPointerObj( + SWIG_as_voidptr(ptr), SWIGTYPE_p_Exiv2__DataSet, 0)); + ++ptr; + } + resultobj = SWIG_Python_AppendOutput(resultobj, PyList_AsTuple(list)); + } return resultobj; fail: return NULL; @@ -5184,7 +5193,16 @@ SWIGINTERN PyObject *_wrap_IptcDataSets_application2RecordList(PyObject *self, P SWIG_fail; } } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Exiv2__DataSet, 0 | 0 ); + { + const Exiv2::DataSet* ptr = result; + PyObject* list = PyList_New(0); + while (ptr->number_ != 0xffff) { + PyList_Append(list, SWIG_NewPointerObj( + SWIG_as_voidptr(ptr), SWIGTYPE_p_Exiv2__DataSet, 0)); + ++ptr; + } + resultobj = SWIG_Python_AppendOutput(resultobj, PyList_AsTuple(list)); + } return resultobj; fail: return NULL; diff --git a/src/swig-0_27_0/image_wrap.cxx b/src/swig-0_27_0/image_wrap.cxx index 9161358e..fc871fe3 100644 --- a/src/swig-0_27_0/image_wrap.cxx +++ b/src/swig-0_27_0/image_wrap.cxx @@ -3753,83 +3753,84 @@ SwigPyBuiltin_iternextfunc_closure(SwigPyWrapperFunction wrapper, PyObject *a) { #define SWIGTYPE_p_Exiv2__BasicIo swig_types[4] #define SWIGTYPE_p_Exiv2__CommentValue swig_types[5] #define SWIGTYPE_p_Exiv2__DataBuf 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_int_t swig_types[29] -#define SWIGTYPE_p_Exiv2__ValueTypeT_short_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_unsigned_int_t swig_types[33] -#define SWIGTYPE_p_Exiv2__ValueTypeT_unsigned_short_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__XmpTextValue swig_types[39] -#define SWIGTYPE_p_Exiv2__XmpValue swig_types[40] -#define SWIGTYPE_p_IptcData_iterator swig_types[41] -#define SWIGTYPE_p_IptcData_iterator_end swig_types[42] -#define SWIGTYPE_p_NsRegistry swig_types[43] -#define SWIGTYPE_p_SwigPyObject swig_types[44] -#define SWIGTYPE_p_ValueList swig_types[45] -#define SWIGTYPE_p_ValueType swig_types[46] -#define SWIGTYPE_p_XmpData_iterator swig_types[47] -#define SWIGTYPE_p_XmpData_iterator_end swig_types[48] -#define SWIGTYPE_p_allocator_type swig_types[49] -#define SWIGTYPE_p_char swig_types[50] -#define SWIGTYPE_p_const_iterator swig_types[51] -#define SWIGTYPE_p_difference_type swig_types[52] -#define SWIGTYPE_p_first_type swig_types[53] -#define SWIGTYPE_p_int swig_types[54] -#define SWIGTYPE_p_iterator swig_types[55] -#define SWIGTYPE_p_key_type swig_types[56] -#define SWIGTYPE_p_long_long swig_types[57] -#define SWIGTYPE_p_mapped_type swig_types[58] -#define SWIGTYPE_p_second_type swig_types[59] -#define SWIGTYPE_p_short swig_types[60] -#define SWIGTYPE_p_signed_char swig_types[61] -#define SWIGTYPE_p_size_type swig_types[62] -#define SWIGTYPE_p_std__listT_Exiv2__Exifdatum_t swig_types[63] -#define SWIGTYPE_p_std__mapT_std__string_std__string_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_std__string_t_t_t swig_types[64] -#define SWIGTYPE_p_std__mapT_std__string_std__string_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_std__string_t_t_t__const_iterator swig_types[65] -#define SWIGTYPE_p_std__pairT_int_int_t swig_types[66] -#define SWIGTYPE_p_std__pairT_unsigned_int_unsigned_int_t swig_types[67] -#define SWIGTYPE_p_std__setT_std__string_t swig_types[68] -#define SWIGTYPE_p_std__setT_std__string_t__const_iterator swig_types[69] -#define SWIGTYPE_p_std__vectorT_Exiv2__Iptcdatum_std__allocatorT_Exiv2__Iptcdatum_t_t swig_types[70] -#define SWIGTYPE_p_std__vectorT_Exiv2__Xmpdatum_std__allocatorT_Exiv2__Xmpdatum_t_t swig_types[71] -#define SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t swig_types[72] -#define SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t__const_iterator swig_types[73] -#define SWIGTYPE_p_std__vectorT_unsigned_char_std__allocatorT_unsigned_char_t_t swig_types[74] -#define SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t swig_types[75] -#define SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t__const_iterator swig_types[76] -#define SWIGTYPE_p_unsigned_char swig_types[77] -#define SWIGTYPE_p_unsigned_int swig_types[78] -#define SWIGTYPE_p_unsigned_long_long swig_types[79] -#define SWIGTYPE_p_unsigned_short swig_types[80] -#define SWIGTYPE_p_value_type swig_types[81] -static swig_type_info *swig_types[83]; -static swig_module_info swig_module = {swig_types, 82, 0, 0, 0, 0}; +#define SWIGTYPE_p_Exiv2__DataSet swig_types[7] +#define SWIGTYPE_p_Exiv2__DataValue swig_types[8] +#define SWIGTYPE_p_Exiv2__DateValue swig_types[9] +#define SWIGTYPE_p_Exiv2__ExifData swig_types[10] +#define SWIGTYPE_p_Exiv2__ExifKey swig_types[11] +#define SWIGTYPE_p_Exiv2__FileIo swig_types[12] +#define SWIGTYPE_p_Exiv2__GroupInfo swig_types[13] +#define SWIGTYPE_p_Exiv2__HttpIo swig_types[14] +#define SWIGTYPE_p_Exiv2__Image swig_types[15] +#define SWIGTYPE_p_Exiv2__ImageFactory swig_types[16] +#define SWIGTYPE_p_Exiv2__IptcData swig_types[17] +#define SWIGTYPE_p_Exiv2__IptcKey swig_types[18] +#define SWIGTYPE_p_Exiv2__Key swig_types[19] +#define SWIGTYPE_p_Exiv2__LangAltValue swig_types[20] +#define SWIGTYPE_p_Exiv2__MemIo swig_types[21] +#define SWIGTYPE_p_Exiv2__RemoteIo swig_types[22] +#define SWIGTYPE_p_Exiv2__StringValue swig_types[23] +#define SWIGTYPE_p_Exiv2__StringValueBase swig_types[24] +#define SWIGTYPE_p_Exiv2__TagInfo swig_types[25] +#define SWIGTYPE_p_Exiv2__TimeValue swig_types[26] +#define SWIGTYPE_p_Exiv2__Value swig_types[27] +#define SWIGTYPE_p_Exiv2__ValueTypeT_double_t swig_types[28] +#define SWIGTYPE_p_Exiv2__ValueTypeT_float_t swig_types[29] +#define SWIGTYPE_p_Exiv2__ValueTypeT_int_t swig_types[30] +#define SWIGTYPE_p_Exiv2__ValueTypeT_short_t swig_types[31] +#define SWIGTYPE_p_Exiv2__ValueTypeT_std__pairT_int32_t_int32_t_t_t swig_types[32] +#define SWIGTYPE_p_Exiv2__ValueTypeT_std__pairT_uint32_t_uint32_t_t_t swig_types[33] +#define SWIGTYPE_p_Exiv2__ValueTypeT_unsigned_int_t swig_types[34] +#define SWIGTYPE_p_Exiv2__ValueTypeT_unsigned_short_t swig_types[35] +#define SWIGTYPE_p_Exiv2__XPathIo swig_types[36] +#define SWIGTYPE_p_Exiv2__XmpArrayValue swig_types[37] +#define SWIGTYPE_p_Exiv2__XmpData swig_types[38] +#define SWIGTYPE_p_Exiv2__XmpKey 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_IptcData_iterator_end swig_types[43] +#define SWIGTYPE_p_NsRegistry swig_types[44] +#define SWIGTYPE_p_SwigPyObject swig_types[45] +#define SWIGTYPE_p_ValueList swig_types[46] +#define SWIGTYPE_p_ValueType swig_types[47] +#define SWIGTYPE_p_XmpData_iterator swig_types[48] +#define SWIGTYPE_p_XmpData_iterator_end swig_types[49] +#define SWIGTYPE_p_allocator_type swig_types[50] +#define SWIGTYPE_p_char swig_types[51] +#define SWIGTYPE_p_const_iterator swig_types[52] +#define SWIGTYPE_p_difference_type swig_types[53] +#define SWIGTYPE_p_first_type swig_types[54] +#define SWIGTYPE_p_int swig_types[55] +#define SWIGTYPE_p_iterator swig_types[56] +#define SWIGTYPE_p_key_type swig_types[57] +#define SWIGTYPE_p_long_long swig_types[58] +#define SWIGTYPE_p_mapped_type swig_types[59] +#define SWIGTYPE_p_second_type swig_types[60] +#define SWIGTYPE_p_short swig_types[61] +#define SWIGTYPE_p_signed_char swig_types[62] +#define SWIGTYPE_p_size_type swig_types[63] +#define SWIGTYPE_p_std__listT_Exiv2__Exifdatum_t swig_types[64] +#define SWIGTYPE_p_std__mapT_std__string_std__string_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_std__string_t_t_t swig_types[65] +#define SWIGTYPE_p_std__mapT_std__string_std__string_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_std__string_t_t_t__const_iterator swig_types[66] +#define SWIGTYPE_p_std__pairT_int_int_t swig_types[67] +#define SWIGTYPE_p_std__pairT_unsigned_int_unsigned_int_t swig_types[68] +#define SWIGTYPE_p_std__setT_std__string_t swig_types[69] +#define SWIGTYPE_p_std__setT_std__string_t__const_iterator swig_types[70] +#define SWIGTYPE_p_std__vectorT_Exiv2__Iptcdatum_std__allocatorT_Exiv2__Iptcdatum_t_t swig_types[71] +#define SWIGTYPE_p_std__vectorT_Exiv2__Xmpdatum_std__allocatorT_Exiv2__Xmpdatum_t_t swig_types[72] +#define SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t swig_types[73] +#define SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t__const_iterator swig_types[74] +#define SWIGTYPE_p_std__vectorT_unsigned_char_std__allocatorT_unsigned_char_t_t swig_types[75] +#define SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t swig_types[76] +#define SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t__const_iterator swig_types[77] +#define SWIGTYPE_p_unsigned_char swig_types[78] +#define SWIGTYPE_p_unsigned_int swig_types[79] +#define SWIGTYPE_p_unsigned_long_long swig_types[80] +#define SWIGTYPE_p_unsigned_short swig_types[81] +#define SWIGTYPE_p_value_type swig_types[82] +static swig_type_info *swig_types[84]; +static swig_module_info swig_module = {swig_types, 83, 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) @@ -7727,6 +7728,7 @@ static swig_type_info _swigt__p_Exiv2__RemoteIo = {"_p_Exiv2__RemoteIo", 0, 0, 0 static swig_type_info _swigt__p_Exiv2__XPathIo = {"_p_Exiv2__XPathIo", 0, 0, 0, 0, 0}; static swig_type_info _swigt__p_Exiv2__CommentValue = {"_p_Exiv2__CommentValue", "Exiv2::CommentValue *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_Exiv2__DataBuf = {"_p_Exiv2__DataBuf", "Exiv2::DataBuf *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_Exiv2__DataSet = {"_p_Exiv2__DataSet", "Exiv2::DataSet *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_Exiv2__DataValue = {"_p_Exiv2__DataValue", "Exiv2::DataValue *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_Exiv2__DateValue = {"_p_Exiv2__DateValue", "Exiv2::DateValue *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_Exiv2__ExifData = {"_p_Exiv2__ExifData", "Exiv2::ExifData *", 0, 0, (void*)0, 0}; @@ -7806,6 +7808,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_Exiv2__BasicIo, &_swigt__p_Exiv2__CommentValue, &_swigt__p_Exiv2__DataBuf, + &_swigt__p_Exiv2__DataSet, &_swigt__p_Exiv2__DataValue, &_swigt__p_Exiv2__DateValue, &_swigt__p_Exiv2__ExifData, @@ -7895,6 +7898,7 @@ static swig_cast_info _swigc__p_Exiv2__XPathIo[] = {{&_swigt__p_Exiv2__XPathIo, static swig_cast_info _swigc__p_Exiv2__BasicIo[] = { {&_swigt__p_Exiv2__BasicIo, 0, 0, 0}, {&_swigt__p_Exiv2__FileIo, _p_Exiv2__FileIoTo_p_Exiv2__BasicIo, 0, 0}, {&_swigt__p_Exiv2__HttpIo, _p_Exiv2__HttpIoTo_p_Exiv2__BasicIo, 0, 0}, {&_swigt__p_Exiv2__MemIo, _p_Exiv2__MemIoTo_p_Exiv2__BasicIo, 0, 0}, {&_swigt__p_Exiv2__RemoteIo, _p_Exiv2__RemoteIoTo_p_Exiv2__BasicIo, 0, 0}, {&_swigt__p_Exiv2__XPathIo, _p_Exiv2__XPathIoTo_p_Exiv2__BasicIo, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_Exiv2__CommentValue[] = { {&_swigt__p_Exiv2__CommentValue, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_Exiv2__DataBuf[] = { {&_swigt__p_Exiv2__DataBuf, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_Exiv2__DataSet[] = { {&_swigt__p_Exiv2__DataSet, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_Exiv2__DataValue[] = { {&_swigt__p_Exiv2__DataValue, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_Exiv2__DateValue[] = { {&_swigt__p_Exiv2__DateValue, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_Exiv2__ExifData[] = { {&_swigt__p_Exiv2__ExifData, 0, 0, 0},{0, 0, 0, 0}}; @@ -7974,6 +7978,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_Exiv2__BasicIo, _swigc__p_Exiv2__CommentValue, _swigc__p_Exiv2__DataBuf, + _swigc__p_Exiv2__DataSet, _swigc__p_Exiv2__DataValue, _swigc__p_Exiv2__DateValue, _swigc__p_Exiv2__ExifData, diff --git a/src/swig-0_27_0/iptc_wrap.cxx b/src/swig-0_27_0/iptc_wrap.cxx index d405f430..aa698618 100644 --- a/src/swig-0_27_0/iptc_wrap.cxx +++ b/src/swig-0_27_0/iptc_wrap.cxx @@ -3748,69 +3748,70 @@ SwigPyBuiltin_iternextfunc_closure(SwigPyWrapperFunction wrapper, PyObject *a) { #define SWIGTYPE_p_AutoPtr swig_types[0] #define SWIGTYPE_p_Exiv2__AsciiValue swig_types[1] #define SWIGTYPE_p_Exiv2__CommentValue swig_types[2] -#define SWIGTYPE_p_Exiv2__DataValue swig_types[3] -#define SWIGTYPE_p_Exiv2__DateValue swig_types[4] -#define SWIGTYPE_p_Exiv2__ExifData swig_types[5] -#define SWIGTYPE_p_Exiv2__IptcData swig_types[6] -#define SWIGTYPE_p_Exiv2__IptcKey swig_types[7] -#define SWIGTYPE_p_Exiv2__Iptcdatum swig_types[8] -#define SWIGTYPE_p_Exiv2__Key swig_types[9] -#define SWIGTYPE_p_Exiv2__LangAltValue swig_types[10] -#define SWIGTYPE_p_Exiv2__Metadatum swig_types[11] -#define SWIGTYPE_p_Exiv2__StringValue swig_types[12] -#define SWIGTYPE_p_Exiv2__StringValueBase swig_types[13] -#define SWIGTYPE_p_Exiv2__TimeValue swig_types[14] -#define SWIGTYPE_p_Exiv2__Value swig_types[15] -#define SWIGTYPE_p_Exiv2__ValueTypeT_double_t swig_types[16] -#define SWIGTYPE_p_Exiv2__ValueTypeT_float_t swig_types[17] -#define SWIGTYPE_p_Exiv2__ValueTypeT_int_t swig_types[18] -#define SWIGTYPE_p_Exiv2__ValueTypeT_short_t swig_types[19] -#define SWIGTYPE_p_Exiv2__ValueTypeT_std__pairT_int32_t_int32_t_t_t swig_types[20] -#define SWIGTYPE_p_Exiv2__ValueTypeT_std__pairT_uint32_t_uint32_t_t_t swig_types[21] -#define SWIGTYPE_p_Exiv2__ValueTypeT_unsigned_int_t swig_types[22] -#define SWIGTYPE_p_Exiv2__ValueTypeT_unsigned_short_t swig_types[23] -#define SWIGTYPE_p_Exiv2__XmpArrayValue swig_types[24] -#define SWIGTYPE_p_Exiv2__XmpTextValue swig_types[25] -#define SWIGTYPE_p_Exiv2__XmpValue swig_types[26] -#define SWIGTYPE_p_IptcData_iterator swig_types[27] -#define SWIGTYPE_p_IptcData_iterator_end swig_types[28] -#define SWIGTYPE_p_SwigPyObject swig_types[29] -#define SWIGTYPE_p_ValueList swig_types[30] -#define SWIGTYPE_p_ValueType swig_types[31] -#define SWIGTYPE_p_allocator_type swig_types[32] -#define SWIGTYPE_p_char swig_types[33] -#define SWIGTYPE_p_const_iterator swig_types[34] -#define SWIGTYPE_p_difference_type swig_types[35] -#define SWIGTYPE_p_first_type swig_types[36] -#define SWIGTYPE_p_int swig_types[37] -#define SWIGTYPE_p_iterator swig_types[38] -#define SWIGTYPE_p_key_type swig_types[39] -#define SWIGTYPE_p_long_long swig_types[40] -#define SWIGTYPE_p_mapped_type swig_types[41] -#define SWIGTYPE_p_second_type swig_types[42] -#define SWIGTYPE_p_short swig_types[43] -#define SWIGTYPE_p_signed_char swig_types[44] -#define SWIGTYPE_p_size_type swig_types[45] -#define SWIGTYPE_p_std__mapT_std__string_std__string_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_std__string_t_t_t swig_types[46] -#define SWIGTYPE_p_std__mapT_std__string_std__string_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_std__string_t_t_t__const_iterator swig_types[47] -#define SWIGTYPE_p_std__pairT_int_int_t swig_types[48] -#define SWIGTYPE_p_std__pairT_unsigned_int_unsigned_int_t swig_types[49] -#define SWIGTYPE_p_std__setT_std__string_t swig_types[50] -#define SWIGTYPE_p_std__setT_std__string_t__const_iterator swig_types[51] -#define SWIGTYPE_p_std__vectorT_Exiv2__Iptcdatum_std__allocatorT_Exiv2__Iptcdatum_t_t swig_types[52] -#define SWIGTYPE_p_std__vectorT_Exiv2__Iptcdatum_std__allocatorT_Exiv2__Iptcdatum_t_t__iterator swig_types[53] -#define SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t swig_types[54] -#define SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t__const_iterator swig_types[55] -#define SWIGTYPE_p_std__vectorT_unsigned_char_std__allocatorT_unsigned_char_t_t swig_types[56] -#define SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t swig_types[57] -#define SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t__const_iterator swig_types[58] -#define SWIGTYPE_p_unsigned_char swig_types[59] -#define SWIGTYPE_p_unsigned_int swig_types[60] -#define SWIGTYPE_p_unsigned_long_long swig_types[61] -#define SWIGTYPE_p_unsigned_short swig_types[62] -#define SWIGTYPE_p_value_type swig_types[63] -static swig_type_info *swig_types[65]; -static swig_module_info swig_module = {swig_types, 64, 0, 0, 0, 0}; +#define SWIGTYPE_p_Exiv2__DataSet swig_types[3] +#define SWIGTYPE_p_Exiv2__DataValue swig_types[4] +#define SWIGTYPE_p_Exiv2__DateValue swig_types[5] +#define SWIGTYPE_p_Exiv2__ExifData swig_types[6] +#define SWIGTYPE_p_Exiv2__IptcData swig_types[7] +#define SWIGTYPE_p_Exiv2__IptcKey swig_types[8] +#define SWIGTYPE_p_Exiv2__Iptcdatum swig_types[9] +#define SWIGTYPE_p_Exiv2__Key swig_types[10] +#define SWIGTYPE_p_Exiv2__LangAltValue swig_types[11] +#define SWIGTYPE_p_Exiv2__Metadatum swig_types[12] +#define SWIGTYPE_p_Exiv2__StringValue swig_types[13] +#define SWIGTYPE_p_Exiv2__StringValueBase swig_types[14] +#define SWIGTYPE_p_Exiv2__TimeValue swig_types[15] +#define SWIGTYPE_p_Exiv2__Value swig_types[16] +#define SWIGTYPE_p_Exiv2__ValueTypeT_double_t swig_types[17] +#define SWIGTYPE_p_Exiv2__ValueTypeT_float_t swig_types[18] +#define SWIGTYPE_p_Exiv2__ValueTypeT_int_t swig_types[19] +#define SWIGTYPE_p_Exiv2__ValueTypeT_short_t swig_types[20] +#define SWIGTYPE_p_Exiv2__ValueTypeT_std__pairT_int32_t_int32_t_t_t swig_types[21] +#define SWIGTYPE_p_Exiv2__ValueTypeT_std__pairT_uint32_t_uint32_t_t_t swig_types[22] +#define SWIGTYPE_p_Exiv2__ValueTypeT_unsigned_int_t swig_types[23] +#define SWIGTYPE_p_Exiv2__ValueTypeT_unsigned_short_t swig_types[24] +#define SWIGTYPE_p_Exiv2__XmpArrayValue swig_types[25] +#define SWIGTYPE_p_Exiv2__XmpTextValue swig_types[26] +#define SWIGTYPE_p_Exiv2__XmpValue swig_types[27] +#define SWIGTYPE_p_IptcData_iterator swig_types[28] +#define SWIGTYPE_p_IptcData_iterator_end swig_types[29] +#define SWIGTYPE_p_SwigPyObject swig_types[30] +#define SWIGTYPE_p_ValueList swig_types[31] +#define SWIGTYPE_p_ValueType swig_types[32] +#define SWIGTYPE_p_allocator_type swig_types[33] +#define SWIGTYPE_p_char swig_types[34] +#define SWIGTYPE_p_const_iterator swig_types[35] +#define SWIGTYPE_p_difference_type swig_types[36] +#define SWIGTYPE_p_first_type swig_types[37] +#define SWIGTYPE_p_int swig_types[38] +#define SWIGTYPE_p_iterator swig_types[39] +#define SWIGTYPE_p_key_type swig_types[40] +#define SWIGTYPE_p_long_long swig_types[41] +#define SWIGTYPE_p_mapped_type swig_types[42] +#define SWIGTYPE_p_second_type swig_types[43] +#define SWIGTYPE_p_short swig_types[44] +#define SWIGTYPE_p_signed_char swig_types[45] +#define SWIGTYPE_p_size_type swig_types[46] +#define SWIGTYPE_p_std__mapT_std__string_std__string_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_std__string_t_t_t swig_types[47] +#define SWIGTYPE_p_std__mapT_std__string_std__string_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_std__string_t_t_t__const_iterator swig_types[48] +#define SWIGTYPE_p_std__pairT_int_int_t swig_types[49] +#define SWIGTYPE_p_std__pairT_unsigned_int_unsigned_int_t swig_types[50] +#define SWIGTYPE_p_std__setT_std__string_t swig_types[51] +#define SWIGTYPE_p_std__setT_std__string_t__const_iterator swig_types[52] +#define SWIGTYPE_p_std__vectorT_Exiv2__Iptcdatum_std__allocatorT_Exiv2__Iptcdatum_t_t swig_types[53] +#define SWIGTYPE_p_std__vectorT_Exiv2__Iptcdatum_std__allocatorT_Exiv2__Iptcdatum_t_t__iterator swig_types[54] +#define SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t swig_types[55] +#define SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t__const_iterator swig_types[56] +#define SWIGTYPE_p_std__vectorT_unsigned_char_std__allocatorT_unsigned_char_t_t swig_types[57] +#define SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t swig_types[58] +#define SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t__const_iterator swig_types[59] +#define SWIGTYPE_p_unsigned_char swig_types[60] +#define SWIGTYPE_p_unsigned_int swig_types[61] +#define SWIGTYPE_p_unsigned_long_long swig_types[62] +#define SWIGTYPE_p_unsigned_short swig_types[63] +#define SWIGTYPE_p_value_type swig_types[64] +static swig_type_info *swig_types[66]; +static swig_module_info swig_module = {swig_types, 65, 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) @@ -11126,6 +11127,7 @@ static void *_p_IptcData_iteratorTo_p_IptcData_iterator_end(void *x, int *SWIGUN static swig_type_info _swigt__p_AutoPtr = {"_p_AutoPtr", "AutoPtr *", 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__CommentValue = {"_p_Exiv2__CommentValue", "Exiv2::CommentValue *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_Exiv2__DataSet = {"_p_Exiv2__DataSet", "Exiv2::DataSet *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_Exiv2__DataValue = {"_p_Exiv2__DataValue", "Exiv2::DataValue *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_Exiv2__DateValue = {"_p_Exiv2__DateValue", "Exiv2::DateValue *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_Exiv2__ExifData = {"_p_Exiv2__ExifData", "Exiv2::ExifData *", 0, 0, (void*)0, 0}; @@ -11192,6 +11194,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_AutoPtr, &_swigt__p_Exiv2__AsciiValue, &_swigt__p_Exiv2__CommentValue, + &_swigt__p_Exiv2__DataSet, &_swigt__p_Exiv2__DataValue, &_swigt__p_Exiv2__DateValue, &_swigt__p_Exiv2__ExifData, @@ -11258,6 +11261,7 @@ static swig_type_info *swig_type_initial[] = { static swig_cast_info _swigc__p_AutoPtr[] = { {&_swigt__p_AutoPtr, 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__CommentValue[] = { {&_swigt__p_Exiv2__CommentValue, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_Exiv2__DataSet[] = { {&_swigt__p_Exiv2__DataSet, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_Exiv2__DataValue[] = { {&_swigt__p_Exiv2__DataValue, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_Exiv2__DateValue[] = { {&_swigt__p_Exiv2__DateValue, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_Exiv2__ExifData[] = { {&_swigt__p_Exiv2__ExifData, 0, 0, 0},{0, 0, 0, 0}}; @@ -11324,6 +11328,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_AutoPtr, _swigc__p_Exiv2__AsciiValue, _swigc__p_Exiv2__CommentValue, + _swigc__p_Exiv2__DataSet, _swigc__p_Exiv2__DataValue, _swigc__p_Exiv2__DateValue, _swigc__p_Exiv2__ExifData, diff --git a/src/swig-0_27_0/preview_wrap.cxx b/src/swig-0_27_0/preview_wrap.cxx index c48e9bbe..fa3265ba 100644 --- a/src/swig-0_27_0/preview_wrap.cxx +++ b/src/swig-0_27_0/preview_wrap.cxx @@ -3752,83 +3752,84 @@ SwigPyBuiltin_iternextfunc_closure(SwigPyWrapperFunction wrapper, PyObject *a) { #define SWIGTYPE_p_Exiv2__BasicIo swig_types[4] #define SWIGTYPE_p_Exiv2__CommentValue swig_types[5] #define SWIGTYPE_p_Exiv2__DataBuf swig_types[6] -#define SWIGTYPE_p_Exiv2__DataValue swig_types[7] -#define SWIGTYPE_p_Exiv2__DateValue 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__IptcKey swig_types[14] -#define SWIGTYPE_p_Exiv2__Key swig_types[15] -#define SWIGTYPE_p_Exiv2__LangAltValue swig_types[16] -#define SWIGTYPE_p_Exiv2__MemIo swig_types[17] -#define SWIGTYPE_p_Exiv2__PreviewImage swig_types[18] -#define SWIGTYPE_p_Exiv2__PreviewManager swig_types[19] -#define SWIGTYPE_p_Exiv2__PreviewProperties 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_int_t swig_types[29] -#define SWIGTYPE_p_Exiv2__ValueTypeT_short_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_unsigned_int_t swig_types[33] -#define SWIGTYPE_p_Exiv2__ValueTypeT_unsigned_short_t swig_types[34] -#define SWIGTYPE_p_Exiv2__XPathIo swig_types[35] -#define SWIGTYPE_p_Exiv2__XmpArrayValue swig_types[36] -#define SWIGTYPE_p_Exiv2__XmpKey swig_types[37] -#define SWIGTYPE_p_Exiv2__XmpTextValue swig_types[38] -#define SWIGTYPE_p_Exiv2__XmpValue swig_types[39] -#define SWIGTYPE_p_IptcData_iterator swig_types[40] -#define SWIGTYPE_p_IptcData_iterator_end swig_types[41] -#define SWIGTYPE_p_NsRegistry swig_types[42] -#define SWIGTYPE_p_SwigPyObject swig_types[43] -#define SWIGTYPE_p_ValueList swig_types[44] -#define SWIGTYPE_p_ValueType swig_types[45] -#define SWIGTYPE_p_XmpData_iterator swig_types[46] -#define SWIGTYPE_p_XmpData_iterator_end 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__mapT_std__string_std__string_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_std__string_t_t_t swig_types[63] -#define SWIGTYPE_p_std__mapT_std__string_std__string_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_std__string_t_t_t__const_iterator swig_types[64] -#define SWIGTYPE_p_std__pairT_int_int_t swig_types[65] -#define SWIGTYPE_p_std__pairT_unsigned_int_unsigned_int_t swig_types[66] -#define SWIGTYPE_p_std__setT_std__string_t swig_types[67] -#define SWIGTYPE_p_std__setT_std__string_t__const_iterator swig_types[68] -#define SWIGTYPE_p_std__vectorT_Exiv2__Iptcdatum_std__allocatorT_Exiv2__Iptcdatum_t_t swig_types[69] -#define SWIGTYPE_p_std__vectorT_Exiv2__PreviewProperties_std__allocatorT_Exiv2__PreviewProperties_t_t swig_types[70] -#define SWIGTYPE_p_std__vectorT_Exiv2__Xmpdatum_std__allocatorT_Exiv2__Xmpdatum_t_t swig_types[71] -#define SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t swig_types[72] -#define SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t__const_iterator swig_types[73] -#define SWIGTYPE_p_std__vectorT_unsigned_char_std__allocatorT_unsigned_char_t_t swig_types[74] -#define SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t swig_types[75] -#define SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t__const_iterator swig_types[76] -#define SWIGTYPE_p_unsigned_char swig_types[77] -#define SWIGTYPE_p_unsigned_int swig_types[78] -#define SWIGTYPE_p_unsigned_long_long swig_types[79] -#define SWIGTYPE_p_unsigned_short swig_types[80] -#define SWIGTYPE_p_value_type swig_types[81] -static swig_type_info *swig_types[83]; -static swig_module_info swig_module = {swig_types, 82, 0, 0, 0, 0}; +#define SWIGTYPE_p_Exiv2__DataSet swig_types[7] +#define SWIGTYPE_p_Exiv2__DataValue swig_types[8] +#define SWIGTYPE_p_Exiv2__DateValue 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__IptcKey swig_types[15] +#define SWIGTYPE_p_Exiv2__Key swig_types[16] +#define SWIGTYPE_p_Exiv2__LangAltValue swig_types[17] +#define SWIGTYPE_p_Exiv2__MemIo swig_types[18] +#define SWIGTYPE_p_Exiv2__PreviewImage swig_types[19] +#define SWIGTYPE_p_Exiv2__PreviewManager swig_types[20] +#define SWIGTYPE_p_Exiv2__PreviewProperties swig_types[21] +#define SWIGTYPE_p_Exiv2__RemoteIo swig_types[22] +#define SWIGTYPE_p_Exiv2__StringValue swig_types[23] +#define SWIGTYPE_p_Exiv2__StringValueBase swig_types[24] +#define SWIGTYPE_p_Exiv2__TagInfo swig_types[25] +#define SWIGTYPE_p_Exiv2__TimeValue swig_types[26] +#define SWIGTYPE_p_Exiv2__Value swig_types[27] +#define SWIGTYPE_p_Exiv2__ValueTypeT_double_t swig_types[28] +#define SWIGTYPE_p_Exiv2__ValueTypeT_float_t swig_types[29] +#define SWIGTYPE_p_Exiv2__ValueTypeT_int_t swig_types[30] +#define SWIGTYPE_p_Exiv2__ValueTypeT_short_t swig_types[31] +#define SWIGTYPE_p_Exiv2__ValueTypeT_std__pairT_int32_t_int32_t_t_t swig_types[32] +#define SWIGTYPE_p_Exiv2__ValueTypeT_std__pairT_uint32_t_uint32_t_t_t swig_types[33] +#define SWIGTYPE_p_Exiv2__ValueTypeT_unsigned_int_t swig_types[34] +#define SWIGTYPE_p_Exiv2__ValueTypeT_unsigned_short_t swig_types[35] +#define SWIGTYPE_p_Exiv2__XPathIo swig_types[36] +#define SWIGTYPE_p_Exiv2__XmpArrayValue swig_types[37] +#define SWIGTYPE_p_Exiv2__XmpKey swig_types[38] +#define SWIGTYPE_p_Exiv2__XmpTextValue swig_types[39] +#define SWIGTYPE_p_Exiv2__XmpValue swig_types[40] +#define SWIGTYPE_p_IptcData_iterator swig_types[41] +#define SWIGTYPE_p_IptcData_iterator_end swig_types[42] +#define SWIGTYPE_p_NsRegistry swig_types[43] +#define SWIGTYPE_p_SwigPyObject swig_types[44] +#define SWIGTYPE_p_ValueList swig_types[45] +#define SWIGTYPE_p_ValueType swig_types[46] +#define SWIGTYPE_p_XmpData_iterator swig_types[47] +#define SWIGTYPE_p_XmpData_iterator_end swig_types[48] +#define SWIGTYPE_p_allocator_type swig_types[49] +#define SWIGTYPE_p_char swig_types[50] +#define SWIGTYPE_p_const_iterator swig_types[51] +#define SWIGTYPE_p_difference_type swig_types[52] +#define SWIGTYPE_p_first_type swig_types[53] +#define SWIGTYPE_p_int swig_types[54] +#define SWIGTYPE_p_iterator swig_types[55] +#define SWIGTYPE_p_key_type swig_types[56] +#define SWIGTYPE_p_long_long swig_types[57] +#define SWIGTYPE_p_mapped_type swig_types[58] +#define SWIGTYPE_p_second_type swig_types[59] +#define SWIGTYPE_p_short swig_types[60] +#define SWIGTYPE_p_signed_char swig_types[61] +#define SWIGTYPE_p_size_type swig_types[62] +#define SWIGTYPE_p_std__listT_Exiv2__Exifdatum_t swig_types[63] +#define SWIGTYPE_p_std__mapT_std__string_std__string_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_std__string_t_t_t swig_types[64] +#define SWIGTYPE_p_std__mapT_std__string_std__string_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_std__string_t_t_t__const_iterator swig_types[65] +#define SWIGTYPE_p_std__pairT_int_int_t swig_types[66] +#define SWIGTYPE_p_std__pairT_unsigned_int_unsigned_int_t swig_types[67] +#define SWIGTYPE_p_std__setT_std__string_t swig_types[68] +#define SWIGTYPE_p_std__setT_std__string_t__const_iterator swig_types[69] +#define SWIGTYPE_p_std__vectorT_Exiv2__Iptcdatum_std__allocatorT_Exiv2__Iptcdatum_t_t swig_types[70] +#define SWIGTYPE_p_std__vectorT_Exiv2__PreviewProperties_std__allocatorT_Exiv2__PreviewProperties_t_t swig_types[71] +#define SWIGTYPE_p_std__vectorT_Exiv2__Xmpdatum_std__allocatorT_Exiv2__Xmpdatum_t_t swig_types[72] +#define SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t swig_types[73] +#define SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t__const_iterator swig_types[74] +#define SWIGTYPE_p_std__vectorT_unsigned_char_std__allocatorT_unsigned_char_t_t swig_types[75] +#define SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t swig_types[76] +#define SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t__const_iterator swig_types[77] +#define SWIGTYPE_p_unsigned_char swig_types[78] +#define SWIGTYPE_p_unsigned_int swig_types[79] +#define SWIGTYPE_p_unsigned_long_long swig_types[80] +#define SWIGTYPE_p_unsigned_short swig_types[81] +#define SWIGTYPE_p_value_type swig_types[82] +static swig_type_info *swig_types[84]; +static swig_module_info swig_module = {swig_types, 83, 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) @@ -5814,6 +5815,7 @@ static swig_type_info _swigt__p_Exiv2__RemoteIo = {"_p_Exiv2__RemoteIo", 0, 0, 0 static swig_type_info _swigt__p_Exiv2__XPathIo = {"_p_Exiv2__XPathIo", 0, 0, 0, 0, 0}; static swig_type_info _swigt__p_Exiv2__CommentValue = {"_p_Exiv2__CommentValue", "Exiv2::CommentValue *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_Exiv2__DataBuf = {"_p_Exiv2__DataBuf", "Exiv2::DataBuf *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_Exiv2__DataSet = {"_p_Exiv2__DataSet", "Exiv2::DataSet *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_Exiv2__DataValue = {"_p_Exiv2__DataValue", "Exiv2::DataValue *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_Exiv2__DateValue = {"_p_Exiv2__DateValue", "Exiv2::DateValue *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_Exiv2__ExifKey = {"_p_Exiv2__ExifKey", "Exiv2::ExifKey *", 0, 0, (void*)0, 0}; @@ -5893,6 +5895,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_Exiv2__BasicIo, &_swigt__p_Exiv2__CommentValue, &_swigt__p_Exiv2__DataBuf, + &_swigt__p_Exiv2__DataSet, &_swigt__p_Exiv2__DataValue, &_swigt__p_Exiv2__DateValue, &_swigt__p_Exiv2__ExifKey, @@ -5982,6 +5985,7 @@ static swig_cast_info _swigc__p_Exiv2__XPathIo[] = {{&_swigt__p_Exiv2__XPathIo, static swig_cast_info _swigc__p_Exiv2__BasicIo[] = { {&_swigt__p_Exiv2__BasicIo, 0, 0, 0}, {&_swigt__p_Exiv2__FileIo, _p_Exiv2__FileIoTo_p_Exiv2__BasicIo, 0, 0}, {&_swigt__p_Exiv2__HttpIo, _p_Exiv2__HttpIoTo_p_Exiv2__BasicIo, 0, 0}, {&_swigt__p_Exiv2__MemIo, _p_Exiv2__MemIoTo_p_Exiv2__BasicIo, 0, 0}, {&_swigt__p_Exiv2__RemoteIo, _p_Exiv2__RemoteIoTo_p_Exiv2__BasicIo, 0, 0}, {&_swigt__p_Exiv2__XPathIo, _p_Exiv2__XPathIoTo_p_Exiv2__BasicIo, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_Exiv2__CommentValue[] = { {&_swigt__p_Exiv2__CommentValue, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_Exiv2__DataBuf[] = { {&_swigt__p_Exiv2__DataBuf, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_Exiv2__DataSet[] = { {&_swigt__p_Exiv2__DataSet, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_Exiv2__DataValue[] = { {&_swigt__p_Exiv2__DataValue, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_Exiv2__DateValue[] = { {&_swigt__p_Exiv2__DateValue, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_Exiv2__ExifKey[] = { {&_swigt__p_Exiv2__ExifKey, 0, 0, 0},{0, 0, 0, 0}}; @@ -6061,6 +6065,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_Exiv2__BasicIo, _swigc__p_Exiv2__CommentValue, _swigc__p_Exiv2__DataBuf, + _swigc__p_Exiv2__DataSet, _swigc__p_Exiv2__DataValue, _swigc__p_Exiv2__DateValue, _swigc__p_Exiv2__ExifKey, diff --git a/src/swig-0_27_0/properties_wrap.cxx b/src/swig-0_27_0/properties_wrap.cxx index fc0a2a04..773cbcd4 100644 --- a/src/swig-0_27_0/properties_wrap.cxx +++ b/src/swig-0_27_0/properties_wrap.cxx @@ -3748,68 +3748,69 @@ SwigPyBuiltin_iternextfunc_closure(SwigPyWrapperFunction wrapper, PyObject *a) { #define SWIGTYPE_p_AutoPtr swig_types[0] #define SWIGTYPE_p_Exiv2__AsciiValue swig_types[1] #define SWIGTYPE_p_Exiv2__CommentValue swig_types[2] -#define SWIGTYPE_p_Exiv2__DataValue swig_types[3] -#define SWIGTYPE_p_Exiv2__DateValue swig_types[4] -#define SWIGTYPE_p_Exiv2__IptcKey swig_types[5] -#define SWIGTYPE_p_Exiv2__Key swig_types[6] -#define SWIGTYPE_p_Exiv2__LangAltValue swig_types[7] -#define SWIGTYPE_p_Exiv2__StringValue swig_types[8] -#define SWIGTYPE_p_Exiv2__StringValueBase swig_types[9] -#define SWIGTYPE_p_Exiv2__TimeValue swig_types[10] -#define SWIGTYPE_p_Exiv2__Value swig_types[11] -#define SWIGTYPE_p_Exiv2__ValueTypeT_double_t swig_types[12] -#define SWIGTYPE_p_Exiv2__ValueTypeT_float_t swig_types[13] -#define SWIGTYPE_p_Exiv2__ValueTypeT_int_t swig_types[14] -#define SWIGTYPE_p_Exiv2__ValueTypeT_short_t swig_types[15] -#define SWIGTYPE_p_Exiv2__ValueTypeT_std__pairT_int32_t_int32_t_t_t swig_types[16] -#define SWIGTYPE_p_Exiv2__ValueTypeT_std__pairT_uint32_t_uint32_t_t_t swig_types[17] -#define SWIGTYPE_p_Exiv2__ValueTypeT_unsigned_int_t swig_types[18] -#define SWIGTYPE_p_Exiv2__ValueTypeT_unsigned_short_t swig_types[19] -#define SWIGTYPE_p_Exiv2__XmpArrayValue swig_types[20] -#define SWIGTYPE_p_Exiv2__XmpKey swig_types[21] -#define SWIGTYPE_p_Exiv2__XmpNsInfo swig_types[22] -#define SWIGTYPE_p_Exiv2__XmpNsInfo__Ns swig_types[23] -#define SWIGTYPE_p_Exiv2__XmpNsInfo__Prefix swig_types[24] -#define SWIGTYPE_p_Exiv2__XmpProperties swig_types[25] -#define SWIGTYPE_p_Exiv2__XmpPropertyInfo swig_types[26] -#define SWIGTYPE_p_Exiv2__XmpTextValue swig_types[27] -#define SWIGTYPE_p_Exiv2__XmpValue swig_types[28] -#define SWIGTYPE_p_NsRegistry swig_types[29] -#define SWIGTYPE_p_SwigPyObject swig_types[30] -#define SWIGTYPE_p_ValueList swig_types[31] -#define SWIGTYPE_p_ValueType swig_types[32] -#define SWIGTYPE_p_allocator_type swig_types[33] -#define SWIGTYPE_p_char swig_types[34] -#define SWIGTYPE_p_const_iterator swig_types[35] -#define SWIGTYPE_p_difference_type swig_types[36] -#define SWIGTYPE_p_first_type swig_types[37] -#define SWIGTYPE_p_int swig_types[38] -#define SWIGTYPE_p_iterator swig_types[39] -#define SWIGTYPE_p_key_type swig_types[40] -#define SWIGTYPE_p_long_long swig_types[41] -#define SWIGTYPE_p_mapped_type swig_types[42] -#define SWIGTYPE_p_second_type swig_types[43] -#define SWIGTYPE_p_short swig_types[44] -#define SWIGTYPE_p_signed_char swig_types[45] -#define SWIGTYPE_p_size_type swig_types[46] -#define SWIGTYPE_p_std__mapT_std__string_std__string_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_std__string_t_t_t swig_types[47] -#define SWIGTYPE_p_std__mapT_std__string_std__string_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_std__string_t_t_t__const_iterator swig_types[48] -#define SWIGTYPE_p_std__pairT_int_int_t swig_types[49] -#define SWIGTYPE_p_std__pairT_unsigned_int_unsigned_int_t swig_types[50] -#define SWIGTYPE_p_std__setT_std__string_t swig_types[51] -#define SWIGTYPE_p_std__setT_std__string_t__const_iterator swig_types[52] -#define SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t swig_types[53] -#define SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t__const_iterator swig_types[54] -#define SWIGTYPE_p_std__vectorT_unsigned_char_std__allocatorT_unsigned_char_t_t swig_types[55] -#define SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t swig_types[56] -#define SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t__const_iterator swig_types[57] -#define SWIGTYPE_p_unsigned_char swig_types[58] -#define SWIGTYPE_p_unsigned_int swig_types[59] -#define SWIGTYPE_p_unsigned_long_long swig_types[60] -#define SWIGTYPE_p_unsigned_short swig_types[61] -#define SWIGTYPE_p_value_type swig_types[62] -static swig_type_info *swig_types[64]; -static swig_module_info swig_module = {swig_types, 63, 0, 0, 0, 0}; +#define SWIGTYPE_p_Exiv2__DataSet swig_types[3] +#define SWIGTYPE_p_Exiv2__DataValue swig_types[4] +#define SWIGTYPE_p_Exiv2__DateValue swig_types[5] +#define SWIGTYPE_p_Exiv2__IptcKey swig_types[6] +#define SWIGTYPE_p_Exiv2__Key swig_types[7] +#define SWIGTYPE_p_Exiv2__LangAltValue swig_types[8] +#define SWIGTYPE_p_Exiv2__StringValue swig_types[9] +#define SWIGTYPE_p_Exiv2__StringValueBase swig_types[10] +#define SWIGTYPE_p_Exiv2__TimeValue swig_types[11] +#define SWIGTYPE_p_Exiv2__Value swig_types[12] +#define SWIGTYPE_p_Exiv2__ValueTypeT_double_t swig_types[13] +#define SWIGTYPE_p_Exiv2__ValueTypeT_float_t swig_types[14] +#define SWIGTYPE_p_Exiv2__ValueTypeT_int_t swig_types[15] +#define SWIGTYPE_p_Exiv2__ValueTypeT_short_t swig_types[16] +#define SWIGTYPE_p_Exiv2__ValueTypeT_std__pairT_int32_t_int32_t_t_t swig_types[17] +#define SWIGTYPE_p_Exiv2__ValueTypeT_std__pairT_uint32_t_uint32_t_t_t swig_types[18] +#define SWIGTYPE_p_Exiv2__ValueTypeT_unsigned_int_t swig_types[19] +#define SWIGTYPE_p_Exiv2__ValueTypeT_unsigned_short_t swig_types[20] +#define SWIGTYPE_p_Exiv2__XmpArrayValue swig_types[21] +#define SWIGTYPE_p_Exiv2__XmpKey swig_types[22] +#define SWIGTYPE_p_Exiv2__XmpNsInfo swig_types[23] +#define SWIGTYPE_p_Exiv2__XmpNsInfo__Ns swig_types[24] +#define SWIGTYPE_p_Exiv2__XmpNsInfo__Prefix swig_types[25] +#define SWIGTYPE_p_Exiv2__XmpProperties swig_types[26] +#define SWIGTYPE_p_Exiv2__XmpPropertyInfo swig_types[27] +#define SWIGTYPE_p_Exiv2__XmpTextValue swig_types[28] +#define SWIGTYPE_p_Exiv2__XmpValue swig_types[29] +#define SWIGTYPE_p_NsRegistry swig_types[30] +#define SWIGTYPE_p_SwigPyObject swig_types[31] +#define SWIGTYPE_p_ValueList swig_types[32] +#define SWIGTYPE_p_ValueType swig_types[33] +#define SWIGTYPE_p_allocator_type swig_types[34] +#define SWIGTYPE_p_char swig_types[35] +#define SWIGTYPE_p_const_iterator swig_types[36] +#define SWIGTYPE_p_difference_type swig_types[37] +#define SWIGTYPE_p_first_type swig_types[38] +#define SWIGTYPE_p_int swig_types[39] +#define SWIGTYPE_p_iterator swig_types[40] +#define SWIGTYPE_p_key_type swig_types[41] +#define SWIGTYPE_p_long_long swig_types[42] +#define SWIGTYPE_p_mapped_type swig_types[43] +#define SWIGTYPE_p_second_type swig_types[44] +#define SWIGTYPE_p_short swig_types[45] +#define SWIGTYPE_p_signed_char swig_types[46] +#define SWIGTYPE_p_size_type swig_types[47] +#define SWIGTYPE_p_std__mapT_std__string_std__string_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_std__string_t_t_t swig_types[48] +#define SWIGTYPE_p_std__mapT_std__string_std__string_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_std__string_t_t_t__const_iterator swig_types[49] +#define SWIGTYPE_p_std__pairT_int_int_t swig_types[50] +#define SWIGTYPE_p_std__pairT_unsigned_int_unsigned_int_t swig_types[51] +#define SWIGTYPE_p_std__setT_std__string_t swig_types[52] +#define SWIGTYPE_p_std__setT_std__string_t__const_iterator swig_types[53] +#define SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t swig_types[54] +#define SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t__const_iterator swig_types[55] +#define SWIGTYPE_p_std__vectorT_unsigned_char_std__allocatorT_unsigned_char_t_t swig_types[56] +#define SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t swig_types[57] +#define SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t__const_iterator swig_types[58] +#define SWIGTYPE_p_unsigned_char swig_types[59] +#define SWIGTYPE_p_unsigned_int swig_types[60] +#define SWIGTYPE_p_unsigned_long_long swig_types[61] +#define SWIGTYPE_p_unsigned_short swig_types[62] +#define SWIGTYPE_p_value_type swig_types[63] +static swig_type_info *swig_types[65]; +static swig_module_info swig_module = {swig_types, 64, 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) @@ -6974,6 +6975,7 @@ static void *_p_Exiv2__XmpTextValueTo_p_Exiv2__XmpValue(void *x, int *SWIGUNUSED static swig_type_info _swigt__p_AutoPtr = {"_p_AutoPtr", "AutoPtr *", 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__CommentValue = {"_p_Exiv2__CommentValue", "Exiv2::CommentValue *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_Exiv2__DataSet = {"_p_Exiv2__DataSet", "Exiv2::DataSet *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_Exiv2__DataValue = {"_p_Exiv2__DataValue", "Exiv2::DataValue *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_Exiv2__DateValue = {"_p_Exiv2__DateValue", "Exiv2::DateValue *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_Exiv2__IptcKey = {"_p_Exiv2__IptcKey", "Exiv2::IptcKey *", 0, 0, (void*)0, 0}; @@ -7039,6 +7041,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_AutoPtr, &_swigt__p_Exiv2__AsciiValue, &_swigt__p_Exiv2__CommentValue, + &_swigt__p_Exiv2__DataSet, &_swigt__p_Exiv2__DataValue, &_swigt__p_Exiv2__DateValue, &_swigt__p_Exiv2__IptcKey, @@ -7104,6 +7107,7 @@ static swig_type_info *swig_type_initial[] = { static swig_cast_info _swigc__p_AutoPtr[] = { {&_swigt__p_AutoPtr, 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__CommentValue[] = { {&_swigt__p_Exiv2__CommentValue, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_Exiv2__DataSet[] = { {&_swigt__p_Exiv2__DataSet, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_Exiv2__DataValue[] = { {&_swigt__p_Exiv2__DataValue, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_Exiv2__DateValue[] = { {&_swigt__p_Exiv2__DateValue, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_Exiv2__IptcKey[] = { {&_swigt__p_Exiv2__IptcKey, 0, 0, 0},{0, 0, 0, 0}}; @@ -7169,6 +7173,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_AutoPtr, _swigc__p_Exiv2__AsciiValue, _swigc__p_Exiv2__CommentValue, + _swigc__p_Exiv2__DataSet, _swigc__p_Exiv2__DataValue, _swigc__p_Exiv2__DateValue, _swigc__p_Exiv2__IptcKey, diff --git a/src/swig-0_27_0/tags_wrap.cxx b/src/swig-0_27_0/tags_wrap.cxx index 50ee6e70..3c5f3d62 100644 --- a/src/swig-0_27_0/tags_wrap.cxx +++ b/src/swig-0_27_0/tags_wrap.cxx @@ -3779,27 +3779,26 @@ SwigPyBuiltin_iternextfunc_closure(SwigPyWrapperFunction wrapper, PyObject *a) { #define SWIGTYPE_p_char swig_types[31] #define SWIGTYPE_p_const_iterator swig_types[32] #define SWIGTYPE_p_difference_type swig_types[33] -#define SWIGTYPE_p_f___p_Exiv2__TagInfo swig_types[34] -#define SWIGTYPE_p_first_type swig_types[35] -#define SWIGTYPE_p_int swig_types[36] -#define SWIGTYPE_p_iterator swig_types[37] -#define SWIGTYPE_p_key_type swig_types[38] -#define SWIGTYPE_p_long_long swig_types[39] -#define SWIGTYPE_p_mapped_type swig_types[40] -#define SWIGTYPE_p_second_type swig_types[41] -#define SWIGTYPE_p_short swig_types[42] -#define SWIGTYPE_p_signed_char swig_types[43] -#define SWIGTYPE_p_size_type swig_types[44] -#define SWIGTYPE_p_std__pairT_int_int_t swig_types[45] -#define SWIGTYPE_p_std__pairT_unsigned_int_unsigned_int_t swig_types[46] -#define SWIGTYPE_p_std__vectorT_unsigned_char_std__allocatorT_unsigned_char_t_t swig_types[47] -#define SWIGTYPE_p_unsigned_char swig_types[48] -#define SWIGTYPE_p_unsigned_int swig_types[49] -#define SWIGTYPE_p_unsigned_long_long swig_types[50] -#define SWIGTYPE_p_unsigned_short swig_types[51] -#define SWIGTYPE_p_value_type swig_types[52] -static swig_type_info *swig_types[54]; -static swig_module_info swig_module = {swig_types, 53, 0, 0, 0, 0}; +#define SWIGTYPE_p_first_type swig_types[34] +#define SWIGTYPE_p_int swig_types[35] +#define SWIGTYPE_p_iterator swig_types[36] +#define SWIGTYPE_p_key_type swig_types[37] +#define SWIGTYPE_p_long_long swig_types[38] +#define SWIGTYPE_p_mapped_type swig_types[39] +#define SWIGTYPE_p_second_type swig_types[40] +#define SWIGTYPE_p_short swig_types[41] +#define SWIGTYPE_p_signed_char swig_types[42] +#define SWIGTYPE_p_size_type swig_types[43] +#define SWIGTYPE_p_std__pairT_int_int_t swig_types[44] +#define SWIGTYPE_p_std__pairT_unsigned_int_unsigned_int_t swig_types[45] +#define SWIGTYPE_p_std__vectorT_unsigned_char_std__allocatorT_unsigned_char_t_t swig_types[46] +#define SWIGTYPE_p_unsigned_char swig_types[47] +#define SWIGTYPE_p_unsigned_int swig_types[48] +#define SWIGTYPE_p_unsigned_long_long swig_types[49] +#define SWIGTYPE_p_unsigned_short swig_types[50] +#define SWIGTYPE_p_value_type swig_types[51] +static swig_type_info *swig_types[53]; +static swig_module_info swig_module = {swig_types, 52, 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) @@ -4607,7 +4606,16 @@ SWIGINTERN PyObject *_wrap_GroupInfo_tagList__get(PyObject *self, PyObject *args } arg1 = reinterpret_cast< Exiv2::GroupInfo * >(argp1); result = (Exiv2::TagListFct) ((arg1)->tagList_); - resultobj = SWIG_NewFunctionPtrObj((void *)(result), SWIGTYPE_p_f___p_Exiv2__TagInfo); + { + const Exiv2::TagInfo* ti = result(); + PyObject* list = PyList_New(0); + while (ti->tag_ != 0xFFFF) { + PyList_Append(list, SWIG_NewPointerObj( + SWIG_as_voidptr(ti), SWIGTYPE_p_Exiv2__TagInfo, 0)); + ++ti; + } + resultobj = SWIG_Python_AppendOutput(resultobj, PyList_AsTuple(list)); + } return resultobj; fail: return NULL; @@ -6938,7 +6946,6 @@ static swig_type_info _swigt__p_allocator_type = {"_p_allocator_type", "allocato static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_const_iterator = {"_p_const_iterator", "const_iterator *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_difference_type = {"_p_difference_type", "difference_type *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f___p_Exiv2__TagInfo = {"_p_f___p_Exiv2__TagInfo", "Exiv2::TagListFct|Exiv2::TagInfo *(*)()", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_first_type = {"_p_first_type", "first_type *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_int = {"_p_int", "int32_t *|int_fast16_t *|int_fast32_t *|int_least32_t *|intptr_t *|int *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_iterator = {"_p_iterator", "iterator *", 0, 0, (void*)0, 0}; @@ -6993,7 +7000,6 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_char, &_swigt__p_const_iterator, &_swigt__p_difference_type, - &_swigt__p_f___p_Exiv2__TagInfo, &_swigt__p_first_type, &_swigt__p_int, &_swigt__p_iterator, @@ -7048,7 +7054,6 @@ static swig_cast_info _swigc__p_allocator_type[] = { {&_swigt__p_allocator_type static swig_cast_info _swigc__p_char[] = { {&_swigt__p_char, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_const_iterator[] = { {&_swigt__p_const_iterator, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_difference_type[] = { {&_swigt__p_difference_type, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_f___p_Exiv2__TagInfo[] = { {&_swigt__p_f___p_Exiv2__TagInfo, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_first_type[] = { {&_swigt__p_first_type, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_int[] = { {&_swigt__p_int, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_iterator[] = { {&_swigt__p_iterator, 0, 0, 0},{0, 0, 0, 0}}; @@ -7103,7 +7108,6 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_char, _swigc__p_const_iterator, _swigc__p_difference_type, - _swigc__p_f___p_Exiv2__TagInfo, _swigc__p_first_type, _swigc__p_int, _swigc__p_iterator, diff --git a/src/swig-0_27_0/xmp_wrap.cxx b/src/swig-0_27_0/xmp_wrap.cxx index 0f943647..ca68f4e0 100644 --- a/src/swig-0_27_0/xmp_wrap.cxx +++ b/src/swig-0_27_0/xmp_wrap.cxx @@ -3748,73 +3748,74 @@ SwigPyBuiltin_iternextfunc_closure(SwigPyWrapperFunction wrapper, PyObject *a) { #define SWIGTYPE_p_AutoPtr swig_types[0] #define SWIGTYPE_p_Exiv2__AsciiValue swig_types[1] #define SWIGTYPE_p_Exiv2__CommentValue swig_types[2] -#define SWIGTYPE_p_Exiv2__DataValue swig_types[3] -#define SWIGTYPE_p_Exiv2__DateValue swig_types[4] -#define SWIGTYPE_p_Exiv2__ExifData swig_types[5] -#define SWIGTYPE_p_Exiv2__IptcKey swig_types[6] -#define SWIGTYPE_p_Exiv2__Key swig_types[7] -#define SWIGTYPE_p_Exiv2__LangAltValue swig_types[8] -#define SWIGTYPE_p_Exiv2__Metadatum swig_types[9] -#define SWIGTYPE_p_Exiv2__StringValue swig_types[10] -#define SWIGTYPE_p_Exiv2__StringValueBase swig_types[11] -#define SWIGTYPE_p_Exiv2__TimeValue swig_types[12] -#define SWIGTYPE_p_Exiv2__Value swig_types[13] -#define SWIGTYPE_p_Exiv2__ValueTypeT_double_t swig_types[14] -#define SWIGTYPE_p_Exiv2__ValueTypeT_float_t swig_types[15] -#define SWIGTYPE_p_Exiv2__ValueTypeT_int_t swig_types[16] -#define SWIGTYPE_p_Exiv2__ValueTypeT_short_t swig_types[17] -#define SWIGTYPE_p_Exiv2__ValueTypeT_std__pairT_int32_t_int32_t_t_t swig_types[18] -#define SWIGTYPE_p_Exiv2__ValueTypeT_std__pairT_uint32_t_uint32_t_t_t swig_types[19] -#define SWIGTYPE_p_Exiv2__ValueTypeT_unsigned_int_t swig_types[20] -#define SWIGTYPE_p_Exiv2__ValueTypeT_unsigned_short_t swig_types[21] -#define SWIGTYPE_p_Exiv2__XmpArrayValue swig_types[22] -#define SWIGTYPE_p_Exiv2__XmpData swig_types[23] -#define SWIGTYPE_p_Exiv2__XmpKey swig_types[24] -#define SWIGTYPE_p_Exiv2__XmpParser swig_types[25] -#define SWIGTYPE_p_Exiv2__XmpTextValue swig_types[26] -#define SWIGTYPE_p_Exiv2__XmpValue swig_types[27] -#define SWIGTYPE_p_Exiv2__Xmpdatum swig_types[28] -#define SWIGTYPE_p_NsRegistry swig_types[29] -#define SWIGTYPE_p_SwigPyObject swig_types[30] -#define SWIGTYPE_p_ValueList swig_types[31] -#define SWIGTYPE_p_ValueType swig_types[32] -#define SWIGTYPE_p_XmpData_iterator swig_types[33] -#define SWIGTYPE_p_XmpData_iterator_end swig_types[34] -#define SWIGTYPE_p_allocator_type swig_types[35] -#define SWIGTYPE_p_char swig_types[36] -#define SWIGTYPE_p_const_iterator swig_types[37] -#define SWIGTYPE_p_difference_type swig_types[38] -#define SWIGTYPE_p_f_p_void_bool__void swig_types[39] -#define SWIGTYPE_p_first_type swig_types[40] -#define SWIGTYPE_p_int swig_types[41] -#define SWIGTYPE_p_iterator swig_types[42] -#define SWIGTYPE_p_key_type swig_types[43] -#define SWIGTYPE_p_long_long swig_types[44] -#define SWIGTYPE_p_mapped_type swig_types[45] -#define SWIGTYPE_p_second_type swig_types[46] -#define SWIGTYPE_p_short swig_types[47] -#define SWIGTYPE_p_signed_char swig_types[48] -#define SWIGTYPE_p_size_type swig_types[49] -#define SWIGTYPE_p_std__mapT_std__string_std__string_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_std__string_t_t_t swig_types[50] -#define SWIGTYPE_p_std__mapT_std__string_std__string_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_std__string_t_t_t__const_iterator swig_types[51] -#define SWIGTYPE_p_std__pairT_int_int_t swig_types[52] -#define SWIGTYPE_p_std__pairT_unsigned_int_unsigned_int_t swig_types[53] -#define SWIGTYPE_p_std__setT_std__string_t swig_types[54] -#define SWIGTYPE_p_std__setT_std__string_t__const_iterator swig_types[55] -#define SWIGTYPE_p_std__vectorT_Exiv2__Xmpdatum_std__allocatorT_Exiv2__Xmpdatum_t_t swig_types[56] -#define SWIGTYPE_p_std__vectorT_Exiv2__Xmpdatum_std__allocatorT_Exiv2__Xmpdatum_t_t__iterator swig_types[57] -#define SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t swig_types[58] -#define SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t__const_iterator swig_types[59] -#define SWIGTYPE_p_std__vectorT_unsigned_char_std__allocatorT_unsigned_char_t_t swig_types[60] -#define SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t swig_types[61] -#define SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t__const_iterator swig_types[62] -#define SWIGTYPE_p_unsigned_char swig_types[63] -#define SWIGTYPE_p_unsigned_int swig_types[64] -#define SWIGTYPE_p_unsigned_long_long swig_types[65] -#define SWIGTYPE_p_unsigned_short swig_types[66] -#define SWIGTYPE_p_value_type swig_types[67] -static swig_type_info *swig_types[69]; -static swig_module_info swig_module = {swig_types, 68, 0, 0, 0, 0}; +#define SWIGTYPE_p_Exiv2__DataSet swig_types[3] +#define SWIGTYPE_p_Exiv2__DataValue swig_types[4] +#define SWIGTYPE_p_Exiv2__DateValue swig_types[5] +#define SWIGTYPE_p_Exiv2__ExifData swig_types[6] +#define SWIGTYPE_p_Exiv2__IptcKey swig_types[7] +#define SWIGTYPE_p_Exiv2__Key swig_types[8] +#define SWIGTYPE_p_Exiv2__LangAltValue swig_types[9] +#define SWIGTYPE_p_Exiv2__Metadatum swig_types[10] +#define SWIGTYPE_p_Exiv2__StringValue swig_types[11] +#define SWIGTYPE_p_Exiv2__StringValueBase swig_types[12] +#define SWIGTYPE_p_Exiv2__TimeValue swig_types[13] +#define SWIGTYPE_p_Exiv2__Value swig_types[14] +#define SWIGTYPE_p_Exiv2__ValueTypeT_double_t swig_types[15] +#define SWIGTYPE_p_Exiv2__ValueTypeT_float_t swig_types[16] +#define SWIGTYPE_p_Exiv2__ValueTypeT_int_t swig_types[17] +#define SWIGTYPE_p_Exiv2__ValueTypeT_short_t swig_types[18] +#define SWIGTYPE_p_Exiv2__ValueTypeT_std__pairT_int32_t_int32_t_t_t swig_types[19] +#define SWIGTYPE_p_Exiv2__ValueTypeT_std__pairT_uint32_t_uint32_t_t_t swig_types[20] +#define SWIGTYPE_p_Exiv2__ValueTypeT_unsigned_int_t swig_types[21] +#define SWIGTYPE_p_Exiv2__ValueTypeT_unsigned_short_t swig_types[22] +#define SWIGTYPE_p_Exiv2__XmpArrayValue swig_types[23] +#define SWIGTYPE_p_Exiv2__XmpData swig_types[24] +#define SWIGTYPE_p_Exiv2__XmpKey swig_types[25] +#define SWIGTYPE_p_Exiv2__XmpParser swig_types[26] +#define SWIGTYPE_p_Exiv2__XmpTextValue swig_types[27] +#define SWIGTYPE_p_Exiv2__XmpValue swig_types[28] +#define SWIGTYPE_p_Exiv2__Xmpdatum swig_types[29] +#define SWIGTYPE_p_NsRegistry swig_types[30] +#define SWIGTYPE_p_SwigPyObject swig_types[31] +#define SWIGTYPE_p_ValueList swig_types[32] +#define SWIGTYPE_p_ValueType swig_types[33] +#define SWIGTYPE_p_XmpData_iterator swig_types[34] +#define SWIGTYPE_p_XmpData_iterator_end swig_types[35] +#define SWIGTYPE_p_allocator_type swig_types[36] +#define SWIGTYPE_p_char swig_types[37] +#define SWIGTYPE_p_const_iterator swig_types[38] +#define SWIGTYPE_p_difference_type swig_types[39] +#define SWIGTYPE_p_f_p_void_bool__void swig_types[40] +#define SWIGTYPE_p_first_type swig_types[41] +#define SWIGTYPE_p_int swig_types[42] +#define SWIGTYPE_p_iterator swig_types[43] +#define SWIGTYPE_p_key_type swig_types[44] +#define SWIGTYPE_p_long_long swig_types[45] +#define SWIGTYPE_p_mapped_type swig_types[46] +#define SWIGTYPE_p_second_type swig_types[47] +#define SWIGTYPE_p_short swig_types[48] +#define SWIGTYPE_p_signed_char swig_types[49] +#define SWIGTYPE_p_size_type swig_types[50] +#define SWIGTYPE_p_std__mapT_std__string_std__string_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_std__string_t_t_t swig_types[51] +#define SWIGTYPE_p_std__mapT_std__string_std__string_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_std__string_t_t_t__const_iterator swig_types[52] +#define SWIGTYPE_p_std__pairT_int_int_t swig_types[53] +#define SWIGTYPE_p_std__pairT_unsigned_int_unsigned_int_t swig_types[54] +#define SWIGTYPE_p_std__setT_std__string_t swig_types[55] +#define SWIGTYPE_p_std__setT_std__string_t__const_iterator swig_types[56] +#define SWIGTYPE_p_std__vectorT_Exiv2__Xmpdatum_std__allocatorT_Exiv2__Xmpdatum_t_t swig_types[57] +#define SWIGTYPE_p_std__vectorT_Exiv2__Xmpdatum_std__allocatorT_Exiv2__Xmpdatum_t_t__iterator swig_types[58] +#define SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t swig_types[59] +#define SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t__const_iterator swig_types[60] +#define SWIGTYPE_p_std__vectorT_unsigned_char_std__allocatorT_unsigned_char_t_t swig_types[61] +#define SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t swig_types[62] +#define SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t__const_iterator 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 SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) @@ -11439,6 +11440,7 @@ static void *_p_XmpData_iteratorTo_p_XmpData_iterator_end(void *x, int *SWIGUNUS static swig_type_info _swigt__p_AutoPtr = {"_p_AutoPtr", "AutoPtr *", 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__CommentValue = {"_p_Exiv2__CommentValue", "Exiv2::CommentValue *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_Exiv2__DataSet = {"_p_Exiv2__DataSet", "Exiv2::DataSet *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_Exiv2__DataValue = {"_p_Exiv2__DataValue", "Exiv2::DataValue *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_Exiv2__DateValue = {"_p_Exiv2__DateValue", "Exiv2::DateValue *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_Exiv2__ExifData = {"_p_Exiv2__ExifData", "Exiv2::ExifData *", 0, 0, (void*)0, 0}; @@ -11509,6 +11511,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_AutoPtr, &_swigt__p_Exiv2__AsciiValue, &_swigt__p_Exiv2__CommentValue, + &_swigt__p_Exiv2__DataSet, &_swigt__p_Exiv2__DataValue, &_swigt__p_Exiv2__DateValue, &_swigt__p_Exiv2__ExifData, @@ -11579,6 +11582,7 @@ static swig_type_info *swig_type_initial[] = { static swig_cast_info _swigc__p_AutoPtr[] = { {&_swigt__p_AutoPtr, 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__CommentValue[] = { {&_swigt__p_Exiv2__CommentValue, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_Exiv2__DataSet[] = { {&_swigt__p_Exiv2__DataSet, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_Exiv2__DataValue[] = { {&_swigt__p_Exiv2__DataValue, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_Exiv2__DateValue[] = { {&_swigt__p_Exiv2__DateValue, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_Exiv2__ExifData[] = { {&_swigt__p_Exiv2__ExifData, 0, 0, 0},{0, 0, 0, 0}}; @@ -11649,6 +11653,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_AutoPtr, _swigc__p_Exiv2__AsciiValue, _swigc__p_Exiv2__CommentValue, + _swigc__p_Exiv2__DataSet, _swigc__p_Exiv2__DataValue, _swigc__p_Exiv2__DateValue, _swigc__p_Exiv2__ExifData, diff --git a/src/swig-0_27_4/datasets_wrap.cxx b/src/swig-0_27_4/datasets_wrap.cxx index b2fc1c3e..45e17690 100644 --- a/src/swig-0_27_4/datasets_wrap.cxx +++ b/src/swig-0_27_4/datasets_wrap.cxx @@ -5159,7 +5159,16 @@ SWIGINTERN PyObject *_wrap_IptcDataSets_envelopeRecordList(PyObject *self, PyObj SWIG_fail; } } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Exiv2__DataSet, 0 | 0 ); + { + const Exiv2::DataSet* ptr = result; + PyObject* list = PyList_New(0); + while (ptr->number_ != 0xffff) { + PyList_Append(list, SWIG_NewPointerObj( + SWIG_as_voidptr(ptr), SWIGTYPE_p_Exiv2__DataSet, 0)); + ++ptr; + } + resultobj = SWIG_Python_AppendOutput(resultobj, PyList_AsTuple(list)); + } return resultobj; fail: return NULL; @@ -5184,7 +5193,16 @@ SWIGINTERN PyObject *_wrap_IptcDataSets_application2RecordList(PyObject *self, P SWIG_fail; } } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Exiv2__DataSet, 0 | 0 ); + { + const Exiv2::DataSet* ptr = result; + PyObject* list = PyList_New(0); + while (ptr->number_ != 0xffff) { + PyList_Append(list, SWIG_NewPointerObj( + SWIG_as_voidptr(ptr), SWIGTYPE_p_Exiv2__DataSet, 0)); + ++ptr; + } + resultobj = SWIG_Python_AppendOutput(resultobj, PyList_AsTuple(list)); + } return resultobj; fail: return NULL; diff --git a/src/swig-0_27_4/image_wrap.cxx b/src/swig-0_27_4/image_wrap.cxx index 725ac068..fb2281ff 100644 --- a/src/swig-0_27_4/image_wrap.cxx +++ b/src/swig-0_27_4/image_wrap.cxx @@ -3753,83 +3753,84 @@ SwigPyBuiltin_iternextfunc_closure(SwigPyWrapperFunction wrapper, PyObject *a) { #define SWIGTYPE_p_Exiv2__BasicIo swig_types[4] #define SWIGTYPE_p_Exiv2__CommentValue swig_types[5] #define SWIGTYPE_p_Exiv2__DataBuf 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_int_t swig_types[29] -#define SWIGTYPE_p_Exiv2__ValueTypeT_short_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_unsigned_int_t swig_types[33] -#define SWIGTYPE_p_Exiv2__ValueTypeT_unsigned_short_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__XmpTextValue swig_types[39] -#define SWIGTYPE_p_Exiv2__XmpValue swig_types[40] -#define SWIGTYPE_p_IptcData_iterator swig_types[41] -#define SWIGTYPE_p_IptcData_iterator_end swig_types[42] -#define SWIGTYPE_p_NsRegistry swig_types[43] -#define SWIGTYPE_p_SwigPyObject swig_types[44] -#define SWIGTYPE_p_ValueList swig_types[45] -#define SWIGTYPE_p_ValueType swig_types[46] -#define SWIGTYPE_p_XmpData_iterator swig_types[47] -#define SWIGTYPE_p_XmpData_iterator_end swig_types[48] -#define SWIGTYPE_p_allocator_type swig_types[49] -#define SWIGTYPE_p_char swig_types[50] -#define SWIGTYPE_p_const_iterator swig_types[51] -#define SWIGTYPE_p_difference_type swig_types[52] -#define SWIGTYPE_p_first_type swig_types[53] -#define SWIGTYPE_p_int swig_types[54] -#define SWIGTYPE_p_iterator swig_types[55] -#define SWIGTYPE_p_key_type swig_types[56] -#define SWIGTYPE_p_long_long swig_types[57] -#define SWIGTYPE_p_mapped_type swig_types[58] -#define SWIGTYPE_p_second_type swig_types[59] -#define SWIGTYPE_p_short swig_types[60] -#define SWIGTYPE_p_signed_char swig_types[61] -#define SWIGTYPE_p_size_type swig_types[62] -#define SWIGTYPE_p_std__listT_Exiv2__Exifdatum_t swig_types[63] -#define SWIGTYPE_p_std__mapT_std__string_std__string_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_std__string_t_t_t swig_types[64] -#define SWIGTYPE_p_std__mapT_std__string_std__string_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_std__string_t_t_t__const_iterator swig_types[65] -#define SWIGTYPE_p_std__pairT_int_int_t swig_types[66] -#define SWIGTYPE_p_std__pairT_unsigned_int_unsigned_int_t swig_types[67] -#define SWIGTYPE_p_std__setT_std__string_t swig_types[68] -#define SWIGTYPE_p_std__setT_std__string_t__const_iterator swig_types[69] -#define SWIGTYPE_p_std__vectorT_Exiv2__Iptcdatum_std__allocatorT_Exiv2__Iptcdatum_t_t swig_types[70] -#define SWIGTYPE_p_std__vectorT_Exiv2__Xmpdatum_std__allocatorT_Exiv2__Xmpdatum_t_t swig_types[71] -#define SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t swig_types[72] -#define SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t__const_iterator swig_types[73] -#define SWIGTYPE_p_std__vectorT_unsigned_char_std__allocatorT_unsigned_char_t_t swig_types[74] -#define SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t swig_types[75] -#define SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t__const_iterator swig_types[76] -#define SWIGTYPE_p_unsigned_char swig_types[77] -#define SWIGTYPE_p_unsigned_int swig_types[78] -#define SWIGTYPE_p_unsigned_long_long swig_types[79] -#define SWIGTYPE_p_unsigned_short swig_types[80] -#define SWIGTYPE_p_value_type swig_types[81] -static swig_type_info *swig_types[83]; -static swig_module_info swig_module = {swig_types, 82, 0, 0, 0, 0}; +#define SWIGTYPE_p_Exiv2__DataSet swig_types[7] +#define SWIGTYPE_p_Exiv2__DataValue swig_types[8] +#define SWIGTYPE_p_Exiv2__DateValue swig_types[9] +#define SWIGTYPE_p_Exiv2__ExifData swig_types[10] +#define SWIGTYPE_p_Exiv2__ExifKey swig_types[11] +#define SWIGTYPE_p_Exiv2__FileIo swig_types[12] +#define SWIGTYPE_p_Exiv2__GroupInfo swig_types[13] +#define SWIGTYPE_p_Exiv2__HttpIo swig_types[14] +#define SWIGTYPE_p_Exiv2__Image swig_types[15] +#define SWIGTYPE_p_Exiv2__ImageFactory swig_types[16] +#define SWIGTYPE_p_Exiv2__IptcData swig_types[17] +#define SWIGTYPE_p_Exiv2__IptcKey swig_types[18] +#define SWIGTYPE_p_Exiv2__Key swig_types[19] +#define SWIGTYPE_p_Exiv2__LangAltValue swig_types[20] +#define SWIGTYPE_p_Exiv2__MemIo swig_types[21] +#define SWIGTYPE_p_Exiv2__RemoteIo swig_types[22] +#define SWIGTYPE_p_Exiv2__StringValue swig_types[23] +#define SWIGTYPE_p_Exiv2__StringValueBase swig_types[24] +#define SWIGTYPE_p_Exiv2__TagInfo swig_types[25] +#define SWIGTYPE_p_Exiv2__TimeValue swig_types[26] +#define SWIGTYPE_p_Exiv2__Value swig_types[27] +#define SWIGTYPE_p_Exiv2__ValueTypeT_double_t swig_types[28] +#define SWIGTYPE_p_Exiv2__ValueTypeT_float_t swig_types[29] +#define SWIGTYPE_p_Exiv2__ValueTypeT_int_t swig_types[30] +#define SWIGTYPE_p_Exiv2__ValueTypeT_short_t swig_types[31] +#define SWIGTYPE_p_Exiv2__ValueTypeT_std__pairT_int32_t_int32_t_t_t swig_types[32] +#define SWIGTYPE_p_Exiv2__ValueTypeT_std__pairT_uint32_t_uint32_t_t_t swig_types[33] +#define SWIGTYPE_p_Exiv2__ValueTypeT_unsigned_int_t swig_types[34] +#define SWIGTYPE_p_Exiv2__ValueTypeT_unsigned_short_t swig_types[35] +#define SWIGTYPE_p_Exiv2__XPathIo swig_types[36] +#define SWIGTYPE_p_Exiv2__XmpArrayValue swig_types[37] +#define SWIGTYPE_p_Exiv2__XmpData swig_types[38] +#define SWIGTYPE_p_Exiv2__XmpKey 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_IptcData_iterator_end swig_types[43] +#define SWIGTYPE_p_NsRegistry swig_types[44] +#define SWIGTYPE_p_SwigPyObject swig_types[45] +#define SWIGTYPE_p_ValueList swig_types[46] +#define SWIGTYPE_p_ValueType swig_types[47] +#define SWIGTYPE_p_XmpData_iterator swig_types[48] +#define SWIGTYPE_p_XmpData_iterator_end swig_types[49] +#define SWIGTYPE_p_allocator_type swig_types[50] +#define SWIGTYPE_p_char swig_types[51] +#define SWIGTYPE_p_const_iterator swig_types[52] +#define SWIGTYPE_p_difference_type swig_types[53] +#define SWIGTYPE_p_first_type swig_types[54] +#define SWIGTYPE_p_int swig_types[55] +#define SWIGTYPE_p_iterator swig_types[56] +#define SWIGTYPE_p_key_type swig_types[57] +#define SWIGTYPE_p_long_long swig_types[58] +#define SWIGTYPE_p_mapped_type swig_types[59] +#define SWIGTYPE_p_second_type swig_types[60] +#define SWIGTYPE_p_short swig_types[61] +#define SWIGTYPE_p_signed_char swig_types[62] +#define SWIGTYPE_p_size_type swig_types[63] +#define SWIGTYPE_p_std__listT_Exiv2__Exifdatum_t swig_types[64] +#define SWIGTYPE_p_std__mapT_std__string_std__string_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_std__string_t_t_t swig_types[65] +#define SWIGTYPE_p_std__mapT_std__string_std__string_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_std__string_t_t_t__const_iterator swig_types[66] +#define SWIGTYPE_p_std__pairT_int_int_t swig_types[67] +#define SWIGTYPE_p_std__pairT_unsigned_int_unsigned_int_t swig_types[68] +#define SWIGTYPE_p_std__setT_std__string_t swig_types[69] +#define SWIGTYPE_p_std__setT_std__string_t__const_iterator swig_types[70] +#define SWIGTYPE_p_std__vectorT_Exiv2__Iptcdatum_std__allocatorT_Exiv2__Iptcdatum_t_t swig_types[71] +#define SWIGTYPE_p_std__vectorT_Exiv2__Xmpdatum_std__allocatorT_Exiv2__Xmpdatum_t_t swig_types[72] +#define SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t swig_types[73] +#define SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t__const_iterator swig_types[74] +#define SWIGTYPE_p_std__vectorT_unsigned_char_std__allocatorT_unsigned_char_t_t swig_types[75] +#define SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t swig_types[76] +#define SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t__const_iterator swig_types[77] +#define SWIGTYPE_p_unsigned_char swig_types[78] +#define SWIGTYPE_p_unsigned_int swig_types[79] +#define SWIGTYPE_p_unsigned_long_long swig_types[80] +#define SWIGTYPE_p_unsigned_short swig_types[81] +#define SWIGTYPE_p_value_type swig_types[82] +static swig_type_info *swig_types[84]; +static swig_module_info swig_module = {swig_types, 83, 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) @@ -7815,6 +7816,7 @@ static swig_type_info _swigt__p_Exiv2__RemoteIo = {"_p_Exiv2__RemoteIo", 0, 0, 0 static swig_type_info _swigt__p_Exiv2__XPathIo = {"_p_Exiv2__XPathIo", 0, 0, 0, 0, 0}; static swig_type_info _swigt__p_Exiv2__CommentValue = {"_p_Exiv2__CommentValue", "Exiv2::CommentValue *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_Exiv2__DataBuf = {"_p_Exiv2__DataBuf", "Exiv2::DataBuf *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_Exiv2__DataSet = {"_p_Exiv2__DataSet", "Exiv2::DataSet *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_Exiv2__DataValue = {"_p_Exiv2__DataValue", "Exiv2::DataValue *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_Exiv2__DateValue = {"_p_Exiv2__DateValue", "Exiv2::DateValue *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_Exiv2__ExifData = {"_p_Exiv2__ExifData", "Exiv2::ExifData *", 0, 0, (void*)0, 0}; @@ -7894,6 +7896,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_Exiv2__BasicIo, &_swigt__p_Exiv2__CommentValue, &_swigt__p_Exiv2__DataBuf, + &_swigt__p_Exiv2__DataSet, &_swigt__p_Exiv2__DataValue, &_swigt__p_Exiv2__DateValue, &_swigt__p_Exiv2__ExifData, @@ -7983,6 +7986,7 @@ static swig_cast_info _swigc__p_Exiv2__XPathIo[] = {{&_swigt__p_Exiv2__XPathIo, static swig_cast_info _swigc__p_Exiv2__BasicIo[] = { {&_swigt__p_Exiv2__BasicIo, 0, 0, 0}, {&_swigt__p_Exiv2__FileIo, _p_Exiv2__FileIoTo_p_Exiv2__BasicIo, 0, 0}, {&_swigt__p_Exiv2__HttpIo, _p_Exiv2__HttpIoTo_p_Exiv2__BasicIo, 0, 0}, {&_swigt__p_Exiv2__MemIo, _p_Exiv2__MemIoTo_p_Exiv2__BasicIo, 0, 0}, {&_swigt__p_Exiv2__RemoteIo, _p_Exiv2__RemoteIoTo_p_Exiv2__BasicIo, 0, 0}, {&_swigt__p_Exiv2__XPathIo, _p_Exiv2__XPathIoTo_p_Exiv2__BasicIo, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_Exiv2__CommentValue[] = { {&_swigt__p_Exiv2__CommentValue, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_Exiv2__DataBuf[] = { {&_swigt__p_Exiv2__DataBuf, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_Exiv2__DataSet[] = { {&_swigt__p_Exiv2__DataSet, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_Exiv2__DataValue[] = { {&_swigt__p_Exiv2__DataValue, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_Exiv2__DateValue[] = { {&_swigt__p_Exiv2__DateValue, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_Exiv2__ExifData[] = { {&_swigt__p_Exiv2__ExifData, 0, 0, 0},{0, 0, 0, 0}}; @@ -8062,6 +8066,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_Exiv2__BasicIo, _swigc__p_Exiv2__CommentValue, _swigc__p_Exiv2__DataBuf, + _swigc__p_Exiv2__DataSet, _swigc__p_Exiv2__DataValue, _swigc__p_Exiv2__DateValue, _swigc__p_Exiv2__ExifData, diff --git a/src/swig-0_27_4/iptc_wrap.cxx b/src/swig-0_27_4/iptc_wrap.cxx index d405f430..aa698618 100644 --- a/src/swig-0_27_4/iptc_wrap.cxx +++ b/src/swig-0_27_4/iptc_wrap.cxx @@ -3748,69 +3748,70 @@ SwigPyBuiltin_iternextfunc_closure(SwigPyWrapperFunction wrapper, PyObject *a) { #define SWIGTYPE_p_AutoPtr swig_types[0] #define SWIGTYPE_p_Exiv2__AsciiValue swig_types[1] #define SWIGTYPE_p_Exiv2__CommentValue swig_types[2] -#define SWIGTYPE_p_Exiv2__DataValue swig_types[3] -#define SWIGTYPE_p_Exiv2__DateValue swig_types[4] -#define SWIGTYPE_p_Exiv2__ExifData swig_types[5] -#define SWIGTYPE_p_Exiv2__IptcData swig_types[6] -#define SWIGTYPE_p_Exiv2__IptcKey swig_types[7] -#define SWIGTYPE_p_Exiv2__Iptcdatum swig_types[8] -#define SWIGTYPE_p_Exiv2__Key swig_types[9] -#define SWIGTYPE_p_Exiv2__LangAltValue swig_types[10] -#define SWIGTYPE_p_Exiv2__Metadatum swig_types[11] -#define SWIGTYPE_p_Exiv2__StringValue swig_types[12] -#define SWIGTYPE_p_Exiv2__StringValueBase swig_types[13] -#define SWIGTYPE_p_Exiv2__TimeValue swig_types[14] -#define SWIGTYPE_p_Exiv2__Value swig_types[15] -#define SWIGTYPE_p_Exiv2__ValueTypeT_double_t swig_types[16] -#define SWIGTYPE_p_Exiv2__ValueTypeT_float_t swig_types[17] -#define SWIGTYPE_p_Exiv2__ValueTypeT_int_t swig_types[18] -#define SWIGTYPE_p_Exiv2__ValueTypeT_short_t swig_types[19] -#define SWIGTYPE_p_Exiv2__ValueTypeT_std__pairT_int32_t_int32_t_t_t swig_types[20] -#define SWIGTYPE_p_Exiv2__ValueTypeT_std__pairT_uint32_t_uint32_t_t_t swig_types[21] -#define SWIGTYPE_p_Exiv2__ValueTypeT_unsigned_int_t swig_types[22] -#define SWIGTYPE_p_Exiv2__ValueTypeT_unsigned_short_t swig_types[23] -#define SWIGTYPE_p_Exiv2__XmpArrayValue swig_types[24] -#define SWIGTYPE_p_Exiv2__XmpTextValue swig_types[25] -#define SWIGTYPE_p_Exiv2__XmpValue swig_types[26] -#define SWIGTYPE_p_IptcData_iterator swig_types[27] -#define SWIGTYPE_p_IptcData_iterator_end swig_types[28] -#define SWIGTYPE_p_SwigPyObject swig_types[29] -#define SWIGTYPE_p_ValueList swig_types[30] -#define SWIGTYPE_p_ValueType swig_types[31] -#define SWIGTYPE_p_allocator_type swig_types[32] -#define SWIGTYPE_p_char swig_types[33] -#define SWIGTYPE_p_const_iterator swig_types[34] -#define SWIGTYPE_p_difference_type swig_types[35] -#define SWIGTYPE_p_first_type swig_types[36] -#define SWIGTYPE_p_int swig_types[37] -#define SWIGTYPE_p_iterator swig_types[38] -#define SWIGTYPE_p_key_type swig_types[39] -#define SWIGTYPE_p_long_long swig_types[40] -#define SWIGTYPE_p_mapped_type swig_types[41] -#define SWIGTYPE_p_second_type swig_types[42] -#define SWIGTYPE_p_short swig_types[43] -#define SWIGTYPE_p_signed_char swig_types[44] -#define SWIGTYPE_p_size_type swig_types[45] -#define SWIGTYPE_p_std__mapT_std__string_std__string_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_std__string_t_t_t swig_types[46] -#define SWIGTYPE_p_std__mapT_std__string_std__string_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_std__string_t_t_t__const_iterator swig_types[47] -#define SWIGTYPE_p_std__pairT_int_int_t swig_types[48] -#define SWIGTYPE_p_std__pairT_unsigned_int_unsigned_int_t swig_types[49] -#define SWIGTYPE_p_std__setT_std__string_t swig_types[50] -#define SWIGTYPE_p_std__setT_std__string_t__const_iterator swig_types[51] -#define SWIGTYPE_p_std__vectorT_Exiv2__Iptcdatum_std__allocatorT_Exiv2__Iptcdatum_t_t swig_types[52] -#define SWIGTYPE_p_std__vectorT_Exiv2__Iptcdatum_std__allocatorT_Exiv2__Iptcdatum_t_t__iterator swig_types[53] -#define SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t swig_types[54] -#define SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t__const_iterator swig_types[55] -#define SWIGTYPE_p_std__vectorT_unsigned_char_std__allocatorT_unsigned_char_t_t swig_types[56] -#define SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t swig_types[57] -#define SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t__const_iterator swig_types[58] -#define SWIGTYPE_p_unsigned_char swig_types[59] -#define SWIGTYPE_p_unsigned_int swig_types[60] -#define SWIGTYPE_p_unsigned_long_long swig_types[61] -#define SWIGTYPE_p_unsigned_short swig_types[62] -#define SWIGTYPE_p_value_type swig_types[63] -static swig_type_info *swig_types[65]; -static swig_module_info swig_module = {swig_types, 64, 0, 0, 0, 0}; +#define SWIGTYPE_p_Exiv2__DataSet swig_types[3] +#define SWIGTYPE_p_Exiv2__DataValue swig_types[4] +#define SWIGTYPE_p_Exiv2__DateValue swig_types[5] +#define SWIGTYPE_p_Exiv2__ExifData swig_types[6] +#define SWIGTYPE_p_Exiv2__IptcData swig_types[7] +#define SWIGTYPE_p_Exiv2__IptcKey swig_types[8] +#define SWIGTYPE_p_Exiv2__Iptcdatum swig_types[9] +#define SWIGTYPE_p_Exiv2__Key swig_types[10] +#define SWIGTYPE_p_Exiv2__LangAltValue swig_types[11] +#define SWIGTYPE_p_Exiv2__Metadatum swig_types[12] +#define SWIGTYPE_p_Exiv2__StringValue swig_types[13] +#define SWIGTYPE_p_Exiv2__StringValueBase swig_types[14] +#define SWIGTYPE_p_Exiv2__TimeValue swig_types[15] +#define SWIGTYPE_p_Exiv2__Value swig_types[16] +#define SWIGTYPE_p_Exiv2__ValueTypeT_double_t swig_types[17] +#define SWIGTYPE_p_Exiv2__ValueTypeT_float_t swig_types[18] +#define SWIGTYPE_p_Exiv2__ValueTypeT_int_t swig_types[19] +#define SWIGTYPE_p_Exiv2__ValueTypeT_short_t swig_types[20] +#define SWIGTYPE_p_Exiv2__ValueTypeT_std__pairT_int32_t_int32_t_t_t swig_types[21] +#define SWIGTYPE_p_Exiv2__ValueTypeT_std__pairT_uint32_t_uint32_t_t_t swig_types[22] +#define SWIGTYPE_p_Exiv2__ValueTypeT_unsigned_int_t swig_types[23] +#define SWIGTYPE_p_Exiv2__ValueTypeT_unsigned_short_t swig_types[24] +#define SWIGTYPE_p_Exiv2__XmpArrayValue swig_types[25] +#define SWIGTYPE_p_Exiv2__XmpTextValue swig_types[26] +#define SWIGTYPE_p_Exiv2__XmpValue swig_types[27] +#define SWIGTYPE_p_IptcData_iterator swig_types[28] +#define SWIGTYPE_p_IptcData_iterator_end swig_types[29] +#define SWIGTYPE_p_SwigPyObject swig_types[30] +#define SWIGTYPE_p_ValueList swig_types[31] +#define SWIGTYPE_p_ValueType swig_types[32] +#define SWIGTYPE_p_allocator_type swig_types[33] +#define SWIGTYPE_p_char swig_types[34] +#define SWIGTYPE_p_const_iterator swig_types[35] +#define SWIGTYPE_p_difference_type swig_types[36] +#define SWIGTYPE_p_first_type swig_types[37] +#define SWIGTYPE_p_int swig_types[38] +#define SWIGTYPE_p_iterator swig_types[39] +#define SWIGTYPE_p_key_type swig_types[40] +#define SWIGTYPE_p_long_long swig_types[41] +#define SWIGTYPE_p_mapped_type swig_types[42] +#define SWIGTYPE_p_second_type swig_types[43] +#define SWIGTYPE_p_short swig_types[44] +#define SWIGTYPE_p_signed_char swig_types[45] +#define SWIGTYPE_p_size_type swig_types[46] +#define SWIGTYPE_p_std__mapT_std__string_std__string_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_std__string_t_t_t swig_types[47] +#define SWIGTYPE_p_std__mapT_std__string_std__string_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_std__string_t_t_t__const_iterator swig_types[48] +#define SWIGTYPE_p_std__pairT_int_int_t swig_types[49] +#define SWIGTYPE_p_std__pairT_unsigned_int_unsigned_int_t swig_types[50] +#define SWIGTYPE_p_std__setT_std__string_t swig_types[51] +#define SWIGTYPE_p_std__setT_std__string_t__const_iterator swig_types[52] +#define SWIGTYPE_p_std__vectorT_Exiv2__Iptcdatum_std__allocatorT_Exiv2__Iptcdatum_t_t swig_types[53] +#define SWIGTYPE_p_std__vectorT_Exiv2__Iptcdatum_std__allocatorT_Exiv2__Iptcdatum_t_t__iterator swig_types[54] +#define SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t swig_types[55] +#define SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t__const_iterator swig_types[56] +#define SWIGTYPE_p_std__vectorT_unsigned_char_std__allocatorT_unsigned_char_t_t swig_types[57] +#define SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t swig_types[58] +#define SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t__const_iterator swig_types[59] +#define SWIGTYPE_p_unsigned_char swig_types[60] +#define SWIGTYPE_p_unsigned_int swig_types[61] +#define SWIGTYPE_p_unsigned_long_long swig_types[62] +#define SWIGTYPE_p_unsigned_short swig_types[63] +#define SWIGTYPE_p_value_type swig_types[64] +static swig_type_info *swig_types[66]; +static swig_module_info swig_module = {swig_types, 65, 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) @@ -11126,6 +11127,7 @@ static void *_p_IptcData_iteratorTo_p_IptcData_iterator_end(void *x, int *SWIGUN static swig_type_info _swigt__p_AutoPtr = {"_p_AutoPtr", "AutoPtr *", 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__CommentValue = {"_p_Exiv2__CommentValue", "Exiv2::CommentValue *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_Exiv2__DataSet = {"_p_Exiv2__DataSet", "Exiv2::DataSet *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_Exiv2__DataValue = {"_p_Exiv2__DataValue", "Exiv2::DataValue *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_Exiv2__DateValue = {"_p_Exiv2__DateValue", "Exiv2::DateValue *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_Exiv2__ExifData = {"_p_Exiv2__ExifData", "Exiv2::ExifData *", 0, 0, (void*)0, 0}; @@ -11192,6 +11194,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_AutoPtr, &_swigt__p_Exiv2__AsciiValue, &_swigt__p_Exiv2__CommentValue, + &_swigt__p_Exiv2__DataSet, &_swigt__p_Exiv2__DataValue, &_swigt__p_Exiv2__DateValue, &_swigt__p_Exiv2__ExifData, @@ -11258,6 +11261,7 @@ static swig_type_info *swig_type_initial[] = { static swig_cast_info _swigc__p_AutoPtr[] = { {&_swigt__p_AutoPtr, 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__CommentValue[] = { {&_swigt__p_Exiv2__CommentValue, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_Exiv2__DataSet[] = { {&_swigt__p_Exiv2__DataSet, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_Exiv2__DataValue[] = { {&_swigt__p_Exiv2__DataValue, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_Exiv2__DateValue[] = { {&_swigt__p_Exiv2__DateValue, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_Exiv2__ExifData[] = { {&_swigt__p_Exiv2__ExifData, 0, 0, 0},{0, 0, 0, 0}}; @@ -11324,6 +11328,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_AutoPtr, _swigc__p_Exiv2__AsciiValue, _swigc__p_Exiv2__CommentValue, + _swigc__p_Exiv2__DataSet, _swigc__p_Exiv2__DataValue, _swigc__p_Exiv2__DateValue, _swigc__p_Exiv2__ExifData, diff --git a/src/swig-0_27_4/preview_wrap.cxx b/src/swig-0_27_4/preview_wrap.cxx index c48e9bbe..fa3265ba 100644 --- a/src/swig-0_27_4/preview_wrap.cxx +++ b/src/swig-0_27_4/preview_wrap.cxx @@ -3752,83 +3752,84 @@ SwigPyBuiltin_iternextfunc_closure(SwigPyWrapperFunction wrapper, PyObject *a) { #define SWIGTYPE_p_Exiv2__BasicIo swig_types[4] #define SWIGTYPE_p_Exiv2__CommentValue swig_types[5] #define SWIGTYPE_p_Exiv2__DataBuf swig_types[6] -#define SWIGTYPE_p_Exiv2__DataValue swig_types[7] -#define SWIGTYPE_p_Exiv2__DateValue 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__IptcKey swig_types[14] -#define SWIGTYPE_p_Exiv2__Key swig_types[15] -#define SWIGTYPE_p_Exiv2__LangAltValue swig_types[16] -#define SWIGTYPE_p_Exiv2__MemIo swig_types[17] -#define SWIGTYPE_p_Exiv2__PreviewImage swig_types[18] -#define SWIGTYPE_p_Exiv2__PreviewManager swig_types[19] -#define SWIGTYPE_p_Exiv2__PreviewProperties 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_int_t swig_types[29] -#define SWIGTYPE_p_Exiv2__ValueTypeT_short_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_unsigned_int_t swig_types[33] -#define SWIGTYPE_p_Exiv2__ValueTypeT_unsigned_short_t swig_types[34] -#define SWIGTYPE_p_Exiv2__XPathIo swig_types[35] -#define SWIGTYPE_p_Exiv2__XmpArrayValue swig_types[36] -#define SWIGTYPE_p_Exiv2__XmpKey swig_types[37] -#define SWIGTYPE_p_Exiv2__XmpTextValue swig_types[38] -#define SWIGTYPE_p_Exiv2__XmpValue swig_types[39] -#define SWIGTYPE_p_IptcData_iterator swig_types[40] -#define SWIGTYPE_p_IptcData_iterator_end swig_types[41] -#define SWIGTYPE_p_NsRegistry swig_types[42] -#define SWIGTYPE_p_SwigPyObject swig_types[43] -#define SWIGTYPE_p_ValueList swig_types[44] -#define SWIGTYPE_p_ValueType swig_types[45] -#define SWIGTYPE_p_XmpData_iterator swig_types[46] -#define SWIGTYPE_p_XmpData_iterator_end 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__mapT_std__string_std__string_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_std__string_t_t_t swig_types[63] -#define SWIGTYPE_p_std__mapT_std__string_std__string_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_std__string_t_t_t__const_iterator swig_types[64] -#define SWIGTYPE_p_std__pairT_int_int_t swig_types[65] -#define SWIGTYPE_p_std__pairT_unsigned_int_unsigned_int_t swig_types[66] -#define SWIGTYPE_p_std__setT_std__string_t swig_types[67] -#define SWIGTYPE_p_std__setT_std__string_t__const_iterator swig_types[68] -#define SWIGTYPE_p_std__vectorT_Exiv2__Iptcdatum_std__allocatorT_Exiv2__Iptcdatum_t_t swig_types[69] -#define SWIGTYPE_p_std__vectorT_Exiv2__PreviewProperties_std__allocatorT_Exiv2__PreviewProperties_t_t swig_types[70] -#define SWIGTYPE_p_std__vectorT_Exiv2__Xmpdatum_std__allocatorT_Exiv2__Xmpdatum_t_t swig_types[71] -#define SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t swig_types[72] -#define SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t__const_iterator swig_types[73] -#define SWIGTYPE_p_std__vectorT_unsigned_char_std__allocatorT_unsigned_char_t_t swig_types[74] -#define SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t swig_types[75] -#define SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t__const_iterator swig_types[76] -#define SWIGTYPE_p_unsigned_char swig_types[77] -#define SWIGTYPE_p_unsigned_int swig_types[78] -#define SWIGTYPE_p_unsigned_long_long swig_types[79] -#define SWIGTYPE_p_unsigned_short swig_types[80] -#define SWIGTYPE_p_value_type swig_types[81] -static swig_type_info *swig_types[83]; -static swig_module_info swig_module = {swig_types, 82, 0, 0, 0, 0}; +#define SWIGTYPE_p_Exiv2__DataSet swig_types[7] +#define SWIGTYPE_p_Exiv2__DataValue swig_types[8] +#define SWIGTYPE_p_Exiv2__DateValue 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__IptcKey swig_types[15] +#define SWIGTYPE_p_Exiv2__Key swig_types[16] +#define SWIGTYPE_p_Exiv2__LangAltValue swig_types[17] +#define SWIGTYPE_p_Exiv2__MemIo swig_types[18] +#define SWIGTYPE_p_Exiv2__PreviewImage swig_types[19] +#define SWIGTYPE_p_Exiv2__PreviewManager swig_types[20] +#define SWIGTYPE_p_Exiv2__PreviewProperties swig_types[21] +#define SWIGTYPE_p_Exiv2__RemoteIo swig_types[22] +#define SWIGTYPE_p_Exiv2__StringValue swig_types[23] +#define SWIGTYPE_p_Exiv2__StringValueBase swig_types[24] +#define SWIGTYPE_p_Exiv2__TagInfo swig_types[25] +#define SWIGTYPE_p_Exiv2__TimeValue swig_types[26] +#define SWIGTYPE_p_Exiv2__Value swig_types[27] +#define SWIGTYPE_p_Exiv2__ValueTypeT_double_t swig_types[28] +#define SWIGTYPE_p_Exiv2__ValueTypeT_float_t swig_types[29] +#define SWIGTYPE_p_Exiv2__ValueTypeT_int_t swig_types[30] +#define SWIGTYPE_p_Exiv2__ValueTypeT_short_t swig_types[31] +#define SWIGTYPE_p_Exiv2__ValueTypeT_std__pairT_int32_t_int32_t_t_t swig_types[32] +#define SWIGTYPE_p_Exiv2__ValueTypeT_std__pairT_uint32_t_uint32_t_t_t swig_types[33] +#define SWIGTYPE_p_Exiv2__ValueTypeT_unsigned_int_t swig_types[34] +#define SWIGTYPE_p_Exiv2__ValueTypeT_unsigned_short_t swig_types[35] +#define SWIGTYPE_p_Exiv2__XPathIo swig_types[36] +#define SWIGTYPE_p_Exiv2__XmpArrayValue swig_types[37] +#define SWIGTYPE_p_Exiv2__XmpKey swig_types[38] +#define SWIGTYPE_p_Exiv2__XmpTextValue swig_types[39] +#define SWIGTYPE_p_Exiv2__XmpValue swig_types[40] +#define SWIGTYPE_p_IptcData_iterator swig_types[41] +#define SWIGTYPE_p_IptcData_iterator_end swig_types[42] +#define SWIGTYPE_p_NsRegistry swig_types[43] +#define SWIGTYPE_p_SwigPyObject swig_types[44] +#define SWIGTYPE_p_ValueList swig_types[45] +#define SWIGTYPE_p_ValueType swig_types[46] +#define SWIGTYPE_p_XmpData_iterator swig_types[47] +#define SWIGTYPE_p_XmpData_iterator_end swig_types[48] +#define SWIGTYPE_p_allocator_type swig_types[49] +#define SWIGTYPE_p_char swig_types[50] +#define SWIGTYPE_p_const_iterator swig_types[51] +#define SWIGTYPE_p_difference_type swig_types[52] +#define SWIGTYPE_p_first_type swig_types[53] +#define SWIGTYPE_p_int swig_types[54] +#define SWIGTYPE_p_iterator swig_types[55] +#define SWIGTYPE_p_key_type swig_types[56] +#define SWIGTYPE_p_long_long swig_types[57] +#define SWIGTYPE_p_mapped_type swig_types[58] +#define SWIGTYPE_p_second_type swig_types[59] +#define SWIGTYPE_p_short swig_types[60] +#define SWIGTYPE_p_signed_char swig_types[61] +#define SWIGTYPE_p_size_type swig_types[62] +#define SWIGTYPE_p_std__listT_Exiv2__Exifdatum_t swig_types[63] +#define SWIGTYPE_p_std__mapT_std__string_std__string_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_std__string_t_t_t swig_types[64] +#define SWIGTYPE_p_std__mapT_std__string_std__string_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_std__string_t_t_t__const_iterator swig_types[65] +#define SWIGTYPE_p_std__pairT_int_int_t swig_types[66] +#define SWIGTYPE_p_std__pairT_unsigned_int_unsigned_int_t swig_types[67] +#define SWIGTYPE_p_std__setT_std__string_t swig_types[68] +#define SWIGTYPE_p_std__setT_std__string_t__const_iterator swig_types[69] +#define SWIGTYPE_p_std__vectorT_Exiv2__Iptcdatum_std__allocatorT_Exiv2__Iptcdatum_t_t swig_types[70] +#define SWIGTYPE_p_std__vectorT_Exiv2__PreviewProperties_std__allocatorT_Exiv2__PreviewProperties_t_t swig_types[71] +#define SWIGTYPE_p_std__vectorT_Exiv2__Xmpdatum_std__allocatorT_Exiv2__Xmpdatum_t_t swig_types[72] +#define SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t swig_types[73] +#define SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t__const_iterator swig_types[74] +#define SWIGTYPE_p_std__vectorT_unsigned_char_std__allocatorT_unsigned_char_t_t swig_types[75] +#define SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t swig_types[76] +#define SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t__const_iterator swig_types[77] +#define SWIGTYPE_p_unsigned_char swig_types[78] +#define SWIGTYPE_p_unsigned_int swig_types[79] +#define SWIGTYPE_p_unsigned_long_long swig_types[80] +#define SWIGTYPE_p_unsigned_short swig_types[81] +#define SWIGTYPE_p_value_type swig_types[82] +static swig_type_info *swig_types[84]; +static swig_module_info swig_module = {swig_types, 83, 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) @@ -5814,6 +5815,7 @@ static swig_type_info _swigt__p_Exiv2__RemoteIo = {"_p_Exiv2__RemoteIo", 0, 0, 0 static swig_type_info _swigt__p_Exiv2__XPathIo = {"_p_Exiv2__XPathIo", 0, 0, 0, 0, 0}; static swig_type_info _swigt__p_Exiv2__CommentValue = {"_p_Exiv2__CommentValue", "Exiv2::CommentValue *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_Exiv2__DataBuf = {"_p_Exiv2__DataBuf", "Exiv2::DataBuf *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_Exiv2__DataSet = {"_p_Exiv2__DataSet", "Exiv2::DataSet *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_Exiv2__DataValue = {"_p_Exiv2__DataValue", "Exiv2::DataValue *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_Exiv2__DateValue = {"_p_Exiv2__DateValue", "Exiv2::DateValue *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_Exiv2__ExifKey = {"_p_Exiv2__ExifKey", "Exiv2::ExifKey *", 0, 0, (void*)0, 0}; @@ -5893,6 +5895,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_Exiv2__BasicIo, &_swigt__p_Exiv2__CommentValue, &_swigt__p_Exiv2__DataBuf, + &_swigt__p_Exiv2__DataSet, &_swigt__p_Exiv2__DataValue, &_swigt__p_Exiv2__DateValue, &_swigt__p_Exiv2__ExifKey, @@ -5982,6 +5985,7 @@ static swig_cast_info _swigc__p_Exiv2__XPathIo[] = {{&_swigt__p_Exiv2__XPathIo, static swig_cast_info _swigc__p_Exiv2__BasicIo[] = { {&_swigt__p_Exiv2__BasicIo, 0, 0, 0}, {&_swigt__p_Exiv2__FileIo, _p_Exiv2__FileIoTo_p_Exiv2__BasicIo, 0, 0}, {&_swigt__p_Exiv2__HttpIo, _p_Exiv2__HttpIoTo_p_Exiv2__BasicIo, 0, 0}, {&_swigt__p_Exiv2__MemIo, _p_Exiv2__MemIoTo_p_Exiv2__BasicIo, 0, 0}, {&_swigt__p_Exiv2__RemoteIo, _p_Exiv2__RemoteIoTo_p_Exiv2__BasicIo, 0, 0}, {&_swigt__p_Exiv2__XPathIo, _p_Exiv2__XPathIoTo_p_Exiv2__BasicIo, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_Exiv2__CommentValue[] = { {&_swigt__p_Exiv2__CommentValue, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_Exiv2__DataBuf[] = { {&_swigt__p_Exiv2__DataBuf, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_Exiv2__DataSet[] = { {&_swigt__p_Exiv2__DataSet, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_Exiv2__DataValue[] = { {&_swigt__p_Exiv2__DataValue, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_Exiv2__DateValue[] = { {&_swigt__p_Exiv2__DateValue, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_Exiv2__ExifKey[] = { {&_swigt__p_Exiv2__ExifKey, 0, 0, 0},{0, 0, 0, 0}}; @@ -6061,6 +6065,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_Exiv2__BasicIo, _swigc__p_Exiv2__CommentValue, _swigc__p_Exiv2__DataBuf, + _swigc__p_Exiv2__DataSet, _swigc__p_Exiv2__DataValue, _swigc__p_Exiv2__DateValue, _swigc__p_Exiv2__ExifKey, diff --git a/src/swig-0_27_4/properties_wrap.cxx b/src/swig-0_27_4/properties_wrap.cxx index fc0a2a04..773cbcd4 100644 --- a/src/swig-0_27_4/properties_wrap.cxx +++ b/src/swig-0_27_4/properties_wrap.cxx @@ -3748,68 +3748,69 @@ SwigPyBuiltin_iternextfunc_closure(SwigPyWrapperFunction wrapper, PyObject *a) { #define SWIGTYPE_p_AutoPtr swig_types[0] #define SWIGTYPE_p_Exiv2__AsciiValue swig_types[1] #define SWIGTYPE_p_Exiv2__CommentValue swig_types[2] -#define SWIGTYPE_p_Exiv2__DataValue swig_types[3] -#define SWIGTYPE_p_Exiv2__DateValue swig_types[4] -#define SWIGTYPE_p_Exiv2__IptcKey swig_types[5] -#define SWIGTYPE_p_Exiv2__Key swig_types[6] -#define SWIGTYPE_p_Exiv2__LangAltValue swig_types[7] -#define SWIGTYPE_p_Exiv2__StringValue swig_types[8] -#define SWIGTYPE_p_Exiv2__StringValueBase swig_types[9] -#define SWIGTYPE_p_Exiv2__TimeValue swig_types[10] -#define SWIGTYPE_p_Exiv2__Value swig_types[11] -#define SWIGTYPE_p_Exiv2__ValueTypeT_double_t swig_types[12] -#define SWIGTYPE_p_Exiv2__ValueTypeT_float_t swig_types[13] -#define SWIGTYPE_p_Exiv2__ValueTypeT_int_t swig_types[14] -#define SWIGTYPE_p_Exiv2__ValueTypeT_short_t swig_types[15] -#define SWIGTYPE_p_Exiv2__ValueTypeT_std__pairT_int32_t_int32_t_t_t swig_types[16] -#define SWIGTYPE_p_Exiv2__ValueTypeT_std__pairT_uint32_t_uint32_t_t_t swig_types[17] -#define SWIGTYPE_p_Exiv2__ValueTypeT_unsigned_int_t swig_types[18] -#define SWIGTYPE_p_Exiv2__ValueTypeT_unsigned_short_t swig_types[19] -#define SWIGTYPE_p_Exiv2__XmpArrayValue swig_types[20] -#define SWIGTYPE_p_Exiv2__XmpKey swig_types[21] -#define SWIGTYPE_p_Exiv2__XmpNsInfo swig_types[22] -#define SWIGTYPE_p_Exiv2__XmpNsInfo__Ns swig_types[23] -#define SWIGTYPE_p_Exiv2__XmpNsInfo__Prefix swig_types[24] -#define SWIGTYPE_p_Exiv2__XmpProperties swig_types[25] -#define SWIGTYPE_p_Exiv2__XmpPropertyInfo swig_types[26] -#define SWIGTYPE_p_Exiv2__XmpTextValue swig_types[27] -#define SWIGTYPE_p_Exiv2__XmpValue swig_types[28] -#define SWIGTYPE_p_NsRegistry swig_types[29] -#define SWIGTYPE_p_SwigPyObject swig_types[30] -#define SWIGTYPE_p_ValueList swig_types[31] -#define SWIGTYPE_p_ValueType swig_types[32] -#define SWIGTYPE_p_allocator_type swig_types[33] -#define SWIGTYPE_p_char swig_types[34] -#define SWIGTYPE_p_const_iterator swig_types[35] -#define SWIGTYPE_p_difference_type swig_types[36] -#define SWIGTYPE_p_first_type swig_types[37] -#define SWIGTYPE_p_int swig_types[38] -#define SWIGTYPE_p_iterator swig_types[39] -#define SWIGTYPE_p_key_type swig_types[40] -#define SWIGTYPE_p_long_long swig_types[41] -#define SWIGTYPE_p_mapped_type swig_types[42] -#define SWIGTYPE_p_second_type swig_types[43] -#define SWIGTYPE_p_short swig_types[44] -#define SWIGTYPE_p_signed_char swig_types[45] -#define SWIGTYPE_p_size_type swig_types[46] -#define SWIGTYPE_p_std__mapT_std__string_std__string_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_std__string_t_t_t swig_types[47] -#define SWIGTYPE_p_std__mapT_std__string_std__string_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_std__string_t_t_t__const_iterator swig_types[48] -#define SWIGTYPE_p_std__pairT_int_int_t swig_types[49] -#define SWIGTYPE_p_std__pairT_unsigned_int_unsigned_int_t swig_types[50] -#define SWIGTYPE_p_std__setT_std__string_t swig_types[51] -#define SWIGTYPE_p_std__setT_std__string_t__const_iterator swig_types[52] -#define SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t swig_types[53] -#define SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t__const_iterator swig_types[54] -#define SWIGTYPE_p_std__vectorT_unsigned_char_std__allocatorT_unsigned_char_t_t swig_types[55] -#define SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t swig_types[56] -#define SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t__const_iterator swig_types[57] -#define SWIGTYPE_p_unsigned_char swig_types[58] -#define SWIGTYPE_p_unsigned_int swig_types[59] -#define SWIGTYPE_p_unsigned_long_long swig_types[60] -#define SWIGTYPE_p_unsigned_short swig_types[61] -#define SWIGTYPE_p_value_type swig_types[62] -static swig_type_info *swig_types[64]; -static swig_module_info swig_module = {swig_types, 63, 0, 0, 0, 0}; +#define SWIGTYPE_p_Exiv2__DataSet swig_types[3] +#define SWIGTYPE_p_Exiv2__DataValue swig_types[4] +#define SWIGTYPE_p_Exiv2__DateValue swig_types[5] +#define SWIGTYPE_p_Exiv2__IptcKey swig_types[6] +#define SWIGTYPE_p_Exiv2__Key swig_types[7] +#define SWIGTYPE_p_Exiv2__LangAltValue swig_types[8] +#define SWIGTYPE_p_Exiv2__StringValue swig_types[9] +#define SWIGTYPE_p_Exiv2__StringValueBase swig_types[10] +#define SWIGTYPE_p_Exiv2__TimeValue swig_types[11] +#define SWIGTYPE_p_Exiv2__Value swig_types[12] +#define SWIGTYPE_p_Exiv2__ValueTypeT_double_t swig_types[13] +#define SWIGTYPE_p_Exiv2__ValueTypeT_float_t swig_types[14] +#define SWIGTYPE_p_Exiv2__ValueTypeT_int_t swig_types[15] +#define SWIGTYPE_p_Exiv2__ValueTypeT_short_t swig_types[16] +#define SWIGTYPE_p_Exiv2__ValueTypeT_std__pairT_int32_t_int32_t_t_t swig_types[17] +#define SWIGTYPE_p_Exiv2__ValueTypeT_std__pairT_uint32_t_uint32_t_t_t swig_types[18] +#define SWIGTYPE_p_Exiv2__ValueTypeT_unsigned_int_t swig_types[19] +#define SWIGTYPE_p_Exiv2__ValueTypeT_unsigned_short_t swig_types[20] +#define SWIGTYPE_p_Exiv2__XmpArrayValue swig_types[21] +#define SWIGTYPE_p_Exiv2__XmpKey swig_types[22] +#define SWIGTYPE_p_Exiv2__XmpNsInfo swig_types[23] +#define SWIGTYPE_p_Exiv2__XmpNsInfo__Ns swig_types[24] +#define SWIGTYPE_p_Exiv2__XmpNsInfo__Prefix swig_types[25] +#define SWIGTYPE_p_Exiv2__XmpProperties swig_types[26] +#define SWIGTYPE_p_Exiv2__XmpPropertyInfo swig_types[27] +#define SWIGTYPE_p_Exiv2__XmpTextValue swig_types[28] +#define SWIGTYPE_p_Exiv2__XmpValue swig_types[29] +#define SWIGTYPE_p_NsRegistry swig_types[30] +#define SWIGTYPE_p_SwigPyObject swig_types[31] +#define SWIGTYPE_p_ValueList swig_types[32] +#define SWIGTYPE_p_ValueType swig_types[33] +#define SWIGTYPE_p_allocator_type swig_types[34] +#define SWIGTYPE_p_char swig_types[35] +#define SWIGTYPE_p_const_iterator swig_types[36] +#define SWIGTYPE_p_difference_type swig_types[37] +#define SWIGTYPE_p_first_type swig_types[38] +#define SWIGTYPE_p_int swig_types[39] +#define SWIGTYPE_p_iterator swig_types[40] +#define SWIGTYPE_p_key_type swig_types[41] +#define SWIGTYPE_p_long_long swig_types[42] +#define SWIGTYPE_p_mapped_type swig_types[43] +#define SWIGTYPE_p_second_type swig_types[44] +#define SWIGTYPE_p_short swig_types[45] +#define SWIGTYPE_p_signed_char swig_types[46] +#define SWIGTYPE_p_size_type swig_types[47] +#define SWIGTYPE_p_std__mapT_std__string_std__string_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_std__string_t_t_t swig_types[48] +#define SWIGTYPE_p_std__mapT_std__string_std__string_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_std__string_t_t_t__const_iterator swig_types[49] +#define SWIGTYPE_p_std__pairT_int_int_t swig_types[50] +#define SWIGTYPE_p_std__pairT_unsigned_int_unsigned_int_t swig_types[51] +#define SWIGTYPE_p_std__setT_std__string_t swig_types[52] +#define SWIGTYPE_p_std__setT_std__string_t__const_iterator swig_types[53] +#define SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t swig_types[54] +#define SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t__const_iterator swig_types[55] +#define SWIGTYPE_p_std__vectorT_unsigned_char_std__allocatorT_unsigned_char_t_t swig_types[56] +#define SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t swig_types[57] +#define SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t__const_iterator swig_types[58] +#define SWIGTYPE_p_unsigned_char swig_types[59] +#define SWIGTYPE_p_unsigned_int swig_types[60] +#define SWIGTYPE_p_unsigned_long_long swig_types[61] +#define SWIGTYPE_p_unsigned_short swig_types[62] +#define SWIGTYPE_p_value_type swig_types[63] +static swig_type_info *swig_types[65]; +static swig_module_info swig_module = {swig_types, 64, 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) @@ -6974,6 +6975,7 @@ static void *_p_Exiv2__XmpTextValueTo_p_Exiv2__XmpValue(void *x, int *SWIGUNUSED static swig_type_info _swigt__p_AutoPtr = {"_p_AutoPtr", "AutoPtr *", 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__CommentValue = {"_p_Exiv2__CommentValue", "Exiv2::CommentValue *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_Exiv2__DataSet = {"_p_Exiv2__DataSet", "Exiv2::DataSet *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_Exiv2__DataValue = {"_p_Exiv2__DataValue", "Exiv2::DataValue *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_Exiv2__DateValue = {"_p_Exiv2__DateValue", "Exiv2::DateValue *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_Exiv2__IptcKey = {"_p_Exiv2__IptcKey", "Exiv2::IptcKey *", 0, 0, (void*)0, 0}; @@ -7039,6 +7041,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_AutoPtr, &_swigt__p_Exiv2__AsciiValue, &_swigt__p_Exiv2__CommentValue, + &_swigt__p_Exiv2__DataSet, &_swigt__p_Exiv2__DataValue, &_swigt__p_Exiv2__DateValue, &_swigt__p_Exiv2__IptcKey, @@ -7104,6 +7107,7 @@ static swig_type_info *swig_type_initial[] = { static swig_cast_info _swigc__p_AutoPtr[] = { {&_swigt__p_AutoPtr, 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__CommentValue[] = { {&_swigt__p_Exiv2__CommentValue, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_Exiv2__DataSet[] = { {&_swigt__p_Exiv2__DataSet, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_Exiv2__DataValue[] = { {&_swigt__p_Exiv2__DataValue, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_Exiv2__DateValue[] = { {&_swigt__p_Exiv2__DateValue, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_Exiv2__IptcKey[] = { {&_swigt__p_Exiv2__IptcKey, 0, 0, 0},{0, 0, 0, 0}}; @@ -7169,6 +7173,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_AutoPtr, _swigc__p_Exiv2__AsciiValue, _swigc__p_Exiv2__CommentValue, + _swigc__p_Exiv2__DataSet, _swigc__p_Exiv2__DataValue, _swigc__p_Exiv2__DateValue, _swigc__p_Exiv2__IptcKey, diff --git a/src/swig-0_27_4/tags_wrap.cxx b/src/swig-0_27_4/tags_wrap.cxx index 50ee6e70..3c5f3d62 100644 --- a/src/swig-0_27_4/tags_wrap.cxx +++ b/src/swig-0_27_4/tags_wrap.cxx @@ -3779,27 +3779,26 @@ SwigPyBuiltin_iternextfunc_closure(SwigPyWrapperFunction wrapper, PyObject *a) { #define SWIGTYPE_p_char swig_types[31] #define SWIGTYPE_p_const_iterator swig_types[32] #define SWIGTYPE_p_difference_type swig_types[33] -#define SWIGTYPE_p_f___p_Exiv2__TagInfo swig_types[34] -#define SWIGTYPE_p_first_type swig_types[35] -#define SWIGTYPE_p_int swig_types[36] -#define SWIGTYPE_p_iterator swig_types[37] -#define SWIGTYPE_p_key_type swig_types[38] -#define SWIGTYPE_p_long_long swig_types[39] -#define SWIGTYPE_p_mapped_type swig_types[40] -#define SWIGTYPE_p_second_type swig_types[41] -#define SWIGTYPE_p_short swig_types[42] -#define SWIGTYPE_p_signed_char swig_types[43] -#define SWIGTYPE_p_size_type swig_types[44] -#define SWIGTYPE_p_std__pairT_int_int_t swig_types[45] -#define SWIGTYPE_p_std__pairT_unsigned_int_unsigned_int_t swig_types[46] -#define SWIGTYPE_p_std__vectorT_unsigned_char_std__allocatorT_unsigned_char_t_t swig_types[47] -#define SWIGTYPE_p_unsigned_char swig_types[48] -#define SWIGTYPE_p_unsigned_int swig_types[49] -#define SWIGTYPE_p_unsigned_long_long swig_types[50] -#define SWIGTYPE_p_unsigned_short swig_types[51] -#define SWIGTYPE_p_value_type swig_types[52] -static swig_type_info *swig_types[54]; -static swig_module_info swig_module = {swig_types, 53, 0, 0, 0, 0}; +#define SWIGTYPE_p_first_type swig_types[34] +#define SWIGTYPE_p_int swig_types[35] +#define SWIGTYPE_p_iterator swig_types[36] +#define SWIGTYPE_p_key_type swig_types[37] +#define SWIGTYPE_p_long_long swig_types[38] +#define SWIGTYPE_p_mapped_type swig_types[39] +#define SWIGTYPE_p_second_type swig_types[40] +#define SWIGTYPE_p_short swig_types[41] +#define SWIGTYPE_p_signed_char swig_types[42] +#define SWIGTYPE_p_size_type swig_types[43] +#define SWIGTYPE_p_std__pairT_int_int_t swig_types[44] +#define SWIGTYPE_p_std__pairT_unsigned_int_unsigned_int_t swig_types[45] +#define SWIGTYPE_p_std__vectorT_unsigned_char_std__allocatorT_unsigned_char_t_t swig_types[46] +#define SWIGTYPE_p_unsigned_char swig_types[47] +#define SWIGTYPE_p_unsigned_int swig_types[48] +#define SWIGTYPE_p_unsigned_long_long swig_types[49] +#define SWIGTYPE_p_unsigned_short swig_types[50] +#define SWIGTYPE_p_value_type swig_types[51] +static swig_type_info *swig_types[53]; +static swig_module_info swig_module = {swig_types, 52, 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) @@ -4607,7 +4606,16 @@ SWIGINTERN PyObject *_wrap_GroupInfo_tagList__get(PyObject *self, PyObject *args } arg1 = reinterpret_cast< Exiv2::GroupInfo * >(argp1); result = (Exiv2::TagListFct) ((arg1)->tagList_); - resultobj = SWIG_NewFunctionPtrObj((void *)(result), SWIGTYPE_p_f___p_Exiv2__TagInfo); + { + const Exiv2::TagInfo* ti = result(); + PyObject* list = PyList_New(0); + while (ti->tag_ != 0xFFFF) { + PyList_Append(list, SWIG_NewPointerObj( + SWIG_as_voidptr(ti), SWIGTYPE_p_Exiv2__TagInfo, 0)); + ++ti; + } + resultobj = SWIG_Python_AppendOutput(resultobj, PyList_AsTuple(list)); + } return resultobj; fail: return NULL; @@ -6938,7 +6946,6 @@ static swig_type_info _swigt__p_allocator_type = {"_p_allocator_type", "allocato static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_const_iterator = {"_p_const_iterator", "const_iterator *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_difference_type = {"_p_difference_type", "difference_type *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f___p_Exiv2__TagInfo = {"_p_f___p_Exiv2__TagInfo", "Exiv2::TagListFct|Exiv2::TagInfo *(*)()", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_first_type = {"_p_first_type", "first_type *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_int = {"_p_int", "int32_t *|int_fast16_t *|int_fast32_t *|int_least32_t *|intptr_t *|int *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_iterator = {"_p_iterator", "iterator *", 0, 0, (void*)0, 0}; @@ -6993,7 +7000,6 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_char, &_swigt__p_const_iterator, &_swigt__p_difference_type, - &_swigt__p_f___p_Exiv2__TagInfo, &_swigt__p_first_type, &_swigt__p_int, &_swigt__p_iterator, @@ -7048,7 +7054,6 @@ static swig_cast_info _swigc__p_allocator_type[] = { {&_swigt__p_allocator_type static swig_cast_info _swigc__p_char[] = { {&_swigt__p_char, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_const_iterator[] = { {&_swigt__p_const_iterator, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_difference_type[] = { {&_swigt__p_difference_type, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_f___p_Exiv2__TagInfo[] = { {&_swigt__p_f___p_Exiv2__TagInfo, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_first_type[] = { {&_swigt__p_first_type, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_int[] = { {&_swigt__p_int, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_iterator[] = { {&_swigt__p_iterator, 0, 0, 0},{0, 0, 0, 0}}; @@ -7103,7 +7108,6 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_char, _swigc__p_const_iterator, _swigc__p_difference_type, - _swigc__p_f___p_Exiv2__TagInfo, _swigc__p_first_type, _swigc__p_int, _swigc__p_iterator, diff --git a/src/swig-0_27_4/xmp_wrap.cxx b/src/swig-0_27_4/xmp_wrap.cxx index 0f943647..ca68f4e0 100644 --- a/src/swig-0_27_4/xmp_wrap.cxx +++ b/src/swig-0_27_4/xmp_wrap.cxx @@ -3748,73 +3748,74 @@ SwigPyBuiltin_iternextfunc_closure(SwigPyWrapperFunction wrapper, PyObject *a) { #define SWIGTYPE_p_AutoPtr swig_types[0] #define SWIGTYPE_p_Exiv2__AsciiValue swig_types[1] #define SWIGTYPE_p_Exiv2__CommentValue swig_types[2] -#define SWIGTYPE_p_Exiv2__DataValue swig_types[3] -#define SWIGTYPE_p_Exiv2__DateValue swig_types[4] -#define SWIGTYPE_p_Exiv2__ExifData swig_types[5] -#define SWIGTYPE_p_Exiv2__IptcKey swig_types[6] -#define SWIGTYPE_p_Exiv2__Key swig_types[7] -#define SWIGTYPE_p_Exiv2__LangAltValue swig_types[8] -#define SWIGTYPE_p_Exiv2__Metadatum swig_types[9] -#define SWIGTYPE_p_Exiv2__StringValue swig_types[10] -#define SWIGTYPE_p_Exiv2__StringValueBase swig_types[11] -#define SWIGTYPE_p_Exiv2__TimeValue swig_types[12] -#define SWIGTYPE_p_Exiv2__Value swig_types[13] -#define SWIGTYPE_p_Exiv2__ValueTypeT_double_t swig_types[14] -#define SWIGTYPE_p_Exiv2__ValueTypeT_float_t swig_types[15] -#define SWIGTYPE_p_Exiv2__ValueTypeT_int_t swig_types[16] -#define SWIGTYPE_p_Exiv2__ValueTypeT_short_t swig_types[17] -#define SWIGTYPE_p_Exiv2__ValueTypeT_std__pairT_int32_t_int32_t_t_t swig_types[18] -#define SWIGTYPE_p_Exiv2__ValueTypeT_std__pairT_uint32_t_uint32_t_t_t swig_types[19] -#define SWIGTYPE_p_Exiv2__ValueTypeT_unsigned_int_t swig_types[20] -#define SWIGTYPE_p_Exiv2__ValueTypeT_unsigned_short_t swig_types[21] -#define SWIGTYPE_p_Exiv2__XmpArrayValue swig_types[22] -#define SWIGTYPE_p_Exiv2__XmpData swig_types[23] -#define SWIGTYPE_p_Exiv2__XmpKey swig_types[24] -#define SWIGTYPE_p_Exiv2__XmpParser swig_types[25] -#define SWIGTYPE_p_Exiv2__XmpTextValue swig_types[26] -#define SWIGTYPE_p_Exiv2__XmpValue swig_types[27] -#define SWIGTYPE_p_Exiv2__Xmpdatum swig_types[28] -#define SWIGTYPE_p_NsRegistry swig_types[29] -#define SWIGTYPE_p_SwigPyObject swig_types[30] -#define SWIGTYPE_p_ValueList swig_types[31] -#define SWIGTYPE_p_ValueType swig_types[32] -#define SWIGTYPE_p_XmpData_iterator swig_types[33] -#define SWIGTYPE_p_XmpData_iterator_end swig_types[34] -#define SWIGTYPE_p_allocator_type swig_types[35] -#define SWIGTYPE_p_char swig_types[36] -#define SWIGTYPE_p_const_iterator swig_types[37] -#define SWIGTYPE_p_difference_type swig_types[38] -#define SWIGTYPE_p_f_p_void_bool__void swig_types[39] -#define SWIGTYPE_p_first_type swig_types[40] -#define SWIGTYPE_p_int swig_types[41] -#define SWIGTYPE_p_iterator swig_types[42] -#define SWIGTYPE_p_key_type swig_types[43] -#define SWIGTYPE_p_long_long swig_types[44] -#define SWIGTYPE_p_mapped_type swig_types[45] -#define SWIGTYPE_p_second_type swig_types[46] -#define SWIGTYPE_p_short swig_types[47] -#define SWIGTYPE_p_signed_char swig_types[48] -#define SWIGTYPE_p_size_type swig_types[49] -#define SWIGTYPE_p_std__mapT_std__string_std__string_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_std__string_t_t_t swig_types[50] -#define SWIGTYPE_p_std__mapT_std__string_std__string_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_std__string_t_t_t__const_iterator swig_types[51] -#define SWIGTYPE_p_std__pairT_int_int_t swig_types[52] -#define SWIGTYPE_p_std__pairT_unsigned_int_unsigned_int_t swig_types[53] -#define SWIGTYPE_p_std__setT_std__string_t swig_types[54] -#define SWIGTYPE_p_std__setT_std__string_t__const_iterator swig_types[55] -#define SWIGTYPE_p_std__vectorT_Exiv2__Xmpdatum_std__allocatorT_Exiv2__Xmpdatum_t_t swig_types[56] -#define SWIGTYPE_p_std__vectorT_Exiv2__Xmpdatum_std__allocatorT_Exiv2__Xmpdatum_t_t__iterator swig_types[57] -#define SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t swig_types[58] -#define SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t__const_iterator swig_types[59] -#define SWIGTYPE_p_std__vectorT_unsigned_char_std__allocatorT_unsigned_char_t_t swig_types[60] -#define SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t swig_types[61] -#define SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t__const_iterator swig_types[62] -#define SWIGTYPE_p_unsigned_char swig_types[63] -#define SWIGTYPE_p_unsigned_int swig_types[64] -#define SWIGTYPE_p_unsigned_long_long swig_types[65] -#define SWIGTYPE_p_unsigned_short swig_types[66] -#define SWIGTYPE_p_value_type swig_types[67] -static swig_type_info *swig_types[69]; -static swig_module_info swig_module = {swig_types, 68, 0, 0, 0, 0}; +#define SWIGTYPE_p_Exiv2__DataSet swig_types[3] +#define SWIGTYPE_p_Exiv2__DataValue swig_types[4] +#define SWIGTYPE_p_Exiv2__DateValue swig_types[5] +#define SWIGTYPE_p_Exiv2__ExifData swig_types[6] +#define SWIGTYPE_p_Exiv2__IptcKey swig_types[7] +#define SWIGTYPE_p_Exiv2__Key swig_types[8] +#define SWIGTYPE_p_Exiv2__LangAltValue swig_types[9] +#define SWIGTYPE_p_Exiv2__Metadatum swig_types[10] +#define SWIGTYPE_p_Exiv2__StringValue swig_types[11] +#define SWIGTYPE_p_Exiv2__StringValueBase swig_types[12] +#define SWIGTYPE_p_Exiv2__TimeValue swig_types[13] +#define SWIGTYPE_p_Exiv2__Value swig_types[14] +#define SWIGTYPE_p_Exiv2__ValueTypeT_double_t swig_types[15] +#define SWIGTYPE_p_Exiv2__ValueTypeT_float_t swig_types[16] +#define SWIGTYPE_p_Exiv2__ValueTypeT_int_t swig_types[17] +#define SWIGTYPE_p_Exiv2__ValueTypeT_short_t swig_types[18] +#define SWIGTYPE_p_Exiv2__ValueTypeT_std__pairT_int32_t_int32_t_t_t swig_types[19] +#define SWIGTYPE_p_Exiv2__ValueTypeT_std__pairT_uint32_t_uint32_t_t_t swig_types[20] +#define SWIGTYPE_p_Exiv2__ValueTypeT_unsigned_int_t swig_types[21] +#define SWIGTYPE_p_Exiv2__ValueTypeT_unsigned_short_t swig_types[22] +#define SWIGTYPE_p_Exiv2__XmpArrayValue swig_types[23] +#define SWIGTYPE_p_Exiv2__XmpData swig_types[24] +#define SWIGTYPE_p_Exiv2__XmpKey swig_types[25] +#define SWIGTYPE_p_Exiv2__XmpParser swig_types[26] +#define SWIGTYPE_p_Exiv2__XmpTextValue swig_types[27] +#define SWIGTYPE_p_Exiv2__XmpValue swig_types[28] +#define SWIGTYPE_p_Exiv2__Xmpdatum swig_types[29] +#define SWIGTYPE_p_NsRegistry swig_types[30] +#define SWIGTYPE_p_SwigPyObject swig_types[31] +#define SWIGTYPE_p_ValueList swig_types[32] +#define SWIGTYPE_p_ValueType swig_types[33] +#define SWIGTYPE_p_XmpData_iterator swig_types[34] +#define SWIGTYPE_p_XmpData_iterator_end swig_types[35] +#define SWIGTYPE_p_allocator_type swig_types[36] +#define SWIGTYPE_p_char swig_types[37] +#define SWIGTYPE_p_const_iterator swig_types[38] +#define SWIGTYPE_p_difference_type swig_types[39] +#define SWIGTYPE_p_f_p_void_bool__void swig_types[40] +#define SWIGTYPE_p_first_type swig_types[41] +#define SWIGTYPE_p_int swig_types[42] +#define SWIGTYPE_p_iterator swig_types[43] +#define SWIGTYPE_p_key_type swig_types[44] +#define SWIGTYPE_p_long_long swig_types[45] +#define SWIGTYPE_p_mapped_type swig_types[46] +#define SWIGTYPE_p_second_type swig_types[47] +#define SWIGTYPE_p_short swig_types[48] +#define SWIGTYPE_p_signed_char swig_types[49] +#define SWIGTYPE_p_size_type swig_types[50] +#define SWIGTYPE_p_std__mapT_std__string_std__string_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_std__string_t_t_t swig_types[51] +#define SWIGTYPE_p_std__mapT_std__string_std__string_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_std__string_t_t_t__const_iterator swig_types[52] +#define SWIGTYPE_p_std__pairT_int_int_t swig_types[53] +#define SWIGTYPE_p_std__pairT_unsigned_int_unsigned_int_t swig_types[54] +#define SWIGTYPE_p_std__setT_std__string_t swig_types[55] +#define SWIGTYPE_p_std__setT_std__string_t__const_iterator swig_types[56] +#define SWIGTYPE_p_std__vectorT_Exiv2__Xmpdatum_std__allocatorT_Exiv2__Xmpdatum_t_t swig_types[57] +#define SWIGTYPE_p_std__vectorT_Exiv2__Xmpdatum_std__allocatorT_Exiv2__Xmpdatum_t_t__iterator swig_types[58] +#define SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t swig_types[59] +#define SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t__const_iterator swig_types[60] +#define SWIGTYPE_p_std__vectorT_unsigned_char_std__allocatorT_unsigned_char_t_t swig_types[61] +#define SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t swig_types[62] +#define SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t__const_iterator 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 SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) @@ -11439,6 +11440,7 @@ static void *_p_XmpData_iteratorTo_p_XmpData_iterator_end(void *x, int *SWIGUNUS static swig_type_info _swigt__p_AutoPtr = {"_p_AutoPtr", "AutoPtr *", 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__CommentValue = {"_p_Exiv2__CommentValue", "Exiv2::CommentValue *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_Exiv2__DataSet = {"_p_Exiv2__DataSet", "Exiv2::DataSet *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_Exiv2__DataValue = {"_p_Exiv2__DataValue", "Exiv2::DataValue *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_Exiv2__DateValue = {"_p_Exiv2__DateValue", "Exiv2::DateValue *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_Exiv2__ExifData = {"_p_Exiv2__ExifData", "Exiv2::ExifData *", 0, 0, (void*)0, 0}; @@ -11509,6 +11511,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_AutoPtr, &_swigt__p_Exiv2__AsciiValue, &_swigt__p_Exiv2__CommentValue, + &_swigt__p_Exiv2__DataSet, &_swigt__p_Exiv2__DataValue, &_swigt__p_Exiv2__DateValue, &_swigt__p_Exiv2__ExifData, @@ -11579,6 +11582,7 @@ static swig_type_info *swig_type_initial[] = { static swig_cast_info _swigc__p_AutoPtr[] = { {&_swigt__p_AutoPtr, 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__CommentValue[] = { {&_swigt__p_Exiv2__CommentValue, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_Exiv2__DataSet[] = { {&_swigt__p_Exiv2__DataSet, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_Exiv2__DataValue[] = { {&_swigt__p_Exiv2__DataValue, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_Exiv2__DateValue[] = { {&_swigt__p_Exiv2__DateValue, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_Exiv2__ExifData[] = { {&_swigt__p_Exiv2__ExifData, 0, 0, 0},{0, 0, 0, 0}}; @@ -11649,6 +11653,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_AutoPtr, _swigc__p_Exiv2__AsciiValue, _swigc__p_Exiv2__CommentValue, + _swigc__p_Exiv2__DataSet, _swigc__p_Exiv2__DataValue, _swigc__p_Exiv2__DateValue, _swigc__p_Exiv2__ExifData, diff --git a/src/swig-0_28_0/datasets_wrap.cxx b/src/swig-0_28_0/datasets_wrap.cxx index 4d8fd9c5..2b6a9f78 100644 --- a/src/swig-0_28_0/datasets_wrap.cxx +++ b/src/swig-0_28_0/datasets_wrap.cxx @@ -5178,7 +5178,16 @@ SWIGINTERN PyObject *_wrap_IptcDataSets_envelopeRecordList(PyObject *self, PyObj SWIG_fail; } } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Exiv2__DataSet, 0 | 0 ); + { + const Exiv2::DataSet* ptr = result; + PyObject* list = PyList_New(0); + while (ptr->number_ != 0xffff) { + PyList_Append(list, SWIG_NewPointerObj( + SWIG_as_voidptr(ptr), SWIGTYPE_p_Exiv2__DataSet, 0)); + ++ptr; + } + resultobj = SWIG_Python_AppendOutput(resultobj, PyList_AsTuple(list)); + } return resultobj; fail: return NULL; @@ -5205,7 +5214,16 @@ SWIGINTERN PyObject *_wrap_IptcDataSets_application2RecordList(PyObject *self, P SWIG_fail; } } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Exiv2__DataSet, 0 | 0 ); + { + const Exiv2::DataSet* ptr = result; + PyObject* list = PyList_New(0); + while (ptr->number_ != 0xffff) { + PyList_Append(list, SWIG_NewPointerObj( + SWIG_as_voidptr(ptr), SWIGTYPE_p_Exiv2__DataSet, 0)); + ++ptr; + } + resultobj = SWIG_Python_AppendOutput(resultobj, PyList_AsTuple(list)); + } return resultobj; fail: return NULL; diff --git a/src/swig-0_28_0/image_wrap.cxx b/src/swig-0_28_0/image_wrap.cxx index 2c2b9cfd..b6cbc993 100644 --- a/src/swig-0_28_0/image_wrap.cxx +++ b/src/swig-0_28_0/image_wrap.cxx @@ -3752,77 +3752,78 @@ SwigPyBuiltin_iternextfunc_closure(SwigPyWrapperFunction wrapper, PyObject *a) { #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__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_int_t swig_types[28] -#define SWIGTYPE_p_Exiv2__ValueTypeT_short_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_unsigned_int_t swig_types[32] -#define SWIGTYPE_p_Exiv2__ValueTypeT_unsigned_short_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__XmpTextValue swig_types[38] -#define SWIGTYPE_p_Exiv2__XmpValue swig_types[39] -#define SWIGTYPE_p_IptcData_iterator swig_types[40] -#define SWIGTYPE_p_IptcData_iterator_end swig_types[41] -#define SWIGTYPE_p_NsRegistry swig_types[42] -#define SWIGTYPE_p_SwigPyObject swig_types[43] -#define SWIGTYPE_p_UniquePtr swig_types[44] -#define SWIGTYPE_p_ValueList swig_types[45] -#define SWIGTYPE_p_ValueType swig_types[46] -#define SWIGTYPE_p_XmpData_iterator swig_types[47] -#define SWIGTYPE_p_XmpData_iterator_end swig_types[48] -#define SWIGTYPE_p_allocator_type swig_types[49] -#define SWIGTYPE_p_char swig_types[50] -#define SWIGTYPE_p_const_iterator swig_types[51] -#define SWIGTYPE_p_difference_type swig_types[52] -#define SWIGTYPE_p_first_type swig_types[53] -#define SWIGTYPE_p_int swig_types[54] -#define SWIGTYPE_p_iterator swig_types[55] -#define SWIGTYPE_p_key_type swig_types[56] -#define SWIGTYPE_p_long_long swig_types[57] -#define SWIGTYPE_p_mapped_type swig_types[58] -#define SWIGTYPE_p_second_type swig_types[59] -#define SWIGTYPE_p_short swig_types[60] -#define SWIGTYPE_p_signed_char swig_types[61] -#define SWIGTYPE_p_size_type swig_types[62] -#define SWIGTYPE_p_std__listT_Exiv2__Exifdatum_t swig_types[63] -#define SWIGTYPE_p_std__mapT_std__string_std__string_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_std__string_t_t_t swig_types[64] -#define SWIGTYPE_p_std__pairT_int_int_t swig_types[65] -#define SWIGTYPE_p_std__pairT_unsigned_int_unsigned_int_t swig_types[66] -#define SWIGTYPE_p_std__vectorT_Exiv2__Iptcdatum_std__allocatorT_Exiv2__Iptcdatum_t_t swig_types[67] -#define SWIGTYPE_p_std__vectorT_Exiv2__Xmpdatum_std__allocatorT_Exiv2__Xmpdatum_t_t swig_types[68] -#define SWIGTYPE_p_std__vectorT_unsigned_char_std__allocatorT_unsigned_char_t_t swig_types[69] -#define SWIGTYPE_p_unsigned_char swig_types[70] -#define SWIGTYPE_p_unsigned_int swig_types[71] -#define SWIGTYPE_p_unsigned_long_long swig_types[72] -#define SWIGTYPE_p_unsigned_short swig_types[73] -#define SWIGTYPE_p_value_type swig_types[74] -static swig_type_info *swig_types[76]; -static swig_module_info swig_module = {swig_types, 75, 0, 0, 0, 0}; +#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_int_t swig_types[29] +#define SWIGTYPE_p_Exiv2__ValueTypeT_short_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_unsigned_int_t swig_types[33] +#define SWIGTYPE_p_Exiv2__ValueTypeT_unsigned_short_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__XmpTextValue swig_types[39] +#define SWIGTYPE_p_Exiv2__XmpValue swig_types[40] +#define SWIGTYPE_p_IptcData_iterator swig_types[41] +#define SWIGTYPE_p_IptcData_iterator_end swig_types[42] +#define SWIGTYPE_p_NsRegistry swig_types[43] +#define SWIGTYPE_p_SwigPyObject swig_types[44] +#define SWIGTYPE_p_UniquePtr swig_types[45] +#define SWIGTYPE_p_ValueList swig_types[46] +#define SWIGTYPE_p_ValueType swig_types[47] +#define SWIGTYPE_p_XmpData_iterator swig_types[48] +#define SWIGTYPE_p_XmpData_iterator_end swig_types[49] +#define SWIGTYPE_p_allocator_type swig_types[50] +#define SWIGTYPE_p_char swig_types[51] +#define SWIGTYPE_p_const_iterator swig_types[52] +#define SWIGTYPE_p_difference_type swig_types[53] +#define SWIGTYPE_p_first_type swig_types[54] +#define SWIGTYPE_p_int swig_types[55] +#define SWIGTYPE_p_iterator swig_types[56] +#define SWIGTYPE_p_key_type swig_types[57] +#define SWIGTYPE_p_long_long swig_types[58] +#define SWIGTYPE_p_mapped_type swig_types[59] +#define SWIGTYPE_p_second_type swig_types[60] +#define SWIGTYPE_p_short swig_types[61] +#define SWIGTYPE_p_signed_char swig_types[62] +#define SWIGTYPE_p_size_type swig_types[63] +#define SWIGTYPE_p_std__listT_Exiv2__Exifdatum_t swig_types[64] +#define SWIGTYPE_p_std__mapT_std__string_std__string_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_std__string_t_t_t swig_types[65] +#define SWIGTYPE_p_std__pairT_int_int_t swig_types[66] +#define SWIGTYPE_p_std__pairT_unsigned_int_unsigned_int_t swig_types[67] +#define SWIGTYPE_p_std__vectorT_Exiv2__Iptcdatum_std__allocatorT_Exiv2__Iptcdatum_t_t swig_types[68] +#define SWIGTYPE_p_std__vectorT_Exiv2__Xmpdatum_std__allocatorT_Exiv2__Xmpdatum_t_t swig_types[69] +#define SWIGTYPE_p_std__vectorT_unsigned_char_std__allocatorT_unsigned_char_t_t swig_types[70] +#define SWIGTYPE_p_unsigned_char swig_types[71] +#define SWIGTYPE_p_unsigned_int swig_types[72] +#define SWIGTYPE_p_unsigned_long_long swig_types[73] +#define SWIGTYPE_p_unsigned_short swig_types[74] +#define SWIGTYPE_p_value_type swig_types[75] +static swig_type_info *swig_types[77]; +static swig_module_info swig_module = {swig_types, 76, 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) @@ -8010,6 +8011,7 @@ static swig_type_info _swigt__p_Exiv2__RemoteIo = {"_p_Exiv2__RemoteIo", 0, 0, 0 static swig_type_info _swigt__p_Exiv2__XPathIo = {"_p_Exiv2__XPathIo", 0, 0, 0, 0, 0}; static swig_type_info _swigt__p_Exiv2__CommentValue = {"_p_Exiv2__CommentValue", "Exiv2::CommentValue *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_Exiv2__DataBuf = {"_p_Exiv2__DataBuf", "Exiv2::DataBuf *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_Exiv2__DataSet = {"_p_Exiv2__DataSet", "Exiv2::DataSet *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_Exiv2__DataValue = {"_p_Exiv2__DataValue", "Exiv2::DataValue *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_Exiv2__DateValue = {"_p_Exiv2__DateValue", "Exiv2::DateValue *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_Exiv2__ExifData = {"_p_Exiv2__ExifData", "Exiv2::ExifData *", 0, 0, (void*)0, 0}; @@ -8082,6 +8084,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_Exiv2__BasicIo, &_swigt__p_Exiv2__CommentValue, &_swigt__p_Exiv2__DataBuf, + &_swigt__p_Exiv2__DataSet, &_swigt__p_Exiv2__DataValue, &_swigt__p_Exiv2__DateValue, &_swigt__p_Exiv2__ExifData, @@ -8164,6 +8167,7 @@ static swig_cast_info _swigc__p_Exiv2__XPathIo[] = {{&_swigt__p_Exiv2__XPathIo, static swig_cast_info _swigc__p_Exiv2__BasicIo[] = { {&_swigt__p_Exiv2__BasicIo, 0, 0, 0}, {&_swigt__p_Exiv2__FileIo, _p_Exiv2__FileIoTo_p_Exiv2__BasicIo, 0, 0}, {&_swigt__p_Exiv2__HttpIo, _p_Exiv2__HttpIoTo_p_Exiv2__BasicIo, 0, 0}, {&_swigt__p_Exiv2__MemIo, _p_Exiv2__MemIoTo_p_Exiv2__BasicIo, 0, 0}, {&_swigt__p_Exiv2__RemoteIo, _p_Exiv2__RemoteIoTo_p_Exiv2__BasicIo, 0, 0}, {&_swigt__p_Exiv2__XPathIo, _p_Exiv2__XPathIoTo_p_Exiv2__BasicIo, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_Exiv2__CommentValue[] = { {&_swigt__p_Exiv2__CommentValue, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_Exiv2__DataBuf[] = { {&_swigt__p_Exiv2__DataBuf, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_Exiv2__DataSet[] = { {&_swigt__p_Exiv2__DataSet, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_Exiv2__DataValue[] = { {&_swigt__p_Exiv2__DataValue, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_Exiv2__DateValue[] = { {&_swigt__p_Exiv2__DateValue, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_Exiv2__ExifData[] = { {&_swigt__p_Exiv2__ExifData, 0, 0, 0},{0, 0, 0, 0}}; @@ -8236,6 +8240,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_Exiv2__BasicIo, _swigc__p_Exiv2__CommentValue, _swigc__p_Exiv2__DataBuf, + _swigc__p_Exiv2__DataSet, _swigc__p_Exiv2__DataValue, _swigc__p_Exiv2__DateValue, _swigc__p_Exiv2__ExifData, diff --git a/src/swig-0_28_0/iptc_wrap.cxx b/src/swig-0_28_0/iptc_wrap.cxx index 2ed05c1c..5cc02d0d 100644 --- a/src/swig-0_28_0/iptc_wrap.cxx +++ b/src/swig-0_28_0/iptc_wrap.cxx @@ -3747,63 +3747,64 @@ SwigPyBuiltin_iternextfunc_closure(SwigPyWrapperFunction wrapper, PyObject *a) { #define SWIGTYPE_p_Exiv2__AsciiValue swig_types[0] #define SWIGTYPE_p_Exiv2__CommentValue swig_types[1] -#define SWIGTYPE_p_Exiv2__DataValue swig_types[2] -#define SWIGTYPE_p_Exiv2__DateValue swig_types[3] -#define SWIGTYPE_p_Exiv2__ExifData swig_types[4] -#define SWIGTYPE_p_Exiv2__IptcData swig_types[5] -#define SWIGTYPE_p_Exiv2__IptcKey swig_types[6] -#define SWIGTYPE_p_Exiv2__Iptcdatum swig_types[7] -#define SWIGTYPE_p_Exiv2__Key swig_types[8] -#define SWIGTYPE_p_Exiv2__LangAltValue swig_types[9] -#define SWIGTYPE_p_Exiv2__Metadatum swig_types[10] -#define SWIGTYPE_p_Exiv2__StringValue swig_types[11] -#define SWIGTYPE_p_Exiv2__StringValueBase swig_types[12] -#define SWIGTYPE_p_Exiv2__TimeValue swig_types[13] -#define SWIGTYPE_p_Exiv2__Value swig_types[14] -#define SWIGTYPE_p_Exiv2__ValueTypeT_double_t swig_types[15] -#define SWIGTYPE_p_Exiv2__ValueTypeT_float_t swig_types[16] -#define SWIGTYPE_p_Exiv2__ValueTypeT_int_t swig_types[17] -#define SWIGTYPE_p_Exiv2__ValueTypeT_short_t swig_types[18] -#define SWIGTYPE_p_Exiv2__ValueTypeT_std__pairT_int32_t_int32_t_t_t swig_types[19] -#define SWIGTYPE_p_Exiv2__ValueTypeT_std__pairT_uint32_t_uint32_t_t_t swig_types[20] -#define SWIGTYPE_p_Exiv2__ValueTypeT_unsigned_int_t swig_types[21] -#define SWIGTYPE_p_Exiv2__ValueTypeT_unsigned_short_t swig_types[22] -#define SWIGTYPE_p_Exiv2__XmpArrayValue swig_types[23] -#define SWIGTYPE_p_Exiv2__XmpTextValue swig_types[24] -#define SWIGTYPE_p_Exiv2__XmpValue swig_types[25] -#define SWIGTYPE_p_IptcData_iterator swig_types[26] -#define SWIGTYPE_p_IptcData_iterator_end swig_types[27] -#define SWIGTYPE_p_SwigPyObject swig_types[28] -#define SWIGTYPE_p_UniquePtr swig_types[29] -#define SWIGTYPE_p_ValueList swig_types[30] -#define SWIGTYPE_p_ValueType swig_types[31] -#define SWIGTYPE_p_allocator_type swig_types[32] -#define SWIGTYPE_p_char swig_types[33] -#define SWIGTYPE_p_const_iterator swig_types[34] -#define SWIGTYPE_p_difference_type swig_types[35] -#define SWIGTYPE_p_first_type swig_types[36] -#define SWIGTYPE_p_int swig_types[37] -#define SWIGTYPE_p_iterator swig_types[38] -#define SWIGTYPE_p_key_type swig_types[39] -#define SWIGTYPE_p_long_long swig_types[40] -#define SWIGTYPE_p_mapped_type swig_types[41] -#define SWIGTYPE_p_second_type swig_types[42] -#define SWIGTYPE_p_short swig_types[43] -#define SWIGTYPE_p_signed_char swig_types[44] -#define SWIGTYPE_p_size_type swig_types[45] -#define SWIGTYPE_p_std__mapT_std__string_std__string_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_std__string_t_t_t swig_types[46] -#define SWIGTYPE_p_std__pairT_int_int_t swig_types[47] -#define SWIGTYPE_p_std__pairT_unsigned_int_unsigned_int_t swig_types[48] -#define SWIGTYPE_p_std__vectorT_Exiv2__Iptcdatum_std__allocatorT_Exiv2__Iptcdatum_t_t swig_types[49] -#define SWIGTYPE_p_std__vectorT_Exiv2__Iptcdatum_std__allocatorT_Exiv2__Iptcdatum_t_t__iterator swig_types[50] -#define SWIGTYPE_p_std__vectorT_unsigned_char_std__allocatorT_unsigned_char_t_t swig_types[51] -#define SWIGTYPE_p_unsigned_char swig_types[52] -#define SWIGTYPE_p_unsigned_int swig_types[53] -#define SWIGTYPE_p_unsigned_long_long swig_types[54] -#define SWIGTYPE_p_unsigned_short swig_types[55] -#define SWIGTYPE_p_value_type swig_types[56] -static swig_type_info *swig_types[58]; -static swig_module_info swig_module = {swig_types, 57, 0, 0, 0, 0}; +#define SWIGTYPE_p_Exiv2__DataSet swig_types[2] +#define SWIGTYPE_p_Exiv2__DataValue swig_types[3] +#define SWIGTYPE_p_Exiv2__DateValue swig_types[4] +#define SWIGTYPE_p_Exiv2__ExifData swig_types[5] +#define SWIGTYPE_p_Exiv2__IptcData swig_types[6] +#define SWIGTYPE_p_Exiv2__IptcKey swig_types[7] +#define SWIGTYPE_p_Exiv2__Iptcdatum swig_types[8] +#define SWIGTYPE_p_Exiv2__Key swig_types[9] +#define SWIGTYPE_p_Exiv2__LangAltValue swig_types[10] +#define SWIGTYPE_p_Exiv2__Metadatum swig_types[11] +#define SWIGTYPE_p_Exiv2__StringValue swig_types[12] +#define SWIGTYPE_p_Exiv2__StringValueBase swig_types[13] +#define SWIGTYPE_p_Exiv2__TimeValue swig_types[14] +#define SWIGTYPE_p_Exiv2__Value swig_types[15] +#define SWIGTYPE_p_Exiv2__ValueTypeT_double_t swig_types[16] +#define SWIGTYPE_p_Exiv2__ValueTypeT_float_t swig_types[17] +#define SWIGTYPE_p_Exiv2__ValueTypeT_int_t swig_types[18] +#define SWIGTYPE_p_Exiv2__ValueTypeT_short_t swig_types[19] +#define SWIGTYPE_p_Exiv2__ValueTypeT_std__pairT_int32_t_int32_t_t_t swig_types[20] +#define SWIGTYPE_p_Exiv2__ValueTypeT_std__pairT_uint32_t_uint32_t_t_t swig_types[21] +#define SWIGTYPE_p_Exiv2__ValueTypeT_unsigned_int_t swig_types[22] +#define SWIGTYPE_p_Exiv2__ValueTypeT_unsigned_short_t swig_types[23] +#define SWIGTYPE_p_Exiv2__XmpArrayValue swig_types[24] +#define SWIGTYPE_p_Exiv2__XmpTextValue swig_types[25] +#define SWIGTYPE_p_Exiv2__XmpValue swig_types[26] +#define SWIGTYPE_p_IptcData_iterator swig_types[27] +#define SWIGTYPE_p_IptcData_iterator_end swig_types[28] +#define SWIGTYPE_p_SwigPyObject swig_types[29] +#define SWIGTYPE_p_UniquePtr swig_types[30] +#define SWIGTYPE_p_ValueList swig_types[31] +#define SWIGTYPE_p_ValueType swig_types[32] +#define SWIGTYPE_p_allocator_type swig_types[33] +#define SWIGTYPE_p_char swig_types[34] +#define SWIGTYPE_p_const_iterator swig_types[35] +#define SWIGTYPE_p_difference_type swig_types[36] +#define SWIGTYPE_p_first_type swig_types[37] +#define SWIGTYPE_p_int swig_types[38] +#define SWIGTYPE_p_iterator swig_types[39] +#define SWIGTYPE_p_key_type swig_types[40] +#define SWIGTYPE_p_long_long swig_types[41] +#define SWIGTYPE_p_mapped_type swig_types[42] +#define SWIGTYPE_p_second_type swig_types[43] +#define SWIGTYPE_p_short swig_types[44] +#define SWIGTYPE_p_signed_char swig_types[45] +#define SWIGTYPE_p_size_type swig_types[46] +#define SWIGTYPE_p_std__mapT_std__string_std__string_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_std__string_t_t_t swig_types[47] +#define SWIGTYPE_p_std__pairT_int_int_t swig_types[48] +#define SWIGTYPE_p_std__pairT_unsigned_int_unsigned_int_t swig_types[49] +#define SWIGTYPE_p_std__vectorT_Exiv2__Iptcdatum_std__allocatorT_Exiv2__Iptcdatum_t_t swig_types[50] +#define SWIGTYPE_p_std__vectorT_Exiv2__Iptcdatum_std__allocatorT_Exiv2__Iptcdatum_t_t__iterator swig_types[51] +#define SWIGTYPE_p_std__vectorT_unsigned_char_std__allocatorT_unsigned_char_t_t swig_types[52] +#define SWIGTYPE_p_unsigned_char swig_types[53] +#define SWIGTYPE_p_unsigned_int swig_types[54] +#define SWIGTYPE_p_unsigned_long_long swig_types[55] +#define SWIGTYPE_p_unsigned_short swig_types[56] +#define SWIGTYPE_p_value_type swig_types[57] +static swig_type_info *swig_types[59]; +static swig_module_info swig_module = {swig_types, 58, 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) @@ -11573,6 +11574,7 @@ static void *_p_IptcData_iteratorTo_p_IptcData_iterator_end(void *x, int *SWIGUN } 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__CommentValue = {"_p_Exiv2__CommentValue", "Exiv2::CommentValue *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_Exiv2__DataSet = {"_p_Exiv2__DataSet", "Exiv2::DataSet *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_Exiv2__DataValue = {"_p_Exiv2__DataValue", "Exiv2::DataValue *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_Exiv2__DateValue = {"_p_Exiv2__DateValue", "Exiv2::DateValue *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_Exiv2__ExifData = {"_p_Exiv2__ExifData", "Exiv2::ExifData *", 0, 0, (void*)0, 0}; @@ -11632,6 +11634,7 @@ static swig_type_info _swigt__p_value_type = {"_p_value_type", "value_type *", 0 static swig_type_info *swig_type_initial[] = { &_swigt__p_Exiv2__AsciiValue, &_swigt__p_Exiv2__CommentValue, + &_swigt__p_Exiv2__DataSet, &_swigt__p_Exiv2__DataValue, &_swigt__p_Exiv2__DateValue, &_swigt__p_Exiv2__ExifData, @@ -11691,6 +11694,7 @@ static swig_type_info *swig_type_initial[] = { 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__CommentValue[] = { {&_swigt__p_Exiv2__CommentValue, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_Exiv2__DataSet[] = { {&_swigt__p_Exiv2__DataSet, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_Exiv2__DataValue[] = { {&_swigt__p_Exiv2__DataValue, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_Exiv2__DateValue[] = { {&_swigt__p_Exiv2__DateValue, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_Exiv2__ExifData[] = { {&_swigt__p_Exiv2__ExifData, 0, 0, 0},{0, 0, 0, 0}}; @@ -11750,6 +11754,7 @@ static swig_cast_info _swigc__p_value_type[] = { {&_swigt__p_value_type, 0, 0, static swig_cast_info *swig_cast_initial[] = { _swigc__p_Exiv2__AsciiValue, _swigc__p_Exiv2__CommentValue, + _swigc__p_Exiv2__DataSet, _swigc__p_Exiv2__DataValue, _swigc__p_Exiv2__DateValue, _swigc__p_Exiv2__ExifData, diff --git a/src/swig-0_28_0/preview_wrap.cxx b/src/swig-0_28_0/preview_wrap.cxx index 79e82a20..a455c9f4 100644 --- a/src/swig-0_28_0/preview_wrap.cxx +++ b/src/swig-0_28_0/preview_wrap.cxx @@ -3751,77 +3751,78 @@ SwigPyBuiltin_iternextfunc_closure(SwigPyWrapperFunction wrapper, PyObject *a) { #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__DataValue swig_types[6] -#define SWIGTYPE_p_Exiv2__DateValue swig_types[7] -#define SWIGTYPE_p_Exiv2__ExifKey swig_types[8] -#define SWIGTYPE_p_Exiv2__FileIo swig_types[9] -#define SWIGTYPE_p_Exiv2__GroupInfo swig_types[10] -#define SWIGTYPE_p_Exiv2__HttpIo swig_types[11] -#define SWIGTYPE_p_Exiv2__Image swig_types[12] -#define SWIGTYPE_p_Exiv2__IptcKey swig_types[13] -#define SWIGTYPE_p_Exiv2__Key swig_types[14] -#define SWIGTYPE_p_Exiv2__LangAltValue swig_types[15] -#define SWIGTYPE_p_Exiv2__MemIo swig_types[16] -#define SWIGTYPE_p_Exiv2__PreviewImage swig_types[17] -#define SWIGTYPE_p_Exiv2__PreviewManager swig_types[18] -#define SWIGTYPE_p_Exiv2__PreviewProperties 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_int_t swig_types[28] -#define SWIGTYPE_p_Exiv2__ValueTypeT_short_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_unsigned_int_t swig_types[32] -#define SWIGTYPE_p_Exiv2__ValueTypeT_unsigned_short_t swig_types[33] -#define SWIGTYPE_p_Exiv2__XPathIo swig_types[34] -#define SWIGTYPE_p_Exiv2__XmpArrayValue swig_types[35] -#define SWIGTYPE_p_Exiv2__XmpKey swig_types[36] -#define SWIGTYPE_p_Exiv2__XmpTextValue swig_types[37] -#define SWIGTYPE_p_Exiv2__XmpValue swig_types[38] -#define SWIGTYPE_p_IptcData_iterator swig_types[39] -#define SWIGTYPE_p_IptcData_iterator_end swig_types[40] -#define SWIGTYPE_p_NsRegistry swig_types[41] -#define SWIGTYPE_p_SwigPyObject swig_types[42] -#define SWIGTYPE_p_UniquePtr swig_types[43] -#define SWIGTYPE_p_ValueList swig_types[44] -#define SWIGTYPE_p_ValueType swig_types[45] -#define SWIGTYPE_p_XmpData_iterator swig_types[46] -#define SWIGTYPE_p_XmpData_iterator_end 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__mapT_std__string_std__string_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_std__string_t_t_t swig_types[63] -#define SWIGTYPE_p_std__pairT_int_int_t swig_types[64] -#define SWIGTYPE_p_std__pairT_unsigned_int_unsigned_int_t swig_types[65] -#define SWIGTYPE_p_std__vectorT_Exiv2__Iptcdatum_std__allocatorT_Exiv2__Iptcdatum_t_t swig_types[66] -#define SWIGTYPE_p_std__vectorT_Exiv2__PreviewProperties_std__allocatorT_Exiv2__PreviewProperties_t_t swig_types[67] -#define SWIGTYPE_p_std__vectorT_Exiv2__Xmpdatum_std__allocatorT_Exiv2__Xmpdatum_t_t swig_types[68] -#define SWIGTYPE_p_std__vectorT_unsigned_char_std__allocatorT_unsigned_char_t_t swig_types[69] -#define SWIGTYPE_p_unsigned_char swig_types[70] -#define SWIGTYPE_p_unsigned_int swig_types[71] -#define SWIGTYPE_p_unsigned_long_long swig_types[72] -#define SWIGTYPE_p_unsigned_short swig_types[73] -#define SWIGTYPE_p_value_type swig_types[74] -static swig_type_info *swig_types[76]; -static swig_module_info swig_module = {swig_types, 75, 0, 0, 0, 0}; +#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__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__IptcKey swig_types[14] +#define SWIGTYPE_p_Exiv2__Key swig_types[15] +#define SWIGTYPE_p_Exiv2__LangAltValue swig_types[16] +#define SWIGTYPE_p_Exiv2__MemIo swig_types[17] +#define SWIGTYPE_p_Exiv2__PreviewImage swig_types[18] +#define SWIGTYPE_p_Exiv2__PreviewManager swig_types[19] +#define SWIGTYPE_p_Exiv2__PreviewProperties 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_int_t swig_types[29] +#define SWIGTYPE_p_Exiv2__ValueTypeT_short_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_unsigned_int_t swig_types[33] +#define SWIGTYPE_p_Exiv2__ValueTypeT_unsigned_short_t swig_types[34] +#define SWIGTYPE_p_Exiv2__XPathIo swig_types[35] +#define SWIGTYPE_p_Exiv2__XmpArrayValue swig_types[36] +#define SWIGTYPE_p_Exiv2__XmpKey swig_types[37] +#define SWIGTYPE_p_Exiv2__XmpTextValue swig_types[38] +#define SWIGTYPE_p_Exiv2__XmpValue swig_types[39] +#define SWIGTYPE_p_IptcData_iterator swig_types[40] +#define SWIGTYPE_p_IptcData_iterator_end swig_types[41] +#define SWIGTYPE_p_NsRegistry swig_types[42] +#define SWIGTYPE_p_SwigPyObject swig_types[43] +#define SWIGTYPE_p_UniquePtr swig_types[44] +#define SWIGTYPE_p_ValueList swig_types[45] +#define SWIGTYPE_p_ValueType swig_types[46] +#define SWIGTYPE_p_XmpData_iterator swig_types[47] +#define SWIGTYPE_p_XmpData_iterator_end swig_types[48] +#define SWIGTYPE_p_allocator_type swig_types[49] +#define SWIGTYPE_p_char swig_types[50] +#define SWIGTYPE_p_const_iterator swig_types[51] +#define SWIGTYPE_p_difference_type swig_types[52] +#define SWIGTYPE_p_first_type swig_types[53] +#define SWIGTYPE_p_int swig_types[54] +#define SWIGTYPE_p_iterator swig_types[55] +#define SWIGTYPE_p_key_type swig_types[56] +#define SWIGTYPE_p_long_long swig_types[57] +#define SWIGTYPE_p_mapped_type swig_types[58] +#define SWIGTYPE_p_second_type swig_types[59] +#define SWIGTYPE_p_short swig_types[60] +#define SWIGTYPE_p_signed_char swig_types[61] +#define SWIGTYPE_p_size_type swig_types[62] +#define SWIGTYPE_p_std__listT_Exiv2__Exifdatum_t swig_types[63] +#define SWIGTYPE_p_std__mapT_std__string_std__string_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_std__string_t_t_t swig_types[64] +#define SWIGTYPE_p_std__pairT_int_int_t swig_types[65] +#define SWIGTYPE_p_std__pairT_unsigned_int_unsigned_int_t swig_types[66] +#define SWIGTYPE_p_std__vectorT_Exiv2__Iptcdatum_std__allocatorT_Exiv2__Iptcdatum_t_t swig_types[67] +#define SWIGTYPE_p_std__vectorT_Exiv2__PreviewProperties_std__allocatorT_Exiv2__PreviewProperties_t_t swig_types[68] +#define SWIGTYPE_p_std__vectorT_Exiv2__Xmpdatum_std__allocatorT_Exiv2__Xmpdatum_t_t swig_types[69] +#define SWIGTYPE_p_std__vectorT_unsigned_char_std__allocatorT_unsigned_char_t_t swig_types[70] +#define SWIGTYPE_p_unsigned_char swig_types[71] +#define SWIGTYPE_p_unsigned_int swig_types[72] +#define SWIGTYPE_p_unsigned_long_long swig_types[73] +#define SWIGTYPE_p_unsigned_short swig_types[74] +#define SWIGTYPE_p_value_type swig_types[75] +static swig_type_info *swig_types[77]; +static swig_module_info swig_module = {swig_types, 76, 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) @@ -5826,6 +5827,7 @@ static swig_type_info _swigt__p_Exiv2__RemoteIo = {"_p_Exiv2__RemoteIo", 0, 0, 0 static swig_type_info _swigt__p_Exiv2__XPathIo = {"_p_Exiv2__XPathIo", 0, 0, 0, 0, 0}; static swig_type_info _swigt__p_Exiv2__CommentValue = {"_p_Exiv2__CommentValue", "Exiv2::CommentValue *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_Exiv2__DataBuf = {"_p_Exiv2__DataBuf", "Exiv2::DataBuf *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_Exiv2__DataSet = {"_p_Exiv2__DataSet", "Exiv2::DataSet *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_Exiv2__DataValue = {"_p_Exiv2__DataValue", "Exiv2::DataValue *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_Exiv2__DateValue = {"_p_Exiv2__DateValue", "Exiv2::DateValue *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_Exiv2__ExifKey = {"_p_Exiv2__ExifKey", "Exiv2::ExifKey *", 0, 0, (void*)0, 0}; @@ -5898,6 +5900,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_Exiv2__BasicIo, &_swigt__p_Exiv2__CommentValue, &_swigt__p_Exiv2__DataBuf, + &_swigt__p_Exiv2__DataSet, &_swigt__p_Exiv2__DataValue, &_swigt__p_Exiv2__DateValue, &_swigt__p_Exiv2__ExifKey, @@ -5980,6 +5983,7 @@ static swig_cast_info _swigc__p_Exiv2__XPathIo[] = {{&_swigt__p_Exiv2__XPathIo, static swig_cast_info _swigc__p_Exiv2__BasicIo[] = { {&_swigt__p_Exiv2__BasicIo, 0, 0, 0}, {&_swigt__p_Exiv2__FileIo, _p_Exiv2__FileIoTo_p_Exiv2__BasicIo, 0, 0}, {&_swigt__p_Exiv2__HttpIo, _p_Exiv2__HttpIoTo_p_Exiv2__BasicIo, 0, 0}, {&_swigt__p_Exiv2__MemIo, _p_Exiv2__MemIoTo_p_Exiv2__BasicIo, 0, 0}, {&_swigt__p_Exiv2__RemoteIo, _p_Exiv2__RemoteIoTo_p_Exiv2__BasicIo, 0, 0}, {&_swigt__p_Exiv2__XPathIo, _p_Exiv2__XPathIoTo_p_Exiv2__BasicIo, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_Exiv2__CommentValue[] = { {&_swigt__p_Exiv2__CommentValue, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_Exiv2__DataBuf[] = { {&_swigt__p_Exiv2__DataBuf, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_Exiv2__DataSet[] = { {&_swigt__p_Exiv2__DataSet, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_Exiv2__DataValue[] = { {&_swigt__p_Exiv2__DataValue, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_Exiv2__DateValue[] = { {&_swigt__p_Exiv2__DateValue, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_Exiv2__ExifKey[] = { {&_swigt__p_Exiv2__ExifKey, 0, 0, 0},{0, 0, 0, 0}}; @@ -6052,6 +6056,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_Exiv2__BasicIo, _swigc__p_Exiv2__CommentValue, _swigc__p_Exiv2__DataBuf, + _swigc__p_Exiv2__DataSet, _swigc__p_Exiv2__DataValue, _swigc__p_Exiv2__DateValue, _swigc__p_Exiv2__ExifKey, diff --git a/src/swig-0_28_0/properties_wrap.cxx b/src/swig-0_28_0/properties_wrap.cxx index f41fa37e..90f172b6 100644 --- a/src/swig-0_28_0/properties_wrap.cxx +++ b/src/swig-0_28_0/properties_wrap.cxx @@ -3747,62 +3747,63 @@ SwigPyBuiltin_iternextfunc_closure(SwigPyWrapperFunction wrapper, PyObject *a) { #define SWIGTYPE_p_Exiv2__AsciiValue swig_types[0] #define SWIGTYPE_p_Exiv2__CommentValue swig_types[1] -#define SWIGTYPE_p_Exiv2__DataValue swig_types[2] -#define SWIGTYPE_p_Exiv2__DateValue swig_types[3] -#define SWIGTYPE_p_Exiv2__IptcKey swig_types[4] -#define SWIGTYPE_p_Exiv2__Key swig_types[5] -#define SWIGTYPE_p_Exiv2__LangAltValue swig_types[6] -#define SWIGTYPE_p_Exiv2__StringValue swig_types[7] -#define SWIGTYPE_p_Exiv2__StringValueBase swig_types[8] -#define SWIGTYPE_p_Exiv2__TimeValue swig_types[9] -#define SWIGTYPE_p_Exiv2__Value swig_types[10] -#define SWIGTYPE_p_Exiv2__ValueTypeT_double_t swig_types[11] -#define SWIGTYPE_p_Exiv2__ValueTypeT_float_t swig_types[12] -#define SWIGTYPE_p_Exiv2__ValueTypeT_int_t swig_types[13] -#define SWIGTYPE_p_Exiv2__ValueTypeT_short_t swig_types[14] -#define SWIGTYPE_p_Exiv2__ValueTypeT_std__pairT_int32_t_int32_t_t_t swig_types[15] -#define SWIGTYPE_p_Exiv2__ValueTypeT_std__pairT_uint32_t_uint32_t_t_t swig_types[16] -#define SWIGTYPE_p_Exiv2__ValueTypeT_unsigned_int_t swig_types[17] -#define SWIGTYPE_p_Exiv2__ValueTypeT_unsigned_short_t swig_types[18] -#define SWIGTYPE_p_Exiv2__XmpArrayValue swig_types[19] -#define SWIGTYPE_p_Exiv2__XmpKey swig_types[20] -#define SWIGTYPE_p_Exiv2__XmpNsInfo swig_types[21] -#define SWIGTYPE_p_Exiv2__XmpNsInfo__Ns swig_types[22] -#define SWIGTYPE_p_Exiv2__XmpNsInfo__Prefix swig_types[23] -#define SWIGTYPE_p_Exiv2__XmpProperties swig_types[24] -#define SWIGTYPE_p_Exiv2__XmpPropertyInfo swig_types[25] -#define SWIGTYPE_p_Exiv2__XmpTextValue swig_types[26] -#define SWIGTYPE_p_Exiv2__XmpValue swig_types[27] -#define SWIGTYPE_p_NsRegistry swig_types[28] -#define SWIGTYPE_p_SwigPyObject swig_types[29] -#define SWIGTYPE_p_UniquePtr swig_types[30] -#define SWIGTYPE_p_ValueList swig_types[31] -#define SWIGTYPE_p_ValueType swig_types[32] -#define SWIGTYPE_p_allocator_type swig_types[33] -#define SWIGTYPE_p_char swig_types[34] -#define SWIGTYPE_p_const_iterator swig_types[35] -#define SWIGTYPE_p_difference_type swig_types[36] -#define SWIGTYPE_p_first_type swig_types[37] -#define SWIGTYPE_p_int swig_types[38] -#define SWIGTYPE_p_iterator swig_types[39] -#define SWIGTYPE_p_key_type swig_types[40] -#define SWIGTYPE_p_long_long swig_types[41] -#define SWIGTYPE_p_mapped_type swig_types[42] -#define SWIGTYPE_p_second_type swig_types[43] -#define SWIGTYPE_p_short swig_types[44] -#define SWIGTYPE_p_signed_char swig_types[45] -#define SWIGTYPE_p_size_type swig_types[46] -#define SWIGTYPE_p_std__mapT_std__string_std__string_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_std__string_t_t_t swig_types[47] -#define SWIGTYPE_p_std__pairT_int_int_t swig_types[48] -#define SWIGTYPE_p_std__pairT_unsigned_int_unsigned_int_t swig_types[49] -#define SWIGTYPE_p_std__vectorT_unsigned_char_std__allocatorT_unsigned_char_t_t swig_types[50] -#define SWIGTYPE_p_unsigned_char swig_types[51] -#define SWIGTYPE_p_unsigned_int swig_types[52] -#define SWIGTYPE_p_unsigned_long_long swig_types[53] -#define SWIGTYPE_p_unsigned_short swig_types[54] -#define SWIGTYPE_p_value_type swig_types[55] -static swig_type_info *swig_types[57]; -static swig_module_info swig_module = {swig_types, 56, 0, 0, 0, 0}; +#define SWIGTYPE_p_Exiv2__DataSet swig_types[2] +#define SWIGTYPE_p_Exiv2__DataValue swig_types[3] +#define SWIGTYPE_p_Exiv2__DateValue swig_types[4] +#define SWIGTYPE_p_Exiv2__IptcKey swig_types[5] +#define SWIGTYPE_p_Exiv2__Key swig_types[6] +#define SWIGTYPE_p_Exiv2__LangAltValue swig_types[7] +#define SWIGTYPE_p_Exiv2__StringValue swig_types[8] +#define SWIGTYPE_p_Exiv2__StringValueBase swig_types[9] +#define SWIGTYPE_p_Exiv2__TimeValue swig_types[10] +#define SWIGTYPE_p_Exiv2__Value swig_types[11] +#define SWIGTYPE_p_Exiv2__ValueTypeT_double_t swig_types[12] +#define SWIGTYPE_p_Exiv2__ValueTypeT_float_t swig_types[13] +#define SWIGTYPE_p_Exiv2__ValueTypeT_int_t swig_types[14] +#define SWIGTYPE_p_Exiv2__ValueTypeT_short_t swig_types[15] +#define SWIGTYPE_p_Exiv2__ValueTypeT_std__pairT_int32_t_int32_t_t_t swig_types[16] +#define SWIGTYPE_p_Exiv2__ValueTypeT_std__pairT_uint32_t_uint32_t_t_t swig_types[17] +#define SWIGTYPE_p_Exiv2__ValueTypeT_unsigned_int_t swig_types[18] +#define SWIGTYPE_p_Exiv2__ValueTypeT_unsigned_short_t swig_types[19] +#define SWIGTYPE_p_Exiv2__XmpArrayValue swig_types[20] +#define SWIGTYPE_p_Exiv2__XmpKey swig_types[21] +#define SWIGTYPE_p_Exiv2__XmpNsInfo swig_types[22] +#define SWIGTYPE_p_Exiv2__XmpNsInfo__Ns swig_types[23] +#define SWIGTYPE_p_Exiv2__XmpNsInfo__Prefix swig_types[24] +#define SWIGTYPE_p_Exiv2__XmpProperties swig_types[25] +#define SWIGTYPE_p_Exiv2__XmpPropertyInfo swig_types[26] +#define SWIGTYPE_p_Exiv2__XmpTextValue swig_types[27] +#define SWIGTYPE_p_Exiv2__XmpValue swig_types[28] +#define SWIGTYPE_p_NsRegistry swig_types[29] +#define SWIGTYPE_p_SwigPyObject swig_types[30] +#define SWIGTYPE_p_UniquePtr swig_types[31] +#define SWIGTYPE_p_ValueList swig_types[32] +#define SWIGTYPE_p_ValueType swig_types[33] +#define SWIGTYPE_p_allocator_type swig_types[34] +#define SWIGTYPE_p_char swig_types[35] +#define SWIGTYPE_p_const_iterator swig_types[36] +#define SWIGTYPE_p_difference_type swig_types[37] +#define SWIGTYPE_p_first_type swig_types[38] +#define SWIGTYPE_p_int swig_types[39] +#define SWIGTYPE_p_iterator swig_types[40] +#define SWIGTYPE_p_key_type swig_types[41] +#define SWIGTYPE_p_long_long swig_types[42] +#define SWIGTYPE_p_mapped_type swig_types[43] +#define SWIGTYPE_p_second_type swig_types[44] +#define SWIGTYPE_p_short swig_types[45] +#define SWIGTYPE_p_signed_char swig_types[46] +#define SWIGTYPE_p_size_type swig_types[47] +#define SWIGTYPE_p_std__mapT_std__string_std__string_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_std__string_t_t_t swig_types[48] +#define SWIGTYPE_p_std__pairT_int_int_t swig_types[49] +#define SWIGTYPE_p_std__pairT_unsigned_int_unsigned_int_t swig_types[50] +#define SWIGTYPE_p_std__vectorT_unsigned_char_std__allocatorT_unsigned_char_t_t swig_types[51] +#define SWIGTYPE_p_unsigned_char swig_types[52] +#define SWIGTYPE_p_unsigned_int swig_types[53] +#define SWIGTYPE_p_unsigned_long_long swig_types[54] +#define SWIGTYPE_p_unsigned_short swig_types[55] +#define SWIGTYPE_p_value_type swig_types[56] +static swig_type_info *swig_types[58]; +static swig_module_info swig_module = {swig_types, 57, 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) @@ -7092,6 +7093,7 @@ static void *_p_Exiv2__XmpTextValueTo_p_Exiv2__XmpValue(void *x, int *SWIGUNUSED } 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__CommentValue = {"_p_Exiv2__CommentValue", "Exiv2::CommentValue *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_Exiv2__DataSet = {"_p_Exiv2__DataSet", "Exiv2::DataSet *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_Exiv2__DataValue = {"_p_Exiv2__DataValue", "Exiv2::DataValue *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_Exiv2__DateValue = {"_p_Exiv2__DateValue", "Exiv2::DateValue *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_Exiv2__IptcKey = {"_p_Exiv2__IptcKey", "Exiv2::IptcKey *", 0, 0, (void*)0, 0}; @@ -7150,6 +7152,7 @@ static swig_type_info _swigt__p_value_type = {"_p_value_type", "value_type *", 0 static swig_type_info *swig_type_initial[] = { &_swigt__p_Exiv2__AsciiValue, &_swigt__p_Exiv2__CommentValue, + &_swigt__p_Exiv2__DataSet, &_swigt__p_Exiv2__DataValue, &_swigt__p_Exiv2__DateValue, &_swigt__p_Exiv2__IptcKey, @@ -7208,6 +7211,7 @@ static swig_type_info *swig_type_initial[] = { 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__CommentValue[] = { {&_swigt__p_Exiv2__CommentValue, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_Exiv2__DataSet[] = { {&_swigt__p_Exiv2__DataSet, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_Exiv2__DataValue[] = { {&_swigt__p_Exiv2__DataValue, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_Exiv2__DateValue[] = { {&_swigt__p_Exiv2__DateValue, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_Exiv2__IptcKey[] = { {&_swigt__p_Exiv2__IptcKey, 0, 0, 0},{0, 0, 0, 0}}; @@ -7266,6 +7270,7 @@ static swig_cast_info _swigc__p_value_type[] = { {&_swigt__p_value_type, 0, 0, static swig_cast_info *swig_cast_initial[] = { _swigc__p_Exiv2__AsciiValue, _swigc__p_Exiv2__CommentValue, + _swigc__p_Exiv2__DataSet, _swigc__p_Exiv2__DataValue, _swigc__p_Exiv2__DateValue, _swigc__p_Exiv2__IptcKey, diff --git a/src/swig-0_28_0/tags_wrap.cxx b/src/swig-0_28_0/tags_wrap.cxx index 5af11039..6b70b42e 100644 --- a/src/swig-0_28_0/tags_wrap.cxx +++ b/src/swig-0_28_0/tags_wrap.cxx @@ -3778,27 +3778,26 @@ SwigPyBuiltin_iternextfunc_closure(SwigPyWrapperFunction wrapper, PyObject *a) { #define SWIGTYPE_p_char swig_types[30] #define SWIGTYPE_p_const_iterator swig_types[31] #define SWIGTYPE_p_difference_type swig_types[32] -#define SWIGTYPE_p_f___p_Exiv2__TagInfo swig_types[33] -#define SWIGTYPE_p_first_type swig_types[34] -#define SWIGTYPE_p_int swig_types[35] -#define SWIGTYPE_p_iterator swig_types[36] -#define SWIGTYPE_p_key_type swig_types[37] -#define SWIGTYPE_p_long_long swig_types[38] -#define SWIGTYPE_p_mapped_type swig_types[39] -#define SWIGTYPE_p_second_type swig_types[40] -#define SWIGTYPE_p_short swig_types[41] -#define SWIGTYPE_p_signed_char swig_types[42] -#define SWIGTYPE_p_size_type swig_types[43] -#define SWIGTYPE_p_std__pairT_int_int_t swig_types[44] -#define SWIGTYPE_p_std__pairT_unsigned_int_unsigned_int_t swig_types[45] -#define SWIGTYPE_p_std__vectorT_unsigned_char_std__allocatorT_unsigned_char_t_t swig_types[46] -#define SWIGTYPE_p_unsigned_char swig_types[47] -#define SWIGTYPE_p_unsigned_int swig_types[48] -#define SWIGTYPE_p_unsigned_long_long swig_types[49] -#define SWIGTYPE_p_unsigned_short swig_types[50] -#define SWIGTYPE_p_value_type swig_types[51] -static swig_type_info *swig_types[53]; -static swig_module_info swig_module = {swig_types, 52, 0, 0, 0, 0}; +#define SWIGTYPE_p_first_type swig_types[33] +#define SWIGTYPE_p_int swig_types[34] +#define SWIGTYPE_p_iterator swig_types[35] +#define SWIGTYPE_p_key_type swig_types[36] +#define SWIGTYPE_p_long_long swig_types[37] +#define SWIGTYPE_p_mapped_type swig_types[38] +#define SWIGTYPE_p_second_type swig_types[39] +#define SWIGTYPE_p_short swig_types[40] +#define SWIGTYPE_p_signed_char swig_types[41] +#define SWIGTYPE_p_size_type swig_types[42] +#define SWIGTYPE_p_std__pairT_int_int_t swig_types[43] +#define SWIGTYPE_p_std__pairT_unsigned_int_unsigned_int_t swig_types[44] +#define SWIGTYPE_p_std__vectorT_unsigned_char_std__allocatorT_unsigned_char_t_t swig_types[45] +#define SWIGTYPE_p_unsigned_char swig_types[46] +#define SWIGTYPE_p_unsigned_int swig_types[47] +#define SWIGTYPE_p_unsigned_long_long swig_types[48] +#define SWIGTYPE_p_unsigned_short swig_types[49] +#define SWIGTYPE_p_value_type swig_types[50] +static swig_type_info *swig_types[52]; +static swig_module_info swig_module = {swig_types, 51, 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) @@ -4616,7 +4615,16 @@ SWIGINTERN PyObject *_wrap_GroupInfo_tagList__get(PyObject *self, PyObject *args } arg1 = reinterpret_cast< Exiv2::GroupInfo * >(argp1); result = (Exiv2::TagListFct) ((arg1)->tagList_); - resultobj = SWIG_NewFunctionPtrObj((void *)(result), SWIGTYPE_p_f___p_Exiv2__TagInfo); + { + const Exiv2::TagInfo* ti = result(); + PyObject* list = PyList_New(0); + while (ti->tag_ != 0xFFFF) { + PyList_Append(list, SWIG_NewPointerObj( + SWIG_as_voidptr(ti), SWIGTYPE_p_Exiv2__TagInfo, 0)); + ++ti; + } + resultobj = SWIG_Python_AppendOutput(resultobj, PyList_AsTuple(list)); + } return resultobj; fail: return NULL; @@ -7026,7 +7034,6 @@ static swig_type_info _swigt__p_allocator_type = {"_p_allocator_type", "allocato static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_const_iterator = {"_p_const_iterator", "const_iterator *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_difference_type = {"_p_difference_type", "difference_type *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_f___p_Exiv2__TagInfo = {"_p_f___p_Exiv2__TagInfo", "Exiv2::TagListFct|Exiv2::TagInfo *(*)()", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_first_type = {"_p_first_type", "first_type *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_int = {"_p_int", "int32_t *|int_fast16_t *|int_fast32_t *|int_least32_t *|intptr_t *|int *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_iterator = {"_p_iterator", "iterator *", 0, 0, (void*)0, 0}; @@ -7080,7 +7087,6 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_char, &_swigt__p_const_iterator, &_swigt__p_difference_type, - &_swigt__p_f___p_Exiv2__TagInfo, &_swigt__p_first_type, &_swigt__p_int, &_swigt__p_iterator, @@ -7134,7 +7140,6 @@ static swig_cast_info _swigc__p_allocator_type[] = { {&_swigt__p_allocator_type static swig_cast_info _swigc__p_char[] = { {&_swigt__p_char, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_const_iterator[] = { {&_swigt__p_const_iterator, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_difference_type[] = { {&_swigt__p_difference_type, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_f___p_Exiv2__TagInfo[] = { {&_swigt__p_f___p_Exiv2__TagInfo, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_first_type[] = { {&_swigt__p_first_type, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_int[] = { {&_swigt__p_int, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_iterator[] = { {&_swigt__p_iterator, 0, 0, 0},{0, 0, 0, 0}}; @@ -7188,7 +7193,6 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_char, _swigc__p_const_iterator, _swigc__p_difference_type, - _swigc__p_f___p_Exiv2__TagInfo, _swigc__p_first_type, _swigc__p_int, _swigc__p_iterator, diff --git a/src/swig-0_28_0/xmp_wrap.cxx b/src/swig-0_28_0/xmp_wrap.cxx index 02496153..7e20e1bb 100644 --- a/src/swig-0_28_0/xmp_wrap.cxx +++ b/src/swig-0_28_0/xmp_wrap.cxx @@ -3747,67 +3747,68 @@ SwigPyBuiltin_iternextfunc_closure(SwigPyWrapperFunction wrapper, PyObject *a) { #define SWIGTYPE_p_Exiv2__AsciiValue swig_types[0] #define SWIGTYPE_p_Exiv2__CommentValue swig_types[1] -#define SWIGTYPE_p_Exiv2__DataValue swig_types[2] -#define SWIGTYPE_p_Exiv2__DateValue swig_types[3] -#define SWIGTYPE_p_Exiv2__ExifData swig_types[4] -#define SWIGTYPE_p_Exiv2__IptcKey swig_types[5] -#define SWIGTYPE_p_Exiv2__Key swig_types[6] -#define SWIGTYPE_p_Exiv2__LangAltValue swig_types[7] -#define SWIGTYPE_p_Exiv2__Metadatum swig_types[8] -#define SWIGTYPE_p_Exiv2__StringValue swig_types[9] -#define SWIGTYPE_p_Exiv2__StringValueBase swig_types[10] -#define SWIGTYPE_p_Exiv2__TimeValue swig_types[11] -#define SWIGTYPE_p_Exiv2__Value swig_types[12] -#define SWIGTYPE_p_Exiv2__ValueTypeT_double_t swig_types[13] -#define SWIGTYPE_p_Exiv2__ValueTypeT_float_t swig_types[14] -#define SWIGTYPE_p_Exiv2__ValueTypeT_int_t swig_types[15] -#define SWIGTYPE_p_Exiv2__ValueTypeT_short_t swig_types[16] -#define SWIGTYPE_p_Exiv2__ValueTypeT_std__pairT_int32_t_int32_t_t_t swig_types[17] -#define SWIGTYPE_p_Exiv2__ValueTypeT_std__pairT_uint32_t_uint32_t_t_t swig_types[18] -#define SWIGTYPE_p_Exiv2__ValueTypeT_unsigned_int_t swig_types[19] -#define SWIGTYPE_p_Exiv2__ValueTypeT_unsigned_short_t swig_types[20] -#define SWIGTYPE_p_Exiv2__XmpArrayValue swig_types[21] -#define SWIGTYPE_p_Exiv2__XmpData swig_types[22] -#define SWIGTYPE_p_Exiv2__XmpKey swig_types[23] -#define SWIGTYPE_p_Exiv2__XmpParser swig_types[24] -#define SWIGTYPE_p_Exiv2__XmpTextValue swig_types[25] -#define SWIGTYPE_p_Exiv2__XmpValue swig_types[26] -#define SWIGTYPE_p_Exiv2__Xmpdatum swig_types[27] -#define SWIGTYPE_p_NsRegistry swig_types[28] -#define SWIGTYPE_p_SwigPyObject swig_types[29] -#define SWIGTYPE_p_UniquePtr swig_types[30] -#define SWIGTYPE_p_ValueList swig_types[31] -#define SWIGTYPE_p_ValueType swig_types[32] -#define SWIGTYPE_p_XmpData_iterator swig_types[33] -#define SWIGTYPE_p_XmpData_iterator_end swig_types[34] -#define SWIGTYPE_p_allocator_type swig_types[35] -#define SWIGTYPE_p_char swig_types[36] -#define SWIGTYPE_p_const_iterator swig_types[37] -#define SWIGTYPE_p_difference_type swig_types[38] -#define SWIGTYPE_p_f_p_void_bool__void swig_types[39] -#define SWIGTYPE_p_first_type swig_types[40] -#define SWIGTYPE_p_int swig_types[41] -#define SWIGTYPE_p_iterator swig_types[42] -#define SWIGTYPE_p_key_type swig_types[43] -#define SWIGTYPE_p_long_long swig_types[44] -#define SWIGTYPE_p_mapped_type swig_types[45] -#define SWIGTYPE_p_second_type swig_types[46] -#define SWIGTYPE_p_short swig_types[47] -#define SWIGTYPE_p_signed_char swig_types[48] -#define SWIGTYPE_p_size_type swig_types[49] -#define SWIGTYPE_p_std__mapT_std__string_std__string_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_std__string_t_t_t swig_types[50] -#define SWIGTYPE_p_std__pairT_int_int_t swig_types[51] -#define SWIGTYPE_p_std__pairT_unsigned_int_unsigned_int_t swig_types[52] -#define SWIGTYPE_p_std__vectorT_Exiv2__Xmpdatum_std__allocatorT_Exiv2__Xmpdatum_t_t swig_types[53] -#define SWIGTYPE_p_std__vectorT_Exiv2__Xmpdatum_std__allocatorT_Exiv2__Xmpdatum_t_t__iterator swig_types[54] -#define SWIGTYPE_p_std__vectorT_unsigned_char_std__allocatorT_unsigned_char_t_t swig_types[55] -#define SWIGTYPE_p_unsigned_char swig_types[56] -#define SWIGTYPE_p_unsigned_int swig_types[57] -#define SWIGTYPE_p_unsigned_long_long swig_types[58] -#define SWIGTYPE_p_unsigned_short swig_types[59] -#define SWIGTYPE_p_value_type swig_types[60] -static swig_type_info *swig_types[62]; -static swig_module_info swig_module = {swig_types, 61, 0, 0, 0, 0}; +#define SWIGTYPE_p_Exiv2__DataSet swig_types[2] +#define SWIGTYPE_p_Exiv2__DataValue swig_types[3] +#define SWIGTYPE_p_Exiv2__DateValue swig_types[4] +#define SWIGTYPE_p_Exiv2__ExifData swig_types[5] +#define SWIGTYPE_p_Exiv2__IptcKey swig_types[6] +#define SWIGTYPE_p_Exiv2__Key swig_types[7] +#define SWIGTYPE_p_Exiv2__LangAltValue swig_types[8] +#define SWIGTYPE_p_Exiv2__Metadatum swig_types[9] +#define SWIGTYPE_p_Exiv2__StringValue swig_types[10] +#define SWIGTYPE_p_Exiv2__StringValueBase swig_types[11] +#define SWIGTYPE_p_Exiv2__TimeValue swig_types[12] +#define SWIGTYPE_p_Exiv2__Value swig_types[13] +#define SWIGTYPE_p_Exiv2__ValueTypeT_double_t swig_types[14] +#define SWIGTYPE_p_Exiv2__ValueTypeT_float_t swig_types[15] +#define SWIGTYPE_p_Exiv2__ValueTypeT_int_t swig_types[16] +#define SWIGTYPE_p_Exiv2__ValueTypeT_short_t swig_types[17] +#define SWIGTYPE_p_Exiv2__ValueTypeT_std__pairT_int32_t_int32_t_t_t swig_types[18] +#define SWIGTYPE_p_Exiv2__ValueTypeT_std__pairT_uint32_t_uint32_t_t_t swig_types[19] +#define SWIGTYPE_p_Exiv2__ValueTypeT_unsigned_int_t swig_types[20] +#define SWIGTYPE_p_Exiv2__ValueTypeT_unsigned_short_t swig_types[21] +#define SWIGTYPE_p_Exiv2__XmpArrayValue swig_types[22] +#define SWIGTYPE_p_Exiv2__XmpData swig_types[23] +#define SWIGTYPE_p_Exiv2__XmpKey swig_types[24] +#define SWIGTYPE_p_Exiv2__XmpParser swig_types[25] +#define SWIGTYPE_p_Exiv2__XmpTextValue swig_types[26] +#define SWIGTYPE_p_Exiv2__XmpValue swig_types[27] +#define SWIGTYPE_p_Exiv2__Xmpdatum swig_types[28] +#define SWIGTYPE_p_NsRegistry swig_types[29] +#define SWIGTYPE_p_SwigPyObject swig_types[30] +#define SWIGTYPE_p_UniquePtr swig_types[31] +#define SWIGTYPE_p_ValueList swig_types[32] +#define SWIGTYPE_p_ValueType swig_types[33] +#define SWIGTYPE_p_XmpData_iterator swig_types[34] +#define SWIGTYPE_p_XmpData_iterator_end swig_types[35] +#define SWIGTYPE_p_allocator_type swig_types[36] +#define SWIGTYPE_p_char swig_types[37] +#define SWIGTYPE_p_const_iterator swig_types[38] +#define SWIGTYPE_p_difference_type swig_types[39] +#define SWIGTYPE_p_f_p_void_bool__void swig_types[40] +#define SWIGTYPE_p_first_type swig_types[41] +#define SWIGTYPE_p_int swig_types[42] +#define SWIGTYPE_p_iterator swig_types[43] +#define SWIGTYPE_p_key_type swig_types[44] +#define SWIGTYPE_p_long_long swig_types[45] +#define SWIGTYPE_p_mapped_type swig_types[46] +#define SWIGTYPE_p_second_type swig_types[47] +#define SWIGTYPE_p_short swig_types[48] +#define SWIGTYPE_p_signed_char swig_types[49] +#define SWIGTYPE_p_size_type swig_types[50] +#define SWIGTYPE_p_std__mapT_std__string_std__string_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_std__string_t_t_t swig_types[51] +#define SWIGTYPE_p_std__pairT_int_int_t swig_types[52] +#define SWIGTYPE_p_std__pairT_unsigned_int_unsigned_int_t swig_types[53] +#define SWIGTYPE_p_std__vectorT_Exiv2__Xmpdatum_std__allocatorT_Exiv2__Xmpdatum_t_t swig_types[54] +#define SWIGTYPE_p_std__vectorT_Exiv2__Xmpdatum_std__allocatorT_Exiv2__Xmpdatum_t_t__iterator swig_types[55] +#define SWIGTYPE_p_std__vectorT_unsigned_char_std__allocatorT_unsigned_char_t_t swig_types[56] +#define SWIGTYPE_p_unsigned_char swig_types[57] +#define SWIGTYPE_p_unsigned_int swig_types[58] +#define SWIGTYPE_p_unsigned_long_long swig_types[59] +#define SWIGTYPE_p_unsigned_short swig_types[60] +#define SWIGTYPE_p_value_type swig_types[61] +static swig_type_info *swig_types[63]; +static swig_module_info swig_module = {swig_types, 62, 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) @@ -11932,6 +11933,7 @@ static void *_p_XmpData_iteratorTo_p_XmpData_iterator_end(void *x, int *SWIGUNUS } 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__CommentValue = {"_p_Exiv2__CommentValue", "Exiv2::CommentValue *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_Exiv2__DataSet = {"_p_Exiv2__DataSet", "Exiv2::DataSet *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_Exiv2__DataValue = {"_p_Exiv2__DataValue", "Exiv2::DataValue *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_Exiv2__DateValue = {"_p_Exiv2__DateValue", "Exiv2::DateValue *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_Exiv2__ExifData = {"_p_Exiv2__ExifData", "Exiv2::ExifData *", 0, 0, (void*)0, 0}; @@ -11995,6 +11997,7 @@ static swig_type_info _swigt__p_value_type = {"_p_value_type", "value_type *", 0 static swig_type_info *swig_type_initial[] = { &_swigt__p_Exiv2__AsciiValue, &_swigt__p_Exiv2__CommentValue, + &_swigt__p_Exiv2__DataSet, &_swigt__p_Exiv2__DataValue, &_swigt__p_Exiv2__DateValue, &_swigt__p_Exiv2__ExifData, @@ -12058,6 +12061,7 @@ static swig_type_info *swig_type_initial[] = { 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__CommentValue[] = { {&_swigt__p_Exiv2__CommentValue, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_Exiv2__DataSet[] = { {&_swigt__p_Exiv2__DataSet, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_Exiv2__DataValue[] = { {&_swigt__p_Exiv2__DataValue, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_Exiv2__DateValue[] = { {&_swigt__p_Exiv2__DateValue, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_Exiv2__ExifData[] = { {&_swigt__p_Exiv2__ExifData, 0, 0, 0},{0, 0, 0, 0}}; @@ -12121,6 +12125,7 @@ static swig_cast_info _swigc__p_value_type[] = { {&_swigt__p_value_type, 0, 0, static swig_cast_info *swig_cast_initial[] = { _swigc__p_Exiv2__AsciiValue, _swigc__p_Exiv2__CommentValue, + _swigc__p_Exiv2__DataSet, _swigc__p_Exiv2__DataValue, _swigc__p_Exiv2__DateValue, _swigc__p_Exiv2__ExifData, diff --git a/tests/test_datasets.py b/tests/test_datasets.py index ae8ca164..463e512b 100644 --- a/tests/test_datasets.py +++ b/tests/test_datasets.py @@ -26,7 +26,7 @@ class TestDatasetsModule(unittest.TestCase): def test_DataSet(self): - dataset = exiv2.IptcDataSets.application2RecordList() + dataset = exiv2.IptcDataSets.application2RecordList()[0] self.assertIsInstance(dataset, exiv2.DataSet) self.assertEqual(dataset.desc_[:27], 'A binary number identifying') self.assertEqual(dataset.mandatory_, True) @@ -44,11 +44,13 @@ def test_IptcDataSets(self): # number and record id of Iptc.Application2.Caption number = exiv2.IptcDataSets.Caption record_id = exiv2.IptcDataSets.application2 - # these should be lists rather than single items + # static data lists datasets = exiv2.IptcDataSets.application2RecordList() - self.assertIsInstance(datasets, exiv2.DataSet) + self.assertIsInstance(datasets, tuple) + self.assertIsInstance(datasets[0], exiv2.DataSet) datasets = exiv2.IptcDataSets.envelopeRecordList() - self.assertIsInstance(datasets, exiv2.DataSet) + self.assertIsInstance(datasets, tuple) + self.assertIsInstance(datasets[0], exiv2.DataSet) # test other methods self.assertEqual(exiv2.IptcDataSets.dataSet( 'Caption', record_id), exiv2.IptcDataSets.Caption) diff --git a/tests/test_tags.py b/tests/test_tags.py index 79a9a6e3..402f354c 100644 --- a/tests/test_tags.py +++ b/tests/test_tags.py @@ -65,7 +65,9 @@ def test_GroupInfo(self): self.assertIsInstance(ifd_name, str) self.assertEqual(ifd_name, 'IFD0') tag_list = info.tagList_ - # tag_list not currently usable from Python + self.assertIsInstance(tag_list, tuple) + self.assertGreater(len(tag_list), 0) + self.assertIsInstance(tag_list[0], exiv2.TagInfo) def test_TagInfo(self): info = exiv2.ExifTags.tagList(self.group_name)[0]