[Sumover-dev] [svn commit] r4823 - vic/branches/mpeg4/video

[sumover-dev at cs.ucl.ac.uk]

Author: arowley
Date: Tue May 11 14:50:12 2010
New Revision: 4823

Modified:
   vic/branches/mpeg4/video/DeckLinkAPI_i.c
   vic/branches/mpeg4/video/grabber-decklink.cpp

Log:
Updated to work with Mingw32

Modified: vic/branches/mpeg4/video/DeckLinkAPI_i.c
==============================================================================
--- vic/branches/mpeg4/video/DeckLinkAPI_i.c	(original)
+++ vic/branches/mpeg4/video/DeckLinkAPI_i.c	Tue May 11 14:50:12 2010
@@ -20,12 +20,11 @@
 
 #pragma warning( disable: 4049 )  /* more than 64k source lines */
 
-
 #ifdef __cplusplus
 extern "C"{
 #endif 
 
-
+#include "DeckLinkAPI_h.h"
 #include <rpc.h>
 #include <rpcndr.h>
 

Modified: vic/branches/mpeg4/video/grabber-decklink.cpp
==============================================================================
--- vic/branches/mpeg4/video/grabber-decklink.cpp	(original)
+++ vic/branches/mpeg4/video/grabber-decklink.cpp	Tue May 11 14:50:12 2010
@@ -47,7 +47,6 @@
 
 #if defined(_WIN32) || defined(_WIN64)
 #include <objbase.h>
-#include <comutil.h>
 #include "DeckLinkAPI_h.h"
 #include "inttypes.h"
 #else
@@ -386,8 +385,7 @@
 
         result = deckLink->GetModelName(&cardNameBSTR);
         if (result == S_OK) {
-            _bstr_t tmpstr1(cardNameBSTR);
-            strncpy_s(deviceNameString, sizeof(deviceNameString), tmpstr1, _TRUNCATE);
+            wcstombs(deviceNameString, cardNameBSTR, 63);
         }
 #elif __APPLE__
         char deviceNameString[64] = {};
@@ -504,8 +502,7 @@
 
         result = displayMode->GetName(&displayModeNameBSTR);
         if (result == S_OK) {
-            _bstr_t tmpstr1(displayModeNameBSTR);
-            strncpy_s(displayModeString, sizeof(displayModeString), tmpstr1, _TRUNCATE);
+            wcstombs(displayModeString, displayModeNameBSTR, 63);
         }
 #elif __APPLE__
         char displayModeString[64] = {};
@@ -678,8 +675,7 @@
 
                 result = displayMode->GetName(&displayModeNameBSTR);
                 if (result == S_OK) {
-                    _bstr_t tmpstr1(displayModeNameBSTR);
-                    strncpy_s(displayModeString, sizeof(displayModeString), tmpstr1, _TRUNCATE);
+                    wcstombs(displayModeString, displayModeNameBSTR, 63);
                 }
 #elif __APPLE__
                 char displayModeString[64] = {};