Changeset 58

Timestamp:

Jan 29, 2006, 5:47:28 PM (20 years ago)

Author:

dmik

Message:

Fixed [Qt bug]: bitBlt(QImage,QImage) could produce a fully transparent result when the source didn't have the alpha channel while the destination had it.

File:

• trunk/src/kernel/qimage.cpp (modified) (1 diff)

trunk/src/kernel/qimage.cpp

@@ -6136 +6136 @@
             }
         } else {
-            QRgb* d = (QRgb*)dst->scanLine(dy) + dx;
-            QRgb* s = (QRgb*)src->scanLine(sy) + sx;
-            if ( sw < 64 ) {
-                // Trust ourselves
-                const int dd = dst->width() - sw;
-                const int ds = src->width() - sw;
-                while ( sh-- ) {
-                    for ( int t=sw; t--; )
-                        *d++ = *s++;
-                    d += dd;
-                    s += ds;
-                }
-            } else {
-                // Trust libc
-                const int dd = dst->width();
-                const int ds = src->width();
-                const int b = sw*sizeof(QRgb);
-                while ( sh-- ) {
-                    memcpy( d, s, b );
-                    d += dd;
-                    s += ds;
-                }
-            }
+            QRgb* d = (QRgb*)dst->scanLine(dy) + dx;
+            QRgb* s = (QRgb*)src->scanLine(sy) + sx;
+            if ( dst->hasAlphaBuffer() ) {
+                const int dd = dst->width() - sw;
+                const int ds = src->width() - sw;
+                while ( sh-- ) {
+                    for ( int t=sw; t--; )
+                        *d++ = *(s++) | ~RGB_MASK;
+                    d += dd;
+                    s += ds;
+                }
+            } else {
+                if ( sw < 64 ) {
+                    // Trust ourselves
+                    const int dd = dst->width() - sw;
+                    const int ds = src->width() - sw;
+                    while ( sh-- ) {
+                        for ( int t=sw; t--; )
+                            *d++ = *s++;
+                        d += dd;
+                        s += ds;
+                    }
+                } else {
+                    // Trust libc
+                    const int dd = dst->width();
+                    const int ds = src->width();
+                    const int b = sw*sizeof(QRgb);
+                    while ( sh-- ) {
+                        memcpy( d, s, b );
+                        d += dd;
+                        s += ds;
+                    }
+                }
+            }
         }
         break;