Module: wine Branch: master Commit: 4cddd5ffdf0c568445365c6c62e7788d7dbbca7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cddd5ffdf0c568445365c6c62...
Author: Alexandre Julliard julliard@winehq.org Date: Thu Sep 8 12:13:08 2011 +0200
d3dx9_36: Avoid using fminf/fmaxf.
---
dlls/d3dx9_36/mesh.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 04ee7d0..c6317c8 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -2548,10 +2548,10 @@ static HRESULT parse_vertex_colors(IDirectXFileData *filedata, struct mesh_data } memcpy(&color, data, sizeof(color)); data += sizeof(color); - color.r = fminf(1.0f, fmaxf(0.0f, color.r)); - color.g = fminf(1.0f, fmaxf(0.0f, color.g)); - color.b = fminf(1.0f, fmaxf(0.0f, color.b)); - color.a = fminf(1.0f, fmaxf(0.0f, color.a)); + color.r = min(1.0f, max(0.0f, color.r)); + color.g = min(1.0f, max(0.0f, color.g)); + color.b = min(1.0f, max(0.0f, color.b)); + color.a = min(1.0f, max(0.0f, color.a)); mesh->vertex_colors[index] = D3DCOLOR_ARGB((BYTE)(color.a * 255.0f + 0.5f), (BYTE)(color.r * 255.0f + 0.5f), (BYTE)(color.g * 255.0f + 0.5f),