Merge branch 'master' into volgeom3d

Conflicts:
	src/CudaBackProjectionAlgorithm3D.cpp

3 files changed, 50 insertions, 32 deletions

diff --git a/tests/test_Fourier.cpp b/tests/test_Fourier.cpp
index 2602edb..ef12747 100644
--- a/tests/test_Fourier.cpp
+++ b/tests/test_Fourier.cpp
@@ -105,8 +105,8 @@ BOOST_AUTO_TEST_CASE( testFourier_FFT_1D_1 )
 {
 	astra::float32 inR[8] = { 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f };
 	astra::float32 inI[8] = { 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f };
-	astra::float32 outR[5];
-	astra::float32 outI[5];
+	astra::float32 outR[8];
+	astra::float32 outI[8];
 
 	astra::fastTwoPowerFourierTransform1D(8, inR, inI, outR, outI, 1, 1, false);
 
diff --git a/tests/test_ParallelBeamLineKernelProjector2D.cpp b/tests/test_ParallelBeamLineKernelProjector2D.cpp
index 86bc54f..c56ff37 100644
--- a/tests/test_ParallelBeamLineKernelProjector2D.cpp
+++ b/tests/test_ParallelBeamLineKernelProjector2D.cpp
@@ -77,6 +77,8 @@ BOOST_FIXTURE_TEST_CASE( testParallelBeamLineKernelProjector2D_Rectangle, TestPa
 		fWeight += pPix[i].m_fWeight;
 
 	BOOST_CHECK_SMALL(fWeight - 7.13037f, 0.00001f);
+
+	delete[] pPix;
 }
 
 
diff --git a/tests/test_XMLDocument.cpp b/tests/test_XMLDocument.cpp
index adabdd6..95429cb 100644
--- a/tests/test_XMLDocument.cpp
+++ b/tests/test_XMLDocument.cpp
@@ -32,18 +32,22 @@ $Id$
 #include <boost/test/auto_unit_test.hpp>
 
 #include "astra/XMLDocument.h"
+#include "astra/Config.h"
 
 BOOST_AUTO_TEST_CASE( testXMLDocument_Constructor1 )
 {
 	astra::XMLDocument *doc = astra::XMLDocument::createDocument("test");
 	BOOST_REQUIRE(doc);
 
-	astra::XMLNode *root = doc->getRootNode();
+	astra::XMLNode root = doc->getRootNode();
 
 	BOOST_REQUIRE(root);
 
-	BOOST_CHECK(root->getName() == "test");
-	BOOST_CHECK(root->getContent().empty());
+	BOOST_CHECK(root.getName() == "test");
+	BOOST_CHECK(root.getContent().empty());
+
+	delete doc;
+
 }
 
 BOOST_AUTO_TEST_CASE( testXMLDocument_FileIO )
@@ -53,12 +57,15 @@ BOOST_AUTO_TEST_CASE( testXMLDocument_FileIO )
 	doc->saveToFile("test.xml");
 
 	astra::XMLDocument *doc2 = astra::XMLDocument::readFromFile("test.xml");
-	astra::XMLNode *root = doc2->getRootNode();
+	astra::XMLNode root = doc2->getRootNode();
 
 	BOOST_REQUIRE(root);
 
-	BOOST_CHECK(root->getName() == "test");
-	BOOST_CHECK(root->getContent().empty());
+	BOOST_CHECK(root.getName() == "test");
+	BOOST_CHECK(root.getContent().empty());
+
+	delete doc2;
+	delete doc;
 
 }
 
@@ -67,32 +74,28 @@ BOOST_AUTO_TEST_CASE( testXMLDocument_CreateNodes )
 	astra::XMLDocument *doc = astra::XMLDocument::createDocument("test");
 	BOOST_REQUIRE(doc);
 
-	astra::XMLNode *root = doc->getRootNode();
+	astra::XMLNode root = doc->getRootNode();
 	BOOST_REQUIRE(root);
 
-	astra::XMLNode *node = root->addChildNode("child");
+	astra::XMLNode node = root.addChildNode("child");
 	BOOST_REQUIRE(node);
 
-	node->addAttribute("attr", "val");
+	node.addAttribute("attr", "val");
 
 	doc->saveToFile("test2.xml");
 
-	delete node;
-	delete root;
 	delete doc;
 
 	doc = astra::XMLDocument::readFromFile("test2.xml");
 	BOOST_REQUIRE(doc);
 	root = doc->getRootNode();
 	BOOST_REQUIRE(node);
-	node = root->getSingleNode("child");
+	node = root.getSingleNode("child");
 	BOOST_REQUIRE(node);
 
-	BOOST_CHECK(node->hasAttribute("attr"));
-	BOOST_CHECK(node->getAttribute("attr") == "val");
+	BOOST_CHECK(node.hasAttribute("attr"));
+	BOOST_CHECK(node.getAttribute("attr") == "val");
 
-	delete node;
-	delete root;
 	delete doc;
 }
 
@@ -101,16 +104,18 @@ BOOST_AUTO_TEST_CASE( testXMLDocument_Options )
 	astra::XMLDocument *doc = astra::XMLDocument::createDocument("test");
 	BOOST_REQUIRE(doc);
 
-	astra::XMLNode *root = doc->getRootNode();
+	astra::XMLNode root = doc->getRootNode();
 	BOOST_REQUIRE(root);
 
-	BOOST_CHECK(!root->hasOption("opt"));
+	BOOST_CHECK(!root.hasOption("opt"));
+
+	root.addOption("opt", "val");
 
-	root->addOption("opt", "val");
+	BOOST_CHECK(root.hasOption("opt"));
 
-	BOOST_CHECK(root->hasOption("opt"));
+	BOOST_CHECK(root.getOption("opt") == "val");
 
-	BOOST_CHECK(root->getOption("opt") == "val");
+	delete doc;
 
 }
 
@@ -119,40 +124,51 @@ BOOST_AUTO_TEST_CASE( testXMLDocument_List )
 	astra::XMLDocument *doc = astra::XMLDocument::createDocument("test");
 	BOOST_REQUIRE(doc);
 
-	astra::XMLNode *root = doc->getRootNode();
+	astra::XMLNode root = doc->getRootNode();
 	BOOST_REQUIRE(root);
 
-	astra::XMLNode *node = root->addChildNode("child");
+	astra::XMLNode node = root.addChildNode("child");
 	BOOST_REQUIRE(node);
 
 
 	float fl[] = { 1.0, 3.5, 2.0, 4.75 };
 
-	node->setContent(fl, sizeof(fl)/sizeof(fl[0]));
+	node.setContent(fl, sizeof(fl)/sizeof(fl[0]));
 
 	doc->saveToFile("test3.xml");
 
-	delete node;
-	delete root;
 	delete doc;
 
 	doc = astra::XMLDocument::readFromFile("test3.xml");
 	BOOST_REQUIRE(doc);
 	root = doc->getRootNode();
 	BOOST_REQUIRE(root);
-	node = root->getSingleNode("child");
+	node = root.getSingleNode("child");
 	BOOST_REQUIRE(node);
 
-	std::vector<astra::float32> f = node->getContentNumericalArray();
+	std::vector<astra::float32> f = node.getContentNumericalArray();
 
 	BOOST_CHECK(f[0] == fl[0]);
 	BOOST_CHECK(f[1] == fl[1]);
 	BOOST_CHECK(f[2] == fl[2]);
 	BOOST_CHECK(f[3] == fl[3]);
 
-	delete node;
-	delete root;
 	delete doc;
 
 }
 
+BOOST_AUTO_TEST_CASE( testXMLDocument_Config )
+{
+	astra::Config* cfg = new astra::Config();
+	cfg->initialize("VolumeGeometry2D");
+
+	cfg->self.addChildNode("GridColCount", 1);
+	cfg->self.addChildNode("GridRowCount", 2);
+
+	cfg->self.addOption("WindowMinX", 3);
+	cfg->self.addOption("WindowMaxX", 4);
+	cfg->self.addOption("WindowMinY", 5);
+	cfg->self.addOption("WindowMaxY", 6);
+
+	delete cfg;
+}