diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-05-12 12:59:07 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-05-12 12:59:07 +0000 |
| commit | b20899d5ad88ce539e8e5f3216e06adb4560720c (patch) | |
| tree | 0343ccdcba0a59e1505f779da661317e78879e4c /sci-visualization/paraview/files | |
| parent | Fix build with gcc 4.5, bug #317207 (diff) | |
| download | gentoo-2-b20899d5ad88ce539e8e5f3216e06adb4560720c.tar.gz gentoo-2-b20899d5ad88ce539e8e5f3216e06adb4560720c.tar.bz2 gentoo-2-b20899d5ad88ce539e8e5f3216e06adb4560720c.zip | |
Fix building with libpng14 wrt #319397 by Helmut Jarausch.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'sci-visualization/paraview/files')
| -rw-r--r-- | sci-visualization/paraview/files/paraview-3.6.2-libpng14.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/sci-visualization/paraview/files/paraview-3.6.2-libpng14.patch b/sci-visualization/paraview/files/paraview-3.6.2-libpng14.patch new file mode 100644 index 000000000000..30947a82eb0a --- /dev/null +++ b/sci-visualization/paraview/files/paraview-3.6.2-libpng14.patch @@ -0,0 +1,45 @@ +diff -ur ParaView3.orig/VTK/IO/vtkPNGReader.cxx ParaView3/VTK/IO/vtkPNGReader.cxx +--- ParaView3.orig/VTK/IO/vtkPNGReader.cxx 2006-09-22 00:23:24.000000000 +0300 ++++ ParaView3/VTK/IO/vtkPNGReader.cxx 2010-05-12 15:28:30.000000000 +0300 +@@ -116,7 +116,7 @@ + // minimum of a byte per pixel + if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) + { +- png_set_gray_1_2_4_to_8(png_ptr); ++ png_set_expand_gray_1_2_4_to_8(png_ptr); + } + + // add alpha if any alpha found +@@ -225,7 +225,7 @@ + // minimum of a byte per pixel + if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) + { +- png_set_gray_1_2_4_to_8(png_ptr); ++ png_set_expand_gray_1_2_4_to_8(png_ptr); + } + + // add alpha if any alpha found +diff -ur ParaView3.orig/VTK/Utilities/vtkpng/png.h ParaView3/VTK/Utilities/vtkpng/png.h +--- ParaView3.orig/VTK/Utilities/vtkpng/png.h 2004-04-28 18:49:22.000000000 +0300 ++++ ParaView3/VTK/Utilities/vtkpng/png.h 2010-05-12 15:28:00.000000000 +0300 +@@ -1330,7 +1330,7 @@ + #if defined(PNG_READ_EXPAND_SUPPORTED) + /* Expand data to 24-bit RGB, or 8-bit grayscale, with alpha if available. */ + extern PNG_EXPORT(void,png_set_expand) PNGARG((png_structp png_ptr)); +-extern PNG_EXPORT(void,png_set_gray_1_2_4_to_8) PNGARG((png_structp png_ptr)); ++extern PNG_EXPORT(void,png_set_expand_gray_1_2_4_to_8) PNGARG((png_structp png_ptr)); + extern PNG_EXPORT(void,png_set_palette_to_rgb) PNGARG((png_structp png_ptr)); + extern PNG_EXPORT(void,png_set_tRNS_to_alpha) PNGARG((png_structp png_ptr)); + #endif +diff -ur ParaView3.orig/VTK/Utilities/vtkpng/vtk_png_mangle.h ParaView3/VTK/Utilities/vtkpng/vtk_png_mangle.h +--- ParaView3.orig/VTK/Utilities/vtkpng/vtk_png_mangle.h 2004-10-26 19:56:45.000000000 +0300 ++++ ParaView3/VTK/Utilities/vtkpng/vtk_png_mangle.h 2010-05-12 15:27:25.000000000 +0300 +@@ -229,7 +229,7 @@ + #define png_set_gAMA vtk_png_set_gAMA + #define png_set_gAMA_fixed vtk_png_set_gAMA_fixed + #define png_set_gamma vtk_png_set_gamma +-#define png_set_gray_1_2_4_to_8 vtk_png_set_gray_1_2_4_to_8 ++#define png_set_expand_gray_1_2_4_to_8 vtk_png_set_gray_1_2_4_to_8 + #define png_set_gray_to_rgb vtk_png_set_gray_to_rgb + #define png_set_hIST vtk_png_set_hIST + #define png_set_iCCP vtk_png_set_iCCP |