Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2013-03-17 14:26:23 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-03-17 14:26:23 +0400
commit0d0291f6e18a2b8357053bf8166220464beab138 (patch)
treea8a076d5351c643a484e9b099d26d8c89a303ab4 /source/blender/imbuf/intern/rectop.c
parent1174c7d6628de721052190167e249f251a8bbbe5 (diff)
code cleanup: incorrect sized array args, remove some redundant code.
Diffstat (limited to 'source/blender/imbuf/intern/rectop.c')
-rw-r--r--source/blender/imbuf/intern/rectop.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/imbuf/intern/rectop.c b/source/blender/imbuf/intern/rectop.c
index 3a79ea09228..8b60d1a96df 100644
--- a/source/blender/imbuf/intern/rectop.c
+++ b/source/blender/imbuf/intern/rectop.c
@@ -121,7 +121,7 @@ static void blend_color_darken(char cp[3], const char cp1[3], const char cp2[3],
}
}
-static void blend_color_erase_alpha(char cp[3], const char cp1[3], const char cp2[3], const int fac)
+static void blend_color_erase_alpha(char cp[4], const char cp1[4], const char cp2[4], const int fac)
{
int temp = (cp1[3] - fac * cp2[3] / 255);
@@ -131,7 +131,7 @@ static void blend_color_erase_alpha(char cp[3], const char cp1[3], const char cp
cp[3] = (temp < 0) ? 0 : temp;
}
-static void blend_color_add_alpha(char cp[3], const char cp1[3], const char cp2[3], const int fac)
+static void blend_color_add_alpha(char cp[4], const char cp1[4], const char cp2[4], const int fac)
{
int temp = (cp1[3] + fac * cp2[3] / 255);
@@ -251,7 +251,7 @@ static void blend_color_darken_float(float cp[3], const float cp1[3], const floa
blend_color_mix_float(cp, cp1, cp2, fac);
}
-static void blend_color_erase_alpha_float(float cp[3], const float cp1[3], const float cp2[3], const float fac)
+static void blend_color_erase_alpha_float(float cp[4], const float cp1[4], const float cp2[4], const float fac)
{
cp[0] = cp1[0];
cp[1] = cp1[1];
@@ -261,7 +261,7 @@ static void blend_color_erase_alpha_float(float cp[3], const float cp1[3], const
if (cp[3] < 0.0f) cp[3] = 0.0f;
}
-static void blend_color_add_alpha_float(float cp[3], const float cp1[3], const float cp2[3], const float fac)
+static void blend_color_add_alpha_float(float cp[4], const float cp1[4], const float cp2[4], const float fac)
{
cp[0] = cp1[0];
cp[1] = cp1[1];