fixed warning on windows

diff --git a/samples/c/adaptiveskindetector.cpp b/samples/c/adaptiveskindetector.cpp
index a21f13e..37856bd 100644 (file)
--- a/samples/c/adaptiveskindetector.cpp
+++ b/samples/c/adaptiveskindetector.cpp
@@ -34,7 +34,6 @@
 //
 //M*/
 
-
 #include <iostream>
 #include <cstdio>
 #include <cstring>
@@ -42,6 +41,10 @@
 #include "opencv2/contrib/contrib.hpp"
 #include "opencv2/highgui/highgui.hpp"
 
+#ifndef _CRT_SECURE_NO_WARNINGS
+# define _CRT_SECURE_NO_WARNINGS
+#endif
+
 static void help(char **argv)
 {
     std::cout << "\nThis program demonstrates the contributed flesh detector CvAdaptiveSkinDetector which can be found in contrib.cpp\n"

diff --git a/samples/c/blobtrack_sample.cpp b/samples/c/blobtrack_sample.cpp
index e4f766c..a2f3727 100644 (file)
--- a/samples/c/blobtrack_sample.cpp
+++ b/samples/c/blobtrack_sample.cpp
@@ -8,11 +8,13 @@
 
 /* Select appropriate case insensitive string comparison function: */
 #if defined WIN32 || defined _MSC_VER
-  #define MY_STRNICMP strnicmp
-  #define MY_STRICMP stricmp
+# define MY_STRNICMP _strnicmp
+# define MY_STRICMP _stricmp
+# define MY_STRDUP _strdup
 #else
-  #define MY_STRNICMP strncasecmp
-  #define MY_STRICMP strcasecmp
+# define MY_STRNICMP strncasecmp
+# define MY_STRICMP strcasecmp
+# define MY_STRDUP strdup
 #endif
 
 /* List of foreground (FG) DETECTION modules: */
@@ -239,7 +241,7 @@ static int RunBlobTrackingAuto( CvCapture* pCap, CvBlobTrackerAuto* pTracker,cha
 
                     if(pS)
                     {
-                        char* pStr = strdup(pS);
+                        char* pStr = MY_STRDUP(pS);
                         char* pStrFree = pStr;
 
                         while (pStr && strlen(pStr) > 0)

diff --git a/samples/cpp/OpenEXRimages_HDR_Retina_toneMapping_video.cpp b/samples/cpp/OpenEXRimages_HDR_Retina_toneMapping_video.cpp
index a3a607f..fc3ac83 100644 (file)
--- a/samples/cpp/OpenEXRimages_HDR_Retina_toneMapping_video.cpp
+++ b/samples/cpp/OpenEXRimages_HDR_Retina_toneMapping_video.cpp
@@ -16,6 +16,10 @@
 
 #include "opencv2/opencv.hpp"
 
+#ifndef _CRT_SECURE_NO_WARNINGS
+# define _CRT_SECURE_NO_WARNINGS
+#endif
+
 static void help(std::string errorMessage)
 {
     std::cout<<"Program init error : "<<errorMessage<<std::endl;

diff --git a/samples/cpp/hybridtrackingsample.cpp b/samples/cpp/hybridtrackingsample.cpp
index 8c925ac..826ae29 100644 (file)
--- a/samples/cpp/hybridtrackingsample.cpp
+++ b/samples/cpp/hybridtrackingsample.cpp
@@ -11,10 +11,6 @@
  *
  */
 
-//#include <cv.h>
-//#include <ml.h>
-//#include <cvaux.h>
-//#include <highgui.h>
 #include <stdio.h>
 #include <time.h>
 #include <iostream>
@@ -22,6 +18,10 @@
 #include "opencv2/highgui/highgui.hpp"
 #include "opencv2/contrib/hybridtracker.hpp"
 
+#ifndef _CRT_SECURE_NO_WARNINGS
+# define _CRT_SECURE_NO_WARNINGS
+#endif
+
 using namespace cv;
 using namespace std;
 

diff --git a/samples/cpp/tutorial_code/calib3d/camera_calibration/camera_calibration.cpp b/samples/cpp/tutorial_code/calib3d/camera_calibration/camera_calibration.cpp
index aa4a036..5cc15b3 100644 (file)
--- a/samples/cpp/tutorial_code/calib3d/camera_calibration/camera_calibration.cpp
+++ b/samples/cpp/tutorial_code/calib3d/camera_calibration/camera_calibration.cpp
@@ -8,6 +8,10 @@
 #include <opencv2/calib3d/calib3d.hpp>
 #include <opencv2/highgui/highgui.hpp>
 
+#ifndef _CRT_SECURE_NO_WARNINGS
+# define _CRT_SECURE_NO_WARNINGS
+#endif
+
 using namespace cv;
 using namespace std;