Attachment 553 Details for Bug 949 – gcc 4.7 + libpng 1.5 patch for digikam (consolidated)

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] gcc 4.7 + libpng 1.5 patch for digikam (consolidated)

digikam-libpng15+gcc47_1.diff (text/plain), 1.67 KB, created by David C. Rankin on 2012-04-19 17:03:56 CDT

(hide)

Description:

Filename:

MIME Type:

Creator: David C. Rankin

Created: 2012-04-19 17:03:56 CDT

Size: 1.67 KB

patch

obsolete

>diff -uNrb digikam.orig/digikam/digikam/albummanager.cpp digikam/digikam/digikam/albummanager.cpp
>--- digikam.orig/digikam/digikam/albummanager.cpp	2012-02-21 18:52:03.000000000 -0600
>+++ digikam/digikam/digikam/albummanager.cpp	2012-04-19 16:42:29.951033101 -0500
>@@ -1579,16 +1579,16 @@
> 
>         // Check if Year Album already exist.
>         DAlbum *yAlbum = 0;
>-        AlbumIterator it(d->rootDAlbum);
>-        while (it.current())
>+        AlbumIterator it2(d->rootDAlbum);
>+        while (it2.current())
>         {
>-            DAlbum* a = (DAlbum*)(*it);
>+            DAlbum* a = (DAlbum*)(*it2);
>             if (a->date() == TQDate(year, 1, 1) && a->range() == DAlbum::Year)
>             {
>                 yAlbum = a;
>                 break;
>             }
>-            ++it;
>+            ++it2;
>         }
> 
>         // If no, create Year album.
>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;

Actions: View | Diff

Attachments on bug 949: 517 | 553