OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

0031173: Point Cloud Rendering - Enable remote file systems as input and output for the Point Cloud converter

Browse Source 
Make RWStl_Reader::IsAscii() accepting optional argument pointing how to rewind the input stream, using unget() or seekg(). This allows writing a reader that uses a stream supporting seekg but not supporting unget.
This commit is contained in:
agv 2019-11-22 12:21:55 +03:00 committed by bugmaster
parent cd0705f660
commit 97454ee0cb
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/RWStl/RWStl_Reader.cxx
View File

@ -149,7 +149,7 @@ Standard_Boolean RWStl_Reader::Read (const char* theFile,
// (80 bytes header + 4 bytes facet count + 50 bytes for one facet); // (80 bytes header + 4 bytes facet count + 50 bytes for one facet);
// thus assume files shorter than 134 as Ascii without probing // thus assume files shorter than 134 as Ascii without probing
// (probing may bring stream to fail state if EOF is reached) // (probing may bring stream to fail state if EOF is reached)
bool isAscii = ((size_t)theEnd < THE_STL_MIN_FILE_SIZE || IsAscii (aStream)); bool isAscii = ((size_t)theEnd < THE_STL_MIN_FILE_SIZE || IsAscii (aStream, true));
Standard_ReadLineBuffer aBuffer (THE_BUFFER_SIZE); Standard_ReadLineBuffer aBuffer (THE_BUFFER_SIZE);
@ -185,7 +185,8 @@ Standard_Boolean RWStl_Reader::Read (const char* theFile,
//purpose : //purpose :
//============================================================================== //==============================================================================
Standard_Boolean RWStl_Reader::IsAscii (Standard_IStream& theStream) Standard_Boolean RWStl_Reader::IsAscii (Standard_IStream& theStream,
const bool isSeekgAvailable)
{ {
// read first 134 bytes to detect file format // read first 134 bytes to detect file format
char aBuffer[THE_STL_MIN_FILE_SIZE]; char aBuffer[THE_STL_MIN_FILE_SIZE];
@ -196,10 +197,18 @@ Standard_Boolean RWStl_Reader::IsAscii (Standard_IStream& theStream)
return true; return true;
} }
// put back the read symbols if (isSeekgAvailable)
for (std::streamsize aByteIter = aNbRead; aByteIter > 0; --aByteIter)
{ {
theStream.unget(); // get back to the beginning
theStream.seekg(0, theStream.beg);
}
else
{
// put back the read symbols
for (std::streamsize aByteIter = aNbRead; aByteIter > 0; --aByteIter)
{
theStream.unget();
}
} }
// if file is shorter than size of binary file with 1 facet, it must be ascii // if file is shorter than size of binary file with 1 facet, it must be ascii

7
src/RWStl/RWStl_Reader.hxx
View File

@ -45,9 +45,12 @@ public:
const Message_ProgressRange& theProgress); const Message_ProgressRange& theProgress);
//! Guess whether the stream is an Ascii STL file, by analysis of the first bytes (~200). //! Guess whether the stream is an Ascii STL file, by analysis of the first bytes (~200).
//! The function attempts to put back the read symbols to the stream which thus must support ungetc(). //! If the stream does not support seekg() then the parameter isSeekgAvailable should
//! be passed as 'false', in this case the function attempts to put back the read symbols
//! to the stream which thus must support ungetc().
//! Returns true if the stream seems to contain Ascii STL. //! Returns true if the stream seems to contain Ascii STL.
Standard_EXPORT Standard_Boolean IsAscii (Standard_IStream& theStream); Standard_EXPORT Standard_Boolean IsAscii (Standard_IStream& theStream,
const bool isSeekgAvailable);
//! Reads STL data from binary stream. //! Reads STL data from binary stream.
//! The stream must be opened in binary mode. //! The stream must be opened in binary mode.