]> granicus.if.org Git - fribidi/commitdiff
Restore call to fribidi_unicode_to_charset
authorKhaled Hosny <khaledhosny@eglug.org>
Sat, 11 Nov 2017 20:59:45 +0000 (22:59 +0200)
committerKhaled Hosny <khaledhosny@eglug.org>
Tue, 14 Nov 2017 18:48:57 +0000 (20:48 +0200)
This partially reverts commit e71e49f9645d21ab511723caf8c75e8d9880aacf
as it broke make check badly!

bin/fribidi-main.c

index ac0b97f8ba95b5dcc5c45f4176ebefb447c1fab2..b847ee517b7cfd2ffe12b27881b53d3cb322f948 100644 (file)
@@ -458,7 +458,7 @@ FRIBIDI_END_IGNORE_DEPRECATIONS
                        FriBidiStrIndex idx, st;
                        for (idx = 0; idx < len;)
                          {
-                           FriBidiStrIndex wid;
+                           FriBidiStrIndex wid, inlen;
 
                            wid = break_width;
                            st = idx;
@@ -479,7 +479,11 @@ FRIBIDI_END_IGNORE_DEPRECATIONS
                                }
                            if (wid < 0 && idx - st > 1)
                              idx--;
+                           inlen = idx - st;
 
+                           fribidi_unicode_to_charset (char_set_num,
+                                                       visual + st, inlen,
+                                                       outstring);
                            if (FRIBIDI_IS_RTL (base))
                              printf ("%*s",
                                      (int) (do_pad ? (padding_width +