[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48942] trunk/blender/source/blender/ blenkernel/intern/mask_rasterize.c: replace fminf with minf
Campbell Barton
ideasman42 at gmail.com
Sun Jul 15 17:11:52 CEST 2012
Revision: 48942
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48942
Author: campbellbarton
Date: 2012-07-15 15:11:52 +0000 (Sun, 15 Jul 2012)
Log Message:
-----------
replace fminf with minf
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/mask_rasterize.c
Modified: trunk/blender/source/blender/blenkernel/intern/mask_rasterize.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mask_rasterize.c 2012-07-15 12:53:16 UTC (rev 48941)
+++ trunk/blender/source/blender/blenkernel/intern/mask_rasterize.c 2012-07-15 15:11:52 UTC (rev 48942)
@@ -356,10 +356,10 @@
const float *v2 = cos[face[1]];
const float *v3 = cos[face[2]];
- xmin = fminf(v1[0], fminf(v2[0], v3[0]));
- xmax = fmaxf(v1[0], fmaxf(v2[0], v3[0]));
- ymin = fminf(v1[1], fminf(v2[1], v3[1]));
- ymax = fmaxf(v1[1], fmaxf(v2[1], v3[1]));
+ xmin = minf(v1[0], minf(v2[0], v3[0]));
+ xmax = maxf(v1[0], maxf(v2[0], v3[0]));
+ ymin = minf(v1[1], minf(v2[1], v3[1]));
+ ymax = maxf(v1[1], maxf(v2[1], v3[1]));
}
else {
const float *v1 = cos[face[0]];
@@ -367,10 +367,10 @@
const float *v3 = cos[face[2]];
const float *v4 = cos[face[3]];
- xmin = fminf(v1[0], fminf(v2[0], fminf(v3[0], v4[0])));
- xmax = fmaxf(v1[0], fmaxf(v2[0], fmaxf(v3[0], v4[0])));
- ymin = fminf(v1[1], fminf(v2[1], fminf(v3[1], v4[1])));
- ymax = fmaxf(v1[1], fmaxf(v2[1], fmaxf(v3[1], v4[1])));
+ xmin = minf(v1[0], minf(v2[0], minf(v3[0], v4[0])));
+ xmax = maxf(v1[0], maxf(v2[0], maxf(v3[0], v4[0])));
+ ymin = minf(v1[1], minf(v2[1], minf(v3[1], v4[1])));
+ ymax = maxf(v1[1], maxf(v2[1], maxf(v3[1], v4[1])));
}
More information about the Bf-blender-cvs
mailing list