diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-01-15 12:37:17 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-01-15 12:37:17 +0400 |
| commit | 0ce2d278b7a895a96c673f2c74020543b94413a3 (patch) | |
| tree | 7f4bb96666c5cf26ca218c0bc53b6ec0d6edf06b /source/blender/imbuf/intern/divers.c | |
| parent | 4f7465cac13262ca47e1196fe1cd585b79bcfe1f (diff) | |
Follow general mathutils rules for naming straight<->premul functions
Diffstat (limited to 'source/blender/imbuf/intern/divers.c')
| -rw-r--r-- | source/blender/imbuf/intern/divers.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/imbuf/intern/divers.c b/source/blender/imbuf/intern/divers.c index 84339b51721..20d51fddb35 100644 --- a/source/blender/imbuf/intern/divers.c +++ b/source/blender/imbuf/intern/divers.c @@ -255,7 +255,7 @@ void IMB_buffer_byte_from_float(uchar *rect_to, const float *rect_from, /* no color space conversion */ if (dither && predivide) { for (x = 0; x < width; x++, from += 4, to += 4) { - premul_to_straight_v4(straight, from); + premul_to_straight_v4_v4(straight, from); float_to_byte_dither_v4(to, straight, di); } } @@ -265,7 +265,7 @@ void IMB_buffer_byte_from_float(uchar *rect_to, const float *rect_from, } else if (predivide) { for (x = 0; x < width; x++, from += 4, to += 4) { - premul_to_straight_v4(straight, from); + premul_to_straight_v4_v4(straight, from); rgba_float_to_uchar(to, straight); } } @@ -281,7 +281,7 @@ void IMB_buffer_byte_from_float(uchar *rect_to, const float *rect_from, if (dither && predivide) { for (x = 0; x < width; x++, from += 4, to += 4) { - premul_to_straight_v4(straight, from); + premul_to_straight_v4_v4(straight, from); linearrgb_to_srgb_ushort4(us, from); ushort_to_byte_dither_v4(to, us, di); } @@ -294,7 +294,7 @@ void IMB_buffer_byte_from_float(uchar *rect_to, const float *rect_from, } else if (predivide) { for (x = 0; x < width; x++, from += 4, to += 4) { - premul_to_straight_v4(straight, from); + premul_to_straight_v4_v4(straight, from); linearrgb_to_srgb_ushort4(us, from); ushort_to_byte_v4(to, us); } @@ -690,20 +690,20 @@ void IMB_buffer_float_clamp(float *buf, int width, int height) void IMB_buffer_float_unpremultiply(float *buf, int width, int height) { int total = width * height; - float *cp = buf; + float *fp = buf; while (total--) { - premul_to_straight_v4(cp, cp); - cp += 4; + premul_to_straight_v4(fp); + fp += 4; } } void IMB_buffer_float_premultiply(float *buf, int width, int height) { int total = width * height; - float *cp = buf; + float *fp = buf; while (total--) { - straight_to_premul_v4(cp, cp); - cp += 4; + straight_to_premul_v4(fp); + fp += 4; } } |