Kaydet (Commit) 9c8478d4 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

tdf#122221: Bin apparently unnecessary early return

Removing these few lines of code fixes the problem on iOS, and has no
apparent ill effect on macOS. But sure, I didn't check that thoroughly
on macOS, so in case this has a bad effect on macOS after all, need to
reinstate the few lines but make them #ifndef IOS.

(Still passes make check.)

Change-Id: I2380d010ba223a698acfe916fca4580a1502be98
üst 222f6a1c
...@@ -587,12 +587,6 @@ bool AquaSalGraphics::drawAlphaBitmap( const SalTwoRect& rTR, ...@@ -587,12 +587,6 @@ bool AquaSalGraphics::drawAlphaBitmap( const SalTwoRect& rTR,
const SalBitmap& rSrcBitmap, const SalBitmap& rSrcBitmap,
const SalBitmap& rAlphaBmp ) const SalBitmap& rAlphaBmp )
{ {
if (rTR.mnSrcWidth != rTR.mnDestWidth || rTR.mnSrcHeight != rTR.mnDestHeight)
{
// TODO - would be better to scale it by the native code
return false;
}
// An image mask can't have a depth > 8 bits (should be 1 to 8 bits) // An image mask can't have a depth > 8 bits (should be 1 to 8 bits)
if( rAlphaBmp.GetBitCount() > 8 ) if( rAlphaBmp.GetBitCount() > 8 )
return false; return false;
......
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