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

[Ivan Timofeev]

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

New commits:
commit c30fad2fcee46d98a9a2da4cf0c0470f5cc7f34e
Author: Ivan Timofeev <timofeev.i.s at gmail.com>
Date:   Sun Jul 28 20:41:27 2013 +0400

    fdo#67397: don't bother to create BlendFrame for width == 1 or height == 1
    
    ... because:
    1) frame painted as a line doesn't make sense to me anyway;
    2) it leads to x = 1 or y = 1 in createBlendFrame, while the max value for that
       variable is "width (or height) - 1", i.e. 0.
    
    Change-Id: I7437bce6681e42cb57458c012927cf5d6bfc154f
    (cherry picked from commit dd6518d42fce1416fa00f80a7b7dead113c37752)
    Reviewed-on: https://gerrit.libreoffice.org/5154
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index 094b7c7..f60c583 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -982,7 +982,7 @@ BitmapEx VCL_DLLPUBLIC createBlendFrame(
     const long nW(rSize.Width());
     const long nH(rSize.Height());
 
-    if(nW && nH)
+    if(nW > 1 && nH > 1)
     {
         sal_uInt8 aEraseTrans(0xff);
         Bitmap aContent(rSize, 24);