# HG changeset patch # User Sebastien Jodogne # Date 1764679247 -3600 # Node ID f1db8845b45cf5f5e1fd168355e67bbf535842bf # Parent 7e8623928cbfe99655a8ceb0441229c17596fca0 sync, creating RunCppCheck-2.17.1.sh diff -r 7e8623928cbf -r f1db8845b45c Applications/Resources/RunCppCheck-2.1.sh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Applications/Resources/RunCppCheck-2.1.sh Tue Dec 02 13:40:47 2025 +0100 @@ -0,0 +1,93 @@ +#!/bin/bash + +# Stone of Orthanc +# Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics +# Department, University Hospital of Liege, Belgium +# Copyright (C) 2017-2023 Osimis S.A., Belgium +# Copyright (C) 2021-2025 Sebastien Jodogne, ICTEAM UCLouvain, Belgium +# +# This program is free software: you can redistribute it and/or +# modify it under the terms of the GNU Affero General Public License +# as published by the Free Software Foundation, either version 3 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + + +set -ex + +CPPCHECK=cppcheck + +if [ $# -ge 1 ]; then + CPPCHECK=$1 +fi + +cat < /tmp/cppcheck-suppressions.txt +assertWithSideEffect:../../OrthancStone/Sources/Loaders/OrthancMultiframeVolumeLoader.cpp:341 +assertWithSideEffect:../../OrthancStone/Sources/Loaders/OrthancMultiframeVolumeLoader.cpp:342 +constParameter:../../RenderingPlugin/Sources/Plugin.cpp:778 +stlFindInsert:../../Applications/Samples/WebAssembly/SingleFrameViewer/SingleFrameViewerApplication.h +stlFindInsert:../../Applications/StoneWebViewer/WebAssembly/StoneWebViewer.cpp:1080 +stlFindInsert:../../Applications/StoneWebViewer/WebAssembly/StoneWebViewer.cpp:1813 +unpreciseMathCall:../../OrthancStone/Sources/Scene2D/Internals/CairoFloatTextureRenderer.cpp +unpreciseMathCall:../../OrthancStone/Sources/Scene2D/LookupTableTextureSceneLayer.cpp +unreadVariable:../../OrthancStone/Sources/Platforms/Sdl/SdlViewport.cpp:159 +unreadVariable:../../OrthancStone/Sources/Platforms/Sdl/SdlViewport.cpp:213 +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=1 \ + -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}/Subversion/orthanc/OrthancFramework/Sources \ + -I${HOME}/Subversion/orthanc/OrthancServer/Plugins/Include/ \ + \ + ../../Applications/Samples \ + ../../Applications/StoneWebViewer \ + ../../OrthancStone/Sources \ + ../../RenderingPlugin/Sources \ + \ + -i ../../Applications/Samples/RtViewerPlugin/i \ + -i ../../Applications/Samples/Sdl/i \ + -i ../../Applications/Samples/WebAssembly/i \ + -i ../../Applications/StoneWebViewer/Plugin/i \ + -i ../../Applications/StoneWebViewer/WebAssembly/StoneModule/i \ + -i ../../Applications/StoneWebViewer/WebAssembly/i \ + -i ../../Applications/StoneWebViewer/WebAssembly/debug/ \ + \ + 2>&1 diff -r 7e8623928cbf -r f1db8845b45c Applications/Resources/RunCppCheck-2.17.1.sh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Applications/Resources/RunCppCheck-2.17.1.sh Tue Dec 02 13:40:47 2025 +0100 @@ -0,0 +1,76 @@ +#!/bin/bash +# Note: This script is tuned to run with cppcheck v2.17.1 + +set -ex + +CPPCHECK=cppcheck + +if [ $# -ge 1 ]; then + CPPCHECK=$1 +fi + +cat < /tmp/cppcheck-suppressions.txt +assertWithSideEffect:../../OrthancStone/Sources/Loaders/OrthancMultiframeVolumeLoader.cpp:341 +assertWithSideEffect:../../OrthancStone/Sources/Loaders/OrthancMultiframeVolumeLoader.cpp:342 +EOF + +CPPCHECK_BUILD_DIR=/tmp/cppcheck-build-dir-stone-2.7.1/ +mkdir -p ${CPPCHECK_BUILD_DIR} + +${CPPCHECK} -j8 --enable=all --quiet --std=c++03 \ + --cppcheck-build-dir=${CPPCHECK_BUILD_DIR} \ + --suppress=unusedFunction \ + --suppress=missingIncludeSystem \ + --suppress=useStlAlgorithm \ + --check-level=exhaustive \ + --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=1 \ + -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}/Subversion/orthanc/OrthancFramework/Sources \ + -I${HOME}/Subversion/orthanc/OrthancServer/Plugins/Include/ \ + \ + ../../OrthancStone/Sources \ + \ + 2>&1 + + +# \ +# ../../Applications/Samples \ +# ../../Applications/StoneWebViewer \ +# ../../RenderingPlugin/Sources \ +# \ +# -i ../../Applications/Samples/RtViewerPlugin/i \ +# -i ../../Applications/Samples/Sdl/i \ +# -i ../../Applications/Samples/WebAssembly/i \ +# -i ../../Applications/StoneWebViewer/Plugin/i \ +# -i ../../Applications/StoneWebViewer/WebAssembly/StoneModule/i \ +# -i ../../Applications/StoneWebViewer/WebAssembly/i \ +# -i ../../Applications/StoneWebViewer/WebAssembly/debug/ \ diff -r 7e8623928cbf -r f1db8845b45c Applications/Resources/RunCppCheck.sh --- a/Applications/Resources/RunCppCheck.sh Wed Nov 26 13:14:41 2025 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,93 +0,0 @@ -#!/bin/bash - -# Stone of Orthanc -# Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics -# Department, University Hospital of Liege, Belgium -# Copyright (C) 2017-2023 Osimis S.A., Belgium -# Copyright (C) 2021-2025 Sebastien Jodogne, ICTEAM UCLouvain, Belgium -# -# This program is free software: you can redistribute it and/or -# modify it under the terms of the GNU Affero General Public License -# as published by the Free Software Foundation, either version 3 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . - - -set -ex - -CPPCHECK=cppcheck - -if [ $# -ge 1 ]; then - CPPCHECK=$1 -fi - -cat < /tmp/cppcheck-suppressions.txt -assertWithSideEffect:../../OrthancStone/Sources/Loaders/OrthancMultiframeVolumeLoader.cpp:341 -assertWithSideEffect:../../OrthancStone/Sources/Loaders/OrthancMultiframeVolumeLoader.cpp:342 -constParameter:../../RenderingPlugin/Sources/Plugin.cpp:778 -stlFindInsert:../../Applications/Samples/WebAssembly/SingleFrameViewer/SingleFrameViewerApplication.h -stlFindInsert:../../Applications/StoneWebViewer/WebAssembly/StoneWebViewer.cpp:1080 -stlFindInsert:../../Applications/StoneWebViewer/WebAssembly/StoneWebViewer.cpp:1813 -unpreciseMathCall:../../OrthancStone/Sources/Scene2D/Internals/CairoFloatTextureRenderer.cpp -unpreciseMathCall:../../OrthancStone/Sources/Scene2D/LookupTableTextureSceneLayer.cpp -unreadVariable:../../OrthancStone/Sources/Platforms/Sdl/SdlViewport.cpp:159 -unreadVariable:../../OrthancStone/Sources/Platforms/Sdl/SdlViewport.cpp:213 -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=1 \ - -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}/Subversion/orthanc/OrthancFramework/Sources \ - -I${HOME}/Subversion/orthanc/OrthancServer/Plugins/Include/ \ - \ - ../../Applications/Samples \ - ../../Applications/StoneWebViewer \ - ../../OrthancStone/Sources \ - ../../RenderingPlugin/Sources \ - \ - -i ../../Applications/Samples/RtViewerPlugin/i \ - -i ../../Applications/Samples/Sdl/i \ - -i ../../Applications/Samples/WebAssembly/i \ - -i ../../Applications/StoneWebViewer/Plugin/i \ - -i ../../Applications/StoneWebViewer/WebAssembly/StoneModule/i \ - -i ../../Applications/StoneWebViewer/WebAssembly/i \ - -i ../../Applications/StoneWebViewer/WebAssembly/debug/ \ - \ - 2>&1 diff -r 7e8623928cbf -r f1db8845b45c Applications/StoneWebViewer/Version.cmake --- a/Applications/StoneWebViewer/Version.cmake Wed Nov 26 13:14:41 2025 +0100 +++ b/Applications/StoneWebViewer/Version.cmake Tue Dec 02 13:40:47 2025 +0100 @@ -24,6 +24,6 @@ set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline") set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg") else() - set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.12.4") + set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.12.10") set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web") endif() diff -r 7e8623928cbf -r f1db8845b45c OrthancStone/Resources/Orthanc/CMake/Compiler.cmake --- a/OrthancStone/Resources/Orthanc/CMake/Compiler.cmake Wed Nov 26 13:14:41 2025 +0100 +++ b/OrthancStone/Resources/Orthanc/CMake/Compiler.cmake Tue Dec 02 13:40:47 2025 +0100 @@ -21,6 +21,8 @@ # This file sets all the compiler-related flags +message(STATUS "CMAKE_CXX_COMPILER_ID is ${CMAKE_CXX_COMPILER_ID}") +message(STATUS "CMAKE_SYSTEM_NAME is ${CMAKE_SYSTEM_NAME}") if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") # Since Orthanc 1.12.7 that allows CMake 4.0, builds for macOS diff -r 7e8623928cbf -r f1db8845b45c OrthancStone/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake --- a/OrthancStone/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake Wed Nov 26 13:14:41 2025 +0100 +++ b/OrthancStone/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake Tue Dec 02 13:40:47 2025 +0100 @@ -175,6 +175,8 @@ set(ORTHANC_FRAMEWORK_MD5 "eb1c719234338e8277b80d3453563e9f") elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.12.9") set(ORTHANC_FRAMEWORK_MD5 "66b5a2ee60706c4a502896083b9e1a01") + elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.12.10") + set(ORTHANC_FRAMEWORK_MD5 "d5e1ba442104c89a24013cb859a9d6bf") # Below this point are development snapshots that were used to # release some plugin, before an official release of the Orthanc