RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Don't assume width == stride for bitmap composition. 

Fixes http://bugzilla.mplayerhq.hu/show_bug.cgi?id=1421

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28891 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
greg 2009-03-08 15:30:27 +00:00
parent b638947171
commit af0797010e
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libass/ass_render.c
View File

@ -423,10 +423,12 @@ static void render_overlap(ass_image_t** last_tail, ass_image_t** tail, bitmap_h
int ax = (*last_tail)->dst_x; int ax = (*last_tail)->dst_x;
int ay = (*last_tail)->dst_y; int ay = (*last_tail)->dst_y;
int aw = (*last_tail)->w; int aw = (*last_tail)->w;
int as = (*last_tail)->stride;
int ah = (*last_tail)->h; int ah = (*last_tail)->h;
int bx = (*tail)->dst_x; int bx = (*tail)->dst_x;
int by = (*tail)->dst_y; int by = (*tail)->dst_y;
int bw = (*tail)->w; int bw = (*tail)->w;
int bs = (*tail)->stride;
int bh = (*tail)->h; int bh = (*tail)->h;
unsigned char* a; unsigned char* a;
unsigned char* b; unsigned char* b;
@ -472,16 +474,16 @@ static void render_overlap(ass_image_t** last_tail, ass_image_t** tail, bitmap_h
// Allocate new bitmaps and copy over data // Allocate new bitmaps and copy over data
a = (*last_tail)->bitmap; a = (*last_tail)->bitmap;
b = (*tail)->bitmap; b = (*tail)->bitmap;
(*last_tail)->bitmap = malloc(aw*ah); (*last_tail)->bitmap = malloc(as*ah);
(*tail)->bitmap = malloc(bw*bh); (*tail)->bitmap = malloc(bs*bh);
memcpy((*last_tail)->bitmap, a, aw*ah); memcpy((*last_tail)->bitmap, a, as*ah);
memcpy((*tail)->bitmap, b, bw*bh); memcpy((*tail)->bitmap, b, bs*bh);
// Composite overlapping area // Composite overlapping area
for (y=0; y<h; y++) for (y=0; y<h; y++)
for (x=0; x<w; x++) { for (x=0; x<w; x++) {
opos = (old_top+y)*(aw) + (old_left+x); opos = (old_top+y)*(as) + (old_left+x);
cpos = (cur_top+y)*(bw) + (cur_left+x); cpos = (cur_top+y)*(bs) + (cur_left+x);
m = (a[opos] > b[cpos]) ? a[opos] : b[cpos]; m = (a[opos] > b[cpos]) ? a[opos] : b[cpos];
(*last_tail)->bitmap[opos] = 0; (*last_tail)->bitmap[opos] = 0;
(*tail)->bitmap[cpos] = m; (*tail)->bitmap[cpos] = m;