RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Reuse utf8_get_char in subtitle rendering code. 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21596 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2006-12-11 22:29:08 +00:00
parent fad12bd37b
commit 7147ed7ab6
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libvo/sub.c
View File

@ -428,20 +428,13 @@ inline static void vo_update_text_sub(mp_osd_obj_t* obj,int dxs,int dys){
x = 1; x = 1;
// reading the subtitle words from vo_sub->text[] // reading the subtitle words from vo_sub->text[]
for (j=0;j<=len;j++){ while (*t) {
if ((c=t[j])>=0x80){ if (sub_utf8)
if (sub_utf8){ c = utf8_get_char(&t);
if ((c & 0xe0) == 0xc0) /* 2 bytes U+00080..U+0007FF*/ else if ((c = *t++) >= 0x80 && sub_unicode)
c = (c & 0x1f)<<6 | (t[++j] & 0x3f); c = (c<<8) + *t++;
else if((c & 0xf0) == 0xe0){ /* 3 bytes U+00800..U+00FFFF*/
c = (((c & 0x0f)<<6) | (t[++j] & 0x3f))<<6;
c |= (t[++j] & 0x3f);
}
} else if (sub_unicode)
c = (c<<8) + t[++j];
}
if (k==MAX_UCS){ if (k==MAX_UCS){
len=j; // end here t += strlen(t); // end here
mp_msg(MSGT_OSD,MSGL_WARN,"\nMAX_UCS exceeded!\n"); mp_msg(MSGT_OSD,MSGL_WARN,"\nMAX_UCS exceeded!\n");
} }
if (!c) c++; // avoid UCS 0 if (!c) c++; // avoid UCS 0