diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:09:44 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:10:02 +0100 |
commit | 77d294db076dac19e8b549b445ffede9f7260c84 (patch) | |
tree | 828ee7a6862ec5c0bd24f97cb540625a2c647376 /src/3rdparty/assimp/code/DefaultIOStream.h | |
parent | 59f8fec8a41606b3185fe3a4e276978e3e1ed5ef (diff) | |
parent | 939b9b4b7591e8a421cf048a0a84ed3e75d81d21 (diff) |
Merge branch 'dev' into wip/animationwip/animation
Change-Id: I6e770609c90a7745d08fa4e2f424e865678c5d6f
Diffstat (limited to 'src/3rdparty/assimp/code/DefaultIOStream.h')
-rw-r--r-- | src/3rdparty/assimp/code/DefaultIOStream.h | 125 |
1 files changed, 67 insertions, 58 deletions
diff --git a/src/3rdparty/assimp/code/DefaultIOStream.h b/src/3rdparty/assimp/code/DefaultIOStream.h index 247b14d3b..510fc1d05 100644 --- a/src/3rdparty/assimp/code/DefaultIOStream.h +++ b/src/3rdparty/assimp/code/DefaultIOStream.h @@ -2,11 +2,11 @@ Open Asset Import Library (assimp) ---------------------------------------------------------------------- -Copyright (c) 2006-2012, assimp team +Copyright (c) 2006-2016, assimp team All rights reserved. -Redistribution and use of this software in source and binary forms, -with or without modification, are permitted provided that the +Redistribution and use of this software in source and binary forms, +with or without modification, are permitted provided that the following conditions are met: * Redistributions of source code must retain the above @@ -23,16 +23,16 @@ following conditions are met: derived from this software without specific prior written permission of the assimp team. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ---------------------------------------------------------------------- @@ -43,87 +43,96 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define AI_DEFAULTIOSTREAM_H_INC #include <stdio.h> -#include "../include/assimp/IOStream.hpp" +#include <assimp/IOStream.hpp> +#include <assimp/importerdesc.h> +#include "Defines.h" -namespace Assimp { +namespace Assimp { // ---------------------------------------------------------------------------------- -//! @class DefaultIOStream -//! @brief Default IO implementation, use standard IO operations +//! @class DefaultIOStream +//! @brief Default IO implementation, use standard IO operations //! @note An instance of this class can exist without a valid file handle //! attached to it. All calls fail, but the instance can nevertheless be //! used with no restrictions. class DefaultIOStream : public IOStream { - friend class DefaultIOSystem; + friend class DefaultIOSystem; +#if __ANDROID__ +#if __ANDROID_API__ > 9 +#if defined(AI_CONFIG_ANDROID_JNI_ASSIMP_MANAGER_SUPPORT) + friend class AndroidJNIIOSystem; +#endif // defined(AI_CONFIG_ANDROID_JNI_ASSIMP_MANAGER_SUPPORT) +#endif // __ANDROID_API__ > 9 +#endif // __ANDROID__ protected: - DefaultIOStream (); - DefaultIOStream (FILE* pFile, const std::string &strFilename); + DefaultIOStream(); + DefaultIOStream(FILE* pFile, const std::string &strFilename); public: - /** Destructor public to allow simple deletion to close the file. */ - ~DefaultIOStream (); + /** Destructor public to allow simple deletion to close the file. */ + ~DefaultIOStream (); - // ------------------------------------------------------------------- - // Read from stream - size_t Read(void* pvBuffer, - size_t pSize, - size_t pCount); + // ------------------------------------------------------------------- + /// Read from stream + size_t Read(void* pvBuffer, + size_t pSize, + size_t pCount); - // ------------------------------------------------------------------- - // Write to stream - size_t Write(const void* pvBuffer, - size_t pSize, - size_t pCount); + // ------------------------------------------------------------------- + /// Write to stream + size_t Write(const void* pvBuffer, + size_t pSize, + size_t pCount); - // ------------------------------------------------------------------- - // Seek specific position - aiReturn Seek(size_t pOffset, - aiOrigin pOrigin); + // ------------------------------------------------------------------- + /// Seek specific position + aiReturn Seek(size_t pOffset, + aiOrigin pOrigin); - // ------------------------------------------------------------------- - // Get current seek position + // ------------------------------------------------------------------- + /// Get current seek position size_t Tell() const; - // ------------------------------------------------------------------- - // Get size of file - size_t FileSize() const; + // ------------------------------------------------------------------- + /// Get size of file + size_t FileSize() const; - // ------------------------------------------------------------------- - // Flush file contents - void Flush(); + // ------------------------------------------------------------------- + /// Flush file contents + void Flush(); private: - //! File datastructure, using clib - FILE* mFile; - //! Filename - std::string mFilename; + // File datastructure, using clib + FILE* mFile; + // Filename + std::string mFilename; - //! Cached file size - mutable size_t cachedSize; + // Cached file size + mutable size_t cachedSize; }; // ---------------------------------------------------------------------------------- -inline DefaultIOStream::DefaultIOStream () : - mFile (NULL), - mFilename (""), - cachedSize (SIZE_MAX) +inline DefaultIOStream::DefaultIOStream () : + mFile (NULL), + mFilename (""), + cachedSize (SIZE_MAX) { - // empty + // empty } // ---------------------------------------------------------------------------------- -inline DefaultIOStream::DefaultIOStream (FILE* pFile, - const std::string &strFilename) : - mFile(pFile), - mFilename(strFilename), - cachedSize (SIZE_MAX) +inline DefaultIOStream::DefaultIOStream (FILE* pFile, + const std::string &strFilename) : + mFile(pFile), + mFilename(strFilename), + cachedSize (SIZE_MAX) { - // empty + // empty } // ---------------------------------------------------------------------------------- |