iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

gcc 4.7 compilation fixes 

Originally committed to SVN as r6647.
This commit is contained in:
Thomas Goyne 2012-04-03 17:38:45 +00:00
parent 582e947c75
commit b11e3d7f3a
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
aegisub/libaegisub/unix/access.cpp
View File

@ -30,6 +30,8 @@
#include <fstream> #include <fstream>
#endif #endif
#include <unistd.h>
#include "libaegisub/util.h" #include "libaegisub/util.h"
namespace agi { namespace agi {

4
aegisub/src/gl_text.cpp
View File

@ -67,7 +67,7 @@ struct OpenGLTextGlyph {
wxFont font; ///< Font used for this glyph wxFont font; ///< Font used for this glyph
OpenGLTextGlyph(int value, wxFont const& font); 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) /// 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); glBindTexture(GL_TEXTURE_2D, tex);
glEnableClientState(GL_VERTEX_ARRAY); glEnableClientState(GL_VERTEX_ARRAY);
glEnableClientState(GL_TEXTURE_COORD_ARRAY); glEnableClientState(GL_TEXTURE_COORD_ARRAY);