diff --git a/CMakeLists.txt b/CMakeLists.txt
index be9d621cad362e29e5e4056fe8cbcd2445eeddfc..575bace4401c758ec60e949a6fc0dd6c2270ca3d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
# GL2PS, an OpenGL to PostScript Printing Library
-# Copyright (C) 1999-2012 C. Geuzaine
+# Copyright (C) 1999-2015 C. Geuzaine
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of either:
diff --git a/gl2ps.c b/gl2ps.c
index 593d2328ca405a403f87e8511b63ef203cd905ae..c6c6d41141d25e9663df04c552c26498c45701c1 100644
--- a/gl2ps.c
+++ b/gl2ps.c
@@ -1,6 +1,6 @@
/*
* GL2PS, an OpenGL to PostScript Printing Library
- * Copyright (C) 1999-2012 C. Geuzaine
+ * Copyright (C) 1999-2015 C. Geuzaine
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of either:
@@ -2186,9 +2186,9 @@ static void gl2psBuildPolygonBoundary(GL2PSbsptree *tree)
*********************************************************************/
static void gl2psAddPolyPrimitive(GLshort type, GLshort numverts,
- GL2PSvertex *verts, GLint offset,
- GLfloat ofactor, GLfloat ounits,
- GLushort pattern, GLint factor,
+ GL2PSvertex *verts, GLint offset,
+ GLfloat ofactor, GLfloat ounits,
+ GLushort pattern, GLint factor,
GLfloat width, char boundary)
{
GL2PSprimitive *prim;
@@ -2329,8 +2329,8 @@ static void gl2psParseFeedbackBuffer(GLint used)
used -= 2;
ounits = current[1];
break;
- case GL2PS_END_OFFSET_TOKEN :
- offset = 0;
+ case GL2PS_END_OFFSET_TOKEN :
+ offset = 0;
ofactor = 0.0;
ounits = 0.0;
break;
@@ -5099,7 +5099,7 @@ static void gl2psPrintSVGPixmap(GLfloat x, GLfloat y, GL2PSimage *pixmap)
y -= pixmap->zoom_y * (GLfloat)pixmap->height;
gl2psPrintf("<image x=\"%g\" y=\"%g\" width=\"%d\" height=\"%d\"\n",
0., 0., pixmap->width, pixmap->height);
- gl2psPrintf("transform=\"matrix(%g,0,0,%g,%g,%g)\"\n",
+ gl2psPrintf("transform=\"matrix(%g,0,0,%g,%g,%g)\"\n",
pixmap->zoom_x, pixmap->zoom_y, x, y);
gl2psPrintf("xlink:href=\"data:image/png;base64,");
for(i = 0; i < gl2psListNbr(png); i++){
diff --git a/gl2ps.h b/gl2ps.h
index 978c2f108605e3ad3cd6079c82e8a13e4c9e48e6..d3e7c0cda5b62e41d0c102a33b0656aeaa48bd37 100644
--- a/gl2ps.h
+++ b/gl2ps.h
@@ -1,6 +1,6 @@
/*
* GL2PS, an OpenGL to PostScript Printing Library
- * Copyright (C) 1999-2012 C. Geuzaine
+ * Copyright (C) 1999-2015 C. Geuzaine
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of either:
@@ -84,14 +84,14 @@
#define GL2PS_MAJOR_VERSION 1
#define GL2PS_MINOR_VERSION 3
-#define GL2PS_PATCH_VERSION 8
+#define GL2PS_PATCH_VERSION 9
#define GL2PS_EXTRA_VERSION ""
#define GL2PS_VERSION (GL2PS_MAJOR_VERSION + \
0.01 * GL2PS_MINOR_VERSION + \
0.0001 * GL2PS_PATCH_VERSION)
-#define GL2PS_COPYRIGHT "(C) 1999-2012 C. Geuzaine"
+#define GL2PS_COPYRIGHT "(C) 1999-2015 C. Geuzaine"
/* Output file formats (the values and the ordering are important!) */
diff --git a/gl2ps.tex b/gl2ps.tex
index ddd9586650a9e54e4e6114fd4f2c358b49f35123..8486f07712a67b5bbc58358b22ca6c3946c0a599 100644
--- a/gl2ps.tex
+++ b/gl2ps.tex
@@ -1,6 +1,6 @@
%
% GL2PS, an OpenGL to PostScript Printing Library
-% Copyright (C) 1999-2012 C. Geuzaine
+% Copyright (C) 1999-2015 C. Geuzaine
%
% This program is free software; you can redistribute it and/or
% modify it under the terms of either:
@@ -62,7 +62,6 @@
\title{GL2PS: an OpenGL to PostScript printing library}
\author{Christophe Geuzaine}
-%\date{Version 1.3.8, November 27 2012}
\maketitle
@@ -92,7 +91,7 @@
</center>
<h2>Download</h2>
The latest stable version of GL2PS is <a
-href="http://geuz.org/gl2ps/src/gl2ps-1.3.8.tgz">gl2ps-1.3.8.tgz</a>. Older
+href="http://geuz.org/gl2ps/src/gl2ps-1.3.9.tgz">gl2ps-1.3.9.tgz</a>. Older
versions and nightly source snapshots are available <a
href="http://geuz.org/gl2ps/src/">here</a>. For read-only svn access use:
'<code>svn co https://geuz.org/svn/gl2ps/trunk gl2ps</code>' (username:
@@ -106,7 +105,7 @@ password: gl2ps). You can also subscribe to the <a
href="http://geuz.org/mailman/listinfo/gl2ps-announce/">gl2ps-announce</a>
mailing list to be notified automatically when a new version of GL2PS is
released.
-<!-- form action="https://www.paypal.com/cgi-bin/webscr" method="post">
+<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
<p>
<input type="hidden" name="cmd" value="_xclick">
<input type="hidden" name="business" value="paypal@geuz.org">
@@ -118,7 +117,7 @@ released.
<input type="submit" value="PayPal" style="display:inline;">
donation.
</p>
-</form -->
+</form>
<h2>Documentation</h2>}
\tableofcontents
@@ -900,7 +899,7 @@ rotated text in PDF output;
\noemail{David Lonie}{david.lonie@kitware.com} for VTK patches;
%
\noemail{Pantxo Diribarne}{pantxo.diribarne@gmail.com} for polygon offset
-improvement.
+improvement and image scaling fix for SVG output.
\section{Links}
\label{sec:links}
@@ -1048,7 +1047,8 @@ anymore.
\item[1.3.7] (Sep 2, 2012) Minor documentation and build system fixes.
\item[1.3.8] (Nov 27, 2012) Handling of arbitrary length messages in
gl2psPrintf; added \dd{gl2psTextOptColor}; minor fixes.
-\item[1.3.9] () Improved \dd{GL_POLYGON_OFFSET_FILL}.
+\item[1.3.9] (Oct 17, 2015) Improved \dd{GL_POLYGON_OFFSET_FILL}; fixed scaling
+ of images in SVG output.
\end{description}
\end{document}
diff --git a/gl2psTest.c b/gl2psTest.c
index 291c6f9dbaea476c339892960e87ffc1ef776ffd..2d2a82548be13c3e31134f7571f82d97ff637e83 100644
--- a/gl2psTest.c
+++ b/gl2psTest.c
@@ -1,6 +1,6 @@
/*
* GL2PS, an OpenGL to PostScript Printing Library
- * Copyright (C) 1999-2012 Christophe Geuzaine <geuz@geuz.org>
+ * Copyright (C) 1999-2015 Christophe Geuzaine <geuz@geuz.org>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of either:
diff --git a/gl2psTestSimple.c b/gl2psTestSimple.c
index 5fbd14c47276f34f3e707724e6b100aec57500bc..e14aa3e64c6e2f4c0602470ebb98e045e6b411dc 100644
--- a/gl2psTestSimple.c
+++ b/gl2psTestSimple.c
@@ -1,6 +1,6 @@
/*
* GL2PS, an OpenGL to PostScript Printing Library
- * Copyright (C) 1999-2012 Christophe Geuzaine <geuz@geuz.org>
+ * Copyright (C) 1999-2015 Christophe Geuzaine <geuz@geuz.org>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of either:
@@ -68,15 +68,15 @@ static void display(void)
glPopMatrix();
- /* draw three triangles on the same zplane and use polygon offset
- to order the layers: the grey triangle should be drawn on the
+ /* draw three triangles on the same zplane and use polygon offset
+ to order the layers: the grey triangle should be drawn on the
middle layer */
glEnable(GL_POLYGON_OFFSET_FILL);
glPolygonOffset(1.0, 1.0);
gl2psEnable(GL2PS_POLYGON_OFFSET_FILL);
glColor3f(0.,0.,0.);
- glBegin(GL_TRIANGLES);
- glVertex3f(0.6, 0.8, 0);
+ glBegin(GL_TRIANGLES);
+ glVertex3f(0.6, 0.8, 0);
glVertex3f(0.8, 0.8, 0);
glVertex3f(0.7, 0.92, 0);
glEnd();
@@ -84,8 +84,8 @@ static void display(void)
glPolygonOffset(2.0, 2.0);
gl2psEnable(GL2PS_POLYGON_OFFSET_FILL);
glColor3f(1.,1.,1.);
- glBegin(GL_TRIANGLES);
- glVertex3f(0.7, 0.8, 0);
+ glBegin(GL_TRIANGLES);
+ glVertex3f(0.7, 0.8, 0);
glVertex3f(0.9, 0.8, 0);
glVertex3f(0.8, 0.92, 0);
glEnd();
@@ -93,12 +93,12 @@ static void display(void)
glPolygonOffset(1.5, 1.5);
gl2psEnable(GL2PS_POLYGON_OFFSET_FILL);
glColor3f(0.5,0.5,0.5);
- glBegin(GL_TRIANGLES);
- glVertex3f(0.65, 0.86, 0);
+ glBegin(GL_TRIANGLES);
+ glVertex3f(0.65, 0.86, 0);
glVertex3f(0.85, 0.86, 0);
glVertex3f(0.75, 0.98, 0);
glEnd();
-
+
glDisable(GL_POLYGON_OFFSET_FILL);
gl2psDisable(GL2PS_POLYGON_OFFSET_FILL);