[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - vcl/source

[Michael Stahl]

 vcl/source/gdi/outdev4.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a071dd3179536f1fb523ff082b5c5b155e443c59
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Jul 1 17:48:28 2014 +0200

    fdo#80014: vcl: fix drawing of linear gradients
    
    There is an off-by-one error in OutputDevice::ImplDrawLinearGradient()
    that causes the bottom line to remain black.
    
    (regression from 04d937c1ec36c2d9fa8c90604c81a37d30e97da6)
    
    (cherry picked from commit d51f53fedb8cd68b1b3122c7199c4ea2d3a6980f)
    
    Conflicts:
    	vcl/source/outdev/gradient.cxx
    
    Change-Id: I33948ec8065e446a9ec7efeab5e506c93fa2e9e8
    Reviewed-on: https://gerrit.libreoffice.org/10023
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/gdi/outdev4.cxx b/vcl/source/gdi/outdev4.cxx
index e817e57..00e05a9 100644
--- a/vcl/source/gdi/outdev4.cxx
+++ b/vcl/source/gdi/outdev4.cxx
@@ -303,7 +303,7 @@ void OutputDevice::ImplDrawLinearGradient( const Rectangle& rRect,
 
         // Polygon for this color step
         aRect.Top() = (long)( fGradientLine + ((double) i) * fScanInc );
-        aRect.Bottom() = (long)( fGradientLine + ( ((double) i) + 1.0 ) * fScanInc + fScanInc*.1 );
+        aRect.Bottom() = (long)( fGradientLine + ( ((double) i) + 1.0 ) * fScanInc);
         aPoly[0] = aRect.TopLeft();
         aPoly[1] = aRect.TopRight();
         aPoly[2] = aRect.BottomRight();