Re: [PATCH] Rootless: src drawable window can now be NULL

[Jeremy Huddleston]

On Oct 13, 2009, at 01:45, Colin Harrison wrote:

Hi,

This is one for Jeremy Huddleston and Jon Turney.


to anti-alias).

Patch to fix the crash and make it work...

Found when testing rootless modes in Xming using the new xeyes (uses Xrender

Looks like we need this in RootlessGlyphs as well...

Signed-off-by: Jeremy Huddleston <jerem...@apple.com>


index b10ca70..c73d517 100644
--- a/miext/rootless/rootlessScreen.c
+++ b/miext/rootless/rootlessScreen.c

         maskWin = (pMask->pDrawable->type == DRAWABLE_WINDOW) ?
                   (WindowPtr)pMask->pDrawable :  NULL;
     }
-    srcWin  = (pSrc->pDrawable->type  == DRAWABLE_WINDOW) ?

               (WindowPtr)pSrc->pDrawable  :  NULL;
     dstWin  = (pDst->pDrawable->type == DRAWABLE_WINDOW) ?
               (WindowPtr)pDst->pDrawable  :  NULL;

     GlyphPtr glyph;
     WindowPtr srcWin, dstWin;

-    srcWin = (pSrc->pDrawable->type == DRAWABLE_WINDOW) ?

              (WindowPtr)pSrc->pDrawable  :  NULL;
     dstWin = (pDst->pDrawable->type == DRAWABLE_WINDOW) ?
              (WindowPtr)pDst->pDrawable  :  NULL;

diff --git a/miext/rootless/rootlessScreen.c b/miext/rootless/ rootlessScreen.c @@ -257,7 +257,7 @@ RootlessComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst, + srcWin = (pSrc->pDrawable && pSrc->pDrawable->type == DRAWABLE_WINDOW) ? @@ -297,7 +297,7 @@ RootlessGlyphs(CARD8 op, PicturePtr pSrc, PicturePtr pDst, + srcWin = (pSrc->pDrawable && pSrc->pDrawable->type == DRAWABLE_WINDOW) ?

smime.p7s
Description: S/MIME cryptographic signature

_______________________________________________
xorg-devel mailing list
xorg-devel@lists.x.org
http://lists.x.org/mailman/listinfo/xorg-devel