Mercurial > mplayer.hg
comparison sub/subreader.c @ 33341:4898b17f68f9
Change variable type to match type in fribidi function declaration.
author | reimar |
---|---|
date | Sat, 07 May 2011 20:43:19 +0000 |
parents | a61e62388508 |
children | 63dbf59fa312 |
comparison
equal
deleted
inserted
replaced
33340:8d137fb84699 | 33341:4898b17f68f9 |
---|---|
1238 */ | 1238 */ |
1239 static subtitle* sub_fribidi (subtitle *sub, int sub_utf8, int from) | 1239 static subtitle* sub_fribidi (subtitle *sub, int sub_utf8, int from) |
1240 { | 1240 { |
1241 FriBidiChar logical[LINE_LEN+1], visual[LINE_LEN+1]; // Hopefully these two won't smash the stack | 1241 FriBidiChar logical[LINE_LEN+1], visual[LINE_LEN+1]; // Hopefully these two won't smash the stack |
1242 char *ip = NULL, *op = NULL; | 1242 char *ip = NULL, *op = NULL; |
1243 FriBidiCharType base; | 1243 FriBidiParType base; |
1244 size_t len,orig_len; | 1244 size_t len,orig_len; |
1245 int l=sub->lines; | 1245 int l=sub->lines; |
1246 int char_set_num; | 1246 int char_set_num; |
1247 fribidi_boolean log2vis; | 1247 fribidi_boolean log2vis; |
1248 if (!flip_hebrew) | 1248 if (!flip_hebrew) |
1262 mp_msg(MSGT_SUBREADER,MSGL_WARN,"SUB: sub->text is longer than LINE_LEN.\n"); | 1262 mp_msg(MSGT_SUBREADER,MSGL_WARN,"SUB: sub->text is longer than LINE_LEN.\n"); |
1263 l++; | 1263 l++; |
1264 break; | 1264 break; |
1265 } | 1265 } |
1266 len = fribidi_charset_to_unicode (char_set_num, ip, len, logical); | 1266 len = fribidi_charset_to_unicode (char_set_num, ip, len, logical); |
1267 base = fribidi_flip_commas?FRIBIDI_TYPE_ON:FRIBIDI_TYPE_L; | 1267 base = fribidi_flip_commas?FRIBIDI_PAR_ON:FRIBIDI_PAR_LTR; |
1268 log2vis = fribidi_log2vis (logical, len, &base, | 1268 log2vis = fribidi_log2vis (logical, len, &base, |
1269 /* output */ | 1269 /* output */ |
1270 visual, NULL, NULL, NULL); | 1270 visual, NULL, NULL, NULL); |
1271 if(log2vis) { | 1271 if(log2vis) { |
1272 len = fribidi_remove_bidi_marks (visual, len, NULL, NULL, | 1272 len = fribidi_remove_bidi_marks (visual, len, NULL, NULL, |