Mercurial > hg > orthanc-stone

changeset 1624:59f95b9ea858

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix build
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 06 Nov 2020 17:30:36 +0100
parents 74be0f498b08
children 4a2c63ae8f99
files Applications/Platforms/WebAssembly/WebAssemblyOpenGLContext.cpp OrthancStone/Sources/Fonts/GlyphTextureAlphabet.cpp OrthancStone/Sources/Loaders/BasicFetchingItemsSorter.cpp OrthancStone/Sources/Loaders/BasicFetchingStrategy.cpp OrthancStone/Sources/Loaders/SeriesOrderedFrames.cpp OrthancStone/Sources/OpenGL/OpenGLIncludes.h OrthancStone/Sources/OpenGL/OpenGLProgram.cpp OrthancStone/Sources/OpenGL/OpenGLShader.cpp OrthancStone/Sources/OpenGL/OpenGLTexture.cpp OrthancStone/Sources/Oracle/GenericOracleRunner.cpp OrthancStone/Sources/Oracle/HttpCommand.cpp OrthancStone/Sources/Oracle/OracleCommandBase.cpp OrthancStone/Sources/Oracle/OrthancRestApiCommand.cpp OrthancStone/Sources/Oracle/ParseDicomFromWadoCommand.cpp OrthancStone/Sources/Scene2D/Internals/OpenGLLinesProgram.cpp OrthancStone/Sources/Scene2D/Internals/OpenGLTextProgram.cpp OrthancStone/Sources/Scene2D/LookupTableTextureSceneLayer.cpp OrthancStone/Sources/Scene2D/MacroSceneLayer.cpp OrthancStone/Sources/Scene2D/TextureBaseSceneLayer.cpp OrthancStone/Sources/Toolbox/OsiriX/ArrayValue.cpp OrthancStone/Sources/Toolbox/OsiriX/DictionaryValue.cpp OrthancStone/Sources/Toolbox/OsiriX/IValue.cpp OrthancStone/Sources/Toolbox/ParsedDicomCache.cpp OrthancStone/Sources/Toolbox/SlicesSorter.cpp OrthancStone/Sources/Volumes/DicomVolumeImage.cpp OrthancStone/Sources/Volumes/DicomVolumeImageMPRSlicer.cpp OrthancStone/Sources/Volumes/IVolumeSlicer.cpp OrthancStone/Sources/Volumes/VolumeImageGeometry.cpp OrthancStone/Sources/Volumes/VolumeReslicer.cpp
diffstat 29 files changed, 52 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/Applications/Platforms/WebAssembly/WebAssemblyOpenGLContext.cpp	Wed Nov 04 11:39:15 2020 +0100
+++ b/Applications/Platforms/WebAssembly/WebAssemblyOpenGLContext.cpp	Fri Nov 06 17:30:36 2020 +0100
@@ -23,6 +23,7 @@
 
 #include "../../../OrthancStone/Sources/StoneException.h"
 
+#include <Logging.h>
 #include <OrthancException.h>
 
 #include <emscripten/html5.h>
--- a/OrthancStone/Sources/Fonts/GlyphTextureAlphabet.cpp	Wed Nov 04 11:39:15 2020 +0100
+++ b/OrthancStone/Sources/Fonts/GlyphTextureAlphabet.cpp	Fri Nov 06 17:30:36 2020 +0100
@@ -157,12 +157,15 @@
 
       //Orthanc::ImageProcessing::Copy(target, bitmap->GetBitmap());
 
-      for (unsigned int y = 0; y < source.GetHeight(); y++)
+      const unsigned int width = source.GetWidth();
+      const unsigned int height = source.GetHeight();
+      
+      for (unsigned int y = 0; y < height; y++)
       {
         const uint8_t* p = reinterpret_cast<const uint8_t*>(source.GetConstRow(y));
         uint8_t* q = reinterpret_cast<uint8_t*>(target.GetRow(y));
 
-        for (unsigned int x = 0; x < source.GetWidth(); x++)
+        for (unsigned int x = 0; x < width; x++)
         {
           // Premultiplied alpha
           q[0] = 0;
--- a/OrthancStone/Sources/Loaders/BasicFetchingItemsSorter.cpp	Wed Nov 04 11:39:15 2020 +0100
+++ b/OrthancStone/Sources/Loaders/BasicFetchingItemsSorter.cpp	Fri Nov 06 17:30:36 2020 +0100
@@ -24,6 +24,8 @@
 
 #include <OrthancException.h>
 
+#include <cassert>
+
 namespace OrthancStone
 {
   BasicFetchingItemsSorter::BasicFetchingItemsSorter(unsigned int itemsCount) :
--- a/OrthancStone/Sources/Loaders/BasicFetchingStrategy.cpp	Wed Nov 04 11:39:15 2020 +0100
+++ b/OrthancStone/Sources/Loaders/BasicFetchingStrategy.cpp	Fri Nov 06 17:30:36 2020 +0100
@@ -24,6 +24,8 @@
 
 #include <OrthancException.h>
 
+#include <cassert>
+
 namespace OrthancStone
 {
   void BasicFetchingStrategy::Schedule(unsigned int item,
--- a/OrthancStone/Sources/Loaders/SeriesOrderedFrames.cpp	Wed Nov 04 11:39:15 2020 +0100
+++ b/OrthancStone/Sources/Loaders/SeriesOrderedFrames.cpp	Fri Nov 06 17:30:36 2020 +0100
@@ -23,6 +23,7 @@
 #include "../Toolbox/SlicesSorter.h"
 #include "SeriesOrderedFrames.h"
 
+#include <Logging.h>
 #include <OrthancException.h>
 
 namespace OrthancStone
--- a/OrthancStone/Sources/OpenGL/OpenGLIncludes.h	Wed Nov 04 11:39:15 2020 +0100
+++ b/OrthancStone/Sources/OpenGL/OpenGLIncludes.h	Fri Nov 06 17:30:36 2020 +0100
@@ -60,6 +60,7 @@
 
 #  if !defined(NDEBUG)  // Is build type "debug"?
 //   glGetError is very expensive!
+#    include <Logging.h>
 #    include <OrthancException.h>
 #    define ORTHANC_OPENGL_CHECK(name)                                  \
   if(true)                                                              \
@@ -89,6 +90,7 @@
 #  include <emscripten/html5.h>
 
 #  if !defined(NDEBUG)  // Is build type "debug"?
+#    include <Logging.h>
 #    include <OrthancException.h>
 #    define ORTHANC_OPENGL_CHECK(name)                                  \
   if(true)                                                              \
--- a/OrthancStone/Sources/OpenGL/OpenGLProgram.cpp	Wed Nov 04 11:39:15 2020 +0100
+++ b/OrthancStone/Sources/OpenGL/OpenGLProgram.cpp	Fri Nov 06 17:30:36 2020 +0100
@@ -25,8 +25,11 @@
 #include "OpenGLShader.h"
 #include "IOpenGLContext.h"
 
+#include <Logging.h>
 #include <OrthancException.h>
 
+#include <cassert>
+
 namespace OrthancStone
 {
   namespace OpenGL
--- a/OrthancStone/Sources/OpenGL/OpenGLShader.cpp	Wed Nov 04 11:39:15 2020 +0100
+++ b/OrthancStone/Sources/OpenGL/OpenGLShader.cpp	Fri Nov 06 17:30:36 2020 +0100
@@ -22,6 +22,7 @@
 
 #include "OpenGLShader.h"
 
+#include <Logging.h>
 #include <OrthancException.h>
 
 namespace OrthancStone
--- a/OrthancStone/Sources/OpenGL/OpenGLTexture.cpp	Wed Nov 04 11:39:15 2020 +0100
+++ b/OrthancStone/Sources/OpenGL/OpenGLTexture.cpp	Fri Nov 06 17:30:36 2020 +0100
@@ -23,6 +23,7 @@
 #include "OpenGLTexture.h"
 #include "IOpenGLContext.h"
 
+#include <Logging.h>
 #include <OrthancException.h>
 
 namespace OrthancStone
--- a/OrthancStone/Sources/Oracle/GenericOracleRunner.cpp	Wed Nov 04 11:39:15 2020 +0100
+++ b/OrthancStone/Sources/Oracle/GenericOracleRunner.cpp	Fri Nov 06 17:30:36 2020 +0100
@@ -45,9 +45,10 @@
 
 #include <Compression/GzipCompressor.h>
 #include <HttpClient.h>
+#include <Logging.h>
 #include <OrthancException.h>
+#include <SystemToolbox.h>
 #include <Toolbox.h>
-#include <SystemToolbox.h>
 
 #include <boost/filesystem.hpp>
 
--- a/OrthancStone/Sources/Oracle/HttpCommand.cpp	Wed Nov 04 11:39:15 2020 +0100
+++ b/OrthancStone/Sources/Oracle/HttpCommand.cpp	Fri Nov 06 17:30:36 2020 +0100
@@ -22,6 +22,7 @@
 
 #include "HttpCommand.h"
 
+#include <Logging.h>
 #include <OrthancException.h>
 
 #ifdef _MSC_VER
--- a/OrthancStone/Sources/Oracle/OracleCommandBase.cpp	Wed Nov 04 11:39:15 2020 +0100
+++ b/OrthancStone/Sources/Oracle/OracleCommandBase.cpp	Fri Nov 06 17:30:36 2020 +0100
@@ -22,6 +22,7 @@
 
 #include "OracleCommandBase.h"
 
+#include <Logging.h>
 #include <OrthancException.h>
 
 namespace OrthancStone
--- a/OrthancStone/Sources/Oracle/OrthancRestApiCommand.cpp	Wed Nov 04 11:39:15 2020 +0100
+++ b/OrthancStone/Sources/Oracle/OrthancRestApiCommand.cpp	Fri Nov 06 17:30:36 2020 +0100
@@ -22,6 +22,7 @@
 
 #include "OrthancRestApiCommand.h"
 
+#include <Logging.h>
 #include <OrthancException.h>
 
 #ifdef _MSC_VER
--- a/OrthancStone/Sources/Oracle/ParseDicomFromWadoCommand.cpp	Wed Nov 04 11:39:15 2020 +0100
+++ b/OrthancStone/Sources/Oracle/ParseDicomFromWadoCommand.cpp	Fri Nov 06 17:30:36 2020 +0100
@@ -24,6 +24,8 @@
 
 #include <OrthancException.h>
 
+#include <cassert>
+
 namespace OrthancStone
 {
   ParseDicomFromWadoCommand::ParseDicomFromWadoCommand(const DicomSource& source,
--- a/OrthancStone/Sources/Scene2D/Internals/OpenGLLinesProgram.cpp	Wed Nov 04 11:39:15 2020 +0100
+++ b/OrthancStone/Sources/Scene2D/Internals/OpenGLLinesProgram.cpp	Fri Nov 06 17:30:36 2020 +0100
@@ -23,6 +23,7 @@
 #include "OpenGLLinesProgram.h"
 #include "OpenGLShaderVersionDirective.h"
 
+#include <Logging.h>
 #include <OrthancException.h>
 
 
--- a/OrthancStone/Sources/Scene2D/Internals/OpenGLTextProgram.cpp	Wed Nov 04 11:39:15 2020 +0100
+++ b/OrthancStone/Sources/Scene2D/Internals/OpenGLTextProgram.cpp	Fri Nov 06 17:30:36 2020 +0100
@@ -25,6 +25,7 @@
 
 #include "../../Fonts/OpenGLTextCoordinates.h"
 
+#include <Logging.h>
 #include <OrthancException.h>
 
 
--- a/OrthancStone/Sources/Scene2D/LookupTableTextureSceneLayer.cpp	Wed Nov 04 11:39:15 2020 +0100
+++ b/OrthancStone/Sources/Scene2D/LookupTableTextureSceneLayer.cpp	Fri Nov 06 17:30:36 2020 +0100
@@ -24,6 +24,7 @@
 
 #include <Images/Image.h>
 #include <Images/ImageProcessing.h>
+#include <Logging.h>
 #include <OrthancException.h>
 
 namespace OrthancStone
--- a/OrthancStone/Sources/Scene2D/MacroSceneLayer.cpp	Wed Nov 04 11:39:15 2020 +0100
+++ b/OrthancStone/Sources/Scene2D/MacroSceneLayer.cpp	Fri Nov 06 17:30:36 2020 +0100
@@ -24,6 +24,8 @@
 
 #include <OrthancException.h>
 
+#include <cassert>
+
 namespace OrthancStone
 {
   void MacroSceneLayer::Clear()
--- a/OrthancStone/Sources/Scene2D/TextureBaseSceneLayer.cpp	Wed Nov 04 11:39:15 2020 +0100
+++ b/OrthancStone/Sources/Scene2D/TextureBaseSceneLayer.cpp	Fri Nov 06 17:30:36 2020 +0100
@@ -22,6 +22,7 @@
 
 #include "TextureBaseSceneLayer.h"
 
+#include <Logging.h>
 #include <OrthancException.h>
 
 namespace OrthancStone
--- a/OrthancStone/Sources/Toolbox/OsiriX/ArrayValue.cpp	Wed Nov 04 11:39:15 2020 +0100
+++ b/OrthancStone/Sources/Toolbox/OsiriX/ArrayValue.cpp	Fri Nov 06 17:30:36 2020 +0100
@@ -24,6 +24,8 @@
 
 #include <OrthancException.h>
 
+#include <cassert>
+
 
 namespace OrthancStone
 {
--- a/OrthancStone/Sources/Toolbox/OsiriX/DictionaryValue.cpp	Wed Nov 04 11:39:15 2020 +0100
+++ b/OrthancStone/Sources/Toolbox/OsiriX/DictionaryValue.cpp	Fri Nov 06 17:30:36 2020 +0100
@@ -24,6 +24,8 @@
 
 #include <OrthancException.h>
 
+#include <cassert>
+
 
 namespace OrthancStone
 {
--- a/OrthancStone/Sources/Toolbox/OsiriX/IValue.cpp	Wed Nov 04 11:39:15 2020 +0100
+++ b/OrthancStone/Sources/Toolbox/OsiriX/IValue.cpp	Fri Nov 06 17:30:36 2020 +0100
@@ -29,6 +29,8 @@
 #include <OrthancException.h>
 #include <Toolbox.h>
 
+#include <boost/lexical_cast.hpp>
+
 
 namespace OrthancStone
 {
--- a/OrthancStone/Sources/Toolbox/ParsedDicomCache.cpp	Wed Nov 04 11:39:15 2020 +0100
+++ b/OrthancStone/Sources/Toolbox/ParsedDicomCache.cpp	Fri Nov 06 17:30:36 2020 +0100
@@ -22,6 +22,11 @@
 
 #include "ParsedDicomCache.h"
 
+#include <Logging.h>
+
+#include <cassert>
+
+
 namespace OrthancStone
 {
   class ParsedDicomCache::Item : public Orthanc::ICacheable
--- a/OrthancStone/Sources/Toolbox/SlicesSorter.cpp	Wed Nov 04 11:39:15 2020 +0100
+++ b/OrthancStone/Sources/Toolbox/SlicesSorter.cpp	Fri Nov 06 17:30:36 2020 +0100
@@ -24,6 +24,7 @@
 
 #include "GeometryToolbox.h"
 
+#include <Logging.h>
 #include <OrthancException.h>
 
 namespace OrthancStone
--- a/OrthancStone/Sources/Volumes/DicomVolumeImage.cpp	Wed Nov 04 11:39:15 2020 +0100
+++ b/OrthancStone/Sources/Volumes/DicomVolumeImage.cpp	Fri Nov 06 17:30:36 2020 +0100
@@ -22,6 +22,7 @@
 
 #include "DicomVolumeImage.h"
 
+#include <Logging.h>
 #include <OrthancException.h>
 
 
--- a/OrthancStone/Sources/Volumes/DicomVolumeImageMPRSlicer.cpp	Wed Nov 04 11:39:15 2020 +0100
+++ b/OrthancStone/Sources/Volumes/DicomVolumeImageMPRSlicer.cpp	Fri Nov 06 17:30:36 2020 +0100
@@ -26,6 +26,7 @@
 
 #include "../Toolbox/ImageToolbox.h"
 
+#include <Logging.h>
 #include <OrthancException.h>
 //#include <Images/PngWriter.h>
 #include <Images/JpegWriter.h>
--- a/OrthancStone/Sources/Volumes/IVolumeSlicer.cpp	Wed Nov 04 11:39:15 2020 +0100
+++ b/OrthancStone/Sources/Volumes/IVolumeSlicer.cpp	Fri Nov 06 17:30:36 2020 +0100
@@ -22,6 +22,7 @@
 
 #include "IVolumeSlicer.h"
 
+#include <Logging.h>
 #include <OrthancException.h>
 
 namespace OrthancStone
--- a/OrthancStone/Sources/Volumes/VolumeImageGeometry.cpp	Wed Nov 04 11:39:15 2020 +0100
+++ b/OrthancStone/Sources/Volumes/VolumeImageGeometry.cpp	Fri Nov 06 17:30:36 2020 +0100
@@ -24,6 +24,7 @@
 
 #include "../Toolbox/GeometryToolbox.h"
 
+#include <Logging.h>
 #include <OrthancException.h>
 
 
--- a/OrthancStone/Sources/Volumes/VolumeReslicer.cpp	Wed Nov 04 11:39:15 2020 +0100
+++ b/OrthancStone/Sources/Volumes/VolumeReslicer.cpp	Fri Nov 06 17:30:36 2020 +0100
@@ -504,12 +504,15 @@
                                       const CoordinateSystem3D& plane,
                                       const OrientedVolumeBoundingBox& box) const
   {
-    for (unsigned int y = 0; y < slice_->GetHeight(); y++)
+    const unsigned int width = slice_->GetWidth();
+    const unsigned int height = slice_->GetHeight();
+    
+    for (unsigned int y = 0; y < height; y++)
     {
       FastRowIterator fast(*slice_, extent_, plane, box, y);
       SlowRowIterator slow(*slice_, extent_, plane, box, y);
 
-      for (unsigned int x = 0; x < slice_->GetWidth(); x++)
+      for (unsigned int x = 0; x < width; x++)
       {
         float px, py, pz;
         fast.GetVolumeCoordinates(px, py, pz);