New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fixed MSVC 2013 build errors and workaround for an internal compiler cra... #1653
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
52a904e
Fixed MSVC 2013 build errors and workaround for an internal compiler …
jlblancoc bec35ee
Avoid duplicated variable declarations.
jlblancoc c33ca77
Undo changing whitespace.
jlblancoc 77023e2
Added comment to features2d_init.cpp explaining the reason for the ex…
jlblancoc 27b0292
Added patch file for fixing VS2013 in 3rd party lib OpenEXR
jlblancoc 80e667b
Minimized the number of arguments required to workaround the MSVC2013…
jlblancoc File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,72 @@ | ||
diff --git a/3rdparty/openexr/IlmImf/ImfAcesFile.cpp b/3rdparty/openexr/IlmImf/ImfAcesFile.cpp | ||
index de4bf83..9418b9d 100644 | ||
--- a/3rdparty/openexr/IlmImf/ImfAcesFile.cpp | ||
+++ b/3rdparty/openexr/IlmImf/ImfAcesFile.cpp | ||
@@ -42,6 +42,7 @@ | ||
#include <ImfRgbaFile.h> | ||
#include <ImfStandardAttributes.h> | ||
#include <Iex.h> | ||
+#include <algorithm> // for std::max() | ||
|
||
using namespace std; | ||
using namespace Imath; | ||
diff --git a/3rdparty/openexr/IlmImf/ImfOutputFile.cpp b/3rdparty/openexr/IlmImf/ImfOutputFile.cpp | ||
index 8831ec9..e69b92b 100644 | ||
--- a/3rdparty/openexr/IlmImf/ImfOutputFile.cpp | ||
+++ b/3rdparty/openexr/IlmImf/ImfOutputFile.cpp | ||
@@ -58,6 +58,7 @@ | ||
#include <vector> | ||
#include <fstream> | ||
#include <assert.h> | ||
+#include <algorithm> // for std::max() | ||
|
||
|
||
namespace Imf { | ||
diff --git a/3rdparty/openexr/IlmImf/ImfScanLineInputFile.cpp b/3rdparty/openexr/IlmImf/ImfScanLineInputFile.cpp | ||
index f7a12a3..5d8b522 100644 | ||
--- a/3rdparty/openexr/IlmImf/ImfScanLineInputFile.cpp | ||
+++ b/3rdparty/openexr/IlmImf/ImfScanLineInputFile.cpp | ||
@@ -56,6 +56,7 @@ | ||
#include <string> | ||
#include <vector> | ||
#include <assert.h> | ||
+#include <algorithm> // for std::max() | ||
|
||
|
||
namespace Imf { | ||
diff --git a/3rdparty/openexr/IlmImf/ImfTiledMisc.cpp b/3rdparty/openexr/IlmImf/ImfTiledMisc.cpp | ||
index 57f52f1..9588e78 100644 | ||
--- a/3rdparty/openexr/IlmImf/ImfTiledMisc.cpp | ||
+++ b/3rdparty/openexr/IlmImf/ImfTiledMisc.cpp | ||
@@ -43,6 +43,7 @@ | ||
#include "Iex.h" | ||
#include <ImfMisc.h> | ||
#include <ImfChannelList.h> | ||
+#include <algorithm> // for std::max() | ||
|
||
|
||
namespace Imf { | ||
diff --git a/3rdparty/openexr/IlmImf/ImfTiledOutputFile.cpp b/3rdparty/openexr/IlmImf/ImfTiledOutputFile.cpp | ||
index 0882106..0bc3cb3 100644 | ||
--- a/3rdparty/openexr/IlmImf/ImfTiledOutputFile.cpp | ||
+++ b/3rdparty/openexr/IlmImf/ImfTiledOutputFile.cpp | ||
@@ -63,6 +63,7 @@ | ||
#include <fstream> | ||
#include <assert.h> | ||
#include <map> | ||
+#include <algorithm> // for std::max() | ||
|
||
|
||
namespace Imf { | ||
diff --git a/3rdparty/openexr/Imath/ImathMatrixAlgo.cpp b/3rdparty/openexr/Imath/ImathMatrixAlgo.cpp | ||
index f0d2ed6..7ddc649 100644 | ||
--- a/3rdparty/openexr/Imath/ImathMatrixAlgo.cpp | ||
+++ b/3rdparty/openexr/Imath/ImathMatrixAlgo.cpp | ||
@@ -44,6 +44,7 @@ | ||
|
||
#include "ImathMatrixAlgo.h" | ||
#include <cmath> | ||
+#include <algorithm> // for std::max() | ||
|
||
#if defined(OPENEXR_DLL) | ||
#define EXPORT_CONST __declspec(dllexport) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What problem does this solve? Also, you can pull the variable declarations out of the
#if
, because they're common to both branches.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Amazingly... an internal compiler crash. Unrolling the code like this was the only way I found to make it to compile.
On getting x,y,ix,iy out of the #if, you're right, but I'm not sure how to change it now in GitHub. Should I remove this pull request and open a new one, or can I modify it? Otherwise, you can also do the change yourself, it'll be ok.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You can add additional commits and push them to your branch.
EDIT: to the branch in your GitHub repo, that is.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks (I'm rather new to Git!)
It's done now, I think this pull request is now complete.