dwrite: Simplify requested texture type validation in IDWriteGlyphRunAnalysis.
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
ac793e5503
commit
a46b81a478
|
@ -167,6 +167,7 @@ struct dwrite_glyphrunanalysis {
|
||||||
LONG ref;
|
LONG ref;
|
||||||
|
|
||||||
DWRITE_RENDERING_MODE1 rendering_mode;
|
DWRITE_RENDERING_MODE1 rendering_mode;
|
||||||
|
DWRITE_TEXTURE_TYPE texture_type; /* derived from rendering mode specified on creation */
|
||||||
DWRITE_GLYPH_RUN run; /* glyphAdvances and glyphOffsets are not used */
|
DWRITE_GLYPH_RUN run; /* glyphAdvances and glyphOffsets are not used */
|
||||||
DWRITE_MATRIX m;
|
DWRITE_MATRIX m;
|
||||||
FLOAT ppdip;
|
FLOAT ppdip;
|
||||||
|
@ -4874,8 +4875,7 @@ static HRESULT WINAPI glyphrunanalysis_GetAlphaTextureBounds(IDWriteGlyphRunAnal
|
||||||
return E_INVALIDARG;
|
return E_INVALIDARG;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((type == DWRITE_TEXTURE_ALIASED_1x1 && This->rendering_mode != DWRITE_RENDERING_MODE1_ALIASED) ||
|
if (type != This->texture_type) {
|
||||||
(type == DWRITE_TEXTURE_CLEARTYPE_3x1 && This->rendering_mode == DWRITE_RENDERING_MODE1_ALIASED)) {
|
|
||||||
memset(bounds, 0, sizeof(*bounds));
|
memset(bounds, 0, sizeof(*bounds));
|
||||||
return S_OK;
|
return S_OK;
|
||||||
}
|
}
|
||||||
|
@ -5059,24 +5059,9 @@ static HRESULT WINAPI glyphrunanalysis_CreateAlphaTexture(IDWriteGlyphRunAnalysi
|
||||||
if (size < required)
|
if (size < required)
|
||||||
return E_NOT_SUFFICIENT_BUFFER;
|
return E_NOT_SUFFICIENT_BUFFER;
|
||||||
|
|
||||||
/* validate requested texture type with rendering mode */
|
/* validate requested texture type */
|
||||||
switch (This->rendering_mode)
|
if (This->texture_type != type)
|
||||||
{
|
return DWRITE_E_UNSUPPORTEDOPERATION;
|
||||||
case DWRITE_RENDERING_MODE1_ALIASED:
|
|
||||||
if (type != DWRITE_TEXTURE_ALIASED_1x1)
|
|
||||||
return DWRITE_E_UNSUPPORTEDOPERATION;
|
|
||||||
break;
|
|
||||||
case DWRITE_RENDERING_MODE1_GDI_CLASSIC:
|
|
||||||
case DWRITE_RENDERING_MODE1_GDI_NATURAL:
|
|
||||||
case DWRITE_RENDERING_MODE1_NATURAL:
|
|
||||||
case DWRITE_RENDERING_MODE1_NATURAL_SYMMETRIC:
|
|
||||||
case DWRITE_RENDERING_MODE1_NATURAL_SYMMETRIC_DOWNSAMPLED:
|
|
||||||
if (type != DWRITE_TEXTURE_CLEARTYPE_3x1)
|
|
||||||
return DWRITE_E_UNSUPPORTEDOPERATION;
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
;
|
|
||||||
}
|
|
||||||
|
|
||||||
memset(bitmap, 0, size);
|
memset(bitmap, 0, size);
|
||||||
glyphrunanalysis_get_texturebounds(This, &runbounds);
|
glyphrunanalysis_get_texturebounds(This, &runbounds);
|
||||||
|
@ -5197,6 +5182,12 @@ HRESULT create_glyphrunanalysis(const struct glyphrunanalysis_desc *desc, IDWrit
|
||||||
analysis->IDWriteGlyphRunAnalysis_iface.lpVtbl = &glyphrunanalysisvtbl;
|
analysis->IDWriteGlyphRunAnalysis_iface.lpVtbl = &glyphrunanalysisvtbl;
|
||||||
analysis->ref = 1;
|
analysis->ref = 1;
|
||||||
analysis->rendering_mode = desc->rendering_mode;
|
analysis->rendering_mode = desc->rendering_mode;
|
||||||
|
|
||||||
|
if (desc->rendering_mode == DWRITE_RENDERING_MODE1_ALIASED)
|
||||||
|
analysis->texture_type = DWRITE_TEXTURE_ALIASED_1x1;
|
||||||
|
else
|
||||||
|
analysis->texture_type = DWRITE_TEXTURE_CLEARTYPE_3x1;
|
||||||
|
|
||||||
analysis->flags = 0;
|
analysis->flags = 0;
|
||||||
analysis->bitmap = NULL;
|
analysis->bitmap = NULL;
|
||||||
analysis->ppdip = desc->ppdip;
|
analysis->ppdip = desc->ppdip;
|
||||||
|
|
Loading…
Reference in New Issue