[xine-cvs] CVS: xine-lib/src/video_out alphablend.c,1.20,1.21

[James Courtier-D. <jcd...@us...>]

Update of /cvsroot/xine/xine-lib/src/video_out
In directory usw-pr-cvs1:/tmp/cvs-serv9906/xine-lib/src/video_out

Modified Files:
	alphablend.c 
Log Message:
Try to fix some bleeding in the menus.



Index: alphablend.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/video_out/alphablend.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- alphablend.c	2002/01/16 00:54:34	1.20
+++ alphablend.c	2002/01/18 02:32:31	1.21
@@ -437,7 +437,7 @@
       printf("1:rle_len=%d, remainder=%d, x=%d\n",rlelen, rle_remainder, x);
 #endif
 
-      if (rlelen < 0 || rle_remainder < 0) {
+      if ((rlelen < 0) || (rle_remainder < 0)) {
         printf("alphablend: major bug in blend_yuv < 0\n");
       } 
       if (rlelen == 0) {
@@ -448,7 +448,7 @@
       if (rle_remainder == 0) {
         rle_remainder = rlelen;
       }
-      if (rle_remainder + x > src_width) {
+      if ((rle_remainder + x) > src_width) {
         /* Do something for long rlelengths */
         rle_remainder = src_width - x; 
         ;
@@ -460,7 +460,7 @@
       if (ymask == 0) {
         if (x <= img_overl->clip_left) { 
           /* Starts outside clip area */
-          if (x + rle_remainder > img_overl->clip_left ) {
+          if ((x + rle_remainder - 1) > img_overl->clip_left ) {
 #ifdef LOG_BLEND_YUV
             printf("Outside clip left %d, ending inside\n", img_overl->clip_left); 
 #endif
@@ -485,12 +485,12 @@
           }
         } else if (x < img_overl->clip_right) {
           /* Starts inside clip area */
-          if (x + rle_remainder >= img_overl->clip_right ) { 
+          if ((x + rle_remainder) > img_overl->clip_right ) { 
 #ifdef LOG_BLEND_YUV
             printf("Inside clip right %d, ending outside\n", img_overl->clip_right); 
 #endif
             /* Cutting needed, starts inside, ends outside */
-            rle_this_bite = (img_overl->clip_right - x + 1);
+            rle_this_bite = (img_overl->clip_right - x);
             rle_remainder -= rle_this_bite;
             rlelen -= rle_this_bite;
             my_clut = (clut_t*) img_overl->clip_color;
@@ -510,7 +510,7 @@
           }
         } else if (x >= img_overl->clip_right) {
           /* Starts outside clip area, ends outsite clip area */
-          if (x + rle_remainder > src_width ) { 
+          if ((x + rle_remainder ) > src_width ) { 
 #ifdef LOG_BLEND_YUV
             printf("Outside clip right %d, ending eol\n", img_overl->clip_right); 
 #endif