X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fclip.h;h=45a4a2c17ffb6d8ef271f48946c9d34f32538108;hb=a94468d6de897136e77c70662177f4b8b4454b6b;hp=4246f2ecdb0c43d408d94b76c84c065f78a0c90e;hpb=77815ec03df6a03ed75433e8cf8ae1e83fb76d6e;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/guicast/clip.h b/cinelerra-5.1/guicast/clip.h
index 4246f2ec..45a4a2c1 100644
--- a/cinelerra-5.1/guicast/clip.h
+++ b/cinelerra-5.1/guicast/clip.h
@@ -43,38 +43,36 @@
 #define TO_RAD(x) ((x) * 2 * M_PI / 360)
 #define TO_DEG(x) ((x) * 360 / 2 / M_PI)
 
-static inline int bclip(int &iv, int imn, int imx) {
-        return iv < imn ? imn : iv > imx ? imx : iv;
-}
-static inline float bclip(float &fv, float fmn, float fmx) {
-        return fv < fmn ? fmn : fv > fmx ? fmx : fv;
+#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 inline double bclip(double &dv, double dmn, double dmx) {
-        return dv < dmn ? dmn : dv > dmx ? dmx : dv;
+static bc_always_inline int bclip(int &iv, int imn, int imx) {
+	return iv < imn ? imn : iv > imx ? imx : iv;
 }
-static inline void bclamp(int &iv, int imn, int imx) {
-        if( iv < imn ) iv = imn; else if( iv > imx ) iv = imx;
+static bc_always_inline float bclip(float &fv, float fmn, float fmx) {
+	return fv < fmn ? fmn : fv > fmx ? fmx : fv;
 }
-static inline void bclamp(float &fv, float fmn, float fmx) {
-        if( fv < fmn ) fv = fmn; else if( fv > fmx ) fv = fmx;
+static bc_always_inline double bclip(double &dv, double dmn, double dmx) {
+	return dv < dmn ? dmn : dv > dmx ? dmx : dv;
 }
-static inline void bclamp(double &dv, double dmn, double dmx) {
-        if( dv < dmn ) dv = dmn; else if( dv > dmx ) dv = dmx;
+
+static bc_always_inline void bclamp(int &iv, int imn, int imx) {
+	if( iv < imn ) iv = imn; else if( iv > imx ) iv = imx;
 }
-static inline void bc_rgb2yuv(int r, int g, int b, int &y, int &u, int &v, int max=255)
-{ //bt601, jpeg, unclipped
-	double mx = max, rr = r/mx, gg = g/mx, bb = b/mx;
-	y = (int)(( 0.29900*rr + 0.58700*gg + 0.11400*bb)       * mx + 0.5);
-	u = (int)((-0.16874*rr - 0.33126*gg + 0.50000*bb + 0.5) * mx + 0.5);
-	v = (int)(( 0.50000*rr - 0.41869*gg - 0.08131*bb + 0.5) * mx + 0.5);
+static bc_always_inline void bclamp(float &fv, float fmn, float fmx) {
+	if( fv < fmn ) fv = fmn; else if( fv > fmx ) fv = fmx;
 }
-static inline void bc_yuv2rgb(int y, int u, int v, int &r, int &g, int &b, int max=255)
-{
-	int ofs = (max + 1) / 2;
-	double mx = max, yy = y/mx, uu = (u-ofs)/mx, vv = (v-ofs)/mx;
-	r = (int)((yy + 1.40200*vv)              * mx + 0.5);
-	g = (int)((yy - 0.34414*uu - 0.71414*vv) * mx + 0.5);
-	b = (int)((yy + 1.77200*uu)              * mx + 0.5);
+static bc_always_inline void bclamp(double &dv, double dmn, double dmx) {
+	if( dv < dmn ) dv = dmn; else if( dv > dmx ) dv = dmx;
 }
 
 #endif