mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolves: fdo#80160 PNG with 1-bit colormap only show black and white

Browse Source 
Change-Id: If0c9950c18e6091fafea47954a4654db436a3a44
This commit is contained in:
Caolán McNamara 2014-06-26 21:06:35 +01:00
parent 7af733d9ef
commit 986c0451d0
1 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
vcl/unx/generic/gdi/salgdi2.cxx
View File

@ -440,6 +440,32 @@ void X11SalGraphics::copyArea ( long nDestX, long nDestY,
copyBits ( aPosAry, 0 ); copyBits ( aPosAry, 0 );
} }
namespace
{
void setForeBack(XGCValues& rValues, const SalColormap& rColMap, const SalBitmap& rSalBitmap)
{
rValues.foreground = rColMap.GetWhitePixel();
rValues.background = rColMap.GetBlackPixel();
//fdo#33455 and fdo#80160 handle 1 bit depth pngs with palette entries
//to set fore/back colors
SalBitmap& rBitmap = const_cast<SalBitmap&>(rSalBitmap);
if (const BitmapBuffer* pBitmapBuffer = rBitmap.AcquireBuffer(true))
{
const BitmapPalette& rPalette = pBitmapBuffer->maPalette;
if (rPalette.GetEntryCount() == 2)
{
const BitmapColor aWhite(rPalette[rPalette.GetBestIndex(Color(COL_WHITE))]);
rValues.foreground = rColMap.GetPixel(ImplColorToSal(aWhite));
const BitmapColor aBlack(rPalette[rPalette.GetBestIndex(Color(COL_BLACK))]);
rValues.background = rColMap.GetPixel(ImplColorToSal(aBlack));
}
rBitmap.ReleaseBuffer(pBitmapBuffer, true);
}
}
}
void X11SalGraphics::drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap ) void X11SalGraphics::drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap )
{ {
const SalDisplay* pSalDisp = GetDisplay(); const SalDisplay* pSalDisp = GetDisplay();
@ -455,24 +481,7 @@ void X11SalGraphics::drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rSa
{ {
// set foreground/background values for 1Bit bitmaps // set foreground/background values for 1Bit bitmaps
XGetGCValues( pXDisp, aGC, nValues, &aOldVal ); XGetGCValues( pXDisp, aGC, nValues, &aOldVal );
setForeBack(aNewVal, rColMap, rSalBitmap);
aNewVal.foreground = rColMap.GetWhitePixel();
aNewVal.background = rColMap.GetBlackPixel();
//fdo#33455 handle 1 bit depth pngs with palette entries
//to set fore/back colors
if (const BitmapBuffer* pBitmapBuffer = const_cast<SalBitmap&>(rSalBitmap).AcquireBuffer(true))
{
const BitmapPalette& rPalette = pBitmapBuffer->maPalette;
if (rPalette.GetEntryCount() == 2)
{
const BitmapColor aBlack( rPalette[rPalette.GetBestIndex( Color( COL_BLACK ) )] );
const BitmapColor aWhite( rPalette[rPalette.GetBestIndex( Color( COL_WHITE ) )] );
aNewVal.foreground = rColMap.GetPixel(ImplColorToSal(aWhite));
aNewVal.background = rColMap.GetPixel(ImplColorToSal(aBlack));
}
}
XChangeGC( pXDisp, aGC, nValues, &aNewVal ); XChangeGC( pXDisp, aGC, nValues, &aNewVal );
} }
@ -525,13 +534,12 @@ void X11SalGraphics::drawMaskedBitmap( const SalTwoRect& rPosAry,
{ {
GC aTmpGC; GC aTmpGC;
XGCValues aValues; XGCValues aValues;
const SalColormap& rColMap = pSalDisp->GetColormap( m_nXScreen ); setForeBack(aValues, pSalDisp->GetColormap(m_nXScreen), rSalBitmap);
const int nBlack = rColMap.GetBlackPixel(), nWhite = rColMap.GetWhitePixel();
const int nValues = GCFunction | GCForeground | GCBackground; const int nValues = GCFunction | GCForeground | GCBackground;
SalTwoRect aTmpRect( rPosAry ); aTmpRect.mnDestX = aTmpRect.mnDestY = 0; SalTwoRect aTmpRect( rPosAry ); aTmpRect.mnDestX = aTmpRect.mnDestY = 0;
// draw paint bitmap in pixmap #1 // draw paint bitmap in pixmap #1
aValues.function = GXcopy, aValues.foreground = nWhite, aValues.background = nBlack; aValues.function = GXcopy;
aTmpGC = XCreateGC( pXDisp, aFG, nValues, &aValues ); aTmpGC = XCreateGC( pXDisp, aFG, nValues, &aValues );
static_cast<const X11SalBitmap&>(rSalBitmap).ImplDraw( aFG, m_nXScreen, nDepth, aTmpRect, aTmpGC ); static_cast<const X11SalBitmap&>(rSalBitmap).ImplDraw( aFG, m_nXScreen, nDepth, aTmpRect, aTmpGC );
DBG_TESTTRANS( aFG ); DBG_TESTTRANS( aFG );