aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Aguirre <aguirre.nicolas@gmail.com>2015-03-26 18:08:14 +0100
committerCedric BAIL <cedric@osg.samsung.com>2015-03-27 18:29:38 +0100
commit940f2e72f934ba1987b3326b7b8655b66d41af9d (patch)
tree70bc8ff6e3a2e923cb0f218bc525d0845138a596
parenteina: Change newline parsing to handle crlf better (diff)
downloadefl-940f2e72f934ba1987b3326b7b8655b66d41af9d.tar.gz
evas: fix gl_cocoa build after recent changes in evas_common_draw_context_font_ext_set.
Now evas_common_draw_context_font_ext_set takes 3 more parameters, fix the build by adding NULL for the function pointers. We really need to switch to gl_generic here, it would avoid this kind of problems. Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
-rw-r--r--src/modules/evas/engines/gl_cocoa/evas_engine.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/modules/evas/engines/gl_cocoa/evas_engine.c b/src/modules/evas/engines/gl_cocoa/evas_engine.c
index fc660b6c98..4acca80744 100644
--- a/src/modules/evas/engines/gl_cocoa/evas_engine.c
+++ b/src/modules/evas/engines/gl_cocoa/evas_engine.c
@@ -1046,14 +1046,20 @@ eng_font_draw(void *data, void *context, void *surface, Evas_Font_Set *font EINA
re->win->gl_context,
evas_gl_font_texture_new,
evas_gl_font_texture_free,
- evas_gl_font_texture_draw);
+ evas_gl_font_texture_draw,
+ NULL,
+ NULL,
+ NULL);
evas_common_font_draw_prepare(intl_props);
evas_common_font_draw(im, context, x, y, intl_props->glyphs);
evas_common_draw_context_font_ext_set(context,
NULL,
NULL,
NULL,
- NULL);
+ NULL,
+ NULL,
+ NULL,
+ NULL);
}
return EINA_FALSE;