From 6ee36e978b73c99f4543278662e9da914357378e Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>
Date: Mon, 16 Oct 2017 19:07:45 +0200
Subject: Fix Windows/Python build

---
 cuda/3d/mem3d.cu | 2 +-
 cuda/3d/mem3d.h  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'cuda/3d')

diff --git a/cuda/3d/mem3d.cu b/cuda/3d/mem3d.cu
index ed779fa..2369149 100644
--- a/cuda/3d/mem3d.cu
+++ b/cuda/3d/mem3d.cu
@@ -326,7 +326,7 @@ bool FDK(const astra::CProjectionGeometry3D* pProjGeom, MemHandle3D projData, co
 
 }
 
-MemHandle3D wrapHandle(float *D_ptr, unsigned int x, unsigned int y, unsigned int z, unsigned int pitch)
+_AstraExport MemHandle3D wrapHandle(float *D_ptr, unsigned int x, unsigned int y, unsigned int z, unsigned int pitch)
 {
 	cudaPitchedPtr ptr;
 	ptr.ptr = D_ptr;
diff --git a/cuda/3d/mem3d.h b/cuda/3d/mem3d.h
index 7a87ae6..619354b 100644
--- a/cuda/3d/mem3d.h
+++ b/cuda/3d/mem3d.h
@@ -80,7 +80,7 @@ enum Mem3DZeroMode {
 size_t availableGPUMemory();
 int maxBlockDimension();
 
-MemHandle3D wrapHandle(float *D_ptr, unsigned int x, unsigned int y, unsigned int z, unsigned int pitch);
+_AstraExport MemHandle3D wrapHandle(float *D_ptr, unsigned int x, unsigned int y, unsigned int z, unsigned int pitch);
 
 MemHandle3D allocateGPUMemory(unsigned int x, unsigned int y, unsigned int z, Mem3DZeroMode zero);
 
-- 
cgit v1.2.3


From d753de051893698bfd1e107a2d03b1a38b55dd91 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>
Date: Tue, 31 Oct 2017 17:10:56 +0100
Subject: Remove some unnecessary includes

---
 cuda/3d/cgls3d.h       | 1 -
 cuda/3d/darthelper3d.h | 5 +----
 cuda/3d/sirt3d.h       | 1 -
 3 files changed, 1 insertion(+), 6 deletions(-)

(limited to 'cuda/3d')

diff --git a/cuda/3d/cgls3d.h b/cuda/3d/cgls3d.h
index e09fcfb..2ed2b1d 100644
--- a/cuda/3d/cgls3d.h
+++ b/cuda/3d/cgls3d.h
@@ -28,7 +28,6 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>.
 #ifndef _CUDA_CGLS3D_H
 #define _CUDA_CGLS3D_H
 
-#include "util3d.h"
 #include "algo3d.h"
 
 namespace astraCUDA3d {
diff --git a/cuda/3d/darthelper3d.h b/cuda/3d/darthelper3d.h
index 71ea5b0..539fa06 100644
--- a/cuda/3d/darthelper3d.h
+++ b/cuda/3d/darthelper3d.h
@@ -28,10 +28,7 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>.
 #ifndef _CUDA_DARTHELPER3_H
 #define _CUDA_DARTHELPER3_H
 
-#include <cuda.h>
-#include <driver_types.h>
-#include "util3d.h"
-#include "algo3d.h"
+#include "dims3d.h"
 
 namespace astraCUDA3d {
 
diff --git a/cuda/3d/sirt3d.h b/cuda/3d/sirt3d.h
index 69031b8..337ca89 100644
--- a/cuda/3d/sirt3d.h
+++ b/cuda/3d/sirt3d.h
@@ -28,7 +28,6 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>.
 #ifndef _CUDA_SIRT3D_H
 #define _CUDA_SIRT3D_H
 
-#include "util3d.h"
 #include "algo3d.h"
 
 namespace astraCUDA3d {
-- 
cgit v1.2.3