X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Fkernel%2FmarTypes.h;h=00b4e0ca0446b93894c2b8a07e7c0b00c77a53f9;hb=7d08401d8ffee17aaf47ff6ee83161cbaa1f10b9;hp=56c5c1996a12c4b0a50dd4ccc612301cd8fa9b56;hpb=7cdd257ac8ad23e435cfbcd768805ccd40acdad3;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/kernel/marTypes.h b/lib/maracasVisuLib/src/kernel/marTypes.h index 56c5c19..00b4e0c 100644 --- a/lib/maracasVisuLib/src/kernel/marTypes.h +++ b/lib/maracasVisuLib/src/kernel/marTypes.h @@ -1,16 +1,41 @@ +/*# --------------------------------------------------------------------- +# +# 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. +# ------------------------------------------------------------------------ */ + /*========================================================================= Program: wxMaracas Module: $RCSfile: marTypes.h,v $ Language: C++ - Date: $Date: 2010/04/20 14:42:44 $ - Version: $Revision: 1.8 $ + Date: $Date: 2012/11/15 14:16:12 $ + Version: $Revision: 1.10 $ Copyright: (c) 2002, 2003 License: - - This software is distributed WITHOUT ANY WARRANTY; without even - the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the above copyright notice for more information. =========================================================================*/ @@ -41,7 +66,7 @@ #define MARACASVISULIB_EXPORTS __declspec( dllimport ) #endif //maracasvisulib_EXPORTS #else - #define MARACASVISULIB_EXPORTS + #define MARACASVISULIB_EXPORTS #endif */ // LG 15/01/09 : Now use crea mechanism @@ -83,7 +108,7 @@ * This file is included by all project files. */ -#include +#include "creaSystem.h" // This redefinitions shoul be useless using uint8_t, etc // JPR