# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1758616875 -7200
# Node ID f9213478200122e7f0806adc91e3603771cadd30
# Parent  0b0222d3a7f9b839a29799dca3672152b471786b# Parent  a662aa0e0d5847209273151b3f40dc1532cd8247
integration inbox->default

diff -r 0b0222d3a7f9 -r f92134782001 Resources/Orthanc/CMake/AutoGeneratedCode.cmake
--- a/Resources/Orthanc/CMake/AutoGeneratedCode.cmake	Thu Aug 28 09:46:10 2025 +0200
+++ b/Resources/Orthanc/CMake/AutoGeneratedCode.cmake	Tue Sep 23 10:41:15 2025 +0200
@@ -20,7 +20,7 @@
 # <http://www.gnu.org/licenses/>.
 
 
-set(EMBED_RESOURCES_PYTHON "${CMAKE_CURRENT_LIST_DIR}/../EmbedResources.py"
+set(EMBED_RESOURCES_PYTHON "${CMAKE_CURRENT_LIST_DIR}/EmbedResources.py"
   CACHE INTERNAL "Path to the EmbedResources.py script from Orthanc")
 set(AUTOGENERATED_DIR "${CMAKE_CURRENT_BINARY_DIR}/AUTOGENERATED")
 set(AUTOGENERATED_SOURCES)
diff -r 0b0222d3a7f9 -r f92134782001 Resources/Orthanc/CMake/DownloadOrthancFramework.cmake
--- a/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake	Thu Aug 28 09:46:10 2025 +0200
+++ b/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake	Tue Sep 23 10:41:15 2025 +0200
@@ -207,6 +207,14 @@
         # DICOMweb 1.15 (framework pre-1.12.2)
         set(ORTHANC_FRAMEWORK_PRE_RELEASE ON)
         set(ORTHANC_FRAMEWORK_MD5 "ebe8bdf388319f1c9536b2b680451848")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "36cd91a53403")
+        # Advanced storage 0.2.0 (framework pre-1.12.10)
+        set(ORTHANC_FRAMEWORK_PRE_RELEASE ON)
+        set(ORTHANC_FRAMEWORK_MD5 "911105f18a154b5e106985d8fcfcb620")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "9eb77f159b9d")
+        # Advanced storage 0.2.2 (framework pre-1.12.10)
+        set(ORTHANC_FRAMEWORK_PRE_RELEASE ON)
+        set(ORTHANC_FRAMEWORK_MD5 "bd5ba2cec329010b912209345acbdeaf")
       endif()
     endif()
   endif()
diff -r 0b0222d3a7f9 -r f92134782001 Resources/Orthanc/Plugins/OrthancPluginCppWrapper.cpp
--- a/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.cpp	Thu Aug 28 09:46:10 2025 +0200
+++ b/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.cpp	Tue Sep 23 10:41:15 2025 +0200
@@ -23,6 +23,7 @@
 
 #include "OrthancPluginCppWrapper.h"
 
+#include <cassert>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/move/unique_ptr.hpp>
 #include <boost/thread.hpp>
diff -r 0b0222d3a7f9 -r f92134782001 Resources/SyncOrthancFolder.py
--- a/Resources/SyncOrthancFolder.py	Thu Aug 28 09:46:10 2025 +0200
+++ b/Resources/SyncOrthancFolder.py	Tue Sep 23 10:41:15 2025 +0200
@@ -20,7 +20,7 @@
     ('OrthancFramework/Resources/CMake/DownloadOrthancFramework.cmake', 'CMake'),
     ('OrthancFramework/Resources/CMake/DownloadPackage.cmake', 'CMake'),
     ('OrthancFramework/Resources/CMake/GoogleTestConfiguration.cmake', 'CMake'),
-    ('OrthancFramework/Resources/EmbedResources.py', 'CMake'),
+    ('OrthancFramework/Resources/CMake/EmbedResources.py', 'CMake'),
     ('OrthancFramework/Resources/Toolchains/LinuxStandardBaseToolchain.cmake', 'Toolchains'),
     ('OrthancFramework/Resources/Toolchains/MinGW-W64-Toolchain32.cmake', 'Toolchains'),
     ('OrthancFramework/Resources/Toolchains/MinGW-W64-Toolchain64.cmake', 'Toolchains'),