Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Try to get rid of memory leak in IOManager

Browse Source 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@830 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Jan Möbius
2013-06-05 07:33:16 +00:00
parent adf464de77
commit ee648b6da1
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/OpenMesh/Core/IO/IOManager.cc
View File

@@ -63,23 +63,22 @@ namespace IO {
//============================================================================= //=============================================================================
// Destructor never called. Moved into singleton getter function
_IOManager_ *__IOManager_instance = 0; // _IOManager_ *__IOManager_instance = 0;
_IOManager_& IOManager() _IOManager_& IOManager()
{ {
if (!__IOManager_instance) static _IOManager_ __IOManager_instance;
__IOManager_instance = new _IOManager_();
return *__IOManager_instance; //if (!__IOManager_instance)
// __IOManager_instance = new _IOManager_();
return __IOManager_instance;
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
bool bool
_IOManager_:: _IOManager_::
read(const std::string& _filename, BaseImporter& _bi, Options& _opt) read(const std::string& _filename, BaseImporter& _bi, Options& _opt)

14
src/OpenMesh/Core/IO/IOManager.hh
View File

@@ -101,13 +101,19 @@ class OPENMESHDLLEXPORT _IOManager_
{ {
private: private:
/// Constructor has nothing todo for the Manager
_IOManager_() {} _IOManager_() {}
/// Destructor has nothing todo for the Manager
~_IOManager_() {};
/** Declare the singleton getter function as friend to access the private constructor
and destructor
*/
friend OPENMESHDLLEXPORT _IOManager_& IOManager(); friend OPENMESHDLLEXPORT _IOManager_& IOManager();
public: public:
/** /**
Read a mesh from file _filename. The target data structure is specified Read a mesh from file _filename. The target data structure is specified
by the given BaseImporter. The \c read method consecutively queries all by the given BaseImporter. The \c read method consecutively queries all
@@ -247,12 +253,10 @@ private:
//============================================================================= //=============================================================================
extern _IOManager_* __IOManager_instance; //_IOManager_* __IOManager_instance; Causes memory leak, as destructor is never called
OPENMESHDLLEXPORT _IOManager_& IOManager(); OPENMESHDLLEXPORT _IOManager_& IOManager();
//============================================================================= //=============================================================================
} // namespace IO } // namespace IO
} // namespace OpenMesh } // namespace OpenMesh