X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fitk%2Fsrc%2FbbitkImageReader.cxx;h=4e9021fbafd3aea51e9281e8fe526cc51b86a378;hb=98ab778755e68bd1b55dd41f20222b91bde7dd5a;hp=bb7938d6b2b2d1c26230f421848b2cd01f8f468a;hpb=d73a7833a28e6111e1e805efae5df3ab18a240e2;p=bbtk.git

diff --git a/packages/itk/src/bbitkImageReader.cxx b/packages/itk/src/bbitkImageReader.cxx
index bb7938d..4e9021f 100644
--- a/packages/itk/src/bbitkImageReader.cxx
+++ b/packages/itk/src/bbitkImageReader.cxx
@@ -1,20 +1,33 @@
-/*=========================================================================
-                                                                                
+/*=========================================================================                                                                               
   Program:   bbtk
   Module:    $RCSfile: bbitkImageReader.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/02/05 12:03:01 $
-  Version:   $Revision: 1.1 $
-                                                                                
-  Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
-  l'Image). All rights reserved. See Doc/License.txt or
-  http://www.creatis.insa-lyon.fr/Public/bbtk/License.html for details.
-                                                                                
-     This software is distributed WITHOUT ANY WARRANTY; without even
-     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-     PURPOSE.  See the above copyright notices for more information.
-                                                                                
+  Date:      $Date: 2008/10/17 08:18:21 $
+  Version:   $Revision: 1.5 $
 =========================================================================*/
+
+/* ---------------------------------------------------------------------
+
+* Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale)
+* Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux
+*
+*  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.
+* ------------------------------------------------------------------------ */                                                                         
+
 /**
  *  \file 
  *  \brief 
@@ -27,8 +40,8 @@
 
 namespace bbitk 
 {
-  BBTK_USER_BLACK_BOX_IMPLEMENTATION(ImageReader,bbtk::UserBlackBox);
-
+  BBTK_BLACK_BOX_IMPLEMENTATION(ImageReader,bbtk::AtomicBlackBox);
+  
   BBTK_ADD_BLACK_BOX_TO_PACKAGE(itk,ImageReader);
 
 
@@ -36,7 +49,7 @@ namespace bbitk
 
   void ImageReader::Read()
   {
-    std::string filename = bbGetInputFilename();
+    std::string filename = bbGetInputIn();
 
     itk::ImageIOBase::Pointer genericReader = 
       itk::ImageIOFactory::CreateImageIO(filename.c_str(), 
@@ -68,7 +81,7 @@ namespace bbitk
     typedef itk::ImageFileReader< itkImageType > itkReaderType;
 
     typename itkReaderType::Pointer reader = itkReaderType::New();
-    std::string filename = bbGetInputFilename();
+    std::string filename = bbGetInputIn();
     reader->SetFileName(filename.c_str());
     try { reader->Update(); }
     catch( std::exception& e )