diff options
| author | Colin Cross <ccross@android.com> | 2017-06-06 02:51:35 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-06 02:51:35 +0000 |
| commit | 3d3aab44bf4341afecf35b10c40b20e85906a1ef (patch) | |
| tree | a77368b5efd882b6d7c224d8fd9f5b6948d48071 /cpp/src/sfntly/table/table_based_table_builder.cc | |
| parent | 90e121df2741a3e4eb6a78da1d39c299c5a2eca9 (diff) | |
| parent | fd76129cde3ff870adaf9bd8649ad1dad90bb9e7 (diff) | |
| download | sfntly-3d3aab44bf4341afecf35b10c40b20e85906a1ef.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into master am: d7c3ad1d95
am: fd76129cde
Change-Id: Ibe3ac0fb59f7497c51a4d41bf24c5d9290c46f9e
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_; } |