1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
|
Description: This is a patch to cope with Swig >4.0
Author: Francesco Paolo Lovergine <frankie@debian.org>
Forwarded: https://github.com/ec-jrc/jeolib-jiplib/pull/3
Applied-Upstream: https://github.com/ec-jrc/jeolib-jiplib/commit/e314504d4b29948d5dfbce17c4c64f2b2eaac34f
--- a/src/swig/jiplib.i
+++ b/src/swig/jiplib.i
@@ -78,6 +78,9 @@
%rename(filter2d_dilate) filter2d::dilate;
%rename(filter2d_shift) filter2d::shift;
+%rename(Jim_createImg) Jim::createImg;
+%rename(VectorOgr_createVector) VectorOgr::createVector;
+
%typemap(in) app::AppFactory& (app::AppFactory tempFactory){
if(PyDict_Check($input)){
PyObject *pKey, *pValue;
@@ -199,9 +202,15 @@
if arg1:
if isinstance(arg1,Jim):
if 'copyData' in kwargs.keys():
- return Jim_createImg(arg1,kwargs['copyData'])
+ if 'Jim_createImg' in globals():
+ return Jim_createImg(arg1,kwargs['copyData'])
+ else:
+ return Jim.Jim_createImg(arg1,kwargs['copyData'])
else:
- return Jim_createImg(arg1)
+ if 'Jim_createImg' in globals():
+ return Jim_createImg(arg1)
+ else:
+ return Jim.Jim_createImg(arg1)
elif isinstance(arg1,str):
if os.path.isfile(arg1):
appDict.update({'filename':arg1})
@@ -211,9 +220,15 @@
appDict.update({key:value})
if appDict:
# SWIG generates wrappers that try to work around calling static member functions, replaceing :: with _ (underscore)
- return Jim_createImg(appDict)
+ if 'Jim_createImg' in globals():
+ return Jim_createImg(appDict)
+ else:
+ return Jim.Jim_createImg(appDict)
else:
- return Jim_createImg()
+ if 'Jim_createImg' in globals():
+ return Jim_createImg()
+ else:
+ return Jim.Jim_createImg()
def createVector(arg1=None,**kwargs):
appDict={}
@@ -222,7 +237,10 @@
if arg1:
if isinstance(arg1,VectorOgr):
if appDict:
- return VectorOgr_createVector(arg1,appDict)
+ if 'VectorOgr_createVector' in globals():
+ return VectorOgr_createVector(arg1,appDict)
+ else:
+ return VectorOgr.VectorOgr_createVector(arg1,appDict)
else:
return VectorOgr_createVector(arg1)
elif isinstance(arg1,str):
@@ -235,9 +253,15 @@
raise TypeError("Error: bad argument type for createVector, arguments without names should be a path or of VectorOgr type")
if appDict:
# SWIG generates wrappers that try to work around calling static member functions, replaceing :: with _ (underscore)
- return VectorOgr_createVector(appDict)
+ if 'VectorOgr_createVector' in globals():
+ return VectorOgr_createVector(appDict)
+ else:
+ return VectorOgr.VectorOgr_createVector(appDict)
else:
- return VectorOgr_createVector()
+ if 'VectorOgr_createVector' in globals():
+ return VectorOgr_createVector()
+ else:
+ return VectorOgr.VectorOgr_createVector()
%}
/* !!! from: http://svn.salilab.org/imp/branches/1.0/kernel/pyext/IMP_streams.i */
|
