[med-svn] [Git][med-team/orthanc-gdcm][upstream] New upstream version 1.2
Sebastien Jodogne
gitlab at salsa.debian.org
Thu Dec 17 17:27:07 GMT 2020
Sebastien Jodogne pushed to branch upstream at Debian Med / orthanc-gdcm
Commits:
8c84a0e3 by jodogne-guest at 2020-12-17T18:13:57+01:00
New upstream version 1.2
- - - - -
9 changed files:
- .hg_archival.txt
- CMakeLists.txt
- NEWS
- Plugin/Plugin.cpp
- Resources/BuildInstructions.txt
- Resources/CMake/GdcmConfiguration.cmake
- Resources/Orthanc/CMake/DownloadOrthancFramework.cmake
- Resources/Orthanc/LinuxStandardBaseToolchain.cmake
- Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h
Changes:
=====================================
.hg_archival.txt
=====================================
@@ -1,6 +1,6 @@
repo: 108d34b53bb89b998dbe89c3bb031241991f13c7
-node: c4f82e5ab0f03f2bca30ef762bdb4a90636425af
-branch: OrthancGdcm-1.1
+node: ad9c32ea9eac377df68f81c8a7b670ec7ff2b6b4
+branch: OrthancGdcm-1.2
latesttag: null
-latesttagdistance: 34
-changessincelatesttag: 34
+latesttagdistance: 41
+changessincelatesttag: 45
=====================================
CMakeLists.txt
=====================================
@@ -21,20 +21,19 @@ cmake_minimum_required(VERSION 2.8)
project(OrthancGdcm)
-SET(PLUGIN_VERSION "1.1" CACHE STRING "Version of the plugin")
+SET(PLUGIN_VERSION "1.2" CACHE STRING "Version of the plugin")
if (PLUGIN_VERSION STREQUAL "mainline")
set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline")
set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg")
else()
- set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.7.2")
+ set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.8.1")
set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web")
endif()
# Parameters of the build
set(STATIC_BUILD OFF CACHE BOOL "Static build of the third-party libraries (necessary for Windows)")
-set(STANDALONE_BUILD ON CACHE BOOL "Standalone build (all the resources are embedded, necessary for releases)")
set(ALLOW_DOWNLOADS OFF CACHE BOOL "Allow CMake to download packages")
set(ORTHANC_FRAMEWORK_SOURCE "${ORTHANC_FRAMEWORK_DEFAULT_SOURCE}" CACHE STRING "Source of the Orthanc framework (can be \"hg\", \"archive\", \"web\" or \"path\")")
set(ORTHANC_FRAMEWORK_VERSION "${ORTHANC_FRAMEWORK_DEFAULT_VERSION}" CACHE STRING "Version of the Orthanc framework")
=====================================
NEWS
=====================================
@@ -2,6 +2,13 @@ Pending changes in the mainline
===============================
+Version 1.2 (2020-12-17)
+========================
+
+* Temporarily prevent transcoding of 16bpp images to JPEG, as this might crash GDCM
+* Upgrade to GDCM 3.0.8 for static builds
+
+
Version 1.1 (2020-08-05)
========================
=====================================
Plugin/Plugin.cpp
=====================================
@@ -23,6 +23,7 @@
#include <Compatibility.h>
#include <DicomFormat/DicomMap.h>
+#include <Logging.h>
#include <MultiThreading/Semaphore.h>
#include <Toolbox.h>
@@ -321,6 +322,18 @@ OrthancPluginErrorCode TranscoderCallback(
gdcm::TransferSyntax syntax(gdcm::TransferSyntax::GetTSType(allowedSyntaxes[i]));
if (syntax.IsValid())
{
+ if (reader.GetImage().GetPixelFormat().GetBitsStored() == 16u &&
+ syntax == gdcm::TransferSyntax::JPEGExtendedProcess2_4)
+ {
+ /**
+ * This is a temporary workaround for issue #513 in GDCM:
+ * https://sourceforge.net/p/gdcm/bugs/513/
+ * https://groups.google.com/g/orthanc-users/c/xt9hwpj6mlQ
+ **/
+ throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented,
+ "Transcoding 16bit images to 1.2.840.10008.1.2.4.51 might lead to a crash in GDCM");
+ }
+
gdcm::ImageChangeTransferSyntax change;
change.SetTransferSyntax(syntax);
change.SetInput(reader.GetImage());
=====================================
Resources/BuildInstructions.txt
=====================================
@@ -16,7 +16,7 @@ Debian Sid (dynamic linking)
# mkdir Build
# cd Build
-# cmake .. -DCMAKE_BUILD_TYPE=Debug -DUSE_GOOGLE_TEST_DEBIAN_PACKAGE=ON -DSTANDALONE_BUILD=ON -DUSE_SYSTEM_ORTHANC_SDK=OFF
+# cmake .. -DCMAKE_BUILD_TYPE=Debug -DUSE_GOOGLE_TEST_DEBIAN_PACKAGE=ON -DUSE_SYSTEM_ORTHANC_SDK=OFF
# make
=====================================
Resources/CMake/GdcmConfiguration.cmake
=====================================
@@ -22,8 +22,8 @@ if (STATIC_BUILD OR NOT USE_SYSTEM_GDCM)
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.7.tar.gz")
- set(GDCM_MD5 "ecfaa66b03c4d3773209f33000c243c6")
+ set(GDCM_URL "http://orthanc.osimis.io/ThirdPartyDownloads/gdcm-3.0.8.tar.gz")
+ set(GDCM_MD5 "29e0e60b04183e3eb9c18ad093156b2c")
endif()
if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR
=====================================
Resources/Orthanc/CMake/DownloadOrthancFramework.cmake
=====================================
@@ -112,6 +112,14 @@ if (ORTHANC_FRAMEWORK_SOURCE STREQUAL "hg" OR
set(ORTHANC_FRAMEWORK_MD5 "3c171217f930abe80246997bdbcaf7cc")
elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.7.2")
set(ORTHANC_FRAMEWORK_MD5 "328f94dcbd78c169655a13f7ad58a2c2")
+ elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.7.3")
+ set(ORTHANC_FRAMEWORK_MD5 "3f1ba9502ec7c5449971d3b56087bcde")
+ elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.7.4")
+ set(ORTHANC_FRAMEWORK_MD5 "19fcb7c21876af86546baa048a22c6c0")
+ elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.8.0")
+ set(ORTHANC_FRAMEWORK_MD5 "f8ec7554ef5d23ea4ce474b1e8214de9")
+ elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.8.1")
+ set(ORTHANC_FRAMEWORK_MD5 "db094f96399cbe8b9bbdbce34884c220")
# Below this point are development snapshots that were used to
# release some plugin, before an official release of the Orthanc
@@ -123,6 +131,12 @@ if (ORTHANC_FRAMEWORK_SOURCE STREQUAL "hg" OR
elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "ae0e3fd609df")
# DICOMweb 1.1 (framework pre-1.6.0)
set(ORTHANC_FRAMEWORK_MD5 "7e09e9b530a2f527854f0b782d7e0645")
+ elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "82652c5fc04f")
+ # Stone Web viewer 1.0 (framework pre-1.8.1)
+ set(ORTHANC_FRAMEWORK_MD5 "d77331d68917e66a3f4f9b807bbdab7f")
+ elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "4a3ba4bf4ba7")
+ # PostgreSQL 3.3 (framework pre-1.8.2)
+ set(ORTHANC_FRAMEWORK_MD5 "2d82bddf06f9cfe82095495cb3b8abde")
endif()
endif()
endif()
@@ -518,6 +532,16 @@ if (ORTHANC_FRAMEWORK_SOURCE STREQUAL "system")
include_directories(${DCMTK_INCLUDE_DIRS})
link_libraries(${DCMTK_LIBRARIES})
endif()
+
+ # Optional component - OpenSSL
+ if (ENABLE_SSL)
+ include(FindOpenSSL)
+ if (NOT ${OPENSSL_FOUND})
+ message(FATAL_ERROR "Unable to find OpenSSL")
+ endif()
+ include_directories(${OPENSSL_INCLUDE_DIR})
+ link_libraries(${OPENSSL_LIBRARIES})
+ endif()
endif()
# Look for Orthanc framework shared library
=====================================
Resources/Orthanc/LinuxStandardBaseToolchain.cmake
=====================================
@@ -21,11 +21,11 @@
#
# Full build, as used on the BuildBot CIS:
#
-# $ LSB_CC=gcc-4.8 LSB_CXX=g++-4.8 cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=../Resources/LinuxStandardBaseToolchain.cmake -DUSE_LEGACY_JSONCPP=ON -DUSE_LEGACY_LIBICU=ON -DBOOST_LOCALE_BACKEND=icu -DENABLE_PKCS11=ON -G Ninja
+# $ LSB_CC=gcc-4.8 LSB_CXX=g++-4.8 cmake ../OrthancServer/ -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=../OrthancFramework/Resources/Toolchains/LinuxStandardBaseToolchain.cmake -DUSE_LEGACY_JSONCPP=ON -DUSE_LEGACY_LIBICU=ON -DBOOST_LOCALE_BACKEND=icu -DENABLE_PKCS11=ON -G Ninja
#
# Or, more lightweight version (without libp11 and ICU):
#
-# $ LSB_CC=gcc-4.8 LSB_CXX=g++-4.8 cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=../Resources/LinuxStandardBaseToolchain.cmake -DUSE_LEGACY_JSONCPP=ON -G Ninja
+# $ LSB_CC=gcc-4.8 LSB_CXX=g++-4.8 cmake ../OrthancServer/ -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=../OrthancFramework/Resources/Toolchains/LinuxStandardBaseToolchain.cmake -DUSE_LEGACY_JSONCPP=ON -G Ninja
#
INCLUDE(CMakeForceCompiler)
=====================================
Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h
=====================================
@@ -779,7 +779,7 @@ namespace OrthancPlugins
void UpdateProgress(float progress);
public:
- OrthancJob(const std::string& jobType);
+ explicit OrthancJob(const std::string& jobType);
virtual ~OrthancJob()
{
View it on GitLab: https://salsa.debian.org/med-team/orthanc-gdcm/-/commit/8c84a0e3d93b064ba77dfaa16560636494bd726e
--
View it on GitLab: https://salsa.debian.org/med-team/orthanc-gdcm/-/commit/8c84a0e3d93b064ba77dfaa16560636494bd726e
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20201217/6af7d23b/attachment-0001.html>
More information about the debian-med-commit
mailing list