From 4c5d11d58257cdffc347202ed08ea528a979200e Mon Sep 17 00:00:00 2001
From: Bill Meltsner <bill@meltsner.com>
Date: Sun, 8 Jan 2012 20:14:27 -0600
Subject: [PATCH] Backout changeset e90d89c7b9712297c14ba73eda37ec28f25101f9

---
 src/modules/graphics/opengl/Font.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/modules/graphics/opengl/Font.cpp b/src/modules/graphics/opengl/Font.cpp
index d648794e4..7a1a4bd0c 100644
--- a/src/modules/graphics/opengl/Font.cpp
+++ b/src/modules/graphics/opengl/Font.cpp
@@ -57,8 +57,7 @@ namespace opengl
 
 	void Font::createTexture()
 	{
-		texture_x = texture_y = 1;
-		rowHeight = 0;
+		texture_x = texture_y = rowHeight = 0;
 		GLuint t;
 		glGenTextures(1, &t);
 		textures.push_back(t);
@@ -93,12 +92,12 @@ namespace opengl
 		}
 		love::font::GlyphData *gd = rasterizer->getGlyphData(glyph);
 		g->spacing = gd->getAdvance();
-		int w = gd->getWidth()+1;
-		int h = gd->getHeight()+1;
+		int w = gd->getWidth();
+		int h = gd->getHeight();
 		if (texture_x + w > TEXTURE_WIDTH)
 		{ // out of space - new row!
-			texture_x = 1;
-			texture_y += rowHeight+1;
+			texture_x = 0;
+			texture_y += rowHeight;
 			rowHeight = 0;
 		}
 		if (texture_y + h > TEXTURE_HEIGHT)
@@ -107,7 +106,7 @@ namespace opengl
 		}
 		GLuint t = textures.back();
 		glBindTexture(GL_TEXTURE_2D, t);
-		glTexSubImage2D(GL_TEXTURE_2D, 0, texture_x, texture_y, w-1, h-1, (type == FONT_TRUETYPE ? GL_LUMINANCE_ALPHA : GL_RGBA), GL_UNSIGNED_BYTE, gd->getData());
+		glTexSubImage2D(GL_TEXTURE_2D, 0, texture_x, texture_y, w, h, (type == FONT_TRUETYPE ? GL_LUMINANCE_ALPHA : GL_RGBA), GL_UNSIGNED_BYTE, gd->getData());
 
 		Quad::Viewport v;
 		v.x = (float) texture_x;