Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(64)

Unified Diff: third_party/ots/src/hmtx.cc

Issue 1252363005: Update OTS to revision a7a3b94 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/ots/src/hhea.cc ('k') | third_party/ots/src/kern.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/ots/src/hmtx.cc
diff --git a/third_party/ots/src/hmtx.cc b/third_party/ots/src/hmtx.cc
index ae86513196a86a33f30850d0a2bb2dc598968700..667d1fe6f5663b906e4f52a1d8d8d110c3284571 100644
--- a/third_party/ots/src/hmtx.cc
+++ b/third_party/ots/src/hmtx.cc
@@ -14,36 +14,41 @@
namespace ots {
-bool ots_hmtx_parse(OpenTypeFile *file, const uint8_t *data, size_t length) {
+bool ots_hmtx_parse(Font *font, const uint8_t *data, size_t length) {
Buffer table(data, length);
OpenTypeHMTX *hmtx = new OpenTypeHMTX;
- file->hmtx = hmtx;
+ font->hmtx = hmtx;
- if (!file->hhea || !file->maxp) {
+ if (!font->hhea || !font->maxp) {
return OTS_FAILURE_MSG("Missing hhea or maxp tables in font, needed by hmtx");
}
- if (!ParseMetricsTable(file, &table, file->maxp->num_glyphs,
- &file->hhea->header, &hmtx->metrics)) {
+ if (!ParseMetricsTable(font, &table, font->maxp->num_glyphs,
+ &font->hhea->header, &hmtx->metrics)) {
return OTS_FAILURE_MSG("Failed to parse hmtx metrics");
}
return true;
}
-bool ots_hmtx_should_serialise(OpenTypeFile *file) {
- return file->hmtx != NULL;
+bool ots_hmtx_should_serialise(Font *font) {
+ return font->hmtx != NULL;
}
-bool ots_hmtx_serialise(OTSStream *out, OpenTypeFile *file) {
- if (!SerialiseMetricsTable(file, out, &file->hmtx->metrics)) {
+bool ots_hmtx_serialise(OTSStream *out, Font *font) {
+ if (!SerialiseMetricsTable(font, out, &font->hmtx->metrics)) {
return OTS_FAILURE_MSG("Failed to serialise htmx metrics");
}
return true;
}
-void ots_hmtx_free(OpenTypeFile *file) {
- delete file->hmtx;
+void ots_hmtx_reuse(Font *font, Font *other) {
+ font->hmtx = other->hmtx;
+ font->hmtx_reused = true;
+}
+
+void ots_hmtx_free(Font *font) {
+ delete font->hmtx;
}
} // namespace ots
« no previous file with comments | « third_party/ots/src/hhea.cc ('k') | third_party/ots/src/kern.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698