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=44a5f45052681d9cf01e5e97c4cb77b6834d6350;hb=c279e21fc2394a7908bbd1ba8c79b116fe9fb14a;hpb=21c2e6b36d6a96c2f662a89459d607b5a387f4eb

diff --git a/cinelerra-5.1/guicast/clip.h b/cinelerra-5.1/guicast/clip.h
index 44a5f450..45a4a2c1 100644
--- a/cinelerra-5.1/guicast/clip.h
+++ b/cinelerra-5.1/guicast/clip.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef CLIP_H
-#define CLIP_H
+#ifndef __CLIP_H__
+#define __CLIP_H__
 
 // Math macros
 #undef SQR
@@ -43,4 +43,36 @@
 #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