SVN commit 494594 by cgilles:
digikam from trunk : fix to toogling alpha channel indicator in color image properties sidebar when image is already loaded in IE CCMAIL: [hidden email] M +3 -3 imagepropertiescolorstab.cpp M +1 -1 imagepropertiescolorstab.h M +3 -2 imagepropertiessidebar.cpp M +2 -1 imagepropertiessidebar.h M +4 -3 imagepropertiessidebardb.cpp M +2 -1 imagepropertiessidebardb.h --- trunk/extragear/graphics/digikam/libs/imageproperties/imagepropertiescolorstab.cpp #494593:494594 @@ -348,8 +348,8 @@ } void ImagePropertiesColorsTab::setData(const KURL& url, QRect *selectionArea, - uchar* imageData, int imageWidth, int imageHeight, - bool sixteenBit, int itemType) + uchar* imageData, int imageWidth, int imageHeight, + bool sixteenBit, bool hasAlpha, int itemType) { // This is necessary to stop computation because m_image.bits() is currently used by // threaded histogram algorithm. @@ -384,7 +384,7 @@ } else { - m_image = DImg(imageWidth, imageHeight, sixteenBit, true, imageData); + m_image = DImg(imageWidth, imageHeight, sixteenBit, hasAlpha, imageData); if ( !m_image.isNull() ) { --- trunk/extragear/graphics/digikam/libs/imageproperties/imagepropertiescolorstab.h #494593:494594 @@ -57,7 +57,7 @@ void setData(const KURL& url=KURL::KURL(), QRect *selectionArea=0, uchar* imageData=0, int imageWidth=0, int imageHeight=0, - bool sixteenBit=false, int itemType=0); + bool sixteenBit=false, bool hasAlpha=true, int itemType=0); void setSelection(QRect *selectionArea); --- trunk/extragear/graphics/digikam/libs/imageproperties/imagepropertiessidebar.cpp #494593:494594 @@ -70,7 +70,7 @@ void ImagePropertiesSideBar::itemChanged(const KURL& url, QRect *rect, uchar *imageData, int imageWidth, int imageHeight, - bool sixteenBit) + bool sixteenBit, bool hasAlpha) { if (!url.isValid()) return; @@ -81,6 +81,7 @@ m_imageWidth = imageWidth; m_imageHeight = imageHeight; m_sixteenBit = sixteenBit; + m_hasAlpha = hasAlpha; m_dirtyExifTab = false; m_dirtyHistogramTab = false; @@ -121,7 +122,7 @@ else if (tab == m_histogramTab && !m_dirtyHistogramTab) { m_histogramTab->setData(m_currentURL, m_currentRect, - m_imageData, m_imageWidth, m_imageHeight, m_sixteenBit); + m_imageData, m_imageWidth, m_imageHeight, m_sixteenBit, m_hasAlpha); m_dirtyHistogramTab = true; } --- trunk/extragear/graphics/digikam/libs/imageproperties/imagepropertiessidebar.h #494593:494594 @@ -51,7 +51,7 @@ ~ImagePropertiesSideBar(); void itemChanged(const KURL& url, QRect *rect, - uchar *imageData, int imageWidth, int imageHeight, bool sixteenBit); + uchar *imageData, int imageWidth, int imageHeight, bool sixteenBit, bool hasAlpha); void imageSelectionChanged(QRect *rect); @@ -62,6 +62,7 @@ bool m_dirtyExifTab; bool m_dirtyHistogramTab; bool m_sixteenBit; + bool m_hasAlpha; int m_imageWidth; int m_imageHeight; --- trunk/extragear/graphics/digikam/libs/imageproperties/imagepropertiessidebardb.cpp #494593:494594 @@ -119,7 +119,7 @@ void ImagePropertiesSideBarDB::itemChanged(const KURL& url, AlbumIconView* view, AlbumIconItem* item, QRect *rect, uchar *imageData, int imageWidth, int imageHeight, - bool sixteenBit) + bool sixteenBit, bool hasAlpha) { if (!url.isValid()) return; @@ -130,6 +130,7 @@ m_imageWidth = imageWidth; m_imageHeight = imageHeight; m_sixteenBit = sixteenBit; + m_hasAlpha = hasAlpha; m_currentView = view; m_currentItem = item; m_dirtyExifTab = false; @@ -182,7 +183,7 @@ else if (tab == m_histogramTab && !m_dirtyHistogramTab) { m_histogramTab->setData(m_currentURL, m_currentRect, - m_imageData, m_imageWidth, m_imageHeight, m_sixteenBit, + m_imageData, m_imageWidth, m_imageHeight, m_sixteenBit, m_hasAlpha, NavigateBarWidget::ItemCurrent); m_dirtyHistogramTab = true; } @@ -210,7 +211,7 @@ else if (tab == m_histogramTab && !m_dirtyHistogramTab) { m_histogramTab->setData(m_currentURL, m_currentRect, - m_imageData, m_imageWidth, m_imageHeight, m_sixteenBit, + m_imageData, m_imageWidth, m_imageHeight, m_sixteenBit, m_hasAlpha, currentItemType); m_dirtyHistogramTab = true; } --- trunk/extragear/graphics/digikam/libs/imageproperties/imagepropertiessidebardb.h #494593:494594 @@ -57,7 +57,7 @@ void itemChanged(const KURL& url, AlbumIconView* view, AlbumIconItem* item, QRect *rect=0, uchar *imageData=0, int imageWidth=0, int imageHeight=0, - bool sixteenBit=false); + bool sixteenBit=false, bool hasAlpha=true); void imageSelectionChanged(QRect *rect); @@ -78,6 +78,7 @@ bool m_dirtyHistogramTab; bool m_dirtyDesceditTab; bool m_sixteenBit; + bool m_hasAlpha; int m_imageWidth; int m_imageHeight; _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Free forum by Nabble | Edit this page |