diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/AstraObjectFactory.cpp | 6 | ||||
| -rw-r--r-- | src/AstraObjectManager.cpp | 16 | ||||
| -rw-r--r-- | src/FanFlatBeamLineKernelProjector2D.cpp | 1 | ||||
| -rw-r--r-- | src/FanFlatBeamStripKernelProjector2D.cpp | 1 | ||||
| -rw-r--r-- | src/ParallelBeamBlobKernelProjector2D.cpp | 1 | ||||
| -rw-r--r-- | src/ParallelBeamLineKernelProjector2D.cpp | 1 | ||||
| -rw-r--r-- | src/ParallelBeamLinearKernelProjector2D.cpp | 1 | ||||
| -rw-r--r-- | src/ParallelBeamStripKernelProjector2D.cpp | 1 | ||||
| -rw-r--r-- | src/Utilities.cpp | 2 |
9 files changed, 18 insertions, 12 deletions
diff --git a/src/AstraObjectFactory.cpp b/src/AstraObjectFactory.cpp index 35132d0..1dda3b2 100644 --- a/src/AstraObjectFactory.cpp +++ b/src/AstraObjectFactory.cpp @@ -32,8 +32,8 @@ using namespace std; namespace astra { -DEFINE_SINGLETON2(CAstraObjectFactory<CAlgorithm, AlgorithmTypeList>); -DEFINE_SINGLETON2(CAstraObjectFactory<CProjector2D, Projector2DTypeList>); -DEFINE_SINGLETON2(CAstraObjectFactory<CProjector3D, Projector3DTypeList>); +DEFINE_SINGLETON2(CAstraObjectFactory<CAlgorithm, AlgorithmTypeList>) +DEFINE_SINGLETON2(CAstraObjectFactory<CProjector2D, Projector2DTypeList>) +DEFINE_SINGLETON2(CAstraObjectFactory<CProjector3D, Projector3DTypeList>) } // end namespace diff --git a/src/AstraObjectManager.cpp b/src/AstraObjectManager.cpp index 46eae4b..3b818d3 100644 --- a/src/AstraObjectManager.cpp +++ b/src/AstraObjectManager.cpp @@ -31,13 +31,13 @@ $Id$ namespace astra { -DEFINE_SINGLETON(CProjector2DManager); -DEFINE_SINGLETON(CProjector3DManager); -DEFINE_SINGLETON(CData2DManager); -DEFINE_SINGLETON(CData3DManager); -DEFINE_SINGLETON(CAlgorithmManager); -DEFINE_SINGLETON(CMatrixManager); - -DEFINE_SINGLETON(CAstraIndexManager); +DEFINE_SINGLETON(CProjector2DManager) +DEFINE_SINGLETON(CProjector3DManager) +DEFINE_SINGLETON(CData2DManager) +DEFINE_SINGLETON(CData3DManager) +DEFINE_SINGLETON(CAlgorithmManager) +DEFINE_SINGLETON(CMatrixManager) + +DEFINE_SINGLETON(CAstraIndexManager) } // end namespace diff --git a/src/FanFlatBeamLineKernelProjector2D.cpp b/src/FanFlatBeamLineKernelProjector2D.cpp index fd4195b..343144d 100644 --- a/src/FanFlatBeamLineKernelProjector2D.cpp +++ b/src/FanFlatBeamLineKernelProjector2D.cpp @@ -30,6 +30,7 @@ $Id$ #include <cmath> #include <cstring> +#include <algorithm> #include "astra/DataProjectorPolicies.h" diff --git a/src/FanFlatBeamStripKernelProjector2D.cpp b/src/FanFlatBeamStripKernelProjector2D.cpp index b48beab..6e2c518 100644 --- a/src/FanFlatBeamStripKernelProjector2D.cpp +++ b/src/FanFlatBeamStripKernelProjector2D.cpp @@ -29,6 +29,7 @@ $Id$ #include "astra/FanFlatBeamStripKernelProjector2D.h" #include <cmath> +#include <algorithm> #include "astra/DataProjectorPolicies.h" diff --git a/src/ParallelBeamBlobKernelProjector2D.cpp b/src/ParallelBeamBlobKernelProjector2D.cpp index 679d5c6..9b7c05f 100644 --- a/src/ParallelBeamBlobKernelProjector2D.cpp +++ b/src/ParallelBeamBlobKernelProjector2D.cpp @@ -29,6 +29,7 @@ $Id$ #include "astra/ParallelBeamBlobKernelProjector2D.h" #include <cmath> +#include <algorithm> #include "astra/DataProjectorPolicies.h" diff --git a/src/ParallelBeamLineKernelProjector2D.cpp b/src/ParallelBeamLineKernelProjector2D.cpp index e4a1bff..ccfb9f8 100644 --- a/src/ParallelBeamLineKernelProjector2D.cpp +++ b/src/ParallelBeamLineKernelProjector2D.cpp @@ -29,6 +29,7 @@ $Id$ #include "astra/ParallelBeamLineKernelProjector2D.h" #include <cmath> +#include <algorithm> #include "astra/DataProjectorPolicies.h" diff --git a/src/ParallelBeamLinearKernelProjector2D.cpp b/src/ParallelBeamLinearKernelProjector2D.cpp index 27aa168..2171e73 100644 --- a/src/ParallelBeamLinearKernelProjector2D.cpp +++ b/src/ParallelBeamLinearKernelProjector2D.cpp @@ -29,6 +29,7 @@ $Id$ #include "astra/ParallelBeamLinearKernelProjector2D.h" #include <cmath> +#include <algorithm> #include "astra/DataProjectorPolicies.h" diff --git a/src/ParallelBeamStripKernelProjector2D.cpp b/src/ParallelBeamStripKernelProjector2D.cpp index 3f4e7f3..a2869e2 100644 --- a/src/ParallelBeamStripKernelProjector2D.cpp +++ b/src/ParallelBeamStripKernelProjector2D.cpp @@ -29,6 +29,7 @@ $Id$ #include "astra/ParallelBeamStripKernelProjector2D.h" #include <cmath> +#include <algorithm> #include "astra/DataProjectorPolicies.h" diff --git a/src/Utilities.cpp b/src/Utilities.cpp index 8b0ca94..9733c30 100644 --- a/src/Utilities.cpp +++ b/src/Utilities.cpp @@ -121,7 +121,7 @@ void splitString(std::vector<std::string> &items, const std::string& s, size_t current = 0; size_t next; do { - next = s.find_first_of(",;", current); + next = s.find_first_of(delim, current); items.push_back(s.substr(current, next - current)); current = next + 1; } while (next != std::string::npos); |