From 38bc63e1f361809015fcf4a00d9e9f37be9789cf Mon Sep 17 00:00:00 2001 From: lisu Date: Mon, 1 Mar 2010 13:08:02 +0000 Subject: [PATCH] - fix build with new libpng Changed files: OpenSceneGraph-libpng.patch -> 1.1 --- OpenSceneGraph-libpng.patch | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 OpenSceneGraph-libpng.patch diff --git a/OpenSceneGraph-libpng.patch b/OpenSceneGraph-libpng.patch new file mode 100644 index 0000000..41edbee --- /dev/null +++ b/OpenSceneGraph-libpng.patch @@ -0,0 +1,28 @@ +--- OpenSceneGraph-2.8.2/src/osgPlugins/png/ReaderWriterPNG.cpp~ 2008-07-14 00:18:59.000000000 +0200 ++++ OpenSceneGraph-2.8.2/src/osgPlugins/png/ReaderWriterPNG.cpp 2010-03-01 12:57:05.720365671 +0100 +@@ -173,7 +173,11 @@ + endinfo = png_create_info_struct(png); + + fin.read((char*)header,8); +- if (fin.gcount() == 8 && png_check_sig(header, 8)) ++ #if PNG_LIBPNG_VER < 10400 ++ if (fin.gcount() == 8 && png_check_sig(header, 8)) ++ #else ++ if (fin.gcount() == 8 && png_sig_cmp(header, 0, 8)) ++ #endif + png_set_read_fn(png,&fin,png_read_istream); //Use custom read function that will get data from istream + else + { +@@ -224,7 +228,11 @@ + if (color == PNG_COLOR_TYPE_PALETTE) + png_set_palette_to_rgb(png); + if (color == PNG_COLOR_TYPE_GRAY && depth < 8) +- png_set_gray_1_2_4_to_8(png); ++ #if PNG_LIBPNG_VER < 10400 ++ png_set_gray_1_2_4_to_8(png); ++ #else ++ png_set_expand_gray_1_2_4_to_8(png); ++ #endif + if (png_get_valid(png, info, PNG_INFO_tRNS)) + png_set_tRNS_to_alpha(png); + -- 2.44.0