diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-05 11:12:54 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-05 12:02:08 +0100 |
| commit | 7accac097688832d8682a88a0176c3e1482ffade (patch) | |
| tree | e24edf0953b3a1c8bc297a4a464f1f1d9411b1cd /include/vcl | |
| parent | e92b89428e66ab44c6c08463b3c43200e1cf7341 (diff) | |
tdf#114837 FILEOPEN: Image is blank
revert
commit e75abe6e0a4ea250366bb29c0ece697e9b1b80a1
Author: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Tue Dec 12 09:33:14 2017 +0200
convert tolerance params to sal_uInt8
for now.
Change-Id: Iafaada0fb338f60ecc9f94aafe138500dfb27cf7
Reviewed-on: https://gerrit.libreoffice.org/47453
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/vcl')
| -rw-r--r-- | include/vcl/bitmap.hxx | 8 | ||||
| -rw-r--r-- | include/vcl/bitmapex.hxx | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx index f6600ecdac9a..f2cd512b3158 100644 --- a/include/vcl/bitmap.hxx +++ b/include/vcl/bitmap.hxx @@ -492,11 +492,11 @@ public: @param nTol Tolerance value. Specifies the maximal difference between rTransColor and the individual pixel values, such that the - corresponding pixel is still regarded as transparent. + corresponding pixel is still regarded transparent. @return the resulting bitmask. */ - Bitmap CreateMask( const Color& rTransColor, sal_uInt8 nTol = 0 ) const; + Bitmap CreateMask( const Color& rTransColor, sal_uLong nTol = 0 ) const; /** Create region of similar colors in a given rectangle @@ -550,7 +550,7 @@ public: @return true, if the operation was completed successfully. */ - bool Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uInt8 nTol = 0 ); + bool Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol = 0 ); /** Replace all pixel having one the search colors with the corresponding replace color @@ -574,7 +574,7 @@ public: const Color* pSearchColors, const Color* rReplaceColors, sal_uLong nColorCount, - const sal_uInt8* pTols ); + sal_uLong* pTols ); /** Convert the bitmap to a meta file diff --git a/include/vcl/bitmapex.hxx b/include/vcl/bitmapex.hxx index a850572357e9..3cef293b4e11 100644 --- a/include/vcl/bitmapex.hxx +++ b/include/vcl/bitmapex.hxx @@ -293,7 +293,7 @@ public: const Color* pSearchColors, const Color* pReplaceColors, sal_uLong nColorCount, - const sal_uInt8* pTols = nullptr ); + const sal_uLong* pTols = nullptr ); /** Change various global color characteristics |