X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=main.cpp;h=625dba6097d724c5a7fa6a3e66b72a32b46d1a0d;hp=1fbb6a2d0e25a7ea6a89dc6ab2f6c5501a940e0f;hb=89da3437c862c15acb870fbe3175b9e4a0a8244a;hpb=3fbc6a0e7ecc008b0bdafcbc576b79c24117859e

diff --git a/main.cpp b/main.cpp
index 1fbb6a2..625dba6 100644
--- a/main.cpp
+++ b/main.cpp
@@ -47,9 +47,9 @@ void update_hsv(Effect *lift_gamma_gain_effect, Effect *saturation_effect)
 	RGBTriplet gamma(1.0f, 1.0f, 1.0f);
 	RGBTriplet gain(1.0f, 1.0f, 1.0f);
 
-	hsv2rgb(lift_theta, lift_rad, lift_v, &lift.r, &lift.g, &lift.b);
-	hsv2rgb(gamma_theta, gamma_rad, gamma_v * 2.0f, &gamma.r, &gamma.g, &gamma.b);
-	hsv2rgb(gain_theta, gain_rad, gain_v * 4.0f, &gain.r, &gain.g, &gain.b);
+	hsv2rgb_normalized(lift_theta, lift_rad, lift_v, &lift.r, &lift.g, &lift.b);
+	hsv2rgb_normalized(gamma_theta, gamma_rad, gamma_v * 2.0f, &gamma.r, &gamma.g, &gamma.b);
+	hsv2rgb_normalized(gain_theta, gain_rad, gain_v * 4.0f, &gain.r, &gain.g, &gain.b);
 
 	bool ok = lift_gamma_gain_effect->set_vec3("lift", (float *)&lift);
 	ok = ok && lift_gamma_gain_effect->set_vec3("gamma", (float *)&gamma);
@@ -166,7 +166,7 @@ int main(int argc, char **argv)
 	inout_format.color_space = COLORSPACE_sRGB;
 	inout_format.gamma_curve = GAMMA_sRGB;
 
-	FlatInput *input = new FlatInput(inout_format, FORMAT_BGRA, WIDTH, HEIGHT);
+	FlatInput *input = new FlatInput(inout_format, FORMAT_BGRA, GL_UNSIGNED_BYTE, img_w, img_h);
 	chain.add_input(input);
 	Effect *lift_gamma_gain_effect = chain.add_effect(new LiftGammaGainEffect());
 	Effect *saturation_effect = chain.add_effect(new SaturationEffect());