summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorhobbs <hobbs>2003-05-11 00:57:09 (GMT)
committerhobbs <hobbs>2003-05-11 00:57:09 (GMT)
commit996aa5aa5d6fca18e46c0f25c7f25589a1d85003 (patch)
tree8020fdf84b9d66b4f2cf40529b7f25312376747d /generic
parent513919cbad4d351c94c5bf05908de070e5627385 (diff)
downloadtk-996aa5aa5d6fca18e46c0f25c7f25589a1d85003.zip
tk-996aa5aa5d6fca18e46c0f25c7f25589a1d85003.tar.gz
tk-996aa5aa5d6fca18e46c0f25c7f25589a1d85003.tar.bz2
* generic/tkCanvPoly.c (PolygonToPostscript):
* tests/canvPs.test: correct crash when generating postscript for a single-line polygon (point) with no color. [Bug #734498] (wilm)
Diffstat (limited to 'generic')
-rw-r--r--generic/tkCanvPoly.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/generic/tkCanvPoly.c b/generic/tkCanvPoly.c
index 5058b9f..2b5f036 100644
--- a/generic/tkCanvPoly.c
+++ b/generic/tkCanvPoly.c
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkCanvPoly.c,v 1.10 2003/02/09 07:48:22 hobbs Exp $
+ * RCS: @(#) $Id: tkCanvPoly.c,v 1.10.2.1 2003/05/11 00:57:09 hobbs Exp $
*/
#include <stdio.h>
@@ -1852,13 +1852,16 @@ PolygonToPostscript(interp, canvas, itemPtr, prepass)
}
if (polyPtr->numPoints==2) {
char string[128];
+ if (color == NULL) {
+ return TCL_OK;
+ }
+
sprintf(string, "%.15g %.15g translate %.15g %.15g",
polyPtr->coordPtr[0], Tk_CanvasPsY(canvas, polyPtr->coordPtr[1]),
width/2.0, width/2.0);
Tcl_AppendResult(interp, "matrix currentmatrix\n",string,
" scale 1 0 moveto 0 0 1 0 360 arc\nsetmatrix\n", (char *) NULL);
- if (Tk_CanvasPsColor(interp, canvas, color)
- != TCL_OK) {
+ if (Tk_CanvasPsColor(interp, canvas, color) != TCL_OK) {
return TCL_ERROR;
}
if (stipple != None) {