# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1610443296 -3600
# Node ID c35a3a0627b9445f42e9e8342444cbe4d6e4c337
# Parent  02cb86d079661aaee98be5ffc1336581a8551052
cppcheck

diff -r 02cb86d07966 -r c35a3a0627b9 Framework/Algorithms/ReconstructPyramidCommand.h
--- a/Framework/Algorithms/ReconstructPyramidCommand.h	Mon Jan 11 17:12:24 2021 +0100
+++ b/Framework/Algorithms/ReconstructPyramidCommand.h	Tue Jan 12 10:21:36 2021 +0100
@@ -61,7 +61,7 @@
       return shiftTargetLevel_;
     }
 
-    virtual bool Execute();
+    virtual bool Execute() ORTHANC_OVERRIDE;
 
     static void PrepareBagOfTasks(Orthanc::BagOfTasks& tasks,
                                   IPyramidWriter& target,
diff -r 02cb86d07966 -r c35a3a0627b9 Framework/Algorithms/TranscodeTileCommand.h
--- a/Framework/Algorithms/TranscodeTileCommand.h	Mon Jan 11 17:12:24 2021 +0100
+++ b/Framework/Algorithms/TranscodeTileCommand.h	Tue Jan 12 10:21:36 2021 +0100
@@ -49,7 +49,7 @@
                          unsigned int countTilesY,
                          const DicomizerParameters& parameters);
 
-    virtual bool Execute();
+    virtual bool Execute() ORTHANC_OVERRIDE;
 
     static void PrepareBagOfTasks(Orthanc::BagOfTasks& tasks,
                                   IPyramidWriter& target,
diff -r 02cb86d07966 -r c35a3a0627b9 Framework/DicomToolbox.cpp
--- a/Framework/DicomToolbox.cpp	Mon Jan 11 17:12:24 2021 +0100
+++ b/Framework/DicomToolbox.cpp	Tue Jan 12 10:21:36 2021 +0100
@@ -95,7 +95,7 @@
                                        const DcmTagKey& key)
     {
       DcmElement* element = NULL;
-      if (!const_cast<DcmItem&>(dataset).findAndGetElement(key, element).good() ||
+      if (!dataset.findAndGetElement(key, element).good() ||
           element == NULL)
       {
         return NULL;
diff -r 02cb86d07966 -r c35a3a0627b9 Framework/ImageToolbox.cpp
--- a/Framework/ImageToolbox.cpp	Mon Jan 11 17:12:24 2021 +0100
+++ b/Framework/ImageToolbox.cpp	Tue Jan 12 10:21:36 2021 +0100
@@ -50,7 +50,7 @@
     }
 
 
-    void Embed(Orthanc::ImageAccessor& target,
+    void Embed(const Orthanc::ImageAccessor& target,
                const Orthanc::ImageAccessor& source,
                unsigned int x,
                unsigned int y)
diff -r 02cb86d07966 -r c35a3a0627b9 Framework/ImageToolbox.h
--- a/Framework/ImageToolbox.h	Mon Jan 11 17:12:24 2021 +0100
+++ b/Framework/ImageToolbox.h	Tue Jan 12 10:21:36 2021 +0100
@@ -35,12 +35,12 @@
                                      unsigned int width,
                                      unsigned int height);
 
-    void Embed(Orthanc::ImageAccessor& target,
+    void Embed(const Orthanc::ImageAccessor& target,
                const Orthanc::ImageAccessor& source,
                unsigned int x,
                unsigned int y);
 
-    inline void Copy(Orthanc::ImageAccessor& target,
+    inline void Copy(const Orthanc::ImageAccessor& target,
                      const Orthanc::ImageAccessor& source)
     {
       Embed(target, source, 0, 0);
diff -r 02cb86d07966 -r c35a3a0627b9 Framework/Inputs/DecodedTiledPyramid.h
--- a/Framework/Inputs/DecodedTiledPyramid.h	Mon Jan 11 17:12:24 2021 +0100
+++ b/Framework/Inputs/DecodedTiledPyramid.h	Tue Jan 12 10:21:36 2021 +0100
@@ -58,13 +58,13 @@
 
     virtual Orthanc::ImageAccessor* DecodeTile(unsigned int level,
                                                unsigned int tileX,
-                                               unsigned int tileY);
+                                               unsigned int tileY) ORTHANC_OVERRIDE;
 
     virtual bool ReadRawTile(std::string& tile,
                              ImageCompression& compression,
                              unsigned int level,
                              unsigned int tileX,
-                             unsigned int tileY)
+                             unsigned int tileY) ORTHANC_OVERRIDE
     {
       return false;   // No access to the raw tiles
     }
diff -r 02cb86d07966 -r c35a3a0627b9 Framework/Inputs/DicomPyramid.h
--- a/Framework/Inputs/DicomPyramid.h	Mon Jan 11 17:12:24 2021 +0100
+++ b/Framework/Inputs/DicomPyramid.h	Tue Jan 12 10:21:36 2021 +0100
@@ -61,27 +61,27 @@
       return seriesId_;
     }
 
-    virtual unsigned int GetLevelCount() const
+    virtual unsigned int GetLevelCount() const ORTHANC_OVERRIDE
     {
       return levels_.size();
     }
 
-    virtual unsigned int GetLevelWidth(unsigned int level) const;
+    virtual unsigned int GetLevelWidth(unsigned int level) const ORTHANC_OVERRIDE;
 
-    virtual unsigned int GetLevelHeight(unsigned int level) const;
+    virtual unsigned int GetLevelHeight(unsigned int level) const ORTHANC_OVERRIDE;
 
-    virtual unsigned int GetTileWidth() const;
+    virtual unsigned int GetTileWidth() const ORTHANC_OVERRIDE;
 
-    virtual unsigned int GetTileHeight() const;
+    virtual unsigned int GetTileHeight() const ORTHANC_OVERRIDE;
 
     virtual bool ReadRawTile(std::string& tile,
                              ImageCompression& compression,
                              unsigned int level,
                              unsigned int tileX,
-                             unsigned int tileY);
+                             unsigned int tileY) ORTHANC_OVERRIDE;
 
-    virtual Orthanc::PixelFormat GetPixelFormat() const;
+    virtual Orthanc::PixelFormat GetPixelFormat() const ORTHANC_OVERRIDE;
 
-    virtual Orthanc::PhotometricInterpretation GetPhotometricInterpretation() const;
+    virtual Orthanc::PhotometricInterpretation GetPhotometricInterpretation() const ORTHANC_OVERRIDE;
   };
 }
diff -r 02cb86d07966 -r c35a3a0627b9 Framework/Inputs/DicomPyramidInstance.cpp
--- a/Framework/Inputs/DicomPyramidInstance.cpp	Mon Jan 11 17:12:24 2021 +0100
+++ b/Framework/Inputs/DicomPyramidInstance.cpp	Tue Jan 12 10:21:36 2021 +0100
@@ -79,7 +79,7 @@
 
   static void DetectPixelFormat(Orthanc::PixelFormat& format,
                                 Orthanc::PhotometricInterpretation& photometric,
-                                OrthancStone::DicomDatasetReader& reader)
+                                const OrthancStone::DicomDatasetReader& reader)
   {
     using namespace OrthancStone;
 
diff -r 02cb86d07966 -r c35a3a0627b9 Framework/Inputs/HierarchicalTiff.h
--- a/Framework/Inputs/HierarchicalTiff.h	Mon Jan 11 17:12:24 2021 +0100
+++ b/Framework/Inputs/HierarchicalTiff.h	Tue Jan 12 10:21:36 2021 +0100
@@ -77,21 +77,21 @@
       Finalize();
     }
 
-    virtual unsigned int GetLevelCount() const
+    virtual unsigned int GetLevelCount() const ORTHANC_OVERRIDE
     {
       return levels_.size();
     }
 
-    virtual unsigned int GetLevelWidth(unsigned int level) const;
+    virtual unsigned int GetLevelWidth(unsigned int level) const ORTHANC_OVERRIDE;
 
-    virtual unsigned int GetLevelHeight(unsigned int level) const;
+    virtual unsigned int GetLevelHeight(unsigned int level) const ORTHANC_OVERRIDE;
 
-    virtual unsigned int GetTileWidth() const
+    virtual unsigned int GetTileWidth() const ORTHANC_OVERRIDE
     {
       return tileWidth_;
     }
 
-    virtual unsigned int GetTileHeight() const
+    virtual unsigned int GetTileHeight() const ORTHANC_OVERRIDE
     {
       return tileHeight_;
     }
@@ -100,14 +100,14 @@
                              ImageCompression& compression,
                              unsigned int level,
                              unsigned int tileX,
-                             unsigned int tileY);
+                             unsigned int tileY) ORTHANC_OVERRIDE;
 
-    virtual Orthanc::PixelFormat GetPixelFormat() const
+    virtual Orthanc::PixelFormat GetPixelFormat() const ORTHANC_OVERRIDE
     {
       return pixelFormat_;
     }
 
-    virtual Orthanc::PhotometricInterpretation GetPhotometricInterpretation() const
+    virtual Orthanc::PhotometricInterpretation GetPhotometricInterpretation() const ORTHANC_OVERRIDE
     {
       return photometric_;
     }
diff -r 02cb86d07966 -r c35a3a0627b9 Framework/Inputs/ITiledPyramid.h
--- a/Framework/Inputs/ITiledPyramid.h	Mon Jan 11 17:12:24 2021 +0100
+++ b/Framework/Inputs/ITiledPyramid.h	Tue Jan 12 10:21:36 2021 +0100
@@ -23,6 +23,7 @@
 
 #include "../Enumerations.h"
 
+#include <Compatibility.h>
 #include <Images/ImageAccessor.h>
 
 #include <boost/noncopyable.hpp>
diff -r 02cb86d07966 -r c35a3a0627b9 Framework/Inputs/OpenSlidePyramid.h
--- a/Framework/Inputs/OpenSlidePyramid.h	Mon Jan 11 17:12:24 2021 +0100
+++ b/Framework/Inputs/OpenSlidePyramid.h	Tue Jan 12 10:21:36 2021 +0100
@@ -37,44 +37,44 @@
     virtual void ReadRegion(Orthanc::ImageAccessor& target,
                             unsigned int level,
                             unsigned int x,
-                            unsigned int y);
+                            unsigned int y) ORTHANC_OVERRIDE;
 
   public:
     OpenSlidePyramid(const std::string& path,
                      unsigned int tileWidth,
                      unsigned int tileHeight);
 
-    virtual unsigned int GetTileWidth() const
+    virtual unsigned int GetTileWidth() const ORTHANC_OVERRIDE
     {
       return tileWidth_;
     }
 
-    virtual unsigned int GetTileHeight() const
+    virtual unsigned int GetTileHeight() const ORTHANC_OVERRIDE
     {
       return tileHeight_;
     }
 
-    virtual unsigned int GetLevelCount() const
+    virtual unsigned int GetLevelCount() const ORTHANC_OVERRIDE
     {
       return image_.GetLevelCount();
     }
 
-    virtual unsigned int GetLevelWidth(unsigned int level) const
+    virtual unsigned int GetLevelWidth(unsigned int level) const ORTHANC_OVERRIDE
     {
       return image_.GetLevelWidth(level);
     }
 
-    virtual unsigned int GetLevelHeight(unsigned int level) const
+    virtual unsigned int GetLevelHeight(unsigned int level) const ORTHANC_OVERRIDE
     {
       return image_.GetLevelHeight(level);
     }
 
-    virtual Orthanc::PixelFormat GetPixelFormat() const
+    virtual Orthanc::PixelFormat GetPixelFormat() const ORTHANC_OVERRIDE
     {
       return Orthanc::PixelFormat_RGB24;
     }
 
-    virtual Orthanc::PhotometricInterpretation GetPhotometricInterpretation() const
+    virtual Orthanc::PhotometricInterpretation GetPhotometricInterpretation() const ORTHANC_OVERRIDE
     {
       return Orthanc::PhotometricInterpretation_RGB;
     }
diff -r 02cb86d07966 -r c35a3a0627b9 Framework/Inputs/PyramidWithRawTiles.h
--- a/Framework/Inputs/PyramidWithRawTiles.h	Mon Jan 11 17:12:24 2021 +0100
+++ b/Framework/Inputs/PyramidWithRawTiles.h	Tue Jan 12 10:21:36 2021 +0100
@@ -30,6 +30,6 @@
   public:
     virtual Orthanc::ImageAccessor* DecodeTile(unsigned int level,
                                                unsigned int tileX,
-                                               unsigned int tileY);
+                                               unsigned int tileY) ORTHANC_OVERRIDE;
   };
 }
diff -r 02cb86d07966 -r c35a3a0627b9 Framework/Inputs/SingleLevelDecodedPyramid.h
--- a/Framework/Inputs/SingleLevelDecodedPyramid.h	Mon Jan 11 17:12:24 2021 +0100
+++ b/Framework/Inputs/SingleLevelDecodedPyramid.h	Tue Jan 12 10:21:36 2021 +0100
@@ -41,7 +41,7 @@
     virtual void ReadRegion(Orthanc::ImageAccessor& target,
                             unsigned int level,
                             unsigned int x,
-                            unsigned int y);
+                            unsigned int y) ORTHANC_OVERRIDE;
 
   public:
     SingleLevelDecodedPyramid(unsigned int tileWidth,
@@ -51,30 +51,30 @@
     {
     }
 
-    virtual unsigned int GetTileWidth() const
+    virtual unsigned int GetTileWidth() const ORTHANC_OVERRIDE
     {
       return tileWidth_;
     }
 
-    virtual unsigned int GetTileHeight() const
+    virtual unsigned int GetTileHeight() const ORTHANC_OVERRIDE
     {
       return tileHeight_;
     }
 
-    virtual unsigned int GetLevelCount() const
+    virtual unsigned int GetLevelCount() const ORTHANC_OVERRIDE
     {
       return 1;
     }
 
-    virtual unsigned int GetLevelWidth(unsigned int level) const;
+    virtual unsigned int GetLevelWidth(unsigned int level) const ORTHANC_OVERRIDE;
 
-    virtual unsigned int GetLevelHeight(unsigned int level) const;
+    virtual unsigned int GetLevelHeight(unsigned int level) const ORTHANC_OVERRIDE;
 
-    virtual Orthanc::PixelFormat GetPixelFormat() const
+    virtual Orthanc::PixelFormat GetPixelFormat() const ORTHANC_OVERRIDE
     {
       return image_.GetFormat();
     }
 
-    virtual Orthanc::PhotometricInterpretation GetPhotometricInterpretation() const;
+    virtual Orthanc::PhotometricInterpretation GetPhotometricInterpretation() const ORTHANC_OVERRIDE;
   };
 }
diff -r 02cb86d07966 -r c35a3a0627b9 Framework/Inputs/TiledPyramidStatistics.h
--- a/Framework/Inputs/TiledPyramidStatistics.h	Mon Jan 11 17:12:24 2021 +0100
+++ b/Framework/Inputs/TiledPyramidStatistics.h	Tue Jan 12 10:21:36 2021 +0100
@@ -40,32 +40,32 @@
 
     virtual ~TiledPyramidStatistics();
 
-    virtual unsigned int GetLevelCount() const
+    virtual unsigned int GetLevelCount() const ORTHANC_OVERRIDE
     {
       return source_.GetLevelCount();
     }
 
-    virtual unsigned int GetLevelWidth(unsigned int level)  const
+    virtual unsigned int GetLevelWidth(unsigned int level)  const ORTHANC_OVERRIDE
     {
       return source_.GetLevelWidth(level);
     }
 
-    virtual unsigned int GetLevelHeight(unsigned int level) const
+    virtual unsigned int GetLevelHeight(unsigned int level) const ORTHANC_OVERRIDE
     {
       return source_.GetLevelHeight(level);
     }
 
-    virtual unsigned int GetTileWidth() const
+    virtual unsigned int GetTileWidth() const ORTHANC_OVERRIDE
     {
       return source_.GetTileWidth();
     }
     
-    virtual unsigned int GetTileHeight() const
+    virtual unsigned int GetTileHeight() const ORTHANC_OVERRIDE
     {
       return source_.GetTileHeight();
     }
 
-    virtual Orthanc::PixelFormat GetPixelFormat() const
+    virtual Orthanc::PixelFormat GetPixelFormat() const ORTHANC_OVERRIDE
     {
       return source_.GetPixelFormat();
     }
@@ -74,13 +74,13 @@
                              ImageCompression& compression,
                              unsigned int level,
                              unsigned int tileX,
-                             unsigned int tileY);
+                             unsigned int tileY) ORTHANC_OVERRIDE;
 
     virtual Orthanc::ImageAccessor* DecodeTile(unsigned int level,
                                                unsigned int tileX,
-                                               unsigned int tileY);
+                                               unsigned int tileY) ORTHANC_OVERRIDE;
 
-    virtual Orthanc::PhotometricInterpretation GetPhotometricInterpretation() const
+    virtual Orthanc::PhotometricInterpretation GetPhotometricInterpretation() const ORTHANC_OVERRIDE
     {
       return source_.GetPhotometricInterpretation();
     }
diff -r 02cb86d07966 -r c35a3a0627b9 Framework/Jpeg2000Writer.h
--- a/Framework/Jpeg2000Writer.h	Mon Jan 11 17:12:24 2021 +0100
+++ b/Framework/Jpeg2000Writer.h	Tue Jan 12 10:21:36 2021 +0100
@@ -21,6 +21,7 @@
 
 #pragma once
 
+#include <Compatibility.h>
 #include <Images/IImageWriter.h>
 
 namespace OrthancWSI
@@ -33,7 +34,7 @@
                                        unsigned int height,
                                        unsigned int pitch,
                                        Orthanc::PixelFormat format,
-                                       const void* buffer);
+                                       const void* buffer) ORTHANC_OVERRIDE;
 
   private:
     bool  isLossless_;
diff -r 02cb86d07966 -r c35a3a0627b9 Framework/MultiThreading/BagOfTasksProcessor.h
--- a/Framework/MultiThreading/BagOfTasksProcessor.h	Mon Jan 11 17:12:24 2021 +0100
+++ b/Framework/MultiThreading/BagOfTasksProcessor.h	Tue Jan 12 10:21:36 2021 +0100
@@ -106,7 +106,8 @@
              bool empty) : 
         that_(that),
         bag_(bag),
-        hasJoined_(empty)
+        hasJoined_(empty),
+        status_(false)
       {
       }
 
diff -r 02cb86d07966 -r c35a3a0627b9 Framework/Outputs/DicomPyramidWriter.h
--- a/Framework/Outputs/DicomPyramidWriter.h	Mon Jan 11 17:12:24 2021 +0100
+++ b/Framework/Outputs/DicomPyramidWriter.h	Tue Jan 12 10:21:36 2021 +0100
@@ -57,9 +57,9 @@
     virtual void WriteRawTileInternal(const std::string& tile,
                                       const Level& level,
                                       unsigned int x,
-                                      unsigned int y);
+                                      unsigned int y) ORTHANC_OVERRIDE;
 
-    virtual void AddLevelInternal(const Level& level)
+    virtual void AddLevelInternal(const Level& level) ORTHANC_OVERRIDE
     {
     }
 
@@ -76,6 +76,6 @@
 
     virtual ~DicomPyramidWriter();
 
-    virtual void Flush();
+    virtual void Flush() ORTHANC_OVERRIDE;
   };
 }
diff -r 02cb86d07966 -r c35a3a0627b9 Framework/Outputs/HierarchicalTiffWriter.h
--- a/Framework/Outputs/HierarchicalTiffWriter.h	Mon Jan 11 17:12:24 2021 +0100
+++ b/Framework/Outputs/HierarchicalTiffWriter.h	Tue Jan 12 10:21:36 2021 +0100
@@ -69,9 +69,9 @@
     virtual void WriteRawTileInternal(const std::string& tile,
                                       const Level& level,
                                       unsigned int tileX,
-                                      unsigned int tileY);
+                                      unsigned int tileY) ORTHANC_OVERRIDE;
         
-    virtual void AddLevelInternal(const Level& level);
+    virtual void AddLevelInternal(const Level& level) ORTHANC_OVERRIDE;
 
 
   public:
@@ -84,6 +84,6 @@
 
     virtual ~HierarchicalTiffWriter();
 
-    virtual void Flush();
+    virtual void Flush() ORTHANC_OVERRIDE;
   };
 }
diff -r 02cb86d07966 -r c35a3a0627b9 Framework/Outputs/InMemoryTiledImage.h
--- a/Framework/Outputs/InMemoryTiledImage.h	Mon Jan 11 17:12:24 2021 +0100
+++ b/Framework/Outputs/InMemoryTiledImage.h	Tue Jan 12 10:21:36 2021 +0100
@@ -56,25 +56,25 @@
 
     virtual ~InMemoryTiledImage();
 
-    virtual unsigned int GetLevelCount() const
+    virtual unsigned int GetLevelCount() const ORTHANC_OVERRIDE
     {
       return 1;
     }
 
-    virtual unsigned int GetCountTilesX(unsigned int level) const;
+    virtual unsigned int GetCountTilesX(unsigned int level) const ORTHANC_OVERRIDE;
 
-    virtual unsigned int GetCountTilesY(unsigned int level) const;
+    virtual unsigned int GetCountTilesY(unsigned int level) const ORTHANC_OVERRIDE;
 
-    virtual unsigned int GetLevelWidth(unsigned int level) const;
+    virtual unsigned int GetLevelWidth(unsigned int level) const ORTHANC_OVERRIDE;
 
-    virtual unsigned int GetLevelHeight(unsigned int level) const;
+    virtual unsigned int GetLevelHeight(unsigned int level) const ORTHANC_OVERRIDE;
 
-    virtual unsigned int GetTileWidth() const
+    virtual unsigned int GetTileWidth() const ORTHANC_OVERRIDE
     {
       return tileWidth_;
     }
 
-    virtual unsigned int GetTileHeight() const
+    virtual unsigned int GetTileHeight() const ORTHANC_OVERRIDE
     {
       return tileHeight_;
     }
@@ -83,13 +83,13 @@
                              ImageCompression& compression,
                              unsigned int level,
                              unsigned int tileX,
-                             unsigned int tileY);
+                             unsigned int tileY) ORTHANC_OVERRIDE;
 
     virtual Orthanc::ImageAccessor* DecodeTile(unsigned int level,
                                                unsigned int tileX,
-                                               unsigned int tileY);
+                                               unsigned int tileY) ORTHANC_OVERRIDE;
 
-    virtual Orthanc::PixelFormat GetPixelFormat() const
+    virtual Orthanc::PixelFormat GetPixelFormat() const ORTHANC_OVERRIDE
     {
       return format_;
     }
@@ -98,14 +98,14 @@
                               ImageCompression compression,
                               unsigned int level,
                               unsigned int tileX,
-                              unsigned int tileY);
+                              unsigned int tileY) ORTHANC_OVERRIDE;
 
     virtual void EncodeTile(const Orthanc::ImageAccessor& tile,
                             unsigned int level,
                             unsigned int tileX,
-                            unsigned int tileY);
+                            unsigned int tileY) ORTHANC_OVERRIDE;
 
-    virtual Orthanc::PhotometricInterpretation GetPhotometricInterpretation() const
+    virtual Orthanc::PhotometricInterpretation GetPhotometricInterpretation() const ORTHANC_OVERRIDE
     {
       return photometric_;
     }
diff -r 02cb86d07966 -r c35a3a0627b9 Framework/Outputs/PyramidWriterBase.h
--- a/Framework/Outputs/PyramidWriterBase.h	Mon Jan 11 17:12:24 2021 +0100
+++ b/Framework/Outputs/PyramidWriterBase.h	Tue Jan 12 10:21:36 2021 +0100
@@ -74,30 +74,30 @@
 
     void SetJpegQuality(int quality);
 
-    virtual void AddLevel(unsigned int width,
-                          unsigned int height);
-
-    virtual unsigned int GetTileWidth() const
+    void AddLevel(unsigned int width,
+                  unsigned int height);
+    
+    virtual unsigned int GetTileWidth() const ORTHANC_OVERRIDE
     {
       return tileWidth_;
     }
 
-    virtual unsigned int GetTileHeight() const 
+    virtual unsigned int GetTileHeight() const ORTHANC_OVERRIDE
     {
       return tileHeight_;
     }
 
-    virtual unsigned int GetCountTilesX(unsigned int level) const
+    virtual unsigned int GetCountTilesX(unsigned int level) const ORTHANC_OVERRIDE
     {
       return GetLevel(level).countTilesX_;
     }
 
-    virtual unsigned int GetCountTilesY(unsigned int level) const
+    virtual unsigned int GetCountTilesY(unsigned int level) const ORTHANC_OVERRIDE
     {
       return GetLevel(level).countTilesY_;
     }
 
-    virtual unsigned int GetLevelCount() const;
+    virtual unsigned int GetLevelCount() const ORTHANC_OVERRIDE;
 
     ImageCompression GetImageCompression() const
     {
@@ -108,14 +108,14 @@
                               ImageCompression compression,
                               unsigned int z,
                               unsigned int tileX,
-                              unsigned int tileY);
+                              unsigned int tileY) ORTHANC_OVERRIDE;
 
     virtual void EncodeTile(const Orthanc::ImageAccessor& tile,
                             unsigned int z,
                             unsigned int tileX, 
-                            unsigned int tileY);
+                            unsigned int tileY) ORTHANC_OVERRIDE;
 
-    virtual Orthanc::PixelFormat GetPixelFormat() const
+    virtual Orthanc::PixelFormat GetPixelFormat() const ORTHANC_OVERRIDE
     {
       return pixelFormat_;
     }
diff -r 02cb86d07966 -r c35a3a0627b9 Framework/Outputs/TruncatedPyramidWriter.h
--- a/Framework/Outputs/TruncatedPyramidWriter.h	Mon Jan 11 17:12:24 2021 +0100
+++ b/Framework/Outputs/TruncatedPyramidWriter.h	Tue Jan 12 10:21:36 2021 +0100
@@ -37,40 +37,40 @@
                            unsigned int upperLevelIndex,
                            Orthanc::PhotometricInterpretation photometric);
 
-    virtual unsigned int GetLevelCount() const
+    virtual unsigned int GetLevelCount() const ORTHANC_OVERRIDE
     {
       return upperLevelIndex_ + 1;
     }
 
-    virtual Orthanc::PixelFormat GetPixelFormat() const 
+    virtual Orthanc::PixelFormat GetPixelFormat() const ORTHANC_OVERRIDE
     {
       return lowerLevels_.GetPixelFormat();
     }
 
-    virtual unsigned int GetTileWidth() const
+    virtual unsigned int GetTileWidth() const ORTHANC_OVERRIDE
     {
       return lowerLevels_.GetTileWidth();
     }
 
-    virtual unsigned int GetTileHeight() const 
+    virtual unsigned int GetTileHeight() const ORTHANC_OVERRIDE
     {
       return lowerLevels_.GetTileHeight();
     }
 
-    virtual unsigned int GetCountTilesX(unsigned int level) const;
+    virtual unsigned int GetCountTilesX(unsigned int level) const ORTHANC_OVERRIDE;
 
-    virtual unsigned int GetCountTilesY(unsigned int level) const;
+    virtual unsigned int GetCountTilesY(unsigned int level) const ORTHANC_OVERRIDE;
 
     virtual void WriteRawTile(const std::string& tile,
                               ImageCompression compression,
                               unsigned int level,
                               unsigned int x,
-                              unsigned int y);
+                              unsigned int y) ORTHANC_OVERRIDE;
 
     virtual void EncodeTile(const Orthanc::ImageAccessor& tile,
                             unsigned int level,
                             unsigned int x, 
-                            unsigned int y);
+                            unsigned int y) ORTHANC_OVERRIDE;
 
     InMemoryTiledImage& GetUpperLevel()
     {
diff -r 02cb86d07966 -r c35a3a0627b9 Framework/Targets/FolderTarget.h
--- a/Framework/Targets/FolderTarget.h	Mon Jan 11 17:12:24 2021 +0100
+++ b/Framework/Targets/FolderTarget.h	Tue Jan 12 10:21:36 2021 +0100
@@ -23,6 +23,8 @@
 
 #include "IFileTarget.h"
 
+#include <Compatibility.h>
+
 #include <boost/thread.hpp>
 
 namespace OrthancWSI
@@ -41,6 +43,6 @@
     {
     }
 
-    virtual void Write(const std::string& file);
+    virtual void Write(const std::string& file) ORTHANC_OVERRIDE;
   };
 }
diff -r 02cb86d07966 -r c35a3a0627b9 Framework/Targets/OrthancTarget.h
--- a/Framework/Targets/OrthancTarget.h	Mon Jan 11 17:12:24 2021 +0100
+++ b/Framework/Targets/OrthancTarget.h	Tue Jan 12 10:21:36 2021 +0100
@@ -46,6 +46,6 @@
     {
     }
 
-    virtual void Write(const std::string& file);
+    virtual void Write(const std::string& file) ORTHANC_OVERRIDE;
   };
 }
diff -r 02cb86d07966 -r c35a3a0627b9 ViewerPlugin/OrthancPluginConnection.h
--- a/ViewerPlugin/OrthancPluginConnection.h	Mon Jan 11 17:12:24 2021 +0100
+++ b/ViewerPlugin/OrthancPluginConnection.h	Tue Jan 12 10:21:36 2021 +0100
@@ -23,6 +23,8 @@
 
 #include "../Resources/Orthanc/Stone/IOrthancConnection.h"
 
+#include <Compatibility.h>
+
 #include <orthanc/OrthancCPlugin.h>
 
 namespace OrthancWSI
@@ -36,16 +38,16 @@
   {
   public:
     virtual void RestApiGet(std::string& result,
-                            const std::string& uri);
+                            const std::string& uri) ORTHANC_OVERRIDE;
 
     virtual void RestApiPost(std::string& result,
                              const std::string& uri,
-                             const std::string& body);
+                             const std::string& body) ORTHANC_OVERRIDE;
 
     virtual void RestApiPut(std::string& result,
                             const std::string& uri,
-                            const std::string& body);
+                            const std::string& body) ORTHANC_OVERRIDE;
 
-    virtual void RestApiDelete(const std::string& uri);
+    virtual void RestApiDelete(const std::string& uri) ORTHANC_OVERRIDE;
   };
 }