Mercurial > hg > orthanc-stone
changeset 1315:1a08b779be64 broker
warning 4996 (deprecation in jsoncpp) + indentation changes
| author | Benjamin Golinvaux <bgo@osimis.io> |
|---|---|
| date | Mon, 16 Mar 2020 11:21:13 +0100 |
| parents | 9b126de2cde2 |
| children | 7045a0ff32c4 |
| files | Framework/Deprecated/Layers/DicomSeriesVolumeSlicer.cpp Framework/Deprecated/Toolbox/MessagingToolbox.cpp Framework/Oracle/GetOrthancWebViewerJpegCommand.cpp Framework/Oracle/HttpCommand.cpp Framework/Oracle/OrthancRestApiCommand.cpp Framework/Viewport/SdlViewport.cpp Framework/Viewport/WebAssemblyViewport.cpp |
| diffstat | 7 files changed, 27 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/Framework/Deprecated/Layers/DicomSeriesVolumeSlicer.cpp Mon Mar 16 11:19:50 2020 +0100 +++ b/Framework/Deprecated/Layers/DicomSeriesVolumeSlicer.cpp Mon Mar 16 11:21:13 2020 +0100 @@ -100,7 +100,6 @@ Register<OrthancSlicesLoader::SliceImageReadyMessage>(*loader_, &DicomSeriesVolumeSlicer::OnSliceImageReady); Register<OrthancSlicesLoader::SliceImageErrorMessage>(*loader_, &DicomSeriesVolumeSlicer::OnSliceImageError); } - void DicomSeriesVolumeSlicer::LoadSeries(const std::string& seriesId) {
--- a/Framework/Deprecated/Toolbox/MessagingToolbox.cpp Mon Mar 16 11:19:50 2020 +0100 +++ b/Framework/Deprecated/Toolbox/MessagingToolbox.cpp Mon Mar 16 11:21:13 2020 +0100 @@ -30,8 +30,10 @@ #include <boost/lexical_cast.hpp> +#ifdef _MSC_VER // 'Json::Reader': Use CharReader and CharReaderBuilder instead #pragma warning(disable:4996) +#endif #include <json/reader.h> #include <json/writer.h>
--- a/Framework/Oracle/GetOrthancWebViewerJpegCommand.cpp Mon Mar 16 11:19:50 2020 +0100 +++ b/Framework/Oracle/GetOrthancWebViewerJpegCommand.cpp Mon Mar 16 11:21:13 2020 +0100 @@ -29,6 +29,11 @@ #include <Core/OrthancException.h> #include <Core/Toolbox.h> +#ifdef _MSC_VER +// 'Json::Reader': Use CharReader and CharReaderBuilder instead +#pragma warning(disable:4996) +#endif + #include <json/reader.h> #include <json/value.h>
--- a/Framework/Oracle/HttpCommand.cpp Mon Mar 16 11:19:50 2020 +0100 +++ b/Framework/Oracle/HttpCommand.cpp Mon Mar 16 11:21:13 2020 +0100 @@ -23,6 +23,11 @@ #include <Core/OrthancException.h> +#ifdef _MSC_VER +// 'Json::Reader': Use CharReader and CharReaderBuilder instead +#pragma warning(disable:4996) +#endif + #include <json/reader.h> #include <json/writer.h>
--- a/Framework/Oracle/OrthancRestApiCommand.cpp Mon Mar 16 11:19:50 2020 +0100 +++ b/Framework/Oracle/OrthancRestApiCommand.cpp Mon Mar 16 11:21:13 2020 +0100 @@ -23,6 +23,11 @@ #include <Core/OrthancException.h> +#ifdef _MSC_VER +// 'Json::Reader': Use CharReader and CharReaderBuilder instead +#pragma warning(disable:4996) +#endif + #include <json/reader.h> #include <json/writer.h>
--- a/Framework/Viewport/SdlViewport.cpp Mon Mar 16 11:19:50 2020 +0100 +++ b/Framework/Viewport/SdlViewport.cpp Mon Mar 16 11:21:13 2020 +0100 @@ -105,21 +105,23 @@ // "OpenGLContext" it references (*) ClearCompositor(); } - + + void SdlOpenGLViewport::Paint() { SdlLock lock(*this); lock.GetCompositor().Refresh(lock.GetController().GetScene()); } - - void SdlOpenGLViewport::UpdateSize(unsigned int width, - unsigned int height) + + + void SdlOpenGLViewport::UpdateSize(unsigned int width, unsigned int height) { // nothing to do in OpenGL, the OpenGLCompositor::UpdateSize will be called automatically SdlLock lock(*this); lock.Invalidate(); } - + + void SdlOpenGLViewport::ToggleMaximize() { // No need to call "Invalidate()" here, as "UpdateSize()" will @@ -127,7 +129,9 @@ SdlLock lock(*this); context_.ToggleMaximize(); } - + + + SdlCairoViewport::SdlCairoViewport(const char* title, unsigned int width, unsigned int height,
--- a/Framework/Viewport/WebAssemblyViewport.cpp Mon Mar 16 11:19:50 2020 +0100 +++ b/Framework/Viewport/WebAssemblyViewport.cpp Mon Mar 16 11:21:13 2020 +0100 @@ -114,7 +114,6 @@ return true; } - EM_BOOL WebAssemblyViewport::OnResize(int eventType, const EmscriptenUiEvent *uiEvent, void *userData) { WebAssemblyViewport& that = *reinterpret_cast<WebAssemblyViewport*>(userData);