X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIODicomScanner.cpp;h=8f7dbc1d86f884867eae8a8ef318aaf8c1da0b2e;hb=f5357d5e24ce935ff82ebb98d21dc95185c3528e;hp=88fe948b33081c735ce0176717a8137090434461;hpb=795cc4e4921f94e0f759935bfc931e25ae12c865;p=creaImageIO.git diff --git a/src/creaImageIODicomScanner.cpp b/src/creaImageIODicomScanner.cpp index 88fe948..8f7dbc1 100644 --- a/src/creaImageIODicomScanner.cpp +++ b/src/creaImageIODicomScanner.cpp @@ -1,20 +1,40 @@ +/* +# --------------------------------------------------------------------- +# +# 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 -#include "creaImageIOSystem.h" + #include #include "boost/algorithm/string.hpp" - - - -#include #include "boost/filesystem/path.hpp" -#include -#include -#include -#include - #include - +#if defined(_WIN32) +#pragma warning(disable: 4996) +#endif #ifdef _DEBUG #define new DEBUG_NEW @@ -149,7 +169,7 @@ void DicomImageScanner::ReadAttributes(const std::string& filename, if ( attr.find("D0004_1500") != attr.end()) { boost::filesystem::path full_path(filename); - std::string f = full_path.leaf(); + std::string f = full_path.leaf().string(); attr["D0004_1500"] = f; } if ( attr.find("FullFileName")!= attr.end())