Enlightenment CVS committal
Author : vapier
Project : e17
Module : libs/emotion
Dir : e17/libs/emotion/src/modules/xine
Modified Files:
emotion_xine_vo_out.c
Log Message:
xine-lib-1.1.1 change member names in the vo_overlay_t struct
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/emotion/src/modules/xine/emotion_xine_vo_out.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- emotion_xine_vo_out.c 30 Aug 2005 23:40:34 -0000 1.10
+++ emotion_xine_vo_out.c 28 Nov 2005 07:01:43 -0000 1.11
@@ -559,7 +559,7 @@
int rle_remainder;
int rlelen;
int x, y;
- int clip_right;
+ int hili_right;
uint8_t clr = 0;
src_width = img_overl->width;
@@ -574,14 +574,14 @@
uint8_t *dst_y = dst_base[0] + dst_pitches[0] * y_off + x_off;
uint8_t *dst_cr = dst_base[2] + (y_off / 2) * dst_pitches[1] + (x_off / 2)
+ 1;
uint8_t *dst_cb = dst_base[1] + (y_off / 2) * dst_pitches[2] + (x_off / 2)
+ 1;
- my_clut = (Emotion_Lut *) img_overl->clip_color;
- my_trans = img_overl->clip_trans;
+ my_clut = (Emotion_Lut *) img_overl->hili_color;
+ my_trans = img_overl->hili_trans;
/* avoid wraping overlay if drawing to small image */
- if( (x_off + img_overl->clip_right) < dst_width )
- clip_right = img_overl->clip_right;
+ if( (x_off + img_overl->hili_right) < dst_width )
+ hili_right = img_overl->hili_right;
else
- clip_right = dst_width - 1 - x_off;
+ hili_right = dst_width - 1 - x_off;
/* avoid buffer overflow */
if( (src_height + y_off) >= dst_height )
@@ -589,7 +589,7 @@
rlelen=rle_remainder=0;
for (y = 0; y < src_height; y++) {
- ymask = ((img_overl->clip_top > y) || (img_overl->clip_bottom < y));
+ ymask = ((img_overl->hili_top > y) || (img_overl->hili_bottom < y));
xmask = 0;
for (x = 0; x < src_width;) {
@@ -609,11 +609,11 @@
}
if (ymask == 0) {
- if (x <= img_overl->clip_left) {
+ if (x <= img_overl->hili_left) {
/* Starts outside clip area */
- if ((x + rle_remainder - 1) > img_overl->clip_left ) {
+ if ((x + rle_remainder - 1) > img_overl->hili_left ) {
/* Cutting needed, starts outside, ends inside */
- rle_this_bite = (img_overl->clip_left - x + 1);
+ rle_this_bite = (img_overl->hili_left - x + 1);
rle_remainder -= rle_this_bite;
rlelen -= rle_this_bite;
my_clut = (Emotion_Lut *) img_overl->color;
@@ -628,26 +628,26 @@
my_trans = img_overl->trans;
xmask = 0;
}
- } else if (x < clip_right) {
+ } else if (x < hili_right) {
/* Starts inside clip area */
- if ((x + rle_remainder) > clip_right ) {
+ if ((x + rle_remainder) > hili_right ) {
/* Cutting needed, starts inside, ends outside */
- rle_this_bite = (clip_right - x);
+ rle_this_bite = (hili_right - x);
rle_remainder -= rle_this_bite;
rlelen -= rle_this_bite;
- my_clut = (Emotion_Lut *) img_overl->clip_color;
- my_trans = img_overl->clip_trans;
+ my_clut = (Emotion_Lut *) img_overl->hili_color;
+ my_trans = img_overl->hili_trans;
xmask++;
} else {
/* no cutting needed, starts inside, ends inside */
rle_this_bite = rle_remainder;
rle_remainder = 0;
rlelen -= rle_this_bite;
- my_clut = (Emotion_Lut *) img_overl->clip_color;
- my_trans = img_overl->clip_trans;
+ my_clut = (Emotion_Lut *) img_overl->hili_color;
+ my_trans = img_overl->hili_trans;
xmask++;
}
- } else if (x >= clip_right) {
+ } else if (x >= hili_right) {
/* Starts outside clip area, ends outsite clip area */
if ((x + rle_remainder ) > src_width ) {
/* Cutting needed, starts outside, ends at right edge */
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
