[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50005] trunk/blender/source/blender/ compositor/operations: use BLI math length functions for distance compositor operations.

[Campbell Barton]

Revision: 50005
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50005
Author:   campbellbarton
Date:     2012-08-19 10:41:16 +0000 (Sun, 19 Aug 2012)
Log Message:
-----------
use BLI math length functions for distance compositor operations.

Modified Paths:
--------------
    trunk/blender/source/blender/compositor/operations/COM_DistanceRGBMatteOperation.cpp
    trunk/blender/source/blender/compositor/operations/COM_DistanceYCCMatteOperation.cpp

Modified: trunk/blender/source/blender/compositor/operations/COM_DistanceRGBMatteOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_DistanceRGBMatteOperation.cpp	2012-08-19 10:20:25 UTC (rev 50004)
+++ trunk/blender/source/blender/compositor/operations/COM_DistanceRGBMatteOperation.cpp	2012-08-19 10:41:16 UTC (rev 50005)
@@ -46,9 +46,7 @@
 
 float DistanceRGBMatteOperation::calculateDistance(float key[4], float image[4])
 {
-	return sqrt(pow((key[0] - image[0]), 2) +
-	            pow((key[1] - image[1]), 2) +
-	            pow((key[2] - image[2]), 2));
+	return len_v3v3(key, image);
 }
 
 void DistanceRGBMatteOperation::executePixel(float output[4], float x, float y, PixelSampler sampler)

Modified: trunk/blender/source/blender/compositor/operations/COM_DistanceYCCMatteOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_DistanceYCCMatteOperation.cpp	2012-08-19 10:20:25 UTC (rev 50004)
+++ trunk/blender/source/blender/compositor/operations/COM_DistanceYCCMatteOperation.cpp	2012-08-19 10:41:16 UTC (rev 50005)
@@ -29,7 +29,7 @@
 
 float DistanceYCCMatteOperation::calculateDistance(float key[4], float image[4])
 {
-	return sqrt(pow((key[1] - image[1]), 2) +
-	            pow((key[2] - image[2]), 2));
+	/* only measure the second 2 values */
+	return len_v2v2(key + 1, image + 1);
 }