← Back to branch summary

~ubuntu-branches/ubuntu/lucid/vlc/lucid-security

« back to all changes in this revision

Viewing changes to modules/misc/freetype.c

  • Committer: Bazaar Package Importer
  • Author(s): Benjamin Drung
  • Date: 2009-09-25 14:44:17 UTC
  • mfrom: (3.5.1 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090925144417-87vomt575d0agvqa
Tags: 1.0.2-1ubuntu1
https://launchpad.net/bugs/435524
* Merge from Debian unstable (LP: #435524), remaining changes:
  - build against xulrunner-dev instead of iceape-dev
  - build against libx264-dev and install libx264 plugin
  - add Xb-Npp header to vlc package
  - recommend vlc-plugin-pulse for vlc

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/misc/freetype.c
2
2
 * freetype.c : Put text on the video, using freetype2
3
3
 *****************************************************************************
4
4
 * Copyright (C) 2002 - 2007 the VideoLAN team
5
 
 * $Id: 7e458663d77eb3f342480ac2cdc31684f5a88afe $
 
5
 * $Id: 901497f1da42286c108c046ae9e7b66cbe5c4cf6 $
6
6
 *
7
7
 * Authors: Sigmund Augdal Helberg <dnumgis@videolan.org>
8
8
 *          Gildas Bazin <gbazin@videolan.org>
51
51
#define FT_MulFix(v, s) (((v)*(s))>>16)
52
52
 
53
53
#ifdef __APPLE__
54
 
#define DEFAULT_FONT "/System/Library/Fonts/LucidaGrande.dfont"
55
 
#define FC_DEFAULT_FONT "Lucida Grande"
 
54
#import <Carbon/Carbon.h>
 
55
#endif
 
56
 
 
57
#ifdef __APPLE__
 
58
#define DEFAULT_FONT "/Library/Fonts/Arial Black.ttf"
 
59
#define FC_DEFAULT_FONT "Arial Black"
56
60
#elif defined( SYS_BEOS )
57
61
#define DEFAULT_FONT "/boot/beos/etc/fonts/ttfonts/Swiss721.ttf"
58
62
#define FC_DEFAULT_FONT "Swiss"
327
331
#ifdef WIN32
328
332
        GetWindowsDirectory( psz_fontfile, PATH_MAX + 1 );
329
333
        strcat( psz_fontfile, "\\fonts\\arial.ttf" );
330
 
#elif defined(__APPLE__)
331
 
        strcpy( psz_fontfile, DEFAULT_FONT );
332
334
#else
333
335
        msg_Err( p_filter, "user didn't specify a font" );
334
336
        goto error;