diff options
author | arthurhsu <arthurhsu@google.com> | 2011-12-09 02:25:57 +0000 |
---|---|---|
committer | arthurhsu <arthurhsu@google.com> | 2011-12-09 02:25:57 +0000 |
commit | ea2befceb03ce29f7a329e36700286fc353eca6a (patch) | |
tree | 460cd757f4e2e360ad0e555d99008117da6fe75e /cpp | |
parent | 9d49ee2650b0ffd660ff22f93ca9a6831847446f (diff) | |
download | sfntly-ea2befceb03ce29f7a329e36700286fc353eca6a.tar.gz |
Update test files for macro changes in previous CL
Diffstat (limited to 'cpp')
-rw-r--r-- | cpp/src/test/verify_hhea.cc | 3 | ||||
-rw-r--r-- | cpp/src/test/verify_maxp.cc | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/cpp/src/test/verify_hhea.cc b/cpp/src/test/verify_hhea.cc index 021c189..81ddb58 100644 --- a/cpp/src/test/verify_hhea.cc +++ b/cpp/src/test/verify_hhea.cc @@ -16,6 +16,7 @@ #include "gtest/gtest.h" #include "sfntly/font.h" +#include "sfntly/math/fixed1616.h" #include "sfntly/table/core/horizontal_header_table.h" #include "test/serialization_test.h" @@ -37,7 +38,7 @@ static bool VerifyHHEA(Table* table) { return false; } - EXPECT_EQ(hhea->TableVersion(), SFNTVERSION_1); + EXPECT_EQ(hhea->TableVersion(), Fixed1616::Fixed(1, 0)); EXPECT_EQ(hhea->Ascender(), HHEA_ASCENDER); EXPECT_EQ(hhea->Descender(), HHEA_DESCENDER); EXPECT_EQ(hhea->AdvanceWidthMax(), HHEA_ADVANCE_WIDTH_MAX); diff --git a/cpp/src/test/verify_maxp.cc b/cpp/src/test/verify_maxp.cc index 437c0dd..dcd776e 100644 --- a/cpp/src/test/verify_maxp.cc +++ b/cpp/src/test/verify_maxp.cc @@ -16,6 +16,7 @@ #include "gtest/gtest.h" #include "sfntly/font.h" +#include "sfntly/math/fixed1616.h" #include "sfntly/table/core/maximum_profile_table.h" #include "test/serialization_test.h" @@ -42,7 +43,7 @@ static bool VerifyMAXP(Table* table) { return false; } - EXPECT_EQ(maxp->TableVersion(), SFNTVERSION_1); + EXPECT_EQ(maxp->TableVersion(), Fixed1616::Fixed(1, 0)); EXPECT_EQ(maxp->NumGlyphs(), MAXP_NUM_GLYPHS); EXPECT_EQ(maxp->MaxPoints(), MAXP_MAX_POINTS); EXPECT_EQ(maxp->MaxContours(), MAXP_MAX_CONTOURS); |