diff --git a/modules/sfm/src/libmv_light/libmv/logging/logging.h b/modules/sfm/src/libmv_light/libmv/logging/logging.h index 776d9d52f..fa091c0ac 100644 --- 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 + +#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 index 6c8592baa..29b0edda4 100644 --- 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 { diff --git a/modules/sfm/src/reconstruct.cpp b/modules/sfm/src/reconstruct.cpp index 1d40f2349..724ef701e 100644 --- a/modules/sfm/src/reconstruct.cpp +++ b/modules/sfm/src/reconstruct.cpp @@ -152,6 +152,7 @@ namespace sfm else { // TODO: implement me + CV_Error(Error::StsNotImplemented, "Affine reconstruction not yet implemented"); } } @@ -180,6 +181,7 @@ namespace sfm else { // TODO: implement me + CV_Error(Error::StsNotImplemented, "Affine reconstruction not yet implemented"); } } @@ -223,6 +225,7 @@ namespace sfm else { // TODO: implement me + CV_Error(Error::StsNotImplemented, "Affine reconstruction not yet implemented"); } } @@ -239,7 +242,7 @@ namespace sfm if ( is_projective ) { - reconstruct_(images, Rs, Ts, K, points3d, false); + reconstruct_(images, Rs, Ts, K, points3d); } @@ -248,6 +251,7 @@ namespace sfm else { // TODO: implement me + CV_Error(Error::StsNotImplemented, "Affine reconstruction not yet implemented"); } }