summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-05-06 10:52:59 +0200
committerNoel Grandin <noelgrandin@gmail.com>2015-05-07 08:35:39 +0000
commitefecaf03adff75aa88be7862eb2c4f1261df5e60 (patch)
tree8b31b6bfa3bd3074cde5e8fe7e707fcfacd98e85 /vcl
parent0825b020caa0d802a0d76d9a7643daedbf9874e6 (diff)
convert BMP_DITHER flags to scoped enum
Change-Id: I652faacf39a32fc8803147819ec9366948ff12b9 Reviewed-on: https://gerrit.libreoffice.org/15646 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/gdi/bitmap3.cxx8
-rw-r--r--vcl/source/gdi/bitmapex.cxx2
-rw-r--r--vcl/unx/generic/dtrans/bmp.cxx2
3 files changed, 6 insertions, 6 deletions
diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx
index 3ad2c18fd01c..4ed1aab1143f 100644
--- a/vcl/source/gdi/bitmap3.cxx
+++ b/vcl/source/gdi/bitmap3.cxx
@@ -1668,7 +1668,7 @@ bool Bitmap::ImplScaleConvolution(
return bResult;
}
-bool Bitmap::Dither( sal_uLong nDitherFlags )
+bool Bitmap::Dither( BmpDitherFlags nDitherFlags )
{
bool bRet = false;
@@ -1676,11 +1676,11 @@ bool Bitmap::Dither( sal_uLong nDitherFlags )
if( aSizePix.Width() == 1 || aSizePix.Height() == 1 )
bRet = true;
- else if( nDitherFlags & BMP_DITHER_MATRIX )
+ else if( nDitherFlags & BmpDitherFlags::Matrix )
bRet = ImplDitherMatrix();
- else if( nDitherFlags & BMP_DITHER_FLOYD )
+ else if( nDitherFlags & BmpDitherFlags::Floyd )
bRet = ImplDitherFloyd();
- else if( ( nDitherFlags & BMP_DITHER_FLOYD_16 ) && ( GetBitCount() == 24 ) )
+ else if( ( nDitherFlags & BmpDitherFlags::Floyd16 ) && ( GetBitCount() == 24 ) )
bRet = ImplDitherFloyd16();
return bRet;
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index 537c7dc8feff..e6fa951a0927 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -625,7 +625,7 @@ bool BitmapEx::Erase( const Color& rFillColor )
return bRet;
}
-bool BitmapEx::Dither( sal_uLong nDitherFlags )
+bool BitmapEx::Dither( BmpDitherFlags nDitherFlags )
{
return !!aBitmap && aBitmap.Dither( nDitherFlags );
}
diff --git a/vcl/unx/generic/dtrans/bmp.cxx b/vcl/unx/generic/dtrans/bmp.cxx
index 621243e5a11f..b4dcc04d5e10 100644
--- a/vcl/unx/generic/dtrans/bmp.cxx
+++ b/vcl/unx/generic/dtrans/bmp.cxx
@@ -739,7 +739,7 @@ css::uno::Sequence<sal_Int8> x11::convertBitmapDepth(
Bitmap bm;
ReadDIB(bm, in, true);
if (bm.GetBitCount() == 24 && depth <= 8) {
- bm.Dither(BMP_DITHER_FLOYD);
+ bm.Dither(BmpDitherFlags::Floyd);
}
if (bm.GetBitCount() != depth) {
switch (depth) {