Nikolay Sivov : dwrite: Add a helper to test for isolate class instead of relying on enum layout.
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Feb 10 11:11:09 CST 2016
Module: wine
Branch: master
Commit: 3d34f29b5c120d36da934b781f97b01e0e33e6c4
URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d34f29b5c120d36da934b781f97b01e0e33e6c4
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Wed Feb 10 13:10:47 2016 +0300
dwrite: Add a helper to test for isolate class instead of relying on enum layout.
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/dwrite/bidi.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/dlls/dwrite/bidi.c b/dlls/dwrite/bidi.c
index 273d100..abf3604 100644
--- a/dlls/dwrite/bidi.c
+++ b/dlls/dwrite/bidi.c
@@ -543,6 +543,11 @@ static inline void iso_dump_types(const char* header, IsolatedRun *run)
Note: On input only these directional classes are expected
AL, HL, R, L, ON, BN, NSM, AN, EN, ES, ET, CS,
------------------------------------------------------------------------*/
+static BOOL bidi_is_isolate(UINT8 class)
+{
+ return class == LRI || class == RLI || class == FSI || class == PDI;
+}
+
static void bidi_resolve_weak(IsolatedRun *iso_run)
{
int i;
@@ -553,7 +558,7 @@ static void bidi_resolve_weak(IsolatedRun *iso_run)
int j = get_prev_valid_char_from_run(iso_run, i);
if (j == -1)
*iso_run->item[i].class = iso_run->sos;
- else if (*iso_run->item[j].class >= LRI)
+ else if (bidi_is_isolate(*iso_run->item[j].class))
*iso_run->item[i].class = ON;
else
*iso_run->item[i].class = *iso_run->item[j].class;
@@ -754,7 +759,7 @@ static void bidi_resolve_neutrals(IsolatedRun *run)
/* Translate isolates into NI */
for (i = 0; i < run->length; i++) {
- if (*run->item[i].class >= LRI)
+ if (bidi_is_isolate(*run->item[i].class))
*run->item[i].class = NI;
switch (*run->item[i].class) {
More information about the wine-cvs
mailing list