Extern :
- modificati header Vroni per incompatibilità di min/max.
This commit is contained in:
@@ -48,7 +48,7 @@ inline void ApproxArc(const coord & p1, const coord & p2,
|
||||
|
||||
if (apx_absolute > 0.0) {
|
||||
incr = acos(radius / (radius + apx_absolute));
|
||||
incr = Min(incr, max_incr);
|
||||
incr = VroniMin(incr, max_incr);
|
||||
}
|
||||
else {
|
||||
incr = max_incr;
|
||||
|
||||
@@ -99,8 +99,8 @@ inline static double CubicRoot(double_arg x)
|
||||
(i1) = (i2); \
|
||||
(i2) = (i); }
|
||||
|
||||
#define Min(a, b) ((a) < (b) ? (a) : (b))
|
||||
#define Max(a, b) ((b) < (a) ? (a) : (b))
|
||||
#define VroniMin(a, b) ((a) < (b) ? (a) : (b))
|
||||
#define VroniMax(a, b) ((b) < (a) ? (a) : (b))
|
||||
#define Min3(a, b, c) (((a) < (b)) ? \
|
||||
(((a) < (c)) ? \
|
||||
(a) : (c)) \
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user