From 53926cba29aa3970105daf6a26430f111b3a17d8 Mon Sep 17 00:00:00 2001 From: ajtribick Date: Tue, 1 May 2012 21:06:09 +0000 Subject: [PATCH] Add missing zlib.h for libpng15. git-svn-id: https://svn.code.sf.net/p/celestia/code/trunk/celestia@5204 10d76133-bd44-0410-b00f-95d021917061 --- src/celestia/imagecapture.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/celestia/imagecapture.cpp b/src/celestia/imagecapture.cpp index 05e8f3fb..4fbf2912 100644 --- a/src/celestia/imagecapture.cpp +++ b/src/celestia/imagecapture.cpp @@ -36,11 +36,14 @@ extern "C" { #define png_jmpbuf(png_ptr) png_ptr->jmpbuf #endif -// Define various expansion transformations for old versions of libpng #if PNG_LIBPNG_VER < 10004 +// Define various expansion transformations for old versions of libpng #define png_set_palette_to_rgb(p) png_set_expand(p) #define png_set_gray_1_2_4_to_8(p) png_set_expand(p) #define png_set_tRNS_to_alpha(p) png_set_expand(p) +#elif PNG_LIBPNG_VER >= 10500 +// libpng-1.5 include does not pull in zlib.h +#include "zlib.h" #endif using namespace std;