From 544e967848a983be15668ae894e2bae9344a9471 Mon Sep 17 00:00:00 2001
From: Kenneth Moreland <kmorel@sandia.gov>
Date: Tue, 11 Nov 2014 12:23:55 -0700
Subject: [PATCH] Better fake RequestInformation from vtkFileSeriesReader.

As part of its operation, vtkFileSeriesReader has to occasionally send
fake requests to the underlying reader. In particular,
vtkFileSeriesReader sends a RequestInformation to the reader when it
gets a RequestUpdateExtent. This is to handle issues where the reader
index changes and to make sure all expected previous requests went to
the reader and it is ready to handle the update extent. However, the
fake request had an empty output information, and that can cause
problems for readers that expect things like the output data object to
be in the information.

This change does a better job of constructing a fake request. To copies
over the actual request and changes out information to make the right
type of request.

Change-Id: I2ab5a9aa193dbe0782e76a394d7d1ece5b1ecb29
---
 .../VTKExtensions/Default/vtkFileSeriesReader.cxx         | 15 ++++++++-------
 ParaViewCore/VTKExtensions/Default/vtkFileSeriesReader.h  |  8 ++++----
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/ParaViewCore/VTKExtensions/Default/vtkFileSeriesReader.cxx b/ParaViewCore/VTKExtensions/Default/vtkFileSeriesReader.cxx
index 81c60cd..8a49878 100644
--- a/ParaViewCore/VTKExtensions/Default/vtkFileSeriesReader.cxx
+++ b/ParaViewCore/VTKExtensions/Default/vtkFileSeriesReader.cxx
@@ -599,7 +599,7 @@ int vtkFileSeriesReader::RequestInformation(
 
 //----------------------------------------------------------------------------
 int vtkFileSeriesReader::RequestUpdateExtent(
-                                 vtkInformation* vtkNotUsed(request),
+                                 vtkInformation* request,
                                  vtkInformationVector** vtkNotUsed(inputVector),
                                  vtkInformationVector* outputVector)
 {
@@ -620,7 +620,7 @@ int vtkFileSeriesReader::RequestUpdateExtent(
 
   // Make sure that the reader file name is set correctly and that
   // RequestInformation has been called.
-  this->RequestInformationForInput(index);
+  this->RequestInformationForInput(index, request, outputVector, 1);
 
   // I commented out the following block because it is probably not important
   // and it is causing a crash in some circumstances (bug #7253).
@@ -666,7 +666,8 @@ int vtkFileSeriesReader::RequestData(vtkInformation *request,
 int vtkFileSeriesReader::RequestInformationForInput(
                                              int index,
                                              vtkInformation *request,
-                                             vtkInformationVector *outputVector)
+                                             vtkInformationVector *outputVector,
+                                             int fakeRequest)
 {
   if ((index != this->_FileIndex) || (outputVector != NULL))
     {
@@ -683,25 +684,25 @@ int vtkFileSeriesReader::RequestInformationForInput(
     // Need to call RequestInformation on reader to refresh any metadata for the
     // new filename.
     vtkSmartPointer<vtkInformation> tempRequest;
-    if (request)
+    if (!fakeRequest)
       {
       tempRequest = request;
       }
     else
       {
       tempRequest = vtkSmartPointer<vtkInformation>::New();
+      tempRequest->Copy(request, 1);
       tempRequest->Set(vtkDemandDrivenPipeline::REQUEST_INFORMATION());
       }
     vtkSmartPointer<vtkInformationVector> tempOutputVector;
-    if (outputVector)
+    if (!fakeRequest)
       {
       tempOutputVector = outputVector;
       }
     else
       {
       tempOutputVector = vtkSmartPointer<vtkInformationVector>::New();
-      VTK_CREATE(vtkInformation, tempOutputInfo);
-      tempOutputVector->Append(tempOutputInfo);
+      tempOutputVector->Copy(outputVector, 1);
       }
     return this->Reader->ProcessRequest(tempRequest,
                                         (vtkInformationVector**)NULL,
diff --git a/ParaViewCore/VTKExtensions/Default/vtkFileSeriesReader.h b/ParaViewCore/VTKExtensions/Default/vtkFileSeriesReader.h
index 232115e..d0f8b28 100644
--- a/ParaViewCore/VTKExtensions/Default/vtkFileSeriesReader.h
+++ b/ParaViewCore/VTKExtensions/Default/vtkFileSeriesReader.h
@@ -134,10 +134,10 @@ protected:
   // Description:
   // Make sure the reader's output is set to the given index and, if it changed,
   // run RequestInformation on the reader.
-  virtual int RequestInformationForInput(
-                                     int index,
-                                     vtkInformation *request = NULL,
-                                     vtkInformationVector *outputVector = NULL);
+  virtual int RequestInformationForInput(int index,
+                                         vtkInformation *request,
+                                         vtkInformationVector *outputVector,
+                                         int fakeRequest = 0);
 
   // Description:
   // Reads a metadata file and returns a list of filenames (in filesToRead).  If
-- 
2.1.0