From: Vincent van Ravesteijn <vfr@lyx.org>
Date: Sun, 13 Mar 2011 21:06:16 +0000 (+0000)
Subject: *rowpainter.cpp: Squeeze warnings.
X-Git-Tag: 2.0.0~531
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=6cb775b1346278f54958f3f5b7eb5344b12429dd;p=features.git

*rowpainter.cpp: Squeeze warnings.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37919 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/rowpainter.cpp b/src/rowpainter.cpp
index 7625909e50..bcbf6da6fb 100644
--- a/src/rowpainter.cpp
+++ b/src/rowpainter.cpp
@@ -378,10 +378,10 @@ void RowPainter::paintMisspelledMark(double orig_x, bool changed)
 {
 	// if changed the misspelled marker gets placed slightly lower than normal
 	// to avoid drawing at the same vertical offset
-	int const y = yo_ + solid_line_offset_ + solid_line_thickness_
+	float const y = yo_ + solid_line_offset_ + solid_line_thickness_
 		+ (changed ? solid_line_thickness_ + 1 : 0)
 		+ dotted_line_offset_;
-	pi_.pain.line(int(orig_x), y, int(x_), y, Color_error,
+	pi_.pain.line(int(orig_x), int(y), int(x_), int(y), Color_error,
 		Painter::line_onoffdash, dotted_line_thickness_);
 }
 
@@ -893,9 +893,9 @@ void RowPainter::paintText()
 			// Calculate 1/3 height of the buffer's default font
 			FontMetrics const & fm
 				= theFontMetrics(pi_.base.bv->buffer().params().getFont());
-			int const y_bar = change_running.deleted() ?
+			float const y_bar = change_running.deleted() ?
 				yo_ - fm.maxAscent() / 3 : yo_ + 2 * solid_line_offset_ + solid_line_thickness_;
-			pi_.pain.line(change_last_x, y_bar, int(x_), y_bar,
+			pi_.pain.line(change_last_x, int(y_bar), int(x_), int(y_bar),
 				change_running.color(), Painter::line_solid, solid_line_thickness_);
 
 			// Change might continue with a different author or type
@@ -953,9 +953,9 @@ void RowPainter::paintText()
 	if (change_running.changed()) {
 		FontMetrics const & fm
 			= theFontMetrics(pi_.base.bv->buffer().params().getFont());
-		int const y_bar = change_running.deleted() ?
+		float const y_bar = change_running.deleted() ?
 				yo_ - fm.maxAscent() / 3 : yo_ + 2 * solid_line_offset_ + solid_line_thickness_;
-		pi_.pain.line(change_last_x, y_bar, int(x_), y_bar,
+		pi_.pain.line(change_last_x, int(y_bar), int(x_), int(y_bar),
 			change_running.color(), Painter::line_solid, solid_line_thickness_);
 		change_running.setUnchanged();
 	}