summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/mbgl/platform/default/headless_view.hpp2
-rw-r--r--platform/default/headless_view_glx.cpp4
-rw-r--r--platform/default/image.cpp10
-rw-r--r--platform/default/jpeg_reader.cpp6
-rw-r--r--platform/default/png_reader.cpp8
-rw-r--r--platform/default/string_stdlib.cpp12
6 files changed, 21 insertions, 21 deletions
diff --git a/include/mbgl/platform/default/headless_view.hpp b/include/mbgl/platform/default/headless_view.hpp
index b2d0a6e5ac..e3acc8e379 100644
--- a/include/mbgl/platform/default/headless_view.hpp
+++ b/include/mbgl/platform/default/headless_view.hpp
@@ -74,7 +74,7 @@ private:
#if MBGL_USE_GLX
Display *xDisplay = nullptr;
GLXFBConfig *fbConfigs = nullptr;
- GLXContext glContext = 0;
+ GLXContext glContext = nullptr;
GLXPbuffer glxPbuffer = 0;
#endif
diff --git a/platform/default/headless_view_glx.cpp b/platform/default/headless_view_glx.cpp
index 3b719ab43a..55d9313f99 100644
--- a/platform/default/headless_view_glx.cpp
+++ b/platform/default/headless_view_glx.cpp
@@ -23,12 +23,12 @@ void HeadlessView::createContext() {
if (!glXIsDirect(xDisplay, glContext)) {
Log::Error(Event::OpenGL, "failed to create direct OpenGL Legacy context");
glXDestroyContext(xDisplay, glContext);
- glContext = 0;
+ glContext = nullptr;
}
}
}
- if (glContext == 0) {
+ if (glContext == nullptr) {
throw std::runtime_error("Error creating GL context object.");
}
diff --git a/platform/default/image.cpp b/platform/default/image.cpp
index 0cfcd4100f..d4e42d8a1b 100644
--- a/platform/default/image.cpp
+++ b/platform/default/image.cpp
@@ -30,15 +30,15 @@ std::string encodePNG(const PremultipliedImage& pre) {
UnassociatedImage src = util::unpremultiply(std::move(copy));
- png_voidp error_ptr = 0;
- png_structp png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, error_ptr, NULL, NULL);
+ png_voidp error_ptr = nullptr;
+ png_structp png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, error_ptr, nullptr, nullptr);
if (!png_ptr) {
throw std::runtime_error("couldn't create png_ptr");
}
png_infop info_ptr = png_create_info_struct(png_ptr);
if (!png_ptr) {
- png_destroy_write_struct(&png_ptr, (png_infopp)0);
+ png_destroy_write_struct(&png_ptr, (png_infopp)nullptr);
throw std::runtime_error("couldn't create info_ptr");
}
@@ -55,7 +55,7 @@ std::string encodePNG(const PremultipliedImage& pre) {
png_set_write_fn(png_ptr, &result, [](png_structp png_ptr_, png_bytep data, png_size_t length) {
std::string *out = static_cast<std::string *>(png_get_io_ptr(png_ptr_));
out->append(reinterpret_cast<char *>(data), length);
- }, NULL);
+ }, nullptr);
struct ptrs {
ptrs(size_t count) : rows(new png_bytep[count]) {}
@@ -68,7 +68,7 @@ std::string encodePNG(const PremultipliedImage& pre) {
}
png_set_rows(png_ptr, info_ptr, pointers.rows);
- png_write_png(png_ptr, info_ptr, PNG_TRANSFORM_IDENTITY, NULL);
+ png_write_png(png_ptr, info_ptr, PNG_TRANSFORM_IDENTITY, nullptr);
png_destroy_write_struct(&png_ptr, &info_ptr);
return result;
diff --git a/platform/default/jpeg_reader.cpp b/platform/default/jpeg_reader.cpp
index 7ef3672333..08b6c299d6 100644
--- a/platform/default/jpeg_reader.cpp
+++ b/platform/default/jpeg_reader.cpp
@@ -55,7 +55,7 @@ static void skip(j_decompress_ptr cinfo, long count) {
{
wrap->stream->seekg(count - wrap->manager.bytes_in_buffer, std::ios_base::cur);
// trigger buffer fill
- wrap->manager.next_input_byte = 0;
+ wrap->manager.next_input_byte = nullptr;
wrap->manager.bytes_in_buffer = 0; //bytes_in_buffer may be zero on return.
}
}
@@ -63,7 +63,7 @@ static void skip(j_decompress_ptr cinfo, long count) {
static void term(j_decompress_ptr) {}
static void attach_stream(j_decompress_ptr cinfo, input_stream* in) {
- if (cinfo->src == 0) {
+ if (cinfo->src == nullptr) {
cinfo->src = (struct jpeg_source_mgr *)
(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, sizeof(jpeg_stream_wrapper));
}
@@ -74,7 +74,7 @@ static void attach_stream(j_decompress_ptr cinfo, input_stream* in) {
src->manager.resync_to_restart = jpeg_resync_to_restart;
src->manager.term_source = term;
src->manager.bytes_in_buffer = 0;
- src->manager.next_input_byte = 0;
+ src->manager.next_input_byte = nullptr;
src->stream = in;
}
diff --git a/platform/default/png_reader.cpp b/platform/default/png_reader.cpp
index 821004922e..3d1165b13f 100644
--- a/platform/default/png_reader.cpp
+++ b/platform/default/png_reader.cpp
@@ -46,7 +46,7 @@ struct png_struct_guard {
i_(info_ptr_ptr) {}
~png_struct_guard() {
- png_destroy_read_struct(p_,i_,0);
+ png_destroy_read_struct(p_,i_,nullptr);
}
png_structpp p_;
@@ -66,7 +66,7 @@ PremultipliedImage decodePNG(const uint8_t* data, size_t size) {
if (!is_png)
throw std::runtime_error("File or stream is not a png");
- png_structp png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, 0, 0, 0);
+ png_structp png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, nullptr, nullptr, nullptr);
if (!png_ptr)
throw std::runtime_error("failed to allocate png_ptr");
@@ -87,7 +87,7 @@ PremultipliedImage decodePNG(const uint8_t* data, size_t size) {
png_uint_32 height = 0;
int bit_depth = 0;
int color_type = 0;
- png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, 0, 0, 0);
+ png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, nullptr, nullptr, nullptr);
UnassociatedImage image { width, height };
@@ -125,7 +125,7 @@ PremultipliedImage decodePNG(const uint8_t* data, size_t size) {
rows[row] = image.data.get() + row * width * 4;
png_read_image(png_ptr, rows.get());
- png_read_end(png_ptr, 0);
+ png_read_end(png_ptr, nullptr);
return util::premultiply(std::move(image));
}
diff --git a/platform/default/string_stdlib.cpp b/platform/default/string_stdlib.cpp
index 4cd6c20777..8bae1ff008 100644
--- a/platform/default/string_stdlib.cpp
+++ b/platform/default/string_stdlib.cpp
@@ -18,10 +18,10 @@ std::string uppercase(const std::string& str)
for (; itr < end; itr = nitr)
{
uint32_t code_point = 0;
- char const* buf = 0;
+ char const* buf = nullptr;
- nitr = _nu_toupper(itr, end, nu_utf8_read, &code_point, &buf, 0);
- if (buf != 0)
+ nitr = _nu_toupper(itr, end, nu_utf8_read, &code_point, &buf, nullptr);
+ if (buf != nullptr)
{
do
{
@@ -51,10 +51,10 @@ std::string lowercase(const std::string& str)
for (; itr < end; itr = nitr)
{
uint32_t code_point = 0;
- char const* buf = 0;
+ char const* buf = nullptr;
- nitr = _nu_tolower(itr, end, nu_utf8_read, &code_point, &buf, 0);
- if (buf != 0)
+ nitr = _nu_tolower(itr, end, nu_utf8_read, &code_point, &buf, nullptr);
+ if (buf != nullptr)
{
do
{
View Lorry Controller Status