Merge pull request #1169 from ioxp:sfmFixes

Author: alalek

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)

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 {
 

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");
     }
 
   }