X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fclip.h;h=44a5f45052681d9cf01e5e97c4cb77b6834d6350;hb=ddabb22a495f457ece1d845fe2c32ddf2fc27b58;hp=ad31c072043b9975257674e5e0d239e61f70bd8a;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/guicast/clip.h b/cinelerra-5.1/guicast/clip.h
index ad31c072..44a5f450 100644
--- a/cinelerra-5.1/guicast/clip.h
+++ b/cinelerra-5.1/guicast/clip.h
@@ -2,37 +2,45 @@
 /*
  * CINELERRA
  * Copyright (C) 2008 Adam Williams <broadcast at earthling dot net>
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- * 
+ *
  */
 
 #ifndef CLIP_H
 #define CLIP_H
 
 // Math macros
-
+#undef SQR
 #define SQR(x) ((x) * (x))
+#undef CLIP
 #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))))
+#undef CLAMP
 #define CLAMP(x, y, z) ((x) = ((x) < (y) ? (y) : ((x) > (z) ? (z) : (x))))
+#undef MAX
 #define MAX(x, y) ((x) > (y) ? (x) : (y))
+#undef MIN
 #define MIN(x, y) ((x) < (y) ? (x) : (y))
+#undef EQUIV
 #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 TO_RAD(x) ((x) * 2 * M_PI / 360)
+#define TO_DEG(x) ((x) * 360 / 2 / M_PI)
 
 #endif