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/truetype/glyph_table.cc | |
| 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/truetype/glyph_table.cc')
| -rw-r--r-- | cpp/src/sfntly/table/truetype/glyph_table.cc | 9 |
1 files changed, 5 insertions, 4 deletions
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(); } |