<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/63e064e5d30ad9613986fb1c9b5caacc93d81b80">https://github.com/macports/macports-ports/commit/63e064e5d30ad9613986fb1c9b5caacc93d81b80</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 63e064e5d30ad9613986fb1c9b5caacc93d81b80
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun Jul 21 09:47:36 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> gl2ps: apply upstream patches
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Some ports (e.g. VTK) rely on the new functionality.
</span>---
graphics/gl2ps/Portfile | 5 +-
graphics/gl2ps/files/patch-upstream.diff | 205 +++++++++++++++++++++++++++++++
2 files changed, 209 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gl2ps/Portfile b/graphics/gl2ps/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 13ed767..6e70dee 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gl2ps/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gl2ps/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup cmake 1.1
</span>
name gl2ps
version 1.4.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> categories graphics print
platforms darwin
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,6 +35,9 @@ depends_lib-append port:zlib \
</span>
worksrcdir ${name}-${version}-source
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# apply upstream patches to accommodate VTK and ParaView
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-upstream.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # if CMakeLists.txt finds GLUT, it builds but does not install example programs
# it also links installed libraries with whichever glut it finds
# if CMakeLists.txt finds LATEX, it builds and installs pdf documentation
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gl2ps/files/patch-upstream.diff b/graphics/gl2ps/files/patch-upstream.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..9243307
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gl2ps/files/patch-upstream.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,205 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./gl2ps.c 2017-04-03 15:48:30.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./gl2ps.c 2019-07-13 15:22:45.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -164,7 +164,7 @@ typedef struct {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GLshort type, numverts;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GLushort pattern;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char boundary, offset, culled;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- GLint factor, linecap, linejoin;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ GLint factor, linecap, linejoin, sortid;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GLfloat width, ofactor, ounits;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GL2PSvertex *verts;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ union {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -600,6 +600,15 @@ static void gl2psListSort(GL2PSlist *lis
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qsort(list->array, list->n, list->size, fcmp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* Must be a list of GL2PSprimitives. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static void gl2psListAssignSortIds(GL2PSlist *list)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ GLint i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for(i = 0; i < gl2psListNbr(list); i++){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (*(GL2PSprimitive**)gl2psListPointer(list, i))->sortid = i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void gl2psListAction(GL2PSlist *list, void (*action)(void *data))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GLint i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -853,7 +862,8 @@ static void gl2psConvertPixmapToPNG(GL2P
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static GLint gl2psAddText(GLint type, const char *str, const char *fontname,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GLshort fontsize, GLint alignment, GLfloat angle,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- GL2PSrgba color)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ GL2PSrgba color, GLboolean setblpos,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ GLfloat blx, GLfloat bly)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GLfloat pos[4];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GL2PSprimitive *prim;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -878,11 +888,16 @@ static GLint gl2psAddText(GLint type, co
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ prim = (GL2PSprimitive*)gl2psMalloc(sizeof(GL2PSprimitive));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ prim->type = (GLshort)type;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ prim->boundary = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- prim->numverts = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- prim->verts = (GL2PSvertex*)gl2psMalloc(sizeof(GL2PSvertex));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ prim->numverts = setblpos ? 2 : 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ prim->verts = (GL2PSvertex*)gl2psMalloc(sizeof(GL2PSvertex) * prim->numverts);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ prim->verts[0].xyz[0] = pos[0];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ prim->verts[0].xyz[1] = pos[1];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ prim->verts[0].xyz[2] = pos[2];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (setblpos) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ prim->verts[1].xyz[0] = blx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ prim->verts[1].xyz[1] = bly;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ prim->verts[1].xyz[2] = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ prim->culled = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ prim->offset = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ prim->ofactor = 0.0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1452,7 +1467,8 @@ static int gl2psCompareDepth(const void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* Ensure that initial ordering is preserved when depths match. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return q->sortid < w->sortid ? -1 : 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2277,7 +2293,7 @@ static void gl2psParseFeedbackBuffer(GLi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GLboolean boundary;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GLint i, sizeoffloat, count, v, vtot, offset = 0, factor = 0, auxindex = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GLint lcap = 0, ljoin = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- GLfloat lwidth = 1.0F, psize = 1.0F, ofactor, ounits;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ GLfloat lwidth = 1.0F, psize = 1.0F, ofactor = 0.0F, ounits = 0.0F;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GLfloat *current;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GL2PSvertex vertices[3];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GL2PSprimitive *prim;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3559,6 +3575,43 @@ static void gl2psPutPDFText(GL2PSstring
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ This is used for producing aligned text in PDF. (x, y) is the anchor for the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ aligned text, (xbl, ybl) is the bottom left corner. Rotation happens
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ around (x, y).*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static void gl2psPutPDFTextBL(GL2PSstring *text, int cnt, GLfloat x, GLfloat y,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ GLfloat xbl, GLfloat ybl)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(text->angle == 0.0F){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gl2ps->streamlength += gl2psPrintf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ("BT\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "/F%d %d Tf\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "%f %f Td\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "(%s) Tj\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "ET\n",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cnt, text->fontsize, xbl, ybl, text->str);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ GLfloat a, ca, sa;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ GLfloat pi = 3.141593F;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ GLfloat i = atan2(y - ybl, x - xbl);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ GLfloat r = sqrt((y - ybl) * (y - ybl) + (x - xbl) * (x - xbl));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ a = (GLfloat)(pi * text->angle / 180.0F);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sa = (GLfloat)sin(a);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ca = (GLfloat)cos(a);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gl2ps->streamlength += gl2psPrintf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ("BT\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "/F%d %d Tf\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "%f %f %f %f %f %f Tm\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "(%s) Tj\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "ET\n",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cnt, text->fontsize,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ca, sa, -sa, ca,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ xbl + r * (cos(i) - cos(i + a)), ybl + r * (sin(i) - sin(i+a)), text->str);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void gl2psPutPDFSpecial(int prim, int sec, GL2PSstring *text)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gl2ps->streamlength += gl2psPrintf("/GS%d%d gs\n", prim, sec);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3941,9 +3994,17 @@ static void gl2psPDFgroupListWriteMainSt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for(j = 0; j <= lastel; ++j){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ prim = *(GL2PSprimitive**)gl2psListPointer(gro->ptrlist, j);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gl2ps->streamlength += gl2psPrintPDFFillColor(prim->verts[0].rgba);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (prim->numverts == 2) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gl2psPutPDFTextBL(prim->data.text, gro->fontno, prim->verts[0].xyz[0],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ prim->verts[0].xyz[1],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ prim->verts[1].xyz[0],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ prim->verts[1].xyz[1]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gl2psPutPDFText(prim->data.text, gro->fontno, prim->verts[0].xyz[0],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ prim->verts[0].xyz[1]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case GL2PS_SPECIAL:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lastel = gl2psListNbr(gro->ptrlist) - 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5834,6 +5895,7 @@ static GLint gl2psPrintPrimitives(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gl2psListReset(gl2ps->primitives);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case GL2PS_SIMPLE_SORT :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gl2psListAssignSortIds(gl2ps->primitives);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gl2psListSort(gl2ps->primitives, gl2psCompareDepth);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(gl2ps->options & GL2PS_OCCLUSION_CULL){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gl2psListActionInverse(gl2ps->primitives, gl2psAddInImageTree);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6147,29 +6209,42 @@ GL2PSDLL_API GLint gl2psTextOptColor(con
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GL2PSrgba color)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return gl2psAddText(GL2PS_TEXT, str, fontname, fontsize, alignment, angle,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- color);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ color, GL_FALSE, 0, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/**
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * This version of gl2psTextOptColor is used to go around the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * fact that PDF does not support text alignment. The extra parameters
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * (blx, bly) represent the bottom left corner of the text bounding box.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++GL2PSDLL_API GLint gl2psTextOptColorBL(const char *str, const char *fontname,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ GLshort fontsize, GLint alignment, GLfloat angle,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ GL2PSrgba color, GLfloat blx, GLfloat bly)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return gl2psAddText(GL2PS_TEXT, str, fontname, fontsize, alignment, angle,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ color, GL_TRUE, blx, bly);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GL2PSDLL_API GLint gl2psTextOpt(const char *str, const char *fontname,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GLshort fontsize, GLint alignment, GLfloat angle)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return gl2psAddText(GL2PS_TEXT, str, fontname, fontsize, alignment, angle, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return gl2psAddText(GL2PS_TEXT, str, fontname, fontsize, alignment, angle, NULL, GL_FALSE, 0, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GL2PSDLL_API GLint gl2psText(const char *str, const char *fontname, GLshort fontsize)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return gl2psAddText(GL2PS_TEXT, str, fontname, fontsize, GL2PS_TEXT_BL, 0.0F,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ NULL, GL_FALSE, 0, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GL2PSDLL_API GLint gl2psSpecial(GLint format, const char *str)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return gl2psAddText(GL2PS_SPECIAL, str, "", 0, format, 0.0F, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return gl2psAddText(GL2PS_SPECIAL, str, "", 0, format, 0.0F, NULL, GL_FALSE, 0, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GL2PSDLL_API GLint gl2psSpecialColor(GLint format, const char *str, GL2PSrgba rgba)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return gl2psAddText(GL2PS_SPECIAL, str, "", 0, format, 0.0F, rgba);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return gl2psAddText(GL2PS_SPECIAL, str, "", 0, format, 0.0F, rgba, GL_FALSE, 0, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GL2PSDLL_API GLint gl2psDrawPixels(GLsizei width, GLsizei height,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./gl2ps.h 2017-04-03 15:48:26.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./gl2ps.h 2019-07-13 15:19:35.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -216,6 +216,9 @@ GL2PSDLL_API GLint gl2psTextOpt(const ch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GL2PSDLL_API GLint gl2psTextOptColor(const char *str, const char *fontname,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GLshort fontsize, GLint align, GLfloat angle,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GL2PSrgba color);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++GL2PSDLL_API GLint gl2psTextOptColorBL(const char *str, const char *fontname,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ GLshort fontsize, GLint align, GLfloat angle,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ GL2PSrgba color, GLfloat blx, GLfloat bly);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GL2PSDLL_API GLint gl2psSpecial(GLint format, const char *str);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GL2PSDLL_API GLint gl2psSpecialColor(GLint format, const char *str, GL2PSrgba rgba);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GL2PSDLL_API GLint gl2psDrawPixels(GLsizei width, GLsizei height,
</span></pre><pre style='margin:0'>
</pre>