diff options
author | Colin Cross <ccross@android.com> | 2017-06-06 03:26:08 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-06-06 03:26:08 +0000 |
commit | e070d6c91d084990bc4c4103090a251557ca7c2b (patch) | |
tree | a1d53259acad0538184ab273ccb7c8ff663a57b9 /cpp/src/sfntly/table | |
parent | 84e59f094e3a5d8eec0739b6a38d3943f2c45c62 (diff) | |
parent | 959c8f344711d56c218e843bbbbdb2a6c1c2ef60 (diff) | |
download | sfntly-e070d6c91d084990bc4c4103090a251557ca7c2b.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
Change-Id: Iff9062b9589d8d33021e630d46a945f6bad3aa77
Diffstat (limited to 'cpp/src/sfntly/table')
-rw-r--r-- | cpp/src/sfntly/table/core/font_header_table.cc | 5 | ||||
-rw-r--r-- | cpp/src/sfntly/table/core/font_header_table.h | 1 | ||||
-rw-r--r-- | cpp/src/sfntly/table/core/name_table.cc | 10 | ||||
-rw-r--r-- | cpp/src/sfntly/table/core/os2_table.cc | 2 | ||||
-rw-r--r-- | cpp/src/sfntly/table/table_based_table_builder.cc | 6 | ||||
-rw-r--r-- | cpp/src/sfntly/table/truetype/glyph_table.cc | 9 |
6 files changed, 22 insertions, 11 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) { diff --git a/cpp/src/sfntly/table/core/font_header_table.h b/cpp/src/sfntly/table/core/font_header_table.h index 841955b..4851775 100644 --- a/cpp/src/sfntly/table/core/font_header_table.h +++ b/cpp/src/sfntly/table/core/font_header_table.h @@ -24,6 +24,7 @@ namespace sfntly { struct IndexToLocFormat { enum { + kInvalidOffset = -1, kShortOffset = 0, kLongOffset = 1 }; diff --git a/cpp/src/sfntly/table/core/name_table.cc b/cpp/src/sfntly/table/core/name_table.cc index 8d2f64f..c9fe468 100644 --- a/cpp/src/sfntly/table/core/name_table.cc +++ b/cpp/src/sfntly/table/core/name_table.cc @@ -469,12 +469,14 @@ int32_t NameTable::NameId(int32_t index) { void NameTable::NameAsBytes(int32_t index, ByteVector* b) { assert(b); - int32_t length = NameLength(index); b->clear(); + + int32_t length = NameLength(index); + if (length <= 0) + return; + b->resize(length); - if (length > 0) { - data_->ReadBytes(NameOffset(index), &((*b)[0]), 0, length); - } + data_->ReadBytes(NameOffset(index), &((*b)[0]), 0, length); } void NameTable::NameAsBytes(int32_t platform_id, diff --git a/cpp/src/sfntly/table/core/os2_table.cc b/cpp/src/sfntly/table/core/os2_table.cc index 7ca9d9a..1fef309 100644 --- a/cpp/src/sfntly/table/core/os2_table.cc +++ b/cpp/src/sfntly/table/core/os2_table.cc @@ -16,6 +16,8 @@ #include "sfntly/table/core/os2_table.h" +#include <algorithm> + namespace sfntly { /****************************************************************************** * Constants 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_; } diff --git a/cpp/src/sfntly/table/truetype/glyph_table.cc b/cpp/src/sfntly/table/truetype/glyph_table.cc index f38fac5..0c1e841 100644 --- a/cpp/src/sfntly/table/truetype/glyph_table.cc +++ b/cpp/src/sfntly/table/truetype/glyph_table.cc @@ -215,10 +215,11 @@ CALLER_ATTACH GlyphTable::Glyph* ReadableFontDataPtr sliced_data; sliced_data.Attach(down_cast<ReadableFontData*>(data->Slice(offset, length))); - if (type == GlyphType::kSimple) { - glyph = new SimpleGlyph(sliced_data); - } else { - glyph = new CompositeGlyph(sliced_data); + if (sliced_data) { + if (type == GlyphType::kSimple) + glyph = new SimpleGlyph(sliced_data); + else + glyph = new CompositeGlyph(sliced_data); } return glyph.Detach(); } |