GeoDiamondSurface+GeoTrapezoidSurface: fixed cppcheck warnings

Logical conjunction always evaluates to false

Related to #119

mentioned in issue #119

added 2 commits

• 95b2ae18 - 1 commit from branch main
• dfc8ae24 - GeoDiamondSurface+GeoTrapezoidSurface: fixed cppcheck warnings

Compare with previous version

enabled an automatic merge when all merge checks for dfc8ae24 pass

canceled the automatic merge

added 1 commit

• f6bf2c43 - GeoDiamondSurface+GeoTrapezoidSurface: fixed cppcheck warnings

Compare with previous version

enabled an automatic merge when all merge checks for f6bf2c43 pass

merged