From 936d5b409f29e9f986c2fa46e4659ef6cccae02b Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Sat, 30 Oct 2021 19:12:53 +0200 Subject: tools::Long->sal_Int32 in StretchAndConvert Change-Id: Id8ceb7042cf28e9130986393aff52bc29920b51a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124502 Tested-by: Jenkins Reviewed-by: Noel Grandin --- vcl/source/gdi/salmisc.cxx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'vcl/source/gdi') diff --git a/vcl/source/gdi/salmisc.cxx b/vcl/source/gdi/salmisc.cxx index 17161420dc4a..83ebbd000719 100644 --- a/vcl/source/gdi/salmisc.cxx +++ b/vcl/source/gdi/salmisc.cxx @@ -52,7 +52,7 @@ static tools::Long ImplIndexFromColor( const BitmapColor& rCol ) static void ImplPALToPAL( const BitmapBuffer& rSrcBuffer, BitmapBuffer& rDstBuffer, FncGetPixel pFncGetPixel, FncSetPixel pFncSetPixel, - Scanline* pSrcScanMap, Scanline* pDstScanMap, tools::Long const * pMapX, const tools::Long* pMapY ) + Scanline* pSrcScanMap, Scanline* pDstScanMap, sal_Int32 const * pMapX, const sal_Int32* pMapY ) { const tools::Long nHeight1 = rDstBuffer.mnHeight - 1; const ColorMask& rSrcMask = rSrcBuffer.maColorMask; @@ -85,7 +85,7 @@ static void ImplPALToPAL( const BitmapBuffer& rSrcBuffer, BitmapBuffer& rDstBuff static void ImplPALToTC( const BitmapBuffer& rSrcBuffer, BitmapBuffer const & rDstBuffer, FncGetPixel pFncGetPixel, FncSetPixel pFncSetPixel, - Scanline* pSrcScanMap, Scanline* pDstScanMap, tools::Long const * pMapX, const tools::Long* pMapY ) + Scanline* pSrcScanMap, Scanline* pDstScanMap, sal_Int32 const * pMapX, const sal_Int32* pMapY ) { const tools::Long nHeight1 = rDstBuffer.mnHeight - 1; const ColorMask& rSrcMask = rSrcBuffer.maColorMask; @@ -144,7 +144,7 @@ static void ImplPALToTC( const BitmapBuffer& rSrcBuffer, BitmapBuffer const & rD static void ImplTCToTC( const BitmapBuffer& rSrcBuffer, BitmapBuffer const & rDstBuffer, FncGetPixel pFncGetPixel, FncSetPixel pFncSetPixel, - Scanline* pSrcScanMap, Scanline* pDstScanMap, tools::Long const * pMapX, const tools::Long* pMapY ) + Scanline* pSrcScanMap, Scanline* pDstScanMap, sal_Int32 const * pMapX, const sal_Int32* pMapY ) { const tools::Long nHeight1 = rDstBuffer.mnHeight - 1; const ColorMask& rSrcMask = rSrcBuffer.maColorMask; @@ -189,7 +189,7 @@ static void ImplTCToTC( const BitmapBuffer& rSrcBuffer, BitmapBuffer const & rDs static void ImplTCToPAL( const BitmapBuffer& rSrcBuffer, BitmapBuffer const & rDstBuffer, FncGetPixel pFncGetPixel, FncSetPixel pFncSetPixel, - Scanline* pSrcScanMap, Scanline* pDstScanMap, tools::Long const * pMapX, const tools::Long* pMapY ) + Scanline* pSrcScanMap, Scanline* pDstScanMap, sal_Int32 const * pMapX, const sal_Int32* pMapY ) { const tools::Long nHeight1 = rDstBuffer.mnHeight- 1; const ColorMask& rSrcMask = rSrcBuffer.maColorMask; @@ -329,15 +329,15 @@ std::unique_ptr StretchAndConvert( std::unique_ptr pSrcScan; std::unique_ptr pDstScan; - std::unique_ptr pMapX; - std::unique_ptr pMapY; + std::unique_ptr pMapX; + std::unique_ptr pMapY; try { pSrcScan.reset(new Scanline[rSrcBuffer.mnHeight]); pDstScan.reset(new Scanline[pDstBuffer->mnHeight]); - pMapX.reset(new tools::Long[pDstBuffer->mnWidth]); - pMapY.reset(new tools::Long[pDstBuffer->mnHeight]); + pMapX.reset(new sal_Int32[pDstBuffer->mnWidth]); + pMapY.reset(new sal_Int32[pDstBuffer->mnHeight]); } catch( const std::bad_alloc& ) { -- cgit