Commit 211ae07d authored by Christophe Mutricy's avatar Christophe Mutricy

freetype.c: BeOS fix (c++ism) and cosmetic

parent 4c640001
...@@ -526,34 +526,35 @@ static int RenderText( filter_t *p_filter, subpicture_region_t *p_region_out, ...@@ -526,34 +526,35 @@ static int RenderText( filter_t *p_filter, subpicture_region_t *p_region_out,
#if defined(HAVE_FRIBIDI) #if defined(HAVE_FRIBIDI)
{ {
uint32_t *p_fribidi_string; uint32_t *p_fribidi_string;
int start_pos, pos = 0;
p_fribidi_string = malloc( (i_string_length + 1) * sizeof(uint32_t) ); p_fribidi_string = malloc( (i_string_length + 1) * sizeof(uint32_t) );
/* Do bidi conversion line-by-line */ /* Do bidi conversion line-by-line */
int pos = 0; while(pos < i_string_length)
while(pos < i_string_length) {
{ while(pos < i_string_length) {
while(pos < i_string_length) { i_char = psz_unicode[pos];
i_char = psz_unicode[pos]; if (i_char != '\r' && i_char != '\n')
if (i_char != '\r' && i_char != '\n') break;
break; p_fribidi_string[pos] = i_char;
p_fribidi_string[pos] = i_char; ++pos;
++pos; }
} start_pos = pos;
int start_pos = pos; while(pos < i_string_length) {
while(pos < i_string_length) { i_char = psz_unicode[pos];
i_char = psz_unicode[pos]; if (i_char == '\r' || i_char == '\n')
if (i_char == '\r' || i_char == '\n') break;
break; ++pos;
++pos; }
} if (pos > start_pos)
if (pos > start_pos) {
{ FriBidiCharType base_dir = FRIBIDI_TYPE_LTR;
FriBidiCharType base_dir = FRIBIDI_TYPE_LTR; fribidi_log2vis((FriBidiChar*)psz_unicode + start_pos, pos - start_pos,
fribidi_log2vis((FriBidiChar*)psz_unicode + start_pos, pos - start_pos, &base_dir, (FriBidiChar*)p_fribidi_string + start_pos, 0, 0, 0);
&base_dir, (FriBidiChar*)p_fribidi_string + start_pos, 0, 0, 0); }
} }
}
free( psz_unicode_orig ); free( psz_unicode_orig );
psz_unicode = psz_unicode_orig = p_fribidi_string; psz_unicode = psz_unicode_orig = p_fribidi_string;
p_fribidi_string[ i_string_length ] = 0; p_fribidi_string[ i_string_length ] = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment