Compare commits
3 Commits
master
...
submit/ren
Author | SHA1 | Date | |
---|---|---|---|
|
0931cb11ca | ||
|
aa720e5454 | ||
|
127294b50f |
|
@ -387,7 +387,8 @@ SetPicturePictFilter(PicturePtr pPicture, PictFilterPtr pFilter,
|
||||||
pPicture->filter_nparams = nparams;
|
pPicture->filter_nparams = nparams;
|
||||||
}
|
}
|
||||||
for (i = 0; i < nparams; i++)
|
for (i = 0; i < nparams; i++)
|
||||||
pPicture->filter_params[i] = params[i];
|
if (pPicture->filter_params)
|
||||||
|
pPicture->filter_params[i] = params[i];
|
||||||
pPicture->filter = pFilter->id;
|
pPicture->filter = pFilter->id;
|
||||||
|
|
||||||
if (pPicture->pDrawable) {
|
if (pPicture->pDrawable) {
|
||||||
|
|
|
@ -123,6 +123,10 @@ FindGlyphRef(GlyphHashPtr hash,
|
||||||
CARD32 elt, step, s;
|
CARD32 elt, step, s;
|
||||||
GlyphPtr glyph;
|
GlyphPtr glyph;
|
||||||
GlyphRefPtr table, gr, del;
|
GlyphRefPtr table, gr, del;
|
||||||
|
|
||||||
|
if ((hash == NULL) || (hash->hashSet == NULL))
|
||||||
|
return NULL;
|
||||||
|
|
||||||
CARD32 tableSize = hash->hashSet->size;
|
CARD32 tableSize = hash->hashSet->size;
|
||||||
|
|
||||||
table = hash->table;
|
table = hash->table;
|
||||||
|
@ -267,7 +271,7 @@ FreeGlyph(GlyphPtr glyph, int format)
|
||||||
gr = FindGlyphRef(&globalGlyphs[format], signature, TRUE, glyph->sha1);
|
gr = FindGlyphRef(&globalGlyphs[format], signature, TRUE, glyph->sha1);
|
||||||
if (gr - globalGlyphs[format].table != first)
|
if (gr - globalGlyphs[format].table != first)
|
||||||
DuplicateRef(glyph, "Found wrong one");
|
DuplicateRef(glyph, "Found wrong one");
|
||||||
if (gr->glyph && gr->glyph != DeletedGlyph) {
|
if (gr && gr->glyph && gr->glyph != DeletedGlyph) {
|
||||||
gr->glyph = DeletedGlyph;
|
gr->glyph = DeletedGlyph;
|
||||||
gr->signature = 0;
|
gr->signature = 0;
|
||||||
globalGlyphs[format].tableEntries--;
|
globalGlyphs[format].tableEntries--;
|
||||||
|
@ -384,6 +388,7 @@ AllocateGlyph(xGlyphInfo * gi, int fdepth)
|
||||||
static Bool
|
static Bool
|
||||||
AllocateGlyphHash(GlyphHashPtr hash, GlyphHashSetPtr hashSet)
|
AllocateGlyphHash(GlyphHashPtr hash, GlyphHashSetPtr hashSet)
|
||||||
{
|
{
|
||||||
|
assert(hashSet);
|
||||||
hash->table = calloc(hashSet->size, sizeof(GlyphRefRec));
|
hash->table = calloc(hashSet->size, sizeof(GlyphRefRec));
|
||||||
if (!hash->table)
|
if (!hash->table)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
@ -418,10 +423,10 @@ ResizeGlyphHash(GlyphHashPtr hash, CARD32 change, Bool global)
|
||||||
glyph = hash->table[i].glyph;
|
glyph = hash->table[i].glyph;
|
||||||
if (glyph && glyph != DeletedGlyph) {
|
if (glyph && glyph != DeletedGlyph) {
|
||||||
s = hash->table[i].signature;
|
s = hash->table[i].signature;
|
||||||
gr = FindGlyphRef(&newHash, s, global, glyph->sha1);
|
if ((gr = FindGlyphRef(&newHash, s, global, glyph->sha1))) {
|
||||||
|
gr->signature = s;
|
||||||
gr->signature = s;
|
gr->glyph = glyph;
|
||||||
gr->glyph = glyph;
|
}
|
||||||
++newHash.tableEntries;
|
++newHash.tableEntries;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1013,7 +1013,10 @@ cpAlphaMap(void **result, XID id, ScreenPtr screen, ClientPtr client, Mask mode)
|
||||||
client, mode);
|
client, mode);
|
||||||
if (err != Success)
|
if (err != Success)
|
||||||
return err;
|
return err;
|
||||||
id = res->info[screen->myNum].id;
|
if (screen == NULL)
|
||||||
|
LogMessage(X_WARNING, "cpAlphaMap() screen == NULL\n");
|
||||||
|
else
|
||||||
|
id = res->info[screen->myNum].id;
|
||||||
}
|
}
|
||||||
#endif /* XINERAMA */
|
#endif /* XINERAMA */
|
||||||
return dixLookupResourceByType(result, id, PictureType, client, mode);
|
return dixLookupResourceByType(result, id, PictureType, client, mode);
|
||||||
|
|
Loading…
Reference in New Issue