aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/evas/engines/gl_common/evas_gl_font.c
diff options
context:
space:
mode:
authorabdulleh Ghujeh <a.ghujeh@samsung.com>2019-04-15 13:48:24 +0200
committerXavi Artigas <xavierartigas@yahoo.es>2019-04-15 13:55:19 +0200
commitbc5df48ffe460b54da70d95efe0b617468158908 (patch)
tree0d6615329c93f4252e1e15a00aaea9e4f50a499e /src/modules/evas/engines/gl_common/evas_gl_font.c
parentgitignore: add elm_default_config.x (diff)
downloadefl-bc5df48ffe460b54da70d95efe0b617468158908.tar.gz
Unreachable code
Summary: Removed condition that will never be fulfilled Reviewers: ali.alzyod, bowonryu, woohyun, segfaultxavi Reviewed By: segfaultxavi Subscribers: segfaultxavi, cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D8606
Diffstat (limited to 'src/modules/evas/engines/gl_common/evas_gl_font.c')
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_font.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/modules/evas/engines/gl_common/evas_gl_font.c b/src/modules/evas/engines/gl_common/evas_gl_font.c
index 3d5d436448..b7bd643756 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_font.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_font.c
@@ -5,7 +5,7 @@ evas_gl_font_texture_new(void *context, RGBA_Font_Glyph *fg)
{
Evas_Engine_GL_Context *gc = context;
Evas_GL_Texture *tex;
- int w, h, j, nw, fh, y;
+ int w, h, nw, fh, y;
DATA8 *ndata, *data, *p1, *p2;
if (fg->ext_dat) return fg->ext_dat; // FIXME: one engine at a time can do this :(
@@ -17,8 +17,6 @@ evas_gl_font_texture_new(void *context, RGBA_Font_Glyph *fg)
if (!fg->glyph_out->rle) return NULL;
data = evas_common_font_glyph_uncompress(fg, &w, &h);
if (!data) return NULL;
- j = w;
- if (j < w) j = w;
// expand to 32bit (4 byte) aligned rows for texture upload
nw = ((w + 3) / 4) * 4;
@@ -31,7 +29,7 @@ evas_gl_font_texture_new(void *context, RGBA_Font_Glyph *fg)
// else copy row by row
for (y = 0; y < h; y++)
{
- p1 = data + (j * y);
+ p1 = data + (w * y);
p2 = ndata + (nw * y);
memcpy(p2,p1,w);
}