Commit 92b95cde76a9f67f0fbbb2c3ab22f5d6d9f5d3e2
2008-05-08T17:01:45
* Made most FTFont, FTGlyph and FTLayout function virtual. It's true that most of them use private members of the pImpl class and thus are not easily replaced, but intercepting the information may be useful in subclassing, too.
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 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267
diff --git a/src/FTGL/FTFont.h b/src/FTGL/FTFont.h
index d7b3b05..8396f14 100644
--- a/src/FTGL/FTFont.h
+++ b/src/FTGL/FTFont.h
@@ -102,7 +102,7 @@ class FTGL_EXPORT FTFont
* @return <code>true</code> if file has been attached
* successfully.
*/
- bool Attach(const char* fontFilePath);
+ virtual bool Attach(const char* fontFilePath);
/**
* Attach auxilliary data to font e.g font metrics, from memory.
@@ -114,8 +114,8 @@ class FTGL_EXPORT FTFont
* @return <code>true</code> if file has been attached
* successfully.
*/
- bool Attach(const unsigned char *pBufferBytes,
- size_t bufferSizeInBytes);
+ virtual bool Attach(const unsigned char *pBufferBytes,
+ size_t bufferSizeInBytes);
/**
* Set the character map for the face.
@@ -124,21 +124,21 @@ class FTGL_EXPORT FTFont
* @return <code>true</code> if charmap was valid and
* set correctly.
*/
- bool CharMap(FT_Encoding encoding);
+ virtual bool CharMap(FT_Encoding encoding);
/**
* Get the number of character maps in this face.
*
* @return character map count.
*/
- unsigned int CharMapCount() const;
+ virtual unsigned int CharMapCount() const;
/**
* Get a list of character maps in this face.
*
* @return pointer to the first encoding.
*/
- FT_Encoding* CharMapList();
+ virtual FT_Encoding* CharMapList();
/**
* Set the char size for the current face.
@@ -147,14 +147,15 @@ class FTGL_EXPORT FTFont
* @param res the resolution of the target device.
* @return <code>true</code> if size was set correctly
*/
- bool FaceSize(const unsigned int size, const unsigned int res = 72);
+ virtual bool FaceSize(const unsigned int size,
+ const unsigned int res = 72);
/**
* Get the current face size in points (1/72 inch).
*
* @return face size
*/
- unsigned int FaceSize() const;
+ virtual unsigned int FaceSize() const;
/**
* Set the extrusion distance for the font. Only implemented by
@@ -162,7 +163,7 @@ class FTGL_EXPORT FTFont
*
* @param depth The extrusion distance.
*/
- void Depth(float depth);
+ virtual void Depth(float depth);
/**
* Set the outset distance for the font. Only implemented by
@@ -170,7 +171,7 @@ class FTGL_EXPORT FTFont
*
* @param outset The outset distance.
*/
- void Outset(float outset);
+ virtual void Outset(float outset);
/**
* Set the front and back outset distances for the font. Only
@@ -179,7 +180,7 @@ class FTGL_EXPORT FTFont
* @param front The front outset distance.
* @param back The back outset distance.
*/
- void Outset(float front, float back);
+ virtual void Outset(float front, float back);
/**
* Enable or disable the use of Display Lists inside FTGL
@@ -187,28 +188,28 @@ class FTGL_EXPORT FTFont
* @param useList <code>true</code> turns ON display lists.
* <code>false</code> turns OFF display lists.
*/
- void UseDisplayList(bool useList);
+ virtual void UseDisplayList(bool useList);
/**
* Get the global ascender height for the face.
*
* @return Ascender height
*/
- float Ascender() const;
+ virtual float Ascender() const;
/**
* Gets the global descender height for the face.
*
* @return Descender height
*/
- float Descender() const;
+ virtual float Descender() const;
/**
* Gets the line spacing for the font.
*
* @return Line height
*/
- float LineHeight() const;
+ virtual float LineHeight() const;
/**
* Get the bounding box for a string.
@@ -216,7 +217,7 @@ class FTGL_EXPORT FTFont
* @param string A char buffer.
* @return The corresponding bounding box.
*/
- FTBBox BBox(const char *string);
+ virtual FTBBox BBox(const char *string);
/**
* Get the bounding box for a string.
@@ -224,7 +225,7 @@ class FTGL_EXPORT FTFont
* @param string A wchar_t buffer.
* @return The corresponding bounding box.
*/
- FTBBox BBox(const wchar_t *string);
+ virtual FTBBox BBox(const wchar_t *string);
/**
* Get the bounding box for a string.
@@ -237,7 +238,8 @@ class FTGL_EXPORT FTFont
* until a '@\0' is encountered.
* @return The corresponding bounding box.
*/
- FTBBox BBox(const char *string, const int start, const int end);
+ virtual FTBBox BBox(const char *string,
+ const int start, const int end);
/**
* Get the bounding box for a string.
@@ -250,7 +252,8 @@ class FTGL_EXPORT FTFont
* until a '@\0' is encountered.
* @return The corresponding bounding box.
*/
- FTBBox BBox(const wchar_t *string, const int start, const int end);
+ virtual FTBBox BBox(const wchar_t *string,
+ const int start, const int end);
/**
* Get the advance width for a string.
@@ -258,7 +261,7 @@ class FTGL_EXPORT FTFont
* @param string a wchar_t string
* @return advance width
*/
- float Advance(const wchar_t* string);
+ virtual float Advance(const wchar_t* string);
/**
* Get the advance width for a string.
@@ -266,14 +269,14 @@ class FTGL_EXPORT FTFont
* @param string a char string
* @return advance width
*/
- float Advance(const char* string);
+ virtual float Advance(const char* string);
/**
* Render a string of characters
*
* @param string 'C' style string to be output.
*/
- void Render(const char* string);
+ virtual void Render(const char* string);
/**
* Render a string of characters
@@ -281,14 +284,14 @@ class FTGL_EXPORT FTFont
* @param string 'C' style string to be output.
* @param renderMode Render mode to display
*/
- void Render(const char* string, int renderMode);
+ virtual void Render(const char* string, int renderMode);
/**
* Render a string of characters
*
* @param string wchar_t string to be output.
*/
- void Render(const wchar_t* string);
+ virtual void Render(const wchar_t* string);
/**
* Render a string of characters
@@ -296,14 +299,14 @@ class FTGL_EXPORT FTFont
* @param string wchar_t string to be output.
* @param renderMode Render mode to display
*/
- void Render(const wchar_t *string, int renderMode);
+ virtual void Render(const wchar_t *string, int renderMode);
/**
* Queries the Font for errors.
*
* @return The current error code.
*/
- FT_Error Error() const;
+ virtual FT_Error Error() const;
protected:
/* Allow impl to access MakeGlyph */
diff --git a/src/FTGL/FTGlyph.h b/src/FTGL/FTGlyph.h
index 26ca5d1..5164838 100644
--- a/src/FTGL/FTGlyph.h
+++ b/src/FTGL/FTGlyph.h
@@ -94,21 +94,21 @@ class FTGL_EXPORT FTGlyph
*
* @return advance width.
*/
- const FTPoint& Advance() const;
+ virtual const FTPoint& Advance() const;
/**
* Return the bounding box for this glyph.
*
* @return bounding box.
*/
- const FTBBox& BBox() const;
+ virtual const FTBBox& BBox() const;
/**
* Queries for errors.
*
* @return The current error code.
*/
- FT_Error Error() const;
+ virtual FT_Error Error() const;
private:
/**
diff --git a/src/FTGL/FTLayout.h b/src/FTGL/FTLayout.h
index 12e3407..564aa3a 100644
--- a/src/FTGL/FTLayout.h
+++ b/src/FTGL/FTLayout.h
@@ -123,7 +123,7 @@ class FTGL_EXPORT FTLayout
*
* @return The current error code.
*/
- FT_Error Error() const;
+ virtual FT_Error Error() const;
private:
/**