diff options
| author | Tomas Bzatek <tbzatek@users.sourceforge.net> | 2014-03-18 11:09:15 +0100 |
|---|---|---|
| committer | Tomas Bzatek <tbzatek@users.sourceforge.net> | 2014-03-18 11:09:15 +0100 |
| commit | 103ddac57a9e50d83782e0195f9e0aa0a26bfd34 (patch) | |
| tree | 1d3405f84428b3222e83b8241cfaa657fdcc9141 | |
| parent | 98ee28f049415750b2bb5d9f3eb386a83696cddc (diff) | |
| download | cataract-103ddac57a9e50d83782e0195f9e0aa0a26bfd34.tar.xz | |
Allow absolute pathnames for external EXIF data
| -rw-r--r-- | src/generators.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/generators.c b/src/generators.c index f94e2a6..457355f 100644 --- a/src/generators.c +++ b/src/generators.c @@ -177,7 +177,7 @@ metadata_apply_overrides (ExifData *exif_data, g_free (exif_data->external_exif_data); exif_data->external_exif_data = NULL; if (setup->write_supplied_exif && item->metadata_external_exif) - exif_data->external_exif_data = g_build_filename (path_info->src_dir, item->metadata_external_exif, NULL); + exif_data->external_exif_data = g_path_is_absolute (item->metadata_external_exif) ? g_strdup (item->metadata_external_exif) : g_build_filename (path_info->src_dir, item->metadata_external_exif, NULL); exif_data->squared_thumbnail_type = setup->squared_thumbnail_type; @@ -786,7 +786,7 @@ write_html_image (TGallerySetup *setup, /* Use external EXIF file if specified */ exif = NULL; if (item->metadata_external_exif) { - s1 = g_build_filename (path_info->src_dir, item->metadata_external_exif, NULL); + s1 = g_path_is_absolute (item->metadata_external_exif) ? g_strdup (item->metadata_external_exif) : g_build_filename (path_info->src_dir, item->metadata_external_exif, NULL); exif = read_exif (s1); if (exif == NULL) log_error ("write_html_image: error getting exif data from file \"%s\"\n", s1); |