From 5d87c15ef0935081319afe2400c99df14d9fa258 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 28 Mar 2017 10:00:59 +0100 Subject: ofz#954 out of memory MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ib27f2dfe0d0837544910208f38a1bc11a35e3cb4 Reviewed-on: https://gerrit.libreoffice.org/35794 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- vcl/inc/headless/svpbmp.hxx | 1 + vcl/inc/impbmp.hxx | 1 + vcl/inc/opengl/salbmp.hxx | 1 + vcl/inc/quartz/salbmp.h | 1 + vcl/inc/salbmp.hxx | 1 + vcl/inc/unx/salbmp.h | 1 + vcl/inc/win/salbmp.h | 1 + 7 files changed, 7 insertions(+) (limited to 'vcl/inc') diff --git a/vcl/inc/headless/svpbmp.hxx b/vcl/inc/headless/svpbmp.hxx index af50ecff6cf5..83c197087931 100644 --- a/vcl/inc/headless/svpbmp.hxx +++ b/vcl/inc/headless/svpbmp.hxx @@ -57,6 +57,7 @@ public: virtual void ReleaseBuffer( BitmapBuffer* pBuffer, BitmapAccessMode nMode ) override; virtual bool GetSystemData( BitmapSystemData& rData ) override; + virtual bool ScalingSupported() const override; virtual bool Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag ) override; virtual bool Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ) override; }; diff --git a/vcl/inc/impbmp.hxx b/vcl/inc/impbmp.hxx index dd607fccc2f6..5824068c6c8a 100644 --- a/vcl/inc/impbmp.hxx +++ b/vcl/inc/impbmp.hxx @@ -66,6 +66,7 @@ public: BitmapChecksum ImplGetChecksum() const; void ImplInvalidateChecksum(); + bool ImplScalingSupported() const; bool ImplScale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag ); bool ImplReplace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ); bool ImplConvert( BmpConversion eConversion ); diff --git a/vcl/inc/opengl/salbmp.hxx b/vcl/inc/opengl/salbmp.hxx index d10129ce8d0c..8d4e05f77050 100644 --- a/vcl/inc/opengl/salbmp.hxx +++ b/vcl/inc/opengl/salbmp.hxx @@ -74,6 +74,7 @@ public: bool GetSystemData( BitmapSystemData& rData ) override; + bool ScalingSupported() const override; bool Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag ) override; bool Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ) override; bool ConvertToGreyscale() override; diff --git a/vcl/inc/quartz/salbmp.h b/vcl/inc/quartz/salbmp.h index 5fe1294c41cf..7c79110ed509 100644 --- a/vcl/inc/quartz/salbmp.h +++ b/vcl/inc/quartz/salbmp.h @@ -74,6 +74,7 @@ public: bool GetSystemData( BitmapSystemData& rData ) override; + bool ScalingSupported() const override; bool Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag ) override; bool Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ) override; diff --git a/vcl/inc/salbmp.hxx b/vcl/inc/salbmp.hxx index 69d25392a448..47d0c0280400 100644 --- a/vcl/inc/salbmp.hxx +++ b/vcl/inc/salbmp.hxx @@ -66,6 +66,7 @@ public: virtual void ReleaseBuffer( BitmapBuffer* pBuffer, BitmapAccessMode nMode ) = 0; virtual bool GetSystemData( BitmapSystemData& rData ) = 0; + virtual bool ScalingSupported() const = 0; virtual bool Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag ) = 0; virtual bool Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ) = 0; diff --git a/vcl/inc/unx/salbmp.h b/vcl/inc/unx/salbmp.h index 81998ba35bea..6b0e722dd7d6 100644 --- a/vcl/inc/unx/salbmp.h +++ b/vcl/inc/unx/salbmp.h @@ -144,6 +144,7 @@ public: virtual void ReleaseBuffer( BitmapBuffer* pBuffer, BitmapAccessMode nMode ) override; virtual bool GetSystemData( BitmapSystemData& rData ) override; + virtual bool ScalingSupported() const override; virtual bool Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag ) override; virtual bool Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ) override; }; diff --git a/vcl/inc/win/salbmp.h b/vcl/inc/win/salbmp.h index d1b96be52a1c..33d88bb92a30 100644 --- a/vcl/inc/win/salbmp.h +++ b/vcl/inc/win/salbmp.h @@ -95,6 +95,7 @@ public: virtual void ReleaseBuffer( BitmapBuffer* pBuffer, BitmapAccessMode nMode ) override; virtual bool GetSystemData( BitmapSystemData& rData ) override; + virtual bool ScalingSupported() const override; virtual bool Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag ) override; virtual bool Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ) override; }; -- cgit