Attachment #553 for bug #949

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. View | Details | Raw Unified | Return to bug 949
Collapse All | Expand All





        // Check if Year Album already exist.
        DAlbum *yAlbum = 0;
        AlbumIterator it2(d->rootDAlbum);
        while (it2.current())
        {
            DAlbum* a = (DAlbum*)(*it2);
            if (a->date() == TQDate(year, 1, 1) && a->range() == DAlbum::Year)
            {
                yAlbum = a;
                break;
            }
            ++it2;
        }

        // If no, create Year album.




    if (color_type == PNG_COLOR_TYPE_PALETTE)
        png_set_expand(png_ptr);

    if (color_type == PNG_COLOR_TYPE_RGB_ALPHA)
        has_alpha = 1;

    if (color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
    {
        has_alpha = 1;
        has_grey = 1;
    }

    if (color_type == PNG_COLOR_TYPE_GRAY)
        has_grey = 1;

    unsigned char **lines;

Return to bug 949

Lines 1579-1594 Link Here

(-)digikam.orig/digikam/digikam/albummanager.cpp (-4 / +4 lines)
1579		1579
1580	// Check if Year Album already exist.	1580	// Check if Year Album already exist.
1581	DAlbum *yAlbum = 0;	1581	DAlbum *yAlbum = 0;
1582	AlbumIterator it(d->rootDAlbum);	1582	AlbumIterator it2(d->rootDAlbum);
1583	while (it.current())	1583	while (it2.current())
1584	{	1584	{
1585	DAlbum* a = (DAlbum)(it);	1585	DAlbum* a = (DAlbum)(it2);
1586	if (a->date() == TQDate(year, 1, 1) && a->range() == DAlbum::Year)	1586	if (a->date() == TQDate(year, 1, 1) && a->range() == DAlbum::Year)
1587	{	1587	{
1588	yAlbum = a;	1588	yAlbum = a;
1589	break;	1589	break;
1590	}	1590	}
1591	++it;	1591	++it2;
1592	}	1592	}
1593		1593
1594	// If no, create Year album.	1594	// If no, create Year album.

Lines 413-428 Link Here

(-)digikam.orig/digikam/kioslave/digikamthumbnail.cpp (-3 / +3 lines)
413	if (color_type == PNG_COLOR_TYPE_PALETTE)	413	if (color_type == PNG_COLOR_TYPE_PALETTE)
414	png_set_expand(png_ptr);	414	png_set_expand(png_ptr);
415		415
416	if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)	416	if (color_type == PNG_COLOR_TYPE_RGB_ALPHA)
417	has_alpha = 1;	417	has_alpha = 1;
418		418
419	if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)	419	if (color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
420	{	420	{
421	has_alpha = 1;	421	has_alpha = 1;
422	has_grey = 1;	422	has_grey = 1;
423	}	423	}
424		424
425	if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY)	425	if (color_type == PNG_COLOR_TYPE_GRAY)
426	has_grey = 1;	426	has_grey = 1;
427		427
428	unsigned char **lines;	428	unsigned char **lines;