summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-06-26 17:31:21 -0500
committerSlávek Banko <slavek.banko@axis.cz>2012-10-29 17:30:38 +0100
commit9fa76858e9d1721ad8bd5ae898c6233009d17635 (patch)
tree62e4168de8ca0fa3830fea1b1dd9a7d279b8c481
parentb89710e8a3b5a303df380eaab19967c3ab0edf3a (diff)
downloaddigikam-9fa76858e9d1721ad8bd5ae898c6233009d17635.tar.gz
digikam-9fa76858e9d1721ad8bd5ae898c6233009d17635.zip
Fix FTBFS on png >= 0.15
(cherry picked from commit 18ecd51264727c75ab3e17a762d8f95361023f0a)
-rw-r--r--digikam/kioslave/digikamthumbnail.cpp6
1 files changed, 3 insertions, 3 deletions
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;