Attachment 61550 Details for Bug 49826 – add substitute font name to GlobalParamsWin32

[patch] add substitute font name to GlobalParamsWin32

0003-add-sustitute-font-name-to-GlobalParamsWin32-to-fix-.patch (text/plain), 1.50 KB, created by Adrian Johnson on 2012-05-13 05:10:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adrian Johnson

Created: 2012-05-13 05:10:25 UTC

Size: 1.50 KB

patch

obsolete

>From 95088880bf6f75acb68f21acdd7970c71e7d6845 Mon Sep 17 00:00:00 2001
>From: Adrian Johnson <ajohnson@redneon.com>
>Date: Sun, 13 May 2012 21:36:36 +0930
>Subject: [PATCH 3/3] add sustitute font name to GlobalParamsWin32 to fix
> compilation
>
>---
> poppler/GlobalParamsWin.cc |    5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
>diff --git a/poppler/GlobalParamsWin.cc b/poppler/GlobalParamsWin.cc
>index d8065e0..b8c3d0c 100644
>--- a/poppler/GlobalParamsWin.cc
>+++ b/poppler/GlobalParamsWin.cc
>@@ -313,6 +313,7 @@ SysFontInfo *SysFontList::makeWindowsFont(char *name, int fontNum,
>   char c;
>   int i;
>   SysFontType type;
>+  GooString substituteName;
> 
>   n = strlen(name);
>   bold = italic = oblique = fixedWidth = gFalse;
>@@ -380,7 +381,7 @@ SysFontInfo *SysFontList::makeWindowsFont(char *name, int fontNum,
>   }
> 
>   return new SysFontInfo(s, bold, italic, oblique, fixedWidth,
>-                         new GooString(path), type, fontNum);
>+                         new GooString(path), type, fontNum, substituteName.copy());
> }
> 
> static GooString* replaceSuffix(GooString *path,
>@@ -570,6 +571,8 @@ GooString *GlobalParams::findSystemFontFile(GfxFont *font,
>     path = fi->path->copy();
>     *type = fi->type;
>     *fontNum = fi->fontNum;
>+    if (substituteFontName)
>+      substituteFontName.Set(fi->substituteName->getCString());
>   } else {
>     GooString *substFontName = new GooString(findSubstituteName(font, fontFiles,
>                                                                 substFiles,
>-- 
>1.7.9.5
>

Actions: View | Splinter Review

Attachments on bug 49826: 61475 | 61548 | 61550

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.