Merge topic 'override-setpixel-data' into paraview/release

f7a4e75c Override SetPixelData() member functions in vtkGenericOpenGLRenderWindow

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ken Martin <ken.martin@kitware.com>
Merge-request: !6538

Rendering/OpenGL2/vtkGenericOpenGLRenderWindow.cxx

@@ -252,6 +252,34 @@ int vtkGenericOpenGLRenderWindow::ReadPixels(
   return VTK_ERROR;
 }
 
+int vtkGenericOpenGLRenderWindow::SetPixelData(
+  int x1, int y1, int x2, int y2, unsigned char* data, int front, int right)
+{
+  if (this->ReadyForRendering)
+  {
+    this->MakeCurrent();
+    this->GetState()->ResetFramebufferBindings();
+    return this->Superclass::SetPixelData(x1, y1, x2, y2, data, front, right);
+  }
+
+  vtkWarningMacro("`SetPixelData` called before window is ready for rendering; ignoring.");
+  return VTK_ERROR;
+}
+
+int vtkGenericOpenGLRenderWindow::SetPixelData(
+  int x1, int y1, int x2, int y2, vtkUnsignedCharArray* data, int front, int right)
+{
+  if (this->ReadyForRendering)
+  {
+    this->MakeCurrent();
+    this->GetState()->ResetFramebufferBindings();
+    return this->Superclass::SetPixelData(x1, y1, x2, y2, data, front, right);
+  }
+
+  vtkWarningMacro("`SetPixelData` called before window is ready for rendering; ignoring.");
+  return VTK_ERROR;
+}
+
 int vtkGenericOpenGLRenderWindow::SetRGBACharPixelData(
   int x1, int y1, int x2, int y2, unsigned char* data, int front, int blend, int right)
 {

Rendering/OpenGL2/vtkGenericOpenGLRenderWindow.h

@@ -178,6 +178,10 @@ protected:
   int ReadPixels(
     const vtkRecti& rect, int front, int glFormat, int glType, void* data, int right) override;
 
+  int SetPixelData(
+    int x1, int y1, int x2, int y2, unsigned char* data, int front, int right) override;
+  int SetPixelData(
+    int x1, int y1, int x2, int y2, vtkUnsignedCharArray* data, int front, int right) override;
   int SetRGBACharPixelData(
     int x1, int y1, int x2, int y2, unsigned char* data, int front, int blend, int right) override;
   int SetRGBACharPixelData(int x, int y, int x2, int y2, vtkUnsignedCharArray* data, int front,