On 06/26/2012 02:07 PM, David C. Rankin wrote:
> Tim, Darrell,
> 
>   Digikam had been fixed once before for libpng15 issues. The patch
> (digikam-libpng15+gcc47_1.diff) contained:
> 
> diff -uNrb digikam.orig/digikam/kioslave/digikamthumbnail.cpp
> digikam/digikam/kioslave/digikamthumbnail.cpp
> --- digikam.orig/digikam/kioslave/digikamthumbnail.cpp	2012-04-19
> 07:02:43.000000000 -0500
> +++ digikam/digikam/kioslave/digikamthumbnail.cpp	2012-04-19 16:44:10.307517462
> -0500
> @@ -413,16 +413,16 @@
>      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;

<quote>
Likely slipped through the cracks and never was pushed. We need to add
preprocessor directives.

Here's a proposed patch:

http://humanreadable.nfshost.com/trinity/patches/digikam-libpng15.diff

Tested here with Slackware 13.1 and Current. As I don't have libpng 1.5
installed on either system, my half of the patch test is complete. You get to
test against 1.5. :-)

Upon your successful report I'll push ASAP.
</quote>

Darrell,

  Just finished building with the patch -- worked fine with the preprocessor
directives -- push it :)

-- 
David C. Rankin, J.D.,P.E.