Skip to content

C
core
Kaydet (Commit) ba6cbddd authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

remove some unused params 

Change-Id: Id4f6da92526cea3e9b01bd23f6569843dfb17d89
üst 55dda8e8
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 43 deletions
include/vcl/animate.hxx
Dosyayı görüntüle @ ba6cbddd
......@@ -184,8 +184,7 @@ public:
bool Filter(
BmpFilter eFilter,
const BmpFilterParam* pFilterParam = NULL,
const Link<>* pProgress = NULL );
const BmpFilterParam* pFilterParam = NULL );
friend VCL_DLLPUBLIC SvStream& ReadAnimation( SvStream& rIStream, Animation& rAnimation );
friend VCL_DLLPUBLIC SvStream& WriteAnimation( SvStream& rOStream, const Animation& rAnimation );
......
include/vcl/bitmap.hxx
Dosyayı görüntüle @ ba6cbddd
......@@ -716,8 +716,7 @@ public:
*/
bool Filter(
BmpFilter eFilter,
const BmpFilterParam* pFilterParam = NULL,
const Link<>* pProgress = NULL );
const BmpFilterParam* pFilterParam = NULL );
public:
......@@ -759,17 +758,15 @@ public:
long nColors, long nPixels, long& rIndex );
SAL_DLLPRIVATE bool ImplConvolute3(
const long* pMatrix, long nDivisor,
const BmpFilterParam* pFilterParam,
const Link<>* pProgress );
SAL_DLLPRIVATE bool ImplMedianFilter( const BmpFilterParam* pFilterParam, const Link<>* pProgress );
SAL_DLLPRIVATE bool ImplSobelGrey( const BmpFilterParam* pFilterParam, const Link<>* pProgress );
SAL_DLLPRIVATE bool ImplEmbossGrey( const BmpFilterParam* pFilterParam, const Link<>* pProgress );
SAL_DLLPRIVATE bool ImplSolarize( const BmpFilterParam* pFilterParam, const Link<>* pProgress );
SAL_DLLPRIVATE bool ImplSepia( const BmpFilterParam* pFilterParam, const Link<>* pProgress );
SAL_DLLPRIVATE bool ImplMosaic( const BmpFilterParam* pFilterParam, const Link<>* pProgress );
SAL_DLLPRIVATE bool ImplPopArt( const BmpFilterParam* pFilterParam, const Link<>* pProgress );
const long* pMatrix, long nDivisor );
SAL_DLLPRIVATE bool ImplMedianFilter();
SAL_DLLPRIVATE bool ImplSobelGrey();
SAL_DLLPRIVATE bool ImplEmbossGrey( const BmpFilterParam* pFilterParam );
SAL_DLLPRIVATE bool ImplSolarize( const BmpFilterParam* pFilterParam );
SAL_DLLPRIVATE bool ImplSepia( const BmpFilterParam* pFilterParam );
SAL_DLLPRIVATE bool ImplMosaic( const BmpFilterParam* pFilterParam );
SAL_DLLPRIVATE bool ImplPopArt();
SAL_DLLPRIVATE bool ImplSeparableBlurFilter( const double aRadius = 0.7 );
SAL_DLLPRIVATE bool ImplSeparableUnsharpenFilter( const double aRadius = 0.7 );
......
include/vcl/bitmapex.hxx
Dosyayı görüntüle @ ba6cbddd
......@@ -361,15 +361,11 @@ public:
@param pFilterParam
Various parameter for the different bitmap filter algorithms
@param pProgress
A callback for showing the progress of the vectorization
@return true, if the operation was completed successfully.
*/
bool Filter(
BmpFilter eFilter,
const BmpFilterParam* pFilterParam = NULL,
const Link<>* pProgress = NULL );
const BmpFilterParam* pFilterParam = NULL );
/** Get transparency at given position
......
vcl/source/gdi/animate.cxx
Dosyayı görüntüle @ ba6cbddd
......@@ -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;
......
vcl/source/gdi/bitmap4.cxx
Dosyayı görüntüle @ ba6cbddd
......@@ -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 );
......
vcl/source/gdi/bitmapex.cxx
Dosyayı görüntüle @ ba6cbddd
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment