From 64f6c7a039b2ea8f0a29a8b0b67e22835605c18e Mon Sep 17 00:00:00 2001 From: James Larcombe Date: Thu, 29 Jul 2010 11:30:06 +0100 Subject: [PATCH] Windows print engine now prints correct glyphs for OpenType PS fonts. --- src/gui/painting/qprintengine_win.cpp | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gui/painting/qprintengine_win.cpp b/src/gui/painting/qprintengine_win.cpp index dd4de99..c091c2c 100644 --- a/src/gui/painting/qprintengine_win.cpp +++ b/src/gui/painting/qprintengine_win.cpp @@ -1646,17 +1646,17 @@ static void draw_text_item_win(const QPointF &pos, const QTextItemInt &ti, HDC h QFontEngineWin *winfe = (fe->type() == QFontEngine::Win) ? static_cast(fe) : 0; HFONT hfont; - bool ttf = false; + bool cmap = false; if (winfe) { hfont = winfe->hfont; - ttf = winfe->ttf; + cmap = winfe->cmap; } else { hfont = (HFONT)GetStockObject(ANSI_VAR_FONT); } HGDIOBJ old_font = SelectObject(hdc, hfont); - unsigned int options = (ttf && !convertToText) ? ETO_GLYPH_INDEX : 0; + unsigned int options = (cmap && !convertToText) ? ETO_GLYPH_INDEX : 0; wchar_t *convertedGlyphs = (wchar_t *)ti.chars; QGlyphLayout glyphs = ti.glyphs; -- 1.7.0.2.msysgit.0