Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

minor speed-improvement

Browse source 
svn path=/trunk/; revision=8778
This commit is contained in:
Thomas Bluemel 2004-03-17 20:57:06 +00:00
parent ff055ed11b
commit fd4ab47d69
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
reactos/subsys/win32k/objects/text.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: text.c,v 1.79 2004/03/04 00:07:03 navaraf Exp $ */ /* $Id: text.c,v 1.80 2004/03/17 20:57:06 weiden Exp $ */
#undef WIN32_LEAN_AND_MEAN #undef WIN32_LEAN_AND_MEAN
@ -209,8 +209,8 @@ IntGdiAddFontResource(PUNICODE_STRING Filename, DWORD fl)
FontGDI->face = face; FontGDI->face = face;
// FIXME: Complete text metrics // FIXME: Complete text metrics
FontGDI->TextMetric.tmAscent = (face->size->metrics.ascender + 32) / 64; // units above baseline FontGDI->TextMetric.tmAscent = (face->size->metrics.ascender + 32) >> 6; // units above baseline
FontGDI->TextMetric.tmDescent = (- face->size->metrics.descender + 32) / 64; // units below baseline FontGDI->TextMetric.tmDescent = (32 - face->size->metrics.descender) >> 6; // units below baseline
FontGDI->TextMetric.tmHeight = FontGDI->TextMetric.tmAscent + FontGDI->TextMetric.tmDescent; FontGDI->TextMetric.tmHeight = FontGDI->TextMetric.tmAscent + FontGDI->TextMetric.tmDescent;
DPRINT("Font loaded: %s (%s)\n", face->family_name, face->style_name); DPRINT("Font loaded: %s (%s)\n", face->family_name, face->style_name);
@ -748,9 +748,9 @@ NtGdiExtTextOut(
if (dc->w.textAlign & TA_BASELINE) if (dc->w.textAlign & TA_BASELINE)
yoff = 0; yoff = 0;
else if (dc->w.textAlign & TA_BOTTOM) else if (dc->w.textAlign & TA_BOTTOM)
yoff = -face->size->metrics.descender / 64; yoff = -face->size->metrics.descender >> 6;
else /* TA_TOP */ else /* TA_TOP */
yoff = face->size->metrics.ascender / 64; yoff = face->size->metrics.ascender >> 6;
use_kerning = FT_HAS_KERNING(face); use_kerning = FT_HAS_KERNING(face);
previous = 0; previous = 0;
@ -865,9 +865,9 @@ NtGdiExtTextOut(
if (fuOptions & ETO_OPAQUE) if (fuOptions & ETO_OPAQUE)
{ {
DestRect.left = BackgroundLeft; DestRect.left = BackgroundLeft;
DestRect.right = TextLeft + (glyph->advance.x + 32) / 64; DestRect.right = TextLeft + ((glyph->advance.x + 32) >> 6);
DestRect.top = TextTop + yoff - (face->size->metrics.ascender + 32) / 64; DestRect.top = TextTop + yoff - ((face->size->metrics.ascender + 32) >> 6);
DestRect.bottom = TextTop + yoff + (- face->size->metrics.descender + 32) / 64; DestRect.bottom = TextTop + yoff + ((32 - face->size->metrics.descender) >> 6);
IntEngBitBlt( IntEngBitBlt(
SurfObj, SurfObj,
NULL, NULL,
@ -921,7 +921,7 @@ NtGdiExtTextOut(
EngDeleteSurface(HSourceGlyph); EngDeleteSurface(HSourceGlyph);
TextLeft += (glyph->advance.x + 32) / 64; TextLeft += (glyph->advance.x + 32) >> 6;
previous = glyph_index; previous = glyph_index;
String++; String++;
@ -1580,12 +1580,12 @@ NtGdiGetTextMetrics(HDC hDC,
} }
else else
{ {
SafeTm.tmAveCharWidth = (pOS2->xAvgCharWidth + 32) / 64; SafeTm.tmAveCharWidth = (pOS2->xAvgCharWidth + 32) >> 6;
} }
SafeTm.tmAscent = (Face->size->metrics.ascender + 32) / 64; // units above baseline SafeTm.tmAscent = (Face->size->metrics.ascender + 32) >> 6; // units above baseline
SafeTm.tmDescent = (- Face->size->metrics.descender + 32) / 64; // units below baseline SafeTm.tmDescent = (32 - Face->size->metrics.descender) >> 6; // units below baseline
SafeTm.tmHeight = SafeTm.tmAscent + SafeTm.tmDescent; SafeTm.tmHeight = SafeTm.tmAscent + SafeTm.tmDescent;
SafeTm.tmMaxCharWidth = (Face->size->metrics.max_advance + 32) / 64; SafeTm.tmMaxCharWidth = (Face->size->metrics.max_advance + 32) >> 6;
Status = MmCopyToCaller(tm, &SafeTm, sizeof(TEXTMETRICW)); Status = MmCopyToCaller(tm, &SafeTm, sizeof(TEXTMETRICW));
} }
} }