kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

now that header was a mess - and this wasnt using the same lock! bad 

bad!



SVN revision: 49345
This commit is contained in:
Carsten Haitzler 2010-05-31 03:31:49 +00:00
parent f1e19253e6
commit 77123462e1
2 changed files with 20 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
legacy/evas/src/lib/engines/common/evas_font_main.c
View File

@ -7,6 +7,9 @@
FT_Library evas_ft_lib = 0; FT_Library evas_ft_lib = 0;
static int initialised = 0; static int initialised = 0;
LK(lock_font_draw); // for freetype2 API calls
LK(lock_fribidi); // for fribidi API calls
EAPI void EAPI void
evas_common_font_init(void) evas_common_font_init(void)
{ {
@ -20,6 +23,8 @@ evas_common_font_init(void)
#ifdef EVAS_FRAME_QUEUING #ifdef EVAS_FRAME_QUEUING
evas_common_font_draw_init(); evas_common_font_draw_init();
#endif #endif
LKI(lock_font_draw);
LKI(lock_fribidi);
} }
EAPI void EAPI void

88
legacy/evas/src/lib/engines/common/evas_font_private.h
View File

@ -1,81 +1,23 @@
#ifndef _EVAS_FONT_PRIVATE_H #ifndef _EVAS_FONT_PRIVATE_H
#define _EVAS_FONT_PRIVATE_H # define _EVAS_FONT_PRIVATE_H
LK(lock_font_draw); // for freetype2 API calls #ifdef BUILD_PTHREAD
LK(lock_fribidi); // for fribidi API calls extern LK(lock_font_draw); // for freetype2 API calls
extern LK(lock_fribidi); // for fribidi API calls
#ifdef EVAS_FRAME_QUEUING
#define FTLOCK() LKL(lock_font_draw)
#define FTUNLOCK() LKU(lock_font_draw)
#define FBDLOCK() LKL(lock_fribidi)
#define FBDUNLOCK() LKU(lock_fribidi)
#else
#define FTLOCK(x)
#define FTUNLOCK(x)
#define FBDLOCK()
#define FBDUNLOCK()
#endif #endif
#endif /* !_EVAS_FONT_PRIVATE_H */ # ifdef EVAS_FRAME_QUEUING
# define FTLOCK() LKL(lock_font_draw)
# define FTUNLOCK() LKU(lock_font_draw)
#ifndef _EVAS_FONT_PRIVATE_H # define FBDLOCK() LKL(lock_fribidi)
#define _EVAS_FONT_PRIVATE_H # define FBDUNLOCK() LKU(lock_fribidi)
# else
# define FTLOCK(x)
# define FTUNLOCK(x)
LK(lock_font_draw); // for freetype2 API calls # define FBDLOCK()
LK(lock_fribidi); // for fribidi API calls # define FBDUNLOCK()
# endif
#ifdef EVAS_FRAME_QUEUING
#define FTLOCK() LKL(lock_font_draw)
#define FTUNLOCK() LKU(lock_font_draw)
#define FBDLOCK() LKL(lock_fribidi)
#define FBDUNLOCK() LKU(lock_fribidi)
#else
#define FTLOCK(x)
#define FTUNLOCK(x)
#define FBDLOCK()
#define FBDUNLOCK()
#endif
#endif /* !_EVAS_FONT_PRIVATE_H */ #endif /* !_EVAS_FONT_PRIVATE_H */
#ifndef _EVAS_FONT_PRIVATE_H
#define _EVAS_FONT_PRIVATE_H
LK(lock_font_draw); // for freetype2 API calls
LK(lock_fribidi); // for fribidi API calls
#ifdef EVAS_FRAME_QUEUING
#define FTLOCK() LKL(lock_font_draw)
#define FTUNLOCK() LKU(lock_font_draw)
#define FBDLOCK() LKL(lock_fribidi)
#define FBDUNLOCK() LKU(lock_fribidi)
#else
#define FTLOCK(x)
#define FTUNLOCK(x)
#define FBDLOCK()
#define FBDUNLOCK()
#endif
#endif /* !_EVAS_FONT_PRIVATE_H */
#ifndef _EVAS_FONT_PRIVATE_H
#define _EVAS_FONT_PRIVATE_H
LK(lock_font_draw);
#ifdef EVAS_FRAME_QUEUING
#define FTLOCK() LKL(lock_font_draw)
#define FTUNLOCK() LKU(lock_font_draw)
#else
#define FTLOCK(x)
#define FTUNLOCK(x)
#endif
#endif /* !_EVAS_FONT_PRIVATE_H */