diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-01-08 08:22:10 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-01-08 08:22:10 (GMT) |
| commit | 6e99e7c7d772e122b0e515c1613d9a1e427181ad (patch) | |
| tree | 08ba4a1db8d17bffa2a69a0538298818668e50fd /src/gui/image | |
| parent | 751de8211033b40c66d88140137eef76e6b20cfa (diff) | |
| parent | 118e7a807d0764dee97612589fe5d7072d271e1e (diff) | |
| download | Qt-6e99e7c7d772e122b0e515c1613d9a1e427181ad.zip Qt-6e99e7c7d772e122b0e515c1613d9a1e427181ad.tar.gz Qt-6e99e7c7d772e122b0e515c1613d9a1e427181ad.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Conflicts:
src/multimedia/audio/qaudioformat.cpp
Diffstat (limited to 'src/gui/image')
| -rw-r--r-- | src/gui/image/qpnghandler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/image/qpnghandler.cpp b/src/gui/image/qpnghandler.cpp index e6c3775..d5406cb 100644 --- a/src/gui/image/qpnghandler.cpp +++ b/src/gui/image/qpnghandler.cpp @@ -855,7 +855,7 @@ bool Q_INTERNAL_WIN_NO_THROW QPNGImageWriter::writeImage(const QImage& image_in, png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, 0, 0, 0); - const uchar *data = image.bits(); + const uchar *data = (static_cast<const QImage *>(&image))->bits(); int bpl = image.bytesPerLine(); row_pointers = new png_bytep[height]; uint y; |