[Libreoffice-commits] core.git: vcl/opengl vcl/quartz
Markus Mohrhard
markus.mohrhard at collabora.co.uk
Sun Nov 9 23:18:48 PST 2014
vcl/opengl/salbmp.cxx | 4 ++++
vcl/quartz/salbmp.cxx | 4 ++++
2 files changed, 8 insertions(+)
New commits:
commit 027041a003fd3821e9b530c1f6a2b42d18a8752c
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date: Mon Nov 10 08:17:51 2014 +0100
put these classes into an anonymous namespace
Change-Id: I29a30fcc8adab34fbe05a927d438c4e34d5c517b
diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index abe62e3..d54ace7 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -215,6 +215,8 @@ bool OpenGLSalBitmap::AllocateUserData()
return maUserBuffer.get() != 0;
}
+namespace {
+
class ImplPixelFormat
{
protected:
@@ -306,6 +308,8 @@ ImplPixelFormat* ImplPixelFormat::GetFormat( sal_uInt16 nBits, const BitmapPalet
return 0;
}
+}
+
Size OpenGLSalBitmap::GetSize() const
{
std::deque< OpenGLSalBitmapOp* >::const_iterator it = maPendingOps.begin();
diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx
index c4cf2b0..0e64aa7 100644
--- a/vcl/quartz/salbmp.cxx
+++ b/vcl/quartz/salbmp.cxx
@@ -330,6 +330,8 @@ bool QuartzSalBitmap::AllocateUserData()
return maUserBuffer.get() != 0;
}
+namespace {
+
class ImplPixelFormat
{
protected:
@@ -536,6 +538,8 @@ ImplPixelFormat* ImplPixelFormat::GetFormat( sal_uInt16 nBits, const BitmapPalet
return 0;
}
+}
+
void QuartzSalBitmap::ConvertBitmapData( sal_uInt32 nWidth, sal_uInt32 nHeight,
sal_uInt16 nDestBits, sal_uInt32 nDestBytesPerRow, const BitmapPalette& rDestPalette, sal_uInt8* pDestData,
sal_uInt16 nSrcBits, sal_uInt32 nSrcBytesPerRow, const BitmapPalette& rSrcPalette, sal_uInt8* pSrcData )
More information about the Libreoffice-commits
mailing list