warnings--

SVN revision: 57877
This commit is contained in:
Carsten Haitzler 2011-03-19 03:56:35 +00:00
parent 269d65dc05
commit 3b9219748d
4 changed files with 9 additions and 4 deletions

View File

@ -2171,6 +2171,8 @@ _layout_line_order(Ctxt *c __UNUSED__, Evas_Object_Textblock_Line *line)
} }
if (v_to_l) free(v_to_l); if (v_to_l) free(v_to_l);
#else
line = NULL;
#endif #endif
} }

View File

@ -24,6 +24,11 @@ extern LK(lock_ot); // for harfbuzz calls
# define BIDILOCK() # define BIDILOCK()
# define BIDIUNLOCK() # define BIDIUNLOCK()
/* Macros for text walking */
# define OTLOCK()
# define OTUNLOCK()
# endif
void evas_common_font_source_unload(RGBA_Font_Source *fs); void evas_common_font_source_unload(RGBA_Font_Source *fs);
void evas_common_font_source_reload(RGBA_Font_Source *fs); void evas_common_font_source_reload(RGBA_Font_Source *fs);
@ -32,10 +37,6 @@ void evas_common_font_int_use_increase(int size);
void evas_common_font_int_use_trim(void); void evas_common_font_int_use_trim(void);
void evas_common_font_int_unload(RGBA_Font_Int *fi); void evas_common_font_int_unload(RGBA_Font_Int *fi);
void evas_common_font_int_reload(RGBA_Font_Int *fi); void evas_common_font_int_reload(RGBA_Font_Int *fi);
/* Macros for text walking */
# define OTLOCK()
# define OTUNLOCK()
# endif
/* 6th bit is on is the same as frac part >= 0.5 */ /* 6th bit is on is the same as frac part >= 0.5 */
# define EVAS_FONT_ROUND_26_6_TO_INT(x) \ # define EVAS_FONT_ROUND_26_6_TO_INT(x) \

View File

@ -1,6 +1,7 @@
// THIS IS DEPRECATED. WILL GO EVENTUALLTY. NO NEED TO SUPPORT ANYMORE // THIS IS DEPRECATED. WILL GO EVENTUALLTY. NO NEED TO SUPPORT ANYMORE
#include "evas_common.h" #include "evas_common.h"
#include <unistd.h>
#ifdef BUILD_PIPE_RENDER #ifdef BUILD_PIPE_RENDER

View File

@ -376,6 +376,7 @@ evas_common_soft16_line_draw(Soft16_Image *dst, RGBA_Draw_Context *dc, int x0, i
int dx, dy; int dx, dy;
int x, y, w, h; int x, y, w, h;
c_tmp.mask = NULL;
c_tmp.use = 1; c_tmp.use = 1;
c_tmp.x = 0; c_tmp.x = 0;
c_tmp.y = 0; c_tmp.y = 0;