diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-01-13 02:06:06 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-01-13 02:06:06 +0000 |
commit | f2aeb662f32d211f02c73fa0c715520414e31c58 (patch) | |
tree | 4f6d6ab927e0aafbd02d0c5fda8beb7708add691 | |
parent | 436737ebbc35f8784945cbc4d1d9a62bbb1cbdd0 (diff) | |
parent | d77ad7e9dca5bbe5f901bf6e07536380b8eb877c (diff) | |
download | sfntly-f2aeb662f32d211f02c73fa0c715520414e31c58.tar.gz |
Snap for 8074123 from d77ad7e9dca5bbe5f901bf6e07536380b8eb877c to sdk-release
Change-Id: I2d81bd9118f905bd06ec16e75ed2952b8d79c9ae
-rw-r--r-- | cpp/src/sfntly/table/core/cmap_table.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/sfntly/table/core/cmap_table.cc b/cpp/src/sfntly/table/core/cmap_table.cc index 1f1668e..a66df98 100644 --- a/cpp/src/sfntly/table/core/cmap_table.cc +++ b/cpp/src/sfntly/table/core/cmap_table.cc @@ -439,7 +439,7 @@ CMapTable::CMapFormat0::Builder::Builder( } CMapTable::CMapFormat0::Builder::Builder(const CMapId& cmap_id) - : CMap::Builder(reinterpret_cast<ReadableFontData*>(NULL), + : CMap::Builder(static_cast<ReadableFontData*>(NULL), CMapFormat::kFormat0, cmap_id) { } @@ -563,7 +563,7 @@ CMapTable::CMapFormat2::Builder::Builder(WritableFontData* data, : CMapTable::CMap::Builder(data ? down_cast<WritableFontData*>( data->Slice(offset, data->ReadUShort( offset + Offset::kFormat0Length))) - : reinterpret_cast<WritableFontData*>(NULL), + : static_cast<WritableFontData*>(NULL), CMapFormat::kFormat2, cmap_id) { // TODO(arthurhsu): FIXIT: heavy lifting and leak, need fix. } @@ -574,7 +574,7 @@ CMapTable::CMapFormat2::Builder::Builder(ReadableFontData* data, : CMapTable::CMap::Builder(data ? down_cast<ReadableFontData*>( data->Slice(offset, data->ReadUShort( offset + Offset::kFormat0Length))) - : reinterpret_cast<ReadableFontData*>(NULL), + : static_cast<ReadableFontData*>(NULL), CMapFormat::kFormat2, cmap_id) { // TODO(arthurhsu): FIXIT: heavy lifting and leak, need fix. } @@ -958,7 +958,7 @@ CMapTable::CMapFormat4::Builder::Builder(WritableFontData* data, int32_t offset, CMapTable::CMapFormat4::Builder::Builder(SegmentList* segments, std::vector<int32_t>* glyph_id_array, const CMapId& cmap_id) - : CMap::Builder(reinterpret_cast<ReadableFontData*>(NULL), + : CMap::Builder(static_cast<ReadableFontData*>(NULL), CMapFormat::kFormat4, cmap_id), segments_(segments->begin(), segments->end()), glyph_id_array_(glyph_id_array->begin(), glyph_id_array->end()) { @@ -966,7 +966,7 @@ CMapTable::CMapFormat4::Builder::Builder(SegmentList* segments, } CMapTable::CMapFormat4::Builder::Builder(const CMapId& cmap_id) - : CMap::Builder(reinterpret_cast<ReadableFontData*>(NULL), + : CMap::Builder(static_cast<ReadableFontData*>(NULL), CMapFormat::kFormat4, cmap_id) { } |