Commit 524e7ca9f84b1c9bd60537590e645ece604f20b2
2001-08-22T03:40:05
Changed the return types for the size function to int
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
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;
}