Credit Andrew - update libsndfile to 1.2.2; allow Maxchannels to be greater than...

[goodguy/cinelerra.git] / cinelerra-5.1 / plugins / color3way / color3way.C

diff --git a/cinelerra-5.1/plugins/color3way/color3way.C b/cinelerra-5.1/plugins/color3way/color3way.C
index 7727594d6223a29c289a8b87d73aaf07a2ba7d5d..417b74510987e6bae051f892ce466e0f2e0df2c2 100644 (file)
--- a/cinelerra-5.1/plugins/color3way/color3way.C
+++ b/cinelerra-5.1/plugins/color3way/color3way.C
@@ -179,13 +179,13 @@ Color3WayUnit::Color3WayUnit(Color3WayMain *plugin,
        r = r + TOTAL_TRANSFER(r, r_factor); \
        g = g + TOTAL_TRANSFER(g, g_factor); \
        b = b + TOTAL_TRANSFER(b, b_factor); \
-       r = CLAMP(r,0,1); g = CLAMP(g,0,1); b = CLAMP(b,0,1); \
+       CLAMP(r,0,1);  CLAMP(g,0,1); CLAMP(b,0,1); \
 /* Apply saturation/value */ \
        float h, s, v; \
        HSV::rgb_to_hsv(r, g, b, h, s, v); \
        v += TOTAL_TRANSFER(v, v_factor); \
        s += TOTAL_TRANSFER(s, s_factor); \
-       s = CLAMP(s,0,1); v = CLAMP(v,0,1); \
+       CLAMP(s,0,1);  CLAMP(v,0,1); \
        HSV::hsv_to_rgb(r, g, b, h, s, v);
 
 
@@ -278,10 +278,10 @@ void Color3WayUnit::process_package(LoadPackage *package)
                                PROCESS(unsigned char, 0xff, 4, 1)
                                break;
                        case BC_RGB_FLOAT:
-                               PROCESS(float, 1.0, 3, 0)
+                               PROCESS(float, 100.0, 3, 0)
                                break;
                        case BC_RGBA_FLOAT:
-                               PROCESS(float, 1.0, 4, 0)
+                               PROCESS(float, 100.0, 4, 0)
                                break;
                }
        }