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/itga/itga.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/itga/itga.cxx')
| -rw-r--r-- | filter/source/graphicfilter/itga/itga.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/filter/source/graphicfilter/itga/itga.cxx b/filter/source/graphicfilter/itga/itga.cxx index b17c70a68fa6..e3967e9392e7 100644 --- a/filter/source/graphicfilter/itga/itga.cxx +++ b/filter/source/graphicfilter/itga/itga.cxx @@ -397,7 +397,7 @@ sal_Bool TGAReader::ImplReadBody() return sal_False; for ( sal_uInt16 i = 0; i < ( ( nRunCount & 0x7f ) + 1 ); i++ ) { - mpAcc->SetPixel( nY, nX, (sal_uInt8)nDummy ); + mpAcc->SetPixelIndex( nY, nX, nDummy ); nX += nXAdd; nXCount++; if ( nXCount == mpFileHeader->nImageWidth ) @@ -422,7 +422,7 @@ sal_Bool TGAReader::ImplReadBody() return sal_False; if ( nDummy >= mpFileHeader->nColorMapLength ) return sal_False; - mpAcc->SetPixel( nY, nX, (sal_uInt8)nDummy ); + mpAcc->SetPixelIndex( nY, nX, nDummy ); nX += nXAdd; nXCount++; if ( nXCount == mpFileHeader->nImageWidth ) @@ -658,7 +658,7 @@ sal_Bool TGAReader::ImplReadBody() return sal_False; if ( nDummy >= mpFileHeader->nColorMapLength ) return sal_False; - mpAcc->SetPixel( nY, nX, (sal_uInt8)nDummy ); + mpAcc->SetPixelIndex( nY, nX, nDummy ); } break; default: |