From 2f22980f00cee5079857b63e12138385b0b671e1 Mon Sep 17 00:00:00 2001 From: Andy Maloney Date: Sat, 20 Apr 2024 17:37:52 -0400 Subject: [PATCH] {format} Update to clang-format 18 & reformat --- .github/workflows/format-check.yml | 4 ++-- include/E57Exception.h | 3 +-- src/BlobNodeImpl.cpp | 6 ++---- src/CompressedVectorNodeImpl.cpp | 4 ++-- src/CompressedVectorWriterImpl.cpp | 3 +-- src/DecodeChannel.cpp | 3 +-- src/Decoder.cpp | 6 ++---- src/E57XmlParser.cpp | 4 ++-- src/Encoder.cpp | 15 +++++++-------- src/FloatNodeImpl.cpp | 7 +++---- src/IntegerNodeImpl.cpp | 6 ++---- src/ScaledIntegerNodeImpl.cpp | 8 +++----- src/SourceDestBufferImpl.cpp | 9 ++++----- src/StringNodeImpl.cpp | 3 +-- src/StructureNodeImpl.cpp | 3 +-- src/VectorNodeImpl.cpp | 3 +-- 16 files changed, 35 insertions(+), 52 deletions(-) diff --git a/.github/workflows/format-check.yml b/.github/workflows/format-check.yml index 69b03fb..c3c1a07 100644 --- a/.github/workflows/format-check.yml +++ b/.github/workflows/format-check.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Run clang-format style check - uses: jidicula/clang-format-action@v4.11.0 + uses: jidicula/clang-format-action@v4.11 with: - clang-format-version: '15' + clang-format-version: '18' exclude-regex: 'extern' diff --git a/include/E57Exception.h b/include/E57Exception.h index 138c276..ecb750f 100644 --- a/include/E57Exception.h +++ b/include/E57Exception.h @@ -378,8 +378,7 @@ namespace e57 E57Exception() = delete; E57Exception( ErrorCode ecode, std::string context, const char *srcFileName = nullptr, int srcLineNumber = 0, const char *srcFunctionName = nullptr ) : - errorCode_( ecode ), - context_( std::move( context ) ), sourceFileName_( srcFileName ), + errorCode_( ecode ), context_( std::move( context ) ), sourceFileName_( srcFileName ), sourceFunctionName_( srcFunctionName ), sourceLineNumber_( srcLineNumber ) { } diff --git a/src/BlobNodeImpl.cpp b/src/BlobNodeImpl.cpp index 34783ed..12ba879 100644 --- a/src/BlobNodeImpl.cpp +++ b/src/BlobNodeImpl.cpp @@ -68,8 +68,7 @@ namespace e57 } BlobNodeImpl::BlobNodeImpl( ImageFileImplWeakPtr destImageFile, int64_t fileOffset, - int64_t length ) : - NodeImpl( destImageFile ) + int64_t length ) : NodeImpl( destImageFile ) { // Init blob object that already exists in E57 file currently reading. @@ -210,8 +209,7 @@ namespace e57 void BlobNodeImpl::dump( int indent, std::ostream &os ) const { // don't checkImageFileOpen - os << space( indent ) << "type: Blob" - << " (" << type() << ")" << std::endl; + os << space( indent ) << "type: Blob" << " (" << type() << ")" << std::endl; NodeImpl::dump( indent, os ); os << space( indent ) << "blobLogicalLength_: " << blobLogicalLength_ << std::endl; os << space( indent ) << "binarySectionLogicalStart: " << binarySectionLogicalStart_ diff --git a/src/CompressedVectorNodeImpl.cpp b/src/CompressedVectorNodeImpl.cpp index 3f344ba..63ae31c 100644 --- a/src/CompressedVectorNodeImpl.cpp +++ b/src/CompressedVectorNodeImpl.cpp @@ -238,8 +238,8 @@ namespace e57 #ifdef E57_ENABLE_DIAGNOSTIC_OUTPUT void CompressedVectorNodeImpl::dump( int indent, std::ostream &os ) const { - os << space( indent ) << "type: CompressedVector" - << " (" << type() << ")" << std::endl; + os << space( indent ) << "type: CompressedVector" << " (" << type() << ")" + << std::endl; NodeImpl::dump( indent, os ); if ( prototype_ ) { diff --git a/src/CompressedVectorWriterImpl.cpp b/src/CompressedVectorWriterImpl.cpp index 641d239..1471c22 100644 --- a/src/CompressedVectorWriterImpl.cpp +++ b/src/CompressedVectorWriterImpl.cpp @@ -49,8 +49,7 @@ namespace e57 CompressedVectorWriterImpl::CompressedVectorWriterImpl( std::shared_ptr ni, std::vector &sbufs ) : - cVector_( ni ), - isOpen_( false ) // set to true when succeed below + cVector_( ni ), isOpen_( false ) // set to true when succeed below { //??? check if cvector already been written (can't write twice) diff --git a/src/DecodeChannel.cpp b/src/DecodeChannel.cpp index e1f9a96..8fbe877 100644 --- a/src/DecodeChannel.cpp +++ b/src/DecodeChannel.cpp @@ -33,8 +33,7 @@ namespace e57 { DecodeChannel::DecodeChannel( SourceDestBuffer dbuf_arg, std::shared_ptr decoder_arg, unsigned bytestreamNumber_arg, uint64_t maxRecordCount_arg ) : - dbuf( dbuf_arg ), - decoder( decoder_arg ), bytestreamNumber( bytestreamNumber_arg ) + dbuf( dbuf_arg ), decoder( decoder_arg ), bytestreamNumber( bytestreamNumber_arg ) { maxRecordCount = maxRecordCount_arg; currentPacketLogicalOffset = 0; diff --git a/src/Decoder.cpp b/src/Decoder.cpp index ed00ae8..6f8374a 100644 --- a/src/Decoder.cpp +++ b/src/Decoder.cpp @@ -199,8 +199,7 @@ Decoder::Decoder( unsigned bytestreamNumber ) : bytestreamNumber_( bytestreamNum BitpackDecoder::BitpackDecoder( unsigned bytestreamNumber, SourceDestBuffer &dbuf, unsigned alignmentSize, uint64_t maxRecordCount ) : - Decoder( bytestreamNumber ), - maxRecordCount_( maxRecordCount ), destBuffer_( dbuf.impl() ), + Decoder( bytestreamNumber ), maxRecordCount_( maxRecordCount ), destBuffer_( dbuf.impl() ), inBuffer_( 1024 ), // !!! need to pick smarter channel buffer sizes inBufferAlignmentSize_( alignmentSize ), bitsPerWord_( 8 * alignmentSize ), bytesPerWord_( alignmentSize ) @@ -856,8 +855,7 @@ ConstantIntegerDecoder::ConstantIntegerDecoder( bool isScaledInteger, unsigned b SourceDestBuffer &dbuf, int64_t minimum, double scale, double offset, uint64_t maxRecordCount ) : - Decoder( bytestreamNumber ), - maxRecordCount_( maxRecordCount ), destBuffer_( dbuf.impl() ), + Decoder( bytestreamNumber ), maxRecordCount_( maxRecordCount ), destBuffer_( dbuf.impl() ), isScaledInteger_( isScaledInteger ), minimum_( minimum ), scale_( scale ), offset_( offset ) { } diff --git a/src/E57XmlParser.cpp b/src/E57XmlParser.cpp index 9d90c78..10ab3a9 100644 --- a/src/E57XmlParser.cpp +++ b/src/E57XmlParser.cpp @@ -155,8 +155,8 @@ class E57FileInputStream : public BinInputStream E57FileInputStream::E57FileInputStream( CheckedFile *cf, uint64_t logicalStart, uint64_t logicalLength ) : - cf_( cf ), - logicalStart_( logicalStart ), logicalLength_( logicalLength ), logicalPosition_( logicalStart ) + cf_( cf ), logicalStart_( logicalStart ), logicalLength_( logicalLength ), + logicalPosition_( logicalStart ) { } diff --git a/src/Encoder.cpp b/src/Encoder.cpp index 930bb72..e0c403f 100644 --- a/src/Encoder.cpp +++ b/src/Encoder.cpp @@ -214,9 +214,9 @@ void Encoder::dump( int indent, std::ostream &os ) const BitpackEncoder::BitpackEncoder( unsigned bytestreamNumber, SourceDestBuffer &sbuf, unsigned outputMaxSize, unsigned alignmentSize ) : - Encoder( bytestreamNumber ), - sourceBuffer_( sbuf.impl() ), outBuffer_( outputMaxSize ), outBufferFirst_( 0 ), - outBufferEnd_( 0 ), outBufferAlignmentSize_( alignmentSize ), currentRecordIndex_( 0 ) + Encoder( bytestreamNumber ), sourceBuffer_( sbuf.impl() ), outBuffer_( outputMaxSize ), + outBufferFirst_( 0 ), outBufferEnd_( 0 ), outBufferAlignmentSize_( alignmentSize ), + currentRecordIndex_( 0 ) { } @@ -496,9 +496,8 @@ void BitpackFloatEncoder::dump( int indent, std::ostream &os ) const BitpackStringEncoder::BitpackStringEncoder( unsigned bytestreamNumber, SourceDestBuffer &sbuf, unsigned outputMaxSize ) : - BitpackEncoder( bytestreamNumber, sbuf, outputMaxSize, 1 ), - totalBytesProcessed_( 0 ), isStringActive_( false ), prefixComplete_( false ), - currentCharPosition_( 0 ) + BitpackEncoder( bytestreamNumber, sbuf, outputMaxSize, 1 ), totalBytesProcessed_( 0 ), + isStringActive_( false ), prefixComplete_( false ), currentCharPosition_( 0 ) { } @@ -896,8 +895,8 @@ void BitpackIntegerEncoder::dump( int indent, std::ostream &os ) cons ConstantIntegerEncoder::ConstantIntegerEncoder( unsigned bytestreamNumber, SourceDestBuffer &sbuf, int64_t minimum ) : - Encoder( bytestreamNumber ), - sourceBuffer_( sbuf.impl() ), currentRecordIndex_( 0 ), minimum_( minimum ) + Encoder( bytestreamNumber ), sourceBuffer_( sbuf.impl() ), currentRecordIndex_( 0 ), + minimum_( minimum ) { } diff --git a/src/FloatNodeImpl.cpp b/src/FloatNodeImpl.cpp index d22f17a..0486354 100644 --- a/src/FloatNodeImpl.cpp +++ b/src/FloatNodeImpl.cpp @@ -33,8 +33,8 @@ namespace e57 { FloatNodeImpl::FloatNodeImpl( ImageFileImplWeakPtr destImageFile, double value, FloatPrecision precision, double minimum, double maximum ) : - NodeImpl( destImageFile ), - value_( value ), precision_( precision ), minimum_( minimum ), maximum_( maximum ) + NodeImpl( destImageFile ), value_( value ), precision_( precision ), minimum_( minimum ), + maximum_( maximum ) { // Since this ctor also used to construct single precision, and defaults for minimum/maximum // are for double precision, adjust bounds smaller if single. @@ -214,8 +214,7 @@ namespace e57 void FloatNodeImpl::dump( int indent, std::ostream &os ) const { // don't checkImageFileOpen - os << space( indent ) << "type: Float" - << " (" << type() << ")" << std::endl; + os << space( indent ) << "type: Float" << " (" << type() << ")" << std::endl; NodeImpl::dump( indent, os ); os << space( indent ) << "precision: "; if ( precision() == PrecisionSingle ) diff --git a/src/IntegerNodeImpl.cpp b/src/IntegerNodeImpl.cpp index 6bb19cd..bf418f0 100644 --- a/src/IntegerNodeImpl.cpp +++ b/src/IntegerNodeImpl.cpp @@ -33,8 +33,7 @@ namespace e57 { IntegerNodeImpl::IntegerNodeImpl( ImageFileImplWeakPtr destImageFile, int64_t value, int64_t minimum, int64_t maximum ) : - NodeImpl( destImageFile ), - value_( value ), minimum_( minimum ), maximum_( maximum ) + NodeImpl( destImageFile ), value_( value ), minimum_( minimum ), maximum_( maximum ) { } @@ -160,8 +159,7 @@ namespace e57 void IntegerNodeImpl::dump( int indent, std::ostream &os ) const { // don't checkImageFileOpen - os << space( indent ) << "type: Integer" - << " (" << type() << ")" << std::endl; + os << space( indent ) << "type: Integer" << " (" << type() << ")" << std::endl; NodeImpl::dump( indent, os ); os << space( indent ) << "value: " << value_ << std::endl; os << space( indent ) << "minimum: " << minimum_ << std::endl; diff --git a/src/ScaledIntegerNodeImpl.cpp b/src/ScaledIntegerNodeImpl.cpp index f35dd54..1c284b6 100644 --- a/src/ScaledIntegerNodeImpl.cpp +++ b/src/ScaledIntegerNodeImpl.cpp @@ -36,9 +36,8 @@ namespace e57 ScaledIntegerNodeImpl::ScaledIntegerNodeImpl( ImageFileImplWeakPtr destImageFile, int64_t rawValue, int64_t minimum, int64_t maximum, double scale, double offset ) : - NodeImpl( destImageFile ), - value_( rawValue ), minimum_( minimum ), maximum_( maximum ), scale_( scale ), - offset_( offset ) + NodeImpl( destImageFile ), value_( rawValue ), minimum_( minimum ), maximum_( maximum ), + scale_( scale ), offset_( offset ) { } @@ -228,8 +227,7 @@ namespace e57 void ScaledIntegerNodeImpl::dump( int indent, std::ostream &os ) const { // don't checkImageFileOpen - os << space( indent ) << "type: ScaledInteger" - << " (" << type() << ")" << std::endl; + os << space( indent ) << "type: ScaledInteger" << " (" << type() << ")" << std::endl; NodeImpl::dump( indent, os ); os << space( indent ) << "rawValue: " << value_ << std::endl; os << space( indent ) << "minimum: " << minimum_ << std::endl; diff --git a/src/SourceDestBufferImpl.cpp b/src/SourceDestBufferImpl.cpp index c534e30..9da1777 100644 --- a/src/SourceDestBufferImpl.cpp +++ b/src/SourceDestBufferImpl.cpp @@ -36,9 +36,8 @@ using namespace e57; SourceDestBufferImpl::SourceDestBufferImpl( ImageFileImplWeakPtr destImageFile, const ustring &pathName, const size_t capacity, bool doConversion, bool doScaling ) : - destImageFile_( destImageFile ), - pathName_( pathName ), memoryRepresentation_( Int32 ), capacity_( capacity ), - doConversion_( doConversion ), doScaling_( doScaling ) + destImageFile_( destImageFile ), pathName_( pathName ), memoryRepresentation_( Int32 ), + capacity_( capacity ), doConversion_( doConversion ), doScaling_( doScaling ) { } @@ -109,8 +108,8 @@ template void SourceDestBufferImpl::setTypeInfo( double *base, size_t st SourceDestBufferImpl::SourceDestBufferImpl( ImageFileImplWeakPtr destImageFile, const ustring &pathName, std::vector *b ) : - destImageFile_( destImageFile ), - pathName_( pathName ), memoryRepresentation_( UString ), ustrings_( b ) + destImageFile_( destImageFile ), pathName_( pathName ), memoryRepresentation_( UString ), + ustrings_( b ) { /// don't checkImageFileOpen, checkState_ will do it diff --git a/src/StringNodeImpl.cpp b/src/StringNodeImpl.cpp index 4da8d3b..8a2fd29 100644 --- a/src/StringNodeImpl.cpp +++ b/src/StringNodeImpl.cpp @@ -137,8 +137,7 @@ namespace e57 #ifdef E57_ENABLE_DIAGNOSTIC_OUTPUT void StringNodeImpl::dump( int indent, std::ostream &os ) const { - os << space( indent ) << "type: String" - << " (" << type() << ")" << std::endl; + os << space( indent ) << "type: String" << " (" << type() << ")" << std::endl; NodeImpl::dump( indent, os ); os << space( indent ) << "value: '" << value_ << "'" << std::endl; } diff --git a/src/StructureNodeImpl.cpp b/src/StructureNodeImpl.cpp index aed51b9..e64f7e9 100644 --- a/src/StructureNodeImpl.cpp +++ b/src/StructureNodeImpl.cpp @@ -454,8 +454,7 @@ void StructureNodeImpl::writeXml( ImageFileImplSharedPtr imf, CheckedFile &cf, i void StructureNodeImpl::dump( int indent, std::ostream &os ) const { // don't checkImageFileOpen - os << space( indent ) << "type: Structure" - << " (" << type() << ")" << std::endl; + os << space( indent ) << "type: Structure" << " (" << type() << ")" << std::endl; NodeImpl::dump( indent, os ); for ( unsigned i = 0; i < children_.size(); i++ ) { diff --git a/src/VectorNodeImpl.cpp b/src/VectorNodeImpl.cpp index d4863e3..fda9f27 100644 --- a/src/VectorNodeImpl.cpp +++ b/src/VectorNodeImpl.cpp @@ -128,8 +128,7 @@ namespace e57 void VectorNodeImpl::dump( int indent, std::ostream &os ) const { // don't checkImageFileOpen - os << space( indent ) << "type: Vector" - << " (" << type() << ")" << std::endl; + os << space( indent ) << "type: Vector" << " (" << type() << ")" << std::endl; NodeImpl::dump( indent, os ); // NOLINT(bugprone-parent-virtual-call) os << space( indent ) << "allowHeteroChildren: " << allowHeteroChildren() << std::endl; for ( unsigned i = 0; i < children_.size(); i++ )