ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

vcl: remove MetaActionType param from DrawBitmap/DrawBitmapEx/DrawMask

Browse Source 
This is needed to allow for a clean abstract class DrawingInterface,
which I will introduce in a followup patch.

Change-Id: I1bb631872e44a82094dcfff07c0f418e9a4a0224
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122614
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
This commit is contained in:
Chris Sherlock
2021-09-30 10:01:19 +02:00
committed by Tomaž Vajngerl
parent 23e50bc96b
commit 52a07baebf
4 changed files with 56 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/vcl/outdev.hxx
+20 -39
View File
@@ -1253,77 +1253,54 @@ public:
///@{
public:
/** @overload
void DrawBitmap(
const Point& rDestPt,
const Size& rDestSize,
const Point& rSrcPtPixel,
const Size& rSecSizePixel,
const Bitmap& rBitmap,
MetaActionType nAction = MetaActionType::BMPSCALEPART)
*/
void DrawBitmap(
const Point& rDestPt,
const Bitmap& rBitmap );
/** @overload
void DrawBitmap(
const Point& rDestPt,
const Size& rDestSize,
const Point& rSrcPtPixel,
const Size& rSecSizePixel,
const Bitmap& rBitmap,
MetaActionType nAction = MetaActionType::BMPSCALEPART)
*/
void DrawBitmap(
const Point& rDestPt,
const Size& rDestSize,
const Bitmap& rBitmap );
void DrawBitmap(
const Point& rDestPt,
const Size& rDestSize,
const Point& rSrcPtPixel,
const Size& rSrcSizePixel,
const Bitmap& rBitmap);
void DrawBitmap(
const Point& rDestPt,
const Size& rDestSize,
const Point& rSrcPtPixel,
const Size& rSrcSizePixel,
const Bitmap& rBitmap,
MetaActionType nAction = MetaActionType::BMPSCALEPART );
MetaActionType nAction );
/** @overload
void DrawBitmapEx(
const Point& rDestPt,
const Size& rDestSize,
const Point& rSrcPtPixel,
const Size& rSecSizePixel,
const BitmapEx& rBitmapEx,
MetaActionType nAction = MetaActionType::BMPEXSCALEPART)
*/
void DrawBitmapEx(
const Point& rDestPt,
const BitmapEx& rBitmapEx );
/** @overload
void DrawBitmapEx(
const Point& rDestPt,
const Size& rDestSize,
const Point& rSrcPtPixel,
const Size& rSecSizePixel,
const BitmapEx& rBitmapEx,
MetaActionType nAction = MetaActionType::BMPEXSCALEPART)
*/
void DrawBitmapEx(
const Point& rDestPt,
const Size& rDestSize,
const BitmapEx& rBitmapEx );
void DrawBitmapEx(
const Point& rDestPt,
const Size& rDestSize,
const Point& rSrcPtPixel,
const Size& rSrcSizePixel,
const BitmapEx& rBitmapEx);
void DrawBitmapEx(
const Point& rDestPt,
const Size& rDestSize,
const Point& rSrcPtPixel,
const Size& rSrcSizePixel,
const BitmapEx& rBitmapEx,
MetaActionType nAction = MetaActionType::BMPEXSCALEPART );
MetaActionType nAction );
/** @overload
virtual void DrawImage(
@@ -1522,6 +1499,10 @@ public:
void DrawMask( const Point& rDestPt, const Size& rDestSize,
const Bitmap& rBitmap, const Color& rMaskColor );
void DrawMask( const Point& rDestPt, const Size& rDestSize,
const Point& rSrcPtPixel, const Size& rSrcSizePixel,
const Bitmap& rBitmap, const Color& rMaskColor);
void DrawMask( const Point& rDestPt, const Size& rDestSize,
const Point& rSrcPtPixel, const Size& rSrcSizePixel,
const Bitmap& rBitmap, const Color& rMaskColor,
vcl/source/outdev/bitmap.cxx
+8
View File
@@ -49,6 +49,14 @@ void OutputDevice::DrawBitmap( const Point& rDestPt, const Size& rDestSize, cons
DrawBitmap( rDestPt, rDestSize, Point(), rBitmap.GetSizePixel(), rBitmap, MetaActionType::BMPSCALE );
}
void OutputDevice::DrawBitmap( const Point& rDestPt, const Size& rDestSize,
const Point& rSrcPtPixel, const Size& rSrcSizePixel,
const Bitmap& rBitmap)
{
assert(!is_double_buffered_window());
DrawBitmap( rDestPt, rDestSize, rSrcPtPixel, rSrcSizePixel, rBitmap, MetaActionType::BMPSCALEPART );
}
void OutputDevice::DrawBitmap( const Point& rDestPt, const Size& rDestSize,
const Point& rSrcPtPixel, const Size& rSrcSizePixel,
vcl/source/outdev/bitmapex.cxx
+18
View File
@@ -67,6 +67,24 @@ void OutputDevice::DrawBitmapEx( const Point& rDestPt, const Size& rDestSize,
}
}
void OutputDevice::DrawBitmapEx( const Point& rDestPt, const Size& rDestSize,
const Point& rSrcPtPixel, const Size& rSrcSizePixel,
const BitmapEx& rBitmapEx)
{
assert(!is_double_buffered_window());
if( ImplIsRecordLayout() )
return;
if ( !rBitmapEx.IsAlpha() )
{
DrawBitmap( rDestPt, rDestSize, rSrcPtPixel, rSrcSizePixel, rBitmapEx.GetBitmap() );
}
else
{
DrawBitmapEx( rDestPt, rDestSize, rSrcPtPixel, rSrcSizePixel, rBitmapEx, MetaActionType::BMPEXSCALEPART );
}
}
void OutputDevice::DrawBitmapEx( const Point& rDestPt, const Size& rDestSize,
const Point& rSrcPtPixel, const Size& rSrcSizePixel,
vcl/source/outdev/mask.cxx
+10
View File
@@ -44,6 +44,16 @@ void OutputDevice::DrawMask( const Point& rDestPt, const Size& rDestSize,
DrawMask( rDestPt, rDestSize, Point(), rBitmap.GetSizePixel(), rBitmap, rMaskColor, MetaActionType::MASKSCALE );
}
void OutputDevice::DrawMask( const Point& rDestPt, const Size& rDestSize,
const Point& rSrcPtPixel, const Size& rSrcSizePixel,
const Bitmap& rBitmap, const Color& rMaskColor)
{
assert(!is_double_buffered_window());
DrawMask( rDestPt, rDestSize, rSrcPtPixel, rSrcSizePixel, rBitmap, rMaskColor, MetaActionType::MASKSCALEPART );
}
void OutputDevice::DrawMask( const Point& rDestPt, const Size& rDestSize,
const Point& rSrcPtPixel, const Size& rSrcSizePixel,
const Bitmap& rBitmap, const Color& rMaskColor,