Commit d228d3905d40742bc318613660ccc563093519bc
2008-04-13T21:27:22
* Merged trunk commits [741], [742], [745], [747], [748] and [749], by henry: + Changed to use FTGlyphSlot internally instead of FTGlyph. + Added a test for broken glyph but freetype is broken so it doesn't work. + Added SetDepth function to FTBBox. + Tidy Up. + Test for bitmap bbox.
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 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131
diff --git a/test/FTBBox-Test.cpp b/test/FTBBox-Test.cpp
index a4b461a..4a60e6c 100644
--- a/test/FTBBox-Test.cpp
+++ b/test/FTBBox-Test.cpp
@@ -17,8 +17,10 @@ class FTBBoxTest : public CppUnit::TestCase
CPPUNIT_TEST_SUITE( FTBBoxTest);
CPPUNIT_TEST( testDefaultConstructor);
CPPUNIT_TEST( testGlyphConstructor);
+ CPPUNIT_TEST( testBitmapConstructor);
CPPUNIT_TEST( testMoveBBox);
CPPUNIT_TEST( testPlusEquals);
+ CPPUNIT_TEST( testSetDepth);
CPPUNIT_TEST_SUITE_END();
public:
@@ -42,7 +44,16 @@ class FTBBoxTest : public CppUnit::TestCase
void testGlyphConstructor()
{
- setUpFreetype();
+ setUpFreetype( GOOD_FONT_FILE);
+
+// FTBBox boundingBox2( (FT_GlyphSlot)(0));
+
+// CPPUNIT_ASSERT( boundingBox2.lowerX == 0.0f);
+// CPPUNIT_ASSERT( boundingBox2.lowerY == 0.0f);
+// CPPUNIT_ASSERT( boundingBox2.lowerZ == 0.0f);
+// CPPUNIT_ASSERT( boundingBox2.upperX == 0.0f);
+// CPPUNIT_ASSERT( boundingBox2.upperY == 0.0f);
+// CPPUNIT_ASSERT( boundingBox2.upperZ == 0.0f);
FTBBox boundingBox( face->glyph);
@@ -53,8 +64,28 @@ class FTBBoxTest : public CppUnit::TestCase
CPPUNIT_ASSERT_DOUBLES_EQUAL( 38, boundingBox.upperY, 0.01);
CPPUNIT_ASSERT_DOUBLES_EQUAL( 0, boundingBox.upperZ, 0.01);
+
tearDownFreetype();
- }
+ }
+
+ void testBitmapConstructor()
+ {
+ setUpFreetype( GOOD_FONT_FILE);
+
+ FT_Load_Char( face, CHARACTER_CODE_G, FT_LOAD_MONOCHROME);
+
+ CPPUNIT_ASSERT( ft_glyph_format_bitmap != face->glyph->format);
+
+ FTBBox boundingBox3( face->glyph);
+
+ CPPUNIT_ASSERT_DOUBLES_EQUAL( 2, boundingBox3.lowerX, 0.01);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL( -15, boundingBox3.lowerY, 0.01);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL( 0, boundingBox3.lowerZ, 0.01);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL( 35, boundingBox3.upperX, 0.01);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL( 38, boundingBox3.upperY, 0.01);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL( 0, boundingBox3.upperZ, 0.01);
+
+ }
void testMoveBBox()
{
@@ -83,7 +114,7 @@ class FTBBoxTest : public CppUnit::TestCase
void testPlusEquals()
{
- setUpFreetype();
+ setUpFreetype( GOOD_FONT_FILE);
FTBBox boundingBox1;
FTBBox boundingBox2( face->glyph);
@@ -112,6 +143,24 @@ class FTBBoxTest : public CppUnit::TestCase
tearDownFreetype();
}
+ void testSetDepth()
+ {
+ setUpFreetype( GOOD_FONT_FILE);
+
+ FTBBox boundingBox( face->glyph);
+
+ boundingBox.SetDepth( 37.754);
+
+ CPPUNIT_ASSERT_DOUBLES_EQUAL( 2, boundingBox.lowerX, 0.01);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL( -15, boundingBox.lowerY, 0.01);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL( 0, boundingBox.lowerZ, 0.01);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL( 35, boundingBox.upperX, 0.01);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL( 38, boundingBox.upperY, 0.01);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL( 37.754, boundingBox.upperZ, 0.01);
+
+ tearDownFreetype();
+ }
+
void setUp()
{}
@@ -122,28 +171,22 @@ class FTBBoxTest : public CppUnit::TestCase
private:
FT_Library library;
FT_Face face;
- FT_Glyph glyph;
- void setUpFreetype()
+ void setUpFreetype(const char *fontName)
{
FT_Error error = FT_Init_FreeType( &library);
CPPUNIT_ASSERT(!error);
- error = FT_New_Face( library, GOOD_FONT_FILE, 0, &face);
+ error = FT_New_Face( library, fontName, 0, &face);
CPPUNIT_ASSERT(!error);
-
- long glyphIndex = FT_Get_Char_Index( face, CHARACTER_CODE_G);
-
+
FT_Set_Char_Size( face, 0L, FONT_POINT_SIZE * 64, RESOLUTION, RESOLUTION);
-
- error = FT_Load_Glyph( face, glyphIndex, FT_LOAD_DEFAULT);
- CPPUNIT_ASSERT(!error);
- error = FT_Get_Glyph( face->glyph, &glyph);
+
+ error = FT_Load_Char( face, CHARACTER_CODE_G, FT_LOAD_RENDER);
CPPUNIT_ASSERT(!error);
}
void tearDownFreetype()
{
- FT_Done_Glyph( glyph);
FT_Done_Face( face);
FT_Done_FreeType( library);
}