svx/source/customshapes/EnhancedCustomShape2d.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
New commits: commit d342cad2749ca68b1f72bf318fbd403adb7a758f Author: Noel Grandin <[email protected]> AuthorDate: Mon Jul 8 11:00:00 2019 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Mon Jul 8 12:49:53 2019 +0200 use BitmapEx in EnhancedCustomShape2d::AdaptObjColor instead of Bitmap Change-Id: Ibcdef2a076f29590f1a8a43f90b1cec95e75d413 Reviewed-on: https://gerrit.libreoffice.org/75199 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx index 22eb1cba2c53..b2effd4649f5 100644 --- a/svx/source/customshapes/EnhancedCustomShape2d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx @@ -2793,11 +2793,11 @@ void EnhancedCustomShape2d::AdaptObjColor( { if ( nColorCount || 0.0 != dBrightness ) { - Bitmap aBitmap(rObj.GetMergedItem(XATTR_FILLBITMAP).GetGraphicObject().GetGraphic().GetBitmapEx().GetBitmap()); + BitmapEx aBitmap(rObj.GetMergedItem(XATTR_FILLBITMAP).GetGraphicObject().GetGraphic().GetBitmapEx()); - aBitmap.Adjust( - static_cast< short > ( GetLuminanceChange( - std::min(nColorIndex, nColorCount-1)))); + short nLuminancePercent = static_cast< short > ( GetLuminanceChange( + std::min(nColorIndex, nColorCount-1))); + aBitmap.Adjust( nLuminancePercent, 0, 0, 0, 0 ); rObj.SetMergedItem(XFillBitmapItem(OUString(), Graphic(aBitmap))); } _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
