diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-12-28 17:08:13 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-12-28 17:08:41 +0300 |
commit | b26fb531f3699d384775703e7da7277a5b2eb1bd (patch) | |
tree | 5cf9c6ce1df3b34a3d01552cb594178176ef791c /source/blender/blenkernel/intern | |
parent | 61d6fa92c5c91b1a7ed86d942b3b8e5f09fa4106 (diff) |
Cleanup: style, indentation
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/seqmodifier.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/blenkernel/intern/seqmodifier.c b/source/blender/blenkernel/intern/seqmodifier.c index f12faacd677..e7a252b7f1f 100644 --- a/source/blender/blenkernel/intern/seqmodifier.c +++ b/source/blender/blenkernel/intern/seqmodifier.c @@ -184,7 +184,7 @@ static void whiteBalance_init_data(SequenceModifierData *smd) } typedef struct WhiteBalanceThreadData { - struct ColorSpace* colorspace; + struct ColorSpace *colorspace; float white[3]; } WhiteBalanceThreadData; @@ -196,19 +196,19 @@ static void whiteBalance_apply_threaded(int width, int height, unsigned char *re WhiteBalanceThreadData *data = (WhiteBalanceThreadData *) data_v; - multiplier[0] = 1.0f/data->white[0]; - multiplier[1] = 1.0f/data->white[1]; - multiplier[2] = 1.0f/data->white[2]; + multiplier[0] = 1.0f / data->white[0]; + multiplier[1] = 1.0f / data->white[1]; + multiplier[2] = 1.0f / data->white[2]; for (y = 0; y < height; y++) { for (x = 0; x < width; x++) { int pixel_index = (y * width + x) * 4; float result[3], mask[3] = {1.0f, 1.0f, 1.0f}; - if (rect_float) + if (rect_float) { copy_v3_v3(result, rect_float + pixel_index); - else - { + } + else { straight_uchar_to_premul_float(result, rect + pixel_index); IMB_colormanagement_colorspace_to_scene_linear_v3(result, data->colorspace); } @@ -228,8 +228,8 @@ static void whiteBalance_apply_threaded(int width, int height, unsigned char *re copy_v3_v3(rect_float + pixel_index, result); else IMB_colormanagement_scene_linear_to_colorspace_v3(result, data->colorspace); - premul_float_to_straight_uchar(rect + pixel_index, result); - } + premul_float_to_straight_uchar(rect + pixel_index, result); + } } } |