summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-09-21 10:06:26 +0200
committerNoel Grandin <noel@peralex.com>2015-09-22 20:21:55 +0200
commitba6cbddd8890b3a5693a187b32c9b92a67511f3d (patch)
tree9994d3b17aace18d211d7fcc9e32474361359726 /vcl
parent55dda8e8d0a29ae150f58168d72ab2611ed2b8a8 (diff)
remove some unused params
Change-Id: Id4f6da92526cea3e9b01bd23f6569843dfb17d89
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/gdi/animate.cxx6
-rw-r--r--vcl/source/gdi/bitmap4.cxx35
-rw-r--r--vcl/source/gdi/bitmapex.cxx4
3 files changed, 22 insertions, 23 deletions
diff --git a/vcl/source/gdi/animate.cxx b/vcl/source/gdi/animate.cxx
index 4e5b333a81d4..0630a9c809cc 100644
--- a/vcl/source/gdi/animate.cxx
+++ b/vcl/source/gdi/animate.cxx
@@ -666,7 +666,7 @@ bool Animation::Adjust( short nLuminancePercent, short nContrastPercent,
return bRet;
}
-bool Animation::Filter( BmpFilter eFilter, const BmpFilterParam* pFilterParam, const Link<>* pProgress )
+bool Animation::Filter( BmpFilter eFilter, const BmpFilterParam* pFilterParam )
{
DBG_ASSERT( !IsInAnimation(), "Animation modified while it is animated" );
@@ -677,9 +677,9 @@ bool Animation::Filter( BmpFilter eFilter, const BmpFilterParam* pFilterParam, c
bRet = true;
for( size_t i = 0, n = maList.size(); ( i < n ) && bRet; ++i )
- bRet = maList[ i ]->aBmpEx.Filter( eFilter, pFilterParam, pProgress );
+ bRet = maList[ i ]->aBmpEx.Filter( eFilter, pFilterParam );
- (void)maBitmapEx.Filter(eFilter, pFilterParam, pProgress);
+ (void)maBitmapEx.Filter(eFilter, pFilterParam);
}
else
bRet = false;
diff --git a/vcl/source/gdi/bitmap4.cxx b/vcl/source/gdi/bitmap4.cxx
index 24a4b08251e7..d669f8a563ee 100644
--- a/vcl/source/gdi/bitmap4.cxx
+++ b/vcl/source/gdi/bitmap4.cxx
@@ -38,7 +38,7 @@ static inline sal_uInt8 lcl_getDuotoneColorComponent( sal_uInt8 base, sal_uInt16
return (sal_uInt8) (color1+color2);
}
-bool Bitmap::Filter( BmpFilter eFilter, const BmpFilterParam* pFilterParam, const Link<>* pProgress )
+bool Bitmap::Filter( BmpFilter eFilter, const BmpFilterParam* pFilterParam )
{
bool bRet = false;
@@ -66,36 +66,36 @@ bool Bitmap::Filter( BmpFilter eFilter, const BmpFilterParam* pFilterParam, cons
case( BMP_FILTER_SHARPEN ):
{
const long pSharpenMatrix[] = { -1, -1, -1, -1, 16, -1, -1, -1, -1 };
- bRet = ImplConvolute3( &pSharpenMatrix[ 0 ], 8, pFilterParam, pProgress );
+ bRet = ImplConvolute3( &pSharpenMatrix[ 0 ], 8 );
}
break;
case( BMP_FILTER_REMOVENOISE ):
- bRet = ImplMedianFilter( pFilterParam, pProgress );
+ bRet = ImplMedianFilter();
break;
case( BMP_FILTER_SOBEL_GREY ):
- bRet = ImplSobelGrey( pFilterParam, pProgress );
+ bRet = ImplSobelGrey();
break;
case( BMP_FILTER_SOLARIZE ):
- bRet = ImplSolarize( pFilterParam, pProgress );
+ bRet = ImplSolarize( pFilterParam );
break;
case( BMP_FILTER_SEPIA ):
- bRet = ImplSepia( pFilterParam, pProgress );
+ bRet = ImplSepia( pFilterParam );
break;
case( BMP_FILTER_MOSAIC ):
- bRet = ImplMosaic( pFilterParam, pProgress );
+ bRet = ImplMosaic( pFilterParam );
break;
case( BMP_FILTER_EMBOSS_GREY ):
- bRet = ImplEmbossGrey( pFilterParam, pProgress );
+ bRet = ImplEmbossGrey( pFilterParam );
break;
case( BMP_FILTER_POPART ):
- bRet = ImplPopArt( pFilterParam, pProgress );
+ bRet = ImplPopArt();
break;
case( BMP_FILTER_DUOTONE ):
@@ -110,8 +110,7 @@ bool Bitmap::Filter( BmpFilter eFilter, const BmpFilterParam* pFilterParam, cons
return bRet;
}
-bool Bitmap::ImplConvolute3( const long* pMatrix, long nDivisor,
- const BmpFilterParam* /*pFilterParam*/, const Link<>* /*pProgress*/ )
+bool Bitmap::ImplConvolute3( const long* pMatrix, long nDivisor )
{
BitmapReadAccess* pReadAcc = AcquireReadAccess();
bool bRet = false;
@@ -256,7 +255,7 @@ bool Bitmap::ImplConvolute3( const long* pMatrix, long nDivisor,
return bRet;
}
-bool Bitmap::ImplMedianFilter( const BmpFilterParam* /*pFilterParam*/, const Link<>* /*pProgress*/ )
+bool Bitmap::ImplMedianFilter()
{
BitmapReadAccess* pReadAcc = AcquireReadAccess();
bool bRet = false;
@@ -385,7 +384,7 @@ bool Bitmap::ImplMedianFilter( const BmpFilterParam* /*pFilterParam*/, const Lin
return bRet;
}
-bool Bitmap::ImplSobelGrey( const BmpFilterParam* /*pFilterParam*/, const Link<>* /*pProgress*/ )
+bool Bitmap::ImplSobelGrey()
{
bool bRet = ImplMakeGreyscales( 256 );
@@ -511,7 +510,7 @@ bool Bitmap::ImplSobelGrey( const BmpFilterParam* /*pFilterParam*/, const Link<>
return bRet;
}
-bool Bitmap::ImplEmbossGrey( const BmpFilterParam* pFilterParam, const Link<>* /*pProgress*/ )
+bool Bitmap::ImplEmbossGrey( const BmpFilterParam* pFilterParam )
{
bool bRet = ImplMakeGreyscales( 256 );
@@ -623,7 +622,7 @@ bool Bitmap::ImplEmbossGrey( const BmpFilterParam* pFilterParam, const Link<>* /
return bRet;
}
-bool Bitmap::ImplSolarize( const BmpFilterParam* pFilterParam, const Link<>* /*pProgress*/ )
+bool Bitmap::ImplSolarize( const BmpFilterParam* pFilterParam )
{
bool bRet = false;
BitmapWriteAccess* pWriteAcc = AcquireWriteAccess();
@@ -671,7 +670,7 @@ bool Bitmap::ImplSolarize( const BmpFilterParam* pFilterParam, const Link<>* /*p
return bRet;
}
-bool Bitmap::ImplSepia( const BmpFilterParam* pFilterParam, const Link<>* /*pProgress*/ )
+bool Bitmap::ImplSepia( const BmpFilterParam* pFilterParam )
{
BitmapReadAccess* pReadAcc = AcquireReadAccess();
bool bRet = false;
@@ -756,7 +755,7 @@ bool Bitmap::ImplSepia( const BmpFilterParam* pFilterParam, const Link<>* /*pPro
return bRet;
}
-bool Bitmap::ImplMosaic( const BmpFilterParam* pFilterParam, const Link<>* /*pProgress*/ )
+bool Bitmap::ImplMosaic( const BmpFilterParam* pFilterParam )
{
sal_uLong nTileWidth = ( pFilterParam && pFilterParam->meFilter == BMP_FILTER_MOSAIC ) ?
pFilterParam->maMosaicTileSize.mnTileWidth : 4;
@@ -941,7 +940,7 @@ extern "C" int SAL_CALL ImplPopArtCmpFnc( const void* p1, const void* p2 )
return nRet;
}
-bool Bitmap::ImplPopArt( const BmpFilterParam* /*pFilterParam*/, const Link<>* /*pProgress*/ )
+bool Bitmap::ImplPopArt()
{
bool bRet = ( GetBitCount() <= 8 ) || Convert( BMP_CONVERSION_8BIT_COLORS );
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index 02c29e229b4a..804e64616757 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -642,9 +642,9 @@ bool BitmapEx::Adjust( short nLuminancePercent, short nContrastPercent,
fGamma, bInvert, msoBrightness );
}
-bool BitmapEx::Filter( BmpFilter eFilter, const BmpFilterParam* pFilterParam, const Link<>* pProgress )
+bool BitmapEx::Filter( BmpFilter eFilter, const BmpFilterParam* pFilterParam )
{
- return !!aBitmap && aBitmap.Filter( eFilter, pFilterParam, pProgress );
+ return !!aBitmap && aBitmap.Filter( eFilter, pFilterParam );
}
void BitmapEx::Draw( OutputDevice* pOutDev, const Point& rDestPt ) const