[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47690] trunk/blender/source/blender/ blenkernel/intern/tracking.c: Fix compilation without libmv

[Sergey Sharybin]

Revision: 47690
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47690
Author:   nazgul
Date:     2012-06-10 16:16:02 +0000 (Sun, 10 Jun 2012)
Log Message:
-----------
Fix compilation without libmv

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/tracking.c

Modified: trunk/blender/source/blender/blenkernel/intern/tracking.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/tracking.c   2012-06-10 
16:09:03 UTC (rev 47689)
+++ trunk/blender/source/blender/blenkernel/intern/tracking.c   2012-06-10 
16:16:02 UTC (rev 47690)
@@ -1248,6 +1248,7 @@
                                          ImBuf *search_ibuf, 
MovieTrackingMarker *marker,
                                          int num_samples_x, int num_samples_y, 
float pos[2])
 {
+#ifdef WITH_LIBMV
        ImBuf *pattern_ibuf;
        double src_pixel_x[5], src_pixel_y[5];
        double warped_position_x, warped_position_y;
@@ -1272,6 +1273,27 @@
        }
 
        return pattern_ibuf;
+#else
+       ImBuf *pattern_ibuf;
+
+       /* real sampling requires libmv, but areas are supposing pattern would 
be
+        * sampled if search area does exists, so we'll need to create empty
+        * pattern area here to prevent adding NULL-checks all over just to deal
+        * with situation when lubmv is disabled
+        */
+
+       (void) frame_width;
+       (void) frame_height;
+       (void) search_ibuf;
+       (void) marker;
+
+       pattern_ibuf = IMB_allocImBuf(num_samples_x, num_samples_y, 32, 
IB_rectfloat);
+
+       pos[0] = num_samples_x / 2.0f;
+       pos[1] = num_samples_y / 2.0f;
+
+       return pattern_ibuf;
+#endif
 }
 
 ImBuf *BKE_tracking_get_pattern_imbuf(ImBuf *ibuf, MovieTrackingTrack *track, 
MovieTrackingMarker *marker,

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs