From edc10f55291cc541e6f46354389baee34fbaba6b Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Tue, 22 Nov 2016 12:11:08 +0100 Subject: Cycles: Another attempt to fix compilation on 32bit Linux --- intern/cycles/util/util_image_impl.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'intern/cycles/util/util_image_impl.h') diff --git a/intern/cycles/util/util_image_impl.h b/intern/cycles/util/util_image_impl.h index 58f85cf93d6..73ecfda0855 100644 --- a/intern/cycles/util/util_image_impl.h +++ b/intern/cycles/util/util_image_impl.h @@ -142,9 +142,9 @@ void util_image_resize_pixels(const vector& input_pixels, * We clamp them to be 1 pixel at least so we do not generate degenerate * image. */ - *output_width = max((size_t)((float)input_width * scale_factor), 1); - *output_height = max((size_t)((float)input_height * scale_factor), 1); - *output_depth = max((size_t)((float)input_depth * scale_factor), 1); + *output_width = max((size_t)((float)input_width * scale_factor), (size_t)1); + *output_height = max((size_t)((float)input_height * scale_factor), (size_t)1); + *output_depth = max((size_t)((float)input_depth * scale_factor), (size_t)1); /* Prepare pixel storage for the result. */ const size_t num_output_pixels = ((*output_width) * (*output_height) * -- cgit v1.2.3