Skip to content
Browse files

Port r46551 (PR##12931) from trunk.

git-svn-id: https://svn.r-project.org/R/branches/R-2-7-branch@46552 00db46b3-68df-0310-9c12-caf00c1e9a41
  • Loading branch information...
1 parent d902f0b commit 144cc43cc2e0d0c1087ef232b3c4b88bed129bcd murdoch committed Sep 20, 2008
Showing with 4 additions and 2 deletions.
  1. +3 −0 src/gnuwin32/CHANGES
  2. +1 −2 src/library/grDevices/src/devWindows.c
View
3 src/gnuwin32/CHANGES
@@ -38,6 +38,9 @@ BUG FIXES
o The clip region was sometimes wrong when printing from the
menu on a windows() graphics device (in 2.7.2 only).
+ o The windows() device would sometimes ignore font family
+ requests (PR#12931).
+
CHANGES IN R VERSION 2.7.2
View
3 src/library/grDevices/src/devWindows.c
@@ -617,14 +617,13 @@ static void SetFont(pGEcontext gc, double rot, gadesc *xd)
xd->font = gnewfont(xd->gawin,
fontfamily, fontstyle[face - 1],
size, rot, usePoints);
- if (xd->font)
- strcpy(xd->fontfamily, gc->fontfamily);
} else {
xd->font = gnewfont(xd->gawin,
fontname[face - 1], fontstyle[face - 1],
size, rot, usePoints);
}
if (xd->font) {
+ strcpy(xd->fontfamily, gc->fontfamily);
xd->fontface = face;
xd->fontsize = size;
xd->fontangle = rot;

0 comments on commit 144cc43

Please sign in to comment.
Something went wrong with that request. Please try again.