summaryrefslogtreecommitdiff
path: root/canvas
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-03-04 08:57:28 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-03-05 12:12:26 +0100
commit191f85df5851473af270be486f95f940e3091fef (patch)
tree753d9513ccda8ee2a132bdad74eedc47bd71b179 /canvas
parent983566119c926d0e2478f74548f00a789de55c15 (diff)
re-land "new loplugin typedefparam""
This reverts commit c9bb48386bad7d2a40e6958883328145ae439cad, and adds a bunch more fixes. Change-Id: Ib584d302a73125528eba85fa1e722cb6fc41538a Reviewed-on: https://gerrit.libreoffice.org/68680 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'canvas')
-rw-r--r--canvas/source/opengl/ogl_canvastools.hxx4
-rw-r--r--canvas/source/tools/surface.hxx2
2 files changed, 3 insertions, 3 deletions
diff --git a/canvas/source/opengl/ogl_canvastools.hxx b/canvas/source/opengl/ogl_canvastools.hxx
index 4382258107eb..0378626571d5 100644
--- a/canvas/source/opengl/ogl_canvastools.hxx
+++ b/canvas/source/opengl/ogl_canvastools.hxx
@@ -26,8 +26,8 @@ namespace oglcanvas
void renderComplexPolyPolygon( const ::basegfx::B2DPolyPolygon& rPolyPoly );
void renderPolyPolygon( const ::basegfx::B2DPolyPolygon& rPolyPoly );
void setupState( const ::basegfx::B2DHomMatrix& rTransform,
- unsigned int eSrcBlend,
- unsigned int eDstBlend,
+ GLenum eSrcBlend,
+ GLenum eDstBlend,
const com::sun::star::rendering::ARGBColor& rColor );
void renderOSD( const std::vector<double>& rNumbers, double scale );
diff --git a/canvas/source/tools/surface.hxx b/canvas/source/tools/surface.hxx
index ac45ea1965f1..b941e9d09618 100644
--- a/canvas/source/tools/surface.hxx
+++ b/canvas/source/tools/surface.hxx
@@ -87,7 +87,7 @@ namespace canvas
bool drawRectangularArea(
double fAlpha,
const ::basegfx::B2DPoint& rPos,
- const ::basegfx::B2DRange& rArea,
+ const ::basegfx::B2DRectangle& rArea,
const ::basegfx::B2DHomMatrix& rTransform );
/** Render the surface content to screen.