Commit 8fd8b00918fc81f952d23a904a660c306f23deeb
2002-07-01T09:44:57
Inlined private functions
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 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177
diff --git a/include/FTFont.h b/include/FTFont.h
index c2daa0c..8fede1a 100755
--- a/include/FTFont.h
+++ b/include/FTFont.h
@@ -188,7 +188,6 @@ class FTGL_EXPORT FTFont
*/
FT_Error Error() const { return err;}
-
protected:
/**
* Construct a glyph of the correct type.
@@ -199,7 +198,7 @@ class FTGL_EXPORT FTFont
* @param g The glyph index NOT the char code.
* @return An FT****Glyph or <code>null</code> on failure.
*/
- virtual FTGlyph* MakeGlyph( unsigned int g) = 0;
+ inline virtual FTGlyph* MakeGlyph( unsigned int g) = 0;
/**
* Construct the internal glyph cache.
@@ -209,24 +208,7 @@ class FTGL_EXPORT FTFont
*
* @return <code>true</code> on success.
*/
- virtual bool MakeGlyphList();
-
- /**
- * Get the advance width for a character.
- *
- * @param chr current character
- * @param nextChr next character
- * @return advance width
- */
- float doAdvance( const unsigned int chr, const unsigned int nextChr);
-
- /**
- * Render a character
- *
- * @param chr current character
- * @param nextChr next character
- */
- void doRender( const unsigned int chr, const unsigned int nextChr);
+ inline virtual bool MakeGlyphList();
/**
* Current face object
@@ -269,6 +251,24 @@ class FTGL_EXPORT FTFont
FT_Error err;
private:
+ /**
+ * Get the advance width for a character.
+ *
+ * @param chr current character
+ * @param nextChr next character
+ * @return advance width
+ */
+ inline float doAdvance( const unsigned int chr, const unsigned int nextChr);
+
+ /**
+ * Render a character
+ *
+ * @param chr current character
+ * @param nextChr next character
+ */
+ inline void doRender( const unsigned int chr, const unsigned int nextChr);
+
+
};
diff --git a/include/FTGLBitmapFont.h b/include/FTGLBitmapFont.h
index e0d773e..05b95b0 100755
--- a/include/FTGLBitmapFont.h
+++ b/include/FTGLBitmapFont.h
@@ -49,7 +49,7 @@ class FTGL_EXPORT FTGLBitmapFont : public FTFont
* @param g The glyph index NOT the char code.
* @return An FTBitmapGlyph or <code>null</code> on failure.
*/
- virtual FTGlyph* MakeGlyph( unsigned int g);
+ inline virtual FTGlyph* MakeGlyph( unsigned int g);
};
#endif // __FTGLBitmapFont__
diff --git a/include/FTGLExtrdFont.h b/include/FTGLExtrdFont.h
index d246636..87ee5c0 100644
--- a/include/FTGLExtrdFont.h
+++ b/include/FTGLExtrdFont.h
@@ -36,7 +36,7 @@ class FTGL_EXPORT FTGLExtrdFont : public FTFont
* @param g The glyph index NOT the char code.
* @return An FTPolyGlyph or <code>null</code> on failure.
*/
- virtual FTGlyph* MakeGlyph( unsigned int g);
+ inline virtual FTGlyph* MakeGlyph( unsigned int g);
float depth;
diff --git a/include/FTGLOutlineFont.h b/include/FTGLOutlineFont.h
index ae68b76..28eeee6 100755
--- a/include/FTGLOutlineFont.h
+++ b/include/FTGLOutlineFont.h
@@ -50,7 +50,7 @@ class FTGL_EXPORT FTGLOutlineFont : public FTFont
* @param g The glyph index NOT the char code.
* @return An FTOutlineGlyph or <code>null</code> on failure.
*/
- virtual FTGlyph* MakeGlyph( unsigned int g);
+ inline virtual FTGlyph* MakeGlyph( unsigned int g);
};
#endif // __FTGLOutlineFont__
diff --git a/include/FTGLPixmapFont.h b/include/FTGLPixmapFont.h
index 6469981..172430d 100755
--- a/include/FTGLPixmapFont.h
+++ b/include/FTGLPixmapFont.h
@@ -50,7 +50,7 @@ class FTGL_EXPORT FTGLPixmapFont : public FTFont
* @param g The glyph index NOT the char code.
* @return An FTPixmapGlyph or <code>null</code> on failure.
*/
- virtual FTGlyph* MakeGlyph( unsigned int g);
+ inline virtual FTGlyph* MakeGlyph( unsigned int g);
};
diff --git a/include/FTGLPolygonFont.h b/include/FTGLPolygonFont.h
index b5e7e3b..269b489 100755
--- a/include/FTGLPolygonFont.h
+++ b/include/FTGLPolygonFont.h
@@ -34,7 +34,7 @@ class FTGL_EXPORT FTGLPolygonFont : public FTFont
* @param g The glyph index NOT the char code.
* @return An FTPolyGlyph or <code>null</code> on failure.
*/
- virtual FTGlyph* MakeGlyph( unsigned int g);
+ inline virtual FTGlyph* MakeGlyph( unsigned int g);
};
diff --git a/include/FTGLTextureFont.h b/include/FTGLTextureFont.h
index dd36b2b..3c9f4bd 100755
--- a/include/FTGLTextureFont.h
+++ b/include/FTGLTextureFont.h
@@ -52,7 +52,7 @@ class FTGL_EXPORT FTGLTextureFont : public FTFont
private:
- virtual FTGlyph* MakeGlyph( unsigned int g);
+ inline virtual FTGlyph* MakeGlyph( unsigned int g);
/**
* Constructs the internal glyph cache.
@@ -60,7 +60,7 @@ class FTGL_EXPORT FTGLTextureFont : public FTFont
* This a list of glyphs processed for openGL rendering NOT
* freetype glyphs
*/
- virtual bool MakeGlyphList();
+ inline virtual bool MakeGlyphList();
/**
* Get the size of a block of memory required to layout the glyphs
@@ -68,7 +68,7 @@ class FTGL_EXPORT FTGLTextureFont : public FTFont
* Calculates a width and height based on the glyph sizes and the
* number of glyphs. It over estimates.
*/
- void GetSize();
+ inline void GetSize();
/**
* Creates a 'blank' OpenGL texture object.
@@ -84,7 +84,7 @@ class FTGL_EXPORT FTGLTextureFont : public FTFont
* @param height The number of rows of bytes.
* @param data A pointer to the texture data
*/
- int CreateTexture();
+ inline int CreateTexture();
/**
* The maximum texture dimension on this OpenGL implemetation