summaryrefslogtreecommitdiffstats
path: root/gfx/ots/src/maxp.cc
diff options
context:
space:
mode:
Diffstat (limited to 'gfx/ots/src/maxp.cc')
-rw-r--r--gfx/ots/src/maxp.cc128
1 files changed, 53 insertions, 75 deletions
diff --git a/gfx/ots/src/maxp.cc b/gfx/ots/src/maxp.cc
index 41e29a745..232e4a988 100644
--- a/gfx/ots/src/maxp.cc
+++ b/gfx/ots/src/maxp.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009-2017 The OTS Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -7,119 +7,97 @@
// maxp - Maximum Profile
// http://www.microsoft.com/typography/otspec/maxp.htm
-#define TABLE_NAME "maxp"
-
namespace ots {
-bool ots_maxp_parse(Font *font, const uint8_t *data, size_t length) {
+bool OpenTypeMAXP::Parse(const uint8_t *data, size_t length) {
Buffer table(data, length);
- OpenTypeMAXP *maxp = new OpenTypeMAXP;
- font->maxp = maxp;
-
uint32_t version = 0;
if (!table.ReadU32(&version)) {
- return OTS_FAILURE_MSG("Failed to read version of maxp table");
+ return Error("Failed to read table version");
}
if (version >> 16 > 1) {
- return OTS_FAILURE_MSG("Bad maxp version %d", version);
+ return Error("Unsupported table version 0x%x", version);
}
- if (!table.ReadU16(&maxp->num_glyphs)) {
- return OTS_FAILURE_MSG("Failed to read number of glyphs from maxp table");
+ if (!table.ReadU16(&this->num_glyphs)) {
+ return Error("Failed to read numGlyphs");
}
- if (!maxp->num_glyphs) {
- return OTS_FAILURE_MSG("Bad number of glyphs 0 in maxp table");
+ if (!this->num_glyphs) {
+ return Error("numGlyphs is 0");
}
if (version >> 16 == 1) {
- maxp->version_1 = true;
- if (!table.ReadU16(&maxp->max_points) ||
- !table.ReadU16(&maxp->max_contours) ||
- !table.ReadU16(&maxp->max_c_points) ||
- !table.ReadU16(&maxp->max_c_contours) ||
- !table.ReadU16(&maxp->max_zones) ||
- !table.ReadU16(&maxp->max_t_points) ||
- !table.ReadU16(&maxp->max_storage) ||
- !table.ReadU16(&maxp->max_fdefs) ||
- !table.ReadU16(&maxp->max_idefs) ||
- !table.ReadU16(&maxp->max_stack) ||
- !table.ReadU16(&maxp->max_size_glyf_instructions) ||
- !table.ReadU16(&maxp->max_c_components) ||
- !table.ReadU16(&maxp->max_c_depth)) {
- return OTS_FAILURE_MSG("Failed to read maxp table");
+ this->version_1 = true;
+ if (!table.ReadU16(&this->max_points) ||
+ !table.ReadU16(&this->max_contours) ||
+ !table.ReadU16(&this->max_c_points) ||
+ !table.ReadU16(&this->max_c_contours) ||
+ !table.ReadU16(&this->max_zones) ||
+ !table.ReadU16(&this->max_t_points) ||
+ !table.ReadU16(&this->max_storage) ||
+ !table.ReadU16(&this->max_fdefs) ||
+ !table.ReadU16(&this->max_idefs) ||
+ !table.ReadU16(&this->max_stack) ||
+ !table.ReadU16(&this->max_size_glyf_instructions) ||
+ !table.ReadU16(&this->max_c_components) ||
+ !table.ReadU16(&this->max_c_depth)) {
+ return Error("Failed to read version 1 table data");
}
- if (maxp->max_zones == 0) {
+ if (this->max_zones == 0) {
// workaround for ipa*.ttf Japanese fonts.
- OTS_WARNING("bad max_zones: %u", maxp->max_zones);
- maxp->max_zones = 1;
- } else if (maxp->max_zones == 3) {
+ Warning("Bad maxZones: %u", this->max_zones);
+ this->max_zones = 1;
+ } else if (this->max_zones == 3) {
// workaround for Ecolier-*.ttf fonts.
- OTS_WARNING("bad max_zones: %u", maxp->max_zones);
- maxp->max_zones = 2;
+ Warning("Bad maxZones: %u", this->max_zones);
+ this->max_zones = 2;
}
- if ((maxp->max_zones != 1) && (maxp->max_zones != 2)) {
- return OTS_FAILURE_MSG("Bad max zones %d in maxp", maxp->max_zones);
+ if ((this->max_zones != 1) && (this->max_zones != 2)) {
+ return Error("Bad maxZones: %u", this->max_zones);
}
} else {
- maxp->version_1 = false;
+ this->version_1 = false;
}
return true;
}
-bool ots_maxp_should_serialise(Font *font) {
- return font->maxp != NULL;
-}
-
-bool ots_maxp_serialise(OTSStream *out, Font *font) {
- const OpenTypeMAXP *maxp = font->maxp;
-
- if (!out->WriteU32(maxp->version_1 ? 0x00010000 : 0x00005000) ||
- !out->WriteU16(maxp->num_glyphs)) {
- return OTS_FAILURE_MSG("Failed to write maxp version or number of glyphs");
+bool OpenTypeMAXP::Serialize(OTSStream *out) {
+ if (!out->WriteU32(this->version_1 ? 0x00010000 : 0x00005000) ||
+ !out->WriteU16(this->num_glyphs)) {
+ return Error("Failed to write version or numGlyphs");
}
- if (!maxp->version_1) return true;
+ if (!this->version_1) return true;
- if (!out->WriteU16(maxp->max_points) ||
- !out->WriteU16(maxp->max_contours) ||
- !out->WriteU16(maxp->max_c_points) ||
- !out->WriteU16(maxp->max_c_contours)) {
- return OTS_FAILURE_MSG("Failed to write maxp");
+ if (!out->WriteU16(this->max_points) ||
+ !out->WriteU16(this->max_contours) ||
+ !out->WriteU16(this->max_c_points) ||
+ !out->WriteU16(this->max_c_contours)) {
+ return Error("Failed to write maxp");
}
- if (!out->WriteU16(maxp->max_zones) ||
- !out->WriteU16(maxp->max_t_points) ||
- !out->WriteU16(maxp->max_storage) ||
- !out->WriteU16(maxp->max_fdefs) ||
- !out->WriteU16(maxp->max_idefs) ||
- !out->WriteU16(maxp->max_stack) ||
- !out->WriteU16(maxp->max_size_glyf_instructions)) {
- return OTS_FAILURE_MSG("Failed to write more maxp");
+ if (!out->WriteU16(this->max_zones) ||
+ !out->WriteU16(this->max_t_points) ||
+ !out->WriteU16(this->max_storage) ||
+ !out->WriteU16(this->max_fdefs) ||
+ !out->WriteU16(this->max_idefs) ||
+ !out->WriteU16(this->max_stack) ||
+ !out->WriteU16(this->max_size_glyf_instructions)) {
+ return Error("Failed to write more maxp");
}
- if (!out->WriteU16(maxp->max_c_components) ||
- !out->WriteU16(maxp->max_c_depth)) {
- return OTS_FAILURE_MSG("Failed to write yet more maxp");
+ if (!out->WriteU16(this->max_c_components) ||
+ !out->WriteU16(this->max_c_depth)) {
+ return Error("Failed to write yet more maxp");
}
return true;
}
-void ots_maxp_reuse(Font *font, Font *other) {
- font->maxp = other->maxp;
- font->maxp_reused = true;
-}
-
-void ots_maxp_free(Font *font) {
- delete font->maxp;
-}
-
} // namespace ots
-
-#undef TABLE_NAME
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-23 15:45:48 +0000