vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merging from old trunk: 

r652293 | mlaurent | 2007-04-10 18:31:06 +0200 (Tue, 10 Apr 2007) | 2 lines

Qt3support--


svn path=/trunk/KDE/kdebase/workspace/; revision=659577
icc-effect-5.14.5
Luboš Luňák 2007-04-30 12:38:05 +00:00
parent 33789c4453
commit b08128530c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
clients/keramik/keramik.cpp
View File

@ -583,23 +583,23 @@ QPixmap *KeramikHandler::composite( QImage *over, QImage *under )
int width = over->width(), height = over->height();
// Clear the destination image
Q_UINT32 *data = reinterpret_cast<Q_UINT32*>( dest.bits() );
quint32 *data = reinterpret_cast<quint32*>( dest.bits() );
for (int i = 0; i < width * height; i++)
*(data++) = 0;
// Copy the under image (bottom aligned) to the destination image
for (int y1 = height - under->height(), y2 = 0; y1 < height; y1++, y2++ )
{
register Q_UINT32 *dst = reinterpret_cast<Q_UINT32*>( dest.scanLine(y1) );
register Q_UINT32 *src = reinterpret_cast<Q_UINT32*>( under->scanLine(y2) );
register quint32 *dst = reinterpret_cast<quint32*>( dest.scanLine(y1) );
register quint32 *src = reinterpret_cast<quint32*>( under->scanLine(y2) );
for ( int x = 0; x < width; x++ )
*(dst++) = *(src++);
}
// Blend the over image onto the destination
register Q_UINT32 *dst = reinterpret_cast<Q_UINT32*>( dest.bits() );
register Q_UINT32 *src = reinterpret_cast<Q_UINT32*>( over->bits() );
register quint32 *dst = reinterpret_cast<quint32*>( dest.bits() );
register quint32 *src = reinterpret_cast<quint32*>( over->bits() );
for ( int i = 0; i < width * height; i++ )
{
int r1 = qRed( *dst ), g1 = qGreen( *dst ), b1 = qBlue( *dst );