diff options
| author | Marcos Paulo de Souza <marcos.souza.org@gmail.com> | 2013-04-11 00:21:40 -0300 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-04-20 11:09:54 +0000 |
| commit | 0f200cc30ea75fdce59f7bb6ae87ebc85729e2a4 (patch) | |
| tree | 2e2c28f9500f81825cdadcbabd131da767ddbb49 /filter | |
| parent | 5414a3eecdb09be928313477792acfe1d3534645 (diff) | |
fdo#63154: Change Min/Max/Abs for std::min/max/abs
Now all these usages were removed from LO.
Change-Id: I8a7233db20abdcdbb18428ad4004c78cc516a0e6
Reviewed-on: https://gerrit.libreoffice.org/3326
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/flash/swfwriter1.cxx | 2 | ||||
| -rw-r--r-- | filter/source/graphicfilter/itiff/itiff.cxx | 18 | ||||
| -rw-r--r-- | filter/source/svg/svgwriter.cxx | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx index a4ab343098e4..abfb3d398644 100644 --- a/filter/source/flash/swfwriter1.cxx +++ b/filter/source/flash/swfwriter1.cxx @@ -694,7 +694,7 @@ void Writer::Impl_writeText( const Point& rPos, const String& rText, const sal_I if( ( aOldFont.GetStrikeout() != STRIKEOUT_NONE ) || ( aOldFont.GetUnderline() != UNDERLINE_NONE ) ) { Polygon aPoly( 4 ); - const long nLineHeight = Max( (long) FRound( aMetric.GetLineHeight() * 0.05 ), (long) 1 ); + const long nLineHeight = std::max( (long) FRound( aMetric.GetLineHeight() * 0.05 ), (long) 1 ); if( aOldFont.GetStrikeout() != STRIKEOUT_NONE ) { diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx index c72efcd1fdbf..a0543a00f6ed 100644 --- a/filter/source/graphicfilter/itiff/itiff.cxx +++ b/filter/source/graphicfilter/itiff/itiff.cxx @@ -854,11 +854,11 @@ sal_Bool TIFFReader::ConvertScanline( sal_uLong nY ) } } nBlack = nSamp[ 3 ]; - nRed = (sal_uInt8) Max( 0L, 255L - ( ( (long) nSamp[ 0 ] + nBlack - ( ( (long) nMinSampleValue ) << 1 ) ) * + nRed = (sal_uInt8) std::max( 0L, 255L - ( ( (long) nSamp[ 0 ] + nBlack - ( ( (long) nMinSampleValue ) << 1 ) ) * 255L/(long)(nMaxSampleValue-nMinSampleValue) ) ); - nGreen = (sal_uInt8) Max( 0L, 255L - ( ( (long) nSamp[ 1 ] + nBlack - ( ( (long) nMinSampleValue ) << 1 ) ) * + nGreen = (sal_uInt8) std::max( 0L, 255L - ( ( (long) nSamp[ 1 ] + nBlack - ( ( (long) nMinSampleValue ) << 1 ) ) * 255L/(long)(nMaxSampleValue-nMinSampleValue) ) ); - nBlue = (sal_uInt8) Max( 0L, 255L - ( ( (long) nSamp[ 2 ] + nBlack - ( ( (long) nMinSampleValue ) << 1 ) ) * + nBlue = (sal_uInt8) std::max( 0L, 255L - ( ( (long) nSamp[ 2 ] + nBlack - ( ( (long) nMinSampleValue ) << 1 ) ) * 255L/(long)(nMaxSampleValue-nMinSampleValue) ) ); pAcc->SetPixel( nY, nx, Color ( (sal_uInt8)nRed, (sal_uInt8)nGreen, (sal_uInt8)nBlue ) ); } @@ -1156,7 +1156,7 @@ sal_Bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic ) pTIFF->ResetError(); break; }; - nMaxPos = Max( pTIFF->Tell(), nMaxPos ); + nMaxPos = std::max( pTIFF->Tell(), nMaxPos ); *pTIFF >> nNumTags; @@ -1166,15 +1166,15 @@ sal_Bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic ) *pTIFF >> nTagType >> nDataType >> nDataLen >> nOffset; if( DataTypeSize() * nDataLen > 4 ) - nMaxPos = Max( nOrigPos + nOffset + DataTypeSize() * nDataLen, nMaxPos ); + nMaxPos = std::max( nOrigPos + nOffset + DataTypeSize() * nDataLen, nMaxPos ); } *pTIFF >> nOffset; if ( pTIFF->IsEof() ) nOffset = 0; - nMaxPos = Max( pTIFF->Tell(), nMaxPos ); + nMaxPos = std::max( pTIFF->Tell(), nMaxPos ); if ( !nOffset ) - nMaxPos = Max( pTIFF->Tell(), nMaxPos ); + nMaxPos = std::max( pTIFF->Tell(), nMaxPos ); } while( nOffset ); @@ -1301,9 +1301,9 @@ sal_Bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic ) if ( bStatus && ReadMap( 10, 60 ) ) { - nMaxPos = Max( pTIFF->Tell(), nMaxPos ); + nMaxPos = std::max( pTIFF->Tell(), nMaxPos ); MakePalCol(); - nMaxPos = Max( pTIFF->Tell(), nMaxPos ); + nMaxPos = std::max( pTIFF->Tell(), nMaxPos ); } else bStatus = sal_False; diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx index 80cd9ca509d9..a223a2b9f9c3 100644 --- a/filter/source/svg/svgwriter.cxx +++ b/filter/source/svg/svgwriter.cxx @@ -2706,7 +2706,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText, if( rFont.GetStrikeout() != STRIKEOUT_NONE || rFont.GetUnderline() != UNDERLINE_NONE ) { Polygon aPoly( 4 ); - const long nLineHeight = Max( (long) FRound( aMetric.GetLineHeight() * 0.05 ), (long) 1 ); + const long nLineHeight = std::max( (long) FRound( aMetric.GetLineHeight() * 0.05 ), (long) 1 ); if( rFont.GetStrikeout() ) { |