Use nullptr in place of 0 or NULL

[libs/gui.git] / source / graphics / png / pngloader.cpp

diff --git a/source/graphics/png/pngloader.cpp b/source/graphics/png/pngloader.cpp
index 7842c1864a60c69072906be62f3957c19a6171cb..9c2e1ae339213c2f3cc5a2ad5965ecebb759bf33 100644 (file)
--- a/source/graphics/png/pngloader.cpp
+++ b/source/graphics/png/pngloader.cpp
@@ -27,8 +27,8 @@ namespace Graphics {
 struct PngLoader::Private
 {
        string message;
-       png_struct *png = 0;
-       png_info *info = 0;
+       png_struct *png = nullptr;
+       png_info *info = nullptr;
        int interlace = PNG_INTERLACE_NONE;
 };
 
@@ -36,7 +36,7 @@ struct PngLoader::Private
 PngLoader::PngLoader(IO::Base &io, unsigned sig_bytes):
        priv(new Private)
 {
-       priv->png = png_create_read_struct(PNG_LIBPNG_VER_STRING, &priv->message, error, 0);
+       priv->png = png_create_read_struct(PNG_LIBPNG_VER_STRING, &priv->message, error, nullptr);
        priv->info = png_create_info_struct(priv->png);
 
        // These probably won't give any errors
@@ -46,7 +46,7 @@ PngLoader::PngLoader(IO::Base &io, unsigned sig_bytes):
 
 PngLoader::~PngLoader()
 {
-       png_destroy_read_struct(&priv->png, &priv->info, 0);
+       png_destroy_read_struct(&priv->png, &priv->info, nullptr);
        delete priv;
 }
 
@@ -67,7 +67,7 @@ void PngLoader::load_headers_(Image::Data &data)
        png_uint_32 height;
        int depth;
        int color;
-       png_get_IHDR(priv->png, priv->info, &width, &height, &depth, &color, &priv->interlace, 0, 0);
+       png_get_IHDR(priv->png, priv->info, &width, &height, &depth, &color, &priv->interlace, nullptr, nullptr);
        unsigned nchans = png_get_channels(priv->png, priv->info);
 
        if(depth!=8)
@@ -90,7 +90,7 @@ void PngLoader::load_headers_(Image::Data &data)
 
 void PngLoader::load_pixels_(Image::Data &data)
 {
-       png_byte **rows = 0;
+       png_byte **rows = nullptr;
 
        if(setjmp(png_jmpbuf(priv->png)))
        {
@@ -107,18 +107,17 @@ void PngLoader::load_pixels_(Image::Data &data)
                        rows[y] = reinterpret_cast<png_byte *>(data.pixels+data.stride*(data.height-1-y));
 
                for(unsigned i=0; i<n_passes; ++i)
-                       png_read_rows(priv->png, rows, 0, data.height);
+                       png_read_rows(priv->png, rows, nullptr, data.height);
 
                delete[] rows;
-               rows = 0;
        }
        else
        {
                for(unsigned y=0; y<data.height; ++y)
-                       png_read_row(priv->png, reinterpret_cast<png_byte *>(data.pixels+data.stride*(data.height-1-y)), 0);
+                       png_read_row(priv->png, reinterpret_cast<png_byte *>(data.pixels+data.stride*(data.height-1-y)), nullptr);
        }
 
-       png_read_end(priv->png, 0);
+       png_read_end(priv->png, nullptr);
 }
 
 } // namespace Graphics