[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl2' - 2 commits - vcl/headless vcl/inc vcl/opengl vcl/quartz vcl/source vcl/unx vcl/win
Matúš Kukan
matus.kukan at collabora.com
Mon Nov 24 13:41:30 PST 2014
vcl/headless/svpbmp.cxx | 10 ++++++++++
vcl/inc/headless/svpbmp.hxx | 2 ++
vcl/inc/impbmp.hxx | 3 ++-
vcl/inc/opengl/salbmp.hxx | 2 ++
vcl/inc/quartz/salbmp.h | 2 ++
vcl/inc/salbmp.hxx | 3 +++
vcl/inc/unx/salbmp.h | 2 ++
vcl/inc/win/salbmp.h | 2 ++
vcl/opengl/salbmp.cxx | 10 ++++++++++
vcl/quartz/salbmp.cxx | 10 ++++++++++
vcl/source/gdi/impbmp.cxx | 10 ++++++++++
vcl/unx/generic/gdi/salbmp.cxx | 10 ++++++++++
vcl/win/source/gdi/salbmp.cxx | 10 ++++++++++
13 files changed, 75 insertions(+), 1 deletion(-)
New commits:
commit 566d46034fcaf22cf943cf6e1ab3d9be92a81400
Author: Matúš Kukan <matus.kukan at collabora.com>
Date: Mon Nov 24 22:18:56 2014 +0100
Add dummy Erase to SalBitmap implementations
Change-Id: I5790deb9ab5af6f8678c964af5321264d3bce733
diff --git a/vcl/headless/svpbmp.cxx b/vcl/headless/svpbmp.cxx
index d5a1e79..e4080da 100644
--- a/vcl/headless/svpbmp.cxx
+++ b/vcl/headless/svpbmp.cxx
@@ -344,6 +344,11 @@ bool SvpSalBitmap::Crop( const Rectangle& /*rRectPixel*/ )
return false;
}
+bool SvpSalBitmap::Erase( const ::Color& /*rFillColor*/ )
+{
+ return false;
+}
+
bool SvpSalBitmap::Scale( const double& /*rScaleX*/, const double& /*rScaleY*/, sal_uInt32 /*nScaleFlag*/ )
{
return false;
diff --git a/vcl/inc/headless/svpbmp.hxx b/vcl/inc/headless/svpbmp.hxx
index 0de0d78..eda1be4 100644
--- a/vcl/inc/headless/svpbmp.hxx
+++ b/vcl/inc/headless/svpbmp.hxx
@@ -59,6 +59,7 @@ public:
virtual bool GetSystemData( BitmapSystemData& rData ) SAL_OVERRIDE;
virtual bool Crop( const Rectangle& rRectPixel ) SAL_OVERRIDE;
+ virtual bool Erase( const Color& rFillColor ) SAL_OVERRIDE;
virtual bool Scale( const double& rScaleX, const double& rScaleY, sal_uInt32 nScaleFlag ) SAL_OVERRIDE;
static sal_uInt32 getBitCountFromScanlineFormat( basebmp::Format nFormat );
diff --git a/vcl/inc/impbmp.hxx b/vcl/inc/impbmp.hxx
index 8f373c5..3b2abea 100644
--- a/vcl/inc/impbmp.hxx
+++ b/vcl/inc/impbmp.hxx
@@ -69,6 +69,7 @@ public:
inline sal_uLong ImplGetChecksum() const { return mnChecksum; }
bool ImplCrop( const Rectangle& rRectPixel );
+ bool ImplErase( const Color& rFillColor );
bool ImplScale( const double& rScaleX, const double& rScaleY, sal_uInt32 nScaleFlag );
};
diff --git a/vcl/inc/opengl/salbmp.hxx b/vcl/inc/opengl/salbmp.hxx
index 20b0e61..449c1b6 100644
--- a/vcl/inc/opengl/salbmp.hxx
+++ b/vcl/inc/opengl/salbmp.hxx
@@ -79,6 +79,7 @@ public:
bool GetSystemData( BitmapSystemData& rData ) SAL_OVERRIDE;
bool Crop( const Rectangle& rRectPixel ) SAL_OVERRIDE;
+ bool Erase( const Color& rFillColor ) SAL_OVERRIDE;
bool Scale( const double& rScaleX, const double& rScaleY, sal_uInt32 nScaleFlag ) SAL_OVERRIDE;
public:
diff --git a/vcl/inc/quartz/salbmp.h b/vcl/inc/quartz/salbmp.h
index c98cf2f..9ece5a3 100644
--- a/vcl/inc/quartz/salbmp.h
+++ b/vcl/inc/quartz/salbmp.h
@@ -80,6 +80,7 @@ public:
bool GetSystemData( BitmapSystemData& rData ) SAL_OVERRIDE;
bool Crop( const Rectangle& rRectPixel ) SAL_OVERRIDE;
+ bool Erase( const Color& rFillColor ) SAL_OVERRIDE;
bool Scale( const double& rScaleX, const double& rScaleY, sal_uInt32 nScaleFlag ) SAL_OVERRIDE;
private:
diff --git a/vcl/inc/salbmp.hxx b/vcl/inc/salbmp.hxx
index 5eb977d..12e7954 100644
--- a/vcl/inc/salbmp.hxx
+++ b/vcl/inc/salbmp.hxx
@@ -26,6 +26,7 @@
#include <com/sun/star/rendering/XBitmapCanvas.hpp>
struct BitmapBuffer;
+class Color;
class SalGraphics;
class BitmapPalette;
struct BitmapSystemData;
@@ -56,6 +57,7 @@ public:
virtual bool GetSystemData( BitmapSystemData& rData ) = 0;
virtual bool Crop( const Rectangle& rRectPixel ) = 0;
+ virtual bool Erase( const Color& rFillColor ) = 0;
virtual bool Scale( const double& rScaleX, const double& rScaleY, sal_uInt32 nScaleFlag ) = 0;
};
diff --git a/vcl/inc/unx/salbmp.h b/vcl/inc/unx/salbmp.h
index 5975f66..56f3b85 100644
--- a/vcl/inc/unx/salbmp.h
+++ b/vcl/inc/unx/salbmp.h
@@ -147,6 +147,7 @@ public:
virtual bool GetSystemData( BitmapSystemData& rData ) SAL_OVERRIDE;
virtual bool Crop( const Rectangle& rRectPixel ) SAL_OVERRIDE;
+ virtual bool Erase( const Color& rFillColor ) SAL_OVERRIDE;
virtual bool Scale( const double& rScaleX, const double& rScaleY, sal_uInt32 nScaleFlag ) SAL_OVERRIDE;
};
diff --git a/vcl/inc/win/salbmp.h b/vcl/inc/win/salbmp.h
index b74ba73..7329449 100644
--- a/vcl/inc/win/salbmp.h
+++ b/vcl/inc/win/salbmp.h
@@ -98,6 +98,7 @@ public:
virtual bool GetSystemData( BitmapSystemData& rData );
virtual bool Crop( const Rectangle& rRectPixel ) SAL_OVERRIDE;
+ virtual bool Erase( const Color& rFillColor ) SAL_OVERRIDE;
virtual bool Scale( const double& rScaleX, const double& rScaleY, sal_uInt32 nScaleFlag );
};
diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index 7a1af0d..8cd7561 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -578,4 +578,9 @@ bool OpenGLSalBitmap::Crop( const Rectangle& /*rRectPixel*/ )
return false;
}
+bool OpenGLSalBitmap::Erase( const ::Color& /*rFillColor*/ )
+{
+ return false;
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx
index b75c08f..80ae37e 100644
--- a/vcl/quartz/salbmp.cxx
+++ b/vcl/quartz/salbmp.cxx
@@ -972,6 +972,11 @@ bool QuartzSalBitmap::Crop( const Rectangle& /*rRectPixel*/ )
return false;
}
+bool QuartzSalBitmap::Erase( const ::Color& /*rFillColor*/ )
+{
+ return false;
+}
+
bool QuartzSalBitmap::Scale( const double& /*rScaleX*/, const double& /*rScaleY*/, sal_uInt32 /*nScaleFlag*/ )
{
return false;
diff --git a/vcl/source/gdi/impbmp.cxx b/vcl/source/gdi/impbmp.cxx
index b402d5b..bcb5b75 100644
--- a/vcl/source/gdi/impbmp.cxx
+++ b/vcl/source/gdi/impbmp.cxx
@@ -98,6 +98,11 @@ bool ImpBitmap::ImplCrop( const Rectangle& rRectPixel )
return mpSalBitmap->Crop( rRectPixel );
}
+bool ImpBitmap::ImplErase( const ::Color& rFillColor )
+{
+ return mpSalBitmap->Erase( rFillColor );
+}
+
bool ImpBitmap::ImplScale( const double& rScaleX, const double& rScaleY, sal_uInt32 nScaleFlag )
{
return mpSalBitmap->Scale( rScaleX, rScaleY, nScaleFlag );
diff --git a/vcl/unx/generic/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx
index a245dc9..b8d9a7d 100644
--- a/vcl/unx/generic/gdi/salbmp.cxx
+++ b/vcl/unx/generic/gdi/salbmp.cxx
@@ -865,6 +865,11 @@ bool X11SalBitmap::Crop( const Rectangle& /*rRectPixel*/ )
return false;
}
+bool X11SalBitmap::Erase( const ::Color& /*rFillColor*/ )
+{
+ return false;
+}
+
bool X11SalBitmap::Scale( const double& /*rScaleX*/, const double& /*rScaleY*/, sal_uInt32 /*nScaleFlag*/ )
{
return false;
diff --git a/vcl/win/source/gdi/salbmp.cxx b/vcl/win/source/gdi/salbmp.cxx
index d4ae11a..5cb0943 100644
--- a/vcl/win/source/gdi/salbmp.cxx
+++ b/vcl/win/source/gdi/salbmp.cxx
@@ -1081,6 +1081,11 @@ bool WinSalBitmap::Crop( const Rectangle& /*rRectPixel*/ )
return false;
}
+bool WinSalBitmap::Erase( const ::Color& /*rFillColor*/ )
+{
+ return false;
+}
+
bool WinSalBitmap::Scale( const double& /*rScaleX*/, const double& /*rScaleY*/, sal_uInt32 /*nScaleFlag*/ )
{
return false;
commit 1f653d3d27341aa8c8ca0fe0c110098518b15c21
Author: Matúš Kukan <matus.kukan at collabora.com>
Date: Tue Nov 18 22:34:31 2014 +0100
Add dummy Crop to SalBitmap implementations
Change-Id: Ib402395f5523a980c9ca098dcd2d8e1ecbbfa7c0
diff --git a/vcl/headless/svpbmp.cxx b/vcl/headless/svpbmp.cxx
index b5fcc24..d5a1e79 100644
--- a/vcl/headless/svpbmp.cxx
+++ b/vcl/headless/svpbmp.cxx
@@ -339,6 +339,11 @@ bool SvpSalBitmap::GetSystemData( BitmapSystemData& )
return false;
}
+bool SvpSalBitmap::Crop( const Rectangle& /*rRectPixel*/ )
+{
+ return false;
+}
+
bool SvpSalBitmap::Scale( const double& /*rScaleX*/, const double& /*rScaleY*/, sal_uInt32 /*nScaleFlag*/ )
{
return false;
diff --git a/vcl/inc/headless/svpbmp.hxx b/vcl/inc/headless/svpbmp.hxx
index 3a0da2e..0de0d78 100644
--- a/vcl/inc/headless/svpbmp.hxx
+++ b/vcl/inc/headless/svpbmp.hxx
@@ -58,6 +58,7 @@ public:
virtual void ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly ) SAL_OVERRIDE;
virtual bool GetSystemData( BitmapSystemData& rData ) SAL_OVERRIDE;
+ virtual bool Crop( const Rectangle& rRectPixel ) SAL_OVERRIDE;
virtual bool Scale( const double& rScaleX, const double& rScaleY, sal_uInt32 nScaleFlag ) SAL_OVERRIDE;
static sal_uInt32 getBitCountFromScanlineFormat( basebmp::Format nFormat );
diff --git a/vcl/inc/impbmp.hxx b/vcl/inc/impbmp.hxx
index bbe8064..8f373c5 100644
--- a/vcl/inc/impbmp.hxx
+++ b/vcl/inc/impbmp.hxx
@@ -68,7 +68,7 @@ public:
inline void ImplSetChecksum( sal_uLong nChecksum ) { mnChecksum = nChecksum; }
inline sal_uLong ImplGetChecksum() const { return mnChecksum; }
-
+ bool ImplCrop( const Rectangle& rRectPixel );
bool ImplScale( const double& rScaleX, const double& rScaleY, sal_uInt32 nScaleFlag );
};
diff --git a/vcl/inc/opengl/salbmp.hxx b/vcl/inc/opengl/salbmp.hxx
index 972fee0..20b0e61 100644
--- a/vcl/inc/opengl/salbmp.hxx
+++ b/vcl/inc/opengl/salbmp.hxx
@@ -78,6 +78,7 @@ public:
bool GetSystemData( BitmapSystemData& rData ) SAL_OVERRIDE;
+ bool Crop( const Rectangle& rRectPixel ) SAL_OVERRIDE;
bool Scale( const double& rScaleX, const double& rScaleY, sal_uInt32 nScaleFlag ) SAL_OVERRIDE;
public:
diff --git a/vcl/inc/quartz/salbmp.h b/vcl/inc/quartz/salbmp.h
index 0bde5ad..c98cf2f 100644
--- a/vcl/inc/quartz/salbmp.h
+++ b/vcl/inc/quartz/salbmp.h
@@ -79,6 +79,7 @@ public:
bool GetSystemData( BitmapSystemData& rData ) SAL_OVERRIDE;
+ bool Crop( const Rectangle& rRectPixel ) SAL_OVERRIDE;
bool Scale( const double& rScaleX, const double& rScaleY, sal_uInt32 nScaleFlag ) SAL_OVERRIDE;
private:
diff --git a/vcl/inc/salbmp.hxx b/vcl/inc/salbmp.hxx
index 227cc3f..5eb977d 100644
--- a/vcl/inc/salbmp.hxx
+++ b/vcl/inc/salbmp.hxx
@@ -55,6 +55,7 @@ public:
virtual void ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly ) = 0;
virtual bool GetSystemData( BitmapSystemData& rData ) = 0;
+ virtual bool Crop( const Rectangle& rRectPixel ) = 0;
virtual bool Scale( const double& rScaleX, const double& rScaleY, sal_uInt32 nScaleFlag ) = 0;
};
diff --git a/vcl/inc/unx/salbmp.h b/vcl/inc/unx/salbmp.h
index f3f0831..5975f66 100644
--- a/vcl/inc/unx/salbmp.h
+++ b/vcl/inc/unx/salbmp.h
@@ -146,6 +146,7 @@ public:
virtual void ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly ) SAL_OVERRIDE;
virtual bool GetSystemData( BitmapSystemData& rData ) SAL_OVERRIDE;
+ virtual bool Crop( const Rectangle& rRectPixel ) SAL_OVERRIDE;
virtual bool Scale( const double& rScaleX, const double& rScaleY, sal_uInt32 nScaleFlag ) SAL_OVERRIDE;
};
diff --git a/vcl/inc/win/salbmp.h b/vcl/inc/win/salbmp.h
index 9038236..b74ba73 100644
--- a/vcl/inc/win/salbmp.h
+++ b/vcl/inc/win/salbmp.h
@@ -97,6 +97,7 @@ public:
virtual void ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly );
virtual bool GetSystemData( BitmapSystemData& rData );
+ virtual bool Crop( const Rectangle& rRectPixel ) SAL_OVERRIDE;
virtual bool Scale( const double& rScaleX, const double& rScaleY, sal_uInt32 nScaleFlag );
};
diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index 155757a..7a1af0d 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -573,4 +573,9 @@ bool OpenGLSalBitmap::GetSystemData( BitmapSystemData& /*rData*/ )
#endif
}
+bool OpenGLSalBitmap::Crop( const Rectangle& /*rRectPixel*/ )
+{
+ return false;
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx
index 0e64aa7..b75c08f 100644
--- a/vcl/quartz/salbmp.cxx
+++ b/vcl/quartz/salbmp.cxx
@@ -967,6 +967,11 @@ bool QuartzSalBitmap::GetSystemData( BitmapSystemData& rData )
return bRet;
}
+bool QuartzSalBitmap::Crop( const Rectangle& /*rRectPixel*/ )
+{
+ return false;
+}
+
bool QuartzSalBitmap::Scale( const double& /*rScaleX*/, const double& /*rScaleY*/, sal_uInt32 /*nScaleFlag*/ )
{
return false;
diff --git a/vcl/source/gdi/impbmp.cxx b/vcl/source/gdi/impbmp.cxx
index 633cff2..b402d5b 100644
--- a/vcl/source/gdi/impbmp.cxx
+++ b/vcl/source/gdi/impbmp.cxx
@@ -93,6 +93,11 @@ void ImpBitmap::ImplReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly )
mnChecksum = 0;
}
+bool ImpBitmap::ImplCrop( const Rectangle& rRectPixel )
+{
+ return mpSalBitmap->Crop( rRectPixel );
+}
+
bool ImpBitmap::ImplScale( const double& rScaleX, const double& rScaleY, sal_uInt32 nScaleFlag )
{
return mpSalBitmap->Scale( rScaleX, rScaleY, nScaleFlag );
diff --git a/vcl/unx/generic/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx
index f36795a..a245dc9 100644
--- a/vcl/unx/generic/gdi/salbmp.cxx
+++ b/vcl/unx/generic/gdi/salbmp.cxx
@@ -860,6 +860,11 @@ bool X11SalBitmap::GetSystemData( BitmapSystemData& rData )
return false;
}
+bool X11SalBitmap::Crop( const Rectangle& /*rRectPixel*/ )
+{
+ return false;
+}
+
bool X11SalBitmap::Scale( const double& /*rScaleX*/, const double& /*rScaleY*/, sal_uInt32 /*nScaleFlag*/ )
{
return false;
diff --git a/vcl/win/source/gdi/salbmp.cxx b/vcl/win/source/gdi/salbmp.cxx
index 0f8906c..d4ae11a 100644
--- a/vcl/win/source/gdi/salbmp.cxx
+++ b/vcl/win/source/gdi/salbmp.cxx
@@ -1076,6 +1076,11 @@ bool WinSalBitmap::GetSystemData( BitmapSystemData& rData )
return bRet;
}
+bool WinSalBitmap::Crop( const Rectangle& /*rRectPixel*/ )
+{
+ return false;
+}
+
bool WinSalBitmap::Scale( const double& /*rScaleX*/, const double& /*rScaleY*/, sal_uInt32 /*nScaleFlag*/ )
{
return false;
More information about the Libreoffice-commits
mailing list