← Back to branch summary

~ubuntu-branches/ubuntu/natty/vlc/natty

« back to all changes in this revision

Viewing changes to modules/gui/skins2/src/ft2_bitmap.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Benjamin Drung
  • Date: 2010-06-25 01:09:16 UTC
  • mfrom: (1.1.30 upstream)
  • Revision ID: james.westby@ubuntu.com-20100625010916-asxhep2mutg6g6pd
Tags: 1.1.0-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - build and install the libx264 plugin
  - add Xb-Npp header to vlc package
  - Add apport hook to include more vlc dependencies in bug reports
* Drop xulrunner patches.
* Drop 502_xulrunner_191.diff.

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/gui/skins2/src/ft2_bitmap.cpp
2
2
 * ft2_bitmap.cpp
3
3
 *****************************************************************************
4
4
 * Copyright (C) 2003 the VideoLAN team
5
 
 * $Id: 7cc8a84f45b561fceebe7951cb6abb5be17e0a86 $
 
5
 * $Id: e7437551add64a0409a16ec8721878d4028e9a70 $
6
6
 *
7
7
 * Authors: Cyril Deguet     <asmax@via.ecp.fr>
8
8
 *          Olivier Teulière <ipkiss@via.ecp.fr>
36
36
 
37
37
FT2Bitmap::~FT2Bitmap()
38
38
{
39
 
    if( m_pData )
40
 
    {
41
 
        delete[] m_pData;
42
 
    }
 
39
    delete[] m_pData;
43
40
}
44
41
 
45
42