← Back to branch summary

~ubuntu-branches/ubuntu/hardy/avidemux/hardy

« back to all changes in this revision

Viewing changes to avidemux/ADM_video/ADM_vidFont.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Matvey Kozhev
  • Date: 2007-12-18 13:53:04 UTC
  • mfrom: (1.1.7 upstream)
  • Revision ID: james.westby@ubuntu.com-20071218135304-cdqec2lg2bglyz15
Tags: 1:2.4~preview3-0.0ubuntu1
https://launchpad.net/bugs/163287
https://launchpad.net/bugs/126572
https://launchpad.net/bugs/138854
* Upload to Ubuntu. (LP: #163287, LP: #126572)
* debian/changelog: re-added Ubuntu releases.
* debian/control:
  - Require debhelper >= 5.0.51 (for dh_icons) and imagemagick.
  - Build-depend on libsdl1.2-dev instead of libsdl-dev.
  - Build against newer libx264-dev. (LP: #138854)
  - Removed libamrnb-dev, not in Ubuntu yet.
* debian/rules:
  - Install all icon sizes, using convert (upstream installs none).
  - Added missing calls to dh_installmenu, dh_installman, dh_icons and
    dh_desktop.
* debian/menu, debian/avidemux-qt.menu:
  - Corrected package and executable names.
* debian/avidemux-common.install: Install icons.
* debian/avidemux.common.manpages: Install man/avidemux.1.
* debian/links, debian/avidemux-cli.links, debian/avidemux-gtk.links:
  - Link manpages to avidemux.1.gz.
* debian/install, debian/avidemux-qt.install, debian/avidemux-gtk.desktop,
  debian/avidemux-qt.desktop: Install desktop files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
avidemux/ADM_video/ADM_vidFont.cpp
14
14
 *   (at your option) any later version.                                   *
15
15
 *                                                                         *
16
16
 ***************************************************************************/
17
 
#include <stdio.h>
18
 
#include <stdlib.h>
 
17
 
 
18
#include "default.h"
 
19
 
19
20
#include <iconv.h>
20
 
#include <string.h> // thanks !
21
 
#include "config.h"
22
 
#include <errno.h>
23
 
#include "ADM_library/default.h"
24
21
 
25
22
 #ifdef USE_FREETYPE
26
23
 
140
137
        //printf("FONT: rendering %d %c\n",c,c);
141
138
        *ww=0;  
142
139
/* Ugly patch t avoid some display problem */   
 
140
#if 0
143
141
        if(c=='\'') c='"';
144
142
        if(prevchar=='\'') prevchar='"';
 
143
#endif
145
144
/* Ugly patch t avoid some display problem */
146
145
        glyph_index = FT_Get_Char_Index( _face, c );
147
146
        if(prevchar)