summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/vcl/salbtype.hxx11
-rw-r--r--vcl/inc/salbmp.hxx4
-rw-r--r--vcl/opengl/salbmp.cxx6
-rw-r--r--vcl/quartz/salbmp.cxx2
-rw-r--r--vcl/source/gdi/bmpacc.cxx10
-rw-r--r--vcl/source/gdi/impbmp.cxx2
-rw-r--r--vcl/unx/generic/gdi/gdiimpl.cxx12
-rw-r--r--vcl/unx/generic/gdi/salbmp.cxx2
-rw-r--r--vcl/unx/generic/print/genpspgraphics.cxx4
-rw-r--r--vcl/win/gdi/gdiimpl.cxx4
-rw-r--r--vcl/win/gdi/salbmp.cxx20
-rw-r--r--vcl/win/gdi/salgdi2.cxx8
12 files changed, 42 insertions, 43 deletions
diff --git a/include/vcl/salbtype.hxx b/include/vcl/salbtype.hxx
index 36da41db3593..769549d2beb2 100644
--- a/include/vcl/salbtype.hxx
+++ b/include/vcl/salbtype.hxx
@@ -266,13 +266,12 @@ struct VCL_DLLPUBLIC BitmapBuffer
sal_uInt8* mpBits;
};
-typedef enum
+enum class BitmapAccessMode
{
- BITMAP_INFO_ACCESS,
- BITMAP_READ_ACCESS,
- BITMAP_WRITE_ACCESS
-}
-BitmapAccessMode;
+ Info,
+ Read,
+ Write
+};
VCL_DLLPUBLIC BitmapBuffer* StretchAndConvert(
const BitmapBuffer& rSrcBuffer, const SalTwoRect& rTwoRect,
diff --git a/vcl/inc/salbmp.hxx b/vcl/inc/salbmp.hxx
index 305f8a63f74d..b34525778608 100644
--- a/vcl/inc/salbmp.hxx
+++ b/vcl/inc/salbmp.hxx
@@ -100,11 +100,11 @@ protected:
ChecksumType nCrc = 0;
SalBitmap* pThis = const_cast<SalBitmap*>(this);
- BitmapBuffer* pBuf = pThis->AcquireBuffer(BITMAP_READ_ACCESS);
+ BitmapBuffer* pBuf = pThis->AcquireBuffer(BitmapAccessMode::Read);
if (pBuf)
{
nCrc = vcl_get_checksum(0, pBuf->mpBits, pBuf->mnScanlineSize * pBuf->mnHeight);
- pThis->ReleaseBuffer(pBuf, BITMAP_READ_ACCESS);
+ pThis->ReleaseBuffer(pBuf, BitmapAccessMode::Read);
pThis->mnChecksum = nCrc;
pThis->mbChecksumValid = true;
}
diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index 946a35fb7136..0ba5b4356d63 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -727,7 +727,7 @@ BitmapBuffer* OpenGLSalBitmap::AcquireBuffer( BitmapAccessMode nMode )
{
OpenGLVCLContextZone aContextZone;
- if( nMode != BITMAP_INFO_ACCESS )
+ if( nMode != BitmapAccessMode::Info )
{
if (!mpUserBuffer.get())
{
@@ -746,7 +746,7 @@ BitmapBuffer* OpenGLSalBitmap::AcquireBuffer( BitmapAccessMode nMode )
}
// mpUserBuffer must be unique when we are doing the write access
- if (nMode == BITMAP_WRITE_ACCESS && mpUserBuffer && !mpUserBuffer.unique())
+ if (nMode == BitmapAccessMode::Write && mpUserBuffer && !mpUserBuffer.unique())
{
std::shared_ptr<sal_uInt8> aBuffer(mpUserBuffer);
@@ -838,7 +838,7 @@ void OpenGLSalBitmap::ReleaseBuffer( BitmapBuffer* pBuffer, BitmapAccessMode nMo
{
OpenGLVCLContextZone aContextZone;
- if( nMode == BITMAP_WRITE_ACCESS )
+ if( nMode == BitmapAccessMode::Write )
{
maTexture = OpenGLTexture();
mbDirtyTexture = true;
diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx
index 48906a399429..3817c94e9cb8 100644
--- a/vcl/quartz/salbmp.cxx
+++ b/vcl/quartz/salbmp.cxx
@@ -816,7 +816,7 @@ BitmapBuffer* QuartzSalBitmap::AcquireBuffer( BitmapAccessMode /*nMode*/ )
void QuartzSalBitmap::ReleaseBuffer( BitmapBuffer* pBuffer, BitmapAccessMode nMode )
{
// invalidate graphic context if we have different data
- if( nMode == BITMAP_WRITE_ACCESS )
+ if( nMode == BitmapAccessMode::Write )
{
maPalette = pBuffer->maPalette;
if( mxGraphicContext )
diff --git a/vcl/source/gdi/bmpacc.cxx b/vcl/source/gdi/bmpacc.cxx
index 45ea184ec589..e18f242030dc 100644
--- a/vcl/source/gdi/bmpacc.cxx
+++ b/vcl/source/gdi/bmpacc.cxx
@@ -36,7 +36,7 @@ BitmapInfoAccess::BitmapInfoAccess( Bitmap& rBitmap, BitmapAccessMode nMode ) :
BitmapInfoAccess::BitmapInfoAccess( Bitmap& rBitmap ) :
mpBuffer ( nullptr ),
- mnAccessMode ( BITMAP_INFO_ACCESS )
+ mnAccessMode ( BitmapAccessMode::Info )
{
ImplCreate( rBitmap );
}
@@ -54,14 +54,14 @@ void BitmapInfoAccess::ImplCreate( Bitmap& rBitmap )
if( xImpBmp )
{
- if( mnAccessMode == BITMAP_WRITE_ACCESS && !maBitmap.ImplGetImpBitmap() )
+ if( mnAccessMode == BitmapAccessMode::Write && !maBitmap.ImplGetImpBitmap() )
{
rBitmap.ImplMakeUnique();
xImpBmp = rBitmap.ImplGetImpBitmap();
}
else
{
- DBG_ASSERT( mnAccessMode != BITMAP_WRITE_ACCESS ||
+ DBG_ASSERT( mnAccessMode != BitmapAccessMode::Write ||
xImpBmp.use_count() == 2,
"Unpredictable results: bitmap is referenced more than once!" );
}
@@ -109,7 +109,7 @@ BitmapReadAccess::BitmapReadAccess( Bitmap& rBitmap, BitmapAccessMode nMode ) :
}
BitmapReadAccess::BitmapReadAccess( Bitmap& rBitmap ) :
- BitmapInfoAccess( rBitmap, BITMAP_READ_ACCESS ),
+ BitmapInfoAccess( rBitmap, BitmapAccessMode::Read ),
mpScanBuf ( nullptr ),
mFncGetPixel ( nullptr ),
mFncSetPixel ( nullptr )
@@ -391,7 +391,7 @@ BitmapColor BitmapReadAccess::GetColorWithFallback( double fY, double fX, const
}
BitmapWriteAccess::BitmapWriteAccess(Bitmap& rBitmap)
- : BitmapReadAccess(rBitmap, BITMAP_WRITE_ACCESS)
+ : BitmapReadAccess(rBitmap, BitmapAccessMode::Write)
, mpLineColor()
, mpFillColor()
{
diff --git a/vcl/source/gdi/impbmp.cxx b/vcl/source/gdi/impbmp.cxx
index b25450d8772f..ab06a712d0e1 100644
--- a/vcl/source/gdi/impbmp.cxx
+++ b/vcl/source/gdi/impbmp.cxx
@@ -87,7 +87,7 @@ void ImpBitmap::ImplReleaseBuffer( BitmapBuffer* pBuffer, BitmapAccessMode nMode
{
mpSalBitmap->ReleaseBuffer( pBuffer, nMode );
- if( nMode == BITMAP_WRITE_ACCESS )
+ if( nMode == BitmapAccessMode::Write )
ImplInvalidateChecksum();
}
diff --git a/vcl/unx/generic/gdi/gdiimpl.cxx b/vcl/unx/generic/gdi/gdiimpl.cxx
index 8946ed3d128a..cf0216650668 100644
--- a/vcl/unx/generic/gdi/gdiimpl.cxx
+++ b/vcl/unx/generic/gdi/gdiimpl.cxx
@@ -109,7 +109,7 @@ namespace
//fdo#33455 and fdo#80160 handle 1 bit depth pngs with palette entries
//to set fore/back colors
SalBitmap& rBitmap = const_cast<SalBitmap&>(rSalBitmap);
- if (BitmapBuffer* pBitmapBuffer = rBitmap.AcquireBuffer(BITMAP_READ_ACCESS))
+ if (BitmapBuffer* pBitmapBuffer = rBitmap.AcquireBuffer(BitmapAccessMode::Read))
{
const BitmapPalette& rPalette = pBitmapBuffer->maPalette;
if (rPalette.GetEntryCount() == 2)
@@ -120,7 +120,7 @@ namespace
const BitmapColor aBlack(rPalette[rPalette.GetBestIndex(Color(COL_BLACK))]);
rValues.background = rColMap.GetPixel(ImplColorToSal(aBlack));
}
- rBitmap.ReleaseBuffer(pBitmapBuffer, BITMAP_READ_ACCESS);
+ rBitmap.ReleaseBuffer(pBitmapBuffer, BitmapAccessMode::Read);
}
}
}
@@ -673,11 +673,11 @@ void X11SalGraphicsImpl::drawBitmap( const SalTwoRect& rPosAry,
DBG_ASSERT( !mrParent.bPrinter_, "Drawing of transparent bitmaps on printer devices is strictly forbidden" );
// decide if alpha masking or transparency masking is needed
- BitmapBuffer* pAlphaBuffer = const_cast<SalBitmap&>(rMaskBitmap).AcquireBuffer( BITMAP_READ_ACCESS );
+ BitmapBuffer* pAlphaBuffer = const_cast<SalBitmap&>(rMaskBitmap).AcquireBuffer( BitmapAccessMode::Read );
if( pAlphaBuffer != nullptr )
{
int nMaskFormat = pAlphaBuffer->mnFormat;
- const_cast<SalBitmap&>(rMaskBitmap).ReleaseBuffer( pAlphaBuffer, BITMAP_READ_ACCESS );
+ const_cast<SalBitmap&>(rMaskBitmap).ReleaseBuffer( pAlphaBuffer, BitmapAccessMode::Read );
if( nMaskFormat == BMP_FORMAT_8BIT_PAL )
drawAlphaBitmap( rPosAry, rSrcBitmap, rMaskBitmap );
}
@@ -857,7 +857,7 @@ bool X11SalGraphicsImpl::drawAlphaBitmap( const SalTwoRect& rTR,
// TODO: use SalX11Bitmap functionality and caching for the Alpha Pixmap
// problem is that they don't provide an 8bit Pixmap on a non-8bit display
- BitmapBuffer* pAlphaBuffer = const_cast<SalBitmap&>(rAlphaBmp).AcquireBuffer( BITMAP_READ_ACCESS );
+ BitmapBuffer* pAlphaBuffer = const_cast<SalBitmap&>(rAlphaBmp).AcquireBuffer( BitmapAccessMode::Read );
// an XImage needs its data top_down
// TODO: avoid wrongly oriented images in upper layers!
@@ -902,7 +902,7 @@ bool X11SalGraphicsImpl::drawAlphaBitmap( const SalTwoRect& rTR,
if( pAlphaBits != reinterpret_cast<char*>(pAlphaBuffer->mpBits) )
delete[] pAlphaBits;
- const_cast<SalBitmap&>(rAlphaBmp).ReleaseBuffer( pAlphaBuffer, BITMAP_READ_ACCESS );
+ const_cast<SalBitmap&>(rAlphaBmp).ReleaseBuffer( pAlphaBuffer, BitmapAccessMode::Read );
XRenderPictureAttributes aAttr;
aAttr.repeat = int(true);
diff --git a/vcl/unx/generic/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx
index dd01c4b7a348..c16be93ccf18 100644
--- a/vcl/unx/generic/gdi/salbmp.cxx
+++ b/vcl/unx/generic/gdi/salbmp.cxx
@@ -868,7 +868,7 @@ BitmapBuffer* X11SalBitmap::AcquireBuffer( BitmapAccessMode /*nMode*/ )
void X11SalBitmap::ReleaseBuffer( BitmapBuffer*, BitmapAccessMode nMode )
{
- if( nMode == BITMAP_WRITE_ACCESS )
+ if( nMode == BitmapAccessMode::Write )
{
if( mpDDB )
{
diff --git a/vcl/unx/generic/print/genpspgraphics.cxx b/vcl/unx/generic/print/genpspgraphics.cxx
index 41cf16ee8409..dc3b80a4f414 100644
--- a/vcl/unx/generic/print/genpspgraphics.cxx
+++ b/vcl/unx/generic/print/genpspgraphics.cxx
@@ -504,12 +504,12 @@ void GenPspGraphics::drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rSa
Rectangle aDst (Point(rPosAry.mnDestX, rPosAry.mnDestY),
Size(rPosAry.mnDestWidth, rPosAry.mnDestHeight));
- BitmapBuffer* pBuffer= const_cast<SalBitmap&>(rSalBitmap).AcquireBuffer(BITMAP_READ_ACCESS);
+ BitmapBuffer* pBuffer= const_cast<SalBitmap&>(rSalBitmap).AcquireBuffer(BitmapAccessMode::Read);
SalPrinterBmp aBmp (pBuffer);
m_pPrinterGfx->DrawBitmap (aDst, aSrc, aBmp);
- const_cast<SalBitmap&>(rSalBitmap).ReleaseBuffer (pBuffer, BITMAP_READ_ACCESS);
+ const_cast<SalBitmap&>(rSalBitmap).ReleaseBuffer (pBuffer, BitmapAccessMode::Read);
}
void GenPspGraphics::drawBitmap( const SalTwoRect&,
diff --git a/vcl/win/gdi/gdiimpl.cxx b/vcl/win/gdi/gdiimpl.cxx
index 8a43898c95b6..915cd9351521 100644
--- a/vcl/win/gdi/gdiimpl.cxx
+++ b/vcl/win/gdi/gdiimpl.cxx
@@ -627,7 +627,7 @@ void ImplDrawBitmap( HDC hDC, const SalTwoRect& rPosAry, const WinSalBitmap& rSa
COLORREF nTextColor = RGB( 0x00, 0x00, 0x00 );
//fdo#33455 handle 1 bit depth pngs with palette entries
//to set fore/back colors
- if (BitmapBuffer* pBitmapBuffer = const_cast<WinSalBitmap&>(rSalBitmap).AcquireBuffer(BITMAP_INFO_ACCESS))
+ if (BitmapBuffer* pBitmapBuffer = const_cast<WinSalBitmap&>(rSalBitmap).AcquireBuffer(BitmapAccessMode::Info))
{
const BitmapPalette& rPalette = pBitmapBuffer->maPalette;
if (rPalette.GetEntryCount() == 2)
@@ -638,7 +638,7 @@ void ImplDrawBitmap( HDC hDC, const SalTwoRect& rPosAry, const WinSalBitmap& rSa
nCol = ImplColorToSal(rPalette[1]);
nBkColor = RGB( SALCOLOR_RED(nCol), SALCOLOR_GREEN(nCol), SALCOLOR_BLUE(nCol) );
}
- const_cast<WinSalBitmap&>(rSalBitmap).ReleaseBuffer(pBitmapBuffer, BITMAP_INFO_ACCESS);
+ const_cast<WinSalBitmap&>(rSalBitmap).ReleaseBuffer(pBitmapBuffer, BitmapAccessMode::Info);
}
nOldBkColor = SetBkColor( hDC, nBkColor );
nOldTextColor = ::SetTextColor( hDC, nTextColor );
diff --git a/vcl/win/gdi/salbmp.cxx b/vcl/win/gdi/salbmp.cxx
index c5b2a74eef46..720c5e1bab5f 100644
--- a/vcl/win/gdi/salbmp.cxx
+++ b/vcl/win/gdi/salbmp.cxx
@@ -270,7 +270,7 @@ Gdiplus::Bitmap* WinSalBitmap::ImplCreateGdiPlusBitmap()
pSalRGB = pExtraWinSalRGB;
}
- BitmapBuffer* pRGB = pSalRGB->AcquireBuffer(BITMAP_READ_ACCESS);
+ BitmapBuffer* pRGB = pSalRGB->AcquireBuffer(BitmapAccessMode::Read);
BitmapBuffer* pExtraRGB = 0;
if(pRGB && BMP_FORMAT_24BIT_TC_BGR != (pRGB->mnFormat & ~BMP_FORMAT_TOP_DOWN))
@@ -283,7 +283,7 @@ Gdiplus::Bitmap* WinSalBitmap::ImplCreateGdiPlusBitmap()
BMP_FORMAT_24BIT_TC_BGR,
0);
- pSalRGB->ReleaseBuffer(pRGB, BITMAP_WRITE_ACCESS);
+ pSalRGB->ReleaseBuffer(pRGB, BitmapAccessMode::Write);
pRGB = pExtraRGB;
}
@@ -334,7 +334,7 @@ Gdiplus::Bitmap* WinSalBitmap::ImplCreateGdiPlusBitmap()
}
else
{
- pSalRGB->ReleaseBuffer(pRGB, BITMAP_READ_ACCESS);
+ pSalRGB->ReleaseBuffer(pRGB, BitmapAccessMode::Read);
}
if(pExtraWinSalRGB)
@@ -359,7 +359,7 @@ Gdiplus::Bitmap* WinSalBitmap::ImplCreateGdiPlusBitmap(const WinSalBitmap& rAlph
pSalRGB = pExtraWinSalRGB;
}
- BitmapBuffer* pRGB = pSalRGB->AcquireBuffer(BITMAP_READ_ACCESS);
+ BitmapBuffer* pRGB = pSalRGB->AcquireBuffer(BitmapAccessMode::Read);
BitmapBuffer* pExtraRGB = 0;
if(pRGB && BMP_FORMAT_24BIT_TC_BGR != (pRGB->mnFormat & ~BMP_FORMAT_TOP_DOWN))
@@ -372,7 +372,7 @@ Gdiplus::Bitmap* WinSalBitmap::ImplCreateGdiPlusBitmap(const WinSalBitmap& rAlph
BMP_FORMAT_24BIT_TC_BGR,
0);
- pSalRGB->ReleaseBuffer(pRGB, BITMAP_READ_ACCESS);
+ pSalRGB->ReleaseBuffer(pRGB, BitmapAccessMode::Read);
pRGB = pExtraRGB;
}
@@ -387,7 +387,7 @@ Gdiplus::Bitmap* WinSalBitmap::ImplCreateGdiPlusBitmap(const WinSalBitmap& rAlph
pSalA = pExtraWinSalA;
}
- BitmapBuffer* pA = pSalA->AcquireBuffer(BITMAP_READ_ACCESS);
+ BitmapBuffer* pA = pSalA->AcquireBuffer(BitmapAccessMode::Read);
BitmapBuffer* pExtraA = 0;
if(pA && BMP_FORMAT_8BIT_PAL != (pA->mnFormat & ~BMP_FORMAT_TOP_DOWN))
@@ -402,7 +402,7 @@ Gdiplus::Bitmap* WinSalBitmap::ImplCreateGdiPlusBitmap(const WinSalBitmap& rAlph
BMP_FORMAT_8BIT_PAL,
&rTargetPalette);
- pSalA->ReleaseBuffer(pA, BITMAP_READ_ACCESS);
+ pSalA->ReleaseBuffer(pA, BitmapAccessMode::Read);
pA = pExtraA;
}
@@ -469,7 +469,7 @@ Gdiplus::Bitmap* WinSalBitmap::ImplCreateGdiPlusBitmap(const WinSalBitmap& rAlph
}
else
{
- pSalA->ReleaseBuffer(pA, BITMAP_READ_ACCESS);
+ pSalA->ReleaseBuffer(pA, BitmapAccessMode::Read);
}
if(pExtraWinSalA)
@@ -486,7 +486,7 @@ Gdiplus::Bitmap* WinSalBitmap::ImplCreateGdiPlusBitmap(const WinSalBitmap& rAlph
}
else
{
- pSalRGB->ReleaseBuffer(pRGB, BITMAP_READ_ACCESS);
+ pSalRGB->ReleaseBuffer(pRGB, BitmapAccessMode::Read);
}
if(pExtraWinSalRGB)
@@ -952,7 +952,7 @@ void WinSalBitmap::ReleaseBuffer( BitmapBuffer* pBuffer, BitmapAccessMode nMode
{
if( mhDIB )
{
- if( nMode == BITMAP_WRITE_ACCESS && !!pBuffer->maPalette )
+ if( nMode == BitmapAccessMode::Write && !!pBuffer->maPalette )
{
PBITMAPINFO pBI = (PBITMAPINFO) GlobalLock( mhDIB );
const sal_uInt16 nCount = pBuffer->maPalette.GetEntryCount();
diff --git a/vcl/win/gdi/salgdi2.cxx b/vcl/win/gdi/salgdi2.cxx
index ae7373160b6a..2104bdb7469f 100644
--- a/vcl/win/gdi/salgdi2.cxx
+++ b/vcl/win/gdi/salgdi2.cxx
@@ -81,10 +81,10 @@ void convertToWinSalBitmap(SalBitmap& rSalBitmap, WinSalBitmap& rWinSalBitmap)
aBitmapPalette = pGLSalBitmap->GetBitmapPalette();
}
- BitmapBuffer* pRead = rSalBitmap.AcquireBuffer(BITMAP_READ_ACCESS);
+ BitmapBuffer* pRead = rSalBitmap.AcquireBuffer(BitmapAccessMode::Read);
rWinSalBitmap.Create(rSalBitmap.GetSize(), rSalBitmap.GetBitCount(), aBitmapPalette);
- BitmapBuffer* pWrite = rWinSalBitmap.AcquireBuffer(BITMAP_WRITE_ACCESS);
+ BitmapBuffer* pWrite = rWinSalBitmap.AcquireBuffer(BitmapAccessMode::Write);
sal_uInt8* pSource(pRead->mpBits);
sal_uInt8* pDestination(pWrite->mpBits);
@@ -95,9 +95,9 @@ void convertToWinSalBitmap(SalBitmap& rSalBitmap, WinSalBitmap& rWinSalBitmap)
pSource += pRead->mnScanlineSize;
pDestination += pWrite->mnScanlineSize;
}
- rWinSalBitmap.ReleaseBuffer(pWrite, BITMAP_WRITE_ACCESS);
+ rWinSalBitmap.ReleaseBuffer(pWrite, BitmapAccessMode::Write);
- rSalBitmap.ReleaseBuffer(pRead, BITMAP_READ_ACCESS);
+ rSalBitmap.ReleaseBuffer(pRead, BitmapAccessMode::Read);
}
} // end anonymous namespace
generated by cgit (git 2.34.1) at 2025-02-13 05:44:17 +0000