summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Pyne <mpyne@kde.org>2012-03-18 20:28:08 (GMT)
committerMichael Pyne <mpyne@kde.org>2012-04-14 20:50:45 (GMT)
commita5cc5111d6dd640e63779e0bb46ca75dee80f714 (patch)
tree248a7fae7df757e0b688a8ee640fbf0e6ba84741
parentd3b4655ff703347a6561062cf2a8640ffbed86fa (diff)
imload_png: Remove incorrect extra libpng call.
KHTML's PNG decoder has an apparently extraneous call to a libpng function, as reported by libpng developer John Bowler. png_read_update_info already does the work required by png_read_start_image. This extra work causes the upcoming libpng-1.6.0-beta18 to fail to load images at all (they will probably downgrade this to a warning before the 1.6.0 release, but should still be fixed). Unfortunately I neglected to commit this when the patch was first approved, so it will not be present in a release until 4.8.3. BUG:296305 FIXED-IN:4.8.3
-rw-r--r--khtml/imload/decoders/pngloader.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/khtml/imload/decoders/pngloader.cpp b/khtml/imload/decoders/pngloader.cpp
index 5e97e6d..8e7d4bc 100644
--- a/khtml/imload/decoders/pngloader.cpp
+++ b/khtml/imload/decoders/pngloader.cpp
@@ -191,7 +191,6 @@ private:
//OK, time to start input
png_read_update_info(pngReadStruct, pngInfoStruct);
- png_start_read_image(pngReadStruct);
}
void haveRow(unsigned int rowNum, int pass, unsigned char* data)