From 58ab8d5c0a7e64b077e21ab2da19bca02f92ae66 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 19 Aug 2012 10:41:16 +0000 Subject: use BLI math length functions for distance compositor operations. --- .../blender/compositor/operations/COM_DistanceRGBMatteOperation.cpp | 4 +--- .../blender/compositor/operations/COM_DistanceYCCMatteOperation.cpp | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'source/blender/compositor') diff --git a/source/blender/compositor/operations/COM_DistanceRGBMatteOperation.cpp b/source/blender/compositor/operations/COM_DistanceRGBMatteOperation.cpp index df3809ba129..d3309e0c978 100644 --- a/source/blender/compositor/operations/COM_DistanceRGBMatteOperation.cpp +++ b/source/blender/compositor/operations/COM_DistanceRGBMatteOperation.cpp @@ -46,9 +46,7 @@ void DistanceRGBMatteOperation::deinitExecution() 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) diff --git a/source/blender/compositor/operations/COM_DistanceYCCMatteOperation.cpp b/source/blender/compositor/operations/COM_DistanceYCCMatteOperation.cpp index 32ed7486f5b..0a6f1fdfd31 100644 --- a/source/blender/compositor/operations/COM_DistanceYCCMatteOperation.cpp +++ b/source/blender/compositor/operations/COM_DistanceYCCMatteOperation.cpp @@ -29,7 +29,7 @@ DistanceYCCMatteOperation::DistanceYCCMatteOperation() : DistanceRGBMatteOperati 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); } -- cgit v1.2.3