diff options
| author | jenglish <jenglish@flightlab.com> | 2007-05-15 19:37:58 (GMT) |
|---|---|---|
| committer | jenglish <jenglish@flightlab.com> | 2007-05-15 19:37:58 (GMT) |
| commit | 86267901593d3e9d1539f7ee2d24b782d201fe2b (patch) | |
| tree | 99f311f6eb1c41041e551e0fe8cc9dc62873b2e6 | |
| parent | d77969b05f0ef96042f9b92b1658369a76c67b31 (diff) | |
| download | tk-86267901593d3e9d1539f7ee2d24b782d201fe2b.zip tk-86267901593d3e9d1539f7ee2d24b782d201fe2b.tar.gz tk-86267901593d3e9d1539f7ee2d24b782d201fe2b.tar.bz2 | |
Fix crash introduced by previous fix, exposed under newer fontconfig
libraries [Bug 1717830 again].
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | unix/tkUnixRFont.c | 5 |
2 files changed, 6 insertions, 4 deletions
@@ -1,3 +1,8 @@ +2007-05-15 Joe English <jenglish@users.sourceforge.net> + + * unix/tkUnixRFont.c: Fix crash introduced by previous fix + exposed under newer fontconfig libraries [Bug 1717830 again]. + 2007-05-15 Don Porter <dgp@users.sourceforge.net> * generic/tkGrid.c: Stop crash due to list intrep shimmer [Bug 1677608] diff --git a/unix/tkUnixRFont.c b/unix/tkUnixRFont.c index f76213e..0913fa1 100644 --- a/unix/tkUnixRFont.c +++ b/unix/tkUnixRFont.c @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkUnixRFont.c,v 1.19 2007/05/15 16:15:54 jenglish Exp $ + * RCS: @(#) $Id: tkUnixRFont.c,v 1.20 2007/05/15 19:37:58 jenglish Exp $ */ #include "tkUnixInt.h" @@ -248,9 +248,6 @@ FinishedWithFont( if (fontPtr->faces[i].ftFont) { XftFontClose(fontPtr->display, fontPtr->faces[i].ftFont); } - if (fontPtr->faces[i].source) { - FcPatternDestroy(fontPtr->faces[i].source); - } if (fontPtr->faces[i].charset) { FcCharSetDestroy(fontPtr->faces[i].charset); } |