Improve image alpha handling in PDF and PS plotters

Fixes: lp:1825276
* https://bugs.launchpad.net/kicad/+bug/1825276

(cherry picked from commit 4adf89b40b)
This commit is contained in:
Jon Evans
2019-05-27 13:06:26 -04:00
parent 3625668ff5
commit 0a6b1ea256
2 changed files with 29 additions and 0 deletions
+15
View File
@@ -390,6 +390,21 @@ void PDF_PLOTTER::PlotImage( const wxImage & aImage, const wxPoint& aPos,
unsigned char r = aImage.GetRed( x, y ) & 0xFF;
unsigned char g = aImage.GetGreen( x, y ) & 0xFF;
unsigned char b = aImage.GetBlue( x, y ) & 0xFF;
// PDF inline images don't support alpha, so premultiply against white background
if( aImage.HasAlpha() )
{
unsigned char alpha = aImage.GetAlpha( x, y ) & 0xFF;
if( alpha < 0xFF )
{
float a = 1.0 - ( (float) alpha / 255.0 );
r = ( int )( r + ( a * 0xFF ) ) & 0xFF;
g = ( int )( g + ( a * 0xFF ) ) & 0xFF;
b = ( int )( b + ( a * 0xFF ) ) & 0xFF;
}
}
// As usual these days, stdio buffering has to suffeeeeerrrr
if( colorMode )
{