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

fix code reading findings: use of std::copy 

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
pull/541/head
Kim Kulling 2015-04-18 19:17:48 +02:00
parent 68ca2ca427
commit eb1ee61420
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
code/OpenGEXImporter.cpp
View File

@ -44,8 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "MakeVerboseFormat.h" #include "MakeVerboseFormat.h"
#include <openddlparser/OpenDDLParser.h> #include <openddlparser/OpenDDLParser.h>
#include "../include/assimp/scene.h" #include <assimp/scene.h>
#include <vector> #include <vector>
@ -788,11 +787,7 @@ void OpenGEXImporter::copyMeshes( aiScene *pScene ) {
} }
pScene->mNumMeshes = m_meshCache.size(); pScene->mNumMeshes = m_meshCache.size();
pScene->mMeshes = new aiMesh*[ pScene->mNumMeshes ]; pScene->mMeshes = new aiMesh*[ pScene->mNumMeshes ];
size_t i( 0 ); std::copy( m_meshCache.begin(), m_meshCache.end(), pScene->mMeshes );
for( std::vector<aiMesh*>::iterator it = m_meshCache.begin(); it != m_meshCache.end(); it++ ) {
pScene->mMeshes[ i ] = *it;
i++;
}
} }
//------------------------------------------------------------------------------------------------ //------------------------------------------------------------------------------------------------

2
code/OpenGEXImporter.h
View File

@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef ASSIMP_BUILD_NO_OPENGEX_IMPORTER #ifndef ASSIMP_BUILD_NO_OPENGEX_IMPORTER
#include "BaseImporter.h" #include "BaseImporter.h"
#include "../include/assimp/mesh.h" #include <assimp/mesh.h>
#include <vector> #include <vector>
#include <list> #include <list>