include/vcl/bitmap.hxx | 2 +-
include/vcl/bitmapex.hxx | 4 ++--
vcl/source/bitmap/bitmappaint.cxx | 12 ++++++------
vcl/source/gdi/bitmapex.cxx | 4 ++--
4 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit b5f7658153d80e74d415a561f562808ea0255554
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Dec 9 20:05:39 2020 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Dec 10 09:54:32 2020 +0100
use size_t instead of sal_uLong
Change-Id: Id0b5f95716ba0bd14f634d927ffb7a71c0bc5767
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107505
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index b995111f16a4..810ece4e5286 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -445,7 +445,7 @@ public:
bool Replace(
const Color* pSearchColors,
const Color* rReplaceColors,
- sal_uLong nColorCount,
+ size_t nColorCount,
sal_uInt8 const * pTols );
/** Convert the bitmap to a meta file
diff --git a/include/vcl/bitmapex.hxx b/include/vcl/bitmapex.hxx
index dc9f8a837502..14bbee535485 100644
--- a/include/vcl/bitmapex.hxx
+++ b/include/vcl/bitmapex.hxx
@@ -286,7 +286,7 @@ public:
void Replace(
const Color* pSearchColors,
const Color* pReplaceColors,
- sal_uLong nColorCount );
+ size_t nColorCount );
/** Replace all pixel having one the search colors with the corresponding
replace color
@@ -309,7 +309,7 @@ public:
void Replace(
const Color* pSearchColors,
const Color* pReplaceColors,
- sal_uLong nColorCount,
+ size_t nColorCount,
sal_uInt8 const * pTols );
/** Replace transparency with given color.
diff --git a/vcl/source/bitmap/bitmappaint.cxx
b/vcl/source/bitmap/bitmappaint.cxx
index 215f0e8e137a..54ef3c69aaa1 100644
--- a/vcl/source/bitmap/bitmappaint.cxx
+++ b/vcl/source/bitmap/bitmappaint.cxx
@@ -913,7 +913,7 @@ bool Bitmap::Replace(const Color& rSearchColor, const
Color& rReplaceColor, sal_
return bRet;
}
-bool Bitmap::Replace(const Color* pSearchColors, const Color* pReplaceColors,
sal_uLong nColorCount,
+bool Bitmap::Replace(const Color* pSearchColors, const Color* pReplaceColors,
size_t nColorCount,
sal_uInt8 const* pTols)
{
// Bitmaps with 1 bit color depth can cause problems if they have other
entries than black/white
@@ -935,7 +935,7 @@ bool Bitmap::Replace(const Color* pSearchColors, const
Color* pReplaceColors, sa
if (pTols)
{
- for (sal_uLong i = 0; i < nColorCount; i++)
+ for (size_t i = 0; i < nColorCount; ++i)
{
const Color& rCol = pSearchColors[i];
const sal_uInt8 nTol = pTols[i];
@@ -950,7 +950,7 @@ bool Bitmap::Replace(const Color* pSearchColors, const
Color* pReplaceColors, sa
}
else
{
- for (sal_uLong i = 0; i < nColorCount; i++)
+ for (size_t i = 0; i < nColorCount; ++i)
{
const Color& rCol = pSearchColors[i];
@@ -970,7 +970,7 @@ bool Bitmap::Replace(const Color* pSearchColors, const
Color* pReplaceColors, sa
{
const BitmapColor& rCol = pAcc->GetPaletteColor(nEntry);
- for (sal_uLong i = 0; i < nColorCount; i++)
+ for (size_t i = 0; i < nColorCount; ++i)
{
if (aMinR[i] <= rCol.GetRed() && aMaxR[i] >= rCol.GetRed()
&& aMinG[i] <= rCol.GetGreen() && aMaxG[i] >=
rCol.GetGreen()
@@ -986,7 +986,7 @@ bool Bitmap::Replace(const Color* pSearchColors, const
Color* pReplaceColors, sa
{
std::vector<BitmapColor> aReplaces(nColorCount);
- for (sal_uLong i = 0; i < nColorCount; i++)
+ for (size_t i = 0; i < nColorCount; ++i)
aReplaces[i] = pAcc->GetBestMatchingColor(pReplaceColors[i]);
for (tools::Long nY = 0, nHeight = pAcc->Height(); nY < nHeight;
nY++)
@@ -996,7 +996,7 @@ bool Bitmap::Replace(const Color* pSearchColors, const
Color* pReplaceColors, sa
{
BitmapColor aCol = pAcc->GetPixelFromData(pScanline, nX);
- for (sal_uLong i = 0; i < nColorCount; i++)
+ for (size_t i = 0; i < nColorCount; ++i)
{
if (aMinR[i] <= aCol.GetRed() && aMaxR[i] >=
aCol.GetRed()
&& aMinG[i] <= aCol.GetGreen() && aMaxG[i] >=
aCol.GetGreen()
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index 2eb3ee77b0e5..7c50435c6fc7 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -595,7 +595,7 @@ void BitmapEx::Replace( const Color& rSearchColor, const
Color& rReplaceColor )
maBitmap.Replace( rSearchColor, rReplaceColor );
}
-void BitmapEx::Replace( const Color* pSearchColors, const Color*
pReplaceColors, sal_uLong nColorCount )
+void BitmapEx::Replace( const Color* pSearchColors, const Color*
pReplaceColors, size_t nColorCount )
{
if (!!maBitmap)
maBitmap.Replace( pSearchColors, pReplaceColors, nColorCount,
/*pTols*/nullptr );
@@ -1324,7 +1324,7 @@ void BitmapEx::Replace(const Color& rSearchColor,
void BitmapEx::Replace( const Color* pSearchColors,
const Color* pReplaceColors,
- sal_uLong nColorCount,
+ size_t nColorCount,
sal_uInt8 const * pTols )
{
maBitmap.Replace( pSearchColors, pReplaceColors, nColorCount, pTols );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
