diff --git a/modules/stitching/src/motion_estimators.cpp b/modules/stitching/src/motion_estimators.cpp
index 026bea6fc3..abd43b11fb 100644
--- a/modules/stitching/src/motion_estimators.cpp
+++ b/modules/stitching/src/motion_estimators.cpp
@@ -41,9 +41,15 @@
 //M*/
 
 #include "precomp.hpp"
-#include <math.h>
 #include "opencv2/calib3d/calib3d_c.h"
 
+#ifdef _MSC_VER
+  #include <float.h>
+  #define isnan(x) _isnan(x)
+#else
+  #include <math.h>
+#endif
+
 using namespace cv;
 using namespace cv::detail;
 
@@ -253,8 +259,7 @@ bool BundleAdjusterBase::estimate(const std::vector<ImageFeatures> &features,
     bool ok = true;
     for (int i = 0; i < cam_params_.rows; ++i)
     {
-        if (isnan(cam_params_.at<double>(i,0)) ||
-            isinf(cam_params_.at<double>(i,0)))
+        if (isnan(cam_params_.at<double>(i,0)))
         {
             ok = false;
             break;