summaryrefslogtreecommitdiff
path: root/vcl/source/gdi
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/source/gdi')
-rw-r--r--vcl/source/gdi/bmpfast.cxx16
-rw-r--r--vcl/source/gdi/impvect.cxx16
-rw-r--r--vcl/source/gdi/pdfwriter_impl.cxx2
-rw-r--r--vcl/source/gdi/pdfwriter_impl2.cxx8
-rw-r--r--vcl/source/gdi/region.cxx2
-rw-r--r--vcl/source/gdi/sallayout.cxx2
-rw-r--r--vcl/source/gdi/svmconverter.cxx16
-rw-r--r--vcl/source/gdi/vectorgraphicdata.cxx2
8 files changed, 34 insertions, 30 deletions
diff --git a/vcl/source/gdi/bmpfast.cxx b/vcl/source/gdi/bmpfast.cxx
index ebc181e42d07..76f083663ba0 100644
--- a/vcl/source/gdi/bmpfast.cxx
+++ b/vcl/source/gdi/bmpfast.cxx
@@ -232,7 +232,7 @@ class TrueColorPixelPtr<ScanlineFormat::N8BitPal>
// converting truecolor formats
template <ScanlineFormat SRCFMT, ScanlineFormat DSTFMT>
-inline void ImplConvertPixel( const TrueColorPixelPtr<DSTFMT>& rDst,
+static inline void ImplConvertPixel( const TrueColorPixelPtr<DSTFMT>& rDst,
const TrueColorPixelPtr<SRCFMT>& rSrc )
{
rDst.SetColor( rSrc.GetRed(), rSrc.GetGreen(), rSrc.GetBlue() );
@@ -252,7 +252,7 @@ inline void ImplConvertPixel<ScanlineFormat::N16BitTcLsbMask, ScanlineFormat::N1
}
template <ScanlineFormat SRCFMT, ScanlineFormat DSTFMT>
-inline void ImplConvertLine( const TrueColorPixelPtr<DSTFMT>& rDst,
+static inline void ImplConvertLine( const TrueColorPixelPtr<DSTFMT>& rDst,
const TrueColorPixelPtr<SRCFMT>& rSrc, int nPixelCount )
{
TrueColorPixelPtr<DSTFMT> aDst( rDst );
@@ -267,7 +267,7 @@ inline void ImplConvertLine( const TrueColorPixelPtr<DSTFMT>& rDst,
// alpha blending truecolor pixels
template <ScanlineFormat SRCFMT, ScanlineFormat DSTFMT>
-inline void ImplBlendPixels( const TrueColorPixelPtr<DSTFMT>& rDst,
+static inline void ImplBlendPixels( const TrueColorPixelPtr<DSTFMT>& rDst,
const TrueColorPixelPtr<SRCFMT>& rSrc, unsigned nAlphaVal )
{
static const unsigned nAlphaShift = 8;
@@ -294,7 +294,7 @@ inline void ImplBlendPixels( const TrueColorPixelPtr<DSTFMT>& rDst,
}
template <ScanlineFormat MASKFMT, ScanlineFormat SRCFMT, ScanlineFormat DSTFMT>
-inline void ImplBlendLines( const TrueColorPixelPtr<DSTFMT>& rDst,
+static inline void ImplBlendLines( const TrueColorPixelPtr<DSTFMT>& rDst,
const TrueColorPixelPtr<SRCFMT>& rSrc, const TrueColorPixelPtr<MASKFMT>& rMsk,
int nPixelCount )
{
@@ -345,7 +345,7 @@ static bool ImplCopyImage( BitmapBuffer& rDstBuffer, const BitmapBuffer& rSrcBuf
}
template <ScanlineFormat DSTFMT,ScanlineFormat SRCFMT>
-bool ImplConvertToBitmap( TrueColorPixelPtr<SRCFMT>& rSrcLine,
+static bool ImplConvertToBitmap( TrueColorPixelPtr<SRCFMT>& rSrcLine,
BitmapBuffer& rDstBuffer, const BitmapBuffer& rSrcBuffer )
{
// help the compiler to avoid instantiations of unneeded conversions
@@ -376,7 +376,7 @@ bool ImplConvertToBitmap( TrueColorPixelPtr<SRCFMT>& rSrcLine,
}
template <ScanlineFormat SRCFMT>
-inline bool ImplConvertFromBitmap( BitmapBuffer& rDst, const BitmapBuffer& rSrc )
+static inline bool ImplConvertFromBitmap( BitmapBuffer& rDst, const BitmapBuffer& rSrc )
{
TrueColorPixelPtr<SRCFMT> aSrcType; aSrcType.SetRawPtr( rSrc.mpBits );
@@ -536,7 +536,7 @@ bool ImplFastBitmapConversion( BitmapBuffer& rDst, const BitmapBuffer& rSrc,
}
template <ScanlineFormat DSTFMT, ScanlineFormat SRCFMT> //,sal_uLong MSKFMT>
-bool ImplBlendToBitmap( TrueColorPixelPtr<SRCFMT>& rSrcLine,
+static bool ImplBlendToBitmap( TrueColorPixelPtr<SRCFMT>& rSrcLine,
BitmapBuffer& rDstBuffer, const BitmapBuffer& rSrcBuffer,
const BitmapBuffer& rMskBuffer )
{
@@ -611,7 +611,7 @@ inline bool ImplBlendToBitmap<ScanlineFormat::N32BitTcBgra,ScanlineFormat::N32Bi
}
template <ScanlineFormat SRCFMT>
-bool ImplBlendFromBitmap( BitmapBuffer& rDst, const BitmapBuffer& rSrc, const BitmapBuffer& rMsk )
+static bool ImplBlendFromBitmap( BitmapBuffer& rDst, const BitmapBuffer& rSrc, const BitmapBuffer& rMsk )
{
TrueColorPixelPtr<SRCFMT> aSrcType; aSrcType.SetRawPtr( rSrc.mpBits );
diff --git a/vcl/source/gdi/impvect.cxx b/vcl/source/gdi/impvect.cxx
index 8c779743c5a0..e785aae0aeb7 100644
--- a/vcl/source/gdi/impvect.cxx
+++ b/vcl/source/gdi/impvect.cxx
@@ -53,11 +53,11 @@ class ImplChain;
namespace ImplVectorizer
{
- ImplVectMap* ImplExpand( BitmapReadAccess* pRAcc, const Color& rColor );
- void ImplCalculate( ImplVectMap* pMap, tools::PolyPolygon& rPolyPoly, sal_uInt8 cReduce );
- bool ImplGetChain( ImplVectMap* pMap, const Point& rStartPt, ImplChain& rChain );
- bool ImplIsUp( ImplVectMap const * pMap, long nY, long nX );
- void ImplLimitPolyPoly( tools::PolyPolygon& rPolyPoly );
+ static ImplVectMap* ImplExpand( BitmapReadAccess* pRAcc, const Color& rColor );
+ static void ImplCalculate( ImplVectMap* pMap, tools::PolyPolygon& rPolyPoly, sal_uInt8 cReduce );
+ static bool ImplGetChain( ImplVectMap* pMap, const Point& rStartPt, ImplChain& rChain );
+ static bool ImplIsUp( ImplVectMap const * pMap, long nY, long nX );
+ static void ImplLimitPolyPoly( tools::PolyPolygon& rPolyPoly );
}
struct ChainMove { long nDX; long nDY; };
@@ -102,7 +102,9 @@ struct ImplColorSet
bool mbSet = false;
};
-extern "C" int ImplColorSetCmpFnc( const void* p1, const void* p2 )
+extern "C" {
+
+static int ImplColorSetCmpFnc( const void* p1, const void* p2 )
{
ImplColorSet const * pSet1 = static_cast<ImplColorSet const *>(p1);
ImplColorSet const * pSet2 = static_cast<ImplColorSet const *>(p2);
@@ -124,6 +126,8 @@ extern "C" int ImplColorSetCmpFnc( const void* p1, const void* p2 )
return nRet;
}
+}
+
class ImplPointArray
{
std::unique_ptr<Point[]> mpArray;
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 562927d505b0..1a3e67d366d7 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -1340,7 +1340,7 @@ bool PDFWriterImpl::PDFPage::emit(sal_Int32 nParentObject )
namespace vcl
{
template < class GEOMETRY >
-GEOMETRY lcl_convert( const MapMode& _rSource, const MapMode& _rDest, OutputDevice* _pPixelConversion, const GEOMETRY& _rObject )
+static GEOMETRY lcl_convert( const MapMode& _rSource, const MapMode& _rDest, OutputDevice* _pPixelConversion, const GEOMETRY& _rObject )
{
GEOMETRY aPoint;
if ( MapUnit::MapPixel == _rSource.GetMapUnit() )
diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx
index 5ad75f843302..e87f2acfbd0d 100644
--- a/vcl/source/gdi/pdfwriter_impl2.cxx
+++ b/vcl/source/gdi/pdfwriter_impl2.cxx
@@ -1561,12 +1561,12 @@ static const long setRun[256] =
4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 7, 8, /* 0xf0 - 0xff */
};
-inline bool isSet( const Scanline i_pLine, long i_nIndex )
+static inline bool isSet( const Scanline i_pLine, long i_nIndex )
{
return (i_pLine[ i_nIndex/8 ] & (0x80 >> (i_nIndex&7))) != 0;
}
-long findBitRunImpl( const Scanline i_pLine, long i_nStartIndex, long i_nW, bool i_bSet )
+static long findBitRunImpl( const Scanline i_pLine, long i_nStartIndex, long i_nW, bool i_bSet )
{
long nIndex = i_nStartIndex;
if( nIndex < i_nW )
@@ -1629,7 +1629,7 @@ long findBitRunImpl( const Scanline i_pLine, long i_nStartIndex, long i_nW, bool
return std::min(nIndex, i_nW);
}
-long findBitRun(const Scanline i_pLine, long i_nStartIndex, long i_nW, bool i_bSet)
+static long findBitRun(const Scanline i_pLine, long i_nStartIndex, long i_nW, bool i_bSet)
{
if (i_nStartIndex < 0)
return i_nW;
@@ -1637,7 +1637,7 @@ long findBitRun(const Scanline i_pLine, long i_nStartIndex, long i_nW, bool i_bS
return findBitRunImpl(i_pLine, i_nStartIndex, i_nW, i_bSet);
}
-long findBitRun(const Scanline i_pLine, long i_nStartIndex, long i_nW)
+static long findBitRun(const Scanline i_pLine, long i_nStartIndex, long i_nW)
{
if (i_nStartIndex < 0)
return i_nW;
diff --git a/vcl/source/gdi/region.cxx b/vcl/source/gdi/region.cxx
index abfc5ad55357..5af7829b0e03 100644
--- a/vcl/source/gdi/region.cxx
+++ b/vcl/source/gdi/region.cxx
@@ -234,7 +234,7 @@ bool vcl::Region::IsEmpty() const
}
-std::unique_ptr<RegionBand> ImplCreateRegionBandFromPolyPolygon(const tools::PolyPolygon& rPolyPolygon)
+static std::unique_ptr<RegionBand> ImplCreateRegionBandFromPolyPolygon(const tools::PolyPolygon& rPolyPolygon)
{
std::unique_ptr<RegionBand> pRetval;
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index b9cc988fdbbb..e2fd9aeb88a3 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -210,7 +210,7 @@ sal_UCS4 GetLocalizedChar( sal_UCS4 nChar, LanguageType eLang )
return nChar;
}
-inline bool IsControlChar( sal_UCS4 cChar )
+static inline bool IsControlChar( sal_UCS4 cChar )
{
// C0 control characters
if( (0x0001 <= cChar) && (cChar <= 0x001F) )
diff --git a/vcl/source/gdi/svmconverter.cxx b/vcl/source/gdi/svmconverter.cxx
index 8393c482e41d..b00fdfdce81b 100644
--- a/vcl/source/gdi/svmconverter.cxx
+++ b/vcl/source/gdi/svmconverter.cxx
@@ -37,7 +37,7 @@
#include <o3tl/make_unique.hxx>
// Inlines
-void ImplReadRect( SvStream& rIStm, tools::Rectangle& rRect )
+static void ImplReadRect( SvStream& rIStm, tools::Rectangle& rRect )
{
Point aTL;
Point aBR;
@@ -48,7 +48,7 @@ void ImplReadRect( SvStream& rIStm, tools::Rectangle& rRect )
rRect = tools::Rectangle( aTL, aBR );
}
-bool ImplReadPoly(SvStream& rIStm, tools::Polygon& rPoly)
+static bool ImplReadPoly(SvStream& rIStm, tools::Polygon& rPoly)
{
sal_Int32 nSize32(0);
rIStm.ReadInt32(nSize32);
@@ -69,7 +69,7 @@ bool ImplReadPoly(SvStream& rIStm, tools::Polygon& rPoly)
return rIStm.good();
}
-bool ImplReadPolyPoly(SvStream& rIStm, tools::PolyPolygon& rPolyPoly)
+static bool ImplReadPolyPoly(SvStream& rIStm, tools::PolyPolygon& rPolyPoly)
{
bool bSuccess = true;
@@ -91,7 +91,7 @@ bool ImplReadPolyPoly(SvStream& rIStm, tools::PolyPolygon& rPolyPoly)
return bSuccess && rIStm.good();
}
-void ImplReadColor( SvStream& rIStm, Color& rColor )
+static void ImplReadColor( SvStream& rIStm, Color& rColor )
{
sal_Int16 nVal(0);
@@ -100,7 +100,7 @@ void ImplReadColor( SvStream& rIStm, Color& rColor )
rIStm.ReadInt16( nVal ); rColor.SetBlue( sal::static_int_cast<sal_uInt8>(static_cast<sal_uInt16>(nVal) >> 8) );
}
-bool ImplReadMapMode(SvStream& rIStm, MapMode& rMapMode)
+static bool ImplReadMapMode(SvStream& rIStm, MapMode& rMapMode)
{
sal_Int16 nUnit(0);
rIStm.ReadInt16(nUnit);
@@ -128,7 +128,7 @@ bool ImplReadMapMode(SvStream& rIStm, MapMode& rMapMode)
return true;
}
-void ImplReadUnicodeComment( sal_uInt32 nStrmPos, SvStream& rIStm, OUString& rString )
+static void ImplReadUnicodeComment( sal_uInt32 nStrmPos, SvStream& rIStm, OUString& rString )
{
sal_uInt32 nOld = rIStm.Tell();
if ( nStrmPos )
@@ -149,7 +149,7 @@ void ImplReadUnicodeComment( sal_uInt32 nStrmPos, SvStream& rIStm, OUString& rSt
rIStm.Seek( nOld );
}
-void ImplSkipActions(SvStream& rIStm, sal_uLong nSkipCount)
+static void ImplSkipActions(SvStream& rIStm, sal_uLong nSkipCount)
{
sal_Int32 nActionSize;
sal_Int16 nType;
@@ -162,7 +162,7 @@ void ImplSkipActions(SvStream& rIStm, sal_uLong nSkipCount)
}
}
-void ImplReadExtendedPolyPolygonAction(SvStream& rIStm, tools::PolyPolygon& rPolyPoly)
+static void ImplReadExtendedPolyPolygonAction(SvStream& rIStm, tools::PolyPolygon& rPolyPoly)
{
rPolyPoly.Clear();
sal_uInt16 nPolygonCount(0);
diff --git a/vcl/source/gdi/vectorgraphicdata.cxx b/vcl/source/gdi/vectorgraphicdata.cxx
index 662c2505553d..08aebe0a1b3d 100644
--- a/vcl/source/gdi/vectorgraphicdata.cxx
+++ b/vcl/source/gdi/vectorgraphicdata.cxx
@@ -90,7 +90,7 @@ BitmapEx convertPrimitive2DSequenceToBitmapEx(
return aRetval;
}
-size_t estimateSize(
+static size_t estimateSize(
std::deque<uno::Reference<graphic::XPrimitive2D>> const& rSequence)
{
size_t nRet(0);
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-21 16:47:16 +0000