diff options
| author | Christian Lippka <christian.lippka@sun.com> | 2010-01-04 17:04:05 +0100 |
|---|---|---|
| committer | Christian Lippka <christian.lippka@sun.com> | 2010-01-04 17:04:05 +0100 |
| commit | 3107778b2e96dfe72298d9a7eda8eca59b789a12 (patch) | |
| tree | 209bea4af6dc7ece287ab35a7e870610c452fb4f /goodies | |
| parent | 0c5348ff2c5cede4607555fdab45642db10b07ba (diff) | |
| parent | 45e8e0fbee40f9a8d91f4c559c8bbb16dd7b3f36 (diff) | |
merging m68
Diffstat (limited to 'goodies')
| -rw-r--r-- | goodies/source/filter.vcl/ipbm/ipbm.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/goodies/source/filter.vcl/ipbm/ipbm.cxx b/goodies/source/filter.vcl/ipbm/ipbm.cxx index 227490fc9d8e..c0b0f6012116 100644 --- a/goodies/source/filter.vcl/ipbm/ipbm.cxx +++ b/goodies/source/filter.vcl/ipbm/ipbm.cxx @@ -106,7 +106,7 @@ BOOL PBMReader::ReadPBM( SvStream & rPBM, Graphic & rGraphic ) if ( ( mbStatus = ImplReadHeader() ) == FALSE ) return FALSE; - if ( mnWidth == 0 || mnHeight == 0 ) + if ( ( mnMaxVal == 0 ) || ( mnWidth == 0 ) || ( mnHeight == 0 ) ) return FALSE; // 0->PBM, 1->PGM, 2->PPM @@ -466,7 +466,9 @@ BOOL PBMReader::ImplReadBody() if ( nCount == 3 ) { nCount = 0; - mpAcc->SetPixel( nHeight, nWidth++, BitmapColor( (BYTE)nRGB[ 0 ], (BYTE)nRGB[ 1 ], (BYTE)nRGB[ 2 ] ) ); + mpAcc->SetPixel( nHeight, nWidth++, BitmapColor( static_cast< BYTE >( ( nRGB[ 0 ] * 255 ) / mnMaxVal ), + static_cast< BYTE >( ( nRGB[ 1 ] * 255 ) / mnMaxVal ), + static_cast< BYTE >( ( nRGB[ 2 ] * 255 ) / mnMaxVal ) ) ); nCount = 0; nRGB[ 0 ] = nRGB[ 1 ] = nRGB[ 2 ] = 0; if ( nWidth == mnWidth ) |