diff options
author | Francois Andriot <francois.andriot@free.fr> | 2012-05-05 11:05:03 +0200 |
---|---|---|
committer | Francois Andriot <francois.andriot@free.fr> | 2012-05-05 11:05:03 +0200 |
commit | 7379de160c3b5ca701a1e9c507facd3c2a3244a3 (patch) | |
tree | ab9d518bc6d4dff348342d35ac9036e45eea7209 /redhat/applications/digikam/digikam-3.5.13-fix_gcc47_compilation.patch | |
parent | 0610a9a48d1e911c8bc444b75b22c016d33abc53 (diff) | |
download | tde-packaging-7379de160c3b5ca701a1e9c507facd3c2a3244a3.tar.gz tde-packaging-7379de160c3b5ca701a1e9c507facd3c2a3244a3.zip |
RHEL/Fedora: fix digikam for GCC 4.7
Diffstat (limited to 'redhat/applications/digikam/digikam-3.5.13-fix_gcc47_compilation.patch')
-rw-r--r-- | redhat/applications/digikam/digikam-3.5.13-fix_gcc47_compilation.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/redhat/applications/digikam/digikam-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/digikam/digikam-3.5.13-fix_gcc47_compilation.patch new file mode 100644 index 000000000..c1f0e1d6c --- /dev/null +++ b/redhat/applications/digikam/digikam-3.5.13-fix_gcc47_compilation.patch @@ -0,0 +1,24 @@ +--- digikam/digikam/libs/dimg/loaders/pngloader.cpp.libpng 2012-05-01 15:02:57.235666444 +0200 ++++ digikam/digikam/libs/dimg/loaders/pngloader.cpp 2012-05-01 15:04:30.737122439 +0200 +@@ -408,10 +408,11 @@ + TQMap<int, TQByteArray>& metaData = imageMetaData(); + + png_charp profile_name, profile_data=NULL; ++ unsigned char* uprofile_data = reinterpret_cast<unsigned char*>(profile_data); + png_uint_32 profile_size; + int compression_type; + +- png_get_iCCP(png_ptr, info_ptr, &profile_name, &compression_type, &profile_data, &profile_size); ++ png_get_iCCP(png_ptr, info_ptr, &profile_name, &compression_type, &uprofile_data, &profile_size); + + if (profile_data != NULL) + { +@@ -607,7 +608,7 @@ + + if (!profile_rawdata.isEmpty()) + { +- png_set_iCCP(png_ptr, info_ptr, (png_charp)"icc", PNG_COMPRESSION_TYPE_BASE, profile_rawdata.data(), profile_rawdata.size()); ++ png_set_iCCP(png_ptr, info_ptr, (png_charp)"icc", PNG_COMPRESSION_TYPE_BASE, (unsigned char*)profile_rawdata.data(), profile_rawdata.size()); + } + + // ------------------------------------------------------------------- |