Commit 486a0751eeb78c397b8b12a5496bb1ffe869a448
2001-09-16T21:27:52
removed the glyphIndex member
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
diff --git a/include/FTGlyph.h b/include/FTGlyph.h
index fcbe57b..8d54973 100755
--- a/include/FTGlyph.h
+++ b/include/FTGlyph.h
@@ -20,14 +20,12 @@
class FTGlyph
{
public:
- // methods
-
/**
* Constructor
*
* @param glyphIndex The glyph index for this glyph
*/
- FTGlyph( unsigned int glyphIndex);
+ FTGlyph();
/**
* Destructor
@@ -37,7 +35,7 @@ class FTGlyph
/**
* Renders this glyph at the current pen position.
*
- * @param pen The current pen position.
+ * @param pen The current pen position.
* @return The advance distance for this glyph.
*/
virtual float Render( const FT_Vector& pen) = 0;
@@ -49,18 +47,7 @@ class FTGlyph
*/
FT_Error Error() const { return err;}
- // attributes
-
- /**
- * The glyph index
- */
- const unsigned int glyphIndex; // FIXME make this private
-
protected:
- // methods
-
- // attributes
-
/**
* The advance distance for this glyph
*/
@@ -72,20 +59,12 @@ class FTGlyph
FT_Vector pos;
/**
- * Temporary holder for the Freetype glyph
- */
- FT_Glyph ftGlyph;
-
- /**
* Current error code. Zero means no error.
*/
FT_Error err;
private:
- // methods
-
- // attributes
-
+
};
diff --git a/src/FTGlyph.cpp b/src/FTGlyph.cpp
index d5c3ad3..cc837ca 100755
--- a/src/FTGlyph.cpp
+++ b/src/FTGlyph.cpp
@@ -2,10 +2,8 @@
// OPSignature: FTGlyph:FTGlyph( FT_Face:face int:glyphIndex )
-FTGlyph::FTGlyph( unsigned int gi)
+FTGlyph::FTGlyph()
: advance(0),
- glyphIndex(gi),
- ftGlyph(0),
err(0)
{
pos.x = 0;