Fixed isnan compil error for MSVC/GCC

plstcharles · Jan 13, 2016 · 92ee344 · 92ee344
1 parent 9a2117b
commit 92ee344
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 7 deletions.
diff --git a/modules/utils/include/litiv/utils/CxxUtils.hpp b/modules/utils/include/litiv/utils/CxxUtils.hpp
@@ -270,9 +270,21 @@ namespace CxxUtils {
         getRandNeighborPosition<24>(s_anNeighborPattern,nNeighborCoord_X,nNeighborCoord_Y,nOrigCoord_X,nOrigCoord_Y,nBorderSize,oImageSize);
     }
 
+    template<typename T>
+    static inline bool isnan(T dVal) {
+        // needed for portability...
+#ifdef _MSC_VER
+        return _isnan((double)dVal)!=0;
+#else //!def(_MSC_VER)
+        return std::isnan(dVal);
+#endif //!def(_MSC_VER)
+    }
+
 } //namespace CxxUtils
 
 namespace std {
+
     template<typename T, size_t N>
     using aligned_vector = vector<T,CxxUtils::AlignAllocator<T,N>>;
+
 } //namespace std
diff --git a/modules/utils/include/litiv/utils/DefineUtils.hpp.in b/modules/utils/include/litiv/utils/DefineUtils.hpp.in
@@ -54,9 +54,6 @@
 #ifndef R2D
 #define R2D(r) ((r)*(180.0/M_PI))
 #endif //ndefined(R2D)
-#ifndef isnan
-#define isnan(f) std::isnan(f)
-#endif //ndefined(isnan)
 #ifndef __STDC_FORMAT_MACROS
 #define __STDC_FORMAT_MACROS
 #endif //ndefined(__STDC_FORMAT_MACROS)

diff --git a/modules/vptz/include/litiv/vptz/StandaloneUtils.hpp.in b/modules/vptz/include/litiv/vptz/StandaloneUtils.hpp.in
@@ -90,9 +90,6 @@
 #ifndef R2D
 #define R2D(r) ((r)*(180.0/M_PI))
 #endif //ndefined(R2D)
-#ifndef isnan
-#define isnan(f) std::isnan(f)
-#endif //ndefined(isnan)
 
 #if defined(_MSC_VER)
 #ifndef NOMINMAX
@@ -176,6 +173,16 @@ namespace CxxUtils {
         }
     };
 
+    template<typename T>
+    static inline bool isnan(T dVal) {
+        // needed for portability...
+#ifdef _MSC_VER
+        return _isnan((double)dVal)!=0;
+#else //!def(_MSC_VER)
+        return std::isnan(dVal);
+#endif //!def(_MSC_VER)
+    }
+
 } //namespace CxxUtils
 
 #define TARGET_GL_VER_MAJOR  3

diff --git a/modules/vptz/src/virtualptz.cpp b/modules/vptz/src/virtualptz.cpp
@@ -22,7 +22,7 @@ vptz::Camera::Camera( const std::string& sInputPath, double verti_FOV, double ou
             vptzErrorExt("cannot open the input panomaric video file at %s",m_sInputPath.c_str());
         m_nScenarioFrameCount = (int)panoCapture.get(cv::CAP_PROP_FRAME_COUNT);
         m_dFrameRate = panoCapture.get(cv::CAP_PROP_FPS);
-        if(m_dFrameRate<=0 || isnan(m_dFrameRate)) {
+        if(m_dFrameRate<=0 || CxxUtils::isnan(m_dFrameRate)) {
             std::cerr << "VirtualPTZ Warning : could not determine frame rate for input video; check container support on platform" << std::endl;
             m_dFrameRate = 16.0;
         }