Module: wine Branch: master Commit: 6bd6193cb13177bc012141458703fa5632ba5c29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bd6193cb13177bc0121414587... Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jan 13 15:21:04 2014 +0100 d3dx9_36: Make emsquare an unsigned int in create_outline. --- dlls/d3dx9_36/mesh.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index b713079..118baf7 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -5128,7 +5128,7 @@ static HRESULT add_vertex_index(struct word_array *array, WORD vertex_index) C_ASSERT(sizeof(FIXED) == sizeof(float)); C_ASSERT(sizeof(POINTFX) == sizeof(D3DXVECTOR2)); -static inline D3DXVECTOR2 *convert_fixed_to_float(POINTFX *pt, int count, float emsquare) +static inline D3DXVECTOR2 *convert_fixed_to_float(POINTFX *pt, int count, unsigned int emsquare) { D3DXVECTOR2 *ret = (D3DXVECTOR2*)pt; while (count--) { @@ -5233,7 +5233,8 @@ static BOOL attempt_line_merge(struct outline *outline, } static HRESULT create_outline(struct glyphinfo *glyph, void *raw_outline, int datasize, - float max_deviation_sq, float emsquare, const struct cos_table *cos_table) + float max_deviation_sq, unsigned int emsquare, + const struct cos_table *cos_table) { TTPOLYGONHEADER *header = (TTPOLYGONHEADER *)raw_outline;