From 20c9b985f1727402dc96c2e9d8a4a2f6d8a121db Mon Sep 17 00:00:00 2001
From: nyamatongwe <devnull@localhost>
Date: Thu, 1 Mar 2012 10:12:25 +1100
Subject: Bug #3494492. Change aveCharWidth in FontMeasurements to actually
 store fractional width. This change complements change set 3994.

Make WidthText() and AverageCharWidth() actually return fractional widths
under Direct2D.

From Marko Njezic.
---
 win32/PlatWin.cxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'win32')

diff --git a/win32/PlatWin.cxx b/win32/PlatWin.cxx
index 61e8b34d5..baa2e9ef5 100644
--- a/win32/PlatWin.cxx
+++ b/win32/PlatWin.cxx
@@ -1611,7 +1611,7 @@ XYPOSITION SurfaceD2D::WidthText(Font &font_, const char *s, int len) {
 			pTextLayout->Release();
 		}
 	}
-	return int(width + 0.5);
+	return width;
 }
 
 void SurfaceD2D::MeasureWidths(Font &font_, const char *s, int len, XYPOSITION *positions) {
@@ -1754,7 +1754,7 @@ XYPOSITION SurfaceD2D::AverageCharWidth(Font &font_) {
 			pTextLayout->Release();
 		}
 	}
-	return int(width + 0.5);
+	return width;
 }
 
 void SurfaceD2D::SetClip(PRectangle rc) {
-- 
cgit v1.2.3