From 7bfc5b3713f750efe21992fcd8d02e840d5d4867 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>
Date: Wed, 5 Dec 2018 12:03:14 +0100
Subject: Read filter config for FBP from cfg.options
Since these settings are optional, they should have been in cfg.options
instead of directly in cfg. The old syntax remains a fallback.
This has the side-effect that the tomopy/astra interface can also supply them.
---
include/astra/Filters.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
(limited to 'include/astra')
diff --git a/include/astra/Filters.h b/include/astra/Filters.h
index a1dec97..2e229b9 100644
--- a/include/astra/Filters.h
+++ b/include/astra/Filters.h
@@ -28,6 +28,8 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>.
#ifndef _INC_ASTRA_FILTERS_H
#define _INC_ASTRA_FILTERS_H
+#include <string>
+
namespace astra {
struct Config;
@@ -82,7 +84,7 @@ float *genFilter(const SFilterConfig &_cfg,
int _iFFTFourierDetectorCount);
// Convert string to filter type. Returns FILTER_ERROR if unrecognized.
-E_FBPFILTER convertStringToFilter(const char * _filterType);
+E_FBPFILTER convertStringToFilter(const std::string &_filterType);
SFilterConfig getFilterConfigForAlgorithm(const Config& _cfg, CAlgorithm *_alg);
--
cgit v1.2.3