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>2014-03-15 20:24:05 +0400
committerCampbell Barton <ideasman42@gmail.com>2014-03-15 20:26:23 +0400
commit2097e621edcf7658895b9f6ba9cc4e51f5538369 (patch)
tree9f112e8a2b35fed01734ed355d3832cd857de826 /source/blender/blenlib/intern/math_color.c
parent38244166b03bc4a01d8c0b99e2fd2cb2c9b60012 (diff)
Code cleanup: use r_ prefix for return args
Diffstat (limited to 'source/blender/blenlib/intern/math_color.c')
-rw-r--r--source/blender/blenlib/intern/math_color.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/source/blender/blenlib/intern/math_color.c b/source/blender/blenlib/intern/math_color.c
index 43f6d4c29ae..093b82e9126 100644
--- a/source/blender/blenlib/intern/math_color.c
+++ b/source/blender/blenlib/intern/math_color.c
@@ -508,29 +508,29 @@ void cpack_to_rgb(unsigned int col, float *r, float *g, float *b)
*b = ((float)(((col) >> 16) & 0xFF)) * (1.0f / 255.0f);
}
-void rgb_uchar_to_float(float col_r[3], const unsigned char col_ub[3])
+void rgb_uchar_to_float(float r_col[3], const unsigned char col_ub[3])
{
- col_r[0] = ((float)col_ub[0]) * (1.0f / 255.0f);
- col_r[1] = ((float)col_ub[1]) * (1.0f / 255.0f);
- col_r[2] = ((float)col_ub[2]) * (1.0f / 255.0f);
+ r_col[0] = ((float)col_ub[0]) * (1.0f / 255.0f);
+ r_col[1] = ((float)col_ub[1]) * (1.0f / 255.0f);
+ r_col[2] = ((float)col_ub[2]) * (1.0f / 255.0f);
}
-void rgba_uchar_to_float(float col_r[4], const unsigned char col_ub[4])
+void rgba_uchar_to_float(float r_col[4], const unsigned char col_ub[4])
{
- col_r[0] = ((float)col_ub[0]) * (1.0f / 255.0f);
- col_r[1] = ((float)col_ub[1]) * (1.0f / 255.0f);
- col_r[2] = ((float)col_ub[2]) * (1.0f / 255.0f);
- col_r[3] = ((float)col_ub[3]) * (1.0f / 255.0f);
+ r_col[0] = ((float)col_ub[0]) * (1.0f / 255.0f);
+ r_col[1] = ((float)col_ub[1]) * (1.0f / 255.0f);
+ r_col[2] = ((float)col_ub[2]) * (1.0f / 255.0f);
+ r_col[3] = ((float)col_ub[3]) * (1.0f / 255.0f);
}
-void rgb_float_to_uchar(unsigned char col_r[3], const float col_f[3])
+void rgb_float_to_uchar(unsigned char r_col[3], const float col_f[3])
{
- F3TOCHAR3(col_f, col_r);
+ F3TOCHAR3(col_f, r_col);
}
-void rgba_float_to_uchar(unsigned char col_r[4], const float col_f[4])
+void rgba_float_to_uchar(unsigned char r_col[4], const float col_f[4])
{
- F4TOCHAR4(col_f, col_r);
+ F4TOCHAR4(col_f, r_col);
}
/* ********************************* color transforms ********************************* */