diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-07-28 10:07:50 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-07-28 12:26:30 +0200 |
| commit | 73301934b4a1861d751724e8153fbb4fb26912b9 (patch) | |
| tree | 8e7e43ed07b3c0ce3bdcf48eeaded017415f0d12 /filter | |
| parent | b78c398817940bbbe0b9ebe848a923cef1856758 (diff) | |
ofz#2766 ensure palette is large enough for all colors
Change-Id: I4669b473f5975ac74a37025f7c936f13bcfea420
Reviewed-on: https://gerrit.libreoffice.org/40512
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/graphicfilter/itiff/itiff.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx index af1707379a44..20e4ce45fcd4 100644 --- a/filter/source/graphicfilter/itiff/itiff.cxx +++ b/filter/source/graphicfilter/itiff/itiff.cxx @@ -1128,7 +1128,6 @@ void TIFFReader::MakePalCol() nNumColors = nLargestPixelIndex + 1; } - pAcc->SetPaletteEntryCount(nNumColors); for (sal_uInt32 i = 0; i < nNumColors; ++i) { sal_uInt32 nVal = ( i * 255 / ( nNumColors - 1 ) ) & 0xff; @@ -1139,6 +1138,7 @@ void TIFFReader::MakePalCol() xColorMap[nNumColors - i - 1] = n0RGB; } } + pAcc->SetPaletteEntryCount(std::max<sal_uInt16>(nNumColors, pAcc->GetPaletteEntryCount())); for (sal_uInt32 i = 0; i < nNumColors; ++i) { pAcc->SetPaletteColor(i, BitmapColor( (sal_uInt8)( xColorMap[ i ] >> 16 ), |