From 4dacad06a94dae1165427a6664c67591415e9594 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 16 Jun 2012 15:32:18 +0000 Subject: code cleanup: spelling 'multiplyer' --> 'multiplier' --- .../compositor/operations/COM_BokehBlurOperation.cpp | 12 ++++++------ .../operations/COM_GaussianAlphaXBlurOperation.cpp | 20 ++++++++++---------- .../operations/COM_GaussianAlphaYBlurOperation.cpp | 20 ++++++++++---------- .../operations/COM_GaussianBokehBlurOperation.cpp | 10 +++++----- .../operations/COM_GaussianXBlurOperation.cpp | 10 +++++----- .../operations/COM_GaussianYBlurOperation.cpp | 10 +++++----- .../compositor/operations/COM_OpenCLKernels.cl.h | 6 +++--- .../COM_VariableSizeBokehBlurOperation.cpp | 14 +++++++------- 8 files changed, 51 insertions(+), 51 deletions(-) (limited to 'source') diff --git a/source/blender/compositor/operations/COM_BokehBlurOperation.cpp b/source/blender/compositor/operations/COM_BokehBlurOperation.cpp index dca087bb587..a8f97c6906e 100644 --- a/source/blender/compositor/operations/COM_BokehBlurOperation.cpp +++ b/source/blender/compositor/operations/COM_BokehBlurOperation.cpp @@ -79,7 +79,7 @@ void BokehBlurOperation::executePixel(float *color, int x, int y, MemoryBuffer * inputBoundingBoxReader->read(tempBoundingBox, x, y, COM_PS_NEAREST, inputBuffers); if (tempBoundingBox[0] > 0.0f) { - float overallmultiplyer[4] = {0.0f, 0.0f, 0.0f, 0.0f}; + float multiplier_accum[4] = {0.0f, 0.0f, 0.0f, 0.0f}; MemoryBuffer *inputBuffer = (MemoryBuffer *)data; float *buffer = inputBuffer->getBuffer(); int bufferwidth = inputBuffer->getWidth(); @@ -109,14 +109,14 @@ void BokehBlurOperation::executePixel(float *color, int x, int y, MemoryBuffer * float v = this->bokehMidY - (ny - y) * m; inputBokehProgram->read(bokeh, u, v, COM_PS_NEAREST, inputBuffers); madd_v4_v4v4(tempColor, bokeh, &buffer[bufferindex]); - add_v4_v4(overallmultiplyer, bokeh); + add_v4_v4(multiplier_accum, bokeh); bufferindex += offsetadd; } } - color[0] = tempColor[0] * (1.0f / overallmultiplyer[0]); - color[1] = tempColor[1] * (1.0f / overallmultiplyer[1]); - color[2] = tempColor[2] * (1.0f / overallmultiplyer[2]); - color[3] = tempColor[3] * (1.0f / overallmultiplyer[3]); + color[0] = tempColor[0] * (1.0f / multiplier_accum[0]); + color[1] = tempColor[1] * (1.0f / multiplier_accum[1]); + color[2] = tempColor[2] * (1.0f / multiplier_accum[2]); + color[3] = tempColor[3] * (1.0f / multiplier_accum[3]); } else { inputProgram->read(color, x, y, COM_PS_NEAREST, inputBuffers); diff --git a/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp b/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp index 5c6e0e4adac..12ebfbe1562 100644 --- a/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp +++ b/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp @@ -111,7 +111,7 @@ void GaussianAlphaXBlurOperation::executePixel(float *color, int x, int y, Memor /* gauss */ float tempColor = 0.0f; - float overallmultiplyer = 0.0f; + float multiplier_accum = 0.0f; /* dilate */ float value_max = finv_test(buffer[(x * 4) + (y * 4 * bufferwidth)], do_invert); /* init with the current color to avoid unneeded lookups */ @@ -120,26 +120,26 @@ void GaussianAlphaXBlurOperation::executePixel(float *color, int x, int y, Memor for (int nx = minx; nx < maxx; nx += step) { const int index = (nx - x) + this->rad; float value = finv_test(buffer[bufferindex], do_invert); - float multiplyer; + float multiplier; /* gauss */ { - multiplyer = gausstab[index]; - tempColor += value * multiplyer; - overallmultiplyer += multiplyer; + multiplier = gausstab[index]; + tempColor += value * multiplier; + multiplier_accum += multiplier; } /* dilate - find most extreme color */ if (value > value_max) { #if 0 - multiplyer = 1.0f - ((fabsf(x - nx)) / (float)this->rad); + multiplier = 1.0f - ((fabsf(x - nx)) / (float)this->rad); #else - multiplyer = distbuf_inv[index]; + multiplier = distbuf_inv[index]; #endif - value *= multiplyer; + value *= multiplier; if (value > value_max) { value_max = value; - distfacinv_max = multiplyer; + distfacinv_max = multiplier; } } @@ -147,7 +147,7 @@ void GaussianAlphaXBlurOperation::executePixel(float *color, int x, int y, Memor } /* blend between the max value and gauss blue - gives nice feather */ - const float value_gauss = tempColor / overallmultiplyer; + const float value_gauss = tempColor / multiplier_accum; const float value_final = (value_max * distfacinv_max) + (value_gauss * (1.0f - distfacinv_max)); color[0] = finv_test(value_final, do_invert); } diff --git a/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp b/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp index 40f74ad4485..66cd2652b62 100644 --- a/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp +++ b/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp @@ -107,7 +107,7 @@ void GaussianAlphaYBlurOperation::executePixel(float *color, int x, int y, Memor /* gauss */ float tempColor = 0.0f; - float overallmultiplyer = 0.0f; + float multiplier_accum = 0.0f; /* dilate */ float value_max = finv_test(buffer[(x * 4) + (y * 4 * bufferwidth)], do_invert); /* init with the current color to avoid unneeded lookups */ @@ -118,33 +118,33 @@ void GaussianAlphaYBlurOperation::executePixel(float *color, int x, int y, Memor const int index = (ny - y) + this->rad; float value = finv_test(buffer[bufferindex], do_invert); - float multiplyer; + float multiplier; /* gauss */ { - multiplyer = gausstab[index]; - tempColor += value * multiplyer; - overallmultiplyer += multiplyer; + multiplier = gausstab[index]; + tempColor += value * multiplier; + multiplier_accum += multiplier; } /* dilate - find most extreme color */ if (value > value_max) { #if 0 - multiplyer = 1.0f - ((fabsf(y - ny)) / (float)this->rad); + multiplier = 1.0f - ((fabsf(y - ny)) / (float)this->rad); #else - multiplyer = distbuf_inv[index]; + multiplier = distbuf_inv[index]; #endif - value *= multiplyer; + value *= multiplier; if (value > value_max) { value_max = value; - distfacinv_max = multiplyer; + distfacinv_max = multiplier; } } } /* blend between the max value and gauss blue - gives nice feather */ - const float value_gauss = tempColor / overallmultiplyer; + const float value_gauss = tempColor / multiplier_accum; const float value_final = (value_max * distfacinv_max) + (value_gauss * (1.0f - distfacinv_max)); color[0] = finv_test(value_final, do_invert); } diff --git a/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp b/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp index 208d482729d..dc9e354b124 100644 --- a/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp +++ b/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp @@ -115,7 +115,7 @@ void GaussianBokehBlurOperation::executePixel(float *color, int x, int y, Memory tempColor[1] = 0; tempColor[2] = 0; tempColor[3] = 0; - float overallmultiplyer = 0; + float multiplier_accum = 0; MemoryBuffer *inputBuffer = (MemoryBuffer *)data; float *buffer = inputBuffer->getBuffer(); int bufferwidth = inputBuffer->getWidth(); @@ -138,15 +138,15 @@ void GaussianBokehBlurOperation::executePixel(float *color, int x, int y, Memory index = ((ny - y) + this->rady) * (this->radx * 2 + 1) + (minx - x + this->radx); int bufferindex = ((minx - bufferstartx) * 4) + ((ny - bufferstarty) * 4 * bufferwidth); for (int nx = minx; nx < maxx; nx += step) { - const float multiplyer = gausstab[index]; - madd_v4_v4fl(tempColor, &buffer[bufferindex], multiplyer); - overallmultiplyer += multiplyer; + const float multiplier = gausstab[index]; + madd_v4_v4fl(tempColor, &buffer[bufferindex], multiplier); + multiplier_accum += multiplier; index += step; bufferindex += offsetadd; } } - mul_v4_v4fl(color, tempColor, 1.0f / overallmultiplyer); + mul_v4_v4fl(color, tempColor, 1.0f / multiplier_accum); } void GaussianBokehBlurOperation::deinitExecution() diff --git a/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp b/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp index 8f6895784d1..fcb2ea0d3ee 100644 --- a/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp +++ b/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp @@ -77,7 +77,7 @@ void GaussianXBlurOperation::executePixel(float *color, int x, int y, MemoryBuff tempColor[1] = 0; tempColor[2] = 0; tempColor[3] = 0; - float overallmultiplyer = 0.0f; + float multiplier_accum = 0.0f; MemoryBuffer *inputBuffer = (MemoryBuffer *)data; float *buffer = inputBuffer->getBuffer(); int bufferwidth = inputBuffer->getWidth(); @@ -99,12 +99,12 @@ void GaussianXBlurOperation::executePixel(float *color, int x, int y, MemoryBuff int bufferindex = ((minx - bufferstartx) * 4) + ((miny - bufferstarty) * 4 * bufferwidth); for (int nx = minx; nx < maxx; nx += step) { index = (nx - x) + this->rad; - const float multiplyer = gausstab[index]; - madd_v4_v4fl(tempColor, &buffer[bufferindex], multiplyer); - overallmultiplyer += multiplyer; + const float multiplier = gausstab[index]; + madd_v4_v4fl(tempColor, &buffer[bufferindex], multiplier); + multiplier_accum += multiplier; bufferindex += offsetadd; } - mul_v4_v4fl(color, tempColor, 1.0f / overallmultiplyer); + mul_v4_v4fl(color, tempColor, 1.0f / multiplier_accum); } void GaussianXBlurOperation::deinitExecution() diff --git a/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp b/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp index d2cf5d16d58..4b4268b581a 100644 --- a/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp +++ b/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp @@ -74,7 +74,7 @@ void GaussianYBlurOperation::executePixel(float *color, int x, int y, MemoryBuff tempColor[1] = 0; tempColor[2] = 0; tempColor[3] = 0; - float overallmultiplyer = 0; + float multiplier_accum = 0; MemoryBuffer *inputBuffer = (MemoryBuffer *)data; float *buffer = inputBuffer->getBuffer(); int bufferwidth = inputBuffer->getWidth(); @@ -95,11 +95,11 @@ void GaussianYBlurOperation::executePixel(float *color, int x, int y, MemoryBuff for (int ny = miny; ny < maxy; ny += step) { index = (ny - y) + this->rad; int bufferindex = ((minx - bufferstartx) * 4) + ((ny - bufferstarty) * 4 * bufferwidth); - const float multiplyer = gausstab[index]; - madd_v4_v4fl(tempColor, &buffer[bufferindex], multiplyer); - overallmultiplyer += multiplyer; + const float multiplier = gausstab[index]; + madd_v4_v4fl(tempColor, &buffer[bufferindex], multiplier); + multiplier_accum += multiplier; } - mul_v4_v4fl(color, tempColor, 1.0f / overallmultiplyer); + mul_v4_v4fl(color, tempColor, 1.0f / multiplier_accum); } void GaussianYBlurOperation::deinitExecution() diff --git a/source/blender/compositor/operations/COM_OpenCLKernels.cl.h b/source/blender/compositor/operations/COM_OpenCLKernels.cl.h index ef8668f6f21..e064b7511cb 100644 --- a/source/blender/compositor/operations/COM_OpenCLKernels.cl.h +++ b/source/blender/compositor/operations/COM_OpenCLKernels.cl.h @@ -16,7 +16,7 @@ const char * clkernelstoh_COM_OpenCLKernels_cl = "/// This file contains all ope " coords += offset;\n" \ " float tempBoundingBox;\n" \ " float4 color = {0.0f,0.0f,0.0f,0.0f};\n" \ -" float4 multiplyer = {0.0f,0.0f,0.0f,0.0f};\n" \ +" float4 multiplier = {0.0f,0.0f,0.0f,0.0f};\n" \ " float4 bokeh;\n" \ " const float radius2 = radius*2.0f;\n" \ " const int2 realCoordinate = coords + offsetOutput;\n" \ @@ -40,10 +40,10 @@ const char * clkernelstoh_COM_OpenCLKernels_cl = "/// This file contains all ope " uv.x = ((realCoordinate.x-nx)/radius2)*bokehImageDim.x+bokehImageCenter.x;\n" \ " bokeh = read_imagef(bokehImage, SAMPLER_NEAREST, uv);\n" \ " color += bokeh * read_imagef(inputImage, SAMPLER_NEAREST, inputXy);\n" \ -" multiplyer += bokeh;\n" \ +" multiplier += bokeh;\n" \ " }\n" \ " }\n" \ -" color /= multiplyer;\n" \ +" color /= multiplier;\n" \ "\n" \ " } else {\n" \ " int2 imageCoordinates = realCoordinate - offsetInput;\n" \ diff --git a/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp b/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp index 7c9b0c75518..db51e27c460 100644 --- a/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp +++ b/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp @@ -61,7 +61,7 @@ void VariableSizeBokehBlurOperation::executePixel(float *color, int x, int y, Me tempColor[2] = 0; tempColor[3] = 0; float tempSize[4]; - float overallmultiplyer[4] = {0.0f, 0.0f, 0.0f, 0.0f}; + float multiplier_accum[4] = {0.0f, 0.0f, 0.0f, 0.0f}; int miny = y - maxBlur; int maxy = y + maxBlur; @@ -74,7 +74,7 @@ void VariableSizeBokehBlurOperation::executePixel(float *color, int x, int y, Me tempColor[2] += readColor[2]; tempColor[3] += readColor[3]; add_v4_v4(tempColor, readColor); - add_v3_fl(overallmultiplyer, 1.0f); + add_v3_fl(multiplier_accum, 1.0f); for (int ny = miny; ny < maxy; ny += QualityStepHelper::getStep()) { for (int nx = minx; nx < maxx; nx += QualityStepHelper::getStep()) { @@ -93,16 +93,16 @@ void VariableSizeBokehBlurOperation::executePixel(float *color, int x, int y, Me inputBokehProgram->read(bokeh, u, v, COM_PS_NEAREST, inputBuffers); inputProgram->read(readColor, nx, ny, COM_PS_NEAREST, inputBuffers); madd_v4_v4v4(tempColor, bokeh, readColor); - add_v4_v4(overallmultiplyer, bokeh); + add_v4_v4(multiplier_accum, bokeh); } } } } - color[0] = tempColor[0] * (1.0f / overallmultiplyer[0]); - color[1] = tempColor[1] * (1.0f / overallmultiplyer[1]); - color[2] = tempColor[2] * (1.0f / overallmultiplyer[2]); - color[3] = tempColor[3] * (1.0f / overallmultiplyer[3]); + color[0] = tempColor[0] * (1.0f / multiplier_accum[0]); + color[1] = tempColor[1] * (1.0f / multiplier_accum[1]); + color[2] = tempColor[2] * (1.0f / multiplier_accum[2]); + color[3] = tempColor[3] * (1.0f / multiplier_accum[3]); } } -- cgit v1.2.3