Mercurial > hg > orthanc-stone

changeset 2063:b6b5e1ca1cc2 deep-learning

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rename
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 03 May 2023 22:00:38 +0200
parents f5db73779f2d
children 4e31d76c7ecd
files OrthancStone/Sources/OpenGL/OpenGLFramebuffer.h OrthancStone/Sources/OpenGL/OpenGLTextureArray.cpp OrthancStone/Sources/OpenGL/OpenGLTextureArray.h
diffstat 3 files changed, 12 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancStone/Sources/OpenGL/OpenGLFramebuffer.h	Wed May 03 16:48:59 2023 +0200
+++ b/OrthancStone/Sources/OpenGL/OpenGLFramebuffer.h	Wed May 03 22:00:38 2023 +0200
@@ -34,6 +34,7 @@
   {
     class OpenGLTexture;
     class OpenGLTextureArray;
+    class OpenGLTextureVolume;
 
     class OpenGLFramebuffer : public boost::noncopyable
     {
@@ -55,12 +56,19 @@
       void SetTarget(OpenGLTextureArray& target,
                      unsigned int layer);
 
+      void SetTarget(OpenGLTextureVolume& target,
+                     unsigned int z);
+
       void ReadTexture(Orthanc::ImageAccessor& target,
                        const OpenGLTexture& source);
 
       void ReadTexture(Orthanc::ImageAccessor& target,
                        const OpenGLTextureArray& source,
                        unsigned int layer);
+
+      void ReadTexture(Orthanc::ImageAccessor& target,
+                       const OpenGLTextureVolume& source,
+                       unsigned int z);
     };
   }
 }
--- a/OrthancStone/Sources/OpenGL/OpenGLTextureArray.cpp	Wed May 03 16:48:59 2023 +0200
+++ b/OrthancStone/Sources/OpenGL/OpenGLTextureArray.cpp	Wed May 03 22:00:38 2023 +0200
@@ -223,7 +223,7 @@
     }
 
 
-    OpenGLTextureArray::DownloadedVolume::DownloadedVolume(const OpenGLTextureArray& texture) :
+    OpenGLTextureArray::DownloadedArray::DownloadedArray(const OpenGLTextureArray& texture) :
       format_(texture.format_),
       width_(texture.width_),
       height_(texture.height_),
@@ -282,7 +282,7 @@
     }
 
 
-    Orthanc::ImageAccessor* OpenGLTextureArray::DownloadedVolume::GetLayer(unsigned int layer) const
+    Orthanc::ImageAccessor* OpenGLTextureArray::DownloadedArray::GetLayer(unsigned int layer) const
     {
       if (layer >= depth_)
       {
--- a/OrthancStone/Sources/OpenGL/OpenGLTextureArray.h	Wed May 03 16:48:59 2023 +0200
+++ b/OrthancStone/Sources/OpenGL/OpenGLTextureArray.h	Wed May 03 22:00:38 2023 +0200
@@ -105,7 +105,7 @@
       void Upload(const Orthanc::ImageAccessor& image,
                   unsigned int layer);
 
-      class DownloadedVolume : public boost::noncopyable
+      class DownloadedArray : public boost::noncopyable
       {
       private:
         std::string           buffer_;
@@ -115,7 +115,7 @@
         unsigned int          depth_;
 
       public:
-        DownloadedVolume(const OpenGLTextureArray& texture);
+        DownloadedArray(const OpenGLTextureArray& texture);
 
         Orthanc::PixelFormat GetFormat() const
         {