tools::Long->sal_Int32 in OutputDevice::Blend*

Change-Id: I26ad2727dbc258a49e7f370167b80e98438a50e8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124494
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

2 files changed, 22 insertions, 22 deletions

diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 151ab8236c6c..e9b8d3540cd1 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -1436,8 +1436,8 @@ private:
                                     const Size&         aOutSz,
                                     const bool          bHMirr,
                                     const bool          bVMirr,
-                                    const tools::Long*         pMapX,
-                                    const tools::Long*         pMapY );
+                                    const sal_Int32*         pMapX,
+                                    const sal_Int32*         pMapY );
 
     SAL_DLLPRIVATE Bitmap       BlendBitmapWithAlpha(
                                     Bitmap&             aBmp,
@@ -1448,8 +1448,8 @@ private:
                                     const sal_Int32     nDstHeight,
                                     const sal_Int32     nOffX,
                                     const sal_Int32     nDstWidth,
-                                    const tools::Long*         pMapX,
-                                    const tools::Long*         pMapY );
+                                    const sal_Int32*         pMapX,
+                                    const sal_Int32*         pMapY );
 
     ///@}
 
diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx
index 09e6091de8d6..53a9f774b71d 100644
--- a/vcl/source/outdev/bitmap.cxx
+++ b/vcl/source/outdev/bitmap.cxx
@@ -375,19 +375,19 @@ namespace
 
 struct LinearScaleContext
 {
-    std::unique_ptr<tools::Long[]> mpMapX;
-    std::unique_ptr<tools::Long[]> mpMapY;
+    std::unique_ptr<sal_Int32[]> mpMapX;
+    std::unique_ptr<sal_Int32[]> mpMapY;
 
-    std::unique_ptr<tools::Long[]> mpMapXOffset;
-    std::unique_ptr<tools::Long[]> mpMapYOffset;
+    std::unique_ptr<sal_Int32[]> mpMapXOffset;
+    std::unique_ptr<sal_Int32[]> mpMapYOffset;
 
     LinearScaleContext(tools::Rectangle const & aDstRect, tools::Rectangle const & aBitmapRect,
                  Size const & aOutSize, tools::Long nOffX, tools::Long nOffY)
 
-        : mpMapX(new tools::Long[aDstRect.GetWidth()])
-        , mpMapY(new tools::Long[aDstRect.GetHeight()])
-        , mpMapXOffset(new tools::Long[aDstRect.GetWidth()])
-        , mpMapYOffset(new tools::Long[aDstRect.GetHeight()])
+        : mpMapX(new sal_Int32[aDstRect.GetWidth()])
+        , mpMapY(new sal_Int32[aDstRect.GetHeight()])
+        , mpMapXOffset(new sal_Int32[aDstRect.GetWidth()])
+        , mpMapYOffset(new sal_Int32[aDstRect.GetHeight()])
     {
         const tools::Long nSrcWidth = aBitmapRect.GetWidth();
         const tools::Long nSrcHeight = aBitmapRect.GetHeight();
@@ -404,7 +404,7 @@ struct LinearScaleContext
 private:
 
     static void generateSimpleMap(tools::Long nSrcDimension, tools::Long nDstDimension, tools::Long nDstLocation,
-                                  tools::Long nOutDimension, tools::Long nOffset, tools::Long* pMap, tools::Long* pMapOffset)
+                                  tools::Long nOutDimension, tools::Long nOffset, sal_Int32* pMap, sal_Int32* pMapOffset)
     {
 
         const double fReverseScale = (std::abs(nOutDimension) > 1) ? (nSrcDimension - 1) / double(std::abs(nOutDimension) - 1) : 0.0;
@@ -542,14 +542,14 @@ public:
 
 struct TradScaleContext
 {
-    std::unique_ptr<tools::Long[]> mpMapX;
-    std::unique_ptr<tools::Long[]> mpMapY;
+    std::unique_ptr<sal_Int32[]> mpMapX;
+    std::unique_ptr<sal_Int32[]> mpMapY;
 
     TradScaleContext(tools::Rectangle const & aDstRect, tools::Rectangle const & aBitmapRect,
                  Size const & aOutSize, tools::Long nOffX, tools::Long nOffY)
 
-        : mpMapX(new tools::Long[aDstRect.GetWidth()])
-        , mpMapY(new tools::Long[aDstRect.GetHeight()])
+        : mpMapX(new sal_Int32[aDstRect.GetWidth()])
+        , mpMapY(new sal_Int32[aDstRect.GetHeight()])
     {
         const tools::Long nSrcWidth = aBitmapRect.GetWidth();
         const tools::Long nSrcHeight = aBitmapRect.GetHeight();
@@ -569,7 +569,7 @@ struct TradScaleContext
 private:
 
     static void generateSimpleMap(tools::Long nSrcDimension, tools::Long nDstDimension, tools::Long nDstLocation,
-                                  tools::Long nOutDimension, tools::Long nOffset, bool bMirror, tools::Long* pMap)
+                                  tools::Long nOutDimension, tools::Long nOffset, bool bMirror, sal_Int32* pMap)
     {
         tools::Long nMirrorOffset = 0;
 
@@ -786,8 +786,8 @@ Bitmap OutputDevice::BlendBitmapWithAlpha(
             const sal_Int32     nDstHeight,
             const sal_Int32     nOffX,
             const sal_Int32     nDstWidth,
-            const tools::Long*         pMapX,
-            const tools::Long*         pMapY )
+            const sal_Int32*    pMapX,
+            const sal_Int32*    pMapY )
 
 {
     BitmapColor aDstCol;
@@ -889,8 +889,8 @@ Bitmap OutputDevice::BlendBitmap(
             const Size&         aOutSz,
             const bool          bHMirr,
             const bool          bVMirr,
-            const tools::Long*         pMapX,
-            const tools::Long*         pMapY )
+            const sal_Int32*    pMapX,
+            const sal_Int32*    pMapY )
 {
     BitmapColor aDstCol;
     Bitmap      res;