diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2019-08-14 11:45:34 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2019-08-14 11:45:34 +0200 |
| commit | d9261bdb05cd0863a2c3747c812871dbb851646e (patch) | |
| tree | d1a81110e3fe213747a58f236e021a085417f663 /include/astra/cuda/2d | |
| parent | 9a58b7451179ed512f975bc4c90fb71f172250b9 (diff) | |
| download | astra-d9261bdb05cd0863a2c3747c812871dbb851646e.tar.gz astra-d9261bdb05cd0863a2c3747c812871dbb851646e.tar.bz2 astra-d9261bdb05cd0863a2c3747c812871dbb851646e.tar.xz astra-d9261bdb05cd0863a2c3747c812871dbb851646e.zip | |
Replace signal-based abort handling by query-based handling
The abort handling is currently only used to process Ctrl-C from Matlab.
Since Matlab R2019a, it appears that calling utIsInterruptPending() from
a thread other than the main thread will crash. The previous approach of
checking utIsInterruptPending() in a thread, and then signalling the running
algorithm was therefore broken.
Diffstat (limited to 'include/astra/cuda/2d')
| -rw-r--r-- | include/astra/cuda/2d/algo.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/astra/cuda/2d/algo.h b/include/astra/cuda/2d/algo.h index 2ce929c..3fccdef 100644 --- a/include/astra/cuda/2d/algo.h +++ b/include/astra/cuda/2d/algo.h @@ -56,8 +56,6 @@ public: bool setSuperSampling(int raysPerDet, int raysPerPixelDim); - void signalAbort() { shouldAbort = true; } - virtual bool enableVolumeMask(); virtual bool enableSinogramMask(); @@ -137,8 +135,6 @@ protected: SFanProjection* fanProjs; float fOutputScale; - volatile bool shouldAbort; - bool freeGPUMemory; // Input/output |