Commit aded31227520147466b46ac3922d86f813e5b5c3
2001-08-20T21:44:00
Gerards fixes to compile under Linux
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54
diff --git a/include/FTLibrary.h b/include/FTLibrary.h
index 5c4c0ff..931adea 100755
--- a/include/FTLibrary.h
+++ b/include/FTLibrary.h
@@ -25,8 +25,8 @@ class FTLibrary
private:
// methods
FTLibrary();
- FTLibrary( const& FT_Library ){}
- FTLibrary& operator=( const& FT_Library ){}
+ FTLibrary( const FT_Library&){}
+ FTLibrary& operator=( const FT_Library&){}
bool Init();
// attributes
diff --git a/src/FTGLTextureFont.cpp b/src/FTGLTextureFont.cpp
index 9cf1448..902d79c 100755
--- a/src/FTGLTextureFont.cpp
+++ b/src/FTGLTextureFont.cpp
@@ -38,14 +38,14 @@ FTGLTextureFont::FTGLTextureFont()
FTGLTextureFont::~FTGLTextureFont()
{
- glDeleteTextures( numTextures, glTextureID);
+ glDeleteTextures( numTextures, (const GLuint*)glTextureID);
}
bool FTGLTextureFont::MakeGlyphList()
{
if( !maxTextSize)
- glGetIntegerv( GL_MAX_TEXTURE_SIZE, &maxTextSize);
+ glGetIntegerv( GL_MAX_TEXTURE_SIZE, (GLint*)&maxTextSize);
glyphHeight = ( charSize.Height()) + padding;
glyphWidth = ( charSize.Width()) + padding;
@@ -62,7 +62,7 @@ bool FTGLTextureFont::MakeGlyphList()
int heightRemain = NextPowerOf2( textureHeight % maxTextSize);
totalMem = ((maxTextSize * ( numTextures - 1)) + heightRemain) * textureWidth;
- glGenTextures( numTextures, &glTextureID[0]);
+ glGenTextures( numTextures, (GLuint*)&glTextureID[0]);
textMem = new unsigned char[totalMem]; // GL_ALPHA texture;
std::memset( textMem, 0, totalMem);
@@ -88,7 +88,7 @@ bool FTGLTextureFont::MakeGlyphList()
textureHeight = NextPowerOf2( textureHeight);
totalMem = textureWidth * textureHeight;
- glGenTextures( numTextures, &glTextureID[0]);
+ glGenTextures( numTextures, (GLuint*)&glTextureID[0]);
textMem = new unsigned char[totalMem]; // GL_ALPHA texture;
std::memset( textMem, 0, totalMem);