vcl/source/gdi/gdimtf.cxx | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
New commits: commit df1c3938d2c54fbf72a0e58a9f178557fca48a3b Author: Noel Grandin <noel.gran...@collabora.co.uk> Date: Fri Jan 5 11:17:49 2018 +0200 remove pCols from ImplBmpReplaceParam it is always nullptr Change-Id: I0eae17a58423cceda08867f4dc5945a3e5553d5e Reviewed-on: https://gerrit.libreoffice.org/47461 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx index 8f65412faba3..05135718af64 100644 --- a/vcl/source/gdi/gdimtf.cxx +++ b/vcl/source/gdi/gdimtf.cxx @@ -108,10 +108,9 @@ struct ImplColReplaceParam struct ImplBmpReplaceParam { - const Color* pSrcCols; - const Color* pDstCols; + const Color* pSrcCols; + const Color* pDstCols; sal_uLong nCount; - const sal_uLong* pTols; }; GDIMetaFile::GDIMetaFile() : @@ -1821,7 +1820,7 @@ BitmapEx GDIMetaFile::ImplBmpReplaceFnc( const BitmapEx& rBmpEx, const void* pBm const ImplBmpReplaceParam* p = static_cast<const ImplBmpReplaceParam*>(pBmpParam); BitmapEx aRet( rBmpEx ); - aRet.Replace( p->pSrcCols, p->pDstCols, p->nCount, p->pTols ); + aRet.Replace( p->pSrcCols, p->pDstCols, p->nCount, nullptr ); return aRet; } @@ -2222,7 +2221,6 @@ void GDIMetaFile::ReplaceColors( const Color* pSearchColors, const Color* pRepla aBmpParam.pSrcCols = pSearchColors; aBmpParam.pDstCols = pReplaceColors; aBmpParam.nCount = nColorCount; - aBmpParam.pTols = nullptr; ImplExchangeColors( ImplColReplaceFnc, &aColParam, ImplBmpReplaceFnc, &aBmpParam ); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits