projects
/
geeqie.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5ab7044
)
fixed exif_read_fd
author
Vladimir Nadvornik
<nadvornik@suse.cz>
Thu, 9 Aug 2012 15:30:12 +0000
(17:30 +0200)
committer
Vladimir Nadvornik
<nadvornik@suse.cz>
Thu, 9 Aug 2012 15:43:43 +0000
(17:43 +0200)
- add fd to cache immediately
- do not check file presence, the result could be inconsistent with the cache
src/exif-common.c
patch
|
blob
|
history
diff --git
a/src/exif-common.c
b/src/exif-common.c
index
7ed2a54
..
3b453a7
100644
(file)
--- a/
src/exif-common.c
+++ b/
src/exif-common.c
@@
-649,7
+649,7
@@
ExifData *exif_read_fd(FileData *fd)
if (!exif_cache) exif_init_cache();
- if (!fd
|| !is_readable_file(fd->path)
) return NULL;
+ if (!fd) return NULL;
if (file_cache_get(exif_cache, fd)) return fd->exif;
g_assert(fd->exif == NULL);
@@
-668,6
+668,7
@@
ExifData *exif_read_fd(FileData *fd)
fd->exif = exif_read(fd->path, sidecar_path, fd->modified_xmp);
g_free(sidecar_path);
+ file_cache_put(exif_cache, fd, 1);
return fd->exif;
}
@@
-676,8
+677,6
@@
void exif_free_fd(FileData *fd, ExifData *exif)
{
if (!fd) return;
g_assert(fd->exif == exif);
-
- file_cache_put(exif_cache, fd, 1);
}
/* embedded icc in jpeg */