[Bf-blender-cvs] [edc10f5] master: Cycles: Another attempt to fix compilation on 32bit Linux

Sergey Sharybin noreply at git.blender.org
Tue Nov 22 12:11:26 CET 2016


Commit: edc10f55291cc541e6f46354389baee34fbaba6b
Author: Sergey Sharybin
Date:   Tue Nov 22 12:11:08 2016 +0100
Branches: master
https://developer.blender.org/rBedc10f55291cc541e6f46354389baee34fbaba6b

Cycles: Another attempt to fix compilation on 32bit Linux

===================================================================

M	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 58f85cf..73ecfda 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) *




More information about the Bf-blender-cvs mailing list