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_ftbfs_png_015.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_ftbfs_png_015.patch')
| -rw-r--r-- | redhat/applications/digikam/digikam-3.5.13-fix_ftbfs_png_015.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/redhat/applications/digikam/digikam-3.5.13-fix_ftbfs_png_015.patch b/redhat/applications/digikam/digikam-3.5.13-fix_ftbfs_png_015.patch new file mode 100644 index 000000000..0522ec982 --- /dev/null +++ b/redhat/applications/digikam/digikam-3.5.13-fix_ftbfs_png_015.patch @@ -0,0 +1,30 @@ +commit 18ecd51264727c75ab3e17a762d8f95361023f0a +Author: Timothy Pearson <kb9vqf@pearsoncomputing.net> +Date: 1340749881 -0500 + + Fix FTBFS on png >= 0.15 + +diff --git a/digikam/kioslave/digikamthumbnail.cpp b/digikam/kioslave/digikamthumbnail.cpp +index 6dba518..97acf12 100644 +--- a/digikam/kioslave/digikamthumbnail.cpp ++++ b/digikam/kioslave/digikamthumbnail.cpp +@@ -413,16 +413,16 @@ TQImage kio_digikamthumbnailProtocol::loadPNG(const TQString& path) + if (color_type == PNG_COLOR_TYPE_PALETTE) + png_set_expand(png_ptr); + +- if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA) ++ if (color_type == PNG_COLOR_TYPE_RGB_ALPHA) + has_alpha = 1; + +- if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) ++ if (color_type == PNG_COLOR_TYPE_GRAY_ALPHA) + { + has_alpha = 1; + has_grey = 1; + } + +- if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY) ++ if (color_type == PNG_COLOR_TYPE_GRAY) + has_grey = 1; + + unsigned char **lines; |