summarylogtreecommitdiffstats
path: root/boost_107200.patch
blob: 49b5e2fd0d15dccf44d31e3fcd869a5f52e03e2e (plain)
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
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
diff -Naur a/src/appleseed/foundation/platform/path.h b/src/appleseed/foundation/platform/path.h
--- a/src/appleseed/foundation/platform/path.h	2019-08-31 17:49:01.000000000 +0200
+++ b/src/appleseed/foundation/platform/path.h	2020-12-10 03:26:57.768459744 +0100
@@ -40,6 +40,7 @@
 #include "main/dllsymbol.h"
 
 // Boost headers.
+#include "boost/filesystem/exception.hpp"
 #include "boost/filesystem/operations.hpp"
 #include "boost/filesystem/path.hpp"
 
diff -Naur a/src/appleseed/foundation/utility/benchmark/benchmarkaggregator.cpp b/src/appleseed/foundation/utility/benchmark/benchmarkaggregator.cpp
--- a/src/appleseed/foundation/utility/benchmark/benchmarkaggregator.cpp	2019-08-31 17:49:01.000000000 +0200
+++ b/src/appleseed/foundation/utility/benchmark/benchmarkaggregator.cpp	2020-12-10 03:40:31.226687399 +0100
@@ -40,6 +40,7 @@
 
 // Boost headers.
 #include "boost/date_time/posix_time/posix_time.hpp"
+#include "boost/filesystem/directory.hpp"
 #include "boost/filesystem/operations.hpp"
 #include "boost/filesystem/path.hpp"
 #include "boost/regex.hpp"
diff -Naur a/src/appleseed/renderer/modeling/project/assethandler.cpp b/src/appleseed/renderer/modeling/project/assethandler.cpp
--- a/src/appleseed/renderer/modeling/project/assethandler.cpp	2019-08-31 17:49:01.000000000 +0200
+++ b/src/appleseed/renderer/modeling/project/assethandler.cpp	2020-12-10 03:26:57.768459744 +0100
@@ -80,7 +80,7 @@
         try
         {
             create_directories(dest_path.parent_path());
-            copy_file(source_path, dest_path, copy_option::overwrite_if_exists);
+            copy_file(source_path, dest_path, copy_options::overwrite_existing);
             return true;
         }
         catch (const std::exception& e)     // namespace qualification required
diff -Naur a/src/appleseed.shared/application/application.cpp b/src/appleseed.shared/application/application.cpp
--- a/src/appleseed.shared/application/application.cpp	2019-08-31 17:49:01.000000000 +0200
+++ b/src/appleseed.shared/application/application.cpp	2020-12-10 03:26:57.768459744 +0100
@@ -39,6 +39,9 @@
 #include "foundation/utility/settings.h"
 #include "foundation/utility/string.h"
 
+// Boost headers.
+#include "boost/filesystem/exception.hpp"
+
 // Standard headers.
 #include <cstring>
 #include <string>
diff -Naur a/src/appleseed.studio/mainwindow/rendering/pixelcolortracker.cpp b/src/appleseed.studio/mainwindow/rendering/pixelcolortracker.cpp
--- a/src/appleseed.studio/mainwindow/rendering/pixelcolortracker.cpp	2019-08-31 17:49:01.000000000 +0200
+++ b/src/appleseed.studio/mainwindow/rendering/pixelcolortracker.cpp	2020-12-10 03:26:57.768459744 +0100
@@ -133,10 +133,10 @@
             static_cast<size_t>(pixel.y),
             linear_rgba);
 
-        m_r_label->setText(QString().sprintf("%4.3f", linear_rgba.r));
-        m_g_label->setText(QString().sprintf("%4.3f", linear_rgba.g));
-        m_b_label->setText(QString().sprintf("%4.3f", linear_rgba.b));
-        m_a_label->setText(QString().sprintf("%4.3f", linear_rgba.a));
+        m_r_label->setText(QString::number(linear_rgba.r, 'f', 3));
+        m_g_label->setText(QString::number(linear_rgba.g, 'f', 3));
+        m_b_label->setText(QString::number(linear_rgba.b, 'f', 3));
+        m_a_label->setText(QString::number(linear_rgba.a, 'f', 3));
     }
     else
     {