From 5233aea8fb6513d94d4cceba43833aa75fc09810 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Thu, 5 Jan 2012 17:50:34 +0000 Subject: Fix mistake in recent refactoring, dither needs to be float not int. --- source/blender/imbuf/IMB_imbuf.h | 2 +- source/blender/imbuf/intern/divers.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'source/blender/imbuf') diff --git a/source/blender/imbuf/IMB_imbuf.h b/source/blender/imbuf/IMB_imbuf.h index 7f99fc3ffc7..c2e1183415c 100644 --- a/source/blender/imbuf/IMB_imbuf.h +++ b/source/blender/imbuf/IMB_imbuf.h @@ -380,7 +380,7 @@ void IMB_color_to_bw(struct ImBuf *ibuf); /* converting pixel buffers */ void IMB_buffer_byte_from_float(unsigned char *rect_to, const float *rect_from, - int channels_from, int dither, int profile_to, int profile_from, int predivide, + int channels_from, float dither, int profile_to, int profile_from, int predivide, int width, int height, int stride_to, int stride_from); void IMB_buffer_float_from_byte(float *rect_to, const unsigned char *rect_from, int profile_to, int profile_from, int predivide, diff --git a/source/blender/imbuf/intern/divers.c b/source/blender/imbuf/intern/divers.c index 0dfc1852e29..034b5724ca6 100644 --- a/source/blender/imbuf/intern/divers.c +++ b/source/blender/imbuf/intern/divers.c @@ -123,7 +123,7 @@ MINLINE void float_to_byte_dither_v4(uchar b[4], const float f[4], float dither) /* float to byte pixels, output 4-channel RGBA */ void IMB_buffer_byte_from_float(uchar *rect_to, const float *rect_from, - int channels_from, int dither, int profile_to, int profile_from, int predivide, + int channels_from, float dither, int profile_to, int profile_from, int predivide, int width, int height, int stride_to, int stride_from) { float tmp[4]; -- cgit v1.2.3