Merge branch 'master' of tux.creatis.insa-lyon.fr:clitk

diff --git a/common/clitkDicomRT_StructureSet.cxx b/common/clitkDicomRT_StructureSet.cxx
index a26804b1839a49f0a3d6e5c51693ccc09c98dead..bbbcfd61274aebff7bb969dfc51d508d4ddca3a7 100644 (file)
--- a/common/clitkDicomRT_StructureSet.cxx
+++ b/common/clitkDicomRT_StructureSet.cxx
@@ -443,7 +443,10 @@ bool clitk::DicomRT_StructureSet::IsDicomRTStruct(const std::string & filename)
   //Verify if the file is a RT-Structure-Set dicom file
   if (!gdcm::Util::DicomStringEqual(mFile->GetEntryValue(0x0008,0x0016),"1.2.840.10008.5.1.4.1.1.481.3")) 
     return false;
-  if (!gdcm::Util::DicomStringEqual(mFile->GetEntryValue(0x0008,0x0060),"RTSTRUCT")) return false;
+  if (!gdcm::Util::DicomStringEqual(mFile->GetEntryValue(0x0008,0x0060),"RTSTRUCT"))
+    return false;
+
+  return true;
 
 #endif
 }

diff --git a/segmentation/clitkAnatomicalFeatureDatabase.txx b/segmentation/clitkAnatomicalFeatureDatabase.txx
index 72e9dcdd06b9293742aa70dac935eb9d58ff4421..dc7c39a6652d9672e44543e317ec22860e1afd3d 100644 (file)
--- a/segmentation/clitkAnatomicalFeatureDatabase.txx
+++ b/segmentation/clitkAnatomicalFeatureDatabase.txx
@@ -34,7 +34,10 @@ GetImage(std::string tag, bool reload)
     else {
       std::string s = m_MapOfTag[tag];
       // Read the file
-      image = readImage<ImageType>(GetPath()+"/"+s);
+      if (s[0] != '/')
+        image = readImage<ImageType>(GetPath() + "/" + s);
+      else
+        image = readImage<ImageType>(s);
       // I add a reference count because the cache is not a smartpointer
       image->SetReferenceCount(image->GetReferenceCount()+1);
       // Insert into the cache