summaryrefslogtreecommitdiffstats
path: root/src/libnrtype
diff options
context:
space:
mode:
authorRichard Hughes <cyreve@gmail.com>2006-02-10 20:41:45 +0000
committercyreve <cyreve@users.sourceforge.net>2006-02-10 20:41:45 +0000
commit5fee34c46fc2144c310213eed820931441e8846c (patch)
tree5bac10c8c248da6f5da51447aa16c80757f35ad0 /src/libnrtype
parentnew files (diff)
downloadinkscape-5fee34c46fc2144c310213eed820931441e8846c.tar.gz
inkscape-5fee34c46fc2144c310213eed820931441e8846c.zip
bug 1412947: crash with some (non-truetype?) fonts
(bzr r115)
Diffstat (limited to 'src/libnrtype')
-rw-r--r--src/libnrtype/FontInstance.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libnrtype/FontInstance.cpp b/src/libnrtype/FontInstance.cpp
index d2b19d0f2..190bbb19f 100644
--- a/src/libnrtype/FontInstance.cpp
+++ b/src/libnrtype/FontInstance.cpp
@@ -349,7 +349,8 @@ void font_instance::InitTheFace()
SelectObject(daddy->hScreenDC,theFace);
#else
theFace=pango_ft2_font_get_face(pFont);
- FT_Select_Charmap(theFace,ft_encoding_unicode) && FT_Select_Charmap(theFace,ft_encoding_symbol);
+ if ( theFace )
+ FT_Select_Charmap(theFace,ft_encoding_unicode) && FT_Select_Charmap(theFace,ft_encoding_symbol);
#endif
}