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

diff --git a/src/creaImageIODicomImageReader2.cpp b/src/creaImageIODicomImageReader2.cpp
index 479170e..e8ff7e1 100644
--- a/src/creaImageIODicomImageReader2.cpp
+++ b/src/creaImageIODicomImageReader2.cpp
@@ -1,15 +1,43 @@
-#include <creaImageIODicomImageReader2.h>
-#include "gdcmStringFilter.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 <creaImageIOSystem.h>
+#include "creaImageIODicomImageReader2.h"
+#include <creaImageIOTreeAttributeDescriptor.h>
+#include "gdcmStringFilter.h"
+#include "gdcmUIDs.h"
 #include "boost/filesystem/path.hpp"
 
-#include <creaImageIOTreeAttributeDescriptor.h>
+#include "vtkGDCMImageReader.h"
 #include <vtkStringArray.h>
-#include <creaImageIOGimmick.h>
+#if defined(_WIN32)
+#pragma warning(disable: 4996)
+#endif
 
-#include "gdcmUIDs.h"
 #ifdef _DEBUG
 #define new DEBUG_NEW
 #endif
@@ -128,8 +156,6 @@ namespace creaImageIO
   void DicomImageReader::ReadAttributes(const std::string& filename, 
 		      std::map<std::string,std::string>& attr)
   {
-    GimmickMessage(2,"Reading attributes from DICOM file '"
-		   <<filename<<"'"<<std::endl);
 
    
       gdcm::Reader reader;
@@ -144,7 +170,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 +243,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" )
@@ -241,18 +267,20 @@ void DicomImageReader::ReadAttributes2(const std::string& filename,
 
 const std::string DicomImageReader::GetStringValueFromTag(const gdcm::DataElement& de)
 {
+printf("EED DicomImageReader::GetStringValueFromTag Start\n");
   static std::string buffer;
   buffer = "";  // cleanup previous call
 
 
-    const gdcm::ByteValue *bv = de.GetByteValue();
-    if( bv ) // Can be Type 2
-      {
+  const gdcm::ByteValue *bv = de.GetByteValue();
+  if( bv!=NULL ) // Can be Type 2
+  {
       buffer = std::string( bv->GetPointer(), bv->GetLength() );
       // Will be padded with at least one \0
-      }
+  } // if bv
 
   // Since return is a const char* the very first \0 will be considered
+printf("EED DicomImageReader::GetStringValueFromTag END\n");
   return buffer.c_str();
 }
   //=====================================================================