summaryrefslogtreecommitdiffstats
path: root/libass/ass_fontconfig.c
Commit message (Collapse)AuthorAgeFilesLines
* Consistently use NULL for pointers instead of 0.reimar2008-11-021-6/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27876 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fallback to non-fontconfig behaviour when fontconfig initialization fails.reimar2008-11-021-5/+3
| | | | | | | Also fixes a memleak in that case, bug #1313. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27875 b3059339-0415-0410-9bf9-f77b7e298cf2
* Rename font-related preprocessor directives.diego2008-08-071-4/+4
| | | | | | | Switch them from a HAVE_ to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27425 b3059339-0415-0410-9bf9-f77b7e298cf2
* Check if the font set returned from FcFontSort in not NULL.eugeni2008-06-231-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27128 b3059339-0415-0410-9bf9-f77b7e298cf2
* Reindent.eugeni2008-06-231-35/+36
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27127 b3059339-0415-0410-9bf9-f77b7e298cf2
* Only use application font dir if library->fonts_dir is not NULL.eugeni2008-06-231-0/+2
| | | | | | | | This can be the case if ass_set_fonts_dir() call is omitted, results in segfault. Never happens in the current MPlayer. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27126 b3059339-0415-0410-9bf9-f77b7e298cf2
* Cosmetics: reindent after the last commit.eugeni2008-05-221-25/+25
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26857 b3059339-0415-0410-9bf9-f77b7e298cf2
* Read all faces of a memory font, not just the first one.eugeni2008-05-221-1/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26856 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix compilation with FontConfig <= 2.2.96.eugeni2008-05-221-0/+2
| | | | | | | | It lacks FcPatternRemove function. The code will work fine, but produce an incorrect "Selected font is not the requested one" warning in rare cases. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26851 b3059339-0415-0410-9bf9-f77b7e298cf2
* Speak of libass instead of MPlayer in the libass license headers.diego2008-05-141-4/+4
| | | | | | | | We already use LIBASS_ prefixes for the multiple inclusion guards. Thus libass can be considered separate enough to warrant this. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26770 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use standard license header.diego2008-05-131-16/+18
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26755 b3059339-0415-0410-9bf9-f77b7e298cf2
* When building font pattern, treat both ' ' and '-' as word separators.eugeni2008-05-111-7/+9
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26742 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix possible free of unallocated memory.eugeni2008-05-111-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26741 b3059339-0415-0410-9bf9-f77b7e298cf2
* Define FC_FULLNAME and FC_EMBOLDEN to fix compilation with ancient fontconfig.eugeni2008-05-081-0/+10
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26692 b3059339-0415-0410-9bf9-f77b7e298cf2
* If both full name and family are available, use the former in inexact match ↵eugeni2008-05-081-1/+1
| | | | | | warning. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26691 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove extra family names from the search pattern after FcFontSort andeugeni2008-05-081-6/+18
| | | | | | | | | | | call FcFontRenderPrepare to select the best family name for the font in case there are several of them. This does not affect font matching results, but helps to avoid warning about inexact match. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26690 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix the second fontconfig_init function as the declaration in the .h file.ulion2008-05-031-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26652 b3059339-0415-0410-9bf9-f77b7e298cf2
* Print more info about selected font.eugeni2008-05-021-2/+24
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26648 b3059339-0415-0410-9bf9-f77b7e298cf2
* Rewrite font family check in a simpler way.eugeni2008-05-021-8/+9
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26647 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move font family check to the end of the list.eugeni2008-05-021-5/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26646 b3059339-0415-0410-9bf9-f77b7e298cf2
* Cosmetics: rename local variables to better reflect their contents.eugeni2008-05-021-17/+17
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26645 b3059339-0415-0410-9bf9-f77b7e298cf2
* Only warn if both font family and it's full name are different from requested.eugeni2008-05-011-3/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26624 b3059339-0415-0410-9bf9-f77b7e298cf2
* Allow inexact font family matching.eugeni2008-05-011-0/+20
| | | | | | | | | | | | | | | In SSA/ASS fonts are sometimes referenced by their "full name", which is usually a concatenation of family name and font style (ex. Ottawa Bold). Full name is available from FontConfig pattern element FC_FULLNAME, but it is never used for font matching. Therefore, I'm removing words from the end of the name one by one, and adding shortened names to the pattern. It seems that the first value (full name in this case) has precedence in matching. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26623 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove libass dependency on global font_fontconfig variable.eugeni2008-04-301-5/+4
| | | | | | | | | A new function (ass_set_fonts_nofc) is introduced instead of an extra argument to existing ass_set_fonts to keep binary compatibility with older versions of the library. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26614 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix libass to support -nofontconfig.ulion2007-12-121-0/+14
| | | | | | | | For history reason, fontconfig is auto-enabled when ass is enabled, we keep this behavior and document it clearly. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25379 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix compilation of ass_fontconfig.c when fontconfig is disabled.iive2007-08-041-1/+2
| | | | | | | Add missing parameter to the function in the #else case git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24008 b3059339-0415-0410-9bf9-f77b7e298cf2
* More simple and correct font reselection.eugeni2007-08-031-35/+17
| | | | | | | | | Since ass_font_t contains a list of font faces, there is no need to select the face with maximum charset coverage each time. It is enough to select any face with the required glyph. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24000 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move variables and a function under #ifdef FC_VERSION to avoid warnings.eugeni2007-05-031-10/+12
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23234 b3059339-0415-0410-9bf9-f77b7e298cf2
* Deallocate FontConfig objects.eugeni2007-05-031-9/+14
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23233 b3059339-0415-0410-9bf9-f77b7e298cf2
* Don't check if user-supplied default font path exists.eugeni2007-04-101-6/+1
| | | | | | | It is checked in FT_New_Face anyway. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22964 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add some missing includes.eugeni2007-02-221-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22310 b3059339-0415-0410-9bf9-f77b7e298cf2
* Update some comments.eugeni2006-12-171-6/+12
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21646 b3059339-0415-0410-9bf9-f77b7e298cf2
* Avoid "pointer targets differ in signedness" warnings.eugeni2006-12-161-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21631 b3059339-0415-0410-9bf9-f77b7e298cf2
* Open embedded fonts directly from memory.eugeni2006-12-031-4/+42
| | | | | | | | | FontConfig 2.4.2 (released yesterday) supports scanning fonts with FcFreeTypeQueryFace without writing them to disk. With earlier FontConfig versions, the old mechanism is used. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21476 b3059339-0415-0410-9bf9-f77b7e298cf2
* Keep embedded fonts in ass_library_t and perform actual disk writeeugeni2006-12-031-2/+92
| | | | | | | | in fontconfig initialization. This is required for some fontconfig-related improvements. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21474 b3059339-0415-0410-9bf9-f77b7e298cf2
* If a glyph is not found in the current font, switch to another one.eugeni2006-11-281-14/+51
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21367 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove obsolete "no_more_font_messages" hack.eugeni2006-11-261-7/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21295 b3059339-0415-0410-9bf9-f77b7e298cf2
* MSGTRs for libasskraymer2006-11-191-13/+12
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21082 b3059339-0415-0410-9bf9-f77b7e298cf2
* Collect all includes of mplayer headers in libass in a single file (mputils.h).eugeni2006-11-191-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21042 b3059339-0415-0410-9bf9-f77b7e298cf2
* Introduce MSGT_ASS, use it for all libass messages.eugeni2006-11-031-13/+13
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20645 b3059339-0415-0410-9bf9-f77b7e298cf2
* Avoid crash with fontconfig 2.3.9x (as shipped with SuSE 10.1, FcDirScan is ↵reimar2006-10-081-1/+5
| | | | | | | | | broken) and warn that these are beta versions and not supported. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20111 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add copyright notice and vim/emacs comments to libass and vf_ass.c.eugeni2006-10-011-0/+20
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20014 b3059339-0415-0410-9bf9-f77b7e298cf2
* Cosmetics: fix indentation after last commit.eugeni2006-09-191-23/+23
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19908 b3059339-0415-0410-9bf9-f77b7e298cf2
* Don't call FcDirScan/FcDirSave with FontConfig >= 2.4.eugeni2006-09-191-1/+4
| | | | | | | Font cache is updated automatically in FcConfigAppFontAddDir. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19907 b3059339-0415-0410-9bf9-f77b7e298cf2
* no c++ decls!rfelker2006-08-211-1/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19487 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use FontConfig cache to speedup mplayer startup.eugeni2006-08-061-0/+28
| | | | | | | Patch by Zealot <zealot0630 at gmail dot com>. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19346 b3059339-0415-0410-9bf9-f77b7e298cf2
* Cosmetics.eugeni2006-07-131-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19069 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use FcPatternAdd-Type instead of FcNameParse. The latter, as it turns out, ↵eugeni2006-07-131-4/+6
| | | | | | requires escaping of some characters ('-', maybe more). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19068 b3059339-0415-0410-9bf9-f77b7e298cf2
* Only match outline fonts.eugeni2006-07-101-0/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19006 b3059339-0415-0410-9bf9-f77b7e298cf2
* Initial libass release (without mencoder support).eugeni2006-07-071-0/+192
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18942 b3059339-0415-0410-9bf9-f77b7e298cf2