diff options
| author | Guenter Bartsch <guenter@users.sourceforge.net> | 2001-07-10 19:33:05 +0000 |
|---|---|---|
| committer | Guenter Bartsch <guenter@users.sourceforge.net> | 2001-07-10 19:33:05 +0000 |
| commit | 9125c00c6d1242b911cbf68cdd25114cd9972c8f (patch) | |
| tree | 313071ce6aac40d9fb35b12d65eba2bbf84927dc /src/video_out/alphablend.c | |
| parent | cec0ffca0dfba3f6807e63636ea2c12cec982db9 (diff) | |
| download | xine-lib-9125c00c6d1242b911cbf68cdd25114cd9972c8f.tar.gz xine-lib-9125c00c6d1242b911cbf68cdd25114cd9972c8f.tar.bz2 | |
subtitle patches (esp. for XShm) from James
CVS patchset: 263
CVS date: 2001/07/10 19:33:05
Diffstat (limited to 'src/video_out/alphablend.c')
| -rw-r--r-- | src/video_out/alphablend.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/video_out/alphablend.c b/src/video_out/alphablend.c index a9f373832..21669e96a 100644 --- a/src/video_out/alphablend.c +++ b/src/video_out/alphablend.c @@ -140,10 +140,8 @@ void blend_tux_rgb16 (uint8_t * img, int dst_width, int dst_height) for (x=0; x<img_overl->width; x++) { \ o = img_overl->trans[*src&0x0f]; \ \ -/* if ((*src&0x0f) != 0) if alpha is != 0 */ \ - if (o) /* if alpha is != 0 */ \ - *dst = blendpixel_rgb##bpp (*dst, img_overl->clut[(*src&0x0f)]/*.y*/, o); \ -/* *dst = blendpixel_rgb##bpp (*dst, myclut[img_overl->clut[(*src&0x0f)]], o);*/\ + if ((*src) >> 4 & 0xf) /* if alpha is != 0 */ \ + *dst = blendpixel_rgb##bpp (*dst, myclut[img_overl->clut[(*src&0x0f)]], o); \ src++; \ dst++; \ } \ @@ -151,11 +149,9 @@ void blend_tux_rgb16 (uint8_t * img, int dst_width, int dst_height) } \ } -//void blend_rgb16 (uint8_t *img, overlay_buf_t *img_overl, int dst_width, int dst_height) -void blend_rgb (uint8_t * img, vo_overlay_t * img_overl, int dst_width, +void blend_rgb16 (uint8_t * img, vo_overlay_t * img_overl, int dst_width, int dst_height) { -#ifdef PRIV_CLUT u_int myclut[] = { 0x0000, 0x20e2, @@ -174,7 +170,6 @@ void blend_rgb (uint8_t * img, vo_overlay_t * img_overl, int dst_width, 0xad13, 0xffdf, }; -#endif BLEND (16, img, img_overl, dst_width, dst_height); //blend_tux_rgb16 (img, dst_width, dst_height); @@ -184,7 +179,6 @@ void blend_rgb24 (uint8_t * img, vo_overlay_t * img_overl, int dst_width, int dst_height) { //FIXME CLUT -#ifdef PRIV_CLUT u_int myclut[] = { 0x0000, 0x20e2, @@ -203,7 +197,6 @@ void blend_rgb24 (uint8_t * img, vo_overlay_t * img_overl, int dst_width, 0xad13, 0xffdf, }; -#endif BLEND (24, img, img_overl, dst_width, dst_height); } @@ -211,7 +204,6 @@ void blend_rgb32 (uint8_t * img, vo_overlay_t * img_overl, int dst_width, int dst_height) { //FIXME CLUT -#ifdef PRIV_CLUT u_int myclut[] = { 0x0000, 0x20e2, @@ -230,7 +222,6 @@ void blend_rgb32 (uint8_t * img, vo_overlay_t * img_overl, int dst_width, 0xad13, 0xffdf, }; -#endif BLEND (32, img, img_overl, dst_width, dst_height); } |