diff options
| author | dawes <dawes> | 2003-12-31 05:10:03 +0000 |
|---|---|---|
| committer | dawes <dawes> | 2003-12-31 05:10:03 +0000 |
| commit | d4c2996425a1d1d14707e06a984371a4af5cdd50 (patch) | |
| tree | 2788248a5ce0d96384a25f7004cf8ee033dbbf51 | |
| parent | 7952513da73cf485c5cc6071f30e2fdd56222ae2 (diff) | |
712. Xtt2 update: Restore the behaviour of "bw" TTCap option for Netscape 4.x.
(Chisato Yamauchi).
| -rw-r--r-- | lib/font/FreeType/ftfuncs.c | 5 | ||||
| -rw-r--r-- | programs/Xserver/hw/xfree86/CHANGELOG | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/lib/font/FreeType/ftfuncs.c b/lib/font/FreeType/ftfuncs.c index a82f5d79d..9fb7eac3b 100644 --- a/lib/font/FreeType/ftfuncs.c +++ b/lib/font/FreeType/ftfuncs.c @@ -26,7 +26,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/lib/font/FreeType/ftfuncs.c,v 1.40tsi Exp $ */ +/* $XFree86: xc/lib/font/FreeType/ftfuncs.c,v 1.41 2003/12/31 01:18:42 tsi Exp $ */ #include "fontmisc.h" @@ -2970,10 +2970,9 @@ FreeTypeLoadXFont(char *fileName, tmp_rsb = face->face->bbox.xMax; if ( tmp_rsb < face->face->max_advance_width ) tmp_rsb = face->face->max_advance_width; /* apply scaleBBoxWidth */ - /* we should not ...??? + /* we should not ...??? */ tmp_lsb *= ins_ttcap->scaleBBoxWidth; tmp_rsb *= ins_ttcap->scaleBBoxWidth; - */ /* transform and rescale */ compute_new_extents( vals, scale, tmp_lsb, tmp_rsb, tmp_des, tmp_asc, &minLsb, &maxRsb, &descent, &ascent ); diff --git a/programs/Xserver/hw/xfree86/CHANGELOG b/programs/Xserver/hw/xfree86/CHANGELOG index f91cf0be0..4c2c91911 100644 --- a/programs/Xserver/hw/xfree86/CHANGELOG +++ b/programs/Xserver/hw/xfree86/CHANGELOG @@ -1,4 +1,6 @@ XFree86 4.3.99.903 (xx December 2003) + 712. Xtt2 update: Restore the behaviour of "bw" TTCap option for Netscape 4.x. + (Chisato Yamauchi). 711. Fix neomagic driver default mode selection to match the detected panel size. This allows it to work correctly with automatic configuration (David Dawes). @@ -18423,7 +18425,7 @@ XFree86 3.0a (28 April 1994) XFree86 3.0 (26 April 1994) -$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.3059 2003/12/30 13:31:15 pascal Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.3060 2003/12/31 05:07:27 dawes Exp $ |