From 7a539104955353d33be51708183f60432acec656 Mon Sep 17 00:00:00 2001 From: ilya-lavrenov Date: Wed, 4 Sep 2013 18:32:05 +0400 Subject: [PATCH] fixed warning on windows --- samples/c/adaptiveskindetector.cpp | 5 ++++- samples/c/blobtrack_sample.cpp | 12 +++++++----- .../OpenEXRimages_HDR_Retina_toneMapping_video.cpp | 4 ++++ samples/cpp/hybridtrackingsample.cpp | 8 ++++---- .../camera_calibration/camera_calibration.cpp | 4 ++++ 5 files changed, 23 insertions(+), 10 deletions(-) diff --git a/samples/c/adaptiveskindetector.cpp b/samples/c/adaptiveskindetector.cpp index a21f13e4d..37856bd4e 100644 --- a/samples/c/adaptiveskindetector.cpp +++ b/samples/c/adaptiveskindetector.cpp @@ -34,7 +34,6 @@ // //M*/ - #include #include #include @@ -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 e4f766cf3..a2f3727e2 100644 --- 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 a3a607f1a..fc3ac8367 100644 --- 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 : "< -//#include -//#include -//#include #include #include #include @@ -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 aa4a0361d..5cc15b305 100644 --- 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 #include +#ifndef _CRT_SECURE_NO_WARNINGS +# define _CRT_SECURE_NO_WARNINGS +#endif + using namespace cv; using namespace std;