fixups

Author: mwestphal

plugins/assimp/module/Testing/TestF3DAssimpImporterStreamError.cxx

@@ -8,8 +8,7 @@
 
 int TestF3DAssimpImporterStreamError(int vtkNotUsed(argc), char* argv[])
 {
-  std::string hint;
-  if (vtkF3DAssimpImporter::CanReadFile(nullptr, hint))
+  if (vtkF3DAssimpImporter::CanReadFile(nullptr))
   {
     std::cerr << "Unexpected success CanReadFile(nullptr)\n";
     return EXIT_FAILURE;

plugins/assimp/module/vtkF3DAssimpImporter.cxx

@@ -44,7 +44,6 @@
 #include <regex>
 #include <set>
 
-#include <iostream>
 vtkStandardNewMacro(vtkF3DAssimpImporter);
 
 class vtkF3DAssimpImporter::vtkInternals
@@ -1241,6 +1240,13 @@ void vtkF3DAssimpImporter::ImportLights(vtkRenderer* renderer)
   this->Internals->ImportLights(renderer);
 }
 
+//------------------------------------------------------------------------------
+bool vtkF3DAssimpImporter::CanReadFile(vtkResourceStream* stream)
+{
+  std::string unused;
+  return vtkF3DAssimpImporter::CanReadFile(stream, unused);
+}
+
 //------------------------------------------------------------------------------
 bool vtkF3DAssimpImporter::CanReadFile(vtkResourceStream* stream, std::string& hint)
 {

plugins/assimp/module/vtkF3DAssimpImporter.h

@@ -107,13 +107,16 @@ class vtkF3DAssimpImporter : public vtkF3DImporter
    */
   void SetCamera(vtkIdType camIndex) override;
 
+  ///@{
   /**
    * Return true if, after a quick check of file header, it looks like the provided stream
-   * can be read. Return false if it is sure it cannot be read as a strean.
+   * can be read. Return false if it is sure it cannot be read as a stream.
    *
-   * This only checks that the first 5 bytes spells "Ogawa".
+   * hint is provided to be used as MemoryHint
    */
   static bool CanReadFile(vtkResourceStream* stream, std::string& hint);
+  static bool CanReadFile(vtkResourceStream* stream);
+  ///@}
 
 protected:
   vtkF3DAssimpImporter();