- data.data = new char[data.stride*data.height];
- for(unsigned y=0; y<data.height; ++y)
- png_read_row(priv->png, reinterpret_cast<png_byte *>(data.data+data.stride*(data.height-1-y)), 0);
+ if(setjmp(png_jmpbuf(priv->png)))
+ {
+ delete[] rows;
+ throw bad_image_data(priv->message);
+ }
+
+ if(priv->interlace==PNG_INTERLACE_ADAM7)
+ {
+ // ADAM7 requires all rows to be loaded at once
+ unsigned n_passes = png_set_interlace_handling(priv->png);
+ rows = new png_byte *[data.height];
+ for(unsigned y=0; y<data.height; ++y)
+ 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, nullptr, data.height);
+
+ delete[] rows;
+ }
+ 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)), nullptr);
+ }