projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge: added speed auto gang/ranges, fix overlayframe norm alpha
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
overlayframe.C
diff --git
a/cinelerra-5.1/cinelerra/overlayframe.C
b/cinelerra-5.1/cinelerra/overlayframe.C
index c660dbbb745539b86ab930dad1a9bedc76cf9e07..4de38e3670ce12afb261ea8983639e8b5496942f 100644
(file)
--- a/
cinelerra-5.1/cinelerra/overlayframe.C
+++ b/
cinelerra-5.1/cinelerra/overlayframe.C
@@
-361,8
+361,8
@@
int OverlayFrame::overlay(VFrame *output, VFrame *input,
return 0;
}
return 0;
}
-// NORMAL [Sa
* Sa
+ Da * (1 - Sa), Sc * Sa + Dc * (1 - Sa)])
-#define ALPHA_NORMAL(mx, Sa, Da) (
(Sa * Sa +
Da * (mx - Sa)) / mx)
+// NORMAL [Sa + Da * (1 - Sa), Sc * Sa + Dc * (1 - Sa)])
+#define ALPHA_NORMAL(mx, Sa, Da) (
Sa + (
Da * (mx - Sa)) / mx)
#define COLOR_NORMAL(mx, Sc, Sa, Dc, Da) ((Sc * Sa + Dc * (mx - Sa)) / mx)
#define CHROMA_NORMAL COLOR_NORMAL
#define COLOR_NORMAL(mx, Sc, Sa, Dc, Da) ((Sc * Sa + Dc * (mx - Sa)) / mx)
#define CHROMA_NORMAL COLOR_NORMAL