File: 107_gl2ps_1.4.0.patch

package info (click to toggle)
vtk7 7.1.1%2Bdfsg2-8
  • links: PTS, VCS
  • area: main
  • in suites: bullseye
  • size: 127,396 kB
  • sloc: cpp: 1,539,584; ansic: 124,382; python: 78,038; tcl: 47,013; xml: 8,142; yacc: 5,040; java: 4,439; perl: 3,132; lex: 1,926; sh: 1,500; makefile: 126; objc: 83
file content (54 lines) | stat: -rw-r--r-- 2,273 bytes parent folder | download | duplicates (3)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
From 4a104a692cfc43594d7558b879fd96c75037dbcd Mon Sep 17 00:00:00 2001
From: jiapei100 <jp4work@gmail.com>
Date: Mon, 26 Sep 2016 23:59:06 -0700
Subject: [PATCH] For gl2ps most recent git, gl2psAddPolyPrimitive() requires
 different parameters.

---
 Rendering/GL2PSOpenGL2/vtkOpenGLGL2PSHelperImpl.cxx | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

--- a/Rendering/GL2PSOpenGL2/vtkOpenGLGL2PSHelperImpl.cxx
+++ b/Rendering/GL2PSOpenGL2/vtkOpenGLGL2PSHelperImpl.cxx
@@ -183,15 +183,15 @@
     {
       case GL_POINTS:
         gl2psAddPolyPrimitive(GL2PS_POINT, 1, verts, 0, 0.f, 0.f, 0xffff, 1,
-                              pointSize, 0);
+                              pointSize, gl2psLineCap (GL2PS_LINE_CAP_ROUND), gl2psLineJoin (GL2PS_LINE_JOIN_ROUND), 0);
         break;
 
       case GL_LINES:
         curVert = (curVert + 1) % 2;
         if (curVert == 0)
         {
-          gl2psAddPolyPrimitive(GL2PS_LINE, 2, verts, 0, 0.f, 0.f,
-                                this->LineStipple, 1, lineWidth, 0);
+          gl2psAddPolyPrimitive(GL2PS_LINE, 2, verts, 0, 0.f, 0.f, this->LineStipple, 1, 
+                                lineWidth, gl2psLineCap (GL2PS_LINE_CAP_ROUND), gl2psLineJoin (GL2PS_LINE_JOIN_ROUND), 0);
         }
         break;
 
@@ -199,8 +199,8 @@
         curVert = (curVert + 1) % 3;
         if (curVert == 0)
         {
-          gl2psAddPolyPrimitive(GL2PS_TRIANGLE, 3, verts, 0, 0.f, 0.f, 0xffff,
-                                1, 1, 0);
+          gl2psAddPolyPrimitive(GL2PS_TRIANGLE, 3, verts, 0, 0.f, 0.f, 0xffff, 1, 
+                                1, gl2psLineCap (GL2PS_LINE_CAP_ROUND), gl2psLineJoin (GL2PS_LINE_JOIN_ROUND), 0);
         }
         break;
 
@@ -270,9 +270,9 @@
       bgVerts[4].xyz[2] = bgVerts[0].xyz[2];
 
       gl2psAddPolyPrimitive(GL2PS_TRIANGLE, 3, bgVerts,     0, 0, 0, 0xffff, 0,
-                            0, 0);
+                            0, gl2psLineCap (GL2PS_LINE_CAP_ROUND), gl2psLineJoin (GL2PS_LINE_JOIN_ROUND), 0);
       gl2psAddPolyPrimitive(GL2PS_TRIANGLE, 3, bgVerts + 2, 0, 0, 0, 0xffff, 0,
-                            0, 0);
+                            0, gl2psLineCap (GL2PS_LINE_CAP_ROUND), gl2psLineJoin (GL2PS_LINE_JOIN_ROUND), 0);
     }
   }