[Gdcm-hackers] gdcm-git:Grassroots DICOM branch master updated. ee82db4a9a692134c38e935d8e02a34fbc534501

[Mathieu M. <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, master has been updated
       via  ee82db4a9a692134c38e935d8e02a34fbc534501 (commit)
       via  6035f8757e0d94af8623c8fafbdc468d13044c89 (commit)
      from  ab04e23b0498870e6225d325065ebbf3aa066b79 (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/ee82db4a9a692134c38e935d8e02a34fbc534501/

commit ee82db4a9a692134c38e935d8e02a34fbc534501
Author: Mathieu Malaterre <mat...@gm...>
Date:   Thu Jan 18 04:16:11 2018 -0500

    Try to remove another warning in clang

diff --git a/Utilities/gdcmcharls/losslesstraits.h b/Utilities/gdcmcharls/losslesstraits.h
index ae1f62a..cddcab6 100644
--- a/Utilities/gdcmcharls/losslesstraits.h
+++ b/Utilities/gdcmcharls/losslesstraits.h
@@ -40,7 +40,7 @@ struct LosslessTraitsImplT
     }

 

 // The following optimalization is implementation-dependent (works on x86 and ARM, see charlstest). 

-#if defined(__clang__)

+#if defined(__clang__) && (__clang_major__ > 7)

      __attribute__((no_sanitize("shift")))

 #endif    

     static inlinehint int32_t ModuloRange(int32_t errorValue)


https://sourceforge.net/p/gdcm/gdcm/ci/6035f8757e0d94af8623c8fafbdc468d13044c89/

commit 6035f8757e0d94af8623c8fafbdc468d13044c89
Author: Victor Derks <vba...@gm...>
Date:   Sat Jan 13 16:37:01 2018 +0100

    Suppress missing override warning in template class with mixed base classes, resolves #39
    
    EncodeScan or DecodeScan will be required by the strategy base class. The override keyword cannot be used as, depending on the base class, only 1 of the 2 functions will become an actual override in the instantiation of the template.

diff --git a/Utilities/gdcmcharls/scan.h b/Utilities/gdcmcharls/scan.h
index e0c52af..afd3a43 100644
--- a/Utilities/gdcmcharls/scan.h
+++ b/Utilities/gdcmcharls/scan.h
@@ -198,9 +198,18 @@ public:
     void InitDefault();

     void InitParams(int32_t t1, int32_t t2, int32_t t3, int32_t nReset);

 

+#if defined(__clang__) && (__clang_major__ > 7)

+#pragma clang diagnostic push

+#pragma clang diagnostic ignored "-Winconsistent-missing-override"

+#endif

+

     size_t EncodeScan(std::unique_ptr<ProcessLine> rawData, ByteStreamInfo& compressedData, void* pvoidCompare);

     void DecodeScan(std::unique_ptr<ProcessLine> rawData, const JlsRect& size, ByteStreamInfo& compressedData, bool bCompare);

 

+#if defined(__clang__) && (__clang_major__ > 7)

+#pragma clang diagnostic pop

+#endif

+

 protected:

     // codec parameters

     TRAITS traits;


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

Summary of changes:
 Utilities/gdcmcharls/losslesstraits.h | 2 +-
 Utilities/gdcmcharls/scan.h           | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
Grassroots DICOM