# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1498206140 -7200
# Node ID 9f3414878c0215cc7c25afc4d922088d779f0e45
# Parent  72aef993b510c97ff6acf249ba7ccb3d4e45df34
 Fix Debian #865606 (orthanc FTBFS with libdcmtk-dev 3.6.1~20170228-2)

diff -r 72aef993b510 -r 9f3414878c02 NEWS
--- a/NEWS	Wed Jun 21 09:24:55 2017 +0000
+++ b/NEWS	Fri Jun 23 10:22:20 2017 +0200
@@ -18,6 +18,7 @@
 * Fix issue 35 (AET name is not transferred to Orthanc using DCMTK 3.6.0)
 * Fix issue 44 (Bad interpretation of photometric interpretation MONOCHROME1)
 * Fix issue 49 (Worklists: accentuated characters are removed from C-Find responses)
+* Fix Debian #865606 (orthanc FTBFS with libdcmtk-dev 3.6.1~20170228-2)
 
 
 Version 1.2.0 (2016/12/13)
diff -r 72aef993b510 -r 9f3414878c02 OrthancServer/FromDcmtkBridge.cpp
--- a/OrthancServer/FromDcmtkBridge.cpp	Wed Jun 21 09:24:55 2017 +0000
+++ b/OrthancServer/FromDcmtkBridge.cpp	Fri Jun 23 10:22:20 2017 +0200
@@ -1681,7 +1681,7 @@
           throw OrthancException(ErrorCode_BadParameterType);
         }
 
-        DcmSequenceOfItems* sequence = new DcmSequenceOfItems(key, value.size());
+        DcmSequenceOfItems* sequence = new DcmSequenceOfItems(key);
         element.reset(sequence);
         
         for (Json::Value::ArrayIndex i = 0; i < value.size(); i++)
diff -r 72aef993b510 -r 9f3414878c02 Resources/CMake/DcmtkConfiguration.cmake
--- a/Resources/CMake/DcmtkConfiguration.cmake	Wed Jun 21 09:24:55 2017 +0000
+++ b/Resources/CMake/DcmtkConfiguration.cmake	Fri Jun 23 10:22:20 2017 +0200
@@ -270,10 +270,14 @@
     set(DCMTK_CONFIGURATION_FILE "${DCMTK_config_INCLUDE_DIR}/cfunix.h")
   elseif (EXISTS "${DCMTK_config_INCLUDE_DIR}/osconfig.h")  # This is for Arch Linux
     set(DCMTK_CONFIGURATION_FILE "${DCMTK_config_INCLUDE_DIR}/osconfig.h")
+  elseif (EXISTS "${DCMTK_INCLUDE_DIRS}/dcmtk/config/osconfig.h")  # This is for Debian Buster
+    set(DCMTK_CONFIGURATION_FILE "${DCMTK_INCLUDE_DIRS}/dcmtk/config/osconfig.h")
   else()
     message(FATAL_ERROR "Please install libdcmtk*-dev")
   endif()
 
+  message("DCMTK configuration file: ${DCMTK_CONFIGURATION_FILE}")
+  
   # Autodetection of the version of DCMTK
   file(STRINGS
     "${DCMTK_CONFIGURATION_FILE}"