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:
authorSergey Sharybin <sergey.vfx@gmail.com>2013-01-15 12:37:17 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2013-01-15 12:37:17 +0400
commit0ce2d278b7a895a96c673f2c74020543b94413a3 (patch)
tree7f4bb96666c5cf26ca218c0bc53b6ec0d6edf06b /source/blender/imbuf/intern/colormanagement.c
parent4f7465cac13262ca47e1196fe1cd585b79bcfe1f (diff)
Follow general mathutils rules for naming straight<->premul functions
Diffstat (limited to 'source/blender/imbuf/intern/colormanagement.c')
-rw-r--r--source/blender/imbuf/intern/colormanagement.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/imbuf/intern/colormanagement.c b/source/blender/imbuf/intern/colormanagement.c
index 2c6e46cb664..86f47fe07c4 100644
--- a/source/blender/imbuf/intern/colormanagement.c
+++ b/source/blender/imbuf/intern/colormanagement.c
@@ -1222,7 +1222,7 @@ static void *display_buffer_apply_get_linear_buffer(DisplayBufferThread *handle)
}
else if (channels == 4) {
rgba_uchar_to_float(fp, cp);
- straight_to_premul_v4(fp, fp);
+ straight_to_premul_v4(fp);
}
else {
BLI_assert(!"Buffers of 3 or 4 channels are only supported here");
@@ -2347,7 +2347,7 @@ static void partial_buffer_update_rect(ImBuf *ibuf, unsigned char *display_buffe
else if (byte_buffer) {
rgba_uchar_to_float(pixel, byte_buffer + linear_index);
IMB_colormanagement_colorspace_to_scene_linear_v3(pixel, rect_colorspace);
- straight_to_premul_v4(pixel, pixel);
+ straight_to_premul_v4(pixel);
}
if (!is_data) {
@@ -2361,7 +2361,7 @@ static void partial_buffer_update_rect(ImBuf *ibuf, unsigned char *display_buffe
}
else {
float pixel_straight[4];
- premul_to_straight_v4(pixel_straight, pixel);
+ premul_to_straight_v4_v4(pixel_straight, pixel);
rgba_float_to_uchar(display_buffer + display_index, pixel_straight);
}
}