X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Fbluebanana%2Fbluebananacolor.c;h=cb64f97996145e94e42cd9dabc5b24ddf28115bf;hb=5c1aff2fd123b65be6e51ca7652185e14ddaf168;hp=f770d878775053e2f266952d73091abefdada7d4;hpb=259e435484d99cf6517290f530ac2d9d0d86cd16;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/plugins/bluebanana/bluebananacolor.c b/cinelerra-5.1/plugins/bluebanana/bluebananacolor.c index f770d878..cb64f979 100644 --- a/cinelerra-5.1/plugins/bluebanana/bluebananacolor.c +++ b/cinelerra-5.1/plugins/bluebanana/bluebananacolor.c @@ -281,11 +281,7 @@ static inline void RGB_to_rgbF(float *R, float *G, float *B, float *S, float F, static inline void Aal_to_alpF(float *S, float F, float *row, int w, int bpp){ if(S){ - while(w--){ - float a = *S*F; - row[3] = a; - row+=bpp; - } + while(w--){ row[3] = *S++ * F; row+=bpp; } }else{ float a = F; while(w--){ row[3] = a; row+=bpp; } @@ -402,6 +398,10 @@ static inline void HSpV_to_RGB(float H, float Sp, float V, float &R, float &G, f static inline void HSpV_correct_RGB(float H, float Sp, float &V, float &R, float &G, float &B){ float vp = Sp<0.f?0.f:(fabs(V)+HSpV_SATURATION_BIAS)*Sp*HSpV_SATURATION_ISCALE; +#define R_TO_Y (Kr) +#define G_TO_Y (Kg) +#define B_TO_Y (Kb) + int i = (int)H; switch(i){ default: