mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-07 17:44:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1253 from kamjagin:fixingCompilationOnOSX

Browse Source
This commit is contained in:
Roman Donchenko 2013-08-15 11:54:54 +04:00 committed by OpenCV Buildbot
commit 556028eff5
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/include/opencv2/core/cvdef.h
View File

@ -201,8 +201,10 @@
#if !defined _MSC_VER && !defined __BORLANDC__ #if !defined _MSC_VER && !defined __BORLANDC__
# if defined __cplusplus && __cplusplus >= 201103L # if defined __cplusplus && __cplusplus >= 201103L
# include <cstdint> # include <cstdint>
typedef std::uint32_t uint;
# else # else
# include <stdint.h> # include <stdint.h>
typedef uint32_t uint;
# endif # endif
#else #else
typedef unsigned uint; typedef unsigned uint;

10
modules/stitching/src/motion_estimators.cpp
View File

@ -42,13 +42,7 @@
#include "precomp.hpp" #include "precomp.hpp"
#include "opencv2/calib3d/calib3d_c.h" #include "opencv2/calib3d/calib3d_c.h"
#include "opencv2/core/cvdef.h"
#ifdef _MSC_VER
#include <float.h>
#define isnan(x) _isnan(x)
#else
#include <math.h>
#endif
using namespace cv; using namespace cv;
using namespace cv::detail; using namespace cv::detail;
@ -259,7 +253,7 @@ bool BundleAdjusterBase::estimate(const std::vector<ImageFeatures> &features,
bool ok = true; bool ok = true;
for (int i = 0; i < cam_params_.rows; ++i) for (int i = 0; i < cam_params_.rows; ++i)
{ {
if (isnan(cam_params_.at<double>(i,0))) if (cvIsNaN(cam_params_.at<double>(i,0)))
{ {
ok = false; ok = false;
break; break;