summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@collabora.com>2014-11-18 22:34:31 +0100
committerMatúš Kukan <matus.kukan@collabora.com>2014-11-24 22:40:40 +0100
commit1f653d3d27341aa8c8ca0fe0c110098518b15c21 (patch)
treefaaef83d7c4f89663a8960920c26e58a6909b35d /vcl
parent07eea5d1b0eb0265f43c6d8d63d775a316f9b42a (diff)
Add dummy Crop to SalBitmap implementations
Change-Id: Ib402395f5523a980c9ca098dcd2d8e1ecbbfa7c0
Diffstat (limited to 'vcl')
-rw-r--r--vcl/headless/svpbmp.cxx5
-rw-r--r--vcl/inc/headless/svpbmp.hxx1
-rw-r--r--vcl/inc/impbmp.hxx2
-rw-r--r--vcl/inc/opengl/salbmp.hxx1
-rw-r--r--vcl/inc/quartz/salbmp.h1
-rw-r--r--vcl/inc/salbmp.hxx1
-rw-r--r--vcl/inc/unx/salbmp.h1
-rw-r--r--vcl/inc/win/salbmp.h1
-rw-r--r--vcl/opengl/salbmp.cxx5
-rw-r--r--vcl/quartz/salbmp.cxx5
-rw-r--r--vcl/source/gdi/impbmp.cxx5
-rw-r--r--vcl/unx/generic/gdi/salbmp.cxx5
-rw-r--r--vcl/win/source/gdi/salbmp.cxx5
13 files changed, 37 insertions, 1 deletions
diff --git a/vcl/headless/svpbmp.cxx b/vcl/headless/svpbmp.cxx
index b5fcc241d75d..d5a1e79b5421 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 3a0da2e9f100..0de0d788c839 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 bbe80649b23b..8f373c59ce08 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 972fee067e0e..20b0e6137f14 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 0bde5adba211..c98cf2f22c21 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 227cc3f6f57b..5eb977d1eee8 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 f3f08313e585..5975f664ceaf 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 90382363b3e5..b74ba73eaf8e 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 155757a0b49d..7a1af0d0f9af 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 0e64aa7c5260..b75c08fad7a4 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 633cff2a5c64..b402d5b91a8e 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 f36795ac4b28..a245dc9637b0 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 0f8906c84bc0..d4ae11ab1b2e 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;