Commit 6b4e1f144336c5e41dad2d5c1f355f27de3c741e
2002-12-08T06:57:27
Made vectoriser a local variable
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
diff --git a/include/FTExtrdGlyph.h b/include/FTExtrdGlyph.h
index 28d607e..e3e8a8c 100644
--- a/include/FTExtrdGlyph.h
+++ b/include/FTExtrdGlyph.h
@@ -52,12 +52,6 @@ class FTGL_EXPORT FTExtrdGlyph : public FTGlyph
bool Winding( int numPoints, FTGL_DOUBLE *points);
/**
- * An object that helps convert freetype outlines into point
- * data
- */
- FTVectoriser* vectoriser;
-
- /**
* OpenGL display list
*/
GLuint glList;
diff --git a/include/FTOutlineGlyph.h b/include/FTOutlineGlyph.h
index 40a34a1..6b22b7a 100644
--- a/include/FTOutlineGlyph.h
+++ b/include/FTOutlineGlyph.h
@@ -43,12 +43,6 @@ class FTGL_EXPORT FTOutlineGlyph : public FTGlyph
private:
/**
- * An object that helps convert freetype outlines into point
- * data
- */
- FTVectoriser* vectoriser;
-
- /**
* The total number of points in the Freetype outline
*/
int numPoints;
diff --git a/include/FTPolyGlyph.h b/include/FTPolyGlyph.h
index cdb6547..f85f84d 100644
--- a/include/FTPolyGlyph.h
+++ b/include/FTPolyGlyph.h
@@ -49,12 +49,6 @@ class FTGL_EXPORT FTPolyGlyph : public FTGlyph
* Uses GLUtesselator to create a mesh
*/
void Tesselate();
-
- /**
- * An object that helps convert freetype outlines into point
- * data
- */
- FTVectoriser* vectoriser;
/**
* The total number of points in the Freetype outline
diff --git a/src/FTExtrdGlyph.cpp b/src/FTExtrdGlyph.cpp
index 48f022e..d19ec09 100644
--- a/src/FTExtrdGlyph.cpp
+++ b/src/FTExtrdGlyph.cpp
@@ -6,7 +6,6 @@
FTExtrdGlyph::FTExtrdGlyph( FT_Glyph glyph, float d)
: FTGlyph(),
- vectoriser(0),
glList(0),
depth(d)
{
@@ -15,7 +14,7 @@ FTExtrdGlyph::FTExtrdGlyph( FT_Glyph glyph, float d)
return;
}
- vectoriser = new FTVectoriser( glyph);
+ FTVectoriser* vectoriser = new FTVectoriser( glyph);
vectoriser->ProcessContours();
diff --git a/src/FTOutlineGlyph.cpp b/src/FTOutlineGlyph.cpp
index 8bc4ea1..c880fcd 100644
--- a/src/FTOutlineGlyph.cpp
+++ b/src/FTOutlineGlyph.cpp
@@ -4,7 +4,6 @@
FTOutlineGlyph::FTOutlineGlyph( FT_Glyph glyph)
: FTGlyph(),
- vectoriser(0),
numPoints(0),
numContours(0),
data(0),
@@ -15,7 +14,7 @@ FTOutlineGlyph::FTOutlineGlyph( FT_Glyph glyph)
return;
}
- vectoriser = new FTVectoriser( glyph);
+ FTVectoriser* vectoriser = new FTVectoriser( glyph);
vectoriser->ProcessContours();
diff --git a/src/FTPolyGlyph.cpp b/src/FTPolyGlyph.cpp
index 84d656b..2d838a0 100644
--- a/src/FTPolyGlyph.cpp
+++ b/src/FTPolyGlyph.cpp
@@ -4,7 +4,6 @@
FTPolyGlyph::FTPolyGlyph( FT_Glyph glyph)
: FTGlyph(),
- vectoriser(0),
numPoints(0),
data(0),
glList(0)
@@ -14,7 +13,7 @@ FTPolyGlyph::FTPolyGlyph( FT_Glyph glyph)
return;
}
- vectoriser = new FTVectoriser( glyph);
+ FTVectoriser* vectoriser = new FTVectoriser( glyph);
vectoriser->ProcessContours();