Skip to content

Commit 921d83c

Browse files
jim-easterbrookjim-easterbrook
committed
Make data struct keys() method static
1 parent d366bb6 commit 921d83c

File tree

11 files changed

+49
-177
lines changed

11 files changed

+49
-177
lines changed

‎src/interface/shared/struct_dict.i‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ Python interface uses names without underscores."
155155
%fragment("keys_struct");
156156
%fragment("values_struct");
157157
%fragment("items_struct");
158-
PyObject* keys() {
158+
static PyObject* keys() {
159159
init_info_%mangle(struct_type)();
160160
return keys_struct(info_%mangle(struct_type));
161161
}

‎src/swig-0_27_7/datasets_wrap.cxx‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4474,7 +4474,7 @@ SWIGINTERNINLINE PyObject*
44744474
return PyInt_FromSize_t((size_t) value);
44754475
}
44764476

4477-
SWIGINTERN PyObject *Exiv2_DataSet_keys(Exiv2::DataSet *self){
4477+
SWIGINTERN PyObject *Exiv2_DataSet_keys(){
44784478
init_info_Exiv2_DataSet();
44794479
return keys_struct(info_Exiv2_DataSet);
44804480
}
@@ -5034,18 +5034,10 @@ SWIGINTERN PyObject *_wrap_DataSet_photoshop__get(PyObject *self, PyObject *args
50345034

50355035
SWIGINTERN PyObject *_wrap_DataSet_keys(PyObject *self, PyObject *args) {
50365036
PyObject *resultobj = 0;
5037-
Exiv2::DataSet *arg1 = (Exiv2::DataSet *) 0 ;
5038-
void *argp1 = 0 ;
5039-
int res1 = 0 ;
50405037
PyObject *result = 0 ;
50415038

50425039
if (!SWIG_Python_UnpackTuple(args, "DataSet_keys", 0, 0, 0)) SWIG_fail;
5043-
res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_Exiv2__DataSet, 0 | 0 );
5044-
if (!SWIG_IsOK(res1)) {
5045-
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DataSet_keys" "', argument " "1"" of type '" "Exiv2::DataSet *""'");
5046-
}
5047-
arg1 = reinterpret_cast< Exiv2::DataSet * >(argp1);
5048-
result = (PyObject *)Exiv2_DataSet_keys(arg1);
5040+
result = (PyObject *)Exiv2_DataSet_keys();
50495041
resultobj = result;
50505042
return resultobj;
50515043
fail:
@@ -5854,7 +5846,7 @@ SwigPyBuiltin__Exiv2__DataSet_richcompare(PyObject *self, PyObject *other, int o
58545846
}
58555847

58565848
SWIGINTERN PyMethodDef SwigPyBuiltin__Exiv2__DataSet_methods[] = {
5857-
{ "keys", _wrap_DataSet_keys, METH_NOARGS, "\n"
5849+
{ "keys", (PyCFunction)(void(*)(void))_wrap_DataSet_keys, METH_STATIC|METH_NOARGS, "\n"
58585850
"Get structure member names.\n"
58595851
"\n"
58605852
"Return the names used to access members as attributes (``object.name``)\n"

‎src/swig-0_27_7/preview_wrap.cxx‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5556,7 +5556,7 @@ SWIGINTERNINLINE PyObject*
55565556
return PyInt_FromLong((long) value);
55575557
}
55585558

5559-
SWIGINTERN PyObject *Exiv2_PreviewProperties_keys(Exiv2::PreviewProperties *self){
5559+
SWIGINTERN PyObject *Exiv2_PreviewProperties_keys(){
55605560
init_info_Exiv2_PreviewProperties();
55615561
return keys_struct(info_Exiv2_PreviewProperties);
55625562
}
@@ -6061,18 +6061,10 @@ SWIGINTERN PyObject *_wrap_PreviewProperties_id__get(PyObject *self, PyObject *a
60616061

60626062
SWIGINTERN PyObject *_wrap_PreviewProperties_keys(PyObject *self, PyObject *args) {
60636063
PyObject *resultobj = 0;
6064-
Exiv2::PreviewProperties *arg1 = (Exiv2::PreviewProperties *) 0 ;
6065-
void *argp1 = 0 ;
6066-
int res1 = 0 ;
60676064
PyObject *result = 0 ;
60686065

60696066
if (!SWIG_Python_UnpackTuple(args, "PreviewProperties_keys", 0, 0, 0)) SWIG_fail;
6070-
res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_Exiv2__PreviewProperties, 0 | 0 );
6071-
if (!SWIG_IsOK(res1)) {
6072-
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PreviewProperties_keys" "', argument " "1"" of type '" "Exiv2::PreviewProperties *""'");
6073-
}
6074-
arg1 = reinterpret_cast< Exiv2::PreviewProperties * >(argp1);
6075-
result = (PyObject *)Exiv2_PreviewProperties_keys(arg1);
6067+
result = (PyObject *)Exiv2_PreviewProperties_keys();
60766068
resultobj = result;
60776069
return resultobj;
60786070
fail:
@@ -6723,7 +6715,7 @@ SwigPyBuiltin__Exiv2__PreviewProperties_richcompare(PyObject *self, PyObject *ot
67236715
}
67246716

67256717
SWIGINTERN PyMethodDef SwigPyBuiltin__Exiv2__PreviewProperties_methods[] = {
6726-
{ "keys", _wrap_PreviewProperties_keys, METH_NOARGS, "\n"
6718+
{ "keys", (PyCFunction)(void(*)(void))_wrap_PreviewProperties_keys, METH_STATIC|METH_NOARGS, "\n"
67276719
"Get structure member names.\n"
67286720
"\n"
67296721
"Return the names used to access members as attributes (``object.name``)\n"

‎src/swig-0_27_7/properties_wrap.cxx‎

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4505,7 +4505,7 @@ static PyObject* items_struct(struct_info& info, PyObject* obj) {
45054505
return result;
45064506
};
45074507

4508-
SWIGINTERN PyObject *Exiv2_XmpPropertyInfo_keys(Exiv2::XmpPropertyInfo *self){
4508+
SWIGINTERN PyObject *Exiv2_XmpPropertyInfo_keys(){
45094509
init_info_Exiv2_XmpPropertyInfo();
45104510
return keys_struct(info_Exiv2_XmpPropertyInfo);
45114511
}
@@ -4542,7 +4542,7 @@ static PyObject* pointer_to_list(Exiv2::XmpPropertyInfo* ptr) {
45424542
return list;
45434543
};
45444544

4545-
SWIGINTERN PyObject *Exiv2_XmpNsInfo_keys(Exiv2::XmpNsInfo *self){
4545+
SWIGINTERN PyObject *Exiv2_XmpNsInfo_keys(){
45464546
init_info_Exiv2_XmpNsInfo();
45474547
return keys_struct(info_Exiv2_XmpNsInfo);
45484548
}
@@ -4842,18 +4842,10 @@ SWIGINTERN PyObject *_wrap_XmpPropertyInfo_desc__get(PyObject *self, PyObject *a
48424842

48434843
SWIGINTERN PyObject *_wrap_XmpPropertyInfo_keys(PyObject *self, PyObject *args) {
48444844
PyObject *resultobj = 0;
4845-
Exiv2::XmpPropertyInfo *arg1 = (Exiv2::XmpPropertyInfo *) 0 ;
4846-
void *argp1 = 0 ;
4847-
int res1 = 0 ;
48484845
PyObject *result = 0 ;
48494846

48504847
if (!SWIG_Python_UnpackTuple(args, "XmpPropertyInfo_keys", 0, 0, 0)) SWIG_fail;
4851-
res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_Exiv2__XmpPropertyInfo, 0 | 0 );
4852-
if (!SWIG_IsOK(res1)) {
4853-
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "XmpPropertyInfo_keys" "', argument " "1"" of type '" "Exiv2::XmpPropertyInfo *""'");
4854-
}
4855-
arg1 = reinterpret_cast< Exiv2::XmpPropertyInfo * >(argp1);
4856-
result = (PyObject *)Exiv2_XmpPropertyInfo_keys(arg1);
4848+
result = (PyObject *)Exiv2_XmpPropertyInfo_keys();
48574849
resultobj = result;
48584850
return resultobj;
48594851
fail:
@@ -5014,18 +5006,10 @@ SWIGINTERN PyObject *_wrap_XmpNsInfo_desc__get(PyObject *self, PyObject *args) {
50145006

50155007
SWIGINTERN PyObject *_wrap_XmpNsInfo_keys(PyObject *self, PyObject *args) {
50165008
PyObject *resultobj = 0;
5017-
Exiv2::XmpNsInfo *arg1 = (Exiv2::XmpNsInfo *) 0 ;
5018-
void *argp1 = 0 ;
5019-
int res1 = 0 ;
50205009
PyObject *result = 0 ;
50215010

50225011
if (!SWIG_Python_UnpackTuple(args, "XmpNsInfo_keys", 0, 0, 0)) SWIG_fail;
5023-
res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_Exiv2__XmpNsInfo, 0 | 0 );
5024-
if (!SWIG_IsOK(res1)) {
5025-
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "XmpNsInfo_keys" "', argument " "1"" of type '" "Exiv2::XmpNsInfo *""'");
5026-
}
5027-
arg1 = reinterpret_cast< Exiv2::XmpNsInfo * >(argp1);
5028-
result = (PyObject *)Exiv2_XmpNsInfo_keys(arg1);
5012+
result = (PyObject *)Exiv2_XmpNsInfo_keys();
50295013
resultobj = result;
50305014
return resultobj;
50315015
fail:
@@ -5969,7 +5953,7 @@ SwigPyBuiltin__Exiv2__XmpPropertyInfo_richcompare(PyObject *self, PyObject *othe
59695953
}
59705954

59715955
SWIGINTERN PyMethodDef SwigPyBuiltin__Exiv2__XmpPropertyInfo_methods[] = {
5972-
{ "keys", _wrap_XmpPropertyInfo_keys, METH_NOARGS, "\n"
5956+
{ "keys", (PyCFunction)(void(*)(void))_wrap_XmpPropertyInfo_keys, METH_STATIC|METH_NOARGS, "\n"
59735957
"Get structure member names.\n"
59745958
"\n"
59755959
"Return the names used to access members as attributes (``object.name``)\n"
@@ -6351,7 +6335,7 @@ SwigPyBuiltin__Exiv2__XmpNsInfo_richcompare(PyObject *self, PyObject *other, int
63516335
}
63526336

63536337
SWIGINTERN PyMethodDef SwigPyBuiltin__Exiv2__XmpNsInfo_methods[] = {
6354-
{ "keys", _wrap_XmpNsInfo_keys, METH_NOARGS, "\n"
6338+
{ "keys", (PyCFunction)(void(*)(void))_wrap_XmpNsInfo_keys, METH_STATIC|METH_NOARGS, "\n"
63556339
"Get structure member names.\n"
63566340
"\n"
63576341
"Return the names used to access members as attributes (``object.name``)\n"

‎src/swig-0_27_7/tags_wrap.cxx‎

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4497,7 +4497,7 @@ SWIGINTERNINLINE PyObject*
44974497
return PyInt_FromLong((long) value);
44984498
}
44994499

4500-
SWIGINTERN PyObject *Exiv2_GroupInfo_keys(Exiv2::GroupInfo *self){
4500+
SWIGINTERN PyObject *Exiv2_GroupInfo_keys(){
45014501
init_info_Exiv2_GroupInfo();
45024502
return keys_struct(info_Exiv2_GroupInfo);
45034503
}
@@ -4544,7 +4544,7 @@ SWIG_From_short (short value)
45444544
return SWIG_From_long (value);
45454545
}
45464546

4547-
SWIGINTERN PyObject *Exiv2_TagInfo_keys(Exiv2::TagInfo *self){
4547+
SWIGINTERN PyObject *Exiv2_TagInfo_keys(){
45484548
init_info_Exiv2_TagInfo();
45494549
return keys_struct(info_Exiv2_TagInfo);
45504550
}
@@ -5074,18 +5074,10 @@ SWIGINTERN PyObject *_wrap_GroupInfo_tagList__get(PyObject *self, PyObject *args
50745074

50755075
SWIGINTERN PyObject *_wrap_GroupInfo_keys(PyObject *self, PyObject *args) {
50765076
PyObject *resultobj = 0;
5077-
Exiv2::GroupInfo *arg1 = (Exiv2::GroupInfo *) 0 ;
5078-
void *argp1 = 0 ;
5079-
int res1 = 0 ;
50805077
PyObject *result = 0 ;
50815078

50825079
if (!SWIG_Python_UnpackTuple(args, "GroupInfo_keys", 0, 0, 0)) SWIG_fail;
5083-
res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_Exiv2__GroupInfo, 0 | 0 );
5084-
if (!SWIG_IsOK(res1)) {
5085-
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GroupInfo_keys" "', argument " "1"" of type '" "Exiv2::GroupInfo *""'");
5086-
}
5087-
arg1 = reinterpret_cast< Exiv2::GroupInfo * >(argp1);
5088-
result = (PyObject *)Exiv2_GroupInfo_keys(arg1);
5080+
result = (PyObject *)Exiv2_GroupInfo_keys();
50895081
resultobj = result;
50905082
return resultobj;
50915083
fail:
@@ -5332,18 +5324,10 @@ SWIGINTERN PyObject *_wrap_TagInfo_count__get(PyObject *self, PyObject *args) {
53325324

53335325
SWIGINTERN PyObject *_wrap_TagInfo_keys(PyObject *self, PyObject *args) {
53345326
PyObject *resultobj = 0;
5335-
Exiv2::TagInfo *arg1 = (Exiv2::TagInfo *) 0 ;
5336-
void *argp1 = 0 ;
5337-
int res1 = 0 ;
53385327
PyObject *result = 0 ;
53395328

53405329
if (!SWIG_Python_UnpackTuple(args, "TagInfo_keys", 0, 0, 0)) SWIG_fail;
5341-
res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_Exiv2__TagInfo, 0 | 0 );
5342-
if (!SWIG_IsOK(res1)) {
5343-
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TagInfo_keys" "', argument " "1"" of type '" "Exiv2::TagInfo *""'");
5344-
}
5345-
arg1 = reinterpret_cast< Exiv2::TagInfo * >(argp1);
5346-
result = (PyObject *)Exiv2_TagInfo_keys(arg1);
5330+
result = (PyObject *)Exiv2_TagInfo_keys();
53475331
resultobj = result;
53485332
return resultobj;
53495333
fail:
@@ -6421,7 +6405,7 @@ SwigPyBuiltin__Exiv2__GroupInfo_richcompare(PyObject *self, PyObject *other, int
64216405
}
64226406

64236407
SWIGINTERN PyMethodDef SwigPyBuiltin__Exiv2__GroupInfo_methods[] = {
6424-
{ "keys", _wrap_GroupInfo_keys, METH_NOARGS, "\n"
6408+
{ "keys", (PyCFunction)(void(*)(void))_wrap_GroupInfo_keys, METH_STATIC|METH_NOARGS, "\n"
64256409
"Get structure member names.\n"
64266410
"\n"
64276411
"Return the names used to access members as attributes (``object.name``)\n"
@@ -6811,7 +6795,7 @@ SwigPyBuiltin__Exiv2__TagInfo_richcompare(PyObject *self, PyObject *other, int o
68116795
}
68126796

68136797
SWIGINTERN PyMethodDef SwigPyBuiltin__Exiv2__TagInfo_methods[] = {
6814-
{ "keys", _wrap_TagInfo_keys, METH_NOARGS, "\n"
6798+
{ "keys", (PyCFunction)(void(*)(void))_wrap_TagInfo_keys, METH_STATIC|METH_NOARGS, "\n"
68156799
"Get structure member names.\n"
68166800
"\n"
68176801
"Return the names used to access members as attributes (``object.name``)\n"

‎src/swig-0_27_7/value_wrap.cxx‎

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6675,7 +6675,7 @@ static PyObject* items_struct(struct_info& info, PyObject* obj) {
66756675
return result;
66766676
};
66776677

6678-
SWIGINTERN PyObject *Exiv2_DateValue_Date_keys(Exiv2::DateValue::Date *self){
6678+
SWIGINTERN PyObject *Exiv2_DateValue_Date_keys(){
66796679
init_info_Exiv2_DateValue_Date();
66806680
return keys_struct(info_Exiv2_DateValue_Date);
66816681
}
@@ -6711,7 +6711,7 @@ SWIGINTERN void Exiv2_TimeValue_setTime__SWIG_1(Exiv2::TimeValue *self,int32_t h
67116711
time.tzMinute = tzMinute;
67126712
self->setTime(time);
67136713
}
6714-
SWIGINTERN PyObject *Exiv2_TimeValue_Time_keys(Exiv2::TimeValue::Time *self){
6714+
SWIGINTERN PyObject *Exiv2_TimeValue_Time_keys(){
67156715
init_info_Exiv2_TimeValue_Time();
67166716
return keys_struct(info_Exiv2_TimeValue_Time);
67176717
}
@@ -14506,18 +14506,10 @@ SWIGINTERN PyObject *_wrap_Date_day_get(PyObject *self, PyObject *args) {
1450614506

1450714507
SWIGINTERN PyObject *_wrap_Date_keys(PyObject *self, PyObject *args) {
1450814508
PyObject *resultobj = 0;
14509-
Exiv2::DateValue::Date *arg1 = (Exiv2::DateValue::Date *) 0 ;
14510-
void *argp1 = 0 ;
14511-
int res1 = 0 ;
1451214509
PyObject *result = 0 ;
1451314510

1451414511
if (args && PyTuple_Check(args) && PyTuple_GET_SIZE(args) > 0) SWIG_exception_fail(SWIG_TypeError, "Date_keys takes no arguments");
14515-
res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_Exiv2__DateValue__Date, 0 | 0 );
14516-
if (!SWIG_IsOK(res1)) {
14517-
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Date_keys" "', argument " "1"" of type '" "Exiv2::DateValue::Date *""'");
14518-
}
14519-
arg1 = reinterpret_cast< Exiv2::DateValue::Date * >(argp1);
14520-
result = (PyObject *)Exiv2_DateValue_Date_keys(arg1);
14512+
result = (PyObject *)Exiv2_DateValue_Date_keys();
1452114513
resultobj = result;
1452214514
return resultobj;
1452314515
fail:
@@ -15806,18 +15798,10 @@ SWIGINTERN PyObject *_wrap_Time_tzMinute_get(PyObject *self, PyObject *args) {
1580615798

1580715799
SWIGINTERN PyObject *_wrap_Time_keys(PyObject *self, PyObject *args) {
1580815800
PyObject *resultobj = 0;
15809-
Exiv2::TimeValue::Time *arg1 = (Exiv2::TimeValue::Time *) 0 ;
15810-
void *argp1 = 0 ;
15811-
int res1 = 0 ;
1581215801
PyObject *result = 0 ;
1581315802

1581415803
if (args && PyTuple_Check(args) && PyTuple_GET_SIZE(args) > 0) SWIG_exception_fail(SWIG_TypeError, "Time_keys takes no arguments");
15815-
res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_Exiv2__TimeValue__Time, 0 | 0 );
15816-
if (!SWIG_IsOK(res1)) {
15817-
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Time_keys" "', argument " "1"" of type '" "Exiv2::TimeValue::Time *""'");
15818-
}
15819-
arg1 = reinterpret_cast< Exiv2::TimeValue::Time * >(argp1);
15820-
result = (PyObject *)Exiv2_TimeValue_Time_keys(arg1);
15804+
result = (PyObject *)Exiv2_TimeValue_Time_keys();
1582115805
resultobj = result;
1582215806
return resultobj;
1582315807
fail:
@@ -30013,7 +29997,7 @@ SwigPyBuiltin__Exiv2__DateValue__Date_richcompare(PyObject *self, PyObject *othe
3001329997
}
3001429998

3001529999
SWIGINTERN PyMethodDef SwigPyBuiltin__Exiv2__DateValue__Date_methods[] = {
30016-
{ "keys", _wrap_Date_keys, METH_VARARGS, "\n"
30000+
{ "keys", (PyCFunction)(void(*)(void))_wrap_Date_keys, METH_STATIC|METH_VARARGS, "\n"
3001730001
"Get structure member names.\n"
3001830002
"\n"
3001930003
"Return the names used to access members as attributes (``object.name``)\n"
@@ -30835,7 +30819,7 @@ SwigPyBuiltin__Exiv2__TimeValue__Time_richcompare(PyObject *self, PyObject *othe
3083530819
}
3083630820

3083730821
SWIGINTERN PyMethodDef SwigPyBuiltin__Exiv2__TimeValue__Time_methods[] = {
30838-
{ "keys", _wrap_Time_keys, METH_VARARGS, "\n"
30822+
{ "keys", (PyCFunction)(void(*)(void))_wrap_Time_keys, METH_STATIC|METH_VARARGS, "\n"
3083930823
"Get structure member names.\n"
3084030824
"\n"
3084130825
"Return the names used to access members as attributes (``object.name``)\n"

‎src/swig-0_28_7/datasets_wrap.cxx‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4474,7 +4474,7 @@ SWIGINTERNINLINE PyObject*
44744474
return PyInt_FromSize_t((size_t) value);
44754475
}
44764476

4477-
SWIGINTERN PyObject *Exiv2_DataSet_keys(Exiv2::DataSet *self){
4477+
SWIGINTERN PyObject *Exiv2_DataSet_keys(){
44784478
init_info_Exiv2_DataSet();
44794479
return keys_struct(info_Exiv2_DataSet);
44804480
}
@@ -5034,18 +5034,10 @@ SWIGINTERN PyObject *_wrap_DataSet_photoshop__get(PyObject *self, PyObject *args
50345034

50355035
SWIGINTERN PyObject *_wrap_DataSet_keys(PyObject *self, PyObject *args) {
50365036
PyObject *resultobj = 0;
5037-
Exiv2::DataSet *arg1 = (Exiv2::DataSet *) 0 ;
5038-
void *argp1 = 0 ;
5039-
int res1 = 0 ;
50405037
PyObject *result = 0 ;
50415038

50425039
if (!SWIG_Python_UnpackTuple(args, "DataSet_keys", 0, 0, 0)) SWIG_fail;
5043-
res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_Exiv2__DataSet, 0 | 0 );
5044-
if (!SWIG_IsOK(res1)) {
5045-
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DataSet_keys" "', argument " "1"" of type '" "Exiv2::DataSet *""'");
5046-
}
5047-
arg1 = reinterpret_cast< Exiv2::DataSet * >(argp1);
5048-
result = (PyObject *)Exiv2_DataSet_keys(arg1);
5040+
result = (PyObject *)Exiv2_DataSet_keys();
50495041
resultobj = result;
50505042
return resultobj;
50515043
fail:
@@ -5834,7 +5826,7 @@ SwigPyBuiltin__Exiv2__DataSet_richcompare(PyObject *self, PyObject *other, int o
58345826
}
58355827

58365828
SWIGINTERN PyMethodDef SwigPyBuiltin__Exiv2__DataSet_methods[] = {
5837-
{ "keys", _wrap_DataSet_keys, METH_NOARGS, "\n"
5829+
{ "keys", (PyCFunction)(void(*)(void))_wrap_DataSet_keys, METH_STATIC|METH_NOARGS, "\n"
58385830
"Get structure member names.\n"
58395831
"\n"
58405832
"Return the names used to access members as attributes (``object.name``)\n"

‎src/swig-0_28_7/preview_wrap.cxx‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5599,7 +5599,7 @@ SWIGINTERNINLINE PyObject*
55995599
return PyInt_FromLong((long) value);
56005600
}
56015601

5602-
SWIGINTERN PyObject *Exiv2_PreviewProperties_keys(Exiv2::PreviewProperties *self){
5602+
SWIGINTERN PyObject *Exiv2_PreviewProperties_keys(){
56035603
init_info_Exiv2_PreviewProperties();
56045604
return keys_struct(info_Exiv2_PreviewProperties);
56055605
}
@@ -6108,18 +6108,10 @@ SWIGINTERN PyObject *_wrap_PreviewProperties_id__get(PyObject *self, PyObject *a
61086108

61096109
SWIGINTERN PyObject *_wrap_PreviewProperties_keys(PyObject *self, PyObject *args) {
61106110
PyObject *resultobj = 0;
6111-
Exiv2::PreviewProperties *arg1 = (Exiv2::PreviewProperties *) 0 ;
6112-
void *argp1 = 0 ;
6113-
int res1 = 0 ;
61146111
PyObject *result = 0 ;
61156112

61166113
if (!SWIG_Python_UnpackTuple(args, "PreviewProperties_keys", 0, 0, 0)) SWIG_fail;
6117-
res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_Exiv2__PreviewProperties, 0 | 0 );
6118-
if (!SWIG_IsOK(res1)) {
6119-
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PreviewProperties_keys" "', argument " "1"" of type '" "Exiv2::PreviewProperties *""'");
6120-
}
6121-
arg1 = reinterpret_cast< Exiv2::PreviewProperties * >(argp1);
6122-
result = (PyObject *)Exiv2_PreviewProperties_keys(arg1);
6114+
result = (PyObject *)Exiv2_PreviewProperties_keys();
61236115
resultobj = result;
61246116
return resultobj;
61256117
fail:
@@ -6770,7 +6762,7 @@ SwigPyBuiltin__Exiv2__PreviewProperties_richcompare(PyObject *self, PyObject *ot
67706762
}
67716763

67726764
SWIGINTERN PyMethodDef SwigPyBuiltin__Exiv2__PreviewProperties_methods[] = {
6773-
{ "keys", _wrap_PreviewProperties_keys, METH_NOARGS, "\n"
6765+
{ "keys", (PyCFunction)(void(*)(void))_wrap_PreviewProperties_keys, METH_STATIC|METH_NOARGS, "\n"
67746766
"Get structure member names.\n"
67756767
"\n"
67766768
"Return the names used to access members as attributes (``object.name``)\n"

0 commit comments

Comments
 (0)