diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-11-22 14:11:08 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-11-22 14:11:08 +0300 |
| commit | edc10f55291cc541e6f46354389baee34fbaba6b (patch) | |
| tree | eaca5d7a53fdf107b3549961f526864ca6e691c7 /intern/cycles/util/util_image_impl.h | |
| parent | af444e913fc29ec52f08e0290831b53f94f3fd8f (diff) | |
Cycles: Another attempt to fix compilation on 32bit Linux
Diffstat (limited to 'intern/cycles/util/util_image_impl.h')
| -rw-r--r-- | intern/cycles/util/util_image_impl.h | 6 |
1 files changed, 3 insertions, 3 deletions
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<T>& 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) * |