@@ -274,18 +274,21 @@ miGlyphs (CARD8 op,
274274 BoxRec extents ;
275275 CARD32 component_alpha ;
276276
277+ #ifdef NXAGENT_SERVER
277278 /*
278279 * Get rid of the warning.
279280 */
280281
281282 extents .x1 = 0 ;
282283 extents .y1 = 0 ;
284+ #endif
283285
284286 if (maskFormat )
285287 {
286288 GCPtr pGC ;
287289 xRectangle rect ;
288290
291+ #ifdef NXAGENT_SERVER
289292 if (nxagentGlyphsExtents != NullBox )
290293 {
291294 memcpy (& extents , nxagentGlyphsExtents , sizeof (BoxRec ));
@@ -298,6 +301,9 @@ miGlyphs (CARD8 op,
298301
299302 memcpy (nxagentGlyphsExtents , & extents , sizeof (BoxRec ));
300303 }
304+ #else
305+ GlyphExtents (nlist , list , glyphs , & extents );
306+ #endif
301307
302308 if (extents .x2 <= extents .x1 || extents .y2 <= extents .y1 )
303309 return ;
@@ -369,6 +375,7 @@ miGlyphs (CARD8 op,
369375 glyph -> info .width , glyph -> info .height ,
370376 0 , 0 , -1 , (void * ) (glyph + 1 ));
371377
378+ #ifdef NXAGENT_SERVER
372379 /*
373380 * The following line fixes a problem with glyphs that appeared
374381 * as clipped. It was a side effect due the validate function
@@ -378,7 +385,7 @@ miGlyphs (CARD8 op,
378385 */
379386
380387 pPicture -> pDrawable -> serialNumber = NEXT_SERIAL_NUMBER ;
381-
388+ #endif
382389 pPixmap -> drawable .serialNumber = NEXT_SERIAL_NUMBER ;
383390 if (maskFormat )
384391 {
0 commit comments