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