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

diff --git a/cinelerra-5.1/guicast/clip.h b/cinelerra-5.1/guicast/clip.h
index ad31c072..45a4a2c1 100644
--- a/cinelerra-5.1/guicast/clip.h
+++ b/cinelerra-5.1/guicast/clip.h
@@ -2,37 +2,77 @@
 /*
  * 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
+#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)
+
+#define	bc_always_inline __attribute__ ((__always_inline__)) inline
+
+static bc_always_inline int bmin(int a, int b) { return a < b ? a : b; }
+static bc_always_inline float bmin(float a, float b) { return a < b ? a : b; }
+static bc_always_inline double bmin(double a, double b) { return a < b ? a : b; }
+static bc_always_inline int bmax(int a, int b) { return a > b ? a : b; }
+static bc_always_inline float bmax(float a, float b) { return a > b ? a : b; }
+static bc_always_inline double bmax(double a, double b) { return a > b ? a : b; }
+
+static bc_always_inline int iclip(int iv, int imn, int imx) {
+	return iv < imn ? imn : iv > imx ? imx : iv;
+}
+static bc_always_inline int bclip(int &iv, int imn, int imx) {
+	return iv < imn ? imn : iv > imx ? imx : iv;
+}
+static bc_always_inline float bclip(float &fv, float fmn, float fmx) {
+	return fv < fmn ? fmn : fv > fmx ? fmx : fv;
+}
+static bc_always_inline double bclip(double &dv, double dmn, double dmx) {
+	return dv < dmn ? dmn : dv > dmx ? dmx : dv;
+}
 
+static bc_always_inline void bclamp(int &iv, int imn, int imx) {
+	if( iv < imn ) iv = imn; else if( iv > imx ) iv = imx;
+}
+static bc_always_inline void bclamp(float &fv, float fmn, float fmx) {
+	if( fv < fmn ) fv = fmn; else if( fv > fmx ) fv = fmx;
+}
+static bc_always_inline void bclamp(double &dv, double dmn, double dmx) {
+	if( dv < dmn ) dv = dmn; else if( dv > dmx ) dv = dmx;
+}
 
 #endif