summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2008-12-22 01:43:39 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2008-12-22 01:43:39 (GMT)
commit292082ecad0ae29c005cde1e4e3d1d07f24d9a01 (patch)
tree5556bc838f980329b80cb4180b2dd405457c8c62
parent7bccb3db79ee269e12c5f019c68396947a92837a (diff)
downloadtk-292082ecad0ae29c005cde1e4e3d1d07f24d9a01.zip
tk-292082ecad0ae29c005cde1e4e3d1d07f24d9a01.tar.gz
tk-292082ecad0ae29c005cde1e4e3d1d07f24d9a01.tar.bz2
Backport of fix for [Bug 2107938].
-rw-r--r--ChangeLog5
-rw-r--r--generic/tkCanvPs.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d799c5e..64082fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-22 Donal K. Fellows <dkf@users.sf.net>
+
+ * generic/tkCanvPs.c (Tk_PostscriptFont): Backport of font size and
+ reflection fix. [Bug 2107938]
+
2008-12-22 Alexandre Ferrieux <ferrieux@users.sourceforge.net>
* generic/tkCanvUtil.c: Backport of the Millipeter patch [1813597,
diff --git a/generic/tkCanvPs.c b/generic/tkCanvPs.c
index d8d60a5..079b38b 100644
--- a/generic/tkCanvPs.c
+++ b/generic/tkCanvPs.c
@@ -11,7 +11,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkCanvPs.c,v 1.19 2007/12/13 15:24:13 dgp Exp $
+ * RCS: @(#) $Id: tkCanvPs.c,v 1.19.2.1 2008/12/22 01:43:39 dkf Exp $
*/
#include "tkInt.h"
@@ -755,7 +755,7 @@ Tk_PostscriptFont(
Tcl_DStringInit(&ds);
points = Tk_PostscriptFontName(tkfont, &ds);
- sprintf(pointString, "%d", points);
+ sprintf(pointString, "%d", TkFontGetPoints(psInfoPtr->tkwin, points));
Tcl_AppendResult(interp, "/", Tcl_DStringValue(&ds), " findfont ",
pointString, " scalefont ", NULL);
if (strncasecmp(Tcl_DStringValue(&ds), "Symbol", 7) != 0) {