diff options
| author | Francois Andriot <francois.andriot@free.fr> | 2012-08-03 21:34:00 +0200 |
|---|---|---|
| committer | Francois Andriot <francois.andriot@free.fr> | 2012-08-03 21:34:00 +0200 |
| commit | c0c1a90179dd0f0e19549f279ee95cae7e577b82 (patch) | |
| tree | 6ebeea5d799486d1c11361118b2878452f509cee /redhat/applications/digikam/digikam-3.5.13-fix_reinterpret_cast.patch | |
| parent | 75c1b2f8bf7066e1b55c3168a78317373a56e711 (diff) | |
| download | tde-packaging-c0c1a90179dd0f0e19549f279ee95cae7e577b82.tar.gz tde-packaging-c0c1a90179dd0f0e19549f279ee95cae7e577b82.zip | |
RHEL/Fedora: some more updates for MGA2/MDV2011 building
Diffstat (limited to 'redhat/applications/digikam/digikam-3.5.13-fix_reinterpret_cast.patch')
| -rw-r--r-- | redhat/applications/digikam/digikam-3.5.13-fix_reinterpret_cast.patch | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/redhat/applications/digikam/digikam-3.5.13-fix_reinterpret_cast.patch b/redhat/applications/digikam/digikam-3.5.13-fix_reinterpret_cast.patch new file mode 100644 index 000000000..aa7e6f2b9 --- /dev/null +++ b/redhat/applications/digikam/digikam-3.5.13-fix_reinterpret_cast.patch @@ -0,0 +1,20 @@ +commit 5a0438539cbe7a99e9b6d0ed21d7b73342b4a6f6 +Author: Darrell Anderson <humanreadable@yahoo.com> +Date: 1336340005 -0500 + + Update patch in GIT hash a9489034 to use reinterpret_cast<iCCP_data>. + Thanks to /dev/ammo42. + +diff --git a/digikam/libs/dimg/loaders/pngloader.cpp b/digikam/libs/dimg/loaders/pngloader.cpp +index fa6dad9..6862b6e 100644 +--- a/digikam/libs/dimg/loaders/pngloader.cpp ++++ b/digikam/libs/dimg/loaders/pngloader.cpp +@@ -611,7 +611,7 @@ bool PNGLoader::save(const TQString& filePath, DImgLoaderObserver *observer) + if (!profile_rawdata.isEmpty()) + { + #if PNG_LIBPNG_VER_MAJOR > 1 || ( PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 5 ) +- png_set_iCCP(png_ptr, info_ptr, (png_charp)("icc"), PNG_COMPRESSION_TYPE_BASE, (iCCP_data)profile_rawdata.data(), profile_rawdata.size()); ++ png_set_iCCP(png_ptr, info_ptr, (png_charp)("icc"), PNG_COMPRESSION_TYPE_BASE, reinterpret_cast<iCCP_data>(profile_rawdata.data()), profile_rawdata.size()); + #else + png_set_iCCP(png_ptr, info_ptr, (png_charp)"icc", PNG_COMPRESSION_TYPE_BASE, profile_rawdata.data(), profile_rawdata.size()); + #endif |