diff options
| author | marha <marha@users.sourceforge.net> | 2010-06-23 07:03:58 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-06-23 07:03:58 +0000 |
| commit | 345335d61c71c245846d679d568a8b5eca1a5ca9 (patch) | |
| tree | 7b878ae84134fa091dd2bdc2695251e609209ebe /xorg-server/randr | |
| parent | fbbbbe88405440920f4baa5a3107ec0b9a6f8cb7 (diff) | |
| parent | c356d5298f18cd103ef7caad015d98d2022044ac (diff) | |
| download | vcxsrv-345335d61c71c245846d679d568a8b5eca1a5ca9.tar.gz vcxsrv-345335d61c71c245846d679d568a8b5eca1a5ca9.tar.bz2 vcxsrv-345335d61c71c245846d679d568a8b5eca1a5ca9.zip | |
svn merge "^/branches/released" .
Diffstat (limited to 'xorg-server/randr')
| -rw-r--r-- | xorg-server/randr/rrtransform.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/xorg-server/randr/rrtransform.c b/xorg-server/randr/rrtransform.c index 03c5c97ba..102a0f48e 100644 --- a/xorg-server/randr/rrtransform.c +++ b/xorg-server/randr/rrtransform.c @@ -183,21 +183,21 @@ RRTransformCompute (int x, break;
case RR_Rotate_90:
f_rot_cos = 0; f_rot_sin = 1;
- f_rot_dx = height-1; f_rot_dy = 0;
+ f_rot_dx = height; f_rot_dy = 0;
rot_cos = F ( 0); rot_sin = F ( 1);
- rot_dx = F (height-1); rot_dy = F (0);
+ rot_dx = F ( height); rot_dy = F (0);
break;
case RR_Rotate_180:
f_rot_cos = -1; f_rot_sin = 0;
- f_rot_dx = width - 1; f_rot_dy = height - 1;
+ f_rot_dx = width; f_rot_dy = height;
rot_cos = F (-1); rot_sin = F ( 0);
- rot_dx = F (width-1); rot_dy = F ( height-1);
+ rot_dx = F (width); rot_dy = F ( height);
break;
case RR_Rotate_270:
f_rot_cos = 0; f_rot_sin = -1;
- f_rot_dx = 0; f_rot_dy = width-1;
+ f_rot_dx = 0; f_rot_dy = width;
rot_cos = F ( 0); rot_sin = F (-1);
- rot_dx = F ( 0); rot_dy = F ( width-1);
+ rot_dx = F ( 0); rot_dy = F ( width);
break;
}
@@ -220,11 +220,11 @@ RRTransformCompute (int x, f_scale_x = -1;
scale_x = F(-1);
if (rotation & (RR_Rotate_0|RR_Rotate_180)) {
- f_scale_dx = width-1;
- scale_dx = F(width-1);
+ f_scale_dx = width;
+ scale_dx = F(width);
} else {
- f_scale_dx = height-1;
- scale_dx = F(height-1);
+ f_scale_dx = height;
+ scale_dx = F(height);
}
}
if (rotation & RR_Reflect_Y)
@@ -232,11 +232,11 @@ RRTransformCompute (int x, f_scale_y = -1;
scale_y = F(-1);
if (rotation & (RR_Rotate_0|RR_Rotate_180)) {
- f_scale_dy = height-1;
- scale_dy = F(height-1);
+ f_scale_dy = height;
+ scale_dy = F(height);
} else {
- f_scale_dy = width-1;
- scale_dy = F(width-1);
+ f_scale_dy = width;
+ scale_dy = F(width);
}
}
|