From 25ed1ef8ea4eaae6b8fd1a0f5c36dc3d6e47ab4f Mon Sep 17 00:00:00 2001
From: Jason Felds <jafelds@gmail.com>
Date: Mon, 21 Mar 2011 01:40:39 -0400
Subject: [PATCH] Finish the job here before leak testing.

Now...how to remove the leak...?
---
 src/Font.cpp | 9 +++++----
 src/Font.h   | 4 +++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/Font.cpp b/src/Font.cpp
index fed6ed7835..209158c7cf 100644
--- a/src/Font.cpp
+++ b/src/Font.cpp
@@ -13,7 +13,8 @@
 
 FontPage::FontPage(): m_iHeight(0), m_iLineSpacing(0), m_fVshift(0),
 	m_iDrawExtraPixelsLeft(0), m_iDrawExtraPixelsRight(0),
-	m_sTexturePath("") {}
+	m_FontPageTextures(), m_sTexturePath(""), m_aGlyphs(),
+	m_iCharToGlyphNo() {}
 
 void FontPage::Load( const FontPageSettings &cfg )
 {
@@ -221,9 +222,9 @@ int Font::GetLineHeightInSourcePixels( const wstring &szLine ) const
 
 
 Font::Font(): m_iRefCount(1), path(""), m_apPages(), m_pDefault(NULL),
-	m_bRightToLeft(false), m_DefaultStrokeColor(RageColor(0,0,0,0)),
-	m_sChars("") {} // strokes aren't shown by default, hence the Color.
-
+	m_iCharToGlyph(), m_bRightToLeft(false),
+	// strokes aren't shown by default, hence the Color.
+	m_DefaultStrokeColor(RageColor(0,0,0,0)), m_sChars("") {}
 Font::~Font()
 {
 	Unload();
diff --git a/src/Font.h b/src/Font.h
index 4242693a34..d57a6b5eae 100644
--- a/src/Font.h
+++ b/src/Font.h
@@ -84,7 +84,9 @@ struct FontPageSettings
 		m_iDefaultWidth(-1),
 		m_iAdvanceExtraPixels(1),
 		m_fScaleAllWidthsBy(1),
-		m_sTextureHints("default")
+		m_sTextureHints("default"),
+		CharToGlyphNo(),
+		m_mapGlyphWidths()
 	{ }
 
 	/**