diff options
| author | Colin Cross <ccross@android.com> | 2022-01-12 18:06:28 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-01-12 18:06:28 +0000 |
| commit | b2d45ff546a9373475d1954741ba6d32db6beafb (patch) | |
| tree | 4f6d6ab927e0aafbd02d0c5fda8beb7708add691 | |
| parent | 6420ec756f3763a47c226bee374b966638b8d4ed (diff) | |
| parent | 06a513ba98b7c2c778830d72d6ab49935b32da4e (diff) | |
| download | sfntly-b2d45ff546a9373475d1954741ba6d32db6beafb.tar.gz | |
Merge "Use static_cast for NULL to pointer type" am: d77ad7e9dc am: 459740c167 am: 06a513ba98
Original change: https://android-review.googlesource.com/c/platform/external/sfntly/+/1945422
Change-Id: I216849e74f4def221cdaf39543ca1be3e43f10e7
| -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) { } |