[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/3.5/kdegraphics/kolourpaint/pixmapfx
From:       Clarence Dang <dang () kde ! org>
Date:       2006-06-11 10:54:07
Message-ID: 1150023247.413784.18980.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 550271 by dang:

Remove unused (and buggy) methods, fix comment in kpPixmapFX::paintPixmapAt().

No functional changes but should backport to 3.4, 3.3, 1.2_kde3.



 M  +1 -43     kppixmapfx.cpp  
 M  +0 -15     kppixmapfx.h  


--- branches/KDE/3.5/kdegraphics/kolourpaint/pixmapfx/kppixmapfx.cpp #550270:550271
@@ -772,7 +772,7 @@
     if (!destPixmapPtr)
         return;
 
-    // copy data from dest onto the top of src (masked by src's mask)
+    // Copy src (masked by src's mask) on top of dest.
     bitBlt (destPixmapPtr, /* dest */
             destAt.x (), destAt.y (), /* dest pt */
             &srcPixmap, /* src */
@@ -865,48 +865,6 @@
 
 
 // public static
-QBitmap kpPixmapFX::getNonNullMaskAt (const QPixmap &pm, const QRect &rect)
-{
-    QBitmap destMaskBitmap (rect.width (), rect.height ());
-
-    if (pm.mask ())
-    {
-        copyBlt (&destMaskBitmap, 0, 0,
-                 &pm, rect.x (), rect.y (), rect.width (), rect.height ());
-    }
-    else
-    {
-        destMaskBitmap.fill (Qt::color1/*opaque*/);
-    }
-
-    return destMaskBitmap;
-}
-
-
-// public static
-void kpPixmapFX::setMaskAt (QPixmap *destPixmapPtr, const QPoint &destAt,
-                            const QBitmap &srcMaskBitmap)
-{
-    if (!destPixmapPtr)
-        return;
-
-    QBitmap destMaskBitmap (srcMaskBitmap.width (), srcMaskBitmap.height ());
-
-    copyBlt (&destMaskBitmap, destAt.x (), destAt.y (),
-             &srcMaskBitmap);
-
-    destPixmapPtr->setMask (destMaskBitmap);
-}
-
-// public static
-void kpPixmapFX::setMaskAt (QPixmap *destPixmapPtr, int destX, int destY,
-                            const QBitmap &srcMaskBitmap)
-{
-    kpPixmapFX::setMaskAt (destPixmapPtr, QPoint (destX, destY), srcMaskBitmap);
-}
-
-
-// public static
 void kpPixmapFX::ensureTransparentAt (QPixmap *destPixmapPtr, const QRect &destRect)
 {
     if (!destPixmapPtr)
--- branches/KDE/3.5/kdegraphics/kolourpaint/pixmapfx/kppixmapfx.h #550270:550271
@@ -290,21 +290,6 @@
     static QBitmap getNonNullMask (const QPixmap &pm);
 
     //
-    // Returns the mask data found at the <rect> in <pm>.
-    //
-    static QBitmap getNonNullMaskAt (const QPixmap &pm, const QRect &rect);
-
-    //
-    // Sets the mask of <*destPixmapPtr> at the rectangle, with the
-    // top-left <destAt> and dimensions <srcMaskBitmap.rect()>,
-    // to <srcMaskBitmap>.
-    //
-    static void setMaskAt (QPixmap *destPixmapPtr, const QPoint &destAt,
-                           const QBitmap &srcMaskBitmap);
-    static void setMaskAt (QPixmap *destPixmapPtr, int destX, int destY,
-                           const QBitmap &srcMaskBitmap);
-
-    //
     // Ensures that <*destPixmapPtr> is transparent at <rect>.
     //
     static void ensureTransparentAt (QPixmap *destPixmapPtr, const QRect &destRect);
[prev in list] [next in list] [prev in thread] [next in thread]