summaryrefslogtreecommitdiffstats
path: root/src/Projector2D.cpp
diff options
context:
space:
mode:
authorWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2015-05-13 11:56:24 +0200
committerWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2015-05-13 11:56:24 +0200
commitde30f7538a865a2ee7acb7dd8294fb6cdc4f98be (patch)
treeba11189e6e83e83e73167518b45641fc287c8eda /src/Projector2D.cpp
parent6504cffdbe74d9b671222a7ec24b26fbb4f871f0 (diff)
parent86ad56f005d9d3871f654390739459d5634dd5d5 (diff)
downloadastra-de30f7538a865a2ee7acb7dd8294fb6cdc4f98be.tar.gz
astra-de30f7538a865a2ee7acb7dd8294fb6cdc4f98be.tar.bz2
astra-de30f7538a865a2ee7acb7dd8294fb6cdc4f98be.tar.xz
astra-de30f7538a865a2ee7acb7dd8294fb6cdc4f98be.zip
Merge branch 'master'
Diffstat (limited to 'src/Projector2D.cpp')
-rw-r--r--src/Projector2D.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Projector2D.cpp b/src/Projector2D.cpp
index 32a2956..cf233a0 100644
--- a/src/Projector2D.cpp
+++ b/src/Projector2D.cpp
@@ -114,12 +114,12 @@ bool CProjector2D::initialize(const Config& _cfg)
}
// required: ProjectionGeometry
- XMLNode* node = _cfg.self->getSingleNode("ProjectionGeometry");
+ XMLNode node = _cfg.self.getSingleNode("ProjectionGeometry");
ASTRA_CONFIG_CHECK(node, "Projector2D", "No ProjectionGeometry tag specified.");
// FIXME: Change how the base class is created. (This is duplicated
// in astra_mex_data2d.cpp.)
- std::string type = node->getAttribute("type");
+ std::string type = node.getAttribute("type");
if (type == "sparse_matrix") {
m_pProjectionGeometry = new CSparseMatrixProjectionGeometry2D();
m_pProjectionGeometry->initialize(Config(node));
@@ -141,7 +141,7 @@ bool CProjector2D::initialize(const Config& _cfg)
// required: VolumeGeometry
- node = _cfg.self->getSingleNode("VolumeGeometry");
+ node = _cfg.self.getSingleNode("VolumeGeometry");
ASTRA_CONFIG_CHECK(node, "Projector2D", "No VolumeGeometry tag specified.");
m_pVolumeGeometry = new CVolumeGeometry2D();
m_pVolumeGeometry->initialize(Config(node));