X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIODicomImageReader2.cpp;h=aa67c76da8ddf28da92912465e74c3e4ed9eb9cd;hb=dd6cfbad206f1743fc7226c43b835b782c1f46ee;hp=479170ec2f8352d008531f2e1d7a5c11f728a875;hpb=397f88e27640cb7475bd9e6c8ec7f028933f6343;p=creaImageIO.git

diff --git a/src/creaImageIODicomImageReader2.cpp b/src/creaImageIODicomImageReader2.cpp
index 479170e..aa67c76 100644
--- a/src/creaImageIODicomImageReader2.cpp
+++ b/src/creaImageIODicomImageReader2.cpp
@@ -1,6 +1,34 @@
+/*
+# ---------------------------------------------------------------------
+#
+# 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 <creaImageIODicomImageReader2.h>
 #include "gdcmStringFilter.h"
-
+#include "vtkGDCMImageReader.h"
 
 #include <creaImageIOSystem.h>
 #include "boost/filesystem/path.hpp"
@@ -144,7 +172,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" )
@@ -217,7 +245,7 @@ void DicomImageReader::ReadAttributes2(const std::string& filename,
 			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" )