Avoid some ambiguous calls to 'floor()' which were upsetting MSVC

This commit is contained in:
John Emmas
2014-03-21 18:24:36 +00:00
parent 2044c12b7b
commit abab819bb3

View File

@@ -592,7 +592,7 @@ FastMeter::vertical_expose (cairo_t* cr, cairo_rectangle_t* area)
last_peak_rect.width = pixwidth;
last_peak_rect.y = max(1, 1 + pixheight - (int) floor (pixheight * current_peak));
if (_styleflags & 2) { // LED stripes
last_peak_rect.y = max(0, 2 * (int) floor (last_peak_rect.y / 2));
last_peak_rect.y = max(0, (last_peak_rect.y & (~1)));
}
if (bright_hold || (_styleflags & 2)) {
last_peak_rect.height = max(0, min(3, pixheight - last_peak_rect.y - 1 ));
@@ -791,7 +791,7 @@ FastMeter::queue_vertical_redraw (const Glib::RefPtr<Gdk::Window>& win, float ol
rect.x = 1;
rect.y = max(1, 1 + pixheight - (int) floor (pixheight * current_peak));
if (_styleflags & 2) { // LED stripes
rect.y = max(0, 2 * (int) floor (rect.y / 2));
rect.y = max(0, (rect.y & (~1)));
}
if (bright_hold || (_styleflags & 2)) {
rect.height = max(0, min(3, pixheight - last_peak_rect.y -1 ));