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

loading: Don't look for cached image when not caching

This commit is contained in:
Kim Woelders 2022-07-08 20:03:56 +02:00
parent b39d33c800
commit 3f1f87b1fb
1 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/lib/image.c
View File

@ -379,40 +379,43 @@ __imlib_LoadImage(const char *file, ImlibLoadArgs * ila)
if (!file || file[0] == '\0')
return NULL;
/* see if we already have the image cached */
im = __imlib_FindCachedImage(file, ila->frame);
/* if we found a cached image and we should always check that it is */
/* accurate to the disk conents if they changed since we last loaded */
/* and that it is still a valid image */
if (im && !IM_FLAG_ISSET(im, F_INVALID))
if (!ila->nocache)
{
if (IM_FLAG_ISSET(im, F_ALWAYS_CHECK_DISK))
{
time_t current_modified_time;
/* see if we already have the image cached */
im = __imlib_FindCachedImage(file, ila->frame);
current_modified_time = ila->fp ?
__imlib_FileModDateFd(fileno(ila->fp)) :
__imlib_FileModDate(im->real_file);
/* if the file on disk is newer than the cached one */
if (current_modified_time != im->moddate)
/* if we found a cached image and we should always check that it is */
/* accurate to the disk conents if they changed since we last loaded */
/* and that it is still a valid image */
if (im && !IM_FLAG_ISSET(im, F_INVALID))
{
if (IM_FLAG_ISSET(im, F_ALWAYS_CHECK_DISK))
{
/* invalidate image */
IM_FLAG_SET(im, F_INVALID);
time_t current_modified_time;
current_modified_time = ila->fp ?
__imlib_FileModDateFd(fileno(ila->fp)) :
__imlib_FileModDate(im->real_file);
/* if the file on disk is newer than the cached one */
if (current_modified_time != im->moddate)
{
/* invalidate image */
IM_FLAG_SET(im, F_INVALID);
}
else
{
/* image is ok to re-use - program is just being stupid loading */
/* the same data twice */
im->references++;
return im;
}
}
else
{
/* image is ok to re-use - program is just being stupid loading */
/* the same data twice */
im->references++;
return im;
}
}
else
{
im->references++;
return im;
}
}
im_file = im_key = NULL;