[ismrmrd] 254/281: Fixed minor bugs in XML library

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to annotated tag ismrmrd0.5
in repository ismrmrd.

commit 3546d981fd0373dc9423b9f131d6a1f097cd5aa5
Author: Michael S. Hansen <michael.hansen at nih.gov>
Date:   Wed Aug 13 12:39:01 2014 -0400

    Fixed minor bugs in XML library
---
 schema/ismrmrd_example_extended.xml | 2 +-
 xml/ismrmrd_xml.cpp                 | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/schema/ismrmrd_example_extended.xml b/schema/ismrmrd_example_extended.xml
index e1c3b03..f2a12c5 100644
--- a/schema/ismrmrd_example_extended.xml
+++ b/schema/ismrmrd_example_extended.xml
@@ -45,7 +45,6 @@
     <H1resonanceFrequency_Hz>63642459</H1resonanceFrequency_Hz>
   </experimentalConditions>
   <encoding>
-    <trajectory>cartesian</trajectory>
     <encodedSpace>
       <matrixSize>
         <x>256</x>
@@ -92,6 +91,7 @@
         <center>0</center>
       </set>
     </encodingLimits>
+    <trajectory>cartesian</trajectory>
   </encoding>
   <encoding>
     <encodedSpace>
diff --git a/xml/ismrmrd_xml.cpp b/xml/ismrmrd_xml.cpp
index a34aec0..09206b7 100644
--- a/xml/ismrmrd_xml.cpp
+++ b/xml/ismrmrd_xml.cpp
@@ -76,7 +76,7 @@ namespace ISMRMRD
     Optional<long> r;
     pugi::xml_node nc = n.child(child);
     if (nc) {
-      r = std::atoi(nc.child_value());
+      r = std::atol(nc.child_value());
     }
     return r;
   }
@@ -563,7 +563,7 @@ namespace ISMRMRD
       for (size_t i = 0; i < h.measurementInformation->measurementDependency.size(); i++) {
 	n2 = n1.append_child();
 	n2.set_name("measurementDependency");
-	append_node(n2,"deoendencyType",h.measurementInformation->measurementDependency[i].dependencyType);
+	append_node(n2,"dependencyType",h.measurementInformation->measurementDependency[i].dependencyType);
 	append_node(n2,"measurementID",h.measurementInformation->measurementDependency[i].measurementID);
       }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ismrmrd.git