From b11e3d7f3a20b27fa7c99e4046a6cdfe189f658f Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Tue, 3 Apr 2012 17:38:45 +0000 Subject: [PATCH] gcc 4.7 compilation fixes Originally committed to SVN as r6647. --- aegisub/libaegisub/unix/access.cpp | 2 ++ aegisub/src/gl_text.cpp | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/aegisub/libaegisub/unix/access.cpp b/aegisub/libaegisub/unix/access.cpp index 2b64a6fc2..88eae8e9e 100644 --- a/aegisub/libaegisub/unix/access.cpp +++ b/aegisub/libaegisub/unix/access.cpp @@ -30,6 +30,8 @@ #include #endif +#include + #include "libaegisub/util.h" namespace agi { diff --git a/aegisub/src/gl_text.cpp b/aegisub/src/gl_text.cpp index 826d8d24b..f619ee8ab 100644 --- a/aegisub/src/gl_text.cpp +++ b/aegisub/src/gl_text.cpp @@ -67,7 +67,7 @@ struct OpenGLTextGlyph { wxFont font; ///< Font used for this glyph OpenGLTextGlyph(int value, wxFont const& font); - void Draw(int x,int y) const; + void Draw(float x, float y) const; }; @@ -347,7 +347,7 @@ void OpenGLTextTexture::Insert(OpenGLTextGlyph &glyph) { } /// Draw a glyph at (x,y) -void OpenGLTextGlyph::Draw(int x,int y) const { +void OpenGLTextGlyph::Draw(float x, float y) const { glBindTexture(GL_TEXTURE_2D, tex); glEnableClientState(GL_VERTEX_ARRAY); glEnableClientState(GL_TEXTURE_COORD_ARRAY);