X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FcreaImageIODicomScanner.cpp;h=7b1b0b7d4cadfd5ec603aacb43072412ff0e3217;hb=0273cd213fbc2d2d95b412d05ba17fb32e4e3db0;hp=43706c156436c2edbf83bf1a27b74859ec3dffaa;hpb=3a22e19184c369b130d4caa992a8e98e50c7a0ee;p=creaImageIO.git diff --git a/src/creaImageIODicomScanner.cpp b/src/creaImageIODicomScanner.cpp index 43706c1..7b1b0b7 100644 --- a/src/creaImageIODicomScanner.cpp +++ b/src/creaImageIODicomScanner.cpp @@ -1,3 +1,30 @@ +/* +# --------------------------------------------------------------------- +# +# 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 @@ -133,20 +160,9 @@ void DicomImageScanner::ReadAttributes(const std::string& filename, gdcm::Scanner::TagToValue::const_iterator it = mapping.begin(); std::map::iterator i; - int j= 0; - - for (;it != mapping.end(); ++it) - { - /*std::stringstream val; - val << "D"; - val << std::hex << it->first.GetGroup() ; - val << "_";; - val << std::hex << it->first.GetElement(); - var >> key*/ - char key[12] ; - + { char key[12] ; sprintf(key,"D%04x_%04x", it->first.GetGroup(), it->first.GetElement()); attr[key] = irclean(it->second); }