Author: matt
Date: 2010-11-15 05:10:14 -0800 (Mon, 15 Nov 2010)
New Revision: 7840
Log:
Applied latest changes for STR 2215
Modified:
branches/branch-1.3/src/fl_font_xft.cxx
Modified: branches/branch-1.3/src/fl_font_xft.cxx
===================================================================
--- branches/branch-1.3/src/fl_font_xft.cxx 2010-11-15 08:44:28 UTC (rev
7839)
+++ branches/branch-1.3/src/fl_font_xft.cxx 2010-11-15 13:10:14 UTC (rev
7840)
@@ -433,15 +433,14 @@
}
// first, we do a query with no prefered size, to see if the font exists at
all
- snprintf(xlfd, 128, "-*-*%s*-%s-%c-*--*-*-*-*-*-*-*-*", name, weight,
slant); // make up xlfd style name
+ snprintf(xlfd, 128, "-*-%s-%s-%c-*--*-*-*-*-*-*-*-*", name, weight, slant);
// make up xlfd style name
xgl_font = XLoadQueryFont(fl_display, xlfd);
if(xgl_font) { // the face exists, but can we get it in a suitable size?
XFreeFont(fl_display, xgl_font); // release the non-sized version
- snprintf(xlfd, 128, "-*-*%s*-%s-%c-*--*-%d-*-*-*-*-*-*", name, weight,
slant, (size*10));
+ snprintf(xlfd, 128, "-*-%s-%s-%c-*--*-%d-*-*-*-*-*-*", name, weight,
slant, (size*10));
xgl_font = XLoadQueryFont(fl_display, xlfd); // attempt to load the font
at the right size
}
//puts(xlfd);
- free(pc); // release our copy of the font name
// try alternative names
if (!xgl_font) {
@@ -459,6 +458,7 @@
snprintf(xlfd, 128, "-*-*%s*-%s-%c-*--*-%d-*-*-*-*-*-*", name, weight,
slant, (size*10));
xgl_font = XLoadQueryFont(fl_display, xlfd);
}
+ free(pc); // release our copy of the font name
// if we have nothing loaded, try a generic proportional font
if(!xgl_font) {
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
