diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-03-17 14:26:23 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-03-17 14:26:23 +0400 |
commit | 0d0291f6e18a2b8357053bf8166220464beab138 (patch) | |
tree | a8a076d5351c643a484e9b099d26d8c89a303ab4 /source/blender/imbuf/intern | |
parent | 1174c7d6628de721052190167e249f251a8bbbe5 (diff) |
code cleanup: incorrect sized array args, remove some redundant code.
Diffstat (limited to 'source/blender/imbuf/intern')
-rw-r--r-- | source/blender/imbuf/intern/bmp.c | 2 | ||||
-rw-r--r-- | source/blender/imbuf/intern/jpeg.c | 2 | ||||
-rw-r--r-- | source/blender/imbuf/intern/rectop.c | 8 |
3 files changed, 8 insertions, 4 deletions
diff --git a/source/blender/imbuf/intern/bmp.c b/source/blender/imbuf/intern/bmp.c index d850153f16e..856124ab5cb 100644 --- a/source/blender/imbuf/intern/bmp.c +++ b/source/blender/imbuf/intern/bmp.c @@ -61,6 +61,7 @@ typedef struct BMPINFOHEADER { unsigned int biClrImportant; } BMPINFOHEADER; +#if 0 typedef struct BMPHEADER { unsigned short biType; unsigned int biSize; @@ -68,6 +69,7 @@ typedef struct BMPHEADER { unsigned short biRes2; unsigned int biOffBits; } BMPHEADER; +#endif #define BMP_FILEHEADER_SIZE 14 diff --git a/source/blender/imbuf/intern/jpeg.c b/source/blender/imbuf/intern/jpeg.c index 05495b92b98..bf0e4187aa6 100644 --- a/source/blender/imbuf/intern/jpeg.c +++ b/source/blender/imbuf/intern/jpeg.c @@ -121,10 +121,12 @@ static void jpeg_error(j_common_ptr cinfo) * INPUT HANDLER FROM MEMORY *---------------------------------------------------------- */ +#if 0 typedef struct { unsigned char *buffer; int filled; } buffer_struct; +#endif typedef struct { struct jpeg_source_mgr pub; /* public fields */ 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]; |