Merge branch 'master' into master

code/AssbinExporter.cpp

@@ -824,8 +824,7 @@ public:
     }
 };
 
-void ExportSceneAssbin(const char* pFile, IOSystem* pIOSystem, const aiScene* pScene, const ExportProperties* /*pProperties*/)
+void ExportSceneAssbin(const char* pFile, IOSystem* pIOSystem, const aiScene* pScene, const ExportProperties* /*pProperties*/) {
-{
     AssbinExport exporter;
     exporter.WriteBinaryDump( pFile, pIOSystem, pScene );
 }

code/AssbinLoader.cpp

@@ -547,7 +547,6 @@ void AssbinImporter::ReadBinaryTexture(IOStream * stream, aiTexture* tex) {
             stream->Read(tex->pcData,1,tex->mWidth*tex->mHeight*4);
         }
     }
-
 }
 
 // -----------------------------------------------------------------------------------

include/assimp/DefaultIOSystem.h

@@ -50,8 +50,7 @@ namespace Assimp    {
 
 // ---------------------------------------------------------------------------
 /** Default implementation of IOSystem using the standard C file functions */
-class ASSIMP_API DefaultIOSystem : public IOSystem
+class ASSIMP_API DefaultIOSystem : public IOSystem {
-{
 public:
     // -------------------------------------------------------------------
     /** Tests for the existence of a file at the given path. */

include/assimp/LineSplitter.h

@@ -44,11 +44,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  @brief LineSplitter, a helper class to iterate through all lines
  *    of a file easily. Works with StreamReader.
  */
+#pragma once
 #ifndef INCLUDED_LINE_SPLITTER_H
 #define INCLUDED_LINE_SPLITTER_H
 
 #include <stdexcept>
-
 #include "StreamReader.h"
 #include "ParsingUtils.h"
 
@@ -81,72 +81,131 @@ public:
     /** construct from existing stream reader
     note: trim is *always* assumed true if skyp_empty_lines==true
     */
-    LineSplitter(StreamReaderLE& stream, bool skip_empty_lines = true, bool trim = true)
+    LineSplitter(StreamReaderLE& stream, bool skip_empty_lines = true, bool trim = true);
-    : idx( 0 )
-    , stream(stream)
-    , swallow()
-    , skip_empty_lines(skip_empty_lines)
-    , trim(trim) {
-        cur.reserve(1024);
-        operator++();
 
-        idx = 0;
+    ~LineSplitter();
-    }
-
-    ~LineSplitter() {
-        // empty
-    }
-
-public:
 
     // -----------------------------------------
     /** pseudo-iterator increment */
-    LineSplitter& operator++() {
+    LineSplitter& operator++();
-        if(swallow) {
+
-            swallow = false;
+    // -----------------------------------------
+    LineSplitter& operator++(int);
+
+    // -----------------------------------------
+    /** get a pointer to the beginning of a particular token */
+    const char* operator[] (size_t idx) const;
+
+    // -----------------------------------------
+    /** extract the start positions of N tokens from the current line*/
+    template <size_t N>
+    void get_tokens(const char* (&tokens)[N]) const;
+
+    // -----------------------------------------
+    /** member access */
+    const std::string* operator -> () const;
+
+    std::string operator* () const;
+
+    // -----------------------------------------
+    /** boolean context */
+    operator bool() const;
+
+    // -----------------------------------------
+    /** line indices are zero-based, empty lines are included */
+    operator line_idx() const;
+
+    line_idx get_index() const;
+
+    // -----------------------------------------
+    /** access the underlying stream object */
+    StreamReaderLE& get_stream();
+
+    // -----------------------------------------
+    /** !strcmp((*this)->substr(0,strlen(check)),check) */
+    bool match_start(const char* check);
+
+    // -----------------------------------------
+    /** swallow the next call to ++, return the previous value. */
+    void swallow_next_increment();
+
+    LineSplitter( const LineSplitter & ) = delete;
+    LineSplitter(LineSplitter &&) = delete;
+    LineSplitter &operator = ( const LineSplitter & ) = delete;
+
+private:
+    line_idx mIdx;
+    std::string mCur;
+    StreamReaderLE& mStream;
+    bool mSwallow, mSkip_empty_lines, mTrim;
+};
+
+inline
+LineSplitter::LineSplitter(StreamReaderLE& stream, bool skip_empty_lines, bool trim )
+: mIdx(0)
+, mCur()
+, mStream(stream)
+, mSwallow()
+, mSkip_empty_lines(skip_empty_lines)
+, mTrim(trim) {
+    mCur.reserve(1024);
+    operator++();
+    mIdx = 0;
+}
+
+inline
+LineSplitter::~LineSplitter() {
+    // empty
+}
+
+inline
+LineSplitter& LineSplitter::operator++() {
+    if (mSwallow) {
+        mSwallow = false;
         return *this;
     }
+
     if (!*this) {
         throw std::logic_error("End of file, no more lines to be retrieved.");
     }
+
     char s;
-        cur.clear();
+    mCur.clear();
-        while(stream.GetRemainingSize() && (s = stream.GetI1(),1)) {
+    while (mStream.GetRemainingSize() && (s = mStream.GetI1(), 1)) {
         if (s == '\n' || s == '\r') {
-                if (skip_empty_lines) {
+            if (mSkip_empty_lines) {
-                    while (stream.GetRemainingSize() && ((s = stream.GetI1()) == ' ' || s == '\r' || s == '\n'));
+                while (mStream.GetRemainingSize() && ((s = mStream.GetI1()) == ' ' || s == '\r' || s == '\n'));
-                    if (stream.GetRemainingSize()) {
+                if (mStream.GetRemainingSize()) {
-                        stream.IncPtr(-1);
+                    mStream.IncPtr(-1);
                 }
-                }
+            } else {
-                else {
                 // skip both potential line terminators but don't read past this line.
-                    if (stream.GetRemainingSize() && (s == '\r' && stream.GetI1() != '\n')) {
+                if (mStream.GetRemainingSize() && (s == '\r' && mStream.GetI1() != '\n')) {
-                        stream.IncPtr(-1);
+                    mStream.IncPtr(-1);
                 }
-                    if (trim) {
+                if (mTrim) {
-                        while (stream.GetRemainingSize() && ((s = stream.GetI1()) == ' ' || s == '\t'));
+                    while (mStream.GetRemainingSize() && ((s = mStream.GetI1()) == ' ' || s == '\t'));
-                        if (stream.GetRemainingSize()) {
+                    if (mStream.GetRemainingSize()) {
-                            stream.IncPtr(-1);
+                        mStream.IncPtr(-1);
                     }
                 }
             }
             break;
         }
-            cur += s;
+        mCur += s;
     }
-        ++idx;
+    ++mIdx;
+
     return *this;
 }
 
-    // -----------------------------------------
+inline
-    LineSplitter& operator++(int) {
+LineSplitter &LineSplitter::operator++(int) {
     return ++(*this);
 }
 
-    // -----------------------------------------
+inline
-    /** get a pointer to the beginning of a particular token */
+const char *LineSplitter::operator[] (size_t idx) const {
-    const char* operator[] (size_t idx) const {
     const char* s = operator->()->c_str();
 
     SkipSpaces(&s);
@@ -162,18 +221,15 @@ public:
     return s;
 }
 
-    // -----------------------------------------
-    /** extract the start positions of N tokens from the current line*/
 template <size_t N>
-    void get_tokens(const char* (&tokens)[N]) const {
+inline
+void LineSplitter::get_tokens(const char* (&tokens)[N]) const {
     const char* s = operator->()->c_str();
 
     SkipSpaces(&s);
     for (size_t i = 0; i < N; ++i) {
         if (IsLineEnd(*s)) {
-
             throw std::range_error("Token count out of range, EOL reached");
-
         }
         tokens[i] = s;
 
@@ -182,63 +238,48 @@ public:
     }
 }
 
-    // -----------------------------------------
+inline
-    /** member access */
+const std::string* LineSplitter::operator -> () const {
-    const std::string* operator -> () const {
+    return &mCur;
-        return &cur;
 }
 
-    std::string operator* () const {
+inline
-        return cur;
+std::string LineSplitter::operator* () const {
+    return mCur;
 }
 
-    // -----------------------------------------
+inline
-    /** boolean context */
+LineSplitter::operator bool() const {
-    operator bool() const {
+    return mStream.GetRemainingSize() > 0;
-        return stream.GetRemainingSize()>0;
 }
 
-    // -----------------------------------------
+inline
-    /** line indices are zero-based, empty lines are included */
+LineSplitter::operator line_idx() const {
-    operator line_idx() const {
+    return mIdx;
-        return idx;
 }
 
-    line_idx get_index() const {
+inline
-        return idx;
+LineSplitter::line_idx LineSplitter::get_index() const {
+    return mIdx;
 }
 
-    // -----------------------------------------
+inline
-    /** access the underlying stream object */
+StreamReaderLE &LineSplitter::get_stream() {
-    StreamReaderLE& get_stream() {
+    return mStream;
-        return stream;
 }
 
-    // -----------------------------------------
+inline
-    /** !strcmp((*this)->substr(0,strlen(check)),check) */
+bool LineSplitter::match_start(const char* check) {
-    bool match_start(const char* check) {
+    const size_t len = ::strlen(check);
-        const size_t len = strlen(check);
 
-        return len <= cur.length() && std::equal(check,check+len,cur.begin());
+    return len <= mCur.length() && std::equal(check, check + len, mCur.begin());
 }
 
-
+inline
-    // -----------------------------------------
+void LineSplitter::swallow_next_increment() {
-    /** swallow the next call to ++, return the previous value. */
+    mSwallow = true;
-    void swallow_next_increment() {
-        swallow = true;
 }
 
-private:
+} // Namespace Assimp
-    LineSplitter( const LineSplitter & );
-    LineSplitter &operator = ( const LineSplitter & );
 
-private:
-    line_idx idx;
-    std::string cur;
-    StreamReaderLE& stream;
-    bool swallow, skip_empty_lines, trim;
-};
-
-}
 #endif // INCLUDED_LINE_SPLITTER_H

include/assimp/StreamReader.h

@@ -67,16 +67,13 @@ namespace Assimp {
  *  XXX switch from unsigned int for size types to size_t? or ptrdiff_t?*/
 // --------------------------------------------------------------------------------------------
 template <bool SwapEndianess = false, bool RuntimeSwitch = false>
-class StreamReader
+class StreamReader {
-{
 public:
     // FIXME: use these data types throughout the whole library,
     // then change them to 64 bit values :-)
+    using diff = int;
+    using pos  = unsigned int;
 
-    typedef int diff;
-    typedef unsigned int pos;
-
-public:
     // ---------------------------------------------------------------------
     /** Construction from a given stream with a well-defined endianness.
      *
@@ -111,8 +108,6 @@ public:
         delete[] buffer;
     }
 
-public:
-
     // deprecated, use overloaded operator>> instead
 
     // ---------------------------------------------------------------------
@@ -176,7 +171,6 @@ public:
         return Get<uint64_t>();
     }
 
-public:
     // ---------------------------------------------------------------------
     /** Get the remaining stream size (to the end of the stream) */
     unsigned int GetRemainingSize() const {

test/CMakeLists.txt

@@ -40,8 +40,9 @@
 cmake_minimum_required( VERSION 2.6 )
 
 INCLUDE_DIRECTORIES(
-	../contrib/gtest/include
+	${Assimp_SOURCE_DIR}/contrib/gtest/include
-	../contrib/gtest/
+	${Assimp_SOURCE_DIR}/contrib/gtest/
+    ${Assimp_SOURCE_DIR}/test/unit
     ${Assimp_SOURCE_DIR}/include
     ${Assimp_SOURCE_DIR}/code
 )
@@ -74,6 +75,7 @@ SET( COMMON
   unit/utProfiler.cpp
   unit/utSharedPPData.cpp
   unit/utStringUtils.cpp
+  unit/Common/utLineSplitter.cpp
 )
 
 SET( IMPORTERS

test/models/ParsingFiles/linesplitter_emptyline_test.txt

@@ -0,0 +1,3 @@
+TEST
+
+the rest

test/models/ParsingFiles/linesplitter_tokenizetest.txt

@@ -0,0 +1,12 @@
+#1= IFCORGANIZATION('GS','Graphisoft','Graphisoft',$,$);
+#5= IFCAPPLICATION(#1,'14.0','ArchiCAD 14.0','ArchiCAD');
+#6= IFCPERSON('','Haefele','Karl-Heinz',$,$,$,$,$);
+#8= IFCORGANIZATION('','KIT / IAI','',$,$);
+#12= IFCPERSONANDORGANIZATION(#6,#8,$);
+#13= IFCOWNERHISTORY(#12,#5,$,.ADDED.,$,$,$,1286451639);
+#14= IFCSIUNIT(*,.LENGTHUNIT.,$,.METRE.);
+#15= IFCSIUNIT(*,.AREAUNIT.,$,.SQUARE_METRE.);
+#16= IFCSIUNIT(*,.VOLUMEUNIT.,$,.CUBIC_METRE.);
+#17= IFCSIUNIT(*,.PLANEANGLEUNIT.,$,.RADIAN.);
+#18= IFCMEASUREWITHUNIT(IFCPLANEANGLEMEASURE(0.017453293),#17);
+

test/unit/Common/utLineSplitter.cpp

@@ -0,0 +1,71 @@
+/*
+---------------------------------------------------------------------------
+Open Asset Import Library (assimp)
+---------------------------------------------------------------------------
+
+Copyright (c) 2006-2018, 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 following
+conditions are met:
+
+* Redistributions of source code must retain the above
+copyright notice, this list of conditions and the
+following disclaimer.
+
+* Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the
+following disclaimer in the documentation and/or other
+materials provided with the distribution.
+
+* Neither the name of the assimp team, nor the names of its
+contributors may be used to endorse or promote products
+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
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+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
+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
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+---------------------------------------------------------------------------
+*/
+#include "UnitTestPCH.h"
+
+#include <assimp/LineSplitter.h>
+#include <assimp/DefaultIOSystem.h>
+#include <string>
+
+using namespace Assimp;
+
+class utLineSplitter : public ::testing::Test {
+    // empty
+};
+
+TEST_F(utLineSplitter, tokenizetest) {
+    DefaultIOSystem fs;
+    IOStream* file = fs.Open(ASSIMP_TEST_MODELS_DIR"/ParsingFiles/linesplitter_tokenizetest.txt", "rb");
+
+    StreamReaderLE stream(file);
+    LineSplitter myLineSplitter(stream);
+}
+
+TEST_F( utLineSplitter, issue212Test) {
+    DefaultIOSystem fs;
+    IOStream* file = fs.Open(ASSIMP_TEST_MODELS_DIR"/ParsingFiles/linesplitter_emptyline_test.txt", "rb");
+
+    StreamReaderLE stream(file);
+    LineSplitter myLineSplitter(stream);
+    myLineSplitter++;
+    EXPECT_THROW( myLineSplitter++, std::logic_error );
+}