diff options
| author | Francois Andriot <francois.andriot@free.fr> | 2012-05-05 11:11:35 +0200 |
|---|---|---|
| committer | Francois Andriot <francois.andriot@free.fr> | 2012-05-05 11:11:35 +0200 |
| commit | 01d4b602ce624d96a0d9574e8e5f6fba53f2d9d9 (patch) | |
| tree | 44a49e67fe0e2b487938d3af116a8804950c8ca7 /redhat/applications/koffice/koffice-3.5.13-fix_libpng.patch | |
| parent | 4a5605e233305678da64153c9664a0d06f00bcbe (diff) | |
| download | tde-packaging-01d4b602ce624d96a0d9574e8e5f6fba53f2d9d9.tar.gz tde-packaging-01d4b602ce624d96a0d9574e8e5f6fba53f2d9d9.zip | |
RHEL/Fedora: more application fixes ...
Diffstat (limited to 'redhat/applications/koffice/koffice-3.5.13-fix_libpng.patch')
| -rw-r--r-- | redhat/applications/koffice/koffice-3.5.13-fix_libpng.patch | 41 |
1 files changed, 39 insertions, 2 deletions
diff --git a/redhat/applications/koffice/koffice-3.5.13-fix_libpng.patch b/redhat/applications/koffice/koffice-3.5.13-fix_libpng.patch index cba4b2584..004bb0225 100644 --- a/redhat/applications/koffice/koffice-3.5.13-fix_libpng.patch +++ b/redhat/applications/koffice/koffice-3.5.13-fix_libpng.patch @@ -1,5 +1,5 @@ ---- /dev/shm/applications/koffice/filters/chalk/png/kis_png_converter.cc 2011-06-27 13:54:18.000000000 -0500 -+++ /dev/shm/applications/koffice/filters/chalk/png/kis_png_converter.cc.new 2011-11-07 15:38:47.918508855 -0600 +--- koffice/filters/chalk/png/kis_png_converter.cc 2011-06-27 13:54:18.000000000 -0500 ++++ koffice/filters/chalk/png/kis_png_converter.cc.new 2011-11-07 15:38:47.918508855 -0600 @@ -785,7 +785,7 @@ void KisPNGConverter::progress(png_structp png_ptr, png_uint_32 row_number, int pass) @@ -9,3 +9,40 @@ // setProgress(row_number); } +--- koffice/filters/chalk/png/kis_png_converter.cc.gcc47 2012-04-26 16:38:35.805156927 -0400 ++++ koffice/filters/chalk/png/kis_png_converter.cc 2012-04-26 16:49:27.179323394 -0400 +@@ -43,6 +43,8 @@ + #include <kis_paint_layer.h> + #include <kis_group_layer.h> + ++#include <zlib.h> ++ + namespace { + + const TQ_UINT8 PIXEL_BLUE = 0; +@@ -222,6 +224,7 @@ + + // Read image profile + png_charp profile_name, profile_data; ++ unsigned char* uprofile_data = reinterpret_cast<unsigned char*>(profile_data); + int compression_type; + png_uint_32 proflen; + int number_of_passes = 1; +@@ -230,7 +233,7 @@ + number_of_passes = png_set_interlace_handling(png_ptr); + + KisProfile* profile = 0; +- if(png_get_iCCP(png_ptr, info_ptr, &profile_name, &compression_type, &profile_data, &proflen)) ++ if(png_get_iCCP(png_ptr, info_ptr, &profile_name, &compression_type, &uprofile_data, &proflen)) + { + TQByteArray profile_rawdata; + // XXX: Hardcoded for icc type -- is that correct for us? +@@ -627,7 +630,7 @@ + } else { // Profile + char* name = new char[(*it)->type().length()+1]; + strcpy(name, (*it)->type().ascii()); +- png_set_iCCP(png_ptr, info_ptr, name, PNG_COMPRESSION_TYPE_BASE, (char*)(*it)->annotation().data(), (*it) -> annotation() . size()); ++ png_set_iCCP(png_ptr, info_ptr, name, PNG_COMPRESSION_TYPE_BASE, (unsigned char*)(*it)->annotation().data(), (*it) -> annotation() . size()); + } + ++it; + } |