[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41315] branches/soc-2011-tomato/source/ blender/blenkernel/intern/tracking.c: Camera tracking integration

[Sergey Sharybin]

Revision: 41315
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41315
Author:   nazgul
Date:     2011-10-27 13:41:28 +0000 (Thu, 27 Oct 2011)
Log Message:
-----------
Camera tracking integration
===========================

Fix for totally unworkable KLT tracker caused by recent codereview commit.
Float buffer for libmv should be calculated in exactly such way.

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c

Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c	2011-10-27 12:37:14 UTC (rev 41314)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c	2011-10-27 13:41:28 UTC (rev 41315)
@@ -733,7 +733,7 @@
 			} else {
 				char *rrgb= (char*)tmpibuf->rect + pixel*4;
 
-				*fp= FTOCHAR(0.2126*rrgb[0] + 0.7152*rrgb[1] + 0.0722*rrgb[2]);
+				*fp= (0.2126*rrgb[0] + 0.7152*rrgb[1] + 0.0722*rrgb[2])/255.0f;
 			}
 
 			fp++;