1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
|
From 8558aa4d14275251e0154e837977c16b7895e124 Mon Sep 17 00:00:00 2001
From: Cristy <urban-warrior@imagemagick.org>
Date: Thu, 30 Nov 2017 09:21:15 -0500
Subject: [PATCH] https://github.com/ImageMagick/ImageMagick/issues/888
---
coders/dng.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/coders/dng.c b/coders/dng.c
index 2ee9658962..b0d4ffe79b 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);
|
