summaryrefslogtreecommitdiff
path: root/platform/default
diff options
context:
space:
mode:
authorThiago Marcos P. Santos <tmpsantos@gmail.com>2020-03-20 12:38:09 +0200
committerThiago Marcos P. Santos <tmpsantos@gmail.com>2020-03-30 23:37:44 +0300
commit65f4df5190d764a12a2c8054bfce2838545917e7 (patch)
tree4b0ae8b13e19d88af1b6e3c7ae2c05d41069723c /platform/default
parent5fa7ff3b63226bda5fe18a89794c76e86f81c4f8 (diff)
downloadqtlocation-mapboxgl-65f4df5190d764a12a2c8054bfce2838545917e7.tar.gz
[core] Fix google-readability-casting errors
As reported by clang-tidy-8.
Diffstat (limited to 'platform/default')
-rw-r--r--platform/default/src/mbgl/storage/http_file_source.cpp2
-rw-r--r--platform/default/src/mbgl/util/jpeg_reader.cpp6
-rw-r--r--platform/default/src/mbgl/util/png_writer.cpp2
3 files changed, 5 insertions, 5 deletions
diff --git a/platform/default/src/mbgl/storage/http_file_source.cpp b/platform/default/src/mbgl/storage/http_file_source.cpp
index 81bbf821ad..d55d447ae7 100644
--- a/platform/default/src/mbgl/storage/http_file_source.cpp
+++ b/platform/default/src/mbgl/storage/http_file_source.cpp
@@ -286,7 +286,7 @@ size_t HTTPRequest::writeCallback(void *const contents, const size_t size, const
impl->data = std::make_shared<std::string>();
}
- impl->data->append((char *)contents, size * nmemb);
+ impl->data->append(static_cast<char *>(contents), size * nmemb);
return size * nmemb;
}
diff --git a/platform/default/src/mbgl/util/jpeg_reader.cpp b/platform/default/src/mbgl/util/jpeg_reader.cpp
index 5f613f9423..69df494e70 100644
--- a/platform/default/src/mbgl/util/jpeg_reader.cpp
+++ b/platform/default/src/mbgl/util/jpeg_reader.cpp
@@ -56,8 +56,8 @@ static void term(j_decompress_ptr) {}
static void attach_stream(j_decompress_ptr cinfo, std::istream* in) {
if (cinfo->src == nullptr) {
- cinfo->src = (struct jpeg_source_mgr *)
- (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, sizeof(jpeg_stream_wrapper));
+ cinfo->src = static_cast<struct jpeg_source_mgr*>((*cinfo->mem->alloc_small)(
+ reinterpret_cast<j_common_ptr>(cinfo), JPOOL_PERMANENT, sizeof(jpeg_stream_wrapper)));
}
auto * src = reinterpret_cast<jpeg_stream_wrapper*> (cinfo->src);
src->manager.init_source = init_source;
@@ -122,7 +122,7 @@ PremultipliedImage decodeJPEG(const uint8_t* data, size_t size) {
PremultipliedImage image({ static_cast<uint32_t>(width), static_cast<uint32_t>(height) });
uint8_t* dst = image.data.get();
- JSAMPARRAY buffer = (*cinfo.mem->alloc_sarray)((j_common_ptr) &cinfo, JPOOL_IMAGE, rowStride, 1);
+ JSAMPARRAY buffer = (*cinfo.mem->alloc_sarray)(reinterpret_cast<j_common_ptr>(&cinfo), JPOOL_IMAGE, rowStride, 1);
while (cinfo.output_scanline < cinfo.output_height) {
jpeg_read_scanlines(&cinfo, buffer, 1);
diff --git a/platform/default/src/mbgl/util/png_writer.cpp b/platform/default/src/mbgl/util/png_writer.cpp
index b89e253f85..1cd3cb60b3 100644
--- a/platform/default/src/mbgl/util/png_writer.cpp
+++ b/platform/default/src/mbgl/util/png_writer.cpp
@@ -59,7 +59,7 @@ std::string encodePNG(const PremultipliedImage& pre) {
for (uint32_t y = 0; y < src.size.height; y++) {
// Every scanline needs to be prefixed with one byte that indicates the filter type.
idat.append(1, 0); // filter type 0
- idat.append((const char*)(src.data.get() + y * stride), stride);
+ idat.append(reinterpret_cast<const char*>(src.data.get() + y * stride), stride);
}
idat = util::compress(idat);