Commit 99a49e8611f9aa557e7aef6b8ab332585d59a5cd

henry 2002-12-17T23:51:42

Fixed tests

diff --git a/test/FTBBox-Test.cpp b/test/FTBBox-Test.cpp
index d3589ac..a2200c0 100755
--- a/test/FTBBox-Test.cpp
+++ b/test/FTBBox-Test.cpp
@@ -132,7 +132,7 @@ class FTBBoxTest : public CppUnit::TestCase
             
             long glyphIndex = FT_Get_Char_Index( face, CHARACTER_CODE_G);
             
-            FT_Set_Char_Size( face, 0L, GOOD_SIZE, RESOLUTION, RESOLUTION);
+            FT_Set_Char_Size( face, 0L, GOOD_SIZE * 64, RESOLUTION, RESOLUTION);
             
             error = FT_Load_Glyph( face, glyphIndex, FT_LOAD_DEFAULT);
             assert(!error);
diff --git a/test/FTVectoriser-Test.cpp b/test/FTVectoriser-Test.cpp
index 921ea14..3d53a2e 100755
--- a/test/FTVectoriser-Test.cpp
+++ b/test/FTVectoriser-Test.cpp
@@ -401,7 +401,7 @@ class FTVectoriserTest : public CppUnit::TestCase
         {
             long glyphIndex = FT_Get_Char_Index( face, characterIndex);
             
-            FT_Set_Char_Size( face, 0L, CHARACTER_SIZE, RESOLUTION, RESOLUTION);
+            FT_Set_Char_Size( face, 0L, GOOD_SIZE * 64, RESOLUTION, RESOLUTION);
             
             FT_Error error = FT_Load_Glyph( face, glyphIndex, FT_LOAD_DEFAULT);
             assert(!error);
diff --git a/test/Fontdefs.h b/test/Fontdefs.h
index 47daa43..701d71a 100644
--- a/test/Fontdefs.h
+++ b/test/Fontdefs.h
@@ -2,18 +2,17 @@
 #define    __Font_defs__
 
 
-const char* const BAD_FONT_FILE  =  "missing_font.ttf";
+const char* const BAD_FONT_FILE  = "missing_font.ttf";
 const char* const GOOD_FONT_FILE = "../../test/MHei-Medium-Acro";
 const char* const FONT_FILE      = "../../test/arial.ttf";
 
-const char* const GOOD_ASCII_TEST_STRING        = "test string";
-const char* const BAD_ASCII_TEST_STRING         = "";
-const wchar_t GOOD_UNICODE_TEST_STRING[4] = { 0x6FB3, 0x9580, 0x0};
-const wchar_t* const BAD_UNICODE_TEST_STRING    = L"";
+const char* const    GOOD_ASCII_TEST_STRING        = "test string";
+const char* const    BAD_ASCII_TEST_STRING         = "";
+const wchar_t        GOOD_UNICODE_TEST_STRING[4]   = { 0x6FB3, 0x9580, 0x0};
+const wchar_t* const BAD_UNICODE_TEST_STRING       = L"";
 
 const unsigned int GOOD_SIZE  = 72;
 const unsigned int RESOLUTION = 72;
-const unsigned int CHARACTER_SIZE      = 72 * 64;
 
 const unsigned int CHARACTER_CODE_A        = 'A';
 const unsigned int CHARACTER_CODE_G        = 'g';