summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorarthurhsu@google.com <arthurhsu@google.com@672e30a5-4c29-85ac-ac6d-611c735e0a51>2011-12-09 02:25:57 +0000
committerarthurhsu@google.com <arthurhsu@google.com@672e30a5-4c29-85ac-ac6d-611c735e0a51>2011-12-09 02:25:57 +0000
commit2407b4212a6391f3993d46b5aae93da6556305a4 (patch)
treeb773ef677ba897dfc10d3609c5de92ce03310ab6
parenta70737a5b6ca5cd32e1a47adb847e1d016e1502b (diff)
downloadsrc-2407b4212a6391f3993d46b5aae93da6556305a4.tar.gz
Update test files for macro changes in previous CL
git-svn-id: http://sfntly.googlecode.com/svn/trunk/cpp/src@117 672e30a5-4c29-85ac-ac6d-611c735e0a51
-rw-r--r--test/verify_hhea.cc3
-rw-r--r--test/verify_maxp.cc3
2 files changed, 4 insertions, 2 deletions
diff --git a/test/verify_hhea.cc b/test/verify_hhea.cc
index 021c189..81ddb58 100644
--- a/test/verify_hhea.cc
+++ b/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/test/verify_maxp.cc b/test/verify_maxp.cc
index 437c0dd..dcd776e 100644
--- a/test/verify_maxp.cc
+++ b/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);