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>2019-01-08 02:28:20 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-01-08 02:37:43 +0300
commit91a155833e59275089641b63ae9271672ac17713 (patch)
tree8057253d80b84de168b96f45ae5e5063d6e8f0fa /source/blender/compositor
parent3d2ff33c261593d5211456500e8a212fb6a2ce82 (diff)
Cleanup: comments causing bad clang-format output
Diffstat (limited to 'source/blender/compositor')
-rw-r--r--source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp24
1 files changed, 16 insertions, 8 deletions
diff --git a/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp b/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
index fdfbd4679f3..0acd3e33075 100644
--- a/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
+++ b/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
@@ -1194,7 +1194,8 @@ void DoubleEdgeMaskOperation::doDoubleEdgeMask(float *imask, float *omask, float
else { // "bleed out" buffer edge mode is turned on
do_adjacentBleedBorders(t, rw, limask, lomask, lres, res, rsize);
}
- isz = rsize[0]; // set up inner edge, outer edge, and gradient buffer sizes after border pass
+ // set up inner edge, outer edge, and gradient buffer sizes after border pass
+ isz = rsize[0];
osz = rsize[1];
gsz = rsize[2];
// detect edges in all non-border pixels in the buffer
@@ -1207,24 +1208,31 @@ void DoubleEdgeMaskOperation::doDoubleEdgeMask(float *imask, float *omask, float
else { // "bleed out" buffer edge mode is turned on
do_allBleedBorders(t, rw, limask, lomask, lres, res, rsize);
}
- isz = rsize[0]; // set up inner edge, outer edge, and gradient buffer sizes after border pass
+ // set up inner edge, outer edge, and gradient buffer sizes after border pass
+ isz = rsize[0];
osz = rsize[1];
gsz = rsize[2];
// detect edges in all non-border pixels in the buffer
do_allEdgeDetection(t, rw, limask, lomask, lres, res, rsize, isz, osz, gsz);
}
- isz = rsize[0]; // set edge and gradient buffer sizes once again...
- osz = rsize[1]; // the sizes in rsize[] may have been modified
- gsz = rsize[2]; // by the do_*EdgeDetection() function.
+ // set edge and gradient buffer sizes once again...
+ // the sizes in rsize[] may have been modified
+ // by the do_*EdgeDetection() function.
+ isz = rsize[0];
+ osz = rsize[1];
+ gsz = rsize[2];
- fsz = gsz + isz + osz; // calculate size of pixel index buffer needed
- gbuf = (unsigned short *)MEM_callocN(sizeof(unsigned short) * fsz * 2, "DEM"); // allocate edge/gradient pixel index buffer
+ // calculate size of pixel index buffer needed
+ fsz = gsz + isz + osz;
+ // allocate edge/gradient pixel index buffer
+ gbuf = (unsigned short *)MEM_callocN(sizeof(unsigned short) * fsz * 2, "DEM");
do_createEdgeLocationBuffer(t, rw, lres, res, gbuf, &innerEdgeOffset, &outerEdgeOffset, isz, gsz);
do_fillGradientBuffer(rw, res, gbuf, isz, osz, gsz, innerEdgeOffset, outerEdgeOffset);
- MEM_freeN(gbuf); // free the gradient index buffer
+ // free the gradient index buffer
+ MEM_freeN(gbuf);
}
}