projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add threading to xfer
[goodguy/history.git]
/
cinelerra-5.1
/
guicast
/
clip.h
diff --git
a/cinelerra-5.1/guicast/clip.h
b/cinelerra-5.1/guicast/clip.h
index ad31c072043b9975257674e5e0d239e61f70bd8a..d9b64fa1694c6d9fc3e6e98935d547705e7fa1f1 100644
(file)
--- a/
cinelerra-5.1/guicast/clip.h
+++ b/
cinelerra-5.1/guicast/clip.h
@@
-23,14
+23,21
@@
#define CLIP_H
// Math macros
#define CLIP_H
// Math macros
-
+#undef SQR
#define SQR(x) ((x) * (x))
#define SQR(x) ((x) * (x))
+#undef CLIP
#define CLIP(x, y, z) ((x) < (y) ? (y) : ((x) > (z) ? (z) : (x)))
#define CLIP(x, y, z) ((x) < (y) ? (y) : ((x) > (z) ? (z) : (x)))
+#undef RECLIP
#define RECLIP(x, y, z) ((x) = ((x) < (y) ? (y) : ((x) > (z) ? (z) : (x))))
#define RECLIP(x, y, z) ((x) = ((x) < (y) ? (y) : ((x) > (z) ? (z) : (x))))
+#undef CLAMP
#define CLAMP(x, y, z) ((x) = ((x) < (y) ? (y) : ((x) > (z) ? (z) : (x))))
#define CLAMP(x, y, z) ((x) = ((x) < (y) ? (y) : ((x) > (z) ? (z) : (x))))
+#undef MAX
#define MAX(x, y) ((x) > (y) ? (x) : (y))
#define MAX(x, y) ((x) > (y) ? (x) : (y))
+#undef MIN
#define MIN(x, y) ((x) < (y) ? (x) : (y))
#define MIN(x, y) ((x) < (y) ? (x) : (y))
+#undef EQUIV
#define EQUIV(x, y) (fabs((x) - (y)) < 0.001)
#define EQUIV(x, y) (fabs((x) - (y)) < 0.001)
+#undef DISTANCE
#define DISTANCE(x1, y1, x2, y2) \
(sqrt(((x2) - (x1)) * ((x2) - (x1)) + ((y2) - (y1)) * ((y2) - (y1))))
#define DISTANCE(x1, y1, x2, y2) \
(sqrt(((x2) - (x1)) * ((x2) - (x1)) + ((y2) - (y1)) * ((y2) - (y1))))