summaryrefslogtreecommitdiffstats
path: root/redhat/applications/digikam/digikam-3.5.13-fix_gcc47_compilation.patch
blob: c1f0e1d6c21885d48e387b24e294f34ab3c7e7f6 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
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());
     }
 
     // -------------------------------------------------------------------