[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41624] trunk/blender: quiet warnings when building without libmv

[Campbell Barton]

Revision: 41624
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41624
Author:   campbellbarton
Date:     2011-11-07 16:26:23 +0000 (Mon, 07 Nov 2011)
Log Message:
-----------
quiet warnings when building without libmv

Modified Paths:
--------------
    trunk/blender/build_files/cmake/config/blender_lite.cmake
    trunk/blender/source/blender/blenkernel/intern/tracking.c

Modified: trunk/blender/build_files/cmake/config/blender_lite.cmake
===================================================================
--- trunk/blender/build_files/cmake/config/blender_lite.cmake	2011-11-07 15:57:52 UTC (rev 41623)
+++ trunk/blender/build_files/cmake/config/blender_lite.cmake	2011-11-07 16:26:23 UTC (rev 41624)
@@ -13,6 +13,7 @@
 set(WITH_CODEC_FFMPEG        OFF CACHE FORCE BOOL)
 set(WITH_CODEC_SNDFILE       OFF CACHE FORCE BOOL)
 set(WITH_FFTW3               OFF CACHE FORCE BOOL)
+set(WITH_LIBMV               OFF CACHE FORCE BOOL)
 set(WITH_GAMEENGINE          OFF CACHE FORCE BOOL)
 set(WITH_IK_ITASC            OFF CACHE FORCE BOOL)
 set(WITH_IMAGE_CINEON        OFF CACHE FORCE BOOL)

Modified: trunk/blender/source/blender/blenkernel/intern/tracking.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/tracking.c	2011-11-07 15:57:52 UTC (rev 41623)
+++ trunk/blender/source/blender/blenkernel/intern/tracking.c	2011-11-07 16:26:23 UTC (rev 41624)
@@ -58,7 +58,9 @@
 #include "IMB_imbuf.h"
 
 #ifdef WITH_LIBMV
-#include "libmv-capi.h"
+#  include "libmv-capi.h"
+#else
+struct libmv_Features;
 #endif
 
 typedef struct MovieDistortion {
@@ -1379,6 +1381,12 @@
 
 		return error;
 	}
+#else
+	(void)tracking;
+	(void)width;
+	(void)height;
+
+	return -1.0f;
 #endif
 }
 
@@ -1581,6 +1589,10 @@
 	/* result is in image coords already */
 	nco[0]= x;
 	nco[1]= y;
+#else
+	(void)camera;
+	(void)co;
+	(void)nco;
 #endif
 }
 
@@ -1597,9 +1609,14 @@
 
 	nco[0]= x * camera->focal + camera->principal[0];
 	nco[1]= y * camera->focal + camera->principal[1] * aspy;
+#else
+	(void)camera;
+	(void)co;
+	(void)nco;
 #endif
 }
 
+#ifdef WITH_LIBMV
 static int point_in_stroke(bGPDstroke *stroke, float x, float y)
 {
 	int i, prev;
@@ -1643,7 +1660,6 @@
 static void retrieve_libmv_features(MovieTracking *tracking, struct libmv_Features *features,
 			int framenr, int width, int height, bGPDlayer *layer, int place_outside_layer)
 {
-#ifdef WITH_LIBMV
 	int a;
 
 	a= libmv_countFeatures(features);
@@ -1668,8 +1684,8 @@
 			track->search_flag|= SELECT;
 		}
 	}
+}
 #endif
-}
 
 void BKE_tracking_detect_fast(MovieTracking *tracking, ImBuf *ibuf,
 			int framenr, int margin, int min_trackness, int min_distance, bGPDlayer *layer,
@@ -1686,6 +1702,15 @@
 	retrieve_libmv_features(tracking, features, framenr, ibuf->x, ibuf->y, layer, place_outside_layer);
 
 	libmv_destroyFeatures(features);
+#else
+	(void)tracking;
+	(void)ibuf;
+	(void)framenr;
+	(void)margin;
+	(void)min_trackness;
+	(void)min_distance;
+	(void)layer;
+	(void)place_outside_layer;
 #endif
 }
 
@@ -2048,6 +2073,8 @@
 
 #ifdef WITH_LIBMV
 	new_distortion->intrinsics= libmv_CameraIntrinsicsCopy(distortion->intrinsics);
+#else
+	(void)distortion;
 #endif
 
 	return new_distortion;
@@ -2068,6 +2095,12 @@
 				camera->principal[0], camera->principal[1] * aspy,
 				camera->k1, camera->k2, camera->k3, width, height * aspy);
 	}
+#else
+	(void)distortion;
+	(void)width;
+	(void)height;
+	(void)camera;
+	(void)aspy;
 #endif
 }
 
@@ -2108,6 +2141,11 @@
 #endif
 	}
 
+#ifndef WITH_LIBMV
+	(void)overscan;
+	(void)undistort;
+#endif
+
 	return resibuf;
 }