diff options
author | Kévin Dietrich <kevin.dietrich@mailoo.org> | 2014-09-30 12:47:19 +0400 |
---|---|---|
committer | Antony Riakiotakis <kalast@gmail.com> | 2014-09-30 12:48:57 +0400 |
commit | 570313d519f0c80124a1704478d7dad0f14ece09 (patch) | |
tree | 36da1a76aca6b381b75cef14753232400713dd35 /source/blender | |
parent | 56a5f1784626021e86a9448613ceabf3306cc63e (diff) |
Blend modes: fix array length being too short
Reviewers: psy-fi
Differential Revision: https://developer.blender.org/D799
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenlib/BLI_math_color_blend.h | 32 | ||||
-rw-r--r-- | source/blender/blenlib/intern/math_color_blend_inline.c | 32 |
2 files changed, 32 insertions, 32 deletions
diff --git a/source/blender/blenlib/BLI_math_color_blend.h b/source/blender/blenlib/BLI_math_color_blend.h index 2535a31ccc4..d966676e19e 100644 --- a/source/blender/blenlib/BLI_math_color_blend.h +++ b/source/blender/blenlib/BLI_math_color_blend.h @@ -78,22 +78,22 @@ MINLINE void blend_color_darken_float(float dst[4], const float src1[4], const f MINLINE void blend_color_erase_alpha_float(float dst[4], const float src1[4], const float src2[4]); MINLINE void blend_color_add_alpha_float(float dst[4], const float src1[4], const float src2[4]); -MINLINE void blend_color_overlay_float(float dst[4], const float src1[4], const float src2[2]); -MINLINE void blend_color_hardlight_float(float dst[4], const float src1[4], const float src2[2]); -MINLINE void blend_color_burn_float(float dst[4], const float src1[4], const float src2[2]); -MINLINE void blend_color_linearburn_float(float dst[4], const float src1[4], const float src2[2]); -MINLINE void blend_color_dodge_float(float dst[4], const float src1[4], const float src2[2]); -MINLINE void blend_color_screen_float(float dst[4], const float src1[4], const float src2[2]); -MINLINE void blend_color_softlight_float(float dst[4], const float src1[4], const float src2[2]); -MINLINE void blend_color_pinlight_float(float dst[4], const float src1[4], const float src2[2]); -MINLINE void blend_color_linearlight_float(float dst[4], const float src1[4], const float src2[2]); -MINLINE void blend_color_vividlight_float(float dst[4], const float src1[4], const float src2[2]); -MINLINE void blend_color_difference_float(float dst[4], const float src1[4], const float src2[2]); -MINLINE void blend_color_exclusion_float(float dst[4], const float src1[4], const float src2[2]); -MINLINE void blend_color_color_float(float dst[4], const float src1[4], const float src2[2]); -MINLINE void blend_color_hue_float(float dst[4], const float src1[4], const float src2[2]); -MINLINE void blend_color_saturation_float(float dst[4], const float src1[4], const float src2[2]); -MINLINE void blend_color_luminosity_float(float dst[4], const float src1[4], const float src2[2]); +MINLINE void blend_color_overlay_float(float dst[4], const float src1[4], const float src2[4]); +MINLINE void blend_color_hardlight_float(float dst[4], const float src1[4], const float src2[4]); +MINLINE void blend_color_burn_float(float dst[4], const float src1[4], const float src2[4]); +MINLINE void blend_color_linearburn_float(float dst[4], const float src1[4], const float src2[4]); +MINLINE void blend_color_dodge_float(float dst[4], const float src1[4], const float src2[4]); +MINLINE void blend_color_screen_float(float dst[4], const float src1[4], const float src2[4]); +MINLINE void blend_color_softlight_float(float dst[4], const float src1[4], const float src2[4]); +MINLINE void blend_color_pinlight_float(float dst[4], const float src1[4], const float src2[4]); +MINLINE void blend_color_linearlight_float(float dst[4], const float src1[4], const float src2[4]); +MINLINE void blend_color_vividlight_float(float dst[4], const float src1[4], const float src2[4]); +MINLINE void blend_color_difference_float(float dst[4], const float src1[4], const float src2[4]); +MINLINE void blend_color_exclusion_float(float dst[4], const float src1[4], const float src2[4]); +MINLINE void blend_color_color_float(float dst[4], const float src1[4], const float src2[4]); +MINLINE void blend_color_hue_float(float dst[4], const float src1[4], const float src2[4]); +MINLINE void blend_color_saturation_float(float dst[4], const float src1[4], const float src2[4]); +MINLINE void blend_color_luminosity_float(float dst[4], const float src1[4], const float src2[4]); MINLINE void blend_color_interpolate_float(float dst[4], const float src1[4], const float src2[4], float t); diff --git a/source/blender/blenlib/intern/math_color_blend_inline.c b/source/blender/blenlib/intern/math_color_blend_inline.c index 2522fe5f6c9..73a7259ddcd 100644 --- a/source/blender/blenlib/intern/math_color_blend_inline.c +++ b/source/blender/blenlib/intern/math_color_blend_inline.c @@ -781,7 +781,7 @@ MINLINE void blend_color_add_alpha_float(float dst[4], const float src1[4], cons } } -MINLINE void blend_color_overlay_float(float dst[3], const float src1[3], const float src2[3]) +MINLINE void blend_color_overlay_float(float dst[4], const float src1[4], const float src2[4]) { const float fac = src2[3]; if (fac != 0.0f && fac < 1.0f) { @@ -807,7 +807,7 @@ MINLINE void blend_color_overlay_float(float dst[3], const float src1[3], const } -MINLINE void blend_color_hardlight_float(float dst[4], const float src1[4], const float src2[2]) +MINLINE void blend_color_hardlight_float(float dst[4], const float src1[4], const float src2[4]) { const float fac = src2[3]; if (fac != 0.0f && fac < 1.0f) { @@ -832,7 +832,7 @@ MINLINE void blend_color_hardlight_float(float dst[4], const float src1[4], cons } } -MINLINE void blend_color_burn_float(float dst[3], const float src1[3], const float src2[3]) +MINLINE void blend_color_burn_float(float dst[4], const float src1[4], const float src2[4]) { const float fac = src2[3]; if (fac != 0.0f && fac < 1.0f) { @@ -850,7 +850,7 @@ MINLINE void blend_color_burn_float(float dst[3], const float src1[3], const flo } } -MINLINE void blend_color_linearburn_float(float dst[3], const float src1[3], const float src2[3]) +MINLINE void blend_color_linearburn_float(float dst[4], const float src1[4], const float src2[4]) { const float fac = src2[3]; if (fac != 0.0f && fac < 1.0f) { @@ -869,7 +869,7 @@ MINLINE void blend_color_linearburn_float(float dst[3], const float src1[3], con } -MINLINE void blend_color_dodge_float(float dst[3], const float src1[3], const float src2[3]) +MINLINE void blend_color_dodge_float(float dst[4], const float src1[4], const float src2[4]) { const float fac = src2[3]; if (fac != 0.0f && fac < 1.0f) { @@ -887,7 +887,7 @@ MINLINE void blend_color_dodge_float(float dst[3], const float src1[3], const fl } } -MINLINE void blend_color_screen_float(float dst[3], const float src1[3], const float src2[3]) +MINLINE void blend_color_screen_float(float dst[4], const float src1[4], const float src2[4]) { const float fac = src2[3]; if (fac != 0.0f && fac < 1.0f) { @@ -905,7 +905,7 @@ MINLINE void blend_color_screen_float(float dst[3], const float src1[3], const f } } -MINLINE void blend_color_softlight_float(float dst[3], const float src1[3], const float src2[3]) +MINLINE void blend_color_softlight_float(float dst[4], const float src1[4], const float src2[4]) { const float fac = src2[3]; if (fac != 0.0f && fac < 1.0f) { @@ -930,7 +930,7 @@ MINLINE void blend_color_softlight_float(float dst[3], const float src1[3], cons } } -MINLINE void blend_color_pinlight_float(float dst[3], const float src1[3], const float src2[3]) +MINLINE void blend_color_pinlight_float(float dst[4], const float src1[4], const float src2[4]) { const float fac = src2[3]; if (fac != 0.0f && fac < 1.0f) { @@ -956,7 +956,7 @@ MINLINE void blend_color_pinlight_float(float dst[3], const float src1[3], const } -MINLINE void blend_color_linearlight_float(float dst[3], const float src1[3], const float src2[3]) +MINLINE void blend_color_linearlight_float(float dst[4], const float src1[4], const float src2[4]) { const float fac = src2[3]; if (fac != 0.0f && fac < 1.0f) { @@ -982,7 +982,7 @@ MINLINE void blend_color_linearlight_float(float dst[3], const float src1[3], co } -MINLINE void blend_color_vividlight_float(float dst[3], const float src1[3], const float src2[3]) +MINLINE void blend_color_vividlight_float(float dst[4], const float src1[4], const float src2[4]) { const float fac = src2[3]; if (fac != 0.0f && fac < 1.0f) { @@ -1013,7 +1013,7 @@ MINLINE void blend_color_vividlight_float(float dst[3], const float src1[3], con } } -MINLINE void blend_color_difference_float(float dst[3], const float src1[3], const float src2[3]) +MINLINE void blend_color_difference_float(float dst[4], const float src1[4], const float src2[4]) { const float fac = src2[3]; if (fac != 0.0f && fac < 1.0f) { @@ -1031,7 +1031,7 @@ MINLINE void blend_color_difference_float(float dst[3], const float src1[3], con } -MINLINE void blend_color_exclusion_float(float dst[3], const float src1[3], const float src2[3]) +MINLINE void blend_color_exclusion_float(float dst[4], const float src1[4], const float src2[4]) { const float fac = src2[3]; if (fac != 0.0f && fac < 1.0f) { @@ -1050,7 +1050,7 @@ MINLINE void blend_color_exclusion_float(float dst[3], const float src1[3], cons } -MINLINE void blend_color_color_float(float dst[3], const float src1[3], const float src2[3]) +MINLINE void blend_color_color_float(float dst[4], const float src1[4], const float src2[4]) { const float fac = src2[3]; if (fac != 0.0f && fac < 1.0f) { @@ -1078,7 +1078,7 @@ MINLINE void blend_color_color_float(float dst[3], const float src1[3], const fl } -MINLINE void blend_color_hue_float(float dst[3], const float src1[3], const float src2[3]) +MINLINE void blend_color_hue_float(float dst[4], const float src1[4], const float src2[4]) { const float fac = src2[3]; if (fac != 0.0f && fac < 1.0f) { @@ -1104,7 +1104,7 @@ MINLINE void blend_color_hue_float(float dst[3], const float src1[3], const floa } } -MINLINE void blend_color_saturation_float(float dst[3], const float src1[3], const float src2[3]) +MINLINE void blend_color_saturation_float(float dst[4], const float src1[4], const float src2[4]) { const float fac = src2[3]; if (fac != 0.0f && fac < 1.0f) { @@ -1131,7 +1131,7 @@ MINLINE void blend_color_saturation_float(float dst[3], const float src1[3], con } } -MINLINE void blend_color_luminosity_float(float dst[3], const float src1[3], const float src2[3]) +MINLINE void blend_color_luminosity_float(float dst[4], const float src1[4], const float src2[4]) { const float fac = src2[3]; if (fac != 0.0f && fac < 1.0f) { |