Mercurial > hg > orthanc
changeset 2287:9f3414878c02
Fix Debian #865606 (orthanc FTBFS with libdcmtk-dev 3.6.1~20170228-2)
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Fri, 23 Jun 2017 10:22:20 +0200 |
| parents | 72aef993b510 |
| children | c6772af6dea3 |
| files | NEWS OrthancServer/FromDcmtkBridge.cpp Resources/CMake/DcmtkConfiguration.cmake |
| diffstat | 3 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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)
--- 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++)
--- 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}"