diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-05-06 16:33:25 -0500 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-06-28 02:54:20 +0200 |
| commit | 44912073b88caaa42d829df544d0397ec2739fb1 (patch) | |
| tree | 917fa8f62f012fdc2389e9b64ac905c902ceb7ea | |
| parent | 62817bd5006d275d947f870ead8487c0cd4c5a5a (diff) | |
| download | digikam-44912073b88caaa42d829df544d0397ec2739fb1.tar.gz digikam-44912073b88caaa42d829df544d0397ec2739fb1.zip | |
Update patch in GIT hash a9489034 to use reinterpret_cast<iCCP_data>.
Thanks to /dev/ammo42.
(cherry picked from commit 5a0438539cbe7a99e9b6d0ed21d7b73342b4a6f6)
| -rw-r--r-- | digikam/libs/dimg/loaders/pngloader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/digikam/libs/dimg/loaders/pngloader.cpp b/digikam/libs/dimg/loaders/pngloader.cpp index fa6dad9b..6862b6ec 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 |