Use default member initializers and defaulted default constructors

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

diff --git a/source/graphics/png/pngloader.cpp b/source/graphics/png/pngloader.cpp
index 190d3cf297488e10977884080c5ad847b8645099..850bbf01c2162ae92306762a96d84bcbe626d30f 100644 (file)
--- a/source/graphics/png/pngloader.cpp
+++ b/source/graphics/png/pngloader.cpp
@@ -1,5 +1,5 @@
-#include <png.h>
 #include "pngloader.h"
+#include <png.h>
 
 using namespace std;
 
@@ -26,10 +26,10 @@ namespace Graphics {
 
 struct PngLoader::Private
 {
-       std::string message;
-       png_struct *png;
-       png_info *info;
-       int interlace;
+       string message;
+       png_struct *png = 0;
+       png_info *info = 0;
+       int interlace = PNG_INTERLACE_NONE;
 };
 
 
@@ -98,8 +98,6 @@ void PngLoader::load_pixels_(Image::Data &data)
                throw bad_image_data(priv->message);
        }
 
-       data.pixels = new char[data.stride*data.height];
-
        if(priv->interlace==PNG_INTERLACE_ADAM7)
        {
                // ADAM7 requires all rows to be loaded at once