* Test/VTKTest*.cxx : bug fix... tests don't generate VTK warning concerning

     differences between the extents
   -- BeNours

diff --git a/Testing/VTKTestRead.cxx b/Testing/VTKTestRead.cxx
index 655c41d96149a759903a915c6356bfe400c552de..b4ba7ea1e4093b6a1cc40c5417b9154e14cd296e 100644 (file)
--- a/Testing/VTKTestRead.cxx
+++ b/Testing/VTKTestRead.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: VTKTestRead.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/19 10:49:47 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2005/01/19 13:50:11 $
+  Version:   $Revision: 1.3 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -109,6 +109,7 @@ int VTKReadTest(vtkTesting *t,vtkImageViewer *viewer,
       clip->SetInput(image);
       clip->SetOutputWholeExtent(ext[0],ext[1],ext[2],ext[3],
                                  ext[4]+dim[2] / 2,ext[4]+dim[2] / 2);
+      clip->ClipDataOn();
       vtkImageTranslateExtent *translat=vtkImageTranslateExtent::New();
       translat->SetInput(clip->GetOutput());
       translat->SetTranslation(0,0,-ext[4]-dim[2] / 2);
@@ -210,7 +211,8 @@ int VTKTestRead(int argc, char *argv[])
    {
       ret = VTKReadTest(t,viewer,argv[1+show],argv[2+show],show);
       t->Delete();
-      viewer->Delete();
+      if( viewer )
+         viewer->Delete();
 
       return ret;
    }
@@ -236,7 +238,7 @@ int VTKTestRead(int argc, char *argv[])
       ret += VTKReadTest(t,viewer,filename,pngfile,show);
    }
    t->Delete();
-   if(viewer)
+   if( viewer )
       viewer->Delete();
 
    return ret;

diff --git a/Testing/VTKTestReadSeq.cxx b/Testing/VTKTestReadSeq.cxx
index 8084618543c642909e9e7eaa02f41cc3af696770..773c9671a0bf92192dbebaa855cc117c8856db1d 100644 (file)
--- a/Testing/VTKTestReadSeq.cxx
+++ b/Testing/VTKTestReadSeq.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: VTKTestReadSeq.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/19 10:49:47 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2005/01/19 13:50:11 $
+  Version:   $Revision: 1.3 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -110,6 +110,7 @@ int VTKReadSeqTest(vtkTesting *t,vtkImageViewer *viewer,
       vtkImageClip *clip=vtkImageClip::New();
       clip->SetInput(image);
       clip->SetOutputWholeExtent(ext[0],ext[1],ext[2],ext[3],j,j);
+      clip->ClipDataOn();
       vtkImageTranslateExtent *translat=vtkImageTranslateExtent::New();
       translat->SetInput(clip->GetOutput());
       translat->SetTranslation(0,0,-j);
@@ -215,7 +216,8 @@ int VTKTestReadSeq(int argc, char *argv[])
    {
       ret = VTKReadSeqTest(t,viewer,argv[1+show],argv[2+show],show);
       t->Delete();
-      viewer->Delete();
+      if( viewer )
+         viewer->Delete();
 
       return ret;
    }
@@ -238,7 +240,7 @@ int VTKTestReadSeq(int argc, char *argv[])
       ret += VTKReadSeqTest(t,viewer,filename,pngfile,show);
    }
    t->Delete();
-   if(viewer)
+   if( viewer )
       viewer->Delete();
 
    return ret;

diff --git a/Testing/VTKTestWrite.cxx b/Testing/VTKTestWrite.cxx
index c6aac0eea393e20be1ba380d767dad553c2671ff..2d9614e0f8f7fe36bfc575bafbf3a93a3512a04a 100644 (file)
--- a/Testing/VTKTestWrite.cxx
+++ b/Testing/VTKTestWrite.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: VTKTestWrite.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/19 10:49:47 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2005/01/19 13:50:11 $
+  Version:   $Revision: 1.3 $
 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -114,6 +114,7 @@ int VTKWriteTest(vtkTesting *t,vtkImageViewer *viewer,
       clip->SetInput(image);
       clip->SetOutputWholeExtent(ext[0],ext[1],ext[2],ext[3],
                                  ext[4]+dim[2] / 2,ext[4]+dim[2] / 2);
+      clip->ClipDataOn();
       vtkImageTranslateExtent *translat=vtkImageTranslateExtent::New();
       translat->SetInput(clip->GetOutput());
       translat->SetTranslation(0,0,-ext[4]-dim[2] / 2);
@@ -214,7 +215,8 @@ int VTKTestWrite(int argc, char *argv[])
    {
       ret = VTKWriteTest(t,viewer,argv[1+show],argv[2+show],show);
       t->Delete();
-      viewer->Delete();
+      if( viewer )
+         viewer->Delete();
 
       return ret;
    }
@@ -240,7 +242,7 @@ int VTKTestWrite(int argc, char *argv[])
       ret += VTKWriteTest(t,viewer,filename,pngfile,show);
    }
    t->Delete();
-   if(viewer)
+   if( viewer )
       viewer->Delete();
 
    return ret;