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

0031213: Coding Rules, RWStl_Reader - misnamed variable THE_BUFFER

Browse Source 
Renamed THE_BUFFER variable.
This commit is contained in:
mzernova 2019-12-03 13:51:02 +03:00 committed by bugmaster
parent 4e8c1d8666
commit c37bd936c3
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/RWStl/RWStl.cxx
View File

@ -26,6 +26,7 @@ namespace
static const Standard_Integer THE_STL_SIZEOF_FACET = 50; static const Standard_Integer THE_STL_SIZEOF_FACET = 50;
static const Standard_Integer IND_THRESHOLD = 1000; // increment the indicator every 1k triangles static const Standard_Integer IND_THRESHOLD = 1000; // increment the indicator every 1k triangles
static const size_t THE_BUFFER_SIZE = 1024; // The length of buffer to read (in bytes)
//! Writing a Little Endian 32 bits integer //! Writing a Little Endian 32 bits integer
inline static void convertInteger (const Standard_Integer theValue, inline static void convertInteger (const Standard_Integer theValue,
@ -199,7 +200,8 @@ Handle(Poly_Triangulation) RWStl::ReadAscii (const OSD_Path& theFile,
aStream.seekg (0, aStream.beg); aStream.seekg (0, aStream.beg);
Reader aReader; Reader aReader;
if (!aReader.ReadAscii (aStream, theEnd, theProgress)) Standard_ReadLineBuffer aBuffer (THE_BUFFER_SIZE);
if (!aReader.ReadAscii (aStream, aBuffer, theEnd, theProgress))
{ {
return Handle(Poly_Triangulation)(); return Handle(Poly_Triangulation)();
} }

21
src/RWStl/RWStl_Reader.cxx
View File

@ -26,7 +26,6 @@
#include <OSD_Timer.hxx> #include <OSD_Timer.hxx>
#include <Precision.hxx> #include <Precision.hxx>
#include <Standard_CLocaleSentry.hxx> #include <Standard_CLocaleSentry.hxx>
#include <Standard_ReadLineBuffer.hxx>
#include <algorithm> #include <algorithm>
#include <limits> #include <limits>
@ -43,9 +42,6 @@ namespace
// The length of buffer to read (in bytes) // The length of buffer to read (in bytes)
static const size_t THE_BUFFER_SIZE = 1024; static const size_t THE_BUFFER_SIZE = 1024;
// Buffer to read
Standard_ReadLineBuffer THE_BUFFER (THE_BUFFER_SIZE);
//! Auxiliary tool for merging nodes during STL reading. //! Auxiliary tool for merging nodes during STL reading.
class MergeNodeTool class MergeNodeTool
{ {
@ -155,11 +151,13 @@ Standard_Boolean RWStl_Reader::Read (const char* theFile,
// (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));
Standard_ReadLineBuffer aBuffer (THE_BUFFER_SIZE);
while (aStream.good()) while (aStream.good())
{ {
if (isAscii) if (isAscii)
{ {
if (!ReadAscii (aStream, theEnd, theProgress)) if (!ReadAscii (aStream, aBuffer, theEnd, theProgress))
{ {
break; break;
} }
@ -275,6 +273,7 @@ static bool ReadVertex (const char* theStr, double& theX, double& theY, double&
//purpose : //purpose :
//============================================================================== //==============================================================================
Standard_Boolean RWStl_Reader::ReadAscii (Standard_IStream& theStream, Standard_Boolean RWStl_Reader::ReadAscii (Standard_IStream& theStream,
Standard_ReadLineBuffer& theBuffer,
const std::streampos theUntilPos, const std::streampos theUntilPos,
const Handle(Message_ProgressIndicator)& theProgress) const Handle(Message_ProgressIndicator)& theProgress)
{ {
@ -285,7 +284,7 @@ Standard_Boolean RWStl_Reader::ReadAscii (Standard_IStream& theStream,
const char* aLine; const char* aLine;
// skip header "solid ..." // skip header "solid ..."
aLine = THE_BUFFER.ReadLine (theStream, aLineLen); aLine = theBuffer.ReadLine (theStream, aLineLen);
if (aLine == NULL) if (aLine == NULL)
{ {
Message::DefaultMessenger()->Send ("Error: premature end of file", Message_Fail); Message::DefaultMessenger()->Send ("Error: premature end of file", Message_Fail);
@ -312,7 +311,7 @@ Standard_Boolean RWStl_Reader::ReadAscii (Standard_IStream& theStream,
aProgressPos += aStepB; aProgressPos += aStepB;
} }
aLine = THE_BUFFER.ReadLine (theStream, aLineLen); // "facet normal nx ny nz" aLine = theBuffer.ReadLine (theStream, aLineLen); // "facet normal nx ny nz"
if (aLine == NULL) if (aLine == NULL)
{ {
Message::DefaultMessenger()->Send ("Error: premature end of file", Message_Fail); Message::DefaultMessenger()->Send ("Error: premature end of file", Message_Fail);
@ -331,7 +330,7 @@ Standard_Boolean RWStl_Reader::ReadAscii (Standard_IStream& theStream,
return false; return false;
} }
aLine = THE_BUFFER.ReadLine (theStream, aLineLen); // "outer loop" aLine = theBuffer.ReadLine (theStream, aLineLen); // "outer loop"
if (aLine == NULL || !str_starts_with (aLine, "outer", 5)) if (aLine == NULL || !str_starts_with (aLine, "outer", 5))
{ {
TCollection_AsciiString aStr ("Error: unexpected format of facet at line "); TCollection_AsciiString aStr ("Error: unexpected format of facet at line ");
@ -344,7 +343,7 @@ Standard_Boolean RWStl_Reader::ReadAscii (Standard_IStream& theStream,
Standard_Boolean isEOF = false; Standard_Boolean isEOF = false;
for (Standard_Integer i = 0; i < 3; i++) for (Standard_Integer i = 0; i < 3; i++)
{ {
aLine = THE_BUFFER.ReadLine (theStream, aLineLen); aLine = theBuffer.ReadLine (theStream, aLineLen);
if (aLine == NULL) if (aLine == NULL)
{ {
isEOF = true; isEOF = true;
@ -379,8 +378,8 @@ Standard_Boolean RWStl_Reader::ReadAscii (Standard_IStream& theStream,
AddTriangle (n1, n2, n3); AddTriangle (n1, n2, n3);
} }
THE_BUFFER.ReadLine (theStream, aLineLen); // skip "endloop" theBuffer.ReadLine (theStream, aLineLen); // skip "endloop"
THE_BUFFER.ReadLine (theStream, aLineLen); // skip "endfacet" theBuffer.ReadLine (theStream, aLineLen); // skip "endfacet"
aNbLine += 2; aNbLine += 2;
} }

4
src/RWStl/RWStl_Reader.hxx
View File

@ -16,8 +16,9 @@
#ifndef _RWStl_Reader_HeaderFile #ifndef _RWStl_Reader_HeaderFile
#define _RWStl_Reader_HeaderFile #define _RWStl_Reader_HeaderFile
#include <Message_ProgressIndicator.hxx>
#include <gp_XYZ.hxx> #include <gp_XYZ.hxx>
#include <Message_ProgressIndicator.hxx>
#include <Standard_ReadLineBuffer.hxx>
//! An abstract class implementing procedure to read STL file. //! An abstract class implementing procedure to read STL file.
//! //!
@ -61,6 +62,7 @@ public:
//! If theUntilPos is non-zero, reads not more than until that position. //! If theUntilPos is non-zero, reads not more than until that position.
//! Returns true if success, false on error or user break. //! Returns true if success, false on error or user break.
Standard_EXPORT Standard_Boolean ReadAscii (Standard_IStream& theStream, Standard_EXPORT Standard_Boolean ReadAscii (Standard_IStream& theStream,
Standard_ReadLineBuffer& theBuffer,
const std::streampos theUntilPos, const std::streampos theUntilPos,
const Handle(Message_ProgressIndicator)& theProgress); const Handle(Message_ProgressIndicator)& theProgress);