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

Unified Diff: src/metrics.h

Issue 658573004: Updating to new OTS repo from https://github.com/khaledhosny/ots.git (Closed) Base URL: https://chromium.googlesource.com/external/ots@master
Patch Set: Adding Colored Emoji changes from external/git repo Created 6 years, 2 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
« .gitmodules ('K') | « src/maxp.cc ('k') | src/metrics.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/metrics.h
diff --git a/src/metrics.h b/src/metrics.h
old mode 100644
new mode 100755
index 46559e1772a29f3297108559c8c44fae608fa92d..f0b4ee8c68ade0f79c53aa9ddc5ffb275937f87a
--- a/src/metrics.h
+++ b/src/metrics.h
@@ -5,7 +5,8 @@
#ifndef OTS_METRICS_H_
#define OTS_METRICS_H_
-#include <utility> // std::pair
+#include <new>
+#include <utility>
#include <vector>
#include "ots.h"
@@ -34,14 +35,17 @@ struct OpenTypeMetricsTable {
bool ParseMetricsHeader(OpenTypeFile *file, Buffer *table,
OpenTypeMetricsHeader *header);
-bool SerialiseMetricsHeader(OTSStream *out,
+bool SerialiseMetricsHeader(const ots::OpenTypeFile *file,
+ OTSStream *out,
const OpenTypeMetricsHeader *header);
-bool ParseMetricsTable(Buffer *table,
+bool ParseMetricsTable(const ots::OpenTypeFile *file,
+ Buffer *table,
const uint16_t num_glyphs,
const OpenTypeMetricsHeader *header,
OpenTypeMetricsTable *metrics);
-bool SerialiseMetricsTable(OTSStream *out,
+bool SerialiseMetricsTable(const ots::OpenTypeFile *file,
+ OTSStream *out,
const OpenTypeMetricsTable *metrics);
} // namespace ots
« .gitmodules ('K') | « src/maxp.cc ('k') | src/metrics.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698