Attachment 61548 Details for Bug 49826 – update win32 findSystemFontFile

[patch] update win32 findSystemFontFile

0002-Update-win32-findSystemFontFile-to-return-substitute.patch (text/plain), 1.12 KB, created by Adrian Johnson on 2012-05-13 04:58:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adrian Johnson

Created: 2012-05-13 04:58:46 UTC

Size: 1.12 KB

patch

obsolete

>From 282f9cace3b810941e50fb1be01ece6d330a8e73 Mon Sep 17 00:00:00 2001
>From: Adrian Johnson <ajohnson@redneon.com>
>Date: Sun, 13 May 2012 21:23:21 +0930
>Subject: [PATCH 2/2] Update win32 findSystemFontFile to return substitute
> font name
>
>---
> poppler/GlobalParams.cc |    4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
>diff --git a/poppler/GlobalParams.cc b/poppler/GlobalParams.cc
>index 098e4a4..5060450 100644
>--- a/poppler/GlobalParams.cc
>+++ b/poppler/GlobalParams.cc
>@@ -1407,7 +1407,7 @@ void GlobalParams::setupBaseFonts(char *dir) {
> 
> GooString *GlobalParams::findSystemFontFile(GfxFont *font,
> 					  SysFontType *type,
>-					  int *fontNum, GooString * /*substituteFontName*/,
>+					  int *fontNum, GooString *substituteFontName,
> 					  GooString * /*base14Name*/) {
>   SysFontInfo *fi;
>   GooString *path;
>@@ -1418,6 +1418,8 @@ GooString *GlobalParams::findSystemFontFile(GfxFont *font,
>     path = fi->path->copy();
>     *type = fi->type;
>     *fontNum = fi->fontNum;
>+    if (substituteFontName)
>+      substituteFontName.Set(fi->substituteName->getCString());
>   }
>   unlockGlobalParams; 
>   return path;
>-- 
>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.