From caf822dd8fdeed8d9d073f4b7c57e00553bdeb08 Mon Sep 17 00:00:00 2001
From: torger <torger@ludd.ltu.se>
Date: Wed, 29 Oct 2014 10:27:46 +0100
Subject: [PATCH] Clang compile fix in DNG float code

---
 rtengine/dcraw.cc    |  3 ++-
 rtengine/dcraw.patch | 11 ++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/rtengine/dcraw.cc b/rtengine/dcraw.cc
index 74389585e..632b7c17f 100644
--- a/rtengine/dcraw.cc
+++ b/rtengine/dcraw.cc
@@ -8725,7 +8725,8 @@ static void decodeFPDeltaRow(Bytef * src, Bytef * dst, size_t tileWidth, size_t
       dst[col*3 + 2] = src[col + realTileWidth*2];
     }
   } else {
-    if (((union { uint32_t x; uint8_t c; }){1}).c) {
+    union X { uint32_t x; uint8_t c; };
+    if (((union X){1}).c) {
 		for (size_t col = 0; col < tileWidth; ++col) {
 			for (size_t byte = 0; byte < bytesps; ++byte)
 				dst[col*bytesps + byte] = src[col + realTileWidth*(bytesps-byte-1)];  // Little endian
diff --git a/rtengine/dcraw.patch b/rtengine/dcraw.patch
index 30ab57e81..0fd419267 100755
--- a/rtengine/dcraw.patch
+++ b/rtengine/dcraw.patch
@@ -1,5 +1,5 @@
---- dcraw.c	2014-09-10 12:00:54 +0000
-+++ dcraw.cc	2014-09-10 12:27:02 +0000
+--- dcraw.c	2014-07-24 16:15:36.700261700 +0200
++++ dcraw.cc	2014-10-29 10:25:28.255138439 +0100
 @@ -1,3 +1,15 @@
 +/*RT*/#include <glib.h>
 +/*RT*/#include <glib/gstdio.h>
@@ -1108,7 +1108,7 @@
      is_raw = 0;
  #ifdef NO_JASPER
    if (load_raw == &CLASS redcine_load_raw) {
-@@ -8978,194 +8706,245 @@
+@@ -8978,194 +8706,246 @@
  }
  #endif
  
@@ -1270,7 +1270,8 @@
 -  image  = img;
 -  fuji_width = 0;
 +  } else {
-+    if (((union { uint32_t x; uint8_t c; }){1}).c) {
++    union X { uint32_t x; uint8_t c; };
++    if (((union X){1}).c) {
 +		for (size_t col = 0; col < tileWidth; ++col) {
 +			for (size_t byte = 0; byte < bytesps; ++byte)
 +				dst[col*bytesps + byte] = src[col + realTileWidth*(bytesps-byte-1)];  // Little endian
@@ -1529,7 +1530,7 @@
  
  struct tiff_tag {
    ushort tag, type;
-@@ -9188,585 +8967,12 @@
+@@ -9188,585 +8968,12 @@
    unsigned gps[26];
    char desc[512], make[64], model[64], soft[32], date[20], artist[64];
  };