# HG changeset patch
# User Alain Mazy <am@orthanc.team>
# Date 1742491464 -3600
# Node ID 78f4c1da54d3d942dcaa21d3b7219a7e0630de11
# Parent  55f171e6ea4a123ed047a5d74c019e05a5140c02# Parent  e83414b2b98dc1384cdc64a5d566de414fcbbddb
merge

diff -r 55f171e6ea4a -r 78f4c1da54d3 NEWS
--- a/NEWS	Thu Mar 20 18:24:04 2025 +0100
+++ b/NEWS	Thu Mar 20 18:24:24 2025 +0100
@@ -38,10 +38,12 @@
   https://discourse.orthanc-server.org/t/lastupdate-coherency/5524
 * Recovered compatibility with Windows XP that was broken because of DCMTK 3.6.9
 * Enabled support of the 1.2.840.10008.1.2.1.99 transfer syntax
-  (Deflated Explicit VR Little Endian) in static builds
+  (Deflated Explicit VR Little Endian) in static builds + fix length of saved files.
+  https://discourse.orthanc-server.org/t/transcoding-to-deflated-transfer-syntax-fails/5489
 * Housekeeper plugin:
   - When encountering an error, the housekeeper now skips the resource and continues processing.
-
+* Orthanc Explorer:
+  - Allow '-' and '_' in labels.
 
 
 Version 1.12.6 (2025-01-22)
diff -r 55f171e6ea4a -r 78f4c1da54d3 OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.cpp
--- a/OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.cpp	Thu Mar 20 18:24:04 2025 +0100
+++ b/OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.cpp	Thu Mar 20 18:24:24 2025 +0100
@@ -1603,7 +1603,7 @@
       // buffer if its size was overestimated by (*)
       ob.flush();
 
-      size_t effectiveSize = static_cast<size_t>(ob.tell());
+      size_t effectiveSize = static_cast<size_t>(ob.filled());
       if (effectiveSize < buffer.size())
       {
         buffer.resize(effectiveSize);
diff -r 55f171e6ea4a -r 78f4c1da54d3 OrthancServer/OrthancExplorer/explorer.js
--- a/OrthancServer/OrthancExplorer/explorer.js	Thu Mar 20 18:24:04 2025 +0100
+++ b/OrthancServer/OrthancExplorer/explorer.js	Thu Mar 20 18:24:24 2025 +0100
@@ -71,6 +71,11 @@
   return s.match(/^[0-9a-zA-Z]+$/);
 }
 
+function IsValidLabelName(s)
+{
+  return s.match(/^[0-9a-zA-Z\-_]+$/);
+}
+
 
 function DeepCopy(obj)
 {
@@ -780,7 +785,7 @@
             click: function () {
               var label = $.mobile.sdLastInput;
               if (label.length > 0) {
-                if (IsAlphanumeric(label)) {
+                if (IsValidLabelName(label)) {
                   $.ajax({
                     url: '../' + resourceLevel + '/' + resourceId + '/labels/' + label,
                     dataType: 'json',
diff -r 55f171e6ea4a -r 78f4c1da54d3 OrthancServer/Sources/OrthancInitialization.cpp
--- a/OrthancServer/Sources/OrthancInitialization.cpp	Thu Mar 20 18:24:04 2025 +0100
+++ b/OrthancServer/Sources/OrthancInitialization.cpp	Thu Mar 20 18:24:24 2025 +0100
@@ -59,6 +59,7 @@
 #    undef __FILE__
 #    define __FILE__ __ORTHANC_FILE__
 #  endif
+#  include <google/protobuf/stubs/common.h>
 #  include <google/protobuf/any.h>
 #endif