From 511577daf5f2fffc5a5a4b51dab8985cd8cd299e Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Tue, 5 Aug 2003 18:26:09 +0000 Subject: [PATCH] Correctly truncate tmFirstChar, tmLastChar, tmBreakChar at 255 in the process of W->A conversion. --- objects/font.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/objects/font.c b/objects/font.c index 3b5041767b6..05824db6fcd 100644 --- a/objects/font.c +++ b/objects/font.c @@ -235,10 +235,10 @@ static void FONT_TextMetricWToA(const TEXTMETRICW *ptmW, LPTEXTMETRICA ptmA ) ptmA->tmOverhang = ptmW->tmOverhang; ptmA->tmDigitizedAspectX = ptmW->tmDigitizedAspectX; ptmA->tmDigitizedAspectY = ptmW->tmDigitizedAspectY; - ptmA->tmFirstChar = ptmW->tmFirstChar; - ptmA->tmLastChar = ptmW->tmLastChar; - ptmA->tmDefaultChar = ptmW->tmDefaultChar; - ptmA->tmBreakChar = ptmW->tmBreakChar; + ptmA->tmFirstChar = ptmW->tmFirstChar > 255 ? 255 : ptmW->tmFirstChar; + ptmA->tmLastChar = ptmW->tmLastChar > 255 ? 255 : ptmW->tmLastChar; + ptmA->tmDefaultChar = ptmW->tmDefaultChar > 255 ? 255 : ptmW->tmDefaultChar; + ptmA->tmBreakChar = ptmW->tmBreakChar > 255 ? 255 : ptmW->tmBreakChar; ptmA->tmItalic = ptmW->tmItalic; ptmA->tmUnderlined = ptmW->tmUnderlined; ptmA->tmStruckOut = ptmW->tmStruckOut; @@ -260,10 +260,10 @@ static void FONT_NewTextMetricExWTo16(const NEWTEXTMETRICEXW *ptmW, LPNEWTEXTMET ptm16->ntmTm.tmOverhang = ptmW->ntmTm.tmOverhang; ptm16->ntmTm.tmDigitizedAspectX = ptmW->ntmTm.tmDigitizedAspectX; ptm16->ntmTm.tmDigitizedAspectY = ptmW->ntmTm.tmDigitizedAspectY; - ptm16->ntmTm.tmFirstChar = ptmW->ntmTm.tmFirstChar; - ptm16->ntmTm.tmLastChar = ptmW->ntmTm.tmLastChar; - ptm16->ntmTm.tmDefaultChar = ptmW->ntmTm.tmDefaultChar; - ptm16->ntmTm.tmBreakChar = ptmW->ntmTm.tmBreakChar; + ptm16->ntmTm.tmFirstChar = ptmW->ntmTm.tmFirstChar > 255 ? 255 : ptmW->ntmTm.tmFirstChar; + ptm16->ntmTm.tmLastChar = ptmW->ntmTm.tmLastChar > 255 ? 255 : ptmW->ntmTm.tmLastChar; + ptm16->ntmTm.tmDefaultChar = ptmW->ntmTm.tmDefaultChar > 255 ? 255 : ptmW->ntmTm.tmDefaultChar; + ptm16->ntmTm.tmBreakChar = ptmW->ntmTm.tmBreakChar > 255 ? 255 : ptmW->ntmTm.tmBreakChar; ptm16->ntmTm.tmItalic = ptmW->ntmTm.tmItalic; ptm16->ntmTm.tmUnderlined = ptmW->ntmTm.tmUnderlined; ptm16->ntmTm.tmStruckOut = ptmW->ntmTm.tmStruckOut;