Merge topic 'ply_cell_texture'

9c2c636 Address MR comments.
e83695b Rename local variable to start with lowercase.
1159dc6 Too much python and other warnings.
a9fdbea Duplicate points for face texture.
79f7cf4 Test for face texture with duplicate texture points.

Acked-by: Kitware Robot <[email protected]>
Merge-request: !5334

Author: danlipsa

IO/PLY/Testing/CMakeLists.txt

@@ -4,7 +4,8 @@ vtk_module_test_data(
   Data/bunny.ply
   Data/squareTextured.ply
   Data/squareTexturedFaces.ply
-  Data/vtk.png)
+  Data/vtk.png
+  Data/two_vtk_logos_stacked.png)
 
 add_subdirectory(Cxx)
 

IO/PLY/Testing/Cxx/CMakeLists.txt

@@ -7,8 +7,10 @@ vtk_add_test_cxx(vtkIOPLYCxxTests tests
   )
 vtk_add_test_cxx(vtkIOPLYCxxTests tests
   TestPLYReaderTextureUVPoints,TestPLYReaderTextureUV.cxx squareTextured.ply
+  vtk.png
 )
 vtk_add_test_cxx(vtkIOPLYCxxTests tests
   TestPLYReaderTextureUVFaces,TestPLYReaderTextureUV.cxx squareTexturedFaces.ply
+  two_vtk_logos_stacked.png
 )
 vtk_test_cxx_executable(vtkIOPLYCxxTests tests)

IO/PLY/Testing/Cxx/TestPLYReaderTextureUV.cxx

@@ -36,9 +36,12 @@ int TestPLYReaderTextureUV( int argc, char *argv[] )
     return EXIT_FAILURE;
   }
   std::string fn = "Data/";
-  fn += argv[1];
-  const char* fname = vtkTestUtilities::ExpandDataFileName(argc, argv, fn.c_str());
-  const char* fnameImg = vtkTestUtilities::ExpandDataFileName(argc, argv, "Data/vtk.png");
+  std::string plyName = fn + argv[1];
+  std::string imageName = fn + argv[2];
+  const char* fname = vtkTestUtilities::ExpandDataFileName(
+    argc, argv, plyName.c_str());
+  const char* fnameImg = vtkTestUtilities::ExpandDataFileName(
+    argc, argv, imageName.c_str());
 
   // Test if the reader thinks it can open the file.
   if (0 == vtkPLYReader::CanReadFile(fname))