diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-02-07 13:09:31 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-02-07 13:09:31 +0000 |
| commit | 19ea3db6d33e8e1de57104e42796454757facd45 (patch) | |
| tree | e6baffa68f6cb5c4a8b1e234d3f98a82c827d580 /vcl/headless/svpvd.cxx | |
| parent | eee0206831f9682f1fa1806d08bbbeaf4783b4e9 (diff) | |
revert unready stuff
Change-Id: I2b112a17a2bc70bfe4d5a6af7964a3c1d7eacf9b
Diffstat (limited to 'vcl/headless/svpvd.cxx')
| -rw-r--r-- | vcl/headless/svpvd.cxx | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/vcl/headless/svpvd.cxx b/vcl/headless/svpvd.cxx index b5ab755a0d1b..ca28a5246b46 100644 --- a/vcl/headless/svpvd.cxx +++ b/vcl/headless/svpvd.cxx @@ -38,7 +38,7 @@ SvpSalVirtualDevice::~SvpSalVirtualDevice() SalGraphics* SvpSalVirtualDevice::AcquireGraphics() { SvpSalGraphics* pGraphics = new SvpSalGraphics(); - pGraphics->setSurface(m_pSurface, m_aFrameSize); + pGraphics->setSurface(m_pSurface); m_aGraphics.push_back( pGraphics ); return pGraphics; } @@ -62,14 +62,12 @@ bool SvpSalVirtualDevice::SetSizeUsingBuffer( long nNewDX, long nNewDY, if (nNewDY == 0) nNewDY = 1; - if (!m_pSurface || m_aFrameSize.getX() != nNewDX || - m_aFrameSize.getY() != nNewDY ) - { - m_aFrameSize = basegfx::B2IVector(nNewDX, nNewDY); - - nNewDX *= m_fScale; - nNewDY *= m_fScale; + nNewDX *= m_fScale; + nNewDY *= m_fScale; + if (!m_pSurface || cairo_image_surface_get_width(m_pSurface) != nNewDX || + cairo_image_surface_get_height(m_pSurface) != nNewDY ) + { if (m_pSurface) { cairo_surface_destroy(m_pSurface); @@ -98,19 +96,20 @@ bool SvpSalVirtualDevice::SetSizeUsingBuffer( long nNewDX, long nNewDY, // update device in existing graphics for( std::list< SvpSalGraphics* >::iterator it = m_aGraphics.begin(); it != m_aGraphics.end(); ++it ) - (*it)->setSurface(m_pSurface, m_aFrameSize); + (*it)->setSurface(m_pSurface); + } return true; } long SvpSalVirtualDevice::GetWidth() const { - return m_pSurface ? m_aFrameSize.getX() : 0; + return m_pSurface ? cairo_image_surface_get_width(m_pSurface) : 0; } long SvpSalVirtualDevice::GetHeight() const { - return m_pSurface ? m_aFrameSize.getY() : 0; + return m_pSurface ? cairo_image_surface_get_height(m_pSurface) : 0; } #endif |