aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/w32font.c8
2 files changed, 9 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 5bfa1afae71..3f0c3246c33 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12008-03-11 Jason Rumney <jasonr@gnu.org>
2
3 * w32font.c (w32font_full_name): Use floor to round.
4
12008-03-10 dhruva <dhruvakm@gmail.com> (tiny change) 52008-03-10 dhruva <dhruvakm@gmail.com> (tiny change)
2 6
3 * sound.c (alsa_configure): Declare vol at beginning of block. 7 * sound.c (alsa_configure): Declare vol at beginning of block.
diff --git a/src/w32font.c b/src/w32font.c
index 10c2ab99ba9..baf5e9a2ba2 100644
--- a/src/w32font.c
+++ b/src/w32font.c
@@ -783,8 +783,9 @@ w32font_open_internal (f, font_entity, pixel_size, w32_font)
783 783
784 GetTextMetrics (dc, &w32_font->metrics); 784 GetTextMetrics (dc, &w32_font->metrics);
785 785
786 /* Cache ASCII metrics. */
787 w32_font->glyph_idx = ETO_GLYPH_INDEX; 786 w32_font->glyph_idx = ETO_GLYPH_INDEX;
787
788 /* Cache ASCII metrics. */
788 recompute_cached_metrics (dc, w32_font); 789 recompute_cached_metrics (dc, w32_font);
789 790
790 SelectObject (dc, old_font); 791 SelectObject (dc, old_font);
@@ -1717,8 +1718,9 @@ w32font_full_name (font, font_obj, pixel_size, name, nbytes)
1717 if (outline) 1718 if (outline)
1718 { 1719 {
1719 float pointsize = height * 72.0 / one_w32_display_info.resy; 1720 float pointsize = height * 72.0 / one_w32_display_info.resy;
1720 /* Round to nearest half point. */ 1721 /* Round to nearest half point. floor is used, since round is not
1721 pointsize = round (pointsize * 2) / 2; 1722 supported in MS library. */
1723 pointsize = floor (pointsize * 2 + 0.5) / 2;
1722 p += sprintf (p, "-%1.1f", pointsize); 1724 p += sprintf (p, "-%1.1f", pointsize);
1723 } 1725 }
1724 else 1726 else