[pkg-wine-party] [SCM] Debian Wine packaging branch, wheezy, updated. wine-1.4-7-302-gb61b690

[Alexandre Julliard]

The following commit has been merged in the wheezy branch:
commit 3dd594958895dde6244427d9184f63aa3c7ae128
Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Apr 17 16:40:47 2012 +0200

    winex11: ExtFloodFill does take the current ROP into account.
    (cherry picked from commit a9b786728cce6e9f68df9c148b0b467316fe4895)

diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c
index e78cd74..298cf7f 100644
--- a/dlls/winex11.drv/graphics.c
+++ b/dlls/winex11.drv/graphics.c
@@ -1378,9 +1378,7 @@ BOOL X11DRV_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT fillTy
     {
         unsigned long pixel = X11DRV_PALETTE_ToPhysical( physDev, color );
 
-          /* ROP mode is always GXcopy for flood-fill */
         wine_tsx11_lock();
-        XSetFunction( gdi_display, physDev->gc, GXcopy );
         X11DRV_InternalFloodFill(image, physDev,
                                  pt.x - rect.left,
                                  pt.y - rect.top,

-- 
Debian Wine packaging