diff options
| author | Herbert Dürr <hdu@apache.org> | 2012-10-19 15:12:40 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-05-09 11:18:22 +0100 |
| commit | 78eca44c4db67848a85b600cc40e25d41bb647df (patch) | |
| tree | 70b9352af07b4ac4678d44aaa88031eb5c225be7 /filter/source/graphicfilter/expm/expm.cxx | |
| parent | aa0bc15b42e8d432def185089ea8fca17f3fd8c8 (diff) | |
make conversions between BitmapColor and sal_uInt8 explicit
Implicit conversions are a dangerous cause of confusion as seen
in http://markmail.org/thread/a4copx2di7cxeowg and require tricky
rewrites to work around them, this change cleans them up and
disables them.
(cherry picked from commit 2d9d5c8d6beb7fb0a7dafa0c1c4d10a25d7200fd)
Conflicts:
filter/source/graphicfilter/egif/egif.cxx
filter/source/graphicfilter/epbm/epbm.cxx
filter/source/graphicfilter/epgm/epgm.cxx
filter/source/graphicfilter/ipbm/ipbm.cxx
filter/source/graphicfilter/ipsd/ipsd.cxx
sd/source/ui/slidesorter/view/SlsButtonBar.cxx
svtools/source/filter/igif/gifread.cxx
svtools/source/filter/jpeg/jpeg.cxx
svtools/source/filter/wmf/winwmf.cxx
svtools/source/graphic/grfmgr2.cxx
vcl/inc/vcl/bmpacc.hxx
vcl/inc/vcl/salbtype.hxx
vcl/source/gdi/bitmap.cxx
vcl/source/gdi/bitmap3.cxx
vcl/source/gdi/outdev2.cxx
Change-Id: I1d163c66782c2750aeee00725dbb2b614507c0d4
(cherry picked from commit ff80c37b18b941712fb967a0c1d48813b47c0583)
Diffstat (limited to 'filter/source/graphicfilter/expm/expm.cxx')
| -rw-r--r-- | filter/source/graphicfilter/expm/expm.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/filter/source/graphicfilter/expm/expm.cxx b/filter/source/graphicfilter/expm/expm.cxx index 7af3eca251eb..451ad2e63ee5 100644 --- a/filter/source/graphicfilter/expm/expm.cxx +++ b/filter/source/graphicfilter/expm/expm.cxx @@ -170,7 +170,7 @@ void XPMWriter::ImplWritePalette() sal_uInt16 nTransIndex = 0xffff; if ( mbTrans ) - nTransIndex = mpAcc->GetBestMatchingColor( BMP_COL_TRANS ); + nTransIndex = mpAcc->GetBestPaletteIndex( BMP_COL_TRANS ); for ( sal_uInt16 i = 0; i < mnColors; i++ ) { m_rOStm << "\x22"; @@ -196,7 +196,7 @@ void XPMWriter::ImplWriteBody() m_rOStm << (sal_uInt8)0x22; for ( sal_uLong x = 0; x < mnWidth; x++ ) { - ImplWritePixel( (sal_uInt8)(mpAcc->GetPixel( y, x ) ) ); + ImplWritePixel( mpAcc->GetPixelIndex( y, x ) ); } m_rOStm << "\x22,\x0a"; } |