diff options
Diffstat (limited to 'include/vcl')
| -rw-r--r-- | include/vcl/animate.hxx | 3 | ||||
| -rw-r--r-- | include/vcl/bitmap.hxx | 23 | ||||
| -rw-r--r-- | include/vcl/bitmapex.hxx | 6 |
3 files changed, 12 insertions, 20 deletions
diff --git a/include/vcl/animate.hxx b/include/vcl/animate.hxx index 3bc5ecb8fda3..3aa12f50f725 100644 --- a/include/vcl/animate.hxx +++ b/include/vcl/animate.hxx @@ -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 ); diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx index ddb6b3280fa3..b11fb646cc66 100644 --- a/include/vcl/bitmap.hxx +++ b/include/vcl/bitmap.hxx @@ -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 ); diff --git a/include/vcl/bitmapex.hxx b/include/vcl/bitmapex.hxx index 8d9b8ec4dbb4..23d8dd94acde 100644 --- a/include/vcl/bitmapex.hxx +++ b/include/vcl/bitmapex.hxx @@ -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 |