Commit 0891ba85 authored by Sebastien Jodogne's avatar Sebastien Jodogne

removed old patches

parent 084d664c
Description: Fix finding and compiling against dcmtk 3.6.2
Author: Gert Wollny <gewo@debian.org>
--- a/Resources/Orthanc/Resources/CMake/DcmtkConfiguration.cmake
+++ b/Resources/Orthanc/Resources/CMake/DcmtkConfiguration.cmake
@@ -266,6 +266,7 @@
-DHAVE_CONFIG_H=1
)
+ SET(DCMTK_config_INCLUDE_DIR ${DCMTK_INCLUDE_DIR}/dcmtk/config)
if (EXISTS "${DCMTK_config_INCLUDE_DIR}/cfunix.h")
set(DCMTK_CONFIGURATION_FILE "${DCMTK_config_INCLUDE_DIR}/cfunix.h")
elseif (EXISTS "${DCMTK_config_INCLUDE_DIR}/osconfig.h") # This is for Arch Linux
@@ -300,6 +301,8 @@
if (DCMTK_DICTIONARY_DIR STREQUAL "")
find_path(DCMTK_DICTIONARY_DIR_AUTO dicom.dic
/usr/share/dcmtk
+ /usr/share/libdcmtk12
+ /usr/share/libdcmtk11
/usr/share/libdcmtk1
/usr/share/libdcmtk2
/usr/share/libdcmtk3
--- a/Resources/Orthanc/OrthancServer/FromDcmtkBridge.cpp
+++ b/Resources/Orthanc/OrthancServer/FromDcmtkBridge.cpp
@@ -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++)
Description: Fix compiling against openjpeg 2.2
Author: Sebastien Jodogne <s.jodogne@gmail.com>
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Index: OrthancWSI-0.4/Resources/CMake/OpenJpegConfiguration.cmake
===================================================================
--- OrthancWSI-0.4.orig/Resources/CMake/OpenJpegConfiguration.cmake
+++ OrthancWSI-0.4/Resources/CMake/OpenJpegConfiguration.cmake
@@ -114,6 +114,7 @@ else()
PATHS
/usr/include/
/usr/include/openjpeg-2.1/
+ /usr/include/openjpeg-2.2/
/usr/local/include/
)
cmake
dcmtk-3.6.1~20170228.patch
openjpeg
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment