diff options
Diffstat (limited to 'filter/source/graphicfilter/itiff/itiff.cxx')
| -rw-r--r-- | filter/source/graphicfilter/itiff/itiff.cxx | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx index b5a127318923..4cb6400e1eea 100644 --- a/filter/source/graphicfilter/itiff/itiff.cxx +++ b/filter/source/graphicfilter/itiff/itiff.cxx @@ -871,7 +871,7 @@ sal_Bool TIFFReader::ConvertScanline( sal_uLong nY ) nLast = BYTESWAP( (sal_uInt8)*pt++ ); for ( nx = 0; nx < nImageWidth; nx++ ) { - pAcc->SetPixel( nY, nx, nLast ); + pAcc->SetPixelIndex( nY, nx, nLast ); nLast = nLast + *pt++; } } @@ -880,7 +880,7 @@ sal_Bool TIFFReader::ConvertScanline( sal_uLong nY ) for ( nx = 0; nx < nImageWidth; nx++ ) { nLast = *pt++; - pAcc->SetPixel( nY, nx, (sal_uInt8)( ( (BYTESWAP((sal_uLong)nLast ) - nMinSampleValue ) * nMinMax ) ) ); + pAcc->SetPixelIndex( nY, nx, static_cast<sal_uInt8>( (BYTESWAP((sal_uLong)nLast) - nMinSampleValue) * nMinMax ) ); } } } @@ -891,7 +891,7 @@ sal_Bool TIFFReader::ConvertScanline( sal_uLong nY ) nLast = *pt++; for ( nx = 0; nx < nImageWidth; nx++ ) { - pAcc->SetPixel( nY, nx, nLast ); + pAcc->SetPixelIndex( nY, nx, nLast ); nLast = nLast + *pt++; } } @@ -899,7 +899,7 @@ sal_Bool TIFFReader::ConvertScanline( sal_uLong nY ) { for ( nx = 0; nx < nImageWidth; nx++ ) { - pAcc->SetPixel( nY, nx, (sal_uInt8)( ( (sal_uLong)*pt++ - nMinSampleValue ) * nMinMax ) ); + pAcc->SetPixelIndex( nY, nx, static_cast<sal_uInt8>( ((sal_uLong)*pt++ - nMinSampleValue) * nMinMax ) ); } } @@ -917,7 +917,7 @@ sal_Bool TIFFReader::ConvertScanline( sal_uLong nY ) for ( nx = 0; nx < nImageWidth; nx++ ) { nVal = ( GetBits( pt, nx * nBitsPerSample, nBitsPerSample ) - nMinSampleValue ) * nMinMax; - pAcc->SetPixel( nY, nx, (sal_uInt8)nVal ); + pAcc->SetPixelIndex( nY, nx, static_cast<sal_uInt8>(nVal)); } } break; @@ -931,28 +931,28 @@ sal_Bool TIFFReader::ConvertScanline( sal_uLong nY ) while ( --nByteCount ) { nByteVal = *pt++; - pAcc->SetPixel( nY, nx++, nByteVal & 1 ); + pAcc->SetPixelIndex( nY, nx++, nByteVal & 1 ); nByteVal >>= 1; - pAcc->SetPixel( nY, nx++, nByteVal & 1 ); + pAcc->SetPixelIndex( nY, nx++, nByteVal & 1 ); nByteVal >>= 1; - pAcc->SetPixel( nY, nx++, nByteVal & 1 ); + pAcc->SetPixelIndex( nY, nx++, nByteVal & 1 ); nByteVal >>= 1; - pAcc->SetPixel( nY, nx++, nByteVal & 1 ); + pAcc->SetPixelIndex( nY, nx++, nByteVal & 1 ); nByteVal >>= 1; - pAcc->SetPixel( nY, nx++, nByteVal & 1 ); + pAcc->SetPixelIndex( nY, nx++, nByteVal & 1 ); nByteVal >>= 1; - pAcc->SetPixel( nY, nx++, nByteVal & 1 ); + pAcc->SetPixelIndex( nY, nx++, nByteVal & 1 ); nByteVal >>= 1; - pAcc->SetPixel( nY, nx++, nByteVal & 1 ); + pAcc->SetPixelIndex( nY, nx++, nByteVal & 1 ); nByteVal >>= 1; - pAcc->SetPixel( nY, nx++, nByteVal ); + pAcc->SetPixelIndex( nY, nx++, nByteVal ); } if ( nImageWidth & 7 ) { nByteVal = *pt++; while ( nx < nImageWidth ) { - pAcc->SetPixel( nY, nx++, nByteVal & 1 ); + pAcc->SetPixelIndex( nY, nx++, nByteVal & 1 ); nByteVal >>= 1; } } @@ -964,21 +964,21 @@ sal_Bool TIFFReader::ConvertScanline( sal_uLong nY ) while ( --nByteCount ) { nByteVal = *pt++; - pAcc->SetPixel( nY, nx, nByteVal & 1 ); + pAcc->SetPixelIndex( nY, nx, nByteVal & 1 ); nByteVal >>= 1; - pAcc->SetPixel( nY, --nx, nByteVal & 1 ); + pAcc->SetPixelIndex( nY, --nx, nByteVal & 1 ); nByteVal >>= 1; - pAcc->SetPixel( nY, --nx, nByteVal & 1 ); + pAcc->SetPixelIndex( nY, --nx, nByteVal & 1 ); nByteVal >>= 1; - pAcc->SetPixel( nY, --nx, nByteVal & 1 ); + pAcc->SetPixelIndex( nY, --nx, nByteVal & 1 ); nByteVal >>= 1; - pAcc->SetPixel( nY, --nx, nByteVal & 1 ); + pAcc->SetPixelIndex( nY, --nx, nByteVal & 1 ); nByteVal >>= 1; - pAcc->SetPixel( nY, --nx, nByteVal & 1 ); + pAcc->SetPixelIndex( nY, --nx, nByteVal & 1 ); nByteVal >>= 1; - pAcc->SetPixel( nY, --nx, nByteVal & 1 ); + pAcc->SetPixelIndex( nY, --nx, nByteVal & 1 ); nByteVal >>= 1; - pAcc->SetPixel( nY, --nx, nByteVal ); + pAcc->SetPixelIndex( nY, --nx, nByteVal ); nx += 15; } if ( nImageWidth & 7 ) @@ -988,7 +988,7 @@ sal_Bool TIFFReader::ConvertScanline( sal_uLong nY ) nShift = 7; while ( nx < nImageWidth ) { - pAcc->SetPixel( nY, nx++, ( nByteVal >> nShift ) & 1); + pAcc->SetPixelIndex( nY, nx++, ( nByteVal >> nShift ) & 1); } } } @@ -1011,7 +1011,7 @@ sal_Bool TIFFReader::ConvertScanline( sal_uLong nY ) pt++; for ( nx = 0; nx < nImageWidth; nx++, pt += 2 ) { - pAcc->SetPixel( nY, nx, (sal_uInt8)( ( (sal_uLong)*pt - nMinSampleValue ) * nMinMax ) ); + pAcc->SetPixelIndex( nY, nx, static_cast<sal_uInt8>( ((sal_uLong)*pt - nMinSampleValue) * nMinMax) ); } } } |