More effort to fix the macOS issue.  This could potentially result
in slight problens with the rightmost pixel, but will protect
against any weird FP issues and -ffast-math concerns.