Allow configure script to run with clang-5, and fixed a minor

warning when compiling with clang++-5.
This commit is contained in:
Stephen Anthony 2017-02-10 21:32:58 -03:30
parent c0a3a5394d
commit c80f72b367
2 changed files with 1 additions and 2 deletions

2
configure vendored
View File

@ -389,7 +389,7 @@ if test "$have_clang" = yes; then
fi
case $cxx_version in
[3].[4-9]|[3].[4-9].[0-9]|[3].[4-9].[0-9][-.]*|[4].[0-9].[0-9])
[3].[4-9]|[3].[4-9].[0-9]|[3].[4-9].[0-9][-.]*|[4-9].[0-9].[0-9])
_cxx_major=`echo $cxx_version | cut -d '.' -f 1`
_cxx_minor=`echo $cxx_version | cut -d '.' -f 2`
cxx_version="$cxx_version, ok"

View File

@ -211,7 +211,6 @@ uInt32 TIASurface::enableScanlines(int relative, int absolute)
FBSurface::Attributes& attr = mySLineSurface->attributes();
if(relative == 0) attr.blendalpha = absolute;
else attr.blendalpha += relative;
attr.blendalpha = std::max(0u, attr.blendalpha);
attr.blendalpha = std::min(100u, attr.blendalpha);
mySLineSurface->applyAttributes();