[Bf-blender-cvs] [b230ca2] libmv_prediction: Libmv: Fix compilation error with libmv disabled

Sergey Sharybin noreply at git.blender.org
Wed Oct 29 12:47:41 CET 2014


Commit: b230ca2a90df8b40f32b11082971fbc3cba9b13b
Author: Sergey Sharybin
Date:   Wed Oct 29 16:46:42 2014 +0500
Branches: libmv_prediction
https://developer.blender.org/rBb230ca2a90df8b40f32b11082971fbc3cba9b13b

Libmv: Fix compilation error with libmv disabled

===================================================================

M	extern/libmv/intern/image.cc
M	extern/libmv/intern/image.h
M	extern/libmv/intern/stub.cc
M	source/blender/blenkernel/intern/tracking_util.c

===================================================================

diff --git a/extern/libmv/intern/image.cc b/extern/libmv/intern/image.cc
index df9a01e..5018cae 100644
--- a/extern/libmv/intern/image.cc
+++ b/extern/libmv/intern/image.cc
@@ -34,7 +34,7 @@
 using libmv::FloatImage;
 using libmv::SamplePlanarPatch;
 
-void libmv_floatImaheDestroy(libmv_FloatImage *image) {
+void libmv_floatImageDestroy(libmv_FloatImage *image) {
   delete [] image->buffer;
 }
 
diff --git a/extern/libmv/intern/image.h b/extern/libmv/intern/image.h
index 9936e74..1213943 100644
--- a/extern/libmv/intern/image.h
+++ b/extern/libmv/intern/image.h
@@ -64,7 +64,7 @@ typedef struct libmv_FloatImage {
   int channels;
 } libmv_FloatImage;
 
-void libmv_floatImaheDestroy(libmv_FloatImage *image);
+void libmv_floatImageDestroy(libmv_FloatImage *image);
 
 void libmv_samplePlanarPatchFloat(const float* image,
                                   int width,
diff --git a/extern/libmv/intern/stub.cc b/extern/libmv/intern/stub.cc
index cd8bb8a..f307d83 100644
--- a/extern/libmv/intern/stub.cc
+++ b/extern/libmv/intern/stub.cc
@@ -97,6 +97,10 @@ void libmv_samplePlanarPatchByte(const unsigned char * /*image*/,
   /* TODO(sergey): implement */
 }
 
+void libmv_floatImageDestroy(libmv_FloatImage* /*image*/)
+{
+}
+
 /* ************ Tracks ************ */
 
 libmv_Tracks *libmv_tracksNew(void) {
@@ -328,3 +332,68 @@ void libmv_homography2DFromCorrespondencesEuc(/* const */ double (*x1)[2],
   H[1][1] = 1.0f;
   H[2][2] = 1.0f;
 }
+
+/* ************ autotrack ************ */
+
+libmv_AutoTrack* libmv_autoTrackNew(libmv_FrameAccessor* /*frame_accessor*/)
+{
+  return NULL;
+}
+
+void libmv_autoTrackDestroy(libmv_AutoTrack* /*libmv_autotrack*/)
+{
+}
+
+void libmv_autoTrackSetOptions(libmv_AutoTrack* /*libmv_autotrack*/,
+                               const libmv_AutoTrackOptions* /*options*/)
+{
+}
+
+int libmv_autoTrackMarker(libmv_AutoTrack* /*libmv_autotrack*/,
+                          const libmv_TrackRegionOptions* /*libmv_options*/,
+                          libmv_Marker */*libmv_tracker_marker*/,
+                          libmv_TrackRegionResult* /*libmv_result*/)
+{
+  return 0;
+}
+
+void libmv_autoTrackAddMarker(libmv_AutoTrack* /*libmv_autotrack*/,
+                              const libmv_Marker* /*libmv_marker*/)
+{
+}
+
+int libmv_autoTrackGetMarker(libmv_AutoTrack* /*libmv_autotrack*/,
+                             int /*clip*/,
+                             int /*frame*/,
+                             int /*track*/,
+                             libmv_Marker* /*libmv_marker*/)
+{
+  return 0;
+}
+
+/* ************ frame accessor ************ */
+
+libmv_FrameAccessor* libmv_FrameAccessorNew(
+    libmv_FrameAccessorUserData* /*user_data**/,
+    libmv_GetImageCallback /*get_image_callback*/,
+    libmv_ReleaseImageCallback /*release_image_callback*/)
+{
+  return NULL;
+}
+
+void libmv_FrameAccessorDestroy(libmv_FrameAccessor* /*frame_accessor*/)
+{
+}
+
+int64_t libmv_frameAccessorgetTransformKey(
+    const libmv_FrameTransform */*transform*/)
+{
+  return 0;
+}
+
+void libmv_frameAccessorgetTransformRun(const libmv_FrameTransform* /*transform*/,
+                                        const libmv_FloatImage* /*input_image*/,
+                                        libmv_FloatImage* /*output_image*/)
+{
+}
+
diff --git a/source/blender/blenkernel/intern/tracking_util.c b/source/blender/blenkernel/intern/tracking_util.c
index ddb36b6..250b575 100644
--- a/source/blender/blenkernel/intern/tracking_util.c
+++ b/source/blender/blenkernel/intern/tracking_util.c
@@ -777,7 +777,7 @@ static ImBuf *accessor_get_ibuf(TrackingImageAccessor *accessor,
 			IMB_freeImBuf(final_ibuf);
 		}
 		final_ibuf = float_image_to_ibuf(&output_image);
-		libmv_floatImaheDestroy(&output_image);
+		libmv_floatImageDestroy(&output_image);
 	}
 
 	/* it's possible processing stil didn't happen at this point,




More information about the Bf-blender-cvs mailing list