X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fguicast%2Fclip.h;h=45a4a2c17ffb6d8ef271f48946c9d34f32538108;hb=c279e21fc2394a7908bbd1ba8c79b116fe9fb14a;hp=d9b64fa1694c6d9fc3e6e98935d547705e7fa1f1;hpb=235c9cc4df8306babbbfda46189108fe262d44ef;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/guicast/clip.h b/cinelerra-5.1/guicast/clip.h
index d9b64fa1..45a4a2c1 100644
--- a/cinelerra-5.1/guicast/clip.h
+++ b/cinelerra-5.1/guicast/clip.h
@@ -2,25 +2,25 @@
 /*
  * 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
@@ -40,6 +40,39 @@
 #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