[ismrmrd] 263/281: fixing little bugs in xml/ and matlab/

[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 0eb88922c7116755f1523aa3bec2d3dbe1cf26ae
Author: Joseph Naegele <joseph.naegele at gmail.com>
Date:   Fri Aug 22 14:45:48 2014 -0400

    fixing little bugs in xml/ and matlab/
---
 matlab/CMakeLists.txt | 2 --
 xml/ismrmrd_meta.h    | 3 +++
 xml/ismrmrd_xml.cpp   | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/matlab/CMakeLists.txt b/matlab/CMakeLists.txt
index f790284..5548b73 100644
--- a/matlab/CMakeLists.txt
+++ b/matlab/CMakeLists.txt
@@ -32,7 +32,6 @@ else (NOT JAVA_FOUND)
         InterleavingDimensionType
         ParallelImagingType
         UserParameterBase64Type
-        DicomParametersType
         IsmrmrdHeader
         ReferencedImageSequence
         UserParameterDoubleType
@@ -42,7 +41,6 @@ else (NOT JAVA_FOUND)
         UserParameterLongType
 	UserParameterStringType
         EncodingLimitsType
-        MRImageModule
         StudyInformationType
         UserParameters
         EncodingSpaceType
diff --git a/xml/ismrmrd_meta.h b/xml/ismrmrd_meta.h
index 3fd5fd8..477c2aa 100644
--- a/xml/ismrmrd_meta.h
+++ b/xml/ismrmrd_meta.h
@@ -85,18 +85,21 @@ namespace ISMRMRD
     MetaValue& operator=(const char * s) 
     {
       set(s);
+      return *this;
     }
 
     ///Assignment operator for long
     MetaValue& operator=(long l) 
     {
       set(l);
+      return *this;
     }
 
     ///Assignment operator for double
     MetaValue& operator=(double d) 
     {
       set(d);
+      return *this;
     }
 
     ///Get the ingeter representation of the value
diff --git a/xml/ismrmrd_xml.cpp b/xml/ismrmrd_xml.cpp
index 019446b..e419b93 100644
--- a/xml/ismrmrd_xml.cpp
+++ b/xml/ismrmrd_xml.cpp
@@ -352,7 +352,7 @@ namespace ISMRMRD
 	info.frameOfReferenceUID = parse_optional_string(measurementInformation,"frameOfReferenceUID");
 
 	//This part of the schema is totally messed up and needs to be fixed, but for now we will just read it. 
-	pugi::xml_node ri = measurementInformation.child("referencedImageSequemce");
+	pugi::xml_node ri = measurementInformation.child("referencedImageSequence");
 	if (ri) {
 	  pugi::xml_node ric = ri.child("referencedSOPInstanceUID");
 	  while (ric) {

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