summaryrefslogtreecommitdiffstats
path: root/krdc/vnc/desktop.c
diff options
context:
space:
mode:
Diffstat (limited to 'krdc/vnc/desktop.c')
-rw-r--r--krdc/vnc/desktop.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/krdc/vnc/desktop.c b/krdc/vnc/desktop.c
index e60c67ee..2975e731 100644
--- a/krdc/vnc/desktop.c
+++ b/krdc/vnc/desktop.c
@@ -1,7 +1,7 @@
/*
* Copyright (C) 1999 AT&T Laboratories Cambridge. All Rights Reserved.
* Copyright (C) 2002 Tim Jansen. All Rights Reserved.
- * Copyright (C) 1999-2001 Anders Lindstr�m
+ * Copyright (C) 1999-2001 Anders Lindstr�m
*
*
*
@@ -25,7 +25,7 @@
* - added FillRectangle and Sync methods to draw only on
* the image
* - added Zoom functionality, based on rotation funcs from
- * SGE by Anders Lindstr�m)
+ * SGE by Anders Lindstr�m)
* - added support for softcursor encoding
*
*/
@@ -626,7 +626,7 @@ void SyncScreenRegionX11Thread(int x, int y, int width, int height) {
}
/*
- * ToplevelInitBeforeRealization sets the title, geometry and other resources
+ * ToplevelInitBeforeRealization sets the title, tqgeometry and other resources
* on the toplevel window.
*/
@@ -1380,17 +1380,17 @@ 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 Rmask = image->red_mask;\
- UintXX Gmask = image->green_mask;\
- UintXX Bmask = image->blue_mask;\
- UintXX Amask = 0;\
+ UintXX Rtqmask = image->red_mask;\
+ UintXX Gtqmask = image->green_mask;\
+ UintXX Btqmask = image->blue_mask;\
+ UintXX Atqmask = 0;\
Uint32 wx, wy;\
Uint32 p1, p2, p3, p4;\
\
/*
* Interpolation:
* We calculate the distances from our point to the four nearest pixels, d1..d4.
- * d(a,b) = sqrt(a�+b�) ~= 0.707(a+b) (Pythagoras (Taylor) expanded around (0.5;0.5))
+ * d(a,b) = sqrt(a�+b�) ~= 0.707(a+b) (Pythagoras (Taylor) expanded around (0.5;0.5))
*
* 1 wx 2
* *-|-* (+ = our point at (x,y))
@@ -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 & 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;\
+ 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;\
\
*(dst_row + x) = R | G | B | A;\
} \