summaryrefslogtreecommitdiffstats
path: root/libvo/font_load.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn changes up to r30216Uoti Urpala2010-01-081-0/+2
|\
| * Add missing header #includes to fix 'make checkheaders'.diego2010-01-041-0/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30208 b3059339-0415-0410-9bf9-f77b7e298cf2
| * whitespace cosmetics: Remove all trailing whitespace.diego2009-05-131-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Remove trailing whitespace from most filesUoti Urpala2009-07-071-2/+2
| |
* | Merge svn changes up to r28537Uoti Urpala2009-02-121-0/+18
|\|
| * Add standard license headers, unify header formatting.diego2009-02-081-0/+18
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28481 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28310Uoti Urpala2009-01-151-10/+1
|\| | | | | | | | | | | | | | | The libdvdread4 and libdvdnav directories, which are externals in the svn repository, are at least for now not included in any form. I added configure checks to automatically disable internal libdvdread and libdvdnav if the corresponding directories are not present; if they're added manually then things work the same as in svn.
| * Support loading font faces other then the first one in a font file.eugeni2009-01-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | With -fontconfig, it is possible to select a face with index higher than 0 in a multi-face font file. Currently, with the old rendering code, this information is lost and the first face is loaded. With this change, index supplied by fontconfig is used for font loading. Patch by Adrian Stutz, adrian sttz ch. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28276 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Conditionally define render_one_glyph and kerning dummy functions indiego2009-01-021-9/+0
| | | | | | | | | | | | | | | | | | font_load.c when FreeType is not enabled instead of conditionally defining them in font_load.h. This moves the workaround closer to where the actual problem is. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28235 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27441Uoti Urpala2008-08-081-5/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cfg-common-opts.h command.c configure input/input.c libmpcodecs/dec_video.c libmpcodecs/vd.c libmpdemux/stheader.h libvo/sub.c libvo/video_out.c libvo/vo_xv.c libvo/vosub_vidix.c libvo/x11_common.c libvo/x11_common.h mp_core.h mplayer.c stream/stream.h
| * Rename font-related preprocessor directives.diego2008-08-071-5/+5
| | | | | | | | | | | | | | Switch them from a HAVE_ to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27425 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Move global sub_font to OSD structUoti Urpala2008-06-241-1/+0
|/
* Give name to font_desc struct, patch by Bryan Henderson, giraffedata gmail com.diego2008-06-091-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27045 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add MPLAYER_ prefix to multiple inclusion guards.diego2008-02-221-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26061 b3059339-0415-0410-9bf9-f77b7e298cf2
* Consistently use uppercase filename as multiple inclusion guard.diego2008-01-281-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25897 b3059339-0415-0410-9bf9-f77b7e298cf2
* Allow independent scaling of vo_font and sub_font.reimar2008-01-271-2/+2
| | | | | | | Patch by Guillaume LECERF (foxcore gmail com). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25879 b3059339-0415-0410-9bf9-f77b7e298cf2
* Consistently use just the name of the #ifdef directive in #endif comments.diego2008-01-011-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25574 b3059339-0415-0410-9bf9-f77b7e298cf2
* Do not use leading underscores in multiple inclusion guards, they are reserved.diego2007-07-021-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23709 b3059339-0415-0410-9bf9-f77b7e298cf2
* add new -subfont option, that allows having a different font for OSD ↵ben2007-05-201-1/+2
| | | | | | (controls and menu) and subtitles git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23356 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make blur() public. Will be used in libass.eugeni2006-09-161-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19853 b3059339-0415-0410-9bf9-f77b7e298cf2
* Marks several string parameters as const when they are not modified in the ↵reynaldo2006-07-091-2/+2
| | | | | | function, Patch by Stefan Huehner, stefan AT huehner-org git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18985 b3059339-0415-0410-9bf9-f77b7e298cf2
* Patch by Stefan Huehner / stefan % huehner ! org \rathann2006-02-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | patch replaces '()' for the correct '(void)' in function declarations/prototypes which have no parameters. The '()' syntax tell thats there is a variable list of arguments, so that the compiler cannot check this. The extra CFLAG '-Wstrict-declarations' shows those cases. Comments about a similar patch applied to ffmpeg: That in C++ these mean the same, but in ANSI C the semantics are different; function() is an (obsolete) K&R C style forward declaration, it basically means that the function can have any number and any types of parameters, effectively completely preventing the compiler from doing any sort of type checking. -- Erik Slagter Defining functions with unspecified arguments is allowed but bad. With arguments unspecified the compiler can't report an error/warning if the function is called with incorrect arguments. -- Måns Rullgård git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17567 b3059339-0415-0410-9bf9-f77b7e298cf2
* freetype build fixhenry2003-11-201-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11501 b3059339-0415-0410-9bf9-f77b7e298cf2
* these patches let ,,oldstyle'' and freetype subtitle renderers livearpi2002-12-291-8/+8
| | | | | | | | | | | together happily. if an oldstyle subtitle (font.desc) is found, it will be used. otherwise mplayer will choose subfont.ttf, if freetype was detected during ./configure. (also you can use -font /path/to/font.desc and -font /path/to/foobar.ttf too) patch-set by Wojtek Kaniewski <wojtekka@bydg.pdi.net> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8636 b3059339-0415-0410-9bf9-f77b7e298cf2
* 2*100l, extern fv() {} is nonsense, you have to decide if it is extern orarpi2002-08-301-12/+3
| | | | | | | local but never both! git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7166 b3059339-0415-0410-9bf9-f77b7e298cf2
* add Jindrich Makovicka <makovick@KMLinux.fjfi.cvut.cz> freetype patchpontscho2002-08-291-5/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7141 b3059339-0415-0410-9bf9-f77b7e298cf2
* freetype 2.0/2.1+ support - disabled by default until bugs fixedarpi2002-08-281-0/+81
| | | | | | | patch by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7123 b3059339-0415-0410-9bf9-f77b7e298cf2
* .raw width>=65536 support by Georgi Georgiev <chutz@chubaka.homeip.net>arpi2002-05-021-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5929 b3059339-0415-0410-9bf9-f77b7e298cf2
* moved font_laod.harpi2002-03-241-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5295 b3059339-0415-0410-9bf9-f77b7e298cf2
* Applied DATADIR patch by Vladimir Kushnirarpi2001-07-201-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1354 b3059339-0415-0410-9bf9-f77b7e298cf2
* better .smi support and display two-byte characters- patch by Sunjin Yangarpi_esp2001-05-061-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@707 b3059339-0415-0410-9bf9-f77b7e298cf2
* printf's only if verbose>1arpi_esp2001-04-111-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@340 b3059339-0415-0410-9bf9-f77b7e298cf2
* font alpha resampling, see -ffactorarpi_esp2001-03-251-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@216 b3059339-0415-0410-9bf9-f77b7e298cf2
* desc fileformat changesarpi_esp2001-03-251-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@215 b3059339-0415-0410-9bf9-f77b7e298cf2
* subtitle+OSD font supportarpi_esp2001-03-251-0/+22
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@214 b3059339-0415-0410-9bf9-f77b7e298cf2