Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-06-16 19:51:52 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-06-16 19:51:52 +0400
commit103f665c593dc53850aaabf4fbe019f3375e10ae (patch)
treef2d8d5798d9d40f8ae9ea2ec7ad9798197008536 /source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp
parent4dacad06a94dae1165427a6664c67591415e9594 (diff)
code cleanup: make names more logical
Diffstat (limited to 'source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp')
-rw-r--r--source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp12
1 files changed, 4 insertions, 8 deletions
diff --git a/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp b/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp
index 66cd2652b62..cc854c96cf5 100644
--- a/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp
+++ b/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp
@@ -106,7 +106,7 @@ void GaussianAlphaYBlurOperation::executePixel(float *color, int x, int y, Memor
int step = getStep();
/* gauss */
- float tempColor = 0.0f;
+ float alpha_accum = 0.0f;
float multiplier_accum = 0.0f;
/* dilate */
@@ -123,17 +123,13 @@ void GaussianAlphaYBlurOperation::executePixel(float *color, int x, int y, Memor
/* gauss */
{
multiplier = gausstab[index];
- tempColor += value * multiplier;
+ alpha_accum += value * multiplier;
multiplier_accum += multiplier;
}
/* dilate - find most extreme color */
if (value > value_max) {
-#if 0
- multiplier = 1.0f - ((fabsf(y - ny)) / (float)this->rad);
-#else
multiplier = distbuf_inv[index];
-#endif
value *= multiplier;
if (value > value_max) {
value_max = value;
@@ -144,8 +140,8 @@ void GaussianAlphaYBlurOperation::executePixel(float *color, int x, int y, Memor
}
/* blend between the max value and gauss blue - gives nice feather */
- const float value_gauss = tempColor / multiplier_accum;
- const float value_final = (value_max * distfacinv_max) + (value_gauss * (1.0f - distfacinv_max));
+ const float value_blur = alpha_accum / multiplier_accum;
+ const float value_final = (value_max * distfacinv_max) + (value_blur * (1.0f - distfacinv_max));
color[0] = finv_test(value_final, do_invert);
}