v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some fixes for build with MinGW 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@55 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
pull/1/head
DarkGuru 2008-06-04 17:50:39 +00:00
parent 8b2ca95419
commit a40ac4eace
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/aiMaterial.inl
View File

@ -95,7 +95,7 @@ inline aiReturn aiMaterialCPP::Get(const char* pKey,Type* pOut,
if ( AI_SUCCESS == ret ) if ( AI_SUCCESS == ret )
{ {
if (prop->mDataLength < sizeof(Type)*iNum)return AI_FAILURE; if (prop->mDataLength < sizeof(Type)*iNum)return AI_FAILURE;
if (prop->mData != aiPTI_Buffer)return AI_FAILURE; if (strcmp(prop->mData,(char*)aiPTI_Buffer)!=0)return AI_FAILURE;
iNum = std::min(iNum,prop->mDataLength / sizeof(Type)); iNum = std::min(iNum,prop->mDataLength / sizeof(Type));
::memcpy(pOut,prop->mData,iNum * sizeof(Type)); ::memcpy(pOut,prop->mData,iNum * sizeof(Type));
@ -112,7 +112,7 @@ inline aiReturn aiMaterialCPP::Get(const char* pKey,Type& pOut)
if ( AI_SUCCESS == ret ) if ( AI_SUCCESS == ret )
{ {
if (prop->mDataLength < sizeof(Type))return AI_FAILURE; if (prop->mDataLength < sizeof(Type))return AI_FAILURE;
if (prop->mData != aiPTI_Buffer)return AI_FAILURE; if (strcmp(prop->mData,(char*)aiPTI_Buffer)!=0)return AI_FAILURE;
::memcpy(&pOut,prop->mData,sizeof(Type)); ::memcpy(&pOut,prop->mData,sizeof(Type));
} }