aboutsummaryrefslogtreecommitdiff
path: root/guilib/GUIFontTTF.cpp
diff options
context:
space:
mode:
authormonkeyman_67156 <monkeyman_67156@svn>2010-01-24 07:35:34 +0000
committermonkeyman_67156 <monkeyman_67156@svn>2010-01-24 07:35:34 +0000
commit798ba45f482be8f2b6c441e18d8432535411a44c (patch)
tree2cabddf2694eb54c6a4cdd6a180c437b2ff88460 /guilib/GUIFontTTF.cpp
parent84c0a0b7328bcb68c0928950c9f058998d234766 (diff)
changed: misc. guilib cleanups
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@27131 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
Diffstat (limited to 'guilib/GUIFontTTF.cpp')
-rw-r--r--guilib/GUIFontTTF.cpp22
1 files changed, 6 insertions, 16 deletions
diff --git a/guilib/GUIFontTTF.cpp b/guilib/GUIFontTTF.cpp
index bdd72ce948..cc3931e2e7 100644
--- a/guilib/GUIFontTTF.cpp
+++ b/guilib/GUIFontTTF.cpp
@@ -165,16 +165,12 @@ void CGUIFontTTFBase::RemoveReference()
void CGUIFontTTFBase::ClearCharacterCache()
{
- if (m_texture)
- {
- delete(m_texture);
- }
+ delete(m_texture);
DeleteHardwareTexture();
m_texture = NULL;
- if (m_char)
- delete[] m_char;
+ delete[] m_char;
m_char = new Character[CHAR_CHUNK];
memset(m_charquick, 0, sizeof(m_charquick));
m_numChars = 0;
@@ -187,12 +183,9 @@ void CGUIFontTTFBase::ClearCharacterCache()
void CGUIFontTTFBase::Clear()
{
- if (m_texture)
- delete(m_texture);
-
+ delete(m_texture);
m_texture = NULL;
- if (m_char)
- delete[] m_char;
+ delete[] m_char;
memset(m_charquick, 0, sizeof(m_charquick));
m_char = NULL;
m_maxChars = 0;
@@ -246,12 +239,9 @@ bool CGUIFontTTFBase::Load(const CStdString& strFilename, float height, float as
m_height = height;
- if (m_texture)
- delete(m_texture);
-
+ delete(m_texture);
m_texture = NULL;
- if (m_char)
- delete[] m_char;
+ delete[] m_char;
m_char = NULL;
m_maxChars = 0;