[Gdcm-hackers] gdcm-git:Grassroots DICOM branch release updated. a624c5ce2b6d4e9f37ee0aa1c6e7c26d8717079e

[malat <ma...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Grassroots DICOM".

The branch, release has been updated
       via  a624c5ce2b6d4e9f37ee0aa1c6e7c26d8717079e (commit)
      from  5061ba991cc8c064173ee773b9606187aed3badd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://sourceforge.net/p/gdcm/gdcm/ci/a624c5ce2b6d4e9f37ee0aa1c6e7c26d8717079e/

commit a624c5ce2b6d4e9f37ee0aa1c6e7c26d8717079e
Author: Sean McBride <se...@ro...>
Date:   Tue Apr 4 22:21:16 2023 -0400

    Manually fixed all clang-tidy readability-misleading-indentation warnings

diff --git a/.clang-tidy b/.clang-tidy
index da5ab0e39..42544d626 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -109,7 +109,6 @@ Checks: '-*,
   -readability-braces-around-statements,
   -readability-static-accessed-through-instance,
   -readability-convert-member-functions-to-static,
-  -readability-misleading-indentation,
   -readability-redundant-member-init,
   -readability-non-const-parameter,
   -readability-inconsistent-declaration-parameter-name,
diff --git a/Applications/Cxx/gdcmanon.cxx b/Applications/Cxx/gdcmanon.cxx
index cfa29ca28..6266cadd4 100644
--- a/Applications/Cxx/gdcmanon.cxx
+++ b/Applications/Cxx/gdcmanon.cxx
@@ -434,7 +434,8 @@ int main(int argc, char *argv[])
           //  assert( outfilename.empty() );
           //  outfilename = optarg;
           //  }
-          /*else*/ if( option_index == 2 ) /* root-uid */
+          //else...
+          if( option_index == 2 ) /* root-uid */
             {
             assert( strcmp(s, "root-uid") == 0 );
             assert( root.empty() );
diff --git a/Applications/Cxx/gdcmtar.cxx b/Applications/Cxx/gdcmtar.cxx
index e9264630c..9a8808e34 100644
--- a/Applications/Cxx/gdcmtar.cxx
+++ b/Applications/Cxx/gdcmtar.cxx
@@ -1026,12 +1026,12 @@ int main (int argc, char *argv[])
             assert( pattern.empty() );
             pattern = optarg;
             }
-           else if( option_index == 6 ) /* root uid */
+          else if( option_index == 6 ) /* root uid */
             {
             assert( strcmp(s, "root-uid") == 0 );
             root = optarg;
             }
-            else if( option_index == 7 ) /* resourcespath */
+          else if( option_index == 7 ) /* resourcespath */
             {
             assert( strcmp(s, "resources-path") == 0 );
             assert( xmlpath.empty() );
diff --git a/Examples/Cxx/DumpADAC.cxx b/Examples/Cxx/DumpADAC.cxx
index d20864f13..9ce5abb09 100644
--- a/Examples/Cxx/DumpADAC.cxx
+++ b/Examples/Cxx/DumpADAC.cxx
@@ -312,7 +312,7 @@ bool DumpADAC( std::istream & is )
       float val = readfloat32(is);
       os << "" << std::dec << val << "";
       }
-     else
+    else
       {
       assert( 0 );
       }
diff --git a/Source/DataStructureAndEncodingDefinition/gdcmPDBHeader.cxx b/Source/DataStructureAndEncodingDefinition/gdcmPDBHeader.cxx
index 9098651ff..0436b8d46 100644
--- a/Source/DataStructureAndEncodingDefinition/gdcmPDBHeader.cxx
+++ b/Source/DataStructureAndEncodingDefinition/gdcmPDBHeader.cxx
@@ -183,7 +183,7 @@ int PDBHeader::readprotocoldatablock(const char *input, size_t inputlen, bool ve
       offset = 0;
       len = (uint32_t)inputlen;
       }
-      else
+    else
       {
       gdcmWarningMacro("Unhandled Protocol Data Block magic value: " << len );
       return 1;
diff --git a/Source/MediaStorageAndFileFormat/gdcmJPEG2000Codec.cxx b/Source/MediaStorageAndFileFormat/gdcmJPEG2000Codec.cxx
index f1530d175..10ac23cca 100644
--- a/Source/MediaStorageAndFileFormat/gdcmJPEG2000Codec.cxx
+++ b/Source/MediaStorageAndFileFormat/gdcmJPEG2000Codec.cxx
@@ -187,8 +187,8 @@ static bool parsej2k_imp( const char * const stream, const size_t file_size, boo
         }
       cur += lenmarker; cur_size -= lenmarker;
       }
-      else if( marker == SOD )
-        return true;
+    else if( marker == SOD )
+      return true;
     }
   return false;
 }
@@ -931,7 +931,7 @@ void rawtoimage_fill2(const T *inputbuffer, int w, int h, int numcomps, opj_imag
     // nmask : to propagate sign bit on negative values
     int16_t nmask = (int16_t)0x8000;
     nmask = (int16_t)(nmask >> ( bitsallocated - bitsstored - 1 ));
-     if( pc )
+    if( pc )
       {
       for(int compno = 0; compno < numcomps; compno++)
         {
diff --git a/Source/MediaStorageAndFileFormat/gdcmSplitMosaicFilter.cxx b/Source/MediaStorageAndFileFormat/gdcmSplitMosaicFilter.cxx
index 6b0bc0459..d3c43ebf8 100644
--- a/Source/MediaStorageAndFileFormat/gdcmSplitMosaicFilter.cxx
+++ b/Source/MediaStorageAndFileFormat/gdcmSplitMosaicFilter.cxx
@@ -398,7 +398,7 @@ bool SplitMosaicFilter::Split()
      {
      image.SetTransferSyntax( TransferSyntax::ExplicitVRLittleEndian );
      }
-   else
+  else
      {
      image.SetTransferSyntax( TransferSyntax::ImplicitVRLittleEndian );
      }
@@ -409,7 +409,7 @@ bool SplitMosaicFilter::Split()
 
   // Fix origin (direction is ok since we reorganize the tiles):
   if( hasOriginCSA )
-  image.SetOrigin( origin );
+    image.SetOrigin( origin );
 
   PhotometricInterpretation pi;
   pi = PhotometricInterpretation::MONOCHROME2;
diff --git a/Source/MessageExchangeDefinition/gdcmBaseQuery.cxx b/Source/MessageExchangeDefinition/gdcmBaseQuery.cxx
index 3cb9ea9ac..baffb7a7b 100644
--- a/Source/MessageExchangeDefinition/gdcmBaseQuery.cxx
+++ b/Source/MessageExchangeDefinition/gdcmBaseQuery.cxx
@@ -68,7 +68,7 @@ namespace gdcm
       {
         de.SetVR( VR::OW );
       }
-       else if( vr == VR::US_SS_OW )
+      else if( vr == VR::US_SS_OW )
       {
         de.SetVR( VR::OW );
       }
diff --git a/Source/MessageExchangeDefinition/gdcmCompositeNetworkFunctions.cxx b/Source/MessageExchangeDefinition/gdcmCompositeNetworkFunctions.cxx
index aa339f538..59692a20a 100644
--- a/Source/MessageExchangeDefinition/gdcmCompositeNetworkFunctions.cxx
+++ b/Source/MessageExchangeDefinition/gdcmCompositeNetworkFunctions.cxx
@@ -423,7 +423,7 @@ bool CompositeNetworkFunctions::CStore( const char *remote, uint16_t portno,
       //case 0xA700:
       //case 0xA900:
       //case 0xC000:
-          {
+        {
           // TODO: value from 0901 ?
           gdcmErrorMacro( "C-Store of file " << filename << " was a failure." );
           Attribute<0x0,0x0902> errormsg;
@@ -432,8 +432,8 @@ bool CompositeNetworkFunctions::CStore( const char *remote, uint16_t portno,
           assert( themsg ); (void)themsg;
           gdcmErrorMacro( "Response Status: " << themsg );
           ret = false; // at least one file was not sent correctly
-          }
-       else
+        }
+      else
         gdcmWarningMacro( "Unhandle error code: " << theVal );
       theManager.InvokeEvent( IterationEvent() );
       }
diff --git a/Testing/Source/DataStructureAndEncodingDefinition/Cxx/TestAttribute8.cxx b/Testing/Source/DataStructureAndEncodingDefinition/Cxx/TestAttribute8.cxx
index a1d14a147..ddf541dca 100644
--- a/Testing/Source/DataStructureAndEncodingDefinition/Cxx/TestAttribute8.cxx
+++ b/Testing/Source/DataStructureAndEncodingDefinition/Cxx/TestAttribute8.cxx
@@ -24,7 +24,7 @@
 int TestAttribute8Func(const char *filename, bool verbose = false)
 {
   if( verbose )
-  std::cout << "TestRead: " << filename << std::endl;
+    std::cout << "TestRead: " << filename << std::endl;
 
   gdcm::Reader reader;
   reader.SetFileName( filename );
diff --git a/Testing/Source/DataStructureAndEncodingDefinition/Cxx/TestReader.cxx b/Testing/Source/DataStructureAndEncodingDefinition/Cxx/TestReader.cxx
index 179aeb770..37677a98d 100644
--- a/Testing/Source/DataStructureAndEncodingDefinition/Cxx/TestReader.cxx
+++ b/Testing/Source/DataStructureAndEncodingDefinition/Cxx/TestReader.cxx
@@ -20,7 +20,7 @@
 int TestRead(const char* filename, bool verbose = false)
 {
   if( verbose )
-  std::cout << "TestRead: " << filename << std::endl;
+    std::cout << "TestRead: " << filename << std::endl;
 
   gdcm::Reader reader;
   reader.SetFileName( filename );
diff --git a/Testing/Source/DataStructureAndEncodingDefinition/Cxx/TestReaderCanRead.cxx b/Testing/Source/DataStructureAndEncodingDefinition/Cxx/TestReaderCanRead.cxx
index 0c9a72077..b4a24237f 100644
--- a/Testing/Source/DataStructureAndEncodingDefinition/Cxx/TestReaderCanRead.cxx
+++ b/Testing/Source/DataStructureAndEncodingDefinition/Cxx/TestReaderCanRead.cxx
@@ -22,7 +22,7 @@
 int TestReadCanRead(const char *subdir, const char* filename, bool verbose = false)
 {
   if( verbose )
-  std::cout << "TestReadCanRead: " << filename << std::endl;
+    std::cout << "TestReadCanRead: " << filename << std::endl;
 
   bool b1, b2;
 
@@ -58,7 +58,7 @@ int TestReadCanRead(const char *subdir, const char* filename, bool verbose = fal
     {
     std::cerr << "TestReadCanRead: incompatible result " << filename << std::endl;
     if( b1 )
-    std::cerr << "TestReadCanRead: CanRead was true: " << filename << std::endl;
+      std::cerr << "TestReadCanRead: CanRead was true: " << filename << std::endl;
     //assert( !ret );
     return ret;
     }
diff --git a/Testing/Source/DataStructureAndEncodingDefinition/Cxx/TestReaderSelectedTags.cxx b/Testing/Source/DataStructureAndEncodingDefinition/Cxx/TestReaderSelectedTags.cxx
index 48ffefe85..b1424c06e 100644
--- a/Testing/Source/DataStructureAndEncodingDefinition/Cxx/TestReaderSelectedTags.cxx
+++ b/Testing/Source/DataStructureAndEncodingDefinition/Cxx/TestReaderSelectedTags.cxx
@@ -34,7 +34,7 @@ int TestReadSelectedTags(const char* filename, bool verbose = false)
   if ( !reader.ReadSelectedTags( selectedtags ) )
     {
     if( verbose )
-    std::cerr << "TestReadSelectedTags : Failed to read: " << filename << std::endl;
+      std::cerr << "TestReadSelectedTags : Failed to read: " << filename << std::endl;
     return 1;
     }
 
diff --git a/Testing/Source/DataStructureAndEncodingDefinition/Cxx/TestReaderUpToTag1.cxx b/Testing/Source/DataStructureAndEncodingDefinition/Cxx/TestReaderUpToTag1.cxx
index 4b8a99b27..93ca0da14 100644
--- a/Testing/Source/DataStructureAndEncodingDefinition/Cxx/TestReaderUpToTag1.cxx
+++ b/Testing/Source/DataStructureAndEncodingDefinition/Cxx/TestReaderUpToTag1.cxx
@@ -22,7 +22,7 @@
 static int TestReadUpToTag(const char* filename, bool verbose = false)
 {
   if( verbose )
-  std::cout << "TestRead: " << filename << std::endl;
+    std::cout << "TestRead: " << filename << std::endl;
 
   std::ifstream is( filename, std::ios::binary );
   gdcm::Reader reader;
diff --git a/Testing/Source/DataStructureAndEncodingDefinition/Cxx/TestReaderUpToTag2.cxx b/Testing/Source/DataStructureAndEncodingDefinition/Cxx/TestReaderUpToTag2.cxx
index b6d4f9f23..7eea03b49 100644
--- a/Testing/Source/DataStructureAndEncodingDefinition/Cxx/TestReaderUpToTag2.cxx
+++ b/Testing/Source/DataStructureAndEncodingDefinition/Cxx/TestReaderUpToTag2.cxx
@@ -22,7 +22,7 @@
 static int TestReadUpToTag2(const char* filename, bool verbose = false)
 {
   if( verbose )
-  std::cout << "TestRead: " << filename << std::endl;
+    std::cout << "TestRead: " << filename << std::endl;
 
   std::ifstream is( filename, std::ios::binary );
   gdcm::Reader reader;
diff --git a/Testing/Source/DataStructureAndEncodingDefinition/Cxx/TestWriter.cxx b/Testing/Source/DataStructureAndEncodingDefinition/Cxx/TestWriter.cxx
index 19b1b28bc..38a4dee5a 100644
--- a/Testing/Source/DataStructureAndEncodingDefinition/Cxx/TestWriter.cxx
+++ b/Testing/Source/DataStructureAndEncodingDefinition/Cxx/TestWriter.cxx
@@ -116,7 +116,7 @@ int TestWrite(const char *subdir, const char* filename, bool recursing, bool ver
     size_t size2 = System::FileSize( outfilename.c_str() );
     if( size1 != size2 ) return 1;
     if(verbose)
-    std::cerr << filename << " and " << outfilename << " are identical\n";
+      std::cerr << filename << " and " << outfilename << " are identical\n";
     return 0;
     }
 }
diff --git a/Testing/Source/InformationObjectDefinition/Cxx/TestTableReader.cxx b/Testing/Source/InformationObjectDefinition/Cxx/TestTableReader.cxx
index 3f1529c55..f8ec50568 100644
--- a/Testing/Source/InformationObjectDefinition/Cxx/TestTableReader.cxx
+++ b/Testing/Source/InformationObjectDefinition/Cxx/TestTableReader.cxx
@@ -27,15 +27,15 @@ void TestReadTable(const char *filename, bool dump = false )
 
   const gdcm::Modules &modules = defs.GetModules();
   if(dump)
-  std::cout << modules << std::endl;
+    std::cout << modules << std::endl;
 
   const gdcm::Macros &macros = defs.GetMacros();
   if(dump)
-  std::cout << macros << std::endl;
+    std::cout << macros << std::endl;
 
   const gdcm::IODs &iods = defs.GetIODs();
   if(dump)
-  std::cout << iods << std::endl;
+    std::cout << iods << std::endl;
 }
 
 int TestTableReader(int argc, char *argv[])
diff --git a/Utilities/.clang-tidy b/Utilities/.clang-tidy
index acc2f5795..e0e421556 100644
--- a/Utilities/.clang-tidy
+++ b/Utilities/.clang-tidy
@@ -123,7 +123,6 @@ Checks: '-*,
   -readability-braces-around-statements,
   -readability-static-accessed-through-instance,
   -readability-convert-member-functions-to-static,
-  -readability-misleading-indentation,
   -readability-redundant-member-init,
   -readability-non-const-parameter,
   -readability-inconsistent-declaration-parameter-name,

-----------------------------------------------------------------------

Summary of changes:
 .clang-tidy                                                         | 1 -
 Applications/Cxx/gdcmanon.cxx                                       | 3 ++-
 Applications/Cxx/gdcmtar.cxx                                        | 4 ++--
 Examples/Cxx/DumpADAC.cxx                                           | 2 +-
 Source/DataStructureAndEncodingDefinition/gdcmPDBHeader.cxx         | 2 +-
 Source/MediaStorageAndFileFormat/gdcmJPEG2000Codec.cxx              | 6 +++---
 Source/MediaStorageAndFileFormat/gdcmSplitMosaicFilter.cxx          | 4 ++--
 Source/MessageExchangeDefinition/gdcmBaseQuery.cxx                  | 2 +-
 Source/MessageExchangeDefinition/gdcmCompositeNetworkFunctions.cxx  | 6 +++---
 .../DataStructureAndEncodingDefinition/Cxx/TestAttribute8.cxx       | 2 +-
 .../Source/DataStructureAndEncodingDefinition/Cxx/TestReader.cxx    | 2 +-
 .../DataStructureAndEncodingDefinition/Cxx/TestReaderCanRead.cxx    | 4 ++--
 .../Cxx/TestReaderSelectedTags.cxx                                  | 2 +-
 .../DataStructureAndEncodingDefinition/Cxx/TestReaderUpToTag1.cxx   | 2 +-
 .../DataStructureAndEncodingDefinition/Cxx/TestReaderUpToTag2.cxx   | 2 +-
 .../Source/DataStructureAndEncodingDefinition/Cxx/TestWriter.cxx    | 2 +-
 Testing/Source/InformationObjectDefinition/Cxx/TestTableReader.cxx  | 6 +++---
 Utilities/.clang-tidy                                               | 1 -
 18 files changed, 26 insertions(+), 27 deletions(-)


hooks/post-receive
-- 
Grassroots DICOM