Skip to content
Snippets Groups Projects
Commit b3bf8cde authored by Michael Migliore's avatar Michael Migliore
Browse files

Fix leaks in PBR tests

parent cefbe0b6
No related branches found
No related tags found
No related merge requests found
......@@ -43,7 +43,9 @@
int TestPolyDataTangents(int argc, char* argv[])
{
vtkNew<vtkXMLPolyDataReader> reader;
reader->SetFileName(vtkTestUtilities::ExpandDataFileName(argc, argv, "Data/cow.vtp"));
char* fname = vtkTestUtilities::ExpandDataFileName(argc, argv, "Data/cow.vtp");
reader->SetFileName(fname);
delete[] fname;
vtkNew<vtkPolyDataNormals> normals;
normals->SetInputConnection(reader->GetOutputPort());
......@@ -72,7 +74,9 @@ int TestPolyDataTangents(int argc, char* argv[])
tgtsMapper->SetScaleFactor(0.5);
vtkNew<vtkJPEGReader> image;
image->SetFileName(vtkTestUtilities::ExpandDataFileName(argc, argv, "Data/tex_debug.jpg"));
char* texname = vtkTestUtilities::ExpandDataFileName(argc, argv, "Data/tex_debug.jpg");
image->SetFileName(texname);
delete[] texname;
vtkNew<vtkTexture> texture;
texture->SetInputConnection(image->GetOutputPort());
......
......@@ -62,7 +62,9 @@ int TestNormalMapping(int argc, char* argv[])
tangents->SetInputConnection(triangulation->GetOutputPort());
vtkNew<vtkPNGReader> png;
png->SetFileName(vtkTestUtilities::ExpandDataFileName(argc, argv, "Data/normalMapping.png"));
char* fname = vtkTestUtilities::ExpandDataFileName(argc, argv, "Data/normalMapping.png");
png->SetFileName(fname);
delete[] fname;
vtkNew<vtkTexture> texture;
texture->SetInputConnection(png->GetOutputPort());
......
......@@ -79,7 +79,9 @@ int TestPBRMapping(int argc, char* argv[])
for (int i = 0; i < 6; i++)
{
vtkNew<vtkJPEGReader> jpg;
jpg->SetFileName(vtkTestUtilities::ExpandDataFileName(argc, argv, pathSkybox[i].c_str()));
char* fname = vtkTestUtilities::ExpandDataFileName(argc, argv, pathSkybox[i].c_str());
jpg->SetFileName(fname);
delete[] fname;
vtkNew<vtkImageFlip> flip;
flip->SetInputConnection(jpg->GetOutputPort());
flip->SetFilteredAxis(1); // flip y axis
......@@ -101,24 +103,27 @@ int TestPBRMapping(int argc, char* argv[])
mapper->SetInputConnection(tangents->GetOutputPort());
vtkNew<vtkPNGReader> materialReader;
materialReader->SetFileName(
vtkTestUtilities::ExpandDataFileName(argc, argv, "Data/vtk_Material.png"));
char* matname = vtkTestUtilities::ExpandDataFileName(argc, argv, "Data/vtk_Material.png");
materialReader->SetFileName(matname);
delete[] matname;
vtkNew<vtkTexture> material;
material->InterpolateOn();
material->SetInputConnection(materialReader->GetOutputPort());
vtkNew<vtkPNGReader> albedoReader;
albedoReader->SetFileName(
vtkTestUtilities::ExpandDataFileName(argc, argv, "Data/vtk_Base_Color.png"));
char* colname = vtkTestUtilities::ExpandDataFileName(argc, argv, "Data/vtk_Base_Color.png");
albedoReader->SetFileName(colname);
delete[] colname;
vtkNew<vtkTexture> albedo;
albedo->InterpolateOn();
albedo->SetInputConnection(albedoReader->GetOutputPort());
vtkNew<vtkPNGReader> normalReader;
normalReader->SetFileName(
vtkTestUtilities::ExpandDataFileName(argc, argv, "Data/vtk_Normal.png"));
char* normname = vtkTestUtilities::ExpandDataFileName(argc, argv, "Data/vtk_Normal.png");
normalReader->SetFileName(normname);
delete[] normname;
vtkNew<vtkTexture> normal;
normal->InterpolateOn();
......
......@@ -69,7 +69,9 @@ int TestPBRMaterials(int argc, char* argv[])
for (int i = 0; i < 6; i++)
{
vtkNew<vtkJPEGReader> jpg;
jpg->SetFileName(vtkTestUtilities::ExpandDataFileName(argc, argv, pathSkybox[i].c_str()));
char* fname = vtkTestUtilities::ExpandDataFileName(argc, argv, pathSkybox[i].c_str());
jpg->SetFileName(fname);
delete[] fname;
vtkNew<vtkImageFlip> flip;
flip->SetInputConnection(jpg->GetOutputPort());
flip->SetFilteredAxis(1); // flip y axis
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment