From 5de077ae98e7d971d033d5d0787325db28e91cf4 Mon Sep 17 00:00:00 2001 From: devilhorns Date: Wed, 18 Aug 2010 16:08:30 +0000 Subject: [PATCH] Comment out some unused variables. Fix some 'may be used uninitialized' warnings. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@51288 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/modules/engines/gl_common/evas_gl_context.c | 2 +- src/modules/engines/gl_common/evas_gl_polygon.c | 2 +- src/modules/engines/gl_common/evas_gl_texture.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/modules/engines/gl_common/evas_gl_context.c b/src/modules/engines/gl_common/evas_gl_context.c index 935aa8a..fb12e59 100644 --- a/src/modules/engines/gl_common/evas_gl_context.c +++ b/src/modules/engines/gl_common/evas_gl_context.c @@ -1764,7 +1764,7 @@ evas_gl_common_context_image_map4_push(Evas_GL_Context *gc, { int pnum, nv, nc, nu, nu2, nt, i; const int points[6] = { 0, 1, 2, 0, 2, 3 }; - int x, y, w, h, px, py; + int x = 0, y = 0, w = 0, h = 0, px = 0, py = 0; GLfloat tx[4], ty[4]; Eina_Bool blend = 1; DATA32 cmul; diff --git a/src/modules/engines/gl_common/evas_gl_polygon.c b/src/modules/engines/gl_common/evas_gl_polygon.c index 49dd902..fda1400 100644 --- a/src/modules/engines/gl_common/evas_gl_polygon.c +++ b/src/modules/engines/gl_common/evas_gl_polygon.c @@ -125,7 +125,7 @@ evas_gl_common_poly_draw(Evas_GL_Context *gc, Evas_GL_Polygon *poly, int dx, int Cutout_Rects *rects; Cutout_Rect *r; int c, cx, cy, cw, ch, cr, cg, cb, ca, i; - int x, y, w, h; + int x = 0, y = 0, w = 0, h = 0; Eina_List *l; int n, k, num_active_edges, y0, y1, *sorted_index, j; diff --git a/src/modules/engines/gl_common/evas_gl_texture.c b/src/modules/engines/gl_common/evas_gl_texture.c index 385b23b..414a9e7 100644 --- a/src/modules/engines/gl_common/evas_gl_texture.c +++ b/src/modules/engines/gl_common/evas_gl_texture.c @@ -859,8 +859,8 @@ Evas_GL_Texture * evas_gl_common_texture_yuv_new(Evas_GL_Context *gc, DATA8 **rows, int w, int h) { Evas_GL_Texture *tex; - Eina_List *l_after = NULL; - int u = 0, v = 0; +// Eina_List *l_after = NULL; +// int u = 0, v = 0; tex = calloc(1, sizeof(Evas_GL_Texture)); if (!tex) return NULL; @@ -920,8 +920,6 @@ evas_gl_common_texture_yuv_new(Evas_GL_Context *gc, DATA8 **rows, int w, int h) void evas_gl_common_texture_yuv_update(Evas_GL_Texture *tex, DATA8 **rows, int w, int h) { - int y; - if (!tex->pt) return; // FIXME: works on lowest size 4 pixel high buffers. must also be multiple of 2 #ifdef GL_UNPACK_ROW_LENGTH @@ -943,6 +941,8 @@ evas_gl_common_texture_yuv_update(Evas_GL_Texture *tex, DATA8 **rows, int w, int GLERR(__FUNCTION__, __FILE__, __LINE__, ""); _tex_sub_2d(0, 0, w / 2, h / 2, tex->ptv->format, tex->ptv->dataformat, rows[h + (h / 2)]); #else + int y; + glPixelStorei(GL_UNPACK_ALIGNMENT, 1); GLERR(__FUNCTION__, __FILE__, __LINE__, ""); glBindTexture(GL_TEXTURE_2D, tex->pt->texture); -- 2.7.4