caiyu/gmio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bench_assimp: fix crash in bench_gmio_stl_read()

Browse Source
This commit is contained in:
Hugues Delorme 2015-03-31 16:19:02 +02:00
parent 45fd39dd7f
commit 78d101860d
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
benchs/bench_assimp/main.cpp
View File

@ -2,6 +2,7 @@
#include <assimp/Importer.hpp> #include <assimp/Importer.hpp>
#include <assimp/scene.h> #include <assimp/scene.h>
#include <assimp/cimport.h>
#include <gmio_core/error.h> #include <gmio_core/error.h>
#include <gmio_stl/stl_io.h> #include <gmio_stl/stl_io.h>
@ -13,6 +14,8 @@ static void bench_assimp_Importer(const char* filepath)
{ {
Assimp::Importer importer; Assimp::Importer importer;
const aiScene* scene = importer.ReadFile(filepath, 0); const aiScene* scene = importer.ReadFile(filepath, 0);
if (aiGetErrorString() != NULL)
std::cerr << aiGetErrorString() << std::endl;
if (scene == NULL || scene->mNumMeshes <= 0) { if (scene == NULL || scene->mNumMeshes <= 0) {
std::cerr << "Failed to read file " << filepath << std::endl; std::cerr << "Failed to read file " << filepath << std::endl;
} }
@ -144,9 +147,9 @@ static void bench_gmio_stl_read(const char* filepath)
{ {
gmio_buffer_t buffer = gmio_buffer_malloc(256 * 1024); gmio_buffer_t buffer = gmio_buffer_malloc(256 * 1024);
aiScene scene; aiScene* scene = new aiScene;
gmio_stl_mesh_creator_t mesh_creator = { 0 }; gmio_stl_mesh_creator_t mesh_creator = { 0 };
mesh_creator.cookie = &scene; mesh_creator.cookie = scene;
mesh_creator.ascii_begin_solid_func = gmio_assimp_ascii_begin_solid_func; mesh_creator.ascii_begin_solid_func = gmio_assimp_ascii_begin_solid_func;
mesh_creator.binary_begin_solid_func = gmio_assimp_binary_begin_solid; mesh_creator.binary_begin_solid_func = gmio_assimp_binary_begin_solid;
mesh_creator.add_triangle_func = gmio_assimp_add_triangle; mesh_creator.add_triangle_func = gmio_assimp_add_triangle;