blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 750 Projects 19 Wiki Activity

Cycles: Another attempt to fix compilation on 32bit Linux

This commit is contained in:
Sergey Sharybin 2016-11-22 12:11:08 +01:00
parent af444e913f
commit edc10f5529
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
intern/cycles/util/util_image_impl.h
View File

@ -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) *