# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1725086401 -7200
# Node ID f68f9a8d0d633b5f07470416ec67d021dc49f673
# Parent  82b8f1a3dafd14384a2e517f41006ecb4d223356# Parent  02a06434833cbf7e2f02e4482f157084a8e01438
integration mainline->dicom-sr

diff -r 82b8f1a3dafd -r f68f9a8d0d63 Applications/Resources/RunCppCheck.sh
--- a/Applications/Resources/RunCppCheck.sh	Fri Aug 30 18:51:21 2024 +0200
+++ b/Applications/Resources/RunCppCheck.sh	Sat Aug 31 08:40:01 2024 +0200
@@ -29,10 +29,12 @@
 fi
 
 cat <<EOF > /tmp/cppcheck-suppressions.txt
+assertWithSideEffect:../../OrthancStone/Sources/Loaders/OrthancMultiframeVolumeLoader.cpp:341
+assertWithSideEffect:../../OrthancStone/Sources/Loaders/OrthancMultiframeVolumeLoader.cpp:342
 constParameter:../../RenderingPlugin/Sources/Plugin.cpp:778
 stlFindInsert:../../Applications/Samples/WebAssembly/SingleFrameViewer/SingleFrameViewerApplication.h
-stlFindInsert:../../Applications/StoneWebViewer/WebAssembly/StoneWebViewer.cpp:1166
-stlFindInsert:../../Applications/StoneWebViewer/WebAssembly/StoneWebViewer.cpp:523
+stlFindInsert:../../Applications/StoneWebViewer/WebAssembly/StoneWebViewer.cpp:1245
+stlFindInsert:../../Applications/StoneWebViewer/WebAssembly/StoneWebViewer.cpp:601
 unpreciseMathCall:../../OrthancStone/Sources/Scene2D/Internals/CairoFloatTextureRenderer.cpp
 unpreciseMathCall:../../OrthancStone/Sources/Scene2D/LookupTableTextureSceneLayer.cpp
 unreadVariable:../../OrthancStone/Sources/Platforms/Sdl/SdlViewport.cpp:159
diff -r 82b8f1a3dafd -r f68f9a8d0d63 Applications/Samples/RtViewerPlugin/CMakeLists.txt
--- a/Applications/Samples/RtViewerPlugin/CMakeLists.txt	Fri Aug 30 18:51:21 2024 +0200
+++ b/Applications/Samples/RtViewerPlugin/CMakeLists.txt	Sat Aug 31 08:40:01 2024 +0200
@@ -28,7 +28,7 @@
   set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg")
 else()
-  set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.11.2")
+  set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.12.4")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web")
 endif()
 
diff -r 82b8f1a3dafd -r f68f9a8d0d63 Applications/Samples/WebAssembly/CMakeLists.txt
--- a/Applications/Samples/WebAssembly/CMakeLists.txt	Fri Aug 30 18:51:21 2024 +0200
+++ b/Applications/Samples/WebAssembly/CMakeLists.txt	Sat Aug 31 08:40:01 2024 +0200
@@ -29,7 +29,7 @@
   set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg")
 else()
-  set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.11.2")
+  set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.12.4")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web")
 endif()
 
diff -r 82b8f1a3dafd -r f68f9a8d0d63 Applications/StoneWebViewer/NEWS
--- a/Applications/StoneWebViewer/NEWS	Fri Aug 30 18:51:21 2024 +0200
+++ b/Applications/StoneWebViewer/NEWS	Sat Aug 31 08:40:01 2024 +0200
@@ -1,6 +1,10 @@
 Pending changes in the mainline
 ===============================
 
+
+Version 2.6 (2024-08-31)
+========================
+
 * New button "Stretch to whole range" in the "Change windowing" menu
 
 Maintenance
diff -r 82b8f1a3dafd -r f68f9a8d0d63 Applications/StoneWebViewer/Version.cmake
--- a/Applications/StoneWebViewer/Version.cmake	Fri Aug 30 18:51:21 2024 +0200
+++ b/Applications/StoneWebViewer/Version.cmake	Sat Aug 31 08:40:01 2024 +0200
@@ -24,6 +24,6 @@
   set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg")
 else()
-  set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.11.2")
+  set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.12.4")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web")
 endif()
diff -r 82b8f1a3dafd -r f68f9a8d0d63 Applications/StoneWebViewer/WebAssembly/StoneWebViewer.cpp
--- a/Applications/StoneWebViewer/WebAssembly/StoneWebViewer.cpp	Fri Aug 30 18:51:21 2024 +0200
+++ b/Applications/StoneWebViewer/WebAssembly/StoneWebViewer.cpp	Sat Aug 31 08:40:01 2024 +0200
@@ -253,7 +253,7 @@
   std::unique_ptr<OrthancStone::SortedFrames>  frames_;
 
 public:
-  SortedFramesCollection(OrthancStone::SortedFrames* frames)
+  explicit SortedFramesCollection(OrthancStone::SortedFrames* frames)
   {
     if (frames == NULL)
     {
diff -r 82b8f1a3dafd -r f68f9a8d0d63 CITATION.cff
--- a/CITATION.cff	Fri Aug 30 18:51:21 2024 +0200
+++ b/CITATION.cff	Sat Aug 31 08:40:01 2024 +0200
@@ -15,7 +15,7 @@
     value: 'http://hdl.handle.net/2078.1/277125'
     description: On the Use of WebAssembly for Rendering and Segmenting Medical Images
 repository-code: 'https://orthanc.uclouvain.be/hg/orthanc-stone/'
-url: 'https://www.orthanc-server.com/'
+url: 'https://orthanc.uclouvain.be/'
 license: AGPL-3.0-or-later
-version: 2.5
-date-released: 2022-12-05
+version: 2.6
+date-released: 2024-08-31
diff -r 82b8f1a3dafd -r f68f9a8d0d63 OrthancStone/Sources/Toolbox/DicomStructuredReport.cpp
--- a/OrthancStone/Sources/Toolbox/DicomStructuredReport.cpp	Fri Aug 30 18:51:21 2024 +0200
+++ b/OrthancStone/Sources/Toolbox/DicomStructuredReport.cpp	Sat Aug 31 08:40:01 2024 +0200
@@ -135,7 +135,9 @@
   DicomStructuredReport::Structure::Structure(const std::string& sopInstanceUid) :
     sopInstanceUid_(sopInstanceUid),
     hasFrameNumber_(false),
-    hasProbabilityOfCancer_(false)
+    frameNumber_(0),         // dummy initialization
+    hasProbabilityOfCancer_(false),
+    probabilityOfCancer_(0)  // dummy initialization
   {
   }
 
@@ -478,7 +480,7 @@
                       {
                         uint32_t frame;
                         if (!Orthanc::SerializationToolbox::ParseUnsignedInteger32(frame, tokens[m]) ||
-                            frame <= 0)
+                            frame == 0)
                         {
                           throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
                         }
diff -r 82b8f1a3dafd -r f68f9a8d0d63 OrthancStone/Sources/Toolbox/DicomStructuredReport.h
--- a/OrthancStone/Sources/Toolbox/DicomStructuredReport.h	Fri Aug 30 18:51:21 2024 +0200
+++ b/OrthancStone/Sources/Toolbox/DicomStructuredReport.h	Sat Aug 31 08:40:01 2024 +0200
@@ -64,7 +64,7 @@
       void Copy(const Structure& other);
 
     public:
-      Structure(const std::string& sopInstanceUid);
+      explicit Structure(const std::string& sopInstanceUid);
 
       virtual ~Structure()
       {
@@ -262,9 +262,9 @@
       }
     };
 
-    DicomStructuredReport(Orthanc::ParsedDicomFile& dicom);
+    explicit DicomStructuredReport(Orthanc::ParsedDicomFile& dicom);
 
-    DicomStructuredReport(const DicomStructuredReport& other);  // Copy constructor
+    explicit DicomStructuredReport(const DicomStructuredReport& other);  // Copy constructor
 
     ~DicomStructuredReport();