# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1590502614 -7200
# Node ID f80631f632ad3daed70ecd7dc6518a1e5aef89a4
# Parent  62f83d58a81bed0121dae84b64648f19af7dd0e0
cppcheck, upgrade to Orthanc framework 1.7.0

diff -r 62f83d58a81b -r f80631f632ad Framework/Inputs/DecodedTiledPyramid.h
--- a/Framework/Inputs/DecodedTiledPyramid.h	Tue Apr 21 10:53:23 2020 +0200
+++ b/Framework/Inputs/DecodedTiledPyramid.h	Tue May 26 16:16:54 2020 +0200
@@ -34,7 +34,6 @@
   class DecodedTiledPyramid : public ITiledPyramid
   {
   private:
-    bool     grayscale_;
     uint8_t  backgroundColor_[3];
 
   protected:
diff -r 62f83d58a81b -r f80631f632ad Framework/Jpeg2000Reader.cpp
--- a/Framework/Jpeg2000Reader.cpp	Tue Apr 21 10:53:23 2020 +0200
+++ b/Framework/Jpeg2000Reader.cpp	Tue May 26 16:16:54 2020 +0200
@@ -168,7 +168,7 @@
                              void *userData)
       {
         OpenJpegInput& that = *reinterpret_cast<OpenJpegInput*>(userData);
-        assert(that.position_ >= 0 && that.position_ <= that.size_);
+        assert(that.position_ <= that.size_);
         assert(size >= 0);
 
         if (that.position_ == that.size_)
diff -r 62f83d58a81b -r f80631f632ad Framework/Outputs/MultiframeDicomWriter.cpp
--- a/Framework/Outputs/MultiframeDicomWriter.cpp	Tue Apr 21 10:53:23 2020 +0200
+++ b/Framework/Outputs/MultiframeDicomWriter.cpp	Tue May 26 16:16:54 2020 +0200
@@ -252,7 +252,7 @@
   void MultiframeDicomWriter::Flush(std::string& target,
                                     unsigned int instanceNumber)
   {
-    if (instanceNumber <= 0)
+    if (instanceNumber == 0)
     {
       throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
     }
diff -r 62f83d58a81b -r f80631f632ad NEWS
--- a/NEWS	Tue Apr 21 10:53:23 2020 +0200
+++ b/NEWS	Tue May 26 16:16:54 2020 +0200
@@ -6,6 +6,7 @@
 * Fix issue #139 (OrthancWSIDicomizer PixelSpacing)
 * Fix issue #144 (OrthancWSIDicomizer PhotometricInterpretation)
 * Fix issue #163 (Failure to recognize MIRAX / 3DHISTECH images)
+* Upgrade to Orthanc framework 1.7.0
 
 
 Version 0.6 (2019-01-26)
diff -r 62f83d58a81b -r f80631f632ad Resources/CMake/Version.cmake
--- a/Resources/CMake/Version.cmake	Tue Apr 21 10:53:23 2020 +0200
+++ b/Resources/CMake/Version.cmake	Tue May 26 16:16:54 2020 +0200
@@ -4,7 +4,7 @@
   set(ORTHANC_FRAMEWORK_VERSION "mainline")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg")
 else()
-  set(ORTHANC_FRAMEWORK_VERSION "1.5.2")
+  set(ORTHANC_FRAMEWORK_VERSION "1.7.0")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web")
 endif()
 
diff -r 62f83d58a81b -r f80631f632ad Resources/Orthanc/DownloadOrthancFramework.cmake
--- a/Resources/Orthanc/DownloadOrthancFramework.cmake	Tue Apr 21 10:53:23 2020 +0200
+++ b/Resources/Orthanc/DownloadOrthancFramework.cmake	Tue May 26 16:16:54 2020 +0200
@@ -114,6 +114,10 @@
         set(ORTHANC_FRAMEWORK_MD5 "82323e8c49a667f658a3639ea4dbc336")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.6.0")
         set(ORTHANC_FRAMEWORK_MD5 "eab428d6e53f61e847fa360bb17ebe25")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.6.1")
+        set(ORTHANC_FRAMEWORK_MD5 "3971f5de96ba71dc9d3f3690afeaa7c0")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.7.0")
+        set(ORTHANC_FRAMEWORK_MD5 "ce5f689e852b01d3672bd3d2f952a5ef")
 
       # Below this point are development snapshots that were used to
       # release some plugin, before an official release of the Orthanc
diff -r 62f83d58a81b -r f80631f632ad Resources/SyncOrthancFolder.py
--- a/Resources/SyncOrthancFolder.py	Tue Apr 21 10:53:23 2020 +0200
+++ b/Resources/SyncOrthancFolder.py	Tue May 26 16:16:54 2020 +0200
@@ -12,7 +12,7 @@
 
 TARGET = os.path.join(os.path.dirname(__file__), 'Orthanc')
 PLUGIN_SDK_VERSION = '1.0.0'
-REPOSITORY = 'https://bitbucket.org/sjodogne/orthanc/raw'
+REPOSITORY = 'https://hg.orthanc-server.com/orthanc/raw-file'
 
 FILES = [
     'DownloadOrthancFramework.cmake',