libpng15 TQt3 build fixes

This closes Bug 683

1 files changed, 111 insertions, 3 deletions

diff --git a/src/kernel/qpngio.cpp b/src/kernel/qpngio.cpp
index b90836ac7..bbb4037bd 100644
--- a/src/kernel/qpngio.cpp
+++ b/src/kernel/qpngio.cpp
@@ -46,6 +46,9 @@
 #include "qiodevice.h"
 
 #include <png.h>
+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
+#include <zlib.h>
+#endif /* LIBPNG 1.5 */
 
 
 #ifdef Q_OS_TEMP
@@ -126,9 +129,29 @@ void setup_qt( TQImage& image, png_structp png_ptr, png_infop info_ptr, float sc
     png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type,
 	0, 0, 0);
 
+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
+    png_colorp info_ptr_palette = NULL;
+    int info_ptr_num_palette = 0;
+    if (png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE)) {
+	png_get_PLTE(png_ptr, info_ptr, &info_ptr_palette, &info_ptr_num_palette);
+    }
+
+    png_bytep info_ptr_trans_alpha = NULL;
+    int info_ptr_num_trans = 0;
+    png_color_16p info_ptr_trans_color = NULL;
+
+    if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) {
+	png_get_tRNS(png_ptr, info_ptr, &info_ptr_trans_alpha, &info_ptr_num_trans, &info_ptr_trans_color);
+    }
+#endif /* LIBPNG 1.5 */
+
     if ( color_type == PNG_COLOR_TYPE_GRAY ) {
 	// Black & White or 8-bit grayscale
+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
+	if ( bit_depth == 1 && png_get_channels(png_ptr, info_ptr) == 1 ) {
+#else /* LIBPNG 1.5 */
 	if ( bit_depth == 1 && info_ptr->channels == 1 ) {
+#endif /* LIBPNG 1.5 */
 	    png_set_invert_mono( png_ptr );
 	    png_read_update_info( png_ptr, info_ptr );
 	    if (!image.create( width, height, 1, 2, TQImage::BigEndian ))
@@ -162,7 +185,9 @@ void setup_qt( TQImage& image, png_structp png_ptr, png_infop info_ptr, float sc
 		image.setColor( i, qRgba(c,c,c,0xff) );
 	    }
 	    if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) {
-#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=4 )
+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
+		const int g = info_ptr_trans_color->gray;
+#elif ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=4 )
 		const int g = info_ptr->trans_color.gray;
 #else
 		const int g = info_ptr->trans_values.gray;
@@ -175,7 +200,11 @@ void setup_qt( TQImage& image, png_structp png_ptr, png_infop info_ptr, float sc
 	}
     } else if ( color_type == PNG_COLOR_TYPE_PALETTE
      && png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE)
+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
+     && info_ptr_num_palette <= 256 )
+#else /* LIBPNG 1.5 */
      && info_ptr->num_palette <= 256 )
+#endif /* LIBPNG 1.5 */
     {
 	// 1-bit and 8-bit color
 	if ( bit_depth != 1 )
@@ -183,18 +212,33 @@ void setup_qt( TQImage& image, png_structp png_ptr, png_infop info_ptr, float sc
 	png_read_update_info( png_ptr, info_ptr );
 	png_get_IHDR(png_ptr, info_ptr,
 	    &width, &height, &bit_depth, &color_type, 0, 0, 0);
+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
+	if (!image.create(width, height, bit_depth, info_ptr_num_palette,
+#else /* LIBPNG 1.5 */
 	if (!image.create(width, height, bit_depth, info_ptr->num_palette,
+#endif /* LIBPNG 1.5 */
 	    TQImage::BigEndian))
 	    return;
 	int i = 0;
 	if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) {
 	    image.setAlphaBuffer( TRUE );
+
+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
+	    while ( i < info_ptr_num_trans ) {
+		image.setColor(i, qRgba(
+		    info_ptr_palette[i].red,
+		    info_ptr_palette[i].green,
+		    info_ptr_palette[i].blue,
+#else /* LIBPNG 1.5 */
 	    while ( i < info_ptr->num_trans ) {
 		image.setColor(i, qRgba(
 		    info_ptr->palette[i].red,
 		    info_ptr->palette[i].green,
 		    info_ptr->palette[i].blue,
-#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=4 )
+#endif /* LIBPNG 1.5 */
+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
+		    info_ptr_trans_alpha[i]
+#elif ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=4 )
 		    info_ptr->trans_alpha[i]
 #else
 		    info_ptr->trans[i]
@@ -204,11 +248,19 @@ void setup_qt( TQImage& image, png_structp png_ptr, png_infop info_ptr, float sc
 		i++;
 	    }
 	}
+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
+	while ( i < info_ptr_num_palette ) {
+	    image.setColor(i, qRgba(
+		info_ptr_palette[i].red,
+		info_ptr_palette[i].green,
+		info_ptr_palette[i].blue,
+#else /* LIBPNG 1.5 */
 	while ( i < info_ptr->num_palette ) {
 	    image.setColor(i, qRgba(
 		info_ptr->palette[i].red,
 		info_ptr->palette[i].green,
 		info_ptr->palette[i].blue,
+#endif /* LIBPNG 1.5 */
 		0xff
 		)
 	    );
@@ -295,7 +347,11 @@ void read_png_image(TQImageIO* iio)
 	return;
     }
 
+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
+    if (setjmp(png_jmpbuf(png_ptr))) {
+#else /* LIBPNG 1.5 */
     if (setjmp(png_ptr->jmpbuf)) {
+#endif /* LIBPNG 1.5 */
 	png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
 	iio->setStatus(-4);
 	return;
@@ -486,7 +542,11 @@ bool TQPNGImageWriter::writeImage(const TQImage& image, int quality_in, int off_
 	return FALSE;
     }
 
+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
+    if (setjmp(png_jmpbuf(png_ptr))) {
+#else /* LIBPNG 1.5 */
     if (setjmp(png_ptr->jmpbuf)) {
+#endif /* LIBPNG 1.5 */
 	png_destroy_write_struct(&png_ptr, &info_ptr);
 	return FALSE;
     }
@@ -508,10 +568,18 @@ bool TQPNGImageWriter::writeImage(const TQImage& image, int quality_in, int off_
 
     png_set_write_fn(png_ptr, (void*)this, qpiw_write_fn, qpiw_flush_fn);
 
+#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 =
 	(image.depth() == 32)
 	    ? (image.hasAlphaBuffer() ? 4 : 3)
 	    : 1;
+#endif /* LIBPNG 1.5 */
 
     png_set_IHDR(png_ptr, info_ptr, image.width(), image.height(),
 	image.depth() == 1 ? 1 : 8 /* per channel */,
@@ -521,11 +589,18 @@ bool TQPNGImageWriter::writeImage(const TQImage& image, int quality_in, int off_
 		: PNG_COLOR_TYPE_RGB
 	    : PNG_COLOR_TYPE_PALETTE, 0, 0, 0);
 
-
+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
+    png_color_8 sig_bit;
+    sig_bit.red = 8;
+    sig_bit.green = 8;
+    sig_bit.blue = 8;
+    png_set_sBIT(png_ptr, info_ptr, &sig_bit);
+#else /* LIBPNG 1.5 */
     //png_set_sBIT(png_ptr, info_ptr, 8);
     info_ptr->sig_bit.red = 8;
     info_ptr->sig_bit.green = 8;
     info_ptr->sig_bit.blue = 8;
+#endif /* LIBPNG 1.5 */
 
     if (image.depth() == 1 && image.bitOrder() == TQImage::LittleEndian)
        png_set_packswap(png_ptr);
@@ -539,11 +614,22 @@ bool TQPNGImageWriter::writeImage(const TQImage& image, int quality_in, int off_
 	png_set_PLTE(png_ptr, info_ptr, palette, num_palette);
 	int* trans = new int[num_palette];
 	int num_trans = 0;
+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
+	png_colorp info_ptr_palette = NULL;
+	int tmp;
+	png_get_PLTE(png_ptr, info_ptr, &info_ptr_palette, &tmp);
+#endif /* LIBPNG 1.5 */
 	for (int i=0; i<num_palette; i++) {
 	    TQRgb rgb=image.color(i);
+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
+	    info_ptr_palette[i].red = qRed(rgb);
+	    info_ptr_palette[i].green = qGreen(rgb);
+	    info_ptr_palette[i].blue = qBlue(rgb);
+#else /* LIBPNG 1.5 */
 	    info_ptr->palette[i].red = qRed(rgb);
 	    info_ptr->palette[i].green = qGreen(rgb);
 	    info_ptr->palette[i].blue = qBlue(rgb);
+#endif /* LIBPNG 1.5 */
 	    if (image.hasAlphaBuffer()) {
 		trans[i] = rgb >> 24;
 		if (trans[i] < 255) {
@@ -551,6 +637,9 @@ bool TQPNGImageWriter::writeImage(const TQImage& image, int quality_in, int off_
 		}
 	    }
 	}
+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
+	png_set_PLTE(png_ptr, info_ptr, info_ptr_palette, num_palette);
+#endif /* LIBPNG 1.5 */
 	if (num_trans) {
 	    copy_trans = new png_byte[num_trans];
 	    for (int i=0; i<num_trans; i++)
@@ -561,7 +650,14 @@ bool TQPNGImageWriter::writeImage(const TQImage& image, int quality_in, int off_
     }
 
     if ( image.hasAlphaBuffer() ) {
+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
+        png_color_8p sig_bit;
+        png_get_sBIT(png_ptr, info_ptr, &sig_bit);
+        sig_bit->alpha = 8;
+        png_set_sBIT(png_ptr, info_ptr, sig_bit);
+#else /* LIBPNG 1.5 */
 	info_ptr->sig_bit.alpha = 8;
+#endif /* LIBPNG 1.5 */
     }
 
     // Swap ARGB to RGBA (normal PNG format) before saving on
@@ -1047,7 +1143,11 @@ int TQPNGFormat::decode(TQImage& img, TQImageConsumer* cons,
 	    return -1;
 	}
 
+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
+	if (setjmp(png_jmpbuf(png_ptr))) {
+#else /* LIBPNG 1.5 */
 	if (setjmp((png_ptr)->jmpbuf)) {
+#endif /* LIBPNG 1.5 */
 	    png_destroy_read_struct(&png_ptr, &info_ptr, 0);
 	    image = 0;
 	    return -1;
@@ -1074,7 +1174,11 @@ int TQPNGFormat::decode(TQImage& img, TQImageConsumer* cons,
 
     if ( !png_ptr ) return 0;
 
+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
+    if (setjmp(png_jmpbuf(png_ptr))) {
+#else /* LIBPNG 1.5 */
     if (setjmp(png_ptr->jmpbuf)) {
+#endif /* LIBPNG 1.5 */
 	png_destroy_read_struct(&png_ptr, &info_ptr, 0);
 	image = 0;
 	state = MovieStart;
@@ -1134,7 +1238,11 @@ void TQPNGFormat::end(png_structp png, png_infop info)
     consumer->frameDone(TQPoint(offx,offy),r);
     consumer->end();
     state = FrameStart;
+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
+    unused_data = png_process_data_pause(png, 0);
+#else /* LIBPNG 1.5 */
     unused_data = (int)png->buffer_size; // Since libpng doesn't tell us
+#endif /* LIBPNG 1.5 */
 }
 
 #ifdef PNG_USER_CHUNKS_SUPPORTED