Commit 177189700eb06084b593819ef0845d4d99ef248b
2002-12-10T08:48:29
Changed size calculations to use floats
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
diff --git a/include/FTBBox.h b/include/FTBBox.h
index 91dbd8a..5c0d63d 100755
--- a/include/FTBBox.h
+++ b/include/FTBBox.h
@@ -19,12 +19,12 @@ class FTGL_EXPORT FTBBox
* Default constructor. Bounding box is set to zero.
*/
FTBBox()
- : lowerX(0),
- lowerY(0),
- lowerZ(0),
- upperX(0),
- upperY(0),
- upperZ(0)
+ : lowerX(0.0f),
+ lowerY(0.0f),
+ lowerZ(0.0f),
+ upperX(0.0f),
+ upperY(0.0f),
+ upperZ(0.0f)
{}
/**
@@ -38,12 +38,12 @@ class FTGL_EXPORT FTBBox
FT_BBox bbox;
FT_Glyph_Get_CBox( glyph, ft_glyph_bbox_subpixels, &bbox );
- lowerX = bbox.xMin >> 6;
- lowerY = bbox.yMin >> 6;
- lowerZ = 0;
- upperX = bbox.xMax >> 6;
- upperY = bbox.yMax >> 6;
- upperZ = 0;
+ lowerX = static_cast<float>( bbox.xMin) / 64;
+ lowerY = static_cast<float>( bbox.yMin) / 64;
+ lowerZ = 0.0f;
+ upperX = static_cast<float>( bbox.xMax) / 64;
+ upperY = static_cast<float>( bbox.yMax) / 64;
+ upperZ = 0.0f;
}
/**