Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
VTK
VTK
Commits
f7903d3f
Commit
f7903d3f
authored
Apr 25, 2021
by
David Gobbi
Browse files
Simplify IsValueWrappable check for objects args
parent
c459fbda
Changes
2
Hide whitespace changes
Inline
Side-by-side
Wrapping/Tools/vtkWrap.c
View file @
f7903d3f
...
...
@@ -535,7 +535,7 @@ int vtkWrap_IsClassWrapped(HierarchyInfo* hinfo, const char* classname)
HierarchyEntry
*
entry
;
entry
=
vtkParseHierarchy_FindEntry
(
hinfo
,
classname
);
if
(
entry
)
if
(
entry
&&
!
vtkParseHierarchy_GetProperty
(
entry
,
"WRAPEXCLUDE"
)
)
{
return
1
;
}
...
...
Wrapping/Tools/vtkWrapPythonMethodDef.c
View file @
f7903d3f
...
...
@@ -514,22 +514,18 @@ static int vtkWrapPython_IsValueWrappable(
if
(
vtkWrap_IsScalar
(
val
))
{
if
(
vtkWrap_IsNumeric
(
val
)
||
val
->
IsEnum
||
/* marked as enum in ImportExportEnumTypes */
vtkWrap_IsEnumMember
(
data
,
val
)
||
vtkWrap_IsString
(
val
))
if
(
vtkWrap_IsNumeric
(
val
)
||
vtkWrap_IsEnumMember
(
data
,
val
)
||
vtkWrap_IsString
(
val
))
{
return
1
;
}
if
(
vtkWrap_IsObject
(
val
))
/* enum types were marked in vtkWrapPython_MarkAllEnums() */
if
(
val
->
IsEnum
)
{
if
(
vtkWrap_IsSpecialType
(
hinfo
,
aClass
)
||
vtkWrapPython_HasWrappedSuperClass
(
hinfo
,
aClass
,
NULL
))
{
// don't allow scoped names (can't wrap nested classes)
if
(
vtkParse_UnscopedNameLength
(
aClass
)
==
strlen
(
aClass
))
{
return
1
;
}
}
return
1
;
}
if
(
vtkWrap_IsObject
(
val
)
&&
vtkWrap_IsClassWrapped
(
hinfo
,
aClass
))
{
return
1
;
}
}
else
if
(
vtkWrap_IsArray
(
val
)
||
vtkWrap_IsNArray
(
val
))
...
...
David Gobbi
@dgobbi
mentioned in commit
bb5fa07c
·
Apr 26, 2021
mentioned in commit
bb5fa07c
mentioned in commit bb5fa07cec9daed8a80c1b6cb8d2305bd1f92263
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment