guijan
/
legacy-imlib2
forked from old/legacy-imlib2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix pixmap caching...... :) 

SVN revision: 3505
This commit is contained in:
Carsten Haitzler 2000-09-17 17:22:55 +00:00
parent 0776d7ff0d
commit 336cecc801
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/draw.c
View File

@ -56,6 +56,8 @@ __imlib_CreatePixmapsForImage(Display *d, Drawable w, Visual *v, int depth,
ip->visual = v;
ip->depth = depth;
ip->image = im;
if (im->file)
ip->file = strdup(im->file);
ip->border.left = im->border.left;
ip->border.right = im->border.right;
ip->border.top = im->border.top;

9
src/image.c
View File

@ -365,6 +365,7 @@ __imlib_ProduceImagePixmap(void)
ip->visual = NULL;
ip->image = NULL;
ip->next = NULL;
ip->file = NULL;
return ip;
}
@ -381,6 +382,7 @@ __imlib_ConsumeImagePixmap(ImlibImagePixmap * ip)
XFreePixmap(ip->display, ip->pixmap);
if (ip->mask)
XFreePixmap(ip->display, ip->mask);
if (ip->file) free(ip->file);
free(ip);
}
@ -399,7 +401,7 @@ __imlib_FindCachedImagePixmap(ImlibImage * im, int w, int h, Display * d,
{
/* if all the pixmap attributes match */
if ((ip->w == w) && (ip->h == h) && (ip->depth == depth) && (!ip->dirty)
&& (ip->image == im) && (ip->visual == v) && (ip->display == d)
&& (ip->visual == v) && (ip->display == d)
&& (ip->source_x == sx) && (ip->source_x == sy)
&& (ip->source_w == sw) && (ip->source_h == sh)
&& (ip->colormap == cm) && (ip->antialias == aa)
@ -408,7 +410,10 @@ __imlib_FindCachedImagePixmap(ImlibImage * im, int w, int h, Display * d,
&& (ip->border.left == im->border.left)
&& (ip->border.right == im->border.right)
&& (ip->border.top == im->border.top)
&& (ip->border.bottom == im->border.bottom))
&& (ip->border.bottom == im->border.bottom) &&
(((im->file) && (ip->file) && !strcmp(im->file, ip->file)) ||
((!im->file) && (!ip->file) && (im == ip->image)))
)
{
/* move the pixmap to the head of the pixmap list */
if (previous_ip)

1
src/image.h
View File

@ -91,6 +91,7 @@ struct _imlibimagepixmap
char antialias, hi_quality, dither_mask;
ImlibBorder border;
ImlibImage *image;
char *file;
char dirty;
int references;
DATABIG modification_count;