mirror of
https://github.com/audacity/conan-recipes.git
synced 2025-12-10 03:56:47 -06:00
59 lines
3.2 KiB
Diff
59 lines
3.2 KiB
Diff
Fix compile errors in QtWebEngine when building with VS2019 >= 16.8.0 .
|
|
See https://bugreports.qt.io/browse/QTBUG-88625 and
|
|
https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/321741 .
|
|
|
|
diff -u -r a/src/3rdparty/chromium/third_party/angle/src/common/mathutil.cpp b/src/3rdparty/chromium/third_party/angle/src/common/mathutil.cpp
|
|
--- a/src/3rdparty/chromium/third_party/angle/src/common/mathutil.cpp 2021-05-20 13:38:32.243947800 +0200
|
|
+++ b/src/3rdparty/chromium/third_party/angle/src/common/mathutil.cpp 2021-05-20 12:25:30.392900700 +0200
|
|
@@ -72,11 +72,11 @@
|
|
const RGB9E5Data *inputData = reinterpret_cast<const RGB9E5Data *>(&input);
|
|
|
|
*red =
|
|
- inputData->R * pow(2.0f, (int)inputData->E - g_sharedexp_bias - g_sharedexp_mantissabits);
|
|
+ inputData->R * (float)pow(2.0f, (int)inputData->E - g_sharedexp_bias - g_sharedexp_mantissabits);
|
|
*green =
|
|
- inputData->G * pow(2.0f, (int)inputData->E - g_sharedexp_bias - g_sharedexp_mantissabits);
|
|
+ inputData->G * (float)pow(2.0f, (int)inputData->E - g_sharedexp_bias - g_sharedexp_mantissabits);
|
|
*blue =
|
|
- inputData->B * pow(2.0f, (int)inputData->E - g_sharedexp_bias - g_sharedexp_mantissabits);
|
|
+ inputData->B * (float)pow(2.0f, (int)inputData->E - g_sharedexp_bias - g_sharedexp_mantissabits);
|
|
}
|
|
|
|
} // namespace gl
|
|
diff -u -r a/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/lab_color_space.h b/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/lab_color_space.h
|
|
--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/lab_color_space.h 2020-11-07 02:22:36.000000000 +0100
|
|
+++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/lab_color_space.h 2021-05-20 13:39:42.890109500 +0200
|
|
@@ -130,7 +130,7 @@
|
|
// https://en.wikipedia.org/wiki/CIELAB_color_space#Forward_transformation.
|
|
FloatPoint3D toXYZ(const FloatPoint3D& lab) const {
|
|
auto invf = [](float x) {
|
|
- return x > kSigma ? pow(x, 3) : 3 * kSigma2 * (x - 4.0f / 29.0f);
|
|
+ return x > kSigma ? (float)pow(x, 3) : 3 * kSigma2 * (x - 4.0f / 29.0f);
|
|
};
|
|
|
|
FloatPoint3D v = {clamp(lab.X(), 0.0f, 100.0f),
|
|
diff -u -r a/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/timestamped_trace_piece.h b/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/timestamped_trace_piece.h
|
|
--- a/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/timestamped_trace_piece.h 2020-11-07 02:22:36.000000000 +0100
|
|
+++ b/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/timestamped_trace_piece.h 2021-05-20 13:41:08.983902900 +0200
|
|
@@ -197,6 +197,20 @@
|
|
}
|
|
return *this;
|
|
}
|
|
+
|
|
+ #if PERFETTO_BUILDFLAG(PERFETTO_COMPILER_MSVC)
|
|
+ TimestampedTracePiece& operator=(TimestampedTracePiece&& ttp) const
|
|
+ {
|
|
+ if (this != &ttp) {
|
|
+ // First invoke the destructor and then invoke the move constructor
|
|
+ // inline via placement-new to implement move-assignment.
|
|
+ this->~TimestampedTracePiece();
|
|
+ new (const_cast<TimestampedTracePiece*>(this)) TimestampedTracePiece(std::move(ttp));
|
|
+ }
|
|
+
|
|
+ return const_cast<TimestampedTracePiece&>(*this);
|
|
+ }
|
|
+#endif // PERFETTO_BUILDFLAG(PERFETTO_COMPILER_MSVC)
|
|
|
|
~TimestampedTracePiece() {
|
|
switch (type) {
|