diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-11 08:47:15 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-15 07:26:17 +0100 |
| commit | 7d8e94444d989d0ac4a4055b207726708e9ec0da (patch) | |
| tree | ce3e4a09ed7932496c4d901360ff23787c8f6e24 /vcl/workben | |
| parent | 80fb8d406ced47e6a2089f0c8ba5c103d2fec91f (diff) | |
convert a<b?a:b to std::min(a,b)
with something like
git grep -nP '(.*)\s*<\s*(.*)\s*\?\s*\g1\s*:\s*\g2' -- *.?xx
Change-Id: Id5078b35961847feb78a66204fdb7598ee63fd23
Note: we also convert a>b?b:a
Reviewed-on: https://gerrit.libreoffice.org/47736
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/workben')
| -rw-r--r-- | vcl/workben/svptest.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vcl/workben/svptest.cxx b/vcl/workben/svptest.cxx index 21a6a86d20fe..e1d36cfe46b7 100644 --- a/vcl/workben/svptest.cxx +++ b/vcl/workben/svptest.cxx @@ -152,12 +152,12 @@ static Color approachColor( const Color& rFrom, const Color& rTo ) if( rFrom.GetRed() < rTo.GetRed() ) { nDiff = rTo.GetRed() - rFrom.GetRed(); - aColor.SetRed( rFrom.GetRed() + ( nDiff < 10 ? nDiff : 10 ) ); + aColor.SetRed( rFrom.GetRed() + std::min<sal_uInt8>( nDiff, 10 ) ); } else if( rFrom.GetRed() > rTo.GetRed() ) { nDiff = rFrom.GetRed() - rTo.GetRed(); - aColor.SetRed( rFrom.GetRed() - ( nDiff < 10 ? nDiff : 10 ) ); + aColor.SetRed( rFrom.GetRed() - std::min<sal_uInt8>( nDiff, 10 ) ); } else aColor.SetRed( rFrom.GetRed() ); @@ -166,12 +166,12 @@ static Color approachColor( const Color& rFrom, const Color& rTo ) if( rFrom.GetGreen() < rTo.GetGreen() ) { nDiff = rTo.GetGreen() - rFrom.GetGreen(); - aColor.SetGreen( rFrom.GetGreen() + ( nDiff < 10 ? nDiff : 10 ) ); + aColor.SetGreen( rFrom.GetGreen() + std::min<sal_uInt8>( nDiff, 10 ) ); } else if( rFrom.GetGreen() > rTo.GetGreen() ) { nDiff = rFrom.GetGreen() - rTo.GetGreen(); - aColor.SetGreen( rFrom.GetGreen() - ( nDiff < 10 ? nDiff : 10 ) ); + aColor.SetGreen( rFrom.GetGreen() - std::min<sal_uInt8>( nDiff, 10 ) ); } else aColor.SetGreen( rFrom.GetGreen() ); @@ -180,12 +180,12 @@ static Color approachColor( const Color& rFrom, const Color& rTo ) if( rFrom.GetBlue() < rTo.GetBlue() ) { nDiff = rTo.GetBlue() - rFrom.GetBlue(); - aColor.SetBlue( rFrom.GetBlue() + ( nDiff < 10 ? nDiff : 10 ) ); + aColor.SetBlue( rFrom.GetBlue() + std::min<sal_uInt8>( nDiff, 10 ) ); } else if( rFrom.GetBlue() > rTo.GetBlue() ) { nDiff = rFrom.GetBlue() - rTo.GetBlue(); - aColor.SetBlue( rFrom.GetBlue() - ( nDiff < 10 ? nDiff : 10 ) ); + aColor.SetBlue( rFrom.GetBlue() - std::min<sal_uInt8>( nDiff, 10 ) ); } else aColor.SetBlue( rFrom.GetBlue() ); |