diff options
| author | Willem Jan Palenstijn <WillemJan.Palenstijn@uantwerpen.be> | 2014-04-07 21:37:47 +0000 |
|---|---|---|
| committer | wpalenst <WillemJan.Palenstijn@uantwerpen.be> | 2014-04-07 21:37:47 +0000 |
| commit | efaf4fcf008d725b98b8964c0bdd09267c4ba0a8 (patch) | |
| tree | 19a550362f25a6288448374ea043ae8d1269ffb1 | |
| parent | 1eba5d772d768ce06ada5fbf2422a2bd4eae4fe0 (diff) | |
| download | astra-efaf4fcf008d725b98b8964c0bdd09267c4ba0a8.tar.gz astra-efaf4fcf008d725b98b8964c0bdd09267c4ba0a8.tar.bz2 astra-efaf4fcf008d725b98b8964c0bdd09267c4ba0a8.tar.xz astra-efaf4fcf008d725b98b8964c0bdd09267c4ba0a8.zip | |
Fix Windows build
| -rw-r--r-- | NEWS.txt | 5 | ||||
| -rw-r--r-- | README.txt | 4 | ||||
| -rw-r--r-- | astra_vc08.vcproj | 2 | ||||
| -rw-r--r-- | cuda/2d/darthelper.cu | 2 | ||||
| -rw-r--r-- | cuda/2d/darthelper.h | 4 |
5 files changed, 11 insertions, 6 deletions
@@ -6,9 +6,12 @@ Copyright: iMinds-Vision Lab, University of Antwerp License: Open Source under GPLv3 Contact: astra@ua.ac.be Website: http://astra.ua.ac.be - http://code.google.com/p/astra-toolbox/ + http://sf.net/projects/astra-toolbox ----------------------------------------------------------------------- +1.4 (2014-04-07) + * various consistency and bug fixes + 1.3 (2013-07-02) * various consistency and bug fixes * add a version of the DART algorithm (written by Wim van Aarle) @@ -6,7 +6,7 @@ Copyright: iMinds-Vision Lab, University of Antwerp License: Open Source under GPLv3 Contact: astra@ua.ac.be Website: http://astra.ua.ac.be - http://code.google.com/p/astra-toolbox/ + http://sf.net/projects/astra-toolbox ----------------------------------------------------------------------- @@ -29,7 +29,7 @@ Documentation / samples: ------------------------- See the matlab code samples in samples/ and on -http://code.google.com/p/astra-toolbox/ . +http://sf.net/projects/astra-toolbox . diff --git a/astra_vc08.vcproj b/astra_vc08.vcproj index 441262f..750a9eb 100644 --- a/astra_vc08.vcproj +++ b/astra_vc08.vcproj @@ -278,7 +278,7 @@ <Tool
Name="CUDA Build Rule"
Include="lib\include\cuda"
- Defines="-DDLL_EXPORTS"
+ Defines="DLL_EXPORTS"
Runtime="2"
Platform="2"
/>
diff --git a/cuda/2d/darthelper.cu b/cuda/2d/darthelper.cu index 28b77cc..768d14e 100644 --- a/cuda/2d/darthelper.cu +++ b/cuda/2d/darthelper.cu @@ -342,7 +342,7 @@ void dartSmoothing(float* out, const float* in, float b, unsigned int radius, un -bool setGPUIndex(int iGPUIndex) +_AstraExport bool setGPUIndex(int iGPUIndex) { if (iGPUIndex != -1) { cudaSetDevice(iGPUIndex); diff --git a/cuda/2d/darthelper.h b/cuda/2d/darthelper.h index 3694b96..8f57d3c 100644 --- a/cuda/2d/darthelper.h +++ b/cuda/2d/darthelper.h @@ -29,13 +29,15 @@ $Id$ #ifndef _CUDA_ARITH2_H #define _CUDA_ARITH2_H +#include "util.h" + namespace astraCUDA { void roiSelect(float* out, float radius, unsigned int width, unsigned int height); void dartMask(float* out, const float* in, unsigned int conn, unsigned int radius, unsigned int threshold, unsigned int width, unsigned int height); void dartSmoothing(float* out, const float* in, float b, unsigned int radius, unsigned int width, unsigned int height); - bool setGPUIndex(int index); + _AstraExport bool setGPUIndex(int index); } |