diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-04-15 09:02:32 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-04-15 14:01:15 +0200 |
| commit | 52528a42892dbe7da7aad3bcf52971e02ec55999 (patch) | |
| tree | a2b879cd3ba368d72335a7954659f766d7e9e2f8 /extensions | |
| parent | ae3342857350c805f536c1af2f560a117be12da8 (diff) | |
loplugin:buriedassign in e*
Change-Id: Ibbf5b576296bb73e7066f2426bf2fa28739bb761
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92238
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/scanner/sane.cxx | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/extensions/source/scanner/sane.cxx b/extensions/source/scanner/sane.cxx index 0127db4a0926..9030e5697a09 100644 --- a/extensions/source/scanner/sane.cxx +++ b/extensions/source/scanner/sane.cxx @@ -546,24 +546,28 @@ bool Sane::Start( BitmapTransporter& rBitmap ) int nHeightMM = 0; double fTLx, fTLy, fResl = 0.0; int nOption; - if( ( nOption = GetOptionByName( "tl-x" ) ) != -1 && + nOption = GetOptionByName( "tl-x" ); + if( nOption != -1 && GetOptionValue( nOption, fTLx ) && GetOptionUnit( nOption ) == SANE_UNIT_MM ) { double fBRx; - if( ( nOption = GetOptionByName( "br-x" ) ) != -1 && + nOption = GetOptionByName( "br-x" ); + if( nOption != -1 && GetOptionValue( nOption, fBRx ) && GetOptionUnit( nOption ) == SANE_UNIT_MM ) { nWidthMM = static_cast<int>(fabs(fBRx - fTLx)); } } - if( ( nOption = GetOptionByName( "tl-y" ) ) != -1 && + nOption = GetOptionByName( "tl-y" ); + if( nOption != -1 && GetOptionValue( nOption, fTLy ) && GetOptionUnit( nOption ) == SANE_UNIT_MM ) { double fBRy; - if( ( nOption = GetOptionByName( "br-y" ) ) != -1 && + nOption = GetOptionByName( "br-y" ); + if( nOption != -1 && GetOptionValue( nOption, fBRy ) && GetOptionUnit( nOption ) == SANE_UNIT_MM ) { |