summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorWillem Jan Palenstijn <wjp@usecode.org>2018-07-18 11:46:05 +0200
committerGitHub <noreply@github.com>2018-07-18 11:46:05 +0200
commit93612c333d6aa0f7d80bd286d9983ce5047a0fd8 (patch)
treee78ac8d69f659b7c9c59e121f7dfb9cba8e5004f /build
parent0d06afc38d7a8443a079d25d72ec4b4b15353974 (diff)
parent4d741fc8e6c7930f7a8e27f54c55e0ad4949ed07 (diff)
downloadastra-93612c333d6aa0f7d80bd286d9983ce5047a0fd8.tar.gz
astra-93612c333d6aa0f7d80bd286d9983ce5047a0fd8.tar.bz2
astra-93612c333d6aa0f7d80bd286d9983ce5047a0fd8.tar.xz
astra-93612c333d6aa0f7d80bd286d9983ce5047a0fd8.zip
Merge pull request #160 from wjp/FBP_filters
Custom filter support for CPU FBP
Diffstat (limited to 'build')
-rw-r--r--build/linux/Makefile.in1
-rw-r--r--build/msvc/gen.py3
2 files changed, 3 insertions, 1 deletions
diff --git a/build/linux/Makefile.in b/build/linux/Makefile.in
index 1627a2e..0b90bd9 100644
--- a/build/linux/Makefile.in
+++ b/build/linux/Makefile.in
@@ -142,6 +142,7 @@ BASE_OBJECTS=\
src/FanFlatProjectionGeometry2D.lo \
src/FanFlatVecProjectionGeometry2D.lo \
src/FilteredBackProjectionAlgorithm.lo \
+ src/Filters.lo \
src/Float32Data2D.lo \
src/Float32Data3D.lo \
src/Float32Data3DMemory.lo \
diff --git a/build/msvc/gen.py b/build/msvc/gen.py
index fcc12d2..47e7440 100644
--- a/build/msvc/gen.py
+++ b/build/msvc/gen.py
@@ -214,6 +214,7 @@ P_astra["filters"]["Global &amp; Other\\source"] = [
"src\\AstraObjectManager.cpp",
"src\\CompositeGeometryManager.cpp",
"src\\Config.cpp",
+"src\\Filters.cpp",
"src\\Fourier.cpp",
"src\\Globals.cpp",
"src\\Logging.cpp",
@@ -292,7 +293,6 @@ P_astra["filters"]["CUDA\\cuda headers"] = [
"include\\astra\\cuda\\2d\\em.h",
"include\\astra\\cuda\\2d\\fan_bp.h",
"include\\astra\\cuda\\2d\\fan_fp.h",
-"include\\astra\\cuda\\2d\\fbp_filters.h",
"include\\astra\\cuda\\2d\\fbp.h",
"include\\astra\\cuda\\2d\\fft.h",
"include\\astra\\cuda\\2d\\par_bp.h",
@@ -354,6 +354,7 @@ P_astra["filters"]["Global &amp; Other\\headers"] = [
"include\\astra\\clog.h",
"include\\astra\\CompositeGeometryManager.h",
"include\\astra\\Config.h",
+"include\\astra\\Filters.h",
"include\\astra\\Fourier.h",
"include\\astra\\Globals.h",
"include\\astra\\Logging.h",