[Bf-blender-cvs] [d20fe9a] temp-decklink: VideoTexture: remove C++11 warning
Benoit Bolsee
noreply at git.blender.org
Fri Jun 10 13:32:26 CEST 2016
Commit: d20fe9a9bc932e99ce56ec3c7109d8fafeaa1fbe
Author: Benoit Bolsee
Date: Fri Jun 10 13:31:48 2016 +0200
Branches: temp-decklink
https://developer.blender.org/rBd20fe9a9bc932e99ce56ec3c7109d8fafeaa1fbe
VideoTexture: remove C++11 warning
Throwing in a destructor in c++11 would cause immediate crash of blender.
Replaced the throw with a message on the console.
===================================================================
M source/gameengine/VideoTexture/VideoDeckLink.cpp
===================================================================
diff --git a/source/gameengine/VideoTexture/VideoDeckLink.cpp b/source/gameengine/VideoTexture/VideoDeckLink.cpp
index d9558a7..c8d3c28 100644
--- a/source/gameengine/VideoTexture/VideoDeckLink.cpp
+++ b/source/gameengine/VideoTexture/VideoDeckLink.cpp
@@ -717,16 +717,18 @@ VideoDeckLink::~VideoDeckLink ()
mDLInput->DisableVideoInput();
mDLInput->DisableAudioInput();
mDLInput->FlushStreams();
- if (mDLInput->Release() != 0)
- THRWEXCP(DeckLinkInternalError, S_OK);
+ if (mDLInput->Release() != 0) {
+ printf("Reference count not NULL on DeckLink device when closing it, please report!\n");
+ }
mDLInput = NULL;
}
if (mpAllocator)
{
// if the device was properly cleared, this should be 0
- if (mpAllocator->Release() != 0)
- THRWEXCP(DeckLinkInternalError, S_OK);
+ if (mpAllocator->Release() != 0) {
+ printf("Reference count not NULL on Allocator when closing it, please report!\n");
+ }
mpAllocator = NULL;
}
if (mpCaptureDelegate)
More information about the Bf-blender-cvs
mailing list