Commit d996cc69e83b707400e1b72a666aca9dcb9c41b8
2001-11-25T20:40:57
Fixed the space bug AGAIN.
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
diff --git a/src/FTExtrdGlyph.cpp b/src/FTExtrdGlyph.cpp
index d25f251..3eaa1d7 100644
--- a/src/FTExtrdGlyph.cpp
+++ b/src/FTExtrdGlyph.cpp
@@ -26,6 +26,10 @@ FTExtrdGlyph::FTExtrdGlyph( FT_Glyph glyph, float d)
// Make the front polygons
vectoriser->MakeMesh( 1.0);
+ bBox = FTBBox( glyph);
+ bBox.z2 = -depth;
+ advance = glyph->advance.x >> 16;
+
numPoints = vectoriser->MeshPoints();
if ( numPoints < 3)
{
@@ -170,10 +174,6 @@ FTExtrdGlyph::FTExtrdGlyph( FT_Glyph glyph, float d)
delete [] backMesh;
delete [] contourLength;
- bBox = FTBBox( glyph);
- bBox.z2 = -depth;
- advance = glyph->advance.x >> 16;
-
// discard glyph image (bitmap or not)
FT_Done_Glyph( glyph); // Why does this have to be HERE
}
diff --git a/src/FTOutlineGlyph.cpp b/src/FTOutlineGlyph.cpp
index e4a3b92..820c998 100644
--- a/src/FTOutlineGlyph.cpp
+++ b/src/FTOutlineGlyph.cpp
@@ -25,6 +25,9 @@ FTOutlineGlyph::FTOutlineGlyph( FT_Glyph glyph)
numPoints = vectoriser->points();
numContours = vectoriser->contours();
+ bBox = FTBBox( glyph);
+ advance = glyph->advance.x >> 16;
+
if ( ( numContours < 1) || ( numPoints < 3))
{
delete vectoriser;
@@ -60,9 +63,6 @@ FTOutlineGlyph::FTOutlineGlyph( FT_Glyph glyph)
delete [] data; // FIXME
delete [] contourLength; // FIXME
- bBox = FTBBox( glyph);
- advance = glyph->advance.x >> 16;
-
// discard glyph image (bitmap or not)
FT_Done_Glyph( glyph); // Why does this have to be HERE
}
diff --git a/src/FTPolyGlyph.cpp b/src/FTPolyGlyph.cpp
index 883447f..04298d1 100644
--- a/src/FTPolyGlyph.cpp
+++ b/src/FTPolyGlyph.cpp
@@ -21,6 +21,9 @@ FTPolyGlyph::FTPolyGlyph( FT_Glyph glyph)
vectoriser->MakeMesh();
numPoints = vectoriser->MeshPoints();
+ bBox = FTBBox( glyph);
+ advance = glyph->advance.x >> 16;
+
if ( numPoints < 3)
{
delete vectoriser;
@@ -54,9 +57,6 @@ FTPolyGlyph::FTPolyGlyph( FT_Glyph glyph)
delete [] data; // FIXME
data = 0;
- bBox = FTBBox( glyph);
- advance = glyph->advance.x >> 16;
-
// discard glyph image (bitmap or not)
FT_Done_Glyph( glyph); // Why does this have to be HERE
}