Author: tkreuzer
Date: Wed Mar 21 10:59:16 2012
New Revision: 56203
URL: http://svn.reactos.org/svn/reactos?rev=56203&view=rev
Log:
[FTFD]
Fix a typo, add a trace, add a comment
Modified:
branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c
branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c
Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c
URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers…
==============================================================================
--- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c [iso-8859-1] (original)
+++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c [iso-8859-1] Wed Mar 21 10:59:16 2012
@@ -188,6 +188,7 @@
/* Check if there is rotation / skewing (cannot use iComplexity!?) */
if (!FLOATOBJ_bIsNull(&fxform.eM12) || !FLOATOBJ_bIsNull(&fxform.eM21))
{
+ TRACE("Setting extended xform\n");
//__debugbreak();
/* Create a transformation matrix that is applied after the character
@@ -386,14 +387,17 @@
}
/* Copy some values from the font structure */
- pfddm->fxMaxAscender = (pfont->metrics.fxMaxAscender + 15) & ~0x0f;
- pfddm->fxMaxDescender = (pfont->metrics.fxMaxDescender + 15) & ~0x0f;
pfddm->ptlUnderline1 = pfont->metrics.ptlUnderline1;
pfddm->ptlStrikeout = pfont->metrics.ptlStrikeout;
pfddm->ptlULThickness = pfont->metrics.ptlULThickness;
pfddm->ptlSOThickness = pfont->metrics.ptlSOThickness;
pfddm->cxMax = pfont->sizlMax.cx;
pfddm->cyMax = pfont->sizlMax.cy;
+
+ /* These values are rounded to pixels to fix inconsistent height
+ of marked text and the rest of the marked row in XP list boxes */
+ pfddm->fxMaxAscender = (pfont->metrics.fxMaxAscender + 15) & ~0x0f;
+ pfddm->fxMaxDescender = (pfont->metrics.fxMaxDescender + 15) & ~0x0f;
/* Convert the base vectors from FLOATOBJ to FLOATL */
pfddm->pteBase.x = FLOATOBJ_GetFloat(&pfont->ptefBase.x);
@@ -460,7 +464,7 @@
/* D is the glyph advance width. Convert it from 26.6 to 28.4 fixpoint format */
pgd->fxD = ftglyph->advance.x >> 2; // FIXME: should be projected on the x-axis
- /* Get the bitnmap size */
+ /* Get the bitmap size */
sizlBitmap.cx = ftglyph->bitmap.width;
sizlBitmap.cy = ftglyph->bitmap.rows;
Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c
URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers…
==============================================================================
--- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c [iso-8859-1] (original)
+++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c [iso-8859-1] Wed Mar 21 10:59:16 2012
@@ -29,7 +29,7 @@
* \brief Searches for a specific table in TrueType and OpenType font files
* \param pvView - The address where the font file is mapped
* \param cjView - Size of the mapped font file
- * \param iFace - 1-based index of the font in the font file.
+ * \param ulFont - 1-based index of the font in the font file.
* \param ulTag - Identifier tag of the table to search
* \param pulLength - Pointer to an ULONG that recieves the table length,
* Can be NULL.