From: Cristy <urban-warrior@imagemagick.org>
Date: Thu, 30 Nov 2017 14:21:15 +0000 (-0500)
Subject: https://github.com/ImageMagick/ImageMagick/issues/888
X-Git-Tag: 7.0.7-13~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8558aa4d14275251e0154e837977c16b7895e124;p=imagemagick

https://github.com/ImageMagick/ImageMagick/issues/888
---

diff --git a/coders/dng.c b/coders/dng.c
index 2ee965896..b0d4ffe79 100644
--- a/coders/dng.c
+++ b/coders/dng.c
@@ -171,6 +171,9 @@ static void SetDNGProperties(Image *image,const libraw_data_t *raw_info,
     exception);
   (void) FormatMagickTime(raw_info->other.timestamp,MagickPathExtent,timestamp);
   (void) SetImageProperty(image,"dng:create.date",timestamp,exception);
+  (void) FormatLocaleString(property,MagickPathExtent,"%0.1f",
+    raw_info->other.iso_speed);
+  (void) SetImageProperty(image,"dng:iso.setting",property,exception);
 #if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0,18)
   (void) SetImageProperty(image,"dng:software",raw_info->idata.software,
     exception);
@@ -187,9 +190,6 @@ static void SetDNGProperties(Image *image,const libraw_data_t *raw_info,
   (void) FormatLocaleString(property,MagickPathExtent,"%0.1f",
     raw_info->other.aperture);
   (void) SetImageProperty(image,"dng:f.number",property,exception);
-  (void) FormatLocaleString(property,MagickPathExtent,"%0.1f",
-    raw_info->other.iso_speed);
-  (void) SetImageProperty(image,"dng:iso.setting",property,exception);
   (void) FormatLocaleString(property,MagickPathExtent,"%0.1f",
     raw_info->lens.EXIF_MaxAp);
   (void) SetImageProperty(image,"dng:max.aperture.value",property,exception);
@@ -400,6 +400,7 @@ static Image *ReadDNGImage(const ImageInfo *image_info,ExceptionInfo *exception)
             profile=DestroyStringInfo(profile);
           }
       }
+#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0,18)
     if (raw_info->idata.xmpdata)
       {
         profile=BlobToStringInfo(raw_info->idata.xmpdata,
@@ -410,6 +411,7 @@ static Image *ReadDNGImage(const ImageInfo *image_info,ExceptionInfo *exception)
             profile=DestroyStringInfo(profile);
           }
       }
+#endif
     SetDNGProperties(image,raw_info,exception);
     libraw_close(raw_info);
     return(image);