ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dwrite: Set fontface pointer and font size for returned color glyph run.

Browse Source 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2016-11-06 00:12:38 +03:00 committed by Alexandre Julliard
parent 1e8a706bc3
commit 9103ee4c66
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dlls/dwrite/font.c
View File

@ -5418,19 +5418,19 @@ HRESULT create_colorglyphenum(FLOAT originX, FLOAT originY, const DWRITE_GLYPH_R
{ {
struct dwrite_colorglyphenum *colorglyphenum; struct dwrite_colorglyphenum *colorglyphenum;
BOOL colorfont, has_colored_glyph; BOOL colorfont, has_colored_glyph;
IDWriteFontFace4 *fontface3; IDWriteFontFace4 *fontface;
HRESULT hr; HRESULT hr;
UINT32 i; UINT32 i;
*ret = NULL; *ret = NULL;
hr = IDWriteFontFace_QueryInterface(run->fontFace, &IID_IDWriteFontFace4, (void**)&fontface3); hr = IDWriteFontFace_QueryInterface(run->fontFace, &IID_IDWriteFontFace4, (void**)&fontface);
if (FAILED(hr)) { if (FAILED(hr)) {
WARN("failed to get IDWriteFontFace4, 0x%08x\n", hr); WARN("failed to get IDWriteFontFace4, 0x%08x\n", hr);
return hr; return hr;
} }
colorfont = IDWriteFontFace4_IsColorFont(fontface3) && IDWriteFontFace4_GetColorPaletteCount(fontface3) > palette; colorfont = IDWriteFontFace4_IsColorFont(fontface) && IDWriteFontFace4_GetColorPaletteCount(fontface) > palette;
if (!colorfont) { if (!colorfont) {
hr = DWRITE_E_NOCOLOR; hr = DWRITE_E_NOCOLOR;
goto failed; goto failed;
@ -5446,7 +5446,7 @@ HRESULT create_colorglyphenum(FLOAT originX, FLOAT originY, const DWRITE_GLYPH_R
colorglyphenum->ref = 1; colorglyphenum->ref = 1;
colorglyphenum->origin_x = originX; colorglyphenum->origin_x = originX;
colorglyphenum->origin_y = originY; colorglyphenum->origin_y = originY;
colorglyphenum->fontface = fontface3; colorglyphenum->fontface = fontface;
colorglyphenum->glyphs = NULL; colorglyphenum->glyphs = NULL;
colorglyphenum->run = *run; colorglyphenum->run = *run;
colorglyphenum->run.glyphIndices = NULL; colorglyphenum->run.glyphIndices = NULL;
@ -5455,7 +5455,7 @@ HRESULT create_colorglyphenum(FLOAT originX, FLOAT originY, const DWRITE_GLYPH_R
colorglyphenum->palette = palette; colorglyphenum->palette = palette;
memset(&colorglyphenum->colr, 0, sizeof(colorglyphenum->colr)); memset(&colorglyphenum->colr, 0, sizeof(colorglyphenum->colr));
colorglyphenum->colr.exists = TRUE; colorglyphenum->colr.exists = TRUE;
get_fontface_table(fontface3, MS_COLR_TAG, &colorglyphenum->colr); get_fontface_table(fontface, MS_COLR_TAG, &colorglyphenum->colr);
colorglyphenum->current_layer = 0; colorglyphenum->current_layer = 0;
colorglyphenum->max_layer_num = 0; colorglyphenum->max_layer_num = 0;
@ -5488,6 +5488,8 @@ HRESULT create_colorglyphenum(FLOAT originX, FLOAT originY, const DWRITE_GLYPH_R
memcpy(colorglyphenum->offsets, run->glyphOffsets, run->glyphCount * sizeof(*run->glyphOffsets)); memcpy(colorglyphenum->offsets, run->glyphOffsets, run->glyphCount * sizeof(*run->glyphOffsets));
} }
colorglyphenum->colorrun.glyphRun.fontFace = (IDWriteFontFace*)fontface;
colorglyphenum->colorrun.glyphRun.fontEmSize = run->fontEmSize;
colorglyphenum->colorrun.glyphRun.glyphIndices = colorglyphenum->glyphindices; colorglyphenum->colorrun.glyphRun.glyphIndices = colorglyphenum->glyphindices;
colorglyphenum->colorrun.glyphRun.glyphAdvances = colorglyphenum->color_advances; colorglyphenum->colorrun.glyphRun.glyphAdvances = colorglyphenum->color_advances;
colorglyphenum->colorrun.glyphRun.glyphOffsets = colorglyphenum->color_offsets; colorglyphenum->colorrun.glyphRun.glyphOffsets = colorglyphenum->color_offsets;
@ -5506,14 +5508,14 @@ HRESULT create_colorglyphenum(FLOAT originX, FLOAT originY, const DWRITE_GLYPH_R
switch (measuring_mode) switch (measuring_mode)
{ {
case DWRITE_MEASURING_MODE_NATURAL: case DWRITE_MEASURING_MODE_NATURAL:
hr = IDWriteFontFace4_GetDesignGlyphAdvances(fontface3, 1, run->glyphIndices + i, &a, run->isSideways); hr = IDWriteFontFace4_GetDesignGlyphAdvances(fontface, 1, run->glyphIndices + i, &a, run->isSideways);
if (FAILED(hr)) if (FAILED(hr))
a = 0; a = 0;
colorglyphenum->advances[i] = get_scaled_advance_width(a, run->fontEmSize, &metrics); colorglyphenum->advances[i] = get_scaled_advance_width(a, run->fontEmSize, &metrics);
break; break;
case DWRITE_MEASURING_MODE_GDI_CLASSIC: case DWRITE_MEASURING_MODE_GDI_CLASSIC:
case DWRITE_MEASURING_MODE_GDI_NATURAL: case DWRITE_MEASURING_MODE_GDI_NATURAL:
hr = IDWriteFontFace4_GetGdiCompatibleGlyphAdvances(fontface3, run->fontEmSize, 1.0f, transform, hr = IDWriteFontFace4_GetGdiCompatibleGlyphAdvances(fontface, run->fontEmSize, 1.0f, transform,
measuring_mode == DWRITE_MEASURING_MODE_GDI_NATURAL, run->isSideways, 1, run->glyphIndices + i, &a); measuring_mode == DWRITE_MEASURING_MODE_GDI_NATURAL, run->isSideways, 1, run->glyphIndices + i, &a);
if (FAILED(hr)) if (FAILED(hr))
colorglyphenum->advances[i] = 0.0f; colorglyphenum->advances[i] = 0.0f;
@ -5530,7 +5532,7 @@ HRESULT create_colorglyphenum(FLOAT originX, FLOAT originY, const DWRITE_GLYPH_R
return S_OK; return S_OK;
failed: failed:
IDWriteFontFace4_Release(fontface3); IDWriteFontFace4_Release(fontface);
return hr; return hr;
} }

8
dlls/dwrite/tests/font.c
View File

@ -5977,6 +5977,14 @@ static void test_TranslateColorGlyphRun(void)
if (!hasrun) if (!hasrun)
break; break;
hr = IDWriteColorGlyphRunEnumerator_GetCurrentRun(layers, &colorrun);
ok(hr == S_OK, "got 0x%08x\n", hr);
ok(colorrun->glyphRun.fontFace != NULL, "got fontface %p\n", colorrun->glyphRun.fontFace);
ok(colorrun->glyphRun.fontEmSize == 20.0f, "got wrong font size %f\n", colorrun->glyphRun.fontEmSize);
ok(colorrun->glyphRun.glyphCount > 0, "got wrong glyph count %u\n", colorrun->glyphRun.glyphCount);
ok(colorrun->glyphRun.glyphIndices != NULL, "got null glyph indices %p\n", colorrun->glyphRun.glyphIndices);
ok(colorrun->glyphRun.glyphAdvances != NULL, "got null glyph advances %p\n", colorrun->glyphRun.glyphAdvances);
} }
/* iterated all way through */ /* iterated all way through */