summaryrefslogtreecommitdiff
path: root/filter
diff options
context:
space:
mode:
authorMatteo Casalin <matteo.casalin@yahoo.com>2015-08-18 22:13:36 +0200
committerMatteo Casalin <matteo.casalin@yahoo.com>2015-08-21 22:29:41 +0200
commitaa62086495ecf3d5579ffc72df55698a9c943863 (patch)
treeb8dedf7d03ed1443f609ca8a4ddc072cc828ff9e /filter
parente28c9ccb014df9616d7a3f3fa1f1b5866d836d94 (diff)
sal_uLong to sal_uInt16 as return type of BitmapColor::GetColorError
Change-Id: I62c0d073d6b22346b65e3560303d7fc9373bfc7e
Diffstat (limited to 'filter')
-rw-r--r--filter/source/msfilter/util.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx
index 3a2843e3aa4e..f7e44c059295 100644
--- a/filter/source/msfilter/util.cxx
+++ b/filter/source/msfilter/util.cxx
@@ -1392,8 +1392,8 @@ static bool HasSimilarScheme(const BitmapColor& rBitmapColor1, const BitmapColor
static sal_uInt16 GetBestIndex(const BitmapPalette& rPalette, const BitmapColor& rBitmapColor)
{
sal_uInt16 nReturn = 0;
+ sal_uInt16 nLastErr = SAL_MAX_UINT16;
bool bFound = false;
- sal_uLong nLastErr = 3 * 255 + 1;
// Prefer those colors which have similar scheme as the input
// Allow bigger and bigger variance of the schemes until we find
@@ -1404,7 +1404,7 @@ static sal_uInt16 GetBestIndex(const BitmapPalette& rPalette, const BitmapColor&
{
if( HasSimilarScheme(rBitmapColor, rPalette[i], nVariance) )
{
- sal_uLong nActErr = rBitmapColor.GetColorError( rPalette[i] );
+ const sal_uInt16 nActErr = rBitmapColor.GetColorError( rPalette[i] );
if( nActErr < nLastErr )
{
nLastErr = nActErr;