Merge pull request #304 from AlexanderStohr:master

modules/line_descriptor/src/binary_descriptor.cpp

@@ -41,6 +41,19 @@
 
 #include "precomp.hpp"
 
+#ifdef _MSC_VER
+    #if (_MSC_VER <= 1700)
+        /* This function rounds x to the nearest integer, but rounds halfway cases away from zero. */
+        static inline double round(double x)
+        {
+            if (x < 0.0)
+                return ceil(x - 0.5);
+            else
+                return floor(x + 0.5);
+        }
+    #endif
+#endif
+
 #define NUM_OF_BANDS 9
 #define Horizontal  255//if |dx|<|dy|;
 #define Vertical    0//if |dy|<=|dx|;

modules/line_descriptor/src/bitops.hpp

@@ -101,7 +101,7 @@ inline void split( UINT64 *chunks, UINT8 *code, int m, int mplus, int b )
   UINT64 temp = 0x0;
   int nbits = 0;
   int nbyte = 0;
-  UINT64 mask = b == 64 ? 0xFFFFFFFFFFFFFFFFLLU : ( ( UINT64_1 << b ) - UINT64_1 );
+  UINT64 mask = (b == 64) ? 0xFFFFFFFFFFFFFFFFull : ( ( UINT64_1 << b ) - UINT64_1 );
 
   for ( int i = 0; i < m; i++ )
   {

modules/saliency/src/motionSaliencyBinWangApr2014.cpp

@@ -479,7 +479,7 @@ bool MotionSaliencyBinWangApr2014::templateReplacement( const Mat& finalBFMask,
                 /////////////////// REPLACEMENT of backgroundModel template ///////////////////
                 //replace TA with current TK
                 backgroundModel[backgroundModel.size() - 1]->at<Vec2f>( i, j ) = potentialBackground.at<Vec2f>( i, j );
-                potentialBackground.at<Vec2f>( i, j )[0] = NAN;
+                potentialBackground.at<Vec2f>( i, j )[0] = (float)NAN;
                 potentialBackground.at<Vec2f>( i, j )[1] = 0;
 
                 break;
@@ -489,7 +489,7 @@ bool MotionSaliencyBinWangApr2014::templateReplacement( const Mat& finalBFMask,
           else
           {
             backgroundModel[backgroundModel.size() - 1]->at<Vec2f>( i, j ) = potentialBackground.at<Vec2f>( i, j );
-            potentialBackground.at<Vec2f>( i, j )[0] = NAN;
+            potentialBackground.at<Vec2f>( i, j )[0] = (float)NAN;
             potentialBackground.at<Vec2f>( i, j )[1] = 0;
           }
         }  // close if of EVALUATION

modules/tracking/src/tldDataset.cpp

@@ -52,7 +52,10 @@ namespace cv
 		cv::Rect2d tld_InitDataset(int datasetInd,const char* rootPath)
 		{
 			char* folderName = (char *)"";
-			int x, y, w, h;
+			int x = 0;
+			int y = 0;
+			int w = 0;
+			int h = 0;
 			flagPNG = false;
 
 			frameNum = 1;