diff options
| author | Eric Anholt <eric@anholt.net> | 2007-10-02 12:14:04 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2007-10-02 12:14:04 -0700 |
| commit | 439edc768eea17667846ce573c843b8377e0dfb4 (patch) | |
| tree | 43035b9d083124d8945048f0103fbe578b9a01a1 /render/miglyph.c | |
| parent | c8ccf469dcb2d7609b23faa8b4999c436263051e (diff) | |
| parent | 93ae6fe18c417a22f1fccb22add4890a20cae713 (diff) | |
Merge branch 'glyph-pixmaps'
Conflicts:
configure.ac
exa/exa_render.c
Diffstat (limited to 'render/miglyph.c')
| -rw-r--r-- | render/miglyph.c | 35 |
1 files changed, 4 insertions, 31 deletions
diff --git a/render/miglyph.c b/render/miglyph.c index 7968c90ea..a52ea49d6 100644 --- a/render/miglyph.c +++ b/render/miglyph.c @@ -112,7 +112,7 @@ miGlyphs (CARD8 op, GlyphListPtr list, GlyphPtr *glyphs) { - PixmapPtr pPixmap = 0; + PixmapPtr pPixmap; PicturePtr pPicture; PixmapPtr pMaskPixmap = 0; PicturePtr pMask; @@ -166,7 +166,6 @@ miGlyphs (CARD8 op, x = 0; y = 0; } - pPicture = 0; while (nlist--) { x += list->xOff; @@ -175,28 +174,8 @@ miGlyphs (CARD8 op, while (n--) { glyph = *glyphs++; - if (!pPicture) - { - pPixmap = GetScratchPixmapHeader (pScreen, glyph->info.width, glyph->info.height, - list->format->depth, - list->format->depth, - 0, (pointer) (glyph + 1)); - if (!pPixmap) - return; - component_alpha = NeedsComponent(list->format->format); - pPicture = CreatePicture (0, &pPixmap->drawable, list->format, - CPComponentAlpha, &component_alpha, - serverClient, &error); - if (!pPicture) - { - FreeScratchPixmapHeader (pPixmap); - return; - } - } - (*pScreen->ModifyPixmapHeader) (pPixmap, - glyph->info.width, glyph->info.height, - 0, 0, -1, (pointer) (glyph + 1)); - pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER; + pPicture = GlyphPicture (glyph)[pScreen->myNum]; + if (maskFormat) { CompositePicture (PictOpAdd, @@ -224,17 +203,11 @@ miGlyphs (CARD8 op, glyph->info.width, glyph->info.height); } + x += glyph->info.xOff; y += glyph->info.yOff; } list++; - if (pPicture) - { - FreeScratchPixmapHeader (pPixmap); - FreePicture ((pointer) pPicture, 0); - pPicture = 0; - pPixmap = 0; - } } if (maskFormat) { |