aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-09-22 20:19:51 +0000
committerGravatar reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-09-22 20:19:51 +0000
commit7da0bb114d45b7e6748b4a08f05b3f33988e6761 (patch)
tree98dd6bc9cea08c8f98ce89e2b3a6fb6f43382a77
parent1014da2101c3338058728009323537f1c34c6934 (diff)
Cosmetics: move curtex++ out of for () into code body, needed for coming patch
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19943 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--libvo/vo_gl.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c
index 600c9c3b97..5e33344616 100644
--- a/libvo/vo_gl.c
+++ b/libvo/vo_gl.c
@@ -257,25 +257,25 @@ static void genEOSD(ass_image_t *img) {
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();