From: guigues <guigues>
Date: Fri, 16 May 2008 14:03:19 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: r0.6.1~35
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=ead983d5eeec329e05bfadcaad90001cc7197408;p=bbtk.git

*** empty log message ***
---

diff --git a/kernel/cmake/BBTKFindLibraries.cmake b/kernel/cmake/BBTKFindLibraries.cmake
index f86e7f8..619be1a 100644
--- a/kernel/cmake/BBTKFindLibraries.cmake
+++ b/kernel/cmake/BBTKFindLibraries.cmake
@@ -7,7 +7,9 @@ IF(USE_VTK)
   FIND_PACKAGE(VTK)
   # If vtk found
   IF(VTK_FOUND)
-    MESSAGE ( STATUS "VTK FOUND - VERSION = ${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}.${VTK_BUILD_VERSION}")
+    MESSAGE ( STATUS "Looking for VTK... found")
+    MESSAGE ( STATUS "* Dir     = ${VTK_DIR}")
+    MESSAGE ( STATUS "* Version = ${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}.${VTK_BUILD_VERSION}")
     INCLUDE(${VTK_USE_FILE})
     ADD_DEF( _USE_VTK_ )
     SET(BBTK_VTK_LIBRARIES
@@ -31,7 +33,9 @@ IF(USE_ITK)
   FIND_PACKAGE(ITK)
   # If itk found
   IF(ITK_FOUND)
-     MESSAGE ( STATUS "ITK FOUND - VERSION = ${ITK_VERSION_MAJOR}.${ITK_VERSION_MINOR}.${ITK_VERSION_PATCH}")
+    MESSAGE ( STATUS "Looking for ITK... found")
+    MESSAGE ( STATUS "* Dir     = ${ITK_DIR}")
+    MESSAGE ( STATUS "* Version = ${ITK_VERSION_MAJOR}.${ITK_VERSION_MINOR}.${ITK_VERSION_PATCH}")
     INCLUDE(${ITK_USE_FILE})
     ADD_DEF( _USE_ITK_ )
     SET(BBTK_ITK_LIBRARIES
@@ -109,18 +113,26 @@ IF(USE_GDCM)
   IF(GDCM_FOUND)
     INCLUDE(${GDCM_USE_FILE})
     ADD_DEF( _USE_GDCM_ )
+
+    MESSAGE ( STATUS "Looking for GDCM... found")
+    MESSAGE ( STATUS "* Dir       = ${GDCM_DIR}")
+    MESSAGE ( STATUS "* Version   = ${GDCM_VERSION_MAJOR}.${GDCM_VERSION_MINOR}.${GDCM_VERSION_PATCH}")
+    MESSAGE ( STATUS "* Namespace = ${GDCM_NAME_SPACE}")
+
     
     SET(BBTK_GDCM_LIBRARIES
 # TO DO : USE GDCM LINK LIBRARIES !!!
-       gdcm  gdcmjpeg8  gdcmjpeg12  gdcmjpeg16
+# IF gdcm WAS NOT COMPILE WITH VTK THE ABOVE FORCED LINK WITH vtkgdcm DOES NOT WORK
+        ${GDCM_LIBRARIES} 
+#gdcm  gdcmjpeg8  gdcmjpeg12  gdcmjpeg16
       )
 
-     IF(USE_VTK )
-         SET(BBTK_GDCM_LIBRARIES
-  	           ${BBTK_GDCM_LIBRARIES}
-                   vtkgdcm  
-         )
-     ENDIF(USE_VTK)
+#     IF(USE_VTK )
+#         SET(BBTK_GDCM_LIBRARIES
+#  	           ${BBTK_GDCM_LIBRARIES}
+#                   vtkgdcm  
+#         )
+#     ENDIF(USE_VTK)
 
   ENDIF(GDCM_FOUND)
 ENDIF(USE_GDCM)
diff --git a/packages/itk/src/bbitkImageSeriesReader.cxx b/packages/itk/src/bbitkImageSeriesReader.cxx
index 36432d5..73f9ccb 100644
--- a/packages/itk/src/bbitkImageSeriesReader.cxx
+++ b/packages/itk/src/bbitkImageSeriesReader.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbitkImageSeriesReader.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/04/18 12:59:50 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2008/05/16 14:03:19 $
+  Version:   $Revision: 1.4 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -39,7 +39,19 @@ namespace bbitk
     const std::vector<std::string>& filenames = bbGetInputFileNames();
     if (!filenames.size()) 
       {
-  	bbtkError("Void vector passed to "<<bbGetFullName());
+	typedef	Image_uint8_t_2_ptr itype;
+	Image_uint8_t_2::Pointer p = Image_uint8_t_2::New();
+	Image_uint8_t_2::IndexType i;
+	i.Fill(0);
+	Image_uint8_t_2::SizeType s;
+	s.Fill(1);
+	Image_uint8_t_2::RegionType r(i,s);
+	p->SetRegions(r);
+	p->Allocate();
+	p->Register();
+	bbSetOutputOut(p.GetPointer());
+	return;
+  	//bbtkError("Void vector passed to "<<bbGetFullName());
       }
 
     std::string filename = filenames[0];
@@ -87,6 +99,7 @@ namespace bbitk
       }
 
     reader->GetOutput()->Register();
+    //    if (bbGetOutputOut()) 
     bbSetOutputOut ( reader->GetOutput() );
 
     bbtkDebugDecTab("Core",9);