projects
/
vuplus_dvbapp
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2437978
)
lib/gdi/font.cpp: assume HAVE_FRIBIDI is always set
author
Andreas Oberritter
<obi@opendreambox.org>
Fri, 22 Oct 2010 12:56:11 +0000
(12:56 +0000)
committer
Andreas Oberritter
<obi@opendreambox.org>
Tue, 16 Nov 2010 16:09:12 +0000
(17:09 +0100)
lib/gdi/font.cpp
patch
|
blob
|
history
diff --git
a/lib/gdi/font.cpp
b/lib/gdi/font.cpp
index
3b5ca94
..
9e17547
100644
(file)
--- 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>
#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>
#include <fribidi/fribidi.h>
-#endif
#include <map>
#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();
// 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.
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);
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);
glyphs.reserve(size);
@@
-672,13
+663,11
@@
nprint: isprintable=0;
}
bboxValid=false;
calc_bbox();
}
bboxValid=false;
calc_bbox();
-#ifdef HAVE_FRIBIDI
if (dir & FRIBIDI_MASK_RTL)
{
realign(dirRight);
doTopBottomReordering=true;
}
if (dir & FRIBIDI_MASK_RTL)
{
realign(dirRight);
doTopBottomReordering=true;
}
-#endif
if (charCount)
{
if (charCount)
{