sfm: Fixed build for MSVC: snprintf only in VS2015 and above

ramartya · May 18, 2017 · 363097e · 363097e
1 parent 204db71
commit 363097e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/modules/sfm/src/libmv_light/libmv/logging/logging.h b/modules/sfm/src/libmv_light/libmv/logging/logging.h
@@ -23,6 +23,11 @@
 
 #include <glog/logging.h>
 
+
+#if defined _MSC_VER && _MSC_VER < 1900
+#  define snprintf _snprintf
+#endif
+
 #define LG LOG(INFO)
 #define V0 LOG(INFO)
 #define V1 LOG(INFO)

diff --git a/modules/sfm/src/libmv_light/libmv/simple_pipeline/pipeline.cc b/modules/sfm/src/libmv_light/libmv/simple_pipeline/pipeline.cc
@@ -30,10 +30,6 @@
 #include "libmv/simple_pipeline/tracks.h"
 #include "libmv/simple_pipeline/camera_intrinsics.h"
 
-#ifdef _MSC_VER
-#  define snprintf _snprintf
-#endif
-
 namespace libmv {
 namespace {