Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 17:34:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

[BMFD]

Browse source 
- Remove a pointless check (CID 731583)
- Add a comment
- Simplify code

svn path=/trunk/; revision=57497
This commit is contained in:
Timo Kreuzer 2012-10-06 14:35:52 +00:00
parent 9d29067d15
commit de6d388331
2 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reactos/win32ss/drivers/font/bmfd/font.c
View file

@ -65,7 +65,7 @@ FillFaceInfo(
pface->wA = GETVAL(pFontInfo->dfAspace);
pface->wB = GETVAL(pFontInfo->dfBspace);
pface->wC = GETVAL(pFontInfo->dfCspace);
pface->pCharTable = pface->pFontInfo->dfCharTable;
pface->pCharTable = pFontInfo->dfCharTable;
pface->cjEntrySize = sizeof(GLYPHENTRY30);
}
else
@ -74,7 +74,7 @@ FillFaceInfo(
pface->wA = 0;
pface->wB = 0;
pface->wC = 0;
pface->pCharTable = &pface->pFontInfo->dfReserved + 1;
pface->pCharTable = &pFontInfo->dfReserved + 1;
pface->cjEntrySize = sizeof(GLYPHENTRY20);
}

17
reactos/win32ss/drivers/font/bmfd/glyph.c
View file

@ -80,18 +80,15 @@ BmfdQueryGlyphAndBitmap(
ULONG cjSize)
{
PBMFD_FACE pface = pfont->pface;
PGLYPHENTRY pge = (PGLYPHENTRY)(pface->pCharTable + hg);
PGLYPHENTRY pge;
ULONG xSrc, ySrc, cxSrc, cySrc;
ULONG xDst, yDst, cxDst, cyDst;
ULONG xScale, yScale;
ULONG ulGlyphOffset, cjDstRow, color;
PVOID pvSrc0, pvDst0;
if (!pge)
{
DbgPrint("no glyph handle given!\n");
return FD_ERROR;
}
/* The glyph handle is the byte offset to the glyph in the table */
pge = (PGLYPHENTRY)(pface->pCharTable + hg);
/* Get the bitmap offset depending on file version */
if (pface->ulVersion >= 0x300)
@ -151,7 +148,7 @@ BmfdQueryGlyphAndBitmap(
/* Verify that the buffer is big enough */
if (cjSize < FIELD_OFFSET(GLYPHBITS, aj) + cyDst * cjDstRow)
{
DbgPrint("Buffer too small (%ld), %ld,%ld\n",
DbgPrint("Buffer too small (%ld), %ld,%ld\n",
cjSize, cxSrc, cySrc);
return FD_ERROR;
}
@ -245,7 +242,7 @@ BmfdQueryMaxExtents(
}
pFontInfo = pfont->pface->pFontInfo;
xScale = pfont->xScale;
yScale = pfont->yScale;
@ -329,7 +326,7 @@ BmfdQueryFontData(
PBMFD_FACE pface = &pfile->aface[pfo->iFace - 1];
PBMFD_FONT pfont= BmfdGetFontInstance(pfo, pface);
DbgPrint("BmfdQueryFontData(pfo=%p, iMode=%ld, hg=%p, pgd=%p, pv=%p, cjSize=%ld)\n",
DbgPrint("BmfdQueryFontData(pfo=%p, iMode=%ld, hg=%p, pgd=%p, pv=%p, cjSize=%ld)\n",
pfo, iMode, hg, pgd, pv, cjSize);
// __debugbreak();
@ -340,7 +337,7 @@ BmfdQueryFontData(
case QFD_MAXEXTENTS: /* 3 */
return BmfdQueryMaxExtents(pfont, pv, cjSize);
/* we support nothing else */
default:
return FD_ERROR;