[Libreoffice-commits] core.git: include/vcl vcl/inc vcl/source

[Noel Grandin (via logerrit)]

 include/vcl/bitmap.hxx                  |    3 +--
 include/vcl/bitmapex.hxx                |    5 +++--
 include/vcl/gdimtf.hxx                  |    1 +
 vcl/inc/bitmap/Octree.hxx               |    1 +
 vcl/source/bitmap/BitmapEx.cxx          |    6 +++---
 vcl/source/bitmap/BitmapWriteAccess.cxx |    2 +-
 vcl/source/bitmap/bitmap.cxx            |    2 +-
 7 files changed, 11 insertions(+), 9 deletions(-)

New commits:
commit 53e720708b9d027a7df9908c75b1b82c8aca3c6a
Author:     Noel Grandin <noelgrandin at gmail.com>
AuthorDate: Tue May 4 18:55:25 2021 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed May 5 08:31:32 2021 +0200

    sal_uLong->sal_Int32 in Bitmap
    
    Change-Id: I267fbdb8946d307440cb675f6ff985bf58db5e4c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115108
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index f3bc3e1cdfe7..f9e116c56d3b 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_VCL_BITMAP_HXX
 #define INCLUDED_VCL_BITMAP_HXX
 
-#include <tools/solar.h>
 #include <tools/degree.hxx>
 #include <vcl/checksum.hxx>
 #include <vcl/dllapi.h>
@@ -205,7 +204,7 @@ public:
         nothing had to be done, e.g. because nDX and nDY were zero.
      */
     bool                    Expand(
-                                sal_uLong nDX, sal_uLong nDY,
+                                sal_Int32 nDX, sal_Int32 nDY,
                                 const Color* pInitColor = nullptr );
 
     /** Copy a rectangular area from another bitmap
diff --git a/include/vcl/bitmapex.hxx b/include/vcl/bitmapex.hxx
index 7225a5fe7385..f623fe86dd18 100644
--- a/include/vcl/bitmapex.hxx
+++ b/include/vcl/bitmapex.hxx
@@ -25,6 +25,7 @@
 #include <vcl/Scanline.hxx>
 #include <tools/color.hxx>
 #include <tools/degree.hxx>
+#include <tools/solar.h>
 
 #include <sal/types.h>
 
@@ -83,7 +84,7 @@ public:
         return maBitmap.getPixelFormat();
     }
 
-    sal_uLong           GetSizeBytes() const;
+    sal_Int64           GetSizeBytes() const;
     BitmapChecksum      GetChecksum() const;
 
     /** Convert bitmap format
@@ -123,7 +124,7 @@ public:
         Whether to expand the transparency color or not.
      */
     void                Expand(
-                            sal_uLong nDX, sal_uLong nDY,
+                            sal_Int32 nDX, sal_Int32 nDY,
                             bool bExpandTransparent = false );
 
     /** Copy a rectangular area from another bitmap
diff --git a/include/vcl/gdimtf.hxx b/include/vcl/gdimtf.hxx
index 202480faa818..363f15f10842 100644
--- a/include/vcl/gdimtf.hxx
+++ b/include/vcl/gdimtf.hxx
@@ -22,6 +22,7 @@
 
 #include <vcl/dllapi.h>
 #include <tools/gen.hxx>
+#include <tools/solar.h>
 #include <vcl/mapmod.hxx>
 #include <vcl/bitmap.hxx>
 #include <vcl/vclptr.hxx>
diff --git a/vcl/inc/bitmap/Octree.hxx b/vcl/inc/bitmap/Octree.hxx
index f1d6e2a583c0..216f2fdd1875 100644
--- a/vcl/inc/bitmap/Octree.hxx
+++ b/vcl/inc/bitmap/Octree.hxx
@@ -22,6 +22,7 @@
 
 #include <vcl/dllapi.h>
 #include <vcl/BitmapColor.hxx>
+#include <tools/solar.h>
 
 struct OctreeNode
 {
diff --git a/vcl/source/bitmap/BitmapEx.cxx b/vcl/source/bitmap/BitmapEx.cxx
index 90c0ca8a47b5..2c56ab44b6a0 100644
--- a/vcl/source/bitmap/BitmapEx.cxx
+++ b/vcl/source/bitmap/BitmapEx.cxx
@@ -217,9 +217,9 @@ AlphaMask BitmapEx::GetAlpha() const
     return AlphaMask(maAlphaMask);
 }
 
-sal_uLong BitmapEx::GetSizeBytes() const
+sal_Int64 BitmapEx::GetSizeBytes() const
 {
-    sal_uLong nSizeBytes = maBitmap.GetSizeBytes();
+    sal_Int64 nSizeBytes = maBitmap.GetSizeBytes();
 
     if( !maAlphaMask.IsEmpty() )
         nSizeBytes += maAlphaMask.GetSizeBytes();
@@ -376,7 +376,7 @@ bool BitmapEx::Convert( BmpConversion eConversion )
     return !maBitmap.IsEmpty() && maBitmap.Convert( eConversion );
 }
 
-void BitmapEx::Expand( sal_uLong nDX, sal_uLong nDY, bool bExpandTransparent )
+void BitmapEx::Expand( sal_Int32 nDX, sal_Int32 nDY, bool bExpandTransparent )
 {
     bool bRet = false;
 
diff --git a/vcl/source/bitmap/BitmapWriteAccess.cxx b/vcl/source/bitmap/BitmapWriteAccess.cxx
index d30477b9f257..c7fb31cc1406 100644
--- a/vcl/source/bitmap/BitmapWriteAccess.cxx
+++ b/vcl/source/bitmap/BitmapWriteAccess.cxx
@@ -67,7 +67,7 @@ void BitmapWriteAccess::CopyScanline(tools::Long nY, ConstScanline aSrcScanline,
                    || (!HasPalette() && nFormat > ScanlineFormat::N8BitPal),
                "No copying possible between palette and non palette scanlines!");
 
-    const sal_uLong nCount = std::min(GetScanlineSize(), nSrcScanlineSize);
+    const sal_uInt32 nCount = std::min(GetScanlineSize(), nSrcScanlineSize);
 
     if (!nCount)
         return;
diff --git a/vcl/source/bitmap/bitmap.cxx b/vcl/source/bitmap/bitmap.cxx
index 99b8d10e9ef7..e093e0afabb5 100644
--- a/vcl/source/bitmap/bitmap.cxx
+++ b/vcl/source/bitmap/bitmap.cxx
@@ -850,7 +850,7 @@ bool Bitmap::CopyPixel_AlphaOptimized( const tools::Rectangle& rRectDst, const t
 
 }
 
-bool Bitmap::Expand( sal_uLong nDX, sal_uLong nDY, const Color* pInitColor )
+bool Bitmap::Expand( sal_Int32 nDX, sal_Int32 nDY, const Color* pInitColor )
 {
     bool bRet = false;