[Libreoffice-commits] core.git: 2 commits - vcl/headless vcl/inc vcl/ios vcl/opengl vcl/qt5 vcl/quartz vcl/source vcl/unx vcl/win
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Feb 26 06:35:12 UTC 2019
vcl/headless/svpgdi.cxx | 2 +-
vcl/inc/headless/svpgdi.hxx | 2 +-
vcl/inc/openglgdiimpl.hxx | 2 +-
vcl/inc/qt5/Qt5Graphics.hxx | 2 +-
vcl/inc/quartz/salgdi.h | 2 +-
vcl/inc/salgdi.hxx | 4 ++--
vcl/inc/salgdiimpl.hxx | 2 +-
vcl/inc/unx/genpspgraphics.h | 2 +-
vcl/inc/unx/salbmp.h | 2 +-
vcl/inc/unx/salgdi.h | 2 +-
vcl/inc/win/salgdi.h | 2 +-
vcl/ios/dummies.cxx | 2 +-
vcl/opengl/gdiimpl.cxx | 2 +-
vcl/qt5/Qt5Graphics_GDI.cxx | 2 +-
vcl/quartz/salgdicommon.cxx | 2 +-
vcl/source/gdi/salgdilayout.cxx | 2 +-
vcl/unx/generic/gdi/gdiimpl.cxx | 2 +-
vcl/unx/generic/gdi/gdiimpl.hxx | 2 +-
vcl/unx/generic/gdi/salbmp.cxx | 2 +-
vcl/unx/generic/gdi/salgdi.cxx | 2 +-
vcl/unx/generic/print/genpspgraphics.cxx | 2 +-
vcl/win/gdi/gdiimpl.cxx | 2 +-
vcl/win/gdi/salgdi.cxx | 2 +-
23 files changed, 24 insertions(+), 24 deletions(-)
New commits:
commit b792e4ee22d7b625a214f6eceb1c223f35b9a606
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Feb 25 14:30:01 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Tue Feb 26 07:34:56 2019 +0100
sal_uLong->sal_uInt32 in drawEPS
Change-Id: I58beedfee1a55df971e778ba2aa3b6989ba53663
Reviewed-on: https://gerrit.libreoffice.org/68341
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index fed0c45af4e3..fafa73fa3c56 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -1885,7 +1885,7 @@ void SvpSalGraphics::invert(sal_uInt32 nPoints, const SalPoint* pPtAry, SalInver
invert(aPoly, nFlags);
}
-bool SvpSalGraphics::drawEPS( long, long, long, long, void*, sal_uLong )
+bool SvpSalGraphics::drawEPS( long, long, long, long, void*, sal_uInt32 )
{
return false;
}
diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index 89e141b78d21..1f00f21249e9 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -255,7 +255,7 @@ public:
virtual void invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags ) override;
virtual void invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags ) override;
- virtual bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize ) override;
+ virtual bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uInt32 nSize ) override;
virtual SystemGraphicsData GetGraphicsData() const override;
diff --git a/vcl/inc/openglgdiimpl.hxx b/vcl/inc/openglgdiimpl.hxx
index 132a64327e42..9c888ae62906 100644
--- a/vcl/inc/openglgdiimpl.hxx
+++ b/vcl/inc/openglgdiimpl.hxx
@@ -330,7 +330,7 @@ public:
long nX, long nY,
long nWidth, long nHeight,
void* pPtr,
- sal_uLong nSize ) override;
+ sal_uInt32 nSize ) override;
/** Render bitmap with alpha channel
diff --git a/vcl/inc/qt5/Qt5Graphics.hxx b/vcl/inc/qt5/Qt5Graphics.hxx
index b11f926f72bb..fe7e3b3012f0 100644
--- a/vcl/inc/qt5/Qt5Graphics.hxx
+++ b/vcl/inc/qt5/Qt5Graphics.hxx
@@ -142,7 +142,7 @@ public:
virtual void invert(sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags) override;
virtual bool drawEPS(long nX, long nY, long nWidth, long nHeight, void* pPtr,
- sal_uLong nSize) override;
+ sal_uInt32 nSize) override;
virtual bool blendBitmap(const SalTwoRect&, const SalBitmap& rBitmap) override;
diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h
index 63bf71090c21..adb5d30429ff 100644
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -264,7 +264,7 @@ public:
virtual void invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags) override;
virtual void invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags ) override;
- virtual bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize ) override;
+ virtual bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uInt32 nSize ) override;
virtual bool blendBitmap( const SalTwoRect&,
const SalBitmap& rBitmap ) override;
diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx
index 5313f24c73b8..fdd93ce00813 100644
--- a/vcl/inc/salgdi.hxx
+++ b/vcl/inc/salgdi.hxx
@@ -336,7 +336,7 @@ public:
long nX, long nY,
long nWidth, long nHeight,
void* pPtr,
- sal_uLong nSize,
+ sal_uInt32 nSize,
const OutputDevice *pOutDev );
// native widget rendering functions
@@ -534,7 +534,7 @@ protected:
long nX, long nY,
long nWidth, long nHeight,
void* pPtr,
- sal_uLong nSize ) = 0;
+ sal_uInt32 nSize ) = 0;
/**
* Query if a position is inside the native widget part.
diff --git a/vcl/inc/salgdiimpl.hxx b/vcl/inc/salgdiimpl.hxx
index a6dc4a808ee9..aafeded45dcc 100644
--- a/vcl/inc/salgdiimpl.hxx
+++ b/vcl/inc/salgdiimpl.hxx
@@ -171,7 +171,7 @@ public:
long nX, long nY,
long nWidth, long nHeight,
void* pPtr,
- sal_uLong nSize ) = 0;
+ sal_uInt32 nSize ) = 0;
virtual bool blendBitmap(
const SalTwoRect&,
diff --git a/vcl/inc/unx/genpspgraphics.h b/vcl/inc/unx/genpspgraphics.h
index b3fff8b8c05d..393f7fc181b3 100644
--- a/vcl/inc/unx/genpspgraphics.h
+++ b/vcl/inc/unx/genpspgraphics.h
@@ -176,7 +176,7 @@ public:
SalInvert nFlags ) override;
virtual bool drawEPS( long nX, long nY, long nWidth, long nHeight,
- void* pPtr, sal_uIntPtr nSize ) override;
+ void* pPtr, sal_uInt32 nSize ) override;
virtual bool blendBitmap( const SalTwoRect&,
const SalBitmap& rBitmap ) override;
virtual bool blendAlphaBitmap( const SalTwoRect&,
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index 7bc0e1934994..22f6d8604b83 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -225,7 +225,7 @@ public:
virtual void invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags ) override;
virtual void invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags ) override;
- virtual bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uIntPtr nSize ) override;
+ virtual bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uInt32 nSize ) override;
virtual bool blendBitmap(
const SalTwoRect&,
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index 1d0f2d51204f..22c4a8f2e8c5 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -261,7 +261,7 @@ protected:
virtual void invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags) override;
virtual void invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags ) override;
- virtual bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uIntPtr nSize ) override;
+ virtual bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uInt32 nSize ) override;
// native widget rendering methods that require mirroring
virtual bool hitTestNativeControl( ControlType nType, ControlPart nPart, const tools::Rectangle& rControlRegion,
diff --git a/vcl/ios/dummies.cxx b/vcl/ios/dummies.cxx
index 3572baa790ad..0a42b8307887 100644
--- a/vcl/ios/dummies.cxx
+++ b/vcl/ios/dummies.cxx
@@ -110,7 +110,7 @@ void SalGenericInstance::jobEndedPrinterUpdate()
{
}
-bool AquaSalGraphics::drawEPS( long, long, long, long, void*, sal_uLong )
+bool AquaSalGraphics::drawEPS( long, long, long, long, void*, sal_uInt32 )
{
return false;
}
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index fb1c0046a3a3..e847cb4ec324 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -1872,7 +1872,7 @@ bool OpenGLSalGraphicsImpl::drawEPS(
long /*nX*/, long /*nY*/,
long /*nWidth*/, long /*nHeight*/,
void* /*pPtr*/,
- sal_uLong /*nSize*/ )
+ sal_uInt32 /*nSize*/ )
{
return false;
}
diff --git a/vcl/qt5/Qt5Graphics_GDI.cxx b/vcl/qt5/Qt5Graphics_GDI.cxx
index 90baba36d3f0..e38a10d4fb90 100644
--- a/vcl/qt5/Qt5Graphics_GDI.cxx
+++ b/vcl/qt5/Qt5Graphics_GDI.cxx
@@ -512,7 +512,7 @@ void Qt5Graphics::invert(sal_uInt32 /*nPoints*/, const SalPoint* /*pPtAry*/, Sal
}
bool Qt5Graphics::drawEPS(long /*nX*/, long /*nY*/, long /*nWidth*/, long /*nHeight*/,
- void* /*pPtr*/, sal_uLong /*nSize*/)
+ void* /*pPtr*/, sal_uInt32 /*nSize*/)
{
return false;
}
diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx
index 53f0e2706e63..ab8065f9f401 100644
--- a/vcl/quartz/salgdicommon.cxx
+++ b/vcl/quartz/salgdicommon.cxx
@@ -737,7 +737,7 @@ void AquaSalGraphics::drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rS
#ifndef IOS
bool AquaSalGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight,
- void* pEpsData, sal_uLong nByteCount )
+ void* pEpsData, sal_uInt32 nByteCount )
{
// convert the raw data to an NSImageRef
NSData* xNSData = [NSData dataWithBytes:pEpsData length:static_cast<int>(nByteCount)];
diff --git a/vcl/source/gdi/salgdilayout.cxx b/vcl/source/gdi/salgdilayout.cxx
index 2bb5b47d3b80..d410ce51772c 100644
--- a/vcl/source/gdi/salgdilayout.cxx
+++ b/vcl/source/gdi/salgdilayout.cxx
@@ -738,7 +738,7 @@ void SalGraphics::Invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert
invert( nPoints, pPtAry, nFlags );
}
-bool SalGraphics::DrawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize, const OutputDevice *pOutDev )
+bool SalGraphics::DrawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uInt32 nSize, const OutputDevice *pOutDev )
{
if( (m_nLayout & SalLayoutFlags::BiDiRtl) || (pOutDev && pOutDev->IsRTLEnabled()) )
mirror( nX, nWidth, pOutDev );
diff --git a/vcl/unx/generic/gdi/gdiimpl.cxx b/vcl/unx/generic/gdi/gdiimpl.cxx
index 29f7323dbb1b..6238a875536a 100644
--- a/vcl/unx/generic/gdi/gdiimpl.cxx
+++ b/vcl/unx/generic/gdi/gdiimpl.cxx
@@ -1437,7 +1437,7 @@ void X11SalGraphicsImpl::invert( sal_uInt32 nPoints,
Complex, CoordModeOrigin );
}
-bool X11SalGraphicsImpl::drawEPS( long,long,long,long,void*,sal_uLong )
+bool X11SalGraphicsImpl::drawEPS( long,long,long,long,void*,sal_uInt32 )
{
return false;
}
diff --git a/vcl/unx/generic/gdi/gdiimpl.hxx b/vcl/unx/generic/gdi/gdiimpl.hxx
index 282b9a29a8d9..8a65787f052c 100644
--- a/vcl/unx/generic/gdi/gdiimpl.hxx
+++ b/vcl/unx/generic/gdi/gdiimpl.hxx
@@ -233,7 +233,7 @@ public:
long nX, long nY,
long nWidth, long nHeight,
void* pPtr,
- sal_uLong nSize ) override;
+ sal_uInt32 nSize ) override;
/** Blend bitmap with color channels */
virtual bool blendBitmap(
diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx
index 8b45e80c9327..2cfe4058a224 100644
--- a/vcl/unx/generic/gdi/salgdi.cxx
+++ b/vcl/unx/generic/gdi/salgdi.cxx
@@ -477,7 +477,7 @@ void X11SalGraphics::invert( sal_uInt32 nPoints,
}
bool X11SalGraphics::drawEPS( long nX, long nY, long nWidth,
- long nHeight, void* pPtr, sal_uLong nSize )
+ long nHeight, void* pPtr, sal_uInt32 nSize )
{
return mxImpl->drawEPS( nX, nY, nWidth, nHeight, pPtr, nSize );
}
diff --git a/vcl/unx/generic/print/genpspgraphics.cxx b/vcl/unx/generic/print/genpspgraphics.cxx
index 2ca4426d7034..13d17c56222b 100644
--- a/vcl/unx/generic/print/genpspgraphics.cxx
+++ b/vcl/unx/generic/print/genpspgraphics.cxx
@@ -456,7 +456,7 @@ void GenPspGraphics::invert( sal_uInt32,
SAL_WARN( "vcl", "Error: PrinterGfx::Invert() not implemented" );
}
-bool GenPspGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize )
+bool GenPspGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uInt32 nSize )
{
return m_pPrinterGfx->DrawEPS( tools::Rectangle( Point( nX, nY ), Size( nWidth, nHeight ) ), pPtr, nSize );
}
diff --git a/vcl/win/gdi/gdiimpl.cxx b/vcl/win/gdi/gdiimpl.cxx
index f4af3a06fecb..84e82b5abd61 100644
--- a/vcl/win/gdi/gdiimpl.cxx
+++ b/vcl/win/gdi/gdiimpl.cxx
@@ -240,7 +240,7 @@ void WinSalGraphicsImpl::freeResources()
{
}
-bool WinSalGraphicsImpl::drawEPS(long, long, long, long, void*, sal_uLong)
+bool WinSalGraphicsImpl::drawEPS(long, long, long, long, void*, sal_uInt32)
{
return false;
}
diff --git a/vcl/win/gdi/salgdi.cxx b/vcl/win/gdi/salgdi.cxx
index 363476a7107f..e4b2eaf203a2 100644
--- a/vcl/win/gdi/salgdi.cxx
+++ b/vcl/win/gdi/salgdi.cxx
@@ -889,7 +889,7 @@ static bool ImplGetBoundingBox( double* nNumb, BYTE* pSource, sal_uLong nSize )
#define POSTSCRIPT_BUFSIZE 0x4000 // MAXIMUM BUFSIZE EQ 0xFFFF
-bool WinSalGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize )
+bool WinSalGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uInt32 nSize )
{
bool bRetValue = false;
commit 4e1a2eb8b1ed1ab3e899e4f25246782165fc3ba4
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Feb 25 13:56:38 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Tue Feb 26 07:34:50 2019 +0100
sal_uIntPtr->unsigned in X11SalBitmap
Change-Id: I4ed777711c1302b3aaa73474b6182214c61b09f2
Reviewed-on: https://gerrit.libreoffice.org/68340
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/vcl/inc/unx/salbmp.h b/vcl/inc/unx/salbmp.h
index 5286ee2d984b..832831660dd0 100644
--- a/vcl/inc/unx/salbmp.h
+++ b/vcl/inc/unx/salbmp.h
@@ -62,7 +62,7 @@ private:
public:
static ImplSalBitmapCache* mpCache;
- static sal_uIntPtr mnCacheInstCount;
+ static unsigned int mnCacheInstCount;
static void ImplCreateCache();
static void ImplDestroyCache();
diff --git a/vcl/unx/generic/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx
index 2a5c475815c8..b8d4df762c61 100644
--- a/vcl/unx/generic/gdi/salbmp.cxx
+++ b/vcl/unx/generic/gdi/salbmp.cxx
@@ -64,7 +64,7 @@ std::shared_ptr<SalBitmap> X11SalInstance::CreateSalBitmap()
}
ImplSalBitmapCache* X11SalBitmap::mpCache = nullptr;
-sal_uLong X11SalBitmap::mnCacheInstCount = 0;
+unsigned int X11SalBitmap::mnCacheInstCount = 0;
X11SalBitmap::X11SalBitmap()
: mbGrey( false )
More information about the Libreoffice-commits
mailing list