summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorFrancois Andriot <francois.andriot@free.fr>2013-08-15 21:15:52 +0200
committerSlávek Banko <slavek.banko@axis.cz>2013-08-15 21:15:52 +0200
commitaf5bc055c269f2685f13f3614bcf9f17349efc95 (patch)
tree001fc4d74a31e71927af28d50d36028d33a9b826 /tools
parent16f24a61f80fef5f29c81182a3bcf3906bdee7a7 (diff)
downloadqt3-af5bc055c269f2685f13f3614bcf9f17349efc95.tar.gz
qt3-af5bc055c269f2685f13f3614bcf9f17349efc95.zip
Fix FTBFS in qvfb with libpng >= 1.5
Diffstat (limited to 'tools')
-rw-r--r--tools/qvfb/qanimationwriter.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/tools/qvfb/qanimationwriter.cpp b/tools/qvfb/qanimationwriter.cpp
index 3555fc6..ad6a047 100644
--- a/tools/qvfb/qanimationwriter.cpp
+++ b/tools/qvfb/qanimationwriter.cpp
@@ -101,7 +101,15 @@ public:
void writePNG(const QImage& image)
{
+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
+#warning XXXtnn not too sure about this
+/*
+according to png.h, channels is only used on read, not writes, so we
+should be able to comment this out.
+*/
+#else /* LIBPNG 1.5 */
info_ptr->channels = 4;
+#endif
png_set_sig_bytes(png_ptr, 8); // Pretend we already wrote the sig
png_set_IHDR(png_ptr, info_ptr, image.width(), image.height(),
8, image.hasAlphaBuffer()