summaryrefslogtreecommitdiff
path: root/vcl/source/gdi
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/source/gdi')
-rw-r--r--vcl/source/gdi/bitmap3.cxx8
-rw-r--r--vcl/source/gdi/gdimtf.cxx12
-rw-r--r--vcl/source/gdi/impvect.cxx4
-rw-r--r--vcl/source/gdi/impvect.hxx2
-rw-r--r--vcl/source/gdi/metaact.cxx6
-rw-r--r--vcl/source/gdi/print.cxx2
-rw-r--r--vcl/source/gdi/sallayout.cxx2
-rw-r--r--vcl/source/gdi/salmisc.cxx8
-rw-r--r--vcl/source/gdi/svmconverter.cxx6
-rw-r--r--vcl/source/gdi/textlayout.cxx2
10 files changed, 26 insertions, 26 deletions
diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx
index 78ac64e7961f..3b0b1cd76bfb 100644
--- a/vcl/source/gdi/bitmap3.cxx
+++ b/vcl/source/gdi/bitmap3.cxx
@@ -591,7 +591,7 @@ bool Bitmap::ImplConvertDown(sal_uInt16 nBitCount, Color const * pExtColor)
pWriteAcc->SetPalette(aPalette);
- for (tools::Long nY = 0; nY < std::min(nHeight, 2L); nY++, nYTmp++)
+ for (tools::Long nY = 0; nY < std::min(nHeight, tools::Long(2)); nY++, nYTmp++)
{
pQLine2 = !nY ? aErrQuad1.data() : aErrQuad2.data();
Scanline pScanlineRead = pReadAcc->GetScanline(nYTmp);
@@ -872,8 +872,8 @@ bool Bitmap::Dither()
tools::Long nW2 = nW - 3;
tools::Long nRErr, nGErr, nBErr;
tools::Long nRC, nGC, nBC;
- std::unique_ptr<long[]> p1(new long[ nW ]);
- std::unique_ptr<long[]> p2(new long[ nW ]);
+ std::unique_ptr<tools::Long[]> p1(new tools::Long[ nW ]);
+ std::unique_ptr<tools::Long[]> p2(new tools::Long[ nW ]);
tools::Long* p1T = p1.get();
tools::Long* p2T = p2.get();
tools::Long* pTmp;
@@ -991,7 +991,7 @@ bool Bitmap::Dither()
return bRet;
}
-void Bitmap::Vectorize( GDIMetaFile& rMtf, sal_uInt8 cReduce, const Link<long,void>* pProgress )
+void Bitmap::Vectorize( GDIMetaFile& rMtf, sal_uInt8 cReduce, const Link<tools::Long,void>* pProgress )
{
ImplVectorizer::ImplVectorize( *this, rMtf, cReduce, pProgress );
}
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index 40c1d7aba529..5fdcac0b3255 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -2181,16 +2181,16 @@ void GDIMetaFile::ReplaceColors( const Color* pSearchColors, const Color* pRepla
tools::Long nVal;
nVal = pSearchColors[ i ].GetRed();
- aColParam.pMinR[ i ] = static_cast<sal_uLong>(std::max( nVal, 0L ));
- aColParam.pMaxR[ i ] = static_cast<sal_uLong>(std::min( nVal, 255L ));
+ aColParam.pMinR[ i ] = static_cast<sal_uLong>(std::max( nVal, tools::Long(0) ));
+ aColParam.pMaxR[ i ] = static_cast<sal_uLong>(std::min( nVal, tools::Long(255) ));
nVal = pSearchColors[ i ].GetGreen();
- aColParam.pMinG[ i ] = static_cast<sal_uLong>(std::max( nVal, 0L ));
- aColParam.pMaxG[ i ] = static_cast<sal_uLong>(std::min( nVal, 255L ));
+ aColParam.pMinG[ i ] = static_cast<sal_uLong>(std::max( nVal, tools::Long(0) ));
+ aColParam.pMaxG[ i ] = static_cast<sal_uLong>(std::min( nVal, tools::Long(255) ));
nVal = pSearchColors[ i ].GetBlue();
- aColParam.pMinB[ i ] = static_cast<sal_uLong>(std::max( nVal, 0L ));
- aColParam.pMaxB[ i ] = static_cast<sal_uLong>(std::min( nVal, 255L ));
+ aColParam.pMinB[ i ] = static_cast<sal_uLong>(std::max( nVal, tools::Long(0) ));
+ aColParam.pMaxB[ i ] = static_cast<sal_uLong>(std::min( nVal, tools::Long(255) ));
}
aColParam.pDstCols = pReplaceColors;
diff --git a/vcl/source/gdi/impvect.cxx b/vcl/source/gdi/impvect.cxx
index 621a3592661a..f64d5c437c26 100644
--- a/vcl/source/gdi/impvect.cxx
+++ b/vcl/source/gdi/impvect.cxx
@@ -49,7 +49,7 @@ static constexpr tools::Long BACK_MAP( tools::Long _def_nVal )
{
return ((_def_nVal + 2) >> 2) - 1;
}
-static void VECT_PROGRESS( const Link<long, void>* pProgress, tools::Long _def_nVal )
+static void VECT_PROGRESS( const Link<tools::Long, void>* pProgress, tools::Long _def_nVal )
{
if(pProgress)
pProgress->Call(_def_nVal);
@@ -642,7 +642,7 @@ void ImplChain::ImplPostProcess( const ImplPointArray& rArr )
namespace ImplVectorizer {
bool ImplVectorize( const Bitmap& rColorBmp, GDIMetaFile& rMtf,
- sal_uInt8 cReduce, const Link<long,void>* pProgress )
+ sal_uInt8 cReduce, const Link<tools::Long,void>* pProgress )
{
bool bRet = false;
diff --git a/vcl/source/gdi/impvect.hxx b/vcl/source/gdi/impvect.hxx
index 017b2dc1a728..41f0884e9626 100644
--- a/vcl/source/gdi/impvect.hxx
+++ b/vcl/source/gdi/impvect.hxx
@@ -27,7 +27,7 @@ namespace tools { class PolyPolygon; }
namespace ImplVectorizer
{
bool ImplVectorize( const Bitmap& rColorBmp, GDIMetaFile& rMtf,
- sal_uInt8 cReduce, const Link<long,void>* pProgress );
+ sal_uInt8 cReduce, const Link<tools::Long,void>* pProgress );
};
#endif
diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index ac70349d4647..2a1bb8562438 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -1091,7 +1091,7 @@ MetaTextArrayAction::MetaTextArrayAction( const MetaTextArrayAction& rAction ) :
{
if( rAction.mpDXAry )
{
- mpDXAry.reset( new long[ mnLen ] );
+ mpDXAry.reset( new tools::Long[ mnLen ] );
memcpy( mpDXAry.get(), rAction.mpDXAry.get(), mnLen * sizeof( long ) );
}
}
@@ -1111,7 +1111,7 @@ MetaTextArrayAction::MetaTextArrayAction( const Point& rStartPt,
if (nAryLen > 0)
{
- mpDXAry.reset( new long[ nAryLen ] );
+ mpDXAry.reset( new tools::Long[ nAryLen ] );
memcpy( mpDXAry.get(), pDXAry, nAryLen * sizeof(long) );
}
}
@@ -1194,7 +1194,7 @@ void MetaTextArrayAction::Read( SvStream& rIStm, ImplMetaReadData* pData )
// #i9762#, #106172# Ensure that DX array is at least mnLen entries long
if ( mnLen >= nAryLen )
{
- mpDXAry.reset( new (std::nothrow)long[ mnLen ] );
+ mpDXAry.reset( new (std::nothrow)tools::Long[ mnLen ] );
if ( mpDXAry )
{
sal_Int32 i;
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index 16db9ad61bd4..756752275b51 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -240,7 +240,7 @@ void Printer::EmulateDrawTransparent ( const tools::PolyPolygon& rPolyPoly,
tools::Rectangle aPolyRect( LogicToPixel( rPolyPoly ).GetBoundRect() );
const Size aDPISize( LogicToPixel(Size(1, 1), MapMode(MapUnit::MapInch)) );
- const tools::Long nBaseExtent = std::max( FRound( aDPISize.Width() / 300. ), 1L );
+ const tools::Long nBaseExtent = std::max<tools::Long>( FRound( aDPISize.Width() / 300. ), 1 );
tools::Long nMove;
const sal_uInt16 nTrans = ( nTransparencePercent < 13 ) ? 0 :
( nTransparencePercent < 38 ) ? 25 :
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 16fa84ab95d5..7beea9a01091 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -1486,7 +1486,7 @@ void MultiSalLayout::GetCaretPositions( int nMaxIndex, tools::Long* pCaretXArray
if( mnLevel <= 1 )
return;
- std::unique_ptr<long[]> const pTempPos(new long[nMaxIndex]);
+ std::unique_ptr<tools::Long[]> const pTempPos(new tools::Long[nMaxIndex]);
for( int n = 1; n < mnLevel; ++n )
{
mpLayouts[ n ]->GetCaretPositions( nMaxIndex, pTempPos.get() );
diff --git a/vcl/source/gdi/salmisc.cxx b/vcl/source/gdi/salmisc.cxx
index aa9220b53136..a077e50be4d6 100644
--- a/vcl/source/gdi/salmisc.cxx
+++ b/vcl/source/gdi/salmisc.cxx
@@ -363,15 +363,15 @@ std::unique_ptr<BitmapBuffer> StretchAndConvert(
std::unique_ptr<Scanline[]> pSrcScan;
std::unique_ptr<Scanline[]> pDstScan;
- std::unique_ptr<long[]> pMapX;
- std::unique_ptr<long[]> pMapY;
+ std::unique_ptr<tools::Long[]> pMapX;
+ std::unique_ptr<tools::Long[]> pMapY;
try
{
pSrcScan.reset(new Scanline[rSrcBuffer.mnHeight]);
pDstScan.reset(new Scanline[pDstBuffer->mnHeight]);
- pMapX.reset(new long[pDstBuffer->mnWidth]);
- pMapY.reset(new long[pDstBuffer->mnHeight]);
+ pMapX.reset(new tools::Long[pDstBuffer->mnWidth]);
+ pMapY.reset(new tools::Long[pDstBuffer->mnHeight]);
}
catch( const std::bad_alloc& )
{
diff --git a/vcl/source/gdi/svmconverter.cxx b/vcl/source/gdi/svmconverter.cxx
index 2af54eabf368..6912654a6164 100644
--- a/vcl/source/gdi/svmconverter.cxx
+++ b/vcl/source/gdi/svmconverter.cxx
@@ -713,7 +713,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
OUString aStr(OStringToOUString(aByteStr, eActualCharSet));
- std::unique_ptr<long[]> pDXAry;
+ std::unique_ptr<tools::Long[]> pDXAry;
if (nAryLen > 0)
{
const size_t nMinRecordSize = sizeof(sal_Int32);
@@ -740,7 +740,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
}
else
{
- pDXAry.reset(new long[nDXAryLen]);
+ pDXAry.reset(new tools::Long[nDXAryLen]);
for (sal_Int32 j = 0; j < nAryLen; ++j)
{
@@ -753,7 +753,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
{
if (nAryLen+1 == nStrLen && nIndex >= 0)
{
- std::unique_ptr<long[]> pTmpAry(new long[nStrLen]);
+ std::unique_ptr<tools::Long[]> pTmpAry(new tools::Long[nStrLen]);
aFontVDev->GetTextArray( aStr, pTmpAry.get(), nIndex, nLen );
diff --git a/vcl/source/gdi/textlayout.cxx b/vcl/source/gdi/textlayout.cxx
index 988c5bfa578f..ea86aa47b049 100644
--- a/vcl/source/gdi/textlayout.cxx
+++ b/vcl/source/gdi/textlayout.cxx
@@ -207,7 +207,7 @@ namespace vcl
return;
}
- std::unique_ptr<long[]> pCharWidths(new long[ _nLength ]);
+ std::unique_ptr<tools::Long[]> pCharWidths(new tools::Long[ _nLength ]);
tools::Long nTextWidth = GetTextArray( _rText, pCharWidths.get(), _nStartIndex, _nLength );
m_rTargetDevice.DrawTextArray( _rStartPoint, _rText, pCharWidths.get(), _nStartIndex, _nLength );
pCharWidths.reset();
generated by cgit (git 2.34.1) at 2024-06-23 19:20:47 +0000