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

d3dx9_36: Make emsquare an unsigned int in create_outline.

This commit is contained in:
Stefan Dösinger 2014-01-13 15:21:04 +01:00 committed by Alexandre Julliard
parent 4ca8f7104f
commit 6bd6193cb1
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/d3dx9_36/mesh.c
View File

@ -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(FIXED) == sizeof(float));
C_ASSERT(sizeof(POINTFX) == sizeof(D3DXVECTOR2)); 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; D3DXVECTOR2 *ret = (D3DXVECTOR2*)pt;
while (count--) { 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, 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; TTPOLYGONHEADER *header = (TTPOLYGONHEADER *)raw_outline;