Commit 1010afa2e68a105e796972084639d7af873c3bfe

henry 2001-10-25T02:01:20

Removed redundant tempGlyph members

diff --git a/include/FTGLBitmapFont.h b/include/FTGLBitmapFont.h
index 43e4e20..6193de9 100755
--- a/include/FTGLBitmapFont.h
+++ b/include/FTGLBitmapFont.h
@@ -52,10 +52,5 @@ class FTGL_EXPORT FTGLBitmapFont : public FTFont
 		 */
 		bool MakeGlyphList();
 		
-		/**
-		 * Temp variable for a FTBitmapGlyph
-		 */
-		FTBitmapGlyph* tempGlyph;
-		
 };
 #endif	//	__FTGLBitmapFont__
diff --git a/include/FTGLOutlineFont.h b/include/FTGLOutlineFont.h
index fee7499..2e8378d 100755
--- a/include/FTGLOutlineFont.h
+++ b/include/FTGLOutlineFont.h
@@ -52,10 +52,5 @@ class FTGL_EXPORT FTGLOutlineFont : public FTFont
 		 */
 		bool MakeGlyphList();
 		
-		/**
-		 * A temporary FTOutlineGlyph used for building the glyphList
-		 */
-		FTOutlineGlyph* tempGlyph;
-	
 };
 #endif // __FTGLOutlineFont__
diff --git a/include/FTGLPixmapFont.h b/include/FTGLPixmapFont.h
index 05cf171..8b8e150 100755
--- a/include/FTGLPixmapFont.h
+++ b/include/FTGLPixmapFont.h
@@ -51,11 +51,6 @@ class FTGL_EXPORT FTGLPixmapFont : public FTFont
 		 */
 		bool MakeGlyphList();
 		
-		/**
-		 * A temporary FTPixmapGlyph used for building the glyphList
-		 */
-		FTPixmapGlyph* tempGlyph;
-		
 };
 
 
diff --git a/include/FTGLPolygonFont.h b/include/FTGLPolygonFont.h
index 92c3b9a..14d3bf0 100755
--- a/include/FTGLPolygonFont.h
+++ b/include/FTGLPolygonFont.h
@@ -36,12 +36,6 @@ class FTGL_EXPORT FTGLPolygonFont : public FTFont
 		 */
 		bool MakeGlyphList();
 		
-		/**
-		 * A temporary FTPolyGlyph used for building the glyphList
-		 */
-		FTPolyGlyph* tempGlyph;
-
-		
 };
 
 
diff --git a/include/FTGLTextureFont.h b/include/FTGLTextureFont.h
index 0f5ec01..a32c1c2 100755
--- a/include/FTGLTextureFont.h
+++ b/include/FTGLTextureFont.h
@@ -100,12 +100,6 @@ class  FTGL_EXPORT FTGLTextureFont : public FTFont
 		void CreateTexture( int id, int width, int height, unsigned char* data);
 		
 		/**
-		 * A temporary FTTextureGlyph used for building the glyphList
-		 */
-		FTTextureGlyph* tempGlyph;
-		
-		
-		/**
 		 * The maximum texture dimension on this OpenGL implemetation
 		 */
 		long maxTextSize;
diff --git a/src/FTGLBitmapFont.cpp b/src/FTGLBitmapFont.cpp
index 9e1c56d..fef372b 100755
--- a/src/FTGLBitmapFont.cpp
+++ b/src/FTGLBitmapFont.cpp
@@ -4,7 +4,6 @@
 
 
 FTGLBitmapFont::FTGLBitmapFont()
-:	tempGlyph(0)
 {}
 
 
@@ -23,7 +22,7 @@ bool FTGLBitmapFont::MakeGlyphList()
 
 		if( ftGlyph)
 		{
-			tempGlyph = new FTBitmapGlyph( *ftGlyph);
+			FTBitmapGlyph* tempGlyph = new FTBitmapGlyph( *ftGlyph);
 			glyphList->Add( tempGlyph);
 		}
 		else
diff --git a/src/FTGLOutlineFont.cpp b/src/FTGLOutlineFont.cpp
index 25a4ed3..fcb404a 100755
--- a/src/FTGLOutlineFont.cpp
+++ b/src/FTGLOutlineFont.cpp
@@ -5,7 +5,6 @@
 
 
 FTGLOutlineFont::FTGLOutlineFont()
-:	tempGlyph(0)
 {}
 
 
@@ -21,7 +20,7 @@ bool FTGLOutlineFont::MakeGlyphList()
 		
 		if( ftGlyph)
 		{
-			tempGlyph = new FTOutlineGlyph( *ftGlyph);
+			FTOutlineGlyph* tempGlyph = new FTOutlineGlyph( *ftGlyph);
 			glyphList->Add( tempGlyph);
 		}
 		else
diff --git a/src/FTGLPixmapFont.cpp b/src/FTGLPixmapFont.cpp
index 0fe7caa..7ad2cfe 100755
--- a/src/FTGLPixmapFont.cpp
+++ b/src/FTGLPixmapFont.cpp
@@ -4,7 +4,6 @@
 
 
 FTGLPixmapFont::FTGLPixmapFont()
-:	tempGlyph(0)
 {}
 
 
@@ -23,7 +22,7 @@ bool FTGLPixmapFont::MakeGlyphList()
 	
 		if( ftGlyph)
 		{
-			tempGlyph = new FTPixmapGlyph( *ftGlyph);
+			FTPixmapGlyph* tempGlyph = new FTPixmapGlyph( *ftGlyph);
 			glyphList->Add( tempGlyph);
 		}
 		else
diff --git a/src/FTGLPolygonFont.cpp b/src/FTGLPolygonFont.cpp
index 7cbb1ed..57a2033 100755
--- a/src/FTGLPolygonFont.cpp
+++ b/src/FTGLPolygonFont.cpp
@@ -6,7 +6,6 @@
 
 
 FTGLPolygonFont::FTGLPolygonFont()
-:	tempGlyph(0)
 {}
 
 
@@ -22,7 +21,7 @@ bool FTGLPolygonFont::MakeGlyphList()
 		
 		if( ftGlyph)
 		{
-			tempGlyph = new FTPolyGlyph( *ftGlyph);
+			FTPolyGlyph* tempGlyph = new FTPolyGlyph( *ftGlyph);
 			glyphList->Add( tempGlyph);
 		}
 		else
diff --git a/src/FTGLTextureFont.cpp b/src/FTGLTextureFont.cpp
index 74c9b42..ca504e1 100755
--- a/src/FTGLTextureFont.cpp
+++ b/src/FTGLTextureFont.cpp
@@ -24,7 +24,6 @@ FTGLTextureFont::FTGLTextureFont()
 :	numTextures(1),
 	textMem(0),
 	padding(1),
-	tempGlyph(0),
 	maxTextSize(0),
 	textureWidth(0),
 	textureHeight(0),
@@ -122,7 +121,7 @@ unsigned int FTGLTextureFont::FillGlyphs( unsigned int glyphStart, int id, int w
 			
 			currTextU = (float)currentTextX / (float)width;
 			
-			tempGlyph = new FTTextureGlyph( *ftGlyph, id, data, width, height, currTextU, currTextV);
+			FTTextureGlyph* tempGlyph = new FTTextureGlyph( *ftGlyph, id, data, width, height, currTextU, currTextV);
 			glyphList->Add( tempGlyph);
 
 			currentTextX += glyphWidth;