mirror of https://github.com/odrling/Aegisub
gcc 4.7 compilation fixes
Originally committed to SVN as r6647.
This commit is contained in:
parent
582e947c75
commit
b11e3d7f3a
|
@ -30,6 +30,8 @@
|
|||
#include <fstream>
|
||||
#endif
|
||||
|
||||
#include <unistd.h>
|
||||
|
||||
#include "libaegisub/util.h"
|
||||
|
||||
namespace agi {
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue