| Index: third_party/ots/src/prep.cc
|
| diff --git a/third_party/ots/src/prep.cc b/third_party/ots/src/prep.cc
|
| index ea3dec0b5361c0312e87b67ae46e0eed2e458d0f..1c9b45f91bf970b83bec38f5a83ddda1953334a3 100644
|
| --- a/third_party/ots/src/prep.cc
|
| +++ b/third_party/ots/src/prep.cc
|
| @@ -11,11 +11,11 @@
|
|
|
| namespace ots {
|
|
|
| -bool ots_prep_parse(OpenTypeFile *file, const uint8_t *data, size_t length) {
|
| +bool ots_prep_parse(Font *font, const uint8_t *data, size_t length) {
|
| Buffer table(data, length);
|
|
|
| OpenTypePREP *prep = new OpenTypePREP;
|
| - file->prep = prep;
|
| + font->prep = prep;
|
|
|
| if (length >= 128 * 1024u) {
|
| return OTS_FAILURE_MSG("table length %ld > 120K", length); // almost all prep tables are less than 9k bytes.
|
| @@ -30,13 +30,13 @@ bool ots_prep_parse(OpenTypeFile *file, const uint8_t *data, size_t length) {
|
| return true;
|
| }
|
|
|
| -bool ots_prep_should_serialise(OpenTypeFile *file) {
|
| - if (!file->glyf) return false; // this table is not for CFF fonts.
|
| - return file->prep != NULL;
|
| +bool ots_prep_should_serialise(Font *font) {
|
| + if (!font->glyf) return false; // this table is not for CFF fonts.
|
| + return font->prep != NULL;
|
| }
|
|
|
| -bool ots_prep_serialise(OTSStream *out, OpenTypeFile *file) {
|
| - const OpenTypePREP *prep = file->prep;
|
| +bool ots_prep_serialise(OTSStream *out, Font *font) {
|
| + const OpenTypePREP *prep = font->prep;
|
|
|
| if (!out->Write(prep->data, prep->length)) {
|
| return OTS_FAILURE_MSG("Failed to write table length");
|
| @@ -45,8 +45,13 @@ bool ots_prep_serialise(OTSStream *out, OpenTypeFile *file) {
|
| return true;
|
| }
|
|
|
| -void ots_prep_free(OpenTypeFile *file) {
|
| - delete file->prep;
|
| +void ots_prep_reuse(Font *font, Font *other) {
|
| + font->prep = other->prep;
|
| + font->prep_reused = true;
|
| +}
|
| +
|
| +void ots_prep_free(Font *font) {
|
| + delete font->prep;
|
| }
|
|
|
| } // namespace ots
|
|
|