1a871097d6
- update to 2.2.5 - New features: - When appending EXIF data to an exported image, do not fail if reading of EXIF from the original file fails - Support XYZ as proofing profile - Clear DerivedFrom from XMP before writing it - bauhaus: when using soft bounds, keep slider step constant - Bugfixes: - Some GCC7 build fixes - cmstest: fix crash when missing XRandR extension. - Fix crash in Lua libs when collapsing libs - Mac packaging: some fixes - RawSpeed: TiffIFD: avoid double-free - Fix a few alloc-dealloc mismatches - Base Support: - Canon EOS 77D - Canon EOS 9000D - Nikon D500 (14bit-uncompressed, 12bit-uncompressed) - Nikon D5600 (12bit-compressed, 12bit-uncompressed, 14bit-compressed, 14bit-uncompressed) - Panasonic DC-FZ82 (4:3) - Panasonic DMC-FZ80 (4:3) - Panasonic DMC-FZ85 (4:3) - Panasonic DC-GH5 (4:3) - White Balance Presets: - Pentax K-3 II - Noise Profiles: - Nikon D500 - Panasonic DMC-FZ300 - Panasonic DMC-LX100 - Pentax K-70 - Sony ILCE-5000 - refreshed darktable-old-glib.patch OBS-URL: https://build.opensuse.org/request/show/498853 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/darktable?expand=0&rev=69
31 lines
1.0 KiB
Diff
31 lines
1.0 KiB
Diff
Index: darktable-2.2.5/src/common/exif.cc
|
|
===================================================================
|
|
--- darktable-2.2.5.orig/src/common/exif.cc
|
|
+++ darktable-2.2.5/src/common/exif.cc
|
|
@@ -82,6 +82,13 @@ const char *dt_xmp_keys[]
|
|
|
|
static const guint dt_xmp_keys_n = G_N_ELEMENTS(dt_xmp_keys); // the number of XmpBag XmpSeq keys that dt uses
|
|
|
|
+#if ! GLIB_CHECK_VERSION(2,40,0)
|
|
+static gboolean _str_is_ascii(const char *str)
|
|
+{
|
|
+ while(*str) if((guchar)*str++ >= 0x80) return FALSE;
|
|
+ return TRUE;
|
|
+}
|
|
+#endif
|
|
|
|
/* a few helper functions inspired by
|
|
https://projects.kde.org/projects/kde/kdegraphics/libs/libkexiv2/repository/revisions/master/entry/libkexiv2/kexiv2gps.cpp
|
|
@@ -1356,7 +1363,11 @@ int dt_exif_read_blob(uint8_t **buf, con
|
|
if(res != NULL)
|
|
{
|
|
char *desc = (char *)res->data;
|
|
+#if GLIB_CHECK_VERSION(2,40,0)
|
|
if(g_str_is_ascii(desc))
|
|
+#else
|
|
+ if(_str_is_ascii(desc))
|
|
+#endif
|
|
exifData["Exif.Image.ImageDescription"] = desc;
|
|
else
|
|
exifData["Exif.Photo.UserComment"] = desc;
|