diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-10-23 06:52:27 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-10-23 06:52:27 +0400 |
commit | 304a32bf1f1e9a5b69c9ab938e80919c50a601ed (patch) | |
tree | 78ae0d2b9a4ea7daf29c8ded9dd1d90a1fa047d7 /source/blender/compositor | |
parent | 8748840564150e62c537c14172528b2d12e43e9c (diff) |
style cleanup
Diffstat (limited to 'source/blender/compositor')
-rw-r--r-- | source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp | 4 | ||||
-rw-r--r-- | source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp | 62 |
2 files changed, 33 insertions, 33 deletions
diff --git a/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp b/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp index 3f8c432a004..7def96d426e 100644 --- a/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp +++ b/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp @@ -47,8 +47,8 @@ void ExecutionSystemHelper::addbNodeTree(ExecutionSystem &system, int nodes_star const bNodeTree *basetree = system.getContext().getbNodeTree(); /* update viewers in the active edittree as well the base tree (for backdrop) */ - bool is_active_group = (parent_key.value == basetree->active_viewer_key.value - || tree == basetree); + bool is_active_group = ((parent_key.value == basetree->active_viewer_key.value) || + (tree == basetree)); /* add all nodes of the tree to the node list */ bNode *node = (bNode *)tree->nodes.first; diff --git a/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp b/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp index fd201fcbc11..caf71040483 100644 --- a/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp +++ b/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp @@ -290,41 +290,41 @@ void FastGaussianBlurOperation::IIR_gauss(MemoryBuffer *src, float sigma, unsign X = (double *)MEM_callocN(sz * sizeof(double), "IIR_gauss X buf"); Y = (double *)MEM_callocN(sz * sizeof(double), "IIR_gauss Y buf"); W = (double *)MEM_callocN(sz * sizeof(double), "IIR_gauss W buf"); - if (xy & 1) { // H - int offset; + if (xy & 1) { // H + int offset; for (y = 0; y < src_height; ++y) { - const int yx = y * src_width; - offset = yx*COM_NUMBER_OF_CHANNELS + chan; - for (x = 0; x < src_width; ++x) { - X[x] = buffer[offset]; - offset += COM_NUMBER_OF_CHANNELS; - } + const int yx = y * src_width; + offset = yx*COM_NUMBER_OF_CHANNELS + chan; + for (x = 0; x < src_width; ++x) { + X[x] = buffer[offset]; + offset += COM_NUMBER_OF_CHANNELS; + } YVV(src_width); - offset = yx*COM_NUMBER_OF_CHANNELS + chan; - for (x = 0; x < src_width; ++x) { - buffer[offset] = Y[x]; - offset += COM_NUMBER_OF_CHANNELS; - } - } + offset = yx*COM_NUMBER_OF_CHANNELS + chan; + for (x = 0; x < src_width; ++x) { + buffer[offset] = Y[x]; + offset += COM_NUMBER_OF_CHANNELS; + } + } } - if (xy & 2) { // V - int offset; - const int add = src_width * COM_NUMBER_OF_CHANNELS; - - for (x = 0; x < src_width; ++x) { - offset = x * COM_NUMBER_OF_CHANNELS + chan; - for (y = 0; y < src_height; ++y) { - X[y] = buffer[offset]; - offset += add; - } + if (xy & 2) { // V + int offset; + const int add = src_width * COM_NUMBER_OF_CHANNELS; + + for (x = 0; x < src_width; ++x) { + offset = x * COM_NUMBER_OF_CHANNELS + chan; + for (y = 0; y < src_height; ++y) { + X[y] = buffer[offset]; + offset += add; + } YVV(src_height); - offset = x * COM_NUMBER_OF_CHANNELS + chan; - for (y = 0; y < src_height; ++y) { - buffer[offset] = Y[y]; - offset += add; - } - } - } + offset = x * COM_NUMBER_OF_CHANNELS + chan; + for (y = 0; y < src_height; ++y) { + buffer[offset] = Y[y]; + offset += add; + } + } + } MEM_freeN(X); MEM_freeN(W); |