diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-08-20 17:03:30 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-08-21 06:43:48 +0000 |
| commit | d20e7e38641868bf14041f090b3668e0148904c7 (patch) | |
| tree | 591de5cf0e45281ac1eb02b516ed29f578312012 /vcl/opengl/scale.cxx | |
| parent | 5a2d6bf3a94f127307d6a9464033b2226508ff38 (diff) | |
tdf#93547 - Disable OpenGL if we have a SEGV on windows in that code.
Annotate when we are in an OpenGL rendering zone.
Check for this in the VCL signal handler, and force OpenGL off here
if exception occurred inside an OpenGL code-path.
Change-Id: I85a4b3d4a374593dc55d01a39ec4c7c3c262c332
Reviewed-on: https://gerrit.libreoffice.org/17881
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'vcl/opengl/scale.cxx')
| -rw-r--r-- | vcl/opengl/scale.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/vcl/opengl/scale.cxx b/vcl/opengl/scale.cxx index 0b2d5cf3b2a8..93a3eee2dea3 100644 --- a/vcl/opengl/scale.cxx +++ b/vcl/opengl/scale.cxx @@ -23,6 +23,7 @@ #include "vcl/bitmap.hxx" +#include "opengl/zone.hxx" #include "opengl/bmpop.hxx" #include "opengl/salbmp.hxx" #include "opengl/program.hxx" @@ -373,6 +374,8 @@ void ScaleOp::GetSize( Size& rSize ) const bool OpenGLSalBitmap::Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag ) { + OpenGLZone aZone; + SAL_INFO("vcl.opengl", "::Scale " << int(nScaleFlag) << " from " << mnWidth << "x" << mnHeight << " to " << (mnWidth * rScaleX) << "x" << (mnHeight * rScaleY) ); |