From 85a14fa265e577cba8f104eef94a70dc876f321b Mon Sep 17 00:00:00 2001 From: kimmi Date: Sat, 18 Apr 2009 23:41:50 +0000 Subject: [PATCH] Bugfix: Memory leak fixed. git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@394 67173fc5-114c-0410-ac8e-9d2fd5bffc1f --- code/ObjFileParser.cpp | 6 +++--- code/ObjFileParser.h | 5 +---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/code/ObjFileParser.cpp b/code/ObjFileParser.cpp index 770322dba..eb7962d62 100644 --- a/code/ObjFileParser.cpp +++ b/code/ObjFileParser.cpp @@ -124,7 +124,7 @@ void ObjFileParser::parseFile() { // Read in normal vector definition ++m_DataIt; - getVector3(m_pModel->m_Normals); + getVector3( m_pModel->m_Normals ); } } break; @@ -216,7 +216,7 @@ void ObjFileParser::copyNextLine(char *pBuffer, size_t length) // ------------------------------------------------------------------- // Get values for a new 3D vector instance -void ObjFileParser::getVector3(std::vector &point3d_array) +void ObjFileParser::getVector3(std::vector &point3d_array) { float x, y, z; copyNextWord(m_buffer, BUFFERSIZE); @@ -228,7 +228,7 @@ void ObjFileParser::getVector3(std::vector &point3d_array) copyNextWord(m_buffer, BUFFERSIZE); z = (float) fast_atof(m_buffer); - point3d_array.push_back(new aiVector3D(x,y,z)); + point3d_array.push_back( aiVector3D( x, y, z ) ); //skipLine(); m_DataIt = skipLine( m_DataIt, m_DataItEnd, m_uiLine ); } diff --git a/code/ObjFileParser.h b/code/ObjFileParser.h index ee6502821..bd4d162f8 100644 --- a/code/ObjFileParser.h +++ b/code/ObjFileParser.h @@ -47,9 +47,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include "../include/aiTypes.h" -/*struct aiVector2D_t; -struct aiVector3D_t;*/ - namespace Assimp { @@ -89,7 +86,7 @@ private: /// Method to copy the new line. void copyNextLine(char *pBuffer, size_t length); /// Stores the following 3d vector. - void getVector3( std::vector &point3d_array ); + void getVector3( std::vector &point3d_array ); /// Stores the following 3d vector. void getVector2(std::vector &point2d_array); /// Stores the following face.