Book a Demo!
CoCalc Logo Icon
StoreFeaturesDocsShareSupportNewsAboutPoliciesSign UpSign In
Tetragramm
GitHub Repository: Tetragramm/opencv
 Path: blob/master/3rdparty/openexr/fix_msvc2013_errors.patch
16337 views
1
diff --git a/3rdparty/openexr/IlmImf/ImfAcesFile.cpp b/3rdparty/openexr/IlmImf/ImfAcesFile.cpp

2
index de4bf83..9418b9d 100644

3
--- a/3rdparty/openexr/IlmImf/ImfAcesFile.cpp

4
+++ b/3rdparty/openexr/IlmImf/ImfAcesFile.cpp

5
@@ -42,6 +42,7 @@

6
 #include <ImfRgbaFile.h>

7
 #include <ImfStandardAttributes.h>

8
 #include <Iex.h>

9
+#include <algorithm> // for std::max()

10
 

11
 using namespace std;

12
 using namespace Imath;

13
diff --git a/3rdparty/openexr/IlmImf/ImfOutputFile.cpp b/3rdparty/openexr/IlmImf/ImfOutputFile.cpp

14
index 8831ec9..e69b92b 100644

15
--- a/3rdparty/openexr/IlmImf/ImfOutputFile.cpp

16
+++ b/3rdparty/openexr/IlmImf/ImfOutputFile.cpp

17
@@ -58,6 +58,7 @@

18
 #include <vector>

19
 #include <fstream>

20
 #include <assert.h>

21
+#include <algorithm> // for std::max()

22
 

23
 

24
 namespace Imf {

25
diff --git a/3rdparty/openexr/IlmImf/ImfScanLineInputFile.cpp b/3rdparty/openexr/IlmImf/ImfScanLineInputFile.cpp

26
index f7a12a3..5d8b522 100644

27
--- a/3rdparty/openexr/IlmImf/ImfScanLineInputFile.cpp

28
+++ b/3rdparty/openexr/IlmImf/ImfScanLineInputFile.cpp

29
@@ -56,6 +56,7 @@

30
 #include <string>

31
 #include <vector>

32
 #include <assert.h>

33
+#include <algorithm> // for std::max()

34
 

35
 

36
 namespace Imf {

37
diff --git a/3rdparty/openexr/IlmImf/ImfTiledMisc.cpp b/3rdparty/openexr/IlmImf/ImfTiledMisc.cpp

38
index 57f52f1..9588e78 100644

39
--- a/3rdparty/openexr/IlmImf/ImfTiledMisc.cpp

40
+++ b/3rdparty/openexr/IlmImf/ImfTiledMisc.cpp

41
@@ -43,6 +43,7 @@

42
 #include "Iex.h"

43
 #include <ImfMisc.h>

44
 #include <ImfChannelList.h>

45
+#include <algorithm> // for std::max()

46
 

47
 

48
 namespace Imf {

49
diff --git a/3rdparty/openexr/IlmImf/ImfTiledOutputFile.cpp b/3rdparty/openexr/IlmImf/ImfTiledOutputFile.cpp

50
index 0882106..0bc3cb3 100644

51
--- a/3rdparty/openexr/IlmImf/ImfTiledOutputFile.cpp

52
+++ b/3rdparty/openexr/IlmImf/ImfTiledOutputFile.cpp

53
@@ -63,6 +63,7 @@

54
 #include <fstream>

55
 #include <assert.h>

56
 #include <map>

57
+#include <algorithm> // for std::max()

58
 

59
 

60
 namespace Imf {

61
diff --git a/3rdparty/openexr/Imath/ImathMatrixAlgo.cpp b/3rdparty/openexr/Imath/ImathMatrixAlgo.cpp

62
index f0d2ed6..7ddc649 100644

63
--- a/3rdparty/openexr/Imath/ImathMatrixAlgo.cpp

64
+++ b/3rdparty/openexr/Imath/ImathMatrixAlgo.cpp

65
@@ -44,6 +44,7 @@

66
 

67
 #include "ImathMatrixAlgo.h"

68
 #include <cmath>

69
+#include <algorithm> // for std::max()

70
 

71
 #if defined(OPENEXR_DLL)

72
     #define EXPORT_CONST __declspec(dllexport)

73


74