View | Details | Raw Unified | Return to bug 228569
Collapse All | Expand All

(-)paraview/files/patch-vtkOpenGLGlyph3DHelper.cxx (+20 lines)
Line 0 Link Here
1 
--- VTK/Rendering/OpenGL2/vtkOpenGLGlyph3DHelper.cxx.orig	2018-05-27 16:13:23.631718000 +0700
2 
+++ VTK/Rendering/OpenGL2/vtkOpenGLGlyph3DHelper.cxx	2018-05-27 16:21:35.310777000 +0700
3 
@@ -449,7 +449,7 @@
4 
                         static_cast<GLuint>(this->VBO->VertexCount - 1),
5 
                         static_cast<GLsizei>(this->Primitives[PrimitiveTris].IBO->IndexCount),
6 
                         GL_UNSIGNED_INT,
7 
-                        reinterpret_cast<const GLvoid *>(NULL));
8 
+                        nullptr);
9 
   }
10 
   if (primed)
11 
   {
12 
@@ -579,7 +579,7 @@
13 
     glDrawElementsInstancedARB(GL_TRIANGLES,
14 
       static_cast<GLsizei>(this->Primitives[PrimitiveTris].IBO->IndexCount),
15 
       GL_UNSIGNED_INT,
16 
-      reinterpret_cast<const GLvoid *>(NULL),
17 
+      nullptr,
18 
       numPts);
19 
   }
20 
 #endif
(-)paraview/files/patch-vtkOpenGLPolyDataMapper.cxx (+11 lines)
Line 0 Link Here
1 
--- VTK/Rendering/OpenGL2/vtkOpenGLPolyDataMapper.cxx.orig	2018-05-27 16:24:15.569847000 +0700
2 
+++ VTK/Rendering/OpenGL2/vtkOpenGLPolyDataMapper.cxx	2018-05-27 16:24:49.235720000 +0700
3 
@@ -2534,7 +2534,7 @@
4 
                           static_cast<GLuint>(this->VBO->VertexCount - 1),
5 
                           static_cast<GLsizei>(this->Primitives[i].IBO->IndexCount),
6 
                           GL_UNSIGNED_INT,
7 
-                          reinterpret_cast<const GLvoid *>(NULL));
8 
+                          nullptr);
9 
       this->Primitives[i].IBO->Release();
10
11 
       int stride = (mode == GL_POINTS ? 1 : (mode == GL_LINES ? 2 : 3));
(-)paraview/files/patch-vtkOpenGLPolyDataMapper2D.cxx (+38 lines)
Line 0 Link Here
1 
--- VTK/Rendering/OpenGL2/vtkOpenGLPolyDataMapper2D.cxx.orig	2018-05-27 16:27:25.256918000 +0700
2 
+++ VTK/Rendering/OpenGL2/vtkOpenGLPolyDataMapper2D.cxx	2018-05-27 16:29:21.344983000 +0700
3 
@@ -860,7 +860,7 @@
4 
                         static_cast<GLuint>(this->VBO->VertexCount - 1),
5 
                         static_cast<GLsizei>(this->Points.IBO->IndexCount),
6 
                         GL_UNSIGNED_INT,
7 
-                        reinterpret_cast<const GLvoid *>(NULL));
8 
+                        nullptr);
9 
     this->Points.IBO->Release();
10 
     this->PrimitiveIDOffset += (int)this->Points.IBO->IndexCount;
11 
   }
12 
@@ -881,7 +881,7 @@
13 
                           static_cast<GLuint>(this->VBO->VertexCount - 1),
14 
                           static_cast<GLsizei>(this->Lines.IBO->IndexCount),
15 
                           GL_UNSIGNED_INT,
16 
-                          reinterpret_cast<const GLvoid *>(NULL));
17 
+                          nullptr);
18 
       this->Lines.IBO->Release();
19 
     }
20 
     this->PrimitiveIDOffset += (int)this->Lines.IBO->IndexCount/2;
21 
@@ -899,7 +899,7 @@
22 
                           static_cast<GLuint>(this->VBO->VertexCount - 1),
23 
                           static_cast<GLsizei>(this->Tris.IBO->IndexCount),
24 
                           GL_UNSIGNED_INT,
25 
-                          reinterpret_cast<const GLvoid *>(NULL));
26 
+                          nullptr);
27 
       this->Tris.IBO->Release();
28 
       this->PrimitiveIDOffset += (int)this->Tris.IBO->IndexCount/3;
29 
     }
30 
@@ -916,7 +916,7 @@
31 
                           static_cast<GLuint>(this->VBO->VertexCount - 1),
32 
                           static_cast<GLsizei>(this->TriStrips.IBO->IndexCount),
33 
                           GL_UNSIGNED_INT,
34 
-                          reinterpret_cast<const GLvoid *>(NULL));
35 
+                          nullptr);
36 
       this->TriStrips.IBO->Release();
37 
     }
38 
   }
(-)paraview/files/patch-vtkOpenGLProjectedTetrahedraMapper.cxx (+11 lines)
Line 0 Link Here
1 
--- VTK/Rendering/VolumeOpenGL2/vtkOpenGLProjectedTetrahedraMapper.cxx.orig	2018-05-27 19:37:01.700537000 +0700
2 
+++ VTK/Rendering/VolumeOpenGL2/vtkOpenGLProjectedTetrahedraMapper.cxx	2018-05-27 19:37:40.189362000 +0700
3 
@@ -1100,7 +1100,7 @@
4 
                         static_cast<GLuint>(this->VBO->VertexCount - 1),
5 
                         static_cast<GLsizei>(this->Tris.IBO->IndexCount),
6 
                         GL_UNSIGNED_INT,
7 
-                        reinterpret_cast<const GLvoid *>(NULL));
8 
+                        nullptr);
9 
     this->Tris.IBO->Release();
10 
     this->Tris.VAO->Release();
11 
     this->VBO->Release();
(-)paraview/files/patch-vtkOpenGLRenderUtilities.cxx (+12 lines)
Line 0 Link Here
1 
--- VTK/Rendering/OpenGL2/vtkOpenGLRenderUtilities.cxx.orig	2018-05-27 16:31:22.687702000 +0700
2 
+++ VTK/Rendering/OpenGL2/vtkOpenGLRenderUtilities.cxx	2018-05-27 16:32:03.881401000 +0700
3 
@@ -93,8 +93,7 @@
4 
   vtkNew<vtkOpenGLBufferObject> ibo;
5 
   vao->Bind();
6 
   ibo->Upload(iboData, numIndices, vtkOpenGLBufferObject::ElementArrayBuffer);
7 
-  glDrawElements(GL_TRIANGLES, numIndices, GL_UNSIGNED_INT,
8 
-    reinterpret_cast<const GLvoid *>(NULL));
9 
+  glDrawElements(GL_TRIANGLES, numIndices, GL_UNSIGNED_INT, nullptr);
10 
   ibo->Release();
11 
   ibo->ReleaseGraphicsResources();
12 
   vao->RemoveAttributeArray("vertexMC");
(-)paraview/files/patch-vtkOpenGLStickMapper.cxx (+11 lines)
Line 0 Link Here
1 
--- VTK/Rendering/OpenGL2/vtkOpenGLStickMapper.cxx.orig	2018-05-27 16:48:40.625194000 +0700
2 
+++ VTK/Rendering/OpenGL2/vtkOpenGLStickMapper.cxx	2018-05-27 16:48:53.507986000 +0700
3 
@@ -614,7 +614,7 @@
4 
                         static_cast<GLuint>(this->VBO->VertexCount - 1),
5 
                         static_cast<GLsizei>(this->Primitives[PrimitiveTris].IBO->IndexCount),
6 
                         GL_UNSIGNED_INT,
7 
-                        reinterpret_cast<const GLvoid *>(NULL));
8 
+                        nullptr);
9 
     this->Primitives[PrimitiveTris].IBO->Release();
10 
   }
11 
 }
(-)paraview/files/patch-vtkPhastaReader.cxx (+11 lines)
Line 0 Link Here
1 
--- ParaViewCore/VTKExtensions/Default/vtkPhastaReader.cxx.orig	2018-05-27 20:05:20.868911000 +0700
2 
+++ ParaViewCore/VTKExtensions/Default/vtkPhastaReader.cxx	2018-05-27 20:05:16.469487000 +0700
3 
@@ -200,7 +200,7 @@
4 
     {
5 
       text_header = new char[real_length + 1];
6 
       strncpy(text_header, Line, real_length);
7 
-      text_header[real_length] = static_cast<char>(NULL);
8 
+      text_header[real_length] = static_cast<char>(0);
9 
       token = strtok(text_header, ":");
10 
       if (cscompare(phrase, token))
11 
       {
(-)paraview/files/patch-vtkXOpenGLRenderWindow.cxx (+40 lines)
Line 0 Link Here
1 
--- VTK/Rendering/OpenGL2/vtkXOpenGLRenderWindow.cxx.orig	2018-05-27 16:56:49.463432000 +0700
2 
+++ VTK/Rendering/OpenGL2/vtkXOpenGLRenderWindow.cxx	2018-05-27 16:58:36.068069000 +0700
3 
@@ -333,7 +333,7 @@
4
5 
 vtkXOpenGLRenderWindow::vtkXOpenGLRenderWindow()
6 
 {
7 
-  this->ParentId = static_cast<Window>(NULL);
8 
+  this->ParentId = static_cast<Window>(0);
9 
   this->ScreenSize[0] = 0;
10 
   this->ScreenSize[1] = 0;
11 
   this->OwnDisplay = 0;
12 
@@ -341,8 +341,8 @@
13 
   this->ForceMakeCurrent = 0;
14 
   this->UsingHardware = 0;
15 
   this->DisplayId = static_cast<Display *>(NULL);
16 
-  this->WindowId = static_cast<Window>(NULL);
17 
-  this->NextWindowId = static_cast<Window>(NULL);
18 
+  this->WindowId = static_cast<Window>(0);
19 
+  this->NextWindowId = static_cast<Window>(0);
20 
   this->ColorMap = static_cast<Colormap>(0);
21 
   this->OwnWindow = 0;
22
23 
@@ -762,7 +762,7 @@
24 
   if (this->OwnWindow && this->DisplayId && this->WindowId)
25 
   {
26 
     XDestroyWindow(this->DisplayId,this->WindowId);
27 
-    this->WindowId = static_cast<Window>(NULL);
28 
+    this->WindowId = static_cast<Window>(0);
29 
   }
30
31 
   this->CloseDisplay();
32 
@@ -1157,7 +1157,7 @@
33
34 
   // set the default windowid
35 
   this->WindowId = this->NextWindowId;
36 
-  this->NextWindowId = static_cast<Window>(NULL);
37 
+  this->NextWindowId = static_cast<Window>(0);
38
39 
   // set everything up again
40 
   this->Initialize();

Return to bug 228569