diff options
| author | Colin Cross <ccross@android.com> | 2017-06-06 03:02:36 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-06 03:02:36 +0000 |
| commit | 31db13c42a58810f66cc87c6f100465c99b8365c (patch) | |
| tree | a3030d07d2ff89294ce4b6394afc5cbe4f67dbda /cpp/src/sfntly/table/table_based_table_builder.cc | |
| parent | ccb3219886cbefb53c7e4160388123658200df94 (diff) | |
| parent | ad302cbfd89396891e23d8902cea1b8189ac7d58 (diff) | |
| download | sfntly-31db13c42a58810f66cc87c6f100465c99b8365c.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into master am: d7c3ad1d95 am: fd76129cde am: 3d3aab44bf
am: ad302cbfd8
Change-Id: Ib2862c4330034e2bfa4a65e6d3f4dfd61e0e4f44
Diffstat (limited to 'cpp/src/sfntly/table/table_based_table_builder.cc')
| -rw-r--r-- | cpp/src/sfntly/table/table_based_table_builder.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cpp/src/sfntly/table/table_based_table_builder.cc b/cpp/src/sfntly/table/table_based_table_builder.cc index b505704..51a5a3b 100644 --- a/cpp/src/sfntly/table/table_based_table_builder.cc +++ b/cpp/src/sfntly/table/table_based_table_builder.cc @@ -60,8 +60,10 @@ TableBasedTableBuilder::TableBasedTableBuilder(Header* header) } Table* TableBasedTableBuilder::GetTable() { - if (table_ == NULL) { - table_.Attach(down_cast<Table*>(SubBuildTable(InternalReadData()))); + if (!table_) { + ReadableFontData* data = InternalReadData(); + if (data) + table_.Attach(down_cast<Table*>(SubBuildTable(data))); } return table_; } |