[gimp/gimp-2-8] Bug 719723 - Drag and drop of sRGB image crashes GIMP
- From: Kristian Rietveld <kristian src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/gimp-2-8] Bug 719723 - Drag and drop of sRGB image crashes GIMP
- Date: Sun, 17 Apr 2016 16:32:51 +0000 (UTC)
commit 5abf0bb35763fb3ebe56bd96298f852adb423e51
Author: Kristian Rietveld <kris loopnest org>
Date: Sun Apr 17 17:22:12 2016 +0100
Bug 719723 - Drag and drop of sRGB image crashes GIMP
In file-jpeg, move the HAVE_LIBEXIF define down to include the call
to the metadata plugin (pdb-in-metadata-decode-xmp). This is necessary
because the metadata plugin is only available if GIMP was configured
with HAVE_LIBEXIF.
plug-ins/file-jpeg/jpeg-load.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/plug-ins/file-jpeg/jpeg-load.c b/plug-ins/file-jpeg/jpeg-load.c
index 4ae7eb2..7c2ed16 100644
--- a/plug-ins/file-jpeg/jpeg-load.c
+++ b/plug-ins/file-jpeg/jpeg-load.c
@@ -350,7 +350,6 @@ load_image (const gchar *filename,
exif_data_unref (exif_data);
exif_data = NULL;
}
-#endif
/* Step 5.2: check for XMP metadata in APP1 markers (after EXIF) */
for (marker = cinfo.marker_list; marker; marker = marker->next)
@@ -389,6 +388,7 @@ load_image (const gchar *filename,
g_free (xmp_packet);
}
}
+#endif
/* Step 5.3: check for an embedded ICC profile in APP2 markers */
jpeg_icc_read_profile (&cinfo, &profile, &profile_size);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]