X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIODicomImageReader.cpp;h=a2c5ccfddba76c2b24bf7ec0d6e271c53e4cd67e;hb=3579beef5bd466705bc0431d7347d1150cdffe97;hp=bfc40893df5f4ca9aabbe46fb31d504661e49e60;hpb=702369fa1f89a638331e43543d83eb5db4c180ab;p=creaImageIO.git

diff --git a/src/creaImageIODicomImageReader.cpp b/src/creaImageIODicomImageReader.cpp
index bfc4089..a2c5ccf 100644
--- a/src/creaImageIODicomImageReader.cpp
+++ b/src/creaImageIODicomImageReader.cpp
@@ -1,9 +1,33 @@
-#include <creaImageIODicomImageReader.h>
-
-#include <vtkGdcmReader.h>
-
+/*
+# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
+#                        pour la Santé)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and 
+#  abiding by the rules of distribution of free software. You can  use, 
+#  modify and/ or redistribute the software under the terms of the CeCILL-B 
+#  license as circulated by CEA, CNRS and INRIA at the following URL 
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability. 
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------
+*/
 
 
+#include <creaImageIODicomImageReader.h>
+#include <vtkGdcmReader.h>
 #include <creaImageIOSystem.h>
 #include "boost/filesystem/path.hpp"
 
@@ -42,14 +66,14 @@ namespace creaImageIO
     GDCM_NAME_SPACE::Document*doc;
     GDCM_NAME_SPACE::File* file = GDCM_NAME_SPACE::File::New();
     file->SetLoadMode( GDCM_NAME_SPACE::LD_ALL);
-    file->SetFileName(filename.c_str());
+    file->SetFileName( filename );
     file->Load();
     bool ok = file->IsReadable();
 	if(!ok)
 	{
 		doc = (GDCM_NAME_SPACE::Document*)file;	
 		ok = doc->IsReadable();
-	}
+	} // if ok
     file->Delete();
     return ok;
   }
@@ -60,17 +84,16 @@ namespace creaImageIO
   {
     vtkImageData* im = 0;
     try
-      {
-	mReader->SetFileName(filename.c_str());
-	mReader->Update();
-	im = vtkImageData::New();
-	im->ShallowCopy(mReader->GetOutput());
-      }
-    catch (...)
-      {
-	if (im!=0) im->Delete();
-	  im = 0;
-      }
+    {
+		mReader->SetFileName(filename.c_str());
+		mReader->Update();
+		im = vtkImageData::New();
+		im->ShallowCopy(mReader->GetOutput());
+    } catch (...) {
+		if (im!=0) im->Delete();
+		im = 0;
+    }
+
     return im;
   }
 
@@ -139,7 +162,7 @@ namespace creaImageIO
 	    if ( i->first == "D0004_1500" )
 	      {
 		boost::filesystem::path full_path(filename);
-		std::string f = full_path.leaf();
+		std::string f = full_path.leaf().string();
 		i->second = f;
 	      }
 	    else if ( i->first == "FullFileName" )