diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
| commit | 2bc1d72869b62af05ae4feafd878203b526da8c5 (patch) | |
| tree | 2676903bb600bd9646644856e354940471ad84e2 /krdc/vnc/desktop.c | |
| parent | 937b2991d8e78166eea904c80ad04d34607017a4 (diff) | |
| download | tdenetwork-2bc1d72869b62af05ae4feafd878203b526da8c5.tar.gz tdenetwork-2bc1d72869b62af05ae4feafd878203b526da8c5.zip | |
rename the following methods:
tqparent parent
tqmask mask
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'krdc/vnc/desktop.c')
| -rw-r--r-- | krdc/vnc/desktop.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/krdc/vnc/desktop.c b/krdc/vnc/desktop.c index 2975e731..003a7160 100644 --- a/krdc/vnc/desktop.c +++ b/krdc/vnc/desktop.c @@ -1380,10 +1380,10 @@ static void _calcRect(Surface *src, Surface *dst, float xscale, float yscale, UintXX *dst_row; \ UintXX c1, c2, c3, c4;\ Uint32 R, G, B, A=0; \ - UintXX Rtqmask = image->red_mask;\ - UintXX Gtqmask = image->green_mask;\ - UintXX Btqmask = image->blue_mask;\ - UintXX Atqmask = 0;\ + UintXX Rmask = image->red_mask;\ + UintXX Gmask = image->green_mask;\ + UintXX Bmask = image->blue_mask;\ + UintXX Amask = 0;\ Uint32 wx, wy;\ Uint32 p1, p2, p3, p4;\ \ @@ -1449,11 +1449,11 @@ static void _calcRect(Surface *src, Surface *dst, float xscale, float yscale, c4 = *(src_row + (ry+1)*src_pitch + rx+1);\ \ /* Calculate the average */\ - R = ((p1*(c1 & Rtqmask) + p2*(c2 & Rtqmask) + p3*(c3 & Rtqmask) + p4*(c4 & Rtqmask))>>7) & Rtqmask;\ - G = ((p1*(c1 & Gtqmask) + p2*(c2 & Gtqmask) + p3*(c3 & Gtqmask) + p4*(c4 & Gtqmask))>>7) & Gtqmask;\ - B = ((p1*(c1 & Btqmask) + p2*(c2 & Btqmask) + p3*(c3 & Btqmask) + p4*(c4 & Btqmask))>>7) & Btqmask;\ - if(Atqmask)\ - A = ((p1*(c1 & Atqmask) + p2*(c2 & Atqmask) + p3*(c3 & Atqmask) + p4*(c4 & Atqmask))>>7) & Atqmask;\ + R = ((p1*(c1 & Rmask) + p2*(c2 & Rmask) + p3*(c3 & Rmask) + p4*(c4 & Rmask))>>7) & Rmask;\ + G = ((p1*(c1 & Gmask) + p2*(c2 & Gmask) + p3*(c3 & Gmask) + p4*(c4 & Gmask))>>7) & Gmask;\ + B = ((p1*(c1 & Bmask) + p2*(c2 & Bmask) + p3*(c3 & Bmask) + p4*(c4 & Bmask))>>7) & Bmask;\ + if(Amask)\ + A = ((p1*(c1 & Amask) + p2*(c2 & Amask) + p3*(c3 & Amask) + p4*(c4 & Amask))>>7) & Amask;\ \ *(dst_row + x) = R | G | B | A;\ } \ |