diff options
| author | marha <marha@users.sourceforge.net> | 2010-06-14 13:15:50 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-06-14 13:15:50 +0000 |
| commit | e2eb44705a8e4886d81b75c12e68aaebe9946439 (patch) | |
| tree | 00639c4f594cdaf4cb08d30dfdb4d4a4e38bc16c /xorg-server/exa | |
| parent | 2dc9ef67a51796a1e25bd31eb58663a8023ddd80 (diff) | |
| parent | 0cf9b03f4990f61640dc35dfac250f929b57b4ed (diff) | |
| download | vcxsrv-e2eb44705a8e4886d81b75c12e68aaebe9946439.tar.gz vcxsrv-e2eb44705a8e4886d81b75c12e68aaebe9946439.tar.bz2 vcxsrv-e2eb44705a8e4886d81b75c12e68aaebe9946439.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/exa')
| -rw-r--r-- | xorg-server/exa/exa_classic.c | 3 | ||||
| -rw-r--r-- | xorg-server/exa/exa_glyphs.c | 12 |
2 files changed, 6 insertions, 9 deletions
diff --git a/xorg-server/exa/exa_classic.c b/xorg-server/exa/exa_classic.c index 8b92d6880..8f24daeeb 100644 --- a/xorg-server/exa/exa_classic.c +++ b/xorg-server/exa/exa_classic.c @@ -257,9 +257,10 @@ exaPixmapHasGpuCopy_classic(PixmapPtr pPixmap) Bool ret;
if (pExaScr->info->PixmapIsOffscreen) {
+ void* old_ptr = pPixmap->devPrivate.ptr;
pPixmap->devPrivate.ptr = ExaGetPixmapAddress(pPixmap);
ret = pExaScr->info->PixmapIsOffscreen(pPixmap);
- pPixmap->devPrivate.ptr = NULL;
+ pPixmap->devPrivate.ptr = old_ptr;
} else
ret = (pExaPixmap->use_gpu_copy && pExaPixmap->fb_ptr);
diff --git a/xorg-server/exa/exa_glyphs.c b/xorg-server/exa/exa_glyphs.c index 36217dc59..15ef61b1e 100644 --- a/xorg-server/exa/exa_glyphs.c +++ b/xorg-server/exa/exa_glyphs.c @@ -127,15 +127,11 @@ exaUnrealizeGlyphCaches(ScreenPtr pScreen, cache->picture = NULL;
}
- if (cache->hashEntries) {
- free(cache->hashEntries);
- cache->hashEntries = NULL;
- }
+ free(cache->hashEntries);
+ cache->hashEntries = NULL;
- if (cache->glyphs) {
- free(cache->glyphs);
- cache->glyphs = NULL;
- }
+ free(cache->glyphs);
+ cache->glyphs = NULL;
cache->glyphCount = 0;
}
}
|