RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-18 21:31:13 +00:00
Code Issues Releases Wiki Activity

Cosmetics: move curtex++ out of for () into code body, needed for coming patch

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19943 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2006-09-22 20:19:51 +00:00
parent 1014da2101
commit 7da0bb114d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libvo/vo_gl.c
View File

@ -257,25 +257,25 @@ static void genEOSD(ass_image_t *img) {
eosdtexCnt++; eosdtexCnt++;
eosdtex = calloc(eosdtexCnt, sizeof(GLuint)); eosdtex = calloc(eosdtexCnt, sizeof(GLuint));
glGenTextures(eosdtexCnt, eosdtex); glGenTextures(eosdtexCnt, eosdtex);
for (i = img, curtex = eosdtex; i; i = i->next, curtex++) { for (i = img, curtex = eosdtex; i; i = i->next) {
if (i->w <= 0 || i->h <= 0 || i->stride < i->w) { if (i->w <= 0 || i->h <= 0 || i->stride < i->w) {
mp_msg(MSGT_VO, MSGL_V, "Invalid dimensions OSD for part!\n"); mp_msg(MSGT_VO, MSGL_V, "Invalid dimensions OSD for part!\n");
continue; continue;
} }
texSize(i->w, i->h, &sx, &sy); texSize(i->w, i->h, &sx, &sy);
BindTexture(gl_target, *curtex); BindTexture(gl_target, *curtex++);
glCreateClearTex(gl_target, GL_ALPHA, scale_type, sx, sy, 0); glCreateClearTex(gl_target, GL_ALPHA, scale_type, sx, sy, 0);
glUploadTex(gl_target, GL_ALPHA, GL_UNSIGNED_BYTE, i->bitmap, i->stride, glUploadTex(gl_target, GL_ALPHA, GL_UNSIGNED_BYTE, i->bitmap, i->stride,
0, 0, i->w, i->h, 0); 0, 0, i->w, i->h, 0);
} }
eosdDispList = glGenLists(1); eosdDispList = glGenLists(1);
glNewList(eosdDispList, GL_COMPILE); glNewList(eosdDispList, GL_COMPILE);
for (i = img, curtex = eosdtex; i; i = i->next, curtex++) { for (i = img, curtex = eosdtex; i; i = i->next) {
if (i->w <= 0 || i->h <= 0 || i->stride < i->w) if (i->w <= 0 || i->h <= 0 || i->stride < i->w)
continue; continue;
glColor4ub(i->color >> 24, (i->color >> 16) & 0xff, (i->color >> 8) & 0xff, 255 - (i->color & 0xff)); glColor4ub(i->color >> 24, (i->color >> 16) & 0xff, (i->color >> 8) & 0xff, 255 - (i->color & 0xff));
texSize(i->w, i->h, &sx, &sy); texSize(i->w, i->h, &sx, &sy);
BindTexture(gl_target, *curtex); BindTexture(gl_target, *curtex++);
glDrawTex(i->dst_x, i->dst_y, i->w, i->h, 0, 0, i->w, i->h, sx, sy, use_rectangle == 1, 0, 0); glDrawTex(i->dst_x, i->dst_y, i->w, i->h, 0, 0, i->w, i->h, sx, sy, use_rectangle == 1, 0, 0);
} }
glEndList(); glEndList();