diff options
| author | Colin Cross <ccross@android.com> | 2017-06-06 03:43:13 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-06 03:43:13 +0000 |
| commit | 7b02e0897503472e86dcb1a3f4addb2484e33815 (patch) | |
| tree | 44865f842035b9548435aedbd895817eacd2b7c2 /cpp/src/sfntly/table/core/font_header_table.cc | |
| parent | 06d185e1fcc2e78707dae961931d7127dde12e81 (diff) | |
| parent | 193346642edfb118cbdac8c8678bfbc405e0f655 (diff) | |
| download | sfntly-7b02e0897503472e86dcb1a3f4addb2484e33815.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into master am: d7c3ad1d95 am: fd76129cde am: 3d3aab44bf am: ad302cbfd8 am: 31db13c42a am: 47b38c7df8 am: 1f8dca48cb am: 959c8f3447 am: e070d6c91d am: a47999b814
am: 193346642e
Change-Id: I891410308b10213c54eb3ef37101339fc45daeb1
Diffstat (limited to 'cpp/src/sfntly/table/core/font_header_table.cc')
| -rw-r--r-- | cpp/src/sfntly/table/core/font_header_table.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cpp/src/sfntly/table/core/font_header_table.cc b/cpp/src/sfntly/table/core/font_header_table.cc index 60015ca..a848afd 100644 --- a/cpp/src/sfntly/table/core/font_header_table.cc +++ b/cpp/src/sfntly/table/core/font_header_table.cc @@ -239,7 +239,10 @@ void FontHeaderTable::Builder::SetFontDirectionHint(int32_t hint) { } int32_t FontHeaderTable::Builder::IndexToLocFormat() { - return down_cast<FontHeaderTable*>(GetTable())->IndexToLocFormat(); + Table* table = GetTable(); + if (!table) + return IndexToLocFormat::kInvalidOffset; + return down_cast<FontHeaderTable*>(table)->IndexToLocFormat(); } void FontHeaderTable::Builder::SetIndexToLocFormat(int32_t format) { |