Merge pull request opencv#8868 from alalek:fix_build_softfloat

alalek · alalek · commit 0213b508dcfa · 2017-06-08T20:22:53.000Z
diff --git a/modules/core/include/opencv2/core.hpp b/modules/core/include/opencv2/core.hpp
@@ -58,7 +58,6 @@
 #include "opencv2/core/types.hpp"
 #include "opencv2/core/mat.hpp"
 #include "opencv2/core/persistence.hpp"
-#include "opencv2/core/softfloat.hpp"
 
 /**
 @defgroup core Core functionality
diff --git a/modules/core/include/opencv2/core/softfloat.hpp b/modules/core/include/opencv2/core/softfloat.hpp
@@ -83,6 +83,18 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "cvdef.h"
 
+// int32_t / uint32_t
+#if defined(_MSC_VER) && _MSC_VER < 1600 /* MSVS 2010 */
+namespace cv {
+typedef signed int int32_t;
+typedef unsigned int uint32_t;
+}
+#elif defined(_MSC_VER) || __cplusplus >= 201103L
+#include <cstdint>
+#else
+#include <stdint.h>
+#endif
+
 namespace cv
 {
 
diff --git a/modules/core/src/precomp.hpp b/modules/core/src/precomp.hpp
@@ -58,8 +58,6 @@
 #include "opencv2/core/ocl.hpp"
 #endif
 
-#include "opencv2/core/softfloat.hpp"
-
 #include <assert.h>
 #include <ctype.h>
 #include <float.h>
diff --git a/modules/core/src/softfloat.cpp b/modules/core/src/softfloat.cpp
@@ -79,6 +79,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "precomp.hpp"
 
+#include "opencv2/core/softfloat.hpp"
+
 namespace cv
 {
 
diff --git a/modules/core/test/test_math.cpp b/modules/core/test/test_math.cpp
@@ -5,6 +5,7 @@
 #include "test_precomp.hpp"
 #include <float.h>
 #include <math.h>
+#include "opencv2/core/softfloat.hpp"
 
 using namespace cv;
 using namespace std;

Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.`
`79`	`79`
`80`	`80`	`#include "precomp.hpp"`
`81`	`81`
	`82`	`+#include "opencv2/core/softfloat.hpp"`
	`83`	`+`
`82`	`84`	`namespace cv`
`83`	`85`	`{`
`84`	`86`