Mercurial > mplayer.hg
changeset 19937:34796c9b8667
Cosmetics: move curtex++ out of for () into code body, needed for coming patch
author | reimar |
---|---|
date | Fri, 22 Sep 2006 20:19:51 +0000 |
parents | f810e12fce63 |
children | f862045246a9 |
files | libvo/vo_gl.c |
diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/libvo/vo_gl.c Fri Sep 22 20:16:36 2006 +0000 +++ b/libvo/vo_gl.c Fri Sep 22 20:19:51 2006 +0000 @@ -257,25 +257,25 @@ eosdtexCnt++; eosdtex = calloc(eosdtexCnt, sizeof(GLuint)); 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) { mp_msg(MSGT_VO, MSGL_V, "Invalid dimensions OSD for part!\n"); continue; } 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); glUploadTex(gl_target, GL_ALPHA, GL_UNSIGNED_BYTE, i->bitmap, i->stride, 0, 0, i->w, i->h, 0); } eosdDispList = glGenLists(1); 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) continue; glColor4ub(i->color >> 24, (i->color >> 16) & 0xff, (i->color >> 8) & 0xff, 255 - (i->color & 0xff)); 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); } glEndList();