summaryrefslogtreecommitdiff
path: root/canvas
diff options
context:
space:
mode:
Diffstat (limited to 'canvas')
-rw-r--r--canvas/source/cairo/cairo_canvas.hxx2
-rw-r--r--canvas/source/cairo/cairo_canvasbitmap.hxx2
-rw-r--r--canvas/source/cairo/cairo_canvascustomsprite.cxx2
-rw-r--r--canvas/source/cairo/cairo_canvascustomsprite.hxx2
-rw-r--r--canvas/source/cairo/cairo_canvashelper.cxx4
-rw-r--r--canvas/source/cairo/cairo_devicehelper.hxx2
-rw-r--r--canvas/source/cairo/cairo_spritecanvas.hxx2
-rw-r--r--canvas/source/cairo/cairo_spritedevicehelper.hxx2
-rw-r--r--canvas/source/cairo/cairo_surfaceprovider.hxx2
-rw-r--r--canvas/source/opengl/ogl_spritedevicehelper.cxx4
10 files changed, 12 insertions, 12 deletions
diff --git a/canvas/source/cairo/cairo_canvas.hxx b/canvas/source/cairo/cairo_canvas.hxx
index fe712e3adb1b..920b37a2ebad 100644
--- a/canvas/source/cairo/cairo_canvas.hxx
+++ b/canvas/source/cairo/cairo_canvas.hxx
@@ -133,7 +133,7 @@ namespace cairocanvas
// SurfaceProvider
virtual ::cairo::SurfaceSharedPtr getSurface() override;
- virtual ::cairo::SurfaceSharedPtr createSurface( const ::basegfx::B2ISize& rSize, int aContent = CAIRO_CONTENT_COLOR_ALPHA ) override;
+ virtual ::cairo::SurfaceSharedPtr createSurface( const ::basegfx::B2ISize& rSize, int aContent ) override;
virtual ::cairo::SurfaceSharedPtr createSurface( ::Bitmap& rBitmap ) override;
virtual ::cairo::SurfaceSharedPtr changeSurface() override;
virtual OutputDevice* getOutputDevice() override;
diff --git a/canvas/source/cairo/cairo_canvasbitmap.hxx b/canvas/source/cairo/cairo_canvasbitmap.hxx
index e6c9f0c8f591..d7954183e75d 100644
--- a/canvas/source/cairo/cairo_canvasbitmap.hxx
+++ b/canvas/source/cairo/cairo_canvasbitmap.hxx
@@ -93,7 +93,7 @@ namespace cairocanvas
// SurfaceProvider
virtual ::cairo::SurfaceSharedPtr getSurface() override;
- virtual ::cairo::SurfaceSharedPtr createSurface( const ::basegfx::B2ISize& rSize, int aContent = CAIRO_CONTENT_COLOR_ALPHA ) override;
+ virtual ::cairo::SurfaceSharedPtr createSurface( const ::basegfx::B2ISize& rSize, int aContent ) override;
virtual ::cairo::SurfaceSharedPtr createSurface( ::Bitmap& rBitmap ) override;
virtual ::cairo::SurfaceSharedPtr changeSurface() override;
virtual OutputDevice* getOutputDevice() override;
diff --git a/canvas/source/cairo/cairo_canvascustomsprite.cxx b/canvas/source/cairo/cairo_canvascustomsprite.cxx
index 9b5b9e84a65a..107b0fe393c5 100644
--- a/canvas/source/cairo/cairo_canvascustomsprite.cxx
+++ b/canvas/source/cairo/cairo_canvascustomsprite.cxx
@@ -47,7 +47,7 @@ namespace cairocanvas
SAL_INFO( "canvas.cairo", "sprite size: " << ::canvas::tools::roundUp( rSpriteSize.Width ) << ", " << ::canvas::tools::roundUp( rSpriteSize.Height ));
- mpBufferSurface = mpSpriteCanvas->createSurface( maSize );
+ mpBufferSurface = mpSpriteCanvas->createSurface( maSize, CAIRO_CONTENT_COLOR_ALPHA );
maCanvasHelper.init( maSize,
*rRefDevice,
diff --git a/canvas/source/cairo/cairo_canvascustomsprite.hxx b/canvas/source/cairo/cairo_canvascustomsprite.hxx
index d42b68cc057f..6ce6102fbbc3 100644
--- a/canvas/source/cairo/cairo_canvascustomsprite.hxx
+++ b/canvas/source/cairo/cairo_canvascustomsprite.hxx
@@ -131,7 +131,7 @@ namespace cairocanvas
// SurfaceProvider
virtual ::cairo::SurfaceSharedPtr getSurface() override;
- virtual ::cairo::SurfaceSharedPtr createSurface( const ::basegfx::B2ISize& rSize, int aContent = CAIRO_CONTENT_COLOR_ALPHA ) override;
+ virtual ::cairo::SurfaceSharedPtr createSurface( const ::basegfx::B2ISize& rSize, int aContent ) override;
virtual ::cairo::SurfaceSharedPtr createSurface( ::Bitmap& rBitmap ) override;
virtual ::cairo::SurfaceSharedPtr changeSurface() override;
virtual OutputDevice* getOutputDevice() override;
diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx
index 46f71a17820e..def6cd6cfa29 100644
--- a/canvas/source/cairo/cairo_canvashelper.cxx
+++ b/canvas/source/cairo/cairo_canvashelper.cxx
@@ -659,7 +659,7 @@ namespace cairocanvas
return pSurface;
}
- static void addColorStops( cairo_pattern_t* pPattern, const uno::Sequence< uno::Sequence< double > >& rColors, const uno::Sequence< double >& rStops, bool bReverseStops = false )
+ static void addColorStops( cairo_pattern_t* pPattern, const uno::Sequence< uno::Sequence< double > >& rColors, const uno::Sequence< double >& rStops, bool bReverseStops )
{
int i;
@@ -717,7 +717,7 @@ namespace cairocanvas
x1 = 1;
y1 = 0;
pPattern = cairo_pattern_create_linear( x0, y0, x1, y1 );
- addColorStops( pPattern, aValues.maColors, aValues.maStops );
+ addColorStops( pPattern, aValues.maColors, aValues.maStops, false );
break;
case ::canvas::ParametricPolyPolygon::GradientType::Elliptical:
diff --git a/canvas/source/cairo/cairo_devicehelper.hxx b/canvas/source/cairo/cairo_devicehelper.hxx
index 430f91ae071c..c0e7449416c3 100644
--- a/canvas/source/cairo/cairo_devicehelper.hxx
+++ b/canvas/source/cairo/cairo_devicehelper.hxx
@@ -92,7 +92,7 @@ namespace cairocanvas
OutputDevice* getOutputDevice() const { return mpRefDevice; }
const ::cairo::SurfaceSharedPtr& getSurface() { return mpSurface; }
- ::cairo::SurfaceSharedPtr createSurface( const ::basegfx::B2ISize& rSize, int aContent = CAIRO_CONTENT_COLOR_ALPHA );
+ ::cairo::SurfaceSharedPtr createSurface( const ::basegfx::B2ISize& rSize, int aContent );
::cairo::SurfaceSharedPtr createSurface( BitmapSystemData& rData, const Size& rSize );
protected:
diff --git a/canvas/source/cairo/cairo_spritecanvas.hxx b/canvas/source/cairo/cairo_spritecanvas.hxx
index 8e41026bd361..9a3b61aaeb75 100644
--- a/canvas/source/cairo/cairo_spritecanvas.hxx
+++ b/canvas/source/cairo/cairo_spritecanvas.hxx
@@ -132,7 +132,7 @@ namespace cairocanvas
// SurfaceProvider
virtual ::cairo::SurfaceSharedPtr getSurface() override;
- virtual ::cairo::SurfaceSharedPtr createSurface( const ::basegfx::B2ISize& rSize, int aContent = CAIRO_CONTENT_COLOR_ALPHA ) override;
+ virtual ::cairo::SurfaceSharedPtr createSurface( const ::basegfx::B2ISize& rSize, int aContent ) override;
virtual ::cairo::SurfaceSharedPtr createSurface( ::Bitmap& rBitmap ) override;
virtual ::cairo::SurfaceSharedPtr changeSurface() override;
virtual OutputDevice* getOutputDevice() override;
diff --git a/canvas/source/cairo/cairo_spritedevicehelper.hxx b/canvas/source/cairo/cairo_spritedevicehelper.hxx
index 750b97f5bf6a..2cd748f27550 100644
--- a/canvas/source/cairo/cairo_spritedevicehelper.hxx
+++ b/canvas/source/cairo/cairo_spritedevicehelper.hxx
@@ -62,7 +62,7 @@ namespace cairocanvas
const ::cairo::SurfaceSharedPtr& getBufferSurface() { return mpBufferSurface; }
::cairo::SurfaceSharedPtr getWindowSurface();
- ::cairo::SurfaceSharedPtr createSurface( const ::basegfx::B2ISize& rSize, int aContent = CAIRO_CONTENT_COLOR_ALPHA );
+ ::cairo::SurfaceSharedPtr createSurface( const ::basegfx::B2ISize& rSize, int aContent );
::cairo::SurfaceSharedPtr createSurface( BitmapSystemData& rData, const Size& rSize );
const ::basegfx::B2ISize& getSizePixel() { return maSize; }
void flush();
diff --git a/canvas/source/cairo/cairo_surfaceprovider.hxx b/canvas/source/cairo/cairo_surfaceprovider.hxx
index c2156cc44403..6a123c275fc2 100644
--- a/canvas/source/cairo/cairo_surfaceprovider.hxx
+++ b/canvas/source/cairo/cairo_surfaceprovider.hxx
@@ -53,7 +53,7 @@ namespace cairocanvas
/// create new surface in given size
virtual ::cairo::SurfaceSharedPtr createSurface( const ::basegfx::B2ISize& rSize,
- int aContent = CAIRO_CONTENT_COLOR_ALPHA ) = 0;
+ int aContent ) = 0;
/// create new surface from given bitmap
virtual ::cairo::SurfaceSharedPtr createSurface( ::Bitmap& rBitmap ) = 0;
diff --git a/canvas/source/opengl/ogl_spritedevicehelper.cxx b/canvas/source/opengl/ogl_spritedevicehelper.cxx
index 50a44999b28c..f602777233ed 100644
--- a/canvas/source/opengl/ogl_spritedevicehelper.cxx
+++ b/canvas/source/opengl/ogl_spritedevicehelper.cxx
@@ -53,7 +53,7 @@ static void initContext()
glShadeModel(GL_FLAT);
}
-static void initTransformation(const ::Size& rSize, bool bMirror=false)
+static void initTransformation(const ::Size& rSize, bool bMirror)
{
// use whole window
glViewport( 0,0,
@@ -282,7 +282,7 @@ namespace oglcanvas
SystemChildWindow* pChildWindow = mxContext->getChildWindow();
const ::Size& rOutputSize = pChildWindow->GetSizePixel();
- initTransformation(rOutputSize);
+ initTransformation(rOutputSize, false);
// render the actual spritecanvas content
mpSpriteCanvas->renderRecordedActions();
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-24 01:21:16 +0000