Merge pull request #1 from assimp/master

Merge

code/ColladaParser.cpp

@@ -66,18 +66,18 @@ using namespace Assimp::Collada;
 ColladaParser::ColladaParser( IOSystem* pIOHandler, const std::string& pFile)
     : mFileName( pFile )
     , mReader( NULL )
-    //, mDataLibrary()
+    , mDataLibrary()
-    //, mAccessorLibrary()
+    , mAccessorLibrary()
-    //, mMeshLibrary()
+    , mMeshLibrary()
-    //, mNodeLibrary()
+    , mNodeLibrary()
-    //, mImageLibrary()
+    , mImageLibrary()
-    //, mEffectLibrary()
+    , mEffectLibrary()
-    //, mMaterialLibrary()
+    , mMaterialLibrary()
-    //, mLightLibrary()
+    , mLightLibrary()
-    //, mCameraLibrary()
+    , mCameraLibrary()
-    //, mControllerLibrary()
+    , mControllerLibrary()
     , mRootNode( NULL )
-    //, mAnims()
+    , mAnims()
     , mUnitSize( 1.0f )
     , mUpDirection( UP_Y )
     , mFormat(FV_1_5_n )    // We assume the newest file format by default
@@ -102,9 +102,6 @@ ColladaParser::ColladaParser( IOSystem* pIOHandler, const std::string& pFile)
 
     // start reading
     ReadContents();
-
-    // release file after import
-    //pIOHandler->Close( file.get() );
 }
 
 // ------------------------------------------------------------------------------------------------

code/ColladaParser.h

@@ -49,6 +49,7 @@
 #include "ColladaHelper.h"
 #include "../include/assimp/ai_assert.h"
 #include <boost/format.hpp>
+#include <boost/scoped_ptr.hpp>
 
 namespace Assimp
 {