Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package orthanc-gdcm for openSUSE:Factory checked in at 2021-07-23 23:41:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/orthanc-gdcm (Old) and /work/SRC/openSUSE:Factory/.orthanc-gdcm.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "orthanc-gdcm" Fri Jul 23 23:41:17 2021 rev:6 rq:907942 version:1.4 Changes: -------- --- /work/SRC/openSUSE:Factory/orthanc-gdcm/orthanc-gdcm.changes 2021-06-23 17:38:18.416477665 +0200 +++ /work/SRC/openSUSE:Factory/.orthanc-gdcm.new.1899/orthanc-gdcm.changes 2021-07-23 23:41:39.717796824 +0200 @@ -1,0 +2,6 @@ +Thu Jul 22 19:40:30 UTC 2021 - Axel Braun <[email protected]> + +- version 1.4 +* Prevent transcoding of 1bpp DICOM images, as this might crash GDCM + +------------------------------------------------------------------- Old: ---- OrthancGdcm-1.3.tar.gz New: ---- OrthancGdcm-1.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ orthanc-gdcm.spec ++++++ --- /var/tmp/diff_new_pack.URI2lv/_old 2021-07-23 23:41:40.153796267 +0200 +++ /var/tmp/diff_new_pack.URI2lv/_new 2021-07-23 23:41:40.157796262 +0200 @@ -21,7 +21,7 @@ Summary: GDCM plugin for Orthanc License: GPL-3.0-or-later Group: Productivity/Graphics/Viewers -Version: 1.3 +Version: 1.4 Release: 0 URL: http://orthanc-server.com Source0: https://www.orthanc-server.com/downloads/get.php?path=/plugin-gdcm/OrthancGdcm-%{version}.tar.gz ++++++ OrthancGdcm-1.3.tar.gz -> OrthancGdcm-1.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancGdcm-1.3/.hg_archival.txt new/OrthancGdcm-1.4/.hg_archival.txt --- old/OrthancGdcm-1.3/.hg_archival.txt 2021-06-14 17:00:50.000000000 +0200 +++ new/OrthancGdcm-1.4/.hg_archival.txt 2021-07-06 12:03:21.000000000 +0200 @@ -1,6 +1,6 @@ repo: 108d34b53bb89b998dbe89c3bb031241991f13c7 -node: 294473d51c84ef734f53708c8ed3d7cbf9787edf -branch: OrthancGdcm-1.3 +node: ef39b0c16e121aa11887e7f3967f849b9dbfa56f +branch: OrthancGdcm-1.4 latesttag: null -latesttagdistance: 46 -changessincelatesttag: 50 +latesttagdistance: 52 +changessincelatesttag: 56 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancGdcm-1.3/CMakeLists.txt new/OrthancGdcm-1.4/CMakeLists.txt --- old/OrthancGdcm-1.3/CMakeLists.txt 2021-06-14 17:00:50.000000000 +0200 +++ new/OrthancGdcm-1.4/CMakeLists.txt 2021-07-06 12:03:21.000000000 +0200 @@ -21,13 +21,13 @@ project(OrthancGdcm) -SET(PLUGIN_VERSION "1.3" CACHE STRING "Version of the plugin") +SET(PLUGIN_VERSION "1.4" 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.9.3") + set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.9.4") set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web") endif() @@ -50,8 +50,6 @@ # Download and setup the Orthanc framework include(${CMAKE_SOURCE_DIR}/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake) -include_directories(${ORTHANC_FRAMEWORK_ROOT}) - if (ORTHANC_FRAMEWORK_SOURCE STREQUAL "system") if (ORTHANC_FRAMEWORK_USE_SHARED) include(FindBoost) @@ -74,6 +72,7 @@ set(ENABLE_MODULE_JOBS OFF CACHE INTERNAL "") include(${ORTHANC_FRAMEWORK_ROOT}/../Resources/CMake/OrthancFrameworkConfiguration.cmake) + include_directories(${ORTHANC_FRAMEWORK_ROOT}) endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancGdcm-1.3/NEWS new/OrthancGdcm-1.4/NEWS --- old/OrthancGdcm-1.3/NEWS 2021-06-14 17:00:50.000000000 +0200 +++ new/OrthancGdcm-1.4/NEWS 2021-07-06 12:03:21.000000000 +0200 @@ -2,6 +2,12 @@ =============================== +Version 1.4 (2021-07-06) +======================== + +* Prevent transcoding of 1bpp DICOM images, as this might crash GDCM + + Version 1.3 (2021-06-14) ======================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancGdcm-1.3/Plugin/Plugin.cpp new/OrthancGdcm-1.4/Plugin/Plugin.cpp --- old/OrthancGdcm-1.3/Plugin/Plugin.cpp 2021-06-14 17:00:50.000000000 +0200 +++ new/OrthancGdcm-1.4/Plugin/Plugin.cpp 2021-07-06 12:03:21.000000000 +0200 @@ -340,16 +340,24 @@ gdcm::TransferSyntax syntax(gdcm::TransferSyntax::GetTSType(allowedSyntaxes[i])); if (syntax.IsValid()) { + if (reader.GetImage().GetPixelFormat().GetBitsAllocated() == 1u) + { + // Prevent transcoding of 1-bit images, as this might crash GDCM + // https://groups.google.com/g/orthanc-users/c/xIwrkFRceuE/m/jwxy50djAQAJ + throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented, "Cannot transcode 1bpp DICOM images"); + } + if (reader.GetImage().GetPixelFormat().GetBitsStored() == 16u && syntax == gdcm::TransferSyntax::JPEGExtendedProcess2_4) { /** - * This is a temporary workaround for issue #513 in GDCM: + * This is a temporary workaround for issue #513 in GDCM + * (will be fixed in GDCM 3.0.9): * 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"); + "Transcoding 16bpp images to 1.2.840.10008.1.2.4.51 might lead to a crash in GDCM"); } gdcm::ImageChangeTransferSyntax change; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancGdcm-1.3/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake new/OrthancGdcm-1.4/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake --- old/OrthancGdcm-1.3/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake 2021-06-14 17:00:50.000000000 +0200 +++ new/OrthancGdcm-1.4/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake 2021-07-06 12:03:21.000000000 +0200 @@ -130,6 +130,8 @@ set(ORTHANC_FRAMEWORK_MD5 "3ea66c09f64aca990016683b6375734e") elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.9.3") set(ORTHANC_FRAMEWORK_MD5 "9b86e6f00e03278293cd15643cc0233f") + elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.9.4") + set(ORTHANC_FRAMEWORK_MD5 "6d5ca4a73ac7d42445041ca79de1624d") # Below this point are development snapshots that were used to # release some plugin, before an official release of the Orthanc
