diff options
| author | Andreas Oberritter <obi@opendreambox.org> | 2010-10-22 12:56:11 +0000 |
|---|---|---|
| committer | Andreas Oberritter <obi@opendreambox.org> | 2010-11-16 17:09:12 +0100 |
| commit | 35f2eed2476bcaf47f06894fb2375137bd950941 (patch) | |
| tree | a515c93ff9a345a89c8a6dcbf82eb0ab8fe3ab09 /lib/gdi | |
| parent | 243797874769aa79fa4c928dc9d135558e430201 (diff) | |
| download | enigma2-35f2eed2476bcaf47f06894fb2375137bd950941.tar.gz enigma2-35f2eed2476bcaf47f06894fb2375137bd950941.zip | |
lib/gdi/font.cpp: assume HAVE_FRIBIDI is always set
Diffstat (limited to 'lib/gdi')
| -rw-r--r-- | lib/gdi/font.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/lib/gdi/font.cpp b/lib/gdi/font.cpp index 3b5ca946..9e175476 100644 --- a/lib/gdi/font.cpp +++ b/lib/gdi/font.cpp @@ -27,12 +27,7 @@ #include <lib/base/init.h> #include <lib/base/init_num.h> -#define HAVE_FRIBIDI -// until we have it in the cdk - -#ifdef HAVE_FRIBIDI #include <fribidi/fribidi.h> -#endif #include <map> @@ -568,7 +563,6 @@ int eTextPara::renderString(const char *string, int rflags) // now do the usual logical->visual reordering int size=uc_shape.size(); -#ifdef HAVE_FRIBIDI FriBidiCharType dir=FRIBIDI_TYPE_ON; uc_visual.resize(size); // gaaanz lahm, aber anders geht das leider nicht, sorry. @@ -576,9 +570,6 @@ int eTextPara::renderString(const char *string, int rflags) std::copy(uc_shape.begin(), uc_shape.end(), array); fribidi_log2vis(array, size, &dir, target, 0, 0, 0); uc_visual.assign(target, target+size); -#else - uc_visual=uc_shape; -#endif glyphs.reserve(size); @@ -672,13 +663,11 @@ nprint: isprintable=0; } bboxValid=false; calc_bbox(); -#ifdef HAVE_FRIBIDI if (dir & FRIBIDI_MASK_RTL) { realign(dirRight); doTopBottomReordering=true; } -#endif if (charCount) { |