1 files changed, 3 insertions, 65 deletions
diff --git a/xorg/X11R7.6/rdp/rdpComposite.c b/xorg/X11R7.6/rdp/rdpComposite.c
index 8528c4c6..ec161994 100644
--- a/xorg/X11R7.6/rdp/rdpComposite.c
+++ b/xorg/X11R7.6/rdp/rdpComposite.c
@@ -697,9 +697,9 @@ rdpComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst,
     rdpPixmapRec* pDstPriv;
     rdpPixmapRec* pDirtyPriv;
     struct image_data id;
-    
+
     LLOGLN(10, ("rdpComposite:"));
-    
+
     if (g_doing_font == 2)
     {
         rdpCompositeOrg(op, pSrc, pMask, pDst, xSrc, ySrc,
@@ -707,7 +707,7 @@ rdpComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst,
 
         return;
     }
-    
+
 #if 0
     if (g_do_glyph_cache && g_do_alpha_glyphs)
     {
@@ -844,65 +844,3 @@ rdpComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst,
         rdpup_switch_os_surface(-1);
     }
 }
-
-/******************************************************************************/
-/* make sure no glyph is too big */
-/* returns boolean */
-static int
-rdpGlyphCheck(int nlist, GlyphListPtr list, GlyphPtr* glyphs)
-{
-    int n;
-    GlyphPtr glyph;
-    
-    while (nlist--)
-    {
-        n = list->len;
-        list++;
-        while (n--)
-        {
-            glyph = *glyphs++;
-            if ((glyph->info.width * glyph->info.height) > 8192)
-            {
-                LLOGLN(10, ("rdpGlyphCheck: too big"));
-                return 0;
-            }
-        }
-    }
-    return 1;
-}
-
-/******************************************************************************/
-void
-rdpGlyphs(CARD8 op, PicturePtr pSrc, PicturePtr pDst,
-          PictFormatPtr maskFormat,
-          INT16 xSrc, INT16 ySrc, int nlists, GlyphListPtr lists,
-          GlyphPtr* glyphs)
-{
-    PictureScreenPtr ps;
-    
-    LLOGLN(10, ("rdpGlyphs: op %d xSrc %d ySrc %d maskFormat %p", op, xSrc, ySrc, maskFormat));
-    
-    if (g_do_glyph_cache && rdpGlyphCheck(nlists, lists, glyphs))
-    {
-        g_doing_font = 2;
-        rdpGlyphs(op, pSrc, pDst, maskFormat, xSrc, ySrc, nlists, lists, glyphs);
-        ps = GetPictureScreen(g_pScreen);
-        ps->Glyphs = g_rdpScreen.Glyphs;
-        ps->Glyphs(op, pSrc, pDst, maskFormat, xSrc, ySrc,
-                   nlists, lists, glyphs);
-        ps->Glyphs = rdpGlyphs;
-    }
-    else
-    {
-        g_doing_font = 1;
-        rdpup_set_hints(1, 1);
-        ps = GetPictureScreen(g_pScreen);
-        ps->Glyphs = g_rdpScreen.Glyphs;
-        ps->Glyphs(op, pSrc, pDst, maskFormat, xSrc, ySrc,
-                   nlists, lists, glyphs);
-        ps->Glyphs = rdpGlyphs;
-        rdpup_set_hints(0, 1);
-    }
-    g_doing_font = 0;
-    LLOGLN(10, ("rdpGlyphs: out"));
-}