-#include <creaImageIODicomImageReader2.h>
-#include "gdcmStringFilter.h"
-#include "vtkGDCMImageReader.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 "boost/filesystem/path.hpp"
+#include "creaImageIODicomImageReader2.h"
#include <creaImageIOTreeAttributeDescriptor.h>
+#include "gdcmStringFilter.h"
+#include "gdcmUIDs.h"
+#include "boost/filesystem/path.hpp"
+
+#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
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;
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" )
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" )