# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1607610234 -3600
# Node ID 4b80ddccec54bf2178090706a4de47cd23b71363
# Parent  0f5c02eebe2022c61d4218aaf17231b496735a00
sync, cppcheck

diff -r 0f5c02eebe20 -r 4b80ddccec54 CMakeLists.txt
--- a/CMakeLists.txt	Fri Nov 06 17:34:21 2020 +0100
+++ b/CMakeLists.txt	Thu Dec 10 15:23:54 2020 +0100
@@ -27,7 +27,7 @@
   set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg")
 else()
-  set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.7.2")
+  set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.8.1")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web")
 endif()
 
diff -r 0f5c02eebe20 -r 4b80ddccec54 NEWS
--- a/NEWS	Fri Nov 06 17:34:21 2020 +0100
+++ b/NEWS	Thu Dec 10 15:23:54 2020 +0100
@@ -2,7 +2,7 @@
 ===============================
 
 * Support of dynamic linking against the system-wide Orthanc framework library
-* Upgrade to Orthanc framework 1.7.2
+* Upgrade to Orthanc framework 1.8.1
 
 
 Version 2.6 (2020-05-26)
diff -r 0f5c02eebe20 -r 4b80ddccec54 Plugin/SeriesInformationAdapter.h
--- a/Plugin/SeriesInformationAdapter.h	Fri Nov 06 17:34:21 2020 +0100
+++ b/Plugin/SeriesInformationAdapter.h	Thu Dec 10 15:23:54 2020 +0100
@@ -43,6 +43,6 @@
     }
 
     virtual bool Create(std::string& content,
-                        const std::string& seriesId);
+                        const std::string& seriesId) ORTHANC_OVERRIDE;
   };
 }
diff -r 0f5c02eebe20 -r 4b80ddccec54 Plugin/ViewerPrefetchPolicy.h
--- a/Plugin/ViewerPrefetchPolicy.h	Fri Nov 06 17:34:21 2020 +0100
+++ b/Plugin/ViewerPrefetchPolicy.h	Thu Dec 10 15:23:54 2020 +0100
@@ -23,6 +23,8 @@
 
 #include "Cache/IPrefetchPolicy.h"
 
+#include <Compatibility.h>
+
 #include <orthanc/OrthancCPlugin.h>
 
 namespace OrthancPlugins
@@ -50,6 +52,6 @@
     virtual void Apply(std::list<CacheIndex>& toPrefetch,
                        CacheScheduler& cache,
                        const CacheIndex& accessed,
-                       const std::string& content);
+                       const std::string& content) ORTHANC_OVERRIDE;
   };
 }
diff -r 0f5c02eebe20 -r 4b80ddccec54 Resources/Orthanc/CMake/DownloadOrthancFramework.cmake
--- a/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake	Fri Nov 06 17:34:21 2020 +0100
+++ b/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake	Thu Dec 10 15:23:54 2020 +0100
@@ -118,6 +118,8 @@
         set(ORTHANC_FRAMEWORK_MD5 "19fcb7c21876af86546baa048a22c6c0")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.8.0")
         set(ORTHANC_FRAMEWORK_MD5 "f8ec7554ef5d23ea4ce474b1e8214de9")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.8.1")
+        set(ORTHANC_FRAMEWORK_MD5 "db094f96399cbe8b9bbdbce34884c220")
 
       # Below this point are development snapshots that were used to
       # release some plugin, before an official release of the Orthanc
@@ -129,6 +131,9 @@
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "ae0e3fd609df")
         # DICOMweb 1.1 (framework pre-1.6.0)
         set(ORTHANC_FRAMEWORK_MD5 "7e09e9b530a2f527854f0b782d7e0645")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "82652c5fc04f")
+        # Stone Web viewer 1.0 (framework pre-1.8.1)
+        set(ORTHANC_FRAMEWORK_MD5 "d77331d68917e66a3f4f9b807bbdab7f")
       endif()
     endif()
   endif()
diff -r 0f5c02eebe20 -r 4b80ddccec54 UnitTestsSources/UnitTestsMain.cpp
--- a/UnitTestsSources/UnitTestsMain.cpp	Fri Nov 06 17:34:21 2020 +0100
+++ b/UnitTestsSources/UnitTestsMain.cpp	Thu Dec 10 15:23:54 2020 +0100
@@ -90,7 +90,7 @@
   }
 
   virtual bool Create(std::string& content,
-                      const std::string& key)
+                      const std::string& key) ORTHANC_OVERRIDE
   {
     content = "Bundle " + boost::lexical_cast<std::string>(bundle_) + ", item " + key;
     return true;