# HG changeset patch # User Sebastien Jodogne # Date 1623682850 -7200 # Node ID 294473d51c84ef734f53708c8ed3d7cbf9787edf # Parent f879d716a25c173bfc80b4fa962f46f030f50379 OrthancGdcm-1.3 diff -r f879d716a25c -r 294473d51c84 CMakeLists.txt --- a/CMakeLists.txt Mon Jun 14 16:03:06 2021 +0200 +++ b/CMakeLists.txt Mon Jun 14 17:00:50 2021 +0200 @@ -21,7 +21,7 @@ project(OrthancGdcm) -SET(PLUGIN_VERSION "mainline" CACHE STRING "Version of the plugin") +SET(PLUGIN_VERSION "1.3" CACHE STRING "Version of the plugin") if (PLUGIN_VERSION STREQUAL "mainline") set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline") diff -r f879d716a25c -r 294473d51c84 NEWS --- a/NEWS Mon Jun 14 16:03:06 2021 +0200 +++ b/NEWS Mon Jun 14 17:00:50 2021 +0200 @@ -1,6 +1,10 @@ Pending changes in the mainline =============================== + +Version 1.3 (2021-06-14) +======================== + * Prevent changing SOP class UID from "MR Image Storage" to "Enhanced MR Image Storage" during the transcoding diff -r f879d716a25c -r 294473d51c84 Plugin/GdcmImageDecoder.cpp --- a/Plugin/GdcmImageDecoder.cpp Mon Jun 14 16:03:06 2021 +0200 +++ b/Plugin/GdcmImageDecoder.cpp Mon Jun 14 17:00:50 2021 +0200 @@ -297,7 +297,7 @@ } - static void FixPhotometricInterpretation(OrthancImage& image, + static void FixPhotometricInterpretation(const OrthancImage& image, gdcm::PhotometricInterpretation interpretation) { switch (interpretation) diff -r f879d716a25c -r 294473d51c84 Resources/RunCppCheck.sh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Resources/RunCppCheck.sh Mon Jun 14 17:00:50 2021 +0200 @@ -0,0 +1,52 @@ +#!/bin/bash + +set -ex + +CPPCHECK=cppcheck + +if [ $# -ge 1 ]; then + CPPCHECK=$1 +fi + +cat < /tmp/cppcheck-suppressions.txt +unusedFunction +EOF + +${CPPCHECK} --enable=all --quiet --std=c++11 \ + --suppressions-list=/tmp/cppcheck-suppressions.txt \ + -DHAS_ORTHANC_EXCEPTION=1 \ + -DORTHANC_BUILDING_FRAMEWORK_LIBRARY=1 \ + -DORTHANC_ENABLE_BASE64=1 \ + -DORTHANC_ENABLE_CIVETWEB=0 \ + -DORTHANC_ENABLE_CURL=1 \ + -DORTHANC_ENABLE_DCMTK=1 \ + -DORTHANC_ENABLE_DCMTK_JPEG=1 \ + -DORTHANC_ENABLE_DCMTK_JPEG_LOSSLESS=1 \ + -DORTHANC_ENABLE_GLEW=1 \ + -DORTHANC_ENABLE_JPEG=1 \ + -DORTHANC_ENABLE_LOCALE=1 \ + -DORTHANC_ENABLE_LOGGING=1 \ + -DORTHANC_ENABLE_LOGGING_STDIO=1 \ + -DORTHANC_ENABLE_MD5=1 \ + -DORTHANC_ENABLE_MONGOOSE=0 \ + -DORTHANC_ENABLE_OPENGL=1 \ + -DORTHANC_ENABLE_PKCS11=0 \ + -DORTHANC_ENABLE_PNG=1 \ + -DORTHANC_ENABLE_PUGIXML=0 \ + -DORTHANC_ENABLE_SDL=1 \ + -DORTHANC_ENABLE_SSL=1 \ + -DORTHANC_ENABLE_THREADS=1 \ + -DORTHANC_ENABLE_WASM=1 \ + -DORTHANC_ENABLE_ZLIB=1 \ + -DORTHANC_SANDBOXED=0 \ + -D__GNUC__ \ + -D__cplusplus=201103 \ + -D__linux__ \ + -DEM_ASM \ + -UNDEBUG \ + -I/home/jodogne/Subversion/orthanc/OrthancFramework/Sources \ + -I/home/jodogne/Subversion/orthanc/OrthancServer/Plugins/Include/ \ + \ + ../Plugin \ + \ + 2>&1