Mercurial > hg > orthanc-gdcm
changeset 30:ba2f648372fa
Upgrade to GDCM 3.0.7 for static builds
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Wed, 22 Jul 2020 11:23:51 +0200 |
| parents | 50d2627c46b4 |
| children | 01c404b14507 |
| files | NEWS Resources/CMake/GdcmConfiguration.cmake Resources/Orthanc/CMake/DownloadOrthancFramework.cmake Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h |
| diffstat | 4 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/NEWS Tue Jul 07 20:39:53 2020 +0200 +++ b/NEWS Wed Jul 22 11:23:51 2020 +0200 @@ -3,6 +3,7 @@ * Fix transcoding of DICOM files encoded using an implicit transfer syntax * Support of dynamic linking against the system-wide Orthanc framework library +* Upgrade to GDCM 3.0.7 for static builds Version 1.0 (2020-05-25)
--- a/Resources/CMake/GdcmConfiguration.cmake Tue Jul 07 20:39:53 2020 +0200 +++ b/Resources/CMake/GdcmConfiguration.cmake Wed Jul 22 11:23:51 2020 +0200 @@ -22,8 +22,8 @@ set(GDCM_URL "http://orthanc.osimis.io/ThirdPartyDownloads/gdcm-2.8.9.tar.gz") set(GDCM_MD5 "aeb00e0cb5375d454010a72e2e0f6154") else() - set(GDCM_URL "http://orthanc.osimis.io/ThirdPartyDownloads/gdcm-3.0.6.tar.gz") - set(GDCM_MD5 "d365e0950da9cb40fee437d48d66d62b") + set(GDCM_URL "http://orthanc.osimis.io/ThirdPartyDownloads/gdcm-3.0.7.tar.gz") + set(GDCM_MD5 "ecfaa66b03c4d3773209f33000c243c6") endif() if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR
--- a/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake Tue Jul 07 20:39:53 2020 +0200 +++ b/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake Wed Jul 22 11:23:51 2020 +0200 @@ -110,6 +110,8 @@ set(ORTHANC_FRAMEWORK_MD5 "ce5f689e852b01d3672bd3d2f952a5ef") elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.7.1") set(ORTHANC_FRAMEWORK_MD5 "3c171217f930abe80246997bdbcaf7cc") + elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.7.2") + set(ORTHANC_FRAMEWORK_MD5 "328f94dcbd78c169655a13f7ad58a2c2") # Below this point are development snapshots that were used to # release some plugin, before an official release of the Orthanc
--- a/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h Tue Jul 07 20:39:53 2020 +0200 +++ b/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h Wed Jul 22 11:23:51 2020 +0200 @@ -1158,9 +1158,9 @@ public: #if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 6, 1) - DicomInstance(const OrthancPluginDicomInstance* instance); + explicit DicomInstance(const OrthancPluginDicomInstance* instance); #else - DicomInstance(OrthancPluginDicomInstance* instance); + explicit DicomInstance(OrthancPluginDicomInstance* instance); #endif #if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 7, 0)