FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Trajce Nikolov, "attached is some fix for the directshow plugin. Cleans up the build warnings as well makes the code a bit safer"

Browse Source
This commit is contained in:
Robert Osfield
2010-02-25 18:01:25 +00:00
parent 74687953be
commit 444361272f
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/osgPlugins/directshow/DirectShowTexture.cpp
View File

@@ -1404,7 +1404,7 @@ bool CTextureRenderer::openFile(const std::string& file)
const char *ansistr = file.c_str();
int lenA = lstrlenA(ansistr);
int lenW;
BSTR unicodestr;
BSTR unicodestr = 0;
lenW = ::MultiByteToWideChar(CP_ACP, 0, ansistr, lenA, 0, 0);
if (lenW > 0)
@@ -1414,10 +1414,13 @@ bool CTextureRenderer::openFile(const std::string& file)
::MultiByteToWideChar(CP_ACP, 0, ansistr, lenA, unicodestr, lenW);
}
(void)StringCchCopyW(wFileName, NUMELMS(wFileName), unicodestr);
if (unicodestr!=0)
{
(void)StringCchCopyW(wFileName, NUMELMS(wFileName), unicodestr);
// when done, free the BSTR
::SysFreeString(unicodestr);
// when done, free the BSTR
::SysFreeString(unicodestr);
}
HRESULT hr;
if (!initBuildGraph())