diff options
| author | jsorg71 <jay.sorg@gmail.com> | 2013-08-16 12:13:52 -0700 |
|---|---|---|
| committer | jsorg71 <jay.sorg@gmail.com> | 2013-08-16 12:13:52 -0700 |
| commit | b8388a65a2d561c23cc08613d1c4d7cf5dbb96d0 (patch) | |
| tree | 6d606a46f9d52dd7945b88566818704e226e013a /xorg/server/module/rdpGlyphs.c | |
| parent | 759d508635a742690aebcf07d4d9dfa2c08beda9 (diff) | |
| parent | fa40106a697611a35b57459c9403cc440a0cc865 (diff) | |
| download | xrdp-proprietary-b8388a65a2d561c23cc08613d1c4d7cf5dbb96d0.tar.gz xrdp-proprietary-b8388a65a2d561c23cc08613d1c4d7cf5dbb96d0.zip | |
Merge pull request #90 from neutrinolabs/master
xorg driver, smart card, etc
Diffstat (limited to 'xorg/server/module/rdpGlyphs.c')
| -rw-r--r-- | xorg/server/module/rdpGlyphs.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/xorg/server/module/rdpGlyphs.c b/xorg/server/module/rdpGlyphs.c index 3a222e79..fc2d347b 100644 --- a/xorg/server/module/rdpGlyphs.c +++ b/xorg/server/module/rdpGlyphs.c @@ -37,6 +37,7 @@ gylph(font) calls #include "rdp.h" #include "rdpGlyphs.h" +#include "rdpDraw.h" /******************************************************************************/ #define LOG_LEVEL 1 @@ -66,13 +67,11 @@ rdpGlyphs(CARD8 op, PicturePtr pSrc, PicturePtr pDst, { ScreenPtr pScreen; rdpPtr dev; - ScrnInfoPtr pScrn; PictureScreenPtr ps; LLOGLN(10, ("rdpGlyphs:")); pScreen = pSrc->pDrawable->pScreen; - pScrn = xf86Screens[pScreen->myNum]; - dev = XRDPPTR(pScrn); + dev = rdpGetDevFromScreen(pScreen); ps = GetPictureScreen(pScreen); rdpGlyphsOrg(ps, dev, op, pSrc, pDst, maskFormat, xSrc, ySrc, nlists, lists, glyphs); |
