From d6d3999ccb2cb72d55820770260172eccbbb68d7 Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 16 Apr 2012 09:17:34 +0200 Subject: libX11 xserver pixman mesa git update 16 Apr 2012 --- xorg-server/hw/xwin/winfont.c | 50 ++++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 24 deletions(-) (limited to 'xorg-server/hw/xwin/winfont.c') diff --git a/xorg-server/hw/xwin/winfont.c b/xorg-server/hw/xwin/winfont.c index af3e90da5..7bcbce1c7 100644 --- a/xorg-server/hw/xwin/winfont.c +++ b/xorg-server/hw/xwin/winfont.c @@ -37,44 +37,46 @@ /* See Porting Layer Definition - p. 32 */ /* See mfb/mfbfont.c - mfbRealizeFont() - which is empty :) */ Bool -winRealizeFontNativeGDI (ScreenPtr pScreen, FontPtr pFont) +winRealizeFontNativeGDI(ScreenPtr pScreen, FontPtr pFont) { - BOOL fResult = TRUE; - winScreenPriv(pScreen); - + BOOL fResult = TRUE; + + winScreenPriv(pScreen); + #if CYGDEBUG - winTrace ("winRealizeFont (%p, %p)\n", pScreen, pFont); + winTrace("winRealizeFont (%p, %p)\n", pScreen, pFont); #endif - WIN_UNWRAP(RealizeFont); - if (pScreen->RealizeFont) - fResult = (*pScreen->RealizeFont) (pScreen, pFont); - WIN_WRAP(RealizeFont, winRealizeFontNativeGDI); - - return fResult; + WIN_UNWRAP(RealizeFont); + if (pScreen->RealizeFont) + fResult = (*pScreen->RealizeFont) (pScreen, pFont); + WIN_WRAP(RealizeFont, winRealizeFontNativeGDI); + + return fResult; } /* See Porting Layer Definition - p. 32 */ /* See mfb/mfbfont.c - mfbUnrealizeFont() - which is empty :) */ Bool -winUnrealizeFontNativeGDI (ScreenPtr pScreen, FontPtr pFont) +winUnrealizeFontNativeGDI(ScreenPtr pScreen, FontPtr pFont) { - BOOL fResult = TRUE; - winScreenPriv(pScreen); - + BOOL fResult = TRUE; + + winScreenPriv(pScreen); + #if CYGDEBUG - winTrace ("winUnrealizeFont (%p, %p)\n", pScreen, pFont); + winTrace("winUnrealizeFont (%p, %p)\n", pScreen, pFont); #endif - WIN_UNWRAP(UnrealizeFont); - if (pScreen->UnrealizeFont) - fResult = (*pScreen->UnrealizeFont) (pScreen, pFont); - WIN_WRAP(UnrealizeFont, winUnrealizeFontNativeGDI); - - return fResult; + WIN_UNWRAP(UnrealizeFont); + if (pScreen->UnrealizeFont) + fResult = (*pScreen->UnrealizeFont) (pScreen, pFont); + WIN_WRAP(UnrealizeFont, winUnrealizeFontNativeGDI); + + return fResult; #if CYGDEBUG - winDebug ("winUnrealizeFont()\n"); + winDebug("winUnrealizeFont()\n"); #endif - return TRUE; + return TRUE; } #endif -- cgit v1.2.3