Kaydet (Commit) 772c3a20 authored tarafından tsahi glik's avatar tsahi glik

fix duplicated symbols on ios salgraphics

üst 8c3fbed4
...@@ -61,6 +61,7 @@ rDevice ...@@ -61,6 +61,7 @@ rDevice
} }
// =========================================================================== // ===========================================================================
#ifndef IOS
bool SvpSalGraphics::drawAlphaBitmap( const SalTwoRect&, const SalBitmap& /*rSourceBitmap*/, const SalBitmap& /*rAlphaBitmap*/ ) bool SvpSalGraphics::drawAlphaBitmap( const SalTwoRect&, const SalBitmap& /*rSourceBitmap*/, const SalBitmap& /*rAlphaBitmap*/ )
{ {
...@@ -68,6 +69,7 @@ bool SvpSalGraphics::drawAlphaBitmap( const SalTwoRect&, const SalBitmap& /*rSou ...@@ -68,6 +69,7 @@ bool SvpSalGraphics::drawAlphaBitmap( const SalTwoRect&, const SalBitmap& /*rSou
return false; return false;
} }
bool SvpSalGraphics::drawTransformedBitmap( bool SvpSalGraphics::drawTransformedBitmap(
const basegfx::B2DPoint& rNull, const basegfx::B2DPoint& rNull,
const basegfx::B2DPoint& rX, const basegfx::B2DPoint& rX,
...@@ -80,11 +82,13 @@ bool SvpSalGraphics::drawTransformedBitmap( ...@@ -80,11 +82,13 @@ bool SvpSalGraphics::drawTransformedBitmap(
return false; return false;
} }
bool SvpSalGraphics::drawAlphaRect( long /*nX*/, long /*nY*/, long /*nWidth*/, long /*nHeight*/, sal_uInt8 /*nTransparency*/ ) bool SvpSalGraphics::drawAlphaRect( long /*nX*/, long /*nY*/, long /*nWidth*/, long /*nHeight*/, sal_uInt8 /*nTransparency*/ )
{ {
// TODO(P3) implement alpha blending // TODO(P3) implement alpha blending
return false; return false;
} }
#endif
#ifndef IOS #ifndef IOS
...@@ -381,6 +385,8 @@ void SvpSalGraphics::SetROPFillColor( SalROPColor nROPColor ) ...@@ -381,6 +385,8 @@ void SvpSalGraphics::SetROPFillColor( SalROPColor nROPColor )
} }
} }
#ifndef IOS
void SvpSalGraphics::drawPixel( long nX, long nY ) void SvpSalGraphics::drawPixel( long nX, long nY )
{ {
if( m_bUseLineColor ) if( m_bUseLineColor )
...@@ -553,6 +559,8 @@ bool SvpSalGraphics::drawPolyPolygon( const basegfx::B2DPolyPolygon&, double /*f ...@@ -553,6 +559,8 @@ bool SvpSalGraphics::drawPolyPolygon( const basegfx::B2DPolyPolygon&, double /*f
return false; return false;
} }
#endif
void SvpSalGraphics::copyArea( long nDestX, void SvpSalGraphics::copyArea( long nDestX,
long nDestY, long nDestY,
long nSrcX, long nSrcX,
...@@ -592,6 +600,7 @@ void SvpSalGraphics::copyBits( const SalTwoRect& rPosAry, ...@@ -592,6 +600,7 @@ void SvpSalGraphics::copyBits( const SalTwoRect& rPosAry,
dbgOut( m_aDevice ); dbgOut( m_aDevice );
} }
#ifndef IOS
void SvpSalGraphics::drawBitmap( const SalTwoRect& rPosAry, void SvpSalGraphics::drawBitmap( const SalTwoRect& rPosAry,
const SalBitmap& rSalBitmap ) const SalBitmap& rSalBitmap )
{ {
...@@ -666,6 +675,8 @@ void SvpSalGraphics::drawMask( const SalTwoRect& rPosAry, ...@@ -666,6 +675,8 @@ void SvpSalGraphics::drawMask( const SalTwoRect& rPosAry,
dbgOut( m_aDevice ); dbgOut( m_aDevice );
} }
#endif
SalBitmap* SvpSalGraphics::getBitmap( long nX, long nY, long nWidth, long nHeight ) SalBitmap* SvpSalGraphics::getBitmap( long nX, long nY, long nWidth, long nHeight )
{ {
basebmp::BitmapDeviceSharedPtr aCopy = basebmp::BitmapDeviceSharedPtr aCopy =
...@@ -741,6 +752,13 @@ void SvpSalGraphics::SetVirDevGraphics( CGLayerRef xLayer, CGContextRef xContext ...@@ -741,6 +752,13 @@ void SvpSalGraphics::SetVirDevGraphics( CGLayerRef xLayer, CGContextRef xContext
mbForeignContext = xContext != NULL; mbForeignContext = xContext != NULL;
}; };
void SvpSalGraphics::RefreshRect(float lX, float lY, float lWidth, float lHeight)
{
if (m_aDevice && m_aDevice->getDamageTracker() != NULL)
m_aDevice->getDamageTracker()->damaged(basegfx::B2IBox( basegfx::fround(lX), basegfx::fround(lY), basegfx::fround(lX + lWidth), basegfx::fround(lY + lHeight)));
}
#endif #endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment