summaryrefslogtreecommitdiffstats
path: root/src/Projector3D.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/Projector3D.cpp')
-rw-r--r--src/Projector3D.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/Projector3D.cpp b/src/Projector3D.cpp
index b546ee9..5e22105 100644
--- a/src/Projector3D.cpp
+++ b/src/Projector3D.cpp
@@ -92,11 +92,11 @@ bool CProjector3D::initialize(const Config& _cfg)
assert(_cfg.self);
ConfigStackCheck<CProjector3D> CC("Projector3D", this, _cfg);
- XMLNode* node;
+ XMLNode node;
- node = _cfg.self->getSingleNode("ProjectionGeometry");
+ node = _cfg.self.getSingleNode("ProjectionGeometry");
ASTRA_CONFIG_CHECK(node, "Projector3D", "No ProjectionGeometry tag specified.");
- std::string type = node->getAttribute("type");
+ std::string type = node.getAttribute("type");
CProjectionGeometry3D* pProjGeometry = 0;
if (type == "parallel3d") {
pProjGeometry = new CParallelProjectionGeometry3D();
@@ -108,18 +108,19 @@ bool CProjector3D::initialize(const Config& _cfg)
pProjGeometry = new CConeVecProjectionGeometry3D();
} else {
// Invalid geometry type
+ ASTRA_CONFIG_CHECK(false, "Projector3D", "Invalid projection geometry type specified.");
}
pProjGeometry->initialize(Config(node)); // this deletes node
m_pProjectionGeometry = pProjGeometry;
ASTRA_CONFIG_CHECK(m_pProjectionGeometry->isInitialized(), "Projector3D", "ProjectionGeometry not initialized.");
CC.markNodeParsed("ProjectionGeometry");
- node = _cfg.self->getSingleNode("VolumeGeometry");
+ node = _cfg.self.getSingleNode("VolumeGeometry");
ASTRA_CONFIG_CHECK(node, "Projector3D", "No VolumeGeometry tag specified.");
CVolumeGeometry3D* pVolGeometry = new CVolumeGeometry3D();
pVolGeometry->initialize(Config(node)); // this deletes node
m_pVolumeGeometry = pVolGeometry;
- ASTRA_CONFIG_CHECK(m_pVolumeGeometry->isInitialized(), "Projector2D", "VolumeGeometry not initialized.");
+ ASTRA_CONFIG_CHECK(m_pVolumeGeometry->isInitialized(), "Projector3D", "VolumeGeometry not initialized.");
CC.markNodeParsed("VolumeGeometry");
return true;