0028680: Data Exchange - allow reading of multi-domain STL files

[occt.git] / src / RWStl / RWStl_Reader.cxx

diff --git a/src/RWStl/RWStl_Reader.cxx b/src/RWStl/RWStl_Reader.cxx
index 84082bc..ca2e28d 100644 (file)
--- a/src/RWStl/RWStl_Reader.cxx
+++ b/src/RWStl/RWStl_Reader.cxx
@@ -132,18 +132,31 @@ Standard_Boolean RWStl_Reader::Read (const char* theFile,
   }
 
   Standard_IStream aStream (&aBuf);
-  if (IsAscii (aStream))
-  {
-    // get length of file to feed progress indicator
-    aStream.seekg (0, aStream.end);
-    std::streampos theEnd = aStream.tellg();
-    aStream.seekg (0, aStream.beg);
-    return ReadAscii (aStream, theEnd, theProgress);
-  }
-  else
+
+  // get length of file to feed progress indicator in Ascii mode
+  aStream.seekg (0, aStream.end);
+  std::streampos theEnd = aStream.tellg();
+  aStream.seekg (0, aStream.beg);
+
+  while (!aStream.eof() && !aStream.bad())
   {
-    return ReadBinary (aStream, theProgress);
+    if (IsAscii (aStream))
+    {
+      if (!ReadAscii (aStream, theEnd, theProgress))
+      {
+        break;
+      }
+    }
+    else
+    {
+      if (!ReadBinary (aStream, theProgress))
+      {
+        break;
+      }
+    }
+    aStream >> std::ws; // skip any white spaces
   }
+  return !aStream.bad();
 }
 
 //==============================================================================