Index: Rendering/vtkTesting.cxx =================================================================== RCS file: /cvsroot/ParaView3/ParaView3/VTK/Rendering/vtkTesting.cxx,v retrieving revision 1.35 diff -u -r1.35 vtkTesting.cxx --- Rendering/vtkTesting.cxx 4 Oct 2008 13:59:30 -0000 1.35 +++ Rendering/vtkTesting.cxx 19 May 2009 22:55:33 -0000 @@ -658,13 +658,13 @@ rt_jpegw_dashboard->Write(); // write out the image that was generated - rt_shrink->SetInput(ic1->GetOutput()); - rt_jpegw_dashboard->SetInput(rt_shrink-> GetOutput()); - char* valid_test_small = new char[strlen(tmpDir) + validName.size() + 30]; - sprintf(valid_test_small, "%s/%s.test.small.jpg", tmpDir, - validName.c_str()); - rt_jpegw_dashboard->SetFileName(valid_test_small); - rt_jpegw_dashboard->Write(); + char* vImage = new char[strlen(tmpDir) + validName.size() + 30]; + sprintf(vImage, "%s/%s", tmpDir, validName.c_str()); + vtkPNGWriter *rt_pngw = vtkPNGWriter::New(); + rt_pngw->SetFileName(vImage); + rt_pngw->SetInput(image); + rt_pngw->Write(); + rt_pngw->Delete(); // write out the valid image that matched rt_shrink->SetInput(ic2->GetOutput()); @@ -675,9 +675,8 @@ rt_jpegw_dashboard->Write(); rt_jpegw_dashboard->Delete(); - os << ""; - os << valid_test_small; - delete [] valid_test_small; + os << ""; + os << vImage; os << ""; os << ""; os << diff_small; @@ -686,16 +685,8 @@ os << valid; os << ""; - delete [] valid; - - char* vImage = new char[strlen(tmpDir) + validName.size() + 30]; - sprintf(vImage, "%s/%s", tmpDir, validName.c_str()); - vtkPNGWriter *rt_pngw = vtkPNGWriter::New(); - rt_pngw->SetFileName(vImage); - rt_pngw->SetInput(image); - rt_pngw->Write(); - rt_pngw->Delete(); delete [] vImage; + delete [] valid; rt_shrink->Delete(); Index: Wrapping/Python/vtk/test/Testing.py =================================================================== RCS file: /cvsroot/ParaView3/ParaView3/VTK/Wrapping/Python/vtk/test/Testing.py,v retrieving revision 1.8 diff -u -r1.8 Testing.py --- Wrapping/Python/vtk/test/Testing.py 5 Dec 2005 14:42:33 -0000 1.8 +++ Wrapping/Python/vtk/test/Testing.py 19 May 2009 22:55:33 -0000 @@ -267,8 +267,8 @@ print "", print "%d "%err_index - print "", - print "%s "%(img_base + '.test.small.jpg') + print "", + print "%s "%(img_base + '.png') print "", print "%s "%(img_base + '.diff.small.jpg') @@ -323,11 +323,11 @@ jpegw.SetQuality(85) jpegw.Write() - # write out the image that was generated. - shrink.SetInput(idiff.GetInput()) - jpegw.SetInput(shrink.GetOutput()) - jpegw.SetFileName(_getTempImagePath(f_base + ".test.small.jpg")) - jpegw.Write() + # Write out the image that was generated. Write it out as full so that + # it may be used as a baseline image if the tester deems it valid. + pngw.SetInput(idiff.GetInput()) + pngw.SetFileName(_getTempImagePath(f_base + ".png")) + pngw.Write() # write out the valid image that matched. shrink.SetInput(idiff.GetImage())