Some fixes for build with MinGW
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@55 67173fc5-114c-0410-ac8e-9d2fd5bffc1fpull/1/head
parent
8b2ca95419
commit
a40ac4eace
|
@ -95,7 +95,7 @@ inline aiReturn aiMaterialCPP::Get(const char* pKey,Type* pOut,
|
|||
if ( AI_SUCCESS == ret )
|
||||
{
|
||||
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));
|
||||
::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 (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));
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue