From bc02ede98b08e81ec225a048e1a76152a06d0a23 Mon Sep 17 00:00:00 2001 From: Aaron Carlisle Date: Tue, 11 Jan 2022 02:16:24 -0500 Subject: Cleanup: Deduplicate `finv_test` function --- .../compositor/operations/COM_GaussianAlphaBlurBaseOperation.cc | 5 ----- .../compositor/operations/COM_GaussianAlphaBlurBaseOperation.h | 5 +++++ .../blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cc | 5 ----- .../blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cc | 5 ----- 4 files changed, 5 insertions(+), 15 deletions(-) (limited to 'source/blender/compositor/operations') diff --git a/source/blender/compositor/operations/COM_GaussianAlphaBlurBaseOperation.cc b/source/blender/compositor/operations/COM_GaussianAlphaBlurBaseOperation.cc index 1a8c000cdd8..cfd83102aaf 100644 --- a/source/blender/compositor/operations/COM_GaussianAlphaBlurBaseOperation.cc +++ b/source/blender/compositor/operations/COM_GaussianAlphaBlurBaseOperation.cc @@ -85,11 +85,6 @@ void GaussianAlphaBlurBaseOperation::get_area_of_interest(const int input_idx, } } -BLI_INLINE float finv_test(const float f, const bool test) -{ - return (LIKELY(test == false)) ? f : 1.0f - f; -} - void GaussianAlphaBlurBaseOperation::update_memory_buffer_partial(MemoryBuffer *output, const rcti &area, Span inputs) diff --git a/source/blender/compositor/operations/COM_GaussianAlphaBlurBaseOperation.h b/source/blender/compositor/operations/COM_GaussianAlphaBlurBaseOperation.h index 4f374d446cf..2bab6912d34 100644 --- a/source/blender/compositor/operations/COM_GaussianAlphaBlurBaseOperation.h +++ b/source/blender/compositor/operations/COM_GaussianAlphaBlurBaseOperation.h @@ -55,6 +55,11 @@ class GaussianAlphaBlurBaseOperation : public BlurBaseOperation { { falloff_ = falloff; } + + BLI_INLINE float finv_test(const float f, const bool test) + { + return (LIKELY(test == false)) ? f : 1.0f - f; + } }; } // namespace blender::compositor diff --git a/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cc b/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cc index de0010fcb58..3836cf45371 100644 --- a/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cc +++ b/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cc @@ -71,11 +71,6 @@ void GaussianAlphaXBlurOperation::update_gauss() } } -BLI_INLINE float finv_test(const float f, const bool test) -{ - return (LIKELY(test == false)) ? f : 1.0f - f; -} - void GaussianAlphaXBlurOperation::execute_pixel(float output[4], int x, int y, void *data) { const bool do_invert = do_subtract_; diff --git a/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cc b/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cc index 90a80e6779a..d71d90e7fa4 100644 --- a/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cc +++ b/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cc @@ -73,11 +73,6 @@ void GaussianAlphaYBlurOperation::update_gauss() } } -BLI_INLINE float finv_test(const float f, const bool test) -{ - return (LIKELY(test == false)) ? f : 1.0f - f; -} - void GaussianAlphaYBlurOperation::execute_pixel(float output[4], int x, int y, void *data) { const bool do_invert = do_subtract_; -- cgit v1.2.3