> On 04/19/2012 04:28 PM, David C. Rankin wrote: >> On 04/19/2012 02:04 PM, Darrell Anderson wrote: >>> Some days I get confused so easily. :) When you wrote "two simple >>> fixes" did you mean you used Tim's patch that has already been merged >>> into GIT, derived your own patch, a derived another patch in addition >>> to Tim's? >>> >>> Is the original patch still needed in addition to the png_jmpbuf >>> patch(es)? >>> >>> Darrell >> >> Crap - my bad, >> >> Tim's fix in pngloader.cpp fixed the first png_jmpbuf, there were >> other >> png_jmpbuf fixes needed in digikam/kioslave/digikamthumbnail.cpp. I'll >> back-out >> the pngloader png_jmpbuf and then repost the consolidated patch needed >> to finish >> digikam for libpng and gcc47... >> > > Darrell, > > This is the updated patch that fixes the remaining gcc47 and libpng15 > issues > in digikam beyond Tim's png_jmpbuf. Get a signoff on the 'color_type' > change, > then you can push it. > > -- > David C. Rankin, J.D.,P.E. The color_type change looks sane; the only thing I would do is verify that alpha-enabled thumbnail images still work properly in Digikam after the patch, as that is the only major code affected by the change. Tim