[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45124] trunk/blender/source/blender/nodes /composite/nodes/node_composite_doubleEdgeMask.c: convert spaces to tabs and some formatting.
Campbell Barton
ideasman42 at gmail.com
Sat Mar 24 05:40:12 CET 2012
Revision: 45124
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45124
Author: campbellbarton
Date: 2012-03-24 04:39:53 +0000 (Sat, 24 Mar 2012)
Log Message:
-----------
convert spaces to tabs and some formatting.
Modified Paths:
--------------
trunk/blender/source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c
Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c 2012-03-24 04:16:44 UTC (rev 45123)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c 2012-03-24 04:39:53 UTC (rev 45124)
@@ -33,1162 +33,1252 @@
static bNodeSocketTemplate cmp_node_doubleedgemask_in[]= {
- { SOCK_FLOAT, 1, "Inner Mask", 0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f, PROP_NONE}, // inner mask socket definition
- { SOCK_FLOAT, 1, "Outer Mask", 0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f, PROP_NONE}, // outer mask socket definition
- { -1, 0, "" } // input socket array terminator
+ { SOCK_FLOAT, 1, "Inner Mask", 0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f, PROP_NONE}, // inner mask socket definition
+ { SOCK_FLOAT, 1, "Outer Mask", 0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f, PROP_NONE}, // outer mask socket definition
+ { -1, 0, "" } // input socket array terminator
};
static bNodeSocketTemplate cmp_node_doubleedgemask_out[]= {
- { SOCK_FLOAT, 0, "Mask"}, // output socket definition
- { -1, 0, "" } // output socket array terminator
+ { SOCK_FLOAT, 0, "Mask"}, // output socket definition
+ { -1, 0, "" } // output socket array terminator
};
static void do_adjacentKeepBorders(unsigned int t, unsigned int rw, unsigned int *limask, unsigned int *lomask, unsigned int *lres, float *res, unsigned int *rsize)
{
- int x;
- unsigned int isz=0; // inner edge size
- unsigned int osz=0; // outer edge size
- unsigned int gsz=0; // gradient fill area size
- /* Test the four corners */
- /* upper left corner */
- x=t-rw+1;
- // test if inner mask is filled
- if(limask[x]){
- // test if pixel underneath, or to the right, are empty in the inner mask,
- // but filled in the outer mask
- if((!limask[x-rw] && lomask[x-rw]) || (!limask[x+1] && lomask[x+1])){
- isz++; // increment inner edge size
- lres[x]=4; // flag pixel as inner edge
- } else {
- res[x]=1.0f; // pixel is just part of inner mask, and it's not an edge
- }
- } else if(lomask[x]){ // inner mask was empty, test if outer mask is filled
- osz++; // increment outer edge size
- lres[x]=3; // flag pixel as outer edge
- }
- /* upper right corner */
- x=t;
- // test if inner mask is filled
- if(limask[x]){
- // test if pixel underneath, or to the left, are empty in the inner mask,
- // but filled in the outer mask
- if((!limask[x-rw] && lomask[x-rw]) || (!limask[x-1] && lomask[x-1])){
- isz++; // increment inner edge size
- lres[x]=4; // flag pixel as inner edge
- } else {
- res[x]=1.0f; // pixel is just part of inner mask, and it's not an edge
- }
- } else if(lomask[x]){ // inner mask was empty, test if outer mask is filled
- osz++; // increment outer edge size
- lres[x]=3; // flag pixel as outer edge
- }
- /* lower left corner */
- x=0;
- // test if inner mask is filled
- if(limask[x]){
- // test if pixel above, or to the right, are empty in the inner mask,
- // but filled in the outer mask
- if((!limask[x+rw] && lomask[x+rw]) || (!limask[x+1] && lomask[x+1])){
- isz++; // increment inner edge size
- lres[x]=4; // flag pixel as inner edge
- } else {
- res[x]=1.0f; // pixel is just part of inner mask, and it's not an edge
- }
- } else if(lomask[x]){ // inner mask was empty, test if outer mask is filled
- osz++; // increment outer edge size
- lres[x]=3; // flag pixel as outer edge
- }
- /* lower right corner */
- x=rw-1;
- // test if inner mask is filled
- if(limask[x]){
- // test if pixel above, or to the left, are empty in the inner mask,
- // but filled in the outer mask
- if((!limask[x+rw] && lomask[x+rw]) || (!limask[x-1] && lomask[x-1])){
- isz++; // increment inner edge size
- lres[x]=4; // flag pixel as inner edge
- } else {
- res[x]=1.0f; // pixel is just part of inner mask, and it's not an edge
- }
- } else if(lomask[x]){ // inner mask was empty, test if outer mask is filled
- osz++; // increment outer edge size
- lres[x]=3; // flag pixel as outer edge
- }
+ int x;
+ unsigned int isz=0; // inner edge size
+ unsigned int osz=0; // outer edge size
+ unsigned int gsz=0; // gradient fill area size
+ /* Test the four corners */
+ /* upper left corner */
+ x=t-rw+1;
+ // test if inner mask is filled
+ if (limask[x]) {
+ // test if pixel underneath, or to the right, are empty in the inner mask,
+ // but filled in the outer mask
+ if ((!limask[x-rw] && lomask[x-rw]) || (!limask[x+1] && lomask[x+1])) {
+ isz++; // increment inner edge size
+ lres[x]=4; // flag pixel as inner edge
+ }
+ else {
+ res[x]=1.0f; // pixel is just part of inner mask, and it's not an edge
+ }
+ }
+ else if (lomask[x]) { // inner mask was empty, test if outer mask is filled
+ osz++; // increment outer edge size
+ lres[x]=3; // flag pixel as outer edge
+ }
+ /* upper right corner */
+ x=t;
+ // test if inner mask is filled
+ if (limask[x]) {
+ // test if pixel underneath, or to the left, are empty in the inner mask,
+ // but filled in the outer mask
+ if ((!limask[x-rw] && lomask[x-rw]) || (!limask[x-1] && lomask[x-1])) {
+ isz++; // increment inner edge size
+ lres[x]=4; // flag pixel as inner edge
+ }
+ else {
+ res[x]=1.0f; // pixel is just part of inner mask, and it's not an edge
+ }
+ }
+ else if (lomask[x]) { // inner mask was empty, test if outer mask is filled
+ osz++; // increment outer edge size
+ lres[x]=3; // flag pixel as outer edge
+ }
+ /* lower left corner */
+ x=0;
+ // test if inner mask is filled
+ if (limask[x]) {
+ // test if pixel above, or to the right, are empty in the inner mask,
+ // but filled in the outer mask
+ if ((!limask[x+rw] && lomask[x+rw]) || (!limask[x+1] && lomask[x+1])) {
+ isz++; // increment inner edge size
+ lres[x]=4; // flag pixel as inner edge
+ }
+ else {
+ res[x]=1.0f; // pixel is just part of inner mask, and it's not an edge
+ }
+ }
+ else if (lomask[x]) { // inner mask was empty, test if outer mask is filled
+ osz++; // increment outer edge size
+ lres[x]=3; // flag pixel as outer edge
+ }
+ /* lower right corner */
+ x=rw-1;
+ // test if inner mask is filled
+ if (limask[x]) {
+ // test if pixel above, or to the left, are empty in the inner mask,
+ // but filled in the outer mask
+ if ((!limask[x+rw] && lomask[x+rw]) || (!limask[x-1] && lomask[x-1])) {
+ isz++; // increment inner edge size
+ lres[x]=4; // flag pixel as inner edge
+ }
+ else {
+ res[x]=1.0f; // pixel is just part of inner mask, and it's not an edge
+ }
+ }
+ else if (lomask[x]) { // inner mask was empty, test if outer mask is filled
+ osz++; // increment outer edge size
+ lres[x]=3; // flag pixel as outer edge
+ }
- /* Test the TOP row of pixels in buffer, except corners */
- for(x= t-1; x>=(t-rw)+2; x--) {
- // test if inner mask is filled
- if(limask[x]) {
- // test if pixel to the right, or to the left, are empty in the inner mask,
- // but filled in the outer mask
- if((!limask[x-1] && lomask[x-1]) || (!limask[x+1] && lomask[x+1])) {
- isz++; // increment inner edge size
- lres[x]=4; // flag pixel as inner edge
- } else {
- res[x]=1.0f; // pixel is just part of inner mask, and it's not an edge
- }
- } else if(lomask[x]) { // inner mask was empty, test if outer mask is filled
- osz++; // increment outer edge size
- lres[x]=3; // flag pixel as outer edge
- }
- }
+ /* Test the TOP row of pixels in buffer, except corners */
+ for (x= t-1; x>=(t-rw)+2; x--) {
+ // test if inner mask is filled
+ if (limask[x]) {
+ // test if pixel to the right, or to the left, are empty in the inner mask,
+ // but filled in the outer mask
+ if ((!limask[x-1] && lomask[x-1]) || (!limask[x+1] && lomask[x+1])) {
+ isz++; // increment inner edge size
+ lres[x]=4; // flag pixel as inner edge
+ }
+ else {
+ res[x]=1.0f; // pixel is just part of inner mask, and it's not an edge
+ }
+ }
+ else if (lomask[x]) { // inner mask was empty, test if outer mask is filled
+ osz++; // increment outer edge size
+ lres[x]=3; // flag pixel as outer edge
+ }
+ }
- /* Test the BOTTOM row of pixels in buffer, except corners */
- for(x= rw-2; x; x--) {
- // test if inner mask is filled
- if(limask[x]) {
- // test if pixel to the right, or to the left, are empty in the inner mask,
- // but filled in the outer mask
- if((!limask[x-1] && lomask[x-1]) || (!limask[x+1] && lomask[x+1])) {
- isz++; // increment inner edge size
- lres[x]=4; // flag pixel as inner edge
- } else {
- res[x]=1.0f; // pixel is just part of inner mask, and it's not an edge
- }
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list