Commit 524e7ca9f84b1c9bd60537590e645ece604f20b2

henry 2001-08-22T03:40:05

Changed the return types for the size function to int

diff --git a/include/FTSize.h b/include/FTSize.h
index fd15667..7cda0f4 100755
--- a/include/FTSize.h
+++ b/include/FTSize.h
@@ -14,11 +14,11 @@ class	FTSize
 		FTSize();
 		virtual ~FTSize();
 		bool CharSize( FT_Face* face, unsigned int point_size, unsigned int x_resolution, unsigned int y_resolution );
-		float Ascender() const;
-		float Descender() const;
-		float Height() const;
-		float Width() const;
-		float Underline() const;
+		int Ascender() const;
+		int Descender() const;
+		int Height() const;
+		int Width() const;
+		int Underline() const;
 
 		FT_Error Error() const { return err; }
 		
diff --git a/src/FTSize.cpp b/src/FTSize.cpp
index 532f133..a6b7917 100755
--- a/src/FTSize.cpp
+++ b/src/FTSize.cpp
@@ -23,19 +23,19 @@ bool FTSize::CharSize( FT_Face* ftFace, unsigned int point_size, unsigned int x_
 }
 
 
-float FTSize::Ascender() const
+int FTSize::Ascender() const
 {
 	return ftSize->metrics.ascender >> 6;
 }
 
 
-float FTSize::Descender() const
+int FTSize::Descender() const
 {
 	return ftSize->metrics.descender >> 6;
 }
 
 
-float FTSize::Height() const
+int FTSize::Height() const
 {
 	if( FT_IS_SCALABLE((*ftFace)))
 	{
@@ -50,7 +50,7 @@ float FTSize::Height() const
 		}
 
 		height =  height * ( (float)ftSize->metrics.y_ppem / (float)(*ftFace)->units_per_EM);
-		return height;
+		return static_cast<int>(height);
 	}
 	else
 	{
@@ -59,7 +59,7 @@ float FTSize::Height() const
 }
 
 
-float FTSize::Width() const
+int FTSize::Width() const
 {
 	if( FT_IS_SCALABLE((*ftFace)))
 	{
@@ -74,7 +74,7 @@ float FTSize::Width() const
 		}
 		
 		width = width * ( (float)ftSize->metrics.x_ppem / (float)(*ftFace)->units_per_EM);
-		return width;
+		return static_cast<int>(width);
 	}
 	else
 	{
@@ -83,7 +83,7 @@ float FTSize::Width() const
 }
 
 
-float FTSize::Underline() const
+int FTSize::Underline() const
 {
 	return 0;
 }