Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Christian Butz
VTK
Commits
c59576ea
Commit
c59576ea
authored
Nov 20, 2015
by
Mathieu Westphal
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
correction thx to bboeckel && jpouderoux
parent
8eb50dd2
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
13 deletions
+4
-13
Utilities/Python/vtkPython.h
Utilities/Python/vtkPython.h
+2
-4
Utilities/PythonInterpreter/vtkPythonInterpreter.cxx
Utilities/PythonInterpreter/vtkPythonInterpreter.cxx
+2
-5
Wrapping/PythonCore/vtkSmartPyObject.cxx
Wrapping/PythonCore/vtkSmartPyObject.cxx
+0
-4
No files found.
Utilities/Python/vtkPython.h
View file @
c59576ea
...
...
@@ -142,11 +142,9 @@ public:
vtkPythonScopeGilEnsurer
(
bool
force
=
false
)
{
#ifdef VTK_PYTHON_FULL_THREADSAFE
this
->
Force
=
force
;
this
->
Force
=
true
;
#else
this
->
Force
=
force
;
force
=
true
;
#endif
this
->
Force
=
force
;
if
(
this
->
Force
)
{
this
->
State
=
PyGILState_Ensure
();
...
...
Utilities/PythonInterpreter/vtkPythonInterpreter.cxx
View file @
c59576ea
...
...
@@ -143,14 +143,11 @@ bool vtkPythonInterpreter::Initialize(int initsigs /*=0*/)
if
(
!
vtkPythonInterpreter
::
InitializedOnce
)
{
#ifndef VTK_NO_PYTHON_THREADS
int
threadInit
=
PyEval_ThreadsInitialized
();
PyEval_InitThreads
();
// safe to call this multiple time
#endif
vtkPythonInterpreter
::
InitializedOnce
=
true
;
#ifndef VTK_NO_PYTHON_THREADS
int
threadInit
=
PyEval_ThreadsInitialized
();
PyEval_InitThreads
();
// safe to call this multiple time
if
(
!
threadInit
)
{
PyEval_SaveThread
();
// release GIL
...
...
Wrapping/PythonCore/vtkSmartPyObject.cxx
View file @
c59576ea
...
...
@@ -42,10 +42,6 @@ vtkSmartPyObject::~vtkSmartPyObject()
vtkPythonScopeGilEnsurer
gilEnsurer
;
Py_XDECREF
(
this
->
Object
);
}
else
{
Py_XDECREF
(
this
->
Object
);
}
}
//--------------------------------------------------------------------
...
...
Write
Preview
Markdown
is supported
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