liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit '638ecc4cde79b0296f2e04f683ca4cb881c28f36' as 'rtengine/libraw'

Browse Source
This commit is contained in:
Lawrence Lee
2023-11-12 11:49:00 -08:00
parent 5acf1c0a7f 638ecc4cde
commit 3f5c3988e5
213 changed files with 77043 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
rtengine/libraw/RawSpeed3/patches/04.clang-cl-compatibility.patch Normal file
View File

@@ -0,0 +1,37 @@
diff --git a/src/librawspeed/common/DefaultInitAllocatorAdaptor.h b/src/librawspeed/common/DefaultInitAllocatorAdaptor.h
index 2ff8969e..fa18c312 100644
--- a/src/librawspeed/common/DefaultInitAllocatorAdaptor.h
+++ b/src/librawspeed/common/DefaultInitAllocatorAdaptor.h
@@ -27,8 +27,12 @@
namespace rawspeed {
template <typename T, typename ActualAllocator = std::allocator<T>,
- typename = std::enable_if_t<std::is_pod<T>::value>>
-class DefaultInitAllocatorAdaptor {
+#ifdef _MSC_VER
+ typename = std::enable_if_t<true>>
+#else
+ typename = std::enable_if_t<std::is_pod<T>::value >>
+#endif
+ class DefaultInitAllocatorAdaptor {
public:
using allocator_traits = std::allocator_traits<ActualAllocator>;
diff --git a/src/librawspeed/decompressors/VC5Decompressor.cpp b/src/librawspeed/decompressors/VC5Decompressor.cpp
index c498ac3a..de4ae412 100644
--- a/src/librawspeed/decompressors/VC5Decompressor.cpp
+++ b/src/librawspeed/decompressors/VC5Decompressor.cpp
@@ -398,7 +398,12 @@ VC5Decompressor::VC5Decompressor(ByteStream bs, const RawImage& img)
wavelet.height = waveletHeight;
wavelet.bands.resize(
- &wavelet == channel.wavelets.begin() ? 1 : Wavelet::maxBands);
+#ifdef _MSC_VER
+ Wavelet::maxBands
+#else
+ &wavelet == channel.wavelets.begin() ? 1 : Wavelet::maxBands
+#endif
+ );
}
}