X-Git-Url: http://git.tdb.fi/?p=libs%2Fgui.git;a=blobdiff_plain;f=source%2Fgraphics%2Fpng%2Fpngloader.cpp;h=537dcc190958ffd525443b2ef1af3de5ccd67cac;hp=c2691bd5c30522a51843bc7774d4ab8453c6db1e;hb=b74b0945b2e19c32f05d8bcb016cc9434c99979d;hpb=d3bc6c9c2cfaaedaabfd4b5b7bf4e1da2de51331 diff --git a/source/graphics/png/pngloader.cpp b/source/graphics/png/pngloader.cpp index c2691bd..537dcc1 100644 --- a/source/graphics/png/pngloader.cpp +++ b/source/graphics/png/pngloader.cpp @@ -90,7 +90,7 @@ void PngLoader::load(Image::Data &data) default: throw unsupported_image_format("unknown color type"); } - data.data = new char[data.stride*data.height]; + data.pixels = new char[data.stride*data.height]; if(interlace==PNG_INTERLACE_ADAM7) { @@ -98,7 +98,7 @@ void PngLoader::load(Image::Data &data) unsigned n_passes = png_set_interlace_handling(priv->png); rows = new png_byte *[data.height]; for(unsigned y=0; y(data.data+data.stride*(data.height-1-y)); + rows[y] = reinterpret_cast(data.pixels+data.stride*(data.height-1-y)); for(unsigned i=0; ipng, rows, 0, data.height); @@ -109,7 +109,7 @@ void PngLoader::load(Image::Data &data) else { for(unsigned y=0; ypng, reinterpret_cast(data.data+data.stride*(data.height-1-y)), 0); + png_read_row(priv->png, reinterpret_cast(data.pixels+data.stride*(data.height-1-y)), 0); } png_read_end(priv->png, 0);