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()
-    //, mAccessorLibrary()
-    //, mMeshLibrary()
-    //, mNodeLibrary()
-    //, mImageLibrary()
-    //, mEffectLibrary()
-    //, mMaterialLibrary()
-    //, mLightLibrary()
-    //, mCameraLibrary()
-    //, mControllerLibrary()
+    , mDataLibrary()
+    , mAccessorLibrary()
+    , mMeshLibrary()
+    , mNodeLibrary()
+    , mImageLibrary()
+    , mEffectLibrary()
+    , mMaterialLibrary()
+    , mLightLibrary()
+    , mCameraLibrary()
+    , mControllerLibrary()
     , mRootNode( NULL )
-    //, mAnims()
+    , mAnims()
     , mUnitSize( 1.0f )
     , mUpDirection( UP_Y )
     , mFormat(FV_1_5_n )    // We assume the newest file format by default
@@ -88,13 +88,13 @@ ColladaParser::ColladaParser( IOSystem* pIOHandler, const std::string& pFile)
     }
 
     // open the file
-    boost::scoped_ptr<IOStream> file( pIOHandler->Open( pFile ) );
-    if ( file.get() == NULL ) {
+    boost::scoped_ptr<IOStream> file( pIOHandler->Open(pFile ) );
+    if (file.get() == NULL) {
         throw DeadlyImportError( "Failed to open file " + pFile + "." );
     }
 
     // generate a XML reader for it
-    boost::scoped_ptr<CIrrXML_IOStreamReader> mIOWrapper( new CIrrXML_IOStreamReader( file.get()));
+    boost::scoped_ptr<CIrrXML_IOStreamReader> mIOWrapper(new CIrrXML_IOStreamReader(file.get()));
     mReader = irr::io::createIrrXMLReader( mIOWrapper.get());
     if (!mReader) {
         ThrowException("Collada: Unable to open file.");
@@ -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
 {