# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1668728220 -3600
# Node ID 37d6805b80ee3ed62cdda79d5207d235b65d973b
# Parent  963f28eb40cb92231b7068c8ca61c037362add91# Parent  c818be7cb9402265dbede68c043443f951112f8c
integration mainline->deep-learning

diff -r 963f28eb40cb -r 37d6805b80ee Applications/StoneWebViewer/NEWS
--- a/Applications/StoneWebViewer/NEWS	Wed Nov 02 15:14:56 2022 +0100
+++ b/Applications/StoneWebViewer/NEWS	Fri Nov 18 00:37:00 2022 +0100
@@ -1,6 +1,10 @@
 Pending changes in the mainline
 ===============================
 
+
+Version 2.4 (2022-11-02)
+========================
+
 * New types of annotations:
   - Text annotation
   - Pixel probe
diff -r 963f28eb40cb -r 37d6805b80ee Applications/StoneWebViewer/Version.cmake
diff -r 963f28eb40cb -r 37d6805b80ee Applications/StoneWebViewer/WebAssembly/StoneWebViewer.cpp
--- a/Applications/StoneWebViewer/WebAssembly/StoneWebViewer.cpp	Wed Nov 02 15:14:56 2022 +0100
+++ b/Applications/StoneWebViewer/WebAssembly/StoneWebViewer.cpp	Fri Nov 18 00:37:00 2022 +0100
@@ -4102,6 +4102,8 @@
     Orthanc::Logging::EnableInfoLevel(true);
     //Orthanc::Logging::EnableTraceLevel(true);
 
+    LOG(INFO) << "Using DCMTK version: " << DCMTK_VERSION_NUMBER;
+
     context_.reset(new OrthancStone::WebAssemblyLoadersContext(1, 4, 1));
     context_->SetDicomCacheSize(128 * 1024 * 1024);  // 128MB
     
diff -r 963f28eb40cb -r 37d6805b80ee CITATION.cff
--- a/CITATION.cff	Wed Nov 02 15:14:56 2022 +0100
+++ b/CITATION.cff	Fri Nov 18 00:37:00 2022 +0100
@@ -17,4 +17,5 @@
 repository-code: 'https://hg.orthanc-server.com/orthanc-stone/'
 url: 'https://www.orthanc-server.com/'
 license: AGPL-3.0-or-later
-date-released: '2022-03-24'
+version: 2.4
+date-released: 2022-11-02
diff -r 963f28eb40cb -r 37d6805b80ee OrthancStone/Resources/SyncOrthancFolder.py
--- a/OrthancStone/Resources/SyncOrthancFolder.py	Wed Nov 02 15:14:56 2022 +0100
+++ b/OrthancStone/Resources/SyncOrthancFolder.py	Fri Nov 18 00:37:00 2022 +0100
@@ -32,7 +32,7 @@
 import sys
 
 if sys.version_info[0] < 3:
-    from urllib import urlopen
+    from urllib2 import urlopen
 else:
     from urllib.request import urlopen
 
diff -r 963f28eb40cb -r 37d6805b80ee RenderingPlugin/Resources/SyncOrthancFolder.py
--- a/RenderingPlugin/Resources/SyncOrthancFolder.py	Wed Nov 02 15:14:56 2022 +0100
+++ b/RenderingPlugin/Resources/SyncOrthancFolder.py	Fri Nov 18 00:37:00 2022 +0100
@@ -28,7 +28,13 @@
 import multiprocessing
 import os
 import stat
-import urllib2
+import sys
+
+if sys.version_info[0] < 3:
+    from urllib2 import urlopen
+else:
+    from urllib.request import urlopen
+
 
 TARGET = os.path.join(os.path.dirname(__file__), 'Orthanc')
 PLUGIN_SDK_VERSION = '1.0.0'
@@ -52,7 +58,7 @@
     branch = x[0]
     source = x[1]
     target = os.path.join(TARGET, x[2])
-    print target
+    print(target)
 
     try:
         os.makedirs(os.path.dirname(target))
@@ -61,8 +67,8 @@
 
     url = '%s/%s/%s' % (REPOSITORY, branch, source)
 
-    with open(target, 'w') as f:
-        f.write(urllib2.urlopen(url).read())
+    with open(target, 'wb') as f:
+        f.write(urlopen(url).read())
 
 
 commands = []