X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIOWxAnySimpleDlg.cpp;h=926e1181675271f373a4e08021c5670b1fa536a3;hb=6b7ccc72c2f9cee3979d9360a55eaa65aeea8a17;hp=7020ffee6929221b9ac22a830f7b2e1189a8566a;hpb=5b147c5d01899210a26d09897cb4d06a4ec2842f;p=creaImageIO.git diff --git a/src/creaImageIOWxAnySimpleDlg.cpp b/src/creaImageIOWxAnySimpleDlg.cpp index 7020ffe..926e118 100644 --- a/src/creaImageIOWxAnySimpleDlg.cpp +++ b/src/creaImageIOWxAnySimpleDlg.cpp @@ -1,3 +1,31 @@ +/* +# --------------------------------------------------------------------- +# +# 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 "creaImageIOWxAnySimpleDlg.h" #include "creaImageIOWxGimmickReaderDialog.h" @@ -11,7 +39,6 @@ #include #include #include -#include #include #include #include @@ -114,7 +141,7 @@ namespace creaImageIO { bvalid = m_exts.size() == 0? true : false; std::vector::iterator it = m_exts.begin(); - std::string ext = itr->filename().substr(itr->filename().find_last_of(".")); + std::string ext = itr->path().filename().string().substr(itr->path().filename().string().find_last_of(".")); for(; it != m_exts.end(); it++) { if(ext == (*it) ) @@ -125,7 +152,7 @@ namespace creaImageIO } if (!boost::filesystem::is_directory(itr->status()) && bvalid) { - readImg(itr->string().c_str()); + readImg(itr->path().string().c_str()); } } }