From e90c46ae7208216d21a17a6e751d1f68e9c01fca Mon Sep 17 00:00:00 2001
From: Zack Galbreath <zack.galbreath@kitware.com>
Date: Fri, 21 Feb 2014 12:14:45 -0500
Subject: [PATCH] fix failing tests revealed by gerrit
subclasses of vtkXMLWriter should now call OpenStream & CloseStream
as opposed to OpenFile & CloseFile.
Change-Id: I39ccdc711d07e96763fc941b5fcd80b1da6b38c5
---
IO/XML/vtkXMLStructuredDataWriter.cxx | 4 ++--
IO/XML/vtkXMLUnstructuredDataWriter.cxx | 4 ++--
IO/XML/vtkXMLWriter.cxx | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/IO/XML/vtkXMLStructuredDataWriter.cxx b/IO/XML/vtkXMLStructuredDataWriter.cxx
index 4c499ac10c5..e42bbbe9453 100644
--- a/IO/XML/vtkXMLStructuredDataWriter.cxx
+++ b/IO/XML/vtkXMLStructuredDataWriter.cxx
@@ -141,7 +141,7 @@ int vtkXMLStructuredDataWriter::ProcessRequest(
int result = 1;
if (this->CurrentPiece == 0 && this->CurrentTimeIndex == 0 )
{
- if (!this->OpenFile())
+ if (!this->OpenStream())
{
return 0;
}
@@ -201,7 +201,7 @@ int vtkXMLStructuredDataWriter::ProcessRequest(
return 0;
}
- this->CloseFile();
+ this->CloseStream();
this->CurrentTimeIndex = 0; // Reset
}
}
diff --git a/IO/XML/vtkXMLUnstructuredDataWriter.cxx b/IO/XML/vtkXMLUnstructuredDataWriter.cxx
index 5703fa57b45..0043edbfa2b 100644
--- a/IO/XML/vtkXMLUnstructuredDataWriter.cxx
+++ b/IO/XML/vtkXMLUnstructuredDataWriter.cxx
@@ -157,7 +157,7 @@ int vtkXMLUnstructuredDataWriter::ProcessRequest(vtkInformation* request,
float wholeProgressRange[2] = {0,1};
this->SetProgressRange(wholeProgressRange, 0, 1);
- if (!this->OpenFile())
+ if (!this->OpenStream())
{
this->NumberOfPieces = numPieces;
return 0;
@@ -225,7 +225,7 @@ int vtkXMLUnstructuredDataWriter::ProcessRequest(vtkInformation* request,
return 0;
}
- this->CloseFile();
+ this->CloseStream();
this->CurrentTimeIndex = 0; // Reset
}
}
diff --git a/IO/XML/vtkXMLWriter.cxx b/IO/XML/vtkXMLWriter.cxx
index 0ec69ffad28..c2f673f7476 100644
--- a/IO/XML/vtkXMLWriter.cxx
+++ b/IO/XML/vtkXMLWriter.cxx
@@ -632,7 +632,7 @@ int vtkXMLWriter::RequestData(vtkInformation* vtkNotUsed( request ),
this->SetErrorCode(vtkErrorCode::NoError);
// Make sure we have a file to write.
- if(!this->Stream && !this->FileName)
+ if(!this->Stream && !this->FileName && !this->WriteToOutputString)
{
vtkErrorMacro("Writer called with no FileName set.");
this->SetErrorCode(vtkErrorCode::NoFileNameError);
--
GitLab