From 4982083b2bf21d89e6d842c1dec07b030da57572 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 27 Apr 2013 17:56:47 +0200 Subject: [PATCH] osd: convert OSD font to OpenType The old OSD font was a PostScript Type 1 font. Convert it to OpenType to work around a fontconfig bug [1]. OpenType is a more modern format, and the font file is quite a bit smaller, so this is actually a nice change. The conversion was done by opening the font with fontforge and saving it as OpenType (CFF). fontforge showed a warning when doing this: The font contains errors. Self Intersecting Bad Private Dictionary These seem to be harmless. [1] https://bugs.freedesktop.org/show_bug.cgi?id=63922 --- Makefile | 2 +- sub/osd_font.otf | Bin 0 -> 2276 bytes sub/osd_font.pfb | Bin 8322 -> 0 bytes 3 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 sub/osd_font.otf delete mode 100644 sub/osd_font.pfb diff --git a/Makefile b/Makefile index 421f243d61..9e565c829d 100644 --- a/Makefile +++ b/Makefile @@ -377,7 +377,7 @@ video/out/gl_video_shaders.h: TOOLS/file2string.pl video/out/gl_video_shaders.gl ./$^ >$@ sub/osd_libass.c: sub/osd_font.h -sub/osd_font.h: TOOLS/file2string.pl sub/osd_font.pfb +sub/osd_font.h: TOOLS/file2string.pl sub/osd_font.otf ./$^ >$@ # ./configure must be rerun if it changed diff --git a/sub/osd_font.otf b/sub/osd_font.otf new file mode 100644 index 0000000000000000000000000000000000000000..d8ebec0ad87b72e0c9a2e5acd71d0909217211fc GIT binary patch literal 2276 zcmd^B|4&m_6hF7`_2F79Z1_57y7Wo<14Dtfh+?xjaafy%36V~sF<@s)f$*h)%KX6u zAv1o#Z=2(X{ia6EmKiY%2_{o#G|RT6l9=eWWDAllPJb|2mP~HT#dV+8_f)dQzhL)r z?&ovPJ?GqaU+;OB#z>@*?6i+0^1c%cYUken=1U^^I+656Fc^6^mYxg{EjmI(u1)nD zgY*{3(7T~)jm=g5nvteHBBnv#xvM9doT>Ts8e$``g*)QW*x%vfMVPw+S=|9cL9g@( z{4a>7qbIfJjTyNP`96al=!x!0QgIU~TZ%#HjrPQ=X1}e0z7KLI**B2NwUZCecM9_w zF^rJybFl+$MQ=VPyYvtix^?>8{^yvRl^#mv&=-+Kx1u3ND$mW*cEcZ|o@rrQOoZns zhDoyg&Q6e($a2{774#zpvU}uX$Y&v|^gK`xc-orUH^ylF44WyDv|KILDkmG}p0A{l zu>%KPd}e)>ye4P(MVd@*p#qATTp~AJFu4q$J0`c1%4Cx(B(YM=G5IB|SP3yWBZWdH zw~&J(CYNX(b(>sGDyN@Ju8_i(A)oS}N{VwijokC5KU|oy@UXz}|7>P;<#y?H|KG+)#+zhJ){hbjl94Y{PMH-f zv(l2OkTOeU@misDrBEInp4*$fW_2-3kqedWV#{B4QJG6x_X?HhVT-7Uob)<*Xa&yD zT3Sz=XfwS>J7^bm(I6eA6LfNSZ|6p@*Jps=fNBF)8Bk-uY6I37P;0?k|Nj=9mok8|*gwg*{?fUgzLDoSID^d3kn1lq>xDlL^)2x;a~sjXkMQ9NEXt z(d@*$ecof;JMU4Sa>pMC&n!a>vSc<4tIKU&nZ;^49WLN?w^ZH|7A=Yx;Ul1F(NZ8r z#IPz_(!53C!(s$9%v%b^_*S)=hc2J~O@yq8<0?PJ_n+?(r^J4%ne=B_ghd%I<6-nX zx?eb>dx$dlBSJ@arcy4o3AgxAEw%B_ouxKM_R~>$Zg1wGf+YNyIz2TtJsp~=tqp~0 zYo|if?yGX7_417ymvw24L|R)TZm#{H@}a9@NJ-sPd4LBxE{cE%SewtlyiE)hG^bRd zn>)B}PBp7yXd53=&Vayh5oR8+-h|W8RX$X36Jfd;Nnkej!Vk(KC_Hx`Jm8+YJc#b8 ztEv*7IuUedoN`z4{DlkWbxC%0C6irl$Lx08|6JuiC*zGZ8w9uBerLzNtg=u?wrf~6Sp#xP? zg8PKoE8fo7GoE>f)y@Zb1NtBz6hJYE-hd8-2D{rnIX*r)nHXYCp4ZzO$xs4rjZw@#nM{~G#zepbdEOj44*TOcuTU6wo(-2UKe Pb)9Xd2HaK+xQ*x^8)z&w literal 0 HcmV?d00001 diff --git a/sub/osd_font.pfb b/sub/osd_font.pfb deleted file mode 100644 index a4a65a143b350bff46ec179fc915624ce5f9151f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8322 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