cc237438f6
This fixes the following issue for the GCC build with '-Werror=shadow'
in place which does not show up in the default build setup since
compiler flag '-Wno-shadow' is currently being set in
'RepositoryExternal.mk' for qt5 and kde5.
(This will be dropped in a follow-up commit.)
.../libreoffice/vcl/qt5/Qt5SvpSurface.cxx: In constructor ‘cairo::Qt5SvpSurface::Qt5SvpSurface(const CairoSurfaceSharedPtr&)’:
.../libreoffice/vcl/qt5/Qt5SvpSurface.cxx:24:69: error: declaration of ‘m_pSurface’ shadows a member of ‘cairo::Qt5SvpSurface’ [-Werror=shadow]
Qt5SvpSurface::Qt5SvpSurface(const CairoSurfaceSharedPtr& m_pSurface)
^
In file included from .../libreoffice/vcl/qt5/Qt5SvpSurface.cxx:12:
.../libreoffice/vcl/inc/qt5/Qt5SvpSurface.hxx:27:27: note: shadowed declaration is here
CairoSurfaceSharedPtr m_pSurface;
^~~~~~~~~~
cc1plus: all warnings being treated as errors
Change-Id: I501657447e02675f7c6b1c9aaca670ba81715590
Reviewed-on: https://gerrit.libreoffice.org/73891
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
73 lines
2 KiB
C++
73 lines
2 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*/
|
|
|
|
#include <utility>
|
|
|
|
#include <Qt5SvpSurface.hxx>
|
|
|
|
#include <Qt5SvpGraphics.hxx>
|
|
|
|
#include <vcl/sysdata.hxx>
|
|
#include <vcl/bitmap.hxx>
|
|
#include <vcl/virdev.hxx>
|
|
#include <vcl/window.hxx>
|
|
#include <basegfx/vector/b2isize.hxx>
|
|
|
|
namespace cairo
|
|
{
|
|
Qt5SvpSurface::Qt5SvpSurface(const CairoSurfaceSharedPtr& pSurface)
|
|
: m_pGraphics(nullptr)
|
|
, m_pCairoContext(nullptr)
|
|
, m_pSurface(pSurface)
|
|
{
|
|
}
|
|
|
|
Qt5SvpSurface::Qt5SvpSurface(const Qt5SvpGraphics* pGraphics, int x, int y, int width, int height)
|
|
: m_pGraphics(pGraphics)
|
|
, m_pCairoContext(pGraphics->getCairoContext(false))
|
|
{
|
|
cairo_surface_t* surface = cairo_get_target(m_pCairoContext);
|
|
m_pSurface.reset(cairo_surface_create_for_rectangle(surface, x, y, width, height),
|
|
&cairo_surface_destroy);
|
|
}
|
|
|
|
Qt5SvpSurface::~Qt5SvpSurface()
|
|
{
|
|
if (m_pCairoContext)
|
|
cairo_destroy(m_pCairoContext);
|
|
}
|
|
|
|
CairoSharedPtr Qt5SvpSurface::getCairo() const
|
|
{
|
|
return CairoSharedPtr(cairo_create(m_pSurface.get()), &cairo_destroy);
|
|
}
|
|
|
|
SurfaceSharedPtr Qt5SvpSurface::getSimilar(int cairo_content_type, int width, int height) const
|
|
{
|
|
return SurfaceSharedPtr(new Qt5SvpSurface(CairoSurfaceSharedPtr(
|
|
cairo_surface_create_similar(
|
|
m_pSurface.get(), static_cast<cairo_content_t>(cairo_content_type), width, height),
|
|
&cairo_surface_destroy)));
|
|
}
|
|
|
|
void Qt5SvpSurface::flush() const
|
|
{
|
|
cairo_surface_flush(m_pSurface.get());
|
|
if (m_pGraphics)
|
|
m_pGraphics->updateQWidget();
|
|
}
|
|
|
|
VclPtr<VirtualDevice> Qt5SvpSurface::createVirtualDevice() const
|
|
{
|
|
return VclPtrInstance<VirtualDevice>(nullptr, Size(1, 1), DeviceFormat::DEFAULT);
|
|
}
|
|
|
|
} // namespace cairo
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|