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
|
From 1db0ae830c0e71218fb3b1916941901802b8c813 Mon Sep 17 00:00:00 2001
From: Cristy <urban-warrior@imagemagick.org>
Date: Thu, 30 Nov 2017 09:02:22 -0500
Subject: [PATCH] https://github.com/ImageMagick/ImageMagick/issues/888
---
coders/dng.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/coders/dng.c b/coders/dng.c
index 98bba92ea7..2ee9658962 100644
--- a/coders/dng.c
+++ b/coders/dng.c
@@ -169,11 +169,11 @@ static void SetDNGProperties(Image *image,const libraw_data_t *raw_info,
(void) SetImageProperty(image,"dng:make",raw_info->idata.make,exception);
(void) SetImageProperty(image,"dng:camera.model.name",raw_info->idata.model,
exception);
- (void) SetImageProperty(image,"dng:software",raw_info->idata.software,
- exception);
(void) FormatMagickTime(raw_info->other.timestamp,MagickPathExtent,timestamp);
(void) SetImageProperty(image,"dng:create.date",timestamp,exception);
#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0,18)
+ (void) SetImageProperty(image,"dng:software",raw_info->idata.software,
+ exception);
if (*raw_info->shootinginfo.BodySerial != '\0')
(void) SetImageProperty(image,"dng:serial.number",
raw_info->shootinginfo.BodySerial,exception);
@@ -181,7 +181,6 @@ static void SetDNGProperties(Image *image,const libraw_data_t *raw_info,
raw_info->other.FlashEC);
(void) SetImageProperty(image,"dng:flash.exposure.compensation",property,
exception);
-#endif
(void) FormatLocaleString(property,MagickPathExtent,"1/%0.1f",
1.0/raw_info->other.shutter);
(void) SetImageProperty(image,"dng:exposure.time",property,exception);
@@ -230,6 +229,7 @@ static void SetDNGProperties(Image *image,const libraw_data_t *raw_info,
raw_info->lens.FocalLengthIn35mmFormat);
(void) SetImageProperty(image,"dng:focal.length.in.35mm.format",property,
exception);
+#endif
}
#endif
|
