Major API cleanup. Unified formatting & doxygen tags in the public API.
Added factory provider for default log streams. Added default log streams to std::out and std::cerr. Updated VC8 project config, boost workarounds is now working for the viewer. Updated unit test suite. Fixed some minor issues in the postprocessing-framework. BROKEN: DebugDLL build. git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@292 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
This commit is contained in:
@@ -50,7 +50,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
#include "GenericProperty.h"
|
||||
|
||||
|
||||
#if (defined AI_C_THREADSAFE)
|
||||
# include <boost/thread/thread.hpp>
|
||||
# include <boost/thread/mutex.hpp>
|
||||
@@ -92,7 +91,7 @@ public:
|
||||
{}
|
||||
|
||||
// -------------------------------------------------------------------
|
||||
size_t Read(void* pvBuffer,
|
||||
size_t Read(void* pvBuffer,
|
||||
size_t pSize,
|
||||
size_t pCount)
|
||||
{
|
||||
@@ -100,16 +99,14 @@ public:
|
||||
return mFile->ReadProc(mFile,(char*)pvBuffer,pSize,pCount);
|
||||
}
|
||||
|
||||
|
||||
// -------------------------------------------------------------------
|
||||
size_t Write(const void* pvBuffer,
|
||||
size_t Write(const void* pvBuffer,
|
||||
size_t pSize,
|
||||
size_t pCount)
|
||||
{
|
||||
// need to typecast here as C has no void*
|
||||
return mFile->WriteProc(mFile,(const char*)pvBuffer,pSize,pCount);
|
||||
}
|
||||
|
||||
{
|
||||
// need to typecast here as C has no void*
|
||||
return mFile->WriteProc(mFile,(const char*)pvBuffer,pSize,pCount);
|
||||
}
|
||||
|
||||
// -------------------------------------------------------------------
|
||||
aiReturn Seek(size_t pOffset,
|
||||
@@ -118,20 +115,24 @@ public:
|
||||
return mFile->SeekProc(mFile,pOffset,pOrigin);
|
||||
}
|
||||
|
||||
|
||||
// -------------------------------------------------------------------
|
||||
size_t Tell(void) const
|
||||
size_t Tell(void) const
|
||||
{
|
||||
return mFile->TellProc(mFile);
|
||||
}
|
||||
|
||||
|
||||
// -------------------------------------------------------------------
|
||||
size_t FileSize() const
|
||||
{
|
||||
return mFile->FileSizeProc(mFile);
|
||||
}
|
||||
|
||||
// -------------------------------------------------------------------
|
||||
void Flush ()
|
||||
{
|
||||
return mFile->FlushProc(mFile);
|
||||
}
|
||||
|
||||
private:
|
||||
aiFile* mFile;
|
||||
};
|
||||
@@ -152,13 +153,17 @@ public:
|
||||
{
|
||||
CIOSystemWrapper* pip = const_cast<CIOSystemWrapper*>(this);
|
||||
IOStream* p = pip->Open(pFile);
|
||||
if (p){pip->Close(p);return true;}
|
||||
if (p){
|
||||
pip->Close(p);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
// -------------------------------------------------------------------
|
||||
std::string getOsSeparator() const
|
||||
{
|
||||
// FIXME
|
||||
return "/";
|
||||
}
|
||||
|
||||
@@ -179,6 +184,7 @@ public:
|
||||
delete pFile;
|
||||
}
|
||||
|
||||
|
||||
private:
|
||||
|
||||
aiFileIO* mFileSystem;
|
||||
|
||||
Reference in New Issue
Block a user