From 1d851f0a8fa093e044c7264569cc6f88df39a16e Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Thu, 26 Jan 2017 14:57:42 +0100 Subject: Remove unused 3d global min/max --- include/astra/Float32Data3D.h | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'include/astra/Float32Data3D.h') diff --git a/include/astra/Float32Data3D.h b/include/astra/Float32Data3D.h index 1cd9c20..2b3b88e 100644 --- a/include/astra/Float32Data3D.h +++ b/include/astra/Float32Data3D.h @@ -107,22 +107,6 @@ public: */ int getDimensionCount() const; - /** - * Clamp data to minimum value - * - * @param _fMin minimum value - * @return l-value - */ - virtual CFloat32Data3D& clampMin(float32& _fMin) = 0; - - /** - * Clamp data to maximum value - * - * @param _fMax maximum value - * @return l-value - */ - virtual CFloat32Data3D& clampMax(float32& _fMax) = 0; - /** get a description of the class * * @return description string -- cgit v1.2.3 From d85a660f064e8130b27e11c7fd762221c754c315 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Thu, 26 Jan 2017 14:57:57 +0100 Subject: Start work on CFloat32Data3DGPU to allow persistent/external GPU memory --- include/astra/Float32Data3D.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include/astra/Float32Data3D.h') diff --git a/include/astra/Float32Data3D.h b/include/astra/Float32Data3D.h index 2b3b88e..aca82ab 100644 --- a/include/astra/Float32Data3D.h +++ b/include/astra/Float32Data3D.h @@ -32,6 +32,8 @@ along with the ASTRA Toolbox. If not, see . #include "Float32Data.h" #include "Float32Data2D.h" +#include "../../cuda/3d/mem3d.h" + namespace astra { /** -- cgit v1.2.3 From b0d9810a4caffef1c85cbdb30430591d99936345 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Wed, 8 Feb 2017 10:34:46 +0100 Subject: Update comments --- include/astra/Float32Data3D.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/astra/Float32Data3D.h') diff --git a/include/astra/Float32Data3D.h b/include/astra/Float32Data3D.h index aca82ab..226689e 100644 --- a/include/astra/Float32Data3D.h +++ b/include/astra/Float32Data3D.h @@ -37,7 +37,7 @@ along with the ASTRA Toolbox. If not, see . namespace astra { /** - * This class represents a three-dimensional block of float32ing point data. + * This class represents a 3-dimensional block of 32-bit floating point data. */ class _AstraExport CFloat32Data3D : public CFloat32Data { -- cgit v1.2.3