Merge pull request #926 from stevenlr/fix_windows_clang_build

Fix build with Clang on Window

Author: LebedevRI

src/librawspeed/decompressors/VC5Decompressor.cpp

@@ -418,7 +418,7 @@ VC5Decompressor::VC5Decompressor(ByteStream bs, const RawImage& img)
       wavelet.height = waveletHeight;
 
       wavelet.bands.resize(
-          &wavelet == channel.wavelets.begin() ? 1 : Wavelet::maxBands);
+          &wavelet == &*channel.wavelets.begin() ? 1 : Wavelet::maxBands);
     }
   }
 

src/librawspeed/io/Endianness.h

@@ -26,6 +26,18 @@
 #include <cstdint>
 #include <cstring>
 
+#ifdef _MSC_VER
+#include <intrin.h>
+
+#define BSWAP16(A) _byteswap_ushort(A)
+#define BSWAP32(A) _byteswap_ulong(A)
+#define BSWAP64(A) _byteswap_uint64(A)
+#else
+#define BSWAP16(A) __builtin_bswap16(A)
+#define BSWAP32(A) __builtin_bswap32(A)
+#define BSWAP64(A) __builtin_bswap64(A)
+#endif
+
 namespace rawspeed {
 
 enum class Endianness : uint16_t {
@@ -60,18 +72,6 @@ inline Endianness getHostEndianness() {
 #endif
 }
 
-#ifdef _MSC_VER
-#include <intrin.h>
-
-#define BSWAP16(A) _byteswap_ushort(A)
-#define BSWAP32(A) _byteswap_ulong(A)
-#define BSWAP64(A) _byteswap_uint64(A)
-#else
-#define BSWAP16(A) __builtin_bswap16(A)
-#define BSWAP32(A) __builtin_bswap32(A)
-#define BSWAP64(A) __builtin_bswap64(A)
-#endif
-
 inline int8_t getByteSwapped(int8_t v) { return v; }
 inline uint8_t getByteSwapped(uint8_t v) { return v; }
 inline int16_t getByteSwapped(int16_t v) {