Author: hdu
Date: Tue Aug 13 14:43:30 2013
New Revision: 1513515
URL: http://svn.apache.org/r1513515
Log:
#i122836# fix rotated images looking corrupted on MacOSX
The solution is to intialize the images rotation mask to be opaque,
an approach that also fixed bug #i122758#.
Modified:
openoffice/branches/AOO401/ (props changed)
openoffice/branches/AOO401/main/cui/ (props changed)
openoffice/branches/AOO401/main/drawinglayer/ (props changed)
openoffice/branches/AOO401/main/drawinglayer/source/processor2d/vclprocessor2d.cxx
openoffice/branches/AOO401/main/vcl/unx/gtk/window/gtkframe.cxx (props
changed)
openoffice/branches/AOO401/test/ (props changed)
openoffice/branches/AOO401/test/testcommon/source/org/openoffice/test/vcl/
(props changed)
Propchange: openoffice/branches/AOO401/
------------------------------------------------------------------------------
Merged /openoffice/trunk:r1506958
Propchange: openoffice/branches/AOO401/main/cui/
------------------------------------------------------------------------------
Merged /openoffice/trunk/main/cui:r1506958
Propchange: openoffice/branches/AOO401/main/drawinglayer/
------------------------------------------------------------------------------
Merged /openoffice/trunk/main/drawinglayer:r1506958
Modified:
openoffice/branches/AOO401/main/drawinglayer/source/processor2d/vclprocessor2d.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO401/main/drawinglayer/source/processor2d/vclprocessor2d.cxx?rev=1513515&r1=1513514&r2=1513515&view=diff
==============================================================================
---
openoffice/branches/AOO401/main/drawinglayer/source/processor2d/vclprocessor2d.cxx
(original)
+++
openoffice/branches/AOO401/main/drawinglayer/source/processor2d/vclprocessor2d.cxx
Tue Aug 13 14:43:30 2013
@@ -423,10 +423,11 @@ namespace drawinglayer
// parts will be uncovered, extend aBitmapEx
with a mask bitmap
const Bitmap aContent(aBitmapEx.GetBitmap());
#if defined(MACOSX)
- const AlphaMask aMaskBmp(
aContent.GetSizePixel());
+ AlphaMask aMaskBmp( aContent.GetSizePixel());
+ aMaskBmp.Erase( 0);
#else
Bitmap aMaskBmp( aContent.GetSizePixel(), 1);
- aMaskBmp.Erase(Color(COL_BLACK)); // #122758# Initialize to
non-transparent
+ aMaskBmp.Erase(Color(COL_BLACK)); // #122758#
Initialize to non-transparent
#endif
aBitmapEx = BitmapEx(aContent, aMaskBmp);
}
Propchange: openoffice/branches/AOO401/main/vcl/unx/gtk/window/gtkframe.cxx
------------------------------------------------------------------------------
Merged /openoffice/trunk/main/vcl/unx/gtk/window/gtkframe.cxx:r1506958
Propchange: openoffice/branches/AOO401/test/
------------------------------------------------------------------------------
Merged /openoffice/trunk/test:r1506958
Propchange:
openoffice/branches/AOO401/test/testcommon/source/org/openoffice/test/vcl/
------------------------------------------------------------------------------
Merged
/openoffice/trunk/test/testcommon/source/org/openoffice/test/vcl:r1506958
